Re: [Python-Dev] cpython (merge 3.4 -> default): null merge with 3.4

2015-06-15 Thread Senthil Kumaran
On Sunday, June 14, 2015 at 6:43 PM, Ned Deily wrote: > Senthil, > > There is now an active 3.5 branch, so the correct current order of > merging is: > > 3.4 -> 3.5 > 3.5 -> default > > I've checked in a couple of null merges to try to fix things. Oh! Missed that. Sorry, for the trouble. I wil

Re: [Python-Dev] cpython (merge 3.4 -> default): null merge with 3.4

2015-06-14 Thread Ned Deily
In article <20150615003717.2599.82...@psf.io>, senthil.kumaran wrote: > https://hg.python.org/cpython/rev/9a0c5ffe7420 > changeset: 96605:9a0c5ffe7420 > parent: 96603:47a566d6ee2a > parent: 96604:3ded282f9615 > user:Senthil Kumaran > date:Sun Jun 14 17:37:09 2015 -070