Changes between Version 18 and Version 19 of UpdatingBugzilla

Timestamp:

Jul 4, 2010 9:04:24 AM (14 years ago)

Author:

ddkilzer@webkit.org

Comment:

--

UpdatingBugzilla

@@ -99 +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.
 {{{
-    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
+    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
+}}}
+ Alternatively, apply the changes from the default template files to the custom template files, then fix any merge conflicts:
+{{{
+    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
 }}}