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

Re: Removing non-committed files?

From: Karl Fogel <kfogel_at_newton.ch.collab.net>
Date: 2002-06-03 21:09:16 CEST

Philip Martin <philip@codematters.co.uk> writes:
> I can tell you why it works the way it does. At the moment any change
> you make with 'svn rm' can be undone with 'svn revert'. Changes that
> cannot be reverted require 'svn rm --force'. Thus requiring --force
> in the situation above is intentional.
>
> I guess there is an argument for different behaviour, but I like the
> current behaviour.

However, if the error message were at least more specific to this
situation, that would be helpful. For example, when rm'ing a normal
versioned file with local mods, you would get the error Justin got:

   % svn rm my-file
   svn_error: #21114 : <Attempting restricted operation for modified resource>
     Use --force to override this restriction
   
   svn_error: #21114 : <Attempting restricted operation for modified resource>
     'my-file' has local modifications

But when removing an added file, you'd get a different error

   % svn rm my-file
   svn_error: #21XXX : <blah blah blah>
     `my-file' is scheduled for addition; to remove it, use
     `svn revert' to unschedule

   svn_error: #21XXX : <blah blah blah>
     'my-file' is scheduled for addition

That way Subversion say what it really means.

Thoughts?

-Karl

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Jun 3 21:14:10 2002

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