From 617a88acd246737ca29122bcfdd2b42c98c2d098 Mon Sep 17 00:00:00 2001 From: "bzrmirror%bugzilla.org" Date: Wed, 3 Dec 2014 22:15:47 +0000 Subject: [PATCH] Rename files to eliminate warnings from multiple includes. git-svn-id: svn://10.0.0.236/trunk@265713 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/webtools/bugzilla/.bzrrev | 2 +- mozilla/webtools/bugzilla/.gitrev | 2 +- .../docs/en/rst/upgrading/get-from-git.rst | 25 ------------------- ...ng-from-1.rst => upgrading-from-1.rst.inc} | 0 ...ng-from-2.rst => upgrading-from-2.rst.inc} | 0 5 files changed, 2 insertions(+), 27 deletions(-) delete mode 100644 mozilla/webtools/bugzilla/docs/en/rst/upgrading/get-from-git.rst rename mozilla/webtools/bugzilla/docs/en/rst/upgrading/{upgrading-from-1.rst => upgrading-from-1.rst.inc} (100%) rename mozilla/webtools/bugzilla/docs/en/rst/upgrading/{upgrading-from-2.rst => upgrading-from-2.rst.inc} (100%) diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev index bd87815a54f..6607b33e0e0 100644 --- a/mozilla/webtools/bugzilla/.bzrrev +++ b/mozilla/webtools/bugzilla/.bzrrev @@ -1 +1 @@ -9241 \ No newline at end of file +9242 \ No newline at end of file diff --git a/mozilla/webtools/bugzilla/.gitrev b/mozilla/webtools/bugzilla/.gitrev index b5d9b308b99..a45551e8740 100644 --- a/mozilla/webtools/bugzilla/.gitrev +++ b/mozilla/webtools/bugzilla/.gitrev @@ -1 +1 @@ -37d6d4b9222a028cc1ab9c71b7ee0b2dc2f3b4cf \ No newline at end of file +aa9116b118405e4f79cd97b5b36b58494e58cba3 \ No newline at end of file diff --git a/mozilla/webtools/bugzilla/docs/en/rst/upgrading/get-from-git.rst b/mozilla/webtools/bugzilla/docs/en/rst/upgrading/get-from-git.rst deleted file mode 100644 index 2f528111214..00000000000 --- a/mozilla/webtools/bugzilla/docs/en/rst/upgrading/get-from-git.rst +++ /dev/null @@ -1,25 +0,0 @@ -:orphan: - -Download Code from Git -====================== - -Download a copy of your current version of Bugzilla from the git repository -into a separate directory alongside your existing Bugzilla installation -(which we will assume is in a directory called :file:`bugzilla`). - -You will need a copy of the git program. All Linux installations have it; -search your package manager for "git". On Windows or Mac OS X, you can -`download the official build `_. - -Once git is installed, run these commands to pull a copy of Bugzilla: - -:command:`git clone https://git.mozilla.org/bugzilla/bugzilla bugzilla-new` - -:command:`cd bugzilla-new` - -:command:`git checkout $VERSION` - -Replace $VERSION with the two-digit version number of your current Bugzilla, e.g. -4.2. These command will automatically change your version to the latest -point release of version $VERSION. - diff --git a/mozilla/webtools/bugzilla/docs/en/rst/upgrading/upgrading-from-1.rst b/mozilla/webtools/bugzilla/docs/en/rst/upgrading/upgrading-from-1.rst.inc similarity index 100% rename from mozilla/webtools/bugzilla/docs/en/rst/upgrading/upgrading-from-1.rst rename to mozilla/webtools/bugzilla/docs/en/rst/upgrading/upgrading-from-1.rst.inc diff --git a/mozilla/webtools/bugzilla/docs/en/rst/upgrading/upgrading-from-2.rst b/mozilla/webtools/bugzilla/docs/en/rst/upgrading/upgrading-from-2.rst.inc similarity index 100% rename from mozilla/webtools/bugzilla/docs/en/rst/upgrading/upgrading-from-2.rst rename to mozilla/webtools/bugzilla/docs/en/rst/upgrading/upgrading-from-2.rst.inc