-
Notifications
You must be signed in to change notification settings - Fork 4.7k
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
[mono] Add metadata update for overrides #85182
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM! 🎉
We can probably backport this to 7.0. Just need to check if it depends on instance field supoort. If not, I'm sure this prevents someone from updating async methods. |
/backport to release/7.0-staging |
Started backporting to release/7.0-staging: https://github.com/dotnet/runtime/actions/runs/4779675983 |
@lambdageek 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: Add metadata update for overrides
Using index info to reconstruct a base tree...
M src/libraries/System.Runtime.Loader/tests/ApplyUpdateTest.cs
M src/mono/mono/metadata/metadata.c
Falling back to patching base and 3-way merge...
Auto-merging src/mono/mono/metadata/metadata.c
Auto-merging src/libraries/System.Runtime.Loader/tests/ApplyUpdateTest.cs
CONFLICT (content): Merge conflict in src/libraries/System.Runtime.Loader/tests/ApplyUpdateTest.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 Add metadata update for overrides
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 128 Please backport manually! |
@lambdageek 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. |
Fixes: #79043