Changes between Version 14 and Version 15 of UpdatingBugzilla

Timestamp:

Jul 3, 2010, 3:37:19 PM (14 years ago)

Author:

ddkilzer@webkit.org

Comment:

Switched from CVS to bzr for upstream Bugzilla repository.

UpdatingBugzilla

@@ -7 +7 @@
 == Setup ==
 
- * Check out Bugzilla sources from CVS (for reference).
+ * Install bzr, bzr-fastimport and bzr-svn.  If you're using MacPorts:
 {{{
-    cvs -d ":pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot" co -d bugzilla.cvs mozilla/webtools/bugzilla
+    sudo port install bzr-fastimport
+    sudo port install bzr-svn
 }}}
 
- * Import original Bugzilla sources from CVS into a local git repository (may take a couple of hours).
+ * Install git and git-svn.  If you're using MacPorts:
 {{{
-    rm -f ~/.cvsps/\:pserver\:anonymous@cvs-mirror.mozilla.org\:#cvsroot#mozilla#webtools#bugzilla
-    mkdir bugzilla.git
-    git cvsimport -d ":pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot" -C bugzilla.git -k mozilla/webtools/bugzilla
+    sudo port install git-core +svn
+}}}
+
+  * [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/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
+    mkdir BugsSite.git
+    cd BugsSite.git
     git svn init -T trunk/BugsSite http://svn.webkit.org/repository/webkit
     git svn fetch
+    cd ..
 }}}
 
  * Create a local git repository to do the merge.
 {{{
-    mkdir update.git
-    cd update.git
+    mkdir bugzilla.git
+    cd bugzilla.git
     git init
-    git remote add -f origin-bugssite ../bugssite.git
-    git remote add -f origin-bugzilla ../bugzilla.git
 }}}
 
- * Create a .git/info/grafts file to provide artificial merge points between the two remote repositories.  NOTE: Your commit hashes may be different for tagged Bugzilla versions since git-cvsimport is not an exact science.
+ * Import the BugsSite.git repository:
 {{{
-# BugsSite 3.2.3 merge has parents of    BugsSite r45519                      and CVS tag BUGZILLA-3_2_3
-4b974c2db64b5e85e72498b0c43100e2ea380a48 355650f88422025d80d5b5ca7f908d653936556e 213407d24e23561c65916e86ae186f154b086dde
-# BugsSite 3.0.3 merge has parents of    BugsSite r44547                      and CVS tag BUGZILLA-3_0_3
-355650f88422025d80d5b5ca7f908d653936556e e9b8dc46dc0a804f199a0b1c2dfa4d2112608c8a bd31477381aa6204bd5e8ed5997354ccf12b6794
-# BugsSite r30048 has parents of         CVS tag BUGZILLA-2_20_1
-92fb2f653ac5b1b4dc9e0ec6d4a3806fe7ea1e2a ba0b747bbab5807857e66e7ff8583d27f1625fa1
+    git remote add -f BugsSite ../BugsSite.git
+}}}
+
+ * Import the Bugzilla branches from bzr:
+{{{
+    git bzr add bugzilla-trunk ../bzr/bugzilla-trunk
+    git bzr add bugzilla-3.2-branch ../bzr/bugzilla-3.2
+    git bzr add bugzilla-3.4-branch ../bzr/bugzilla-3.4
+    git bzr add bugzilla-3.6-branch ../bzr/bugzilla-3.6
+}}}
+ NOTE: If you get an error about too many authors while importing, see [https://bugs.launchpad.net/bzr-fastimport/+bug/496677 Bug 496677].
+
+ * Create a .git/info/grafts file to provide artificial merge points between the two remote repositories.
+{{{
+# BugsSite 3.2.3 merge has parents of    BugsSite r45519                      and bzr tag Bugzilla-3.2.3
+4b974c2db64b5e85e72498b0c43100e2ea380a48 355650f88422025d80d5b5ca7f908d653936556e 780da003de2a006fefa6310f073e3c6be0281a6d
 }}}
 
  * Create a local git branch to track the BugsSite master branch.
 {{{
-    git branch --track master remotes/origin-bugssite/master
+    git branch --track master remotes/BugsSite/master
 }}}