Date: Tue, 16 Jun 2020 11:29:42 +0200
From: Natanael Copa <ncopa@alpinelinux.org>
To: Ariadne Conill <ariadne@dereferenced.org>
Cc: ~alpine/devel@lists.alpinelinux.org
Subject: Re: Renaming master branch in aports.git to edge?
Message-ID: <20200616112942.7bca16a4@ncopa-desktop.copa.dup.pw>
In-Reply-To: <2066642.Yu4YfQU2oB@localhost>
References: <2066642.Yu4YfQU2oB@localhost>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit

On Mon, 15 Jun 2020 18:34:04 -0600
Ariadne Conill <ariadne@dereferenced.org> wrote:

> Hello,
> 
> With all of the discussion about github renaming their default branch from 
> "master" to "main", it occured to me that the "master" branch in aports.git 
> reflects Alpine's rolling release "edge" repositories.
> 
> Discussion of the semantics behind the terminology aside, I think it would be 
> more transparent if we renamed "master" to "edge."  This would cause the edge 
> repositories to be aligned with an obviously-named branch in aports.git, which 
> seems like it would be helpful in general, verses having a special case for 
> master == edge and release branches being named after their version numbers.
> 
> Thoughts?

In general, I like the idea, but I'm not sure its worth it.

I have been thinking for a while that it would be nice if
the git branch corresponds with the release branch. eg: git master ->
edge, 3.12-stable -> v3.12.

I originally thought that we could create a symlink in the apk
repository `ln -s edge master` and `ln -s v3.12 3.12-stable` so we
would be backwards compatible and avoid breakages, but I never liked
the idea of renaming 'edge' repo to 'master'. Renaming the git branch
'master' to 'edge' would be nicer and makes more sense.

On the other hand, I suspect that there will alot of things that
breaks, like CI, secdb generation, `abuild rootbld`, docker-abuild, old
URLs pointing to commits in 'master' and who knows what else. I doubt
it is worth it. I'd rather spend my time on working on musl 1.2 and the
time64 migration. At least for now.

-nc