From owner-freebsd-current@freebsd.org Mon Jan 4 12:57:44 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 E145D4D5537; Mon, 4 Jan 2021 12:57:44 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D8bJS60sWz4h0Z; Mon, 4 Jan 2021 12:57:44 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from smtp.infracaninophile.co.uk (smtp.infracaninophile.co.uk [81.2.117.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.infracaninophile.co.uk", Issuer "Let's Encrypt Authority X3" (verified OK)) (Authenticated sender: matthew/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id A32D92C003; Mon, 4 Jan 2021 12:57:44 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from PD0786.local (unknown [IPv6:2001:8b0:151:1:4c2d:4c71:d432:ad5b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: m.seaman@infracaninophile.co.uk) by smtp.infracaninophile.co.uk (Postfix) with ESMTPSA id 47E401B56F; Mon, 4 Jan 2021 12:57:43 +0000 (UTC) From: Matthew Seaman Subject: Re: CURRENT, usr/src on git, howto "mergemaster"? To: current@freebsd.org, "Hartmann, O." , FreeBSD CURRENT References: <20210104123512.0f5e1b01@hermann.fritz.box> Message-ID: <3137a3ce-50c8-bee5-6a15-7701e3281500@FreeBSD.org> Date: Mon, 4 Jan 2021 12:57:43 +0000 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:78.0) Gecko/20100101 Thunderbird/78.5.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-GB Content-Transfer-Encoding: 7bit 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 12:57:44 -0000 On 04/01/2021 12:29, David Wolfskill wrote: > 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. The process of merging changes in etcupdate(1) is essentially identical to merging in mergemaster(1) -- the difference being that typically etcupdate(1) will run to completion without any user intervention needed, or else it will flag up that there are unresolved differences to merge and flag to the user to run `etcupdate resolve` as a separate command. This is much more time efficient than the typical mergemaster(1) procedure, and I find it lends itself much more effectively to automation through eg. ansible. (ie. you can just run the first `etcupdate` through automation across all of your server inventory, and then go round and manually resolve anything that needs it.) Cheers, Matthew