Date: Fri, 25 Dec 2020 21:32:06 +0000 From: bugzilla-noreply@freebsd.org To: bugs@FreeBSD.org Subject: [Bug 252132] mergemaster: needs to cope with empty $FreeBSD$ tags or /etc files must have $FreeBSD: number$ Message-ID: <bug-252132-227@https.bugs.freebsd.org/bugzilla/>
next in thread | raw e-mail | index | archive | help
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D252132 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@FreeBSD.org Reporter: Trond.Endrestol@ximalas.info The $FreeBSD$ keyword is empty after the conversion to Git. Now, mergemaste= r(8) has nothing to compare other than actual file content. Previously, users of "mergemaster -Fp" and "mergemaster -Fi" only merged fi= les when the $FreeBSD$ keyword differed. Now, we find ourselves constantly merg= ing files we have modified such as /etc/master.passwd and /etc/group. Please fix mergemaster(8) or consider assigning values to the $FreeBSD$ key= word 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. --=20 You are receiving this mail because: You are the assignee for the bug.=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-252132-227>