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

Jump to bottom

Update import merge tool #271

Merged

benedikt-schesch merged 90 commits into main from update-import

Jun 6, 2024

Owner

benedikt-schesch commented Apr 25, 2024

No description provided.

Owner Author

benedikt-schesch commented May 10, 2024

@mernst Any clue why the merge tool is crashing in the CI/CD pipeline?

benedikt-schesch force-pushed the update-import branch from 8b242d4 to 77f7028 Compare

May 13, 2024 15:03

Owner Author

benedikt-schesch commented May 13, 2024

@mernst The number of incorrect merges is double the previous amount.

Collaborator

mernst commented May 13, 2024

OK, I will investigate.

benedikt-schesch mentioned this pull request

Support zsh #289

Closed

benedikt-schesch force-pushed the update-import branch from 9053e13 to 25ba568 Compare

May 19, 2024 20:29

benedikt-schesch force-pushed the update-import branch from f302562 to b91f693 Compare

May 27, 2024 20:35

benedikt-schesch requested a review from mernst

May 27, 2024 20:39

mernst approved these changes

View reviewed changes

Collaborator

mernst left a comment

This overall looks good, but I have a couple of concerns; please see comments.

src/scripts/merge_tools/merge_plumelib.sh Outdated

+              retVal=$?
+              # report conflicts
+              if [ "$retVal" -ne 0 ]; then

Collaborator

mernst May 28, 2024

Any tool that involves "imports" needs to run regardless of the return value of git merge.

Owner Author

benedikt-schesch May 28, 2024 •

edited

Loading

@mernst Is it fine in the current version where I just always call it?

Collaborator

mernst May 28, 2024

Yes. The default version runs annotations, imports, and version-numbers.
(Defaults are listed at https://github.com/plume-lib/merging/#features .)

src/scripts/merge_tools/merge_plumelib.sh Outdated

+                  # Check if there are still conflicts
+                  diffs=$(git diff --name-only --diff-filter=U)
+                  if [ -z "$diffs" ]; then
+                      git commit -m "Resolved conflicts"

Collaborator

mernst May 28, 2024

It is possible that there was already a merge commit created by git merge. In that case, this should probably amend the merge commit (or maybe create a new, additional commit).
It may be necessary to run git add, or add a . argument to git commit.

mernst reviewed

View reviewed changes

src/scripts/merge_tools/merge_plumelib.sh Outdated Show resolved Hide resolved

mernst approved these changes

View reviewed changes

Collaborator

mernst left a comment

This looks good. Thanks!

src/scripts/merge_tools/merge_plumelib.sh Outdated

		@@ -0,0 +1,50 @@
		#!/usr/bin/env sh

		# usage: ./gitmerge_ort_imports_ignorespace.sh <clone_dir> <branch-1> <branch-2> <git_strategy> <merge_strategy>

Collaborator

mernst May 28, 2024

Wrong usage message, it refers to gitmerge_ort_imports_ignorespace.sh.

src/scripts/merge_tools/merge_plumelib.sh Outdated


		echo "git_merge_plumelib: Merging $branch1 and $branch2 with git_strategy=$git_strategy and merge_strategy=$merge_strategy"

		# shellcheck disable=SC2153 # "JAVA17_HOME is not a misspelling of "JAVA_HOME"

Collaborator

mernst May 28, 2024

Missing " after JAVA17_HOME.

benedikt-schesch force-pushed the update-import branch 2 times, most recently from fc54c17 to 03f8e15 Compare

June 5, 2024 23:42

benedikt-schesch and others added 17 commits

June 6, 2024 10:13


          Update

19d777c


          Bug fix

67fd1eb


          Fixed imports

7d388b6


          Update

66432cf


          Style fix

820413d


          Modified test results

68036aa


          BUg fix

23640ac


          Restore old file

f00ce02


          Comment fix

90fb316


          Added latest results

9d84bb7


          Build fixes (#277)

f36e559


          Added run data

2f3a75b


          Modified results

96108e5


          Include merge fingerprints in output

b75936e


          Add --dont_check_fingerprints command-line argument

854fef4


          Modified replay merge

c911bf2


          Newest results

3b29bd5

Benedikt Schesch and others added 27 commits

June 6, 2024 10:17


          Update merge_plumelib

22e2a49


          Updatge merge_plumelib

fa2b400


          Update print

dab2c3a


          Style fix

822be4f


          Added latest tool

e87cca3


          Use new git-mergetool.sh

667d4fa


          Fix script name

1d7e045


          Improve diagnostics

e27f074


          Updated submodules to latest commits

0890eb3


          Update

087ad17


          Added latest data

a9e8699


          Update subproject

7589f89


          Fix directory where git merge-base is called

0de9bf9


          Use latest plume-lib merging

4f1d95c


          Test results update

f0c6355


          Added latest data

6a9fbbd


          Removed the use of parallel

167585f


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

0bfcbbd


          Update merging submodule

1a9a371


          Reduce width of column headers

2a4c21b


          Added latest data

0012d32


          Removed -q

0ca900b


          Rebased main

911edb9


          Update plumelib

13723d4


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


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

720ac05


          Update plots and merged main

c6dd35b

benedikt-schesch force-pushed the update-import branch from 4673058 to c6dd35b Compare

June 6, 2024 17:21

benedikt-schesch merged commit 1ebf695 into main

2 of 8 checks passed

benedikt-schesch deleted the update-import branch

June 6, 2024 17:24

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet