[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: C. Michael Pilato <cmpilato_at_collab.net>
Date: 2004-08-18 17:53:44 CEST

Lukas Ruf <ruf@rawip.org> writes:

> 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.

The repository does the commit in the first bits of handling of the
MERGE request, so it makes sense that some part of the MERGE handling
*after* the commit occurred could time out and yield the behavior you
saw.

> Really annoying is the fact that the local WC remains in a strange
> state of unmerged changes. Why?

Because the MERGE request never completed successfully, which means
the working copy never got the signal that the commit completed
successfully.

> Is tere any way I can solve that problem?

If you *know* your commit "took", then just:

   $ svn revert -R . # Lose my local changes, they already live in the repos
   $ svn update

---------------------------------------------------------------------
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:55:31 2004

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