-
Notifications
You must be signed in to change notification settings - Fork 4.8k
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
Fix HashSet copy constructor handling of instances that have fallen back to the randomized hashcode generator. #107613
Fix HashSet copy constructor handling of instances that have fallen back to the randomized hashcode generator. #107613
Conversation
…ack to the randomized hashcode generator.
/backport to release/9.0 |
Started backporting to release/9.0: https://github.com/dotnet/runtime/actions/runs/10812144574 |
@eiriktsarpalis backporting to release/9.0 failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Fix HashSet copy constructor handling of instances that have fallen back to the randomized hashcode generator.
.git/rebase-apply/patch:45: trailing whitespace.
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M src/libraries/System.Collections/tests/System.Collections.Tests.csproj
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/System.Collections/tests/System.Collections.Tests.csproj
CONFLICT (content): Merge conflict in src/libraries/System.Collections/tests/System.Collections.Tests.csproj
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Fix HashSet copy constructor handling of instances that have fallen back to the randomized hashcode generator.
Error: The process '/usr/bin/git' failed with exit code 128 Please backport manually! |
@eiriktsarpalis an error occurred while backporting to release/9.0, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
…ack to the randomized hashcode generator. (dotnet#107613)
…ack to the randomized hashcode generator. (dotnet#107613)
…ack to the randomized hashcode generator. (dotnet#107613)
…ack to the randomized hashcode generator. (dotnet#107613)
…ack to the randomized hashcode generator. (dotnet#107613)
…ack to the randomized hashcode generator. (dotnet#107613)
Fix #107222.