Lieven, et al,
I attempted the following merge in the root of the explore-wc branch:
$ svn merge https://svn.collab.net/repos/svn/trunk
and it generated a core dump with the following traceback:
#0 0x96c2fb9e in kill$UNIX2003 ()
#1 0x96ca6ec2 in raise ()
#2 0x96cb647f in abort ()
#3 0x001ca8cd in serf_bucket_mem_free ()
#4 0x001c822c in serf_default_destroy_and_data ()
#5 0x001c786d in serf_aggregate_destroy_and_data ()
#6 0x001cde02 in serf_chunk_destroy ()
#7 0x001c776d in cleanup_aggregate ()
#8 0x001c7862 in serf_aggregate_destroy_and_data ()
#9 0x001cd71c in serf_ssl_encrypt_destroy_and_data ()
#10 0x001c67ae in write_to_connection ()
#11 0x001c6c08 in process_connection ()
#12 0x001c6f21 in serf_event_trigger ()
#13 0x001c6fcc in serf_context_run ()
#14 0x001afc60 in svn_ra_serf__context_run_wait (done=0x8b6a88,
sess=0x81f8a0, pool=0x81f418) at subversion/libsvn_ra_serf/util.c:555
#15 0x0019cb3b in svn_ra_serf__get_location_segments
(ra_session=0x81f890, path=0x8b6a18 "build.conf", peg_revision=33146,
start_rev=33146, end_rev=1, receiver=0x8006a <gls_receiver>,
receiver_baton=0xbfffe990, pool=0x81f418) at
subversion/libsvn_ra_serf/getlocationsegments.c:218
#16 0x000f4d7b in svn_ra_get_location_segments (session=0x81f890,
path=0x8b6a18 "build.conf", peg_revision=33146, start_rev=33146,
end_rev=1, receiver=0x8006a <gls_receiver>, receiver_baton=0xbfffe990,
pool=0x81f418) at subversion/libsvn_ra/ra_loader.c:1198
#17 0x000801bb in svn_client__repos_location_segments
(segments=0xbfffe9f0, ra_session=0x81f890, path=0x8b6a18 "build.conf",
peg_revision=33146, start_revision=33146, end_revision=1,
ctx=0x811be8, pool=0x81f418) at subversion/libsvn_client/ra.c:558
#18 0x000704e1 in prepare_subtree_ranges
(requested_rangelist=0xbfffea88,
child_deleted_or_nonexistant=0xbfffea84, mergeinfo_path=0x8b6968
"/trunk/build.conf", parent=0x8d2098, revision1=1, revision2=33146,
primary_url=0x8c76f8
"https://svn.collab.net/repos/svn/trunk/build.conf",
ra_session=0x81f890, ctx=0x811be8, pool=0x81f418) at
subversion/libsvn_client/merge.c:2301
#19 0x000708cf in filter_merged_revisions (parent=0x8d2098,
child=0x8d20d8, mergeinfo_path=0x8b6968 "/trunk/build.conf",
target_mergeinfo=0x8eb348, implicit_mergeinfo=0x8b6798, revision1=1,
revision2=33146, primary_url=0x8c76f8
"https://svn.collab.net/repos/svn/trunk/build.conf",
ra_session=0x81f890, is_subtree=1, ctx=0x811be8, pool=0x81f418) at
subversion/libsvn_client/merge.c:2512
#20 0x00070bfa in calculate_remaining_ranges (parent=0x8d2098,
child=0x8d20d8, source_root_url=0x820dc0
"https://svn.collab.net/repos/svn", url1=0x8c7688
"https://svn.collab.net/repos/svn/trunk/build.conf", revision1=1,
url2=0x8c76f8 "https://svn.collab.net/repos/svn/trunk/build.conf",
revision2=33146, target_mergeinfo=0x8eb348,
implicit_mergeinfo=0x8b6798, is_subtree=1, ra_session=0x81f890,
entry=0x813110, ctx=0x811be8, pool=0x81f418) at
subversion/libsvn_client/merge.c:2698
#21 0x000714ba in populate_remaining_ranges
(children_with_mergeinfo=0x8207a0, source_root_url=0x820dc0
"https://svn.collab.net/repos/svn", url1=0x4948a8
"https://svn.collab.net/repos/svn/trunk", revision1=1, url2=0x494920
"https://svn.collab.net/repos/svn/trunk", revision2=33146,
inheritable=1, honor_mergeinfo=1, ra_session=0x81f890,
parent_merge_src_canon_path=0x820e58 "/trunk", adm_access=0x812d80,
merge_b=0xbfffeea0) at subversion/libsvn_client/merge.c:2983
#22 0x0007615f in do_directory_merge (url1=0x4948a8
"https://svn.collab.net/repos/svn/trunk", revision1=1, url2=0x494920
"https://svn.collab.net/repos/svn/trunk", revision2=33146,
target_entry=0x812e18, adm_access=0x812d80, depth=svn_depth_infinity,
notify_b=0xbfffee70, merge_b=0xbfffeea0, pool=0x81f418) at
subversion/libsvn_client/merge.c:5743
#23 0x0007757e in do_merge (merge_sources=0x4934e8, target=0x180b4 "",
target_entry=0x812e18, adm_access=0x812d80, 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=0x811be8, pool=0x811418) at subversion/libsvn_client/merge.c:6355
#24 0x00079bc0 in svn_client_merge_peg3 (source=0x812bd8
"https://svn.collab.net/repos/svn/trunk", ranges_to_merge=0x812cb8,
peg_revision=0xbffff08c, target_wcpath=0x180b4 "",
depth=svn_depth_unknown, ignore_ancestry=0, force=0, record_only=0,
dry_run=0, merge_options=0x0, ctx=0x811be8, pool=0x811418) at
subversion/libsvn_client/merge.c:7297
#25 0x0000e75a in svn_cl__merge (os=0x8115b8, baton=0xbffff228,
pool=0x811418) at subversion/svn/merge-cmd.c:307
#26 0x0000dd35 in main (argc=3, argv=0xbffff3dc) at subversion/svn/main.c:2008
This is on Mac OS (Leopard), if that matters at all. And using serf
from its /trunk.
Cheers,
-g
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-09-17 22:48:18 CEST