git-svn Tips

by Galoisplusplus - 五 25 7月 2014

Tags #Linux #CS #tech #git #svn

用git clone远端svn仓库（repo）：

$ git svn clone http://svn.example.com/project [-T trunk] [-b branches] [-t tags]

用git-svn从远端svn仓库拉取提交（commit）到本地：

$ git svn rebase

用git-svn把本地推送到远端svn仓库：

$ git svn dcommit

用git-svncheckout远端svn仓库的另一条svn支线（branch）到本地git支线：

假设我们要checkout的支线叫"another-branch"，首先在.git/config添加：

[svn-remote "another-branch"]
    url = http://svn.example.com/project/branches/another-branch
    fetch = :refs/remotes/another-branch

然后在命令行里执行：

$ git svn fetch another-branch
$ git checkout -b another-branch remotes/another-branch

使用git-svn来获取svn仓库的所有svn支线的改动：

$ git svn fetch --fetch-all

用git-svn某条svn支线复制提交到另一条svn支线：

我一开始想复杂了，写了下面的脚本，先在原来的支线上生成某一提交的patch，然后到另一支线打上该patch：

#!/bin/bash
if [ $1 == "-h" ]; then
    echo "Usage: "
    echo "$(basename $0) <git commit SHA1>"
    exit 0
fi

SHA1=$1

REPO_DIR=""
PATCH_DIR=""

SOURCE_BRANCH=master
DEST_BRANCH=dev

# cd ${REPO_DIR}
git stash
git checkout ${SOURCE_BRANCH}

patch_file=`git format-patch -1 ${SHA1} -o ${PATCH_DIR}`

git checkout ${DEST_BRANCH}
git svn rebase

# Apply patch for any svn repo:
# patch -p1 -i ${patch_file}
# In a git-svn repo, use `git am` instead:
git am ${patch_file}

# Check the commit manually
# tig

git svn dcommit

git checkout ${SOURCE_BRANCH}
git stash pop

后来发现git-svncheckout的svn支线其实和git支线没什么两样，用git cherry-pick就可以了。

将远端svn仓库的忽略文件列表加到git设置：

$ git svn show-ignore >> .git/info/exclude

References

Adding a Branch to Git

Add an SVN remote to your Git repo

Add svn repo to existing git repo?

Checkout remote branch using git svn

Selective import of SVN branches into a git/git-svn repository

git-svn Tips

References

Comments