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

Re: undelete?

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2004-03-20 01:04:42 CET

On Thu, 2004-03-18 at 15:34, Jeff Bowden wrote:
> My first instinct was to use merge
> but when I tried it I got an obscure error message:

This is *exactly* the recommended way to undo changes. It's discussed
in chapter 4 of the svn book.

>
> $ svn merge -r 178:176 https://svnserver/svn/branches/project/tmp2/dir
>
> svn: REPORT request failed on '/svn/!svn/vcc/default'
> svn: REPORT of '/svn/!svn/vcc/default': Could not read chunk size:
> Secure connection truncated (https://svnserver)

Truncated? Are you running a 1.0.1 server? This looks like a
meta-problem with apache, irrelevant to merging.

Your command is a bit off, however. You're asking the repository to
compare /branches/project/tmp2/dir in two different trees, and then
apply the diff to your working copy. But that path doesn't exist in one
of the trees! Run the merge on a path "higher up" the hierarchy, or
even on the repository root itself. Just make sure that your
working-copy target dir is appropriate.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Mar 20 01:05:14 2004

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