将中继合并到具有SVN的分支中：“安全连接截断” [英] Merge trunk into branch with SVN: "Secure Connection Truncated"

问题描述

尝试使用以下命令将对svn trunk的更改合并回分支：

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

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

我从SVN得到以下错误：

I get the following error from SVN:

svn：REPORT of'/ svnroot / simspark /！svn / vcc / default'：无法读取块大小：安全连接已截断（ https://simspark.svn.sourceforge.net ）

我们已经尝试过google而结论是这是无意义的。我不会阻止你自己尝试自己，但你已经被警告。

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.

无论如何，我们发现的一般氛围是，这是一个错误， SVN和我们拧了。我使用SVN版本1.5.4，这是可用于我的Linux发行版的最新版本。

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.

一个刚刚在Mac上试过的同事没有得到错误，可以拉干干运行，顺便说一句，但已经有几打冲突，仍在计数。 < 3 SVN。

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.

推荐答案

对我有用的解决方案（在本地服务器上，到Apache配置文件的 SVNAllowBulkUpdates On 指令。
对某人可能有帮助;）

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 ;)

这篇关于将中继合并到具有SVN的分支中：“安全连接截断”的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！