I had a fairly complicated config for my SVN to Git migration with
multiple branch and tag locations. Therefore, I had to break up the
"git svn clone" because I didn't know how to pass multiple branch
locations to "git svn clone":
1. git svn init
2. Update .git/config with branch/tag locations
[svn-remote "svn"]
url = file:///Users/Developers/git_transition/svn_repo
fetch = project/trunk:refs/remotes/svn/trunk
branches =
project/branches/{feature1-branch,feature2-branch}:refs/remotes/svn/*
branches =
project/branches/{6.x,5.x,4.x,3.x,archive}/*:refs/remotes/svn/*
tags = project/tags/{3.7.x,4.x,5.x,6.x,old-releases}/*:refs/remotes/svn/tags/*
3. git svn -A/path/to/mappings fetch
Do I need to convert these remote tags/branches into local Git
tags/branches before pushing them to my remote Git repo or is there a
way to push remote branches directly to my remote Git repo?
The command that someone else told me was "git checkout -b
<local_branch_name> <remote_branch_name>". Though, I've seen other
places mention different strategies for converting the branches.
The script I devised to convert the tags does this for each tags
folder to maintain the original commit date, author, and commit
message:
git for-each-ref --format="%(refname)" refs/remotes/svn/tags/6.x |
grep -v @ | while read tag; do GIT_COMMITTER_DATE="$(git log -1
--pretty=format:"%ad" "$tag")" GIT_COMMITTER_EMAIL="$(git log -1
--pretty=format:"%ce" "$tag")" GIT_COMMITTER_NAME="$(git log -1
--pretty=format:"%cn" "$tag")" git tag -m "$(git log -1
--pretty=format:"%s%n%b" "$tag")" ${tag#refs/remotes/svn/tags/6.x/}
"$tag"; done
Please let me know if this is correct.
Thanks!
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html