Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

Subversion conflict in filename case

Tags:

svn

I'm using a Subversion repository where someone copied a filename to the same filename using a different case (at least, I'm pretty sure this is what happened). Something like:

svn copy FILENAME.xml filename.xml

This person neglected, however, to delete FILENAME.xml from the repository (I work in a team of mainly non-developers so it's unlikely they realized this). Now there is a situation in which both filenames (uppercase and lowercase) exist in the repository.

This wouldn't be so much of a problem except that I am using a Mac on a case-insensitive filesystem: when I update my working copy, the lowercase version overwrites the uppercase version I get the warnings that my working copy is incomplete, and I can't get the exclamation marks to go away. I don't really use this particular repository except to check up on a couple of things occasionally, and I'm not terribly familiar with Subversion.

What I want to do is to delete the all-caps name entirely in favor of the lowercase name. I can't do this because when I try to svn delete the file it deletes the lowercase version.

like image 370
Michael M. Avatar asked Jan 08 '14 15:01

Michael M.


1 Answers

The easiest way would be to remove the file directly on the repository. The svn delete subcommand accepts two kind of arguments, either a PATH (working copy) or a URL (repository)—simply use the second one:

svn delete -m 'Fix broken rename' http://example.com/svn/foo/bar/FILENAME.xml
like image 97
Álvaro González Avatar answered Oct 11 '22 02:10

Álvaro González