Difference between revisions of "Git-svn"

Revision as of 04:39, 10 October 2011

Basic usage of git-svn

Checkout:

mkdir prjname
cd prjname
git svn init https://example.com/svn/prjname/trunk
git svn fetch -r HEAD
git checkout -b nameoflocalbranch
git svn show-ignore > .gitignore

Show (SVN) status:

git svn fetch
git diff --name-status remotes/trunk

Update with incoming changes:

git svn fetch
git svn rebase

Commit changes:

git status
git add path/to/file
git commit

git svn rebase
git svn dcommit

Checkout with branches

mkdir prjname
cd prjname
git svn init https://example.com/svn/prjname
git svn fetch -r HEAD
git checkout -b nameoflocalbranch
git svn show-ignore > .gitignore

Checkout of SVN sub-directory

mkdir prjname
cd prjname
git svn init --stdlayout --no-minimize-url https://example.com/svn/teamname/prjname
git svn fetch

Then branch, etc. as usual.

Useful git cmds

Show branches:

git branch
git branch -a

Check git FS is sane.

git fsck

References

• http://www.viget.com/extend/effectively-using-git-with-subversion/
• http://blog.tsunanet.net/2007/07/learning-git-svn-in-5min.html
• http://utsl.gen.nz/talks/git-svn/intro.html#using-moving

• http://techdebug.com/blog/2010/01/06/clone-a-part-of-an-svn-repository-in-git/
• http://stackoverflow.com/questions/2426654/git-svn-status-showing-changes-that-are-not-committed-to-svn