From nobody Thu Oct 2 09:35:10 2025 X-Original-To: freebsd-current@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ccmqS0WZDz69S9v for ; Thu, 02 Oct 2025 09:35:16 +0000 (UTC) (envelope-from ivy@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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ccmqS01NMz3VHK; Thu, 02 Oct 2025 09:35:16 +0000 (UTC) (envelope-from ivy@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759397716; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=n3RklIEKFHew6PrlUgmD3jijXgmlb4B9EGHrNfD11So=; b=pXq5UuRs1quKPDeC6S2sY2dMK8c+mZM+5PXggTXuq8A5M88PplA370krvx3qpomrr5CqoS VUREbfy7X0wVF6L8Y++PS16pK8ViPuE7Di/k/pfYMk2AUPrVBIfmZmhRhrmsBjfNPcNxub FfwFaZu31yHi1UZiF7mGe34JuLekuUd6GzmLI1YdyW1JuS/fosXD0k0hZzAkGz//wfj8W8 H1Dn6JY2Jy4byu/4vLk3cLARl9IvHrwyqBj40JzmQRFkE6cZyXZRUyVj1ekQRiPb3lqEMI QfIJXTzs4xOP4lKvHZSJ51BC5oxtHTryPldlxwv9zhZBZY7Ksqd9IaQBd2uxAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759397716; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=n3RklIEKFHew6PrlUgmD3jijXgmlb4B9EGHrNfD11So=; b=LDaZ0o2Tsr4AEAjd3qzN6uqPiO1qegcmAYHvCclVaa6LhSX5kltHGZ0EwTyaKOEN6f/QZU titZB5v98ePvsswS31TD29pLJw1rlxkaKFDd4NoFKowNauW4hcYarLr/IXzeYQAmuB5PB0 nTzchW2bh9fzBjCXYvVT4qt+Ivi/76JXSWcJARSdcTq5fV8LEw70ARj0Gpdd1JLv+xqQOd btJXUrMs7FutSekbKbzmCXlkOZ7rL7kaTpuq8AV/X0W8tLW6jnCZUiTyQxT//PbDs8XaiO xYizxqRrDDDxHI6huDGAR1Su9vrsrzWBu+6hI3JHlK+hyeC3YLMNpfgvXRyG8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759397716; a=rsa-sha256; cv=none; b=JpG+tDzc2zXoGxdFG2wrRX60tBTXtt4csnERDynvH6mjp22Ab9kXnJS50kIWkmZVM5u9Ad a9vDOUTmwWw+WHBciMbr9XHSimNXWfVbH6lDWprImEfzAwanDUiGB6W9IrbyE7PXQRzVi0 M1q92Eq9o1+N5O/Cu9QUEjsZtrwYwEO3ddLvQy3tWb3OLJP2CZin8M8KrEDN5kwXldTZTW VdGDz8Um4XU7fUqDiyKLjbsOMWcaYbcTdOUOajwm5EX09s/T6paVRJO9NxkV5wUvb74yod vZJ1YB63jysrOU+Ce1KnBaP0ySEwvP8udLHLEyLuTeO4csycQCb9WocqFF+HtQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from amaryllis.le-fay.org (amaryllis.le-fay.org [IPv6:2a00:1098:6b:400::9]) (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 did not present a certificate) (Authenticated sender: ivy/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4ccmqR42VYzt0D; Thu, 02 Oct 2025 09:35:15 +0000 (UTC) (envelope-from ivy@freebsd.org) Date: Thu, 2 Oct 2025 10:35:10 +0100 From: Lexi Winter To: Gleb Popov Cc: freebsd-current@freebsd.org Subject: Re: Questions about pkgbase Message-ID: Mail-Followup-To: Gleb Popov , freebsd-current@freebsd.org References: <20251002.180121.980053125503545103.yasu@FreeBSD.org> List-Id: Discussions about the use of FreeBSD-current List-Archive: https://lists.freebsd.org/archives/freebsd-current List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-current@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="V7mHZrPLwLbE6wzc" Content-Disposition: inline In-Reply-To: --V7mHZrPLwLbE6wzc Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Gleb Popov wrote in : > > pkg(8) will attempt a 3-way merge when installing a new configuration > > file. if this is successful, no action is required. if it fails, the > > existing file will be left unchanged and pkg will create a .pkgnew > > file, which you need to manually merge with the existing version of the > > file. > > > > this workflow is much worse than etcupdate or freebsd-update, and i'm > > not convinced we should release with pkgbase as the recommended option > > without a better solution, but we'll see. >=20 > Doesn't etcupdate perform the same 3-way merge during its operation? > My understanding is that pkg and etcupdate will produce the same > results for the same inputs. yes, the merge functionality is the same (more or less), but the result for the user is worse: etcupdate makes it clear which files failed to merge and offers a manual resolution of the merge with conflict markers, while pkg just prints a message, which is usually lost in the hundreds of other messages printed during an upgrade, and requires the user to manually locate the unmerged files via find / -name '*.pkgnew', then you only get the old and new files with no way to easily see what has changed in the new version of the file. (basically, this is a manual two-way merge.) if there's a better way to do this with pkg, i'd definitely like to know about it. --V7mHZrPLwLbE6wzc Content-Type: application/pgp-signature; name=signature.asc -----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQSyjTg96lp3RifySyn1nT63mIK/YAUCaN5HSgAKCRD1nT63mIK/ YHK+AP4sZ/2qXOvSXp6hsUupjfbQeNMaSn2AwlmbxHYC2wYRAwEA4rxpj9TzyAsy GscO32tcdAh61/f0u3qhQTmVt6ACsgU= =jkfr -----END PGP SIGNATURE----- --V7mHZrPLwLbE6wzc--