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

Re: confirm merge

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-07-22 18:16:42 CEST

On Jul 22, 2005, at 10:56 AM, Phil Lawrence wrote:

> I just merged the latest changes from a branch to trunk
> $ cd trunk
> $ svn merge -r 79:82 $LOUIESVN/intl_trav/branches/656
> $ svn diff
> $ svn commit -m "Merged branch 656 changes r79:82 into the trunk."
>
> Now, just to be paranoid, I'd like to diff the current trunk and
> current branch 656. But this doesn't work:
> $ svn diff $LOUIESVN/intl_trav/branches/656 \
> $LOUIESVN/intl_trav/trunk
> subversion/libsvn_ra_dav/util.c:780: (apr_err=175002)
> svn: REPORT request failed on '/svn/!svn/vcc/default'
> subversion/libsvn_ra_dav/util.c:295: (apr_err=175002)
> svn: REPORT of '/svn/!svn/vcc/default': Could not read status line:
> Secure connection truncated (https://localhost:9443)

That error usually means the httpd process crashed. Take a look for
clues in the apache errorlog.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jul 22 18:19:04 2005

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