Added test files

Makefile

@@ -53,12 +53,22 @@ compress-cache:
 	if [ -f cache.tar ]; then rm -f cache.tar; fi
 	tar --exclude="lock" -czf cache.tar cache
 
+compress-small-cache:
+	if [ ! -d cache-small ]; then echo "cache-small does not exist"; exit 1; fi
+	if [ -f cache-small.tar ]; then rm -f cache-small.tar; fi
+	tar --exclude="lock" -czf cache-small.tar cache-small
+
 # Decompresses the cache.
 decompress-cache:
 	if [ ! -f cache.tar ]; then echo "cache.tar does not exist"; exit 1; fi
 	if [ -d cache ]; then echo "cache already exists"; exit 1; fi
 	tar -xzf cache.tar
 
+decompress-small-cache:
+	if [ ! -f cache-small.tar ]; then echo "cache-small.tar does not exist"; exit 1; fi
+	if [ -d cache-small ]; then echo "cache-small already exists"; exit 1; fi
+	tar -xzf cache-small.tar
+
 # Copy tables and plots to the paper.
 copy-paper:
 	rm -rf ../AST-Merging-Evaluation-Paper/results
@@ -74,6 +84,7 @@ update-cache-results:
 small-test:
 	${MAKE} clean-test-cache clean
 	./run_small.sh --include_trivial_merges --no_timing
+	${MAKE} compress-small-cache
 	${MAKE} small-test-diff
 	rm -rf results/small
 	./run_small.sh --include_trivial_merges --no_timing

environment.yml

@@ -4,7 +4,6 @@ channels:
 dependencies:
   - bzip2
   - ca-certificates
-  - ld_impl_linux-64
   - libffi
   - libuuid
   - lxml

src/main/java/astmergeevaluation/FindMergeCommits.java

@@ -152,7 +152,7 @@ public static void main(String[] args) throws IOException, GitAPIException {
     } else {
       System.err.println(
           "FindMergeCommits: "
-              + "need ~/.gitHubPersonalAccessToken file or GITHUB_TOKEN environment variable.");
+              + "need .github-personal-access-token file or GITHUB_TOKEN environment variable.");
       System.exit(3);
       throw new Error("unreachable"); // needed due to javac definite assignment check
     }

src/python/merge_analyzer.py

@@ -130,7 +130,12 @@ def diff_merge_analyzer(
         base_left_files = get_diff_files(
             repo, base_sha, left_sha, Path(cache_data["diff_logs"]["base_left"])
         )
-    except RuntimeError:
+    except RuntimeError as e:
+        logger.error(
+            "merge_analyzer: Error while computing diff "
+            + f"for {repo_slug} {left_sha} {right_sha}: {e}"
+        )
+        cache_data["explanation"] = str(e)
         set_in_cache(cache_key, cache_data, repo_slug, diff_cache_dir)
         return cache_data
 

src/python/merges_sampler.py

@@ -26,6 +26,7 @@
     TimeRemainingColumn,
     TextColumn,
 )
+from loguru import logger
 
 if __name__ == "__main__":
     parser = argparse.ArgumentParser()
@@ -41,6 +42,7 @@
     Path(args.output_dir).mkdir(parents=True, exist_ok=True)
     missing_merges_repos = 0
     total_valid_repos = 0
