Skip to content

8259559: COMPARE_BUILD can't compare patch files #2025

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

Closed
wants to merge 1 commit into from

Conversation

magicus
Copy link
Member

@magicus magicus commented Jan 11, 2021

COMPARE_BUILD will fail to run the compare stage, since re-applying an applied patch does not work.


Progress

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

Issue

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk pull/2025/head:pull/2025
$ git checkout pull/2025

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 11, 2021

👋 Welcome back ihse! 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 added the rfr Pull request is ready for review label Jan 11, 2021
@openjdk
Copy link

openjdk bot commented Jan 11, 2021

@magicus The following label will be automatically applied to this pull request:

  • build

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the build build-dev@openjdk.org label Jan 11, 2021
@mlbridge
Copy link

mlbridge bot commented Jan 11, 2021

Webrevs

@openjdk
Copy link

openjdk bot commented Jan 11, 2021

@magicus 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:

8259559: COMPARE_BUILD can't compare patch files

Reviewed-by: erikj

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

  • 33fbc10: 8259025: Record compact constructor using Objects.requireNonNull
  • 23801da: 8259482: jni_Set/GetField_probe are the same as their _nh versions
  • 01b2804: 8237578: JDK-8214339 (SSLSocketImpl wraps SocketException) appears to not be fully fixed
  • 1bd015f: 8258407: Split up CompileJavaModules.gmk into make/modules/$M/Java.gmk
  • 2354882: 8250768: javac should be adapted to changes in JEP 12
  • 18a37f9: 8259368: Zero: UseCompressedClassPointers does not depend on UseCompressedOops
  • a03e22b: 8253910: UseCompressedClassPointers depends on UseCompressedOops in vmError.cpp

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 Jan 11, 2021
@magicus
Copy link
Member Author

magicus commented Jan 11, 2021

/integrate

@openjdk openjdk bot closed this Jan 11, 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 Jan 11, 2021
@openjdk
Copy link

openjdk bot commented Jan 11, 2021

@magicus Since your change was applied there have been 8 commits pushed to the master branch:

  • cf3e4bf: 8258838: Remove JVM option UseStackBanging
  • 33fbc10: 8259025: Record compact constructor using Objects.requireNonNull
  • 23801da: 8259482: jni_Set/GetField_probe are the same as their _nh versions
  • 01b2804: 8237578: JDK-8214339 (SSLSocketImpl wraps SocketException) appears to not be fully fixed
  • 1bd015f: 8258407: Split up CompileJavaModules.gmk into make/modules/$M/Java.gmk
  • 2354882: 8250768: javac should be adapted to changes in JEP 12
  • 18a37f9: 8259368: Zero: UseCompressedClassPointers does not depend on UseCompressedOops
  • a03e22b: 8253910: UseCompressedClassPointers depends on UseCompressedOops in vmError.cpp

Your commit was automatically rebased without conflicts.

Pushed as commit dab1787.

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

@magicus magicus deleted the fix-compare-build-really branch February 9, 2021 11:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build build-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants