Strange CVS problem (help!!!)

[Vincent Béron]

Le ven 06/09/2002 à 18:48, Dimitrie O. Paun a écrit :
> On September 6, 2002 06:33 pm, Shachar Shemesh wrote:
> > I got the same thing with the last patch I submitted. I don't know how
> > long before the next time, so we'll see.
> 
> Aha! So I'm not alone...
> 
> > In any case, try leaving just the local part of a file you have not
> > changed since the change, and do "cvs stat" on it. See if it is
> > identified as "locally modified". If it is not, I would suspect
> > something with your local cvs has changed.
> 
> Of course it would be marked as "locally modified", because it is!
> If it wouldn't be, there would be no conflict.
> 
> >  Are you, by any chance, using Debain unstable, and doing apt-get
> > dist-upgrade occasionally? Are you using cvsup to work with a local
> > repository?
> 
> No, I use RH7.3. Yes, I use cvsup to update my local repository...
> Maybe that's the problem, but I don't see why it would be!
> 
> --
> Dimi.
> 
> 

It's probably very naive, but still... what does cvs diff from says? Or
checking out in a fresh directory, and manually diffing both files?
(Both from your local and the winehq.org repositery?)

Vincent