ICU-23290 BRS 78.2: CLDR release-48-1-beta1 to ICU maint/maint-78 branch#3808
Conversation
|
Note, this also passed C and J exhaustive tests run locally; I am also running them in GitHub, on my branch.... |
|
Hi @pedberg-icu could you please resolve the pom file conflict and ping us for re-approval? |
261de78 to
21bdd4c
Compare
|
Notice: the branch changed across the force-push!
~ Your Friendly Jira-GitHub PR Checker Bot |
21bdd4c to
3b9660b
Compare
|
Hooray! The files in the branch are the same across the force-push. 😃 ~ Your Friendly Jira-GitHub PR Checker Bot |
|
@eggrobin and @mihnita This PR is for CLDR integration, is not for collecting all items for the maintenance branch with different ticket numbers etc. Please make separate PRs to the maint branch for your changes. @markusicu Was there some agreement or discussion about piling other maint branch updates for unrelated tickets into this PR? If so then I leave it to someone else to clean up the PR and fix everything. I was just signed up to resolve the one collision and then merge, |
|
Hi @pedberg-icu we wanted to get the maintenance branch settled and didn't know if you were still available, so I asked Mihai to try to resolve the reported conflict in the pom file. |
@markusicu I had left a note in the agenda before the ICU meeting that I would resolve the pom conflict this afternoon. However the 2 commits so far here by Robin/Mihai have nothing to do with the pom file or CLDR integration and are under different ticket numbers, that has turned this PR into a kind of mess, and there are mysterious new errors about appveyor unable to build non-mergeable PR etc. So I am no longer willing to fix this PR to resolve all of the issues (unless those commits are retracted). It would have been simple just to fix the pom conflict. |
|
I know, sorry about that -- Mihai got himself tangled in some git pit of despair. He said he would get back to it once he gets home. |
|
Sorry, I've sent a separate email about this.
M
…On Thu, Dec 18, 2025, 15:44 Markus Scherer ***@***.***> wrote:
*markusicu* left a comment (unicode-org/icu#3808)
<#3808 (comment)>
I know, sorry about that -- Mihai got himself tangled in some git pit of
despair. He said he would get back to it once he gets home.
—
Reply to this email directly, view it on GitHub
<#3808 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AAJ7ITXTNR6ZWHJUSTU3DHL4CM34BAVCNFSM6AAAAACPH7YVZCVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZTMNZSG42TQMRQGU>
.
You are receiving this because you were mentioned.Message ID:
***@***.***>
|
3b9660b to
5a42b8b
Compare
|
Notice: the branch changed across the force-push!
~ Your Friendly Jira-GitHub PR Checker Bot |
702758b to
13cd144
Compare
|
Hooray! The files in the branch are the same across the force-push. 😃 ~ Your Friendly Jira-GitHub PR Checker Bot |
|
OK, all good. I also started from a current, clean icu branch The files I got are binary identical with the ones in the PR. So the history (3 commits) in this PR is clean, I am confident that files are also correct. Sorry for the mess, |
|
@mihnita, thanks! Whoever merges, please use "Rebase and merge" without squashing to merge the 3 commits separately. |
…ata generated from CLDR
…ata/test generated or copied from CLDR
13cd144 to
fef9903
Compare
|
Hooray! The files in the branch are the same across the force-push. 😃 ~ Your Friendly Jira-GitHub PR Checker Bot |
|
@mihnita @markusicu @srl295 Mihai, thanks for fixing this all up. This looks good to me now and looks identical to what Markus and Steven originally approved except for the resolution of the pom conflict; compared to my original version, that pom conflict resolution just changed |
|
I approved, so it's green, if you want to go ahead. |
Integrate CLDR release-48-1-beta1 to ICU maint/maint-78 branch, in 3 commits:
The CLDR tickets are listed as blockers in CLDR-19148, but the key fixed data issues that affect ICU are:
zh_Hant,yue(caused parse issues); this required updating some tests.hc).paexemplars.ALLOW_MANY_COMMITS=true
Checklist