On Fri, Sep 10, 1999 at 05:37:35PM -0500, [EMAIL PROTECTED] wrote: > > I typed: > > > > $ cvs commit -r 1.5 maint-guide.sgml > > > > Edited the changelog, saved it, exited, and after some time got this > > message: > > > > cvs server: Up-to-date check failed for `maint-guide.sgml' > > cvs [server aborted]: correct above errors first! > > cvs commit: saving log message in /tmp/cvs01258baa > > > > What the fsck does that mean? How can I fix that? > > You have to do an update since maint-guide.sgml was modified by someone > else while you were editing your checked out version: > > cvs update maint-guide.sgml > > This will merge any changes that were made after you check it out into > your version. If there are any conflicts you will have to correct them > before you can commit them. Once the file is clean, i.e. no conflicts, > you can then commit the file.
Nope, I did "cvs update" several times, it didn't help. I think I figured it out - my $CVSROOT variable was a little rusty, so I made a fresh checkout, copied my new file to the new tree, and committed it from there. And it worked! -- enJoy -*/\*- don't even try to pronounce my first name