From owner-freebsd-current Mon Dec 16 18:05:25 1996 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.4/8.8.4) id SAA24755 for current-outgoing; Mon, 16 Dec 1996 18:05:25 -0800 (PST) Received: from phaeton.artisoft.com (phaeton.Artisoft.COM [198.17.250.211]) by freefall.freebsd.org (8.8.4/8.8.4) with SMTP id SAA24748 for ; Mon, 16 Dec 1996 18:05:22 -0800 (PST) Received: (from terry@localhost) by phaeton.artisoft.com (8.6.11/8.6.9) id TAA07434; Mon, 16 Dec 1996 19:03:52 -0700 From: Terry Lambert Message-Id: <199612170203.TAA07434@phaeton.artisoft.com> Subject: Re: cvsup clobbering local changes To: moke@fools.ecpnet.com (Jimbo Bahooli) Date: Mon, 16 Dec 1996 19:03:52 -0700 (MST) Cc: freebsd-current@freebsd.org In-Reply-To: from "Jimbo Bahooli" at Dec 16, 96 06:51:41 pm X-Mailer: ELM [version 2.4 PL24] MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: owner-current@freebsd.org X-Loop: FreeBSD.org Precedence: bulk > Cvsup here clobbers all my local changes, even with the delete key taken > out. Is there a way I can get it to stop doing this, or better yet is > there a read-only cvs account that freebsd users can use? You need to set a local tag before you make local changes. Otherwise, your local changes will occur on the defualt tag, which is the one -current is using. If they conflict with yours, theirs wins. Terry Lambert terry@lambert.org --- Any opinions in this posting are my own and not those of my present or previous employers.