0

我在使用 git svn 时遇到问题。我有一份报告，主要由 Windows 用户使用，但我使用 Linux。

我已经对此回购进行了更改，但今天我得到了这个git svn dcommit：

Could not chdir to home directory /isource/home/pmalek: No such file or directory
        M       robot_tests/XXXXX-XXXXX_tests/testcases/03.01.test.tsv
        M       robot_tests/XXXXX-XXXXX_tests/testcases/XXXXXKeywords.tsv
        M       robot_tests/common_keywords/XXXXXKeywords.tsv

ERROR from SVN:
Transaction is out of date: File '/trunk/robot_tests/XXXXX-XXXXX_tests/testcases/XXXXXKeywords.tsv' is out of date
W: 1638177d0f033905043ff0fd9507e9fc30f39db6 and refs/remotes/git-svn differ, using rebase:
:040000 040000 c6f5f770f94b1b46310a4c20f09f2da3e2d1d806 9f378428c1211f60bcabd96f2c3b0e9794dbd90a M      robot_tests
First, rewinding head to replay your work on top of it...
Applying: Test | XXXXX TA tests refactored
Using index info to reconstruct a base tree...
M       robot_tests/XXXXX-XXXXX_tests/testcases/XXXXXKeywords.tsv
<stdin>:12: trailing whitespace.
${test_Filename} XXXXX_test.xml
<stdin>:14: trailing whitespace.
${configFilename}       xxxxtest.xml
<stdin>:18: trailing whitespace.
Topology file in XXXXX bin directory    [Documentation] file in XXXXX bin directory
<stdin>:19: trailing whitespace.
        [Timeout]       30 seconds
<stdin>:23: trailing whitespace.
        SSHLibrary.File Should Exist    ${XXXXXdirectory}/bin/${test_Filename}
warning: squelched 93 whitespace errors
warning: 98 lines add whitespace errors.
Falling back to patching base and 3-way merge...
/home/XXXXX/libexec/git-core/git-am: line 179: git-merge-recursive: command not found
Failed to merge in the changes.
Patch failed at 0001 Test | XXXXX TA tests refactored
The copy of the patch that failed is found in: 
   /home/xxxxx/_svn/trunk/.git/rebase-apply/patch

When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".

rebase refs/remotes/git-svn: command returned error: 1

我在本地仓库中有一个干净的提交，但不能执行git svn dcommit. 要提交的文件有尾随空格，但没关系。

我应该怎么办 ？

我已经尝试了很多东西，.gitconfig但都没有奏效。当前的.gitconfig

[core]
   autocrlf = true
   whitespace = cr-at-eol
4

1 回答 1

0

git svn dcommit仅当您的 git 分支是超集（即，比最新的 SVN 修订版更新）时才有效。如果不是这种情况，您必须先导入新的 SVN 提交。这是通过git svn rebase.

于 2014-09-17T12:50:47.553 回答