Version 6 (modified by, 15 years ago) (diff)


Updating Bugzilla

This page describes a process to update the Bugzilla instance running on


  • Check out Bugzilla sources from CVS (for reference).
        cvs -d "" co -d bugzilla.cvs mozilla/webtools/bugzilla
  • Import original Bugzilla sources from CVS into a local git repository (may take a couple of hours).
        rm -f ~/.cvsps/\:pserver\\:#cvsroot#mozilla#webtools#bugzilla
        mkdir bugzilla.git
        git cvsimport -d "" -C bugzilla.git -k mozilla/webtools/bugzilla
  • Import BugsSite from the WebKit repository into a local git repository.
        mkdir bugssite.git
        cd bugssite.git
        git svn init -T trunk/BugsSite
        git svn fetch
  • Create a local git repository to do the merge.
        mkdir update.git
        cd update.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.
    # BugsSite 3.2.3 merge has parents of    BugsSite 3.0.3 merge                 and CVS tag BUGZILLA-3_2_3
    #647597ba39744df98bfad066f74a4a6b93c74606 056397ff02eaa427187ada3531f12b370d1e6e8d 213407d24e23561c65916e86ae186f154b086dde
    # BugsSite 3.0.3 merge has parents of    BugsSite r44547                      and CVS tag BUGZILLA-3_0_3
    #056397ff02eaa427187ada3531f12b370d1e6e8d e9b8dc46dc0a804f199a0b1c2dfa4d2112608c8a bd31477381aa6204bd5e8ed5997354ccf12b6794
    # BugsSite r30048 has parents of         CVS tag BUGZILLA-2_20_1
    92fb2f653ac5b1b4dc9e0ec6d4a3806fe7ea1e2a ba0b747bbab5807857e66e7ff8583d27f1625fa1
  • Create a local git branch.
        git checkout -b master remotes/origin-bugssite/master