From nobody Thu Jun 15 20:36:36 2023 X-Original-To: freebsd-current@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QhvGc6pgFz4f11d for ; Thu, 15 Jun 2023 20:36:56 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic311-24.consmr.mail.gq1.yahoo.com (sonic311-24.consmr.mail.gq1.yahoo.com [98.137.65.205]) (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 did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4QhvGb424Kz44vg for ; Thu, 15 Jun 2023 20:36:55 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=yahoo.com header.s=s2048 header.b=PHr8AdOk; spf=pass (mx1.freebsd.org: domain of marklmi@yahoo.com designates 98.137.65.205 as permitted sender) smtp.mailfrom=marklmi@yahoo.com; dmarc=pass (policy=reject) header.from=yahoo.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1686861413; bh=agz0Z5drnmuBpR1Swlks9Q3QOjNKRMX5zAoJDpiss20=; h=From:Subject:Date:To:References:From:Subject:Reply-To; b=PHr8AdOk5nDaWF36JjpLNGFIt3XS3fegtXHt3KoIlh4qHWws42KyIPBIEqR5wy4vFKlf3s311eLYh6K0e4qrCxze8eE/g/p+ei7bfLtxs3zLQ7zYFjbKJQ5OiInamO3LRHbcZ7aYWbTg0QS+uIwIkE33x2d9zlKWMSdbk4zQi1OWpRfXZoEJ5GeVds57CzgVWOQL4ehztVzCVJgQhAcGMoBJuxueJB9hk9fqmiErWwaG90dunnInIy+VEQgtIhvlk5UGuSd9QRDK515eWdU//xxiWTdDzROsblD/4Qfj9yKGO1IfuxTcHzFXNi463x05/rJsxy5pf+dcm2GfhUB8jA== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1686861413; bh=fPmA++I9Pen/33DUVWbYd0lYwOtDBJiqntFkVzaI0km=; h=X-Sonic-MF:From:Subject:Date:To:From:Subject; b=p/mNLOfqraeuQ/GlcGWCf6q+PUmCKWYDopNh/FDXs4y5fVXOL4MuZNQB/dWB6BSezpsxg/pVEM1Qe4B/5wL4m9M60NROxa3gSX9Yx8wIDj6xjdYerCEFtNhx7p2KSx7dQ13rUe0jhNT059zqd1jx9BZgXeqOLCYQ/83e7p5GCyomXK5oxlS5J7Bg/QF7esxyxueNY3tQyRhR/YlvcGTgsfso1KJ09dN0eAN2tzpeURvklWKjdRHs0ytnDN2Su9f+CH3hKEB+Uwvmdiaclzd+ieWL6FOq5MywZH7Yf302ucVAtxa6IXTMPJHs1KPUV62uP35m1K/0ynqxTGMyFAUxAQ== X-YMail-OSG: rpwAVIUVM1kSa7w1NMwmWpimOfflJLyWbZTBkPoL8b918I0gY6cgwZ1lzNtlFHY kGqvmpoTJf_PXAz6C0JvIv_uWxpI24Y1cM8gOn4i9hQ7kPbeB7TpwrGDThRrRDSaC8NjDMq.V3Yt igsbgCQ1iePDnNVj6JYK5Bj4n6G9kI3IXgpsrubrrxpr6YoiGFie8tC0eajI3Xh_tnzyvq93YfYx JHFznX4RNjA1KwxTwemXSmkNiDh6EYGSKDulwpZuFtMVfxNZ_KONgo8dV0Phomo1gMdds1G9Dqig MQIwUnSXr5QYIzn1rwnJoGCtSPASiaS.H8brhJVNBbG8_LM2GYFP93mA8bi4rSEb24yHvWqffMrg WCM_nagLaoROLlTdKMwx1g3rqpHkLE39FaZRMACkSNloLVKLSCTbNlhJhfgNoK0NZx02ZMuLYM_l SSoFMJEzzADjaHfpqTm6APPjXOjvVy0Elj0Om5h1PVJktD_LG1CrkjnhPt3wVnDbtQJE06bmQSGs I6wagEn1CP_056fPPkPBYNqV89wDE275KqSfnOlZnJODsmRceuTp8PW2a77pecl5.atMzxvKjqg5 HL0uG8DAbW.jxrMe5daPr5asueH31C9I0he9ZtntV_pk3rePw3RVAbwnBj51jKCR8R7sHV7_z4vH 7E.WJsDwgLe8jPsnSRlsbn6w1QF4sPHU4lKusGcuBo6vaDXsNOGiu_55lKlr01BBLlUS6CujgixJ MM.8MWIrfiURus3oIHYbf_u._cQ58Nhf23MXE2q43aStggm37yGpKka7wTbZLERv2hf9QMagg0ho nr.tDMkobL2uk.nnEpvPe6i4Cz2A4g.3J79A2cTOdVlZGpSitgixth_pmu5hba2whUmXy8XTYox4 ZAhXsm1qs74JU_2UKtdhxMavYgXuI1XpSJOkaUgMjEqpvXfQA.ZHFcbjwjfq4_jQ0U7XvOtitykP 9mJz4xP4Ylmi6TzbfJE8t8_H_ewVyj7bIP3by0RXzD4dK2iRq0NlrNLv4VWgcPLuxCH9eKegIBmT exkW_6lbzjqdFmbwZrN7hYBTY8BNHjiuVq1egVFuPjEHlMeEPDdeBHjCpl1zDaTJaeFTo7tIYUTK pU3.cGQ9tY1ox6cg2oU3Vmjqy.IibILY4Mhtbo3hiP3_dvyl1EhgIbN9sGtI5T5MlcCZNdkOtuY8 MS7QbWMNQLxsUdEPa0jfaavDnKllYNWj6RR.zF10dVpjJ1AKE279uMgKVjwyM2wTe_RfVUnLK_jL BZ665BxyZGfupsBeZWWkvoQKEkTePQczTVe7OMipGR_VcrYnk0kZqDdEF6BixYrKcpw4l3wWPQgL PpqEVrfIaqqJu4XXX5ZFkE_EybzjY50e1M4zoCk7OW0BtgYYd51dRdMw1paEy3JhAJ6GlZsJgKI9 darXMtNmbBRoHqKCr228sQdwsvcI4ZBirLubwdp2jOLKfuoRtpxyQeZai9715UTWO8PL88Xh4Xqi ho6Vd0JH4XAydmBRwrhMzaQlUfJtgK2MLOZRTffD8iI1vRofEf_ddkW6rpmWETP_CgYHsPhjghzU fGH1CD6c7cITzR2.tUh5E2RwKYEC7phMMmENJyR36e80G8.vN4BrC5cW4ZxTYw8kzG_GlqTa29Ig UEz7n6lkJeXJcCT6gwzY2pkPyQogUj7W3TOMKRA43Iuj87DHBuzQpAxYRuZvpxg9lwITfl3oI9VU OlHfAumTLCAUTofOHbm1oJrugmZ7bPYF7A84DLww8C8fYbBFR7kFk06xrmaC7xNmfXY.fj3AgKYW JmqwrTZE6N565lB9uHWHctbaX52lkUWPxY9g.MjtcnVS0s4KBD.KYxx0G3MDdr9.DjpEPh8D8W35 j1zcj9THSvWB7CtUITEnoAIZpkk37RdOJ9rBO0DP2z0Mq0br1j9KKHC2BZVtqjpqqwxCHfeaJAhw isaIMc0GwTtlDXFRJolx3ji6Jf2xqyRZptK_eFmFcKDpk7gMda7iKjGAYtXXLWQXNLUd8XAjsNxH 9DTA53kWsKAvLYPI50JwdNOyYV_06rSGnpu32bndBhBMfAr_TgXmemvBBmIY6xZFDmzXC.ST2wSF QTHDNGfhotImAFmcHzLwm6EZAIAln9jtXBf6w69uQJNLEOLXNUmKnfvEgUBj08zY4QAytr5QPDxG E1E25ZHYkGubvoo6wJvyTAaO3Z3F.XQBAyBMM75BV4RQoaLN7apKGe9adyrhOhWjW13hOb9qu4MX sm6sIKtYs4AKJMm7DEhJLyXymamgqXQiXACrzP4HJEsfLIwcGI7tui6.xBMRGH6HiTDXTI1CbKFy WOPA- X-Sonic-MF: X-Sonic-ID: 17021d1f-7466-4fa2-aec0-63997a1b8b75 Received: from sonic.gate.mail.ne1.yahoo.com by sonic311.consmr.mail.gq1.yahoo.com with HTTP; Thu, 15 Jun 2023 20:36:53 +0000 Received: by hermes--production-gq1-6db989bfb-jqsjz (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 134ede7d56d29e1084c3b651d96226d8; Thu, 15 Jun 2023 20:36:49 +0000 (UTC) From: Mark Millard Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable List-Id: Discussions about the use of FreeBSD-current List-Archive: https://lists.freebsd.org/archives/freebsd-current List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-current@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.600.7\)) Subject: RE: Using etcupdate resolve, was Re: Surprise null root password Message-Id: <6D6741E7-FC92-4E55-89F5-D1D38D0E8AD9@yahoo.com> Date: Thu, 15 Jun 2023 13:36:36 -0700 To: bob prohaska , Current FreeBSD X-Mailer: Apple Mail (2.3731.600.7) References: <6D6741E7-FC92-4E55-89F5-D1D38D0E8AD9.ref@yahoo.com> X-Spamd-Result: default: False [-3.49 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.998]; NEURAL_HAM_LONG(-1.00)[-0.996]; NEURAL_HAM_SHORT(-0.99)[-0.994]; MV_CASE(0.50)[]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; RCVD_IN_DNSWL_NONE(0.00)[98.137.65.205:from]; MID_RHS_MATCH_FROM(0.00)[]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; MLMMJ_DEST(0.00)[freebsd-current@freebsd.org]; TO_DN_ALL(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; FREEMAIL_FROM(0.00)[yahoo.com]; RCVD_TLS_LAST(0.00)[]; DKIM_TRACE(0.00)[yahoo.com:+]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; MIME_TRACE(0.00)[0:+]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.65.205:from] X-Rspamd-Queue-Id: 4QhvGb424Kz44vg X-Spamd-Bar: --- X-ThisMailContainsUnwantedMimeParts: N [Note: In this 2nd try, I've indented everything by a tab to help avoid reinterpretation/reformatting of some of the text.] I'm going to comment about the notations mean, not about that the specific type of file is not one you would be likely to have other than sn official-content-only status for. My notes are yet another alternative wording since you are uncomfortable with things in this area, just in case it helps. bob prohaska wrote on Date: Thu, 15 Jun 2023 17:26:48 UTC : =09 > Here's an example of the puzzles faced when using etcupdate > that have so far proved baffling: >=20 > On running etcupdate resolve, the system reports >=20 > Resolving conflict in '/etc/mtree/BSD.tests.dist': > Select: (p) postpone, (df) diff-full, (e) edit, > (h) help for more options: df > --- /etc/mtree/BSD.tests.dist 2023-05-29 08:29:48.174762000 = -0700 > +++ /var/db/etcupdate/conflicts/etc/mtree/BSD.tests.dist = 2023-06-13 22:55:04.284491000 -0700 > @@ -442,6 +442,16 @@ > .. > ifconfig > .. > +<<<<<<< yours > +||||||| original > + md5 > + .. > +=3D=3D=3D=3D=3D=3D=3D > + ipfw > + .. > + md5 > + .. > +>>>>>>> new > mdconfig > .. > nvmecontrol > Select: (p) postpone, (df) diff-full, (e) edit, > (h) help for more options: e >=20 > Selecting option e for edit brings up what appears to be a > vi window, using search I can find the line with mdconfig: >=20 For: > <<<<<<< yours > ||||||| original > md5 > .. > =3D=3D=3D=3D=3D=3D=3D > ipfw > .. > md5 > .. > >>>>>>> new The: ||||||| original md5 .. =3D=3D=3D=3D=3D=3D=3D indicates the prior official version's material (the middle two lines of the 4 in this case). The: <<<<<<< yours ||||||| original has an empty middle indicating what was found in the file on your machine. The empty middle indicates that the "md5" and ".." lines had been deleted somehow, relative to want was official. The: =3D=3D=3D=3D=3D=3D=3D ipfw .. md5 .. >>>>>>> new indicates the new official version's content for what originally had just the "md" and ".." lines. You might pick one of the 3 blocks to keep and delete the rest of the lines (including <<<<..., =3D=3D=3D=3D..., and >>>>...) or you might replace everything from <<<<... to >>>>... (inclusive) with the text that you know you want in that area. (In this case you likely want the new text that also has "ipfw" material included.) It is possible for a file to have multiple of these kinds of "yours...original...new" blocks in the file. > mdconfig > .. > nvmecontrol > .. > pfctl > files > .. > .. > ping > .. >=20 > The puzzle at this point is what to do. It's looks like the > points of interest are the lines marked "yours" and "new", > but I'll admit to bafflement which to modify and whether > the modifications needed include the <<<< and >>>>> characters. >=20 > If there's a relevant man section please point it out. "man git-merge" has the following text describing such = notations: (Again I'm not sure how nice the display will end up being.) An alternative style can be used by setting the = "merge.conflictStyle" configuration variable to either "diff3" or "zdiff3". In = "diff3" style, the above conflict may look like this: Here are lines that are either unchanged from the = common ancestor, or cleanly resolved because only one side = changed, <<<<<<< yours:sample.txt or cleanly resolved because both sides changed the = same way. Conflict resolution is hard; let's go shopping. ||||||| base:sample.txt or cleanly resolved because both sides changed = identically. Conflict resolution is hard. =3D=3D=3D=3D=3D=3D=3D or cleanly resolved because both sides changed the = same way. Git makes conflict resolution easy. >>>>>>> theirs:sample.txt And here is another line that is cleanly resolved or = unmodified. while in "zdiff3" style, it may look like this: Here are lines that are either unchanged from the = common ancestor, or cleanly resolved because only one side = changed, or cleanly resolved because both sides changed the = same way. <<<<<<< yours:sample.txt Conflict resolution is hard; let's go shopping. ||||||| base:sample.txt or cleanly resolved because both sides changed = identically. Conflict resolution is hard. =3D=3D=3D=3D=3D=3D=3D Git makes conflict resolution easy. >>>>>>> theirs:sample.txt And here is another line that is cleanly resolved or = unmodified. In addition to the <<<<<<<, =3D=3D=3D=3D=3D=3D=3D, and = >>>>>>> markers, it uses another ||||||| marker that is followed by the original = text. You can tell that the original just stated a fact, and your side = simply gave in to that statement and gave up, while the other side tried = to have a more positive attitude. You can sometimes come up with a = better resolution by viewing the original. I found that text via use of: # man -K ">>>>>" and the looking more at some of the files listed. =3D=3D=3D Mark Millard marklmi at yahoo.com