[pypy-dev] How to organize the py3k branch

[Antonio Cuni]

Hi,

On 14/10/11 14:07, Amaury Forgeot d'Arc wrote:

> Yes, that's true. It seemed to me that supporting both versions in the same
> files would be too much of a hassle.
> I'd prefer regularly merge branches, conflicts should be limited since the 2.7
> version won't grow new Python features.

yes, I see the point.  I'm not saying that this is the wrong approach, just 
that it's probably better to think a bit about it and decide which direction 
to follow.

> But we could revisit this, I just would like to avoid tons of #ifdef around
> the changes...

I agree with you that having tons of #ifdef should be avoided.

> Unfortunately I'm travelling early this afternoon, and I'm not sure to have a
> connection during the week-end.
> It will be easier next week, for example around 17:00 CEST.

what about monday at 17:00 CEST?