Date: Fri, 03 Oct 2025 08:58:34 +0200 From: Alexander Leidinger <Alexander@Leidinger.net> To: Gleb Popov <arrowd@freebsd.org>, freebsd-current@freebsd.org Subject: Re: Questions about pkgbase Message-ID: <c9b66cfaa0e20b92bd61ac2ab33f5cbc@Leidinger.net> In-Reply-To: <aN5HTt0kWCbD_lNf@amaryllis.le-fay.org> References: <20251002.180121.980053125503545103.yasu@FreeBSD.org> <aN5DKrWeSlT978zr@amaryllis.le-fay.org> <CALH631=ioRih8n-DhD0D1CWjp3kbqemeJUzq2kBgg8GORjAN3g@mail.gmail.com> <aN5HTt0kWCbD_lNf@amaryllis.le-fay.org>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] Am 2025-10-02 11:35, schrieb Lexi Winter: > Gleb Popov wrote in > <CALH631=ioRih8n-DhD0D1CWjp3kbqemeJUzq2kBgg8GORjAN3g@mail.gmail.com>: >> > 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 <name>.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 [-- Attachment #2 --] -----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-----home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?c9b66cfaa0e20b92bd61ac2ab33f5cbc>