Can not resolve svn conflict - two files with same name in repository

Question

I have a freshly checked-out svn working copy in my eclipse workspace, running on Windows 7. In the repository, both in the same directory, I have the following two files (that only differs by the extension letter case):

grey_tube_with_border.PNG
grey_tube_with_border.png

Unsurprisingly, Windows isn't happy about it, and cannot hold the two files simultaneously in the working copy. This cause me a lot of troubles (for instance, when I try to merge the WC with a different branch).

On the other hand, I can't find a way to rename / delete one of the files. I tried commit , override and commit etc. Nothing works.

How do I solve this problem?

Answer 1

Use command-line tools, or the Repository Browser in TortoiseSVN, to do a rename directly on the server without a working copy.

Example:

svn move http://example.com/svn/grey_tube_with_border.PNG http://example.com/svn/grey_tube_with_border.2.png

Then you should be able to svn update to get any version at or after this rename.