[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
cvs update doesn't!
From: |
Ian Dall |
Subject: |
cvs update doesn't! |
Date: |
Fri, 4 Jan 2002 22:20:46 +1030 |
CVS does not seem to work properly for me. Since the problem
is pretty basic, I assume it is my naivety, which is the problem
rather than a bug. I'd appreciate if someone can enlighten me.
I am mirroring the netbsd sources using anoncvs. I imported
the mirror into a local repository with "cvs import" and checked out
a working directory with "cvs checkout". So far so good.
Then I imported an updated distribution, and updated my working
directory with "cvs update". I correctly got a couple of conflicts,
but at least a few files were not updated which should have been.
One example is parse.c as follows:
$ ls -l /usr/local/{mirrors,cvs-rep,src}/netbsd/src/usr.bin/make/parse.c*
-r--r--r-- 1 root root 76038 Jan 4 15:45
/usr/local/cvs-rep/netbsd/src/usr.bin/make/parse.c,v
-rw-r--r-- 1 root root 75636 Nov 4 05:56
/usr/local/mirrors/netbsd/src/usr.bin/make/parse.c
-rw-r--r-- 1 ian users 75147 Aug 31 22:56
/usr/local/src/netbsd/src/usr.bin/make/parse.c
Note that the cvs-rep file is, correctly, newer than the corresponding mirror
file, but the working directory version is older.
Now:
$ cd /usr/local/src/netbsd/src/usr.bin/make
$ cvs log parse.c
RCS file: /usr/local/cvs-rep/netbsd/src/usr.bin/make/parse.c,v
Working file: parse.c
head: 1.1
branch: 1.1.1
locks: strict
access list:
symbolic names:
current-2002-01-04: 1.1.1.1
current-2001-11-25: 1.1.1.1
src: 1.1.1
keyword substitution: kv
total revisions: 2; selected revisions: 2
description:
----------------------------
revision 1.1
date: 2001/11/25 13:24:31; author: ian; state: Exp;
branches: 1.1.1;
Initial revision
----------------------------
revision 1.1.1.1
date: 2001/11/25 13:24:31; author: ian; state: Exp; lines: +0 -0
Importing distribution 2001-11-25
=============================================================================
Ah. Looks OK to my inexpert eye. A version was imported on November 25.
Now lets look in the local CVS directory:
$ grep parse\.c CVS/Entries
/parse.c/1.1.1.1/Fri Aug 31 13:26:41 2001//
Well, parse.c was checked out on Aug 31.
I'm a bit puzzled by that. According to the log, there was no
1.1.1.1 in the repository until Nov 25.
Now:
$ cvs update
cvs update: Updating .
? .depend
? make.cat1
cvs update: Updating PSD.doc
cvs update: Updating lst.lib
Does not update parse.c.
I'm going to just "rm -r" my working directory and checkout again,
but I'd like to know how I got into this state, and how to avoid it!
- cvs update doesn't!,
Ian Dall <=