Staging
v0.8.1
v0.8.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 |
|---|---|---|
| stringlib | ||
| abstract.c | -rw-r--r-- | 59.2 KB |
| boolobject.c | -rw-r--r-- | 4.4 KB |
| bytes_methods.c | -rw-r--r-- | 15.7 KB |
| bytesobject.c | -rw-r--r-- | 93.0 KB |
| cellobject.c | -rw-r--r-- | 2.6 KB |
| classobject.c | -rw-r--r-- | 14.5 KB |
| cobject.c | -rw-r--r-- | 3.9 KB |
| codeobject.c | -rw-r--r-- | 17.5 KB |
| complexobject.c | -rw-r--r-- | 24.1 KB |
| descrobject.c | -rw-r--r-- | 32.6 KB |
| dictnotes.txt | -rw-r--r-- | 11.9 KB |
| dictobject.c | -rw-r--r-- | 70.3 KB |
| doubledigits.c | -rw-r--r-- | 12.0 KB |
| enumobject.c | -rw-r--r-- | 9.4 KB |
| exceptions.c | -rw-r--r-- | 54.1 KB |
| fileobject.c | -rw-r--r-- | 11.8 KB |
| floatobject.c | -rw-r--r-- | 46.9 KB |
| frameobject.c | -rw-r--r-- | 25.4 KB |
| funcobject.c | -rw-r--r-- | 23.4 KB |
| genobject.c | -rw-r--r-- | 9.5 KB |
| iterobject.c | -rw-r--r-- | 9.3 KB |
| listobject.c | -rw-r--r-- | 65.9 KB |
| listsort.txt | -rw-r--r-- | 31.0 KB |
| longobject.c | -rw-r--r-- | 93.7 KB |
| memoryobject.c | -rw-r--r-- | 17.4 KB |
| methodobject.c | -rw-r--r-- | 7.8 KB |
| moduleobject.c | -rw-r--r-- | 6.3 KB |
| object.c | -rw-r--r-- | 41.6 KB |
| obmalloc.c | -rw-r--r-- | 56.8 KB |
| rangeobject.c | -rw-r--r-- | 18.9 KB |
| setobject.c | -rw-r--r-- | 54.7 KB |
| sliceobject.c | -rw-r--r-- | 8.7 KB |
| stringobject.c | -rw-r--r-- | 83.1 KB |
| structseq.c | -rw-r--r-- | 12.4 KB |
| tupleobject.c | -rw-r--r-- | 21.7 KB |
| typeobject.c | -rw-r--r-- | 158.9 KB |
| unicodectype.c | -rw-r--r-- | 16.4 KB |
| unicodeobject.c | -rw-r--r-- | 246.8 KB |
| unicodetype_db.h | -rw-r--r-- | 91.3 KB |
| weakrefobject.c | -rw-r--r-- | 27.9 KB |
Computing file changes ...
