Changes between Version 29 and Version 30 of UpdatingBugzilla


Ignore:
Timestamp:
Apr 19, 2012 11:30:10 AM (10 years ago)
Author:
ddkilzer@apple.com
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • UpdatingBugzilla

    v29 v30  
    136136 * Clean up any conflicts when the merge is done.
    137137
     138 * Compare merged tree with bugzilla-4.2.1 tag to make sure there isn't any left-over cruft.  Remove any cruft found.
     139{{{
     140    diff -urN -x .git -x .bzr bzr/bugzilla-4.2 bugzilla.git
     141}}}
     142
    138143 * 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.
    139144{{{