gambas-devel

[Gambas-devel] Gambas to Git(Lab)

[Adrien P. <adr...@gm...>]

Hello everyone,

In an effort to both switch the Gambas project versioning to Git, and to  
move away
 from Sourceforge, I imported the whole repository to GitLab. You can see  
it here :

https://gitlab.com/prokopyl/gambas

 From what I see, all history, commits, tags and branches have been  
successfully
imported, and authors have been correctly mapped from their Sourceforge  
usernames to
Git full names and emails (the SVN/Git mapping file is attached).

I know there has been some GitHub vs. GitLab debate on the mailing list  
somewhere,
but it didn't seem to have produced anything, so I just picked one.
Since nothing I have done is GitLab-specific (it's just a plain Git  
repository for now),
we can easily use GitHub too.
I personally picked GitLab simply because we can easily retrieve data  
(issues, wiki and such)
 from a generated archive if we ever want to switch, and their integrated  
CI solution
seems less restricted than Travis (but I didn't go that far with it).

For now, all I did was cloning the entire SVN repo on the server that  
hosts the
playground (for its symmetric 100Mbit/s connection :) ), then using  
git-svn to
create a git repo from the clone, and then push it all to GitLab.

I'm currently trying to set up Continuous Integration to generate Ubuntu  
packages, and
maybe for more distributions later (RHEL/CentOS, Debian, ArchLinux, …).

I know we won't switch to Git right now, I'm at least waiting for 3.10 to  
be released
so everything can calm down. :)
However I would like your feedback : what do you think is needed to make  
Gambas
successfully switch to Git ? (Whichever host we end up choosing).

Regards,
-- 
Adrien Prokopowicz

Re: [Gambas-devel] Gambas to Git(Lab)

[Karl R. <kar...@fe...>]

Am Samstag, den 22.07.2017, 20:35 +0200 schrieb Adrien Prokopowicz:
> Hello everyone,
> 
> In an effort to both switch the Gambas project versioning to Git, and to  
> move away
>  from Sourceforge, I imported the whole repository to GitLab. You can see  
> it here :
> 
> https://gitlab.com/prokopyl/gambas
> 
>  From what I see, all history, commits, tags and branches have been  
> successfully
> imported, and authors have been correctly mapped from their Sourceforge  
> usernames to
> Git full names and emails (the SVN/Git mapping file is attached).
> 
> I know there has been some GitHub vs. GitLab debate on the mailing list  
> somewhere,
> but it didn't seem to have produced anything, so I just picked one.
> Since nothing I have done is GitLab-specific (it's just a plain Git  
> repository for now),
> we can easily use GitHub too.
> I personally picked GitLab simply because we can easily retrieve data  
> (issues, wiki and such)
>  from a generated archive if we ever want to switch, and their integrated  
> CI solution
> seems less restricted than Travis (but I didn't go that far with it).
> 
> For now, all I did was cloning the entire SVN repo on the server that  
> hosts the
> playground (for its symmetric 100Mbit/s connection :) ), then using  
> git-svn to
> create a git repo from the clone, and then push it all to GitLab.
> 
> I'm currently trying to set up Continuous Integration to generate Ubuntu  
> packages, and
> maybe for more distributions later (RHEL/CentOS, Debian, ArchLinux, …).
> 
> I know we won't switch to Git right now, I'm at least waiting for 3.10 to  
> be released
> so everything can calm down. :)
> However I would like your feedback : what do you think is needed to make  
> Gambas
> successfully switch to Git ? (Whichever host we end up choosing).

Salut Adrien,

a short test shows me the Copy Links get a 404.
But I do not know anything about GitXX


-- 
Amicalement
Charlie

Re: [Gambas-devel] Gambas to Git(Lab)

[Adrien P. <adr...@gm...>]

Le Sat, 22 Jul 2017 21:19:54 +0200, Karl Reinl <kar...@fe...> a  
écrit:
>
> Salut Adrien,
>
> a short test shows me the Copy Links get a 404.
> But I do not know anything about GitXX
>
>

Hi Karl,

These links are just the messages for commits that Benoît wrote 9 years  
ago.
They apparently point to the old 2.0 repository on sourceforge, which does
not exist anymore. You can see the corresponding commit on sourceforge[0].

