git: 041b28524a3c - main - release: Add workaround to use SVN for ports

[Glen Barber]

On Wed, Jan 20, 2021 at 07:46:46PM +0900, Yasuhiro Kimura wrote:
> From: Yasuhiro Kimura <yasu at utahime.org>
> Subject: Re: git: 041b28524a3c - main - release: Add workaround to use SVN for ports
> Date: Wed, 20 Jan 2021 17:29:33 +0900 (JST)
> 
> > From: Glen Barber <gjb at FreeBSD.org>
> > Subject: git: 041b28524a3c - main - release: Add workaround to use SVN for ports
> > Date: Tue, 19 Jan 2021 18:38:50 GMT
> > 
> >> The branch main has been updated by gjb:
> >> 
> >> URL: https://cgit.FreeBSD.org/src/commit/?id=041b28524a3c69ff6e893067df156c3faabcac9a
> >> 
> >> commit 041b28524a3c69ff6e893067df156c3faabcac9a
> >> Author:     Glen Barber <gjb at FreeBSD.org>
> >> AuthorDate: 2021-01-19 18:38:33 +0000
> >> Commit:     Glen Barber <gjb at FreeBSD.org>
> >> CommitDate: 2021-01-19 18:38:33 +0000
> >> 
> >>     release: Add workaround to use SVN for ports
> >>     
> >>     The ports tree is scheduled to be converted from Subversion to Git
> >>     after the currently-scheduled 13.0-RELEASE, so the source of truth
> >>     will be Subversion for the ports tree.
> >>     
> >>     Implement a hack specifically for this case.
> > 
> > This change results in accessing 'svn://svn.freebsd.org/ports/head/head'
> > and failing to check out ports tree.
> 
> Following patch fixes the problem.
> 
> diff --git a/release/release.sh b/release/release.sh
> index 60034f12349..fbd64bb8234 100755
> --- a/release/release.sh
> +++ b/release/release.sh
> @@ -147,7 +147,7 @@ env_check() {
>  	SRC="${GITROOT}${GITSRC}"
>  	DOC="${GITROOT}${GITDOC}"
>  	#PORT="${GITROOT}${GITPORTS}"
> -	PORT="svn://svn.freebsd.org/ports/${PORTBRANCH}"
> +	PORT="svn://svn.freebsd.org/ports/"
>  
>  	if [ -n "${EMBEDDEDBUILD}" ]; then
>  		WITH_DVD=
> 

Thank you very much.  Committed as 5b0914aea27.

Sorry for the breakage.

Glen

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/dev-commits-src-all/attachments/20210120/ceb72963/attachment.sig>