Created
November 24, 2011 04:45
-
-
Save kyuwoo-choi/1390640 to your computer and use it in GitHub Desktop.
Check out from multiple svn repos & merge into one git repo
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
$ git svn clone -s SVN_REPO_URL LOCAL_DIR | |
$ cd LOCAL_DIR | |
$ git remote add origin git@github.com:GITHUB_USERNAME/REPO_NAME.git | |
$ git push origin master | |
$ git remote add rack_remote git@github.com:schacon/rack.git | |
$ git fetch rack_remote | |
warning: no common commits | |
remote: Counting objects: 3184, done. | |
remote: Compressing objects: 100% (1465/1465), done. | |
remote: Total 3184 (delta 1952), reused 2770 (delta 1675) | |
Receiving objects: 100% (3184/3184), 677.42 KiB | 4 KiB/s, done. | |
Resolving deltas: 100% (1952/1952), done. | |
From git@github.com:schacon/rack | |
* [new branch] build -> rack_remote/build | |
* [new branch] master -> rack_remote/master | |
* [new branch] rack-0.4 -> rack_remote/rack-0.4 | |
* [new branch] rack-0.9 -> rack_remote/rack-0.9 | |
$ git checkout -b rack_branch rack_remote/master | |
Branch rack_branch set up to track remote branch refs/remotes/rack_remote/master. | |
Switched to a new branch "rack_branch" | |
$ ls | |
AUTHORS KNOWN-ISSUES Rakefile contrib lib | |
COPYING README bin example test | |
$ git checkout master | |
Switched to branch "master" | |
$ ls | |
README | |
$ git read-tree --prefix=rack/ -u rack_branch | |
$ git checkout rack_branch | |
$ git pull | |
$ git checkout master | |
$ git merge --squash -s subtree --no-commit rack_branch | |
Squash commit -- not updating HEAD | |
Automatic merge went well; stopped before committing as requested | |
$ git diff-tree -p rack_branch | |
$ git diff-tree -p rack_remote/master | |
//REFS http://progit.org/book/ch6-7.html | |
//REFS http://help.github.com/import-from-subversion/ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment