TortoiseSVN The coolest Interface to (Sub)Version Control

There is a server hook script available at: http://svn.collab.net/repos/svn/trunk/contrib/hook-scripts/ that will prevent checkins which result in case conflicts.

If you already have two files with a name that differs only in case, you have to decide which one of them you want to keep and delete (or rename) the other one from the repository.

There are (at least) two possible solutions to rename a file without losing its log history. It is important to rename it within subversion. Just renaming in the explorer will corrupt your working copy!!!

Solution A) (recommended)

1. Commit the changes in your working copy.
2. Rename the file from UPPERcase to upperCASE directly in the repository using the repository browser.
3. Update your working copy.

Solution B)

1. Rename from UPPERcase to UPPERcase_ with the rename command in the TortoiseSVN submenu.
2. Commit the changes.
3. Rename from UPPERcase_ to upperCASE.
4. Commit the changes.