You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@avalon.apache.org by Sylvain Wallez <sy...@anyware-tech.com> on 2003/10/06 09:47:38 UTC
CVS conflict on the download page
Hi,
I just found that there has been a CVS conflict on the Avalon download
page at http://avalon.apache.org/download.cgi
Nothing that prevents the download, though.
Sylvain
--
Sylvain Wallez Anyware Technologies
http://www.apache.org/~sylvain http://www.anyware-tech.com
{ XML, Java, Cocoon, OpenSource }*{ Training, Consulting, Projects }
Orixo, the opensource XML business alliance - http://www.orixo.com
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@avalon.apache.org
For additional commands, e-mail: dev-help@avalon.apache.org
Re: CVS conflict on the download page
Posted by Stephen McConnell <mc...@apache.org>.
Tetsuya Kitahata wrote:
>Don't have any clue!? ... IIRC, you deleted some
>*.html files (for download pages) from CVS ...
>#Not related to download.html?? .. I forgot..
>
The files I deleted are the generated download html files in /site which
were inconsitent with the source in /src. What seems to be happening is
that there is a conflict over on www/avalon.apache.org which suggests
content has been modified over there as opposed to modification of the
src content. But that does not appear to be the end of the story
because updates to /src concering the ehtml file are not appearing in
/site - instead they appear to be going from /src, via site generation
process with output to /www.
Stephen.
>
>--
>
>Anyway,
>$ cd /www/avalon.apache.org/
>$ mv download.html download.old.html
>$ cvs update
>
>How about this?
>
Ok - except for cvs update. The update will drag in the contents of
/site - and the site generation isn't updating the download pages into
/site. So basically moving download.html out of the way followed by a
site generation should work - but I don't have the forrest stuff
available here to run the update. Anyone else?
Cheers, Steve.
>
>Hope this helps.
>
>-- Tetsuya. (tetsuya@apache.org)
>
>On Mon, 06 Oct 2003 15:05:03 +0200
>(Subject: Re: CVS conflict on the download page)
>Stephen McConnell <mc...@apache.org> wrote:
>
>
>
>>Sylvain :
>>
>>I've been looking at this off and on over the last week.
>>Frankly, I don't have a clue as to why it is happening. I'm hoping we
>>can resolve this as part of the work on the new site.
>>
>>Steve.
>>
>>
>>Sylvain Wallez wrote:
>>
>>
>>
>>>Hi,
>>>
>>>I just found that there has been a CVS conflict on the Avalon download
>>>page at http://avalon.apache.org/download.cgi
>>>
>>>Nothing that prevents the download, though.
>>>
>>>Sylvain
>>>
>>>
>>>
>>--
>>
>>Stephen J. McConnell
>>mailto:mcconnell@apache.org
>>
>>
>>
>
>-----------------------------------------------------------
>Tetsuya Kitahata -- Terra-International, Inc.
>E-mail: tetsuya@apache.org http://www.terra-intl.com/
>
>
>---------------------------------------------------------------------
>To unsubscribe, e-mail: dev-unsubscribe@avalon.apache.org
>For additional commands, e-mail: dev-help@avalon.apache.org
>
>
>
>
--
Stephen J. McConnell
mailto:mcconnell@apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@avalon.apache.org
For additional commands, e-mail: dev-help@avalon.apache.org
Re: CVS conflict on the download page
Posted by Tetsuya Kitahata <te...@apache.org>.
Don't have any clue!? ... IIRC, you deleted some
*.html files (for download pages) from CVS ...
#Not related to download.html?? .. I forgot..
--
Anyway,
$ cd /www/avalon.apache.org/
$ mv download.html download.old.html
$ cvs update
How about this?
Hope this helps.
-- Tetsuya. (tetsuya@apache.org)
On Mon, 06 Oct 2003 15:05:03 +0200
(Subject: Re: CVS conflict on the download page)
Stephen McConnell <mc...@apache.org> wrote:
>
> Sylvain :
>
> I've been looking at this off and on over the last week.
> Frankly, I don't have a clue as to why it is happening. I'm hoping we
> can resolve this as part of the work on the new site.
>
> Steve.
>
>
> Sylvain Wallez wrote:
>
> > Hi,
> >
> > I just found that there has been a CVS conflict on the Avalon download
> > page at http://avalon.apache.org/download.cgi
> >
> > Nothing that prevents the download, though.
> >
> > Sylvain
> >
>
> --
>
> Stephen J. McConnell
> mailto:mcconnell@apache.org
>
-----------------------------------------------------------
Tetsuya Kitahata -- Terra-International, Inc.
E-mail: tetsuya@apache.org http://www.terra-intl.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@avalon.apache.org
For additional commands, e-mail: dev-help@avalon.apache.org
Re: CVS conflict on the download page
Posted by Stephen McConnell <mc...@apache.org>.
Sylvain :
I've been looking at this off and on over the last week.
Frankly, I don't have a clue as to why it is happening. I'm hoping we
can resolve this as part of the work on the new site.
Steve.
Sylvain Wallez wrote:
> Hi,
>
> I just found that there has been a CVS conflict on the Avalon download
> page at http://avalon.apache.org/download.cgi
>
> Nothing that prevents the download, though.
>
> Sylvain
>
--
Stephen J. McConnell
mailto:mcconnell@apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@avalon.apache.org
For additional commands, e-mail: dev-help@avalon.apache.org