[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Error doing Merge

From: Bradley Remedios <bremedios_at_gmail.com>
Date: 2005-02-08 00:20:05 CET

Hello all,

I'm trying to do a rather large merge on our repository and am getting
the failure message below:

svn: REPORT request failed on '/svn/lsengineering/!svn/vcc/default'
svn: REPORT of '/svn/lsengineering/!svn/vcc/default': Could not read
response body: Secure connection truncated

My system:
  OS: Linux (Fedora Core 3)
  Neon: 0.24.7-4 (with Fedora Core 3)
  SVN: 1.1.2-2.3 (with Fedora Core 3)

The server:
   OS: Linux (Fedora Core 3)
   Neon: 0.24-7 (with Fedora Core 3)
   SVN: 1.1.2-2.3 (wth Fedora Core 3)
   Apache: 2.0.52-3.1 (with Fedora Core 3)

My merge command:
    svn merge -r 146:147

ssl_error_log on server:
[Mon Feb 07 14:15:12 2005] [error] [client] Provider
encountered an error while streaming a REPORT response. [500, #0]
[Mon Feb 07 14:15:12 2005] [error] [client] A failure
occurred while driving the update report editor [500, #190004]

Basically, I am given a rather large vendor source tree. We have to
do a lot of modifications to the vendor source tree so I wanted to
have our version as the trunk and the vendors version as a branch. My
idea was that I would update the vendor branch each time their changes
were submitted to us and do a merge from their vendor branch to our
trunk when it makes sense.

I know I can generate a diff and apply it to the working copy but I
would rather use the merge command as it can handle the removal and
addition of files and directories. (using patch will create and
delete files / directories but I still have to manually add / remove
them from svn.)

Additionally, the actual size of the modifications is also rather
large (and I believe is related to the problem.)

Has anyone seen this before, or knows what I can try / do to resolve this?

Bradley Remedios
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Feb 8 00:22:12 2005

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.