Index: project_faq.html =================================================================== --- project_faq.html (revision 10763) +++ project_faq.html (working copy) @@ -68,8 +68,7 @@ Windows domain controller using SSPI Authentication?
  • I don't like the ".svn" directory name, and prefer "SVN" or something else. How do I change it?
  • -
  • I checked in a file but had the wrong case - in the filename. How do I change it?
  • +
  • How do I change the case of a filename?
  • I can't use tags to merge changes from a branch into the trunk like I used to with CVS, can I?
  • Why doesn't the $Revision$ @@ -1110,29 +1109,36 @@ -

    I checked in a file but had the wrong case - in the filename. How do I change it?

    +

    How do I change the case of a filename?

    -

    If you're adding files on an operating system with a case-insensitive +

    This problem comes up in two situations. +If you're adding files on an operating system with a case-insensitive filesystem, such as Windows, you might find you accidentally add a file -with the wrong case in the filename. You can correct this by copying +with the wrong case in the filename. Alternatively, you may just decide +to change the case of an existing file in the repository.

    + +

    If you're working in a case-sensitive file system, this is no problem at +all. Just move the file to the new name, e.g. +

    svn mv file.java File.java
    +This won't work in Windows. In Windows you can accomplish this by copying the file somewhere temporary, deleting the file from Subversion, then -adding the copy with the correct case, or by performing a move +adding the copy with the correct case. A better way is to perform a move operation with Subversion URLs. Using URLs is recommended, because it will preserve history for the file, and will take effect immediately.

    -

    Both fixes will leave Windows working copies with problems, -because Windows can still get confused when trying to add the file with -the new case. One way of fixing the problem is to delete your working -copy and check out again. If this is not possible, you must perform a -two step update.

    +

    Both fixes will leave Windows working copies with problems, because Windows +can still get confused when trying to update the conflicting filenames. (You'll get a +message like svn: Failed to add file 'File.java': object of the same name already +exists). One way of fixing the problem is to delete your working copy and check +out again. If you do not want to do this, you must perform a two step update.

    -

    For each file with the wrong the case, do:

    +

    For each file with the wrong case, the following command will change +the case:

    svn mv svn://svnserver/path/to/file.java svn://svnserver/path/to/File.java
    -

    Then for each working copy, change to the relevant directory and do:

    +

    To update the working copy, change to the relevant directory and do:

    -svn update *
    +svn update file.java
     svn update