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

8305072: Win32ShellFolder2.compareTo is inconsistent #638

Conversation

TheRealMDoerr
Copy link
Contributor

@TheRealMDoerr TheRealMDoerr commented May 31, 2024

Clean backport of JDK-8305072.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8305072 needs maintainer approval

Issue

  • JDK-8305072: Win32ShellFolder2.compareTo is inconsistent (Bug - P4 - Approved)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk21u-dev.git pull/638/head:pull/638
$ git checkout pull/638

Update a local copy of the PR:
$ git checkout pull/638
$ git pull https://git.openjdk.org/jdk21u-dev.git pull/638/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 638

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk21u-dev/pull/638.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented May 31, 2024

👋 Welcome back mdoerr! 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
Copy link

openjdk bot commented May 31, 2024

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

8305072: Win32ShellFolder2.compareTo is inconsistent

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

  • 5666863: 8329134: Reconsider TLAB zapping
  • f5f5870: 8331771: ZGC: Remove OopMapCacheAlloc_lock ordering workaround
  • 33a43e5: 8327040: Problemlist ActionListenerCalledTwiceTest.java test failing in macos14
  • 64b0f61: 8325763: Revert properties: vm.opt.x.*
  • 7723611: 8305825: getBounds API returns wrong value resulting in multiple Regression Test Failures on Ubuntu 23.04
  • 0e9b9f2: 8310072: JComboBox/DisabledComboBoxFontTestAuto: Enabled and disabled ComboBox does not match in these LAFs: GTK+

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 changed the title Backport 2fcb816858406f33cefef3164b2c85f9f996c7da 8305072: Win32ShellFolder2.compareTo is inconsistent May 31, 2024
@openjdk
Copy link

openjdk bot commented May 31, 2024

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

@openjdk
Copy link

openjdk bot commented May 31, 2024

⚠️ @TheRealMDoerr This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@openjdk openjdk bot added the rfr Pull request is ready for review label May 31, 2024
@mlbridge
Copy link

mlbridge bot commented May 31, 2024

Webrevs

@TheRealMDoerr
Copy link
Contributor Author

/approval request Should get backported for parity with 21.0.5-oracle. Applies cleanly and tier 1-4 have passed.

@openjdk
Copy link

openjdk bot commented Jun 3, 2024

@TheRealMDoerr
8305072: The approval request has been created successfully.

@openjdk openjdk bot added approval ready Pull request is ready to be integrated and removed approval labels Jun 3, 2024
@TheRealMDoerr
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Jun 3, 2024

Going to push as commit f5025eb.
Since your change was applied there have been 11 commits pushed to the master branch:

  • 4b0a789: 8329004: Update Libpng to 1.6.43
  • dc831aa: 8328953: JEditorPane.read throws ChangedCharSetException
  • 4b3df73: 8325179: Race in BasicDirectoryModel.validateFileCache
  • e4ac1a4: 8325382: (fc) FileChannel.transferTo throws IOException when position equals size
  • 88c366c: 8329126: No native wrappers generated anymore with -XX:-TieredCompilation after JDK-8251462
  • 5666863: 8329134: Reconsider TLAB zapping
  • f5f5870: 8331771: ZGC: Remove OopMapCacheAlloc_lock ordering workaround
  • 33a43e5: 8327040: Problemlist ActionListenerCalledTwiceTest.java test failing in macos14
  • 64b0f61: 8325763: Revert properties: vm.opt.x.*
  • 7723611: 8305825: getBounds API returns wrong value resulting in multiple Regression Test Failures on Ubuntu 23.04
  • ... and 1 more: https://git.openjdk.org/jdk21u-dev/compare/0d9833e522d6401c2ba2495a5b4f058bb489649c...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jun 3, 2024
@openjdk openjdk bot closed this Jun 3, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jun 3, 2024
@openjdk
Copy link

openjdk bot commented Jun 3, 2024

@TheRealMDoerr Pushed as commit f5025eb.

💡 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 clean integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

1 participant