Skip to content

Conversation

@shipilev
Copy link
Member

@shipilev shipilev commented Jun 25, 2021

This is unclean backport: there is a minor conflict in @bug line in the test. Otherwise it applies cleanly. New test case fails without the patch, passes with it.


Progress

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

Issue

  • JDK-8210959: JShell fails and exits when statement throws an exception whose message contains a '%'.

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 64

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

Using diff file

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

…ose message contains a '%'

Reviewed-by: jlahoda
@bridgekeeper
Copy link

bridgekeeper bot commented Jun 25, 2021

👋 Welcome back shade! A progress list of the required criteria for merging this PR into master 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 8210959: JShell fails and exits when statement throws an exception whose message contains a '%' 8210959: JShell fails and exits when statement throws an exception whose message contains a '%'. Jun 25, 2021
@openjdk openjdk bot added the rfr Pull request is ready for review label Jun 25, 2021
@shipilev
Copy link
Member Author

/label add backport

@openjdk
Copy link

openjdk bot commented Jun 25, 2021

@shipilev The label backport is not a valid label. These labels are valid:

@shipilev shipilev changed the title 8210959: JShell fails and exits when statement throws an exception whose message contains a '%'. Backport dafc4834753ca078987eefc054d8407df2c38a3c Jun 25, 2021
@openjdk openjdk bot changed the title Backport dafc4834753ca078987eefc054d8407df2c38a3c 8210959: JShell fails and exits when statement throws an exception whose message contains a '%'. Jun 25, 2021
@openjdk
Copy link

openjdk bot commented Jun 25, 2021

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

@openjdk openjdk bot added the backport Port of a pull request already in a different code base label Jun 25, 2021
@mlbridge
Copy link

mlbridge bot commented Jun 25, 2021

Webrevs

Copy link
Contributor

@jerboaa jerboaa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@openjdk
Copy link

openjdk bot commented Jun 25, 2021

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

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

8210959: JShell fails and exits when statement throws an exception whose message contains a '%'.

Reviewed-by: sgehwolf

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 1 new commit pushed to the master branch:

  • 66d4ee9: 8247421: [TESTBUG] ReturnBlobToWrongHeapTest.java failed allocating blob

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this 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 Pull request is ready to be integrated label Jun 25, 2021
@shipilev
Copy link
Member Author

Received the approval too.

/integrate

@openjdk
Copy link

openjdk bot commented Jun 25, 2021

Going to push as commit a0958a8.
Since your change was applied there has been 1 commit pushed to the master branch:

  • 66d4ee9: 8247421: [TESTBUG] ReturnBlobToWrongHeapTest.java failed allocating blob

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Jun 25, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jun 25, 2021
@openjdk
Copy link

openjdk bot commented Jun 25, 2021

@shipilev Pushed as commit a0958a8.

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

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

Labels

backport Port of a pull request already in a different code base integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

2 participants