Date: Wed, 23 Dec 2020 20:04:49 -0600 From: Kyle Evans <kevans@freebsd.org> To: Jonathan Chen <jonc@chen.org.nz> Cc: FreeBSD-STABLE Mailing List <freebsd-stable@freebsd.org> Subject: Re: git, $FreeBSD$ and mergemaster Message-ID: <CACNAnaHaNqXzGqzG0KaHJSc_K_9fDWCOaApm2K%2BG9uzKGKc5WQ@mail.gmail.com> In-Reply-To: <CAJuc1zNmSJ_qcJSSEFnihE4aLNvjZKUVgFA8GKrymmJ38qSfDw@mail.gmail.com> References: <CAJuc1zNmSJ_qcJSSEFnihE4aLNvjZKUVgFA8GKrymmJ38qSfDw@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, Dec 23, 2020 at 8:02 PM Jonathan Chen <jonc@chen.org.nz> wrote: > > 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? > mergemaster only uses it as an optimization, if they're unexpanded throughout then it falls back to diff(1) -- i.e. it's slower without. Thanks, Kyle Evans
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CACNAnaHaNqXzGqzG0KaHJSc_K_9fDWCOaApm2K%2BG9uzKGKc5WQ>