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

Re: Commit failure and KILLME file.

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2004-04-23 16:13:49 CEST

Martin Tomes wrote:

> What is the best way out of this?

In general, if a commit succeeds on the server but then the client never
hears about the success (or if the client utterly fails to perform
"post-update" maintenance on the working copy), then you're left in a
situation much like yours: the working copy still thinks all the files
are locally changed. When you update, of course you get the *same*
changes sent back from the server, so everything gets conflicted.

Really, the best thing to do is a fresh checkout. An alternate strategy
is to toss all local mods ('svn revert -R'), delete any leftover
unversioned files that result, and then run 'svn up'.

The important question here, however, isn't "how do I make the working
copy happy again?", but rather, "how and why did the post-commit
processing fail in the first place?" Any extra detail or reproduction
info about that would be great.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Apr 23 16:13:52 2004

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.