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

cmbarton · May 21, 2008, 3:28pm

I've been doing some work on TclTk again, updating gronsole.tcl, gui.tcl,
and runandoutput.tcl.

My understanding is that I should be working on develbranch_6 for this. I'm
not clear whether these should go on to trunk or not since they're for the
TclTk gui.

If we are keeping the TclTk gui, they should be merged. I have working
copies of both trunk and develbranch_6. What do you recommend is the best
way to merge to trunk if that is what needs doing?

Michael

On 5/21/08 2:07 AM, "grass-dev-request@lists.osgeo.org"
<grass-dev-request@lists.osgeo.org> wrote:

Date: Wed, 21 May 2008 09:09:06 +0100
From: Glynn Clements <glynn@gclements.plus.com>
Subject: [GRASS-dev] Changes which may need to be merged
To: grass-dev@lists.osgeo.org
Message-ID: <18483.55458.558573.747611@cerise.gclements.plus.com>
Content-Type: text/plain; charset=us-ascii

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>

__________________________________________
Michael Barton, Professor of Anthropology
Director of Graduate Studies
School of Human Evolution & Social Change
Center for Social Dynamics & Complexity
Arizona State University

phone: 480-965-6213
fax: 480-965-7671
www: http://www.public.asu.edu/~cmbarton

neteler · May 21, 2008, 6:05pm

On Wed, May 21, 2008 at 5:28 PM, Michael Barton <michael.barton@asu.edu> wrote:

I've been doing some work on TclTk again, updating gronsole.tcl, gui.tcl,
and runandoutput.tcl.

My understanding is that I should be working on develbranch_6 for this. I'm
not clear whether these should go on to trunk or not since they're for the
TclTk gui.

If we are keeping the TclTk gui, they should be merged. I have working
copies of both trunk and develbranch_6. What do you recommend is the best
way to merge to trunk if that is what needs doing?

I see two ways:
- either always sync trunk
- or remove gis.m from trunk.

Everything else is confusing.

Markus

cmbarton · May 21, 2008, 6:08pm

You mean always sync trunk AND develbranch_6 or sync trunk INSTEAD of
develbranch_6?

Michael

On 5/21/08 11:05 AM, "Markus Neteler" <neteler@osgeo.org> wrote:

On Wed, May 21, 2008 at 5:28 PM, Michael Barton <michael.barton@asu.edu>
wrote:

I've been doing some work on TclTk again, updating gronsole.tcl, gui.tcl,
and runandoutput.tcl.

My understanding is that I should be working on develbranch_6 for this. I'm
not clear whether these should go on to trunk or not since they're for the
TclTk gui.

If we are keeping the TclTk gui, they should be merged. I have working
copies of both trunk and develbranch_6. What do you recommend is the best
way to merge to trunk if that is what needs doing?

I see two ways:
- either always sync trunk
- or remove gis.m from trunk.

Everything else is confusing.

Markus

__________________________________________
Michael Barton, Professor of Anthropology
Director of Graduate Studies
School of Human Evolution & Social Change
Center for Social Dynamics and Complexity
Arizona State University

phone: 480-965-6213
fax: 480-965-7671
www: http://www.public.asu.edu/~cmbarton

neteler · May 21, 2008, 6:13pm

I mean: keep trunk AND develbranch_6 sync'ed.

Or delete gis.m from trunk.

Markus

On Wed, May 21, 2008 at 8:08 PM, Michael Barton <michael.barton@asu.edu> wrote:

You mean always sync trunk AND develbranch_6 or sync trunk INSTEAD of
develbranch_6?

Michael

On 5/21/08 11:05 AM, "Markus Neteler" <neteler@osgeo.org> wrote:

On Wed, May 21, 2008 at 5:28 PM, Michael Barton <michael.barton@asu.edu>
wrote:

I've been doing some work on TclTk again, updating gronsole.tcl, gui.tcl,
and runandoutput.tcl.

My understanding is that I should be working on develbranch_6 for this. I'm
not clear whether these should go on to trunk or not since they're for the
TclTk gui.

If we are keeping the TclTk gui, they should be merged. I have working
copies of both trunk and develbranch_6. What do you recommend is the best
way to merge to trunk if that is what needs doing?

I see two ways:
- either always sync trunk
- or remove gis.m from trunk.

Everything else is confusing.

Markus

__________________________________________
Michael Barton, Professor of Anthropology
Director of Graduate Studies
School of Human Evolution & Social Change
Center for Social Dynamics and Complexity
Arizona State University

phone: 480-965-6213
fax: 480-965-7671
www: http://www.public.asu.edu/~cmbarton

--
Open Source Geospatial Foundation
http://www.osgeo.org/
http://www.grassbook.org/

cmbarton · May 21, 2008, 6:20pm

I'm not sure what is going on with trunk at the moment. I don't mind
sync-ing with both. I just have to remember to do so. Can you merge in the
existing gis.m files that have changed? I don't know who made them all, but
I'm sure they should be merged. I'll sync both for any changes I make from
now on.

Michael

On 5/21/08 11:13 AM, "Markus Neteler" <neteler@osgeo.org> wrote:

I mean: keep trunk AND develbranch_6 sync'ed.

Or delete gis.m from trunk.

Markus

On Wed, May 21, 2008 at 8:08 PM, Michael Barton <michael.barton@asu.edu>
wrote:

