Patches item #1097671, was opened at 2005-01-06 22:28 Message generated for change (Comment added) made by bcannon You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=305470&aid=1097671&group_id=5470
Category: Core (C code) Group: AST Status: Open Resolution: None Priority: 5 Submitted By: Kurt B. Kaiser (kbk) Assigned to: Brett Cannon (bcannon) Summary: Info Associated with Merge to AST Initial Comment: Attached file is the output of the merge from MAIN to ast-branch. -j mrg_to_ast-branch_24APR03 (24 April 2003 17:30 UTC) (estimated time of first merge) -j mrg_to_ast-branch_05JAN05 (05 January 2005 08:23 UTC) C Include/compile.h C Include/symtable.h C Lib/distutils/sysconfig.py C Lib/test/test_compile.py NOT MERGED C Lib/test/output/test_profile C Modules/main.c C Objects/listobject.c C Objects/tupleobject.c C Python/bltinmodule.c C Python/compile.c NOT MERGED C Python/future.c C Python/pythonrun.c C Python/symtable.c Other conflicts resolved. ---------------------------------------------------------------------- >Comment By: Brett Cannon (bcannon) Date: 2005-04-24 15:06 Message: Logged In: YES user_id=357491 rev. 1.10.10.4 has the checked-in copy. ---------------------------------------------------------------------- Comment By: Brett Cannon (bcannon) Date: 2005-04-24 11:23 Message: Logged In: YES user_id=357491 That was my plan. And no need for the patch, logistix. Easier for me to just copy from release24-maint into ast-branch and check it in. Thanks for the offer, though. ---------------------------------------------------------------------- Comment By: logistix (logistix) Date: 2005-04-23 13:38 Message: Logged In: YES user_id=699438 I took a look at test_compile to see how bad the conflicts were and it doesn't look good. On the ast-branch, it was rewritten to use doctests. On the main branch, it was rewritten to use unittest. So everything is out of whack due to two completely differnent rewrites. Other than that, I don't see any critical changes to either branch. I recommend that you just copy the test from the main branch as-is (from the last mergepoint, not HEAD) instead of trying to do a proper backport and merge. I can generate a patch if you need it. ---------------------------------------------------------------------- Comment By: Brett Cannon (bcannon) Date: 2005-04-18 22:08 Message: Logged In: YES user_id=357491 test_compile should have been merged; tests that the compiler is doing its job at the bytecode level, not Python/compile.c directly. Need to remember to backport changes at some point. ---------------------------------------------------------------------- Comment By: logistix (logistix) Date: 2005-04-03 15:03 Message: Logged In: YES user_id=699438 This can probably be closed. People have been developing off of the branch post-merge. ---------------------------------------------------------------------- Comment By: Kurt B. Kaiser (kbk) Date: 2005-01-06 22:32 Message: Logged In: YES user_id=149084 Hm, file was a little too big. bzip2 it, 10x compression ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=305470&aid=1097671&group_id=5470 _______________________________________________ Patches mailing list [email protected] http://mail.python.org/mailman/listinfo/patches
