From owner-freebsd-hackers@FreeBSD.ORG Tue Aug 5 04:03:01 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 908BA37B401 for ; Tue, 5 Aug 2003 04:03:01 -0700 (PDT) Received: from ptserver.progtech.net (pD9E8B737.dip.t-dialin.net [217.232.183.55]) by mx1.FreeBSD.org (Postfix) with ESMTP id AA44743F3F for ; Tue, 5 Aug 2003 04:02:59 -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 h75B2pXo079795; Tue, 5 Aug 2003 13:02:56 +0200 (CEST) (envelope-from rg@PROGTECH.net) Message-ID: <3F2F8EC0.9000900@PROGTECH.net> Date: Tue, 05 Aug 2003 13:02:24 +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: "Artem 'Zazoobr' Ignatjev" References: <200308041304.h74D4u000654@isis.muc.progtech.intern> <1060068108.643.10.camel@timon.nist> In-Reply-To: <1060068108.643.10.camel@timon.nist> Content-Type: text/plain; charset=us-ascii; format=flowed 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 11:03:01 -0000 Hi, Artem 'Zazoobr' Ignatjev wrote: >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? > > Yes, it does. And rightfully so, because the given revision may still be present. However, I think it errs when it's not. >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 > Sorry, I think you didn't quite understand what I'm trying to achive. I'd like to get a diff of what has changed in the repository *before* I update my sources (and without making a copy of any files). Rolf