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

Simplify patches and make them more robust #6478

Merged
merged 2 commits into from
Dec 17, 2019

Conversation

mehrdadn
Copy link
Contributor

@mehrdadn mehrdadn commented Dec 13, 2019

Why are these changes needed?

Most of our patches have extraneous information and additional context that is unnecessary, confusing, or even outright wrong (such as file hashes that won't match, e.g. due to the order in which patches are applied).

Unnecessary context in particular can also result in extraneous conflicts when updating a library, and make it harder to understand what is going on.

Simplifying them to include only the relevant lines (instead of just the 3-line default) makes them easier to understand and maintain.

Note: when reviewing: I recommend split view when reviewing, rather than unified view, or the changes may be confusing. (You can switch by clicking the gear icon in the changes tab.)

Related issue number

#631

Checks

@AmplabJenkins
Copy link

Can one of the admins verify this patch?

@AmplabJenkins
Copy link

Test FAILed.
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/Ray-PRB/19568/
Test FAILed.

Copy link
Contributor

@pcmoritz pcmoritz left a comment

Choose a reason for hiding this comment

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

LGTM!

@pcmoritz pcmoritz merged commit 9948a37 into ray-project:master Dec 17, 2019
@mehrdadn mehrdadn deleted the simplify-patches branch December 17, 2019 03:28
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.

4 participants