Date: Fri, 14 Jan 2005 08:30:26 -0500 (EST) From: Andre Guibert de Bruet <andy@siliconlandmark.com> To: Peter Jeremy <PeterJeremy@optushome.com.au> Cc: Anton Berezin <tobez@freebsd.org> Subject: Re: beating mergemaster to /etc/rc.d Message-ID: <20050114082713.S49498@alpha.siliconlandmark.com> In-Reply-To: <20050112105034.GA51959@cirb503493.alcatel.com.au> References: <16749.21420.643438.983797@ran.psg.com> <20041014121852.GB28875@samodelkin.net> <20050112105034.GA51959@cirb503493.alcatel.com.au>
next in thread | previous in thread | raw e-mail | index | archive | help
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/ >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050114082713.S49498>