Date: Mon, 8 Jun 2020 06:31:09 +0100 From: Matthew Seaman <matthew@FreeBSD.org> To: Kyle Evans <kevans@freebsd.org> Cc: freebsd-pkgbase@freebsd.org Subject: Re: Not getting expected 3-way merge Message-ID: <045fe46b-537a-3a09-0e8b-9e4f2577f1f7@FreeBSD.org> In-Reply-To: <CACNAnaGXXYFE1QeqgizVR2DD2n-nuvv2QGjaLkZHm3NYVqRWpQ@mail.gmail.com> References: <8438088e-2d06-0511-c725-a4a497a9a1f0@FreeBSD.org> <CACNAnaGXXYFE1QeqgizVR2DD2n-nuvv2QGjaLkZHm3NYVqRWpQ@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --0YGgreWEn8D7fu3j5dlppSXDSCqjQsEMF Content-Type: multipart/mixed; boundary="r4I5SLSJ07HH7MEAfOzZxzW6xpg3rJ0NL" --r4I5SLSJ07HH7MEAfOzZxzW6xpg3rJ0NL Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: quoted-printable 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? >=20 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. Cheers, Matthew --r4I5SLSJ07HH7MEAfOzZxzW6xpg3rJ0NL-- --0YGgreWEn8D7fu3j5dlppSXDSCqjQsEMF Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEGfFU7L8RLlBUTj8wAFE/EOCp5OcFAl7dzR1fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE5 RjE1NEVDQkYxMTJFNTA1NDRFM0YzMDAwNTEzRjEwRTBBOUU0RTcACgkQAFE/EOCp 5OeSfxAAgFfXIOzFd1Vpmdb9GaZXOsEgSxCPaI2w2/hdncc1qzuVpQIiq5GAz0d/ 8RXS+bw0E7R9ckX9KWdOQprkucw03iZPFrtFuFp0whIguAo4V/iDFYIzlGOu2HIA tK406AXtcBS4U5kHxOWi0+T1I0W4FBg6Cye//I4ys/tOANogzZVTB7J4aqjKsoDf e0/vZvHXM1uAQRBDEyE4rRyJdzH9cMsDkrrF2mJ0V+69/Q2AKe5JsefoKyZ6IB8n c0rUvK45SdxnrAz+2b7p41JTzX9EV6A4nsNxnkEaIQms1ym2tTW/r6HPeuzbpkRO flw9K0fXAcGddGZQRMVttogTEko2ewn4pLLw1XQm7RaIc9W99uC6gun3S0MnuYFS PmFiVKg9Gu/6zfsQMTokjelyi6U3CeIyjiOceXCKMDx/lgauHMSd3a56C6InarL7 Agtm8tez+uFFWG7LVygG8FLexFmiuvOrKwy/qAnoxVWu0QNW58e6VOBwxAq5uUpG gYxSlHTSSIcAUwFpsh1nDuHMYgdOh0Lg9TLC1zP3fgIBfZs/S0oRQGpKG4HTtyK6 MTKqQ+zaOjUGB77EFp0MpoQVur2LnmGj9U7E8H6XAUUCCLXWbfuY8pCZmHNAbE1I uyjHm5W7OaKvr/Q/wg36VIFXdMX36kF6jCe+gQ7bgefA6e/Kwtw= =6dY7 -----END PGP SIGNATURE----- --0YGgreWEn8D7fu3j5dlppSXDSCqjQsEMF--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?045fe46b-537a-3a09-0e8b-9e4f2577f1f7>