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

[Christof Thalhofer]

Am 28.07.2017 um 17:38 schrieb Adrien Prokopowicz:

> You're right, I mistakingly assumed we would only have to maintain one  
> stable
> version (as it is the case right now).
> 
> However, I think the fix is pretty simple : we could add a legacy branch  
> (branched
> right before the 4.0 version would be merged into master, so it is still  
> 3.20), and
> commit the fixes for the legacy version into it when needed (so we can  
> release both
> versions in parallel).

Yes. Ok, I see, so:

                               .--------------.
                             ^ | Branch: 3.21 |----->
                            /  '--------------'
.--------.      .-----------.                 .-----------.
| Master |----->| Tag: 3.20 |------......---->| Tag: 4.05 |
'--------'      '-----------'                 '-----------'

Right?

> If the fix can be applied to both the legacy and stable versions without  
> rewriting it
> (unlikely, since the codebase would change a lot between these versions),  
> then
> cherry-picking the fixing commit into master should be enough. :-)

Yes.

> The model isn't set it stone. It's still Git, we can do whatever we want
> whenever we want. Adding a few branches to our workflow later isn't a  
> problem. ;-)

Also Yes :-)


Alles Gute

Christof Thalhofer

-- 
Dies ist keine Signatur

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <http://lists.gambas-basic.org/pipermail/devel/attachments/20170728/a1ae2050/attachment.sig>