Fix neutral cultures created with the underscore #87411
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ghost
assigned 
|
Tagging subscribers to this area: @dotnet/area-system-globalization Issue Detailsnull
|
|
/backport to release/7.0-staging |
stephentoub
approved these changes
Jun 12, 2023
|
Started backporting to release/7.0-staging: https://github.com/dotnet/runtime/actions/runs/5246272638 |
|
/backport to release/6.0-staging |
|
Started backporting to release/6.0-staging: https://github.com/dotnet/runtime/actions/runs/5246292235 |
|
@tarekgh backporting to release/7.0-staging failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Fix neutral cultures created with the underscore
Using index info to reconstruct a base tree...
M src/libraries/System.Globalization/tests/CultureInfo/CultureInfoCtor.cs
M src/libraries/System.Private.CoreLib/src/System/Globalization/CultureData.Icu.cs
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/System.Private.CoreLib/src/System/Globalization/CultureData.Icu.cs
Auto-merging src/libraries/System.Globalization/tests/CultureInfo/CultureInfoCtor.cs
CONFLICT (content): Merge conflict in src/libraries/System.Globalization/tests/CultureInfo/CultureInfoCtor.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix neutral cultures created with the underscore
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@tarekgh an error occurred while backporting to release/7.0-staging, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
This was referenced Jun 12, 2023
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a delta change to the original fix #86441
#87394