| Index: trunk/tools/make-wmf-branch/make-wmf-branch |
| — | — | @@ -7,7 +7,8 @@ |
| 8 | 8 | } |
| 9 | 9 | |
| 10 | 10 | if ( count( $argv ) < 3 ) { |
| 11 | | - echo "Usage: make-wmf-branch <new-version> <old-version>"; |
| | 11 | + echo "Usage: make-wmf-branch <new-version> <old-version>\n"; |
| | 12 | + echo "Example: make-wmf-branch 1.16wmf4 1.16wmf3\n"; |
| 12 | 13 | exit( 1 ); |
| 13 | 14 | } |
| 14 | 15 | |
| — | — | @@ -149,7 +150,7 @@ |
| 150 | 151 | function fixVersion( $fileName ) { |
| 151 | 152 | $s = file_get_contents( $fileName ); |
| 152 | 153 | $s = preg_replace( '/^( \$wgVersion \s+ = \s+ ) [^;]* ( ; \s* ) $/xm', |
| 153 | | - "\\1'{$this->newVersion}\2'", $s ); |
| | 154 | + "\\1'{$this->newVersion}'\\2", $s ); |
| 154 | 155 | file_put_contents( $fileName, $s ); |
| 155 | 156 | } |
| 156 | 157 | } |
| Index: trunk/tools/make-wmf-branch/default.conf |
| — | — | @@ -99,7 +99,7 @@ |
| 100 | 100 | 'LiquidThreads' => '^/branches/wmf/1.16wmf3/extensions/LiquidThreads', |
| 101 | 101 | 'FlaggedRevs_alpha' => '^/branches/wmf/1.16wmf3/extensions/FlaggedRevs_alpha', |
| 102 | 102 | 'FlaggedRevs' => '^/branches/wmf/1.16wmf3/extensions/FlaggedRevs', |
| 103 | | - 'UsabilityInitiative' => '^/branches/1.16wmf3/extensions/UsabilityInitiative', |
| | 103 | + 'UsabilityInitiative' => '^/branches/wmf/1.16wmf3/extensions/UsabilityInitiative', |
| 104 | 104 | ); |
| 105 | 105 | |
| 106 | 106 | $preservedItems = array( |
| — | — | @@ -125,7 +125,9 @@ |
| 126 | 126 | # array( 'rev' => 56394, 'base' => '^/branches/wmf/1.16wmf3' ), |
| 127 | 127 | |
| 128 | 128 | array( 'rev' => 60970, 'base' => '^/branches/wmf/1.16wmf3' ), |
| 129 | | - array( 'rev' => 62002, 'base' => '^/branches/wmf/1.16wmf3' ), |
| | 129 | + |
| | 130 | + # Not needed for a copy from 1.16wmf3, may be needed for a future copy from trunk |
| | 131 | + #array( 'rev' => 62002, 'base' => '^/branches/wmf/1.16wmf3' ), |
| 130 | 132 | ); |
| 131 | 133 | |
| 132 | 134 | $dryRun = false; |