Fixing Subversion Repository

Question

This is a very annoying problem with Subversion. The problem is talked about in this thread, but I don't see how to apply the solution to my situation.

I am developing using Netbeans 7-beta and sometimes use my Mac, sometimes my Windows system, and I made the mistake of renaming a file (using Netbeans refactoring) where the rename was just changing the case of the letters. Then there were subsequent checkins from both the Mac and the Windows side -- I don't remember exactly what step did the damage.

The result is that if I try to just go to check out the project on any system, I get the error:

svn: Can't open file zzzzz/.svn/tmp/text-base/xxxxx.java.svn-base

where the tokens zzzzz and xxxxx are specific to my project. The xxxxx was once named xXxXx or something.

I can check out the plain code (no .svn directories) and create a new repository, but that will lose all my history. Trying to get Netbeans to check in the file with the original name doesn't seem to work either. Is there another way to clean this up?

Answer 1

As in the accepted answer in the thread you referred to I would suggest inspecting the files in the folder using TortoiseSVN's repo browser - it appears likely that you'll find two files with the same name but different case. From within repo browser delete one of the files, and try your update again.