Re: [GRASS-dev] svn/trac -> git/github migration plan

[Panagiotis Mavrogiorgos]

On Sat, 18 May 2019, 19:11 Markus Neteler,  wrote:.

>
> For fetching the updates, is this enough:
>
> git pull --all
> ?
>

Μmm... sometimes yes, but I wouldn't suggest it.

Git pull is essentially 2 operations in one. It is a git fetch, followed by
a git merge.

The potential problem is with the merge step.

When you have no local changes, git pull works just fine. When you have
local changes though, there might be a conflict with the remote ones. And
if there is a conflict, you need to resolve it.

Resolving the conflicts is not something you can avoid; you will eventually
have to do it, but you should probably not try to do it before you have
reviewed the (remote) changes you just fetched.

This is why I almost always do this in 3 steps:

1. git fetch --all
2. Review the fetched changes. It's often convenient to use a git client
here. gitg, qgit and tig are easy to use and lightweight options.
3. git merge

By injecting step 2 you can both check if there are any conflicts and think
what's the best way to resolve them. Moreover, if there are conflicts, you
can choose to postpone resolving them (resolving conflicts takes time). If
you do git pull you will have to resolve them straight away.

P.
___
grass-dev mailing list
grass-dev@lists.osgeo.org
https://lists.osgeo.org/mailman/listinfo/grass-dev

Re: [GRASS-dev] grass-addons git repo clean-up

[Paulo van Breugel]

Hi,


If add-ons are made available from personal repositories, will there still 
be a central page with links to all manual pages 
(https://grass.osgeo.org/grass76/manuals/addons/)? I always find this a 
very convenient place to check what add-ons are available.



Cheers,


Paulo


Op 18 mei 2019 17:01:15 schreef Martin Landa :


Hi,

we should think what to do with grass-addons [1] after migration to
git. The concept of the one single addons repo goes somehow against
distributed approach. But never mind, we will keep this repo for
people who want to put their addons to the single place (and teach
meanwhile `g.extension` to collect addons from more repositories).
Anyway this mail is more about cleaning-up the current content.

* grass6/ content could be moved to new branch grass6
* grass7/ content will become master
* roadmap/ content can be partially moved to `grass-promo` repo
* tools/ content could be moved to a new git repo,
`grass-maintenance-tools` (any idea for better name).

Any ideas/comments? Thanks, Ma

[1] https://github.com/OSGeo/grass-addons

--
Martin Landa
http://geo.fsv.cvut.cz/gwiki/Landa
http://gismentors.cz/mentors/landa
___
grass-dev mailing list
grass-dev@lists.osgeo.org
https://lists.osgeo.org/mailman/listinfo/grass-dev


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

Re: [GRASS-dev] wingrass builds down

[Martin Landa]

so 18. 5. 2019 v 20:23 odesílatel Helmut Kudrnovsky  napsal:
> git in my msys2 installation works.

you were always a lucky guy :-) Ma

-- 
Martin Landa
http://geo.fsv.cvut.cz/gwiki/Landa
http://gismentors.cz/mentors/landa
___
grass-dev mailing list
grass-dev@lists.osgeo.org
https://lists.osgeo.org/mailman/listinfo/grass-dev

Re: [GRASS-dev] wingrass builds down

[Helmut Kudrnovsky]

Martin Landa wrote
> but unfortunately git appeared to be broken in my msys2 installation
> (calling `git` command had no effect). So I am trying to reinstall
> msys2 from scratch.

git in my msys2 installation works.




-
best regards
Helmut
--
Sent from: http://osgeo-org.1560.x6.nabble.com/Grass-Dev-f3991897.html
___
grass-dev mailing list
grass-dev@lists.osgeo.org
https://lists.osgeo.org/mailman/listinfo/grass-dev

Re: [GRASS-dev] pywin32 missing

[Helmut Kudrnovsky]

Anna Petrášová wrote
> On Wed, May 15, 2019 at 4:14 PM Helmut Kudrnovsky 

> hellik@

>  wrote:
> 
>> Anna Petrášová wrote
>> > Did you compile it with those local changes? It needs to be compiled to
>> > create the xml files.
>>
>> no compilation yet, just copied the updated python script.
>>
>> which is the relevant xml-file?
>>
> 
> it creates gui/wxpython/xml/menudata.xml and module_tree_menudata.xml
> during compilation.

now self compiled winGRASS

###

