From 248bb8b7272fdad0fc34dc193512d9085ec3f5b6 Mon Sep 17 00:00:00 2001 From: Frédéric Buclin Date: Sat, 10 Mar 2012 16:07:54 +0100 Subject: Bug 730032: The documentation must mention bzr instead of cvs in the "Upgrading to New Releases" section r=dkl a=LpSolit --- docs/en/xml/installation.xml | 134 +++++++++++++++++++++++++------------------ 1 file changed, 78 insertions(+), 56 deletions(-) (limited to 'docs') diff --git a/docs/en/xml/installation.xml b/docs/en/xml/installation.xml index d5217706f..bf9c5a1cc 100644 --- a/docs/en/xml/installation.xml +++ b/docs/en/xml/installation.xml @@ -2018,21 +2018,22 @@ chmod o+x . data data/webdot
Upgrading to New Releases - + Upgrading to new Bugzilla releases is very simple. There is - a script included with Bugzilla that will automatically - do all of the database migration for you. - + a script named checksetup.pl included with + Bugzilla that will automatically do all of the database migration + for you. + The following sections explain how to upgrade from one version of Bugzilla to another. Whether you are upgrading - from one bug-fix version to another (such as 3.0.1 to 3.0.2) - or from one major version to another (such as from 3.0 to 3.2), + from one bug-fix version to another (such as 4.2 to 4.2.1) + or from one major version to another (such as from 4.0 to 4.2), the instructions are always the same. Any examples in the following sections are written as though the - user were updating to version 2.22.1, but the procedures are the + user were updating to version 4.2.1, but the procedures are the same no matter what version you're updating to. Also, in the examples, the user's Bugzilla installation is found at /var/www/html/bugzilla. If that is not the @@ -2128,10 +2129,10 @@ chmod o+x . data data/webdot - CVS () + Bzr () - If have cvs installed on your machine + If you have bzr installed on your machine and you have Internet access, this is the easiest way to upgrade, particularly if you have made modifications to the code or templates of Bugzilla. @@ -2156,12 +2157,12 @@ chmod o+x . data data/webdot If you have made modifications to your Bugzilla, and you don't have Internet access or you don't want to use - cvs, then this is the best way to upgrade. + bzr, then this is the best way to upgrade. - + - You can only do minor upgrades (such as 3.0 to 3.0.1 or - 3.0.1 to 3.0.2) with patches. + You can only do minor upgrades (such as 4.2 to 4.2.1 or + 4.2.1 to 4.2.2) with patches. @@ -2181,8 +2182,8 @@ chmod o+x . data data/webdot The larger the jump you are trying to make, the more difficult it is going to be to upgrade if you have made local customizations. - Upgrading from 3.0 to 3.0.1 should be fairly painless even if - you are heavily customized, but going from 2.18 to 3.0 is going + Upgrading from 4.2 to 4.2.1 should be fairly painless even if + you are heavily customized, but going from 2.18 to 4.2 is going to mean a fair bit of work re-writing your local changes to use the new files, logic, templates, etc. If you have done no local changes at all, however, then upgrading should be approximately @@ -2191,41 +2192,53 @@ chmod o+x . data data/webdot
-
- Upgrading using CVS +
+ Upgrading using Bzr - This requires that you have cvs installed (most Unix machines do), - and requires that you are able to access cvs-mirror.mozilla.org - on port 2401, which may not be an option if you are behind a - highly restrictive firewall or don't have Internet access. + This requires that you have bzr installed (most Unix machines do), + and requires that you are able to access + bzr.mozilla.org, + which may not be an option if you don't have Internet access. The following shows the sequence of commands needed to update a - Bugzilla installation via CVS, and a typical series of results. + Bugzilla installation via Bzr, and a typical series of results. + These commands assume that you already have Bugzilla installed + using Bzr. + + + If your installation is still using CVS, you must first convert + it to Bzr. A very detailed step by step documentation can be + found on wiki.mozilla.org. + + + bash$ cd /var/www/html/bugzilla -bash$ cvs login -Logging in to :pserver:anonymous@cvs-mirror.mozilla.org:2401/cvsroot -CVS password: ('anonymous', or just leave it blank) -bash$ cvs -q update -r BUGZILLA-2_22_1 -dP -P checksetup.pl -P collectstats.pl -P docs/rel_notes.txt -P template/en/default/list/quips.html.tmpl -(etc.) +bash$ bzr switch 4.2 (only run this command when not yet running 4.2) +bash$ bzr up -r tag:bugzilla-4.2.1 ++N extensions/MoreBugUrl/ ++N extensions/MoreBugUrl/Config.pm ++N extensions/MoreBugUrl/Extension.pm +... + M Bugzilla/Attachment.pm + M Bugzilla/Attachment/PatchReader.pm + M Bugzilla/Bug.pm +... +All changes applied successfully. - If a line in the output from cvs update begins - with a C, then that represents a - file with local changes that CVS was unable to properly merge. You - need to resolve these conflicts manually before Bugzilla (or at - least the portion using that file) will be usable. + If a line in the output from bzr up mentions + a conflict, then that represents a file with local changes that + Bzr was unable to properly merge. You need to resolve these + conflicts manually before Bugzilla (or at least the portion using + that file) will be usable.
@@ -2234,7 +2247,7 @@ P template/en/default/list/quips.html.tmpl Upgrading using the tarball - If you are unable (or unwilling) to use CVS, another option that's + If you are unable (or unwilling) to use Bzr, another option that's always available is to obtain the latest tarball from the Download Page and create a new Bugzilla installation from that. @@ -2251,18 +2264,18 @@ P template/en/default/list/quips.html.tmpl bash$ cd /var/www/html -bash$ wget http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-2.22.1.tar.gz +bash$ wget http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-4.2.1.tar.gz (Output omitted) -bash$ tar xzvf bugzilla-2.22.1.tar.gz -bugzilla-2.22.1/ -bugzilla-2.22.1/.cvsignore +bash$ tar xzvf bugzilla-4.2.1.tar.gz +bugzilla-4.2.1/ +bugzilla-4.2.1/colchange.cgi (Output truncated) -bash$ cd bugzilla-2.22.1 +bash$ cd bugzilla-4.2.1 bash$ cp ../bugzilla/localconfig* . bash$ cp -r ../bugzilla/data . bash$ cd .. bash$ mv bugzilla bugzilla.old -bash$ mv bugzilla-2.22.1 bugzilla +bash$ mv bugzilla-4.2.1 bugzilla @@ -2273,6 +2286,15 @@ bash$ mv bugzilla-2.22.1 bugzilla + + + If you have some extensions installed, you will have to copy them + to the new bugzilla directory too. Extensions are located in + bugzilla/extensions/. Only copy those you + installed, not those managed by the Bugzilla team. + + + This upgrade method will give you a clean install of Bugzilla. That's fine if you don't have any local customizations that you @@ -2288,15 +2310,15 @@ bash$ mv bugzilla-2.22.1 bugzilla A patch is a collection of all the bug fixes that have been made since the last bug-fix release. - + If you are doing a bug-fix upgrade—that is, one where only the - last number of the revision changes, such as from 2.22 to - 2.22.1—then you have the option of obtaining and applying a + last number of the revision changes, such as from 4.2 to + 4.2.1—then you have the option of obtaining and applying a patch file from the Download Page. - + As above, this example starts with obtaining the file via the command line. If you have already downloaded it, you can omit the @@ -2305,21 +2327,21 @@ bash$ mv bugzilla-2.22.1 bugzilla bash$ cd /var/www/html/bugzilla -bash$ wget http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-2.22-to-2.22.1.diff.gz +bash$ wget http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-4.2-to-4.2.1.diff.gz (Output omitted) -bash$ gunzip bugzilla-2.22-to-2.22.1.diff.gz -bash$ patch -p1 < bugzilla-2.22-to-2.22.1.diff -patching file checksetup.pl -patching file collectstats.pl +bash$ gunzip bugzilla-4.2-to-4.2.1.diff.gz +bash$ patch -p1 < bugzilla-4.2-to-4.2.1.diff +patching file Bugzilla/Constants.pm +patching file enter_bug.cgi (etc.) Be aware that upgrading from a patch file does not change the - entries in your CVS directory. - This could make it more difficult to upgrade using CVS - () in the future. + entries in your .bzr directory. + This could make it more difficult to upgrade using Bzr + () in the future. @@ -2379,7 +2401,7 @@ bash$ ./checksetup.pl - If this is a major upgrade (say, 2.22 to 3.0 or similar), + If this is a major upgrade (say, 3.6 to 4.2 or similar), running checksetup.pl on a large installation (75,000 or more bugs) can take a long time, possibly several hours. -- cgit v1.2.3-24-g4f1b