-
Notifications
You must be signed in to change notification settings - Fork 208
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
8278065: Refactor subclassAudits to use ClassValue #260
Conversation
👋 Welcome back rkennke! A progress list of the required criteria for merging this PR into |
This backport pull request has now been updated with issue from the original commit. |
Webrevs
|
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 rkennke-backport-8eb453ba
git fetch https://git.openjdk.java.net/jdk17u-dev master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push |
Unfortunately, following the instructions suggested by Skara messes up the PR. The diff contains both backports and the clean label is lost. I had the same problems when trying it. (What works is rebase and force-push which is not particularly nice, either.) I don't know what would happen when integrating it this way. Is the best way in this situation to just throw it away and redo it? |
As far as I know, the recommended way is to manually merge from upstream/master, push it to the PR branch, wait until it is flagged with clean label again, and then go. That's what I would do, unless you object to this plan. |
@rkennke This change now passes all automated pre-integration checks. ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details. After integration, the commit message for the final commit will be:
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 ➡️ To integrate this PR with the above commit message to the |
Oh, ok. That's fine. Thanks for the hint. |
/integrate |
Going to push as commit 8d7f26b. |
This backports the fix for JDK-8278065, which fixes a number of small issues with the preceding change for JDK-8277072.
The original change has baked for several weeks in jdk19 and applies with some fuzz, but no conflicts.
Testing:
Progress
Issue
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk17u-dev pull/260/head:pull/260
$ git checkout pull/260
Update a local copy of the PR:
$ git checkout pull/260
$ git pull https://git.openjdk.java.net/jdk17u-dev pull/260/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 260
View PR using the GUI difftool:
$ git pr show -t 260
Using diff file
Download this PR as a diff file:
https://git.openjdk.java.net/jdk17u-dev/pull/260.diff