> On Dec 23, 2020, at 9:04 PM, Kyle Evans <[email protected]> wrote: > > On Wed, Dec 23, 2020 at 8:02 PM Jonathan Chen <[email protected]> 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.
Is this a permanent change with git? I’d miss being able to see a path, date and some indication of revision in config files and anything else that’s text-based. Charles > Thanks, > > Kyle Evans > _______________________________________________ > [email protected] mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-stable > To unsubscribe, send any mail to "[email protected]" _______________________________________________ [email protected] mailing list https://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to "[email protected]"
