Date: Mon, 27 Apr 2009 15:33:21 +0700 From: Victor Sudakov <sudakov@sibptus.tomsk.ru> To: freebsd-questions@freebsd.org Subject: Re: mergemaster -U overwriting modified files Message-ID: <20090427083321.GA20534@admin.sibptus.tomsk.ru> 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
Peter Schuller 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? It may be useful, prior to running "mergemaster -U", to run mtree -eq -f /var/db/mergemaster.mtree -p / | grep changed to see what mergemaster considers changed. -- Victor Sudakov, VAS4-RIPE, VAS47-RIPN sip:sudakov@sibptus.tomsk.ru
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090427083321.GA20534>