r114622 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r114621‎ | r114622 | r114623 >
Date:01:16, 30 March 2012
Author:reedy
Status:new (Comments)
Tags:
Comment:
Remove PrefSwitch/PrefStats

Add some other revisions to merge
Modified paths:
  • /trunk/tools/make-wmf-branch/default.conf (modified) (history)

Diff [purge]

Index: trunk/tools/make-wmf-branch/default.conf
——@@ -76,8 +76,6 @@
7777 'PdfHandler',
7878 'Poem',
7979 'PoolCounter',
80 - 'PrefStats',
81 - 'PrefSwitch',
8280 'ProofreadPage',
8381 'Quiz',
8482 'ReaderFeedback',
——@@ -140,10 +138,13 @@
141139 $mainSourceUrl = '^/branches/REL1_19';
142140 $patches = array(
143141 array( 'rev' => 97505, 'base' => '^/branches/wmf/1.18wmf1' ),
144 - array( 'rev' => 97508, 'base' => '^/branches/wmf/1.18wmf1' ),
145 - array( 'rev' => 97509, 'base' => '^/branches/wmf/1.18wmf1' ), // r96552 part merged to trunk
 142+ array( 'rev' => 97508, 'base' => '^/branches/wmf/1.18wmf1' ), // r96552 part merged to trunk
 143+ array( 'rev' => 97509, 'base' => '^/branches/wmf/1.18wmf1' ),
146144 array( 'rev' => 97512, 'base' => '^/branches/wmf/1.18wmf1' ),
147145 array( 'rev' => 99928, 'base' => '^/branches/wmf/1.18wmf1' ),
 146+
 147+ //array( 'rev' => 111194, 'base' => '^/branches/wmf/1.19wmf1' ),
 148+ array( 'rev' => r112080, 'base' => '^/branches/wmf/1.19wmf1' ),
148149 );
149150
150151 $dryRun = false;

Follow-up revisions

RevisionCommit summaryAuthorDate
r114626r114622: Extension not longer enabled on WMF clusterraymond06:40, 30 March 2012
r114632Remove r from r114622reedy16:12, 30 March 2012

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r96552Committing 2 live hacks swapping cache type (needs reapplying to 1.18wmf1)reedy10:53, 8 September 2011
r975081.18wmf1, Merge r96552, r96835reedy15:35, 19 September 2011
r975091.18wmf1 Merge r96834reedy15:41, 19 September 2011
r111194MFT r97505, r97508, r97509, r97512, r99928reedy19:53, 10 February 2012
r1120801.19wmf1: Disable MessageBlobStore::clear(), like in 1.17wmf1 and 1.18wmf1catrope02:50, 22 February 2012

Comments

#Comment by Krinkle (talk | contribs)   13:37, 30 March 2012 
+	array( 'rev' => [[Special:Code/MediaWiki/112080|r112080]], 'base' => '^/branches/wmf/1.19wmf1' ),

that 'r' looks problematic, should be a quoted string or an integer (integer probably)