[GRASS5] CVS tag documentation

Glynn Clements glynn.clements at virgin.net
Wed Oct 31 17:57:24 EST 2001

Markus Neteler wrote:

> > > However, it seems that currently the head of the CVS tree is actually
> > > very out of date and probably not useful to anyone. So, either that
> > > paragraph should be updated to match the current state of affairs, or
> > > else the changes on the release branch should be merged back onto the
> > > trunk of the CVS tree.
> > 
> > As there doesn't seem to be any development occurring on the trunk, we
> > may as well merge the branch into the trunk and discontinue the
> > branch.
> At least this would avoid a lot of confusion for newcomers.
> But: How complex is merging back? we have lots of new directories
> etc.

The first thing to do is to:

1. merge locally,
2. see whether conflicts occur, and
3. see whether the end result builds and runs.

I'll try this, and see what occurs.

Glynn Clements <glynn.clements at virgin.net>

More information about the grass-dev mailing list