views:

459

answers:

0

Hi,

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-run, by the way, but already has a few dozen conflicts, and still counting. <3 SVN.