Code

Update import merge tool#271

Code

Merged

benedikt-schesch merged 90 commits intomainbenedikt-schesch/AST-Merging-Evaluation:mainfrom update-importbenedikt-schesch/AST-Merging-Evaluation:update-importCopy head branch name to clipboardJun 6, 2024

+60,899-40,050

Commits

Commits on Jun 6, 2024

• Update

  

  benedikt-schesch

  authored and

  Benedikt Schesch

  committed
  19d777c

• Bug fix

  

  benedikt-schesch

  authored and

  Benedikt Schesch

  committed
  67fd1eb

• Fixed imports

  

  benedikt-schesch

  authored and

  Benedikt Schesch

  committed
  7d388b6

• Update

  

  benedikt-schesch

  authored and

  Benedikt Schesch

  committed
  66432cf

• Style fix

  

  benedikt-schesch

  authored and

  Benedikt Schesch

  committed
  820413d

• Modified test results

  

  Benedikt Schesch

  committed
  68036aa

• BUg fix

  

  benedikt-schesch

  authored and

  Benedikt Schesch

  committed
  23640ac

• Restore old file

  

  benedikt-schesch

  authored and

  Benedikt Schesch

  committed
  f00ce02

• Comment fix

  

  benedikt-schesch

  authored and

  Benedikt Schesch

  committed
  90fb316

• Added latest results

  

  benedikt-schesch

  authored and

  Benedikt Schesch

  committed
  9d84bb7

