http://www.mediawiki.org/wiki/Special:Code/MediaWiki/73221
Revision: 73221
Author: peter17
Date: 2010-09-17 17:20:41 +0000 (Fri, 17 Sep 2010)
Log Message:
-----------
Merging with trunk r73220 including phpunit
Property Changed:
----------------
branches/iwtransclusion/phase3/
branches/iwtransclusion/phase3/includes/
branches/iwtransclusion/phase3/includes/ChangesList.php
branches/iwtransclusion/phase3/includes/ConfEditor.php
branches/iwtransclusion/phase3/includes/GlobalFunctions.php
branches/iwtransclusion/phase3/includes/HistoryPage.php
branches/iwtransclusion/phase3/includes/OutputPage.php
branches/iwtransclusion/phase3/includes/api/
branches/iwtransclusion/phase3/includes/installer/DatabaseInstaller.php
branches/iwtransclusion/phase3/includes/json/Services_JSON.php
branches/iwtransclusion/phase3/includes/specials/
branches/iwtransclusion/phase3/maintenance/cleanupTable.inc
branches/iwtransclusion/phase3/maintenance/deleteSelfExternals.php
branches/iwtransclusion/phase3/maintenance/populateRevisionLength.php
branches/iwtransclusion/phase3/maintenance/tables.sql
branches/iwtransclusion/phase3/maintenance/tests/
Property changes on: branches/iwtransclusion/phase3
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3:51646
/branches/new-installer/phase3:43664-66004
/branches/sqlite:58211-58321
/trunk/phase3:67506-73216
+ /branches/REL1_15/phase3:51646
/branches/new-installer/phase3:43664-66004
/branches/sqlite:58211-58321
/trunk/phase3:67506-73220
Property changes on: branches/iwtransclusion/phase3/includes
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes:51646
/branches/new-installer/phase3/includes:43664-66004
/branches/sqlite/includes:58211-58321
/branches/wmf-deployment/includes:53381
/trunk/phase3/includes:67506-73216
+ /branches/REL1_15/phase3/includes:51646
/branches/new-installer/phase3/includes:43664-66004
/branches/sqlite/includes:58211-58321
/branches/wmf-deployment/includes:53381
/trunk/phase3/includes:67506-73220
Property changes on: branches/iwtransclusion/phase3/includes/ChangesList.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/ChangesList.php:51646
/branches/resourceloader/phase3/includes/ChangesList.php:68366-69676,69678-70682,70684-71999,72001-72255,72257-72305,72307-72342
/branches/wmf-deployment/includes/ChangesList.php:53381,57589
/trunk/phase3/includes/ChangesList.php:67506-73216
+ /branches/REL1_15/phase3/includes/ChangesList.php:51646
/branches/resourceloader/phase3/includes/ChangesList.php:68366-69676,69678-70682,70684-71999,72001-72255,72257-72305,72307-72342
/branches/wmf-deployment/includes/ChangesList.php:53381,57589
/trunk/phase3/includes/ChangesList.php:67506-73220
Property changes on: branches/iwtransclusion/phase3/includes/ConfEditor.php
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/phase3/includes/ConfEditor.php:67506-73216
+ /trunk/phase3/includes/ConfEditor.php:67506-73220
Property changes on: branches/iwtransclusion/phase3/includes/GlobalFunctions.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/GlobalFunctions.php:51646
/branches/new-installer/phase3/includes/GlobalFunctions.php:43664-66004
/branches/resourceloader/phase3/includes/GlobalFunctions.php:71750
/branches/sqlite/includes/GlobalFunctions.php:58211-58321
/branches/wmf-deployment/includes/GlobalFunctions.php:53381
/trunk/phase3/includes/GlobalFunctions.php:67506-73216
+ /branches/REL1_15/phase3/includes/GlobalFunctions.php:51646
/branches/new-installer/phase3/includes/GlobalFunctions.php:43664-66004
/branches/resourceloader/phase3/includes/GlobalFunctions.php:71750
/branches/sqlite/includes/GlobalFunctions.php:58211-58321
/branches/wmf-deployment/includes/GlobalFunctions.php:53381
/trunk/phase3/includes/GlobalFunctions.php:67506-73220
Property changes on: branches/iwtransclusion/phase3/includes/HistoryPage.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/PageHistory.php:51646
/branches/resourceloader/phase3/includes/HistoryPage.php:68366-69676,69678-70682,70684-71999,72001-72255,72257-72305,72307-72342
/trunk/phase3/includes/HistoryPage.php:67506-73216
+ /branches/REL1_15/phase3/includes/PageHistory.php:51646
/branches/resourceloader/phase3/includes/HistoryPage.php:68366-69676,69678-70682,70684-71999,72001-72255,72257-72305,72307-72342
/trunk/phase3/includes/HistoryPage.php:67506-73220
Property changes on: branches/iwtransclusion/phase3/includes/OutputPage.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/OutputPage.php:51646
/branches/resourceloader/phase3/includes/OutputPage.php:68366-69676,69678-70682,70684-71999,72001-72255,72257-72305,72307-72342
/branches/wmf-deployment/includes/OutputPage.php:53381,57468
/trunk/phase3/includes/OutputPage.php:67506-73216
+ /branches/REL1_15/phase3/includes/OutputPage.php:51646
/branches/resourceloader/phase3/includes/OutputPage.php:68366-69676,69678-70682,70684-71999,72001-72255,72257-72305,72307-72342
/branches/wmf-deployment/includes/OutputPage.php:53381,57468
/trunk/phase3/includes/OutputPage.php:67506-73220
Property changes on: branches/iwtransclusion/phase3/includes/api
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/api:51646
/branches/REL1_16/phase3/includes/api:63621-63636,69357
/branches/sqlite/includes/api:58211-58321
/branches/wmf/1.16wmf4/includes/api:69521
/branches/wmf-deployment/includes/api:53381,59952
/trunk/phase3/includes/api:67506-73216
+ /branches/REL1_15/phase3/includes/api:51646
/branches/REL1_16/phase3/includes/api:63621-63636,69357
/branches/sqlite/includes/api:58211-58321
/branches/wmf/1.16wmf4/includes/api:69521
/branches/wmf-deployment/includes/api:53381,59952
/trunk/phase3/includes/api:67506-73220
Property changes on:
branches/iwtransclusion/phase3/includes/installer/DatabaseInstaller.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/installer/InstallerDBType.php:51646
/branches/new-installer/phase3/includes/installer/InstallerDBType.php:43664-66004
/branches/sqlite/includes/installer/InstallerDBType.php:58211-58321
/branches/wmf-deployment/includes/installer/InstallerDBType.php:53381
/trunk/phase3/includes/installer/DatabaseInstaller.php:68449-69593,69829-73216
+ /branches/REL1_15/phase3/includes/installer/InstallerDBType.php:51646
/branches/new-installer/phase3/includes/installer/InstallerDBType.php:43664-66004
/branches/sqlite/includes/installer/InstallerDBType.php:58211-58321
/branches/wmf-deployment/includes/installer/InstallerDBType.php:53381
/trunk/phase3/includes/installer/DatabaseInstaller.php:67506-69593,69829-73220
Property changes on:
branches/iwtransclusion/phase3/includes/json/Services_JSON.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/api/ApiFormatJson_json.php:51646
/branches/wmf-deployment/includes/api/ApiFormatJson_json.php:53381
/trunk/phase3/includes/json/Services_JSON.php:67506-73216
+ /branches/REL1_15/phase3/includes/api/ApiFormatJson_json.php:51646
/branches/wmf-deployment/includes/api/ApiFormatJson_json.php:53381
/trunk/phase3/includes/json/Services_JSON.php:67506-73220
Property changes on: branches/iwtransclusion/phase3/includes/specials
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/specials:51646
/branches/sqlite/includes/specials:58211-58321
/branches/wmf-deployment/includes/specials:53381,56967
/trunk/phase3/includes/specials:67506-73216
+ /branches/REL1_15/phase3/includes/specials:51646
/branches/sqlite/includes/specials:58211-58321
/branches/wmf-deployment/includes/specials:53381,56967
/trunk/phase3/includes/specials:67506-73220
Property changes on: branches/iwtransclusion/phase3/maintenance/cleanupTable.inc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/maintenance/cleanupTable.inc:51646
/branches/wmf-deployment/maintenance/cleanupTable.inc:56715
/trunk/phase3/maintenance/cleanupTable.inc:67506-73216
+ /branches/REL1_15/phase3/maintenance/cleanupTable.inc:51646
/branches/wmf-deployment/maintenance/cleanupTable.inc:56715
/trunk/phase3/maintenance/cleanupTable.inc:67506-73220
Property changes on:
branches/iwtransclusion/phase3/maintenance/deleteSelfExternals.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/maintenance/deleteSelfExternals.php:51646
/trunk/phase3/maintenance/deleteSelfExternals.php:52290,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,67506-73216
+ /branches/REL1_15/phase3/maintenance/deleteSelfExternals.php:51646
/trunk/phase3/maintenance/deleteSelfExternals.php:52290,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,67506-73220
Property changes on:
branches/iwtransclusion/phase3/maintenance/populateRevisionLength.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/maintenance/populateParentId.php:51646
/branches/sqlite/maintenance/populateParentId.php:58211-58321
/trunk/phase3/maintenance/populateRevisionLength.php:67506-73216
+ /branches/REL1_15/phase3/maintenance/populateParentId.php:51646
/branches/sqlite/maintenance/populateParentId.php:58211-58321
/trunk/phase3/maintenance/populateRevisionLength.php:67506-73220
Property changes on: branches/iwtransclusion/phase3/maintenance/tables.sql
___________________________________________________________________
Modified: svn:mergeinfo
-
/branches/resourceloader/phase3/maintenance/tables.sql:68366-69676,69678-70682,70684-71999,72001-72255,72257-72305,72307-72342
+ /branches/REL1_15/phase3/maintenance/tables.sql:51646
/branches/new-installer/phase3/maintenance/tables.sql:43664-66004
/branches/resourceloader/phase3/maintenance/tables.sql:68366-69676,69678-70682,70684-71999,72001-72255,72257-72305,72307-72342
/branches/sqlite/maintenance/tables.sql:58211-58321
/trunk/phase3/maintenance/tables.sql:67506-73220
Property changes on: branches/iwtransclusion/phase3/maintenance/tests
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/maintenance/tests:51646
/branches/new-installer/phase3/maintenance/tests:43664-66004
/branches/phpunit-restructure/maintenance/tests:72257-72560
/branches/sqlite/maintenance/tests:58211-58321
/trunk/phase3/maintenance/tests:67506-73216
+ /branches/REL1_15/phase3/maintenance/tests:51646
/branches/new-installer/phase3/maintenance/tests:43664-66004
/branches/phpunit-restructure/maintenance/tests:72257-72560
/branches/sqlite/maintenance/tests:58211-58321
/trunk/phase3/maintenance/tests:67506-73220
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
