[Gambas-devel] Gambas to Git(Lab)

[Benoît Minisini]

Le 12/08/2017 à 09:49, Adrien Prokopowicz a écrit :
>> Very strange: 3.10.0 tag is present in the "tags" section of the 
>> repository, but not when you pop down the list "switch
>> branch/tag"...
> 
> It's there, but the list isn't sorted in natural order, so it's right
> after the 3.1.0 version.

Ha!

> 
> I didn't push the branches for the stable versions, since the tags
> have the same purpose : you can switch to any tag, and create a
> branch from there if you want to make changes to an older version.
> 
> (Actually, you can switch to any commit you want and create a branch
>  from there : commits are kind of like ref-counted, and a tag is just
> a named reference to a commit).
> 
> However, if I missed something and there is something needed in these
>  branches, I can push them back.
> 
> For tagging new releases, as we've discussed in previous messages,
> it's all done from the "stable" branch : right now it contains the
> 3.10.0 version, you can either commit directly to it or cherry-pick
> commits from the master branch (i.e. just take specific commits
> instead of the whole branch, if you want only the bugfixes to tag a
> patch release, say 3.10.1).

So the 'stable' branch is the last stable version. But, as far as I 
understand, I have no branch for the other stable versions.

It is not really problematic, as usually we do fixes only in the current 
stable version. If someday we have to make a fix in 3.9, for example, we 
can just create a stable branch for 3.9 from its latest tag, and work on it.

Do I get it correctly?

> 
> You can also merge the master branch into stable, which will apply
> all the commits the stable branch didn't have, in order to tag a new
> release, say 3.11.

OK, I see.

> 
> Once you're done and the stable branch contains what you want to 
> release, you just have to create an annotated tag[0]. (Annotated tags
> have checksums and can be signed, unlike simple tags which are just
> pointers). And then it's done. :-)
> 
> [0] https://git-scm.com/book/en/v2/Git-Basics-Tagging
> 

OK.

Now I have to understand how to deal with your merge request...

-- 
Benoît Minisini