如果SVN存储库中有新的提交，则阻止dcommit自动重新定位

Question

运行git svn dcommit时，如果SVN存储库中存在的所有提交都已集成到正在提交的分支中， 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]

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

Answer 1

您可以尝试git svn fetch和git merge --ff-only <svn/branch>

的组合