Date: Wed, 12 Jan 2005 12:59:54 +0100 From: Anton Berezin <tobez@FreeBSD.org> To: Peter Jeremy <PeterJeremy@optushome.com.au> Cc: FreeBSD Current <freebsd-current@FreeBSD.org> Subject: Re: beating mergemaster to /etc/rc.d Message-ID: <20050112115954.GB68344@heechee.tobez.org> In-Reply-To: <20050112105034.GA51959@cirb503493.alcatel.com.au> References: <16749.21420.643438.983797@ran.psg.com> <20041013101825.B19494-100000@moo.sysabend.org> <20041014121852.GB28875@samodelkin.net> <20050112083300.GB66718@heechee.tobez.org> <20050112105034.GA51959@cirb503493.alcatel.com.au>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, Jan 12, 2005 at 09:50:34PM +1100, 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. > 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. Yeah, the possibility to shoot yourself if the foot is always there. On the other hand, I would expect that 1) changes in defaults should be in UPDATING, and 2) most people qi<enter> such files (say, for /etc/defaults/rc.conf) without looking too closely into the actual diffs. \Anton. -- The moronity of the universe is a monotonically increasing function. -- Jarkko Hietaniemi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050112115954.GB68344>