[GeoNetwork-devel] Branch reorganisations

GeoNetwork GeoNetwork Developer
1

Hi

These last few days Francois and I have been reviewing / merging the open pull requests, not all, but quite quite a few reviewed / merged. Also the branches are reorganised like this:

  • main branch, based on previous 4.0.x.

  • 3.12.x branch, based on previous master.

For now no specific branch for 4.0.x (main branch is used for 4.0.x releases). After the release of 4.0.4 in 1/ 2 weeks will be created the branch 4.0.x and main will be set up for the future 4.2 version.

Pull requests should be addressed to the main branch, unless specific for 3.x versions.

If you have checked out the code you’ll need to update locally to point to the new branches.

For 3.12.x, if you have old master checkout:

git branch -m master 3.12.x

git fetch origin

git branch -u origin/3.12.x 3.12.x

git remote set-head origin -a

For main, if you have old 4.0.x checkout:

git branch -m 4.0.x main

git fetch origin

git branch -u origin/main main

git remote set-head origin -a

Regards,

Jose García

···

Vriendelijke groeten / Kind regards,

Jose García


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

Please consider the environment before printing this email.

2

It looks like this work is complete - thanks to both of you :slight_smile:

There is some synchronization still required between the content 3.12.x and main, how can we help? Or is this planned for after the 4.0.4 release?

···

–
Jody Garnett

3

Hi Jody

I already backported some security improvements from main to 3.12.x yesterday.

It is pending to merge 3.12.x into main, but as you indicate will be done after 4.0.4.

Regards,
Jose García

···

Vriendelijke groeten / Kind regards,

Jose García


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

Please consider the environment before printing this email.

4

I noticed that the https://github.com/geonetwork/doc is not following the same branch structure as
https://github.com/geonetwork/core-geonetwork

Am I correct in assuming that this will also be updated once the work on https://github.com/geonetwork/core-geonetwork is complete?

···

From: Jose Garcia jose.garcia@anonymised.com
Sent: April 22, 2021 2:18 AM
To: Jody Garnett jody.garnett@anonymised.com
Cc: Devel geonetwork-devel@lists.sourceforge.net geonetwork-devel@lists.sourceforge.net
Subject: Re: [GeoNetwork-devel] Branch reorganisations

Hi Jody

I already backported some security improvements from main to 3.12.x yesterday.

It is pending to merge 3.12.x into main, but as you indicate will be done after 4.0.4.

Regards,
Jose García

On Thu, Apr 22, 2021 at 1:24 AM Jody Garnett <jody.garnett@anonymised.com.> wrote:

It looks like this work is complete - thanks to both of you :slight_smile:

There is some synchronization still required between the content 3.12.x and main, how can we help? Or is this planned for after the 4.0.4 release?

–
Jody Garnett

On Wed, 14 Apr 2021 at 23:03, Jose Garcia <jose.garcia@anonymised.com> wrote:

Hi

These last few days Francois and I have been reviewing / merging the open pull requests, not all, but quite quite a few reviewed / merged. Also the branches are reorganised like this:

  • main branch, based on previous 4.0.x.

  • 3.12.x branch, based on previous master.

For now no specific branch for 4.0.x (main branch is used for 4.0.x releases). After the release of 4.0.4 in 1/ 2 weeks will be created the branch 4.0.x and main will be set up for the future 4.2 version.

Pull requests should be addressed to the main branch, unless specific for 3.x versions.

If you have checked out the code you’ll need to update locally to point to the new branches.

For 3.12.x, if you have old master checkout:

git branch -m master 3.12.x

git fetch origin

git branch -u origin/3.12.x 3.12.x

git remote set-head origin -a

For main, if you have old 4.0.x checkout:

git branch -m 4.0.x main

git fetch origin

git branch -u origin/main main

git remote set-head origin -a

Regards,

Jose García

–

Vriendelijke groeten / Kind regards,

Jose García


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

Please consider the environment before printing this email.

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

Please consider the environment before printing this email.