Since it is just an old message, I don't think you have to worry about
these broken links. :)

Regards,

[0] https://sourceforge.net/p/gambas/code/8167/log/?path=/gambas/trunk/NEWS
-- 
Adrien Prokopowicz

Re: [Gambas-devel] Gambas to Git(Lab)

[Adrien P. <adr...@gm...>]

Le Sat, 22 Jul 2017 20:35:17 +0200, Adrien Prokopowicz  
<adr...@gm...> a écrit:

> Hello everyone,
>
> In an effort to both switch the Gambas project versioning to Git, and to  
> move away
>  from Sourceforge, I imported the whole repository to GitLab. You can  
> see it here :
>
> https://gitlab.com/prokopyl/gambas
>
>  From what I see, all history, commits, tags and branches have been  
> successfully
> imported, and authors have been correctly mapped from their Sourceforge  
> usernames to
> Git full names and emails (the SVN/Git mapping file is attached).
>
> I know there has been some GitHub vs. GitLab debate on the mailing list  
> somewhere,
> but it didn't seem to have produced anything, so I just picked one.
> Since nothing I have done is GitLab-specific (it's just a plain Git  
> repository for now),
> we can easily use GitHub too.
> I personally picked GitLab simply because we can easily retrieve data  
> (issues, wiki and such)
>  from a generated archive if we ever want to switch, and their  
> integrated CI solution
> seems less restricted than Travis (but I didn't go that far with it).
>
> For now, all I did was cloning the entire SVN repo on the server that  
> hosts the
> playground (for its symmetric 100Mbit/s connection :) ), then using  
> git-svn to
> create a git repo from the clone, and then push it all to GitLab.
>
> I'm currently trying to set up Continuous Integration to generate Ubuntu  
> packages, and
> maybe for more distributions later (RHEL/CentOS, Debian, ArchLinux, …).
>
> I know we won't switch to Git right now, I'm at least waiting for 3.10  
> to be released
> so everything can calm down. :)
> However I would like your feedback : what do you think is needed to make  
> Gambas
> successfully switch to Git ? (Whichever host we end up choosing).
>
> Regards,

So I just took some time to clean up the repository, and I implemented the
workflow we discussed in previous messages, with one little exception : the
master branch is the development branch, and I created a "stable" branch,  
which
currently contains the newly-released 3.10.0 version.
This way, the master branch works exactly like the old "trunk", which  
makes the
migration easier (both form a svn-git and a developer standpoint).

I also removed all the old version branches[0] and turned them into actual  
tags
instead[1].

I also transferred the repo from my personal account to a new group :
https://gitlab.com/gambas-basic/gambas

I invited Benoît as an owner, and Laurent and Fabien as developers.
If other regular contributors / component maintainers want to join,
just ask me here. :-)

I would like the group to be simply called "gambas", but for that Benoît  
needs
to change his username on GitLab first (right now it conflicts :-) ).

Now that the repo is organized and usable, the only thing left to do to  
fully
switch to Git(Lab) is to write the contributing guides and update the wiki,
so that everybody can configure their clients and start working again.

As a side note, it is amusing that even though the repo wasn't fully  
migrated,
there is already enough work done in it to make examples for the git  
workflow :

- Last week, I made some small changes to how the WITH keyword works (see  
bug
   #1131 on the tracker[2]), but since these changes affect the compiler  
and the
   generated Gambas bytecode, I wanted to have Benoît review it, so I made
   a new temporary branch (from master), and created a Merge Request[3] !
- I also created another experimental branch[4] to try and build Gambas  
with
   CMake instead. This is an old project of mine that was never completed,  
but
   I decided to push it on the repo for experience sharing, because :
- Laurent Carlier wants to try and use Meson for building Gambas,
   but since he had no access to the repository at all, he forked it to a
   personal repository[5].
   This way, when he will be done he can create a Merge Request to merge it
   back into the main repository, which is a great way for other people to
   contribute to Gambas. :-)

You can also see all the branch shenanigans on the fancy graph here :
https://gitlab.com/gambas-basic/gambas/network/master

