[Bug 252132] mergemaster: needs to cope with empty $FreeBSD$ tags or /etc files must have $FreeBSD: number$

[bugzilla-noreply at freebsd.org]

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=252132

            Bug ID: 252132
           Summary: mergemaster: needs to cope with empty $FreeBSD$ tags
                    or /etc files must have $FreeBSD: number$
           Product: Base System
           Version: CURRENT
          Hardware: Any
                OS: Any
            Status: New
          Severity: Affects Only Me
          Priority: ---
         Component: bin
          Assignee: bugs at FreeBSD.org
          Reporter: Trond.Endrestol at ximalas.info

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.

-- 
You are receiving this mail because:
You are the assignee for the bug.