From owner-freebsd-hackers@FreeBSD.ORG Mon Jan 21 20:35:45 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 1878516A419 for ; Mon, 21 Jan 2008 20:35:45 +0000 (UTC) (envelope-from aryeh.friedman@gmail.com) Received: from py-out-1112.google.com (py-out-1112.google.com [64.233.166.183]) by mx1.freebsd.org (Postfix) with ESMTP id CEACF13C4F4 for ; Mon, 21 Jan 2008 20:35:44 +0000 (UTC) (envelope-from aryeh.friedman@gmail.com) Received: by py-out-1112.google.com with SMTP id u52so3163323pyb.10 for ; Mon, 21 Jan 2008 12:35:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from:user-agent:mime-version:to:cc:subject:references:in-reply-to:x-enigmail-version:content-type:content-transfer-encoding; bh=5Hkismi3plTZcM9NBH+nQKMSDZ68fMENrQzrXgq4EOo=; b=ayKWBJ7tcqN1oqqfTZVFwGJyK6vwVLkvaLz1Vl6rcul04EhIw0iB2JPfNLDKPaiL5XKePdm/riNl8gWIw0YmlvAi5kMFsSSvO21OGJvmRwIwZD+DbSq3DHIYMNqAS5B9IfEcewmdBSO/xPkUH7pTtpfnfYiAsJmCid5Rob2Sk8M= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject:references:in-reply-to:x-enigmail-version:content-type:content-transfer-encoding; b=HnP3qSP01jVVccjqhgglPBhVDKxXcMQzlcBvBPIh+QHAwKYXEwpt9/H7hoP+DLBnz814OkHeTkyMqxKXarNMaEVqrROE1Rohw8kYQCEEKOogZ5hYXB5bY5zZaX9PnM7FcyXoV7gPXitgqskcNMaSaipsdSEhFcK9umgXI+ja6+4= Received: by 10.65.241.20 with SMTP id t20mr15703187qbr.88.1200947743713; Mon, 21 Jan 2008 12:35:43 -0800 (PST) Received: from flosoft.no-ip.biz ( [67.85.89.184]) by mx.google.com with ESMTPS id f14sm5906956qba.25.2008.01.21.12.35.43 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 21 Jan 2008 12:35:43 -0800 (PST) Message-ID: <4795021E.8070506@gmail.com> Date: Mon, 21 Jan 2008 15:35:42 -0500 From: "Aryeh M. Friedman" User-Agent: Thunderbird 2.0.0.9 (X11/20080117) MIME-Version: 1.0 To: Doug Barton References: <4794F175.5040708@gmail.com> <47950058.3050503@FreeBSD.org> In-Reply-To: <47950058.3050503@FreeBSD.org> X-Enigmail-Version: 0.95.5 Content-Type: text/plain; charset=ISO-8859-1 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:35:45 -0000 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Doug Barton wrote: > 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? cvsup -h cvsup9.us.freebsd.org /usr/share/examples/cvsup/cvs-supfile cd /usr/src cvs -q -d /home/ncvs update cd /usr/ports cvs -q -d /home/ncvs update The problem showed up specifically when the above failed to add src/sys/dev/sf/* but the makefiles where updated to ref it. > >> 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. Someone one else suggested adding the -d and it seems to work fine. > >> (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. Here goes the entire setup procedure I used (it is the very first thing I did on the machine after installing the base system [from dist cd]): pkg_add -r cvsup-without-gui mkdir /home/ncvs cvsup -h cvsup9.us.freebsd.org /usr/share/examples/cvsup/cvs-supfile cd /usr cvs -q -d /home/ncvs checkout src ports doc www pkg_delete cvsup-without-gui (I later re-add as a port not as a package) > > 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 > -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.4 (FreeBSD) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFHlQIdQi2hk2LEXBARAjfhAKCMj+XNILXAI+KuV62qf7N0slFGIQCeOl6+ XnUFkDi9kyVc/cFxbE9TvpY= =eSyb -----END PGP SIGNATURE-----