Gavin wrote:
> From: Gavin wrote:
> > 
> > I notice forrest site is down.
> > 
> > On inspection, our .htaccess is messed up with <<<<<MINE etc etc..
> > 
> > Attempting to fix on mino then will svn up.
> 
> I have removed all version clashes such as :-
> 
> rm -rf .htaccess
> rm -rf.htaccess.mine
> rm -rf .htaccess.r695133
> mv .htaccess.r695140 .htaccess

There must have been manual changes on the server that
were not added to our SVN.

Did you save a copy? I guess not, going by those commands.

Be careful of using "rm -rf" that will be recursive.

Sorry about that. When doing changs to .htaccess
i should have tested it with the proxy trick shown here:
http://apache.org/dev/project-site.html

I am at dinner now. Will try to look into it soon.

-David

> will have to wait and see if eos picks this up or if we need to do any more
> that end.
> 
> > Gav...