Git-SVN: Update Git repo from centralized SVN server

git git-svn git-pull git-fetch
Jacob Krieg picture Jacob Krieg · May 31, 2013 · Viewed 22.7k times · Source

I'm working on a project for which everyone uses SVN as a centralized server and everybody pushes the changes they do on that server. I want to use Git locally and I'm pretty new to git svn. I did a git svn clone of the repository with git svn clone -r HEAD https://svn.repo/app/branch an I want to do an update through git.

I need a 'git pull like' command but to pull from a specific revision of the SVN server repo. Also is there a 'fetch like' command to fetch from a specific revision of the SVN server repo?

I don't have any .svn folders in my cloned project and git remote doesn't give me anything. However I did a git config -l and I get the SVN server's URL, so somehow I'm linked with the SVN server. I don't know how to fetch or pull though.

Thanks!

Answer

bentolor picture bentolor · May 31, 2013

Best way to work on a Subversion Repository via Git:

  1. git svn init -s https://svn.repo/app/ myrepo assuming that under https://svn.repo/app/ the repo contains the standard /trunk, branches and tags subdirectories
  2. Do a git svn fetch in myrepo until no more commits are fetched (may take quite some time and sometimes aborts under Windows).
  3. Checkout a specific Subversion branch or trunk via git checkout -b trunk remotes/trunk

Then you can simply browse, hack and commit into your Git Repo containing all Subversion commits and branches.

  • To pull in new commits from SVN use git svn rebase
  • To push your local commits into SVN use git svn dcommit

To jump to a specific Subversion revision you only need to browse the history via git log and search for a commit mirroring the according subversion commit. You can easily spot the Subversion revision in the git-svn-id: line of the commit message. The just use a git checkout <commithash> to explicitly checkout that version.

Related questions

How do I migrate an SVN repository with history to a new Git repository?

I read the Git manual, FAQ, Git - SVN crash course, etc. and they all explain this and that, but nowhere can you find a simple instruction like: SVN repository in: svn://myserver/path/to/svn/repos Git repository in: …

Read More
See changes to a specific file using git

I know that I can use the git diff command to check the changes, but, as far as I understood, it is directory based. This means it gives all the changes of all files on the current directory. How can …

Read More
How can I remove an SSH key?

I currently have an old SSH key uploaded on a server. The problem is I lost my ~/.ssh directory (with the original id_rsa and id_rsa.pub files). Consequently, I want to remove the old SSH key directly on …

Read More