From: Christian Heimes <christian@cheimes.de>
Date: Sat, 23 Feb 2008 16:29:43 +0000 (+0000)
Subject: Simplified svnmerge blocked and integrated. We are never ever going to integrate... 
X-Git-Tag: v3.0a3~31
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5abe9125f9eb858fdaca966d687bb32387603f45;p=thirdparty%2FPython%2Fcpython.git

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
---