Only update typar name when TyparStaticReq matches.#15845
Merged
vzarytovskii merged 2 commits intodotnet:mainfrom Aug 23, 2023
Merged
Only update typar name when TyparStaticReq matches.#15845vzarytovskii merged 2 commits intodotnet:mainfrom
vzarytovskii merged 2 commits intodotnet:mainfrom
Conversation
vzarytovskii
approved these changes
Aug 23, 2023
edgarfgp
approved these changes
Aug 23, 2023
dawedawe
approved these changes
Aug 23, 2023
0101
approved these changes
Aug 23, 2023
Member
|
/backport to release/dev17.7 |
Contributor
|
Started backporting to release/dev17.7: https://github.com/dotnet/fsharp/actions/runs/5952907769 |
Contributor
|
@vzarytovskii backporting to release/dev17.7 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Only update typar name when TyparStaticReq matches.
.git/rebase-apply/patch:66: trailing whitespace.
FSharp """
.git/rebase-apply/patch:101: trailing whitespace.
FSharp """
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
M src/Compiler/Checking/CheckDeclarations.fs
M tests/FSharp.Compiler.ComponentTests/Signatures/TypeTests.fs
Falling back to patching base and 3-way merge...
Auto-merging tests/FSharp.Compiler.ComponentTests/Signatures/TypeTests.fs
Auto-merging src/Compiler/Checking/CheckDeclarations.fs
CONFLICT (content): Merge conflict in src/Compiler/Checking/CheckDeclarations.fs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Only update typar name when TyparStaticReq matches.
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! |
vzarytovskii
pushed a commit
to vzarytovskii/fsharp
that referenced
this pull request
Aug 23, 2023
vzarytovskii
added a commit
that referenced
this pull request
Aug 24, 2023
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
As mentioned on Slack by Josua Jäger, there was a recent regression in the
7.0.400SDK.The fix for this is that we can't update the
identof thesyntyparwhen'doesn't match with^.