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

[Doug Barton]

On Fri, 2 May 2003, Dag-Erling Smorgrav wrote:

> 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...

I don't necessarily disagree with you, but I wanted people to have some
experience with it first. You can of course make it the default in your
mergemaster rc file if you choose.

> >   * 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?

mergemaster -v will give you the list. If you actually run that, you'll
see the problem I think. Too many files that actually do belong, but
aren't created by src/etc/Makefile (and therefore mergemaster doesn't
"know" about them). In order to make what you're suggesting really
worthwhile, mergemaster would have to grow a lot of knowledge about
specific files, and that knowledge would have to be maintained, dealt with
across upgrade boundaries, etc. This is something I've opposed in the past
for reasons I've articulated several times, and should be available in the
archives.

Doug

-- 

    This .signature sanitized for your protection