Date: Thu, 2 Oct 2025 10:35:10 +0100 From: Lexi Winter <ivy@freebsd.org> To: Gleb Popov <arrowd@freebsd.org> Cc: freebsd-current@freebsd.org Subject: Re: Questions about pkgbase Message-ID: <aN5HTt0kWCbD_lNf@amaryllis.le-fay.org> In-Reply-To: <CALH631=ioRih8n-DhD0D1CWjp3kbqemeJUzq2kBgg8GORjAN3g@mail.gmail.com> References: <20251002.180121.980053125503545103.yasu@FreeBSD.org> <aN5DKrWeSlT978zr@amaryllis.le-fay.org> <CALH631=ioRih8n-DhD0D1CWjp3kbqemeJUzq2kBgg8GORjAN3g@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] 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. [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQSyjTg96lp3RifySyn1nT63mIK/YAUCaN5HSgAKCRD1nT63mIK/ YHK+AP4sZ/2qXOvSXp6hsUupjfbQeNMaSn2AwlmbxHYC2wYRAwEA4rxpj9TzyAsy GscO32tcdAh61/f0u3qhQTmVt6ACsgU= =jkfr -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?aN5HTt0kWCbD_lNf>