From owner-freebsd-stable@freebsd.org Thu Dec 24 04:38:42 2020 Return-Path: Delivered-To: freebsd-stable@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DF37C4B6E34 for ; Thu, 24 Dec 2020 04:38:42 +0000 (UTC) (envelope-from spork@bway.net) Received: from smtp1.bway.net (smtp1.bway.net [216.220.96.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4D1clk5vP8z4vqm; Thu, 24 Dec 2020 04:38:42 +0000 (UTC) (envelope-from spork@bway.net) Received: from gaseousweiner.sporklab.com (pool-98-109-63-188.nwrknj.fios.verizon.net [98.109.63.188]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: spork@bway.net) by smtp1.bway.net (Postfix) with ESMTPSA id 46B0195854; Wed, 23 Dec 2020 23:38:41 -0500 (EST) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 12.4 \(3445.104.17\)) Subject: Re: git, $FreeBSD$ and mergemaster From: Charles Sprickman In-Reply-To: Date: Wed, 23 Dec 2020 23:38:40 -0500 Cc: FreeBSD-STABLE Mailing List X-Mao-Original-Outgoing-Id: 630477520.646034-166048e383b2f87d213274844c1527c6 Content-Transfer-Encoding: quoted-printable Message-Id: <4B681053-11E5-48CD-85A4-F19CF4BC10B9@bway.net> References: To: Kyle Evans X-Mailer: Apple Mail (2.3445.104.17) X-Rspamd-Queue-Id: 4D1clk5vP8z4vqm X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Dec 2020 04:38:42 -0000 > On Dec 23, 2020, at 9:04 PM, Kyle Evans wrote: >=20 > On Wed, Dec 23, 2020 at 8:02 PM Jonathan Chen = wrote: >>=20 >> Hi, >>=20 >> With the transition to git, I'm now getting a lot of prompts for >> differences against an empty $FreeBSD$, eg: >>=20 >> *** Displaying differences between installed version and ./.cshrc: >>=20 >> --- /.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 >> # >>=20 >> 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? >>=20 >=20 > 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=E2=80=99d miss being able to see = a path, date and some indication of revision in config files and anything else that=E2=80=99s text-based. Charles > Thanks, >=20 > Kyle Evans > _______________________________________________ > freebsd-stable@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-stable > To unsubscribe, send any mail to = "freebsd-stable-unsubscribe@freebsd.org"