--VbJkn9YxBvnuCH5J
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:
>=20
> Well, this is what I get today, on my own little repository:
>=20
>     # cvs update -A
>     cvs server: Updating .
>     cvs server: conflict: foo.c is modified but no longer in the reposito=
ry
>     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)
>=20
> 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:

http://ccvs.cvshome.org/servlets/ReadMsg?msgId=3D13231&listName=3Dbug

Take care,

Bill

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

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3 (NetBSD)

iD8DBQE/2NHVWz+3JHUci9cRAl1pAJ9CtuWDVib2okut3gEjmr0iAjeKHwCbB/+W
/Jo4iPLQbOq7nLkQVlJfye0=
=mwhN
-----END PGP SIGNATURE-----

--VbJkn9YxBvnuCH5J--