[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: File case sensitivity in CVS (on Win32) 
Alex,

You have stumbled on a shortcomming of using CVS (a case sensitive tool) with Windows (a case insensitive platform). I would suggest trying the following.

1) Rename the conflicting file locally
2) Synchronize with the repository. You should have an outgoing deletion and a conflict related to the file in question.
3) For the conflict, merge any desired changes from the server version into your local version and save.
4) Commit the local version and any other outstanding changes you have to the server.
5) Perform a Team > Replace with Latest to overrite your local project with the remotre contents
6) If you weren't quite done what you were working on, step 4 may have introduced some instability to HEAD which you will need to correct.

Hope this helps
Michael

Alex Akilov wrote:

I've run into a strange situation and I'm not sure how to get out of it.

I work in a team and we had some inconsistencies in the way we were
capitalizing names of Java classes.  For example, say we had the
following two classes in one of our projects:

AbcDef
ABCGhi

Now all of us have the code in our workspaces and one of the developers
decided to rename ABCGhi to AbcGhi to be consistent with the other
case.  The problem is that I already have that file in my workspace
(along with a bunch of other changes that are work in progress and not
ready to be commited yet).  How do I go about picking up his change?  I
tried update and what I ended up with is a file that reports a compile
error (since the file name in my workspace is still ABCGhi and the
update doesn't seem to realize that the file needs to be renamed to
match the class name within the file).  Unfortunately, if I try to
rename the file on my local file system then it loses touch with the
version in the repository and assumes that I have an outgoing deletion
and creation of a new file with the same name.  I also, tried to delete
it on the file system but that got had the same effect of deleting it in
the workspace.

Is this simply a limitation of CVSNT (I believe we're using 1.11.1.1)?
Is this a bug in the Eclipse version I'm using (M5+fixes)?
Unfortunately, upgrading the latter is somewhat problematic since it
would require the whole team to upgrade (along with other plugins we're
using which were designed to work with that version).
Do I have to rename the file locally and commit it to the repository?
Would everyone on the team have to do that then?

Thanks in advance for any help,

Alex