Sender: current-users-owner@NetBSD.org


--5mCyUwZo2JvN/JJP
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Hiya,

Got yet another question/problem regarding CVS.  It is a behaviour
which has been getting me miffed for years now, and I can see no
reason for it to occur.  I have attached the log file, but the long
and the short of it is that it seems that about every other time I do
a `cvs update` of src, I get conflicts on files like
sys/arch/i386/compile/.keep_me and end up just deleting the stupid
files and redoing the update, since I never touch these files.  But my
question is why do I keep having to do this???

- Doug

-- 
Douglas Wade Needham - KA8ZRT        UN*X Consultant & UW/BSD kernel programmer
Email:  cinnion @ ka8zrt . com       http://cinnion.ka8zrt.com
Disclaimer: My opinions are my own.  Since I don't want them, why
            should my employer, or anybody else for that matter! 

--5mCyUwZo2JvN/JJP
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="update.log"
Content-Transfer-Encoding: quoted-printable

Script started on Sat Feb  7 01:25:22 2004
$ update_cvs162 ; exit=0D=0D
+ SRCROOT=3D/u[0-9]*/source=0D
+ df -kl=0D
Filesystem  1K-blocks     Used     Avail Capacity  Mounted on=0D
/dev/wd0a       63927    25404     35326    41%    /=0D
/dev/wd0g     1016103   152914    812383    15%    /var=0D
/dev/wd0h     2541271  1442983    971224    59%    /usr=0D
/dev/wd0e       63455        1     60281     0%    /stand=0D
/dev/wd0i    20116064  2838223  16272037    14%    /homes=0D
/dev/wd0j    32526083 20310967  10588811    65%    /u0=0D
/dev/wd1a    57718810 24415340  30417528    44%    /u1=0D
mfs:144        127495     1213    119907     1%    /tmp=0D
kernfs              1        1         0   100%    /kern=0D
+ date +%s=0D
+ WHEN=3D1076135130=0D
+ cd /u1/source/usr/src.162=0D
+ cvs -lq update -d -P -r netbsd-1-6-PATCH002=0D
cvs update: ignoring sys/arch/acorn26/compile (CVS/Repository missing)=0D
cvs update: ignoring sys/arch/acorn32/compile (CVS/Repository missing)=0D
cvs update: ignoring sys/arch/algor/compile (CVS/Repository missing)=0D
cvs update: ignoring sys/arch/alpha/compile (CVS/Repository missing)=0D
cvs update: ignoring sys/arch/amiga/compile (CVS/Repository missing)=0D
cvs update: ignoring sys/arch/amigappc/compile (CVS/Repository missing)=0D
cvs update: ignoring sys/arch/arc/compile (CVS/Repository missing)=0D
cvs update: ignoring sys/arch/atari/compile (CVS/Repository missing)=0D
cvs update: ignoring sys/arch/bebox/compile (CVS/Repository missing)=0D
cvs update: ignoring sys/arch/cats/compile (CVS/Repository missing)=0D
cvs update: ignoring sys/arch/cesfic/compile (CVS/Repository missing)=0D
cvs update: ignoring sys/arch/cobalt/compile (CVS/Repository missing)=0D
cvs update: ignoring sys/arch/dreamcast/compile (CVS/Repository missing)=0D
cvs update: ignoring sys/arch/evbarm/compile (CVS/Repository missing)=0D
cvs update: ignoring sys/arch/evbmips/compile (CVS/Repository missing)=0D
cvs update: ignoring sys/arch/evbsh3/compile (CVS/Repository missing)=0D
cvs update: ignoring sys/arch/hp300/compile (CVS/Repository missing)=0D
cvs update: ignoring sys/arch/hpc/stand/compile (CVS/Repository missing)=0D
cvs update: ignoring sys/arch/hpcarm/compile (CVS/Repository missing)=0D
cvs update: ignoring sys/arch/hpcmips/compile (CVS/Repository missing)=0D
cvs update: ignoring sys/arch/hpcsh/compile (CVS/Repository missing)=0D
cvs update: ignoring sys/arch/i386/compile (CVS/Repository missing)=0D
cvs update: ignoring sys/arch/luna68k/compile (CVS/Repository missing)=0D
cvs update: ignoring sys/arch/mac68k/compile (CVS/Repository missing)=0D
cvs update: ignoring sys/arch/macppc/compile (CVS/Repository missing)=0D
cvs update: ignoring sys/arch/mipsco/compile (CVS/Repository missing)=0D
cvs update: ignoring sys/arch/mmeye/compile (CVS/Repository missing)=0D
cvs update: ignoring sys/arch/mvme68k/compile (CVS/Repository missing)=0D
cvs update: ignoring sys/arch/mvmeppc/compile (CVS/Repository missing)=0D
cvs update: ignoring sys/arch/netwinder/compile (CVS/Repository missing)=0D
cvs update: ignoring sys/arch/news68k/compile (CVS/Repository missing)=0D
cvs update: ignoring sys/arch/newsmips/compile (CVS/Repository missing)=0D
cvs update: ignoring sys/arch/next68k/compile (CVS/Repository missing)=0D
cvs update: ignoring sys/arch/ofppc/compile (CVS/Repository missing)=0D
cvs update: ignoring sys/arch/pc532/compile (CVS/Repository missing)=0D
cvs update: ignoring sys/arch/playstation2/compile (CVS/Repository missing)=
=0D
cvs update: ignoring sys/arch/pmax/compile (CVS/Repository missing)=0D
cvs update: ignoring sys/arch/prep/compile (CVS/Repository missing)=0D
cvs update: ignoring sys/arch/sandpoint/compile (CVS/Repository missing)=0D
cvs update: ignoring sys/arch/sbmips/compile (CVS/Repository missing)=0D
cvs update: ignoring sys/arch/sgimips/compile (CVS/Repository missing)=0D
cvs update: ignoring sys/arch/shark/compile (CVS/Repository missing)=0D
cvs update: ignoring sys/arch/sparc/compile (CVS/Repository missing)=0D
cvs update: ignoring sys/arch/sparc64/compile (CVS/Repository missing)=0D
cvs update: ignoring sys/arch/sun2/compile (CVS/Repository missing)=0D
cvs update: ignoring sys/arch/sun3/compile (CVS/Repository missing)=0D
cvs update: ignoring sys/arch/vax/compile (CVS/Repository missing)=0D
cvs update: ignoring sys/arch/walnut/compile (CVS/Repository missing)=0D
cvs update: ignoring sys/arch/x68k/compile (CVS/Repository missing)=0D
cvs update: ignoring sys/arch/x86_64/compile (CVS/Repository missing)=0D
? .update=0D
? distrib/sets/lists/local=0D
? gnu/usr.sbin/sendmail/cf/cf/fargone.cf=0D
? gnu/usr.sbin/sendmail/cf/cf/fargone.mc=0D
? gnu/usr.sbin/sendmail/cf/cf/fargone.mc.new=0D
? gnu/usr.sbin/sendmail/cf/cf/fargone_ka8zrt.mc=0D
? gnu/usr.sbin/sendmail/cf/cf/pell.cf=0D
? gnu/usr.sbin/sendmail/cf/cf/pell.mc=0D
? gnu/usr.sbin/sendmail/cf/cf/naapo.cf=0D
? gnu/usr.sbin/sendmail/cf/cf/naapo.mc=0D
? gnu/usr.sbin/sendmail/cf/cf/mcsegal.cf=0D
? gnu/usr.sbin/sendmail/cf/cf/mcsegal.mc=0D
? gnu/usr.sbin/sendmail/cf/domain/ka8zrt.com.m4=0D
? gnu/usr.sbin/sendmail/cf/domain/naapo.org.m4=0D
? sys/arch/i386/conf/CYTEEN=0D
? sys/arch/i386/conf/AIR=0D
? sys/arch/i386/conf/FARGONE=0D
? sys/arch/i386/conf/BFC=0D
M Makefile=0D
M crypto/dist/ssh/sshd_config=0D
M distrib/sets/makeflist=0D
M distrib/sets/maketars=0D
M etc/aliases=0D
M etc/daily.conf=0D
M etc/hosts=0D
M etc/newsyslog.conf=0D
M etc/printcap=0D
M etc/rc.conf=0D
M etc/syslog.conf=0D
M etc/etc.i386/Makefile.inc=0D
M etc/root/dot.shrc=0D
M gnu/usr.sbin/sendmail/cf/cf/Makefile=0D
M gnu/usr.sbin/sendmail/cf/domain/Makefile=0D
cvs update: move away sys/arch/acorn26/compile/.keep_me; it is in the way=0D
C sys/arch/acorn26/compile/.keep_me=0D
cvs update: move away sys/arch/acorn32/compile/.keep_me; it is in the way=0D
C sys/arch/acorn32/compile/.keep_me=0D
cvs update: move away sys/arch/algor/compile/.keep_me; it is in the way=0D
C sys/arch/algor/compile/.keep_me=0D
cvs update: move away sys/arch/alpha/compile/.keep_me; it is in the way=0D
C sys/arch/alpha/compile/.keep_me=0D
cvs update: move away sys/arch/alpha/compile/build_all; it is in the way=0D
C sys/arch/alpha/compile/build_all=0D
cvs update: move away sys/arch/alpha/compile/rebuild_all; it is in the way=
=0D
C sys/arch/alpha/compile/rebuild_all=0D
cvs update: move away sys/arch/amiga/compile/.keep_me; it is in the way=0D
C sys/arch/amiga/compile/.keep_me=0D
cvs update: move away sys/arch/amigappc/compile/.keep_me; it is in the way=
=0D
C sys/arch/amigappc/compile/.keep_me=0D
cvs update: move away sys/arch/arc/compile/.keep_me; it is in the way=0D
C sys/arch/arc/compile/.keep_me=0D
cvs update: move away sys/arch/atari/compile/.keep_me; it is in the way=0D
C sys/arch/atari/compile/.keep_me=0D
cvs update: move away sys/arch/bebox/compile/.keep_me; it is in the way=0D
C sys/arch/bebox/compile/.keep_me=0D
cvs update: move away sys/arch/cats/compile/.keep_me; it is in the way=0D
C sys/arch/cats/compile/.keep_me=0D
cvs update: move away sys/arch/cesfic/compile/.keep_me; it is in the way=0D
C sys/arch/cesfic/compile/.keep_me=0D
cvs update: move away sys/arch/cobalt/compile/.keep_me; it is in the way=0D
C sys/arch/cobalt/compile/.keep_me=0D
cvs update: move away sys/arch/dreamcast/compile/.keep_me; it is in the way=
=0D
C sys/arch/dreamcast/compile/.keep_me=0D
cvs update: move away sys/arch/evbarm/compile/.keep_me; it is in the way=0D
C sys/arch/evbarm/compile/.keep_me=0D
cvs update: move away sys/arch/evbmips/compile/.keep_me; it is in the way=0D
C sys/arch/evbmips/compile/.keep_me=0D
cvs update: move away sys/arch/evbsh3/compile/.keep_me; it is in the way=0D
C sys/arch/evbsh3/compile/.keep_me=0D
cvs update: move away sys/arch/hp300/compile/.keep_me; it is in the way=0D
C sys/arch/hp300/compile/.keep_me=0D
cvs update: move away sys/arch/hpc/stand/compile/.keep_me; it is in the way=
=0D
C sys/arch/hpc/stand/compile/.keep_me=0D
cvs update: move away sys/arch/hpcarm/compile/.keep_me; it is in the way=0D
C sys/arch/hpcarm/compile/.keep_me=0D
cvs update: move away sys/arch/hpcmips/compile/.keep_me; it is in the way=0D
C sys/arch/hpcmips/compile/.keep_me=0D
cvs update: move away sys/arch/hpcsh/compile/.keep_me; it is in the way=0D
C sys/arch/hpcsh/compile/.keep_me=0D
cvs update: move away sys/arch/i386/compile/.keep_me; it is in the way=0D
C sys/arch/i386/compile/.keep_me=0D
cvs update: move away sys/arch/luna68k/compile/.keep_me; it is in the way=0D
C sys/arch/luna68k/compile/.keep_me=0D
cvs update: move away sys/arch/mac68k/compile/.keep_me; it is in the way=0D
C sys/arch/mac68k/compile/.keep_me=0D
cvs update: move away sys/arch/macppc/compile/.keep_me; it is in the way=0D
C sys/arch/macppc/compile/.keep_me=0D
cvs update: move away sys/arch/mipsco/compile/.keep_me; it is in the way=0D
C sys/arch/mipsco/compile/.keep_me=0D
cvs update: move away sys/arch/mmeye/compile/.keep_me; it is in the way=0D
C sys/arch/mmeye/compile/.keep_me=0D
cvs update: move away sys/arch/mvme68k/compile/.keep_me; it is in the way=0D
C sys/arch/mvme68k/compile/.keep_me=0D
cvs update: move away sys/arch/mvmeppc/compile/.keep_me; it is in the way=0D
C sys/arch/mvmeppc/compile/.keep_me=0D
cvs update: move away sys/arch/netwinder/compile/.keep_me; it is in the way=
=0D
C sys/arch/netwinder/compile/.keep_me=0D
cvs update: move away sys/arch/news68k/compile/.keep_me; it is in the way=0D
C sys/arch/news68k/compile/.keep_me=0D
cvs update: move away sys/arch/newsmips/compile/.keep_me; it is in the way=
=0D
C sys/arch/newsmips/compile/.keep_me=0D
cvs update: move away sys/arch/next68k/compile/.keep_me; it is in the way=0D
C sys/arch/next68k/compile/.keep_me=0D
cvs update: move away sys/arch/ofppc/compile/.keep_me; it is in the way=0D
C sys/arch/ofppc/compile/.keep_me=0D
cvs update: move away sys/arch/pc532/compile/.keep_me; it is in the way=0D
C sys/arch/pc532/compile/.keep_me=0D
cvs update: move away sys/arch/playstation2/compile/.keep_me; it is in the =
way=0D
C sys/arch/playstation2/compile/.keep_me=0D
cvs update: move away sys/arch/pmax/compile/.keep_me; it is in the way=0D
C sys/arch/pmax/compile/.keep_me=0D
cvs update: move away sys/arch/prep/compile/.keep_me; it is in the way=0D
C sys/arch/prep/compile/.keep_me=0D
cvs update: move away sys/arch/sandpoint/compile/.keep_me; it is in the way=
=0D
C sys/arch/sandpoint/compile/.keep_me=0D
cvs update: move away sys/arch/sbmips/compile/.keep_me; it is in the way=0D
C sys/arch/sbmips/compile/.keep_me=0D
cvs update: move away sys/arch/sgimips/compile/.keep_me; it is in the way=0D
C sys/arch/sgimips/compile/.keep_me=0D
cvs update: move away sys/arch/shark/compile/.keep_me; it is in the way=0D
C sys/arch/shark/compile/.keep_me=0D
cvs update: move away sys/arch/sparc/compile/.keep_me; it is in the way=0D
C sys/arch/sparc/compile/.keep_me=0D
cvs update: move away sys/arch/sparc64/compile/.keep_me; it is in the way=0D
C sys/arch/sparc64/compile/.keep_me=0D
cvs update: move away sys/arch/sun2/compile/.keep_me; it is in the way=0D
C sys/arch/sun2/compile/.keep_me=0D
cvs update: move away sys/arch/sun3/compile/.keep_me; it is in the way=0D
C sys/arch/sun3/compile/.keep_me=0D
cvs update: move away sys/arch/vax/compile/.keep_me; it is in the way=0D
C sys/arch/vax/compile/.keep_me=0D
cvs update: move away sys/arch/walnut/compile/.keep_me; it is in the way=0D
C sys/arch/walnut/compile/.keep_me=0D
cvs update: move away sys/arch/walnut/compile/mkimg.sh; it is in the way=0D
C sys/arch/walnut/compile/mkimg.sh=0D
cvs update: move away sys/arch/x68k/compile/.keep_me; it is in the way=0D
C sys/arch/x68k/compile/.keep_me=0D
M usr.sbin/dhcp/clientscript/dhclient-script=0D
  684.29s real     9.19s user    21.69s system=0D
+ date +%s=0D
+ WHEN=3D1076135814=0D
+ cd /u1/source/usr/xsrc.162=0D
+ cvs -lq update -d -P -r netbsd-1-6-PATCH002=0D
? .update=0D
  238.51s real     3.93s user     7.47s system=0D
+ echo 1076135814=0D
+ > .update =0D
+ date -r 1076135814 +%m%d%H%M=0D
+ touch -t 02070136 .update=0D
+ df -kl=0D
Filesystem  1K-blocks     Used     Avail Capacity  Mounted on=0D
/dev/wd0a       63927    25404     35326    41%    /=0D
/dev/wd0g     1016103   152914    812383    15%    /var=0D
/dev/wd0h     2541271  1442983    971224    59%    /usr=0D
/dev/wd0e       63455        1     60281     0%    /stand=0D
/dev/wd0i    20116064  2838223  16272037    14%    /homes=0D
/dev/wd0j    32526083 20310967  10588811    65%    /u0=0D
/dev/wd1a    57718810 24431252  30401616    44%    /u1=0D
mfs:144        127495     1213    119907     1%    /tmp=0D
kernfs              1        1         0   100%    /kern=0D
+ xterm_raise=0D
=1B[1;5t+ exit=0D

Script done on Sat Feb  7 01:40:54 2004

--5mCyUwZo2JvN/JJP--