Changes between Version 2 and Version 3 of DarcsToGit
- Timestamp:
- 04/01/11 07:33:18 (2 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
DarcsToGit
v2 v3 1 2 WORK IN PROGRESS!!!3 1 4 2 = Migrating patches from darcs to git = … … 29 27 }}} 30 28 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:29 Now we put the git meta-data into our darcs repo, record the changes with git and merge them back to master: 32 30 {{{ 33 31 cd ghc/darcs … … 36 34 git checkout master 37 35 git merge "some-descriptive-name" 38 git push ../../ghc/git 36 cd ../.. 39 37 }}} 38 39 Finally, we pull the changes into our real git repo: 40 {{{ 41 cd ghc/git 42 git pull ../../ghc/darcs master 43 }}} 44 45 The `ghc/migrate` directory is no longer needed and can be removed.
