[Python-Dev] Please help complete the AST branch
Kurt B. Kaiser
kbk at shore.net
Wed Jan 5 22:30:34 CET 2005
Jeremy Hylton <jhylton at gmail.com> writes:
>> 29 conflicts
>
> Oh. That's not as bad as I expected.
Proceeding....
>> Major conflict:
>> Python/compile.c (Probably not merged during 1st merge)
>
> I think that's right. I didn't merge any of the changes, then.
>
>> Lib/test/test_compile.c (ditto)
>
> Probably.
So maybe it's not necessary to merge these two; just leave them behind?
That would lighten the load quite a bit.
--
KBK
More information about the Python-Dev
mailing list