Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added runs for trivial merges #227

Closed
wants to merge 8 commits into from
Closed

Added runs for trivial merges #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4900fb2
Added runs for trivial merges
benedikt-schesch Oct 10, 2023
f9eec73
Style Fix
benedikt-schesch Oct 10, 2023
a695440
Added runs
benedikt-schesch Oct 16, 2023
a3d2807
Style fix
benedikt-schesch Oct 16, 2023
6e5042a
Style fix
benedikt-schesch Oct 16, 2023
c93e6d4
Sytle fix
benedikt-schesch Oct 16, 2023
c108229
import order fix
benedikt-schesch Oct 16, 2023
c9e796d
Merge branch 'main' into trivial_merges
benedikt-schesch Oct 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
21 changes: 21 additions & 0 deletions results_trivial_merges/defs.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
\def\reposInitial{1000\xspace}
\def\reposValid{390\xspace}
\def\mergesInitial{11357\xspace}
\def\mergesPer{20\xspace}
\def\reposSampled{321\xspace}
\def\mergesSampled{34854\xspace}
\def\reposYieldedFull{6\xspace}
\def\reposTotal{256\xspace}
\def\mergesTotal{2320\xspace}

% Results
\def\sporkOverOrtCorrect{0\xspace}
\def\sporkOverOrtIncorrect{0\xspace}
\def\mainBranchMerges{1965\xspace}
\def\mainBranchMergesPercent{85\xspace}
\def\featureBranchMerges{355\xspace}
\def\featureBranchMergesPercent{15\xspace}

% Timeout
\def\parentTestTimeout{30\xspace}
\def\mergeTestTimeout{45\xspace}
960 changes: 960 additions & 0 deletions results_trivial_merges/local_repos.csv
View file
Open in desktop

Large diffs are not rendered by default.

