From owner-freebsd-current@freebsd.org Mon Jan 4 11:35:38 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 873784D1D54 for ; Mon, 4 Jan 2021 11:35:38 +0000 (UTC) (envelope-from ohartmann@walstatt.org) Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mout.gmx.net", Issuer "TeleSec ServerPass Class 2 CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D8YTj27dtz4ZHW for ; Mon, 4 Jan 2021 11:35:36 +0000 (UTC) (envelope-from ohartmann@walstatt.org) X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from hermann.fritz.box ([77.191.26.71]) by mail.gmx.com (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1ML9yc-1keAo11e6s-00IF0M for ; Mon, 04 Jan 2021 12:35:35 +0100 Date: Mon, 4 Jan 2021 12:35:28 +0100 From: "Hartmann, O." To: FreeBSD CURRENT Subject: CURRENT, usr/src on git, howto "mergemaster"? Message-ID: <20210104123512.0f5e1b01@hermann.fritz.box> Organization: walstatt.org MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/+TfrBvlYG93MUcD3=76_TSh"; protocol="application/pgp-signature"; micalg=pgp-sha256 X-Provags-ID: V03:K1:TdFAaXXoyZRq9l7tETofcFPwE1XoCKgfNqJxwN/80Un4B8Mzf2c B4C5XJXzlj3QBCg20hvrPFC6M9j12MIiud6ItKYWZCSjOj8b6ZphDEGF6/4BCTBdUN+eVHY 4IM0kg17s3owrKedUiMxwzGksdGp52VdHHo8aDzp2NjsotXxmwa5yYvvUPP36KuF5IBufuZ 83QJflKzvroaMuA9n5v6g== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:lvyt/IT5ENw=:ureafhOm6dOD6k9GeiGBi7 sRB07QuzHZfHIYGviMyfFa/DsFLLwTNlo94ssYbnr0yhajaLPU8dCdsOgVQH9Tw3NDsufX6pU jSKv8ZOR+FijEGrlP6+BwBWyCJr2eeNImH0Xr1+cYKKtihIDmSHZNQqTBEyV5q8PY1NIx5hLe TJjKvTR425xBDCoWFkyfy0nkC9zu7wEhbnLDypq8JVylxK9W8oL5lB5ulr83Oedr+nakfHse4 Z/qPQwQ++mK5TkBkSFmrBvkSOpSvhhdGgUcypGvAEWrXPyL3cSijPxQfglhNtn0zLEn7xzdN9 3uejpI0CXC+znG5dr2s6ayecpWyeVIhbgN9yS/CTU6uvH+Siuaa/V/ywXxCkaNSvL3DJjC2zy wxKsZBH4m0FOhsR8LsqhbGVlHxs5sU9A3DwKn5B7BiZBAUkuJNAlG4UjjAUGm7gm7e5UDukvM ANoR1xdHLa7kabxzy3uOi4Qetmcg4No9TT60bGsl7yjCVPqi6LaXz90B8mpzT1I/Ndr1x233g qgRoI7DNpU/5JqwhIp29D/UsCDmbekJCafdq+my2ZhOHuczhQMMkl8TcdrIrPS63HEwIm1Psg x3bX0iKRT4QYVgtOQT56QaMOxSwPLgyV1L5y3IKRDTCcyK6xsyLnD++bvEN9RtLqoL4EY0FGU OSDUU5Cpdt26GIwV9AC2YO4ZvvLQWFuLK5mgKCrwjmJM+qp6rRedza4ILjfczgfn9IfCrSIxL 1LmE2MQAoWKnf8qgc+vmYqsKYUJOWofTInbbRnIuPL5AProXT3RkJ5ZHeKPyT5pDUvkQ7IQDb cNMN+xDg0n1PMAlevAPbPtGIucG43EafY21inQ9Ke22zbMq3xd5UiiPdCmPlQeEqsg9+kuyy2 oifkKQxB6loS3BQPLn4w== X-Rspamd-Queue-Id: 4D8YTj27dtz4ZHW X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.27 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; HAS_ORG_HEADER(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[gmx.net:+]; NEURAL_HAM_SHORT(-0.77)[-0.769]; RECEIVED_SPAMHAUS_PBL(0.00)[77.191.26.71:received]; SUBJECT_ENDS_QUESTION(1.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[212.227.17.20:from]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:8560, ipnet:212.227.0.0/16, country:DE]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[gmx.net:s=badeba3b8450]; RCVD_IN_DNSWL_LOW(-0.10)[212.227.17.20:from]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-current@freebsd.org]; DMARC_NA(0.00)[walstatt.org]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[212.227.17.20:from:127.0.2.255]; R_SPF_NA(0.00)[no SPF record]; RWL_MAILSPIKE_POSSIBLE(0.00)[212.227.17.20:from]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-current] 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 11:35:38 -0000 --Sig_/+TfrBvlYG93MUcD3=76_TSh Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Now, since /usr/src has been siwtched to git on several boxes and the forme= r svn tag $FreeBSD$ seem not valid/useful anymore, how am I (or any other here) suppo= sed to "mergemaster"? I did a full "mergemaster -CUFi" lately and did the same again, but when me= rgemaster 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.= =20 Thanks in advance, a happy new year oh --Sig_/+TfrBvlYG93MUcD3=76_TSh Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iHUEARYIAB0WIQSy8IBxAPDkqVBaTJ44N1ZZPba5RwUCX/L9gAAKCRA4N1ZZPba5 RyeDAP0VJ1cCcIaBgTRluO4/yopS47/7ATEtHa9trN95WbDbswEAoMAq8IUZVnnz sh1Q94T7trtCjOby2/IYLd4oZcJUXw0= =bPBl -----END PGP SIGNATURE----- --Sig_/+TfrBvlYG93MUcD3=76_TSh--