From owner-freebsd-stable Sun Mar 29 19:41:54 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id TAA07427 for freebsd-stable-outgoing; Sun, 29 Mar 1998 19:41:54 -0800 (PST) (envelope-from owner-freebsd-stable@FreeBSD.ORG) Received: from austin.polstra.com (austin.polstra.com [206.213.73.10]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id TAA07010 for ; Sun, 29 Mar 1998 19:40:11 -0800 (PST) (envelope-from jdp@austin.polstra.com) Received: from austin.polstra.com (jdp@localhost) by austin.polstra.com (8.8.8/8.8.8) with ESMTP id JAA15886; Sun, 29 Mar 1998 09:05:15 -0800 (PST) (envelope-from jdp) Message-Id: <199803291705.JAA15886@austin.polstra.com> To: freebsd@bug.fe.up.pt Subject: Re: Staying -STABLE with make world In-Reply-To: References: Organization: Polstra & Co., Seattle, WA Cc: stable@FreeBSD.ORG Date: Sun, 29 Mar 1998 09:05:15 -0800 From: John Polstra Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk In article , wrote: > 2. If I customize any file in the tree that will be updated > by CVSup what will happen if that file must be changed by > the cvsup program? Can it merge the new version with the > one I've changed? If not what will happen? It won't merge the changes -- it will simply overwrite the file. (Maybe that will improve in a future version of CVSup.) However, you can set up a "refuse" file listing the areas that you don't want CVSup to touch. See cvsup(1) for details. If you do a lot of customization and have enough disk space, you might be better off CVSupping the CVS repository. Then check out your sources from there using CVS. CVS is able to merge changes in the way you describe. John -- John Polstra jdp@polstra.com John D. Polstra & Co., Inc. Seattle, Washington USA "Self-knowledge is always bad news." -- John Barth To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message