Date: Wed, 30 Dec 2020 08:19:24 -0800 From: David Wolfskill <david@catwhisker.org> To: FreeBSD-STABLE Mailing List <freebsd-stable@freebsd.org> Subject: Re: git, $FreeBSD$ and mergemaster Message-ID: <X%2ByojCHPAdW4Ln1o@albert.catwhisker.org> In-Reply-To: <X%2Bylt3fifErOca7W@acme.spoerlein.net> References: <CAJuc1zNmSJ_qcJSSEFnihE4aLNvjZKUVgFA8GKrymmJ38qSfDw@mail.gmail.com> <CACNAnaHaNqXzGqzG0KaHJSc_K_9fDWCOaApm2K%2BG9uzKGKc5WQ@mail.gmail.com> <CAJuc1zNQJyJyvYJAEM2Gcv0cc2XSQANHL8wjiZ7Z6QWFNzoaUw@mail.gmail.com> <X%2BXYjupHKfyEekPL@albert.catwhisker.org> <X%2Bylt3fifErOca7W@acme.spoerlein.net>
next in thread | previous in thread | raw e-mail | index | archive | help
--suevv0QSVtWAHhqG Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Dec 30, 2020 at 05:07:19PM +0100, Ulrich Sp=F6rlein 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 <jonc@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." >=20 > The only way forward is full git! Provide the /etc equivalent in a git=20 > branch or subdir, then check it out to /etc and handle local changes=20 > with git rebase or git merge. >=20 > (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 --=20 David H. Wolfskill david@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. --suevv0QSVtWAHhqG Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGTBAEBCgB9FiEE4owz2QxMJyaxAefyQLJg+bY2PckFAl/sqIxfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUy OEMzM0Q5MEM0QzI3MjZCMTAxRTdGMjQwQjI2MEY5QjYzNjNEQzkACgkQQLJg+bY2 PcmdVgf9HjmSW/lGHDG4u55e8Tb/JIJ/3LuUMLM24UvIoFgkju45pwAtG15pRxxW pjkiTCO3jExPHE8p9FVq8sqv0sZFGp+0MonAmRjT9rIszzKMYppYvVdfdMvRVoj7 cUDY2XnYyR0mTMQogXI+EpARbNFyUT0zdEil88+KBi3F6p+nwLwldzmKiCmjFlW6 LGK7Q7VROlesXqTOKnYW/WJw64GTOiTI//DulO33saN4zGo7gSVDJaN9ScruBGN0 DEMTk44ve9GsCZFN5FGEfLEVtvAyUxKpOEhjYXxYxwIf8qD9TeGQjFXihCxNNEd1 /Eq78Fpg+bZPiijKPskFWu1b0ijLmw== =xiFR -----END PGP SIGNATURE----- --suevv0QSVtWAHhqG--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?X%2ByojCHPAdW4Ln1o>