Return-Path: 
 <dev-return-29700-apmail-forrest-dev-archive=forrest.apache.org@forrest.apache.org>
Delivered-To: apmail-forrest-dev-archive@www.apache.org
Received: (qmail 53851 invoked from network); 14 Sep 2008 11:57:39 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 14 Sep 2008 11:57:39 -0000
Received: (qmail 17364 invoked by uid 500); 14 Sep 2008 11:57:36 -0000
Delivered-To: apmail-forrest-dev-archive@forrest.apache.org
Received: (qmail 17322 invoked by uid 500); 14 Sep 2008 11:57:36 -0000
Mailing-List: contact dev-help@forrest.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:dev-help@forrest.apache.org>
list-unsubscribe: <mailto:dev-unsubscribe@forrest.apache.org>
List-Post: <mailto:dev@forrest.apache.org>
Reply-To: dev@forrest.apache.org
List-Id: <dev.forrest.apache.org>
Delivered-To: mailing list dev@forrest.apache.org
Received: (qmail 17311 invoked by uid 99); 14 Sep 2008 11:57:36 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 14 Sep 2008 04:57:36 -0700
X-ASF-Spam-Status: No, hits=0.7 required=10.0
	tests=SPF_SOFTFAIL
X-Spam-Check-By: apache.org
Received-SPF: softfail (athena.apache.org: transitioning domain of
 gavin@16degrees.com.au does not designate 61.9.189.149 as permitted sender)
Received: from [61.9.189.149] (HELO nschwmtas05p.mx.bigpond.com)
 (61.9.189.149)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 14 Sep 2008 11:56:37 +0000
Received: from nschwotgx03p.mx.bigpond.com ([124.185.182.143])
          by nschwmtas05p.mx.bigpond.com with ESMTP
          id
 <20080914115657.KHBL6339.nschwmtas05p.mx.bigpond.com@nschwotgx03p.mx.bigpond.com>
          for <dev@forrest.apache.org>; Sun, 14 Sep 2008 11:56:57 +0000
Received: from developer ([124.185.182.143]) by nschwotgx03p.mx.bigpond.com
          with ESMTP
          id <20080914115656.JSOA11041.nschwotgx03p.mx.bigpond.com@developer>
          for <dev@forrest.apache.org>; Sun, 14 Sep 2008 11:56:56 +0000
From: "Gavin" <gavin@16degrees.com.au>
To: <dev@forrest.apache.org>
References: <018701c91653$ddeaf7b0$0200a8c0@developer>
 <018801c91655$2354c8c0$0200a8c0@developer>
 <20080914105007.GB18657@igg.indexgeo.com.au>
 <018f01c91659$7febf3c0$0200a8c0@developer>
 <20080914112533.GA20371@igg.indexgeo.com.au>
Subject: RE: Forrest site down
Date: Sun, 14 Sep 2008 21:56:54 +1000
Message-ID: <019401c91660$fb79ba20$0200a8c0@developer>
MIME-Version: 1.0
Content-Type: text/plain;
	charset="US-ASCII"
Content-Transfer-Encoding: 7bit
X-Mailer: Microsoft Office Outlook 11
In-Reply-To: <20080914112533.GA20371@igg.indexgeo.com.au>
thread-index: AckWXc8n4N7AzPe+Sc25fLrT6PLOXQAAlWCg
X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.3350
X-Antivirus: avast! (VPS 080913-0, 13/09/2008), Outbound message
X-Antivirus-Status: Clean
X-RPD-ScanID: Class unknown;
 VirusThreatLevel unknown, RefID str=0001.0A150202.48CCFC09.0012,ss=1,fgs=0
X-Virus-Checked: Checked by ClamAV on apache.org



> -----Original Message-----
> From: David Crossley [mailto:crossley@apache.org]
> 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