Changes between Version 32 and Version 33 of UpdatingBugzilla

Timestamp:

Feb 9, 2017, 3:24:02 PM (9 years ago)

Author:

ddkilzer@apple.com

Comment:

--

UpdatingBugzilla

@@ -3 +3 @@
 = Updating Bugzilla =
 
-This page describes a process to update the Bugzilla instance running on [http://bugs.webkit.org/ bugs.webkit.org].
+This page describes a process to update the Bugzilla instance running on [https://bugs.webkit.org/ bugs.webkit.org].
 
-== Setup ==
+== Setup from Scratch ==
+
+This section describes how to set up a merge environment from scratch.  If you already have a git-svn repo for `Websites/bugs.webkit.org`, you can skip to the `Setup from git-svn Repository` section.
 
  * Subscribe to the [http://bugzilla.org/cgi-bin/mj_wwwusr?func=lists-long-full&extra=announce announce@bugzilla.org mailing list] to receive email for security updates and new releases.
 
- * Install bzr, bzr-fastimport and bzr-svn.  If you're using MacPorts:
-{{{
-    sudo port install bzr-fastimport
-    sudo port install bzr-svn
-}}}
-
- * Install git and git-svn.  If you're using MacPorts:
+ * Install git and git-svn.  If you have a modern Xcode on macOS, these are already installed.  If you're using MacPorts:
 {{{
     sudo port install git-core +svn
 }}}
 
- * Install git-bzr.
-
- Unfortunately, there is currently a proliferation of git-bzr commands, each of which behave in a slightly different manner.  Until there is a single, blessed git-bzr command, I'll assume that you're using commit `61d60075fb548f1d49d54b1a98b8b568e68ecc44` from the [http://github.com/kfish/git-bzr kfish branch of git-bzr].
-
- If you're using MacPorts:
-
- (1) Download `Portfile` (not `Portfile.2`) from [http://trac.macports.org/ticket/24763 MacPorts ticket #24763].
-
- (2) In a terminal window run the following commands.  Note that you may want to use a different directory other than `/opt/mports/trunk/dports`, but you'll have to add it to `/opt/local/etc/macports/sources.conf`.  The `/opt/mports` directory comes from instructions on [http://guide.macports.org/#installing.macports.subversion installing MacPorts from subversion]:
+ * Import `Websites/bugs.webkit.org` from the WebKit repository into a local git-svn repository.
 {{{
-    sudo -s
-    mkdir /opt/mports/trunk/dports/devel/git-bzr
-    cd /opt/mports/trunk/dports/devel/git-bzr
-    mv ~/Downloads/Portfile .
-    chown root:admin Portfile
-    chmod 644 Portfile
-    cd /opt/mports/trunk/dports
-    portindex
-    port install git-bzr
-    exit
-}}}
-
-  * [https://wiki.mozilla.org/Bugzilla:Bzr Check out Bugzilla sources] from bzr.  At minimum check out trunk, the branch that contains the current version used by bugs.webkit.org and the branch that you want to merge to.
-{{{
-    mkdir bzr
-    cd bzr
-    bzr co bzr://bzr.mozilla.org/bugzilla/trunk bugzilla-trunk
-    bzr co bzr://bzr.mozilla.org/bugzilla/4.2 bugzilla-4.2
-    bzr co bzr://bzr.mozilla.org/bugzilla/4.0 bugzilla-4.0
-    bzr co bzr://bzr.mozilla.org/bugzilla/3.6 bugzilla-3.6
-    bzr co bzr://bzr.mozilla.org/bugzilla/3.4 bugzilla-3.4
-    bzr co bzr://bzr.mozilla.org/bugzilla/3.2 bugzilla-3.2
-    cd ..
-}}}
-
- * Import BugsSite from the WebKit repository into a local git repository.
-{{{
-    mkdir BugsSite.git
-    cd BugsSite.git
-    git svn init -T trunk/BugsSite http://svn.webkit.org/repository/webkit
+    mkdir bugzilla.git
+    cd bugzilla.git
+    git svn init -T trunk/Websites/bugs.webkit.org http://svn.webkit.org/repository/webkit
     git svn fetch
     cd ..