From owner-freebsd-stable@freebsd.org Fri Dec 25 09:01:15 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 7A6404BB933 for ; Fri, 25 Dec 2020 09:01:15 +0000 (UTC) (envelope-from jonc@chen.org.nz) Received: from mail-ot1-x336.google.com (mail-ot1-x336.google.com [IPv6:2607:f8b0:4864:20::336]) (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 4D2LXB3T2mz4hZ2 for ; Fri, 25 Dec 2020 09:01:13 +0000 (UTC) (envelope-from jonc@chen.org.nz) Received: by mail-ot1-x336.google.com with SMTP id x13so3512830oto.8 for ; Fri, 25 Dec 2020 01:01:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chen-org-nz.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=sA3v2ZxuDEOEJyMA40r2WMJX+oADg5hLNw0EhfPnyMM=; b=OaUP6/f2VQbzFta7kVFClW3Vh3huQZccdlOqrvTkDlNv8sa6C2btoc3uTBEVfo5XCA KyBUpyzBwBoWk44tySmoBu8yomxIuaVOQJq1Ba9I8LtrXFxpo6nW8r8o84cLsJGrOhRv sREMPofmQX2tmuLGeVD8vYgCTcr8q82sKyb9SUnYS2G8zR/l27ntuVxnKD8MpqbA3/Qr ESjxNxilBisNEo3uL6Gu83jdeYpUIB6CRWycirJGrb2sidrPCZVsStmk7NieFuO8Qqgv B0Mu72mPBqprrte9ljR0L0zeiICMIFZKAbJISIh0G2azwV0hypq07GYmodKmbIw2hf3Y lCWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=sA3v2ZxuDEOEJyMA40r2WMJX+oADg5hLNw0EhfPnyMM=; b=gmi201ZOQJpS0PHo1hqBcAIKSyx0v8Bu+A22PEhn6BKQD25TpArFeKtMDFjN1J93ro aEVgOiU8tnqKF2INWHRYEHTy5xRk1r+8aQx8Njv8EGZPCGJjKud5CmSZLAB6Ku+YiN3+ BZqftVAXuFyIk0D0eJFxkycWsV+ohbfS4SrLqK6uENLwI6VyhRHDriatVHCu7GGGi2i6 eMadlf2PdMueZlYtNVwVVefVT0yAskUzLVDdxhBiaceO+dOUAOV6DJcGA+5onunFfFOT V11filj8XpjLcfYN+wObnZTrcVF4BNe+DQ0LlQkycQjpRc+92bKEXbeGPCAvJS8lkBlF 9DaA== X-Gm-Message-State: AOAM533yYlp/LDV18vFehX2ApZDKP3LpPuM5mLp5bDr1RBZ+d71w0hSP hzOGiHU41Epw6JehTJAzsHNeK8XzOerC35V3OVyU2lbOUa88WQ== X-Google-Smtp-Source: ABdhPJw/T4ss67wNssMNFLbv4bMb+ZVuoS56trtsP8Q4VMSYj2rgX3Fwdr7ObcCFDP22Mv2PvuM+EngRA0pZqY82NP4= X-Received: by 2002:a05:6830:10:: with SMTP id c16mr24439207otp.162.1608886872935; Fri, 25 Dec 2020 01:01:12 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Jonathan Chen Date: Fri, 25 Dec 2020 22:00:57 +1300 Message-ID: Subject: Re: git, $FreeBSD$ and mergemaster To: Kyle Evans Cc: FreeBSD-STABLE Mailing List Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4D2LXB3T2mz4hZ2 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=chen-org-nz.20150623.gappssmtp.com header.s=20150623 header.b=OaUP6/f2; dmarc=none; spf=softfail (mx1.freebsd.org: 2607:f8b0:4864:20::336 is neither permitted nor denied by domain of jonc@chen.org.nz) smtp.mailfrom=jonc@chen.org.nz X-Spamd-Result: default: False [-2.30 / 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)[-0.998]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; SUBJECT_HAS_CURRENCY(1.00)[]; PREVIOUSLY_DELIVERED(0.00)[freebsd-stable@freebsd.org]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[chen.org.nz]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::336:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[chen-org-nz.20150623.gappssmtp.com:+]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::336:from]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::336: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: Fri, 25 Dec 2020 09:01:15 -0000 Hi Kyle, On Thu, 24 Dec 2020 at 15:05, Kyle Evans wrote: > > On Wed, Dec 23, 2020 at 8:02 PM Jonathan Chen 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 for the answer. However, wouldn't this mean that every run of "mergemaster" would prompt for local changes? The nice thing about using the $FreeBSD$ tags was that if I approved a local-change, subsequent runs of mergemaster would not prompt me about the local-change unless the etc-file had been modified in the source tree. Cheers. -- Jonathan Chen