Re: [pypy-dev] stdlib-2.7.9!

2015-01-02 Thread Philip Jenvey
I doubt the VCS can help here. I think the only sane way of dealing with this is to wrap said changes in feature flags, e.g. if PYTHON34_SSL: On Dec 15, 2014, at 2:01 AM, Amaury Forgeot d'Arc wrote: > I suspect that some 2.7.9 changes should not go in 3.2, but are only > compatible with a 3.

Re: [pypy-dev] stdlib-2.7.9!

2014-12-15 Thread Amaury Forgeot d'Arc
I suspect that some 2.7.9 changes should not go in 3.2, but are only compatible with a 3.3 or 3.4 stdlib... Is there a way to skip the merge so these changes directly go to the 3.3 branch? 2014-12-14 22:15 GMT+01:00 Alex Gaynor : > Hey all, > > Earlier today I created the 2.7.9 branch, with the c