On Wed, Dec 30, 2020 at 05:07:19PM +0100, Ulrich Spörlein wrote: > ... > >> However, wouldn't this mean that every run of "mergemaster" would > >> prompt for local changes? The nice thing about using the $FreeBSD$ > >> tags was that if I approved a local-change, subsequent runs of > >> mergemaster would not prompt me about the local-change unless the > >> etc-file had been modified in the source tree. > >> > >> Cheers. > >> -- > >> Jonathan Chen <j...@chen.org.nz> > >> .... > > > >Indeed: the above-described behavior is what I have observed so far > >since the transition (tracking head & stable/12 daily on two machines). > > > >I would go a bit further than stating that the prior behavior was > >"nice." > > The only way forward is full git! Provide the /etc equivalent in a git > branch or subdir, then check it out to /etc and handle local changes > with git rebase or git merge. > > (I'm not even joking! :) > ....
After more-or-less coping with the above, I switched from mergemaster to etcupdate this morning. That avoids the issue. Perhaps src/UPDATING's "COMMON ITEMS"/"To rebuild everything and install it on the current system." (et al.) might merit an update? (It cites "mergemaster," but not "etcupdate.") Peace, david -- David H. Wolfskill da...@catwhisker.org While Trump successfully conned a lot of people for a while, in the end he's just a failure throwing a temper tantrum because he lost. See https://www.catwhisker.org/~david/publickey.gpg for my public key.
signature.asc
Description: PGP signature
