[GRASS5] CVS snapshots / Web pages in CVS

GRASS GRASS developer
1

Bernhard and Andreas (?),

Bernhard, please add for the
web/
directory in CVS the feature to send cvs-commit mails to
the commit mailing list. As I was unaware of a change
to

http://grass.itc.it/grass5/source/snapshot/
(maybe done by Andreas?)

I have some conflict now which I cannot resolve any more
(suggestions welcome).

thuille:snapshot[374.117] cvs up
Warning: Remote host denied X11 forwarding.
cvs server: Updating .
R COPYRIGHT.html
cvs server: conflict: removed README.html was modified by second party
C README.html
R WARNING.html
cvs server: conflict: removed compiling.html was modified by second party
C compiling.html

-> I have tried to delete the files, but they had been modified.
Now the files are gone on my machine, and I cannot update them
and more (to finally delete).

Andreas (whomever applied the change):
1. make a copy of
    source/snapshot/README.html
    source/snapshot/compiling.html

2. Then update your GRASS web CVS repos locally.

3. I have renamed
grass5/source/snapshot/
to
grass5/source/snapshot_release
as the new exp snapshot is present.

4. Then apply the changes from the copies of source/snapshot/README.html
   and source/snapshot/compiling.html to
   grass5/source/snapshot_release/...

5. delete source/snapshot/ or the files within.

Sorry for the extra work. When the GRASS web pages in CVS will send
mails, I'll be aware of changes (the last two years I was the only
one to do this job... :slight_smile:

Markus

2

Markus Neteler wrote:

Bernhard and Andreas (?),

Bernhard, please add for the
web/
directory in CVS the feature to send cvs-commit mails to
the commit mailing list. As I was unaware of a change
to

http://grass.itc.it/grass5/source/snapshot/
(maybe done by Andreas?)

I have some conflict now which I cannot resolve any more
(suggestions welcome).

thuille:snapshot[374.117] cvs up
Warning: Remote host denied X11 forwarding.
cvs server: Updating .
R COPYRIGHT.html
cvs server: conflict: removed README.html was modified by second party
C README.html
R WARNING.html
cvs server: conflict: removed compiling.html was modified by second party
C compiling.html

-> I have tried to delete the files, but they had been modified.
Now the files are gone on my machine, and I cannot update them
and more (to finally delete).

Andreas (whomever applied the change):
1. make a copy of
    source/snapshot/README.html
    source/snapshot/compiling.html

2. Then update your GRASS web CVS repos locally.

3. I have renamed
grass5/source/snapshot/
to
grass5/source/snapshot_release
as the new exp snapshot is present.

4. Then apply the changes from the copies of source/snapshot/README.html
   and source/snapshot/compiling.html to
   grass5/source/snapshot_release/...

5. delete source/snapshot/ or the files within.

Sorry for the extra work. When the GRASS web pages in CVS will send
mails, I'll be aware of changes (the last two years I was the only
one to do this job... :slight_smile:

Markus

Markus,

i fear i can not help here. I can't remember doing any changes in
grass5/source/snapshot, i did indeed some minor changes to
grassdevel.html, general.html and firsttime.html, which are shown in the
logs. I would have annouced any major updates or changes, but thought
that i should not bother you with a message that i fixed some typos etc.

While we are on this topic, i think it would be very useful if some sort
of automation (include files, date inclusion, etc) could be done with
the web pages (e. g. m4 macros, WML or something similar). This would
allow to update the web pages successively with style sheets, navigation
aids and create a unified layout. Currently the web pages are a bit of a
maze (the navigation, not the contents!).

Andreas

--
Andreas Lange, 65187 Wiesbaden, Germany, Tel. +49 611 807850
url: http://mitglied.tripod.de/AndreasLange
mail: Andreas.Lange_at_Rhein-Main.de - A.C.Lange_at_GMX.net

3

On Wed, Feb 13, 2002 at 03:48:18PM +0100, Andreas Lange wrote:

Markus Neteler wrote:

> Bernhard, please add for the
> web/
> directory in CVS the feature to send cvs-commit mails to
> the commit mailing list.

Will see what I can do.

> I have some conflict now which I cannot resolve any more
> (suggestions welcome).

Check out a clean version of the subdirectory in question
somewhere. Make your changes and recommit.

> Andreas (whomever applied the change):

cvs log or the viewcvs interface should help you to find
excatly the right person. (I did not inquire.)

