'make upgrade' needs updating

[Matthew Dillon]

:I run mergemaster occasionally because it catches files that
:make upgrade misses.  Today it misses about half a dozen or
:so, including aliases, ftpusers, /usr/Makefile, and maybe a
:few others I can't remember.
:
:Thanks.

    Well, we could add /usr/Makefile easily enough, that file is not 
    modified by the sysad.  ftpusers and aliases can be edited by the
    sysad so make upgrade can't just copy a new one in.

    I very explicitly do *NOT* want make upgrade to try to mess with
    files that are typically modified by the sysadmin.  However, there
    is no reason why it couldn't compare them and generate a warning at
    the end for files needing manual work.  It could even suggest running
    mergemaster :-)

    Would someone like to add /usr/Makefile and a basic compare/warning
    feature for the other files to make upgrade?

					-Matt
					Matthew Dillon 
					<dillon at backplane.com>