使用 SVN 将主干合并到分支中:“安全连接被截断" [英] Merge trunk into branch with SVN: "Secure Connection Truncated"

问题描述

在尝试使用以下命令将 svn 主干的更改合并回分支后:

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:'/svnroot/simspark/!svn/vcc/default'的报告:无法读取块大小:安全连接被截断(https://simspark.svn.sourceforge.net)

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.

无论如何，我们发现的普遍情况是，这是 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屋！