Date: Thu, 24 Dec 2020 15:01:42 +1300 From: Jonathan Chen <jonc@chen.org.nz> To: freebsd-stable@freebsd.org Subject: git, $FreeBSD$ and mergemaster Message-ID: <CAJuc1zNmSJ_qcJSSEFnihE4aLNvjZKUVgFA8GKrymmJ38qSfDw@mail.gmail.com>
next in thread | raw e-mail | index | archive | help
Hi, With the transition to git, I'm now getting a lot of prompts for differences against an empty $FreeBSD$, eg: *** Displaying differences between installed version and ./.cshrc: --- /.cshrc 2020-09-03 19:14:19.258107000 +1200 +++ ./.cshrc 2020-12-24 14:52:16.751245000 +1300 @@ -1,4 +1,4 @@ -# $FreeBSD: stable/12/bin/csh/dot.cshrc 363525 2020-07-25 11:57:39Z pstef $ +# $FreeBSD$ # # .cshrc - csh resource script, read at beginning of execution by each shell # While I can simply run a "mergemaster -F" to get past this particular update, how will mergemaster operate in the future when there are changes in /etc if it can't inspect the $FreeBSD$ tag anymore? Cheers. -- Jonathan Chen <jonc@chen.org.nz>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAJuc1zNmSJ_qcJSSEFnihE4aLNvjZKUVgFA8GKrymmJ38qSfDw>