-
Notifications
You must be signed in to change notification settings - Fork 221
8297804: (tz) Update Timezone Data to 2022g #28
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
Conversation
|
👋 Welcome back andrew! 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. |
dimitryc
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good.
|
Thanks both. Flagged with |
|
The parent pull request that this pull request depends on 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 JDK-8297804
git fetch https://git.openjdk.org/jdk8u master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push |
ac90f9d to
f53a65e
Compare
|
@gnu-andrew This change now passes all automated pre-integration checks. 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 |
|
@gnu-andrew Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information. |
|
I see /integrate |
Rebasing is the right thing to do here, as Git will replace the commit from the dependent PR with the one that's been pushed. No point doing unnecessary work merging them. |
|
Going to push as commit c961cb9. |
|
@gnu-andrew Pushed as commit c961cb9. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
This is a mostly clean backport of the latest tzdata update.
This pull request contains a backport of commit ce896731 from the openjdk/jdk repository.
The commit being backported was authored by Andrew John Hughes on 7 Dec 2022 and was reviewed by Naoto Sato.
Changes from the {11,13,15,17,19}u and 20 versions:
timezone.xmldoes not exist in 8u so the addition there is omittedmetaZones.xml,America_Mountainis used instead ofMexico_Pacific. This is consistent with PR27 on top of which this PR is based (America/Ciudad_Juarezsplits fromAmerica/Ojinaga). 8u does not contain definitions forMexico_Pacific.jdk/test/sun/util/calendar/zi/tzdata, as currently required for 8u testing.Tests in
java/util/TimeZone,java/time/test,sun/util/calendar,sun/util/resourcesandsun/text/resourcesall pass. The rearguard changes are identical to those for vanguard, as verified against the rearguard data generated usingmake rearguard_tarballsin the tzdata2022g distribution.Thanks!
Progress
Issue
Reviewers
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/jdk8u pull/28/head:pull/28$ git checkout pull/28Update a local copy of the PR:
$ git checkout pull/28$ git pull https://git.openjdk.org/jdk8u pull/28/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 28View PR using the GUI difftool:
$ git pr show -t 28Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk8u/pull/28.diff