Mailing-List: contact dev-help@perl.apache.org; run by ezmlm
Precedence: bulk
Received-SPF: pass (hermes.apache.org: local policy)
Message-ID: <4252E9E7.2080906@stason.org>
Date: Tue, 05 Apr 2005 15:41:27 -0400
From: Stas Bekman <stas@stason.org>
Organization: Hope, Humanized
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.7.6) Gecko/20050322
MIME-Version: 1.0
To: "Brian W. Fitzpatrick" <fitz@red-bean.com>
Cc: mod_perl Dev <dev@perl.apache.org>,
	infrastructure <infrastructure@apache.org>
Subject: Re: svn up doesn't work after svn tree merging
References: <4252C0D9.8040104@stason.org>
	 <1112720707.30981.15.camel@localhost.localdomain>
	 <4252C631.3020302@stason.org>
	 <1112722472.30981.20.camel@localhost.localdomain>
	 <4252CD49.2040809@stason.org>
  <4252D130.4010404@stason.org>	 <1112724940.30981.27.camel@localhost.localdomain>
	 <4252D8AF.9080604@stason.org>
 <1112728436.30981.47.camel@localhost.localdomain>
In-Reply-To: <1112728436.30981.47.camel@localhost.localdomain>
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit

Brian W. Fitzpatrick wrote:
> On Tue, 2005-04-05 at 14:27 -0400, Stas Bekman wrote:
> 
>>Brian W. Fitzpatrick wrote:
>>
>>>On Tue, 2005-04-05 at 13:56 -0400, Stas Bekman wrote:
>>>
>>>
>>>>Brian, here is the whole problematic checkout:
>>>>http://people.apache.org/~stas/mp2-svn.tgz
>>>>May you will be able to figure out what are the problems by just using it.
>>>
>>>
>>>For starters, a lot of your directories in the working copy are marked
>>>as incomplete ('!' in the status line), so something was really broken
>>>with your working copy... did you run 'svn up' and hit "ctrl-c" a few
>>>times?
>>
>>Not a single time. It was bailing out on its own with:
>>
>>svn: Checksum mismatch for 
>>'t/filter/TestFilter/.svn/text-base/both_str_req_mix.pm.svn-base'; 
>>recorded: '98aeb94004bfcca1eaa1ca5a11418926', actual: 
>>'81f8253f43f02048a06a3e58e15f3d00'
>>
>>
>>
>>>Hmm. Somehow t/filter/TestFilter/both_str_req_mix.pm seems to have a
>>>stale checksum in your working copy... I'm not sure how that happened,
>>>but when I delete just the TestFilter directory, 'svn up' completes
>>>successfully on the whole working copy.
>>
>>Right. I did the same.
>>
>>
>>>I don't see what might have caused this, but given the busted state of
>>>your wc, I'd chalk it up to sunspots. :-)
>>
>>I suspect the checksum mismatch has screwed up the rest of the tree.
>>
>>Unfortunately that has costed me several hours of work, trying to manually 
>>migrate the tree.
> 
> 
> Well, just delete the TestFilter directory, then update works from the
> top-level directory (or at least it did for me).

Not here. After deleting that directory it restores is but then I get:

% svn up
svn: Delta source ended unexpectedly

% svn --version
svn, version 1.1.3 (r12730)
    compiled Mar  2 2005, 21:26:33


-- 
__________________________________________________________________
Stas Bekman            JAm_pH ------> Just Another mod_perl Hacker
http://stason.org/     mod_perl Guide ---> http://perl.apache.org
mailto:stas@stason.org http://use.perl.org http://apacheweek.com
http://modperlbook.org http://apache.org   http://ticketmaster.com

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org