0

运行时，如果 SVN 存储库中存在的所有提交未集成到正在提交的分支中git svn dcommit，git-svn将自动执行等效操作。git svn rebase是否可以禁用此行为？我想git svn docmmit失败，就像git push默认情况下在非快进推送中失败一样。

我说的是这种行为：

$ git svn dcommit
Committing to svn://[...]
    [lists committed files]
Committed r1857
    [lists changes in the repostiory since last rebase]
r1856 = 3062cfbe5c3ab56d5d6e16cadba55cfa73e35c6e (refs/remotes/svn/trunk)
    [lists differences between committed revision and latest repository revision]
r1857 = 3a57b29f6e5006925f0ab7ec931e9ecf3b64b11b (refs/remotes/svn/trunk)
W: d3fbaa461d5ef643e400be7f6727fe6ef89a9d26 and refs/remotes/svn/trunk differ, using rebase:
:040000 040000 16b8ed30058d274f5f57560e06f2e8598312e0b4 dbe9d86a21aee9f4832021436f489b8e3ed8ed6e M  [...]
First, rewinding head to replay your work on top of it...
Applying: [rebases commits that were not yet committed]

之后，重新提交的提交将自动提交。

4

1 回答 1

1

You could probably try a combination of git svn fetch and git merge --ff-only <svn/branch>

于 2014-11-18T21:45:07.967 回答