[pypy-dev] change of strategy for the py3k branch?

[Amaury Forgeot d'Arc]

2012/5/30 Antonio Cuni <anto.cuni at gmail.com>

> Another point of view is that IMHO porting the changes by doing merges is
> harder/more time consuming than porting them by hand.
>

We probably don't have the same view on merges then :)
I consider that when a merge is successful (no conflict), it's a win.
And conflicts are markers to say "hey, port this change by hand".

Of course, it would be better if we could just merge the translator/ or
jit/ directories on a regular basis,
and come back later to merge (or port) changes from the interpreter/ and
objspace/ directories.
But hg does not seem to allow this.

I estimate that I spent ~2h on each merge from default to py3k.
If one merge per month is enough, it's a task I can definitely find time
for.

-- 
Amaury Forgeot d'Arc
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.python.org/pipermail/pypy-dev/attachments/20120530/4b69fa57/attachment.html>