Date: Tue, 12 May 2020 18:43:54 +0200 From: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= <uqs@freebsd.org> To: Glen Barber <gjb@freebsd.org> Cc: freebsd-git@freebsd.org Subject: Re: Git tags vs SVN tags and some edge cases Message-ID: <CAJ9axoRH3YUmCs7qsQB6-Wns8Q6kKKbPL_WLhN0R5-7sigo1Sw@mail.gmail.com> In-Reply-To: <20200421211755.GA93074@FreeBSD.org> References: <20200421211755.GA93074@FreeBSD.org>
index | next in thread | previous in thread | raw e-mail
Am Di., 21. Apr. 2020 um 23:18 Uhr schrieb Glen Barber <gjb@freebsd.org>: > 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 > Thanks for the summary Glen, the tags are being avoided by the rules and not extra tags are being produced. https://github.com/freebsd/git_conv/blob/master/freebsd-base.rules#L65-L77 (couldn't find a way to make a stable URL, so the highlighted lines are sure to drift) Cheers Ulihelp
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAJ9axoRH3YUmCs7qsQB6-Wns8Q6kKKbPL_WLhN0R5-7sigo1Sw>