Merged
Conversation
|
Tagging subscribers to this area: @dotnet/area-system-globalization |
src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoCurrencyGroupSizes.cs
Outdated
Show resolved
Hide resolved
eiriktsarpalis
approved these changes
Jul 17, 2023
Member
Author
|
/backport to release/7.0-staging |
Contributor
|
Started backporting to release/7.0-staging: https://github.com/dotnet/runtime/actions/runs/5581634068 |
Member
Author
|
/backport to release/6.0-staging |
Contributor
|
Started backporting to release/6.0-staging: https://github.com/dotnet/runtime/actions/runs/5581640681 |
Contributor
|
@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 Globalization Tests
Using index info to reconstruct a base tree...
M src/libraries/System.Globalization/tests/CultureInfo/CultureInfoCtor.cs
M src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoCurrencyGroupSizes.cs
M src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoTests.cs
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoTests.cs
Auto-merging src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoCurrencyGroupSizes.cs
CONFLICT (content): Merge conflict in src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoCurrencyGroupSizes.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 Globalization Tests
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! |
Contributor
|
@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. |
Contributor
|
@tarekgh backporting to release/6.0-staging failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Fix Globalization Tests
Using index info to reconstruct a base tree...
M src/libraries/System.Globalization/tests/CultureInfo/CultureInfoCtor.cs
M src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoCurrencyGroupSizes.cs
M src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoTests.cs
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoTests.cs
CONFLICT (content): Merge conflict in src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoTests.cs
Auto-merging src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoCurrencyGroupSizes.cs
CONFLICT (content): Merge conflict in src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoCurrencyGroupSizes.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 Globalization Tests
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! |
Contributor
|
@tarekgh an error occurred while backporting to release/6.0-staging, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
This was referenced Jul 18, 2023
ghost
locked as resolved and limited conversation to collaborators
This file contains hidden or 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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
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.
Fixes #79867
Fixing these tests is failing in the main, servicing branches, and causing some noises.
#86338
#88740