From owner-freebsd-stable@freebsd.org Fri Dec 25 12:18:34 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 C829B4C0360 for ; Fri, 25 Dec 2020 12:18:34 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from mx.catwhisker.org (mx.catwhisker.org [107.204.234.170]) (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 did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4D2Qvt3MXBz4tGg; Fri, 25 Dec 2020 12:18:34 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from albert.catwhisker.org (localhost [127.0.0.1]) by albert.catwhisker.org (8.16.1/8.15.2) with ESMTP id 0BPCIOCQ056104; Fri, 25 Dec 2020 12:18:24 GMT (envelope-from david@albert.catwhisker.org) Received: (from david@localhost) by albert.catwhisker.org (8.16.1/8.16.1/Submit) id 0BPCIM2i056103; Fri, 25 Dec 2020 04:18:22 -0800 (PST) (envelope-from david) Date: Fri, 25 Dec 2020 04:18:22 -0800 From: David Wolfskill To: Jonathan Chen Cc: Kyle Evans , FreeBSD-STABLE Mailing List Subject: Re: git, $FreeBSD$ and mergemaster Message-ID: Mail-Followup-To: David Wolfskill , Jonathan Chen , Kyle Evans , FreeBSD-STABLE Mailing List References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="NnQfTabPFY0sXC+y" Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 4D2Qvt3MXBz4tGg X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none 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: Fri, 25 Dec 2020 12:18:34 -0000 --NnQfTabPFY0sXC+y Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Dec 25, 2020 at 10:00:57PM +1300, Jonathan Chen wrote: > Hi Kyle, >=20 > On Thu, 24 Dec 2020 at 15:05, Kyle Evans 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. >=20 > Thanks for the answer. >=20 > 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. >=20 > Cheers. > --=20 > Jonathan Chen > .... 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." Peace, david --=20 David H. Wolfskill david@catwhisker.org "Dismissing reality doesn't make it go away." - Rajiv Shah, Rockefeller Foundation president See https://www.catwhisker.org/~david/publickey.gpg for my public key. --NnQfTabPFY0sXC+y Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGTBAEBCgB9FiEE4owz2QxMJyaxAefyQLJg+bY2PckFAl/l2I5fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUy OEMzM0Q5MEM0QzI3MjZCMTAxRTdGMjQwQjI2MEY5QjYzNjNEQzkACgkQQLJg+bY2 PcmT1Qf/aSGEGRCHqM1XXooH6l64zmH9Nnt6U5+AXqv32/RikJLZOYENjOQ8aefw 4c2lTC1CqQXODlFIWYzWbNFeo8ivypRKsCm5SA3bWqPD97+a2tizUFsfAK17RQCX yEkhOKNaYjV/yrQ5QS4jqstmlH0Zh+Pgn8g590jnfN6ujJevtOZPcDIRzP6zKc9P ulMqFpg8Fc+OXLxtxQ421rmvV9JlTcQCVc2wF7k2RtUYMNg46NS8Vus+rSYFdsPi 8TUh1TNVRjA9KWW0OXzzBI80hNWJnYWUjbuvuzoNblkoPR8+dLTeeH9dYDzJkEjI 3AbO1bvetUhoUMuI7D6xWUJfwbiQwg== =F+fa -----END PGP SIGNATURE----- --NnQfTabPFY0sXC+y--