Skip to content

Commit

Permalink
Process pull request merges (#246)
Browse files Browse the repository at this point in the history
  • Loading branch information
mernst authored Nov 1, 2023
1 parent fd40e3d commit a406a2e
Show file tree
Hide file tree
Showing 8 changed files with 53 additions and 49 deletions.
2 changes: 2 additions & 0 deletions src/python/merge_analyzer.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ def merge_analyzer( # pylint: disable=too-many-locals

# Test left parent
if not left_success:
# This should never happen. Search output for "Git_checkout_failed"
cache_data["left parent test result"] = TEST_STATE.Git_checkout_failed.name
cache_data["left_tree_fingerprint"] = None
cache_data["left parent test coverage"] = None
Expand All @@ -116,6 +117,7 @@ def merge_analyzer( # pylint: disable=too-many-locals

# Test right parent
if not right_success:
# This should never happen. Search output for "Git_checkout_failed"
cache_data["right parent test result"] = TEST_STATE.Git_checkout_failed.name
cache_data["right_tree_fingerprint"] = None
cache_data["right parent test coverage"] = None
Expand Down
1 change: 1 addition & 0 deletions src/python/write_head_hashes.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ def clone_repo(repo_slug: str) -> git.repo.Repo:
except Exception as e:
print(repo_slug, "Exception during cloning:\n", e)
raise
repo.remote().fetch("refs/pull/*/head:refs/remotes/origin/pull/*")
return repo


Expand Down
12 changes: 6 additions & 6 deletions test/small-goal-files/merges_analyzed/Algorithms.csv
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ idx,branch_name,merge,left,right,notes,diff_size,diff_contains_java_file,left_tr
11,refs/heads/master,ffa4a6ccd332fad6dc1c5a269b3854a5a2bfff91,128ccf0f25f401f2218c03166a6f4ebc5ce21385,03d7c1872d5b17434fd460f7b8a0b8c9c90849f7,a parent is the base,39,False,3be3867629eb4ed141509a8a8b8e32f4f535d8fc94803e6d896b31a08dbdad6b,Tests_passed,0.97108234646103,True,16ffc55222112897157b65a9a305d7d9f0a6d2c91d4768dd26d885fa148d3c33,Tests_passed,0.9711181405583826,False
12,refs/heads/master,128ccf0f25f401f2218c03166a6f4ebc5ce21385,1f8f61c50d4e36ab8677b271a58648e90a2f1b28,22ee3ce03f74349ed3b0f36bfdf1dc119e2be70b,a parent is the base,29,False,42a1ba4ec7eb8649d2d3299078713b66afc5bb00b269a92be940e4b4ad14163c,Tests_passed,0.9712826176998481,True,3be3867629eb4ed141509a8a8b8e32f4f535d8fc94803e6d896b31a08dbdad6b,Tests_passed,0.97108234646103,False
13,refs/heads/master,c8604d6f6d23a0cd5d3f9fac472dbf467fe11b8e,7ebdadbc657a68da22826ce3cc402e3635e80d4c,fd87cbc2cdbe813564f0a2c7e8070964220cdcc6,a parent is the base,21,False,480c0d0c75bba90a670ac3c07f6afc5c61c394d0d6c1ba59468503b47ad2e849,Tests_passed,0.9712270023516393,True,4487d24e3a4cfb37622bc594cbd8e3ec74fa77f0381121247d246d83434e5867,Tests_passed,0.9712826176998481,False
14,refs/remotes/origin/pull/27,fdd92255570bf37534ba36f632773923d60e32d2,8edac208c376e88626e88a720c9166fef9588853,1a71e9f95183a089b2b72a0cb42337681594e699,,406,False,,Git_checkout_failed,,False,d246e3670ab5e0ba5a4d0ea8c24a62b33d3fe0f78c1a821a23bac0bc739c5ec3,Tests_passed,0.9707940780619112,False
15,refs/remotes/origin/pull/37,6b917cc6a33eb87fec2dcdafc845177f470ca374,8ef7da30196fba8e55947acf6168d8cd4a82f2b8,68f656ff10751259284d083e8fdf8e82f7ada15f,,0,False,,Git_checkout_failed,,False,,Git_checkout_failed,,False
16,refs/remotes/origin/pull/37,8ef7da30196fba8e55947acf6168d8cd4a82f2b8,37e80741a853a6626a77aed38caa07f4e44d85b2,8b2e3b06185e4a111ae987db7fa01901974036cd,,209,False,,Git_checkout_failed,,False,cb9d190fba5816b072ac476d8c839e907344d0b8211d512779f5521a6dbf954e,Tests_passed,0.97102615694165,False
17,refs/remotes/origin/pull/37,680f2603dc41bb7c5843b0fa342e829210611d9d,1477ce25eaad76986f50aa5b740e2c023ff31de2,879fb60972e4e83fdb7b5337db66c8afbfb95ffc,,0,False,,Git_checkout_failed,,False,,Git_checkout_failed,,False
18,refs/remotes/origin/pull/37,d1279d1b59ecba7f01de8b2c1995562f92b2e255,b636ef254a97ae830baa6d783121de7890818785,9497e2f66d7af3feedd3106faa6e8b0aa6118b41,,0,False,,Git_checkout_failed,,False,,Git_checkout_failed,,False
19,refs/remotes/origin/pull/37,104eb9ed88cde145576ea1df50460915af488e74,6baa2ed219e18f9763bb2f2de74c5fb800d15899,99a155f67dfe68de440feb560a7e4c4ee5ae355c,,262,False,216098fad46bb19977b73bb3104f281c803911449ff6eb9c13d600efb375ae84,Tests_passed,0.9711205749268033,False,,Git_checkout_failed,,False
14,refs/remotes/origin/pull/27,fdd92255570bf37534ba36f632773923d60e32d2,8edac208c376e88626e88a720c9166fef9588853,1a71e9f95183a089b2b72a0cb42337681594e699,,17,False,b00db31ee0ff34d2b38aaba8f8c3346627eafe18da6b0102a2b8d0cb75d11567,Tests_passed,0.9708176438945669,True,d246e3670ab5e0ba5a4d0ea8c24a62b33d3fe0f78c1a821a23bac0bc739c5ec3,Tests_passed,0.9707940780619112,False
15,refs/remotes/origin/pull/37,6b917cc6a33eb87fec2dcdafc845177f470ca374,8ef7da30196fba8e55947acf6168d8cd4a82f2b8,68f656ff10751259284d083e8fdf8e82f7ada15f,,94,False,7aa5e2f53ad1560daf3a96bd8e663a929817c73938d959fa60d355658fa2e2be,Tests_failed,0.0,False,755c5c56e067df81d5c17ef49dc1f4e7678609ab296b9a8ab2dece46fe0e4fde,Tests_failed,0.0,False
16,refs/remotes/origin/pull/37,8ef7da30196fba8e55947acf6168d8cd4a82f2b8,37e80741a853a6626a77aed38caa07f4e44d85b2,8b2e3b06185e4a111ae987db7fa01901974036cd,,123,False,750234862e2408f85646f30ab36d0dbcfdac88dba376d8c3d61d70f4487afd25,Tests_failed,0.0,False,cb9d190fba5816b072ac476d8c839e907344d0b8211d512779f5521a6dbf954e,Tests_passed,0.97102615694165,False
17,refs/remotes/origin/pull/37,680f2603dc41bb7c5843b0fa342e829210611d9d,1477ce25eaad76986f50aa5b740e2c023ff31de2,879fb60972e4e83fdb7b5337db66c8afbfb95ffc,,96,False,bdf6e72ad28bbb283d5760e9a231b0df40640519b3e3cfd5e3f0ccda8c93fc8d,Tests_passed,0.9459424423126782,False,1a54a2f1e9d5a185842f1ebcbb59a35d16b5d948671ad2f6eb75fc88bf0831d3,Tests_failed,0.0,False
18,refs/remotes/origin/pull/37,d1279d1b59ecba7f01de8b2c1995562f92b2e255,b636ef254a97ae830baa6d783121de7890818785,9497e2f66d7af3feedd3106faa6e8b0aa6118b41,,70,False,876fec686e8da05d3343c630aba013323e9f9cdd6bf4252242d093211d7052d4,Tests_failed,0.0,False,481269e0b8f9bfc8b74b1541ab78f98aa9364d3e17bf7f640b95ffc2376ab1c4,Tests_failed,0.0,False
19,refs/remotes/origin/pull/37,104eb9ed88cde145576ea1df50460915af488e74,6baa2ed219e18f9763bb2f2de74c5fb800d15899,99a155f67dfe68de440feb560a7e4c4ee5ae355c,,110,False,216098fad46bb19977b73bb3104f281c803911449ff6eb9c13d600efb375ae84,Tests_passed,0.9711205749268033,True,d80bbdd6216a68130e2bbf0e70dde5edb5e9e02e397fe38c702bc69e74fddebf,Tests_passed,0.9711321005720367,False
20,refs/remotes/origin/pull/73,9c8740d0e38ba93f08bfb462d16cab448a0197f1,7ebdadbc657a68da22826ce3cc402e3635e80d4c,4e2214112de23d1319ce77736547fa8900384e7c,a parent is the base,1006,False,480c0d0c75bba90a670ac3c07f6afc5c61c394d0d6c1ba59468503b47ad2e849,Tests_passed,0.9712270023516393,True,d02d6c3c9e716e52368f24ba6495f28e8fd4773601dc017f861e81fd4e6bfaf8,Tests_passed,0.974043350280974,False
2 changes: 1 addition & 1 deletion test/small-goal-files/merges_analyzed/JSCover.csv
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ idx,branch_name,merge,left,right,notes,diff_size,diff_contains_java_file,left_tr
24,refs/heads/master,3ae921c45ac9a68844bbdc1d53a8a7ca262fb6b7,8fb1d13ac9c28ccf9723a4328141816f224337b9,aec694fe670b35eb827c473f5fbaf205cd59a0ba,,6542,False,bb4ed38dc2166762d5a373aa60d2d4930bc7e52d49b8c4b735d72c6a7f27017c,Tests_failed,0.0,False,876c70f3e5dc78debfb39901faa59e33bda1b28ae33baf60cfc5a7d6ae22eea2,Tests_failed,0.0,False
25,refs/heads/master,ac65c8f97187f99331093624c7829d3688a50297,fb4312ddbbf301484ff0e1243cfdf12d6a2fb840,c8937ebc236d924201af98021a50091ab0ee013a,,129,True,1df962e38d7eb57b4089203442b3adabd0fa69068107fc155e2689a12823efe2,Tests_failed,0.0,False,df60362dc02bda92c3989d190bbfeac4fbe5f648b0049001f2b6cb79b4b62c48,Tests_failed,0.0,False
26,refs/remotes/origin/gh-pages,9217160ed01a2bb7e57cd07001fc0da20135ad21,49868943e60fdb40de33c4416aae6a8517ef3d7f,bd0c5960622a73573c9fa5fb0f356ba575c3676c,a parent is the base,22,False,39bbf65e36cdcbd8db1f215dd86c51138d8cf200fc3b381b93331e8b278a4075,Tests_failed,0.0,False,65119fc78d1b2e903eeb86d7cbf83a3803785b5526d53c535a8b63e548720be5,Tests_failed,0.0,False
27,refs/remotes/origin/pull/94,c905e6a5da47ddf684d6cb6b6c52a6d5cb0d2e3b,390eb1dbfc709f2b75889697a9296ffeb06424a4,2e483d3cd3abbb5b6af28ea519278f597ccded96,,41503,True,,Git_checkout_failed,,False,21c90bb9de31ea68ac17b0cb22d88ad5a1d668172ae43633e9cf5b0fdf5dd8eb,Tests_failed,0.0,False
27,refs/remotes/origin/pull/94,c905e6a5da47ddf684d6cb6b6c52a6d5cb0d2e3b,390eb1dbfc709f2b75889697a9296ffeb06424a4,2e483d3cd3abbb5b6af28ea519278f597ccded96,,2027,True,1c09a267f1c9a9fadc907ee6591ec27a3de2265d4d6b27f4fe6c91f7edff4aa6,Tests_failed,0.0,False,21c90bb9de31ea68ac17b0cb22d88ad5a1d668172ae43633e9cf5b0fdf5dd8eb,Tests_failed,0.0,False
26 changes: 13 additions & 13 deletions test/small-goal-files/merges_analyzed/ez-vcard.csv
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
idx,branch_name,merge,left,right,notes,diff_size,diff_contains_java_file,left parent test result,left_tree_fingerprint,left parent test coverage,parents pass,right_tree_fingerprint,right parent test result,right parent test coverage,test merge
1,refs/heads/master,0637f5fc19cf6ad79cd2c58981facc3678d5bbff,b8b0b0c8e1dff237975942022a42c6c25b9d9741,3c10bf587f097be3e2a77b0d2d556e6f9efd97b1,,77,False,Tests_passed,e677696d99009543543b67e43376936df48da7710eff36c66a37d4eaa1fc98e5,0.8535777267140491,True,d187f1c73849a223e794329f88807bf76f60a16041876a0896846dbce5bb1861,Tests_passed,0.853562075784298,False
2,refs/heads/master,633e9c677f26c1cae476d9ce43331cc30bd8f9e8,af63ebf1a441d0165bab7f6250caf0e2793b9829,22631a4817aa29b231919cb5d8c05d935386b763,a parent is the base,17,False,Tests_passed,f598d3120ef68309ed315a47e98d429cc60c53fa77a4189f6e8a43dfdf55fa25,0.85334653571333,True,9e86790517ce177c1a909da94e1af95469201985b918b77fc5011863183644a7,Tests_passed,0.85334653571333,False
3,refs/heads/master,a927decebd50d02bff3f8c56ade565b98d0ecd4c,2380144cf35bc2c211874ac53db2d846fccffb97,6621980643544df2261bd874717839dd24b28324,,70,False,Tests_passed,096c2d7eb164a14db32edc1795fbcb2a0581b74bd48dd262c1a055d11919ad81,0.8457226084805848,True,5130a21901c613787b9283b8566df0875df8dfbbf369ba1c0fff23858649a88c,Tests_passed,0.8456949637123378,False
4,refs/heads/master,d6a31c5fece9a634b7829df08bd0afa0ef06b69a,4639361f062ee6455b88e31996743e300240e71e,4e959f00b9e3a80ea99486834b0ab164be663fdc,a parent is the base,17,False,Tests_passed,5aa2dd4621da7b6c16236ae4f421ba167863bc71abe916fb4756f3b5830dbfe5,0.8461919300272299,True,eda7ff9105f5b5526ffe4c43e4daf10a441d8ad3da01e76ca65e9573e9df456b,Tests_passed,0.8461919300272299,False
5,refs/heads/master,8b26b8c56130e60347f8f20c17c3eca14b601cc1,e454bdf3e3b7d02bb95ff8a58952e70cb97dd0f9,522254f7ceb5e390cbb0904d698cb6294e081ce2,a parent is the base,39,False,Tests_passed,309996fcf2f75fdb2c75ff984b937ef0168bf1837b872e864544149f927bb14d,0.8517759917033965,True,ca67a5201f9ee344350e60fcbf3145d37ba8b5f63655db51fb3a69f4f8f96ea0,Tests_passed,0.8517759917033965,False
6,refs/heads/master,63ab6b841a7aa31372315a902b98fc5b2cc3b661,ea6026ee62cc184db68d841d50d58474fcdf4862,ab2032ca9769d452d4906f51cf56ca7d983a27c4,,17831,True,Tests_passed,aa82b49dd87edb07fbe37b7c2d6801fce8db7c437d1afe8a7b2723c81806286e,0.7582322978692876,True,66055b6c4498a64239ae0e49781e086ed06ec3e58be7d9651c23c53f8c6bab6a,Tests_passed,0.7173103413091169,False
7,refs/heads/master,5e11fc8e2c1f5763ff6e6b37d3e750e369af7c94,b42390b2d6279bf7c23580f0f4ac517cba448cd5,dee07e7edfb332efd5d5207660248f71e96a1a0e,,224,False,Tests_passed,eb24de92724a4a9cfded8b479cf21ee00bcbc24daa5032a4b5fb0504b2bea69a,0.7026750196517472,True,31f6c872c0080531d16ac6b7efa7bd842985c69c185ff53af558b61b4c6a329c,Tests_passed,0.7026750196517472,False
8,refs/heads/master,bce54f56a1da7332cabdec21b26e82cd899ce82b,16b6d6cd734326e55af96146ac89594c8ed1b233,ce422afbecd67144c1e8caceaa151f80d4f8a0cc,,1598,True,Tests_passed,a5e189b974c286e626dff96fe996698327301483890e32df62d647c7441e8b6c,0.7214297078008167,True,e2a15289f8f14272bff7f3d76f800272b4b6e16760d80acd562bbc787e406721,Tests_passed,0.7195962185547188,False
9,refs/heads/master,f238de6e66d3e5d03715aa88dccc660d0ab89318,03bd6bf2c9873b23344b31ca7c39524ad9ee5756,c824e9fabecc54d431d4c860b95a2ad13794556c,a parent is the base,54,False,Tests_passed,785747a7609141e6e381731036e1b1968b5b70b315cf80140e8af096727f6ee9,0.7211962001804384,True,04155e098016a45775f99c28abc6cf0ff0bfcdfce0265d4120fffab7993d5d40,Tests_passed,0.7212701612903226,False
10,refs/heads/master,a2a632bba203ee71191e71e11058726f2f030b00,345934e15e82c9cbffb5b297aab51ad105b9ad82,541f59d09b5232b68cda87ee2abba7c62d33ee32,,19,False,Tests_passed,a30b3c3d8e0b71e540c763f13d31dc4995c98abe5246092d7030f7ae8385518f,0.7205625319314851,True,c3ac9a40ed916d3170b18a54d6d1859bd665c137a26837a701936bf28679b550,Tests_passed,0.7205625319314851,False
11,refs/remotes/origin/pull/49,72e37df9ec88656844758c7303e8e1f9234295c3,24476c206b8df9f5458e2ec57fa16d3ebe23f898,64164540fa269cd1ed14f04236a88b8a3ac22dcb,,26434,True,Git_checkout_failed,,,False,6a26b8452ea8957e10c32b00e3a4232a42a8a2189f106759b926ec0d968d116b,Tests_passed,0.8538166355527899,False
12,refs/remotes/origin/pull/49,073c34351663673f4b53142bacf75033706e067f,64847e218c67593c77b0ebdefc93b5e7b4c82406,e80bea970d0b1a4ee340641f01b30b09f816eaa2,,28491,True,Git_checkout_failed,,,False,db1bbb783df46c51866457b8a4c7a2365225682a680b961c9bbffcd419fb5838,Tests_passed,0.8492908269723463,False
idx,branch_name,merge,left,right,notes,diff_size,diff_contains_java_file,left_tree_fingerprint,left parent test result,left parent test coverage,parents pass,right_tree_fingerprint,right parent test result,right parent test coverage,test merge
1,refs/heads/master,0637f5fc19cf6ad79cd2c58981facc3678d5bbff,b8b0b0c8e1dff237975942022a42c6c25b9d9741,3c10bf587f097be3e2a77b0d2d556e6f9efd97b1,,77,False,e677696d99009543543b67e43376936df48da7710eff36c66a37d4eaa1fc98e5,Tests_passed,0.8535777267140491,True,d187f1c73849a223e794329f88807bf76f60a16041876a0896846dbce5bb1861,Tests_passed,0.853562075784298,False
2,refs/heads/master,633e9c677f26c1cae476d9ce43331cc30bd8f9e8,af63ebf1a441d0165bab7f6250caf0e2793b9829,22631a4817aa29b231919cb5d8c05d935386b763,a parent is the base,17,False,f598d3120ef68309ed315a47e98d429cc60c53fa77a4189f6e8a43dfdf55fa25,Tests_passed,0.85334653571333,True,9e86790517ce177c1a909da94e1af95469201985b918b77fc5011863183644a7,Tests_passed,0.85334653571333,False
3,refs/heads/master,a927decebd50d02bff3f8c56ade565b98d0ecd4c,2380144cf35bc2c211874ac53db2d846fccffb97,6621980643544df2261bd874717839dd24b28324,,70,False,096c2d7eb164a14db32edc1795fbcb2a0581b74bd48dd262c1a055d11919ad81,Tests_passed,0.8457226084805848,True,5130a21901c613787b9283b8566df0875df8dfbbf369ba1c0fff23858649a88c,Tests_passed,0.8456949637123378,False
4,refs/heads/master,d6a31c5fece9a634b7829df08bd0afa0ef06b69a,4639361f062ee6455b88e31996743e300240e71e,4e959f00b9e3a80ea99486834b0ab164be663fdc,a parent is the base,17,False,5aa2dd4621da7b6c16236ae4f421ba167863bc71abe916fb4756f3b5830dbfe5,Tests_passed,0.8461919300272299,True,eda7ff9105f5b5526ffe4c43e4daf10a441d8ad3da01e76ca65e9573e9df456b,Tests_passed,0.8461919300272299,False
5,refs/heads/master,8b26b8c56130e60347f8f20c17c3eca14b601cc1,e454bdf3e3b7d02bb95ff8a58952e70cb97dd0f9,522254f7ceb5e390cbb0904d698cb6294e081ce2,a parent is the base,39,False,309996fcf2f75fdb2c75ff984b937ef0168bf1837b872e864544149f927bb14d,Tests_passed,0.8517759917033965,True,ca67a5201f9ee344350e60fcbf3145d37ba8b5f63655db51fb3a69f4f8f96ea0,Tests_passed,0.8517759917033965,False
6,refs/heads/master,63ab6b841a7aa31372315a902b98fc5b2cc3b661,ea6026ee62cc184db68d841d50d58474fcdf4862,ab2032ca9769d452d4906f51cf56ca7d983a27c4,,17831,True,aa82b49dd87edb07fbe37b7c2d6801fce8db7c437d1afe8a7b2723c81806286e,Tests_passed,0.7582322978692876,True,66055b6c4498a64239ae0e49781e086ed06ec3e58be7d9651c23c53f8c6bab6a,Tests_passed,0.7173103413091169,False
7,refs/heads/master,5e11fc8e2c1f5763ff6e6b37d3e750e369af7c94,b42390b2d6279bf7c23580f0f4ac517cba448cd5,dee07e7edfb332efd5d5207660248f71e96a1a0e,,224,False,eb24de92724a4a9cfded8b479cf21ee00bcbc24daa5032a4b5fb0504b2bea69a,Tests_passed,0.7026750196517472,True,31f6c872c0080531d16ac6b7efa7bd842985c69c185ff53af558b61b4c6a329c,Tests_passed,0.7026750196517472,False
8,refs/heads/master,bce54f56a1da7332cabdec21b26e82cd899ce82b,16b6d6cd734326e55af96146ac89594c8ed1b233,ce422afbecd67144c1e8caceaa151f80d4f8a0cc,,1598,True,a5e189b974c286e626dff96fe996698327301483890e32df62d647c7441e8b6c,Tests_passed,0.7214297078008167,True,e2a15289f8f14272bff7f3d76f800272b4b6e16760d80acd562bbc787e406721,Tests_passed,0.7195962185547188,False
9,refs/heads/master,f238de6e66d3e5d03715aa88dccc660d0ab89318,03bd6bf2c9873b23344b31ca7c39524ad9ee5756,c824e9fabecc54d431d4c860b95a2ad13794556c,a parent is the base,54,False,785747a7609141e6e381731036e1b1968b5b70b315cf80140e8af096727f6ee9,Tests_passed,0.7211962001804384,True,04155e098016a45775f99c28abc6cf0ff0bfcdfce0265d4120fffab7993d5d40,Tests_passed,0.7212701612903226,False
10,refs/heads/master,a2a632bba203ee71191e71e11058726f2f030b00,345934e15e82c9cbffb5b297aab51ad105b9ad82,541f59d09b5232b68cda87ee2abba7c62d33ee32,,19,False,a30b3c3d8e0b71e540c763f13d31dc4995c98abe5246092d7030f7ae8385518f,Tests_passed,0.7205625319314851,True,c3ac9a40ed916d3170b18a54d6d1859bd665c137a26837a701936bf28679b550,Tests_passed,0.7205625319314851,False
11,refs/remotes/origin/pull/49,72e37df9ec88656844758c7303e8e1f9234295c3,24476c206b8df9f5458e2ec57fa16d3ebe23f898,64164540fa269cd1ed14f04236a88b8a3ac22dcb,,2912,True,d2932153aaceea3e3dd8b0a3695a3f512d061b5befb7d373730b4e7254322c5a,Tests_passed,0.851034045587808,True,6a26b8452ea8957e10c32b00e3a4232a42a8a2189f106759b926ec0d968d116b,Tests_passed,0.8538166355527899,True
12,refs/remotes/origin/pull/49,073c34351663673f4b53142bacf75033706e067f,64847e218c67593c77b0ebdefc93b5e7b4c82406,e80bea970d0b1a4ee340641f01b30b09f816eaa2,,5056,True,18b82ff99b0bd4a72b59223148fe1e79e9e84ee01e9afe00a392268db041d821,Tests_passed,0.7594220063958309,True,db1bbb783df46c51866457b8a4c7a2365225682a680b961c9bbffcd419fb5838,Tests_passed,0.8492908269723463,False
3 changes: 2 additions & 1 deletion test/small-goal-files/merges_tested/ez-vcard.csv
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
idx
idx,branch_name,merge,left,right,notes,diff_size,diff_contains_java_file,left_tree_fingerprint,left parent test result,left parent test coverage,parents pass,right_tree_fingerprint,right parent test result,right parent test coverage,test merge,left test result,right test result,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint
11,refs/remotes/origin/pull/49,72e37df9ec88656844758c7303e8e1f9234295c3,24476c206b8df9f5458e2ec57fa16d3ebe23f898,64164540fa269cd1ed14f04236a88b8a3ac22dcb,,2912,True,d2932153aaceea3e3dd8b0a3695a3f512d061b5befb7d373730b4e7254322c5a,Tests_passed,0.851034045587808,True,6a26b8452ea8957e10c32b00e3a4232a42a8a2189f106759b926ec0d968d116b,Tests_passed,0.8538166355527899,True,Tests_passed,Tests_passed,Tests_passed,1787f179683225eb343978d72acbae8e07e384ff204fe0e64742bd4bc094580a,Tests_passed,1787f179683225eb343978d72acbae8e07e384ff204fe0e64742bd4bc094580a,Tests_passed,1787f179683225eb343978d72acbae8e07e384ff204fe0e64742bd4bc094580a,Tests_passed,1787f179683225eb343978d72acbae8e07e384ff204fe0e64742bd4bc094580a,Tests_passed,1787f179683225eb343978d72acbae8e07e384ff204fe0e64742bd4bc094580a,Tests_passed,1787f179683225eb343978d72acbae8e07e384ff204fe0e64742bd4bc094580a,Tests_passed,1787f179683225eb343978d72acbae8e07e384ff204fe0e64742bd4bc094580a,Tests_passed,1787f179683225eb343978d72acbae8e07e384ff204fe0e64742bd4bc094580a,Tests_passed,1787f179683225eb343978d72acbae8e07e384ff204fe0e64742bd4bc094580a,Tests_passed,1787f179683225eb343978d72acbae8e07e384ff204fe0e64742bd4bc094580a,Tests_passed,1787f179683225eb343978d72acbae8e07e384ff204fe0e64742bd4bc094580a,Tests_passed,1787f179683225eb343978d72acbae8e07e384ff204fe0e64742bd4bc094580a,Tests_passed,1787f179683225eb343978d72acbae8e07e384ff204fe0e64742bd4bc094580a,Tests_passed,1787f179683225eb343978d72acbae8e07e384ff204fe0e64742bd4bc094580a
Loading

0 comments on commit a406a2e

Please sign in to comment.