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

[Armin Rigo]

Hi Antonio,

On Wed, May 30, 2012 at 1:35 PM, Antonio Cuni <anto.cuni at gmail.com> wrote:
>> 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 :-(

Then we can probably arrange things so that we use "translate.py" from
default, and not from the "py3k branch", which would be stripped of
the translation parts.

More precisely, we could organize this "py3k branch" --- quotes,
because likely living then in another repo --- with an only marginally
different directory structure: e.g. call the top-level directory
"py3k" instead of "pypy".  Then you would use the default's
"translate.py" to translate it, without getting conflicts between
"pypy.interpreter" as used by translate.py and the new
"py3k.interpreter" containing what you are translating.

Of course the directories that would be in the py3k package would
still have the same name as their original ones, so that we keep open
the possibility to do merges without adding yet another layer of
troubles.


A bientôt,

Armin.