r91758 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r91757‎ \| r91758 \| r91759 >
Date:	21:26, 8 July 2011
Author:	hashar
Status:	ok (Comments)
Tags:
Comment:	MFT to REL1_18: r89099, r89108 : message key 'noemail' r88231, r88232 : fix ProfilerSimpleTextBreakage (fix r86633)
Modified paths:	/branches/REL1_18/phase3 (modified) (history) /branches/REL1_18/phase3/api.php (modified) (history) /branches/REL1_18/phase3/img_auth.php (modified) (history) /branches/REL1_18/phase3/includes (modified) (history) /branches/REL1_18/phase3/includes/AutoLoader.php (modified) (history) /branches/REL1_18/phase3/includes/CategoryPage.php (modified) (history) /branches/REL1_18/phase3/includes/ChangesList.php (modified) (history) /branches/REL1_18/phase3/includes/ConfEditor.php (modified) (history) /branches/REL1_18/phase3/includes/GlobalFunctions.php (modified) (history) /branches/REL1_18/phase3/includes/HistoryPage.php (modified) (history) /branches/REL1_18/phase3/includes/OutputPage.php (modified) (history) /branches/REL1_18/phase3/includes/RawPage.php (modified) (history) /branches/REL1_18/phase3/includes/Revision.php (modified) (history) /branches/REL1_18/phase3/includes/SpecialPage.php (modified) (history) /branches/REL1_18/phase3/includes/SpecialPageFactory.php (modified) (history) /branches/REL1_18/phase3/includes/Title.php (modified) (history) /branches/REL1_18/phase3/includes/WebRequest.php (modified) (history) /branches/REL1_18/phase3/includes/WebStart.php (modified) (history) /branches/REL1_18/phase3/includes/api (modified) (history) /branches/REL1_18/phase3/includes/api/ApiQueryImageInfo.php (modified) (history) /branches/REL1_18/phase3/includes/api/ApiUpload.php (modified) (history) /branches/REL1_18/phase3/includes/db/Database.php (modified) (history) /branches/REL1_18/phase3/includes/db/LoadBalancer.php (modified) (history) /branches/REL1_18/phase3/includes/filerepo/File.php (modified) (history) /branches/REL1_18/phase3/includes/installer (modified) (history) /branches/REL1_18/phase3/includes/installer/DatabaseInstaller.php (modified) (history) /branches/REL1_18/phase3/includes/interwiki/Interwiki.php (modified) (history) /branches/REL1_18/phase3/includes/json/Services_JSON.php (modified) (history) /branches/REL1_18/phase3/includes/libs/IEUrlExtension.php (modified) (history) /branches/REL1_18/phase3/includes/media/Exif.php (modified) (history) /branches/REL1_18/phase3/includes/media/JpegOrTiff.php (modified) (history) /branches/REL1_18/phase3/includes/profiler/ProfilerSimpleText.php (modified) (history) /branches/REL1_18/phase3/includes/profiler/ProfilerSimpleTrace.php (modified) (history) /branches/REL1_18/phase3/includes/resourceloader/ResourceLoader.php (modified) (history) /branches/REL1_18/phase3/includes/specials (modified) (history) /branches/REL1_18/phase3/includes/specials/SpecialBlock.php (modified) (history) /branches/REL1_18/phase3/includes/specials/SpecialUploadStash.php (modified) (history) /branches/REL1_18/phase3/includes/specials/SpecialUserlogin.php (modified) (history) /branches/REL1_18/phase3/includes/templates/NoLocalSettings.php (modified) (history) /branches/REL1_18/phase3/includes/upload/UploadBase.php (modified) (history) /branches/REL1_18/phase3/includes/upload/UploadFromFile.php (modified) (history) /branches/REL1_18/phase3/includes/upload/UploadStash.php (modified) (history) /branches/REL1_18/phase3/index.php (modified) (history) /branches/REL1_18/phase3/languages (modified) (history) /branches/REL1_18/phase3/load.php (modified) (history) /branches/REL1_18/phase3/maintenance/archives (modified) (history) /branches/REL1_18/phase3/maintenance/cleanupTable.inc (modified) (history) /branches/REL1_18/phase3/maintenance/deleteSelfExternals.php (modified) (history) /branches/REL1_18/phase3/maintenance/mergeMessageFileList.php (modified) (history) /branches/REL1_18/phase3/maintenance/populateRevisionLength.php (modified) (history) /branches/REL1_18/phase3/maintenance/tables.sql (modified) (history) /branches/REL1_18/phase3/tests/parserTests.php (modified) (history) /branches/REL1_18/phase3/tests/phpunit (modified) (history) /branches/REL1_18/phase3/tests/phpunit/Makefile (modified) (history) /branches/REL1_18/phase3/tests/phpunit/includes/api/ApiUploadTest.php (modified) (history) /branches/REL1_18/phase3/tests/phpunit/includes/api/RandomImageGenerator.php (modified) (history) /branches/REL1_18/phase3/tests/phpunit/includes/api/generateRandomImages.php (modified) (history) /branches/REL1_18/phase3/tests/selenium/installer/MediaWikiButtonsAvailabilityTestCase.php (modified) (history) /branches/REL1_18/phase3/tests/selenium/installer/MediaWikiDifferentDatabaseAccountTestCase.php (modified) (history) /branches/REL1_18/phase3/tests/selenium/installer/MediaWikiDifferntDatabasePrefixTestCase.php (modified) (history) /branches/REL1_18/phase3/tests/selenium/installer/MediaWikiErrorsConnectToDatabasePageTestCase.php (modified) (history) /branches/REL1_18/phase3/tests/selenium/installer/MediaWikiErrorsNamepageTestCase.php (modified) (history) /branches/REL1_18/phase3/tests/selenium/installer/MediaWikiHelpFieldHintTestCase.php (modified) (history) /branches/REL1_18/phase3/tests/selenium/installer/MediaWikiInstallationCommonFunction.php (modified) (history) /branches/REL1_18/phase3/tests/selenium/installer/MediaWikiInstallationConfig.php (modified) (history) /branches/REL1_18/phase3/tests/selenium/installer/MediaWikiInstallationMessage.php (modified) (history) /branches/REL1_18/phase3/tests/selenium/installer/MediaWikiInstallationVariables.php (modified) (history) /branches/REL1_18/phase3/tests/selenium/installer/MediaWikiInstallerTestSuite.php (modified) (history) /branches/REL1_18/phase3/tests/selenium/installer/MediaWikiMySQLDataBaseTestCase.php (modified) (history) /branches/REL1_18/phase3/tests/selenium/installer/MediaWikiMySQLiteDataBaseTestCase.php (modified) (history) /branches/REL1_18/phase3/tests/selenium/installer/MediaWikiOnAlreadyInstalledTestCase.php (modified) (history) /branches/REL1_18/phase3/tests/selenium/installer/MediaWikiRestartInstallationTestCase.php (modified) (history) /branches/REL1_18/phase3/tests/selenium/installer/MediaWikiRightFrameworkLinksTestCase.php (modified) (history) /branches/REL1_18/phase3/tests/selenium/installer/MediaWikiUpgradeExistingDatabaseTestCase.php (modified) (history) /branches/REL1_18/phase3/tests/selenium/installer/MediaWikiUserInterfaceTestCase.php (modified) (history) /branches/REL1_18/phase3/tests/selenium/installer/README.txt (modified) (history) /branches/REL1_18/phase3/tests/testHelpers.inc (modified) (history)

