diff --git a/.github/workflows/check-style.yml b/.github/workflows/check-style.yml index 1ba9db4f9e..663b910a11 100644 --- a/.github/workflows/check-style.yml +++ b/.github/workflows/check-style.yml @@ -25,3 +25,5 @@ jobs: run: sudo apt update && sudo apt install shellcheck devscripts - name: Check style run: make check-style + - name: Check script diffs + run: pwd && cd src/scripts/merge_tools && pwd && ls && ./check-implementations.sh diff --git a/Makefile b/Makefile index cecedbd5e5..9de9cbafef 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -all: style gradle-assemble +all: check-style gradle-assemble fix-style: fix-python-style fix-java-style diff --git a/src/python/replay_merge.py b/src/python/replay_merge.py index d7a12b6b96..964dadcba0 100755 --- a/src/python/replay_merge.py +++ b/src/python/replay_merge.py @@ -14,6 +14,7 @@ import argparse import git import os +import os.path import sys import tarfile from pathlib import Path @@ -93,7 +94,22 @@ def merge_replay( plumelib_merging_dir = Path(ast_merging_evaluation_repo.working_tree_dir) / Path( "src/scripts/merge_tools/merging" ) - subprocess.run(["./gradlew", "-q", "shadowJar"], cwd=plumelib_merging_dir) + print(f"About to compile in {plumelib_merging_dir}") + p = subprocess.run( + ["./gradlew", "-q", "shadowJar"], + cwd=plumelib_merging_dir, + capture_output=True, + text=True, + ) + if p.returncode != 0: + print("Failure in: ./gradlew -q shadowJar") + print(p.stdout) + print(p.stderr) + sys.exit(1) + p = subprocess.run( + ["./gradlew", "-q", "nativeCompile"], cwd=plumelib_merging_dir, check=False + ) + print("Finished compiling") result_df = pd.DataFrame() with Progress( @@ -158,6 +174,7 @@ def merge_replay( ["git", "merge-base", merge_data["left"], merge_data["right"]], cwd=repo.local_repo_path, stdout=subprocess.PIPE, + check=True, ) .stdout.decode("utf-8") .strip() diff --git a/src/python/repo.py b/src/python/repo.py index e50b95c422..a514b95d3f 100755 --- a/src/python/repo.py +++ b/src/python/repo.py @@ -109,10 +109,11 @@ def clone_repo(repo_slug: str, repo_dir: Path) -> None: MERGE_TOOL = Enum( "MERGE_TOOL", [ + ## First, the algorithms that the paper evaluates. "gitmerge_ort", "gitmerge_ort_ignorespace", "gitmerge_recursive_histogram", - "gitmerge_recursive_ignorespace", + "gitmerge_recursive_myers_ignorespace", "gitmerge_recursive_minimal", "gitmerge_recursive_myers", "gitmerge_recursive_patience", @@ -123,17 +124,26 @@ def clone_repo(repo_slug: str, repo_dir: Path) -> None: "adjacent", "imports", "version_numbers", - "git_hires_merge_plus", - "intellimerge_plus", + "ivn", + "ivn_ignorespace", + ## Second, the algorithms that we run to correct the classifications of the above algorithms. + ## "_plus" = plus known good = plus default plumelib == + imports + version_numbers + "gitmerge_ort_plus", + "gitmerge_ort_ignorespace_plus", "gitmerge_recursive_histogram_plus", - "gitmerge_recursive_ignorespace_plus", + "gitmerge_recursive_myers_ignorespace_plus", "gitmerge_recursive_minimal_plus", "gitmerge_recursive_myers_plus", "gitmerge_recursive_patience_plus", "gitmerge_resolve_plus", + "git_hires_merge_plus", "spork_plus", - "ivn", - "ivn_ignorespace", + "intellimerge_plus", + "adjacent_plus", + "imports_plus", + "version_numbers_plus", + "ivn_plus", + "ivn_ignorespace_plus", ], ) MERGE_STATE = Enum( diff --git a/src/scripts/merge_tools/adjacent_ignorespace_plus.sh b/src/scripts/merge_tools/adjacent_ignorespace_plus.sh new file mode 100755 index 0000000000..88ef830264 --- /dev/null +++ b/src/scripts/merge_tools/adjacent_ignorespace_plus.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env sh + +# usage: + +MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)" +clone_dir=$1 +branch1=$2 +branch2=$3 +git_strategy="-s ort -Xignore-space-change" +plumelib_strategy="--adjacent" +"$MERGE_SCRIPTS_DIR"/merge_git_then_plumelib.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy" diff --git a/src/scripts/merge_tools/adjacent_plus.sh b/src/scripts/merge_tools/adjacent_plus.sh index f246994a9d..ac056d31ba 100755 --- a/src/scripts/merge_tools/adjacent_plus.sh +++ b/src/scripts/merge_tools/adjacent_plus.sh @@ -7,7 +7,5 @@ clone_dir=$1 branch1=$2 branch2=$3 git_strategy="-s ort" -# Uses both --adjacent and all of plume-lib merging's default behaviors. -# Thus, this implements "adjacent + plume-lib-merging-fixups". plumelib_strategy="--adjacent" "$MERGE_SCRIPTS_DIR"/merge_git_then_plumelib.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy" diff --git a/src/scripts/merge_tools/check-implementations.sh b/src/scripts/merge_tools/check-implementations.sh new file mode 100755 index 0000000000..6266b17e3b --- /dev/null +++ b/src/scripts/merge_tools/check-implementations.sh @@ -0,0 +1,63 @@ +#!/bin/sh + +# This checks that the implementations of various tools are consistent with one another. + +set -e + +# Check for identical content. + +diff -q ivn_plus.sh adjacent_plus.sh > /dev/null 2>&1 && { echo "identical: ivn_plus.sh adjacent_plus.sh"; exit 1; } +diff -q ivn_plus.sh gitmerge_ort_plus.sh +diff -q ivn_plus.sh imports_plus.sh +diff -q ivn_plus.sh version_numbers_plus.sh + +diff -q ivn_ignorespace_plus.sh adjacent_ignorespace_plus.sh > /dev/null 2>&1 && { echo "identical: ivn_ignorespace_plus.sh adjacent_ignorespace_plus.sh"; exit 1; } +diff -q ivn_ignorespace_plus.sh gitmerge_ort_ignorespace_plus.sh +diff -q ivn_ignorespace_plus.sh imports_ignorespace_plus.sh +diff -q ivn_ignorespace_plus.sh version_numbers_ignorespace_plus.sh + +# + + +## These have an ignorespace version + +tmpfile=$(mktemp) +tmpfile2=$(mktemp) + +for base in adjacent imports ivn version_numbers ; do + diff "$base.sh" "${base}_ignorespace.sh" > "$tmpfile" || true + diff -q diff-pl-ignorespace.diff "$tmpfile" || { echo "problem with: diff $base.sh ${base}_ignorespace.sh" ; exit 1; } + diff "${base}_plus.sh" "${base}_ignorespace_plus.sh" > "$tmpfile" || true + diff -q diff-pl-ignorespace.diff "$tmpfile" || { echo "problem with: diff ${base}_plus.sh ${base}_ignorespace_plus.sh" ; exit 1; } + + diff "$base.sh" "${base}_plus.sh" > "$tmpfile" || true + diff "${base}_ignorespace.sh" "${base}_ignorespace_plus.sh" > "$tmpfile2" || true + diff -q "$tmpfile" "$tmpfile2" || { echo "problem with: ( $base.sh ${base}_plus.sh) versus ( ${base}_ignorespace.sh ${base}_ignorespace_plus.sh"; exit 1; } +done + + +for base in gitmerge_ort gitmerge_recursive_myers ; do + diff "$base.sh" "${base}_ignorespace.sh" > "$tmpfile" || true + diff "${base}_plus.sh" "${base}_ignorespace_plus.sh" > "$tmpfile2" || true + diff -q "$tmpfile" "$tmpfile2" || { echo "problem with: ( $base.sh ${base}_ignorespace.sh) versus ( ${base}_plus.sh ${base}_ignorespace_plus.sh"; exit 1; } + + + diff "$base.sh" "${base}_plus.sh" > "$tmpfile" || true + diff "${base}_ignorespace.sh" "${base}_ignorespace_plus.sh" > "$tmpfile2" || true + diff -q "$tmpfile" "$tmpfile2" || { echo "problem with: ( $base.sh ${base}_plus.sh) versus ( ${base}_ignorespace.sh ${base}_ignorespace_plus.sh"; exit 1; } +done + + +## These do not have an ignorespace version + +# "git_hires_merge.sh" has different diffs, so it is not included. +# TODO: Reinstate gitmerge_resolve +for base in gitmerge_recursive_histogram gitmerge_recursive_minimal \ + gitmerge_recursive_patience ; do + + diff "$base.sh" "${base}_plus.sh" > "$tmpfile" || true + diff -q diff-gm-plus.diff "$tmpfile" || { echo "problem with $base.sh ${base}_plus.sh"; exit 1; } + +done + +rm -rf "$tmpfile" diff --git a/src/scripts/merge_tools/diff-gm-ignorespace.diff b/src/scripts/merge_tools/diff-gm-ignorespace.diff new file mode 100644 index 0000000000..ad271b1ce4 --- /dev/null +++ b/src/scripts/merge_tools/diff-gm-ignorespace.diff @@ -0,0 +1,5 @@ +10c10,11 +< "$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" +--- +> plumelib_strategy="" +> "$MERGE_SCRIPTS_DIR"/merge_git_then_plumelib.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy" diff --git a/src/scripts/merge_tools/diff-gm-plus.diff b/src/scripts/merge_tools/diff-gm-plus.diff new file mode 100644 index 0000000000..ad271b1ce4 --- /dev/null +++ b/src/scripts/merge_tools/diff-gm-plus.diff @@ -0,0 +1,5 @@ +10c10,11 +< "$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" +--- +> plumelib_strategy="" +> "$MERGE_SCRIPTS_DIR"/merge_git_then_plumelib.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy" diff --git a/src/scripts/merge_tools/diff-gmpl-ignorespace.diff b/src/scripts/merge_tools/diff-gmpl-ignorespace.diff new file mode 100644 index 0000000000..87a9cfc3ee --- /dev/null +++ b/src/scripts/merge_tools/diff-gmpl-ignorespace.diff @@ -0,0 +1,4 @@ +9c9 +< git_strategy="-s ort" +--- +> git_strategy="-s ort -Xignore-space-change" diff --git a/src/scripts/merge_tools/diff-pl-ignorespace.diff b/src/scripts/merge_tools/diff-pl-ignorespace.diff new file mode 100644 index 0000000000..87a9cfc3ee --- /dev/null +++ b/src/scripts/merge_tools/diff-pl-ignorespace.diff @@ -0,0 +1,4 @@ +9c9 +< git_strategy="-s ort" +--- +> git_strategy="-s ort -Xignore-space-change" diff --git a/src/scripts/merge_tools/gitmerge_recursive_ignorespace_plus.sh b/src/scripts/merge_tools/gitmerge_ort_ignorespace_plus.sh similarity index 85% rename from src/scripts/merge_tools/gitmerge_recursive_ignorespace_plus.sh rename to src/scripts/merge_tools/gitmerge_ort_ignorespace_plus.sh index e9bdd0e77f..af3a3009f4 100755 --- a/src/scripts/merge_tools/gitmerge_recursive_ignorespace_plus.sh +++ b/src/scripts/merge_tools/gitmerge_ort_ignorespace_plus.sh @@ -6,6 +6,6 @@ MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)" clone_dir=$1 branch1=$2 branch2=$3 -git_strategy="-s recursive -Xignore-space-change" +git_strategy="-s ort -Xignore-space-change" plumelib_strategy="" "$MERGE_SCRIPTS_DIR"/merge_git_then_plumelib.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy" diff --git a/src/scripts/merge_tools/gitmerge_ort_plus.sh b/src/scripts/merge_tools/gitmerge_ort_plus.sh new file mode 100755 index 0000000000..15a395c7a0 --- /dev/null +++ b/src/scripts/merge_tools/gitmerge_ort_plus.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env sh + +# usage: + +MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)" +clone_dir=$1 +branch1=$2 +branch2=$3 +git_strategy="-s ort" +plumelib_strategy="" +"$MERGE_SCRIPTS_DIR"/merge_git_then_plumelib.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy" diff --git a/src/scripts/merge_tools/gitmerge_recursive_ignorespace.sh b/src/scripts/merge_tools/gitmerge_recursive_ignorespace.sh deleted file mode 100755 index 1d735e8362..0000000000 --- a/src/scripts/merge_tools/gitmerge_recursive_ignorespace.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env sh - -# usage: - -MERGE_DIR="$(dirname "$0")" -clone_dir=$1 -branch1=$2 -branch2=$3 -git_strategy="-s recursive -Xignore-space-change" -"$MERGE_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" diff --git a/src/scripts/merge_tools/gitmerge_recursive_myers_ignorespace.sh b/src/scripts/merge_tools/gitmerge_recursive_myers_ignorespace.sh new file mode 100755 index 0000000000..13d9b13206 --- /dev/null +++ b/src/scripts/merge_tools/gitmerge_recursive_myers_ignorespace.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env sh + +# usage: + +MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)" +clone_dir=$1 +branch1=$2 +branch2=$3 +git_strategy="-s recursive -Xdiff-algorithm=myers -Xignore-space-change" +"$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" diff --git a/src/scripts/merge_tools/gitmerge_recursive_myers_ignorespace_plus.sh b/src/scripts/merge_tools/gitmerge_recursive_myers_ignorespace_plus.sh new file mode 100755 index 0000000000..9c7bbbe260 --- /dev/null +++ b/src/scripts/merge_tools/gitmerge_recursive_myers_ignorespace_plus.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env sh + +# usage: + +MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)" +clone_dir=$1 +branch1=$2 +branch2=$3 +git_strategy="-s recursive -Xdiff-algorithm=myers -Xignore-space-change" +plumelib_strategy="" +"$MERGE_SCRIPTS_DIR"/merge_git_then_plumelib.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy" diff --git a/src/scripts/merge_tools/imports_ignorespace_plus.sh b/src/scripts/merge_tools/imports_ignorespace_plus.sh new file mode 100755 index 0000000000..af3a3009f4 --- /dev/null +++ b/src/scripts/merge_tools/imports_ignorespace_plus.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env sh + +# usage: + +MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)" +clone_dir=$1 +branch1=$2 +branch2=$3 +git_strategy="-s ort -Xignore-space-change" +plumelib_strategy="" +"$MERGE_SCRIPTS_DIR"/merge_git_then_plumelib.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy" diff --git a/src/scripts/merge_tools/imports_plus.sh b/src/scripts/merge_tools/imports_plus.sh new file mode 100755 index 0000000000..15a395c7a0 --- /dev/null +++ b/src/scripts/merge_tools/imports_plus.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env sh + +# usage: + +MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)" +clone_dir=$1 +branch1=$2 +branch2=$3 +git_strategy="-s ort" +plumelib_strategy="" +"$MERGE_SCRIPTS_DIR"/merge_git_then_plumelib.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy" diff --git a/src/scripts/merge_tools/ivn_ignorespace_plus.sh b/src/scripts/merge_tools/ivn_ignorespace_plus.sh new file mode 100755 index 0000000000..af3a3009f4 --- /dev/null +++ b/src/scripts/merge_tools/ivn_ignorespace_plus.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env sh + +# usage: + +MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)" +clone_dir=$1 +branch1=$2 +branch2=$3 +git_strategy="-s ort -Xignore-space-change" +plumelib_strategy="" +"$MERGE_SCRIPTS_DIR"/merge_git_then_plumelib.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy" diff --git a/src/scripts/merge_tools/ivn_plus.sh b/src/scripts/merge_tools/ivn_plus.sh new file mode 100755 index 0000000000..15a395c7a0 --- /dev/null +++ b/src/scripts/merge_tools/ivn_plus.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env sh + +# usage: + +MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)" +clone_dir=$1 +branch1=$2 +branch2=$3 +git_strategy="-s ort" +plumelib_strategy="" +"$MERGE_SCRIPTS_DIR"/merge_git_then_plumelib.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy" diff --git a/src/scripts/merge_tools/merge_git_then_plumelib.sh b/src/scripts/merge_tools/merge_git_then_plumelib.sh index abe746fc20..97184d65f2 100755 --- a/src/scripts/merge_tools/merge_git_then_plumelib.sh +++ b/src/scripts/merge_tools/merge_git_then_plumelib.sh @@ -57,7 +57,7 @@ fi git config --local merge.tool merge-plumelib # shellcheck disable=SC2016 -git config --local mergetool.merge-plumelib.cmd "$SCRIPTDIR"/'java-merge-tool.sh '"$plumelib_strategy"' ${BASE} ${LOCAL} ${REMOTE} ${MERGED}' +git config --local mergetool.merge-plumelib.cmd "$SCRIPTDIR"/'java-merge-tool.sh '"$plumelib_strategy"' ${LOCAL} ${BASE} ${REMOTE} ${MERGED}' git config --local mergetool.merge-plumelib.trustExitCode true case "$plumelib_strategy" in @@ -73,10 +73,10 @@ esac if [ -n "$VERBOSE" ] ; then echo "$0: about to run: git-mergetool.sh $all_arg --tool=merge-plumelib in $(pwd)" -fi -git-mergetool.sh $all_arg --tool=merge-plumelib -if [ -n "$VERBOSE" ] ; then + git-mergetool.sh --verbose $all_arg --tool=merge-plumelib echo "$0: ran: git-mergetool.sh $all_arg --tool=merge-plumelib in $(pwd)" +else + git-mergetool.sh $all_arg --tool=merge-plumelib fi # Check if there are still conflicts diff --git a/src/scripts/merge_tools/merge_script_then_plumelib.sh b/src/scripts/merge_tools/merge_script_then_plumelib.sh index b63d643fb5..04fc3101db 100755 --- a/src/scripts/merge_tools/merge_script_then_plumelib.sh +++ b/src/scripts/merge_tools/merge_script_then_plumelib.sh @@ -58,7 +58,7 @@ fi git config --local merge.tool merge-plumelib # shellcheck disable=SC2016 -git config --local mergetool.merge-plumelib.cmd "$SCRIPTDIR"/'java-merge-tool.sh '"$plumelib_strategy"' ${BASE} ${LOCAL} ${REMOTE} ${MERGED}' +git config --local mergetool.merge-plumelib.cmd "$SCRIPTDIR"/'java-merge-tool.sh '"$plumelib_strategy"' ${LOCAL} ${BASE} ${REMOTE} ${MERGED}' git config --local mergetool.merge-plumelib.trustExitCode true case "$plumelib_strategy" in diff --git a/src/scripts/merge_tools/merging b/src/scripts/merge_tools/merging index a51fc28111..54b3dccf20 160000 --- a/src/scripts/merge_tools/merging +++ b/src/scripts/merge_tools/merging @@ -1 +1 @@ -Subproject commit a51fc28111b2ec20535722f2c2402402ad21362a +Subproject commit 54b3dccf20f8baba0e63679babb1edf363b24f2d diff --git a/src/scripts/merge_tools/version_numbers_ignorespace_plus.sh b/src/scripts/merge_tools/version_numbers_ignorespace_plus.sh new file mode 100755 index 0000000000..af3a3009f4 --- /dev/null +++ b/src/scripts/merge_tools/version_numbers_ignorespace_plus.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env sh + +# usage: + +MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)" +clone_dir=$1 +branch1=$2 +branch2=$3 +git_strategy="-s ort -Xignore-space-change" +plumelib_strategy="" +"$MERGE_SCRIPTS_DIR"/merge_git_then_plumelib.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy" diff --git a/src/scripts/merge_tools/version_numbers_plus.sh b/src/scripts/merge_tools/version_numbers_plus.sh new file mode 100755 index 0000000000..15a395c7a0 --- /dev/null +++ b/src/scripts/merge_tools/version_numbers_plus.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env sh + +# usage: + +MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)" +clone_dir=$1 +branch1=$2 +branch2=$3 +git_strategy="-s ort" +plumelib_strategy="" +"$MERGE_SCRIPTS_DIR"/merge_git_then_plumelib.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy" 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 f8c138ddc0..243812c956 100644 --- a/test/small-goal-files/merges_tested/benedikt-schesch/git-hires-merge-example.csv +++ b/test/small-goal-files/merges_tested/benedikt-schesch/git-hires-merge-example.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,num_diff_files,union_diff_files,num_intersecting_files,num_diff_lines,num_diff_hunks,imports_involved,non_java_involved,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint -1,refs/heads/main,4ae40d33c3b959e3a15e458eb9b0676251e36a41,48199306f02a82abdeff0c01fab1ce112126d727,488122ce6c91e157d1f49b88b79feaa083fdee5b,,2,2,2,4,1,False,True,True,2252a9465319d00b974abd931cc98e1f435b4fe232b4dd61a828ad40139ec20c,Tests_passed,3782e47be673266f23cba016dc13973231429bb34e4c08a314c5b2f6c37d238f,Tests_passed,True,True,True,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,54749277742f9010b6666756eb77020e2b251b0c575b9ed96020fe650e660c3b,Tests_passed,1cebc99cd5f8a1b210b66b6985f8aa5c38c4af194a32ad23dc3c6261f43d2968,Tests_passed,d04c699fb9748d42ffbbd2a94ae59e522247862c60f3dc29d7c3ed974fc47cb8,Tests_passed,37fdd5a8db81b80bee8cc5b121b9b2f70019498749193c47168e6aa4b86a02e9,Tests_passed,1cebc99cd5f8a1b210b66b6985f8aa5c38c4af194a32ad23dc3c6261f43d2968,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,4abab825dba02ae94f7cc664a590c7c4a57687e2b79fb78d2b92a5d190661e0f,Tests_passed,d04c699fb9748d42ffbbd2a94ae59e522247862c60f3dc29d7c3ed974fc47cb8,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19 -2,refs/remotes/origin/import_1,0209c47c118fcaf978f6ebc5bad8a334b541de0b,b4331092d8c5d1b03e6a9807ab135ed263b52663,8204af9984280ccc7f7793f903fc0807b626bf9c,,2,2,2,5,2,True,True,True,f48eaaf883e49f3e3a1f3e1ddff64beb42c9d9bacec7d273f748baa63093bd9b,Tests_passed,052542ef8f16db238683e23556af730ee0d7c65c3ac0554d01e7ee800ca9b7c6,Tests_passed,True,True,True,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,4c1e23118bc3dc9db98dd8a5d322792c1987f738893ce43bf3032e71d37615a4,Merge_failed,4e0fa6edde284105a006148092586bd2bbce067c56588f4e5c02783786563c3f,Tests_passed,371b1c88034153afe8c3292ba4698b8bea2aa4aea4495b090a68f8f0555290d5,Tests_passed,6f65953e612e19453986bb2b697a79cbab808d3dc01cd3014db987083989a175,Merge_failed,4e0fa6edde284105a006148092586bd2bbce067c56588f4e5c02783786563c3f,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,d5f2cdfd3ff568d6b5f1200f5176590d41ab3ad38f72f5e4f630e3aeb8dc83dd,Tests_passed,371b1c88034153afe8c3292ba4698b8bea2aa4aea4495b090a68f8f0555290d5,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d +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,45a91fab7d2afc015d376427ae26281cddc3d0385c2924d743c7d6adb5f0fdb8,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,26ba12875e757f3089d4082d64f29bcb171b3bc2c97ff385d001f4406fdb2d33,Merge_failed,4e0fa6edde284105a006148092586bd2bbce067c56588f4e5c02783786563c3f,Tests_passed,371b1c88034153afe8c3292ba4698b8bea2aa4aea4495b090a68f8f0555290d5,Tests_passed,6f65953e612e19453986bb2b697a79cbab808d3dc01cd3014db987083989a175,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d diff --git a/test/small-goal-files/merges_tested/mangstadt/ez-vcard.csv b/test/small-goal-files/merges_tested/mangstadt/ez-vcard.csv index 27b4e427a9..913843fe23 100644 --- a/test/small-goal-files/merges_tested/mangstadt/ez-vcard.csv +++ b/test/small-goal-files/merges_tested/mangstadt/ez-vcard.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,num_diff_files,union_diff_files,num_intersecting_files,num_diff_lines,num_diff_hunks,imports_involved,non_java_involved,diff contains java file,test merge,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint -7,refs/heads/master,63ab6b841a7aa31372315a902b98fc5b2cc3b661,ea6026ee62cc184db68d841d50d58474fcdf4862,ab2032ca9769d452d4906f51cf56ca7d983a27c4,,342,342,10,16131,2526,True,True,True,True,aa82b49dd87edb07fbe37b7c2d6801fce8db7c437d1afe8a7b2723c81806286e,Tests_passed,66055b6c4498a64239ae0e49781e086ed06ec3e58be7d9651c23c53f8c6bab6a,Tests_passed,True,True,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,2eb4722f282ab563c519ff9eaa07c7fe5bb4d008eaef5edb034f712791619ed7,Tests_failed,d46e1be02785c17b203d59e5826734071ddc054a6e47461239bbc565807667e6,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,2eb4722f282ab563c519ff9eaa07c7fe5bb4d008eaef5edb034f712791619ed7,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0 +idx,branch_name,merge,left,right,notes,num_diff_files,union_diff_files,num_intersecting_files,num_diff_lines,num_diff_hunks,imports_involved,non_java_involved,diff contains java file,test merge,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_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 +7,refs/heads/master,63ab6b841a7aa31372315a902b98fc5b2cc3b661,ea6026ee62cc184db68d841d50d58474fcdf4862,ab2032ca9769d452d4906f51cf56ca7d983a27c4,,342,342,10,16131,2526,True,True,True,True,aa82b49dd87edb07fbe37b7c2d6801fce8db7c437d1afe8a7b2723c81806286e,Tests_passed,66055b6c4498a64239ae0e49781e086ed06ec3e58be7d9651c23c53f8c6bab6a,Tests_passed,True,True,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,2eb4722f282ab563c519ff9eaa07c7fe5bb4d008eaef5edb034f712791619ed7,Tests_failed,fca4fc91dfb0b83a17860b361b5e5676bda5097a8d17c5c835e7f3709aa0dc20,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,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,63bdf383174120f3d6dbbd362b0f2336cd794b8e557d670c91ecff2cb168b0d9,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,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 5bc8496f0f..518bc36575 100644 --- a/test/small-goal-files/merges_tested/pedrovgs/algorithms.csv +++ b/test/small-goal-files/merges_tested/pedrovgs/algorithms.csv @@ -1,3 +1,3 @@ -idx,branch_name,merge,left,right,notes,num_diff_files,union_diff_files,num_intersecting_files,num_diff_lines,num_diff_hunks,imports_involved,non_java_involved,diff contains java file,test merge,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint -5,refs/heads/master,d7e0b1c03fa7cacf40b32dcfde30871e8947445a,2c4e69eb243a81ba05d24456b3cad7e8a696f630,8a1a1a7fb53732edaf17ef9876545c4bca568e05,,2,3,3,219,20,False,True,True,True,718024edbe6334028acc916e40446b4ae7cb30be97792ae8e2253bdc1112c5a4,Tests_passed,199e1e65500c8ab0fd66d837663440faf9f32711932bdf2136778923a7b0d4d3,Tests_passed,True,True,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,14192423a42830e340baa41e9e304c9887717c60c76647d67d2b75beca45e4cc,Merge_failed,80dadbca965612865a128b71a58d18704846a5cbd3cb50e93cca090233120ace,Tests_passed,e46044bafa010841cebb82e2b54234877bd9295e7f720fcdd79e2ff137cdb433,Tests_passed,06100d09fa236db95f80cbeba2d28cbc6086692d6d75031406b40d855fedac5e,Merge_failed,80dadbca965612865a128b71a58d18704846a5cbd3cb50e93cca090233120ace,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,d37c85012f27488ffb534f12b1e16e058689729b24f8193d14fddf6b3b41b31c,Tests_passed,e46044bafa010841cebb82e2b54234877bd9295e7f720fcdd79e2ff137cdb433,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7 -19,refs/remotes/origin/pull/37,104eb9ed88cde145576ea1df50460915af488e74,6baa2ed219e18f9763bb2f2de74c5fb800d15899,99a155f67dfe68de440feb560a7e4c4ee5ae355c,,3,4,4,78,10,True,True,True,True,216098fad46bb19977b73bb3104f281c803911449ff6eb9c13d600efb375ae84,Tests_passed,d80bbdd6216a68130e2bbf0e70dde5edb5e9e02e397fe38c702bc69e74fddebf,Tests_passed,True,True,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,3b2f4fea6d25d8648458233fc847f7023ec6bc08720601ad7ae1efeceb450071,Merge_failed,8a8768d8ce56caeb4b3ad8a4e5e8f7e6afcb91934bab5282ce5a1f7daef76c65,Merge_failed,f49462ec3092b24bc747241df2e554408663f570124685b61327e57ea61ceb60,Merge_failed,4db8343a17eae46da41b4530d1fa29a84fd0dad4bc9dc55e30d59c9e0ed076e4,Merge_failed,8a8768d8ce56caeb4b3ad8a4e5e8f7e6afcb91934bab5282ce5a1f7daef76c65,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,ea1afbafefd4d14186ae487d1d6e67184e2a2c79c74607cbd873dca0bb157c39,Merge_failed,f49462ec3092b24bc747241df2e554408663f570124685b61327e57ea61ceb60,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4 +idx,branch_name,merge,left,right,notes,num_diff_files,union_diff_files,num_intersecting_files,num_diff_lines,num_diff_hunks,imports_involved,non_java_involved,diff contains java file,test merge,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_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 +5,refs/heads/master,d7e0b1c03fa7cacf40b32dcfde30871e8947445a,2c4e69eb243a81ba05d24456b3cad7e8a696f630,8a1a1a7fb53732edaf17ef9876545c4bca568e05,,2,3,3,219,20,False,True,True,True,718024edbe6334028acc916e40446b4ae7cb30be97792ae8e2253bdc1112c5a4,Tests_passed,199e1e65500c8ab0fd66d837663440faf9f32711932bdf2136778923a7b0d4d3,Tests_passed,True,True,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,14192423a42830e340baa41e9e304c9887717c60c76647d67d2b75beca45e4cc,Merge_failed,80dadbca965612865a128b71a58d18704846a5cbd3cb50e93cca090233120ace,Tests_passed,e46044bafa010841cebb82e2b54234877bd9295e7f720fcdd79e2ff137cdb433,Tests_passed,06100d09fa236db95f80cbeba2d28cbc6086692d6d75031406b40d855fedac5e,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,97f067f54290f4a645cccaaa35e4352309321a2bdbdf2372e27cdbcc5d8ed4eb,Merge_failed,80dadbca965612865a128b71a58d18704846a5cbd3cb50e93cca090233120ace,Tests_passed,e46044bafa010841cebb82e2b54234877bd9295e7f720fcdd79e2ff137cdb433,Tests_passed,06100d09fa236db95f80cbeba2d28cbc6086692d6d75031406b40d855fedac5e,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c +19,refs/remotes/origin/pull/37,104eb9ed88cde145576ea1df50460915af488e74,6baa2ed219e18f9763bb2f2de74c5fb800d15899,99a155f67dfe68de440feb560a7e4c4ee5ae355c,,3,4,4,78,10,True,True,True,True,216098fad46bb19977b73bb3104f281c803911449ff6eb9c13d600efb375ae84,Tests_passed,d80bbdd6216a68130e2bbf0e70dde5edb5e9e02e397fe38c702bc69e74fddebf,Tests_passed,True,True,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,3b2f4fea6d25d8648458233fc847f7023ec6bc08720601ad7ae1efeceb450071,Merge_failed,8a8768d8ce56caeb4b3ad8a4e5e8f7e6afcb91934bab5282ce5a1f7daef76c65,Merge_failed,f49462ec3092b24bc747241df2e554408663f570124685b61327e57ea61ceb60,Merge_failed,4db8343a17eae46da41b4530d1fa29a84fd0dad4bc9dc55e30d59c9e0ed076e4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,90ff1712eeff37b2e98357a403b23179f0cb92f6db50277264056d136217f23b,Merge_failed,8a8768d8ce56caeb4b3ad8a4e5e8f7e6afcb91934bab5282ce5a1f7daef76c65,Merge_failed,f49462ec3092b24bc747241df2e554408663f570124685b61327e57ea61ceb60,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 ad2f12ff91..c53be482e4 100644 --- a/test/small-goal-files/merges_tested/tntim96/jscover.csv +++ b/test/small-goal-files/merges_tested/tntim96/jscover.csv @@ -1,2 +1,2 @@ -idx,branch_name,merge,left,right,notes,num_diff_files,union_diff_files,num_intersecting_files,num_diff_lines,num_diff_hunks,imports_involved,non_java_involved,diff contains java file,test merge,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint -20,refs/heads/master,75e03285fddc0e2510c4f20c56ac607702fc3c9a,56dc97e7850da6b5a904b57c5e288cbb89fde81d,46b585e31b43ec0d1740395b38d15fd4e4f8c60f,,15,15,2,1706,45,True,True,True,True,8cd2e5da1cc38b2042f77063db20b9c9c480d6ae2da25000586ac2cc74ed5e9e,Tests_passed,0655271b4f7b84183e4c0bf0105dc677f68858e9b294c4cdf28d57f34108ee66,Tests_passed,True,True,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,0597b17fac27dd5503cf96febe102dfb3cf4eebd385ae84b6f1de0384a499827,Tests_failed,6895042df88cd69df58dd42da6e4f02e9e18474c89317141fa3519a06a1dd7f3,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,0597b17fac27dd5503cf96febe102dfb3cf4eebd385ae84b6f1de0384a499827,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042 +idx,branch_name,merge,left,right,notes,num_diff_files,union_diff_files,num_intersecting_files,num_diff_lines,num_diff_hunks,imports_involved,non_java_involved,diff contains java file,test merge,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_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 +20,refs/heads/master,75e03285fddc0e2510c4f20c56ac607702fc3c9a,56dc97e7850da6b5a904b57c5e288cbb89fde81d,46b585e31b43ec0d1740395b38d15fd4e4f8c60f,,15,15,2,1706,45,True,True,True,True,8cd2e5da1cc38b2042f77063db20b9c9c480d6ae2da25000586ac2cc74ed5e9e,Tests_passed,0655271b4f7b84183e4c0bf0105dc677f68858e9b294c4cdf28d57f34108ee66,Tests_passed,True,True,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,0597b17fac27dd5503cf96febe102dfb3cf4eebd385ae84b6f1de0384a499827,Tests_failed,6895042df88cd69df58dd42da6e4f02e9e18474c89317141fa3519a06a1dd7f3,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,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 diff --git a/test/small-goal-files/result.csv b/test/small-goal-files/result.csv index cf2b59d8fb..57a99b9ef6 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,num_diff_files,union_diff_files,num_intersecting_files,num_diff_lines,num_diff_hunks,imports_involved,non_java_involved,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_ignorespace_plus,gitmerge_recursive_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,repository -0-1,0,1,refs/heads/main,4ae40d33c3b959e3a15e458eb9b0676251e36a41,48199306f02a82abdeff0c01fab1ce112126d727,488122ce6c91e157d1f49b88b79feaa083fdee5b,,2,2,2,4,1,False,True,True,2252a9465319d00b974abd931cc98e1f435b4fe232b4dd61a828ad40139ec20c,Tests_passed,3782e47be673266f23cba016dc13973231429bb34e4c08a314c5b2f6c37d238f,Tests_passed,True,True,True,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,54749277742f9010b6666756eb77020e2b251b0c575b9ed96020fe650e660c3b,Tests_passed,1cebc99cd5f8a1b210b66b6985f8aa5c38c4af194a32ad23dc3c6261f43d2968,Tests_passed,d04c699fb9748d42ffbbd2a94ae59e522247862c60f3dc29d7c3ed974fc47cb8,Tests_passed,37fdd5a8db81b80bee8cc5b121b9b2f70019498749193c47168e6aa4b86a02e9,Tests_passed,1cebc99cd5f8a1b210b66b6985f8aa5c38c4af194a32ad23dc3c6261f43d2968,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,4abab825dba02ae94f7cc664a590c7c4a57687e2b79fb78d2b92a5d190661e0f,Tests_passed,d04c699fb9748d42ffbbd2a94ae59e522247862c60f3dc29d7c3ed974fc47cb8,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,benedikt-schesch/git-hires-merge-example -0-2,0,2,refs/remotes/origin/import_1,0209c47c118fcaf978f6ebc5bad8a334b541de0b,b4331092d8c5d1b03e6a9807ab135ed263b52663,8204af9984280ccc7f7793f903fc0807b626bf9c,,2,2,2,5,2,True,True,True,f48eaaf883e49f3e3a1f3e1ddff64beb42c9d9bacec7d273f748baa63093bd9b,Tests_passed,052542ef8f16db238683e23556af730ee0d7c65c3ac0554d01e7ee800ca9b7c6,Tests_passed,True,True,True,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,4c1e23118bc3dc9db98dd8a5d322792c1987f738893ce43bf3032e71d37615a4,Merge_failed,4e0fa6edde284105a006148092586bd2bbce067c56588f4e5c02783786563c3f,Tests_passed,371b1c88034153afe8c3292ba4698b8bea2aa4aea4495b090a68f8f0555290d5,Tests_passed,6f65953e612e19453986bb2b697a79cbab808d3dc01cd3014db987083989a175,Merge_failed,4e0fa6edde284105a006148092586bd2bbce067c56588f4e5c02783786563c3f,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,d5f2cdfd3ff568d6b5f1200f5176590d41ab3ad38f72f5e4f630e3aeb8dc83dd,Tests_passed,371b1c88034153afe8c3292ba4698b8bea2aa4aea4495b090a68f8f0555290d5,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,benedikt-schesch/git-hires-merge-example -1-7,1,7,refs/heads/master,63ab6b841a7aa31372315a902b98fc5b2cc3b661,ea6026ee62cc184db68d841d50d58474fcdf4862,ab2032ca9769d452d4906f51cf56ca7d983a27c4,,342,342,10,16131,2526,True,True,True,aa82b49dd87edb07fbe37b7c2d6801fce8db7c437d1afe8a7b2723c81806286e,Tests_passed,66055b6c4498a64239ae0e49781e086ed06ec3e58be7d9651c23c53f8c6bab6a,Tests_passed,True,True,True,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,2eb4722f282ab563c519ff9eaa07c7fe5bb4d008eaef5edb034f712791619ed7,Tests_failed,d46e1be02785c17b203d59e5826734071ddc054a6e47461239bbc565807667e6,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,2eb4722f282ab563c519ff9eaa07c7fe5bb4d008eaef5edb034f712791619ed7,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,mangstadt/ez-vcard -2-5,2,5,refs/heads/master,d7e0b1c03fa7cacf40b32dcfde30871e8947445a,2c4e69eb243a81ba05d24456b3cad7e8a696f630,8a1a1a7fb53732edaf17ef9876545c4bca568e05,,2,3,3,219,20,False,True,True,718024edbe6334028acc916e40446b4ae7cb30be97792ae8e2253bdc1112c5a4,Tests_passed,199e1e65500c8ab0fd66d837663440faf9f32711932bdf2136778923a7b0d4d3,Tests_passed,True,True,True,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,14192423a42830e340baa41e9e304c9887717c60c76647d67d2b75beca45e4cc,Merge_failed,80dadbca965612865a128b71a58d18704846a5cbd3cb50e93cca090233120ace,Tests_passed,e46044bafa010841cebb82e2b54234877bd9295e7f720fcdd79e2ff137cdb433,Tests_passed,06100d09fa236db95f80cbeba2d28cbc6086692d6d75031406b40d855fedac5e,Merge_failed,80dadbca965612865a128b71a58d18704846a5cbd3cb50e93cca090233120ace,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,d37c85012f27488ffb534f12b1e16e058689729b24f8193d14fddf6b3b41b31c,Tests_passed,e46044bafa010841cebb82e2b54234877bd9295e7f720fcdd79e2ff137cdb433,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,pedrovgs/algorithms -2-19,2,19,refs/remotes/origin/pull/37,104eb9ed88cde145576ea1df50460915af488e74,6baa2ed219e18f9763bb2f2de74c5fb800d15899,99a155f67dfe68de440feb560a7e4c4ee5ae355c,,3,4,4,78,10,True,True,True,216098fad46bb19977b73bb3104f281c803911449ff6eb9c13d600efb375ae84,Tests_passed,d80bbdd6216a68130e2bbf0e70dde5edb5e9e02e397fe38c702bc69e74fddebf,Tests_passed,True,True,True,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,3b2f4fea6d25d8648458233fc847f7023ec6bc08720601ad7ae1efeceb450071,Merge_failed,8a8768d8ce56caeb4b3ad8a4e5e8f7e6afcb91934bab5282ce5a1f7daef76c65,Merge_failed,f49462ec3092b24bc747241df2e554408663f570124685b61327e57ea61ceb60,Merge_failed,4db8343a17eae46da41b4530d1fa29a84fd0dad4bc9dc55e30d59c9e0ed076e4,Merge_failed,8a8768d8ce56caeb4b3ad8a4e5e8f7e6afcb91934bab5282ce5a1f7daef76c65,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,ea1afbafefd4d14186ae487d1d6e67184e2a2c79c74607cbd873dca0bb157c39,Merge_failed,f49462ec3092b24bc747241df2e554408663f570124685b61327e57ea61ceb60,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,pedrovgs/algorithms -4-20,4,20,refs/heads/master,75e03285fddc0e2510c4f20c56ac607702fc3c9a,56dc97e7850da6b5a904b57c5e288cbb89fde81d,46b585e31b43ec0d1740395b38d15fd4e4f8c60f,,15,15,2,1706,45,True,True,True,8cd2e5da1cc38b2042f77063db20b9c9c480d6ae2da25000586ac2cc74ed5e9e,Tests_passed,0655271b4f7b84183e4c0bf0105dc677f68858e9b294c4cdf28d57f34108ee66,Tests_passed,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,Tests_passed,0597b17fac27dd5503cf96febe102dfb3cf4eebd385ae84b6f1de0384a499827,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,Tests_passed,f622ae60c2d097abcb9634b9cd53b174201cfc6c5bd4a8f1ebdfb2abb54f5042,tntim96/jscover +idx,repo-idx,merge-idx,branch_name,merge,left,right,notes,num_diff_files,union_diff_files,num_intersecting_files,num_diff_lines,num_diff_hunks,imports_involved,non_java_involved,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_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,repository +0-1,0,1,refs/heads/main,4ae40d33c3b959e3a15e458eb9b0676251e36a41,48199306f02a82abdeff0c01fab1ce112126d727,488122ce6c91e157d1f49b88b79feaa083fdee5b,,2,2,2,4,1,False,True,True,2252a9465319d00b974abd931cc98e1f435b4fe232b4dd61a828ad40139ec20c,Tests_passed,3782e47be673266f23cba016dc13973231429bb34e4c08a314c5b2f6c37d238f,Tests_passed,True,True,True,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,54749277742f9010b6666756eb77020e2b251b0c575b9ed96020fe650e660c3b,Tests_passed,1cebc99cd5f8a1b210b66b6985f8aa5c38c4af194a32ad23dc3c6261f43d2968,Tests_passed,d04c699fb9748d42ffbbd2a94ae59e522247862c60f3dc29d7c3ed974fc47cb8,Tests_passed,37fdd5a8db81b80bee8cc5b121b9b2f70019498749193c47168e6aa4b86a02e9,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,45a91fab7d2afc015d376427ae26281cddc3d0385c2924d743c7d6adb5f0fdb8,Tests_passed,1cebc99cd5f8a1b210b66b6985f8aa5c38c4af194a32ad23dc3c6261f43d2968,Tests_passed,d04c699fb9748d42ffbbd2a94ae59e522247862c60f3dc29d7c3ed974fc47cb8,Tests_passed,37fdd5a8db81b80bee8cc5b121b9b2f70019498749193c47168e6aa4b86a02e9,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,benedikt-schesch/git-hires-merge-example +0-2,0,2,refs/remotes/origin/import_1,0209c47c118fcaf978f6ebc5bad8a334b541de0b,b4331092d8c5d1b03e6a9807ab135ed263b52663,8204af9984280ccc7f7793f903fc0807b626bf9c,,2,2,2,5,2,True,True,True,f48eaaf883e49f3e3a1f3e1ddff64beb42c9d9bacec7d273f748baa63093bd9b,Tests_passed,052542ef8f16db238683e23556af730ee0d7c65c3ac0554d01e7ee800ca9b7c6,Tests_passed,True,True,True,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,4c1e23118bc3dc9db98dd8a5d322792c1987f738893ce43bf3032e71d37615a4,Merge_failed,4e0fa6edde284105a006148092586bd2bbce067c56588f4e5c02783786563c3f,Tests_passed,371b1c88034153afe8c3292ba4698b8bea2aa4aea4495b090a68f8f0555290d5,Tests_passed,6f65953e612e19453986bb2b697a79cbab808d3dc01cd3014db987083989a175,Merge_failed,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,26ba12875e757f3089d4082d64f29bcb171b3bc2c97ff385d001f4406fdb2d33,Merge_failed,4e0fa6edde284105a006148092586bd2bbce067c56588f4e5c02783786563c3f,Tests_passed,371b1c88034153afe8c3292ba4698b8bea2aa4aea4495b090a68f8f0555290d5,Tests_passed,6f65953e612e19453986bb2b697a79cbab808d3dc01cd3014db987083989a175,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,benedikt-schesch/git-hires-merge-example +1-7,1,7,refs/heads/master,63ab6b841a7aa31372315a902b98fc5b2cc3b661,ea6026ee62cc184db68d841d50d58474fcdf4862,ab2032ca9769d452d4906f51cf56ca7d983a27c4,,342,342,10,16131,2526,True,True,True,aa82b49dd87edb07fbe37b7c2d6801fce8db7c437d1afe8a7b2723c81806286e,Tests_passed,66055b6c4498a64239ae0e49781e086ed06ec3e58be7d9651c23c53f8c6bab6a,Tests_passed,True,True,True,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,2eb4722f282ab563c519ff9eaa07c7fe5bb4d008eaef5edb034f712791619ed7,Tests_failed,fca4fc91dfb0b83a17860b361b5e5676bda5097a8d17c5c835e7f3709aa0dc20,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,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,63bdf383174120f3d6dbbd362b0f2336cd794b8e557d670c91ecff2cb168b0d9,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,mangstadt/ez-vcard +2-5,2,5,refs/heads/master,d7e0b1c03fa7cacf40b32dcfde30871e8947445a,2c4e69eb243a81ba05d24456b3cad7e8a696f630,8a1a1a7fb53732edaf17ef9876545c4bca568e05,,2,3,3,219,20,False,True,True,718024edbe6334028acc916e40446b4ae7cb30be97792ae8e2253bdc1112c5a4,Tests_passed,199e1e65500c8ab0fd66d837663440faf9f32711932bdf2136778923a7b0d4d3,Tests_passed,True,True,True,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,14192423a42830e340baa41e9e304c9887717c60c76647d67d2b75beca45e4cc,Merge_failed,80dadbca965612865a128b71a58d18704846a5cbd3cb50e93cca090233120ace,Tests_passed,e46044bafa010841cebb82e2b54234877bd9295e7f720fcdd79e2ff137cdb433,Tests_passed,06100d09fa236db95f80cbeba2d28cbc6086692d6d75031406b40d855fedac5e,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,97f067f54290f4a645cccaaa35e4352309321a2bdbdf2372e27cdbcc5d8ed4eb,Merge_failed,80dadbca965612865a128b71a58d18704846a5cbd3cb50e93cca090233120ace,Tests_passed,e46044bafa010841cebb82e2b54234877bd9295e7f720fcdd79e2ff137cdb433,Tests_passed,06100d09fa236db95f80cbeba2d28cbc6086692d6d75031406b40d855fedac5e,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,fcc27e623c9a8fad3a559f0bde747bb46e497e828f1bed0b1302a5820d68e54c,pedrovgs/algorithms +2-19,2,19,refs/remotes/origin/pull/37,104eb9ed88cde145576ea1df50460915af488e74,6baa2ed219e18f9763bb2f2de74c5fb800d15899,99a155f67dfe68de440feb560a7e4c4ee5ae355c,,3,4,4,78,10,True,True,True,216098fad46bb19977b73bb3104f281c803911449ff6eb9c13d600efb375ae84,Tests_passed,d80bbdd6216a68130e2bbf0e70dde5edb5e9e02e397fe38c702bc69e74fddebf,Tests_passed,True,True,True,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,3b2f4fea6d25d8648458233fc847f7023ec6bc08720601ad7ae1efeceb450071,Merge_failed,8a8768d8ce56caeb4b3ad8a4e5e8f7e6afcb91934bab5282ce5a1f7daef76c65,Merge_failed,f49462ec3092b24bc747241df2e554408663f570124685b61327e57ea61ceb60,Merge_failed,4db8343a17eae46da41b4530d1fa29a84fd0dad4bc9dc55e30d59c9e0ed076e4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,90ff1712eeff37b2e98357a403b23179f0cb92f6db50277264056d136217f23b,Merge_failed,8a8768d8ce56caeb4b3ad8a4e5e8f7e6afcb91934bab5282ce5a1f7daef76c65,Merge_failed,f49462ec3092b24bc747241df2e554408663f570124685b61327e57ea61ceb60,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,Merge_failed,42521d9a18f2cf0c69d4ab28dfc46419286fc6b547ece0a4f12739e68b9a46c4,pedrovgs/algorithms +4-20,4,20,refs/heads/master,75e03285fddc0e2510c4f20c56ac607702fc3c9a,56dc97e7850da6b5a904b57c5e288cbb89fde81d,46b585e31b43ec0d1740395b38d15fd4e4f8c60f,,15,15,2,1706,45,True,True,True,8cd2e5da1cc38b2042f77063db20b9c9c480d6ae2da25000586ac2cc74ed5e9e,Tests_passed,0655271b4f7b84183e4c0bf0105dc677f68858e9b294c4cdf28d57f34108ee66,Tests_passed,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,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,tntim96/jscover