Message 341303 - Python tracker

Message341303

Author	terry.reedy
Recipients	miss-islington, terry.reedy
Date	2019-05-02.19:03:53
SpamBayes Score	-1.0
Marked as misclassified	Yes
Message-id	<1556823833.19.0.568134858572.issue34162@roundup.psfhosted.org>
In-reply-to

Content
PR 12579 started as a fixup for 3.7.4, but there seemed to be a problem of duplicate commits. The fix, based on Ned Deily's comments, after fetching from upstream: cd ../37 # 3.7 workspace git branch -D news37 # and dict37, whatever it was git reset --hard 784f52a^ <In response to 'more?', ' ' ENTER> git merge upstream/37 <Fix 3.7 NEWS.txt conflict - remove additions, and commit> git push --force origin Then git checkout -b news37 to add dates and fix for 3.7.4 to produce PR 13067

Content

PR 12579 started as a fixup for 3.7.4, but there seemed to be a problem of duplicate commits.  The fix, based on Ned Deily's comments, after fetching from upstream:

cd ../37  # 3.7 workspace
git branch -D news37  # and dict37, whatever it was
git reset --hard  784f52a^
<In response to 'more?', ' ' ENTER>
git merge upstream/37
<Fix 3.7 NEWS.txt conflict - remove additions, and commit>
git push --force origin

Then git checkout -b news37 to add dates and fix for 3.7.4 to produce PR 13067

History
Date	User	Action	Args
2019-05-02 19:03:53	terry.reedy	set	recipients: + terry.reedy, miss-islington
2019-05-02 19:03:53	terry.reedy	set	messageid: <1556823833.19.0.568134858572.issue34162@roundup.psfhosted.org>
2019-05-02 19:03:53	terry.reedy	link	issue34162 messages
2019-05-02 19:03:53	terry.reedy	create