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

[Antonio Cuni]

On 05/30/2012 12:53 PM, Amaury Forgeot d'Arc wrote:

> 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".

yes, I also consider it a win. However, it happens rarely.
Maybe it's just me that can't handle them, but conflicts markers are usually
put in places which makes it very difficult to understand what's going on. I
always end up at looking at the unchanged files before the merge and the diff
in the branch, forgetting the markers.


> 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.

yes. That would be perfect, but we can't :-(

> 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.

My impression is that the time spent for merges is increasing, and this is not
surprising because the two branches are slowly diverging.

Anyway, if you volunteer to do the merges regularly I won't certainly stop you
:-). We can always do the split later.

ciao,
Anto