freebsd-skq/usr.sbin/mergemaster
Doug Barton 1b2aeedc64 Over time things that used to be files/directories/links can change
to something else. So add code to detect when things don't match and
give the user choices about how to fix it.

If we're using -P and something in the above check needs to be moved
we need to have the directory there for it, so create it at the
beginning and delete empty versions of it at the end.

The case where something used to be a file or link and now is supposed
to be a directory (e.g., /etc/security) is especially dangerous, so
make failure to install a necessary directory in $DESTDIR a fatal error.
2009-12-12 02:19:41 +00:00
..
Makefile
mergemaster.8 Don't tempt svn to expand the example $FreeBSD strings 2009-03-23 14:42:41 +00:00
mergemaster.sh Over time things that used to be files/directories/links can change 2009-12-12 02:19:41 +00:00