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

Re: Importing large changes fails

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2004-08-18 17:53:31 CEST

On Wed, 2004-08-18 at 10:45, Lukas Ruf wrote:
> Dear all,
>
> whenever a new linux kernel is released, I have to update my local
> working copy of the kernel. This process, however, fails usually for
> the following reason:
>
> svn: Commit failed (details follow):
> svn: MERGE request failed on '/svn/PromethOS/linux/2.6/upstream'
> svn: MERGE of '/svn/PromethOS/linux/2.6/upstream':
> timed out waiting for server (https://xxxxxxxxxxxxxxxxxxxxxx)
>
> Strange to me is the fact that the commit was carried out, at least
> post-commit sends an email to all of the specified recipients.

Your client (specifically, the neon http library) sends a MERGE request
to finish a commit; the server finishes the commit, runs hooks, then
sends a response back to the client that states the new revision.

In this case, it has timed-out waiting for the server to send a response
saying that the commit succeeded. As a result, your working copy still
has all the local changes, even though the commit happened on the
server.

I don't know why it's taking so long for the server to send a response.
Perhaps you're not backgrounding your hooks... i.e. maybe it's taking a
really long time to generate the commit email? Whatever the case,
increase your neon timeout in ~/.subversion/servers, so the client
doesn't give up waiting.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Aug 18 17:54:50 2004

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