From owner-freebsd-current@FreeBSD.ORG Wed Jan 12 10:50:37 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 9451B16A4CE; Wed, 12 Jan 2005 10:50:37 +0000 (GMT) Received: from mail07.syd.optusnet.com.au (mail07.syd.optusnet.com.au [211.29.132.188]) by mx1.FreeBSD.org (Postfix) with ESMTP id CDAC343D4C; Wed, 12 Jan 2005 10:50:36 +0000 (GMT) (envelope-from PeterJeremy@optushome.com.au) Received: from cirb503493.alcatel.com.au (c211-30-75-229.belrs2.nsw.optusnet.com.au [211.30.75.229]) j0CAoYsc020904 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO); Wed, 12 Jan 2005 21:50:35 +1100 Received: from cirb503493.alcatel.com.au (localhost.alcatel.com.au [127.0.0.1])j0CAoYxP052233; Wed, 12 Jan 2005 21:50:34 +1100 (EST) (envelope-from pjeremy@cirb503493.alcatel.com.au) Received: (from pjeremy@localhost)j0CAoYuE052232; Wed, 12 Jan 2005 21:50:34 +1100 (EST) (envelope-from pjeremy) Date: Wed, 12 Jan 2005 21:50:34 +1100 From: Peter Jeremy To: Anton Berezin Message-ID: <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> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20050112083300.GB66718@heechee.tobez.org> User-Agent: Mutt/1.4.2i 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 10:50:37 -0000 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