From owner-freebsd-hackers@FreeBSD.ORG Mon Jan 21 20:28:16 2008 Return-Path: Delivered-To: freebsd-hackers@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ABA8F16A418 for ; Mon, 21 Jan 2008 20:28:16 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mx21.fluidhosting.com [204.14.89.4]) by mx1.freebsd.org (Postfix) with SMTP id 54E0A13C467 for ; Mon, 21 Jan 2008 20:28:16 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: (qmail 2706 invoked by uid 399); 21 Jan 2008 20:28:14 -0000 Received: from localhost (HELO ?192.168.0.4?) (dougb@dougbarton.us@127.0.0.1) by localhost with ESMTP; 21 Jan 2008 20:28:14 -0000 X-Originating-IP: 127.0.0.1 Message-ID: <47950058.3050503@FreeBSD.org> Date: Mon, 21 Jan 2008 12:28:08 -0800 From: Doug Barton Organization: http://www.FreeBSD.org/ User-Agent: Thunderbird 2.0.0.9 (Windows/20071031) MIME-Version: 1.0 To: "Aryeh M. Friedman" References: <4794F175.5040708@gmail.com> In-Reply-To: <4794F175.5040708@gmail.com> X-Enigmail-Version: 0.95.6 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: freebsd-hackers@freebsd.org Subject: Re: cvs question X-BeenThere: freebsd-hackers@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Technical Discussions relating to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Jan 2008 20:28:16 -0000 Aryeh M. Friedman wrote: > I maintain a local repo of the via the cvs mode of cvsup. When I do a: What command did you use to check out the files, and what tree are you talking about? > cvs -q -d /home/ncvs update > > It will update any modified files but will not add any new files When you say "new files" do you really mean new directories? If a new directory is added to the tree, you need to use 'update -d' to get it in your working copy. Otherwise cvs will add new files in existing directories by default, so if that's not happening for you, something is wrong. > (it > removes stale ones), but if I do a checkout it overwrites my local > modifications... If that is actually happening, you've done something really wrong, since that is not what cvs does by default. I would suggest that you go into your working copy (checked out tree) and do 'cvs diff -u > ~/mytree.diff' and then wipe out what you had and check it out again. Then you can apply your diff as needed. You should also spend some time thoroughly reading the cvs man page. It's a fairly complex system, and it's easy to accidentally add a knob that will have hard to diagnose long-term effects. Doug -- This .signature sanitized for your protection