[GRASS-dev] Towards SVN - git integration

Hi devs,

at time I am aware of two GRASS GIS related git instances:

* https://github.com/GRASS-GIS (used for Travis CI, in sync)
* https://git.osgeo.org/gogs/grass/grassgis (slighly outdated)

It would be nice to go towards a bidirectional SVN <--> git(hub)
integration in order to collect easily contributions.

Any suggestions how to proceed?

Markus

Markus Neteler <neteler@osgeo.org> writes:

Hi devs,

at time I am aware of two GRASS GIS related git instances:

* https://github.com/GRASS-GIS (used for Travis CI, in sync)
* https://git.osgeo.org/gogs/grass/grassgis (slighly outdated)

It would be nice to go towards a bidirectional SVN <--> git(hub)
integration in order to collect easily contributions.

Any suggestions how to proceed?

I know there are many who prefer svn to git, but the question is if the
main repo should migrate from svn to git.

If the decision is to have a git(hub) repo, I would suggest completely
moving to git.

I don't think one can reliably and automatically keep two repos in sync.

As it looks now, grass-ci seems to be updated automatically.

Cheers,

Rainer

Markus
_______________________________________________
grass-dev mailing list
grass-dev@lists.osgeo.org
http://lists.osgeo.org/mailman/listinfo/grass-dev

--
Rainer M. Krug
email: Rainer<at>krugs<dot>de
PGP: 0x0F52F982

Hi,

(after a while)

I agree with Rainer - and I understand the conservative point of view - and still remember last change from cvs to svn. Meanwhile, couple of you might have custom scripts which do enable similar magic in svn, which are natural to git (without any need for hacking). Git really makes it very easy to merge code and solve conflicts, not to mention possibility of forking and pulling from various repos (more organised way of accepting someone’s code). I think, it’s possible to have the main repo in Git and access it with svn client, if I’m not mistaken. But moving to git as main repo would be wise option IMHO.

Github certainly is great service. Custom GitLab instance on (OSGeo?) server should certainly be considered. But what is the difference between GitHub and Intevation (for those, who remember)? Just the scale business model IMHO, but the principal is the same - private companies hosting infrastructure for open source projects.

Just my 2 cents

J

čt 9. 6. 2016 v 11:37 odesílatel Rainer M Krug <Rainer@krugs.de> napsal:

Markus Neteler <neteler@osgeo.org> writes:

Hi devs,

at time I am aware of two GRASS GIS related git instances:

It would be nice to go towards a bidirectional SVN ↔ git(hub)
integration in order to collect easily contributions.

Any suggestions how to proceed?

I know there are many who prefer svn to git, but the question is if the
main repo should migrate from svn to git.

If the decision is to have a git(hub) repo, I would suggest completely
moving to git.

I don’t think one can reliably and automatically keep two repos in sync.

As it looks now, grass-ci seems to be updated automatically.

Cheers,

Rainer

Markus


grass-dev mailing list
grass-dev@lists.osgeo.org
http://lists.osgeo.org/mailman/listinfo/grass-dev


Rainer M. Krug
email: Rainerkrugsde
PGP: 0x0F52F982


grass-dev mailing list
grass-dev@lists.osgeo.org
http://lists.osgeo.org/mailman/listinfo/grass-dev

Jachym Cepicky <jachym.cepicky@gmail.com> writes:

Hi,

(after a while)