[0] https://gitlab.com/gambas-basic/gambas/branches
[1] https://gitlab.com/gambas-basic/gambas/tags
[2] http://gambaswiki.org/bugtracker/edit?object=BUG.1131&from=L21haW4-
[3] https://gitlab.com/gambas-basic/gambas/merge_requests/1
[4] https://gitlab.com/gambas-basic/gambas/tree/cmake
[5] https://gitlab.com/lordheavy/gambas/commits/meson-test
-- 
Adrien Prokopowicz

Re: [Gambas-devel] Gambas to Git(Lab)

[Benoît M. <ga...@us...>]

Le 11/08/2017 à 23:24, Adrien Prokopowicz a écrit :
> 
> So I just took some time to clean up the repository, and I implemented the
> workflow we discussed in previous messages, with one little exception : the
> master branch is the development branch, and I created a "stable" 
> branch, which
> currently contains the newly-released 3.10.0 version.
> This way, the master branch works exactly like the old "trunk", which 
> makes the
> migration easier (both form a svn-git and a developer standpoint).
> 
> I also removed all the old version branches[0] and turned them into 
> actual tags
> instead[1].
> 
> I also transferred the repo from my personal account to a new group :
> https://gitlab.com/gambas-basic/gambas
> 
> I invited Benoît as an owner, and Laurent and Fabien as developers.
> If other regular contributors / component maintainers want to join,
> just ask me here. :-)
> 
> I would like the group to be simply called "gambas", but for that Benoît 
> needs
> to change his username on GitLab first (right now it conflicts :-) ).
> 
> Now that the repo is organized and usable, the only thing left to do to 
> fully
> switch to Git(Lab) is to write the contributing guides and update the wiki,
> so that everybody can configure their clients and start working again.
> 
> As a side note, it is amusing that even though the repo wasn't fully 
> migrated,
> there is already enough work done in it to make examples for the git 
> workflow :
> 
> - Last week, I made some small changes to how the WITH keyword works 
> (see bug
>    #1131 on the tracker[2]), but since these changes affect the compiler 
> and the
>    generated Gambas bytecode, I wanted to have Benoît review it, so I made
>    a new temporary branch (from master), and created a Merge Request[3] !
> - I also created another experimental branch[4] to try and build Gambas 
> with
>    CMake instead. This is an old project of mine that was never 
> completed, but
>    I decided to push it on the repo for experience sharing, because :
> - Laurent Carlier wants to try and use Meson for building Gambas,
>    but since he had no access to the repository at all, he forked it to a
>    personal repository[5].
>    This way, when he will be done he can create a Merge Request to merge it
>    back into the main repository, which is a great way for other people to
>    contribute to Gambas. :-)
> 
> You can also see all the branch shenanigans on the fancy graph here :
> https://gitlab.com/gambas-basic/gambas/network/master
> 
> [0] https://gitlab.com/gambas-basic/gambas/branches
> [1] https://gitlab.com/gambas-basic/gambas/tags
> [2] http://gambaswiki.org/bugtracker/edit?object=BUG.1131&from=L21haW4-
> [3] https://gitlab.com/gambas-basic/gambas/merge_requests/1
> [4] https://gitlab.com/gambas-basic/gambas/tree/cmake
> [5] https://gitlab.com/lordheavy/gambas/commits/meson-test

Is it possible to transfer the repository to gambas/gambas ? What should 
I do for that?

-- 
Benoît Minisini

Re: [Gambas-devel] Gambas to Git(Lab)

[Tony M. <tmo...@aj...>]

Adrien,

Great work!

I'd like to become a contributor/developer.  I'm retired so I have time 
to spare.  My programming experience goes back almost 40 years, to a 
PDP-9.  My C is very rusty, but my basic and Gambas is current.


