From owner-freebsd-hackers@FreeBSD.ORG Tue Aug 5 00:21:55 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 2947F37B401 for ; Tue, 5 Aug 2003 00:21:55 -0700 (PDT) Received: from memphis.mephi.ru (memphis.mephi.ru [194.67.67.234]) by mx1.FreeBSD.org (Postfix) with ESMTP id E03AE43FB1 for ; Tue, 5 Aug 2003 00:21:53 -0700 (PDT) (envelope-from timon@memphis.mephi.ru) Received: from [192.168.0.3] (ppp9-198.pppoe.mtu-net.ru [81.195.9.198]) (authenticated bits=0) by memphis.mephi.ru (8.12.6p2/8.12.6) with ESMTP id h757Lndr004953; Tue, 5 Aug 2003 11:21:50 +0400 (MSD) (envelope-from timon@memphis.mephi.ru) From: "Artem 'Zazoobr' Ignatjev" To: Rolf Grossmann In-Reply-To: <200308041304.h74D4u000654@isis.muc.progtech.intern> References: <200308041304.h74D4u000654@isis.muc.progtech.intern> Content-Type: text/plain Message-Id: <1060068108.643.10.camel@timon.nist> Mime-Version: 1.0 X-Mailer: Ximian Evolution 1.4.3 Date: 05 Aug 2003 11:21:48 +0400 Content-Transfer-Encoding: 7bit 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: Tue, 05 Aug 2003 07:21:55 -0000 On Mon, 04.08.2003, at 17:04, Rolf Grossmann wrote: > 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. Maybe server looks for those files in attic? as far as I understand logics of cvs update, it won't rub out your local changes - all you can get with cvs update are conflicts. Why not do cvs -n update -d, and then cvs update -d, or even cvs update -d -I your/changed/file1 -I another/changed/file, and then you can diff through this small (I suppose (: ) set of files -- Artem 'Zazoobr' Ignatjev