git svn rebase：数据不完整：Delta源意外终止 [英] git svn rebase: Incomplete data: Delta source ended unexpectedly

问题描述

我一直在维护 git镜像 .rubyforge.org /rel =noreferrer> watir项目。几个星期前的某个时候，我们有人准备提交他们的第一个基于git的补丁。不幸的是，由于项目的多平台性质，我们遇到了一些关于行结束的问题（CRLF vs. LF等）。

我尽力而为设置 autocrlf选项（对输入），并执行一些--hard重置。然而，几天后，每日更新（git svn rebase）正在喷出这个错误：

 不完整的数据：Delta源结束出乎意料的是
  

我试过用Google做什么，但是甚至删除了autocrlf设置。 git / config没有帮助。我担心工作副本是腐败的，但我希望它不是不可恢复的。

显然，一个可能的行动是从svn重新导入并开始一个新的镜子，但我希望我们不必那样做，因为当前的镜子已经分叉了，并且人们已经在他们的叉子上开发了新的代码。

感谢您提供任何帮助。

解决方案

我试图从brlcad svn存储库创建git存储库时遇到了同样的问题。我通过执行 git svn reset --r XXXXX 来解决它，其中我将XXXXX设置为最初产生错误之前的大约50个修订版本。

单步修订并未成功解决错误。作为过程的一部分，我收到了关于HEAD没有被定义的错误。为了解决这个问题，我做了一个 git svn find-rev XXXXX 来确定对应于我想要的修订版的散列，然后使用git checkout。之后，关于HEAD的错误消失了，并且 git svn reset -r XXXXX 工作。

I have been maintaining the git mirror of the watir project. Some time a couple weeks ago, we had someone ready to submit their first git-based patch. Unfortunately, we ran into some issues regarding line endings (CRLF vs. LF, etc.) because of the multi-platform nature of the project.

I tried what I could to set the autocrlf option (to 'input'), and do some --hard resets. However, a few days later, the daily update (git svn rebase) is spewing this error:

Incomplete data: Delta source ended unexpectedly

I've tried googling around for what to do, but even removing the autocrlf setting in the .git/config hasn't helped. I fear the working copy is corrupt, but I hope it is not unrecoverable.

Obviously, a possible course of action is to just re-import from svn and start a fresh mirror, but I hope we don't have to do that, since the current watir-mirror has already been forked, and people have developed new code in their forks.

Thanks in advance for any help.

解决方案

I had this same problem in trying to create a git repository from the brlcad svn repository. I solved it by doing git svn reset --r XXXXX, where I set XXXXX to be about 50 revisions prior to the one that originally produced the error.

Stepping back a single revision was not successful in resolving the error. As part of the process, I received errors from git about HEAD not being defined. To resolve this, I did a git svn find-rev XXXXX to determine the hash corresponding to the revision I wanted, then git checkout. After this, the errors about HEAD were gone and the git svn reset -r XXXXX worked.

这篇关于git svn rebase：数据不完整：Delta源意外终止的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！