SteveKing <steveking@gmx.ch> writes:
> kfogel@collab.net wrote:
>> SteveKing <steveking@gmx.ch> writes:
>>
>>>subversion/libsvn_wc/lock.c, line 621 :
>>> if (associated->set) // with associated as 0!!
>>>subversion/libsvn_wc/entries.c, line 711
>>>subversion/libsvn_wc/props.c, line 279
>>>subversion/libsvn_client/diff.c, line 1168
>>>subversion/libsvn_client/repos_diff.c, line 817
>>>subversion/libsvn_delta/cancel.c, line 237
>>>subversion/libsvn_ra_svn/editorp.c, line 688
>>>subversion/libsvn_ra_svn/editorp.c, line 794
>>>subversion/libsvn_ra_svn/editor.c, line 730
>>>subversion/libsvn_ra_svn/client.c, line 382
>>>subversion/libsvn_client/diff.c, line 1393
>>>subversion/libsvn_client/diff.c, line 2491
> [snip]
>> This may be related to
>> http://subversion.tigris.org/issues/show_bug.cgi?id=2254
>> (Paul Querna, any progress on that reproduction recipe?)
>
> Yes, the stacktrace looks exactly the same!
Really? The stack trace in issue 2254 makes no sense to me, it
appears to have svn_client_relocate calling svn_client_delete, and
svn_client_delete calling svn_wc_merge_prop_diffs.
> From what I can see on that issue, I think that's the same bug we're
> talking about here.
I don't know about issue 2254, but I think I know how to reproduce
your bug, can you determine if this produces the stacktrace you are
seeing:
svnadmin create repo
svn mkdir $REPO/foo $REPO/foo/bar $REPO/foo2 -m ""
touch Makefile
svn import Makefile $REPO/foo/bar/zig -m ""
svn co $REPO/foo wc
svn ps x x wc/bar/zig
svn ci wc -m ""
svn sw $REPO/foo2 wc
svn merge --dry-run -r2:3 $REPO/foo wc
The merge crashes if I use 1.1.x but it works if I use trunk, I
suspect it got fixed as a side effect of r12025.
--
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun May 1 00:18:37 2005