Git-svn update

Git 1. VonC VonC 1. Loganath Raja Loganath Raja 13 3 3 bronze badges. Sign up or log in Sign up using Google. Sign up using Facebook. Sign up using Email and Password. Post as a guest Name. Email Required, but never shown. The Overflow Blog. Stack Gives Back Safety in numbers: crowdsourcing data on nefarious IP addresses. Featured on Meta. New post summary designs on greatest hits now, everywhere else eventually.

Linked Related Learn more. Asked 8 years, 7 months ago. Active 7 years, 9 months ago. Viewed 25k times. Improve this question. Jacob Krieg Jacob Krieg 2, 11 11 gold badges 64 64 silver badges bronze badges. Add a comment. Active Oldest Votes. 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.

Improve this answer. It seems that it only sees SVN commits up to the point I did the git svn clone. Even when I do git svn info it says the latest change was back on the day I did the clone.

While it's easy to create all SVN branches as a proper Git branches, it's recommended that you evaluate the following points before you continue:.

If you migrate feature branches, are you prepared to service branches out of Git? Moving from a centralized version control system to Git is more than just migrating code. Your team needs training to understand how Git is different from your existing version control system and how these differences affect day-to-day work.

Learn more. Authors: Hosam Kamel, William H. All rights reserved. This document is provided "as-is. You bear the risk of using it. This document does not provide you with any legal rights to any intellectual property in any Microsoft product. You may copy and use this document for your internal, reference purposes.

Skip to main content. This browser is no longer supported. Download Microsoft Edge More info. Contents Exit focus mode. However, it is not an exhaustive guide, nor it is updated anymore, so please, if you find something wrong, please leave a messge. If your SVN repository follows the standard layout trunk, branches, tags folders you can save some typing:. If the SVN repository has a lot of commits this will take a while, so you may want to grab a coffee.

When the command is finished you will have a full fledged git repository with a local branch called master that trackes the trunk branch in the SVN repository. If the SVN repository has a long history, the git svn clone operation can crash or hang you'll notice the hang because the progress will stall, just kill the process with CTRL-C.

If this happens, do not worry: the git repository has been created, but there is some SVN history yet to be retrieved from the server. To resume the operation, just change to the git repository's folder and issue the command git svn fetch. This retrieves all the changes from the SVN repository and applies them on top of your local commits in your current branch.

This works like, you know, a rebase between two branches :. You can also use git svn fetch to retrieve the changes from the SVN repository but without applying them to your local branch. As with SVN, your local git history must be in sync with the latest changes in the SVN repository, so if the command fails, try performing a git svn rebase first. Your local git commits will be rewritten when using the command git svn dcommit.

However, adding a new text requires modifying an existing commit's message which can't actually be done: git commits are inmutable. The solution is create a new commit with the same contents and the new message, but it is technically a new commit anyway i. Fortunately the rules are very simple:.

Do not merge your local branches, if you need to reintegrate the history of local branches use git rebase instead. When you perform a merge, a merge commit is created. The particular thing about merge commits is that they have two parents, and that makes the history non-linear. Non-linear history will confuse SVN in the case you "push" a merge commit to the repository. However do not worry: you won't break anything if you "push" a git merge commit to SVN. If you do so, when the git merge commit is sent to the svn server it will contain all the changes of all commits for that merge, so you will lose the history of those commits, but not the changes in your code.

This means git does not track empty folders. SVN, however, does. Using git svn means that, by default, any change you do involving empty folders with git will not be propagated to SVN.

Fortunately the --rmdir flag corrects this issue, and makes git remove an empty folder in SVN if you remove the last file inside of it. Unfortunatelly it does not removes existing empty folders, you need to do it manually. To avoid needing to issue the flag each time you do a dcommit, or to play it safe if you are using a git GUI tool like SourceTree you need to set this behaviour as default, just issue the command:.

Be careful if you issue the command git clean -d. That will remove all untracked files including folders that should be kept empty for SVN. If you need to generate againg the empty folders tracked by SVN use the command git svn mkdirs.

In practices this means that if you want to cleanup your workspace from untracked files and folders you should always use both commands:. If you SVN repo history is really really big this operation could take hours, as git svn needs to rebuild the complete history of the SVN repo.