From owner-freebsd-current@FreeBSD.ORG  Sun Jul  5 10:07:24 2009
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: current@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CEE8D106564A
	for <current@freebsd.org>; Sun,  5 Jul 2009 10:07:24 +0000 (UTC)
	(envelope-from ianf@clue.co.za)
Received: from inbound01.jnb1.gp-online.net (inbound01.jnb1.gp-online.net
	[41.161.16.135])
	by mx1.freebsd.org (Postfix) with ESMTP id EBD018FC08
	for <current@freebsd.org>; Sun,  5 Jul 2009 10:07:23 +0000 (UTC)
	(envelope-from ianf@clue.co.za)
Received: from [41.145.103.163] (helo=clue.co.za)
	by inbound01.jnb1.gp-online.net with esmtpsa
	(TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.63)
	(envelope-from <ianf@clue.co.za>) id 1MNOcy-0006Hv-5i
	for current@freebsd.org; Sun, 05 Jul 2009 12:07:20 +0200
Received: from localhost ([127.0.0.1] helo=clue.co.za)
	by clue.co.za with esmtp (Exim 4.69 (FreeBSD))
	(envelope-from <ianf@clue.co.za>) id 1MNOcw-0001uh-K3
	for current@freebsd.org; Sun, 05 Jul 2009 12:07:18 +0200
To: current@freebsd.org
From: "Ian Freislich" <ianf@clue.co.za>
X-Attribution: BOFH
Date: Sun, 05 Jul 2009 12:07:18 +0200
Message-Id: <E1MNOcw-0001uh-K3@clue.co.za>
Cc: 
Subject: pebkac, but is it a mergemaster bug?
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Jul 2009 10:07:25 -0000

Hi

Due to not paying attention my ntp.conf on several of my time servers
was updated (and broken) by mergemaster.  I had the automatic update
options set for files that I had not modified.  My ntp.conf had no
VCS id and the files differed, obviously.

Was mergemaster correct in its assesment that this file was a
candidate for automatic installation?

	-U	Attempt to auto upgrade files that have not been 
		user modified

Ian

--
Ian Freislich