cvs commit: src/usr.sbin/mergemaster mergemaster.sh

[Dag-Erling Smorgrav]

Doug Barton <dougb at FreeBSD.org> writes:
>   * Add a -P (Preserve) option, which saves a copy of files that you replace.
>   The idea for this option came from Marc Schneiders <marc at schneiders.org>

This should be the default...

>   * Replace the above with a check for elements of the old rc system.
>   Offer to move these files out of DESTDIR/etc for the user's convenience.

How about a more generic mechanism that lists files which exist in
DESTDIR but not in TEMPROOT and offers to remove / rename them?

DES
-- 
Dag-Erling Smorgrav - des at ofug.org