C:\>grass77svn --text
Starting GRASS GIS...
WARNUNG: Sperren gleichzeitiger Zugriffe auf ein Mapset ist unter Windows
 nicht möglich.
Cleaning up temporary files...

  __  ___   _____
 / / __ \/   | / ___/ ___/   / /  _/ ___/
/ / __/ /_/ / /| | \__ \\_  \   / / __ / / \__ \
   / /_/ / _, _/ ___ |___/ /__/ /  / /_/ // / ___/ /
   \/_/ |_/_/  |_///   \/___///

Welcome to GRASS GIS 7.7.svn (r74506M)



module_tree_menudata.xml is still empty after compilation



-
best regards
Helmut
--
Sent from: http://osgeo-org.1560.x6.nabble.com/Grass-Dev-f3991897.html
___
grass-dev mailing list
grass-dev@lists.osgeo.org
https://lists.osgeo.org/mailman/listinfo/grass-dev

Re: [GRASS-dev] wingrass builds down

[Martin Landa]

Hi,

so 18. 5. 2019 v 19:43 odesílatel Helmut Kudrnovsky  napsal:
> https://trac.osgeo.org/grass/wiki/CompileOnWindows
>
> which sections have to be updated?

https://trac.osgeo.org/grass/wiki/CompileOnWindows?action=diff=354_version=353

but unfortunately git appeared to be broken in my msys2 installation
(calling `git` command had no effect). So I am trying to reinstall
msys2 from scratch.

* scripts needs to updated,
https://trac.osgeo.org/grass/browser/grass-addons/tools/wingrass-packager

Ma

-- 
Martin Landa
http://geo.fsv.cvut.cz/gwiki/Landa
http://gismentors.cz/mentors/landa
___
grass-dev mailing list
grass-dev@lists.osgeo.org
https://lists.osgeo.org/mailman/listinfo/grass-dev

Re: [GRASS-dev] wingrass builds down

[Helmut Kudrnovsky]

Martin Landa wrote
> Hi,
> 
> WinGRASS builds are currently down. It will take some time to update
> build procedure to a new git repo workflow. I will inform you about
> progress.

https://trac.osgeo.org/grass/wiki/CompileOnWindows

which sections have to be updated?




-
best regards
Helmut
--
Sent from: http://osgeo-org.1560.x6.nabble.com/Grass-Dev-f3991897.html
___
grass-dev mailing list
grass-dev@lists.osgeo.org
https://lists.osgeo.org/mailman/listinfo/grass-dev

[GRASS-dev] wingrass builds down

[Martin Landa]

Hi,

WinGRASS builds are currently down. It will take some time to update
build procedure to a new git repo workflow. I will inform you about
progress.

Martin

-- 
Martin Landa
http://geo.fsv.cvut.cz/gwiki/Landa
http://gismentors.cz/mentors/landa
___
grass-dev mailing list
grass-dev@lists.osgeo.org
https://lists.osgeo.org/mailman/listinfo/grass-dev

Re: [GRASS-dev] svn/trac -> git/github migration plan

[Markus Neteler]

Hi Panos, all,

On Sat, May 18, 2019 at 5:59 PM Panagiotis Mavrogiorgos
 wrote:
