r86165 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r86164‎ | r86165 | r86166 >
Date:00:37, 16 April 2011
Author:bawolff
Status:ok
Tags:
Comment:
According to my googling, removing some svn:mergeinfo props will fix the errors subversion
is giving me (merging is fun!)
Modified paths:
  • /branches/img_metadata/phase3/includes (modified) (history)
  • /branches/img_metadata/phase3/includes/AutoLoader.php (modified) (history)
  • /branches/img_metadata/phase3/includes/CategoryPage.php (modified) (history)
  • /branches/img_metadata/phase3/includes/ChangesList.php (modified) (history)
  • /branches/img_metadata/phase3/includes/ConfEditor.php (modified) (history)
  • /branches/img_metadata/phase3/includes/GlobalFunctions.php (modified) (history)
  • /branches/img_metadata/phase3/includes/HistoryPage.php (modified) (history)
  • /branches/img_metadata/phase3/includes/Interwiki.php (modified) (history)
  • /branches/img_metadata/phase3/includes/OutputPage.php (modified) (history)
  • /branches/img_metadata/phase3/includes/Revision.php (modified) (history)
  • /branches/img_metadata/phase3/includes/SpecialPage.php (modified) (history)
  • /branches/img_metadata/phase3/includes/Title.php (modified) (history)
  • /branches/img_metadata/phase3/includes/api (modified) (history)
  • /branches/img_metadata/phase3/includes/api/ApiQueryImageInfo.php (modified) (history)
  • /branches/img_metadata/phase3/includes/api/ApiUpload.php (modified) (history)
  • /branches/img_metadata/phase3/includes/db/Database.php (modified) (history)
  • /branches/img_metadata/phase3/includes/db/LoadBalancer.php (modified) (history)
  • /branches/img_metadata/phase3/includes/filerepo/File.php (modified) (history)
  • /branches/img_metadata/phase3/includes/installer/DatabaseInstaller.php (modified) (history)
  • /branches/img_metadata/phase3/includes/json/Services_JSON.php (modified) (history)
  • /branches/img_metadata/phase3/includes/media/Exif.php (modified) (history)
  • /branches/img_metadata/phase3/includes/resourceloader/ResourceLoader.php (modified) (history)
  • /branches/img_metadata/phase3/includes/specials (modified) (history)
  • /branches/img_metadata/phase3/includes/specials/SpecialBlock.php (modified) (history)
  • /branches/img_metadata/phase3/includes/specials/SpecialUploadStash.php (modified) (history)
  • /branches/img_metadata/phase3/includes/upload/UploadBase.php (modified) (history)
  • /branches/img_metadata/phase3/includes/upload/UploadFromFile.php (modified) (history)
  • /branches/img_metadata/phase3/includes/upload/UploadStash.php (modified) (history)
  • /branches/img_metadata/phase3/languages/Language.php (modified) (history)
  • /branches/img_metadata/phase3/maintenance/archives (modified) (history)
  • /branches/img_metadata/phase3/maintenance/cleanupTable.inc (modified) (history)
  • /branches/img_metadata/phase3/maintenance/deleteSelfExternals.php (modified) (history)
  • /branches/img_metadata/phase3/maintenance/mergeMessageFileList.php (modified) (history)
  • /branches/img_metadata/phase3/maintenance/populateRevisionLength.php (modified) (history)
  • /branches/img_metadata/phase3/maintenance/tables.sql (modified) (history)
  • /branches/img_metadata/phase3/tests/parserTests.php (modified) (history)
  • /branches/img_metadata/phase3/tests/phpunit/Makefile (modified) (history)
  • /branches/img_metadata/phase3/tests/phpunit/includes/api/ApiUploadTest.php (modified) (history)
  • /branches/img_metadata/phase3/tests/phpunit/includes/api/RandomImageGenerator.php (modified) (history)
  • /branches/img_metadata/phase3/tests/phpunit/includes/api/generateRandomImages.php (modified) (history)
  • /branches/img_metadata/phase3/tests/selenium/installer/MediaWikiButtonsAvailabilityTestCase.php (modified) (history)
  • /branches/img_metadata/phase3/tests/selenium/installer/MediaWikiDifferentDatabaseAccountTestCase.php (modified) (history)
  • /branches/img_metadata/phase3/tests/selenium/installer/MediaWikiDifferntDatabasePrefixTestCase.php (modified) (history)
  • /branches/img_metadata/phase3/tests/selenium/installer/MediaWikiErrorsConnectToDatabasePageTestCase.php (modified) (history)
  • /branches/img_metadata/phase3/tests/selenium/installer/MediaWikiErrorsNamepageTestCase.php (modified) (history)
  • /branches/img_metadata/phase3/tests/selenium/installer/MediaWikiHelpFieldHintTestCase.php (modified) (history)
  • /branches/img_metadata/phase3/tests/selenium/installer/MediaWikiInstallationCommonFunction.php (modified) (history)
  • /branches/img_metadata/phase3/tests/selenium/installer/MediaWikiInstallationConfig.php (modified) (history)
  • /branches/img_metadata/phase3/tests/selenium/installer/MediaWikiInstallationMessage.php (modified) (history)
  • /branches/img_metadata/phase3/tests/selenium/installer/MediaWikiInstallationVariables.php (modified) (history)
  • /branches/img_metadata/phase3/tests/selenium/installer/MediaWikiInstallerTestSuite.php (modified) (history)
  • /branches/img_metadata/phase3/tests/selenium/installer/MediaWikiMySQLDataBaseTestCase.php (modified) (history)
  • /branches/img_metadata/phase3/tests/selenium/installer/MediaWikiMySQLiteDataBaseTestCase.php (modified) (history)
  • /branches/img_metadata/phase3/tests/selenium/installer/MediaWikiOnAlreadyInstalledTestCase.php (modified) (history)
  • /branches/img_metadata/phase3/tests/selenium/installer/MediaWikiRestartInstallationTestCase.php (modified) (history)
  • /branches/img_metadata/phase3/tests/selenium/installer/MediaWikiRightFrameworkLinksTestCase.php (modified) (history)
  • /branches/img_metadata/phase3/tests/selenium/installer/MediaWikiUpgradeExistingDatabaseTestCase.php (modified) (history)
  • /branches/img_metadata/phase3/tests/selenium/installer/MediaWikiUserInterfaceTestCase.php (modified) (history)
  • /branches/img_metadata/phase3/tests/selenium/installer/README.txt (modified) (history)
  • /branches/img_metadata/phase3/tests/testHelpers.inc (modified) (history)

