[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: Kevin Pilch-Bisson <kevin_at_pilch-bisson.net>
Date: 2002-06-02 20:04:01 CEST

On Sun, Jun 02, 2002 at 10:10:55AM -0700, Justin Erenkrantz wrote:
> % svn add my-file
> <this is okay>
> % 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
>
> I don't know if this has been discussed before, but it'd be awful
> nice if the entry is newly added that I can remove it without adding
> --force.
>
> A quick glance shows that the entry in the .entries file has
> schedule="add" as a property. My SVN karma probably isn't high enough
> for me to do this on my own. So, consider this a feature enhancement
> request. =) -- justin
>
The "correct" way to do this is to svn revert my-file. This will undo the
schedule for addition. I beleive the issue has come up before and people
decided that they prefered the idea of just using svn revert.

-- 
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Kevin Pilch-Bisson                    http://www.pilch-bisson.net
     "Historically speaking, the presences of wheels in Unix
     has never precluded their reinvention." - Larry Wall
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

  • application/pgp-signature attachment: stored
Received on Sun Jun 2 20:05:17 2002

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