| Index: trunk/tools/make-wmf-branch/default.conf |
| — | — | @@ -94,6 +94,7 @@ |
| 95 | 95 | 'wikidiff2', |
| 96 | 96 | 'wikihiero', |
| 97 | 97 | 'WikiEditor', |
| | 98 | + 'WikimediaMaintenance', |
| 98 | 99 | 'WikimediaMessages', |
| 99 | 100 | ); |
| 100 | 101 | |
| — | — | @@ -123,12 +124,6 @@ |
| 124 | 125 | |
| 125 | 126 | $preservedItems = array( |
| 126 | 127 | 'StartProfiler.php', |
| 127 | | - 'math/GNUmakefile', |
| 128 | | - 'maintenance/jobs-loop.sh', |
| 129 | | - 'maintenance/jeluf.php', |
| 130 | | - 'maintenance/storage/testRctComplete.php', |
| 131 | | - 'maintenance/storage/make-all-blobs', |
| 132 | | - |
| 133 | 128 | 'extensions/FlaggedRevs/maintenance/wikimedia-periodic-update.sh', |
| 134 | 129 | ); |
| 135 | 130 | |
| — | — | @@ -139,14 +134,10 @@ |
| 140 | 135 | $destBaseUrl = 'svn+ssh://svn.wikimedia.org/svnroot/mediawiki/branches/wmf'; |
| 141 | 136 | $mainSourceUrl = '^/branches/REL1_18'; |
| 142 | 137 | $patches = array( |
| 143 | | - // NOTE: r81460 is a big rev |
| 144 | | - // memcached->APC in LanguageConverter. TODO: Ask Tim if this is needed |
| 145 | | - // Reduce cache size for RepoGroup cache |
| 146 | | - // array( 'rev' => 81460, 'base' => '^/branches/wmf/1.17wmf1' ), |
| 147 | | - |
| 148 | | - // Is this still needed? |
| 149 | | - // Protect against fatals in Profiler.php |
| 150 | | - // array( 'rev' => 76243, 'base' => '^/branches/wmf/1.16wmf4' ), |
| | 138 | + array( 'rev' => 97505, 'base' => '^/branches/wmf/1.18wmf1' ), |
| | 139 | + array( 'rev' => 97508, 'base' => '^/branches/wmf/1.18wmf1' ), |
| | 140 | + array( 'rev' => 97509, 'base' => '^/branches/wmf/1.18wmf1' ), |
| | 141 | + array( 'rev' => 97512, 'base' => '^/branches/wmf/1.18wmf1' ), |
| 151 | 142 | ); |
| 152 | 143 | |
| 153 | 144 | $dryRun = false; |