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

8274465: Fix javax/swing/text/ParagraphView/6364882/bug6364882.java failures #754

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Jan 12, 2022

I backport this for parity with 11.0.15-oracle.


Progress

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

Issue

  • JDK-8274465: Fix javax/swing/text/ParagraphView/6364882/bug6364882.java failures

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 754

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 12, 2022

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

@openjdk openjdk bot changed the title Backport bb4500d0d227cbb238bd6c862e143f864106a31a 8274465: Fix javax/swing/text/ParagraphView/6364882/bug6364882.java failures Jan 12, 2022
@openjdk
Copy link

openjdk bot commented Jan 12, 2022

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

@openjdk openjdk bot added backport clean rfr labels Jan 12, 2022
@mlbridge
Copy link

mlbridge bot commented Jan 12, 2022

Webrevs

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/753 to master Jan 13, 2022
@openjdk-notifier
Copy link

openjdk-notifier bot commented Jan 13, 2022

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 GoeLin-backport-67e52a30
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

@GoeLin GoeLin force-pushed the goetz_backport_8274465 branch from c4ed317 to d1e8dce Compare Jan 13, 2022
@openjdk
Copy link

openjdk bot commented Jan 13, 2022

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

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

8274465: Fix javax/swing/text/ParagraphView/6364882/bug6364882.java failures

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 Jan 13, 2022
@GoeLin
Copy link
Member Author

GoeLin commented Jan 13, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Jan 13, 2022

Going to push as commit 00dc442.

@openjdk openjdk bot added the integrated label Jan 13, 2022
@openjdk openjdk bot closed this Jan 13, 2022
@openjdk openjdk bot removed ready rfr labels Jan 13, 2022
@openjdk
Copy link

openjdk bot commented Jan 13, 2022

@GoeLin Pushed as commit 00dc442.

💡 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_8274465 branch Jan 13, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated
1 participant