Git-svn workflow
本文参考: http://notes.jimlindley.com/2008/3/25/git-svn-that-works-for-me
作者: Jim Lindley
The canonical git-svn workflow that I’ve seen goes like this:
标准的git-svn工作流程参考这里:
[code lang="C"]
git svn clone
git checkout -b
…hack…hack…
git commit -a
git checkout master
git merge #NOTE: no need for –squash anymore
git svn rebase
git svn dcommit -e # -e will let you enter a commit message for SVN
[/code]
I’ve had more luck with the following workflow, when integrating changes via SVN from other team members:
我从团队的其他成员学到了更好的工作流程:
[code lang="C"]
# initial setup
git svn clone
# 99% of daily workflow
git checkout -b
…hack…hack…
git commit -a
# switch back to master, then rebase against
# any revisions in the svn repo
git checkout master
git svn rebase
# now that master is current with svn,
# sync working branch to local master
git checkout # These two are the added steps
git rebase master # which help prevent conflicts
# final upstream commit after rebasing
git checkout master
git svn rebase # one last check for new svn check ins
git merge
git svn dcommit -e
[/code]
The extra rebase step seems to do a better job of integrating your patches into the tree. Merge should do the same thing, if I’m reading the man pages right, but splitting the steps is more idiot proof (me-proof) this way.
It also keeps the master local branch from getting messy dealing with conflicts. Instead conflict is kept in the side working branch.
上面虽然很罗嗦但是做的好处在于，我们把所有的工作和从svn代码的合并都放在本地的分支上进行。这样就能保证本地主干与svn服务器进行同步，并且在本地主干没有任何修改。
更多有关git, git-svn, git-reset 的文章:
1. git-svn workflow
2. An introduction to git-svn for Subversion/SVK users and deserters
3. Git reset in depth
2009.4.3
Bian Jiang
–EOF–
Recent Comments