Line 97: |
Line 97: |
| For the full details on this installation method, see http://www.mediawiki.org/wiki/Download_from_Git | | For the full details on this installation method, see http://www.mediawiki.org/wiki/Download_from_Git |
| | | |
− | == SVN Upgrade notes == | + | == Upgrade notes == |
− | | |
− | '''THESE INSTRUCTIONS COVER SVN-BASED INSTALLATIONS -- THE PROCEDURE NEEDS TO BE RETHOUGHT FOR GIT'''
| |
| | | |
| We update our MediaWiki instances by simply pulling from the remote git repo and then switching to a | | We update our MediaWiki instances by simply pulling from the remote git repo and then switching to a |
Line 107: |
Line 105: |
| git co -b REL1_xx remotes/origin/REL1_xx | | git co -b REL1_xx remotes/origin/REL1_xx |
| | | |
| + | The "extensions-all" directory contains a bunch of git repositories stitched together with 'git submodule'. |
| + | To update it: |
| | | |
− | Because the "extensions" directory comes from a different
| + | cd extensions-all |
− | repository, we need to take care not to confuse Subversion's little mind when it sees it.
| + | git submodule update |
− | Hence, we keep around a copy of the original extensions directory from the main repository.
| |
− | | |
− | mv extensions extensions.keep
| |
− | mv extensions.orig extensions
| |
− | svn switch http://svn.wikimedia.org/svnroot/mediawiki/branches/REL1_16/phase3
| |
− | mv extensions extensions.orig
| |
− | mv extensions.new extensions
| |
− | cd extensions | |
− | svn switch http://svn.wikimedia.org/svnroot/mediawiki/branches/REL1_16/extensions | |
− | cd ..
| |
| | | |
− | Now run update scripts: | + | Now run update script: |
| | | |
− | cd maintenance | + | php maintenance/update.php |
− | php update.php
| |
| | | |
| In the case of Local Labs wikis the correct command for performing the updates is: | | In the case of Local Labs wikis the correct command for performing the updates is: |
| | | |
− | php update.php --conf /srv/www-sugarlabs/pe.sugarlabs.org/wiki/LocalSettings.php | + | php maintenance/update.php --conf /srv/www-sugarlabs/pe.sugarlabs.org/wiki/LocalSettings.php |
| (replace pe.sugarlabs.org for the correct path for your local lab w) | | (replace pe.sugarlabs.org for the correct path for your local lab w) |
| | | |