Date: Tue, 21 Apr 2020 21:17:55 +0000 From: Glen Barber <gjb@freebsd.org> To: freebsd-git@freebsd.org Subject: Git tags vs SVN tags and some edge cases Message-ID: <20200421211755.GA93074@FreeBSD.org>
next in thread | raw e-mail | index | archive | help
--Q68bSM7Ycu6FN28Q Content-Type: text/plain; charset=us-ascii Content-Disposition: inline I was asked to send and email about this as something about which we need to be aware when retaining history during the official final conversion from SVN to Git. There are four known anomalies (naturally, all of which are mine) with SVN tags that may not translate well when the conversion to Git is done. Here follows said known anomalies and the reason for their existence: 1) 11.0-RELEASE and the case of the real RELEASE - 11.0-RELEASE-p1: When the initial builds for 11.0-RELEASE were done, there was still an outstanding issue with the freebsd-update(8) utility that I was under the impression had already been fixed, but it had not. Since 11.0-RELEASE was already available on the download mirrors and had already become actively used, the original ISOs were renamed and following the fix to the issue blocking the release, we opted to release 11.0-RELEASE as 11.0-RELEASE-p1, retaining the original release/11.0.0 tag and re-tagging the real official release as release/11.0.1. 2) 10.0-RELEASE and the case of missing build fixes: During the 10.0-RELEASE cycle, the release/10.0.0 tag was created from r260664, however there were several changes to fix various parts of the build, committed as r260788. The real 10.0-RELEASE tag was created from r260788 to incorporate said fixes. So, this tag was deleted and recreated. [1] [2] [3] 3) 9.3-RELEASE and the case of the wrong source revision: The original 9.3-RELEASE tag, release/9.3.0, was created from r268519 by mistake, when it should have been created from the commit that changed the name to -RELEASE (r268512). So, this tag was deleted and recreated. [4] [5] [6] 4) 8.4-RELEASE and the case of the change-in-a-tag wrong commit: The original commit for 8.4-RELEASE included a change to sys/conf/newvers.sh to rename from -RC3 to -RELEASE, which was wrong (r250625). The release/8.4.0 branch was deleted in r250629 and recreated from r251258 (not a typo) after the erroneous commit had been discovered some time later. [1] https://lists.freebsd.org/pipermail/svn-src-release/2014-January/000007.html [2] https://lists.freebsd.org/pipermail/svn-src-release/2014-January/000008.html [3] https://lists.freebsd.org/pipermail/svn-src-release/2014-January/000009.html [4] https://lists.freebsd.org/pipermail/svn-src-release/2014-July/000010.html [5] https://lists.freebsd.org/pipermail/svn-src-release/2014-July/000011.html [6] https://lists.freebsd.org/pipermail/svn-src-release/2014-July/000012.html [7] https://lists.freebsd.org/pipermail/svn-src-release/2013-May/000003.html [8] https://lists.freebsd.org/pipermail/svn-src-release/2013-May/000002.html [9] https://lists.freebsd.org/pipermail/svn-src-release/2013-June/000005.html Glen --Q68bSM7Ycu6FN28Q Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAl6fYv4ACgkQAxRYpUeP 4pMMng//b+jGGok0hTPC9EIvu/H1s6mMKESRKqjLUZ501Mkliq/JOxSAwvQpnfpm bdWUNZXJghLmLAPISnNyNV/0hqjK3haUg7Gh6gSnWxo0fAhSHetXhF++bu+ngPa2 eFaVIOhcSXP2hktf6WxJABDPlrQBx9glPWYTVyp77aDuTNt2pX0DQyBSPYSnwT4t vweoi2sQBs6rDSOSa7blGFiTdlAnpqxd/YUVTdOlnd213BbA0J0hWlBQChTVphMv GFK8guup01wrANPzOODxOcP11R/SRsnVkv+b0BYZ4pG4ZYey4qeum5+aieIOY5YQ BzAxdV1N6QgSSGD4OGu0qwV5pg0YOYhXsnY/+SCdwvnC05chMc0kY7qhZwNP2Pj7 6/Dw9u2YcTS9qGBZlC1d4L3nt3DGuGptTFtlMgrbgvkjw90hsGAk28Dp4bSqIDES LQJVtk5MyKliUwxYvR8EWfq43qfUsq664abjdhrsgkog0adZuj6Eqb3F+sk6FpzF haZFolBTz0JeN2ClIfz80yVJaR4YlD0g9hZN6LrRGJ2CmXN/Yj6nxr70PilsjGeN kSEAacwU2b+9vU00VZCyHmuOQg5um9yK/RGUcEqbLpwMTJjCKignKiGvf2m5FHxd 8qA+cwz00nLUxvaKVZqoouP9NF876aC3+ArixankBMP8M6yA3ME= =0cZp -----END PGP SIGNATURE----- --Q68bSM7Ycu6FN28Q--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20200421211755.GA93074>