Re: [python-committers] I broke the 3.5 branch, apparently

2016-06-04 Thread Larry Hastings
On 06/03/2016 02:50 PM, R. David Murray wrote: (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). For future reference: #mercurial on freenode IRC. There's always someone in there and they're glad to help out with stuf

Re: [python-committers] I broke the 3.5 branch, apparently

2016-06-03 Thread Guido van Rossum
According to the logs it's been fixed. On Fri, Jun 3, 2016 at 7:32 PM, Jesus Cea wrote: > On 03/06/16 23: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.

Re: [python-committers] I broke the 3.5 branch, apparently

2016-06-03 Thread Jesus Cea
On 03/06/16 23: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