Date: Wed, 12 Jan 2005 21:50:34 +1100 From: Peter Jeremy <PeterJeremy@optushome.com.au> To: Anton Berezin <tobez@FreeBSD.org> Cc: FreeBSD Current <freebsd-current@FreeBSD.org> Subject: Re: beating mergemaster to /etc/rc.d Message-ID: <20050112105034.GA51959@cirb503493.alcatel.com.au> In-Reply-To: <20050112083300.GB66718@heechee.tobez.org> References: <16749.21420.643438.983797@ran.psg.com> <20041013101825.B19494-100000@moo.sysabend.org> <20041014121852.GB28875@samodelkin.net> <20050112083300.GB66718@heechee.tobez.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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. -- Peter Jeremy
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050112105034.GA51959>