Subject: Re: cvs 1.11.10 will be imported
To: Frederick Bruckman <>
From: Bill Studenmund <>
List: tech-userlevel
Date: 12/11/2003 12:21:41
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Thu, Dec 11, 2003 at 11:27:45AM -0600, Frederick Bruckman wrote:
> On Thu, 11 Dec 2003, Bill Studenmund wrote:
> Well, this is what I get today, on my own little repository:
>     # cvs update -A
>     cvs server: Updating .
>     cvs server: conflict: foo.c is modified but no longer in the reposito=
>     C foo.c

You didn't resolve the conflicts.

>     # cvs commit -m'Try to commit anyway.'
>     cvs commit: Examining .
>     cvs server: Up-to-date check failed for `foo.c'
>     cvs [server aborted]: correct above errors first!

You have unresolved conflicts, I think cvs ci is supposed to complain. :-)

>     # cvs version
>     Client: Concurrent Versions System (CVS) 1.11.5 (client/server)
>     Server: Concurrent Versions System (CVS) 1.11.5 (client/server)
> I get the same result if I try to commit from a backed-up directory
> which never got a "cvs update". Maybe the CVS folks do fix bugs, after
> all. ;-)

Try fixing the conflicts.

Also, the bug report is:

Take care,


Content-Type: application/pgp-signature
Content-Disposition: inline

Version: GnuPG v1.2.3 (NetBSD)