Date: Mon, 4 Jan 2021 17:04:04 +0100 From: Marek Zarychta <zarychtam@plan-b.pwste.edu.pl> To: freebsd-current@freebsd.org Subject: Re: CURRENT, usr/src on git, howto "mergemaster"? Message-ID: <dbcb1757-0637-54b0-68af-aa4d497becd0@plan-b.pwste.edu.pl> In-Reply-To: <X/MY1ZEnJFJiy02V@albert.catwhisker.org> References: <3137a3ce-50c8-bee5-6a15-7701e3281500@FreeBSD.org> <E1kwPoI-0007Gk-2V@rmmprod05.runbox> <X/MY1ZEnJFJiy02V@albert.catwhisker.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --2SISRk4qiywZhQwf4pm653yzA2DEHdFrk Content-Type: multipart/mixed; boundary="M6YBqSbSSisHDXlZKpgImItLUuk6E2rXr"; protected-headers="v1" From: Marek Zarychta <zarychtam@plan-b.pwste.edu.pl> To: freebsd-current@freebsd.org Message-ID: <dbcb1757-0637-54b0-68af-aa4d497becd0@plan-b.pwste.edu.pl> Subject: Re: CURRENT, usr/src on git, howto "mergemaster"? References: <3137a3ce-50c8-bee5-6a15-7701e3281500@FreeBSD.org> <E1kwPoI-0007Gk-2V@rmmprod05.runbox> <X/MY1ZEnJFJiy02V@albert.catwhisker.org> In-Reply-To: <X/MY1ZEnJFJiy02V@albert.catwhisker.org> --M6YBqSbSSisHDXlZKpgImItLUuk6E2rXr Content-Type: text/plain; charset=windows-1252 Content-Language: en-US Content-Transfer-Encoding: quoted-printable W dniu 04.01.2021 o=A014:32, David Wolfskill pisze: > 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 >> >> and then answering 'l' for left for most merges >> it seems to have sufficed.=20 >> This was before installworld.=20 >=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. >=20 > Now that the Ids are no longer present, mergemaster will now prompt on > every invocation for each file locally modified on each machine. >=20 > This amounts to about a dozen opportunities to screw things up for each= > machine daily for me; that's just not ... reasonable. >=20 > 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"). >=20 >> In case that helps. >> I keep that command parameter in /etc/motd for each time around lookup= =2E=20 >> .... $FreeBSD$ tags can be regenerated locally with Git clean and smudge filters[1] applied on local git repository. This helps to keep the track of files updated by mergemaster(8) or etcupdate(8). The filters should be applied to only the files important for mergemagster. Applying filters to the whole repository degrades performance. [1]https://git-scm.com/book/en/v2/Customizing-Git-Git-Attributes Regards, --=20 Marek Zarychta --M6YBqSbSSisHDXlZKpgImItLUuk6E2rXr-- --2SISRk4qiywZhQwf4pm653yzA2DEHdFrk Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsB5BAABCAAjFiEEMOqvKm6wKvS1/ZeCdZ/s//1SjSwFAl/zPHQFAwAAAAAACgkQdZ/s//1SjSya kwgAq3gvk6eAtvm0yCl/mbA9ZBprr5YIvapiRVz1/4m9U5y7spmQb2rvBhAepIEZ84NUIOQZ9/hD EGSufkYviGv4dWZz47vbL3C2DMm1g1pO6c1v/8L7OBVh+M1IcQDu4WCUGnp2xPPR3SInjjt/700d mNhY9CW30E9jIAg3SJVHGA6Rz8pfBicnCPoU5xD3mwIN+JE6YZo4oSSTgvKvvp3MAQC+XPjrhMoi PmKA1Wal1mgrVOwrcKlIdgX2B3005v2R+RiSlV/9IycBiKwg/KSD0AVRXeB0kMGtR2IX8MVZWyL/ ZFZ6x5PNok3MXTrYxVowWVvqLlbdGUWjCKOU6fru1w== =6Kzs -----END PGP SIGNATURE----- --2SISRk4qiywZhQwf4pm653yzA2DEHdFrk--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?dbcb1757-0637-54b0-68af-aa4d497becd0>