| msg47479 - (view) |
Author: Kurt B. Kaiser (kbk) *  |
Date: 2005-01-07 06:28 |
| 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. |
|
|
| msg47480 - (view) |
Author: Kurt B. Kaiser (kbk) * |
Date: 2005-01-07 06:32 |
| Logged In: YES user_id=149084 Hm, file was a little too big. bzip2 it, 10x compression |
|
|
| msg47481 - (view) |
Author: Grant Olson (logistix) |
Date: 2005-04-03 22:03 |
| Logged In: YES user_id=699438 This can probably be closed. People have been developing off of the branch post-merge. |
|
|
| msg47482 - (view) |
Author: Brett Cannon (brett.cannon) * |
Date: 2005-04-19 05:08 |
| 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. |
|
|
| msg47483 - (view) |
Author: Grant Olson (logistix) |
Date: 2005-04-23 20:38 |
| 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. |
|
|
| msg47484 - (view) |
Author: Brett Cannon (brett.cannon) * |
Date: 2005-04-24 18:23 |
| 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. |
|
|
| msg47485 - (view) |
Author: Brett Cannon (brett.cannon) * |
Date: 2005-04-24 22:06 |
| Logged In: YES user_id=357491 rev. 1.10.10.4 has the checked-in copy. |
|
|
| msg47486 - (view) |
Author: Kurt B. Kaiser (kbk) * |
Date: 2005-04-25 02:05 |
| Logged In: YES user_id=149084 The change to test_compile.py looks ok, probably the best solution since there have been many changes on MAIN. There have been 11 updates to Python.c since the merge from 5 Jan tag. The AST crew probably should look at them so we don't get too far behind. We will need to do another merge from MAIN at some point. Let me know. Closing this Tracker item. |
|
|
| msg47487 - (view) |
Author: Brett Cannon (brett.cannon) * |
Date: 2005-04-26 06:22 |
| Logged In: YES user_id=357491 Kurt, what happened to the logging package? |
|
|
| msg47488 - (view) |
Author: Kurt B. Kaiser (kbk) * |
Date: 2005-04-30 19:12 |
| Logged In: YES user_id=149084 logging package missing: That's a good question. It was added after the AST branch was created and didn't get tagged with the mrg_to_ast-branch_24APR03 tag for some reason.... Researching. |
|
|
| msg47489 - (view) |
Author: Kurt B. Kaiser (kbk) * |
Date: 2005-11-11 21:40 |
| Logged In: YES user_id=149084 Missing directories are a non-issue because of the method Jeremy used to land the branch. |
|
|