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 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 > .... 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: '“pre-world” 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 -- David H. Wolfskill david_at_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.
This archive was generated by hypermail 2.4.0 : Wed May 19 2021 - 11:41:26 UTC