From owner-freebsd-stable@freebsd.org  Thu Dec 24 02:05:00 2020
Return-Path: <owner-freebsd-stable@freebsd.org>
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 D25174B344C
 for <freebsd-stable@mailman.nyi.freebsd.org>;
 Thu, 24 Dec 2020 02:05:00 +0000 (UTC)
 (envelope-from kevans@freebsd.org)
Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "smtp.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4D1YLN5d2rz4myH
 for <freebsd-stable@freebsd.org>; Thu, 24 Dec 2020 02:05:00 +0000 (UTC)
 (envelope-from kevans@freebsd.org)
Received: from mail-qk1-f180.google.com (mail-qk1-f180.google.com
 [209.85.222.180])
 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
 (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK))
 (Authenticated sender: kevans)
 by smtp.freebsd.org (Postfix) with ESMTPSA id ADA752C62C
 for <freebsd-stable@freebsd.org>; Thu, 24 Dec 2020 02:05:00 +0000 (UTC)
 (envelope-from kevans@freebsd.org)
Received: by mail-qk1-f180.google.com with SMTP id d14so1077792qkc.13
 for <freebsd-stable@freebsd.org>; Wed, 23 Dec 2020 18:05:00 -0800 (PST)
X-Gm-Message-State: AOAM531zxzJSbQyyuP4NWjAYhK4crJgg+bPN0jpBL/UPMqGJURGLS1Xp
 46Bv6Y/geH7qvKf8/ZKrmieRtYi1gonu0pB1KqQ=
X-Google-Smtp-Source: ABdhPJyAIMnKvbyHZ55DtSQpHEOrCD6IGr3iUXA4VJ+szu0owejNHIu4U7EP8VLb9sX9bYtdtCNV7SjKOhp+cMh1oZ4=
X-Received: by 2002:a37:b442:: with SMTP id d63mr525010qkf.430.1608775500376; 
 Wed, 23 Dec 2020 18:05:00 -0800 (PST)
MIME-Version: 1.0
References: <CAJuc1zNmSJ_qcJSSEFnihE4aLNvjZKUVgFA8GKrymmJ38qSfDw@mail.gmail.com>
In-Reply-To: <CAJuc1zNmSJ_qcJSSEFnihE4aLNvjZKUVgFA8GKrymmJ38qSfDw@mail.gmail.com>
From: Kyle Evans <kevans@freebsd.org>
Date: Wed, 23 Dec 2020 20:04:49 -0600
X-Gmail-Original-Message-ID: <CACNAnaHaNqXzGqzG0KaHJSc_K_9fDWCOaApm2K+G9uzKGKc5WQ@mail.gmail.com>
Message-ID: <CACNAnaHaNqXzGqzG0KaHJSc_K_9fDWCOaApm2K+G9uzKGKc5WQ@mail.gmail.com>
Subject: Re: git, $FreeBSD$ and mergemaster
To: Jonathan Chen <jonc@chen.org.nz>
Cc: FreeBSD-STABLE Mailing List <freebsd-stable@freebsd.org>
Content-Type: text/plain; charset="UTF-8"
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Production branch of FreeBSD source code <freebsd-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/freebsd-stable>, 
 <mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable/>
List-Post: <mailto:freebsd-stable@freebsd.org>
List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
 <mailto:freebsd-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 24 Dec 2020 02:05:00 -0000

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