Differences

This shows you the differences between two versions of the page.

--- docs:git:importing_an_svn_repository [2009/10/19 21:07] – billh
+++ docs:git:importing_an_svn_repository [2010/09/20 10:09] (current) – billh
@@ Line 1: / Line 1: @@
 ====== importing an svn repository ======
-To get in the right frame of mind, don't think of exporting your entire svn repository, but rather export project by project.  Export the trunk of your projects and forget about the branches.  If you need data from the branches, merge it first.
+===== using git while keeping an svn repo intact =====
   - create a text file somewhere (~/Desktop/users.txt) to map the svn users to git users<code>
 jdoe = John Doe <jdoe@example.com>
 </code>
-  - create a temporary project directory, and change to it<code>
+  - create a project directory, and change to it<code>
-mkdir myproject_tmp
+mkdir myproject.git
-cd myproject_tmp
+cd myproject.git
 </code>
   - initialize an empty git repository<code>
-git svn init http://host/path/to/your/svn/repo/project/trunk --no-metadata
+git svn init -s http://host/path/to/your/svn/repo/project/trunk --no-metadata
 </code>
+    * note the -s flag sets the default svn structure for /branches /tags /trunk; if this isn't how your repo is set up, you can use the -T -b -t flags
   - set up the user file for mapping<code>
 git config svn.authorsfile ~/Desktop/users.txt
@@ Line 18: / Line 19: @@
 git svn fetch
 </code>
-  - change up one directory, and clone this newly created repository (this cleans up all svn stuff)<code>
+  - sync with svn (like running svn update)<code>
-cd ..
+git svn rebase
-git clone myproject_tmp myproject
 </code>
-  - the myproject_tmp directory can now be removed, and the origin remote<code>
+  - use the master branch to push to svn, and create git only branches for your local development
-rm -Rf myproject_tmp
+  - when you have a commit on the master branch ready to push to svn, do this<code>
-cd myproject
+git svn dcommit
-git remote rm origin
 </code>
+  - since it takes so long to pull full svn history into a git repo, you may want to do this once and then set up a git repo that others can clone, if other users want to use git on a large project
+===== See Also =====
+  * [[converting an svn project to git]]
 ===== External Links =====
   * http://www.simplisticcomplexity.com/2008/03/05/cleanly-migrate-your-subversion-repository-to-a-git-repository/