On 2017-08-11 05:24 PM, Adrien Prokopowicz wrote:
> Le Sat, 22 Jul 2017 20:35:17 +0200, Adrien Prokopowicz 
> <adr...@gm...> a écrit:
>
>> Hello everyone,
>>
>> In an effort to both switch the Gambas project versioning to Git, and 
>> to move away
>>  from Sourceforge, I imported the whole repository to GitLab. You can 
>> see it here :
>>
>> https://gitlab.com/prokopyl/gambas
>>
>>  From what I see, all history, commits, tags and branches have been 
>> successfully
>> imported, and authors have been correctly mapped from their 
>> Sourceforge usernames to
>> Git full names and emails (the SVN/Git mapping file is attached).
>>
>> I know there has been some GitHub vs. GitLab debate on the mailing 
>> list somewhere,
>> but it didn't seem to have produced anything, so I just picked one.
>> Since nothing I have done is GitLab-specific (it's just a plain Git 
>> repository for now),
>> we can easily use GitHub too.
>> I personally picked GitLab simply because we can easily retrieve data 
>> (issues, wiki and such)
>>  from a generated archive if we ever want to switch, and their 
>> integrated CI solution
>> seems less restricted than Travis (but I didn't go that far with it).
>>
>> For now, all I did was cloning the entire SVN repo on the server that 
>> hosts the
>> playground (for its symmetric 100Mbit/s connection :) ), then using 
>> git-svn to
>> create a git repo from the clone, and then push it all to GitLab.
>>
>> I'm currently trying to set up Continuous Integration to generate 
>> Ubuntu packages, and
>> maybe for more distributions later (RHEL/CentOS, Debian, ArchLinux, …).
>>
>> I know we won't switch to Git right now, I'm at least waiting for 
>> 3.10 to be released
>> so everything can calm down. :)
>> However I would like your feedback : what do you think is needed to 
>> make Gambas
>> successfully switch to Git ? (Whichever host we end up choosing).
>>
>> Regards,
>
> So I just took some time to clean up the repository, and I implemented 
> the
> workflow we discussed in previous messages, with one little exception 
> : the
> master branch is the development branch, and I created a "stable" 
> branch, which
> currently contains the newly-released 3.10.0 version.
> This way, the master branch works exactly like the old "trunk", which 
> makes the
> migration easier (both form a svn-git and a developer standpoint).
>
> I also removed all the old version branches[0] and turned them into 
> actual tags
> instead[1].
>
> I also transferred the repo from my personal account to a new group :
> https://gitlab.com/gambas-basic/gambas
>
> I invited Benoît as an owner, and Laurent and Fabien as developers.
> If other regular contributors / component maintainers want to join,
> just ask me here. :-)
>
> I would like the group to be simply called "gambas", but for that 
> Benoît needs
> to change his username on GitLab first (right now it conflicts :-) ).
>
> Now that the repo is organized and usable, the only thing left to do 
> to fully
> switch to Git(Lab) is to write the contributing guides and update the 
> wiki,
> so that everybody can configure their clients and start working again.
>
> As a side note, it is amusing that even though the repo wasn't fully 
> migrated,
> there is already enough work done in it to make examples for the git 
> workflow :
>
> - Last week, I made some small changes to how the WITH keyword works 
> (see bug
>   #1131 on the tracker[2]), but since these changes affect the 
> compiler and the
>   generated Gambas bytecode, I wanted to have Benoît review it, so I made
>   a new temporary branch (from master), and created a Merge Request[3] !
> - I also created another experimental branch[4] to try and build 
> Gambas with
>   CMake instead. This is an old project of mine that was never 
> completed, but
>   I decided to push it on the repo for experience sharing, because :
> - Laurent Carlier wants to try and use Meson for building Gambas,
>   but since he had no access to the repository at all, he forked it to a
>   personal repository[5].
>   This way, when he will be done he can create a Merge Request to 
> merge it
>   back into the main repository, which is a great way for other people to
>   contribute to Gambas. :-)
>
> You can also see all the branch shenanigans on the fancy graph here :
> https://gitlab.com/gambas-basic/gambas/network/master
>
> [0] https://gitlab.com/gambas-basic/gambas/branches
> [1] https://gitlab.com/gambas-basic/gambas/tags
> [2] http://gambaswiki.org/bugtracker/edit?object=BUG.1131&from=L21haW4-
> [3] https://gitlab.com/gambas-basic/gambas/merge_requests/1
> [4] https://gitlab.com/gambas-basic/gambas/tree/cmake
> [5] https://gitlab.com/lordheavy/gambas/commits/meson-test

Re: [Gambas-devel] Gambas to Git(Lab)

[Adrien P. <adr...@gm...>]

Le Fri, 11 Aug 2017 23:54:46 +0200, Benoît Minisini  
<ga...@us...> a écrit:
>
> Is it possible to transfer the repository to gambas/gambas ? What should  
> I do for that?
>

