From owner-freebsd-stable@freebsd.org Thu Dec 31 13:57:53 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 0890D4C28E7 for ; Thu, 31 Dec 2020 13:57:53 +0000 (UTC) (envelope-from george+freebsd@m5p.com) Received: from mailhost.m5p.com (mailhost.m5p.com [74.104.188.4]) (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 "m5p.com", Issuer "R3" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D68qh0Sg4z4nQS for ; Thu, 31 Dec 2020 13:57:51 +0000 (UTC) (envelope-from george+freebsd@m5p.com) Received: from [IPv6:2001:470:1f07:15ff::26] (court.m5p.com [IPv6:2001:470:1f07:15ff:0:0:0:26]) (authenticated bits=0) by mailhost.m5p.com (8.15.2/8.15.2) with ESMTPSA id 0BVDvdoK043544 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO) for ; Thu, 31 Dec 2020 08:57:44 -0500 (EST) (envelope-from george+freebsd@m5p.com) To: freebsd-stable@freebsd.org References: From: George Mitchell Subject: Re: HEADS UP: FreeBSD src repo transitioning to git this weekend Message-ID: <258e5a60-5a29-1a10-814d-95c28a8b5461@m5p.com> Date: Thu, 31 Dec 2020 08:57:38 -0500 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:78.0) Gecko/20100101 Thunderbird/78.5.0 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="UXgBLeWNcNNZvwq3JisKdKgOx47cq7jIz" X-Spam-Status: No, score=-0.3 required=10.0 tests=HELO_MISC_IP, HELO_NO_DOMAIN, NICE_REPLY_A autolearn=unavailable autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mattapan.m5p.com X-Rspamd-Queue-Id: 4D68qh0Sg4z4nQS X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of george@m5p.com designates 74.104.188.4 as permitted sender) smtp.mailfrom=george@m5p.com X-Spamd-Result: default: False [-2.61 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_SPF_ALLOW(-0.20)[+a]; HAS_ATTACHMENT(0.00)[]; TO_DN_NONE(0.00)[]; NEURAL_HAM_SHORT(-0.21)[-0.209]; SIGNED_PGP(-2.00)[]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:+,3:~]; RBL_DBL_DONT_QUERY_IPS(0.00)[74.104.188.4:from]; ASN(0.00)[asn:701, ipnet:74.104.0.0/16, country:US]; MID_RHS_MATCH_FROM(0.00)[]; TAGGED_FROM(0.00)[freebsd]; R_DKIM_NA(0.00)[]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.20)[multipart/signed,multipart/mixed,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-stable@freebsd.org]; DMARC_NA(0.00)[m5p.com]; NEURAL_SPAM_MEDIUM(1.00)[1.000]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[74.104.188.4:from:127.0.2.255]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; 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, 31 Dec 2020 13:57:53 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --UXgBLeWNcNNZvwq3JisKdKgOx47cq7jIz Content-Type: multipart/mixed; boundary="RoYE9Kzbx38Z0gduSYqDriQj0CHRbsUdp"; protected-headers="v1" From: George Mitchell To: freebsd-stable@freebsd.org Message-ID: <258e5a60-5a29-1a10-814d-95c28a8b5461@m5p.com> Subject: Re: HEADS UP: FreeBSD src repo transitioning to git this weekend References: In-Reply-To: --RoYE9Kzbx38Z0gduSYqDriQj0CHRbsUdp Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 12/23/20 11:58 AM, Warner Losh wrote: > [...] >=20 > mergemaster and etcupdate can cope without them. >=20 > Warner > [...] Until this moment, I had never heard of etcupdate, and I had mergemaster practically programmed into my fingers for system updates. So I read the man page for etcupdate, and it looks like just what I should have been using all along! Given that my habitual method for updating with mergemaster will clearly not work any more, it seems highly regrettable that there is no reference to etcupdate anywhere in the FreeBSD Handbook, or in /usr/src/UPDATING in the tail end COMMON ITEMS section. If it hadn't been for this email thread, I never would have found out about it (and I would have become highly wrought when update time rolled around once again). Could someone who is more familiar with etcupdate please modify /usr/src/UPDATING and the Handbook appropriately? Thanks. -- George --RoYE9Kzbx38Z0gduSYqDriQj0CHRbsUdp-- --UXgBLeWNcNNZvwq3JisKdKgOx47cq7jIz Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsF5BAABCAAjFiEENdM4ZHktsJW5kKZXwRES3m+p4fkFAl/t2NIFAwAAAAAACgkQwRES3m+p4fna 5RAAqBqXKQ7dn1elPPDf42mmAPjIdY2bQmnDQGrSf0aMvLdI4qDDfuH0cNg1ectS/papS8JwkIcV fYsQQ4CIxz6yDqdiK9ZrB/F/pv17WJvOJxiHTSYWSY3fy3sbS2evKTmQgd+ZKwOentENf6VvnPoz CNktQ4Tr9zFlDCKuVkW96ckWSzd/b2n3e+2v9V9sTVmXcMIeNBpHummC0M4rl6oXoRlw/2DW0Uzs hEZAVW0RKF0P4B/LuJBX2S2/5e+a3QaZ8I9Vq8BD6Qy5hVnpsDF3raRbuC7XJAl3TeBKD1zVgF4Y Pgu7hO8qT+ODmdttNV3iK31FG9KKjV+/zbkEgJS81hHovK9Kg45hpflYF/Wok7+Q7bqgWG6btagA mVyuCQwFdeG39z9Rls/VfWCdQEXv4d0mJ66JiMKnNG+oj1UVVZuTgFMXUTuOi4UMAYnUFWGwone4 umgFt5ZJc2N6y2IgzoQwzGntTlRpnndC5dSil6GRmxejwufPithnFNczBTSht0EpCJlPQHjgzX0q aj2mJBQ0bpBispDMYfO5mLAo4EmJxp8KuTYq7GSI8xpBJ1t7/pyPA46QSHLdso/Yv+gdu0+fIOUi 9x7ZFX8dbq+kKGIFr22aq8Fvu3eTO4cVVVjy9iMcrY1gz+2Dc/pjtvof+8yOKS7svAO1TmbAj+Uh H3E= =cDbw -----END PGP SIGNATURE----- --UXgBLeWNcNNZvwq3JisKdKgOx47cq7jIz--