David Demelier <demelier.da...@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. _______________________________________________ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to "freebsd-questions-unsubscr...@freebsd.org"
