Date: Mon, 04 Jan 2021 05:22:10 -0800 (PST) From: "Jeffrey Bouquet" <jbtakk@iherebuywisely.com> To: "Matthew Seaman" <matthew@FreeBSD.org> Cc: "current" <current@freebsd.org>, "ohartmann" <ohartmann@walstatt.org>, "FreeBSD CURRENT" <freebsd-current@freebsd.org> Subject: Re: CURRENT, usr/src on git, howto "mergemaster"? Message-ID: <E1kwPoI-0007Gk-2V@rmmprod05.runbox> In-Reply-To: <3137a3ce-50c8-bee5-6a15-7701e3281500@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, 4 Jan 2021 12:57:43 +0000, Matthew Seaman <matthew@FreeBSD.org> wro= te: > On 04/01/2021 12:29, David Wolfskill wrote: >=20 > > 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. >=20 > The process of merging changes in etcupdate(1) is essentially identical=20 > to merging in mergemaster(1) -- the difference being that typically=20 > etcupdate(1) will run to completion without any user intervention=20 > needed, or else it will flag up that there are unresolved differences to= =20 > merge and flag to the user to run `etcupdate resolve` as a separate comma= nd. >=20 > This is much more time efficient than the typical mergemaster(1)=20 > procedure, and I find it lends itself much more effectively to=20 > automation through eg. ansible. (ie. you can just run the first=20 > `etcupdate` through automation across all of your server inventory, and=20 > then go round and manually resolve anything that needs it.) >=20 > Cheers, >=20 > Matthew >=20 > _______________________________________________ > freebsd-current@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-current > To unsubscribe, send any mail to "freebsd-current-unsubscribe@freebsd.org" after checking out stable/12 with git, here a # cd /usr/src/usr.sbin/mergemaster # sh ./mergemaster.sh -piPcv and then answering 'l' for left for most merges it seems to have sufficed.=20 This was before installworld.=20 In case that helps. I keep that command parameter in /etc/motd for each time around lookup.=20
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1kwPoI-0007Gk-2V>