Code

Adjacent plus plumelib plus app pre9#373

Code

Closed

benedikt-schesch wants to merge 68 commits intobenedikt-schesch:mainbenedikt-schesch/AST-Merging-Evaluation:mainfrom mernst:adjacent-plus-plumelib-plus-app-pre9mernst/AST-Merging-Evaluation:adjacent-plus-plumelib-plus-app-pre9Copy head branch name to clipboard

+251-44

Commits

Commits on Sep 16, 2024

• Rename plumelib_ort_adjacent => adjacent

  mernst

  committed
  94df8e2

Commits on Sep 17, 2024

• Rename two more scripts

  mernst

  committed
  8dbc924

• Rename two more scripts

  mernst

  committed
  64e0499

• Rename two more scripts

  mernst

  committed
  abcf44a

• Merge ../AST-Merging-Evaluation-fork-mernst-branch-plumelib-script-naming into adjacent-plus-plumelib

  mernst

  committed
  b393866

• Don't use non-existent scripts yet

  mernst

  committed
  569f857

• Merge ../AST-Merging-Evaluation-fork-mernst-branch-plumelib-script-naming into adjacent-plus-plumelib

  mernst

  committed
  6a11592

• Comment about unneeded scripts

  mernst

  committed
  b4bae88

• Remove non-existent scripts

  mernst

  committed
  cf8ab1c

• Merge ../AST-Merging-Evaluation-fork-mernst-branch-plumelib-script-naming into adjacent-plus-plumelib

  mernst

  committed
  e5c5370

• Update goals

  mernst

  committed
  bb3dad0

• Revert test results for better visibility

  benedikt-schesch

  committed
  7ec7ee1

• Merged main

  benedikt-schesch

  committed
  0728653

Commits on Sep 18, 2024

• Rename tools

  mernst

  authored
  5f20e4c

Commits on Sep 19, 2024

• Fix name of script in mergetool..cmd

  mernst

  committed
  083d6d4

• Improve diagnostics

  mernst

  committed
  503eb35

• Update plume-lib merging

  mernst

  committed
  de995e5

• Fix target name

  mernst

  committed
  a6b4ac1

• Improve Python style

  mernst

  committed
  f4654f9

• Update small-test goals

  mernst

  committed
  c98eb96

• How to update small-test goals

  mernst

  committed
  b5d9e2e

• Improve diagnostic

  mernst

  committed
  d29359f

• Merge branch 'plm-script-name' of github.com:mernst/AST-Merging-Evaluation into plm-script-name

  mernst

  committed
  97f169e

• Initialize variables

  mernst

  committed
  4a07bd3

• Update goal

  mernst

  committed
  b5766fe

• Merge ../AST-Merging-Evaluation-fork-mernst-branch-plm-script-name into adjacent-plus-plumelib

  mernst

  committed
  c5c0d2a

• Update submodule

  mernst

  committed
  57d3829

• Fix behavior

  mernst

  committed
  fd4be43

• Add a complete set of "_plus" scripts

  mernst

  committed
  dc49ce2

• Reduce gratuitous differences

  mernst

  committed
  f2b57b7

• Script updates

  mernst

  committed
  ca2c843

• Update results

  mernst

  committed
  049c389

• Tweak style check

  mernst

  committed
  850d102

• Merge ../AST-Merging-Evaluation-fork-mernst-branch-plm-script-name into adjacent-plus-plumelib

  mernst

  committed
  2ad9b3f

• Update goal files

  mernst

  committed
  5116fe0

Commits on Sep 20, 2024

• Revert test results

  benedikt-schesch

  committed
  ff49cab

• Revert results

  benedikt-schesch

  committed
  6409b2f

• revert results

  benedikt-schesch

  committed
  8ac02d6

• Updated test results

  benedikt-schesch

  committed
  186ae5e

• added latest test results

  benedikt-schesch

  committed
  3e3fc0f

• Add a line to README

  mernst

  committed
  a5ff4c7

Commits on Sep 21, 2024

• Quieter compilation

  mernst

  committed
  71e6346

• Fixes

  mernst

  committed
  53c86f2

• Documentation

  mernst

  committed
  c09679b

• Run nativeCompile too

  mernst

  committed
  9dc6cb9

• Documenttion & update plume-lib merging

  mernst

  committed
  e518789

Commits on Sep 22, 2024

• Update merging

  mernst

  committed
  bf7ec72

• Correct order of arguments

  mernst

  committed
  08eee89

• Merge branch 'adjacent-plus-plumelib' of github.com:mernst/AST-Merging-Evaluation into adjacent-plus-plumelib

  mernst

  committed
  22f829e

• Correct order of arguments

  mernst

  committed
  0f84f17

• Merge ../AST-Merging-Evaluation-fork-mernst-branch-app-pre9 into adjacent-plus-plumelib

  mernst

  committed
  c85d1e9

• Don't use verbose by default

  mernst

  committed
  1055d43

• Update tests

  mernst

  committed
  5a0e5ad

• Remove output to standard error

  mernst

  committed
  324858f

• Merge branch 'adjacent-plus-plumelib' of github.com:mernst/AST-Merging-Evaluation into adjacent-plus-plumelib

  mernst

  committed
  8167673

• Merge ../AST-Merging-Evaluation-fork-mernst-branch-adjacent-plus-plumelib into adjacent-plus-plumelib-plus-app-pre9

  mernst

  committed
  2fce3f8

• Fix typo

  mernst

  committed
  4037c79

• Merge branch 'adjacent-plus-plumelib' of github.com:mernst/AST-Merging-Evaluation into adjacent-plus-plumelib

  mernst

  committed
  68e5e9d

• Merge ../AST-Merging-Evaluation-fork-mernst-branch-adjacent-plus-plumelib into adjacent-plus-plumelib-plus-app-pre9

  mernst

  committed
  e2009ca

• Newer plume-lib merging

  mernst

  committed
  8e2ff27

• Merge ../AST-Merging-Evaluation-fork-mernst-branch-adjacent-plus-plumelib into adjacent-plus-plumelib-plus-app-pre9

  mernst

  committed
  fa3fc94

• Merge branch 'main' into app-pre9

  benedikt-schesch

  authored
  43702af

• Merge branch 'main' into adjacent-plus-plumelib

  benedikt-schesch

  committed
  e9fc2ca

• Added latest test results

  benedikt-schesch

  committed
  db1e07d

• Merge ../AST-Merging-Evaluation-fork-mernst-branch-adjacent-plus-plumelib into adjacent-plus-plumelib-plus-app-pre9

  mernst

  committed
  7f546c1

• Merge ../AST-Merging-Evaluation-fork-mernst-branch-adjacent-plus-plumelib into app-pre9

  mernst

  committed
  4569c0e

• Merge ../AST-Merging-Evaluation-fork-mernst-branch-app-pre9 into adjacent-plus-plumelib-plus-app-pre9

  mernst

  committed
  3799534

• Correct order of arguments

  mernst

  committed
  c85aff1