Diff [purge]

Property changes on: branches/img_metadata/phase3/maintenance/archives
___________________________________________________________________
Deleted: svn:mergeinfo
11 Reverse-merged /branches/iwtransclusion/phase3/maintenance/archives:r69540
22 Reverse-merged /branches/new-installer/phase3/maintenance/archives:r43664-66004
33 Reverse-merged /branches/REL1_15/phase3/maintenance/archives:r51646
44 Reverse-merged /branches/sqlite/maintenance/archives:r58211-58321
Property changes on: branches/img_metadata/phase3/maintenance/deleteSelfExternals.php
___________________________________________________________________
Deleted: svn:mergeinfo
55 Reverse-merged /trunk/phase3/maintenance/deleteSelfExternals.php:r52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613,54764,54793,54806,55178,55626
66 Reverse-merged /branches/REL1_15/phase3/maintenance/deleteSelfExternals.php:r51646
Property changes on: branches/img_metadata/phase3/maintenance/populateRevisionLength.php
___________________________________________________________________
Deleted: svn:mergeinfo
77 Reverse-merged /branches/REL1_15/phase3/maintenance/populateParentId.php:r51646
88 Reverse-merged /branches/sqlite/maintenance/populateParentId.php:r58211-58321
Property changes on: branches/img_metadata/phase3/maintenance/cleanupTable.inc
___________________________________________________________________
Deleted: svn:mergeinfo
99 Reverse-merged /branches/wmf-deployment/maintenance/cleanupTable.inc:r56715
1010 Reverse-merged /branches/REL1_15/phase3/maintenance/cleanupTable.inc:r51646
Property changes on: branches/img_metadata/phase3/maintenance/mergeMessageFileList.php
___________________________________________________________________
Deleted: svn:mergeinfo
1111 Reverse-merged /branches/new-installer/phase3/maintenance/mergeMessageFileList.php:r43664-66004
1212 Reverse-merged /branches/wmf/1.17wmf1/maintenance/mergeMessageFileList.php:r81725
1313 Reverse-merged /branches/REL1_15/phase3/maintenance/mergeMessageFileList.php:r51646
1414 Reverse-merged /branches/sqlite/maintenance/mergeMessageFileList.php:r58211-58321
Property changes on: branches/img_metadata/phase3/maintenance/tables.sql
___________________________________________________________________
Deleted: svn:mergeinfo
1515 Reverse-merged /branches/resourceloader/phase3/maintenance/tables.sql:r68366-69676,69678-70682,70684-71999,72001-72255,72257-72305,72307-72342
1616 Reverse-merged /branches/sqlite/maintenance/tables.sql:r58211-58321
1717 Reverse-merged /branches/iwtransclusion/phase3/maintenance/tables.sql:r68448,69480
1818 Reverse-merged /branches/new-installer/phase3/maintenance/tables.sql:r43664-66004
1919 Reverse-merged /branches/REL1_15/phase3/maintenance/tables.sql:r51646
Property changes on: branches/img_metadata/phase3/includes/upload/UploadBase.php
___________________________________________________________________
Deleted: svn:mergeinfo
2020 Reverse-merged /branches/sqlite/includes/upload/UploadBase.php:r58211-58321
2121 Reverse-merged /branches/new-installer/phase3/includes/upload/UploadBase.php:r43664-66004
2222 Reverse-merged /branches/wmf-deployment/includes/upload/UploadBase.php:r53381
2323 Reverse-merged /branches/uploadwizard/phase3/includes/upload/UploadBase.php:r73550-75905
2424 Reverse-merged /branches/REL1_15/phase3/includes/upload/UploadBase.php:r51646
Property changes on: branches/img_metadata/phase3/includes/upload/UploadFromFile.php
___________________________________________________________________
Deleted: svn:mergeinfo
2525 Reverse-merged /branches/new-installer/phase3/includes/upload/UploadFromFile.php:r43664-66004
2626 Reverse-merged /branches/wmf-deployment/includes/upload/UploadFromFile.php:r53381
2727 Reverse-merged /branches/uploadwizard/phase3/includes/upload/UploadFromFile.php:r73550-75905
2828 Reverse-merged /branches/REL1_15/phase3/includes/upload/UploadFromFile.php:r51646
2929 Reverse-merged /branches/sqlite/includes/upload/UploadFromFile.php:r58211-58321
Property changes on: branches/img_metadata/phase3/includes/Interwiki.php
___________________________________________________________________
Deleted: svn:mergeinfo
3030 Reverse-merged /branches/REL1_15/phase3/includes/Interwiki.php:r51646
3131 Reverse-merged /branches/sqlite/includes/Interwiki.php:r58211-58321
3232 Reverse-merged /branches/iwtransclusion/phase3/includes/Interwiki.php:r68170,68448,69480,69541
3333 Reverse-merged /branches/new-installer/phase3/includes/Interwiki.php:r43664-66004
3434 Reverse-merged /branches/wmf-deployment/includes/Interwiki.php:r53381
Property changes on: branches/img_metadata/phase3/includes/CategoryPage.php
___________________________________________________________________
Deleted: svn:mergeinfo
3535 Reverse-merged /branches/new-installer/phase3/includes/CategoryPage.php:r43664-66004
3636 Reverse-merged /branches/wmf-deployment/includes/CategoryPage.php:r53381
3737 Reverse-merged /branches/wmf/1.17wmf1/includes/CategoryPage.php:r83562
3838 Reverse-merged /branches/REL1_15/phase3/includes/CategoryPage.php:r51646
3939 Reverse-merged /branches/sqlite/includes/CategoryPage.php:r58211-58321
Property changes on: branches/img_metadata/phase3/includes/json/Services_JSON.php
___________________________________________________________________
Deleted: svn:mergeinfo
4040 Reverse-merged /branches/wmf-deployment/includes/api/ApiFormatJson_json.php:r53381
4141 Reverse-merged /branches/REL1_15/phase3/includes/api/ApiFormatJson_json.php:r51646
Property changes on: branches/img_metadata/phase3/includes/GlobalFunctions.php
___________________________________________________________________
Deleted: svn:mergeinfo
4242 Reverse-merged /branches/new-installer/phase3/includes/GlobalFunctions.php:r43664-66004
4343 Reverse-merged /branches/wmf-deployment/includes/GlobalFunctions.php:r53381
4444 Reverse-merged /branches/wmf/1.17wmf1/includes/GlobalFunctions.php:r81718
4545 Reverse-merged /branches/REL1_15/phase3/includes/GlobalFunctions.php:r51646
4646 Reverse-merged /branches/resourceloader/phase3/includes/GlobalFunctions.php:r71750
4747 Reverse-merged /branches/sqlite/includes/GlobalFunctions.php:r58211-58321
Property changes on: branches/img_metadata/phase3/includes/db/Database.php
___________________________________________________________________
Deleted: svn:mergeinfo
4848 Reverse-merged /branches/new-installer/phase3/includes/db/Database.php:r43664-66004
4949 Reverse-merged /branches/querypage-work2/phase3/includes/db/Database.php:r65475
5050 Reverse-merged /branches/wmf-deployment/includes/db/Database.php:r53381
5151 Reverse-merged /branches/REL1_15/phase3/includes/db/Database.php:r51646
5252 Reverse-merged /branches/wmf/1.16wmf4/includes/db/Database.php:r67177
5353 Reverse-merged /branches/sqlite/includes/db/Database.php:r58211-58321
Property changes on: branches/img_metadata/phase3/includes/db/LoadBalancer.php
___________________________________________________________________
Deleted: svn:mergeinfo
5454 Reverse-merged /branches/new-installer/phase3/includes/db/LoadBalancer.php:r43664-66004
5555 Reverse-merged /branches/wmf-deployment/includes/db/LoadBalancer.php:r53381
5656 Reverse-merged /branches/wmf/1.17wmf1/includes/db/LoadBalancer.php:r83555
5757 Reverse-merged /branches/REL1_15/phase3/includes/db/LoadBalancer.php:r51646
5858 Reverse-merged /branches/sqlite/includes/db/LoadBalancer.php:r58211-58321
Property changes on: branches/img_metadata/phase3/includes/filerepo/File.php
___________________________________________________________________
Deleted: svn:mergeinfo
5959 Reverse-merged /branches/REL1_15/phase3/includes/filerepo/File.php:r51646
6060 Reverse-merged /branches/sqlite/includes/filerepo/File.php:r58211-58321
6161 Reverse-merged /branches/new-installer/phase3/includes/filerepo/File.php:r43664-66004
6262 Reverse-merged /branches/wmf-deployment/includes/filerepo/File.php:r53381
6363 Reverse-merged /branches/uploadwizard/phase3/includes/filerepo/File.php:r73550-75905
Property changes on: branches/img_metadata/phase3/includes/OutputPage.php
___________________________________________________________________
Deleted: svn:mergeinfo
6464 Reverse-merged /branches/wmf-deployment/includes/OutputPage.php:r53381,57468
6565 Reverse-merged /branches/REL1_15/phase3/includes/OutputPage.php:r51646
6666 Reverse-merged /branches/REL1_17/phase3/includes/OutputPage.php:r81445
6767 Reverse-merged /branches/resourceloader/phase3/includes/OutputPage.php:r68366-69676,69678-70682,70684-71999,72001-72255,72257-72305,72307-72342
Property changes on: branches/img_metadata/phase3/includes/HistoryPage.php
___________________________________________________________________
Deleted: svn:mergeinfo
6868 Reverse-merged /branches/resourceloader/phase3/includes/HistoryPage.php:r68366-69676,69678-70682,70684-71999,72001-72255,72257-72305,72307-72342
6969 Reverse-merged /branches/REL1_15/phase3/includes/PageHistory.php:r51646
7070 Reverse-merged /branches/REL1_17/phase3/includes/HistoryPage.php:r81448
Property changes on: branches/img_metadata/phase3/includes/api/ApiQueryImageInfo.php
___________________________________________________________________
Deleted: svn:mergeinfo
7171 Reverse-merged /branches/uploadwizard/phase3/includes/api/ApiQueryImageInfo.php:r73550-75905
7272 Reverse-merged /branches/REL1_15/phase3/includes/api/ApiQueryImageInfo.php:r51646
7373 Reverse-merged /branches/REL1_16/phase3/includes/api/ApiQueryImageInfo.php:r63621-63636,69357
7474 Reverse-merged /branches/wmf/1.16wmf4/includes/api/ApiQueryImageInfo.php:r69521
7575 Reverse-merged /branches/sqlite/includes/api/ApiQueryImageInfo.php:r58211-58321
7676 Reverse-merged /branches/wmf-deployment/includes/api/ApiQueryImageInfo.php:r53381,59952
Property changes on: branches/img_metadata/phase3/includes/api/ApiUpload.php
___________________________________________________________________
Deleted: svn:mergeinfo
7777 Reverse-merged /branches/uploadwizard/phase3/includes/api/ApiUpload.php:r73550-75905
7878 Reverse-merged /branches/REL1_15/phase3/includes/api/ApiUpload.php:r51646
7979 Reverse-merged /branches/REL1_16/phase3/includes/api/ApiUpload.php:r63621-63636,69357
8080 Reverse-merged /branches/wmf/1.16wmf4/includes/api/ApiUpload.php:r69521
8181 Reverse-merged /branches/sqlite/includes/api/ApiUpload.php:r58211-58321
8282 Reverse-merged /branches/wmf-deployment/includes/api/ApiUpload.php:r53381,59952
Property changes on: branches/img_metadata/phase3/includes/api
___________________________________________________________________
Deleted: svn:mergeinfo
8383 Reverse-merged /branches/REL1_16/phase3/includes/api:r63621-63636,69357
8484 Reverse-merged /branches/wmf/1.16wmf4/includes/api:r69521
8585 Reverse-merged /branches/sqlite/includes/api:r58211-58321
8686 Reverse-merged /branches/wmf-deployment/includes/api:r53381,59952
8787 Reverse-merged /branches/REL1_15/phase3/includes/api:r51646
Property changes on: branches/img_metadata/phase3/includes/media/Exif.php
___________________________________________________________________
Deleted: svn:mergeinfo
Property changes on: branches/img_metadata/phase3/includes/Revision.php
___________________________________________________________________
Deleted: svn:mergeinfo
8888 Reverse-merged /branches/sqlite/includes/Revision.php:r58211-58321
8989 Reverse-merged /branches/new-installer/phase3/includes/Revision.php:r43664-66004
9090 Reverse-merged /branches/wmf-deployment/includes/Revision.php:r53381
9191 Reverse-merged /branches/REL1_15/phase3/includes/Revision.php:r51646
9292 Reverse-merged /branches/wmf/1.16wmf4/includes/Revision.php:r80947
Property changes on: branches/img_metadata/phase3/includes/AutoLoader.php
___________________________________________________________________
Deleted: svn:mergeinfo
9393 Reverse-merged /branches/sqlite/includes/AutoLoader.php:r58211-58321
9494 Reverse-merged /branches/new-installer/phase3/includes/AutoLoader.php:r43664-66004
9595 Reverse-merged /branches/wmf-deployment/includes/AutoLoader.php:r53381
9696 Reverse-merged /branches/uploadwizard/phase3/includes/AutoLoader.php:r73550-75905
9797 Reverse-merged /branches/REL1_15/phase3/includes/AutoLoader.php:r51646
9898 Reverse-merged /branches/REL1_17/phase3/includes/AutoLoader.php:r81448
Property changes on: branches/img_metadata/phase3/includes/ChangesList.php
___________________________________________________________________
Deleted: svn:mergeinfo
9999 Reverse-merged /branches/REL1_15/phase3/includes/ChangesList.php:r51646
100100 Reverse-merged /branches/resourceloader/phase3/includes/ChangesList.php:r68366-69676,69678-70682,70684-71999,72001-72255,72257-72305,72307-72342
101101 Reverse-merged /branches/wmf-deployment/includes/ChangesList.php:r53381,57589
102102 Reverse-merged /branches/wmf/1.17wmf1/includes/ChangesList.php:r81926
Property changes on: branches/img_metadata/phase3/includes/Title.php
___________________________________________________________________
Deleted: svn:mergeinfo
103103 Reverse-merged /branches/sqlite/includes/Title.php:r58211-58321
104104 Reverse-merged /branches/iwtransclusion/phase3/includes/Title.php:r68448,69480
105105 Reverse-merged /branches/new-installer/phase3/includes/Title.php:r43664-66004
106106 Reverse-merged /branches/wmf-deployment/includes/Title.php:r53381
107107 Reverse-merged /branches/REL1_15/phase3/includes/Title.php:r51646
Property changes on: branches/img_metadata/phase3/includes/ConfEditor.php
___________________________________________________________________
Deleted: svn:mergeinfo
Property changes on: branches/img_metadata/phase3/includes/specials/SpecialUploadStash.php
___________________________________________________________________
Deleted: svn:mergeinfo
108108 Reverse-merged /branches/wmf-deployment/includes/specials/SpecialUploadStash.php:r53381,56967
109109 Reverse-merged /branches/REL1_15/phase3/includes/specials/SpecialUploadStash.php:r51646
110110 Reverse-merged /branches/sqlite/includes/specials/SpecialUploadStash.php:r58211-58321
111111 Reverse-merged /trunk/phase3/includes/specials/SpecialUploadStash.php:r73549-75058,75060-75587,75589-75821
Property changes on: branches/img_metadata/phase3/includes/specials
___________________________________________________________________
Deleted: svn:mergeinfo
112112 Reverse-merged /branches/wmf-deployment/includes/specials:r53381,56967
113113 Reverse-merged /branches/REL1_15/phase3/includes/specials:r51646
114114 Reverse-merged /branches/sqlite/includes/specials:r58211-58321
Property changes on: branches/img_metadata/phase3/includes/SpecialPage.php
___________________________________________________________________
Deleted: svn:mergeinfo
115115 Reverse-merged /branches/new-installer/phase3/includes/SpecialPage.php:r43664-66004
116116 Reverse-merged /branches/wmf-deployment/includes/SpecialPage.php:r53381
117117 Reverse-merged /branches/uploadwizard/phase3/includes/SpecialPage.php:r73550-75905
118118 Reverse-merged /branches/REL1_15/phase3/includes/SpecialPage.php:r51646
119119 Reverse-merged /branches/REL1_17/phase3/includes/SpecialPage.php:r81448
120120 Reverse-merged /branches/sqlite/includes/SpecialPage.php:r58211-58321
Property changes on: branches/img_metadata/phase3/includes
___________________________________________________________________
Deleted: svn:mergeinfo
121121 Reverse-merged /branches/new-installer/phase3/includes:r43664-66004
122122 Reverse-merged /branches/wmf-deployment/includes:r53381
123123 Reverse-merged /branches/REL1_15/phase3/includes:r51646
124124 Reverse-merged /branches/sqlite/includes:r58211-58321
Property changes on: branches/img_metadata/phase3/languages/Language.php
___________________________________________________________________
Deleted: svn:mergeinfo
125125 Reverse-merged /branches/sqlite/languages/Language.php:r58211-58321
126126 Reverse-merged /branches/new-installer/phase3/languages/Language.php:r43664-66004
127127 Reverse-merged /branches/wmf/1.17wmf1/languages/Language.php:r84259
128128 Reverse-merged /branches/REL1_15/phase3/languages/Language.php:r51646

Status & tagging log