Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 05 Jul 2009 12:07:18 +0200
From:      "Ian Freislich" <ianf@clue.co.za>
To:        current@freebsd.org
Subject:   pebkac, but is it a mergemaster bug?
Message-ID:  <E1MNOcw-0001uh-K3@clue.co.za>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1MNOcw-0001uh-K3>