Date: Mon, 4 Jan 2021 04:29:42 -0800 From: David Wolfskill <david@catwhisker.org> To: "Hartmann, O." <ohartmann@walstatt.org> Cc: FreeBSD CURRENT <freebsd-current@freebsd.org> Subject: Re: CURRENT, usr/src on git, howto "mergemaster"? Message-ID: <X/MKNnDIdd/mCUNP@albert.catwhisker.org> In-Reply-To: <20210104123512.0f5e1b01@hermann.fritz.box> References: <20210104123512.0f5e1b01@hermann.fritz.box>
next in thread | previous in thread | raw e-mail | index | archive | help
--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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?X/MKNnDIdd/mCUNP>