Changes between Version 58 and Version 59 of UpdatingBugzilla


Ignore:
Timestamp:
Feb 13, 2017 9:12:08 AM (5 years ago)
Author:
ddkilzer@apple.com
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • UpdatingBugzilla

    v58 v59  
    126126 This frequently happens when changes are made for a point update on a branch that don't match a change to trunk.  The git merge then doesn't know that it needs to remove those changes, so one ends up with duplicate code, or conflicted code that's slightly different, even though there was no difference to the previous release version.
    127127
    128  * Compare merged tree with bugzilla-4.2 branch to make sure there isn't any left-over cruft.  Remove any cruft found.
     128 * Compare merged tree with the `release-5.0.3` tag to make sure there isn't any left-over cruft.  Remove any cruft found!
    129129{{{
    130130    cd bugzilla.git
    131     git diff release-4.2.11..master
     131    git diff release-5.0.3
    132132}}}
    133133
     
    145145 * Schedule downtime for the update.
    146146
    147  * Commit changes from git repository to subversion.
     147 * Commit changes from git-svn repository to subversion.
    148148
    149149 * Do the update.