← Back to team overview

kicad-developers team mailing list archive

Re: The version string in the master branch

 

Hi,

On 25.07.2018 14:25, Wayne Stambaugh wrote:

> It seems to me that 5.1.0-dev would sort before 5.1.0-rc1 or am I
> missing something?

We already have tricks in place to sort RC before the release (without
suffix), which is annoying as is but an established convention.

IMO, any tag that begins with "5.1" should be close to the "5.1"
release. This is true for RC tags and the release tag, but not for a
"-dev" tag, so that tag should not exist.

Branches are a complication there in that for branches that are
essentially feature branches like 5.1, the tags don't apply to the
master branch, so after the 5.1 release, the master would still show
"5.0-3254+g3423425234". This can be fixed by doing a merge commit that
formally brings 5.1 back into master (which would be a no-op unless
someone messed up), at which point git-describe would find the 5.1 tag
as nearest.

   Simon

Attachment: signature.asc
Description: OpenPGP digital signature


References