Not a release blocker of course; serf's experimental. In my
1.5.x branch working copy:
0 1.5.x% svnversion
31660:31696
Entire wc is at 31660, except STATUS at 31696. Sometimes it
crashes, sometimes it doesn't.
1 1.5.x% svn cleanup; svn revert -R .
Reverted 'subversion/include/svn_io.h'
Reverted 'subversion/libsvn_client/diff.c'
0 1.5.x% svn merge -c r31685 http://svn.collab.net/repos/svn/trunk
--- Merging r31685 into '.':
U subversion/include/svn_io.h
U subversion/libsvn_client/diff.c
0 1.5.x% svn cleanup; svn revert -R .
Reverted '.'
Reverted 'COMMITTERS'
Reverted 'subversion/include/svn_io.h'
Reverted 'subversion/libsvn_client/diff.c'
Reverted 'subversion/bindings/swig'
Reverted 'CHANGES'
0 1.5.x% svn merge -c r31685 http://svn.collab.net/repos/svn/trunk
--- Merging r31685 into '.':
U subversion/include/svn_io.h
U subversion/libsvn_client/diff.c
zsh: segmentation fault (core dumped) svn merge -c r31685 http://svn.collab.net/repos/svn/trunk
(gdb) bt
#0 0x47d04203 in strncmp () from /lib/tls/i686/cmov/libc.so.6
#1 0xf7e56024 in svn_path_is_ancestor (
path1=0x81e6fe8 "http://svn.collab.net/repos/svn",
path2=0x194 <Address 0x194 out of bounds>)
at subversion/libsvn_subr/path.c:689
#2 0xf7f76475 in svn_ra_reparent (session=0x80b3dd8,
url=0x194 <Address 0x194 out of bounds>, pool=0x81e6b78)
at subversion/libsvn_ra/ra_loader.c:538
#3 0xf7fe7367 in do_directory_merge (
url1=0x8192ba8 "http://svn.collab.net/repos/svn/trunk", revision1=31684,
url2=0x8192bf0 "http://svn.collab.net/repos/svn/trunk", revision2=31685,
parent_entry=0x80b11b0, adm_access=0x80b1118, depth=svn_depth_infinity,
notify_b=0xffffcf10, merge_b=0xffffcf40, pool=0x80b3840)
at subversion/libsvn_client/merge.c:4352
#4 0xf7fe80ef in do_merge (merge_sources=0x8191b58, target=0x806e1a0 "",
target_entry=0x80b11b0, adm_access=0x80b1118, sources_ancestral=1,
sources_related=1, same_repos=1, ignore_ancestry=0, force=0, dry_run=0,
record_only=0, depth=svn_depth_infinity, merge_options=0x0, ctx=0x807c990,
pool=0x807c128) at subversion/libsvn_client/merge.c:4772
#5 0xf7fea2ec in svn_client_merge_peg3 (
source=0x80b0fb0 "http://svn.collab.net/repos/svn/trunk",
ranges_to_merge=0x807c2a8, peg_revision=0xffffd094,
target_wcpath=0x806e1a0 "", depth=svn_depth_unknown, ignore_ancestry=0,
force=0, record_only=0, dry_run=0, merge_options=0x0, ctx=0x807c990,
pool=0x807c128) at subversion/libsvn_client/merge.c:5716
#6 0x08056771 in svn_cl__merge (os=0x807c2c8, baton=0xffffd19c,
pool=0x807c128) at subversion/svn/merge-cmd.c:307
#7 0x08055e53 in main (argc=5, argv=0xffffd364) at subversion/svn/main.c:2018
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-06-11 00:37:54 CEST