svn: SVNROOT/

gwynne		Sun, 12 Jul 2009 21:00:19 +0000

ViewVC URL: http://svn.php.net/viewvc?view=revision&revision=283986

Changed paths:
	U   SVNROOT/run-conversion.php

Log:
record the final changes that made the conversion work, for posterity

Modified: SVNROOT/run-conversion.php
===================================================================
--- SVNROOT/run-conversion.php	2009-07-12 20:59:32 UTC (rev 283985)
+++ SVNROOT/run-conversion.php	2009-07-12 21:00:19 UTC (rev 283986)
@@ -219,7 +219,10 @@
     trunk_path='SVNROOT',
     branches_path=None,
     tags_path=None,
-
+    symbol_transforms=svn_symbol_transforms,
+    symbol_strategy_rules=global_symbol_strategy_rules,
+    )
+
 EOEXTRA;
         } else if ($isMetaModule == true) {
             // Prefix of module
@@ -240,6 +243,9 @@
     trunk_path='{$modprefix}{$module}/trunk',
     branches_path='{$modprefix}{$module}/branches',
     tags_path='{$modprefix}{$module}/tags',
+    symbol_transforms=svn_symbol_transforms,
+    symbol_strategy_rules=global_symbol_strategy_rules,
+    )

 EOEXTRA;
             }
@@ -251,15 +257,12 @@
     trunk_path='{$moduleName}/trunk',
     branches_path='{$moduleName}/branches',
     tags_path='{$moduleName}/tags',
-
-EOEXTRA;
-        }
-        $this->optionsFileContents .= <<<EOEXTRA
     symbol_transforms=svn_symbol_transforms,
     symbol_strategy_rules=global_symbol_strategy_rules,
     )

 EOEXTRA;
+        }
     }

     public function run()
@@ -476,7 +479,7 @@
     $svnPath = $GLOBALS['options']['svnroot'];

     v(2, "Checking out SVNROOT...\n");
-    run_command("svn checkout " . escapeshellarg("file://{$GLOBALS['options']['svnroot']}/repository/SVNROOT/trunk") . ' ' .
+    run_command("svn checkout " . escapeshellarg("file://{$GLOBALS['options']['svnroot']}/repository/SVNROOT") . ' ' .
         escapeshellarg("{$svnPath}/SVNROOT"));

     if (!is_executable("{$svnPath}/SVNROOT/start-commit")) {