Code

Add mergiraf to the evaluated tools#380

Code

Merged

benedikt-schesch merged 30 commits intobenedikt-schesch:mainbenedikt-schesch/AST-Merging-Evaluation:mainfrom wetneb:add_mergirafwetneb/AST-Merging-Evaluation:add_mergirafCopy head branch name to clipboardJan 27, 2025

+129,248-73,817

Commits

Commits on Nov 13, 2024

• Add mergiraf to the evaluated tools

  wetneb

  committed
  a776ab7

  Copy full SHA for a776ab7

Commits on Nov 14, 2024

• Review and linting suggestions

  wetneb

  committed
  651fb4d

  Copy full SHA for 651fb4d

• Use --local for explicitness (even though it's the default)

  mernst

  committed
  77f9707

  Copy full SHA for 77f9707

• Add mergiraf_plus.sh that runs Mergiraf then Plume-lib Merging

  mernst

  committed
  4b2708f

  Copy full SHA for 4b2708f

• mergiraf_absolutepath is a variable that holds a path, not a command that yields a path

  mernst

  committed
  bb24ded

  Copy full SHA for bb24ded

• Merge ../AST-Merging-Evaluation-branch-main into add_mergiraf

  mernst

  committed
  aff2668

  Copy full SHA for aff2668

• Updated test results

  benedikt-schesch

  committed
  893b590

  Copy full SHA for 893b590

Commits on Nov 15, 2024

• Added latest results

  benedikt-schesch

  committed
  09e6e70

  Copy full SHA for 09e6e70

• Add debugging code

  benedikt-schesch

  committed
  bb440ff

  Copy full SHA for bb440ff

Commits on Nov 16, 2024

• Added more debbuging code

  benedikt-schesch

  committed
  67a5cc5

  Copy full SHA for 67a5cc5

Commits on Jan 16, 2025

• Merge branch 'main' into add_mergiraf

  benedikt-schesch

  committed
  d753b4a

  Copy full SHA for d753b4a

• Updated test results

  benedikt-schesch

  committed
  b05f7af

  Copy full SHA for b05f7af

Commits on Jan 20, 2025

• Added latest test data

  benedikt-schesch

  committed
  126de8f

  Copy full SHA for 126de8f

• Fix in makefile

  benedikt-schesch

  committed
  1d00845

  Copy full SHA for 1d00845

• Updated to mergiraf v0.4

  benedikt-schesch

  committed
  80428d2

  Copy full SHA for 80428d2

Commits on Jan 21, 2025

• Use cargo install instead

  benedikt-schesch

  committed
  6e878d4

  Copy full SHA for 6e878d4

• Added hash testing in small-test

  benedikt-schesch

  committed
  1ee924f

  Copy full SHA for 1ee924f

• Check Hashes in ci/cd

  benedikt-schesch

  committed
  63f5566

  Copy full SHA for 63f5566

• Show which hashes are missing

  benedikt-schesch

  committed
  9c39f11

  Copy full SHA for 9c39f11

• Show which hashes are missing

  benedikt-schesch

  committed
  0e0e2ec

  Copy full SHA for 0e0e2ec

• More debugging code

  benedikt-schesch

  committed
  072173d

  Copy full SHA for 072173d

• Added hashes

  benedikt-schesch

  committed
  1bea400

  Copy full SHA for 1bea400

Commits on Jan 22, 2025

• New hashes

  benedikt-schesch

  committed
  ef7d37e

  Copy full SHA for ef7d37e

• Ignore resolve and intellimerge

  benedikt-schesch

  committed
  6776896

  Copy full SHA for 6776896

Commits on Jan 24, 2025

• Mergiraf v0.4.0 results

  benedikt-schesch

  committed
  cd2ca8a

  Copy full SHA for cd2ca8a

Commits on Jan 26, 2025

• New small tests

  benedikt-schesch

  committed
  b7a61b9

  Copy full SHA for b7a61b9

• Added hashes

  benedikt-schesch

  committed
  08a81d9

  Copy full SHA for 08a81d9

Commits on Jan 27, 2025

• Updated results for hiresmerge

  benedikt-schesch

  committed
  4cf4de4

  Copy full SHA for 4cf4de4

• Install mergiraf in ci/cd

  benedikt-schesch

  committed
  c6356a5

  Copy full SHA for c6356a5

• Add latest results

  benedikt-schesch

  committed
  98de815

  Copy full SHA for 98de815