Changes between Version 8 and Version 9 of UpdatingBugzilla


Ignore:
Timestamp:
Aug 1, 2009 3:08:31 PM (12 years ago)
Author:
ddkilzer@apple.com
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • UpdatingBugzilla

    v8 v9  
    3636}}}
    3737
    38  * 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.
     38 * 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.
    3939{{{
    4040# BugsSite 3.2.3 merge has parents of &  CVS tag BUGZILLA-3_2_3
     
    5050    git checkout -b master remotes/origin-bugssite/master
    5151}}}
     52
     53== Update ==
     54
     55 * Update CVS directory (if needed).
     56{{{
     57    cd bugzilla.cvs
     58    cvs -q update -d -P -A
     59}}}
     60
     61 * Update Git mirror of BugsSite in svn.
     62{{{
     63    cd bugssite.git
     64    git svn rebase
     65}}}
     66
     67 * Update Git mirror of Bugzilla in CVS.  (Removing the cvsps cache file forces git-cvsimport to regenerate it each time.)
     68{{{
     69    rm -f ~/.cvsps/\:pserver\:anonymous@cvs-mirror.mozilla.org\:#cvsroot#mozilla#webtools#bugzilla
     70    git cvsimport -d ":pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot" -C bugzilla.git -k mozilla/webtools/bugzilla
     71}}}
     72
     73 * Update the merge repository.
     74{{{
     75    cd update.git
     76    git fetch origin-bugssite
     77    git fetch origin-bugzilla
     78    git checkout master
     79    git svn rebase
     80}}}
     81
     82== Merge ==
     83
     84TBD.