Fix HashSet copy constructor handling of instances that have fallen back to the randomized hashcode generator.#107613
Merged
eiriktsarpalis merged 1 commit intodotnet:mainfrom Sep 11, 2024
Conversation
…ack to the randomized hashcode generator.
jeffhandley
approved these changes
Sep 10, 2024
stephentoub
approved these changes
Sep 10, 2024
Member
Author
|
/backport to release/9.0 |
Contributor
|
Started backporting to release/9.0: https://github.com/dotnet/runtime/actions/runs/10812144574 |
Contributor
|
@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 128Please backport manually! |
Contributor
|
@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. |
eiriktsarpalis
added a commit
to eiriktsarpalis/runtime
that referenced
this pull request
Sep 11, 2024
…ack to the randomized hashcode generator. (dotnet#107613)
eiriktsarpalis
added a commit
to eiriktsarpalis/runtime
that referenced
this pull request
Sep 11, 2024
…ack to the randomized hashcode generator. (dotnet#107613)
4 tasks
eiriktsarpalis
added a commit
to eiriktsarpalis/runtime
that referenced
this pull request
Sep 11, 2024
…ack to the randomized hashcode generator. (dotnet#107613)
4 tasks
eiriktsarpalis
added a commit
to eiriktsarpalis/runtime
that referenced
this pull request
Sep 11, 2024
…ack to the randomized hashcode generator. (dotnet#107613)
4 tasks
jtschuster
pushed a commit
to jtschuster/runtime
that referenced
this pull request
Sep 17, 2024
…ack to the randomized hashcode generator. (dotnet#107613)
sirntar
pushed a commit
to sirntar/runtime
that referenced
this pull request
Sep 30, 2024
…ack to the randomized hashcode generator. (dotnet#107613)
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.
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.
Fix #107222.