MediaWiki r114622 - Code Review

Repository:	MediaWiki
Revision:	< r114621‎ \| r114622 (on ViewVC)‎ \| 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)

Diff [purge]

Index: trunk/tools/make-wmf-branch/default.conf
—	—	@@ -76,8 +76,6 @@
77	77	'PdfHandler',
78	78	'Poem',
79	79	'PoolCounter',
80		~~- 'PrefStats',~~
81		~~- 'PrefSwitch',~~
82	80	'ProofreadPage',
83	81	'Quiz',
84	82	'ReaderFeedback',
—	—	@@ -140,10 +138,13 @@
141	139	$mainSourceUrl = '^/branches/REL1_19';
142	140	$patches = array(
143	141	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' ),
146	144	array( 'rev' => 97512, 'base' => '^/branches/wmf/1.18wmf1' ),
147	145	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' ),
148	149	);
149	150
150	151	$dryRun = false;

Rev.	Commit summary	Author	Date
r114626	r114622: Extension not longer enabled on WMF cluster	raymond	06:40, 30 March 2012
r114632	Remove r from r114622	reedy	16:12, 30 March 2012

Rev.	Commit summary	Author	Date
r96552	Committing 2 live hacks swapping cache type (needs reapplying to 1.18wmf1)	reedy	10:53, 8 September 2011
r97508	1.18wmf1, Merge r96552, r96835	reedy	15:35, 19 September 2011
r97509	1.18wmf1 Merge r96834	reedy	15:41, 19 September 2011
r111194	MFT r97505, r97508, r97509, r97512, r99928	reedy	19:53, 10 February 2012
r112080	1.19wmf1: Disable MessageBlobStore::clear(), like in 1.17wmf1 and 1.18wmf1	catrope	02:50, 22 February 2012

#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)