The proper way to do this would be to keep the repository on the group (I  
invited you
as an owner, so you should have full access to the group too), and then  
change your
username (you'll find it under your icon > Settings > Account), so the  
group can be
renamed "gambas", and so the repository will be named gambas/gambas.

This way, we can put all gambas-related projects and repositories under a  
single group
(website, wiki, bugtracker, playground, etc.), as well as the regularly  
contributing
developers.

However, if you wish to have the repository on your personal account  
instead, I can
initiate a repository transfer. You will then receive a notification to  
complete it.

-- 
Adrien Prokopowicz

Re: [Gambas-devel] Gambas to Git(Lab)

[Benoît M. <ga...@us...>]

Le 12/08/2017 à 00:31, Adrien Prokopowicz a écrit :
> Le Fri, 11 Aug 2017 23:54:46 +0200, Benoît Minisini 
> <ga...@us...> a écrit:
>> 
>> Is it possible to transfer the repository to gambas/gambas ? What 
>> should I do for that?
>> 
> 
> The proper way to do this would be to keep the repository on the
> group (I invited you as an owner, so you should have full access to
> the group too), and then change your username (you'll find it under
> your icon > Settings > Account),

OK, done.

> so the group can be renamed "gambas", and so the repository will be
> named gambas/gambas.

OK. done.

> 
> This way, we can put all gambas-related projects and repositories
> under a single group (website, wiki, bugtracker, playground, etc.),
> as well as the regularly contributing developers.
> 
> However, if you wish to have the repository on your personal account
>  instead, I can initiate a repository transfer. You will then receive
> a notification to complete it.
> 

-- 
Benoît Minisini

Re: [Gambas-devel] Gambas to Git(Lab)

[Benoît M. <ga...@us...>]

Le 12/08/2017 à 09:07, Benoît Minisini via Gambas-devel a écrit :
>>
>> The proper way to do this would be to keep the repository on the
>> group (I invited you as an owner, so you should have full access to
>> the group too), and then change your username (you'll find it under
>> your icon > Settings > Account),
> 
> OK, done.
> 
>> so the group can be renamed "gambas", and so the repository will be
>> named gambas/gambas.
> 
> OK. done.
> 

Now, how to update the git repository to the latest svn?

-- 
Benoît Minisini

Re: [Gambas-devel] Gambas to Git(Lab)

[Benoît M. <ga...@us...>]

Le 12/08/2017 à 09:08, Benoît Minisini a écrit :
> Le 12/08/2017 à 09:07, Benoît Minisini via Gambas-devel a écrit :
>>>
>>> The proper way to do this would be to keep the repository on the
>>> group (I invited you as an owner, so you should have full access to
>>> the group too), and then change your username (you'll find it under
>>> your icon > Settings > Account),
>>
>> OK, done.
>>
>>> so the group can be renamed "gambas", and so the repository will be
>>> named gambas/gambas.
>>
>> OK. done.
>>
> 
> Now, how to update the git repository to the latest svn?
> 

Aow. It is already up to date?

-- 
Benoît Minisini

Re: [Gambas-devel] Gambas to Git(Lab)

[Benoît M. <ga...@us...>]

Le 12/08/2017 à 09:12, Benoît Minisini via Gambas-devel a écrit :
> Le 12/08/2017 à 09:08, Benoît Minisini a écrit :
>> Le 12/08/2017 à 09:07, Benoît Minisini via Gambas-devel a écrit :
>>>>
>>>> The proper way to do this would be to keep the repository on the
>>>> group (I invited you as an owner, so you should have full access to
>>>> the group too), and then change your username (you'll find it under
>>>> your icon > Settings > Account),
>>>
>>> OK, done.
>>>
>>>> so the group can be renamed "gambas", and so the repository will be
>>>> named gambas/gambas.
>>>
>>> OK. done.
>>>
>>
>> Now, how to update the git repository to the latest svn?
>>
> 
> Aow. It is already up to date?
> 

Now there is something I don't understand:

- How can I make the 3.10.0 tag? From which branch?

- Where are the branches of all stable versions? (3.10, 3.9, 3.8...)

-- 
Benoît Minisini

Re: [Gambas-devel] Gambas to Git(Lab)

[Benoît M. <ga...@us...>]

Le 12/08/2017 à 09:17, Benoît Minisini a écrit :
> Le 12/08/2017 à 09:12, Benoît Minisini via Gambas-devel a écrit :
>> Le 12/08/2017 à 09:08, Benoît Minisini a écrit :
>>> Le 12/08/2017 à 09:07, Benoît Minisini via Gambas-devel a écrit :
>>>>>
>>>>> The proper way to do this would be to keep the repository on the
>>>>> group (I invited you as an owner, so you should have full access to
>>>>> the group too), and then change your username (you'll find it under
>>>>> your icon > Settings > Account),
>>>>
>>>> OK, done.
>>>>
>>>>> so the group can be renamed "gambas", and so the repository will be
>>>>> named gambas/gambas.
>>>>
>>>> OK. done.
>>>>
>>>
>>> Now, how to update the git repository to the latest svn?
>>>
>>
>> Aow. It is already up to date?
>>
> 
> Now there is something I don't understand:
> 
> - How can I make the 3.10.0 tag? From which branch?
> 
> - Where are the branches of all stable versions? (3.10, 3.9, 3.8...)
> 

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"...

-- 
Benoît Minisini

Re: [Gambas-devel] Gambas to Git(Lab)

[Adrien P. <adr...@gm...>]

Le Sat, 12 Aug 2017 09:20:11 +0200, Benoît Minisini  
<ga...@us...> a écrit:

> Le 12/08/2017 à 09:17, Benoît Minisini a écrit :
>> Le 12/08/2017 à 09:12, Benoît Minisini via Gambas-devel a écrit :
>>> Le 12/08/2017 à 09:08, Benoît Minisini a écrit :
>>>> Le 12/08/2017 à 09:07, Benoît Minisini via Gambas-devel a écrit :
>>>>>>
>>>>>> The proper way to do this would be to keep the repository on the
>>>>>> group (I invited you as an owner, so you should have full access to
>>>>>> the group too), and then change your username (you'll find it under
>>>>>> your icon > Settings > Account),
>>>>>
>>>>> OK, done.
>>>>>
>>>>>> so the group can be renamed "gambas", and so the repository will be
>>>>>> named gambas/gambas.
>>>>>
>>>>> OK. done.
>>>>>

Nice, thank you !

>>>>
>>>> Now, how to update the git repository to the latest svn?
>>>>
>>>
>>> Aow. It is already up to date?

Yes. I have a script running hourly on the playground's server to keep
it updated. :-)

