Skip to content

Breaking change for Pull-Requests: Allman style #6086

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

Closed
d-a-v opened this issue May 13, 2019 · 0 comments · Fixed by #6090
Closed

Breaking change for Pull-Requests: Allman style #6086

d-a-v opened this issue May 13, 2019 · 0 comments · Fixed by #6090

Comments

@d-a-v
Copy link
Collaborator

d-a-v commented May 13, 2019

The Allman restyle process had been on the table from a long time before today.
It had been prepared taking into account all ongoing pull-requests.

What was initially planned, which doesn't work, was:

An ongoing PR has to be merged to the commit right before allman commit:
git merge 625c3a62c4991347e8298fb5e4021bc6f6df7099
Then the script tests/restyle-all.sh has to be called.

After that, the diff against master is good, but git merge master conflicts and has to be repaired by hand. And the conflicts are exactly the committed patches (the initial PR before Allman).

Here is a script which will do some git/diff mixture and hopefully be able to update a pull request. Assuming your git remote is called origin, this script can be run from your local directory (linux only) with the pull request number.

We can, on demand, create an updated version of your PR for you.

Check this gist: https://gist.github.com/d-a-v/29b1cf4b54e646df188997c7b3086796

@ghost ghost mentioned this issue May 13, 2019
@ghost ghost mentioned this issue May 13, 2019
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 a pull request may close this issue.

1 participant