[GRASS5] CVS question

GRASS GRASS developer
1

Folks,

I'm trying to get a working installation of the GRASS CVS tree, but I
have a problem. I'm sure this is simple ignorance on my part.

My aim was to look at the problems that Andreas Lange pointed out in
r.drain. I downloaded the source tree through anonymous CVS. When the
download was done I found that the code it contained for r.drain was the
old code rather than my newer version. So I visited the CVS tree
through HTML and found that the new code was all "in the attic".

Just were is "the attic?" Did I download it with the original download
and simply fail to find it, or is there some special switch (more
special than included in "cvs -z3 co grass") that I need to set to
download files in the attic along with the rest of the files?

Roger Miller

2

On Wed, Aug 08, 2001 at 09:04:36PM -0600, Roger S. Miller wrote:

Folks,

I'm trying to get a working installation of the GRASS CVS tree, but I
have a problem. I'm sure this is simple ignorance on my part.

My aim was to look at the problems that Andreas Lange pointed out in
r.drain. I downloaded the source tree through anonymous CVS. When the
download was done I found that the code it contained for r.drain was the
old code rather than my newer version. So I visited the CVS tree
through HTML and found that the new code was all "in the attic".

Just were is "the attic?" Did I download it with the original download
and simply fail to find it, or is there some special switch (more
special than included in "cvs -z3 co grass") that I need to set to
download files in the attic along with the rest of the files?

Try "cvs -z3 co grass -r releasebranch_11_april_2001_5_0_0".

AFAIK, the "releasebranch_11_april_2001_5_0_0" *is* the current working
tree for GRASS 5.0 (and your new code is in there). I'd vote for not
using tags in the future for code that will be modified (release
snapshots seems easy enough...).

--
Eric G. Miller <egm2@jps.net>

3

On Wed, Aug 08, 2001 at 09:04:36PM -0600, Roger S. Miller wrote:

Folks,

I'm trying to get a working installation of the GRASS CVS tree, but I
have a problem. I'm sure this is simple ignorance on my part.

My aim was to look at the problems that Andreas Lange pointed out in
r.drain. I downloaded the source tree through anonymous CVS. When the
download was done I found that the code it contained for r.drain was the
old code rather than my newer version. So I visited the CVS tree
through HTML and found that the new code was all "in the attic".

Just were is "the attic?" Did I download it with the original download
and simply fail to find it, or is there some special switch (more
special than included in "cvs -z3 co grass") that I need to set to
download files in the attic along with the rest of the files?

Roger,

the procedure to get the latest code is as follows:

cvs -z3 co -r releasebranch_11_april_2001_5_0_0 grass

Eventually you run
cd grass
cvs up -dP

To be very sure to have the latest code.

I have send a mail to Intevation to update their CVS page yesterday
which doesn't talk about the branch tag (yet).
The tags are explained here:
http://grass.itc.it/grasscvs.html

If you later want to update, simply run
cvs up -dP

To check to have the releasebranch_11_april_2001_5_0_0, run
cat CVS/Entries

There you will find releasebranch_11_april_2001_5_0_0 mentioned
at end of every line.

Hope this helps,

Markus

4

On Thu, Aug 09, 2001 at 10:07:39AM +0200, Markus Neteler wrote:

I have send a mail to Intevation to update their CVS page yesterday
which doesn't talk about the branch tag (yet).

Did not get the mail, can you resent it?
We should probably avoid explaining things twice, too.

  Bernhard

--
Professional Service around Free Software (intevation.net)
The FreeGIS Project (freegis.org)
Association for a Free Informational Infrastructure (ffii.org)
FSF Europe (fsfeurope.org)

5

On Thu, Aug 09, 2001 at 10:42:22AM +0200, Bernhard Reiter wrote:

On Thu, Aug 09, 2001 at 10:07:39AM +0200, Markus Neteler wrote:
> I have send a mail to Intevation to update their CVS page yesterday
> which doesn't talk about the branch tag (yet).

Did not get the mail, can you resent it?

Sure, done. I had sent to Jan...

We should probably avoid explaining things twice, too.

Right, therefore only a general explanation is necessary and
a link to the tag page (to improve that suggestions are welcome).

Thanks,

Markus

6

Well,

I have updated (hopefully improved) the GRASS-CVS page at:

http://grass.itc.it/grasscvs.html

There is a new page talking about GRASS tags and branches now:
http://grass.itc.it/grasscvstags.html

(all on the mirrors tomorrow).

Let me know ideas for further improvements and
language polishs if needed,

Markus

7

Markus Neteler wrote:

Well,

I have updated (hopefully improved) the GRASS-CVS page at:

http://grass.itc.it/grasscvs.html

There is a new page talking about GRASS tags and branches now:
http://grass.itc.it/grasscvstags.html

(all on the mirrors tomorrow).

Let me know ideas for further improvements and
language polishs if needed,

Markus,

This page helps, but I am still confused. First, I appologise for being somewhat
CVS challenged. While I use CVS alot, I generally avoid the more sophisticated
aspects of branching, just making minimal use of tags.

If I want to add a change that will make it into the next version of GRASS 5.0
(GRASS 5.1 pre2?), what do I do? Do I do the following?

  cvs update -r release_grass500pre1_20_may_2001
apply my changes
cvs commit

What will happen to changes checked in at the head? I presume they will
not make it into GRASS 5.0, but will they be incorporated into GRASS 5.1?
How do we do work on the GRASS tree that we want to apply to GRASS
5.1 but not GRASS 5.0?

Will there be 5.0.1 and similar feature improvement releases, or is 5.1 the
only suitable place for non 5.0 features?

Best regards,

---------------------------------------+--------------------------------------
I set the clouds in motion - turn up | Frank Warmerdam, warmerdam@pobox.com
light and sound - activate the windows | http://pobox.com/~warmerdam
and watch the world go round - Rush | Geospatial Programmer for Rent

8

On Thu, Aug 09, 2001 at 09:32:11AM -0400, Frank Warmerdam wrote:

Markus Neteler wrote:

>Well,
>
>I have updated (hopefully improved) the GRASS-CVS page at:
>
>http://grass.itc.it/grasscvs.html
>
>There is a new page talking about GRASS tags and branches now:
>http://grass.itc.it/grasscvstags.html
>
>(all on the mirrors tomorrow).
>
>Let me know ideas for further improvements and
>language polishs if needed,
>

Markus,

This page helps, but I am still confused. First, I appologise for being
somewhat
CVS challenged. While I use CVS alot, I generally avoid the more
sophisticated
aspects of branching, just making minimal use of tags.

If I want to add a change that will make it into the next version of
GRASS 5.0
(GRASS 5.1 pre2?), what do I do? Do I do the following?

  cvs update -r release_grass500pre1_20_may_2001
apply my changes
cvs commit

What will happen to changes checked in at the head? I presume they will
not make it into GRASS 5.0, but will they be incorporated into GRASS 5.1?
How do we do work on the GRASS tree that we want to apply to GRASS
5.1 but not GRASS 5.0?

Will there be 5.0.1 and similar feature improvement releases, or is 5.1 the
only suitable place for non 5.0 features?

Well, at time we have

grass50/
grass51/

on CVS. The grass50/ splits into (outdated) experimental and the
release_branch. The experimental however contains an unused/ directory
with new code (this should go to grass51/not_yet_uploaded/).

The grass51/ contains the new vector stuff and a not_yet_uploaded/ directory
with new code. All new code should go here.

Means: For 5.1 we have a new directory without a branch as the entire
directories layout will be changed. We'll feed the grass51/ soon from
the grass50-release_branch. We loose the history for every file, but
we consider the modules included to be stable (at that point) and still
have the old (that time) grass50 directory.

Does this clarify it a bit?

At time we only work on grass50-release_branch. A later merge-back doesn't
make too much sense as a fresh startup in grass51/ is better.

Regards

Markus