Git svn: Delta source ended unexpectedly

Question

I am using git svn for svn repo. My colleague made a repo for some native libraries, and after that I can not overload my trunk:

  D native/libVal.so.v8.0.38za A native/libHelpVAL.so A native/libValuation.so.v9.0.36l 

Incomplete data: Delta source ended unexpectedly at /usr/lib/git-core/git-svn line 5117

I tried setting core.autocrlf to false ( as suggested ) and making a clone, but that didn't help me. I am using git 1.7.3.3 under cygwin (win xp).

Thanks for any help.

Answer 1

I googled "Delta source ended unexpectedly" and found this , which implies that this is a problem on the svn side. Perhaps try git svn reset few changes before the changes made by your colleague, and then git svn rebase .

Answer 2

It sounds like your problem is on the svn side. In our case, the developer aborted the svn update command for the directory. If you cannot delete the entire directory, you can follow these steps, which work for me in svn 1.6.11:

 $ cd {directory_with_file} $ cd .svn $ vi all-wcprops 

Find the file name you are looking for, you should see similarly:

 END {FILENAME} K 25 svn:wc:ra_dav:version-url V 123 /{URL}/!svn/ver/19811/{PROJECT}/trunk/{PATH_TO_FILE} END 

Delete all lines between "END" and also one line "END". Save the file as read-only.

 $ vi entries 

Find the file name you are looking for, you should see similarly:

 ^L {FILENAME} file {whitespace} 2012-09-14T07:37:36.000000Z b32c5eec03f4be5c09fa7d9c71bac5ce 2012-09-13T07:13:43.808544Z 20167 {COMMITTER} {whitespace} 11157 ^L 

Delete all lines between '^ L', including one line of '^ L'. Save the file as read-only.

 $ cd text-base $ rm {FILENAME} $ cd ../../ $ rm {FILENAME} ; svn update {FILENAME} 

Answer 3

This is how I solved the problem:

Step 1: I identified the file that caused the problem. Maybe the last file was registered before breaking the assembly.

Step 2. I made sure that all the modified files in the problems file directory were bound to the repository.

Step 3: I deleted the folder with the problem file from my working copy (and not to the repository!). If it is difficult to find the calling file, simply delete the entire directory after checking all changes.

Step 4: I updated the whole working copy

Answer 4

I got this error when running "git svn fetch" on OS / X (I used svn2git to import a large svn repo into git). The problem was that there were two branches that differed only in the case of /branches/BUG-241 and /branches/BUG-241 , which played poorly with a case-insensitive / case-insensitive file system.

I worked on this by creating a disk image with disk utility (after these instructions ) and running import there.