> Sorry for the extra work. When the GRASS web pages in CVS will send
> mails, I'll be aware of changes (the last two years I was the only
> one to do this job... :slight_smile:

We'll get there.

While we are on this topic, i think it would be very useful if some sort
of automation (include files, date inclusion, etc) could be done with
the web pages (e. g. m4 macros, WML or something similar). This would
allow to update the web pages successively with style sheets, navigation
aids and create a unified layout. Currently the web pages are a bit of a
maze (the navigation, not the contents!).

We could install some preprocessing,
but we should be very careful to not make it too complicated.
I saw too many projects, where it got too complicated which
turned into a drawback.

Thus m4 macros and WML are out of the question,
they are generally too complicated.

Here are pointer for people to see what is available implemented
in python. PTL and Plow look interesting.
http://webware.sourceforge.net/Papers/Templates/

Note that we do not need a complete Framework, like:
http://www.paul.boddie.net/Python/web_modules.html

4

On Wed, Feb 13, 2002 at 04:13:32PM +0100, Bernhard Reiter wrote:

On Wed, Feb 13, 2002 at 03:48:18PM +0100, Andreas Lange wrote:
> Markus Neteler wrote:

> > Bernhard, please add for the
> > web/
> > directory in CVS the feature to send cvs-commit mails to
> > the commit mailing list.

Will see what I can do.

Done. Let me now, if it does not work.

You should have been able to do this yourself.
Check out the file CVSROOT/loginfo, edit and commit again.

5

On Wed, Feb 13, 2002 at 04:19:18PM +0100, Bernhard Reiter wrote:

On Wed, Feb 13, 2002 at 04:13:32PM +0100, Bernhard Reiter wrote:
> On Wed, Feb 13, 2002 at 03:48:18PM +0100, Andreas Lange wrote:
> > Markus Neteler wrote:
>
> > > Bernhard, please add for the
> > > web/
> > > directory in CVS the feature to send cvs-commit mails to
> > > the commit mailing list.
>
> Will see what I can do.

Done. Let me now, if it does not work.

Thanks, Bernhard, it's working well.

You should have been able to do this yourself.
Check out the file CVSROOT/loginfo, edit and commit again.

O.k.

Markus

6

On Wed, Feb 13, 2002 at 04:13:32PM +0100, Bernhard Reiter wrote:
[..]

> > I have some conflict now which I cannot resolve any more
> > (suggestions welcome).

Check out a clean version of the subdirectory in question
somewhere. Make your changes and recommit.

Thanks for the hint. I have resolved the problem. The CVS-web
is fine now.

> While we are on this topic, i think it would be very useful if some sort
> of automation (include files, date inclusion, etc) could be done with
> the web pages (e. g. m4 macros, WML or something similar). This would
> allow to update the web pages successively with style sheets, navigation
> aids and create a unified layout. Currently the web pages are a bit of a
> maze (the navigation, not the contents!).

We could install some preprocessing,
but we should be very careful to not make it too complicated.
I saw too many projects, where it got too complicated which
turned into a drawback.

Thus m4 macros and WML are out of the question,
they are generally too complicated.

Here are pointer for people to see what is available implemented
in python. PTL and Plow look interesting.
http://webware.sourceforge.net/Papers/Templates/

Note that we do not need a complete Framework, like:
http://www.paul.boddie.net/Python/web_modules.html

This looks like a flood of options. We need something low level
reducing the work and ready for teams to use :slight_smile:

In fact the pages need a better navigation system. Suggestions are
very welcome (or updated HTML pages...).

Markus

7

On Thu, Feb 14, 2002 at 11:11:32AM +0100, Markus Neteler wrote:

On Wed, Feb 13, 2002 at 04:13:32PM +0100, Bernhard Reiter wrote:

> Here are pointer for people to see what is available implemented
> in python. PTL and Plow look interesting.
> http://webware.sourceforge.net/Papers/Templates/
>
> Note that we do not need a complete Framework, like:
> http://www.paul.boddie.net/Python/web_modules.html

This looks like a flood of options. We need something low level
reducing the work and ready for teams to use :slight_smile:

Like I've said: The choice is not easy.
We should not just take anything.

In fact the pages need a better navigation system. Suggestions are
very welcome (or updated HTML pages...).

Right it is fine if people just create good simple HTML
and make the pages evolve slowly.
  Bernhard