svn commit: r334617 - in head: . etc

[Eugene Grosbein]

06.06.2018 2:28, Konstantin Belousov wrote:

>> I found that "mergemaster -iFUP" deals with unchanged files including mentioned rc* scripts just fine.
>> That is, it automatically refreshes unchanged files without any silly questions just for change of $FreeBSD$.
> 
> No, you missed the point.  Whatever nice is the handling of unchanged files,
> use of mergemaster forces me to handle changed files, which is exactly
> what I do not want/need to do.  Yes, I update crashboxes very often, and
> I want to get all new code, including the startup scripts, when I update.

"Changed" means "local copy changed by hands", not "changed in the repository".
"mergemaster -iFUP" installs all new changes from the repo without questions for files
untouched locally since last invocation of such mergemaster, so you get what you want :-)