Diff [purge]

Property changes on: branches/REL1_18/phase3/maintenance/archives
___________________________________________________________________
Modified: svn:mergeinfo
1	1	Merged /trunk/phase3/maintenance/archives:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/maintenance/deleteSelfExternals.php
___________________________________________________________________
Modified: svn:mergeinfo
2	2	Merged /trunk/phase3/maintenance/deleteSelfExternals.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/maintenance/populateRevisionLength.php
___________________________________________________________________
Modified: svn:mergeinfo
3	3	Merged /trunk/phase3/maintenance/populateRevisionLength.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/maintenance/cleanupTable.inc
___________________________________________________________________
Modified: svn:mergeinfo
4	4	Merged /trunk/phase3/maintenance/cleanupTable.inc:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/maintenance/mergeMessageFileList.php
___________________________________________________________________
Modified: svn:mergeinfo
5	5	Merged /trunk/phase3/maintenance/mergeMessageFileList.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/maintenance/tables.sql
___________________________________________________________________
Modified: svn:mergeinfo
6	6	Merged /trunk/phase3/maintenance/tables.sql:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/tests/selenium/installer/MediaWikiErrorsNamepageTestCase.php
___________________________________________________________________
Modified: svn:mergeinfo
7	7	Merged /trunk/phase3/tests/selenium/installer/MediaWikiErrorsNamepageTestCase.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/tests/selenium/installer/MediaWikiInstallationMessage.php
___________________________________________________________________
Modified: svn:mergeinfo
8	8	Merged /trunk/phase3/tests/selenium/installer/MediaWikiInstallationMessage.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/tests/selenium/installer/MediaWikiErrorsConnectToDatabasePageTestCase.php
___________________________________________________________________
Modified: svn:mergeinfo
9	9	Merged /trunk/phase3/tests/selenium/installer/MediaWikiErrorsConnectToDatabasePageTestCase.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/tests/selenium/installer/MediaWikiInstallerTestSuite.php
___________________________________________________________________
Modified: svn:mergeinfo
10	10	Merged /trunk/phase3/tests/selenium/installer/MediaWikiInstallerTestSuite.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/tests/selenium/installer/MediaWikiOnAlreadyInstalledTestCase.php
___________________________________________________________________
Modified: svn:mergeinfo
11	11	Merged /trunk/phase3/tests/selenium/installer/MediaWikiOnAlreadyInstalledTestCase.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/tests/selenium/installer/MediaWikiHelpFieldHintTestCase.php
___________________________________________________________________
Modified: svn:mergeinfo
12	12	Merged /trunk/phase3/tests/selenium/installer/MediaWikiHelpFieldHintTestCase.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/tests/selenium/installer/MediaWikiInstallationCommonFunction.php
___________________________________________________________________
Modified: svn:mergeinfo
13	13	Merged /trunk/phase3/tests/selenium/installer/MediaWikiInstallationCommonFunction.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/tests/selenium/installer/MediaWikiUpgradeExistingDatabaseTestCase.php
___________________________________________________________________
Modified: svn:mergeinfo
14	14	Merged /trunk/phase3/tests/selenium/installer/MediaWikiUpgradeExistingDatabaseTestCase.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/tests/selenium/installer/MediaWikiButtonsAvailabilityTestCase.php
___________________________________________________________________
Modified: svn:mergeinfo
15	15	Merged /trunk/phase3/tests/selenium/installer/MediaWikiButtonsAvailabilityTestCase.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/tests/selenium/installer/MediaWikiMySQLDataBaseTestCase.php
___________________________________________________________________
Modified: svn:mergeinfo
16	16	Merged /trunk/phase3/tests/selenium/installer/MediaWikiMySQLDataBaseTestCase.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/tests/selenium/installer/MediaWikiInstallationConfig.php
___________________________________________________________________
Modified: svn:mergeinfo
17	17	Merged /trunk/phase3/tests/selenium/installer/MediaWikiInstallationConfig.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/tests/selenium/installer/MediaWikiMySQLiteDataBaseTestCase.php
___________________________________________________________________
Modified: svn:mergeinfo
18	18	Merged /trunk/phase3/tests/selenium/installer/MediaWikiMySQLiteDataBaseTestCase.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/tests/selenium/installer/MediaWikiRightFrameworkLinksTestCase.php
___________________________________________________________________
Modified: svn:mergeinfo
19	19	Merged /trunk/phase3/tests/selenium/installer/MediaWikiRightFrameworkLinksTestCase.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/tests/selenium/installer/MediaWikiInstallationVariables.php
___________________________________________________________________
Modified: svn:mergeinfo
20	20	Merged /trunk/phase3/tests/selenium/installer/MediaWikiInstallationVariables.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/tests/selenium/installer/MediaWikiUserInterfaceTestCase.php
___________________________________________________________________
Modified: svn:mergeinfo
21	21	Merged /trunk/phase3/tests/selenium/installer/MediaWikiUserInterfaceTestCase.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/tests/selenium/installer/MediaWikiDifferntDatabasePrefixTestCase.php
___________________________________________________________________
Modified: svn:mergeinfo
22	22	Merged /trunk/phase3/tests/selenium/installer/MediaWikiDifferntDatabasePrefixTestCase.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/tests/selenium/installer/README.txt
___________________________________________________________________
Modified: svn:mergeinfo
23	23	Merged /trunk/phase3/tests/selenium/installer/README.txt:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/tests/selenium/installer/MediaWikiRestartInstallationTestCase.php
___________________________________________________________________
Modified: svn:mergeinfo
24	24	Merged /trunk/phase3/tests/selenium/installer/MediaWikiRestartInstallationTestCase.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/tests/selenium/installer/MediaWikiDifferentDatabaseAccountTestCase.php
___________________________________________________________________
Modified: svn:mergeinfo
25	25	Merged /trunk/phase3/tests/selenium/installer/MediaWikiDifferentDatabaseAccountTestCase.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/tests/parserTests.php
___________________________________________________________________
Modified: svn:mergeinfo
26	26	Merged /trunk/phase3/tests/parserTests.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/tests/phpunit/includes/api/RandomImageGenerator.php
___________________________________________________________________
Modified: svn:mergeinfo
27	27	Merged /trunk/phase3/tests/phpunit/includes/api/RandomImageGenerator.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/tests/phpunit/includes/api/ApiUploadTest.php
___________________________________________________________________
Modified: svn:mergeinfo
28	28	Merged /trunk/phase3/tests/phpunit/includes/api/ApiUploadTest.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/tests/phpunit/includes/api/generateRandomImages.php
___________________________________________________________________
Modified: svn:mergeinfo
29	29	Merged /trunk/phase3/tests/phpunit/includes/api/generateRandomImages.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/tests/phpunit/Makefile
___________________________________________________________________
Modified: svn:mergeinfo
30	30	Merged /trunk/phase3/tests/phpunit/Makefile:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/tests/phpunit
___________________________________________________________________
Modified: svn:mergeinfo
31	31	Merged /trunk/phase3/tests/phpunit:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/tests/testHelpers.inc
___________________________________________________________________
Modified: svn:mergeinfo
32	32	Merged /trunk/phase3/tests/testHelpers.inc:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/includes/upload/UploadBase.php
___________________________________________________________________
Modified: svn:mergeinfo
33	33	Merged /trunk/phase3/includes/upload/UploadBase.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/includes/upload/UploadStash.php
___________________________________________________________________
Modified: svn:mergeinfo
34	34	Merged /trunk/phase3/includes/upload/UploadStash.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/includes/upload/UploadFromFile.php
___________________________________________________________________
Modified: svn:mergeinfo
35	35	Merged /trunk/phase3/includes/upload/UploadFromFile.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/includes/SpecialPageFactory.php
___________________________________________________________________
Modified: svn:mergeinfo
36	36	Merged /trunk/phase3/includes/SpecialPageFactory.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/includes/CategoryPage.php
___________________________________________________________________
Modified: svn:mergeinfo
37	37	Merged /trunk/phase3/includes/CategoryPage.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/includes/json/Services_JSON.php
___________________________________________________________________
Modified: svn:mergeinfo
38	38	Merged /trunk/phase3/includes/json/Services_JSON.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/includes/GlobalFunctions.php
___________________________________________________________________
Modified: svn:mergeinfo
39	39	Merged /trunk/phase3/includes/GlobalFunctions.php:r88231-88232,89099,89108
Index: branches/REL1_18/phase3/includes/profiler/ProfilerSimpleTrace.php
—	—	@@ -60,7 +60,7 @@
61	61	return $diff / 1024;
62	62	}
63	63
64		~~- function getOutput() {~~
	64	+ function logData() {
65	65	print "<!-- \n {$this->trace} \n -->";
66	66	}
67	67	}
Index: branches/REL1_18/phase3/includes/profiler/ProfilerSimpleText.php
—	—	@@ -27,7 +27,6 @@
28	28
29	29	public function logData() {
30	30	if($this->mTemplated) {
31		~~- $this->collateData();~~
32	31	uasort($this->mCollated,array('self','sort'));
33	32	array_walk($this->mCollated,array('self','format'));
34	33	if ($this->visible) {
Property changes on: branches/REL1_18/phase3/includes/db/Database.php
___________________________________________________________________
Modified: svn:mergeinfo
35	34	Merged /trunk/phase3/includes/db/Database.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/includes/db/LoadBalancer.php
___________________________________________________________________
Modified: svn:mergeinfo
36	35	Merged /trunk/phase3/includes/db/LoadBalancer.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/includes/filerepo/File.php
___________________________________________________________________
Modified: svn:mergeinfo
37	36	Merged /trunk/phase3/includes/filerepo/File.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/includes/OutputPage.php
___________________________________________________________________
Modified: svn:mergeinfo
38	37	Merged /trunk/phase3/includes/OutputPage.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/includes/HistoryPage.php
___________________________________________________________________
Modified: svn:mergeinfo
39	38	Merged /trunk/phase3/includes/HistoryPage.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/includes/installer/DatabaseInstaller.php
___________________________________________________________________
Modified: svn:mergeinfo
40	39	Merged /trunk/phase3/includes/installer/DatabaseInstaller.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/includes/installer
___________________________________________________________________
Modified: svn:mergeinfo
41	40	Merged /trunk/phase3/includes/installer:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/includes/interwiki/Interwiki.php
___________________________________________________________________
Modified: svn:mergeinfo
42	41	Merged /trunk/phase3/includes/interwiki/Interwiki.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/includes/api/ApiQueryImageInfo.php
___________________________________________________________________
Modified: svn:mergeinfo
43	42	Merged /trunk/phase3/includes/api/ApiQueryImageInfo.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/includes/api/ApiUpload.php
___________________________________________________________________
Modified: svn:mergeinfo
44	43	Merged /trunk/phase3/includes/api/ApiUpload.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/includes/api
___________________________________________________________________
Modified: svn:mergeinfo
45	44	Merged /trunk/phase3/includes/api:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/includes/WebRequest.php
___________________________________________________________________
Modified: svn:mergeinfo
46	45	Merged /trunk/phase3/includes/WebRequest.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/includes/resourceloader/ResourceLoader.php
___________________________________________________________________
Modified: svn:mergeinfo
47	46	Merged /trunk/phase3/includes/resourceloader/ResourceLoader.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/includes/media/Exif.php
___________________________________________________________________
Modified: svn:mergeinfo
48	47	Merged /trunk/phase3/includes/media/Exif.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/includes/media/JpegOrTiff.php
___________________________________________________________________
Modified: svn:mergeinfo
49	48	Merged /trunk/phase3/includes/media/JpegOrTiff.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/includes/WebStart.php
___________________________________________________________________
Modified: svn:mergeinfo
50	49	Merged /trunk/phase3/includes/WebStart.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/includes/Revision.php
___________________________________________________________________
Modified: svn:mergeinfo
51	50	Merged /trunk/phase3/includes/Revision.php:r88231-88232,89099,89108
Index: branches/REL1_18/phase3/includes/AutoLoader.php
—	—	@@ -601,6 +601,7 @@
602	602	'Profiler' => 'includes/profiler/Profiler.php',
603	603	'ProfilerSimple' => 'includes/profiler/ProfilerSimple.php',
604	604	'ProfilerSimpleText' => 'includes/profiler/ProfilerSimpleText.php',
	605	+ 'ProfilerSimpleTrace' => 'includes/profiler/ProfilerSimpleTrace.php',
605	606	'ProfilerSimpleUDP' => 'includes/profiler/ProfilerSimpleUDP.php',
606	607	'ProfilerStub' => 'includes/profiler/ProfilerStub.php',
607	608
Property changes on: branches/REL1_18/phase3/includes/AutoLoader.php
___________________________________________________________________
Modified: svn:mergeinfo
608	609	Merged /trunk/phase3/includes/AutoLoader.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/includes/ChangesList.php
___________________________________________________________________
Modified: svn:mergeinfo
609	610	Merged /trunk/phase3/includes/ChangesList.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/includes/Title.php
___________________________________________________________________
Modified: svn:mergeinfo
610	611	Merged /trunk/phase3/includes/Title.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/includes/RawPage.php
___________________________________________________________________
Modified: svn:mergeinfo
611	612	Merged /trunk/phase3/includes/RawPage.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/includes/ConfEditor.php
___________________________________________________________________
Modified: svn:mergeinfo
612	613	Merged /trunk/phase3/includes/ConfEditor.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/includes/libs/IEUrlExtension.php
___________________________________________________________________
Modified: svn:mergeinfo
613	614	Merged /trunk/phase3/includes/libs/IEUrlExtension.php:r88231-88232,89099,89108
Index: branches/REL1_18/phase3/includes/specials/SpecialUserlogin.php
—	—	@@ -158,7 +158,7 @@
159	159	global $wgOut;
160	160
161	161	if ( $this->mEmail == '' ) {
162		~~- $this->mainLoginForm( wfMsgExt( 'noemail', array( 'parsemag', 'escape' ), $this->mUsername ) );~~
	162	+ $this->mainLoginForm( wfMsgExt( 'noemailcreate', array( 'parsemag', 'escape' ) ) );
163	163	return;
164	164	}
165	165
Property changes on: branches/REL1_18/phase3/includes/specials/SpecialUploadStash.php
___________________________________________________________________
Modified: svn:mergeinfo
166	166	Merged /trunk/phase3/includes/specials/SpecialUploadStash.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/includes/specials/SpecialBlock.php
___________________________________________________________________
Modified: svn:mergeinfo
167	167	Merged /trunk/phase3/includes/specials/SpecialBlock.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/includes/specials
___________________________________________________________________
Modified: svn:mergeinfo
168	168	Merged /trunk/phase3/includes/specials:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/includes/SpecialPage.php
___________________________________________________________________
Modified: svn:mergeinfo
169	169	Merged /trunk/phase3/includes/SpecialPage.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/includes/templates/NoLocalSettings.php
___________________________________________________________________
Modified: svn:mergeinfo
170	170	Merged /trunk/phase3/includes/templates/NoLocalSettings.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/includes
___________________________________________________________________
Modified: svn:mergeinfo
171	171	Merged /trunk/phase3/includes:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/img_auth.php
___________________________________________________________________
Modified: svn:mergeinfo
172	172	Merged /trunk/phase3/img_auth.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/index.php
___________________________________________________________________
Modified: svn:mergeinfo
173	173	Merged /trunk/phase3/index.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/api.php
___________________________________________________________________
Modified: svn:mergeinfo
174	174	Merged /trunk/phase3/api.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/load.php
___________________________________________________________________
Modified: svn:mergeinfo
175	175	Merged /trunk/phase3/load.php:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3/languages
___________________________________________________________________
Modified: svn:mergeinfo
176	176	Merged /trunk/phase3/languages:r88231-88232,89099,89108
Property changes on: branches/REL1_18/phase3
___________________________________________________________________
Modified: svn:mergeinfo
177	177	Merged /trunk/phase3:r88231-88232,88750,89099,89108

Past revisions this follows-up on

Revision	Commit summary	Author	Date
r86633	* Added Profiler::isStub() to check if we are using a stub profiler, instead ...	ialex	16:31, 21 April 2011
r88231	Fix ProfilerSimpleTextBreakage introduced by r86633	midom	12:45, 16 May 2011
r88232	unbreak ProfilerSimpleTrace, some Profile refactoring made it not worky :( Al...	midom	12:50, 16 May 2011
r89099	Fix message key for account creation by e-mail....	raymond	13:22, 29 May 2011
r89108	Followup r89099 per RobertL's CR: Remove now unused parameter. Thanks :)	raymond	14:53, 29 May 2011

Comments

#Comment by 😂 (talk | contribs) 19:56, 12 July 2011

Also seem to have merged a bunch of needless property changes :\

#Comment by Hashar (talk | contribs) 20:52, 12 July 2011

I merge using several time:

svn merge -c <REVISION> svn+ssh://svn.wikimedia.org/svnroot/mediawiki/trunk/phase3 .

Then I svn commit.

Maybe I should just merge individual files.

#Comment by Reedy (talk | contribs) 20:53, 12 July 2011

Roan has a list of like 10 chained commands that will clear just merge props etc

#Comment by Catrope (talk | contribs) 20:53, 12 July 2011

$ cat ~/bin/svnsucks
#! /bin/bash
svn st | grep '^ M' | awk '{print $2}' | xargs svn revert

Status & tagging log

19:56, 12 July 2011 😂 (talk | contribs) changed the status of r91758 [removed: new added: ok]