Subject: Checking source out from CVS
To: None <netbsd-help@NetBSD.ORG>
From: Greg 'groggy' Lehey <grog@lemis.com>
List: netbsd-help
Date: 09/16/2002 17:02:29
After the announcement of 1.6, I decided it was time to update my 1.5
machine.  I had checked out the sources from anoncvs.NetBSD.org, and I
had a lot of trouble with the update.  I ended up with lots of
messages like this:

  cvs server: Updating bin/systrace
  cvs update: move away bin/systrace/Makefile; it is in the way
  C bin/systrace/Makefile
  cvs update: move away bin/systrace/alias.c; it is in the way
  C bin/systrace/alias.c

This occurred for many other directories as well.  In this case, I
renamed the directory and picked up a new copy, after which I compared
the files.  All the files were identical, but the timestamps in
CVS/Entries were not:

  --- systrace.old/CVS/Entries    Sun Sep  1 02:41:56 2002
  +++ systrace/CVS/Entries        Sun Sep 15 16:06:45 2002
  @@ -1,22 +1,22 @@
  +/Makefile/1.6/Mon Aug 19 09:56:03 2002//
  -/Makefile/1.6/Sat Aug 24 17:11:31 2002//
  +/filter.c/1.5/Wed Aug 28 03:52:44 2002//
  -/filter.c/1.5/Sat Aug 31 17:11:55 2002//

This diff is truncated and rearranged to make it clearer; a large
number of files show different modification timestamps.

I then heard that there is an anonymous cvsup server at
cvsup.de.NetBSD.org.  I'm much happier with a local repo, so I set up
cvsup to download from there.  That worked (on the second attempt; I
had a network error first time round), but when I checked out the
source tree (from the root of the CVS tree), I discovered I only had
two directories in src/usr.sbin, those contained in
$CVSROOT/syssrc/usr.sbin.  I moved this directory aside, and in the
parent directory I did another cvs co, this time getting the
directories in $CVSROOT/basesrc/usr.sbin.

I'm sure I can find a way to get both, but this puzzles me, and I
suspect I'm missing some obvious but elusive piece to the puzzle.  Can
anybody help?

Greg
--
Finger grog@lemis.com for PGP public key
See complete headers for address and phone numbers