gwynne Sun Nov 9 06:37:09 2008 UTC
Modified files:
/SVNROOT phpsvn.options.skel run-conversion.php
Log:
fix keywords, remove obsolete fixup rules
http://cvs.php.net/viewvc.cgi/SVNROOT/phpsvn.options.skel?r1=1.1&r2=1.2&diff_format=u
Index: SVNROOT/phpsvn.options.skel
diff -u SVNROOT/phpsvn.options.skel:1.1 SVNROOT/phpsvn.options.skel:1.2
--- SVNROOT/phpsvn.options.skel:1.1 Wed Nov 5 18:15:59 2008
+++ SVNROOT/phpsvn.options.skel Sun Nov 9 06:37:09 2008
@@ -64,9 +64,9 @@
CVSBinaryFileEOLStyleSetter(),
CVSBinaryFileDefaultMimeTypeSetter(),
EOLStyleFromMimeTypeSetter(),
- DefaultEOLStyleSetter('native'),
+ DefaultEOLStyleSetter(r'native'),
SVNBinaryFileKeywordsPropertySetter(),
- KeywordsPropertySetter(config.SVN_KEYWORDS_VALUE),
+ KeywordsPropertySetter(r'Id Rev Revision Date LastChangedDate
LastChangedRevision Author LastChangedBy HeadURL URL'),
ExecutablePropertySetter(),
CVSRevisionNumberSetter(),
])
http://cvs.php.net/viewvc.cgi/SVNROOT/run-conversion.php?r1=1.28&r2=1.29&diff_format=u
Index: SVNROOT/run-conversion.php
diff -u SVNROOT/run-conversion.php:1.28 SVNROOT/run-conversion.php:1.29
--- SVNROOT/run-conversion.php:1.28 Sun Nov 9 06:00:55 2008
+++ SVNROOT/run-conversion.php Sun Nov 9 06:37:09 2008
@@ -7,7 +7,7 @@
//
-----------------------------------------------------------------------------------------------------------------------------
// Constants
-$version = substr('$Revision: 1.28 $', strlen('$Revision: '), -2);
+$version = substr('$Revision: 1.29 $', strlen('$Revision: '), -2);
$passes = array(
'processcvs', // Process CVS modules
@@ -463,12 +463,6 @@
$repoList['doc']->addRenameRule(array('mode' => 'move', 'srcPath' =>
'phpdoc', 'dstPath' => 'doc-base'));
// Fixup rules for php-src
$repoList['src']->addRenameRule(array('mode' => 'move', 'srcPath' =>
'pdo-specs/trunk', 'dstPath' => 'php-src/trunk/ext/pdo/specs'));
- $repoList['src']->addRenameRule(array('mode' => 'move', 'srcPath' =>
'ZendEngine2/trunk', 'dstPath' => 'php-src/trunk/ZendEngine2'));
- $repoList['src']->addRenameRule(array('mode' => 'move', 'srcPath' =>
'ZendEngine2/branches/PHP_5_2', 'dstPath' =>
'php-src/branches/PHP_5_2/ZendEngine2'));
- $repoList['src']->addRenameRule(array('mode' => 'move', 'srcPath' =>
'ZendEngine2/branches/PHP_5_3', 'dstPath' =>
'php-src/branches/PHP_5_3/ZendEngine2'));
- $repoList['src']->addRenameRule(array('mode' => 'move', 'srcPath' =>
'TSRM/trunk', 'dstPath' => 'php-src/trunk/TSRM'));
- $repoList['src']->addRenameRule(array('mode' => 'move', 'srcPath' =>
'TSRM/branches/PHP_5_2', 'dstPath' => 'php-src/branches/PHP_5_2/TSRM'));
- $repoList['src']->addRenameRule(array('mode' => 'move', 'srcPath' =>
'TSRM/branches/PHP_5_3', 'dstPath' => 'php-src/branches/PHP_5_3/TSRM'));
// Fixup rules for pear1
$repoList['pear1']->addRenameRule(array('mode' => 'delete', 'srcPath' =>
'pear/Selenium/branches/shin/.svn'));
$repoList['pear1']->addRenameRule(array('mode' => 'delete', 'srcPath' =>
'pear/Selenium/branches/shin/tests/.svn'));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php