Updated test results

test/small-goal-files/defs.tex

@@ -16,7 +16,7 @@
 
 % Results
 \def\smallAverageTriesUntilPass{1.0\xspace}
-\def\smallNumberofMergesWith1TriesUntilPass{54\xspace}
+\def\smallNumberofMergesWith1TriesUntilPass{68\xspace}
 \def\smallSporkOverOrtCorrect{3\xspace}
 \def\smallSporkOverOrtIncorrect{0\xspace}
 \def\smallMainBranchMerges{4\xspace}

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_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_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,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,ebc4b8ba6ab1ec099567c41c7522b9502c12ccfee0e5c8034021adafb5158ea1,Tests_passed,1cebc99cd5f8a1b210b66b6985f8aa5c38c4af194a32ad23dc3c6261f43d2968,Tests_passed,d04c699fb9748d42ffbbd2a94ae59e522247862c60f3dc29d7c3ed974fc47cb8,Tests_passed,37fdd5a8db81b80bee8cc5b121b9b2f70019498749193c47168e6aa4b86a02e9,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,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,cfb090ab0653675a0ab75d9a1957a60c02a69048c6c2654a7a5a921bc43d77fa,Merge_failed,4e0fa6edde284105a006148092586bd2bbce067c56588f4e5c02783786563c3f,Tests_passed,371b1c88034153afe8c3292ba4698b8bea2aa4aea4495b090a68f8f0555290d5,Tests_passed,6f65953e612e19453986bb2b697a79cbab808d3dc01cd3014db987083989a175,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d
+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,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,793b2615418f79ebb8bc7e65fa6d70f3b8c6c7bccb7adf57ea5d11748f668bf5,Tests_passed,1cebc99cd5f8a1b210b66b6985f8aa5c38c4af194a32ad23dc3c6261f43d2968,Tests_passed,d04c699fb9748d42ffbbd2a94ae59e522247862c60f3dc29d7c3ed974fc47cb8,Tests_passed,37fdd5a8db81b80bee8cc5b121b9b2f70019498749193c47168e6aa4b86a02e9,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,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,0f0f9cf3024777ba43d3017ee4a052404831a10bb96c90f9e82d8ccbd9aa71a7,Merge_failed,4e0fa6edde284105a006148092586bd2bbce067c56588f4e5c02783786563c3f,Tests_passed,371b1c88034153afe8c3292ba4698b8bea2aa4aea4495b090a68f8f0555290d5,Tests_passed,6f65953e612e19453986bb2b697a79cbab808d3dc01cd3014db987083989a175,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d