Author terry.reedy
Recipients Guilherme.Simões, Mark.Young, Todd.Rovito, gpolo, ned.deily, r.david.murray, roger.serwy, serhiy.storchaka, terry.reedy, weeble
Date 2016-06-11.05:23:33
SpamBayes Score -1.0
Marked as misclassified Yes
Message-id <1465622614.12.0.34143889274.issue5124@psf.upfronthosting.co.za>
In-reply-to
Content
I had some trouble committing and pushing these patches.  After deleting TEntry and committed the 2.7 and 3.5 patches and tried to do the usual 3.5 to default forward merge in TortoiseHG.  I got

% hg merge --tool :merge --verbose 101861
resolving manifests
abort: case-folding collision between Lib/idlelib/pyshell.py and Lib/idlelib/PyShell.py
[command returned code 255 Fri Jun 10 22:33:09 2016]

This seems to be a known problem.  After some effort to resolve the situation, I gave up and used my replaced my repository with a copy of my backup copy, to undo the things I had tried.

Since the renames on 5/22, I have done other merges without problem, but I rechecked and none involved a file where case was the only difference. I will try again by temporarily renaming pyshell back to PyShell first.
History
Date User Action Args
2016-06-11 05:23:34terry.reedysetrecipients: + terry.reedy, gpolo, ned.deily, roger.serwy, weeble, r.david.murray, Todd.Rovito, Mark.Young, serhiy.storchaka, Guilherme.Simões
2016-06-11 05:23:34terry.reedysetmessageid: <1465622614.12.0.34143889274.issue5124@psf.upfronthosting.co.za>
2016-06-11 05:23:34terry.reedylinkissue5124 messages
2016-06-11 05:23:33terry.reedycreate