Git and Subversion

最新推荐文章于 2024-09-14 20:25:32 发布

weixin_33847182

最新推荐文章于 2024-09-14 20:25:32 发布

阅读量60

点赞数

文章标签： git

原文链接：http://www.cnblogs.com/joe-yang/archive/2012/04/29/2476173.html

版权

Cloning a Subversion Repository

$ git svn clone <subversion-url> ?optional-directory-name?

Synchronizing With Upstream

$ git svn rebase

Pushing Changes Upstream

$ git svn dcommit

Rules and Guidelines

There are a few rules you should follow when using Git as a Subversion client. Many of these are due to the fact that Git is a much more capable system than Subversion and some of the Git features simply do not work in Subversion.

Do not dcommit Git merge commits to the Subversion repository. Subversion doesn’t handle merges in the same way as Git, and this will cause problems. This means you should keep your Git development history linear (i.e., no merging from other branches, just rebasing).
Do not amend, reorder, or otherwise change commits that have been dcommited to Subversion. This is essentially the same rule as not changing Git commits that have been pushed to public repositories. Subversion cannot handle modifying or reordering commits.

from: http://learn.github.com/p/git-svn.html

转载于:https://www.cnblogs.com/joe-yang/archive/2012/04/29/2476173.html