[GRASS-dev] testing results of r.watershed2 against old r.watershed

[Hamish]

Markus:
> > I have moved the code to GRASS 6.4.svn and 7.svn now and deactivated
> > the old version.
 
Glynn:
> And presumably the clean-up I've done on watershed in 7.0 has all now
> been discarded?

.... not fully - in devbr6 modifications need to me made to r.watershed2
to keep the old option names: 
-    opt15->key = "slope_steepness";
+    opt15->key = "slope.steepness";

etc. so it has at least some of the grass7 changes.


actually I think it is wrong to call this r.watershed2 at all, really 
after whitespace changes etc it is just some normal patches to r.watershed,
not a full rewrite of the module.

As such it should be merged into the old r.watershed code not get its own
new directory. A suggested way forward: indent and modify r.watershed2
so that a minimal diff is created and apply that to r.watershed(1) keeping
an eye on option name changes and new unmerged developments.

And keep the Makefiles pointing at the original.


Hamish