Code

V2 update#184

Code

Merged

mernst merged 117 commits intomainbenedikt-schesch/AST-Merging-Evaluation:mainfrom v2-updatebenedikt-schesch/AST-Merging-Evaluation:v2-updateCopy head branch name to clipboardSep 30, 2023

+2,806-106,762

Commits

Commits on Aug 8, 2023

• Adapted validate repos

  benedikt-schesch

  committed
  fa8e2a0

• Makefile update

  benedikt-schesch

  committed
  e1a9324

• Validate repos refactoring

  benedikt-schesch

  committed
  808d1ce

• Supress warning

  benedikt-schesch

  committed
  2d34a89

• Sort local repos

  Show description for 22b40d4
  benedikt-schesch

  committed
  22b40d4

• Merge branch 'main' into v2-update

  benedikt-schesch

  committed
  8dd6af3

Commits on Aug 9, 2023

• Further changes

  benedikt-schesch

  committed
  8dbe68e

• Added merge filter

  benedikt-schesch

  committed
  5b2b0d0

• Don't output the merge base (#186)

  mernst

  authored
  7bbae3b

• Revert "Don't output the merge base (#186)" (#187)

  Show description for 0105071
  benedikt-schesch

  authored
  0105071

• Don't output the merge base (#188)

  benedikt-schesch

  authored
  7653166

Commits on Aug 10, 2023

• Make the output of git merge -s resolve deterministic

  mernst

  committed
  c33c53f

• Don't output the merge base (#189)

  mernst

  authored
  1138d6c

• Fix typo

  mernst

  committed
  ed87710

• Merge remote-tracking branch 'origin/resolve_deterministic' into v2-update

  benedikt-schesch

  committed
  daaf155

• Make the output of git merge -s resolve deterministic (#191)

  mernst

  authored
  6efdec9

• Merge branch 'v2-update' of github.com:benedikt-schesch/AST-Merging-Evaluation into v2-update

  benedikt-schesch

  committed
  ef35fd9

• Gitmerge resolve bug fix

  benedikt-schesch

  committed
  b7f7add

• V1 merge tester

  benedikt-schesch

  committed
  d672dd6

• Merge Tester Update

  benedikt-schesch

  committed
  f3e20b1

Commits on Aug 11, 2023

• Add index to output of FindMergeCommits (#193)

  mernst

  authored
  31fa337

• Further changes

  benedikt-schesch

  committed
  ee0614d

• Further changes

  benedikt-schesch

  committed
  0cd2a8c

• Faster caching

  benedikt-schesch

  committed
  3943d42

• Style fix

  benedikt-schesch

  committed
  7c1eb5f

Commits on Aug 12, 2023

• Test fix

  benedikt-schesch

  committed
  5c72432

• Further changes

  benedikt-schesch

  committed
  e2c2eeb

• Futher changes

  benedikt-schesch

  committed
  caea78b

• .gitignore update

  benedikt-schesch

  committed
  1e8518e

• README refactoring

  Show description for ee0e439
  benedikt-schesch

  committed
  ee0e439

• Test update

  benedikt-schesch

  committed
  215d045

• Test update

  benedikt-schesch

  committed
  b3d46eb

• Style fix

  benedikt-schesch

  committed
  79db031

Commits on Aug 13, 2023

• Add shebang

  benedikt-schesch

  committed
  65cbc22

• requirements update

  benedikt-schesch

  committed
  bbbd97c

• test case update

  benedikt-schesch

  committed
  d9bef35

• Merge branch 'v2-update' of github.com:benedikt-schesch/AST-Merging-Evaluation into v2-update

  benedikt-schesch

  committed
  c13f2fd

• Use mamba for faster intall

  benedikt-schesch

  committed
  97e89b5

• readme update

  benedikt-schesch

  committed
  db3b331

• Added plot

  benedikt-schesch

  committed
  09e996a

• removed html file

  benedikt-schesch

  committed
  6be1f97

• Test folder rename

  benedikt-schesch

  committed
  46890fd

• Test

  benedikt-schesch

  committed
  2fd5d13

• Add diff

  benedikt-schesch

  committed
  5fe4f83

• Added all files

  benedikt-schesch

  committed
  02d6a58

• Fix

  benedikt-schesch

  committed
  0d8e414

• added hashes

  benedikt-schesch

  committed
  a0af5ac

• new hashes

  benedikt-schesch

  committed
  53bad49

• new hashes

  benedikt-schesch

  committed
  6377ec7

• Fix hashes computations

  benedikt-schesch

  committed
  c85b27d

• Style fix

  benedikt-schesch

  committed
  434695f

• Style fix

  benedikt-schesch

  committed
  bde31aa

Commits on Aug 14, 2023

• Permit parallel execution of some loops (#195)

  mernst

  authored
  0d8fc32

• Reduced requirements and number of log files

  benedikt-schesch

  committed
  cfcd487

• Added merge differ

  benedikt-schesch

  committed
  a4ae422

• Bug fix

  benedikt-schesch

  committed
  78c0464

• Illustration update

  benedikt-schesch

  committed
  9573dc1

• Fixes

  benedikt-schesch

  committed
  2fd5b29

• Bug fix

  benedikt-schesch

  committed
  33f5303

• Test case update

  benedikt-schesch

  committed
  b420d71

• Changed order of git diff

  benedikt-schesch

  committed
  687fc38

• Style fix

  benedikt-schesch

  committed
  fcfcd11

• Deleted results

  benedikt-schesch

  committed
  d3f454d

• Added resolve-import-conflicts tool (#196)

  benedikt-schesch

  authored
  06defa3

• Added tool (#197)

  benedikt-schesch

  authored
  e14688f

• Removed trivial merge filtering

  benedikt-schesch

  committed
  64498aa

Commits on Aug 16, 2023

• Mike's code review changes

  mernst

  committed
  26d035c

• Merge branch 'v2-update' of github.com:benedikt-schesch/AST-Merging-Evaluation into v2-update

  mernst

  committed
  1dd234b

Commits on Aug 18, 2023

• Changes

  benedikt-schesch

  committed
  c02d107

• Style fix

  benedikt-schesch

  committed
  fcc3023

• Added changes

  benedikt-schesch

  committed
  41e1dd7

• Style fix

  benedikt-schesch

  committed
  b31c687

• Further changes

  benedikt-schesch

  committed
  74c942e

• Further changes

  benedikt-schesch

  committed
  b4bf59c

• Grouped package import

  benedikt-schesch

  committed
  28a5960

• Permision change

  benedikt-schesch

  committed
  efe42ac

• Added pandera typing

  benedikt-schesch

  committed
  65f54cb

• Style fix

  benedikt-schesch

  committed
  e48cc19

• Test fix

  benedikt-schesch

  committed
  c2a141a

• Test case update

  benedikt-schesch

  committed
  646ba94

Commits on Aug 21, 2023

• Removed prefix

  benedikt-schesch

  committed
  c66eff2

• Updates

  benedikt-schesch

  committed
  75a46d4

• Updated test results

  benedikt-schesch

  committed
  de99e20

Commits on Aug 22, 2023

• Documentation changes and renamings (#200)

  mernst

  authored
  144f01c

• Use "a parent is the base" instead of "trivial merge" (#199)

  mernst

  authored
  fee21fb

• Abstract out function get_merge_fingerprint() (#198)

  mernst

  authored
  ed614c0

• Rename "Validation hash" to "head hash" (#202)

  mernst

  authored
  e6e7938

• Abstract out function slug_repo_name() (#201)

  mernst

  authored
  1400e42

Commits on Aug 23, 2023

• Documentation improvements, and refactorings (#203)

  mernst

  authored
  76f789c

• Be more explicit about file name (#204)

  mernst

  authored
  c392080

• Rename filter_run_time to remove_run_time (#205)

  mernst

  authored
  39cd033

• Improve diagnostics (#206)

  mernst

  authored
  355c3b0

Commits on Aug 25, 2023

• Code review changes

  benedikt-schesch

  committed
  a318c0a

• Style fix

  benedikt-schesch

  committed
  eb9c2cc

Commits on Aug 29, 2023

• Further integration of comments

  benedikt-schesch

  committed
  2e6bd66

• Added flag

  benedikt-schesch

  committed
  e2bf241

• Added more debug prints

  benedikt-schesch

  committed
  adaf365

• Style fix

  benedikt-schesch

  committed
  8c61b1c

Commits on Aug 30, 2023

• Test fix + bug fix

  benedikt-schesch

  committed
  f114771

• Style fix

  benedikt-schesch

  committed
  2ee31a0

• Bug fix

  benedikt-schesch

  committed
  0e0d86c

Commits on Aug 31, 2023

• Added comments

  benedikt-schesch

  committed
  ee64059

• Added comments

  benedikt-schesch

  committed
  a4d310d

• Typo fixes

  mernst

  committed
  62a90de

Commits on Sep 12, 2023

• Rename test_repo_head.py to test_repo_heads.py

  mernst

  authored
  5d510aa

Commits on Sep 13, 2023

• Renamings

  mernst

  authored
  5415252

Commits on Sep 14, 2023

• Check settings of environment variables (#213)

  mernst

  authored
  f7c1c2b

• Mike's code review changes (#207)

  mernst

  authored
  06c9934

• Add comments (#216)

  mernst

  authored
  5914031

Commits on Sep 19, 2023

• Reduce code duplication (#212)

  mernst

  authored
  a76a1a6

Commits on Sep 26, 2023

• Fix usage comments

  mernst

  committed
  f18f2ce

Commits on Sep 27, 2023

• Mike's code review comments (#208)

  mernst

  authored
  d5a8de8

• Spell-check

  mernst

  committed
  4328d9d

• Rename issubsequence to is_subsequence

  mernst

  committed
  623b6e0

• Turn off diagnostic output

  mernst

  committed
  5bb20c5

Commits on Sep 29, 2023

• Fixed type hints

  benedikt-schesch

  committed
  9a2e9a5

• Modified _ to - in latex output

  benedikt-schesch

  committed
  f2c8b96