From owner-freebsd-hackers Wed Dec 5 12:33:49 2001 Delivered-To: freebsd-hackers@freebsd.org Received: from dragon.nuxi.com (trang.nuxi.com [66.92.13.169]) by hub.freebsd.org (Postfix) with ESMTP id 453EE37B405 for ; Wed, 5 Dec 2001 12:33:48 -0800 (PST) Received: (from obrien@localhost) by dragon.nuxi.com (8.11.6/8.11.1) id fB5KXaC00653; Wed, 5 Dec 2001 12:33:36 -0800 (PST) (envelope-from obrien) Date: Wed, 5 Dec 2001 12:33:36 -0800 From: "David O'Brien" To: remy@boostworks.com Cc: hackers@freebsd.org Subject: Re: How to handle replaced files in repos ? Message-ID: <20011205123336.A96803@dragon.nuxi.com> Reply-To: obrien@freebsd.org References: <200112051948.fB5JmM698533@luxren2.boostworks.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <200112051948.fB5JmM698533@luxren2.boostworks.com>; from remy@boostworks.com on Wed, Dec 05, 2001 at 08:48:19PM +0100 X-Operating-System: FreeBSD 5.0-CURRENT Organization: The NUXI BSD group X-Pgp-Rsa-Fingerprint: B7 4D 3E E9 11 39 5F A3 90 76 5D 69 58 D9 98 7A X-Pgp-Rsa-Keyid: 1024/34F9F9D5 Sender: owner-freebsd-hackers@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Wed, Dec 05, 2001 at 08:48:19PM +0100, remy@boostworks.com wrote: > Aside from manually re-adding local changes, is there a way to avoid > cvsup to replace files (that have been manually changed in the FreeBSD > repos) when there are local branches ? Yes, somewhat. Have you read http://www.polstra.com/projects/freeware/CVSup/faq.html#canilocal To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-hackers" in the body of the message