• Build fixes (#277)

  

  mernst

  authored and

  Benedikt Schesch

  committed
  f36e559

• Added run data

  

  benedikt-schesch

  authored and

  Benedikt Schesch

  committed
  2f3a75b

• Modified results

  

  benedikt-schesch

  authored and

  Benedikt Schesch

  committed
  96108e5

• Include merge fingerprints in output

  

  mernst

  authored and

  Benedikt Schesch

  committed
  b75936e

• Add --dont_check_fingerprints command-line argument

  

  mernst

  authored and

  Benedikt Schesch

  committed
  854fef4

• Modified replay merge

  

  benedikt-schesch

  authored and

  Benedikt Schesch

  committed
  c911bf2

• Newest results

  

  benedikt-schesch

  authored and

  Benedikt Schesch

  committed
  3b29bd5

• Added some data

  

  Benedikt Schesch

  committed
  c3e5860

• Simplification

  

  Benedikt Schesch

  committed
  a348cf7

• Undo whitespace change

  

  mernst

  authored and

  Benedikt Schesch

  committed
  cac94ff

• Fix typo

  

  mernst

  authored and

  Benedikt Schesch

  committed
  747c246

• Indicate which script is producing output (#290)

  

  mernst

  authored and

  Benedikt Schesch

  committed
  1ab3f39

• Reset results

  

  benedikt-schesch

  authored and

  Benedikt Schesch

  committed
  020cc82

• Removed debugging problem

  

  benedikt-schesch

  authored and

  Benedikt Schesch

  committed
  0afa3a8

• Update

  

  benedikt-schesch

  authored and

  Benedikt Schesch

  committed
  ab8485f

• Added submodule

  

  benedikt-schesch

  authored and

  Benedikt Schesch

  committed
  aa2517f

• Fixed imports

  

  benedikt-schesch

  authored and

  Benedikt Schesch

  committed
  253de6f

• Update

  

  benedikt-schesch

  authored and

  Benedikt Schesch

  committed
  0aaca40

• Restore old file

  

  benedikt-schesch

  authored and

  Benedikt Schesch

  committed
  61d363b

• Comment fix

  

  benedikt-schesch

  authored and

  Benedikt Schesch

  committed
  b1ee6e5

• Added run data

  

  benedikt-schesch

  authored and

  Benedikt Schesch

  committed
  f8ad72d

• Include merge fingerprints in output

  

  mernst

  authored and

  Benedikt Schesch

  committed
  9f6d0b8

• Add --dont_check_fingerprints command-line argument

  

  mernst

  authored and

  Benedikt Schesch

  committed
  f2c2a73

• Modified replay merge

  

  benedikt-schesch

  authored and

  Benedikt Schesch

  committed
  be8f505

• Newest results

  

  benedikt-schesch

  authored and

  Benedikt Schesch

  committed
  971d502

• Added some data

  

  Benedikt Schesch

  committed
  8c60ada

• Simplification

  

  Benedikt Schesch

  committed
  2966f18

• Undo whitespace change

  

  mernst

  authored and

  Benedikt Schesch

  committed
  ebf5e37

• Fix typo

  

  mernst

  authored and

  Benedikt Schesch

  committed
  2c89bfd

• Reset results

  

  benedikt-schesch

  authored and

  Benedikt Schesch

  committed
  83f08a0

• Removed debugging problem

  

  benedikt-schesch

  authored and

  Benedikt Schesch

  committed
  ad15ee5

• Deleted unused script

  

  Benedikt Schesch

  committed
  1710e50

• Tweaks

  

  mernst

  authored and

  Benedikt Schesch

  committed
  f9f4cca

• Get base, left, right, and programmer merge

  

  mernst

  authored and

  Benedikt Schesch

  committed
  1e0eb21

• Align with upstream

  

  mernst

  authored and

  Benedikt Schesch

  committed
  205dfe4

• Removed file

  

  benedikt-schesch

  authored and

  Benedikt Schesch

  committed
  87c5c63

• Reverted results

  

  benedikt-schesch

  authored and

  Benedikt Schesch

  committed
  2f074b9

• Update test results

  

  benedikt-schesch

  authored and

  Benedikt Schesch

  committed
  bb72aeb

• Added latest data

  

  benedikt-schesch

  authored and

  Benedikt Schesch

  committed
  fba3937

• Change pushurl

  

  mernst

  authored and

  Benedikt Schesch

  committed
  8fe0791

• Simplify command

  

  mernst

  authored and

  Benedikt Schesch

  committed
  c1c0fa3

• Update submodule

  

  mernst

  authored and

  Benedikt Schesch

  committed
  7a55fd7

• Added latest tools

  

  benedikt-schesch

  authored and

  Benedikt Schesch

  committed
  d5ee1ec

• New merge tools

  

  benedikt-schesch

  authored and

  Benedikt Schesch

  committed
  291a05e

• Repo fix

  

  benedikt-schesch

  authored and

  Benedikt Schesch

  committed
  7ba856f

• Added latest info

  

  benedikt-schesch

  authored and

  Benedikt Schesch

  committed
  bab646c

• Fix

  

  benedikt-schesch

  authored and

  Benedikt Schesch

  committed
  e64804b

• Reset results

  

  benedikt-schesch

  authored and

  Benedikt Schesch

  committed
  37d1861

• Reverted some changes

  

  benedikt-schesch

  authored and

  Benedikt Schesch

  committed
  b16b7cd

• Style fix

  

  benedikt-schesch

  authored and

  Benedikt Schesch

  committed
  9285262

• Delete workdir if it does not exist

  

  benedikt-schesch

  authored and

  Benedikt Schesch

  committed
  5c55d1f

• Update test results

  

  benedikt-schesch

  authored and

  Benedikt Schesch

  committed
  5fc474f

• updated delete scripts

  

  benedikt-schesch

  authored and

  Benedikt Schesch

  committed
  a6f7606

• Update merge_plumelib

  

  Benedikt Schesch

  committed
  22e2a49

• Updatge merge_plumelib

  

  Benedikt Schesch

  committed
  fa2b400

• Update print

  

  Benedikt Schesch

  committed
  dab2c3a

• Style fix

  

  Benedikt Schesch

  committed
  822be4f

• Added latest tool

  

  Benedikt Schesch

  committed
  e87cca3

• Use new git-mergetool.sh

  

  mernst

  authored and

  Benedikt Schesch

  committed
  667d4fa

• Fix script name

  

  mernst

  authored and

  Benedikt Schesch

  committed
  1d7e045

• Improve diagnostics

  

  mernst

  authored and

  Benedikt Schesch

  committed
  e27f074

• Updated submodules to latest commits

  

  benedikt-schesch

  authored and

  Benedikt Schesch

  committed
  0890eb3

• Update

  

  benedikt-schesch

  authored and

  Benedikt Schesch

  committed
  087ad17

• Added latest data

  

  benedikt-schesch

  authored and

  Benedikt Schesch

  committed
  a9e8699

• Update subproject

  

  mernst

  authored and

  Benedikt Schesch

  committed
  7589f89

• Fix directory where git merge-base is called

  

  mernst

  authored and

  Benedikt Schesch

  committed
  0de9bf9

• Use latest plume-lib merging

  

  mernst

  authored and

  Benedikt Schesch

  committed
  4f1d95c

• Test results update

  

  benedikt-schesch

  authored and

  Benedikt Schesch

  committed
  f0c6355

• Added latest data

  

  benedikt-schesch

  authored and

  Benedikt Schesch

  committed
  6a9fbbd

• Removed the use of parallel

  

  Benedikt Schesch

  committed
  167585f

• Don't set JAVA_HOME, fix use of --all

  

  mernst

  authored and

  Benedikt Schesch

  committed
  0bfcbbd

• Update merging submodule

  

  mernst

  authored and

  Benedikt Schesch

  committed
  1a9a371

• Reduce width of column headers

  

  mernst

  authored and

  Benedikt Schesch

  committed
  2a4c21b

• Added latest data

  

  benedikt-schesch

  authored and

  Benedikt Schesch

  committed
  0012d32

• Removed -q

  

  benedikt-schesch

  authored and

  Benedikt Schesch

  committed
  0ca900b

• Rebased main

  

  benedikt-schesch

  authored and

  Benedikt Schesch

  committed
  911edb9

• Update plumelib

  

  benedikt-schesch

  authored and

  Benedikt Schesch

  committed
  13723d4

• Update plume-lib merging; fixes a bug, so it changes output

  

  mernst

  authored and

  Benedikt Schesch

  committed
  6424067

• Build plume-lib merging, in case the user forgets (#299)

  

  mernst

  authored and

  Benedikt Schesch

  committed
  720ac05

• Update plots and merged main

  

  Benedikt Schesch

  committed
  c6dd35b