Bug 252132 - mergemaster: needs to cope with empty $FreeBSD$ tags or /etc files must have $FreeBSD: number$
Summary: mergemaster: needs to cope with empty $FreeBSD$ tags or /etc files must have ...
Status: New
Alias: None
Product: Base System
Classification: Unclassified
Component: bin (show other bugs)
Version: CURRENT
Hardware: Any Any
: --- Affects Many People
Assignee: freebsd-bugs (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2020-12-25 21:32 UTC by Trond.Endrestol
Modified: 2021-01-07 13:48 UTC (History)
6 users (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Trond.Endrestol 2020-12-25 21:32:06 UTC
The $FreeBSD$ keyword is empty after the conversion to Git. Now, mergemaster(8) has nothing to compare other than actual file content.

Previously, users of "mergemaster -Fp" and "mergemaster -Fi" only merged files when the $FreeBSD$ keyword differed. Now, we find ourselves constantly merging files we have modified such as /etc/master.passwd and /etc/group.

Please fix mergemaster(8) or consider assigning values to the $FreeBSD$ keyword for files belonging in /etc. Maybe it can be as simple as "$FreeBSD: number$" where "number" must be incremented before running "git commit".

Finally, maybe it's time we all moved to etcupdate(8). Please advise the community.
Comment 1 Anton Saietskii 2021-01-04 14:16:16 UTC
Yep, mergemaster became almost completely useless without keywords. This should be considered as POLA violation.
Comment 2 Marek Zarychta 2021-01-04 23:12:50 UTC
(In reply to Anton Saietskii from comment #1)

No worries. I was told that mergemaster(8) is on its way out, but
$FreeBSD$ IDs can be regenerated in the local Git repository with clean/smudge filters. With them applied, "mergemaster -UFi" still works fine and also the administrator is able to better track the updates.

More info on configuring the filters can be found here:
https://git-scm.com/book/en/v2/Customizing-Git-Git-Attributes