I have been maintaining my own SVN server for many years, but in order to share code and make use of managed services, it was time to migrate some of my repositories to Git.<\/p>\n\n\n\n
There are many tutorials for svn-git migration, here’s a customised script which works for me: migrate-svn-to-git.sh<\/tt>. Note, it requires an authors.txt<\/tt> file – there any plenty of adequate resources out there for how to create one.<\/p>\n\n\n\n
There is nothing specific about this script for Google Source Repos, that is just my choice for private code so it can make use of Google Cloud Build and gcr.io.<\/p>\n\n\n\n
#!\/usr\/bin\/env bash
<\/strong>svnUri=\"$1\"
<\/strong>gitUri=\"$2\"
if [[ -z \"${svnUri}\" || -z \"${gitUri}\" ]]<\/strong>; then
<\/strong>echo \"[ERROR] Usage migrate-svn-to-git.sh <svn_uri> <git_uri>\" <\/strong>1>&2
<\/em>exit 1
fi
if [[ <\/strong>! -f <\/strong>authors.txt ]]<\/strong>; then
<\/strong>echo \"[ERROR] authors.txt is missing\" <\/strong>1>&2
<\/em>exit 1
fi
<\/strong>echo \"[INFO] Cloning from SVN: ${svnUri}\"
<\/strong>git svn --authors-file=authors.txt clone -s $<\/strong>{svnUri} --prefix svn\/ migration
cd migration
echo \"[INFO] Creating Git tags\"
for <\/strong>t in $<\/strong>(git for-each-ref --format='%(refname:short)' <\/strong>refs\/remotes\/svn\/tags); do <\/strong>git tag $<\/strong>(echo $<\/strong>{t} | sed 's^svn\/tags\/^^'<\/strong>) $<\/strong>{t} && <\/strong>git branch -D -r $<\/strong>{t}; done
<\/strong>echo \"[INFO] Creating Git branches\"
for <\/strong>b in $<\/strong>(git for-each-ref --format='%(refname:short)' <\/strong>refs\/remotes\/svn | grep -v trunk); do <\/strong>git branch $<\/strong>(echo $<\/strong>{b} | sed 's^svn\/^^'<\/strong>) refs\/remotes\/$<\/strong>{b} && <\/strong>git branch -D -r $<\/strong>{b}; done
<\/strong>echo \"[INFO] Creating .gitignore file\"
<\/strong>git svn show-ignore > .gitignore
<\/em>git add .gitignore
git commit -m \"Added .gitignore\"
<\/strong>echo \"[INFO] Pushing to Git: ${gitUri}\"
<\/strong>git remote add google $<\/strong>{gitUri}
git push --force google --tags
git push --force google --all
cd -
echo \"[INFO] Removing migration directory\"
<\/strong>rm -rf migration<\/pre>\n\n\n\nOnce you have created the Git repo, you need to switch your working copy of a project from SVN to Git. Here’s a script: switch-svn-to-git.sh<\/tt><\/p>\n\n\n\n
#!\/usr\/bin\/env bash<\/strong>
<\/em>gitUri=\"$1\"
if [[ -z \"${gitUri}\" ]]<\/strong>; then
<\/strong>echo \"[ERROR] Usage switch-svn-to-git.sh <git_uri>\" <\/strong>1>&2
<\/em>exit 1
fi
if [[ <\/strong>! -d <\/strong>.svn ]]<\/strong>; then
<\/strong>echo \"[ERROR] Not a SVN project\" <\/strong>1>&2
<\/em>exit 1
fi
<\/strong>echo \"[INFO] Finding current branch\"
<\/strong>svnBranch=$<\/strong>(svn info | grep '^URL:' <\/strong>| egrep -o '(tags|branches)\/[^\/]+|trunk' <\/strong>| egrep -o '[^\/]+$'<\/strong>)
echo \"[DEBUG] ${svnBranch}\"
<\/strong>echo \"[INFO] Cleaning SVN directory\"
<\/strong>rm -rf .svn
echo \"[INFO] Initialising Git from: ${gitUri}\"
<\/strong>git init
git remote add origin $<\/strong>{gitUri}
git fetch
echo \"[INFO] Saving working copy\"
<\/strong>git show origin\/master:.gitignore > .gitignore
<\/em>git checkout -b tmp
git add .
git commit -m \"local changes\"
<\/strong>echo \"[INFO] Checking out branch\"
<\/strong>gitBranch=\"master\"
if [[ $<\/strong>{svnBranch} != \"trunk\" ]]<\/strong>; then
<\/strong>gitBranch=\"${svnBranch}\"
fi
<\/strong>git checkout $<\/strong>{gitBranch}
echo \"[INFO] Merging working copy\"
<\/strong>git merge --allow-unrelated-histories -X theirs --squash tmp
git branch --delete --force tmp
echo \"[INFO] Deleting IntelliJ reference to SVN (if exists)\"
<\/strong>test -f .idea\/vcs.xml && <\/strong>rm .idea\/vcs.xml
echo \"[INFO] Done - you may want to set your name \/ email with: git config user.email <email>\"<\/strong><\/pre>\n","protected":false},"excerpt":{"rendered":"I have been maintaining my own SVN server for many years, but in order to share code and make use of managed services, it was time to migrate some of my repositories to Git. There are many tutorials for svn-git … Continue reading