Changes between Version 19 and Version 20 of UpdatingBugzilla

Timestamp:

Jul 4, 2010 9:06:05 AM (14 years ago)

Author:

ddkilzer@webkit.org

Comment:

--

UpdatingBugzilla

@@ -97 +97 @@
 == Merge ==
 
- * 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 | 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
-}}}
-
  * Merge the new Bugzilla using a tag imported from bzr.
 {{{
@@ -113 +104 @@
  * Clean up any conflicts when the merge is done.
 
- * Copy the updated default template files over the custom template files, then reapply the patch.
+ * 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 | egrep -v '/(review|reviewform|rietveldreview).html.tmpl'`; do git diff HEAD:`echo $F | sed -e 's#/custom/#/default/#'` HEAD:$F; done > template-changes.diff
+}}}
+ Then copy the updated default template files over the custom template files, then reapply the patch.
 {{{
     # TBD
+}}}
+ 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
 }}}