Changes between Version 51 and Version 52 of UpdatingBugzilla


Ignore:
Timestamp:
Feb 10, 2017, 7:25:06 PM (8 years ago)
Author:
ddkilzer@apple.com
Comment:

--

Legend:

Unmodified
Added
Removed
Modified

  • UpdatingBugzilla

    v51 v52  
    102102 This frequently happens when changes are made for a point update on a branch that don't match a change to trunk.  The git merge then doesn't know that it needs to remove those changes, so one ends up with duplicate code, or conflicted code that's slightly different, even though there was no difference to the previous release version.
    103103
    104  * Locate any customize templates that no longer exist:
    105 {{{
    106     for F in `find template/en/custom -type f | sed -e 's#/custom/#/default/#'`; do if [ ! -f $F ]; then echo $F; fi; done
    107 }}}
    108  Note that these custom templates have no Bugzilla equivalent:
    109 {{{
    110     template/en/custom/attachment/review.html.tmpl
    111     template/en/custom/attachment/reviewform.html.tmpl
    112     template/en/custom/attachment/rietveldreview.html.tmpl
    113 }}}
    114 
    115104 * Compare merged tree with bugzilla-4.2 branch to make sure there isn't any left-over cruft.  Remove any cruft found.
    116105{{{
    117     diff -urN -x .git -x .bzr bzr/bugzilla-4.2 bugzilla.git
    118 }}}
    119 
    120  * 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.
    121 {{{
    122     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
    123 }}}
    124  Then copy the updated default template files over the custom template files, then reapply the patch.
    125 {{{
    126     # TBD
    127 }}}
    128  Alternatively, apply the changes from the default template files to the custom template files, then fix any merge conflicts:
    129 {{{
    130     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
     106    cd bugzilla.git
     107    git diff release-4.2.11..master
    131108}}}
    132109