Skip to content
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

Merged
merged 1 commit into from
Sep 11, 2024

Conversation

eiriktsarpalis
Copy link
Member

Fix #107222.

@eiriktsarpalis eiriktsarpalis merged commit 4f18509 into dotnet:main Sep 11, 2024
148 checks passed
@eiriktsarpalis
Copy link
Member Author

/backport to release/9.0

Copy link
Contributor

Started backporting to release/9.0: https://github.com/dotnet/runtime/actions/runs/10812144574

Copy link
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 128

Please backport manually!

Copy link
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
eiriktsarpalis added a commit to eiriktsarpalis/runtime that referenced this pull request Sep 11, 2024
eiriktsarpalis added a commit to eiriktsarpalis/runtime that referenced this pull request Sep 11, 2024
eiriktsarpalis added a commit to eiriktsarpalis/runtime that referenced this pull request Sep 11, 2024
carlossanlop pushed a commit that referenced this pull request Sep 16, 2024
jtschuster pushed a commit to jtschuster/runtime that referenced this pull request Sep 17, 2024
carlossanlop pushed a commit that referenced this pull request Sep 19, 2024
sirntar pushed a commit to sirntar/runtime that referenced this pull request Sep 30, 2024
@github-actions github-actions bot locked and limited conversation to collaborators Oct 12, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

HashSet<string> breaks if copied from one that uses a non-singleton default equality comparer
3 participants