Changes between Version 19 and Version 20 of UpdatingBugzilla


Ignore:
Timestamp:
Jul 4, 2010 9:06:05 AM (12 years ago)
Author:
ddkilzer@webkit.org
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • UpdatingBugzilla

    v19 v20  
    9797== Merge ==
    9898
    99  * Create a patch of changes to custom template files.  These custom template files will need to be updated and the patch merged after the Bugzilla merge.
    100 {{{
    101     for F in `find template/en/custom -type f | egrep -v '/(review|reviewform|rietveldreview).html.tmpl'`; do git diff HEAD:`echo $F | sed -e 's#/custom/#/default/#'` HEAD:$F; done > template-changes.diff
    102 }}}
    103  Alternatively, apply the changes from the default template files to the custom template files, then fix any merge conflicts:
    104 {{{
    105     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
    106 }}}
    107 
    10899 * Merge the new Bugzilla using a tag imported from bzr.
    109100{{{
     
    113104 * Clean up any conflicts when the merge is done.
    114105
    115  * Copy the updated default template files over the custom template files, then reapply the patch.
     106 * Create a patch of changes to custom template files.  These custom template files will need to be updated and the patch merged after the Bugzilla merge.
     107{{{
     108    for F in `find template/en/custom -type f | egrep -v '/(review|reviewform|rietveldreview).html.tmpl'`; do git diff HEAD:`echo $F | sed -e 's#/custom/#/default/#'` HEAD:$F; done > template-changes.diff
     109}}}
     110 Then copy the updated default template files over the custom template files, then reapply the patch.
    116111{{{
    117112    # TBD
     113}}}
     114 Alternatively, apply the changes from the default template files to the custom template files, then fix any merge conflicts:
     115{{{
     116    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
    118117}}}
    119118