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

ICU-22323 Typo fixes in docs for ICU TimeZone Classes #2674

Merged
merged 1 commit into from
Oct 19, 2023

Conversation

spacegaier
Copy link
Contributor

@spacegaier spacegaier commented Oct 18, 2023

Note: I am not sure if doc PRs also require the creation of a JIRA issue. If yes, let me know and I can do that as well and adjust the commit message.

Update: Looks like the CLI is requiring that. Is there a generic JIRA document fix ticket that can be referenced?

Final Update: I found another PR was the author was advised to reference ICU-22323 so I did the same now.

Checklist
  • Required: Issue filed: https://unicode-org.atlassian.net/browse/ICU-22323
  • Required: The PR title must be prefixed with a JIRA Issue number.
  • Required: The PR description must include the link to the Jira Issue, for example by completing the URL in the first checklist item
  • Required: Each commit message must be prefixed with a JIRA Issue number.
  • Issue accepted (done by Technical Committee after discussion)
  • Tests included, if applicable
  • API docs and/or User Guide docs changed or added, if applicable

@CLAassistant
Copy link

CLAassistant commented Oct 18, 2023

CLA assistant check
All committers have signed the CLA.

@spacegaier spacegaier changed the title Typo fixes in docs for ICU TimeZone Classes ICU-22323 Typo fixes in docs for ICU TimeZone Classes Oct 18, 2023
@jira-pull-request-webhook
Copy link

Hooray! The files in the branch are the same across the force-push. 😃

~ Your Friendly Jira-GitHub PR Checker Bot

@markusicu markusicu changed the base branch from main to maint/maint-74 October 19, 2023 16:32
@markusicu markusicu self-requested a review October 19, 2023 16:33
@echeran
Copy link
Contributor

echeran commented Oct 19, 2023

Hi @spacegaier , the Jira ticket is for the soon-to-be-released version 74. We're in the process of vetting the release candidate version that we tagged before the final cut (GA = General Availability) of ICU 74. Instead of having you change the PR preamble to use a ticket for ICU 75 and change the commit message, we changed the target branch of your PR to the ICU 74 branch.

The consequence of changing the PR target branch in Github is that the implicit git rebase operation pulled in some extraneous commits. To help synchronize your local branch, clean this up, and update the PR, the following commands should work:

  1. Sync with the Github PR changes
    git pull --force
    
    
  2. Configure git with info needed for subsequent step
    git remote add upstream https://github.com/unicode-org/icu.git
    git fetch --all
    
  3. Edit branch in interactive mode in comparison to the ICU 74 branch
    git rebase -i upstream/maint/maint-74
    
  4. Edit the temporary buffer from git to look like this (so as to exclude the extraneous commits), then save and quit
    d 049c8ad3651 ICU-22534 Script preparing the GitHub icu4j release files
    d cdbf0ef6dfb ICU-22529 Update services.md
    d bd9e5ed620e ICU-21991 added VS2022 checks and changed windows SDK version
    d cb7b1b6506e ICU-22548 Reduce the loop limit to fail faster
    d 3d1dee68374 ICU-22528 Improve date formatting performance
    pick bfcd1706a6e ICU-22323 Typo fixes in docs for ICU TimeZone Classes
    
    ...
    
  5. Force push the changes to Github to make the PR reflect the cleanup
    git push --force origin
    

@jira-pull-request-webhook
Copy link

Notice: the branch changed across the force-push!

  • .ci-builds/.azure-pipelines.yml is no longer changed in the branch
  • docs/processes/release/tasks/versions.md is no longer changed in the branch
  • docs/userguide/icu/services.md is no longer changed in the branch
  • icu4c/source/allinone/Build.Windows.ProjectConfiguration.props is no longer changed in the branch
  • icu4c/source/common/unistr.cpp is no longer changed in the branch
  • icu4c/source/i18n/calendar.cpp is no longer changed in the branch
  • icu4c/source/i18n/collationbuilder.cpp is no longer changed in the branch
  • icu4c/source/i18n/datefmt.cpp is no longer changed in the branch
  • icu4c/source/i18n/dtfmtsym.cpp is no longer changed in the branch
  • icu4c/source/i18n/formatted_string_builder.cpp is no longer changed in the branch
  • icu4c/source/i18n/gregoimp.cpp is no longer changed in the branch
  • icu4c/source/i18n/gregoimp.h is no longer changed in the branch
  • icu4c/source/i18n/smpdtfmt.cpp is no longer changed in the branch
  • icu4c/source/i18n/unicode/calendar.h is no longer changed in the branch
  • icu4c/source/i18n/unicode/formattednumber.h is no longer changed in the branch
  • icu4c/source/i18n/unicode/simplenumberformatter.h is no longer changed in the branch
  • icu4c/source/test/fuzzer/locale_util.h is no longer changed in the branch
  • icu4j/releases_tools/api_reports.sh is no longer changed in the branch
  • icu4j/releases_tools/github_release.sh is no longer changed in the branch
  • icu4j/releases_tools/shared.sh is no longer changed in the branch

View Diff Across Force-Push

~ Your Friendly Jira-GitHub PR Checker Bot

@spacegaier
Copy link
Contributor Author

@echeran Took a few attempts but in the end it worked. For some reason the VS Code terminal would not let me do the force push ("error: failed to push some refs to 'https://github.com/spacegaier/icu.git'"), but Github Desktop's force push from the GUI menu worked for some reason 😄 .

Copy link
Contributor

@echeran echeran left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks!

@echeran echeran merged commit 01388fa into unicode-org:maint/maint-74 Oct 19, 2023
99 checks passed
@spacegaier spacegaier deleted the patch-1 branch October 20, 2023 16:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants