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

[Markus Neteler]

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