Re: Skip a modified dirty file?

[Ed Greenberg]

At 12:57 PM 8/24/2001 +0200, you wrote:
> Ed Greenberg <address@hidden> writes:
>
> > I get this:
> >
> > cvs commit: Skip a modified dirty file : P780-1.mcp
> > cvs server: Up-to-date check failed for `P780-1.mcp'
> > cvs [server aborted]: correct above errors first!
> >
>
> The second message is probably the one you should have searched for.
>
> Your file is not up to date bescause someone has checked in a new
> version since you updated it.
>
> You need to run "cvs update" and resolve any conflicts before you can
> check it in.
>
> rgds/
> T Axelsson

Torbjörn and others,

In response to this, I went back, checked out my project, changed only the 
P780-1.mcp file, and tried to update. (Note that the file is marked as 
binary (-kb)

CVSROOT: :pserver:address@hidden:/home/edg/cvs (password authentication)
TCL is available, shell is enabled : help (select and press enter)
cvs login
(Logging in to address@hidden)

*****CVS exited normally with code 0*****


cvs checkout -P P780 (in directory C:\)
cvs server: Updating P780
U P780/P780-1.mcp
cvs server: Updating P780/Obj
cvs server: Updating P780/Obj/Resource.frk
U P780/Obj/Resource.frk/P780.tmp
U P780/Obj/Resource.frk/Starter.tmp
cvs server: Updating P780/P780-1_Data
cvs server: Updating P780/P780-1_Data/P780-Debug
cvs server: Updating P780/Rsc
U P780/Rsc/P780.rsrc
U P780/Rsc/P780Rsc.h
cvs server: Updating P780/Rsc/Resource.frk
U P780/Rsc/Resource.frk/P780.rsrc
cvs server: Updating P780/Src
U P780/Src/ChannelEdit.c
U P780/Src/ChannelEdit.h
U P780/Src/Convenience.c
U P780/Src/Convenience.h
U P780/Src/P780.h
U P780/Src/TextFields.c
U P780/Src/TextFields.h
U P780/Src/globals.c
U P780/Src/globals.h
U P780/Src/main.c
U P780/Src/prototypes.h

*****CVS exited normally with code 0*****

NOW, HERE I OPEN CODEWARRIOR AND DO A COMPILE, WHICH
UPDATES P780-1.mcp. THEN WINCVS SHOWS THAT THE FILE IS
CHANGED (RED) AND i DO AN UPDATE ON THAT FILE ONLY, AND
I GET THIS:

cvs update P780-1.mcp (in directory C:\P780\)
cvs update: Skip a modified dirty file : P780-1.mcp

*****CVS exited normally with code 0*****



There are no other users of this repository, so I don't understand how I 
got out of sync with the
server.

The server is a linux box running cvs-1.11.1p1.  I am tunneling port 2401 
through SSH into the server
from my Win2000 client running WinCVS 1.2.  The .MCP extension is defined 
as binary in my
cvswrappers file.

The log for P780-1.mcp shows the following last access:
address@hidden edg]$ cvs -d /home/edg/cvs log P780/P780-1.mcp

RCS file: /home/edg/cvs/P780/P780-1.mcp,v
Working file: P780/P780-1.mcp
head: 1.4
branch:
locks: strict
access list:
symbolic names:
        start: 1.1.1.1
        P780: 1.1.1
keyword substitution: b
total revisions: 5;     selected revisions: 5
description:
----------------------------
revision 1.4
date: 2001/08/23 16:39:58;  author: edg;  state: Exp;  lines: +1 -1
Moved lookup structures to globals and structure definitions to P780.h
----------------------------

There is no entry on 2001/08/24 at all. The only thing that happened on 
8/24 was the checkout.

Note that all the other modified files (all ascii source) are handled 
correctly. They update and commit just fine.

I'm stumped.

Thanks for your attention,
</edg>