Jensen, Chris writes: > > Doing 'cvs diff' reported nothing, so we decided to grep for > the diff markers and found the conflicts in files that were > different than the repository version. Then we understood we > had a weird issue, since 'cvs diff' and other commands would > not identify that the files differed from the repository.
That sounds like CVS doesn't know the file has been modified, even though it has. If you can reproduce this situation, what's in CVS/Entries* for that file? Does "touch"ing the file resolve the problem? -Larry Jones I wonder if you can refuse to inherit the world. -- Calvin _______________________________________________ Bug-cvs mailing list [email protected] http://lists.nongnu.org/mailman/listinfo/bug-cvs
