[GRASS5] Next steps for GRASS

[Bernhard Reiter]

On Mon, Jan 07, 2002 at 05:34:10PM +0000, Michel Wurtz wrote:
> Bernhard Reiter wrote:
> > 
> > On Mon, Jan 07, 2002 at 03:05:08PM +0000, Michel Wurtz wrote:
> > 
> > > Does this mean that I should do that on "MAIN" and must only fix
> > > bugs on release_branch ?
> > 
> > That is the idea.
> > As it obviously did not happen as envisioned,
> > we have to do the merge first,
> > before we can branch again.
> 
> How to merge ? 

AFAIK Markus and Glynn (maybe radim) are working on this merge.

> should I create another grasss directory for that and
> copy all my changes in it, then check-in ?
> I believe that simply changing the tag will only replace all the files
> in release_branch by the one in main trunk... I don't want to loose
> the modification I've not uploaded until now !

Make a copy of your working tree with modifications.
Thus you can be sure when doing cvs operations. 

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 248 bytes
Desc: not available
Url : http://lists.osgeo.org/pipermail/grass-dev/attachments/20020107/5efcd5d3/attachment.bin