Date: Fri, 18 Feb 2011 08:25:49 -0500 From: Lowell Gilbert <freebsd-questions-local@be-well.ilk.org> To: David Demelier <demelier.david@gmail.com> Cc: freebsd-questions@freebsd.org Subject: Re: mergemaster -U ask for a lot non-user modified files Message-ID: <44ei75xyn6.fsf@be-well.ilk.org> In-Reply-To: <4D5CCB72.20505@gmail.com> (David Demelier's message of "Thu, 17 Feb 2011 08:17:06 %2B0100") References: <4D5CCB72.20505@gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
David Demelier <demelier.david@gmail.com> writes: > Hello, > > Each time I run mergemaster -UiF, it asks for a lot of file that I do > not have modified such as /dev/rc.d/* and /etc/defaults/* > > > ====================================================================== > > > Use 'd' to delete the temporary ./etc/network.subr > Use 'i' to install the temporary ./etc/network.subr > Use 'm' to merge the temporary and installed versions > Use 'v' to view the diff results again > > Default is to leave the temporary file to deal with by hand > > How should I deal with this? [Leave it for later] > > I never touched this file! Why it asks me to install the new one? You're probably having problems with the mtree database that mergemaster uses for that. I think by default it's /var/db/mergemaster.mtree.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?44ei75xyn6.fsf>