Date: Mon, 8 Jun 2020 06:47:37 +0100 From: Matthew Seaman <matthew@FreeBSD.org> To: freebsd-pkgbase@freebsd.org Subject: Re: Not getting expected 3-way merge Message-ID: <d420ca0a-548a-4289-3fa0-81ed0a717235@FreeBSD.org> In-Reply-To: <045fe46b-537a-3a09-0e8b-9e4f2577f1f7@FreeBSD.org> References: <8438088e-2d06-0511-c725-a4a497a9a1f0@FreeBSD.org> <CACNAnaGXXYFE1QeqgizVR2DD2n-nuvv2QGjaLkZHm3NYVqRWpQ@mail.gmail.com> <045fe46b-537a-3a09-0e8b-9e4f2577f1f7@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --EowipOGwAzdepJYLKJv73XoBws2WSQhZj Content-Type: multipart/mixed; boundary="od8UlGiOjWSOMOS4Nt6O9HSgrHs6KUZy1" --od8UlGiOjWSOMOS4Nt6O9HSgrHs6KUZy1 Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: quoted-printable 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? >> >=20 > Looks like that's exactly what happenend, according to my syslog: >=20 > 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.s2020053009374= 7 > 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.s2020060703195= 4 > 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 > [...] >=20 > 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 --od8UlGiOjWSOMOS4Nt6O9HSgrHs6KUZy1-- --EowipOGwAzdepJYLKJv73XoBws2WSQhZj Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEGfFU7L8RLlBUTj8wAFE/EOCp5OcFAl7d0PlfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE5 RjE1NEVDQkYxMTJFNTA1NDRFM0YzMDAwNTEzRjEwRTBBOUU0RTcACgkQAFE/EOCp 5Of06g//eJhiZjy4KznYmnxnD/eZWjhXQQ9h2rCCUytvqN1mLaESXn6K9rLAkWEJ hx0hSGyHCKMZOG3x7ybr+sE6kdLCRQRaD6swn5dl0bFJ8q7923A+aXVxzmuHgbfC +bouHZtLgQpBsb6gTfHQIGsx/6Xa9MwJzb0pd2ZAvcYgOH5s9hA1J0j46ls7HWFx 7had/5CRBWQCXefcdJQE5Z0+H1E1VYS3gz9JjBzl9S5SG5StN7DgWSqKzrnIp6it K2+cNe4vmwT+kRIt7Mblgd54gK3rGxmGBysEfw9jJzbE7cRSIGJsm5DkRPTvT0BG JFt8NLt80ACWoMusB2KEmYfRKs9sKG0AeiL9kOMl1547FH4VC0zPtx91fQG4SsKC 3duwqDBL8DW7HgKT6MP67EykSzgLgEXKQNVoZXlBn49f3VlVNrzVCFV/uiF0JP98 XPWzbJpR3RQQk0jsGH7JtX9qY7Ie/cj4ytlIP2HB/egDwTSOJqbtPr9k1FQj1Aml PG1gv+QzC6EH2bSoiCFofuUlGQb4H7d3ZzhjpxwyUrvGu3NckhCEWAtm3LTfegVe DR9Z++q2Svr0JKUqXMwXYGTib7Zh6izlHILpPfhwJ/H9C/srq82BW5f69L1YmJuT EasK6i646inpYTTj/lUVnb5AxympJBER5RLPXWwOUHfhFSsJxI0= =7CK6 -----END PGP SIGNATURE----- --EowipOGwAzdepJYLKJv73XoBws2WSQhZj--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?d420ca0a-548a-4289-3fa0-81ed0a717235>