[GRASS-dev] svn help

Hi all

I tried to add to svn add-ons new module but I did it probably wrong.

In raster directory I created new dir:

    svn add r.stream.del
    svn ci -m "New module" r.stream.del

jarekj@jarekj-desktop:~/src/add-ons/raster$ svn ci -m "New module" r.stream.del
Sending r.stream.del/Makefile
Sending r.stream.del/description.html
Sending r.stream.del/global.h
Sending r.stream.del/io.c
Sending r.stream.del/main.c

in that moment all files from r.stream.del have been send to r.stream.basins (Why??? I was in raster directory when I added new subdirectory) and updated that directory. Now that directory is corrupted. So I have a problem...
revision version is 39503 after updating

Any help?

greetings ...

Jarek

Jaros³aw Jasiewicz pisze:

Hi all

I tried to add to svn add-ons new module but I did it probably wrong.

In raster directory I created new dir:

   svn add r.stream.del
   svn ci -m "New module" r.stream.del

jarekj@jarekj-desktop:~/src/add-ons/raster$ svn ci -m "New module" r.stream.del
Sending r.stream.del/Makefile
Sending r.stream.del/description.html
Sending r.stream.del/global.h
Sending r.stream.del/io.c
Sending r.stream.del/main.c

in that moment all files from r.stream.del have been send to r.stream.basins (Why??? I was in raster directory when I added new subdirectory) and updated that directory. Now that directory is corrupted. So I have a problem...
revision version is 39503 after updating

Any help?

greetings ...

Jarek

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

BTW... I wrote r.stream.del module base on r.stream.basins code (i.e I copied r.stream.basin to r.stram.del and modified the code. It is the only relationship between that two modules.

Jaros³aw Jasiewicz wrote:

Hi all

I tried to add to svn add-ons new module but I did it probably wrong.

In raster directory I created new dir:

   svn add r.stream.del
   svn ci -m "New module" r.stream.del

You can also do

svn mkdir https://svn.osgeo.org/grass/grass-addons/raster/r.stream.del

svn import r.stream.del https://svn.osgeo.org/grass/grass-addons/raster/r.stream.del

svn checkout https://svn.osgeo.org/grass/grass-addons/raster/r.stream.del r.stream.del

Maybe not the most elegant way to do it, but works for me.

jarekj@jarekj-desktop:~/src/add-ons/raster$ svn ci -m "New module" r.stream.del
Sending r.stream.del/Makefile
Sending r.stream.del/description.html
Sending r.stream.del/global.h
Sending r.stream.del/io.c
Sending r.stream.del/main.c

in that moment all files from r.stream.del have been send to r.stream.basins (Why??? I was in raster directory when I added new subdirectory) and updated that directory.

Maybe there was still some svn information in hidden files within r.stream.del, depending on how you created that directory (e.g. copying or renaming r.stream.basins to r.stream.del could cause such behaviour).

Markus M

Now that directory is corrupted. So I have a problem...
revision version is 39503 after updating

Any help?

greetings ...

Jarek

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

Hi,

2009/10/13 Jarosław Jasiewicz <jarekj@amu.edu.pl>:

BTW... I wrote r.stream.del module base on r.stream.basins code (i.e I
copied r.stream.basin to r.stram.del and modified the code. It is the only
relationship between that two modules.

you probably copied also metadata dictionary (.svn). It could be the
reason. The best way to fork a module is to use 'svn copy' otherwise
logs are broken.

Martin

--
Martin Landa <landa.martin gmail.com> * http://gama.fsv.cvut.cz/~landa

2009/10/13 Martin Landa <landa.martin@gmail.com>:

BTW... I wrote r.stream.del module base on r.stream.basins code (i.e I
copied r.stream.basin to r.stram.del and modified the code. It is the only
relationship between that two modules.

you probably copied also metadata dictionary (.svn). It could be the
reason. The best way to fork a module is to use 'svn copy' otherwise
logs are broken.

see

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

Martin

--
Martin Landa <landa.martin gmail.com> * http://gama.fsv.cvut.cz/~landa

Hi,

2009/10/13 Jarosław Jasiewicz <jarekj@amu.edu.pl>:

in that moment all files from r.stream.del have been send to r.stream.basins
(Why??? I was in raster directory when I added new subdirectory) and updated
that directory. Now that directory is corrupted. So I have a problem...
revision version is 39503 after updating

wrong commit reverted (r39504).

Martin

--
Martin Landa <landa.martin gmail.com> * http://gama.fsv.cvut.cz/~landa

Markus Metz wrote:

> I tried to add to svn add-ons new module but I did it probably wrong.
>
> In raster directory I created new dir:
>
> svn add r.stream.del
> svn ci -m "New module" r.stream.del
You can also do

svn mkdir https://svn.osgeo.org/grass/grass-addons/raster/r.stream.del

svn import r.stream.del
https://svn.osgeo.org/grass/grass-addons/raster/r.stream.del

svn checkout
https://svn.osgeo.org/grass/grass-addons/raster/r.stream.del r.stream.del

Maybe not the most elegant way to do it, but works for me.

However, this should only be done if it's *completely* new code. If
it's based upon existing code in any way, start with "svn copy", then
modify the copy,

Note: the meaning of "modify" doesn't include overwriting a file with
something based upon an older version. It's imperative that subversion
knows which revision the code was based upon.

If you have created a file based upon an existing file, but you don't
know the revision on which it was based, simply delete the modified
file and start again.

--
Glynn Clements <glynn@gclements.plus.com>