Changes between Version 5 and Version 6 of UpdatingBugzilla


Ignore:
Timestamp:
Aug 1, 2009 2:57:23 PM (12 years ago)
Author:
ddkilzer@apple.com
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • UpdatingBugzilla

    v5 v6  
    3434    git remote add -f origin-bugssite ../bugssite.git
    3535    git remote add -f origin-bugzilla ../bugzilla.git
    36     # TODO: update .git/info/grafts to create artificial merge points
    3736}}}
    3837
    39 * Create a local git branch.
     38 * Create a .git/info/grafts file to provide artificial merge points between the two remote repositories.
     39{{{
     40# BugsSite 3.2.3 merge has parents of    BugsSite 3.0.3 merge                 and CVS tag BUGZILLA-3_2_3
     41#647597ba39744df98bfad066f74a4a6b93c74606 056397ff02eaa427187ada3531f12b370d1e6e8d 213407d24e23561c65916e86ae186f154b086dde
     42# BugsSite 3.0.3 merge has parents of    BugsSite r44547                      and CVS tag BUGZILLA-3_0_3
     43#056397ff02eaa427187ada3531f12b370d1e6e8d e9b8dc46dc0a804f199a0b1c2dfa4d2112608c8a bd31477381aa6204bd5e8ed5997354ccf12b6794
     44# BugsSite r30048 has parents of         CVS tag BUGZILLA-2_20_1
     4592fb2f653ac5b1b4dc9e0ec6d4a3806fe7ea1e2a ba0b747bbab5807857e66e7ff8583d27f1625fa1
     46}}}
     47
     48 * Create a local git branch.
    4049{{{
    4150    git checkout -b master remotes/origin-bugssite/master