From owner-freebsd-current@freebsd.org Mon Jan 4 13:22:13 2021 Return-Path: Delivered-To: freebsd-current@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9020F4D602D; Mon, 4 Jan 2021 13:22:13 +0000 (UTC) (envelope-from jbtakk@iherebuywisely.com) Received: from aibo.runbox.com (aibo.runbox.com [91.220.196.211]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4D8brj3D1tz4jBL; Mon, 4 Jan 2021 13:22:13 +0000 (UTC) (envelope-from jbtakk@iherebuywisely.com) Received: from [10.9.9.127] (helo=rmmprod05.runbox) by mailtransmit03.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1kwPoI-0004cQ-3j; Mon, 04 Jan 2021 14:22:10 +0100 Received: from mail by rmmprod05.runbox with local (Exim 4.86_2) (envelope-from ) id 1kwPoI-0007Gk-2V; Mon, 04 Jan 2021 14:22:10 +0100 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Received: from [Authenticated alias (650894)] by runbox.com with http (RMM6); Mon, 04 Jan 2021 13:22:10 GMT From: "Jeffrey Bouquet" To: "Matthew Seaman" CC: "current" , "ohartmann" , "FreeBSD CURRENT" Subject: Re: CURRENT, usr/src on git, howto "mergemaster"? Date: Mon, 04 Jan 2021 05:22:10 -0800 (PST) X-RMM-Aliasid: 650894 X-Mailer: RMM6 In-Reply-To: <3137a3ce-50c8-bee5-6a15-7701e3281500@FreeBSD.org> Message-Id: X-Rspamd-Queue-Id: 4D8brj3D1tz4jBL X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Jan 2021 13:22:13 -0000 On Mon, 4 Jan 2021 12:57:43 +0000, Matthew Seaman 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