From nobody Fri Oct 3 06:58:34 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 4cdKK96CVxz69jsK for ; Fri, 03 Oct 2025 06:59:25 +0000 (UTC) (envelope-from Alexander@Leidinger.net) Received: from mailgate.Leidinger.net (bastille.leidinger.net [89.238.82.207]) (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 ECDSA (prime256v1) client-digest SHA256) (Client CN "mailgate.leidinger.net", Issuer "E8" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cdKK74TTsz3p73; Fri, 03 Oct 2025 06:59:23 +0000 (UTC) (envelope-from Alexander@Leidinger.net) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=leidinger.net header.s=outgoing-alex header.b=INWCRw89; dmarc=pass (policy=quarantine) header.from=leidinger.net; spf=pass (mx1.freebsd.org: domain of Alexander@Leidinger.net designates 89.238.82.207 as permitted sender) smtp.mailfrom=Alexander@Leidinger.net 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=leidinger.net; s=outgoing-alex; t=1759474761; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=8ga7t0epdJIGaKzMzF/glS+8YjvY0G/uFvAY5lrETmE=; b=INWCRw89kvSukV/E8wjI65sWYVbo/YNNUaoz0jwqUhAfdA8+BGD7iDlI1eKtE1irx+DYR1 V/Rozv+as669p+8vctiu2t+ICIb73NmiqSPMud3j1D+uK/xQwqSy8i1v2voj1YJUtMGMP2 f0s3TlHNS1G5GmvCFUOOrOR70TV1h9Vh8PEDnUsrPFFwyaUGCl8tJKBCMORZIGW640ce/m Xnri5cfW0sMnIhDRf8itgOvznu+qOLD5llsKF3KWi/ISU7SgXnmuG0GbKumQbI/eLypwyU 7N3b6kEJM7NfGR9x/mABLUlU+jvfXZgWMmicT1YuvPtSUwR79aQaWqEpNcMj3A== Date: Fri, 03 Oct 2025 08:58:34 +0200 From: Alexander Leidinger To: Gleb Popov , freebsd-current@freebsd.org Subject: Re: Questions about pkgbase In-Reply-To: References: <20251002.180121.980053125503545103.yasu@FreeBSD.org> Message-ID: Organization: No organization, this is a private message. Content-Type: multipart/signed; protocol="application/pgp-signature"; boundary="=_d44dd204fb473fa11426a0b98fc9ea40"; micalg=pgp-sha256 X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.35 / 15.00]; SIGNED_PGP(-2.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-0.999]; NEURAL_SPAM_SHORT(0.64)[0.645]; DMARC_POLICY_ALLOW(-0.50)[leidinger.net,quarantine]; R_SPF_ALLOW(-0.20)[+mx]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; R_DKIM_ALLOW(-0.20)[leidinger.net:s=outgoing-alex]; ONCE_RECEIVED(0.10)[]; ARC_NA(0.00)[]; MISSING_XM_UA(0.00)[]; HAS_ORG_HEADER(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; DKIM_TRACE(0.00)[leidinger.net:+]; MID_RHS_MATCH_FROM(0.00)[]; TO_DN_SOME(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_COUNT_ZERO(0.00)[0]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; MLMMJ_DEST(0.00)[freebsd-current@freebsd.org]; HAS_ATTACHMENT(0.00)[] X-Rspamd-Queue-Id: 4cdKK74TTsz3p73 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --=_d44dd204fb473fa11426a0b98fc9ea40 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; format=flowed Am 2025-10-02 11:35, schrieb Lexi Winter: > 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. >> >> 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. Teach pkg to do the same what etcupdate does: handle the conflict interactively (and doing that for ports too would be nice). What the default way (interactive or non-interactive) shall be, would be discut^wbikeshed-able. Bye, Alexander. -- http://www.Leidinger.net Alexander@Leidinger.net: PGP 0x8F31830F9F2772BF http://www.FreeBSD.org netchild@FreeBSD.org : PGP 0x8F31830F9F2772BF --=_d44dd204fb473fa11426a0b98fc9ea40 Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc; size=833 Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEER9UlYXp1PSd08nWXEg2wmwP42IYFAmjfdCgACgkQEg2wmwP4 2IaQEA/9EIC1YeFkuBjobukN+2jcMLSC65pqfifre25ZxpInfiDprZChP3xY3D98 jXCAZlyzrQYSkm420ORA7ANXUM0QUoXkrTK1ambQkUiRNPS5QGLlX054zFOHBYuD yw7ZTdfgQOkbCoaRb6dIHYkuQS0Mu5nJwV+GXH0PwXgswDgMrmSRRHhGvM9h08Qv Sf/4pnEts2Qz7GNUDJPNF2hoE5hYjjJViTsr7+uV4pJ0nnHgWq7d9sZZWc2e2YhE YfT5DNlKe9yALxpLnmD+1QFlHZ4+2dgS4sMKmGYVZOo6EqZWCPIkn9MwkRnz70pJ qyRYDKrWzikCDlN076y93TYcGS4xm0MbPheWNl26W6xoHFgF8PAxr1lLsRIwYrYK MCWFw0W1XJ0TnlBOqq0OkBtJAVD9C3aTqy+TDoyeBexBOjN37nUVLvWISNNMjAdx w7VgQLwb397MAQ0xxuAtUAYzVOfdDGlI4pOEOoAMCt+bUolMn70pmYBv8ovEby3D uN9xKixeJrQ8bR4ZlcL4fpgLC0fwlDTGEFqNO7WPLOTg7vUXKwrVopo/VKymsTY6 M865bUgW2nKFdM+KPZGsrfzb9KqijKPanapu+VRXeHLW6bYild4ZOIxVPX0GemwQ Q/54mjEqEkD5JYqGUMhOH2UHk5s0G1azJ13uucudPh3TKtmX+gc= =yHgb -----END PGP SIGNATURE----- --=_d44dd204fb473fa11426a0b98fc9ea40--