Not getting expected 3-way merge

[Matthew Seaman]

On 08/06/2020 06:31, Matthew Seaman wrote:
> On 07/06/2020 15:50, Kyle Evans wrote:
>> Hmm, I think pkg executed the merge successfully when the test user
>> was introduced here. Do you still have the transcript from this
>> upgrade available to make sure that it didn't deinstall -runtime due
>> to a conflict before reinstalling it?
>>
> 
> Looks like that's exactly what happenend, according to my syslog:
> 
> Jun  7 09:02:40 codling pkg[92260]:
> FreeBSD-utilities-13.0.s20200530093747 deinstalled
> Jun  7 09:02:40 codling pkg[92260]: FreeBSD-runtime-13.0.s20200530093747
> deinstalled
> Jun  7 09:02:40 codling pkg[92260]:
> FreeBSD-runtime-development-13.0.s20200530093747 deinstalled
> Jun  7 09:02:42 codling pkg[92260]: FreeBSD-clibs upgraded:
> 13.0.s20200530093747 -> 13.0.s20200607031954
> Jun  7 09:02:42 codling pkg[92260]: FreeBSD-ftp-13.0.s20200530093747
> deinstalled
> Jun  7 09:02:42 codling pkg[92260]: FreeBSD-telnet-13.0.s20200530093747
> deinstalled
> Jun  7 09:02:47 codling pkg[92260]: FreeBSD-runtime-13.0.s20200607031954
> installed
> Jun  7 09:02:47 codling pkg[92260]: FreeBSD-wpa upgraded:
> 13.0.s20200530093747 -> 13.0.s20200607031954
> Jun  7 09:02:47 codling pkg[92260]: FreeBSD-vi upgraded:
> 13.0.s20200530093747 -> 13.0.s20200607031954
> Jun  7 09:02:59 codling pkg[92260]:
> FreeBSD-utilities-13.0.s20200607031954 installed
> Jun  7 09:02:59 codling pkg[92260]: FreeBSD-unbound upgraded:
> 13.0.s20200530093747 -> 13.0.s20200607031954
> Jun  7 09:03:11 codling pkg[92260]: FreeBSD-tests upgraded:
> 13.0.s20200530093747 -> 13.0.s20200607031954
> [...]
> 
> There was a lot of churn with this upgrade to to all of the
> *-development packages being renamed to *-dev, a lot of which required
> manual cleanup.  It would have gone a lot better if pkg(8) had some
> mechanism to understand that the two packages were related.

Github issue https://github.com/freebsd/pkg/issues/1845 raised.

	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/20200608/a217f243/attachment.sig>