Date: Mon, 4 Jan 2021 05:32:05 -0800 From: David Wolfskill <david@catwhisker.org> To: Jeffrey Bouquet <jbtakk@iherebuywisely.com> Cc: current <current@freebsd.org> Subject: Re: CURRENT, usr/src on git, howto "mergemaster"? Message-ID: <X/MY1ZEnJFJiy02V@albert.catwhisker.org> In-Reply-To: <E1kwPoI-0007Gk-2V@rmmprod05.runbox> References: <3137a3ce-50c8-bee5-6a15-7701e3281500@FreeBSD.org> <E1kwPoI-0007Gk-2V@rmmprod05.runbox>
next in thread | previous in thread | raw e-mail | index | archive | help
--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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?X/MY1ZEnJFJiy02V>