From owner-freebsd-stable@freebsd.org Thu Dec 24 02:02:00 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 E8D574B2642 for ; Thu, 24 Dec 2020 02:02:00 +0000 (UTC) (envelope-from jonc@chen.org.nz) Received: from mail-oi1-x22f.google.com (mail-oi1-x22f.google.com [IPv6:2607:f8b0:4864:20::22f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D1YGw0V6rz4mJH for ; Thu, 24 Dec 2020 02:01:59 +0000 (UTC) (envelope-from jonc@chen.org.nz) Received: by mail-oi1-x22f.google.com with SMTP id x13so1087561oic.5 for ; Wed, 23 Dec 2020 18:01:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chen-org-nz.20150623.gappssmtp.com; s=20150623; h=mime-version:from:date:message-id:subject:to; bh=UexQJWDRyY9LFn+Bxc2D2b9jQ6fxCAtTXZGVRldN2yI=; b=MnXC7EcGNOAxSXbyO4nsQ7hppHjOWZm+/jItZFVgCzaOWsmNd1iIJSWwiWY0F6bGBT WNO80ClHP7qWr/PCYgJY7ZR4FojbalPjlUudb9hdgfU9pezf6NRtgxVBh6pRl6Pt9KIg 7hyrX5BpK6fZ0nrEtgd40hbp0yRPSAfK4lfxknITFdrPe52QpK6nJBDeORW7WAZrZ2G8 ACUKXbZJz0R8yF1Ojd2Tks5Pn4kDW0LznWezpztozlF/QoEkk6rRoXBWKF3R97iZHEAm Z4TpflK+Wo1o8nJIfyh22tZff4QITN5KFk5wr3rEbL+8Rrrbeeq3mtia+t4dl0jqhuF9 wIrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=UexQJWDRyY9LFn+Bxc2D2b9jQ6fxCAtTXZGVRldN2yI=; b=QLaft0kkNWl7B0VQ4abh8ZjO4qVkDAZDR/C3E6ifx2JV9t1jonFHjvM2V0Pg184TTU o280/IVAU5jGO/S4S5WYuuVcU0NF1XbPqlhEhFU+OZPx+03mIh2PPfUZrnpQQpFfOoOc erNxAJ0KXdclSQ27DtbB0Sm70AOupng+Z9/76Ny5pTf3L0D53xIfrEa+AtLsvk/psqeQ QM0dara8FFRiN918QkU9CeKu9Sc13PUYk20FpbcuvBePEjwmbXFC3T3Ax6mlSFERmJUh Ctei1hmn+gU84/stAocAaSlF5eosJJMFDTYVfrNdRO7XQTWBVmldLiqK+zemzDl47JI0 aR6g== X-Gm-Message-State: AOAM531vQ3RDujUmx4JGq8bjTY7b7VnxEExgjuK25YIoQdxMKTmSvRjl hsT0RTuQDULZJEOzqPWWqx617XMOhjGvpW5ZnWuD99/SyhoLEffX X-Google-Smtp-Source: ABdhPJxjPSzQ5doCUXJa8R+8uF+3LJxYWMXzTIYV5qxl+iLNYbmBN9O+SB3VFon8kfWSkTjIeVl9GEU5lFjV07f5TEc= X-Received: by 2002:aca:f48c:: with SMTP id s134mr1637987oih.150.1608775317971; Wed, 23 Dec 2020 18:01:57 -0800 (PST) MIME-Version: 1.0 From: Jonathan Chen Date: Thu, 24 Dec 2020 15:01:42 +1300 Message-ID: Subject: git, $FreeBSD$ and mergemaster To: freebsd-stable@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4D1YGw0V6rz4mJH X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=pass header.d=chen-org-nz.20150623.gappssmtp.com header.s=20150623 header.b=MnXC7EcG; dmarc=none; spf=softfail (mx1.freebsd.org: 2607:f8b0:4864:20::22f is neither permitted nor denied by domain of jonc@chen.org.nz) smtp.mailfrom=jonc@chen.org.nz X-Spamd-Result: default: False [-0.53 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[chen-org-nz.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; SUBJECT_HAS_CURRENCY(1.00)[]; TO_DN_NONE(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::22f:from:127.0.2.255]; PREVIOUSLY_DELIVERED(0.00)[freebsd-stable@freebsd.org]; NEURAL_SPAM_SHORT(0.77)[0.766]; DKIM_TRACE(0.00)[chen-org-nz.20150623.gappssmtp.com:+]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::22f:from]; DMARC_NA(0.00)[chen.org.nz]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::22f:from]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[freebsd-stable] 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 02:02:01 -0000 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