Changes between Version 2 and Version 3 of DarcsToGit


Ignore:
Timestamp:
Apr 1, 2011 2:33:18 PM (4 years ago)
Author:
igloo
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • DarcsToGit

    v2 v3  
    1  
    2 WORK IN PROGRESS!!! 
    31 
    42= Migrating patches from darcs to git = 
     
    2927}}} 
    3028 
    31 Now we put the git meta-data into our darcs repo, record the changes with git and push them back to our git repo: 
     29Now we put the git meta-data into our darcs repo, record the changes with git and merge them back to master: 
    3230{{{ 
    3331cd ghc/darcs 
     
    3634git checkout master 
    3735git merge "some-descriptive-name" 
    38 git push ../../ghc/git 
     36cd ../.. 
    3937}}} 
     38 
     39Finally, we pull the changes into our real git repo: 
     40{{{ 
     41cd ghc/git 
     42git pull ../../ghc/darcs master 
     43}}} 
     44 
     45The `ghc/migrate` directory is no longer needed and can be removed.