[GRASS-dev] Changes which may need to be merged

GRASS GRASS developer
1

The following files currently differ between develbranch_6 and the
trunk, for no obvious reason:

        doc/howto_release.txt
        general/g.region/main.c
        gui/tcltk/gis.m/gm.tcl
        gui/tcltk/gis.m/gmlib.tcl
        gui/tcltk/gis.m/mapcanvas.tcl
        gui/tcltk/gis.m/runandoutput.tcl
        lib/gis/gui.tcl
        lib/gtcltk/gronsole.tcl
        lib/proj/projlib.dox
        scripts/d.split/d.split
        scripts/d.split/description.html
        vector/v.db.select/description.html
        vector/v.db.select/main.c
        vector/v.label.sa/labels.c

Can whoever made the changes check whether these should be merged?

You can use "svn diff" with two URLs if you don't have working copies
of both, e.g.:

svn diff \
  https://svn.osgeo.org/grass/grass/trunk/general/g.region/main.c \
  https://svn.osgeo.org/grass/grass/branches/develbranch_6/general/g.region/main.c

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

2

On Wed, May 21, 2008 at 10:09 AM, Glynn Clements
<glynn@gclements.plus.com> wrote:

The following files currently differ between develbranch_6 and the
trunk, for no obvious reason:

       doc/howto_release.txt
       lib/proj/projlib.dox
       vector/v.db.select/description.html
       vector/v.db.select/main.c

... above sync'ed.

       general/g.region/main.c

No need to backport.

The following I didn't check (not my field):

       gui/tcltk/gis.m/gm.tcl
       gui/tcltk/gis.m/gmlib.tcl
       gui/tcltk/gis.m/mapcanvas.tcl
       gui/tcltk/gis.m/runandoutput.tcl
       lib/gis/gui.tcl
       lib/gtcltk/gronsole.tcl
       scripts/d.split/d.split
       scripts/d.split/description.html
       vector/v.label.sa/labels.c

Can whoever made the changes check whether these should be merged?

Markus

3

The following files currently differ between develbranch_6
and the trunk, for no obvious reason:

....

        scripts/d.split/d.split
        scripts/d.split/description.html

....

Can whoever made the changes check whether these should be
merged?

I have replaced d.split in grass7 with the d.frame.split script from grass-addons. It is much better but the options are not backwards compatible, so not backported to develbranch_6.

Hamish