55 changes: 55 additions & 0 deletions results_trivial_merges/merges/Agrona.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
idx,branch_name,merge_commit,parent_1,parent_2,notes
1,refs/heads/master,e0452ca1a1fa7545d6ef32564f53b58b16a5ff30,a89041e923364c7b889e2477166978e7938ff231,250e9a1ab196e6827c4592c3ca6f62c79dc47a10,
2,refs/heads/master,915999b26b9f40d47403fd61b372aa2d79482be3,44fd1e69aeed7e75f90bb947572b93cd4c111eb7,85de8dce889aa34afff02e96e2328781e233683a,
3,refs/heads/master,532b9f20941de13fcba05c66a7337ab5480cc5e1,e8ae822591a7bc291e019a86ace62ce2c06abfac,fe407357336234ac193a8ff2235c6181babcc608,
4,refs/heads/master,8786158f5f8470cd3f23ca44286e7b74127bba20,10b01d5d5516f6713594674300e3e23bffa29e2b,d29d5592b42903cc25324ae9dea4cc18b5a83fb4,
5,refs/heads/master,9f07b4f05720ac8a9ebd97c4777ec30c0e51e13a,177c1eb0ca1288dc94abaff9ebd425ab2de7ad36,51450e7dff1c15dea6a2507a506e761cd90e3a27,
6,refs/heads/master,3e2a9015297dcdc8bd09fbd05807293b3fc1f754,63a3082c8f1b58daf3d82ba472178934e19f9220,0a57665540d2af248dc2fc4d9f31437ebd0ee692,
7,refs/heads/master,63a3082c8f1b58daf3d82ba472178934e19f9220,7a63b734c094a3256d70c45f974a77a5ace2a5b0,1dcc73e9d806b17a846469e97bd8f113f3568f51,
8,refs/heads/master,7a63b734c094a3256d70c45f974a77a5ace2a5b0,89dc3e6558d399a31eeaaacb56d02ee4d71ccf2c,d71b8d7d0e135d99c1560542575be8135f97eaff,
9,refs/heads/master,bf58860987c6fb614a3e77a7f4861319d6cce069,8db1b822ebca8c8a5189a56462cd705aa55dba93,c977bceaddacf58bbe993e857892881e0d6e26b0,
10,refs/heads/master,036c3de9aab044c31470c46b1bfcc0a44012da9b,c22215a9ffa406909fa60bab1bd199522b35c32c,2dae2911f3fc0737b5dc2ab843f95e4c72412f65,
11,refs/heads/master,41ee226c273855721fd483addd7fdfe62981b9eb,c48419a7ded7947abbf15836187f6fc5918e375b,7a7fe384fca0e75bde2f24790c50a9e787d97f47,
12,refs/heads/master,7b9ba9383c64a2122893b13a35ed7f3cb9452271,27bf0ca529fc3388712a579368099e3567923253,2d839e77d512694dfaf7e3d073471f9f15b62291,
13,refs/heads/master,d9ed7064330b74af6e063c61cfa40e266539d906,f91a67bbca62c027b81fb732c865390700f8fe90,412eb910fadcbc7e1ce9a41bbca3f37baa8fc2fb,
14,refs/heads/master,72e8e8928133f62e79bb2208045840ccc922f913,c31890dfc7b9ff12af59459499719408d3226c01,ecd1074e4820d341efd55d639854d9e9dd688d8c,
15,refs/heads/master,429ec309d1acad07af4c5be8cd3947290de2dcae,39b5605ff89a78ee373700046ee5013981a5cd06,f90f3a80475a35d79e98f245da4e27c2e5606a2e,
16,refs/heads/master,41f2452bf37417a7b37f9cbdfc68b893d4135fa3,e95082d6b85e096c6438cdc9e1f0409ad9ef18db,3d8ddcd6963910463a8e18801daca6330c870060,
17,refs/heads/master,e547869831a2b8c4527a1c8058dc982e9d335b33,23141d91cfc9292617cde8d8068cd3adcd369d6f,a93b37f30464398b15340d15f507ddcb1330711a,a parent is the base
18,refs/heads/master,85d0456ba3b5f97b6349e8a7177bb6fbb84d1406,68d72f48232fe0e178e0be7e0660ee94538d1b7b,cd334e51dfec9b2b2e8784c2542161781abab3c1,a parent is the base
19,refs/heads/master,0d98334a53143679c7eeae685cb1a453ff41f5dd,aaaab82e2dff76f60f084b24b40db9e9933069d0,25a1d3991bc052e1f4f88e534c364caf80d18780,
20,refs/heads/master,01184ef83fac25072efb8fa64b04a99fd69c5b41,e8a232c06cfe12e33e3668b8b781c0dc5030cefd,f50e8fdd671cf98f4c82a4843047abd603486e71,
21,refs/heads/master,26ed0dba5b0c259ba20183280d0acca56b46e51c,43cdebd5dfc0d1daa2684da632de951f4fecae55,4e8abe938d98ca2f417a083cbf3ebbc8839a5fe0,a parent is the base
22,refs/heads/master,13a9083e32f886c652041a536d13980a1ff982e0,45d86347910231d66e5f7270d3b03053a1f80b23,e95962c28014c76a6f7e0a2861784bb7bf847ec7,a parent is the base
23,refs/heads/master,59f45a37f52376be4a28f0a4b971e2452fe1d7d0,6b6b22b205ab7440a799675f06ec4debcc5fc102,e48f60845de19dcf6180fcb4828eea49b8cb5eb6,a parent is the base
24,refs/heads/master,6b6b22b205ab7440a799675f06ec4debcc5fc102,fce823f0734f3a0d3612cf5f78f2f773b13ae054,b10159cdffcf39f0111f3692b9c103c28af189c5,a parent is the base
25,refs/heads/master,cd2413b79f94184866a66e2c304078e45fdbc39e,470cfad655a7ec408ec99cff3e722dc057de1ae6,82840183047f281e14644bf584beb05cdc308307,
26,refs/heads/master,8944ed35eaa8038ca091987721e4308fba4258bb,32f06f323304de283321954dc27dc28b7f64049a,f770da5a8ce3a8de4cbf6159b93ce972563f2228,a parent is the base
27,refs/heads/master,b5987adc616c8b3dbc19582ba5e882cb803f0aeb,b7a99ab993d2f455d90d4fc3590b73193b29cc9e,8b25d7602e816264d33bad08562c5a0ed97768ad,a parent is the base
28,refs/heads/master,e090293118ea60e72c812ff7e2bd58c12836847f,308e7e677a6c7d4c3500e151a418af6dbf1264f9,d8c979796eb6ddebdcf586726d0343c03627e90a,
29,refs/heads/master,108d20ff287c7a609cdf5b57fdd7908bf87207ce,3157e01d4769ff61f673366619276d9262855acb,8dc73495173f01111a9893989530af4521a8161a,
30,refs/heads/master,482ab01b384935b9d31d91eea9e494905b0c8109,1f170c2020d28ce42d5b3fcce130e7df9a31e184,5dadfb631d2e5abef57080a16d7b9a58b3d32f43,a parent is the base
31,refs/heads/master,b813f390184f26ea3f6cdeb2740564c1c0b15bb4,e6e5802a7930d999d20d978d3286410c7662f200,399749861538962b090e1f475f0f39e69ec5d3cf,
32,refs/heads/master,9148ece4c1bdbab7d61943d7e92c870282a0e2db,c1d41fe27fc972e00446490b90d09a0e58d9a0e1,1d14af3c219d5a4cdcbd8d5f79c01fc5ae1fa7f8,a parent is the base
33,refs/heads/master,8576d0143b48fb04e3a7166a9a1ca073c618ed31,4296edc36e681d8ab1f1447ed9b4ed19ab5842e7,907809b1c7fbb84f7ca891c2732000f08e15a76f,a parent is the base
34,refs/heads/master,1554fd68936777084cfe5933b2af9486699306fb,28d16e0495ecb946c68ff1a5787941b348ca991e,9ae0c70d4b65bc0e45414079a4286b86a0c9b912,a parent is the base
35,refs/heads/master,257343427a77271be8ad6fcf363d496e30296f0c,5fe18084d98e038d9e4195a110d53592fa56d47d,fd226b815073822bd9bcb3d0365607e5662611ff,
36,refs/heads/master,a3afd4684abeec7293b250f0deef6743e187d182,9d840ff7cdbb8d18fd8a1b7106aea37a352028dd,81bb36bf242044c13be2d22b2f4ff261acc9deec,a parent is the base
37,refs/heads/master,f2e4e525b994959fdc82549bb94893345034be2e,72acb10bf316a5355a48e1e74ed3866d535f0800,29dbf9e325b50843d51f10a55c45c0e71fd3745a,
38,refs/heads/master,0503e1a34e8277e76382eb0942124800063ca06f,170a221cb9fbe0163f89a6eec5e21453c79f9d51,c7bd6870bddce0d75ce4dc192f833b232f31d39b,a parent is the base
39,refs/heads/master,170a221cb9fbe0163f89a6eec5e21453c79f9d51,0544ade5179578a6a2dc10bbace436fbfabc47b3,8951d951d525da9d122a45e2f8e56c1fb18ddb11,a parent is the base
40,refs/heads/master,5518ad98139c9edf57f6f1d51908bdae44908bc9,086db69762a99958b876e6e8cb70edfad05eed45,404177575d1f16fa4f4c5940870d231463ac8bd6,a parent is the base
41,refs/heads/master,d7da0b351ccd2bb51c6bb1c48aa4f31b1f41c00c,bf69861b39ad0c42070046d2a15524f31825297d,d9d524ce2de112bf4faadf7dd81a2ac9bad0ef5e,a parent is the base
42,refs/heads/master,91f25512ec423d7d0b3a2ac570b44cc374a55922,df80bd623653a85280ccd6e0b962a00021c38a6d,415ca21d72d2b733b84216f9535ee37ab703724e,
43,refs/heads/master,6514863f2e6a9d164d05c0c1c7c8d452713bd02c,66e43dad9beac76357e53d0719e0382030250ede,8bfcdba4e57fa528564b853328e318db5059c943,
44,refs/heads/master,76d84a630cc0857c13e9e7402476fb8501b43d19,cd2addf5ae2e993e196b41f03490428d2749f7ec,cf4ce6598cb377d2c3692edfb1ed07263e5aef98,
45,refs/heads/master,458f1c980f5d6fa808798a447a1efc6e12684503,337692724ec9338ba87d71b14abc7eb6a45ed765,8df47574df9a4763a891b0f94a1a84152faf6425,a parent is the base
46,refs/heads/master,e791df038a44355294e6e0ab79489b37e89c4284,740760de37be7638034cfda937008a8bc2bf86a3,a7a63876d18691ca6fd1c5f41ef5a533116d706d,
47,refs/heads/master,854f2a533e97bf0b3c04a7f627efadd39c8f91b2,3989ff9f28a36395e713a7a06ffae0efbbb4ab8f,04c9228616116c3a78063b9f7751567aa1372217,a parent is the base
48,refs/heads/master,079d801d8732c8812dcae719630b66cef10c5955,ad24279dd7c89a6bfce13fdb50c0145a3879e659,1e122871f2e46d675a3e3686433b82b0715f92f3,a parent is the base
49,refs/heads/master,15bbc677f375c825efe13241659d468997c84676,d57339b3fe5e039db8a2399c964432b35ce8583a,1729a52608fe38ff7ea32ae11130aed0f2cbc5e9,a parent is the base
50,refs/heads/master,7a1b107ae752b556a883eade6ece115b6637560e,c7128ee59cdb0711f5fc46182ebd177c9392084e,5e2082301e39cc90b3b6311db3157dd4a9b2a956,
51,refs/heads/master,c4377f832165062d6549447b0ef00fa067da8c0d,a1f3bbf11b2b56e43a50193da2872ea4af6ebf76,bf5c747dd7c65b6898084bf68287525467466474,
52,refs/heads/master,bf5c747dd7c65b6898084bf68287525467466474,d1ea76e6e3598cd6a0d34879687652ef123f639b,83d45ec1ce2368f29674b18b3289f0c1cd9f41d9,a parent is the base
53,refs/heads/master,9bddb2e0bc7d4e7ae8998052db2265403edce099,9d59a4099c3234351e56ff6d63f58cb696ec1676,7c81414930feb73f36e72781e219517faa3f18f4,a parent is the base
54,
21 changes: 21 additions & 0 deletions results_trivial_merges/merges/Algorithms.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
idx,branch_name,merge_commit,parent_1,parent_2,notes
1,refs/heads/master,44ce61beeb8bb5c5c1289db02f1da53f6bff6d8a,e121b3943958ba1558d8828db6f13c632e99f298,58129e828567fac52e821ca147feeab87a95d780,a parent is the base
2,refs/heads/master,e866ae7916d6b763f7d32f72f54edd735b5ea6bc,ae5dac889d19edd6c773e60420f00d4e7177f31f,4342b16e18da9082b32d5b8e9b5b6e3378461ce4,
3,refs/heads/master,ae5dac889d19edd6c773e60420f00d4e7177f31f,38ec459e6f163991c6f88210720dcda4fecc64e8,eb3260404e596031bc9ee037b29bd1fcbb87f625,a parent is the base
4,refs/heads/master,38ec459e6f163991c6f88210720dcda4fecc64e8,60d87e9a120e330eb34c9d558d0f00e52b5ce438,aa882141f26ef82107658c214ec18a799403bb57,a parent is the base
5,refs/heads/master,d7e0b1c03fa7cacf40b32dcfde30871e8947445a,2c4e69eb243a81ba05d24456b3cad7e8a696f630,8a1a1a7fb53732edaf17ef9876545c4bca568e05,
6,refs/heads/master,60d87e9a120e330eb34c9d558d0f00e52b5ce438,bceffabe0d850ea9c67c93a9fb578d2ca8600022,9aa3611952f1715d8f5cf6404a3dad0e95bf175f,a parent is the base
7,refs/heads/master,bceffabe0d850ea9c67c93a9fb578d2ca8600022,247b66cb2c7792336c5d1c2c1502a55d5222c823,67360ca7159643f3a9fc20f30e164b36a4e4f859,
8,refs/heads/master,247b66cb2c7792336c5d1c2c1502a55d5222c823,c7c288a43e324748f1f25ee72f9639d808c70b7e,7f89b8c5fbe85848e96a0cdaffb83664588c8474,a parent is the base
9,refs/heads/master,c7c288a43e324748f1f25ee72f9639d808c70b7e,ffa4a6ccd332fad6dc1c5a269b3854a5a2bfff91,296f6b09446b63e8b036e4840879c2d890ae925d,a parent is the base
10,refs/heads/master,216529baa98d8646b192b1c6897b01d3181f2ac6,ffa4a6ccd332fad6dc1c5a269b3854a5a2bfff91,deaa316e2165940e50e4e00e83e18d27417fb642,a parent is the base
11,refs/heads/master,ffa4a6ccd332fad6dc1c5a269b3854a5a2bfff91,128ccf0f25f401f2218c03166a6f4ebc5ce21385,03d7c1872d5b17434fd460f7b8a0b8c9c90849f7,a parent is the base
12,refs/heads/master,128ccf0f25f401f2218c03166a6f4ebc5ce21385,1f8f61c50d4e36ab8677b271a58648e90a2f1b28,22ee3ce03f74349ed3b0f36bfdf1dc119e2be70b,a parent is the base
13,refs/heads/master,c8604d6f6d23a0cd5d3f9fac472dbf467fe11b8e,7ebdadbc657a68da22826ce3cc402e3635e80d4c,fd87cbc2cdbe813564f0a2c7e8070964220cdcc6,a parent is the base
14,refs/remotes/origin/pull/27,fdd92255570bf37534ba36f632773923d60e32d2,8edac208c376e88626e88a720c9166fef9588853,1a71e9f95183a089b2b72a0cb42337681594e699,
15,refs/remotes/origin/pull/37,6b917cc6a33eb87fec2dcdafc845177f470ca374,8ef7da30196fba8e55947acf6168d8cd4a82f2b8,68f656ff10751259284d083e8fdf8e82f7ada15f,
16,refs/remotes/origin/pull/37,8ef7da30196fba8e55947acf6168d8cd4a82f2b8,37e80741a853a6626a77aed38caa07f4e44d85b2,8b2e3b06185e4a111ae987db7fa01901974036cd,
17,refs/remotes/origin/pull/37,680f2603dc41bb7c5843b0fa342e829210611d9d,1477ce25eaad76986f50aa5b740e2c023ff31de2,879fb60972e4e83fdb7b5337db66c8afbfb95ffc,
18,refs/remotes/origin/pull/37,d1279d1b59ecba7f01de8b2c1995562f92b2e255,b636ef254a97ae830baa6d783121de7890818785,9497e2f66d7af3feedd3106faa6e8b0aa6118b41,
19,refs/remotes/origin/pull/37,104eb9ed88cde145576ea1df50460915af488e74,6baa2ed219e18f9763bb2f2de74c5fb800d15899,99a155f67dfe68de440feb560a7e4c4ee5ae355c,
20,refs/remotes/origin/pull/73,9c8740d0e38ba93f08bfb462d16cab448a0197f1,7ebdadbc657a68da22826ce3cc402e3635e80d4c,4e2214112de23d1319ce77736547fa8900384e7c,a parent is the base
Loading