Changes between Version 35 and Version 36 of UpdatingBugzilla

Timestamp:

Feb 9, 2017, 3:35:13 PM (8 years ago)

Author:

ddkilzer@apple.com

Comment:

--

UpdatingBugzilla

@@ -22 +22 @@
     git svn init -T trunk/Websites/bugs.webkit.org http://svn.webkit.org/repository/webkit
     git svn fetch
-    cd ..
 }}}
 
  * Import the upstream Bugzilla git repository.
 {{{
-    cd bugzilla.git
     git remote add -f upstream https://github.com/bugzilla/bugzilla.git
 }}}
 
- * Import the Bugzilla branches from bzr:
+ * Create a local git branch to track the `upstream/master` branch.
 {{{
-    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
-    git bzr add bugzilla-4.0-branch ../bzr/bugzilla-4.0
-    git bzr add bugzilla-4.2-branch ../bzr/bugzilla-4.2
+    git branch --track upstream remotes/upstream/master
 }}}
- NOTE: If you get an error about too many authors while importing, see [https://bugs.launchpad.net/bzr-fastimport/+bug/496677 Bug 496677] and [http://trac.macports.org/ticket/26954 MacPorts ticket #26954].
 
  * Create a .git/info/grafts file to provide artificial merge points between the two remote repositories.
@@ -46 +38 @@
 # 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/BugsSite/master
 }}}