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

Jump to bottom

[3.6] - "Revert bpo-24746: Avoid stripping trailing whitespace in doctest fancy diff (GH-10639)" #11509

Merged
merged 1 commit into from Jan 10, 2019
Merged

[3.6] - "Revert bpo-24746: Avoid stripping trailing whitespace in doctest fancy diff (GH-10639)" #11509

merged 1 commit into from Jan 10, 2019

Conversation

orsenthil
Copy link
Member

@orsenthil orsenthil commented Jan 10, 2019 •
edited by bedevere-bot

Reverts #11477

3.6 is in security fixes only mode and the patch merge was a mistake.

https://bugs.python.org/issue24746

@orsenthil orsenthil changed the title Revert "[3.6] bpo-24746: Avoid stripping trailing whitespace in doctest fancy diff (GH-10639)" [3.6] bpo-24746: Avoid stripping trailing whitespace in doctest fancy diff (GH-10639) Jan 10, 2019
@vstinner
Copy link
Member

vstinner commented Jan 10, 2019

The commit message is confusing. I read it as the fix, whereas it's a revert.

vstinner
vstinner approved these changes Jan 10, 2019
View changes
Copy link
Member

@vstinner vstinner left a comment

LGTM.

@ned-deily would you mind to merge this change?

@orsenthil orsenthil changed the title [3.6] bpo-24746: Avoid stripping trailing whitespace in doctest fancy diff (GH-10639) [3.6] - "Revert bpo-24746: Avoid stripping trailing whitespace in doctest fancy diff (GH-10639)" Jan 10, 2019
@orsenthil
Copy link
Member Author

orsenthil commented Jan 10, 2019

@vstinner : I changed the title. I just need to "[3.6]" to satisfy the the status check, but I removed the "Revert" and it caused some confusion.

Should we wait for @ned-deily or shall we merge this once the CI goes green? I seem to have the privs to merge this PR.

@vstinner
Copy link
Member

vstinner commented Jan 10, 2019

Should we wait for @ned-deily or shall we merge this once the CI goes green? I seem to have the privs to merge this PR.

I'm not allowed to merge PRs in the 3.6 branch, the branch is restricted to release managers like @ned-deily.

@ned-deily ned-deily merged commit d09e8ce into 3.6 Jan 10, 2019
@ned-deily
Copy link
Member

ned-deily commented Jan 10, 2019

Thanks all for catching and fixing this. I don't understand how you were able to merge the original PR to 3.6 in the first place unless the branch protection settings had been inadvertently changed and subsequently reset. This is one reason why we want to minimize the number of people with repo administrative privileges.

@zware zware deleted the revert-11477-backport-cbb1645-3.6 branch Jan 16, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vstinner vstinner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@orsenthil @vstinner @ned-deily @the-knights-who-say-ni @bedevere-bot