From owner-freebsd-questions@FreeBSD.ORG  Sat Apr 25 10:10:45 2009
Return-Path: <owner-freebsd-questions@FreeBSD.ORG>
Delivered-To: freebsd-questions@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9A90C106566B
	for <freebsd-questions@freebsd.org>;
	Sat, 25 Apr 2009 10:10:45 +0000 (UTC)
	(envelope-from peter.schuller@infidyne.com)
Received: from hyperion.scode.org (cl-1361.ams-04.nl.sixxs.net
	[IPv6:2001:960:2:550::2])
	by mx1.freebsd.org (Postfix) with ESMTP id 5EB008FC08
	for <freebsd-questions@freebsd.org>;
	Sat, 25 Apr 2009 10:10:45 +0000 (UTC)
	(envelope-from peter.schuller@infidyne.com)
Received: from hyperion.scode.org (hyperion.scode.org [85.17.42.115])
	by hyperion.scode.org (Postfix) with ESMTPS id BA1E023C503
	for <freebsd-questions@freebsd.org>;
	Sat, 25 Apr 2009 12:10:43 +0200 (CEST)
Date: Sat, 25 Apr 2009 12:10:42 +0200
From: Peter Schuller <peter.schuller@infidyne.com>
To: freebsd-questions@freebsd.org
Message-ID: <20090425101042.GA48343@hyperion.scode.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="SLDf9lqlvOQaIe6s"
Content-Disposition: inline
User-Agent: Mutt/1.5.19 (2009-01-05)
Subject: mergemaster -U overwriting modified files
X-BeenThere: freebsd-questions@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: User questions <freebsd-questions.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>, 
	<mailto:freebsd-questions-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-questions>
List-Post: <mailto:freebsd-questions@freebsd.org>
List-Help: <mailto:freebsd-questions-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>, 
	<mailto:freebsd-questions-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 25 Apr 2009 10:10:45 -0000


--SLDf9lqlvOQaIe6s
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

I recently began testing mergemaster -U since the perpetual "review
diff of file I never touched" grows annoying real quick.

Unfortunately I recently discovered that it does not seem to do what
you might expect. For example it nuked my mailer.conf on one machine,
and my /etc/namedb/named.conf (!!!) on another machine.

Is this a bug or intended? What is the intended functionality of -U?

--=20
/ Peter Schuller

PGP userID: 0xE9758B7D or 'Peter Schuller <peter.schuller@infidyne.com>'
Key retrieval: Send an E-Mail to getpgpkey@scode.org
E-Mail: peter.schuller@infidyne.com Web: http://www.scode.org


--SLDf9lqlvOQaIe6s
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.11 (FreeBSD)

iEYEARECAAYFAkny4aIACgkQDNor2+l1i3262wCgzbfOaGvRfMOCzKJSKlpk06aE
UXcAoO6H5JhfHrWP/YE8CLwAlmScIl4P
=XJvv
-----END PGP SIGNATURE-----

--SLDf9lqlvOQaIe6s--