[GeoNetwork-devel] bleeding edge branch?

Hi,

which branch hold s the bleeding edge code of gnos? is it develop or
3.0.x? I'm a little bit confused, because usally I'd expect develop to
be the master-branch (and is the default branch as well), but there is
heavy development in 3.0.x as well (for me does not only seem to be
bugfixing/backporting, ...). So waht is the recent relationship between
develop- and 3.0.x-branch?

May be anyone can enlighten me with a quick information about the
branch-strategies in geonetwork.

Marco

--
Dr. Marco Lechner
Bundesamt fuer Strahlenschutz / Federal Office for Radiation Protection
SW2.1 Koordination Notfallschutzsysteme / Coordination Emergency Systems
Rosastrasse 9 | D-79098 Freiburg | Germany
mlechner@anonymised.com | +49 (0)3018 333 6724 | www.bfs.de

--
Hinweis zu Anhängen die auf .p7m/.p7c/.p7s oder .asc/.asc.sig enden:
Die .p7?- und .asc-Dateien sind ungefährliche Signaturdateien (digitale
Unterschriften).
In E-Mail-Clients mit S/MIME Konfiguration (.p7?) oder PGP-Erweiterung
(.asc) dienen sie zur:
- - Überprüfung des Absenders
- - Überprüfung einer evtl. Veränderung des Inhalts während der
Übermittlung über das Internet
Die Signaturdateien können ebenso dazu verwendet werden dem Absender
dieser Signatur eine E-Mail mit verschlüsseltem Inhalt zu senden.

In E-Mail-Clients ohne S/MIME Konfiguration oder PGP-Erweiterung
erscheinen die Dateien als Anhang und können ignoriert werden.

Hi

The developments for small improvements/fixes are done against 3.0.x branch, that is merged periodically to develop branch.

Develop is used for the next major release, so there should go any new development. But afaik, there’s no much activity in that branch for now.

Time ago was discussed to use a similar workflow as described in http://nvie.com/posts/a-successful-git-branching-model/, but the actual is not exactly the same. You can find more details in https://github.com/geonetwork/core-geonetwork/wiki/Git-merge-branching-good-practices

Regards,
Jose García

···

2015-10-01 11:50 GMT+02:00 Dr. Marco Lechner <mlechner@anonymised.com>:

Hi,

which branch hold s the bleeding edge code of gnos? is it develop or
3.0.x? I’m a little bit confused, because usally I’d expect develop to
be the master-branch (and is the default branch as well), but there is
heavy development in 3.0.x as well (for me does not only seem to be
bugfixing/backporting, …). So waht is the recent relationship between
develop- and 3.0.x-branch?

May be anyone can enlighten me with a quick information about the
branch-strategies in geonetwork.

Marco


Dr. Marco Lechner
Bundesamt fuer Strahlenschutz / Federal Office for Radiation Protection
SW2.1 Koordination Notfallschutzsysteme / Coordination Emergency Systems
Rosastrasse 9 | D-79098 Freiburg | Germany
mlechner@anonymised.com | +49 (0)3018 333 6724 | www.bfs.de


Hinweis zu Anhängen die auf .p7m/.p7c/.p7s oder .asc/.asc.sig enden:
Die .p7?- und .asc-Dateien sind ungefährliche Signaturdateien (digitale
Unterschriften).
In E-Mail-Clients mit S/MIME Konfiguration (.p7?) oder PGP-Erweiterung
(.asc) dienen sie zur:

    • Überprüfung des Absenders
    • Überprüfung einer evtl. Veränderung des Inhalts während der
      Übermittlung über das Internet
      Die Signaturdateien können ebenso dazu verwendet werden dem Absender
      dieser Signatur eine E-Mail mit verschlüsseltem Inhalt zu senden.

In E-Mail-Clients ohne S/MIME Konfiguration oder PGP-Erweiterung
erscheinen die Dateien als Anhang und können ignoriert werden.



GeoNetwork-devel mailing list
GeoNetwork-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geonetwork-devel
GeoNetwork OpenSource is maintained at http://sourceforge.net/projects/geonetwork

Vriendelijke groeten / Kind regards,

Jose García


Veenderweg 13
6721 WD Bennekom
The Netherlands
T: +31 (0)318 416664
M: +31 (0)655 818332

Please consider the environment before printing this email.

On Thu, Oct 1, 2015 at 1:40 PM, Jose Garcia <jose.garcia@anonymised.com> wrote:

Hi

The developments for small improvements/fixes are done against 3.0.x
branch, that is merged periodically to develop branch.

Develop is used for the next major release, so there should go any new
development. But afaik, there's no much activity in that branch for now.

Time ago was discussed to use a similar workflow as described in
http://nvie.com/posts/a-successful-git-branching-model/, but the actual
is not exactly the same. You can find more details in
https://github.com/geonetwork/core-geonetwork/wiki/Git-merge-branching-good-practices

Regards,
Jose García

2015-10-01 11:50 GMT+02:00 Dr. Marco Lechner <mlechner@anonymised.com>:

Hi,

which branch hold s the bleeding edge code of gnos? is it develop or
3.0.x? I'm a little bit confused, because usally I'd expect develop to
be the master-branch (and is the default branch as well), but there is
heavy development in 3.0.x as well (for me does not only seem to be
bugfixing/backporting, ...). So waht is the recent relationship between
develop- and 3.0.x-branch?

May be anyone can enlighten me with a quick information about the
branch-strategies in geonetwork.

Marco

Hi,

As a summary I would say:

* 3.0.x contains all features and bugfixing that will go to 3.0.x versions
* develop contains things more experimental, that will go to 3.1.x up

Everything that is implemented on 3.0.x will be ported to develop.
Nothing implemented directly in develop will be ported to 3.0.x.

If you are looking for a stable version, check the tags:
https://github.com/geonetwork/core-geonetwork/tags

Regards,
María.