I agree with Rainer - and I understand the conservative point of view
- and still remember last change from cvs to svn. Meanwhile, couple of
you might have custom scripts which do enable similar magic in svn,
which are natural to git (without any need for hacking). Git really
makes it *very* easy to merge code and solve conflicts, not to mention
possibility of forking and pulling from various repos (more organised
way of accepting someone's code).

Just to clearify - forking and pull and push requests are github
features - not git. Nowadays github is so sexy, that its features are
often confused with being git features.

I think, it's possible to have the main repo in Git and access it with
svn client, if I'm not mistaken. But moving to git as main repo would
be wise option IMHO.

Github certainly is great service. Custom GitLab instance on (OSGeo?)
server should certainly be considered.

In the long run would a GitLab server possibly be the best option. But
in the meantime a move to github would be the easiest and all features
for which github is famous are there.

But what is the difference between GitHub and Intevation (for those,
who remember)? Just the scale business model IMHO, but the principal
is the same - private companies hosting infrastructure for open source
projects.

This is exactly why many dislike github. But as you said, gitlab is also
an option which has very nice features (also CI for testing).

Cheers,

Rainer

Just my 2 cents

J

čt 9. 6. 2016 v 11:37 odesílatel Rainer M Krug <Rainer@krugs.de> napsal:

Markus Neteler <neteler@osgeo.org> writes:

> Hi devs,
>
> at time I am aware of two GRASS GIS related git instances:
>
> * https://github.com/GRASS-GIS (used for Travis CI, in sync)
> * https://git.osgeo.org/gogs/grass/grassgis (slighly outdated)
>
> It would be nice to go towards a bidirectional SVN <--> git(hub)
> integration in order to collect easily contributions.
>
> Any suggestions how to proceed?

I know there are many who prefer svn to git, but the question is if the
main repo should migrate from svn to git.

If the decision is to have a git(hub) repo, I would suggest completely
moving to git.

I don't think one can reliably and automatically keep two repos in sync.

As it looks now, grass-ci seems to be updated automatically.

Cheers,

Rainer

>
> Markus
> _______________________________________________
> grass-dev mailing list
> grass-dev@lists.osgeo.org
> http://lists.osgeo.org/mailman/listinfo/grass-dev

--
Rainer M. Krug
email: Rainer<at>krugs<dot>de
PGP: 0x0F52F982
_______________________________________________
grass-dev mailing list
grass-dev@lists.osgeo.org
http://lists.osgeo.org/mailman/listinfo/grass-dev

_______________________________________________
grass-dev mailing list
grass-dev@lists.osgeo.org
http://lists.osgeo.org/mailman/listinfo/grass-dev

--
Rainer M. Krug
email: Rainer<at>krugs<dot>de
PGP: 0x0F52F982

(back to this thread as it comes with a better subject title)

---------- Forwarded message ----------
From: Markus Neteler <neteler@osgeo.org>
Date: Mon, Aug 29, 2016 at 11:54 AM
Subject: Re: [GRASS-dev] [vincent.ml@oslandia.com: Re:
[Qgis-developer] issue move to gh stalled]
To: Luca Delucchi <lucadeluge@gmail.com>
Cc: Nikos Alexandris <nik@nikosalexandris.net>, GRASS-dev
<grass-dev@lists.osgeo.org>

On Mon, Aug 29, 2016 at 10:24 AM, Luca Delucchi <lucadeluge@gmail.com> wrote:

On 29 August 2016 at 10:04, Nikos Alexandris <nik@nikosalexandris.net> wrote:

Hi GRASSers,

Hi,

anyone interested in this?

Yes! On the previous beta installation of
https://git.osgeo.org/gitlab/

there was already a GRASS git repo, see
https://lists.osgeo.org/pipermail/grass-dev/2016-June/080687.html
--> https://git.osgeo.org/gogs/grass/grassgis

it seems to be outdated but I'll ask Sandro about this.
Or Pietro Z knows?

...

yes sure, we could start to move something there like promo material
there just to start really to use it

Good idea.

The current state of git related OSGeo services is listed here:

https://wiki.osgeo.org/wiki/SAC:Git_Service

Markus

Hi Markus,

On Mon, Aug 29, 2016 at 1:12 PM, Markus Neteler <neteler@osgeo.org> wrote:

(back to this thread as it comes with a better subject title)
there was already a GRASS git repo, see
https://lists.osgeo.org/pipermail/grass-dev/2016-June/080687.html
--> https://git.osgeo.org/gogs/grass/grassgis

it seems to be outdated but I'll ask Sandro about this.
Or Pietro Z knows?

Actually I just synced manually (git svn fetch), perhaps we can simply
configure GRASS server that for each commit just sync the git
repository.

On Mon, Aug 29, 2016 at 4:43 PM, Pietro <peter.zamb@gmail.com> wrote:

Hi Markus,

On Mon, Aug 29, 2016 at 1:12 PM, Markus Neteler <neteler@osgeo.org> wrote:

(back to this thread as it comes with a better subject title)
there was already a GRASS git repo, see
https://lists.osgeo.org/pipermail/grass-dev/2016-June/080687.html
--> https://git.osgeo.org/gogs/grass/grassgis

it seems to be outdated but I'll ask Sandro about this.
Or Pietro Z knows?

Actually I just synced manually (git svn fetch),

ah, I see.

perhaps we can simply
configure GRASS server that for each commit just sync the git
repository.

Would Travis-CI provide that triggering?
Or, what needs to be done on grass.osgeo.org to achieve that?

Markus

On Mon, Aug 29, 2016 at 10:48 PM, Markus Neteler <neteler@osgeo.org> wrote:

On Mon, Aug 29, 2016 at 4:43 PM, Pietro <peter.zamb@gmail.com> wrote:

...

perhaps we can simply
configure GRASS server that for each commit just sync the git
repository.

So, in parallel this is discussed on the OSGeo-board list. I take
liberty to copy this information over to here (from
https://lists.osgeo.org/pipermail/board/2016-August/014489.html):

On Tue, Aug 30, 2016 at 11:34 AM, Sandro Santilli <strk@kbt.io> wrote:

On Tue, Aug 30, 2016 at 08:07:58AM +0200, Luca Delucchi wrote:

ok, I don't know if is possible to svn up from a git repository, this
could be really cool

It takes a script. I have my own ones for PostGIS/GEOS that do
SVN to GIT, but no way back. From GIT to SVN I do it manually.
Both directions are done with git-svn.

I'd love to see an OSGeo wide solution to keep SVN repositories
in sync with GIT ones, and there's already a ticket about it:
https://trac.osgeo.org/osgeo/ticket/1654

Comments and more importantly _code_ are welcome :slight_smile:

> - I just discovered that we have yet another git option: GitLab at
> https://git.osgeo.org/gitlab/ (hard to keep track of all options ha!)

yes, I don't know why they are not using the same git repository...

GitLab is running on its own, temporary, machine.
Gogs runs on the same machine as Trac (and allows using
the same git repository from both).

That said, I suspect these "modern" systems want to have exclusive
ownership over git repositories.

What both GitLab and Gogs offer, though, is registering a repository
as a _mirror_ of another, so you could (for example) create a GitLab
mirror of the Gogs one, or viceversa. What remain separated are the
issues and pull requests.

--strk;
_______________________________________________
Board mailing list
Board@lists.osgeo.org
http://lists.osgeo.org/mailman/listinfo/board

Marku