Date: Sat, 25 Apr 2009 12:28:25 +0100 From: Bruce Cran <bruce@cran.org.uk> To: Peter Schuller <peter.schuller@infidyne.com> Cc: freebsd-questions@freebsd.org Subject: Re: mergemaster -U overwriting modified files Message-ID: <20090425122825.2cc0b090@gluon.draftnet> In-Reply-To: <20090425101042.GA48343@hyperion.scode.org> References: <20090425101042.GA48343@hyperion.scode.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sat, 25 Apr 2009 12:10:42 +0200 Peter Schuller <peter.schuller@infidyne.com> wrote: > 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? > I noticed this recently too: after using mergemaster -U without problems for a long time it suddenly went and overwrote named.conf on a recently upgrade of 7-STABLE. -- Bruce Cran
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090425122825.2cc0b090>