Date: Sun, 26 Apr 2009 14:50:39 -0500 From: Jeffrey Goldberg <jeffrey@goldmark.org> To: Peter Schuller <peter.schuller@infidyne.com> Cc: freebsd-questions@freebsd.org Subject: Re: mergemaster -U overwriting modified files Message-ID: <4E42E0A5-E8BB-4482-9EDE-F05F1E76186E@goldmark.org> 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 Apr 25, 2009, at 5:10 AM, Peter Schuller wrote: > 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. Me, too. I lost exactly those two files during recent updates on two machines, using -Ui to mergemaster. After restoring them from back-up, I've added them to the exclude list in mergemaster.rc as IGNORE_FILES='/etc/motd /etc/namedb/named.conf /etc/mail/mailer.conf' Until I saw your post and the other responses, I had just assumed that I'd been somehow careless when running mergemaster. But now it looks like a bug. I've been using -Ui for mergemaster for a while now, but only seem to have experienced this problem recently. Cheers, -j -- Jeffrey Goldberg http://www.goldmark.org/jeff/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4E42E0A5-E8BB-4482-9EDE-F05F1E76186E>