From 7024eba90788d5bde4d9e1a91caf14060229ce1c Mon Sep 17 00:00:00 2001 From: Benedikt Schesch Date: Mon, 27 May 2024 14:37:05 -0700 Subject: [PATCH] Update test results --- src/scripts/merge_tools/merge_plumelib.sh | 7 +++-- src/scripts/merge_tools/plumelib_ort.sh | 2 +- .../merge_tools/plumelib_ort_adjacent.sh | 2 +- .../plumelib_ort_adjacent_ignorespace.sh | 2 +- .../merge_tools/plumelib_ort_ignorespace.sh | 2 +- .../merge_tools/plumelib_ort_imports.sh | 2 +- .../plumelib_ort_imports_ignorespace.sh | 2 +- .../plumelib_ort_version_number.sh | 2 +- ...plumelib_ort_version_number_ignorespace.sh | 2 +- test/small-goal-files/defs.tex | 28 ----------------- .../git-hires-merge-example.csv | 6 ++-- .../merges_tested/mangstadt/ez-vcard.csv | 4 +-- .../merges_tested/pedrovgs/algorithms.csv | 6 ++-- .../merges_tested/tntim96/jscover.csv | 4 +-- test/small-goal-files/result.csv | 14 ++++----- .../tables/all/table_feature_main_summary.tex | 30 ------------------ .../all/table_main_feature_summary_oracle.tex | 31 ------------------- .../tables/all/table_summary.tex | 23 -------------- .../tables/all/table_summary_with_oracle.tex | 24 -------------- .../tables/git/table_feature_main_summary.tex | 24 -------------- .../git/table_main_feature_summary_oracle.tex | 25 --------------- .../tables/git/table_summary.tex | 17 ---------- .../tables/git/table_summary_with_oracle.tex | 18 ----------- .../tools/table_feature_main_summary.tex | 24 -------------- .../table_main_feature_summary_oracle.tex | 25 --------------- .../tables/tools/table_summary.tex | 17 ---------- .../tools/table_summary_with_oracle.tex | 18 ----------- 27 files changed, 30 insertions(+), 331 deletions(-) delete mode 100644 test/small-goal-files/defs.tex delete mode 100644 test/small-goal-files/tables/all/table_feature_main_summary.tex delete mode 100644 test/small-goal-files/tables/all/table_main_feature_summary_oracle.tex delete mode 100644 test/small-goal-files/tables/all/table_summary.tex delete mode 100644 test/small-goal-files/tables/all/table_summary_with_oracle.tex delete mode 100644 test/small-goal-files/tables/git/table_feature_main_summary.tex delete mode 100644 test/small-goal-files/tables/git/table_main_feature_summary_oracle.tex delete mode 100644 test/small-goal-files/tables/git/table_summary.tex delete mode 100644 test/small-goal-files/tables/git/table_summary_with_oracle.tex delete mode 100644 test/small-goal-files/tables/tools/table_feature_main_summary.tex delete mode 100644 test/small-goal-files/tables/tools/table_main_feature_summary_oracle.tex delete mode 100644 test/small-goal-files/tables/tools/table_summary.tex delete mode 100644 test/small-goal-files/tables/tools/table_summary_with_oracle.tex diff --git a/src/scripts/merge_tools/merge_plumelib.sh b/src/scripts/merge_tools/merge_plumelib.sh index a95ae6f981..91e90ddabf 100755 --- a/src/scripts/merge_tools/merge_plumelib.sh +++ b/src/scripts/merge_tools/merge_plumelib.sh @@ -1,6 +1,6 @@ #!/usr/bin/env sh -# usage: ./gitmerge_ort_imports_ignorespace.sh +# usage: ./gitmerge_ort_imports_ignorespace.sh clone_dir=$1 branch1=$2 @@ -8,6 +8,8 @@ branch2=$3 git_strategy=$4 #"-Xignore-space-change" merge_strategy=$5 #"--only-adjacent" +echo "git_merge_plumelib: Merging $branch1 and $branch2 with git_strategy=$git_strategy and merge_strategy=$merge_strategy" + # shellcheck disable=SC2153 # "JAVA17_HOME is not a misspelling of "JAVA_HOME" export JAVA_HOME="$JAVA17_HOME" @@ -22,7 +24,8 @@ git config --local merge.tool merge-plumelib git config --local mergetool.merge-plumelib.cmd 'java-merge-tool.sh '"$merge_strategy"' ${BASE} ${LOCAL} ${REMOTE} ${MERGED}' git config --local mergetool.merge-plumelib.trustExitCode true -git merge --no-edit "$git_strategy" "$branch2" +# shellcheck disable=SC2086 +git merge --no-edit $git_strategy "$branch2" retVal=$? # report conflicts diff --git a/src/scripts/merge_tools/plumelib_ort.sh b/src/scripts/merge_tools/plumelib_ort.sh index fa8f7c342d..997582f2d5 100755 --- a/src/scripts/merge_tools/plumelib_ort.sh +++ b/src/scripts/merge_tools/plumelib_ort.sh @@ -8,4 +8,4 @@ branch1=$2 branch2=$3 git_strategy="-s ort" plumelib_strategy="" -"$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy" +"$MERGE_SCRIPTS_DIR"/merge_plumelib.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy" diff --git a/src/scripts/merge_tools/plumelib_ort_adjacent.sh b/src/scripts/merge_tools/plumelib_ort_adjacent.sh index 1c7e0727e7..f7f62af9df 100755 --- a/src/scripts/merge_tools/plumelib_ort_adjacent.sh +++ b/src/scripts/merge_tools/plumelib_ort_adjacent.sh @@ -8,4 +8,4 @@ branch1=$2 branch2=$3 git_strategy="-s ort" plumelib_strategy="--only-adjacent" -"$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy" +"$MERGE_SCRIPTS_DIR"/merge_plumelib.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy" diff --git a/src/scripts/merge_tools/plumelib_ort_adjacent_ignorespace.sh b/src/scripts/merge_tools/plumelib_ort_adjacent_ignorespace.sh index 42319df896..10c3379f22 100755 --- a/src/scripts/merge_tools/plumelib_ort_adjacent_ignorespace.sh +++ b/src/scripts/merge_tools/plumelib_ort_adjacent_ignorespace.sh @@ -8,4 +8,4 @@ branch1=$2 branch2=$3 git_strategy="-s ort -Xignore-space-change" plumelib_strategy="--only-adjacent" -"$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy" +"$MERGE_SCRIPTS_DIR"/merge_plumelib.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy" diff --git a/src/scripts/merge_tools/plumelib_ort_ignorespace.sh b/src/scripts/merge_tools/plumelib_ort_ignorespace.sh index 159368032d..93a8806ec1 100755 --- a/src/scripts/merge_tools/plumelib_ort_ignorespace.sh +++ b/src/scripts/merge_tools/plumelib_ort_ignorespace.sh @@ -8,4 +8,4 @@ branch1=$2 branch2=$3 git_strategy="-s ort -Xignore-space-change" plumelib_strategy="" -"$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy" +"$MERGE_SCRIPTS_DIR"/merge_plumelib.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy" diff --git a/src/scripts/merge_tools/plumelib_ort_imports.sh b/src/scripts/merge_tools/plumelib_ort_imports.sh index 74a58816f4..20bfca74db 100755 --- a/src/scripts/merge_tools/plumelib_ort_imports.sh +++ b/src/scripts/merge_tools/plumelib_ort_imports.sh @@ -8,4 +8,4 @@ branch1=$2 branch2=$3 git_strategy="-s ort" plumelib_strategy="--only-imports" -"$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy" +"$MERGE_SCRIPTS_DIR"/merge_plumelib.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy" diff --git a/src/scripts/merge_tools/plumelib_ort_imports_ignorespace.sh b/src/scripts/merge_tools/plumelib_ort_imports_ignorespace.sh index 9d714f9a3d..64d64c8e7c 100755 --- a/src/scripts/merge_tools/plumelib_ort_imports_ignorespace.sh +++ b/src/scripts/merge_tools/plumelib_ort_imports_ignorespace.sh @@ -8,4 +8,4 @@ branch1=$2 branch2=$3 git_strategy="-s ort -Xignore-space-change" plumelib_strategy="--only-imports" -"$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy" +"$MERGE_SCRIPTS_DIR"/merge_plumelib.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy" diff --git a/src/scripts/merge_tools/plumelib_ort_version_number.sh b/src/scripts/merge_tools/plumelib_ort_version_number.sh index 97aae6914b..2bb95cf51d 100755 --- a/src/scripts/merge_tools/plumelib_ort_version_number.sh +++ b/src/scripts/merge_tools/plumelib_ort_version_number.sh @@ -8,4 +8,4 @@ branch1=$2 branch2=$3 git_strategy="-s ort" plumelib_strategy="--only-version-numbers" -"$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy" +"$MERGE_SCRIPTS_DIR"/merge_plumelib.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy" diff --git a/src/scripts/merge_tools/plumelib_ort_version_number_ignorespace.sh b/src/scripts/merge_tools/plumelib_ort_version_number_ignorespace.sh index 1108910cba..432a820d54 100755 --- a/src/scripts/merge_tools/plumelib_ort_version_number_ignorespace.sh +++ b/src/scripts/merge_tools/plumelib_ort_version_number_ignorespace.sh @@ -8,4 +8,4 @@ branch1=$2 branch2=$3 git_strategy="-s ort -Xignore-space-change" plumelib_strategy="--only-version-numbers" -"$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy" +"$MERGE_SCRIPTS_DIR"/merge_plumelib.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy" diff --git a/test/small-goal-files/defs.tex b/test/small-goal-files/defs.tex deleted file mode 100644 index e1bfa1021e..0000000000 --- a/test/small-goal-files/defs.tex +++ /dev/null @@ -1,28 +0,0 @@ -\def\smallReposInitial{4\xspace} -\def\smallReposValid{4\xspace} -\def\smallMergesInitial{62\xspace} -\def\smallMergesPer{50\xspace} -\def\smallMergesNonTrivial{32\xspace} -\def\smallReposNonTrivial{3\xspace} -\def\smallMergesJavaDiff{10\xspace} -\def\smallReposJavaDiff{4\xspace} -\def\smallMergesJavaDiffAndParentsPass{6\xspace} -\def\smallReposJavaDiffAndParentsPass{4\xspace} -\def\smallReposSampled{4\xspace} -\def\smallMergesSampled{6\xspace} -\def\smallReposYieldedFull{0\xspace} -\def\smallReposTotal{4\xspace} -\def\smallMergesTotal{6\xspace} - -% Results -\def\smallSporkOverOrtCorrect{3\xspace} -\def\smallSporkOverOrtIncorrect{0\xspace} -\def\smallMainBranchMerges{4\xspace} -\def\smallMainBranchMergesPercent{67\xspace} -\def\smallOtherBranchMerges{2\xspace} -\def\smallOtherBranchMergesPercent{33\xspace} -\def\smallReposJava{4\xspace} - -% Timeout -\def\smallParentTestTimeout{30\xspace} -\def\smallMergeTestTimeout{45\xspace} 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 feff9fd29c..61873126a8 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,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint -1,refs/heads/main,4ae40d33c3b959e3a15e458eb9b0676251e36a41,48199306f02a82abdeff0c01fab1ce112126d727,488122ce6c91e157d1f49b88b79feaa083fdee5b,,2252a9465319d00b974abd931cc98e1f435b4fe232b4dd61a828ad40139ec20c,Tests_passed,3782e47be673266f23cba016dc13973231429bb34e4c08a314c5b2f6c37d238f,Tests_passed,True,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,Merge_failed,435bcaa87b0e48e4991abc08213d0d93ae8c230e7577bd27a7aa4555219be103,Merge_failed,435bcaa87b0e48e4991abc08213d0d93ae8c230e7577bd27a7aa4555219be103,Merge_failed,435bcaa87b0e48e4991abc08213d0d93ae8c230e7577bd27a7aa4555219be103,Tests_passed,1cebc99cd5f8a1b210b66b6985f8aa5c38c4af194a32ad23dc3c6261f43d2968,Tests_passed,d04c699fb9748d42ffbbd2a94ae59e522247862c60f3dc29d7c3ed974fc47cb8,Merge_failed,89aea3021d6f4e0d388c026053c5a982bc802e7ad3ab3699717f5a425d4e572e -2,refs/remotes/origin/import_1,0209c47c118fcaf978f6ebc5bad8a334b541de0b,b4331092d8c5d1b03e6a9807ab135ed263b52663,8204af9984280ccc7f7793f903fc0807b626bf9c,,f48eaaf883e49f3e3a1f3e1ddff64beb42c9d9bacec7d273f748baa63093bd9b,Tests_passed,052542ef8f16db238683e23556af730ee0d7c65c3ac0554d01e7ee800ca9b7c6,Tests_passed,True,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,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Merge_failed,4e0fa6edde284105a006148092586bd2bbce067c56588f4e5c02783786563c3f,Tests_passed,371b1c88034153afe8c3292ba4698b8bea2aa4aea4495b090a68f8f0555290d5,Merge_failed,202b3ad2b5215619c767caba2d95318535ac5f81b9f5cd680dbd392ff0e91e16 +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,plumelib_ort_adjacent,plumelib_ort_adjacent_merge_fingerprint,plumelib_ort_adjacent_ignorespace,plumelib_ort_adjacent_ignorespace_merge_fingerprint,plumelib_ort_imports,plumelib_ort_imports_merge_fingerprint,plumelib_ort_imports_ignorespace,plumelib_ort_imports_ignorespace_merge_fingerprint,plumelib_ort_version_number,plumelib_ort_version_number_merge_fingerprint,plumelib_ort_version_number_ignorespace,plumelib_ort_version_number_ignorespace_merge_fingerprint +1,refs/heads/main,4ae40d33c3b959e3a15e458eb9b0676251e36a41,48199306f02a82abdeff0c01fab1ce112126d727,488122ce6c91e157d1f49b88b79feaa083fdee5b,,2252a9465319d00b974abd931cc98e1f435b4fe232b4dd61a828ad40139ec20c,Tests_passed,3782e47be673266f23cba016dc13973231429bb34e4c08a314c5b2f6c37d238f,Tests_passed,True,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_failed,092a4cb44cf5e6d9aa1353329e5e78f327e98e628746c890a0ead47640b120e9,Tests_failed,092a4cb44cf5e6d9aa1353329e5e78f327e98e628746c890a0ead47640b120e9,Tests_passed,c0bfa532d73e4f798d99a7ba69c2ab1a28d53caa1c3f1bf1cda103342db04e57,Tests_passed,c0bfa532d73e4f798d99a7ba69c2ab1a28d53caa1c3f1bf1cda103342db04e57,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Tests_failed,092a4cb44cf5e6d9aa1353329e5e78f327e98e628746c890a0ead47640b120e9,Tests_failed,092a4cb44cf5e6d9aa1353329e5e78f327e98e628746c890a0ead47640b120e9 +2,refs/remotes/origin/import_1,0209c47c118fcaf978f6ebc5bad8a334b541de0b,b4331092d8c5d1b03e6a9807ab135ed263b52663,8204af9984280ccc7f7793f903fc0807b626bf9c,,f48eaaf883e49f3e3a1f3e1ddff64beb42c9d9bacec7d273f748baa63093bd9b,Tests_passed,052542ef8f16db238683e23556af730ee0d7c65c3ac0554d01e7ee800ca9b7c6,Tests_passed,True,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,Tests_passed,10a64793549a76adcae8efbbcd4472f7d093bdfb23554ad5e93837862df22fc5,Tests_passed,10a64793549a76adcae8efbbcd4472f7d093bdfb23554ad5e93837862df22fc5,Tests_passed,4e79942fe159872e00b750c5fc96a0503ba4975d3757dcb6eeb38ad02959a4c4,Tests_passed,4e79942fe159872e00b750c5fc96a0503ba4975d3757dcb6eeb38ad02959a4c4,Tests_passed,10a64793549a76adcae8efbbcd4472f7d093bdfb23554ad5e93837862df22fc5,Tests_passed,10a64793549a76adcae8efbbcd4472f7d093bdfb23554ad5e93837862df22fc5,Tests_passed,4e79942fe159872e00b750c5fc96a0503ba4975d3757dcb6eeb38ad02959a4c4,Tests_passed,4e79942fe159872e00b750c5fc96a0503ba4975d3757dcb6eeb38ad02959a4c4 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 ad3d89ddaa..f5d2cf8d53 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,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint -7,refs/heads/master,63ab6b841a7aa31372315a902b98fc5b2cc3b661,ea6026ee62cc184db68d841d50d58474fcdf4862,ab2032ca9769d452d4906f51cf56ca7d983a27c4,,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,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,2eb4722f282ab563c519ff9eaa07c7fe5bb4d008eaef5edb034f712791619ed7,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0 +idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,plumelib_ort_adjacent,plumelib_ort_adjacent_merge_fingerprint,plumelib_ort_adjacent_ignorespace,plumelib_ort_adjacent_ignorespace_merge_fingerprint,plumelib_ort_imports,plumelib_ort_imports_merge_fingerprint,plumelib_ort_imports_ignorespace,plumelib_ort_imports_ignorespace_merge_fingerprint,plumelib_ort_version_number,plumelib_ort_version_number_merge_fingerprint,plumelib_ort_version_number_ignorespace,plumelib_ort_version_number_ignorespace_merge_fingerprint +7,refs/heads/master,63ab6b841a7aa31372315a902b98fc5b2cc3b661,ea6026ee62cc184db68d841d50d58474fcdf4862,ab2032ca9769d452d4906f51cf56ca7d983a27c4,,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,fca4fc91dfb0b83a17860b361b5e5676bda5097a8d17c5c835e7f3709aa0dc20,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a diff --git a/test/small-goal-files/merges_tested/pedrovgs/algorithms.csv b/test/small-goal-files/merges_tested/pedrovgs/algorithms.csv index c7d6cc6bcc..c5a71125c1 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,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint -5,refs/heads/master,d7e0b1c03fa7cacf40b32dcfde30871e8947445a,2c4e69eb243a81ba05d24456b3cad7e8a696f630,8a1a1a7fb53732edaf17ef9876545c4bca568e05,,True,True,718024edbe6334028acc916e40446b4ae7cb30be97792ae8e2253bdc1112c5a4,Tests_passed,199e1e65500c8ab0fd66d837663440faf9f32711932bdf2136778923a7b0d4d3,Tests_passed,True,True,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,61696b2b731bcaeb7629f2a47034d02a5f740dfb237bdb185c605197d2f017fe,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,61696b2b731bcaeb7629f2a47034d02a5f740dfb237bdb185c605197d2f017fe,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,14192423a42830e340baa41e9e304c9887717c60c76647d67d2b75beca45e4cc,Merge_failed,b715f0f78abecca4271cb0d71ae03b6cb6203a2306d2782b2991a5476824c03e,Merge_failed,b715f0f78abecca4271cb0d71ae03b6cb6203a2306d2782b2991a5476824c03e,Merge_failed,b715f0f78abecca4271cb0d71ae03b6cb6203a2306d2782b2991a5476824c03e,Merge_failed,80dadbca965612865a128b71a58d18704846a5cbd3cb50e93cca090233120ace,Tests_passed,e46044bafa010841cebb82e2b54234877bd9295e7f720fcdd79e2ff137cdb433,Merge_failed,b6c0da70d24e30bdadd393948d91c3d07b50a2c1af43ab2d6ff67bd2f372f3cf -19,refs/remotes/origin/pull/37,104eb9ed88cde145576ea1df50460915af488e74,6baa2ed219e18f9763bb2f2de74c5fb800d15899,99a155f67dfe68de440feb560a7e4c4ee5ae355c,,True,True,216098fad46bb19977b73bb3104f281c803911449ff6eb9c13d600efb375ae84,Tests_passed,d80bbdd6216a68130e2bbf0e70dde5edb5e9e02e397fe38c702bc69e74fddebf,Tests_passed,True,True,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,f19931ca02a3dea15a502859251c2361252bf79b80945ff12a235522b5421e4d,Merge_failed,caabfaf56f55dab120eb0da046403f7f02fb2d999b08b3b4852e608293207290,Merge_failed,caabfaf56f55dab120eb0da046403f7f02fb2d999b08b3b4852e608293207290,Merge_failed,caabfaf56f55dab120eb0da046403f7f02fb2d999b08b3b4852e608293207290,Merge_failed,8a8768d8ce56caeb4b3ad8a4e5e8f7e6afcb91934bab5282ce5a1f7daef76c65,Merge_failed,f49462ec3092b24bc747241df2e554408663f570124685b61327e57ea61ceb60,Merge_failed,4db8343a17eae46da41b4530d1fa29a84fd0dad4bc9dc55e30d59c9e0ed076e4 +idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,plumelib_ort_adjacent,plumelib_ort_adjacent_merge_fingerprint,plumelib_ort_adjacent_ignorespace,plumelib_ort_adjacent_ignorespace_merge_fingerprint,plumelib_ort_imports,plumelib_ort_imports_merge_fingerprint,plumelib_ort_imports_ignorespace,plumelib_ort_imports_ignorespace_merge_fingerprint,plumelib_ort_version_number,plumelib_ort_version_number_merge_fingerprint,plumelib_ort_version_number_ignorespace,plumelib_ort_version_number_ignorespace_merge_fingerprint +5,refs/heads/master,d7e0b1c03fa7cacf40b32dcfde30871e8947445a,2c4e69eb243a81ba05d24456b3cad7e8a696f630,8a1a1a7fb53732edaf17ef9876545c4bca568e05,,True,True,718024edbe6334028acc916e40446b4ae7cb30be97792ae8e2253bdc1112c5a4,Tests_passed,199e1e65500c8ab0fd66d837663440faf9f32711932bdf2136778923a7b0d4d3,Tests_passed,True,True,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,61696b2b731bcaeb7629f2a47034d02a5f740dfb237bdb185c605197d2f017fe,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,61696b2b731bcaeb7629f2a47034d02a5f740dfb237bdb185c605197d2f017fe,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,14192423a42830e340baa41e9e304c9887717c60c76647d67d2b75beca45e4cc,Merge_failed,80dadbca965612865a128b71a58d18704846a5cbd3cb50e93cca090233120ace,Tests_passed,e46044bafa010841cebb82e2b54234877bd9295e7f720fcdd79e2ff137cdb433,Tests_passed,06100d09fa236db95f80cbeba2d28cbc6086692d6d75031406b40d855fedac5e,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c +19,refs/remotes/origin/pull/37,104eb9ed88cde145576ea1df50460915af488e74,6baa2ed219e18f9763bb2f2de74c5fb800d15899,99a155f67dfe68de440feb560a7e4c4ee5ae355c,,True,True,216098fad46bb19977b73bb3104f281c803911449ff6eb9c13d600efb375ae84,Tests_passed,d80bbdd6216a68130e2bbf0e70dde5edb5e9e02e397fe38c702bc69e74fddebf,Tests_passed,True,True,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,f19931ca02a3dea15a502859251c2361252bf79b80945ff12a235522b5421e4d,Merge_failed,8a8768d8ce56caeb4b3ad8a4e5e8f7e6afcb91934bab5282ce5a1f7daef76c65,Merge_failed,f49462ec3092b24bc747241df2e554408663f570124685b61327e57ea61ceb60,Merge_failed,4db8343a17eae46da41b4530d1fa29a84fd0dad4bc9dc55e30d59c9e0ed076e4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,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 dedaa512e9..3afc804565 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,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint -19,refs/heads/master,75e03285fddc0e2510c4f20c56ac607702fc3c9a,56dc97e7850da6b5a904b57c5e288cbb89fde81d,46b585e31b43ec0d1740395b38d15fd4e4f8c60f,,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,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,0597b17fac27dd5503cf96febe102dfb3cf4eebd385ae84b6f1de0384a499827,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042 +idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,plumelib_ort,plumelib_ort_merge_fingerprint,plumelib_ort_ignorespace,plumelib_ort_ignorespace_merge_fingerprint,plumelib_ort_adjacent,plumelib_ort_adjacent_merge_fingerprint,plumelib_ort_adjacent_ignorespace,plumelib_ort_adjacent_ignorespace_merge_fingerprint,plumelib_ort_imports,plumelib_ort_imports_merge_fingerprint,plumelib_ort_imports_ignorespace,plumelib_ort_imports_ignorespace_merge_fingerprint,plumelib_ort_version_number,plumelib_ort_version_number_merge_fingerprint,plumelib_ort_version_number_ignorespace,plumelib_ort_version_number_ignorespace_merge_fingerprint +19,refs/heads/master,75e03285fddc0e2510c4f20c56ac607702fc3c9a,56dc97e7850da6b5a904b57c5e288cbb89fde81d,46b585e31b43ec0d1740395b38d15fd4e4f8c60f,,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 diff --git a/test/small-goal-files/result.csv b/test/small-goal-files/result.csv index ff236ff418..559bdf51e1 100644 --- a/test/small-goal-files/result.csv +++ b/test/small-goal-files/result.csv @@ -1,7 +1,7 @@ -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,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,repository,Oracle tool -0-1,0,1,refs/heads/main,4ae40d33c3b959e3a15e458eb9b0676251e36a41,48199306f02a82abdeff0c01fab1ce112126d727,488122ce6c91e157d1f49b88b79feaa083fdee5b,,2252a9465319d00b974abd931cc98e1f435b4fe232b4dd61a828ad40139ec20c,Tests_passed,3782e47be673266f23cba016dc13973231429bb34e4c08a314c5b2f6c37d238f,Tests_passed,True,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,Merge_failed,435bcaa87b0e48e4991abc08213d0d93ae8c230e7577bd27a7aa4555219be103,Merge_failed,435bcaa87b0e48e4991abc08213d0d93ae8c230e7577bd27a7aa4555219be103,Merge_failed,435bcaa87b0e48e4991abc08213d0d93ae8c230e7577bd27a7aa4555219be103,Tests_passed,1cebc99cd5f8a1b210b66b6985f8aa5c38c4af194a32ad23dc3c6261f43d2968,Tests_passed,d04c699fb9748d42ffbbd2a94ae59e522247862c60f3dc29d7c3ed974fc47cb8,Merge_failed,89aea3021d6f4e0d388c026053c5a982bc802e7ad3ab3699717f5a425d4e572e,benedikt-schesch/git-hires-merge-example,Tests_passed -0-2,0,2,refs/remotes/origin/import_1,0209c47c118fcaf978f6ebc5bad8a334b541de0b,b4331092d8c5d1b03e6a9807ab135ed263b52663,8204af9984280ccc7f7793f903fc0807b626bf9c,,f48eaaf883e49f3e3a1f3e1ddff64beb42c9d9bacec7d273f748baa63093bd9b,Tests_passed,052542ef8f16db238683e23556af730ee0d7c65c3ac0554d01e7ee800ca9b7c6,Tests_passed,True,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,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Tests_passed,6ee8bb20e8c7215279006bc73c3674b19d7b0a5d1b8cf9828ac8b34b56b3f4bd,Merge_failed,4e0fa6edde284105a006148092586bd2bbce067c56588f4e5c02783786563c3f,Tests_passed,371b1c88034153afe8c3292ba4698b8bea2aa4aea4495b090a68f8f0555290d5,Merge_failed,202b3ad2b5215619c767caba2d95318535ac5f81b9f5cd680dbd392ff0e91e16,benedikt-schesch/git-hires-merge-example,Tests_passed -1-7,1,7,refs/heads/master,63ab6b841a7aa31372315a902b98fc5b2cc3b661,ea6026ee62cc184db68d841d50d58474fcdf4862,ab2032ca9769d452d4906f51cf56ca7d983a27c4,,aa82b49dd87edb07fbe37b7c2d6801fce8db7c437d1afe8a7b2723c81806286e,Tests_passed,66055b6c4498a64239ae0e49781e086ed06ec3e58be7d9651c23c53f8c6bab6a,Tests_passed,True,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,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,2eb4722f282ab563c519ff9eaa07c7fe5bb4d008eaef5edb034f712791619ed7,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,mangstadt/ez-vcard,Tests_passed -2-5,2,5,refs/heads/master,d7e0b1c03fa7cacf40b32dcfde30871e8947445a,2c4e69eb243a81ba05d24456b3cad7e8a696f630,8a1a1a7fb53732edaf17ef9876545c4bca568e05,,718024edbe6334028acc916e40446b4ae7cb30be97792ae8e2253bdc1112c5a4,Tests_passed,199e1e65500c8ab0fd66d837663440faf9f32711932bdf2136778923a7b0d4d3,Tests_passed,True,True,True,True,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,61696b2b731bcaeb7629f2a47034d02a5f740dfb237bdb185c605197d2f017fe,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,61696b2b731bcaeb7629f2a47034d02a5f740dfb237bdb185c605197d2f017fe,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,14192423a42830e340baa41e9e304c9887717c60c76647d67d2b75beca45e4cc,Merge_failed,b715f0f78abecca4271cb0d71ae03b6cb6203a2306d2782b2991a5476824c03e,Merge_failed,b715f0f78abecca4271cb0d71ae03b6cb6203a2306d2782b2991a5476824c03e,Merge_failed,b715f0f78abecca4271cb0d71ae03b6cb6203a2306d2782b2991a5476824c03e,Merge_failed,80dadbca965612865a128b71a58d18704846a5cbd3cb50e93cca090233120ace,Tests_passed,e46044bafa010841cebb82e2b54234877bd9295e7f720fcdd79e2ff137cdb433,Merge_failed,b6c0da70d24e30bdadd393948d91c3d07b50a2c1af43ab2d6ff67bd2f372f3cf,pedrovgs/algorithms,Tests_passed -2-19,2,19,refs/remotes/origin/pull/37,104eb9ed88cde145576ea1df50460915af488e74,6baa2ed219e18f9763bb2f2de74c5fb800d15899,99a155f67dfe68de440feb560a7e4c4ee5ae355c,,216098fad46bb19977b73bb3104f281c803911449ff6eb9c13d600efb375ae84,Tests_passed,d80bbdd6216a68130e2bbf0e70dde5edb5e9e02e397fe38c702bc69e74fddebf,Tests_passed,True,True,True,True,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,f19931ca02a3dea15a502859251c2361252bf79b80945ff12a235522b5421e4d,Merge_failed,caabfaf56f55dab120eb0da046403f7f02fb2d999b08b3b4852e608293207290,Merge_failed,caabfaf56f55dab120eb0da046403f7f02fb2d999b08b3b4852e608293207290,Merge_failed,caabfaf56f55dab120eb0da046403f7f02fb2d999b08b3b4852e608293207290,Merge_failed,8a8768d8ce56caeb4b3ad8a4e5e8f7e6afcb91934bab5282ce5a1f7daef76c65,Merge_failed,f49462ec3092b24bc747241df2e554408663f570124685b61327e57ea61ceb60,Merge_failed,4db8343a17eae46da41b4530d1fa29a84fd0dad4bc9dc55e30d59c9e0ed076e4,pedrovgs/algorithms,Merge_failed -4-19,4,19,refs/heads/master,75e03285fddc0e2510c4f20c56ac607702fc3c9a,56dc97e7850da6b5a904b57c5e288cbb89fde81d,46b585e31b43ec0d1740395b38d15fd4e4f8c60f,,8cd2e5da1cc38b2042f77063db20b9c9c480d6ae2da25000586ac2cc74ed5e9e,Tests_passed,0655271b4f7b84183e4c0bf0105dc677f68858e9b294c4cdf28d57f34108ee66,Tests_passed,True,True,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,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,8644c0f666694776df25e1ab475b756991911993319ba2af9652082cafa604c8,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,0597b17fac27dd5503cf96febe102dfb3cf4eebd385ae84b6f1de0384a499827,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,tntim96/jscover,Tests_passed +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,plumelib_ort_adjacent,plumelib_ort_adjacent_merge_fingerprint,plumelib_ort_adjacent_ignorespace,plumelib_ort_adjacent_ignorespace_merge_fingerprint,plumelib_ort_imports,plumelib_ort_imports_merge_fingerprint,plumelib_ort_imports_ignorespace,plumelib_ort_imports_ignorespace_merge_fingerprint,plumelib_ort_version_number,plumelib_ort_version_number_merge_fingerprint,plumelib_ort_version_number_ignorespace,plumelib_ort_version_number_ignorespace_merge_fingerprint,repository,Oracle tool +0-1,0,1,refs/heads/main,4ae40d33c3b959e3a15e458eb9b0676251e36a41,48199306f02a82abdeff0c01fab1ce112126d727,488122ce6c91e157d1f49b88b79feaa083fdee5b,,2252a9465319d00b974abd931cc98e1f435b4fe232b4dd61a828ad40139ec20c,Tests_passed,3782e47be673266f23cba016dc13973231429bb34e4c08a314c5b2f6c37d238f,Tests_passed,True,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_failed,092a4cb44cf5e6d9aa1353329e5e78f327e98e628746c890a0ead47640b120e9,Tests_failed,092a4cb44cf5e6d9aa1353329e5e78f327e98e628746c890a0ead47640b120e9,Tests_passed,c0bfa532d73e4f798d99a7ba69c2ab1a28d53caa1c3f1bf1cda103342db04e57,Tests_passed,c0bfa532d73e4f798d99a7ba69c2ab1a28d53caa1c3f1bf1cda103342db04e57,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Tests_failed,092a4cb44cf5e6d9aa1353329e5e78f327e98e628746c890a0ead47640b120e9,Tests_failed,092a4cb44cf5e6d9aa1353329e5e78f327e98e628746c890a0ead47640b120e9,benedikt-schesch/git-hires-merge-example,Tests_passed +0-2,0,2,refs/remotes/origin/import_1,0209c47c118fcaf978f6ebc5bad8a334b541de0b,b4331092d8c5d1b03e6a9807ab135ed263b52663,8204af9984280ccc7f7793f903fc0807b626bf9c,,f48eaaf883e49f3e3a1f3e1ddff64beb42c9d9bacec7d273f748baa63093bd9b,Tests_passed,052542ef8f16db238683e23556af730ee0d7c65c3ac0554d01e7ee800ca9b7c6,Tests_passed,True,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,Tests_passed,10a64793549a76adcae8efbbcd4472f7d093bdfb23554ad5e93837862df22fc5,Tests_passed,10a64793549a76adcae8efbbcd4472f7d093bdfb23554ad5e93837862df22fc5,Tests_passed,4e79942fe159872e00b750c5fc96a0503ba4975d3757dcb6eeb38ad02959a4c4,Tests_passed,4e79942fe159872e00b750c5fc96a0503ba4975d3757dcb6eeb38ad02959a4c4,Tests_passed,10a64793549a76adcae8efbbcd4472f7d093bdfb23554ad5e93837862df22fc5,Tests_passed,10a64793549a76adcae8efbbcd4472f7d093bdfb23554ad5e93837862df22fc5,Tests_passed,4e79942fe159872e00b750c5fc96a0503ba4975d3757dcb6eeb38ad02959a4c4,Tests_passed,4e79942fe159872e00b750c5fc96a0503ba4975d3757dcb6eeb38ad02959a4c4,benedikt-schesch/git-hires-merge-example,Tests_passed +1-7,1,7,refs/heads/master,63ab6b841a7aa31372315a902b98fc5b2cc3b661,ea6026ee62cc184db68d841d50d58474fcdf4862,ab2032ca9769d452d4906f51cf56ca7d983a27c4,,aa82b49dd87edb07fbe37b7c2d6801fce8db7c437d1afe8a7b2723c81806286e,Tests_passed,66055b6c4498a64239ae0e49781e086ed06ec3e58be7d9651c23c53f8c6bab6a,Tests_passed,True,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,fca4fc91dfb0b83a17860b361b5e5676bda5097a8d17c5c835e7f3709aa0dc20,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,mangstadt/ez-vcard,Tests_passed +2-5,2,5,refs/heads/master,d7e0b1c03fa7cacf40b32dcfde30871e8947445a,2c4e69eb243a81ba05d24456b3cad7e8a696f630,8a1a1a7fb53732edaf17ef9876545c4bca568e05,,718024edbe6334028acc916e40446b4ae7cb30be97792ae8e2253bdc1112c5a4,Tests_passed,199e1e65500c8ab0fd66d837663440faf9f32711932bdf2136778923a7b0d4d3,Tests_passed,True,True,True,True,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,61696b2b731bcaeb7629f2a47034d02a5f740dfb237bdb185c605197d2f017fe,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,61696b2b731bcaeb7629f2a47034d02a5f740dfb237bdb185c605197d2f017fe,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,14192423a42830e340baa41e9e304c9887717c60c76647d67d2b75beca45e4cc,Merge_failed,80dadbca965612865a128b71a58d18704846a5cbd3cb50e93cca090233120ace,Tests_passed,e46044bafa010841cebb82e2b54234877bd9295e7f720fcdd79e2ff137cdb433,Tests_passed,06100d09fa236db95f80cbeba2d28cbc6086692d6d75031406b40d855fedac5e,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,pedrovgs/algorithms,Tests_passed +2-19,2,19,refs/remotes/origin/pull/37,104eb9ed88cde145576ea1df50460915af488e74,6baa2ed219e18f9763bb2f2de74c5fb800d15899,99a155f67dfe68de440feb560a7e4c4ee5ae355c,,216098fad46bb19977b73bb3104f281c803911449ff6eb9c13d600efb375ae84,Tests_passed,d80bbdd6216a68130e2bbf0e70dde5edb5e9e02e397fe38c702bc69e74fddebf,Tests_passed,True,True,True,True,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,f19931ca02a3dea15a502859251c2361252bf79b80945ff12a235522b5421e4d,Merge_failed,8a8768d8ce56caeb4b3ad8a4e5e8f7e6afcb91934bab5282ce5a1f7daef76c65,Merge_failed,f49462ec3092b24bc747241df2e554408663f570124685b61327e57ea61ceb60,Merge_failed,4db8343a17eae46da41b4530d1fa29a84fd0dad4bc9dc55e30d59c9e0ed076e4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,pedrovgs/algorithms,Merge_failed +4-19,4,19,refs/heads/master,75e03285fddc0e2510c4f20c56ac607702fc3c9a,56dc97e7850da6b5a904b57c5e288cbb89fde81d,46b585e31b43ec0d1740395b38d15fd4e4f8c60f,,8cd2e5da1cc38b2042f77063db20b9c9c480d6ae2da25000586ac2cc74ed5e9e,Tests_passed,0655271b4f7b84183e4c0bf0105dc677f68858e9b294c4cdf28d57f34108ee66,Tests_passed,True,True,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,tntim96/jscover,Tests_passed diff --git a/test/small-goal-files/tables/all/table_feature_main_summary.tex b/test/small-goal-files/tables/all/table_feature_main_summary.tex deleted file mode 100644 index 8e53a0dacf..0000000000 --- a/test/small-goal-files/tables/all/table_feature_main_summary.tex +++ /dev/null @@ -1,30 +0,0 @@ -% Do not edit. This file is automatically generated. -\begin{tabular}{c|c c c c|c c c c|c c c c} - Tool & - \multicolumn{4}{c|}{Correct Merges} & - \multicolumn{4}{c|}{Unhandled Merges} & - \multicolumn{4}{c}{Incorrect Merges} \\ - & - \multicolumn{2}{c}{Main Branch} & - \multicolumn{2}{c|}{Other Branches} & - \multicolumn{2}{c}{Main Branch} & - \multicolumn{2}{c|}{Other Branches} & - \multicolumn{2}{c}{Main Branch} & - \multicolumn{2}{c}{Other Branches} \\ - \hline - & \# & \% & \# & \% & \# & \% & \# & \% & \# & \% & \# & \% \\ - Gitmerge-ort & 2 & 50\% & 0 & 0\% & 2 & 50\% & 2 & 100\% & 0 & 0\% & 0 & 0\% \\ - Gitmerge-ort-ignorespace & 2 & 50\% & 0 & 0\% & 2 & 50\% & 2 & 100\% & 0 & 0\% & 0 & 0\% \\ - Gitmerge-recursive-histogram & 2 & 50\% & 0 & 0\% & 2 & 50\% & 2 & 100\% & 0 & 0\% & 0 & 0\% \\ - Gitmerge-recursive-ignorespace & 2 & 50\% & 0 & 0\% & 2 & 50\% & 2 & 100\% & 0 & 0\% & 0 & 0\% \\ - Gitmerge-recursive-minimal & 2 & 50\% & 0 & 0\% & 2 & 50\% & 2 & 100\% & 0 & 0\% & 0 & 0\% \\ - Gitmerge-recursive-myers & 2 & 50\% & 0 & 0\% & 2 & 50\% & 2 & 100\% & 0 & 0\% & 0 & 0\% \\ - Gitmerge-recursive-patience & 2 & 50\% & 0 & 0\% & 2 & 50\% & 2 & 100\% & 0 & 0\% & 0 & 0\% \\ - Gitmerge-resolve & 2 & 50\% & 0 & 0\% & 2 & 50\% & 2 & 100\% & 0 & 0\% & 0 & 0\% \\ - Adjacent+ort & 3 & 75\% & 1 & 50\% & 1 & 25\% & 1 & 50\% & 0 & 0\% & 0 & 0\% \\ - Imports+ort & 2 & 50\% & 0 & 0\% & 2 & 50\% & 2 & 100\% & 0 & 0\% & 0 & 0\% \\ - Imports+ort-ignorespace & 2 & 50\% & 0 & 0\% & 2 & 50\% & 2 & 100\% & 0 & 0\% & 0 & 0\% \\ - Hires-Merge & 3 & 75\% & 0 & 0\% & 1 & 25\% & 2 & 100\% & 0 & 0\% & 0 & 0\% \\ - Spork & 4 & 100\% & 1 & 50\% & 0 & 0\% & 1 & 50\% & 0 & 0\% & 0 & 0\% \\ - IntelliMerge & 2 & 50\% & 1 & 50\% & 0 & 0\% & 1 & 50\% & 2 & 50\% & 0 & 0\% \\ -\end{tabular} diff --git a/test/small-goal-files/tables/all/table_main_feature_summary_oracle.tex b/test/small-goal-files/tables/all/table_main_feature_summary_oracle.tex deleted file mode 100644 index 802acb26af..0000000000 --- a/test/small-goal-files/tables/all/table_main_feature_summary_oracle.tex +++ /dev/null @@ -1,31 +0,0 @@ -% Do not edit. This file is automatically generated. -\begin{tabular}{c|c c c c|c c c c|c c c c} - Tool & - \multicolumn{4}{c|}{Correct Merges} & - \multicolumn{4}{c|}{Unhandled Merges} & - \multicolumn{4}{c}{Incorrect Merges} \\ - & - \multicolumn{2}{c}{Main Branch} & - \multicolumn{2}{c|}{Other Branches} & - \multicolumn{2}{c}{Main Branch} & - \multicolumn{2}{c|}{Other Branches} & - \multicolumn{2}{c}{Main Branch} & - \multicolumn{2}{c}{Other Branches} \\ - \hline - & \# & \% & \# & \% & \# & \% & \# & \% & \# & \% & \# & \% \\ - Gitmerge-ort & 0 & 0\% & 2 & 50\% & 2 & 100\% & 2 & 50\% & 0 & 0\% & 0 & 0\% \\ - Gitmerge-ort-ignorespace & 0 & 0\% & 2 & 50\% & 2 & 100\% & 2 & 50\% & 0 & 0\% & 0 & 0\% \\ - Gitmerge-recursive-histogram & 0 & 0\% & 2 & 50\% & 2 & 100\% & 2 & 50\% & 0 & 0\% & 0 & 0\% \\ - Gitmerge-recursive-ignorespace & 0 & 0\% & 2 & 50\% & 2 & 100\% & 2 & 50\% & 0 & 0\% & 0 & 0\% \\ - Gitmerge-recursive-minimal & 0 & 0\% & 2 & 50\% & 2 & 100\% & 2 & 50\% & 0 & 0\% & 0 & 0\% \\ - Gitmerge-recursive-myers & 0 & 0\% & 2 & 50\% & 2 & 100\% & 2 & 50\% & 0 & 0\% & 0 & 0\% \\ - Gitmerge-recursive-patience & 0 & 0\% & 2 & 50\% & 2 & 100\% & 2 & 50\% & 0 & 0\% & 0 & 0\% \\ - Gitmerge-resolve & 0 & 0\% & 2 & 50\% & 2 & 100\% & 2 & 50\% & 0 & 0\% & 0 & 0\% \\ - Adjacent+ort & 1 & 50\% & 3 & 75\% & 1 & 50\% & 1 & 25\% & 0 & 0\% & 0 & 0\% \\ - Imports+ort & 0 & 0\% & 2 & 50\% & 2 & 100\% & 2 & 50\% & 0 & 0\% & 0 & 0\% \\ - Imports+ort-ignorespace & 0 & 0\% & 2 & 50\% & 2 & 100\% & 2 & 50\% & 0 & 0\% & 0 & 0\% \\ - Hires-Merge & 0 & 0\% & 3 & 75\% & 2 & 100\% & 1 & 25\% & 0 & 0\% & 0 & 0\% \\ - Spork & 1 & 50\% & 4 & 100\% & 1 & 50\% & 0 & 0\% & 0 & 0\% & 0 & 0\% \\ - IntelliMerge & 1 & 50\% & 2 & 50\% & 1 & 50\% & 0 & 0\% & 0 & 0\% & 2 & 50\% \\ - Oracle tool & 1 & 50\% & 4 & 100\% & 1 & 50\% & 0 & 0\% & 0 & 0\% & 0 & 0\% \\ -\end{tabular} diff --git a/test/small-goal-files/tables/all/table_summary.tex b/test/small-goal-files/tables/all/table_summary.tex deleted file mode 100644 index 6b6ca8ac67..0000000000 --- a/test/small-goal-files/tables/all/table_summary.tex +++ /dev/null @@ -1,23 +0,0 @@ -% Do not edit. This file is automatically generated. -\begin{tabular}{l|c c|c c|c c} - Tool & - \multicolumn{2}{c|}{Correct Merges} & - \multicolumn{2}{c|}{Unhandled Merges} & - \multicolumn{2}{c}{Incorrect Merges} \\ - & \# & \% & \# & \% & \# & \% \\ - \hline -Gitmerge-ort & 2 & 33\% & 4 & 67\% & 0 & 0\% \\ -Gitmerge-ort-ignorespace & 2 & 33\% & 4 & 67\% & 0 & 0\% \\ -Gitmerge-recursive-histogram & 2 & 33\% & 4 & 67\% & 0 & 0\% \\ -Gitmerge-recursive-ignorespace & 2 & 33\% & 4 & 67\% & 0 & 0\% \\ -Gitmerge-recursive-minimal & 2 & 33\% & 4 & 67\% & 0 & 0\% \\ -Gitmerge-recursive-myers & 2 & 33\% & 4 & 67\% & 0 & 0\% \\ -Gitmerge-recursive-patience & 2 & 33\% & 4 & 67\% & 0 & 0\% \\ -Gitmerge-resolve & 2 & 33\% & 4 & 67\% & 0 & 0\% \\ -Adjacent+ort & 4 & 67\% & 2 & 33\% & 0 & 0\% \\ -Imports+ort & 2 & 33\% & 4 & 67\% & 0 & 0\% \\ -Imports+ort-ignorespace & 2 & 33\% & 4 & 67\% & 0 & 0\% \\ -Hires-Merge & 3 & 50\% & 3 & 50\% & 0 & 0\% \\ -Spork & 5 & 83\% & 1 & 17\% & 0 & 0\% \\ -IntelliMerge & 3 & 50\% & 1 & 17\% & 2 & 33\% \\ -\end{tabular} diff --git a/test/small-goal-files/tables/all/table_summary_with_oracle.tex b/test/small-goal-files/tables/all/table_summary_with_oracle.tex deleted file mode 100644 index 5a441a79d3..0000000000 --- a/test/small-goal-files/tables/all/table_summary_with_oracle.tex +++ /dev/null @@ -1,24 +0,0 @@ -% Do not edit. This file is automatically generated. -\begin{tabular}{l|c c|c c|c c} - Tool & - \multicolumn{2}{c|}{Correct Merges} & - \multicolumn{2}{c|}{Unhandled Merges} & - \multicolumn{2}{c}{Incorrect Merges} \\ - & \# & \% & \# & \% & \# & \% \\ - \hline -Gitmerge-ort & 2 & 33\% & 4 & 67\% & 0 & 0\% \\ -Gitmerge-ort-ignorespace & 2 & 33\% & 4 & 67\% & 0 & 0\% \\ -Gitmerge-recursive-histogram & 2 & 33\% & 4 & 67\% & 0 & 0\% \\ -Gitmerge-recursive-ignorespace & 2 & 33\% & 4 & 67\% & 0 & 0\% \\ -Gitmerge-recursive-minimal & 2 & 33\% & 4 & 67\% & 0 & 0\% \\ -Gitmerge-recursive-myers & 2 & 33\% & 4 & 67\% & 0 & 0\% \\ -Gitmerge-recursive-patience & 2 & 33\% & 4 & 67\% & 0 & 0\% \\ -Gitmerge-resolve & 2 & 33\% & 4 & 67\% & 0 & 0\% \\ -Adjacent+ort & 4 & 67\% & 2 & 33\% & 0 & 0\% \\ -Imports+ort & 2 & 33\% & 4 & 67\% & 0 & 0\% \\ -Imports+ort-ignorespace & 2 & 33\% & 4 & 67\% & 0 & 0\% \\ -Hires-Merge & 3 & 50\% & 3 & 50\% & 0 & 0\% \\ -Spork & 5 & 83\% & 1 & 17\% & 0 & 0\% \\ -IntelliMerge & 3 & 50\% & 1 & 17\% & 2 & 33\% \\ -Oracle tool & 5 & 83\% & 1 & 17\% & 0 & 0\% \\ -\end{tabular} diff --git a/test/small-goal-files/tables/git/table_feature_main_summary.tex b/test/small-goal-files/tables/git/table_feature_main_summary.tex deleted file mode 100644 index 1ee17ad34f..0000000000 --- a/test/small-goal-files/tables/git/table_feature_main_summary.tex +++ /dev/null @@ -1,24 +0,0 @@ -% Do not edit. This file is automatically generated. -\begin{tabular}{c|c c c c|c c c c|c c c c} - Tool & - \multicolumn{4}{c|}{Correct Merges} & - \multicolumn{4}{c|}{Unhandled Merges} & - \multicolumn{4}{c}{Incorrect Merges} \\ - & - \multicolumn{2}{c}{Main Branch} & - \multicolumn{2}{c|}{Other Branches} & - \multicolumn{2}{c}{Main Branch} & - \multicolumn{2}{c|}{Other Branches} & - \multicolumn{2}{c}{Main Branch} & - \multicolumn{2}{c}{Other Branches} \\ - \hline - & \# & \% & \# & \% & \# & \% & \# & \% & \# & \% & \# & \% \\ - Gitmerge-ort & 2 & 50\% & 0 & 0\% & 2 & 50\% & 2 & 100\% & 0 & 0\% & 0 & 0\% \\ - Gitmerge-ort-ignorespace & 2 & 50\% & 0 & 0\% & 2 & 50\% & 2 & 100\% & 0 & 0\% & 0 & 0\% \\ - Gitmerge-recursive-histogram & 2 & 50\% & 0 & 0\% & 2 & 50\% & 2 & 100\% & 0 & 0\% & 0 & 0\% \\ - Gitmerge-recursive-ignorespace & 2 & 50\% & 0 & 0\% & 2 & 50\% & 2 & 100\% & 0 & 0\% & 0 & 0\% \\ - Gitmerge-recursive-minimal & 2 & 50\% & 0 & 0\% & 2 & 50\% & 2 & 100\% & 0 & 0\% & 0 & 0\% \\ - Gitmerge-recursive-myers & 2 & 50\% & 0 & 0\% & 2 & 50\% & 2 & 100\% & 0 & 0\% & 0 & 0\% \\ - Gitmerge-recursive-patience & 2 & 50\% & 0 & 0\% & 2 & 50\% & 2 & 100\% & 0 & 0\% & 0 & 0\% \\ - Gitmerge-resolve & 2 & 50\% & 0 & 0\% & 2 & 50\% & 2 & 100\% & 0 & 0\% & 0 & 0\% \\ -\end{tabular} diff --git a/test/small-goal-files/tables/git/table_main_feature_summary_oracle.tex b/test/small-goal-files/tables/git/table_main_feature_summary_oracle.tex deleted file mode 100644 index da1275d070..0000000000 --- a/test/small-goal-files/tables/git/table_main_feature_summary_oracle.tex +++ /dev/null @@ -1,25 +0,0 @@ -% Do not edit. This file is automatically generated. -\begin{tabular}{c|c c c c|c c c c|c c c c} - Tool & - \multicolumn{4}{c|}{Correct Merges} & - \multicolumn{4}{c|}{Unhandled Merges} & - \multicolumn{4}{c}{Incorrect Merges} \\ - & - \multicolumn{2}{c}{Main Branch} & - \multicolumn{2}{c|}{Other Branches} & - \multicolumn{2}{c}{Main Branch} & - \multicolumn{2}{c|}{Other Branches} & - \multicolumn{2}{c}{Main Branch} & - \multicolumn{2}{c}{Other Branches} \\ - \hline - & \# & \% & \# & \% & \# & \% & \# & \% & \# & \% & \# & \% \\ - Gitmerge-ort & 0 & 0\% & 2 & 50\% & 2 & 100\% & 2 & 50\% & 0 & 0\% & 0 & 0\% \\ - Gitmerge-ort-ignorespace & 0 & 0\% & 2 & 50\% & 2 & 100\% & 2 & 50\% & 0 & 0\% & 0 & 0\% \\ - Gitmerge-recursive-histogram & 0 & 0\% & 2 & 50\% & 2 & 100\% & 2 & 50\% & 0 & 0\% & 0 & 0\% \\ - Gitmerge-recursive-ignorespace & 0 & 0\% & 2 & 50\% & 2 & 100\% & 2 & 50\% & 0 & 0\% & 0 & 0\% \\ - Gitmerge-recursive-minimal & 0 & 0\% & 2 & 50\% & 2 & 100\% & 2 & 50\% & 0 & 0\% & 0 & 0\% \\ - Gitmerge-recursive-myers & 0 & 0\% & 2 & 50\% & 2 & 100\% & 2 & 50\% & 0 & 0\% & 0 & 0\% \\ - Gitmerge-recursive-patience & 0 & 0\% & 2 & 50\% & 2 & 100\% & 2 & 50\% & 0 & 0\% & 0 & 0\% \\ - Gitmerge-resolve & 0 & 0\% & 2 & 50\% & 2 & 100\% & 2 & 50\% & 0 & 0\% & 0 & 0\% \\ - Oracle tool & 1 & 50\% & 4 & 100\% & 1 & 50\% & 0 & 0\% & 0 & 0\% & 0 & 0\% \\ -\end{tabular} diff --git a/test/small-goal-files/tables/git/table_summary.tex b/test/small-goal-files/tables/git/table_summary.tex deleted file mode 100644 index aac91bf9ea..0000000000 --- a/test/small-goal-files/tables/git/table_summary.tex +++ /dev/null @@ -1,17 +0,0 @@ -% Do not edit. This file is automatically generated. -\begin{tabular}{l|c c|c c|c c} - Tool & - \multicolumn{2}{c|}{Correct Merges} & - \multicolumn{2}{c|}{Unhandled Merges} & - \multicolumn{2}{c}{Incorrect Merges} \\ - & \# & \% & \# & \% & \# & \% \\ - \hline -Gitmerge-ort & 2 & 33\% & 4 & 67\% & 0 & 0\% \\ -Gitmerge-ort-ignorespace & 2 & 33\% & 4 & 67\% & 0 & 0\% \\ -Gitmerge-recursive-histogram & 2 & 33\% & 4 & 67\% & 0 & 0\% \\ -Gitmerge-recursive-ignorespace & 2 & 33\% & 4 & 67\% & 0 & 0\% \\ -Gitmerge-recursive-minimal & 2 & 33\% & 4 & 67\% & 0 & 0\% \\ -Gitmerge-recursive-myers & 2 & 33\% & 4 & 67\% & 0 & 0\% \\ -Gitmerge-recursive-patience & 2 & 33\% & 4 & 67\% & 0 & 0\% \\ -Gitmerge-resolve & 2 & 33\% & 4 & 67\% & 0 & 0\% \\ -\end{tabular} diff --git a/test/small-goal-files/tables/git/table_summary_with_oracle.tex b/test/small-goal-files/tables/git/table_summary_with_oracle.tex deleted file mode 100644 index 3bb4489cbf..0000000000 --- a/test/small-goal-files/tables/git/table_summary_with_oracle.tex +++ /dev/null @@ -1,18 +0,0 @@ -% Do not edit. This file is automatically generated. -\begin{tabular}{l|c c|c c|c c} - Tool & - \multicolumn{2}{c|}{Correct Merges} & - \multicolumn{2}{c|}{Unhandled Merges} & - \multicolumn{2}{c}{Incorrect Merges} \\ - & \# & \% & \# & \% & \# & \% \\ - \hline -Gitmerge-ort & 2 & 33\% & 4 & 67\% & 0 & 0\% \\ -Gitmerge-ort-ignorespace & 2 & 33\% & 4 & 67\% & 0 & 0\% \\ -Gitmerge-recursive-histogram & 2 & 33\% & 4 & 67\% & 0 & 0\% \\ -Gitmerge-recursive-ignorespace & 2 & 33\% & 4 & 67\% & 0 & 0\% \\ -Gitmerge-recursive-minimal & 2 & 33\% & 4 & 67\% & 0 & 0\% \\ -Gitmerge-recursive-myers & 2 & 33\% & 4 & 67\% & 0 & 0\% \\ -Gitmerge-recursive-patience & 2 & 33\% & 4 & 67\% & 0 & 0\% \\ -Gitmerge-resolve & 2 & 33\% & 4 & 67\% & 0 & 0\% \\ -Oracle tool & 5 & 83\% & 1 & 17\% & 0 & 0\% \\ -\end{tabular} diff --git a/test/small-goal-files/tables/tools/table_feature_main_summary.tex b/test/small-goal-files/tables/tools/table_feature_main_summary.tex deleted file mode 100644 index 7af1cc05d2..0000000000 --- a/test/small-goal-files/tables/tools/table_feature_main_summary.tex +++ /dev/null @@ -1,24 +0,0 @@ -% Do not edit. This file is automatically generated. -\begin{tabular}{c|c c c c|c c c c|c c c c} - Tool & - \multicolumn{4}{c|}{Correct Merges} & - \multicolumn{4}{c|}{Unhandled Merges} & - \multicolumn{4}{c}{Incorrect Merges} \\ - & - \multicolumn{2}{c}{Main Branch} & - \multicolumn{2}{c|}{Other Branches} & - \multicolumn{2}{c}{Main Branch} & - \multicolumn{2}{c|}{Other Branches} & - \multicolumn{2}{c}{Main Branch} & - \multicolumn{2}{c}{Other Branches} \\ - \hline - & \# & \% & \# & \% & \# & \% & \# & \% & \# & \% & \# & \% \\ - Gitmerge-ort & 2 & 50\% & 0 & 0\% & 2 & 50\% & 2 & 100\% & 0 & 0\% & 0 & 0\% \\ - Gitmerge-ort-ignorespace & 2 & 50\% & 0 & 0\% & 2 & 50\% & 2 & 100\% & 0 & 0\% & 0 & 0\% \\ - Adjacent+ort & 3 & 75\% & 1 & 50\% & 1 & 25\% & 1 & 50\% & 0 & 0\% & 0 & 0\% \\ - Imports+ort & 2 & 50\% & 0 & 0\% & 2 & 50\% & 2 & 100\% & 0 & 0\% & 0 & 0\% \\ - Imports+ort-ignorespace & 2 & 50\% & 0 & 0\% & 2 & 50\% & 2 & 100\% & 0 & 0\% & 0 & 0\% \\ - Hires-Merge & 3 & 75\% & 0 & 0\% & 1 & 25\% & 2 & 100\% & 0 & 0\% & 0 & 0\% \\ - Spork & 4 & 100\% & 1 & 50\% & 0 & 0\% & 1 & 50\% & 0 & 0\% & 0 & 0\% \\ - IntelliMerge & 2 & 50\% & 1 & 50\% & 0 & 0\% & 1 & 50\% & 2 & 50\% & 0 & 0\% \\ -\end{tabular} diff --git a/test/small-goal-files/tables/tools/table_main_feature_summary_oracle.tex b/test/small-goal-files/tables/tools/table_main_feature_summary_oracle.tex deleted file mode 100644 index 90c758c9f7..0000000000 --- a/test/small-goal-files/tables/tools/table_main_feature_summary_oracle.tex +++ /dev/null @@ -1,25 +0,0 @@ -% Do not edit. This file is automatically generated. -\begin{tabular}{c|c c c c|c c c c|c c c c} - Tool & - \multicolumn{4}{c|}{Correct Merges} & - \multicolumn{4}{c|}{Unhandled Merges} & - \multicolumn{4}{c}{Incorrect Merges} \\ - & - \multicolumn{2}{c}{Main Branch} & - \multicolumn{2}{c|}{Other Branches} & - \multicolumn{2}{c}{Main Branch} & - \multicolumn{2}{c|}{Other Branches} & - \multicolumn{2}{c}{Main Branch} & - \multicolumn{2}{c}{Other Branches} \\ - \hline - & \# & \% & \# & \% & \# & \% & \# & \% & \# & \% & \# & \% \\ - Gitmerge-ort & 0 & 0\% & 2 & 50\% & 2 & 100\% & 2 & 50\% & 0 & 0\% & 0 & 0\% \\ - Gitmerge-ort-ignorespace & 0 & 0\% & 2 & 50\% & 2 & 100\% & 2 & 50\% & 0 & 0\% & 0 & 0\% \\ - Adjacent+ort & 1 & 50\% & 3 & 75\% & 1 & 50\% & 1 & 25\% & 0 & 0\% & 0 & 0\% \\ - Imports+ort & 0 & 0\% & 2 & 50\% & 2 & 100\% & 2 & 50\% & 0 & 0\% & 0 & 0\% \\ - Imports+ort-ignorespace & 0 & 0\% & 2 & 50\% & 2 & 100\% & 2 & 50\% & 0 & 0\% & 0 & 0\% \\ - Hires-Merge & 0 & 0\% & 3 & 75\% & 2 & 100\% & 1 & 25\% & 0 & 0\% & 0 & 0\% \\ - Spork & 1 & 50\% & 4 & 100\% & 1 & 50\% & 0 & 0\% & 0 & 0\% & 0 & 0\% \\ - IntelliMerge & 1 & 50\% & 2 & 50\% & 1 & 50\% & 0 & 0\% & 0 & 0\% & 2 & 50\% \\ - Oracle tool & 1 & 50\% & 4 & 100\% & 1 & 50\% & 0 & 0\% & 0 & 0\% & 0 & 0\% \\ -\end{tabular} diff --git a/test/small-goal-files/tables/tools/table_summary.tex b/test/small-goal-files/tables/tools/table_summary.tex deleted file mode 100644 index aab63633b8..0000000000 --- a/test/small-goal-files/tables/tools/table_summary.tex +++ /dev/null @@ -1,17 +0,0 @@ -% Do not edit. This file is automatically generated. -\begin{tabular}{l|c c|c c|c c} - Tool & - \multicolumn{2}{c|}{Correct Merges} & - \multicolumn{2}{c|}{Unhandled Merges} & - \multicolumn{2}{c}{Incorrect Merges} \\ - & \# & \% & \# & \% & \# & \% \\ - \hline -Gitmerge-ort & 2 & 33\% & 4 & 67\% & 0 & 0\% \\ -Gitmerge-ort-ignorespace & 2 & 33\% & 4 & 67\% & 0 & 0\% \\ -Adjacent+ort & 4 & 67\% & 2 & 33\% & 0 & 0\% \\ -Imports+ort & 2 & 33\% & 4 & 67\% & 0 & 0\% \\ -Imports+ort-ignorespace & 2 & 33\% & 4 & 67\% & 0 & 0\% \\ -Hires-Merge & 3 & 50\% & 3 & 50\% & 0 & 0\% \\ -Spork & 5 & 83\% & 1 & 17\% & 0 & 0\% \\ -IntelliMerge & 3 & 50\% & 1 & 17\% & 2 & 33\% \\ -\end{tabular} diff --git a/test/small-goal-files/tables/tools/table_summary_with_oracle.tex b/test/small-goal-files/tables/tools/table_summary_with_oracle.tex deleted file mode 100644 index b9027bf796..0000000000 --- a/test/small-goal-files/tables/tools/table_summary_with_oracle.tex +++ /dev/null @@ -1,18 +0,0 @@ -% Do not edit. This file is automatically generated. -\begin{tabular}{l|c c|c c|c c} - Tool & - \multicolumn{2}{c|}{Correct Merges} & - \multicolumn{2}{c|}{Unhandled Merges} & - \multicolumn{2}{c}{Incorrect Merges} \\ - & \# & \% & \# & \% & \# & \% \\ - \hline -Gitmerge-ort & 2 & 33\% & 4 & 67\% & 0 & 0\% \\ -Gitmerge-ort-ignorespace & 2 & 33\% & 4 & 67\% & 0 & 0\% \\ -Adjacent+ort & 4 & 67\% & 2 & 33\% & 0 & 0\% \\ -Imports+ort & 2 & 33\% & 4 & 67\% & 0 & 0\% \\ -Imports+ort-ignorespace & 2 & 33\% & 4 & 67\% & 0 & 0\% \\ -Hires-Merge & 3 & 50\% & 3 & 50\% & 0 & 0\% \\ -Spork & 5 & 83\% & 1 & 17\% & 0 & 0\% \\ -IntelliMerge & 3 & 50\% & 1 & 17\% & 2 & 33\% \\ -Oracle tool & 5 & 83\% & 1 & 17\% & 0 & 0\% \\ -\end{tabular}