Skip to content

bpo-29656: Handle PR branches in 'make patchcheck'#302

Merged
ncoghlan merged 1 commit intopython:masterfrom
ncoghlan:bpo-29656-branch-aware-patchcheck
Mar 12, 2017
Merged

bpo-29656: Handle PR branches in 'make patchcheck'#302
ncoghlan merged 1 commit intopython:masterfrom
ncoghlan:bpo-29656-branch-aware-patchcheck

Conversation

@ncoghlan
Copy link
Copy Markdown
Contributor

No description provided.

@ncoghlan ncoghlan merged commit 482f7a2 into python:master Mar 12, 2017
ncoghlan added a commit to ncoghlan/cpython that referenced this pull request Mar 12, 2017
ncoghlan added a commit to ncoghlan/cpython that referenced this pull request Mar 12, 2017
@ncoghlan
Copy link
Copy Markdown
Contributor Author

3.5 backport: #627
3.6 backport: #626

Both created with @Mariatta's helper script - thank you!

The cherry pick to 2.7 failed, so I'm going to take a closer look at that.

ncoghlan added a commit that referenced this pull request Mar 12, 2017
ncoghlan added a commit that referenced this pull request Mar 12, 2017
ncoghlan added a commit to ncoghlan/cpython that referenced this pull request Mar 12, 2017
Additional changes needed to backport:

- dropped legacy SVN support from patchcheck
- use subprocess.PIPE to silence expected error output
- don't try to use subprocess.Popen as a context manager
- don't try to pass a keyword argument to str.split()

(cherry picked from commit 482f7a2)
@ncoghlan
Copy link
Copy Markdown
Contributor Author

And the 2.7 backport: #628

The merge conflict itself was due to the legacy subversion support (which I just removed entirely), but there were also runtime errors due to reliance on features that are all in at least 3.3+ but not in 2.7.

Working on this also prompted me to file http://bugs.python.org/issue29798, as even the backported change wasn't working in my 2.7 worktree.

ncoghlan added a commit that referenced this pull request Mar 12, 2017
Additional changes needed to backport:

- dropped legacy SVN support from patchcheck
- use subprocess.PIPE to silence expected error output
- don't try to use subprocess.Popen as a context manager
- don't try to pass a keyword argument to str.split()

(cherry picked from commit 482f7a2)
@ncoghlan ncoghlan deleted the bpo-29656-branch-aware-patchcheck branch March 12, 2017 09:35
akruis added a commit to akruis/cpython that referenced this pull request Aug 11, 2021
…rowPickling

Upstream fix for bpo-39606 broke the test case.
jaraco pushed a commit that referenced this pull request Dec 2, 2022
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.

3 participants