From owner-freebsd-hackers@FreeBSD.ORG Mon Aug 4 12:41:32 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 5634E37B401 for ; Mon, 4 Aug 2003 12:41:32 -0700 (PDT) Received: from ptserver.progtech.net (pD9E8B912.dip.t-dialin.net [217.232.185.18]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0C2B743F3F for ; Mon, 4 Aug 2003 12:41:30 -0700 (PDT) (envelope-from rg@progtech.net) Received: from PROGTECH.net (isis.muc.progtech.intern [10.25.0.100]) by ptserver.progtech.net (8.12.9/8.12.3) with ESMTP id h74JfNXo026494; Mon, 4 Aug 2003 21:41:28 +0200 (CEST) (envelope-from rg@PROGTECH.net) Message-ID: <3F2EB6CA.5000102@PROGTECH.net> Date: Mon, 04 Aug 2003 21:40:58 +0200 From: Rolf Grossmann User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.4b) Gecko/20030522 X-Accept-Language: en,German [de] MIME-Version: 1.0 To: =?ISO-8859-1?Q?Dag-Erling_Sm=F8rgrav?= References: <200308041304.h74D4u000654@isis.muc.progtech.intern> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 8bit 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:41:32 -0000 Dag-Erling Smørgrav wrote: >Rolf Grossmann writes: > > >>I'm using cvsup for a while now to get a copy of the FreeBSD CVS repository >>and I have a (slightly modified) version of -STABLE checked out from there. >>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 RELENG_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. > FWIW it also happens with HEAD (which of course is a branch aswell, but no way around). >The only >workaround I know of is to specify the files explicitly. With zsh, >you can do 'cvs diff -Nu -rBASE -rRELENG_4 **/*~*CVS*(.)' > Which, again, won't list the files I don't have yet. Wouldn't you consider it a bug listing files that are not really part of either revision? Maybe I should file a bug report with the CVS people? Anyway, thanks a lot for your reply. Rolf