Bug 192577 - Allow user of 'mergemaster' to automatically install files that differ only in comments
Summary: Allow user of 'mergemaster' to automatically install files that differ only i...
Status: Open
Alias: None
Product: Base System
Classification: Unclassified
Component: misc (show other bugs)
Version: 10.0-STABLE
Hardware: Any Any
: --- Affects Many People
Assignee: Nikolai Lifanov
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-08-11 11:09 UTC by Yuri Victorovich
Modified: 2018-08-14 16:43 UTC (History)
2 users (show)

See Also:


Attachments
patch (3.97 KB, patch)
2014-08-11 11:09 UTC, Yuri Victorovich
no flags Details | Diff
auto install if only change is $FreeBSD: ...$ lines. (1.22 KB, patch)
2018-08-14 13:15 UTC, Wall
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Yuri Victorovich freebsd_committer 2014-08-11 11:09:22 UTC
Created attachment 145658 [details]
patch

Makefile recommends to always run mergemaster after system update from source.
However, there are often a lot of files only having minor differences in comments. For example, those only with the change in $FreeBSD: xxx template. Such files require the user to choose 'i' again and again, often many times.

The attached patch solves this problem. It offers the user the new option 'a', which would automatically accept all further files that differ only in comments.
Comment 1 Eitan Adler freebsd_committer freebsd_triage 2018-05-28 19:41:27 UTC
batch change:

For bugs that match the following
-  Status Is In progress 
AND
- Untouched since 2018-01-01.
AND
- Affects Base System OR Documentation

DO:

Reset to open status.


Note:
I did a quick pass but if you are getting this email it might be worthwhile to double check to see if this bug ought to be closed.
Comment 2 Wall 2018-08-14 13:13:03 UTC
After going through dozens of files with only the $FreeBSD:..$ line different, I have to second this suggestion.  Since comment types can differ by file, even just checking for the $FreeBSD tag would be an improvement.
Comment 3 Wall 2018-08-14 13:15:31 UTC
Created attachment 196193 [details]
auto install if only change is $FreeBSD: ...$ lines.
Comment 4 Yuri Victorovich freebsd_committer 2018-08-14 16:43:50 UTC
Somehow, this patch never received any attention. And the problem is obviously still there.