+    logger.info("merges_sampler: Start sampling merges...")
     with Progress(
         SpinnerColumn(),
         TextColumn("[progress.description]{task.description}"),
@@ -52,6 +54,7 @@
         for _, repository_data in repos.iterrows():
             progress.update(task, advance=1)
             repo_slug = repository_data["repository"]
+            logger.info(f"Processing {repo_slug}")
             merge_list_file = Path(os.path.join(args.merges_path, repo_slug + ".csv"))
             output_file = Path(os.path.join(args.output_dir, repo_slug + ".csv"))
             if not merge_list_file.exists():
@@ -83,6 +86,7 @@
             sample = merges.sample(frac=1.0, random_state=42)
             sample = sample[:n_merges]
             sample.sort_index(inplace=True)
+            logger.info(f"Sampled {n_merges} merges from {repo_slug} in {output_file}")
             sample.to_csv(output_file)
 
     print(

src/python/replay_merge.py

@@ -83,12 +83,6 @@ def merge_replay(
                 timeout=TIMEOUT_TESTING_MERGE,
                 use_cache=False,
             )
-            if merge_data[f"{merge_tool.name}_merge_fingerprint"] != merge_fingerprint:
-                raise Exception(
-                    f"fingerprints differ: after merge of {workdir} with {merge_tool}, expected"
-                    + f" {merge_fingerprint} but found "
-                    + f"{merge_data[f'{merge_tool.name}_merge_fingerprint']}"
-                )
             root_dir = Path("replay_logs")
             log_path = root_dir / Path(
                 "merges/"
@@ -112,6 +106,12 @@ def merge_replay(
                 log_path,
                 repo.local_repo_path,
             ]
+            if merge_data[f"{merge_tool.name}_merge_fingerprint"] != merge_fingerprint:
+                raise Exception(
+                    f"fingerprints differ: after merge of {workdir} with {merge_tool}, found"
+                    + f" {merge_fingerprint} but expected "
+                    + f"{merge_data[f'{merge_tool.name}_merge_fingerprint']}"
+                )
 
             if merge_result not in (
                 MERGE_STATE.Merge_failed,
@@ -169,13 +169,13 @@ def merge_replay(
         "--merges_csv",
         help="CSV file with merges that have been tested",
         type=str,
-        default="results-small/result.csv",
+        default="results/small/result.csv",
     )
     parser.add_argument(
         "--idx",
         help="Index of the merge to replay",
-        type=int,
-        default=0,
+        type=str,
+        default="1-7",
     )
     parser.add_argument(
         "-test",

src/python/repo.py

@@ -195,6 +195,7 @@ def __init__(  # pylint: disable=too-many-arguments
             cache_directory (Path): The prefix of the cache.
         """
         self.repo_slug = repo_slug.lower()
+        self.owner, self.name = self.repo_slug.split("/")
         self.repo_path = REPOS_PATH / repo_slug
         self.workdir = WORKDIR_DIRECTORY / workdir_id
         self.local_repo_path = self.workdir / self.repo_path.name
@@ -541,6 +542,17 @@ def merge(  # pylint: disable=too-many-locals,too-many-arguments
         if use_cache:
             cache_entry["sha"] = sha
             cache_entry["merge status"] = merge_status.name
+            output = f"command: {' '.join(command)}\n stdout: {p.stdout}\n stderr: {p.stderr}"
+            output_file = (
+                self.sha_cache_directory
+                / self.owner
+                / "logs"
+                / f"{cache_entry_name}.log"
+            )
+            output_file.parent.mkdir(parents=True, exist_ok=True)
+            cache_entry["merge_logs"] = str(output_file)
+            with open(output_file, "w", encoding="utf-8") as f:
+                f.write(output)
             set_in_cache(
                 cache_entry_name,
                 cache_entry,

test/small-goal-files/merges/benedikt-schesch/git-hires-merge-example.csv

@@ -1,2 +1,3 @@
 idx,branch_name,merge_commit,parent_1,parent_2,notes
 1,refs/heads/main,4ae40d33c3b959e3a15e458eb9b0676251e36a41,48199306f02a82abdeff0c01fab1ce112126d727,488122ce6c91e157d1f49b88b79feaa083fdee5b,
+2,refs/remotes/origin/import_1,0209c47c118fcaf978f6ebc5bad8a334b541de0b,b4331092d8c5d1b03e6a9807ab135ed263b52663,8204af9984280ccc7f7793f903fc0807b626bf9c,

test/small-goal-files/merges_analyzed/benedikt-schesch/git-hires-merge-example.csv

@@ -1,2 +1,3 @@
 idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing
 1,refs/heads/main,4ae40d33c3b959e3a15e458eb9b0676251e36a41,48199306f02a82abdeff0c01fab1ce112126d727,488122ce6c91e157d1f49b88b79feaa083fdee5b,,2252a9465319d00b974abd931cc98e1f435b4fe232b4dd61a828ad40139ec20c,Tests_passed,3782e47be673266f23cba016dc13973231429bb34e4c08a314c5b2f6c37d238f,Tests_passed,True,True,True,True
+2,refs/remotes/origin/import_1,0209c47c118fcaf978f6ebc5bad8a334b541de0b,b4331092d8c5d1b03e6a9807ab135ed263b52663,8204af9984280ccc7f7793f903fc0807b626bf9c,,f48eaaf883e49f3e3a1f3e1ddff64beb42c9d9bacec7d273f748baa63093bd9b,Tests_passed,052542ef8f16db238683e23556af730ee0d7c65c3ac0554d01e7ee800ca9b7c6,Tests_passed,True,True,True,True

test/small-goal-files/merges_sampled/benedikt-schesch/git-hires-merge-example.csv

@@ -1,2 +1,3 @@
 idx,branch_name,merge_commit,parent_1,parent_2,notes
 1,refs/heads/main,4ae40d33c3b959e3a15e458eb9b0676251e36a41,48199306f02a82abdeff0c01fab1ce112126d727,488122ce6c91e157d1f49b88b79feaa083fdee5b,
+2,refs/remotes/origin/import_1,0209c47c118fcaf978f6ebc5bad8a334b541de0b,b4331092d8c5d1b03e6a9807ab135ed263b52663,8204af9984280ccc7f7793f903fc0807b626bf9c,

test/small-goal-files/merges_tested/benedikt-schesch/git-hires-merge-example.csv

@@ -1,2 +1,3 @@
 idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint
 1,refs/heads/main,4ae40d33c3b959e3a15e458eb9b0676251e36a41,48199306f02a82abdeff0c01fab1ce112126d727,488122ce6c91e157d1f49b88b79feaa083fdee5b,,2252a9465319d00b974abd931cc98e1f435b4fe232b4dd61a828ad40139ec20c,Tests_passed,3782e47be673266f23cba016dc13973231429bb34e4c08a314c5b2f6c37d238f,Tests_passed,True,True,True,True,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,54749277742f9010b6666756eb77020e2b251b0c575b9ed96020fe650e660c3b,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Tests_passed,1cebc99cd5f8a1b210b66b6985f8aa5c38c4af194a32ad23dc3c6261f43d2968,Tests_passed,d04c699fb9748d42ffbbd2a94ae59e522247862c60f3dc29d7c3ed974fc47cb8,Merge_failed,89aea3021d6f4e0d388c026053c5a982bc802e7ad3ab3699717f5a425d4e572e
+2,refs/remotes/origin/import_1,0209c47c118fcaf978f6ebc5bad8a334b541de0b,b4331092d8c5d1b03e6a9807ab135ed263b52663,8204af9984280ccc7f7793f903fc0807b626bf9c,,f48eaaf883e49f3e3a1f3e1ddff64beb42c9d9bacec7d273f748baa63093bd9b,Tests_passed,052542ef8f16db238683e23556af730ee0d7c65c3ac0554d01e7ee800ca9b7c6,Tests_passed,True,True,True,True,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,4c1e23118bc3dc9db98dd8a5d322792c1987f738893ce43bf3032e71d37615a4,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,4e0fa6edde284105a006148092586bd2bbce067c56588f4e5c02783786563c3f,Tests_passed,371b1c88034153afe8c3292ba4698b8bea2aa4aea4495b090a68f8f0555290d5,Merge_failed,202b3ad2b5215619c767caba2d95318535ac5f81b9f5cd680dbd392ff0e91e16

test/small-goal-files/result.csv

@@ -1,5 +1,6 @@
 idx,repo-idx,merge-idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,diff contains java file,test merge,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,repository
 0-1,0,1,refs/heads/main,4ae40d33c3b959e3a15e458eb9b0676251e36a41,48199306f02a82abdeff0c01fab1ce112126d727,488122ce6c91e157d1f49b88b79feaa083fdee5b,,2252a9465319d00b974abd931cc98e1f435b4fe232b4dd61a828ad40139ec20c,Tests_passed,3782e47be673266f23cba016dc13973231429bb34e4c08a314c5b2f6c37d238f,Tests_passed,True,True,True,True,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,54749277742f9010b6666756eb77020e2b251b0c575b9ed96020fe650e660c3b,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Merge_failed,66544c265579fd37b14384c25b569fb765721d9b8046fd6e4574d4b04ce68d19,Tests_passed,1cebc99cd5f8a1b210b66b6985f8aa5c38c4af194a32ad23dc3c6261f43d2968,Tests_passed,d04c699fb9748d42ffbbd2a94ae59e522247862c60f3dc29d7c3ed974fc47cb8,Merge_failed,89aea3021d6f4e0d388c026053c5a982bc802e7ad3ab3699717f5a425d4e572e,benedikt-schesch/git-hires-merge-example
+0-2,0,2,refs/remotes/origin/import_1,0209c47c118fcaf978f6ebc5bad8a334b541de0b,b4331092d8c5d1b03e6a9807ab135ed263b52663,8204af9984280ccc7f7793f903fc0807b626bf9c,,f48eaaf883e49f3e3a1f3e1ddff64beb42c9d9bacec7d273f748baa63093bd9b,Tests_passed,052542ef8f16db238683e23556af730ee0d7c65c3ac0554d01e7ee800ca9b7c6,Tests_passed,True,True,True,True,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,4c1e23118bc3dc9db98dd8a5d322792c1987f738893ce43bf3032e71d37615a4,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,69e9fb68947b80201eb2a238ed6e463c457e27d75b3a7e02a1c27b7157d8ed5d,Merge_failed,4e0fa6edde284105a006148092586bd2bbce067c56588f4e5c02783786563c3f,Tests_passed,371b1c88034153afe8c3292ba4698b8bea2aa4aea4495b090a68f8f0555290d5,Merge_failed,202b3ad2b5215619c767caba2d95318535ac5f81b9f5cd680dbd392ff0e91e16,benedikt-schesch/git-hires-merge-example
 1-7,1,7,refs/heads/master,63ab6b841a7aa31372315a902b98fc5b2cc3b661,ea6026ee62cc184db68d841d50d58474fcdf4862,ab2032ca9769d452d4906f51cf56ca7d983a27c4,,aa82b49dd87edb07fbe37b7c2d6801fce8db7c437d1afe8a7b2723c81806286e,Tests_passed,66055b6c4498a64239ae0e49781e086ed06ec3e58be7d9651c23c53f8c6bab6a,Tests_passed,True,True,True,True,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,3cba91122d229079d26dfa7ac449401fc3198521cdbc1013a722ad7a8a37ac6a,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,Tests_passed,2eb4722f282ab563c519ff9eaa07c7fe5bb4d008eaef5edb034f712791619ed7,Tests_passed,da2456383ebd3cdf892ad5208d4f13c8184ddf492bc3e309d44553d43bd280f0,mangstadt/ez-vcard
 2-5,2,5,refs/heads/master,d7e0b1c03fa7cacf40b32dcfde30871e8947445a,2c4e69eb243a81ba05d24456b3cad7e8a696f630,8a1a1a7fb53732edaf17ef9876545c4bca568e05,,718024edbe6334028acc916e40446b4ae7cb30be97792ae8e2253bdc1112c5a4,Tests_passed,199e1e65500c8ab0fd66d837663440faf9f32711932bdf2136778923a7b0d4d3,Tests_passed,True,True,True,True,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,61696b2b731bcaeb7629f2a47034d02a5f740dfb237bdb185c605197d2f017fe,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,61696b2b731bcaeb7629f2a47034d02a5f740dfb237bdb185c605197d2f017fe,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,6588d649662767fadf26f7efc7619f45c4881eebf75daaf45e961bbd7472d23d,Merge_failed,14192423a42830e340baa41e9e304c9887717c60c76647d67d2b75beca45e4cc,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,5a47de86d07bf10d99c6f72b691f79b9241f6dea9be24f307b39f7598f0458d7,Merge_failed,61696b2b731bcaeb7629f2a47034d02a5f740dfb237bdb185c605197d2f017fe,Merge_failed,80dadbca965612865a128b71a58d18704846a5cbd3cb50e93cca090233120ace,Tests_passed,e46044bafa010841cebb82e2b54234877bd9295e7f720fcdd79e2ff137cdb433,Merge_failed,b6c0da70d24e30bdadd393948d91c3d07b50a2c1af43ab2d6ff67bd2f372f3cf,pedrovgs/algorithms
 2-19,2,19,refs/remotes/origin/pull/37,104eb9ed88cde145576ea1df50460915af488e74,6baa2ed219e18f9763bb2f2de74c5fb800d15899,99a155f67dfe68de440feb560a7e4c4ee5ae355c,,216098fad46bb19977b73bb3104f281c803911449ff6eb9c13d600efb375ae84,Tests_passed,d80bbdd6216a68130e2bbf0e70dde5edb5e9e02e397fe38c702bc69e74fddebf,Tests_passed,True,True,True,True,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,f19931ca02a3dea15a502859251c2361252bf79b80945ff12a235522b5421e4d,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,d94f5970134c9e6d8d9e813c1bb6a45db74be4893958a88a5537b093055f5300,Merge_failed,8a8768d8ce56caeb4b3ad8a4e5e8f7e6afcb91934bab5282ce5a1f7daef76c65,Merge_failed,f49462ec3092b24bc747241df2e554408663f570124685b61327e57ea61ceb60,Merge_failed,4db8343a17eae46da41b4530d1fa29a84fd0dad4bc9dc55e30d59c9e0ed076e4,pedrovgs/algorithms