From owner-freebsd-questions Wed Apr 17 4: 6:51 2002 Delivered-To: freebsd-questions@freebsd.org Received: from mailg.telia.com (mailg.telia.com [194.22.194.26]) by hub.freebsd.org (Postfix) with ESMTP id 4761137B405 for ; Wed, 17 Apr 2002 04:06:47 -0700 (PDT) Received: from d1o913.telia.com (d1o913.telia.com [195.252.44.241]) by mailg.telia.com (8.11.6/8.11.6) with ESMTP id g3HB6kB15566 for ; Wed, 17 Apr 2002 13:06:46 +0200 (CEST) Received: from falcon.midgard.homeip.net (h53n2fls20o913.telia.com [212.181.163.53]) by d1o913.telia.com (8.8.8/8.8.8) with SMTP id NAA24676 for ; Wed, 17 Apr 2002 13:06:45 +0200 (CEST) Received: (qmail 11197 invoked by uid 1001); 17 Apr 2002 11:06:42 -0000 Date: Wed, 17 Apr 2002 13:06:41 +0200 From: Erik Trulsson To: Mathieu Arnold Cc: freebsd-questions@FreeBSD.org Subject: Re: cvs commit: src UPDATING src/sys/conf newvers.sh Message-ID: <20020417110640.GA11180@student.uu.se> Mail-Followup-To: Mathieu Arnold , freebsd-questions@FreeBSD.org References: <20020417104022.GA10940@student.uu.se> <174497243.1019047408@andromede.reaumur.absolight.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <174497243.1019047408@andromede.reaumur.absolight.net> User-Agent: Mutt/1.3.28i Sender: owner-freebsd-questions@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Wed, Apr 17, 2002 at 12:43:28PM +0200, Mathieu Arnold wrote: > > > --On mercredi 17 avril 2002 12:40 +0200 Erik Trulsson > wrote: > > >On Wed, Apr 17, 2002 at 08:51:13AM +0200, Mathieu Arnold wrote: > >> > >>--On mardi 16 avril 2002 14:00 -0700 Jacques Vidrine > >> wrote: > >> > >>> nectar 2002/04/16 14:00:16 PDT > >>> > >>> Modified files: (Branch: RELENG_4_5) > >>> . UPDATING > >>> sys/conf newvers.sh > >>> Log: > >>> Note fixes for: > >>> = IP routing table leak in icmp_relect(). > >>> = mmap/msync bug which can panic the kernel. > >>> = TCP broadcast connection bug. > >> > >>seeing that, I wanted to do some cvs diff command to show me the > >>differences between -p2 and -p3. I can easily do a -r > >>RELENG_4_5_0_RELEASE -r RELENG_5_4, but that gives me the diffs between > >>the release and -p3, and whenever I try to use -D (using the dates in > >>UPDATING), cvs keeps using the HEAD tag and not the one in my > >>directory. Does someone know how I can achieve this (without having to > >>check out -p2 (if I can) and -p3 and do a diff -r on them) > > > >You can give two -r options to cvs diff. > >cvs diff -r TAG1 -r TAG2 file > > > >will show the difference between versions TAG1 and TAG2 of the file. > > yes, but there is not tag for 4.5-RELEASE-p2 or -p3 :) Spending a couple of minutes reading the manpage for cvs(1) reveals teh following trick: cvs diff -j RELENG_4_5:date1 -j RELENG_4_5:date2 file for viewing the difference between the dates 'date1' and 'date2' along the RELENG_4_5 branch for the file 'file'. -- Erik Trulsson ertr1013@student.uu.se To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message