On Wed, 05 Jan 2005 13:20:51 -0500, Kurt B. Kaiser <[EMAIL PROTECTED]> wrote: > Jeremy Hylton <[EMAIL PROTECTED]> writes: > > > Does anyone want to volunteer to integrate the current head to the > > branch? I think that's a pretty important near-term step. > > I'll take a shot at it.
Great! I say this after reading your other message in response to my suggestion to create a new branch. If you can manage to do the integration, it's simpler for everyone to stick to a single branch. (For example, there will be no opportunity for someone to work on the wrong branch.) > 29 conflicts Oh. That's not as bad as I expected. > 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. > Lib/test/test_os.py (AST?) > Lib/test/test_re.py (AST?) I wonder if these two were edited to worm around some bugs in early versions of newcompile.c. You could check the revision history. If that's the case, it's safe to drop the changes. > Major conflict probably not AST related: > Lib/test/test_bool.py > Lib/test/test_urllib.py > Lib/test/output/test_profile > Python/pythonrun.c (check brackets!) There are actually a lot of AST-related changes in pythonrun.c, because it is the gunk between files and stdin and the actual compiler and runtime. Jeremy _______________________________________________ Python-Dev mailing list Python-Dev@python.org http://mail.python.org/mailman/listinfo/python-dev Unsubscribe: http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
