Date: Tue, 05 Aug 2003 13:02:24 +0200 From: Rolf Grossmann <rg@progtech.net> To: "Artem 'Zazoobr' Ignatjev" <timon@memphis.mephi.ru> Cc: freebsd-hackers@freebsd.org Subject: Re: Using CVS diff to find out what has changed, including new files Message-ID: <3F2F8EC0.9000900@PROGTECH.net> In-Reply-To: <1060068108.643.10.camel@timon.nist> References: <200308041304.h74D4u000654@isis.muc.progtech.intern> <1060068108.643.10.camel@timon.nist>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3F2F8EC0.9000900>