Quantcast

New git branch structure (was Re: Branch for Freeplane 1.4.x and its translations)

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

New git branch structure (was Re: Branch for Freeplane 1.4.x and its translations)

Dimitry Polivaev
Administrator
Hello,

after having a detailed discussion with Felix (and as nobody else replayed to this thread)

in order to simplify our branch structure and to make translations of Freeplane 1.4.x on weblate
possible

I suggest to slightly change the way how we use git branches in Freeplane as follows:

1. There no regular commits to the master branch any more, the master branch should contain only
tagged preview and release versions.

2. There is a new branch 1.4.x (I have already pushed it). As long as we do not have feature freeze
for 1.4.x it is the new integration branch instead of the master branch. This branch is also exposed
to the translators on weblate.

3. After we declare feature freeze for current integration branch (e.g. 1.4.x) we create the new
release branch (e.g. 1.5.x) and it becomes the new integration branch accumulating all bug fixes
from the release branch and all new features.

4. As before we use feature branches for middle and long term feature developments. The changes from
the integration branch should be merged into feature branches often, and in any case before the
feature is integrated into the integration branch.

Please ask questions if the above rules are not clear and communicate whether you have any
objections. If nobody disagrees the new rules are entering into force right now.

Best regards,
Dimitry
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Re: New git branch structure (was Re: Branch for Freeplane 1.4.x and its translations)

BArchibald
Hi Dimitry,

I'm just sending this to say that I agree completely with this model.

Is this documented somewhere on the wiki?

Many thanks,
Blair




On 3 August 2014 12:53, Dimitry Polivaev [via Freeplane Developer] <[hidden email]> wrote:
Hello,

after having a detailed discussion with Felix (and as nobody else replayed to this thread)

in order to simplify our branch structure and to make translations of Freeplane 1.4.x on weblate
possible

I suggest to slightly change the way how we use git branches in Freeplane as follows:

1. There no regular commits to the master branch any more, the master branch should contain only
tagged preview and release versions.

2. There is a new branch 1.4.x (I have already pushed it). As long as we do not have feature freeze
for 1.4.x it is the new integration branch instead of the master branch. This branch is also exposed
to the translators on weblate.

3. After we declare feature freeze for current integration branch (e.g. 1.4.x) we create the new
release branch (e.g. 1.5.x) and it becomes the new integration branch accumulating all bug fixes
from the release branch and all new features.

4. As before we use feature branches for middle and long term feature developments. The changes from
the integration branch should be merged into feature branches often, and in any case before the
feature is integrated into the integration branch.

Please ask questions if the above rules are not clear and communicate whether you have any
objections. If nobody disagrees the new rules are entering into force right now.

Best regards,
Dimitry



To start a new topic under Freeplane Developer, email [hidden email]
To unsubscribe from Freeplane Developer, click here.
NAML

Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Re: New git branch structure (was Re: Branch for Freeplane 1.4.x and its translations)

nnako
This post was updated on .
Hi Blair,

there is some overall documentation about GIT usage and a recommended
development process for Freeplane in the WIKI:

structure:
http://freeplane.sourceforge.net/wiki/index.php/File:Nnako_UsageOfGit.gif

documentation:
http://freeplane.sourceforge.net/wiki/index.php/Git_howto

I'd like to update the structure picture and maybe some text according
to the new model as soon as possible.

Regards.
nnako



Am 04.08.2014 10:56, schrieb BArchibald [via Freeplane Developer]:
> Hi Dimitry,
>
> I'm just sending this to say that I agree completely with this model.
>
> Is this documented somewhere on the wiki?
>
> Many thanks,
> Blair
>

Loading...