如果SVN信息库中有新的提交，则防止dcommit自动重新设置基准

Question

When running git svn dcommit , git-svn will automatically do the equivalent of git svn rebase if not all commits present in the SVN repository have integrated into the branch being committed. Is it possible to disable this behavior? I would like git svn docmmit to fail instead, like git push by default fails in a non-fast-forward push.

I am talking about this behavior:

$ 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]

After that the rebased commits are automatically committed.

Answer 1

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