From owner-freebsd-stable@freebsd.org Wed Dec 30 16:19:27 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 661CA4C7CCA for ; Wed, 30 Dec 2020 16:19:27 +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 4D5c1V3vWYz3r4W for ; Wed, 30 Dec 2020 16:19:26 +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 0BUGJOUD043436 for ; Wed, 30 Dec 2020 16:19:24 GMT (envelope-from david@albert.catwhisker.org) Received: (from david@localhost) by albert.catwhisker.org (8.16.1/8.16.1/Submit) id 0BUGJOx3043435 for freebsd-stable@freebsd.org; Wed, 30 Dec 2020 08:19:24 -0800 (PST) (envelope-from david) Date: Wed, 30 Dec 2020 08:19:24 -0800 From: David Wolfskill To: FreeBSD-STABLE Mailing List Subject: Re: git, $FreeBSD$ and mergemaster Message-ID: Reply-To: stable@freebsd.org Mail-Followup-To: stable@freebsd.org, FreeBSD-STABLE Mailing List References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="suevv0QSVtWAHhqG" Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 4D5c1V3vWYz3r4W X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of david@catwhisker.org designates 107.204.234.170 as permitted sender) smtp.mailfrom=david@catwhisker.org X-Spamd-Result: default: False [-2.40 / 15.00]; HAS_REPLYTO(0.00)[stable@freebsd.org]; R_SPF_ALLOW(-0.20)[+ip4:107.204.234.170:c]; SUBJECT_HAS_CURRENCY(1.00)[]; TO_DN_ALL(0.00)[]; SIGNED_PGP(-2.00)[]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RBL_DBL_DONT_QUERY_IPS(0.00)[107.204.234.170:from]; ASN(0.00)[asn:7018, ipnet:107.192.0.0/12, country:US]; R_DKIM_NA(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FREEFALL_USER(0.00)[david]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; REPLYTO_DOM_NEQ_FROM_DOM(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[freebsd-stable@freebsd.org]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[107.204.234.170:from:127.0.2.255]; RCVD_TLS_LAST(0.00)[]; NEURAL_SPAM_SHORT(1.00)[1.000]; DMARC_NA(0.00)[catwhisker.org]; 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: Wed, 30 Dec 2020 16:19:27 -0000 --suevv0QSVtWAHhqG Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Dec 30, 2020 at 05:07:19PM +0100, Ulrich Sp=F6rlein wrote: > ... > >> 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 > >> .... > > > >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." >=20 > The only way forward is full git! Provide the /etc equivalent in a git=20 > branch or subdir, then check it out to /etc and handle local changes=20 > with git rebase or git merge. >=20 > (I'm not even joking! :) > .... After more-or-less coping with the above, I switched from mergemaster to etcupdate this morning. That avoids the issue. Perhaps src/UPDATING's "COMMON ITEMS"/"To rebuild everything and install it on the current system." (et al.) might merit an update? (It cites "mergemaster," but not "etcupdate.") Peace, david --=20 David H. Wolfskill david@catwhisker.org While Trump successfully conned a lot of people for a while, in the end he's just a failure throwing a temper tantrum because he lost. See https://www.catwhisker.org/~david/publickey.gpg for my public key. --suevv0QSVtWAHhqG Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGTBAEBCgB9FiEE4owz2QxMJyaxAefyQLJg+bY2PckFAl/sqIxfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUy OEMzM0Q5MEM0QzI3MjZCMTAxRTdGMjQwQjI2MEY5QjYzNjNEQzkACgkQQLJg+bY2 PcmdVgf9HjmSW/lGHDG4u55e8Tb/JIJ/3LuUMLM24UvIoFgkju45pwAtG15pRxxW pjkiTCO3jExPHE8p9FVq8sqv0sZFGp+0MonAmRjT9rIszzKMYppYvVdfdMvRVoj7 cUDY2XnYyR0mTMQogXI+EpARbNFyUT0zdEil88+KBi3F6p+nwLwldzmKiCmjFlW6 LGK7Q7VROlesXqTOKnYW/WJw64GTOiTI//DulO33saN4zGo7gSVDJaN9ScruBGN0 DEMTk44ve9GsCZFN5FGEfLEVtvAyUxKpOEhjYXxYxwIf8qD9TeGQjFXihCxNNEd1 /Eq78Fpg+bZPiijKPskFWu1b0ijLmw== =xiFR -----END PGP SIGNATURE----- --suevv0QSVtWAHhqG--