From owner-svn-src-all@FreeBSD.ORG  Thu Jun 18 07:40:53 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 969D8106566B;
	Thu, 18 Jun 2009 07:40:53 +0000 (UTC) (envelope-from des@des.no)
Received: from tim.des.no (tim.des.no [194.63.250.121])
	by mx1.freebsd.org (Postfix) with ESMTP id 55A748FC16;
	Thu, 18 Jun 2009 07:40:53 +0000 (UTC) (envelope-from des@des.no)
Received: from ds4.des.no (des.no [84.49.246.2])
	by smtp.des.no (Postfix) with ESMTP id A60246D41C;
	Thu, 18 Jun 2009 09:40:52 +0200 (CEST)
Received: by ds4.des.no (Postfix, from userid 1001)
	id 7DA27844E2; Thu, 18 Jun 2009 09:40:52 +0200 (CEST)
From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= <des@des.no>
To: Edwin Groothuis <edwin@FreeBSD.org>
References: <200906071326.n57DQvSG095104@svn.freebsd.org>
Date: Thu, 18 Jun 2009 09:40:52 +0200
In-Reply-To: <200906071326.n57DQvSG095104@svn.freebsd.org> (Edwin Groothuis's
	message of "Sun, 7 Jun 2009 13:26:57 +0000 (UTC)")
Message-ID: <86iqiudm63.fsf@ds4.des.no>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.92 (berkeley-unix)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
	src-committers@freebsd.org
Subject: Re: svn commit: r193635 - head/etc
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 18 Jun 2009 07:40:54 -0000

Edwin Groothuis <edwin@FreeBSD.org> writes:
> Author: edwin
> Date: Sun Jun  7 13:26:57 2009
> New Revision: 193635
> URL: http://svn.freebsd.org/changeset/base/193635
>
> Log:
>   Welcome to a default installed /etc/ntp.conf

Great, now mergemaster blew away my ntp.conf and installed this one
instead.  Apparently, it thinks AUTO_UPGRADE means it's fine to
overwrite an existing file with a new one...

DES
--=20
Dag-Erling Sm=C3=B8rgrav - des@des.no