From owner-freebsd-current@FreeBSD.ORG Fri Jan 14 13:30:35 2005 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 40B2C16A4D9; Fri, 14 Jan 2005 13:30:35 +0000 (GMT) Received: from alpha.siliconlandmark.com (alpha.siliconlandmark.com [209.69.98.4]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3185843D45; Fri, 14 Jan 2005 13:30:31 +0000 (GMT) (envelope-from andy@siliconlandmark.com) Received: from alpha.siliconlandmark.com (andy@localhost [127.0.0.1]) j0EDUTsN049557; Fri, 14 Jan 2005 08:30:29 -0500 (EST) (envelope-from andy@siliconlandmark.com) Received: from localhost (andy@localhost)j0EDUQSo049554; Fri, 14 Jan 2005 08:30:29 -0500 (EST) (envelope-from andy@siliconlandmark.com) X-Authentication-Warning: alpha.siliconlandmark.com: andy owned process doing -bs Date: Fri, 14 Jan 2005 08:30:26 -0500 (EST) From: Andre Guibert de Bruet To: Peter Jeremy In-Reply-To: <20050112105034.GA51959@cirb503493.alcatel.com.au> Message-ID: <20050114082713.S49498@alpha.siliconlandmark.com> References: <16749.21420.643438.983797@ran.psg.com> <20041014121852.GB28875@samodelkin.net> <20050112105034.GA51959@cirb503493.alcatel.com.au> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed X-MailScanner-Information: Please contact the ISP for more information X-MailScanner: Found to be clean cc: FreeBSD Current cc: Anton Berezin Subject: Re: beating mergemaster to /etc/rc.d X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Jan 2005 13:30:35 -0000 On Wed, 12 Jan 2005, Peter Jeremy wrote: > On Wed, 2005-Jan-12 09:33:00 +0100, Anton Berezin wrote: >> A colleague of mine came up with an idea which I did not see before: >> >> Optionally, if CVS revisions are different, and CVS repository is >> available, fetch the file with the same revision as the installed one >> from CVS, and compare it with the installed one. If they are identical, >> mergemaster can safely assume that the file was not modified by hand and >> can therefore overwrite it without doing a diff loop hoop-la. > > I think this has been suggested before but you are the first person to > actually code it. Thank you. > > Note that there are still risks in blindly applying CVS changes. There > have been a couple of cases where defaults have changed meaning that > corresponding changes to local system configuration is required to > retain previous behaviour. One would have to use the -R flag to obtain this behavior. Blindly running mergemaster -i isn't going to be affected by this. If you follow the recommended system upgrade path, you would have read UPDATING before the installkernel and reboot anyway... ;) Cheers, Andy | Andre Guibert de Bruet | Enterprise Software Consultant > | Silicon Landmark, LLC. | http://siliconlandmark.com/ >