You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Robert Krugmann <Ro...@infoteam.de> on 2004/07/26 12:18:46 UTC

HowTo: Continue at the error "can not delete locally modified fil e"

Hi all,

Situation:
Locally I have a modified file. This happens each time I do compile. If
someone deletes such a file in the repo,
svn stop an update transaction with the error: "can not delete locally
modified file". 

Currently I wonder, if there is any possibility to make TortoiseSVN continue
at collisions with locally modified files.
I know this conflict can only be resolved manually, but it was much more
convenient, if SVN does not stop updating
the rest.

Similar Situations are:
*)	update of a file, which is locally not known to version control but
in the repo it is.
*)	someone has (accidently or not) deleted the .svn directory and does
an update


regards
robert





---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: HowTo: Continue at the error "can not delete locally modified fil e"

Posted by Ben Collins-Sussman <su...@collab.net>.
On Mon, 2004-07-26 at 07:18, Robert Krugmann wrote:
> Hi all,
> 
> Situation:
> Locally I have a modified file. This happens each time I do compile. If
> someone deletes such a file in the repo,
> svn stop an update transaction with the error: "can not delete locally
> modified file". 

This behavior is fixed in svn 1.1;  the update process no longer stops
when this happens.  Instead, it just unversions the file and leaves it
behind.

And when svn 1.1 is released, I'm sure a new version of Tortoise will
come out that uses the libraries.



---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org