You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@perl.apache.org by Stas Bekman <st...@stason.org> on 2005/04/05 18:46:17 UTC
svn up doesn't work after svn tree merging
modperl2 has recently went through an svn tree merge, which moved many
files around. Result: I no longer can update my tree with multiple changes
which happened before the merge:
% svn up
svn: Checksum mismatch for
't/filter/TestFilter/.svn/text-base/both_str_req_mix.pm.svn-base';
recorded: '98aeb94004bfcca1eaa1ca5a11418926', actual:
'81f8253f43f02048a06a3e58e15f3d00'
nuked the t/filter/TestFilter tree completely (had no modification there),
passed over this problem.
% svn up
svn: Delta source ended unexpectedly
I have no idea how to proceed.
Are those bugs in subversion? Or did the merging go wrong?
svn 1.1.3-11mdk here.
--
__________________________________________________________________
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
Re: svn up doesn't work after svn tree merging
Posted by Stas Bekman <st...@stason.org>.
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
Re: svn up doesn't work after svn tree merging
Posted by Stas Bekman <st...@stason.org>.
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.
--
__________________________________________________________________
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
Re: svn up doesn't work after svn tree merging
Posted by Stas Bekman <st...@stason.org>.
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.
Thanks.
--
__________________________________________________________________
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
Re: svn up doesn't work after svn tree merging
Posted by Stas Bekman <st...@stason.org>.
Brian W. Fitzpatrick wrote:
> On Tue, 2005-04-05 at 13:09 -0400, Stas Bekman wrote:
>
>>Brian W. Fitzpatrick wrote:
>>
>>>Have you tried checking out a new working copy? Is this after
>>>successfully committing the merge, or before?
>>
>>Checking out a new copy is fine. In fact a checkout in another tree which
>>had no changes worked fine as well.
>>
>>The events were as follows;
>>
>>1) check out trunk
>>
>>2) do changes
>>
>>3) meanwhile another tree was merged with trunk (lots of files moved)
>>
>>4) svn up - no workie
>
>
> Hmm. It may be a bug in update when replacing a merged file... can you
> manage to reproduce it by checking out a working copy at a revision
> before the big merge, and then trying to update. If you can do this,
> please shoot me the recipe.
As I said an unmodified tree checked previously works fine. It's the
changed tree that is problematic. So I need to know which file to try to
change. However there are many files. The error:
% svn up
> svn: Delta source ended unexpectedly
doesn't give me a single clue to which file it has a problem with. And I
can't find a flag that makes the output more verbose than that.
--
__________________________________________________________________
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
Re: svn up doesn't work after svn tree merging
Posted by Stas Bekman <st...@stason.org>.
Brian W. Fitzpatrick wrote:
> Have you tried checking out a new working copy? Is this after
> successfully committing the merge, or before?
Checking out a new copy is fine. In fact a checkout in another tree which
had no changes worked fine as well.
The events were as follows;
1) check out trunk
2) do changes
3) meanwhile another tree was merged with trunk (lots of files moved)
4) svn up - no workie
> -Fitz
>
> On Tue, 2005-04-05 at 12:46 -0400, Stas Bekman wrote:
>
>>modperl2 has recently went through an svn tree merge, which moved many
>>files around. Result: I no longer can update my tree with multiple changes
>>which happened before the merge:
>>
>>% svn up
>>
>>svn: Checksum mismatch for
>>'t/filter/TestFilter/.svn/text-base/both_str_req_mix.pm.svn-base';
>>recorded: '98aeb94004bfcca1eaa1ca5a11418926', actual:
>>'81f8253f43f02048a06a3e58e15f3d00'
>>
>>nuked the t/filter/TestFilter tree completely (had no modification there),
>>passed over this problem.
>>
>>% svn up
>>svn: Delta source ended unexpectedly
>>
>>I have no idea how to proceed.
>>
>>Are those bugs in subversion? Or did the merging go wrong?
>>
>>svn 1.1.3-11mdk here.
>>
--
__________________________________________________________________
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