Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 2 Oct 2025 12:26:38 +0300
From:      Gleb Popov <arrowd@freebsd.org>
To:        ivy@freebsd.org
Cc:        freebsd-current@freebsd.org
Subject:   Re: Questions about pkgbase
Message-ID:  <CALH631=ioRih8n-DhD0D1CWjp3kbqemeJUzq2kBgg8GORjAN3g@mail.gmail.com>
In-Reply-To: <aN5DKrWeSlT978zr@amaryllis.le-fay.org>
References:  <20251002.180121.980053125503545103.yasu@FreeBSD.org> <aN5DKrWeSlT978zr@amaryllis.le-fay.org>

index | next in thread | previous in thread | raw e-mail

On Thu, Oct 2, 2025 at 12:17 PM Lexi Winter <ivy@freebsd.org> wrote:
>
> 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.


help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CALH631=ioRih8n-DhD0D1CWjp3kbqemeJUzq2kBgg8GORjAN3g>