From owner-freebsd-current@freebsd.org Mon Jan 4 12:29:45 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 B9EAF4D47CA for ; Mon, 4 Jan 2021 12:29:45 +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 4D8Zh867skz4dXS for ; Mon, 4 Jan 2021 12:29:44 +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 104CTgqZ013056; Mon, 4 Jan 2021 12:29:42 GMT (envelope-from david@albert.catwhisker.org) Received: (from david@localhost) by albert.catwhisker.org (8.16.1/8.16.1/Submit) id 104CTgb9013055; Mon, 4 Jan 2021 04:29:42 -0800 (PST) (envelope-from david) Date: Mon, 4 Jan 2021 04:29:42 -0800 From: David Wolfskill To: "Hartmann, O." Cc: FreeBSD CURRENT Subject: Re: CURRENT, usr/src on git, howto "mergemaster"? Message-ID: Reply-To: current@freebsd.org Mail-Followup-To: current@freebsd.org, "Hartmann, O." , FreeBSD CURRENT References: <20210104123512.0f5e1b01@hermann.fritz.box> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="catO1b3MSlfw8k7j" Content-Disposition: inline In-Reply-To: <20210104123512.0f5e1b01@hermann.fritz.box> X-Rspamd-Queue-Id: 4D8Zh867skz4dXS X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.40 / 15.00]; HAS_REPLYTO(0.00)[current@freebsd.org]; RBL_DBL_DONT_QUERY_IPS(0.00)[107.204.234.170:from]; FREEFALL_USER(0.00)[david]; FROM_HAS_DN(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:107.204.234.170]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; REPLYTO_DOM_NEQ_FROM_DOM(0.00)[]; ARC_NA(0.00)[]; DMARC_NA(0.00)[catwhisker.org]; SPAMHAUS_ZRD(0.00)[107.204.234.170:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RCPT_COUNT_TWO(0.00)[2]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; RCVD_TLS_LAST(0.00)[]; SIGNED_PGP(-2.00)[]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:7018, ipnet:107.192.0.0/12, country:US]; SUBJECT_ENDS_QUESTION(1.00)[]; MAILMAN_DEST(0.00)[freebsd-current]; RCVD_COUNT_TWO(0.00)[2] 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 12:29:45 -0000 --catO1b3MSlfw8k7j Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Jan 04, 2021 at 12:35:28PM +0100, Hartmann, O. wrote: > Now, since /usr/src has been siwtched to git on several boxes and the for= mer svn tag > $FreeBSD$ seem not valid/useful anymore, how am I (or any other here) sup= posed to > "mergemaster"? >=20 > 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 fil= es in etc edited > by me. Is there a workaround and if so, please hint me to the announcemen= t.=20 >=20 > Thanks in advance, > a happy new year > .... After trying to use mergemaster for a couple of weeks (after the switch to sources from git, vs. svn) of daily tracking of head & stable/12 on a pair of machines (and weekly tracking of stable/12 on another 4), I gave up and switched to etcupdate. Note that each of mergemaster and etcupdate has a "-p" flag; it is functionally equivalent between the two, but called slightly differently: * mergemaster: 'Pre-buildworld mode' * etcupdate: '=E2=80=9Cpre-world=E2=80=9D mode' And note that per src/UPDATING, "mergemaster -Fp" is invoked after "make buildworld" but before "make installworld" (under "To rebuild everything and install it on the current system.", under "COMMON ITEMS:"). Caveat: Since the switch, I have yet to encounter a case where I needed to merge a change in (e.g., because of a newly-created user, or there was a commit to /etc/crontab or /etc/newsyslog.conf). I may find things rather "more interesting" when that happens; we shall see. 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. --catO1b3MSlfw8k7j Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGTBAEBCgB9FiEE4owz2QxMJyaxAefyQLJg+bY2PckFAl/zCjZfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUy OEMzM0Q5MEM0QzI3MjZCMTAxRTdGMjQwQjI2MEY5QjYzNjNEQzkACgkQQLJg+bY2 PcnXfQf/YiOWK4orxYmvoewFcE/LoatYattJ5Wq15vIQNV3WFuRsHElJAxy71p3b kCBGUu9JHQHDRUdgV5uYG52eU/xlva0n+B//GD7zhxM91zw213qUh5UMr0lAqKt+ YxqGhu9oxmk/xbtpuM7+fJCECN4RlJPHiU3EGR3dnx35CWOE1Uhvy7mcGhdrY2LR TYOGLSP286QbQAuWviXhnVwuY5oFr+BjZekFKV3DiSJWj9xVpMdOKaRrGzhG42fw h+jHB/ax87FZtkCoJdmrR/AzDywojvsW8t6ycqkiN8C8iO0JYve/Xqv76Peid8hJ k0v3B4PSMoPjibeJi3qwXcXamkUEjw== =aPWP -----END PGP SIGNATURE----- --catO1b3MSlfw8k7j--