[GRASS-dev] Push diffs from local git to grass-addons svn?

GRASS GIS GRASS GIS developer
1

Hi!

Anyone that uses locally git and pushes changes directly to svn
(grass-addons)? Care to share some know-how?

I managed to get locally only sub-directories from the grass-addons svn
repository, via a series of svn commands (see:
<http://stackoverflow.com/a/50980/1172302&gt;\).

For example, I did that for "r.sun.daily". I would like to push the
diff directly from my local gitted directory, not from inside the local
copy of grass-addons.

Thanks, Nikos

2

I committed something in the add-ons with the wrong description for the log and
something which was not my intention.

Is it enough to use something like

svn up -r ##### FileName

?

where #... is the revision number.

Thanks, Nikos

3

On Fri, Aug 14, 2015 at 11:06 PM, Nikos Alexandris
<nik@nikosalexandris.net> wrote:

I committed something in the add-ons with the wrong description for the log and
something which was not my intention.

Is it enough to use something like

You find this documented here:
https://trac.osgeo.org/grass/wiki/HowToSVN#Revertingsubmittedchanges

Markus

4

Nikos:

> I committed something in the add-ons with the wrong description for the log and
> something which was not my intention.
> Is it enough to use something like...

Markus:

You find this documented here:
https://trac.osgeo.org/grass/wiki/HowToSVN#Revertingsubmittedchanges

That's great. I'll fix my unintentional commits asap.

Nikos

ps- we have had a short discussion on keeping a complete local copy of
svn for having the options to move stuff around. Do you really, devs,
keep a complete local copy (>10GB)?

5

On Sat, Aug 15, 2015 at 8:17 AM, Nikos Alexandris
<nik@nikosalexandris.net> wrote:
...

ps- we have had a short discussion on keeping a complete local copy of
svn for having the options to move stuff around. Do you really, devs,
keep a complete local copy (>10GB)?

No need - there is the "svn copy" command for that. See e.g.

https://trac.osgeo.org/grass/wiki/HowToSVN#MovingmodulesbetweentrunkandAddonsrepository

I have checked out separately
grass64/
grass64_release/
grass65/
grass70/
grass70_release/
grass71/
grass-addons/grass-promo/
grass-sandbox/

and this is way less than 10 GB.

(the XX_release checkouts are redundant which I use to prepare the
releases - almost all file timestamps maintained which I try to
carefully keep since 1999 or earlier :slight_smile:

Markus