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

Commit the directory, not the file.

Think of a directory as a text file containing the list of files it contains, then you can see that to commit successfully, you need to update the directory itself so it can remove the old entry and add the new entry. This will show up in SVN as deleting the old and adding the new file (ie 2 changes to the directory, not 1 change to the file)

If only want to commit the 1 file, you will need to add the other changed files to an ignore list temporarily.

Answer 2

If you're using IntelliJ IDEA and make commit with TortoiseSVN, sometimes, it happens that the folder is not deleted by IDEA and Subversion make this error.

In that case, that means "please, don't commit a folder/file you marked as deleted"

Answer 3

TortiseSVN open the file in windows explorer. select the file,right click,use TortiseSVN->unversion and add to ignore list

then the file will get rid of the SVN，becomes normal file. thus you can do the operation to add the file to SVN,and submit it.

i use the solution solve to the issue.

Answer 4

If things really get messed up, the simplest solution is to delete the folder from the repository and then add it back in its current form.

SVN Wipe and Replace:

1. Copy the folder containing all of your changes to a temporary location.
2. Use SVN Delete on the folder and then commit.
3. Copy the backup copy back to your working copy and commit.

Answer 5

svn commit 'R:\myPath\My-New-File-Name.cfm' 'R:\myPath\My-Old-File-Name.cfm' -m "message"

works for me. You just also need to include the deleted file.

Answer 6

For Visual Studio 2015, I tripped over a fix for Ankh SVN. In my case the error resulted from renaming a "Form1.cs" during development (and perhaps moving it). That caused issues with the old and new .resx files.

• Highlight the project in the Solution Explorer to open the pending changes view window,
• Choose File > Subversion > Pending changes
• Uncheck the Path
• Check the two or more files that subversion needs. If "new" one isn't in the list change its contents in a non-desturctive way so it will appear in the list.
• Run commit.

Hope this works for you.