From owner-freebsd-current@FreeBSD.ORG Wed Jan 12 11:59:56 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 A5DD316A4CE for ; Wed, 12 Jan 2005 11:59:56 +0000 (GMT) Received: from heechee.tobez.org (heechee.tobez.org [217.157.39.226]) by mx1.FreeBSD.org (Postfix) with ESMTP id D252443D48 for ; Wed, 12 Jan 2005 11:59:55 +0000 (GMT) (envelope-from tobez@tobez.org) Received: by heechee.tobez.org (Postfix, from userid 1001) id 3CA0F125465; Wed, 12 Jan 2005 12:59:54 +0100 (CET) Date: Wed, 12 Jan 2005 12:59:54 +0100 From: Anton Berezin To: Peter Jeremy Message-ID: <20050112115954.GB68344@heechee.tobez.org> Mail-Followup-To: Anton Berezin , Peter Jeremy , FreeBSD Current 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> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20050112105034.GA51959@cirb503493.alcatel.com.au> User-Agent: Mutt/1.4.2.1i cc: FreeBSD Current 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: Wed, 12 Jan 2005 11:59:56 -0000 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 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