Staging
v0.5.1
v0.5.1
https://github.com/python/cpython
Revision 5abe9125f9eb858fdaca966d687bb32387603f45 authored by Christian Heimes on 23 February 2008, 16:29:43 UTC, committed by Christian Heimes on 23 February 2008, 16:29:43 UTC
svnmerge-blocked : /python/trunk:60480,60521-60522,60528-60529,60534,60539,60599,60707,60713,60879,60893,60899,60932,60962,60970,60978 svnmerge-integrated : /python/trunk:1-60479,60481-60520,60523-60527,60530-60533,60535-60538,60540-60598,60600-60706,60708-60712,60714-60878,60880-60892,60894-60898,60900-60931,60933-60961,60963-60969,60971-60977,60979-60989
1 parent 8640e74
Tip revision: 5abe9125f9eb858fdaca966d687bb32387603f45 authored by Christian Heimes on 23 February 2008, 16:29:43 UTC
Simplified svnmerge blocked and integrated. We are never ever going to integrate the blocked revisions. The old values were:
Simplified svnmerge blocked and integrated. We are never ever going to integrate the blocked revisions. The old values were:
Tip revision: 5abe912
| File | Mode | Size |
|---|---|---|
| Python-ast.c | -rw-r--r-- | 116.8 KB |
| asdl.c | -rw-r--r-- | 661 bytes |
| ast.c | -rw-r--r-- | 97.8 KB |
| atof.c | -rw-r--r-- | 815 bytes |
| bltinmodule.c | -rw-r--r-- | 46.5 KB |
| ceval.c | -rw-r--r-- | 95.2 KB |
| codecs.c | -rw-r--r-- | 20.5 KB |
| compile.c | -rw-r--r-- | 100.4 KB |
| dup2.c | -rw-r--r-- | 685 bytes |
| dynload_aix.c | -rw-r--r-- | 4.9 KB |
| dynload_atheos.c | -rw-r--r-- | 1.0 KB |
| dynload_dl.c | -rw-r--r-- | 561 bytes |
| dynload_hpux.c | -rw-r--r-- | 1.3 KB |
| dynload_next.c | -rw-r--r-- | 3.4 KB |
| dynload_os2.c | -rw-r--r-- | 1020 bytes |
| dynload_shlib.c | -rw-r--r-- | 3.2 KB |
| dynload_stub.c | -rw-r--r-- | 202 bytes |
| dynload_win.c | -rw-r--r-- | 7.5 KB |
| errors.c | -rw-r--r-- | 19.7 KB |
| formatter_unicode.c | -rw-r--r-- | 484 bytes |
| frozen.c | -rw-r--r-- | 1.3 KB |
| frozenmain.c | -rw-r--r-- | 1.3 KB |
| future.c | -rw-r--r-- | 3.3 KB |
| getargs.c | -rw-r--r-- | 43.6 KB |
| getcompiler.c | -rw-r--r-- | 366 bytes |
| getcopyright.c | -rw-r--r-- | 503 bytes |
| getcwd.c | -rw-r--r-- | 1.4 KB |
| getmtime.c | -rw-r--r-- | 388 bytes |
| getopt.c | -rw-r--r-- | 2.8 KB |
| getplatform.c | -rw-r--r-- | 130 bytes |
| getversion.c | -rw-r--r-- | 290 bytes |
| graminit.c | -rw-r--r-- | 35.8 KB |
| hypot.c | -rw-r--r-- | 304 bytes |
| import.c | -rw-r--r-- | 81.3 KB |
| importdl.c | -rw-r--r-- | 2.0 KB |
| importdl.h | -rw-r--r-- | 990 bytes |
| mactoolboxglue.c | -rw-r--r-- | 13.7 KB |
| marshal.c | -rw-r--r-- | 25.3 KB |
| memmove.c | -rw-r--r-- | 439 bytes |
| modsupport.c | -rw-r--r-- | 14.7 KB |
| mysnprintf.c | -rw-r--r-- | 2.6 KB |
| mystrtoul.c | -rw-r--r-- | 6.7 KB |
| peephole.c | -rw-r--r-- | 17.5 KB |
| pyarena.c | -rw-r--r-- | 5.8 KB |
| pyfpe.c | -rw-r--r-- | 623 bytes |
| pystate.c | -rw-r--r-- | 17.1 KB |
| pystrcmp.c | -rw-r--r-- | 473 bytes |
| pystrtod.c | -rw-r--r-- | 10.2 KB |
| pythonrun.c | -rw-r--r-- | 48.9 KB |
| sigcheck.c | -rw-r--r-- | 529 bytes |
| strdup.c | -rw-r--r-- | 256 bytes |
| strerror.c | -rw-r--r-- | 416 bytes |
| strtod.c | -rw-r--r-- | 5.1 KB |
| structmember.c | -rw-r--r-- | 6.6 KB |
| symtable.c | -rw-r--r-- | 42.9 KB |
| sysmodule.c | -rw-r--r-- | 38.7 KB |
| thread.c | -rw-r--r-- | 9.5 KB |
| thread_atheos.h | -rw-r--r-- | 6.0 KB |
| thread_cthread.h | -rw-r--r-- | 2.7 KB |
| thread_foobar.h | -rw-r--r-- | 1.9 KB |
| thread_lwp.h | -rw-r--r-- | 3.1 KB |
| thread_nt.h | -rw-r--r-- | 6.6 KB |
| thread_os2.h | -rw-r--r-- | 5.6 KB |
| thread_pth.h | -rw-r--r-- | 5.2 KB |
| thread_pthread.h | -rw-r--r-- | 12.1 KB |
| thread_sgi.h | -rw-r--r-- | 9.4 KB |
| thread_solaris.h | -rw-r--r-- | 3.0 KB |
| thread_wince.h | -rw-r--r-- | 4.0 KB |
| traceback.c | -rw-r--r-- | 6.8 KB |
Computing file changes ...
