Date: Sat, 25 Apr 2009 12:10:42 +0200 From: Peter Schuller <peter.schuller@infidyne.com> To: freebsd-questions@freebsd.org Subject: mergemaster -U overwriting modified files Message-ID: <20090425101042.GA48343@hyperion.scode.org>
next in thread | raw e-mail | index | archive | help
--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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090425101042.GA48343>