| Index: trunk/tools/make-wmf-branch/default.conf |
| — | — | @@ -15,6 +15,7 @@ |
| 16 | 16 | 'CharInsert', |
| 17 | 17 | 'CheckUser', |
| 18 | 18 | 'Cite', |
| | 19 | + 'ClickTracking', |
| 19 | 20 | 'ClientSide', |
| 20 | 21 | 'CodeReview', |
| 21 | 22 | 'Collection', |
| — | — | @@ -25,17 +26,13 @@ |
| 26 | 27 | 'ConfirmEdit', |
| 27 | 28 | 'ContactPage', |
| 28 | 29 | 'ContactPageFundraiser', |
| 29 | | - 'ContributionReporting', |
| 30 | | - 'ContributionTracking', |
| 31 | 30 | 'DismissableSiteNotice', |
| 32 | | - 'DonationInterface', |
| 33 | 31 | 'DoubleWiki', |
| 34 | 32 | 'DumpHTML', |
| 35 | 33 | 'ExpandTemplates', |
| 36 | 34 | 'ExtensionDistributor', |
| 37 | 35 | 'FlaggedRevs', |
| 38 | 36 | 'FormPreloadPostCache', |
| 39 | | - 'FundraiserPortal', |
| 40 | 37 | 'Gadgets', |
| 41 | 38 | 'GlobalBlocking', |
| 42 | 39 | 'GlobalUsage', |
| — | — | @@ -43,7 +40,6 @@ |
| 44 | 41 | 'InputBox', |
| 45 | 42 | 'intersection', |
| 46 | 43 | 'LabeledSectionTransclusion', |
| 47 | | - 'LandingCheck', |
| 48 | 44 | 'LocalisationUpdate', |
| 49 | 45 | 'MWReleases', |
| 50 | 46 | 'MWSearch', |
| — | — | @@ -58,6 +54,8 @@ |
| 59 | 55 | 'ParserFunctions', |
| 60 | 56 | 'PdfHandler', |
| 61 | 57 | 'Poem', |
| | 58 | + 'PrefStats', |
| | 59 | + 'PrefSwitch', |
| 62 | 60 | 'ProofreadPage', |
| 63 | 61 | 'Quiz', |
| 64 | 62 | 'ReaderFeedback', |
| — | — | @@ -66,6 +64,7 @@ |
| 67 | 65 | 'ScanSet', |
| 68 | 66 | 'SecurePoll', |
| 69 | 67 | 'SimpleAntiSpam', |
| | 68 | + 'SimpleSurvey', |
| 70 | 69 | 'SiteMatrix', |
| 71 | 70 | 'SkinPerPage', |
| 72 | 71 | 'skins', |
| — | — | @@ -83,8 +82,8 @@ |
| 84 | 83 | 'UnicodeConverter', |
| 85 | 84 | 'UploadBlacklist', |
| 86 | 85 | 'UploadWizard', |
| | 86 | + 'UserDailyContribs', |
| 87 | 87 | 'UserThrottle', |
| 88 | | - 'VariablePage', |
| 89 | 88 | 'Vector', |
| 90 | 89 | 'wikidiff', |
| 91 | 90 | 'wikidiff2', |
| — | — | @@ -123,7 +122,7 @@ |
| 124 | 123 | ); |
| 125 | 124 | |
| 126 | 125 | $destBaseUrl = 'svn+ssh://svn.wikimedia.org/svnroot/mediawiki/branches/wmf'; |
| 127 | | -$mainSourceUrl = '^/trunk'; |
| | 126 | +$mainSourceUrl = '^/branches/REL1_17'; |
| 128 | 127 | $patches = array( |
| 129 | 128 | # Needs conflict resolution |
| 130 | 129 | # array( 'rev' => 56394, 'base' => '^/branches/wmf/1.16wmf3' ), |