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

Re: Questions/issues with revert & checkout

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2004-07-16 16:34:09 CEST

You're not giving us much to work with. We have no idea what OSes
you're using, what versions of SVN, and you're describing things, rather
than showing us transcripts. But that said...

On Fri, 2004-07-16 at 05:44, Auke Jilderda wrote:
> We've just started to try using Subversion at a rather big project so
> our experience with SVN is not yet elaborate so bear with me. :-)
>
> I just tried merging from one branch to the other but my connection to
> the server happened to break somewhere halfway and SVN suddenly stopped,
> reporting:
>
> svn: REPORT request failed on '/svn/medical/!svn/vcc/default'
> svn: REPORT of '/svn/medical/!svn/vcc/default': Could not read response
> body: Secure connection truncated

So is this the 'svn merge' command that got interrupted? Do you have
any way of reproducing? Can you show us the output?

> I assume this would leave my working environment in flux, with part of
> the merge finished and part unfinished.

Sure, you've got only some local mods, but not others.

> Therefore, I tried an 'svn
> revert' before re-trying the merge but now got quite a number of
> 'Skipped ...' messages. Seems to me the revert didn't quite revert to
> exactly the same state as before the first merge? :-(

Correct. 'svn revert' removes textual and property edits, and
'unschedules' any deletes and adds. The problem is that merely
unscheduling an add doesn't delete the file: you're left with an
unversioned file lying around. (We do this, because svn is careful to
never delete unversioned data.)

So the moral of the story is, after doing an 'svn revert -R' to revert a
merge, run 'svn status' to see all the unversioned things left behind,
and hand-remove them before retrying the merge.

> It takes quite a long time with the size of this archive
> (around 200 MB), mostly because the checkout seems to halt every once in
> a while, leaving the machine doing absolutely nothing (that is, neither
> processing, disk access, nor network traffic). It typically takes a
> couple of mins before it resumes. Any ideas what could be the matter
> here?

This is not normal behavior by any means. It looks like you're having
some sort of network 'hiccup' that's pausing all communication between
client and server... and that would explain why the 'svn merge' command
was mysteriously disconnected as well. Are you having any sort of
network latency or disconnect problems?

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jul 16 16:35:30 2004

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