https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114622
Revision: 114622
Author: reedy
Date: 2012-03-30 01:16:24 +0000 (Fri, 30 Mar 2012)
Log Message:
-----------
Remove PrefSwitch/PrefStats
Add some other revisions to merge
Modified Paths:
--------------
trunk/tools/make-wmf-branch/default.conf
Modified: trunk/tools/make-wmf-branch/default.conf
===================================================================
--- trunk/tools/make-wmf-branch/default.conf 2012-03-30 01:13:55 UTC (rev
114621)
+++ trunk/tools/make-wmf-branch/default.conf 2012-03-30 01:16:24 UTC (rev
114622)
@@ -76,8 +76,6 @@
'PdfHandler',
'Poem',
'PoolCounter',
- 'PrefStats',
- 'PrefSwitch',
'ProofreadPage',
'Quiz',
'ReaderFeedback',
@@ -140,10 +138,13 @@
$mainSourceUrl = '^/branches/REL1_19';
$patches = array(
array( 'rev' => 97505, 'base' => '^/branches/wmf/1.18wmf1' ),
- array( 'rev' => 97508, 'base' => '^/branches/wmf/1.18wmf1' ),
- array( 'rev' => 97509, 'base' => '^/branches/wmf/1.18wmf1' ), // r96552
part merged to trunk
+ array( 'rev' => 97508, 'base' => '^/branches/wmf/1.18wmf1' ), // r96552
part merged to trunk
+ array( 'rev' => 97509, 'base' => '^/branches/wmf/1.18wmf1' ),
array( 'rev' => 97512, 'base' => '^/branches/wmf/1.18wmf1' ),
array( 'rev' => 99928, 'base' => '^/branches/wmf/1.18wmf1' ),
+
+ //array( 'rev' => 111194, 'base' => '^/branches/wmf/1.19wmf1' ),
+ array( 'rev' => r112080, 'base' => '^/branches/wmf/1.19wmf1' ),
);
$dryRun = false;
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
