| 84 | | TBD. |
| | 84 | * 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. |
| | 85 | {{{ |
| | 86 | for F in `find template/en/custom -type f | grep -v review.html.tmpl | grep -v reviewform.html.tmpl`; do git diff HEAD:`echo $F | sed -e 's#/custom/#/default/#'` HEAD:$F; done > template-changes.diff |
| | 87 | }}}} |
| | 88 | |
| | 89 | * Merge the new Bugzilla. Clean up any conflicts when the merge is done. |
| | 90 | {{{ |
| | 91 | git merge --squash --no-commit BUGZILLA-3_4_1 |
| | 92 | }}} |
| | 93 | |
| | 94 | * Copy the updated default template files over the custom template files, then reapply the patch. |
| | 95 | {{{ |
| | 96 | # TBD |
| | 97 | }}} |
| | 98 | |
| | 99 | * Test the merged Bugzilla locally. |
| | 100 | {{{ |
| | 101 | ./checksetup.pl |
| | 102 | # TBD |
| | 103 | }}} |
| | 104 | |
| | 105 | * Schedule downtime for the update. |
| | 106 | |
| | 107 | * Do the update. |
