From owner-freebsd-current@freebsd.org Mon Jan 4 13:32:09 2021 Return-Path: Delivered-To: freebsd-current@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 04C7F4D63CD for ; Mon, 4 Jan 2021 13:32:09 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4D8c48564Kz4jYL for ; Mon, 4 Jan 2021 13:32:08 +0000 (UTC) (envelope-from david@catwhisker.org) Received: by mailman.nyi.freebsd.org (Postfix) id AF37F4D6376; Mon, 4 Jan 2021 13:32:08 +0000 (UTC) Delivered-To: current@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 AEFCA4D6595 for ; Mon, 4 Jan 2021 13:32:08 +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 4D8c4830hxz4jsj for ; Mon, 4 Jan 2021 13:32:07 +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 104DW5xb013554; Mon, 4 Jan 2021 13:32:05 GMT (envelope-from david@albert.catwhisker.org) Received: (from david@localhost) by albert.catwhisker.org (8.16.1/8.16.1/Submit) id 104DW5Xl013553; Mon, 4 Jan 2021 05:32:05 -0800 (PST) (envelope-from david) Date: Mon, 4 Jan 2021 05:32:05 -0800 From: David Wolfskill To: Jeffrey Bouquet Cc: current Subject: Re: CURRENT, usr/src on git, howto "mergemaster"? Message-ID: Reply-To: current@freebsd.org Mail-Followup-To: current@freebsd.org, Jeffrey Bouquet References: <3137a3ce-50c8-bee5-6a15-7701e3281500@FreeBSD.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="0KiyPS8rFeTREXiH" Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 4D8c4830hxz4jsj X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Jan 2021 13:32:09 -0000 --0KiyPS8rFeTREXiH Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Jan 04, 2021 at 05:22:10AM -0800, Jeffrey Bouquet wrote: > ...=20 > after checking out stable/12 with git, here a > # cd /usr/src/usr.sbin/mergemaster > # sh ./mergemaster.sh -piPcv >=20 > and then answering 'l' for left for most merges > it seems to have sufficed.=20 > This was before installworld.=20 Yes. However, the salient issue for me is that with the Ids in the file, on subsequent invocations, mergemaster would leave the file as-is unless the Id changed. This wass usually on the order of a few times per year for a given file. Now that the Ids are no longer present, mergemaster will now prompt on every invocation for each file locally modified on each machine. This amounts to about a dozen opportunities to screw things up for each machine daily for me; that's just not ... reasonable. So far, etcupdate seems to be working out OK for me (as in "not prompting for each of the files in question on each invocation"). > In case that helps. > I keep that command parameter in /etc/motd for each time around lookup.= =20 > .... :-) Peace, david --=20 David H. Wolfskill david@catwhisker.org An election becomes "disputed" merely when any party claims a disagreement about it, no matter how evidence-free, specious, absurd, or ridiculous. See https://www.catwhisker.org/~david/publickey.gpg for my public key. --0KiyPS8rFeTREXiH Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGTBAEBCgB9FiEE4owz2QxMJyaxAefyQLJg+bY2PckFAl/zGNVfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUy OEMzM0Q5MEM0QzI3MjZCMTAxRTdGMjQwQjI2MEY5QjYzNjNEQzkACgkQQLJg+bY2 PcmISgf9F7IMKCIkMUAnTiarBabk3BWtZjD5Q3YDCCg1CPOtdasuNQZVWNYtLAQb F8ctKeA0iCnKCzVLmG7a/N2+s14S5JSziNvn9ktMQkmZ/kG4Mz+ZE9y/ZtSjjTRe YuxxoeXUfHeTMATS4+ah60QITI/bXMGf7paywpwBmovz5yq5XyEkN3oio/sO7XDS 4AYzbTKc112upJAsJZ81Tn+gSaCjYqK1Lpv9jj5cGYnWsj+57H10CF+p0oWrF2NW 05TVfaxOE0J9jX2ukoRY8F4rQ/vUoxw4ssLKwqiCmCjylb8VXrmJ+N0Xo/okeN+d w9KTb9pmHBDPYXt8tOq2q2mOeGy4ew== =wNbS -----END PGP SIGNATURE----- --0KiyPS8rFeTREXiH--