You mean always sync trunk AND develbranch_6 or sync trunk INSTEAD of
develbranch_6?

Michael

On 5/21/08 11:05 AM, "Markus Neteler" <neteler@osgeo.org> wrote:

On Wed, May 21, 2008 at 5:28 PM, Michael Barton <michael.barton@asu.edu>
wrote:

I've been doing some work on TclTk again, updating gronsole.tcl, gui.tcl,
and runandoutput.tcl.

My understanding is that I should be working on develbranch_6 for this. I'm
not clear whether these should go on to trunk or not since they're for the
TclTk gui.

If we are keeping the TclTk gui, they should be merged. I have working
copies of both trunk and develbranch_6. What do you recommend is the best
way to merge to trunk if that is what needs doing?

I see two ways:
- either always sync trunk
- or remove gis.m from trunk.

Everything else is confusing.

Markus

__________________________________________
Michael Barton, Professor of Anthropology
Director of Graduate Studies
School of Human Evolution & Social Change
Center for Social Dynamics and Complexity
Arizona State University

phone: 480-965-6213
fax: 480-965-7671
www: http://www.public.asu.edu/~cmbarton

__________________________________________
Michael Barton, Professor of Anthropology
Director of Graduate Studies
School of Human Evolution & Social Change
Center for Social Dynamics and Complexity
Arizona State University

phone: 480-965-6213
fax: 480-965-7671
www: http://www.public.asu.edu/~cmbarton

Hamish · May 22, 2008, 2:52am

Michael:

Can you merge in the existing gis.m files that have changed? I don't
know who made them all, but I'm sure they should be merged.

it is possible review change history either with "svn log <filename>" or through the web interface by clicking on the Rev column:

http://trac.osgeo.org/grass/browser/grass/trunk/gui/tcltk/gis.m
http://trac.osgeo.org/grass/browser/grass/branches/develbranch_6/gui/tcltk/gis.m

Hamish

neteler · May 22, 2008, 7:45am

On Wed, May 21, 2008 at 8:20 PM, Michael Barton <michael.barton@asu.edu> wrote:

I'm not sure what is going on with trunk at the moment.

For obvious reasons trunk (7.0.svn) should not lag behind 6.4.svn. So
please keep it updated, too.

I don't mind
sync-ing with both. I just have to remember to do so. Can you merge in the
existing gis.m files that have changed? I don't know who made them all, but
I'm sure they should be merged.

I am already overcommitted and cannot adopt the tcl part, too...
Someone, please...

I'll sync both for any changes I make from now on.

Michael

Good.

Markus

Glynn_Clements1 · May 22, 2008, 8:31am

Michael Barton wrote:

I've been doing some work on TclTk again, updating gronsole.tcl, gui.tcl,
and runandoutput.tcl.

My understanding is that I should be working on develbranch_6 for this. I'm
not clear whether these should go on to trunk or not since they're for the
TclTk gui.

If we are keeping the TclTk gui, they should be merged. I have working
copies of both trunk and develbranch_6. What do you recommend is the best
way to merge to trunk if that is what needs doing?

From the directory containing a working copy of the trunk, either:

svn merge -c 31350 https://svn.osgeo.org/grass/grass/branches/develbranch_6
svn merge -c 31332 https://svn.osgeo.org/grass/grass/branches/develbranch_6

or:

svn merge -r 31141:31350 https://svn.osgeo.org/grass/grass/branches/develbranch_6/gui/tcltk/gis.m gui/tcltk/gis.m

The former merges the two individual changes, the latter merges all
changes between the time the branch was made and the latest change.

But I'm thinking that it may be better to just remove gis.m from the
trunk. Once 7.x starts to diverge, maintaining two versions of gis.m
will become too much work. I would expect the wxPython GUI to be
stable by the time that 7.x is ready for everyday use.

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

cmbarton · May 22, 2008, 3:23pm

Is there some way to see an online diff like you could with the old web cvs?

Michael

On 5/21/08 7:52 PM, "Hamish" <hamish_b@yahoo.com> wrote:

Michael:

Can you merge in the existing gis.m files that have changed? I don't
know who made them all, but I'm sure they should be merged.

it is possible review change history either with "svn log <filename>" or
through the web interface by clicking on the Rev column:

http://trac.osgeo.org/grass/browser/grass/trunk/gui/tcltk/gis.m
http://trac.osgeo.org/grass/browser/grass/branches/develbranch_6/gui/tcltk/gis
.m

Hamish

__________________________________________
Michael Barton, Professor of Anthropology
Director of Graduate Studies
School of Human Evolution & Social Change
Center for Social Dynamics & Complexity
Arizona State University

phone: 480-965-6213
fax: 480-965-7671
www: http://www.public.asu.edu/~cmbarton

neteler · May 22, 2008, 7:09pm

On Thu, May 22, 2008 at 5:23 PM, Michael Barton <michael.barton@asu.edu> wrote:

Is there some way to see an online diff like you could with the old web cvs?

Sure! Example:

http://trac.osgeo.org/grass/browser/grass/trunk/gui/tcltk/gis.m/thematic.tcl
In upper left corner, click:
Last Change Revision Log

I have added this to
http://trac.osgeo.org/grass/wiki/HowToSVN#RevisitpreviousDiffs

Markus