From owner-freebsd-stable@freebsd.org  Wed Dec 30 16:07:32 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 E64B24C76AD
 for <freebsd-stable@mailman.nyi.freebsd.org>;
 Wed, 30 Dec 2020 16:07:32 +0000 (UTC) (envelope-from uqs@freebsd.org)
Received: from acme.spoerlein.net (acme.spoerlein.net [IPv6:2a05:fc87:1:5::15])
 (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 (2048 bits) client-digest SHA256)
 (Client CN "www.spoerlein.net", Issuer "R3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4D5blm4zXRz3qBK;
 Wed, 30 Dec 2020 16:07:32 +0000 (UTC) (envelope-from uqs@freebsd.org)
Received: from localhost (acme.spoerlein.net [IPv6:2a05:fc87:1:5:0:0:0:15])
 by acme.spoerlein.net (8.16.1/8.15.2) with ESMTPS id 0BUG7J57055058
 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO);
 Wed, 30 Dec 2020 17:07:19 +0100 (CET) (envelope-from uqs@freebsd.org)
Date: Wed, 30 Dec 2020 17:07:19 +0100
From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= <uqs@freebsd.org>
To: David Wolfskill <david@catwhisker.org>, Jonathan Chen <jonc@chen.org.nz>, 
 Kyle Evans <kevans@freebsd.org>,
 FreeBSD-STABLE Mailing List <freebsd-stable@freebsd.org>
Subject: Re: git, $FreeBSD$ and mergemaster
Message-ID: <X+ylt3fifErOca7W@acme.spoerlein.net>
Mail-Followup-To: David Wolfskill <david@catwhisker.org>,
 Jonathan Chen <jonc@chen.org.nz>, Kyle Evans <kevans@freebsd.org>,
 FreeBSD-STABLE Mailing List <freebsd-stable@freebsd.org>
References: <CAJuc1zNmSJ_qcJSSEFnihE4aLNvjZKUVgFA8GKrymmJ38qSfDw@mail.gmail.com>
 <CACNAnaHaNqXzGqzG0KaHJSc_K_9fDWCOaApm2K+G9uzKGKc5WQ@mail.gmail.com>
 <CAJuc1zNQJyJyvYJAEM2Gcv0cc2XSQANHL8wjiZ7Z6QWFNzoaUw@mail.gmail.com>
 <X+XYjupHKfyEekPL@albert.catwhisker.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Disposition: inline
In-Reply-To: <X+XYjupHKfyEekPL@albert.catwhisker.org>
User-Agent: Mutt/2.0.1 (2020-11-14)
X-Rspamd-Queue-Id: 4D5blm4zXRz3qBK
X-Spamd-Bar: /
Authentication-Results: mx1.freebsd.org;
	none
X-Spamd-Result: default: False [0.00 / 15.00];
 local_wl_from(0.00)[freebsd.org];
 ASN(0.00)[asn:39540, ipnet:2a05:fc87::/32, country:CH]
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: Wed, 30 Dec 2020 16:07:33 -0000

On Fri, 2020-12-25 at 04:18:22 -0800, David Wolfskill wrote:
>On Fri, Dec 25, 2020 at 10:00:57PM +1300, Jonathan Chen wrote:
>> Hi Kyle,
>>
>> On Thu, 24 Dec 2020 at 15:05, Kyle Evans <kevans@freebsd.org> wrote:
>> ...
>> > 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 <jonc@chen.org.nz>
>> ....
>
>Indeed: the above-described behavior is what I have observed so far
>since the transition (tracking head & stable/12 daily on two machines).
>
>I would go a bit further than stating that the prior behavior was
>"nice."

The only way forward is full git! Provide the /etc equivalent in a git 
branch or subdir, then check it out to /etc and handle local changes 
with git rebase or git merge.

(I'm not even joking! :)

Cheers
Uli