Re: Mysterious Conflict

[Larry Jones]

Arachtingi, Mike writes:
> 
> I've checked out my entire tree, sticky on a module tag (build-2_4_0.)
> When I then query status, it shows that one file (out of about 800 files
> in 500 folders) is not up-to-date.  When I try to update it (keeping the
> sticky tag) CVS indicates that a conflict is preventing update of that
> file.  

Look at the messages very carefully -- you have two files with identical
names save for case differences:  CpeRegistrationMessage.java and
CPERegistrationMessage.java.  Since MS-Windows is not case sensitive,
that terminally confuses your CVS client.

-Larry Jones

You don't get to be Mom if you can't fix everything just right. -- Calvin