Date: Mon, 4 Jan 2021 12:35:28 +0100 From: "Hartmann, O." <ohartmann@walstatt.org> To: FreeBSD CURRENT <freebsd-current@freebsd.org> Subject: CURRENT, usr/src on git, howto "mergemaster"? Message-ID: <20210104123512.0f5e1b01@hermann.fritz.box>
index | next in thread | raw e-mail
[-- Attachment #1 --] Now, since /usr/src has been siwtched to git on several boxes and the former svn tag $FreeBSD$ seem not valid/useful anymore, how am I (or any other here) supposed to "mergemaster"? I did a full "mergemaster -CUFi" lately and did the same again, but when mergemaster ran the second (or n-th) time again, it stops by by the same non standard files in etc edited by me. Is there a workaround and if so, please hint me to the announcement. Thanks in advance, a happy new year oh [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- iHUEARYIAB0WIQSy8IBxAPDkqVBaTJ44N1ZZPba5RwUCX/L9gAAKCRA4N1ZZPba5 RyeDAP0VJ1cCcIaBgTRluO4/yopS47/7ATEtHa9trN95WbDbswEAoMAq8IUZVnnz sh1Q94T7trtCjOby2/IYLd4oZcJUXw0= =bPBl -----END PGP SIGNATURE-----help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20210104123512.0f5e1b01>