From owner-freebsd-hackers@FreeBSD.ORG Mon Aug 4 12:01:43 2003 Return-Path: Delivered-To: freebsd-hackers@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C767B37B409 for ; Mon, 4 Aug 2003 12:01:43 -0700 (PDT) Received: from mail.broadpark.no (mail.broadpark.no [217.13.4.2]) by mx1.FreeBSD.org (Postfix) with ESMTP id 210C243FBF for ; Mon, 4 Aug 2003 12:01:40 -0700 (PDT) (envelope-from des@des.no) Received: from smtp.des.no (37.80-203-228.nextgentel.com [80.203.228.37]) by mail.broadpark.no (Postfix) with ESMTP id 93FBE78D89; Mon, 4 Aug 2003 21:01:38 +0200 (MEST) Received: by smtp.des.no (Pony Express, from userid 666) id 60C6C9649F; Mon, 4 Aug 2003 21:01:38 +0200 (CEST) Received: from dwp.des.no (dwp.des.no [10.0.0.4]) by smtp.des.no (Pony Express) with ESMTP id B2E5396482; Mon, 4 Aug 2003 21:01:34 +0200 (CEST) Received: by dwp.des.no (Postfix, from userid 2602) id 8F45FB824; Mon, 4 Aug 2003 21:01:34 +0200 (CEST) To: Rolf Grossmann References: <200308041304.h74D4u000654@isis.muc.progtech.intern> From: des@des.no (Dag-Erling =?iso-8859-1?q?Sm=F8rgrav?=) Date: Mon, 04 Aug 2003 21:01:34 +0200 In-Reply-To: <200308041304.h74D4u000654@isis.muc.progtech.intern> (Rolf Grossmann's message of "Mon, 4 Aug 2003 15:04:56 +0200 (CEST)") Message-ID: User-Agent: Gnus/5.090024 (Oort Gnus v0.24) Emacs/21.3 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, hits=-3.0 required=8.0 tests=EMAIL_ATTRIBUTION,IN_REP_TO,QUOTED_EMAIL_TEXT,REFERENCES, REPLY_WITH_QUOTES,USER_AGENT_GNUS_UA version=2.55 X-Spam-Level: X-Spam-Checker-Version: SpamAssassin 2.55 (1.174.2.19-2003-05-19-exp) cc: freebsd-hackers@freebsd.org Subject: Re: Using CVS diff to find out what has changed, including new files X-BeenThere: freebsd-hackers@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Technical Discussions relating to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Aug 2003 19:01:44 -0000 Rolf Grossmann writes: > I'm using cvsup for a while now to get a copy of the FreeBSD CVS reposito= ry > and I have a (slightly modified) version of -STABLE checked out from ther= e. > Now there are certain areas where I'd like to see what changed before > doing a "cvs update". Currently I'm using "cvs diff -u -N -r BASE -r RELE= NG_4" > to do that. However this has one drawback that I'm hoping you'll be > able to help me with: If files have been removed from the distribution, > these files continue to show up as getting readded (even though they > won't when doing an update). To see the problem, you can go to > /usr/src/sbin/md5 and run the above cvs diff command. That's normal behaviour with CVS when using branches. The only workaround I know of is to specify the files explicitly. With zsh, you can do 'cvs diff -Nu -rBASE -rRELENG_4 **/*~*CVS*(.)' DES --=20 Dag-Erling Sm=F8rgrav - des@des.no