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

Glynn Clements glynn at gclements.plus.com
Wed May 21 04:09:06 EDT 2008


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 at gclements.plus.com>


More information about the grass-dev mailing list