Skip to content
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.

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

8226943: compile error in libfollowref003.cpp with XCode 10.2 on macosx #637

Closed
wants to merge 3 commits into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Nov 18, 2021

A build fix needed after JDK-8209611


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8226943: compile error in libfollowref003.cpp with XCode 10.2 on macosx

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/637/head:pull/637
$ git checkout pull/637

Update a local copy of the PR:
$ git checkout pull/637
$ git pull https://git.openjdk.java.net/jdk11u-dev pull/637/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 637

View PR using the GUI difftool:
$ git pr show -t 637

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u-dev/pull/637.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Nov 18, 2021

👋 Welcome back goetz! A progress list of the required criteria for merging this PR into pr/634 will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@GoeLin
Copy link
Member Author

@GoeLin GoeLin commented Nov 18, 2021

Replaces #636 ... try to make it a "real" dependent pull request.

@openjdk openjdk bot changed the title Backport 4dececb589289605d38b8de69f1f3dc7a9a8ecb1 8226943: compile error in libfollowref003.cpp with XCode 10.2 on macosx Nov 18, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Nov 18, 2021

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added the backport label Nov 18, 2021
@openjdk openjdk bot added clean rfr labels Nov 18, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Nov 18, 2021

Webrevs

@openjdk-notifier
Copy link

@openjdk-notifier openjdk-notifier bot commented Nov 20, 2021

The dependent pull request has now been integrated, and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout goetz_backport_8209611
git fetch https://git.openjdk.java.net/jdk11u-dev master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot removed the clean label Nov 20, 2021
@GoeLin
Copy link
Member Author

@GoeLin GoeLin commented Nov 20, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Nov 20, 2021

@GoeLin Your integration request cannot be fulfilled at this time, as the status check jcheck has not been performed on commit a10ff9a yet

@GoeLin
Copy link
Member Author

@GoeLin GoeLin commented Nov 20, 2021

/integrate

@openjdk openjdk bot added the clean label Nov 20, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Nov 20, 2021

@GoeLin This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8226943: compile error in libfollowref003.cpp  with XCode 10.2 on macosx

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready label Nov 20, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Nov 20, 2021

Going to push as commit 63277a4.

@openjdk openjdk bot closed this Nov 20, 2021
@GoeLin
Copy link
Member Author

@GoeLin GoeLin commented Nov 20, 2021

/integrate

@openjdk openjdk bot added integrated and removed ready rfr labels Nov 20, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Nov 20, 2021

@GoeLin Pushed as commit 63277a4.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@GoeLin GoeLin deleted the goetz_backport_8226943 branch Nov 20, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Nov 20, 2021

@GoeLin The command integrate can only be used in open pull requests.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated
1 participant