diff options
| author | Christian Heimes <christian@cheimes.de> | 2008-02-23 16:29:43 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2008-02-23 16:29:43 (GMT) |
| commit | 5abe9125f9eb858fdaca966d687bb32387603f45 (patch) | |
| tree | fd6168e9832696bf63426c7f50c8edd354df1a80 /Python/import.c | |
| parent | 8640e749fd9f769f486268bebe340c9a35cca564 (diff) | |
| download | cpython-5abe9125f9eb858fdaca966d687bb32387603f45.zip cpython-5abe9125f9eb858fdaca966d687bb32387603f45.tar.gz cpython-5abe9125f9eb858fdaca966d687bb32387603f45.tar.bz2 | |
Simplified svnmerge blocked and integrated. We are never ever going to integrate the blocked revisions. The old values were:
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
Diffstat (limited to 'Python/import.c')
0 files changed, 0 insertions, 0 deletions