Date: Mon, 04 Jan 2021 23:12:50 +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-48H01xOgZH@https.bugs.freebsd.org/bugzilla/> In-Reply-To: <bug-252132-227@https.bugs.freebsd.org/bugzilla/> References: <bug-252132-227@https.bugs.freebsd.org/bugzilla/>
next in thread | previous in thread | raw e-mail | index | archive | help
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D252132 Marek Zarychta <zarychtam@plan-b.pwste.edu.pl> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |zarychtam@plan-b.pwste.edu. | |pl --- Comment #2 from Marek Zarychta <zarychtam@plan-b.pwste.edu.pl> --- (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/smu= dge 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 --=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-48H01xOgZH>