Not getting expected 3-way merge

[Matthew Seaman]

I just had a somewhat amusing time updating my CURRENT pkgbase VM.

pkg(8) managed to blow away my /etc/master.passwd and /etc/group,
replacing them with default versions.  I believe this was triggered by
the introduction of the new 'test' user and group upstream.  Luckily I
noticed pretty quickly and could manually merge with the copies from
/var/backup, before I did anything like trying to reboot. That would
have got me locked out of the system.

Now, `pkg info -R FreeBSD-runtime-13.0.s20200607031954` lists both of
those files under the `config` section -- so presumably, pkg(8) should
do a 3-way merge?  Is there something I'm missing here?  This seems too
obvious a bug not to have been squashed already.

I also find that /etc/mail/aliases keeps getting overwritten -- but that
file is not listed in the `config` section in the FreeBSD-runtime
manifest, which I think it probably should be.

	Cheers,

	Matthew

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 963 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freebsd.org/pipermail/freebsd-pkgbase/attachments/20200607/cdc48e44/attachment.sig>