[Python-checkins] [Python-Dev] FIXED: I broke the 3.5 branch, apparently

[Terry Reedy]

On 6/3/2016 6:29 PM, R. David Murray wrote:
> On Fri, 03 Jun 2016 23:21:25 +0100, MRAB <python at mrabarnett.plus.com> wrote:
>> On 2016-06-03 22:50, R. David Murray wrote:
>>> I don't understand how it happened, but apparently I got a merge commit
>>> backward and merged 3.6 into 3.5 and pushed it without realizing what
>>> had happened.  If anyone has any clue how to reverse this cleanly,
>>> please let me know.  (There are a couple people at the sprints looking
>>> in to it, but the mercurial guys aren't here so we are short on experts).
>>>
>>> My apologies for the mess :(
>>>
>> There's a lot about undoing changes here:
>>
>> http://hgbook.red-bean.com/read/finding-and-fixing-mistakes.html
>
> Ned Deily has fixed the problem.

I don't think so.  There is still a merge needed, plus someone committed 
something that deleted most of idlelib and some other files and changed 
100s of others.  I am still trying to figure out what is what for idlelib.