Renamed file, now SVN not allowing me to commit?

Question

I\'m developing a ColdFusion website using Aptana. We\'re using SVN for version control.

I renamed a few files and am now trying to commit one of them, but I\'m gett

Answer 1

Various clients seem to handle this better than others..

AnkhSVN for Visual Studio encounters this error and can't deal with it.

TortiseSVN (shell extension) works though - it knows to delete the old file and add the new one.

So if you're on Windows an easy way to work around this is to use TortiseSVN from Explorer to do a commit on the directory (which deletes the old file name and adds the new one).

Answer 2

There is a chance that one of the files is renamed.

Look at the file names in the error and see if this matches with your files.

If the file names don't match, rename your file to the one in the error and commit all the files you wanted to commit. After this you can rename your file and commit again.

Answer 3

Add a file with old name and do commit, Then delete the file again do commit.

Answer 4

In eclipse with subversion, I was able to work around this confusing error by doing a Team->synchronize at a high enough level folder in the project that it encompassed both the old and new file names and locations. If you moved and renamed your files or if you can't figure out what precisely is going on, it can't hurt to synchronize at the very top level of your project.

When I did this, the old versions of the renamed files showed up in the synchronize view. Once I used "override and commit" on them, they disappeared again. At this point, the new ones will finally commit properly.

Answer 5

sudo svn rm offendingfile --force

sudo svn commit -m ''

Done