@SimonSobisch
根据 Simons 的要求,这是我最终编写的将 Subversion 移至 GH 的脚本
#!/usr/local/env bash
# Converter for GitHub -> Subversion Repositories
# CPR : Jd Daniel :: Ehime-ken
# MOD : 2013-03-09 @ 16:26:53; 2017-01-31 @ 13:36:15 Simon Sobisch
# VER : Version 1c
# the Github SVN url to clone from
URL={THE_SVN_URL} # https://github.com/user/repo/
# the SVN url to clone to
REPO={THE_REPO_ROOT} in # svn+ssh://user@domain.com/api/svn_name
# the SVN structure
SVNTRUNK=${SVN_TRUNK-trunk}
SVNTAGS=${SVN_TAGS-tags}
SVNBRANCHES=${SVN_BRANCHES-branches}
# use the trunk, branch, etc... I'm using the trunk
SVN="${REPO}/$SVNTRUNK"
clear || cls; # set -x #debug
## if you want to burn and rebuild your repo, uncomment below
#
#echo "Burning Repo..."
#svn rm $REPO/{$SVNTRUNK,$SVNTAGS,$SVNBRANCHES} -m "Burning..."
#echo "Rebuilding Repo...."
#svn mkdir $REPO/{$SVNTRUNK,$SVNTAGS,$SVNBRANCHES} -m "Rebuilding..."
# cleanup
find -maxdepth 1 -type d ! -name '.*' |xargs rm -rf; # tmp
# dirs
SVN_FOLDER=`pwd`"/svn"
GIT_FOLDER=`pwd`"/git"
# revs
ENDREV=`svn info $URL |grep Revision: |awk '{print $2}'`
CURREV=1
mkdir -p $SVN_FOLDER $GIT_FOLDER
echo -e "\nLinking SVN repo\n"
cd $SVN_FOLDER
svn co $SVN .
echo -e "\nDownloading GIT repo\n"
cd $GIT_FOLDER
git svn init -s $URL \
-T $SVNTRUNK \
-t $SVNTAGS \
-b $SVNBRANCHES \
--prefix=svn/
# Set authors so we get prettier authors
if [ -f "../authors" ]; then
git config svn.authorsfile ../authors
fi
echo -e "\nFound ${ENDREV} revisions\n"
for (( REVISION=$CURREV; REVISION<$ENDREV+1; REVISION++ ))
do
cd $GIT_FOLDER
echo -e "\n---> FETCHING: ${REVISION}\n"
git svn fetch -r$REVISION; echo -e "\n"
git rebase `git svn find-rev r$REVISION`; echo -e "\n"
# STATUS: git log -p -1 `git svn find-rev r19` --pretty=format: --name-only --diff-filter=A | sort -u
ADD=$(git log -p -1 `git svn find-rev r$REVISION` --pretty=format: --name-only --diff-filter=A |awk '{printf "%s ", $1}')
MOD=$(git log -p -1 `git svn find-rev r$REVISION` --pretty=format: --name-only --diff-filter=M |awk '{printf "%s ", $1}')
DEL=$(git log -p -1 `git svn find-rev r$REVISION` --pretty=format: --name-only --diff-filter=D |awk '{printf "%s ", $1}')
# copy new files
for i in $ADD
do
cp --parents $i $SVN_FOLDER/
done
# copy modified files
for i in $MOD
do
cp --parents $i $SVN_FOLDER/
done
# set opts for SVN logging
HASH=$(git log -1 --pretty=format:'Hash: %h <%H>')
AUTHOR='Jd Daniel <dodomeki@gmail.com>' # or $(git log -1 --pretty="%cn <%cE>")
TMPDATE=$(git log -1 --pretty=%ad --date=iso8601)
DATE=$(date --date "$TMPDATE" -u +"%Y-%m-%dT%H:%M:%S.%N" |sed 's/.....$/Z/g')
LOGMSG=$(git log -1 --pretty=%s)
# move to svn
cd $SVN_FOLDER
# burn file if it exists....
if [ "$DEL" != "" ]; then
for i in $DEL
do
test -f $i && svn --force rm $i
done
fi
# first round of additions....
[ -z "$ADD" ] || svn --force add $ADD
[ -z "$MOD" ] || svn --force add $MOD
# try 2 for adding in case we missed ? files
ADDTRY=$(svn st . |grep "^?" |awk '{print $2}')
[ -z "$ADDTRY" ] || svn --force add $ADDTRY
# do commit
svn ci -m "$LOGMSG"$'\n\n'"$HASH"
# servers pre-revprop-change
# cp hooks/pre-revprop-change.tmpl pre-revprop-change; chmod +x pre-revprop-change
# if [ "$ACTION" = "M" -a "$PROPNAME" = "svn:author" ]; then exit 0; fi
# if [ "$ACTION" = "M" -a "$PROPNAME" = "svn:date" ]; then exit 0; fi
# echo "Changing revision properties other than svn:log, svn:author and svn:date is prohibited" >&2
# change this commits author and date
svn propset --revprop -r HEAD svn:author "$AUTHOR"
svn propset --revprop -r HEAD svn:date "$DATE"
done
exit
无论如何,git-svn 很好地支持了这一点,只是在通常的 git svn 克隆上略有不同。
我们使用稍微不同的标准项目/主干|分支|标签而不是标准,parent/trunk|branches|tags/project
因此您会看到我指定了 -T/-t/-b
标志。
git svn init
这是我从现有的本地 git repo 中所做的:
# Create the project directory in subversion
$ /usr/bin/svn mkdir
https://example.com/svn/parent/trunk/project
-m "Make project directory."
Committed revision 200.
# Initialize git-svn, doesn't fetch anything yet
$ git svn init https://example.com/svn/
-T parent/trunk/project
-t parent/tags/project
-b parent/branches/project
--prefix=svn/
# Set authors so we get prettier authors
$ git config svn.authorsfile ../authors
# Now pull down the svn commits
$ git svn fetch
W: Ignoring error from SVN, ...
W: Do not be alarmed at the above message git-svn ...
This may take a while on large repositories
r200 = (guid) (refs/remotes/svn/trunk)
# We should now see our svn trunk setup under our svn remote
$ git branch -av
* master c3a7161 The latest git commit.
remotes/svn/trunk 3b7fed6 Make project directory.
# Now we want to take all of our local commits and
# rebase them on top of the new svn/trunk
$ git rebase svn/trunk
First, rewinding head to replay your work on top of it...
Applying: First git commit
Applying: The latest git commit
# Now we should see our local commits applied
# on top of svn/trunk
$ git lg
* 52b7977 (HEAD, master) The latest git commit
* a34e162 First git commit
* 3b7fed6 (svn/trunk) Make project directory.
# Everything is cool, push it back to svn
$ git svn dcommit
Committing to https://example.com/svn/parent/trunk/project
...
–prefix=svn
我最近特别喜欢的一个标志git svn clone
是--prefix=svn/
.
这将为远程 Subversion 分支、标签和主干的所有跟踪分支添加 svn/ 前缀,使其看起来很像常规 git 遥控器使用的通常的 origin/ 习惯用法。
使用带有前缀的跟踪分支,您还可以将它们用作本地分支名称,例如:
# Name your copy of svn/trunk "trunk" instead of "master"
$ git checkout -b trunk master
Switched to a new branch 'trunk'
$ git branch -d master
Deleted branch master (was 33c3136).
$ git branch -av
* trunk 33c3136 Latest svn commit
* remotes/svn/trunk 33c3136 Latest svn commit
然后,如果您有其他要跟踪的分支:
$ git checkout -b featurea svn/featurea