After the latest change in i.pansharpen, the opening triple double quote <"""> is missing and the comments (MODULE's description, AUTHOR, etc) are not a docstring as expected. Please update.
Thanks, Nikos
On Wed, Dec 17, 2014 at 4:33 PM, Nikos Alexandris
<nik@nikosalexandris.net> wrote:
After the latest change in i.pansharpen, the opening triple double quote
<"""> is missing and the comments (MODULE's description, AUTHOR, etc) are
not a docstring as expected. Please update.
Not sure what you mean?
this is how it looks like:
http://trac.osgeo.org/grass/browser/grass/branches/releasebranch_7_0/scripts/i.pansharpen/i.pansharpen.py
Perhaps you have local changes and a svn update conflict? Find out with:
svn status
Markus
On 17.12.2014 18:21, Markus Neteler wrote:
On Wed, Dec 17, 2014 at 4:33 PM, Nikos Alexandris
<nik@nikosalexandris.net> wrote:After the latest change in i.pansharpen, the opening triple double quote
<"""> is missing and the comments (MODULE's description, AUTHOR, etc) are
not a docstring as expected. Please update.Not sure what you mean?
this is how it looks like:Perhaps you have local changes and a svn update conflict? Find out with:
svn status
Probably! But, I did select for "tc" --> "theirs conflict" while updating. Anyway. Thanks (again). Should(n't) we go for """...""" in python scripts instead of # whereever possible?
Some newer python scripts, I remember, have the AUTHOR and stuff info inside a docstring.
Nikos
On Wed, Dec 17, 2014 at 5:27 PM, Nikos Alexandris
<nik@nikosalexandris.net> wrote:
Probably! But, I did select for "tc" --> "theirs conflict" while updating.
This means that you keep your changes (somehow).
Anyway. Thanks (again). Should(n't) we go for """...""" in python scripts
instead of # whereever possible?
No idea - so far not discussed AFAIK. But I see it here:
https://trac.osgeo.org/grass/wiki/Submitting/Python
Some newer python scripts, I remember, have the AUTHOR and stuff info inside
a docstring.
Then we should update all scripts accordingly if that's the way to go.
The included scripts should ideally reflect best practice.
Markus
Thanks Markus.
Nikos Alexandris:
Probably! But, I did select for "tc" --> "theirs conflict" while updating.
Markus Neteler wrote:
This means that you keep your changes (somehow).
Reading in <http://svnbook.red-bean.com/en/1.7/svn-book.html>:
--%<---
(tc) theirs-conflict
Discard any local changes which conflict with incoming changes from the server for the file under review. However, preserve all non-conflicting local changes to that file.
--->%--
and
- <http://stackoverflow.com/questions/4015864/tortoise-svn-resolve-conflict-using-theirs-what-does-it-mean>
- <http://tortoisesvn.net/docs/release/TortoiseMerge_en/tmerge-basics-conflicts.html>
I think its a bit confusing, happened to me in the past again.
Nikos