SVN Commit failed for folder/directory

Question

SVN is failing to commit [add]ed folder. I added a new folder/directory "ImagesSubDirectory" and placed a couple of images in it. Xcode is showing "A" for all the added images. "svn status" terminal command shows "A" for both the ImagesSubDirectory and the images in this directory. However, when i try to commit this to the server i get the follower error:

svn: Commit failed (details follow): svn: '/Path/Project/ProjectDirectory/Resources/Images/ImagesSubDirectory' is not under version control and is not part of the commit, yet its child '/Path/Project/ProjectDirectory/Resources/Images/ImagesSubDirectory/MyImage@2x.png' is part of the commit

The Xcode commit dialog is not showing "A" against the "ImagesSubDirectory". What's wrong, and how do I fix it? I can use Terminal, but Xcode should handle it, right?

ps I'm using Xcode Version 4.3.2 (4E2002)

Answer 1

That's just buggy Xcode + SVN behavior.

I had to use Terminal to fix the issue(s) in the end.

Answer 2

add a "@" character at the end of all " @2x " files while checking in and your problem with subversion will be solved.

in other words, " svn add blahblah@2x.png@ " (where blahblah is the true name of the Retina high rez image files) at the terminal and then explicitly commit that. In other words, don't add these files from Xcode, use the command line in the Terminal.

Subversion can have troubles with files with "@" in the filename.

Answer 3

here is my case's solution: in Terminal, using svn to first add file then commit:

1.file is xxx@3x.png: image_file_name@3x.png

2.then add xxx\\@3x.png into svn:

svn add image_file_name\@3x.png@

3.fiannaly to commit:

svn commit -m “add your comment here"