Skip to content

Conversation

@conradarcturus
Copy link
Contributor

@conradarcturus conradarcturus commented Jan 18, 2025

CLDR-18193

Putting this up to merge into main -- but won't actually merge until the v47 cutoff, targetting v48. There are a lot of data updates on the main branch not in the v48 branch that I'd like to keep.

  • This PR completes the ticket.

ALLOW_MANY_COMMITS=true

@srl295
Copy link
Member

srl295 commented Jan 18, 2025

We can merge from main to 48 too.

@conradarcturus conradarcturus force-pushed the CLDR-18193-Add-piemontese branch from 5a4d6e8 to 49460a8 Compare January 18, 2025 19:46
@jira-pull-request-webhook
Copy link

Notice: the branch changed across the force-push!

  • common/main/pms.xml is different

View Diff Across Force-Push

~ Your Friendly Jira-GitHub PR Checker Bot

@srl295 srl295 changed the base branch from main to ddl/v48 January 21, 2025 22:35
@srl295
Copy link
Member

srl295 commented Jan 21, 2025

nothing had been merged to ddl/v48 yet but ddl/v48 is now up to date with main. So i moved the branch target to v48

srl295
srl295 previously requested changes Jan 21, 2025
Copy link
Member

@srl295 srl295 left a comment

Choose a reason for hiding this comment

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

OK except for the testData file being changed, just remove that

@conradarcturus conradarcturus force-pushed the CLDR-18193-Add-piemontese branch from 49460a8 to 38c041b Compare January 22, 2025 22:26
@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

@conradarcturus conradarcturus force-pushed the CLDR-18193-Add-piemontese branch from 38c041b to bab1546 Compare January 22, 2025 22:30
@jira-pull-request-webhook
Copy link

Notice: the branch changed across the force-push!

  • common/testData/localeIdentifiers/localeDisplayName.txt is different

View Diff Across Force-Push

~ Your Friendly Jira-GitHub PR Checker Bot

@conradarcturus conradarcturus force-pushed the CLDR-18193-Add-piemontese branch from bab1546 to 3dc931e Compare January 22, 2025 22:35
@jira-pull-request-webhook
Copy link

Notice: the branch changed across the force-push!

  • common/testData/localeIdentifiers/localeDisplayName.txt is no longer changed in the branch

View Diff Across Force-Push

~ Your Friendly Jira-GitHub PR Checker Bot

@conradarcturus conradarcturus added the ddl DDL-SC specific work label Feb 13, 2025
@conradarcturus conradarcturus force-pushed the CLDR-18193-Add-piemontese branch from 3dc931e to 027c78e Compare February 13, 2025 14:47
@jira-pull-request-webhook
Copy link

Notice: the branch changed across the force-push!

  • common/supplemental/attributeValueValidity.xml is now changed in the branch
  • common/supplemental/supplementalData.xml is different
  • common/supplemental/supplementalMetadata.xml is now changed in the branch

View Diff Across Force-Push

~ Your Friendly Jira-GitHub PR Checker Bot

@conradarcturus conradarcturus dismissed srl295’s stale review February 13, 2025 15:04

dismissing prior changes requested because it has been fixed

@conradarcturus conradarcturus merged commit 32ceda5 into unicode-org:ddl/v48 Feb 17, 2025
9 checks passed
@conradarcturus conradarcturus deleted the CLDR-18193-Add-piemontese branch February 17, 2025 10:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ddl DDL-SC specific work

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants