[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Up-to-date check failed for 'module'
From: |
David Berry |
Subject: |
Up-to-date check failed for 'module' |
Date: |
Thu, 21 Jun 2001 11:19:00 -0500 |
Dear Gurus,
I am having trouble understanding
the up-to-date check. We are converting
our software group from using RCS to
CVS. I am modifying our scrips to use
the CVS commands. During my testing
of CVS, I have run across the up-to-date
check failed several times. My tests involve
simply checking out a set of software, making
NO changes and checking it back in. I have
noticed the following:
I have versions 201.4, 201.5 and 201.6 .
There is NO difference in the code in
any of these versions, except for the
revision string $Id:$
When I check out 201.4 and try to check
it back in on top of 201.6, I get the
following:
cvs commit: Up-to-date check failed for `alnmo.c'
cvs [commit aborted]: correct above errors first!
cvs commit: Up-to-date check failed for `alnmo.h'
cvs [commit aborted]: correct above errors first!
cvs commit: Up-to-date check failed for `alnmo.nsd'
cvs [commit aborted]: correct above errors first!
cvs commit: Up-to-date check failed for `makefile'
cvs [commit aborted]: correct above errors first!
cvs commit: Up-to-date check failed for `ChangeLog'
cvs [commit aborted]: correct above errors first!
---------------------------------------------------------
Since the code is identical, how do I correct
the above errors??????
When I do a cvs diff, I get the following:
cato:/users/721/berry/src/scripts/esproc/alnmo% cvs diff
cvs diff: Diffing .
Index: ChangeLog
===================================================================
RCS file: /cm/cvs/esproc/alnmo/ChangeLog,v
retrieving revision 201.4
diff -r201.4 ChangeLog
1c1
< $Id: ChangeLog,v 201.4 2001/06/21 14:57:36 berry Exp $
---
> $Id: ChangeLog,v 202.7 2001/06/21 14:57:36 berry Exp $
Index: alnmo.c
===================================================================
RCS file: /cm/cvs/esproc/alnmo/alnmo.c,v
retrieving revision 201.4
diff -r201.4 alnmo.c
3c3
< $Id: alnmo.c,v 201.4 2001/06/21 14:58:16 berry Exp $
---
> $Id: alnmo.c,v 202.7 2001/06/21 14:58:16 berry Exp $
Index: alnmo.h
===================================================================
RCS file: /cm/cvs/esproc/alnmo/alnmo.h,v
retrieving revision 201.4
diff -r201.4 alnmo.h
1c1
< static char h_rcs_ver[] = "$Revision: 201.4 $";
---
> static char h_rcs_ver[] = "$Revision: 202.7 $";
Index: alnmo.nsd
===================================================================
RCS file: /cm/cvs/esproc/alnmo/alnmo.nsd,v
retrieving revision 201.4
diff -r201.4 alnmo.nsd
196,197c196,197
< domain = $ENUMERATE "$Revision: 201.4 $"
< default = "$Revision: 201.4 $"
---
> domain = $ENUMERATE "$Revision: 202.7 $"
> default = "$Revision: 202.7 $"
Index: makefile
===================================================================
RCS file: /cm/cvs/esproc/alnmo/makefile,v
retrieving revision 201.4
diff -r201.4 makefile
2c2
< # $Id: makefile,v 201.4 2001/06/21 14:58:22 berry Exp $
---
> # $Id: makefile,v 202.7 2001/06/21 14:58:22 berry Exp $
cato:/users/721/berry/src/scripts/esproc/alnmo%
Regards,
David Berry
- Up-to-date check failed for 'module',
David Berry <=