mergemaster -U ask for a lot non-user modified files
freebsd-questions-local at be-well.ilk.org
Fri Feb 18 13:25:52 UTC 2011
David Demelier <demelier.david at gmail.com> writes:
> 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.
More information about the freebsd-questions