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

[Michael Barton]

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 at osgeo.org> wrote:

> On Wed, May 21, 2008 at 5:28 PM, Michael Barton <michael.barton at 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