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 coreclr binlog: corrupted patch #1944

Merged
merged 1 commit into from
Dec 8, 2020
Merged

Conversation

dagood
Copy link
Member

@dagood dagood commented Dec 8, 2020

Recreate the patch adding the dotnet/runtime build-source-build.sh: it wasn't adding the last line. This ends up overwriting the coreclr binlog in the portable build.

Fixes #1943.

@dagood dagood requested review from dseefeld and crummel December 8, 2020 00:09
@dagood dagood self-assigned this Dec 8, 2020
Copy link
Contributor

@crummel crummel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there some kind of Git issue with this patch? I remember this happening before.

@dagood
Copy link
Member Author

dagood commented Dec 8, 2020

It looks like with 26c298f#diff-c72afe4ad8f6530dfdc0d7bb0a852e671bd0e57d4bf2dda5af448d9a1e38aebe, the patch was changed without updating the line count.

Within the commits of the PR that was squashed to make that commit, I see this tighter diff which only adds one line and makes the patch wrong: d0caaea#diff-c72afe4ad8f6530dfdc0d7bb0a852e671bd0e57d4bf2dda5af448d9a1e38aebe.

Maybe the patch text was manually modified without updating the rest of the patch properly? Seems like the simplest answer to me.

@dagood
Copy link
Member Author

dagood commented Dec 8, 2020

Merging past #1937.

@dagood dagood merged commit daf3563 into dotnet:master Dec 8, 2020
@dagood dagood deleted the fix-coreclr-binlog branch December 8, 2020 05:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants