From owner-freebsd-current Sun Sep 8 16:13:47 1996 Return-Path: owner-current Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id QAA02058 for current-outgoing; Sun, 8 Sep 1996 16:13:47 -0700 (PDT) Received: (from jmb@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id QAA02052; Sun, 8 Sep 1996 16:13:45 -0700 (PDT) From: "Jonathan M. Bresler" Message-Id: <199609082313.QAA02052@freefall.freebsd.org> Subject: Re: [Q] cvs diff * To: gibbs@freefall.freebsd.org (Justin T. Gibbs) Date: Sun, 8 Sep 1996 16:13:45 -0700 (PDT) Cc: current@freefall.freebsd.org In-Reply-To: <199609082300.QAA01367@freefall.freebsd.org> from "Justin T. Gibbs" at Sep 8, 96 04:00:21 pm X-Mailer: ELM [version 2.4 PL24] Content-Type: text Sender: owner-current@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk Justin T. Gibbs wrote: > > CVS expects you to specify files or directories that appear in the > repository if you specify anything at all. The CVS directory holds > revision information about your checked out tree and is invalid. > > >Aspen:[36] cvs diff vm_page.c > > You haven't changed anything in that file. > > >Aspen:[37] grep vm_page.c,v vm_page.c > > * $Id: vm_page.c,v 1.62 1996/07/30 03:08:15 dyson Exp $ > >Aspen:[35] head -1 /home/ncvs/src/sys/vm/vm_page.c,v > >head 1.63; > > > > but if i spec a revision to diff against, it works! > > Right. You could also do: > > cvs diff -r HEAD > > and get the same results. > > > > >Aspen:[39] cvs diff -c -r1.63 vm_page.c | more > >Index: vm_page.c > >=================================================================== > >RCS file: /home/ncvs/src/sys/vm/vm_page.c,v > >retrieving revision 1.63 > >retrieving revision 1.62 > >diff -c -r1.63 -r1.62 > > > > this behavior does not match the man page (as i read it) > > I believe it does. i had verson 1.62 of vm_page.c in /sys/vm the HEAD was at 1.63 per the man page "cvs diff vm_page.c" should produce behavior identical to "cvs diff -r HEAD" but it does not. here is the section on the man page that confuses me: mand. If you don't specify a particular revision, your files are compared with the revisions they were based on. You can also use the standard cvs doesnt this mean, that vm_page.c vers 1.62 will be diff'ed against the HEAD (vers 1.63) ?? moreover if no files are listed on the command line then all files in the local directory (and below should be diff'ed, but the are not. so "cvs diff" run while in /sys/vm should diff every file in the directory, including vm_page.c. but no output is displayed ;( If you don't specify any files, diff will display differences for all those files in the current directory (and its subdirectories, unless you use the standard option -l) that differ from the corre- sponding revision in the source repository (i.e. files that you have changed), or that differ from the revision specified. still confused ;( perhaps, i am not checking out and updating correctly? initial command: cd /usr; cvs co -P src to update: cd /usr; cvs update -P jmb