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

2016-06-03 Thread MRAB
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 peo

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

2016-06-03 Thread R. David Murray
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 m