> -----Original Message----- > From: David Crossley [mailto:[EMAIL PROTECTED] > Sent: Sunday, 14 September 2008 9:26 PM > To: dev@forrest.apache.org > Subject: Re: Forrest site down > > Gavin wrote: > > From: David Crossley > > > 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. > > > > Strange, I looked at yesterdays backup on bia and there were no version > > conflicts. > > No becuase i only made the SVN change to .htaccess > in the last few hours. > > That will be the file that we need. It should > have the local changes.
Do you want me to restore that file so you can commit your RedirectMatch again ? Gav... > > -David > > > -- > No virus found in this incoming message. > Checked by AVG. > Version: 7.5.524 / Virus Database: 270.6.21 - Release Date: 9/11/2008 > 12:00 AM
