Changes between Version 28 and Version 29 of UpdatingBugzilla


Ignore:
Timestamp:
Apr 19, 2012 9:58:14 AM (9 years ago)
Author:
ddkilzer@apple.com
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • UpdatingBugzilla

    v28 v29  
    106106    (cd bzr/bugzilla-3.4 && bzr update)
    107107    (cd bzr/bugzilla-3.6 && bzr update)
     108    (cd bzr/bugzilla-4.0 && bzr update)
     109    (cd bzr/bugzilla-4.2 && bzr update)
    108110}}}
    109111
     
    121123    git bzr fetch bugzilla-3.4-branch
    122124    git bzr fetch bugzilla-3.6-branch
     125    git bzr fetch bugzilla-4.0-branch
     126    git bzr fetch bugzilla-4.2-branch
    123127}}}
    124128
     
    127131 * Merge the new Bugzilla using a tag imported from bzr.
    128132{{{
    129     git merge --squash --no-commit bugzilla-3.6.1
     133    git merge --squash --no-commit bugzilla-4.2.1
    130134}}}
    131135
     
    142146 Alternatively, apply the changes from the default template files to the custom template files, then fix any merge conflicts:
    143147{{{
    144     for F in `find template/en/custom -type f | egrep -v '/(review|reviewform|rietveldreview).html.tmpl'`; do G=`echo $F | sed -e 's#/custom/#/default/#'`; echo $F && git diff HEAD..bugzilla-3.6.1 $G | patch -p1 $F; done
     148    for F in `find template/en/custom -type f | egrep -v '/(review|reviewform|rietveldreview).html.tmpl'`; do G=`echo $F | sed -e 's#/custom/#/default/#'`; echo $F && git diff HEAD..bugzilla-4.2.1 $G | patch -p1 $F; done
    145149}}}
    146150