>
> hello Markus,
>
> I would suggest that:
>
> - even core devs fork the main repo
> - "origin" is the personal remote GRASS repository (e.g. in my case 
> https://github.com/pmav99/grass)
> - everyone adds the main GRASS repository as a secondary remote (e.g. 
> "upstream")

yes, it sounds good to me (while my opinion only counts 0.02 cents here).

> This way:
>
> 1. You always push to "origin" and you create a Pull Request from the Github 
> UI
> 2. To get updates you always pull from "upstream"
> 3. You always rebase your code to "upstream/master".
> 4. You don't need separate instructions for non core-devs.

Updated in a similar way to

https://trac.osgeo.org/grass/wiki/HowToGit#Workflowforcoredevelopers

> Just my 2 cents.

For fetching the updates, is this enough:

git pull --all
?

Thanks for your recommendations,

Markus
___
grass-dev mailing list
grass-dev@lists.osgeo.org
https://lists.osgeo.org/mailman/listinfo/grass-dev

Re: [GRASS-dev] svn/trac -> git/github migration plan

[Panagiotis Mavrogiorgos]

hello Markus,

I would suggest that:

- even core devs fork the main repo
- "origin" is the personal remote GRASS repository (e.g. in my case
https://github.com/pmav99/grass)
- everyone adds the main GRASS repository as a secondary remote (e.g.
"upstream")

This way:

1. You always push to "origin" and you create a Pull Request from the
Github UI
2. To get updates you always pull from "upstream"
3. You always rebase your code to "upstream/master".
4. You don't need separate instructions for non core-devs.

Just my 2 cents.

P.
___
grass-dev mailing list
grass-dev@lists.osgeo.org
https://lists.osgeo.org/mailman/listinfo/grass-dev

Re: [GRASS-dev] [GRASS GIS] #3722: migrate grass svn repositories to git

[GRASS GIS]

#3722: migrate grass svn repositories to git
--+-
  Reporter:  martinl  |  Owner:  grass-dev@…
  Type:  task | Status:  new
  Priority:  major|  Milestone:
 Component:  Default  |Version:  unspecified
Resolution:   |   Keywords:  svn, git, migration
   CPU:  Unspecified  |   Platform:  Unspecified
--+-

Comment (by martinl):

 Most of work done:

 * https://github.com/landam/grass
 * https://github.com/OSGeo/grass-addons
 * https://github.com/OSGeo/grass-promo

 https://github.com/OSGeo/grass-legacy is missing to close this ticket.

-- 
Ticket URL: 
GRASS GIS 

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

[GRASS-dev] grass-addons git repo clean-up

[Martin Landa]

Hi,

we should think what to do with grass-addons [1] after migration to
git. The concept of the one single addons repo goes somehow against
distributed approach. But never mind, we will keep this repo for
people who want to put their addons to the single place (and teach
meanwhile `g.extension` to collect addons from more repositories).
Anyway this mail is more about cleaning-up the current content.

* grass6/ content could be moved to new branch grass6
* grass7/ content will become master
* roadmap/ content can be partially moved to `grass-promo` repo
* tools/ content could be moved to a new git repo,
`grass-maintenance-tools` (any idea for better name).

Any ideas/comments? Thanks, Ma

[1] https://github.com/OSGeo/grass-addons

-- 
Martin Landa
http://geo.fsv.cvut.cz/gwiki/Landa
http://gismentors.cz/mentors/landa
___
grass-dev mailing list
grass-dev@lists.osgeo.org
https://lists.osgeo.org/mailman/listinfo/grass-dev

Re: [GRASS-dev] [GRASS GIS] #3846: r.contour started producing broken/segmented contour lines since 7.4

[GRASS GIS]

#3846: r.contour started producing broken/segmented contour lines since 7.4
--+---
  Reporter:  metello  |  Owner:  grass-dev@…
  Type:  defect   | Status:  new
  Priority:  normal   |  Milestone:
 Component:  Raster   |Version:  unspecified
Resolution:   |   Keywords:  r.contour ​helpwanted
   CPU:  x86-64   |   Platform:  MSWindows
--+---

Comment (by mmetz):

 Replying to [comment:1 metello]:
 > The file was too large to attach. I uploaded here:
 > http://psr-
 shared.s3.amazonaws.com/public/admin/2C66EC59/R_CONTOUR_BUG.zip
 >
 > Coordinates of some points of discontinuity:
 > (384073.870002,8827636.45371),
 > (402242.43372,8799021.33681),
 > (409632.732253,8796197.58953)

 I can confirm the missing segments, the previous fix to prevent contours
 from tracing back on themselves was not working. Working on it...

-- 
Ticket URL: 
GRASS GIS 

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

Re: [GRASS-dev] svn/trac -> git/github migration plan

[Markus Neteler]

Hi devs,
please stay tuned for re-enabled write access (for merging), we are
working on it.
We just have a lot on our plate here during the Berlin sprint (locals
and remote participants).

cheers,
Markus
___
grass-dev mailing list
grass-dev@lists.osgeo.org
https://lists.osgeo.org/mailman/listinfo/grass-dev

Re: [GRASS-dev] svn/trac -> git/github migration plan

[Markus Neteler]

Hi,

On Thu, May 16, 2019 at 3:16 PM Vaclav Petras  wrote:
> +1 for Markus, Carmen, and Bas. That's what I see used elsewhere too.

Great, thanks for the suggestions.

I have written up a draft document:

https://trac.osgeo.org/grass/wiki/HowToGit

Please expand, discuss, ...

Markus
___
grass-dev mailing list
grass-dev@lists.osgeo.org
https://lists.osgeo.org/mailman/listinfo/grass-dev