>>>
>>  Now there is something I don't understand:
>>  - How can I make the 3.10.0 tag? From which branch?
>>  - Where are the branches of all stable versions? (3.10, 3.9, 3.8...)
>>
> 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.

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).

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.

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

-- 
Adrien Prokopowicz

Re: [Gambas-devel] Gambas to Git(Lab)

[Benoît M. <ga...@us...>]

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

Re: [Gambas-devel] Gambas to Git(Lab)

[Benoît M. <ga...@us...>]

Le 12/08/2017 à 10:04, Benoît Minisini a écrit :
> 
> Now I have to understand how to deal with your merge request...
> 

OK, there is a fix for WITH I must check. But there is something about 
auto-completion that seems unrelated... Shouldn't you make two different 
merge requests?

-- 
Benoît Minisini

Re: [Gambas-devel] Gambas to Git(Lab)

[Adrien P. <adr...@gm...>]

Le Sat, 12 Aug 2017 10:09:01 +0200, Benoît Minisini  
<ga...@us...> a écrit:

> Le 12/08/2017 à 10:04, Benoît Minisini a écrit :
>>  Now I have to understand how to deal with your merge request...
>>
>
> OK, there is a fix for WITH I must check. But there is something about  
> auto-completion that seems unrelated... Shouldn't you make two different  
> merge requests?
>

Yes sorry, I put the exclamation-mark completion work in another branch (I  
haven't made
the Merge Request, because the first one needs to be merged first).

There is still some completion changes, but these go along with the change  
in the
compiler for nested WITHs. :-)

Since you started working on the master branch, I disabled the automatic  
updates from
SVN : because SVN has no idea about what's going on on Git, changes have  
to be manually
merged instead of just fast-forwarded (I already merged #8175 into master).

Also a small tip : in your account settings, you can also add your  
sourceforge email
address to your account, this way the commits you made on SVN will be  
linked to your
account instead of being from "another Benoît". :-)

-- 
Adrien Prokopowicz