Merge trunk into branch with SVN: "Secure Connection Truncated"

after trying to merge changes to an svn trunk back to the branch with the following command:

../branches/myBranch$ svn merge -r 94:171 https://.../trunk --dry-run

I get the following error from SVN:

svn: REPORT of '/svnroot/simspark/!svn/vcc/default': Could not read chunk size: Secure connection truncated (https://simspark.svn.sourceforge.net)

We already tried to google this for quite a while and concluded that this is kinda pointless. I won't stop you from trying yourself of course, but you have been warned.

Anyway, the general vibe of what we found is that this is a bug in to SVN and we are screwed. I'm using SVN version 1.5.4, which is the newest version available for my Linux distribution.

Any ideas? I don't feel like losing more than three months of work, so a solution would be quite nice.

A colleague who just tried this on a Mac did not get the error and could pull off the dry开发者_Python百科-run, by the way, but already has a few dozen conflicts, and still counting. <3 SVN.

---

For what it's worth, I've found that this happens when your HTTP connection is reset by your firewall. Using svn+ssh solves the problem, if that's an option for you.

---

A solution that worked for me (on a local server, where I had access) was to add to the Apache configuration file the SVNAllowBulkUpdates On directive. Might be of help for somebody ;)

---

Had the same problem during a switch. Since other branches within the same repo didn't yield the same error, it was likely that the working copy somehow got broken.

Solution: first find the highest folder in the directory tree where the error occurs; that's where your working copy got broken. Once you located that folder, check it out fresh in another location on your harddrive. Within the newly checked out folder, grab the file called "entries" from the .svn subdirectory, and copy it over the entries file in your broken working copy.

---

This appears to be a Sourceforge issue, not an SVN one.

https://sourceforge.net/apps/trac/sourceforge/ticket/21376 https://sourceforge.net/apps/trac/sourceforge/ticket/21051

If you add directories to your working copy, or import new directory structures into an existing repository, this seems to cause the issue.

Our workaround is to use a different SVN provider.

---

Looks like the merge was too big for something along the line to handle - I reduced the revision range and was able to get around the error. This site gave me a clue: http://lists.parrot.org/pipermail/parrot-Dev/2009-September/02785.html