Changes between Version 28 and Version 29 of UpdatingBugzilla
- Timestamp:
- Apr 19, 2012, 9:58:14 AM (13 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
UpdatingBugzilla
v28 v29 106 106 (cd bzr/bugzilla-3.4 && bzr update) 107 107 (cd bzr/bugzilla-3.6 && bzr update) 108 (cd bzr/bugzilla-4.0 && bzr update) 109 (cd bzr/bugzilla-4.2 && bzr update) 108 110 }}} 109 111 … … 121 123 git bzr fetch bugzilla-3.4-branch 122 124 git bzr fetch bugzilla-3.6-branch 125 git bzr fetch bugzilla-4.0-branch 126 git bzr fetch bugzilla-4.2-branch 123 127 }}} 124 128 … … 127 131 * Merge the new Bugzilla using a tag imported from bzr. 128 132 {{{ 129 git merge --squash --no-commit bugzilla- 3.6.1133 git merge --squash --no-commit bugzilla-4.2.1 130 134 }}} 131 135 … … 142 146 Alternatively, apply the changes from the default template files to the custom template files, then fix any merge conflicts: 143 147 {{{ 144 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; done148 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 145 149 }}} 146 150