http://www.mediawiki.org/wiki/Special:Code/MediaWiki/97492
Revision: 97492
Author: reedy
Date: 2011-09-19 13:49:05 +0000 (Mon, 19 Sep 2011)
Log Message:
-----------
Also comment out r76243, it won't merge cleanly due to path changes, and it
looks like some protection has been put in already
Modified Paths:
--------------
trunk/tools/make-wmf-branch/default.conf
Modified: trunk/tools/make-wmf-branch/default.conf
===================================================================
--- trunk/tools/make-wmf-branch/default.conf 2011-09-19 13:47:15 UTC (rev
97491)
+++ trunk/tools/make-wmf-branch/default.conf 2011-09-19 13:49:05 UTC (rev
97492)
@@ -147,7 +147,7 @@
// Is this still needed?
// Protect against fatals in Profiler.php
- array( 'rev' => 76243, 'base' => '^/branches/wmf/1.16wmf4' ),
+ // array( 'rev' => 76243, 'base' => '^/branches/wmf/1.16wmf4' ),
);
$dryRun = false;
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
