Hi,
I'm trying to merge changes from a branch back to trunk and svn dumps core.
Am I doing something wrong here?
.s
Backtrace:
GNU gdb 2002-08-18-cvs
Copyright 2002 Free Software Foundation, Inc.
GDB is free software, covered by the GNU General Public License, and you are
welcome to change it and/or distribute copies of it under certain
conditions.
Type "show copying" to see the conditions.
There is absolutely no warranty for GDB. Type "show warranty" for details.
This GDB was configured as "i386-linux"...
(gdb) r merge --password xxxx http://gray.mine.nu:81/svn/repos/dmesh/trunk/
http://gray.mine.nu:81/svn/repos/dmesh/branches/animated.textures/ trunk
Starting program: /usr/local/bin/svn merge --password xxxx
http://gray.mine.nu:81/svn/repos/dmesh/trunk/
http://gray.mine.nu:81/svn/repos/dmesh/branches/animated.textures/ trunk
[New Thread 16384 (LWP 300)]
U trunk/Texture.cpp
U trunk/Engine.cpp
U trunk/Quaternion.cpp
U trunk/Texture.h
U trunk/Starmap.cpp
U trunk/Keyframe.h
U trunk/GUI.cpp
Program received signal SIGSEGV, Segmentation fault.
[Switching to Thread 16384 (LWP 300)]
svn_io_check_path (path=0x0, kind=0xbffff304, pool=0x805cb78) at
subversion/libsvn_subr/io.c:64
warning: Source file is more recent than executable.
64 if (path[0] == '\0')
(gdb) bt
#0 svn_io_check_path (path=0x0, kind=0xbffff304, pool=0x805cb78) at
subversion/libsvn_subr/io.c:64
#1 0x40037a69 in svn_wc_check_wc (path=0x0, wc_format=0xbffff344,
pool=0x805cb78) at
subversion/libsvn_wc/questions.c:53
#2 0x40015e69 in store_auth_info (filename=0x40020e8b "username",
data=0x80be3c8 "gray", cb=0x811b108)
at subversion/libsvn_client/auth.c:239
#3 0x40015f43 in maybe_store_username (username=0x80be3c8 "gray",
baton=0x811b108) at
subversion/libsvn_client/auth.c:278
#4 0x40016015 in store_user_and_pass (baton=0x811b108) at
subversion/libsvn_client/auth.c:316
#5 0x40109953 in svn_ra_dav__maybe_store_auth_info (ras=0x811b2c8) at
subversion/libsvn_ra_dav/util.c:369
#6 0x40105467 in svn_ra_dav__get_latest_revnum
(session_baton=0x811b2c8, latest_revnum=0xbffff4c8) at
subversion/libsvn_ra_dav/fetch.c:1331
#7 0x4001fff9 in svn_client__get_revision_number (revnum=0xbffff4c8,
ra_lib=0x4010c540, sess=0x811b2c8,
revision=0xbffffc4c, path=0x0, pool=0x805cb78)
at subversion/libsvn_client/revisions.c:68
#8 0x40019f03 in repos_to_wc_copy (src_url=0x811b000
"http://gray.mine.nu:81/svn/repos/dmesh/branches/animated.textures/Keyframe.cpp",
src_revision=0xbffffc4c,
dst_path=0x80eaf48 "trunk/Keyframe.cpp",
optional_adm_access=0x805d190, auth_baton=0x805ce50,
notify_func=0, notify_baton=0x0, pool=0x805cb78)
at subversion/libsvn_client/copy.c:700
#9 0x4001a621 in setup_copy (commit_info=0x0, src_path=0x811b000
"http://gray.mine.nu:81/svn/repos/dmesh/branches/animated.textures/Keyframe.cpp",
src_revision=0xbffffc4c, dst_path=0x80eaf48 "trunk/Keyframe.cpp",
optional_adm_access=0x805d190,
auth_baton=0x805ce50, log_msg_func=0, log_msg_baton=0x0,
is_move=0, force=1, notify_func=0, notify_baton=0x0,
pool=0x805cb78) at
subversion/libsvn_client/copy.c:1014
#10 0x4001a698 in svn_client_copy (commit_info=0x0, src_path=0x811b000
"http://gray.mine.nu:81/svn/repos/dmesh/branches/animated.textures/Keyframe.cpp",
src_revision=0xbffffc4c, dst_path=0x80eaf48 "trunk/Keyframe.cpp",
optional_adm_access=0x805d190,
auth_baton=0x805ce50, log_msg_func=0, log_msg_baton=0x0,
notify_func=0, notify_baton=0x0, pool=0x805cb78) at
subversion/libsvn_client/copy.c:1049
#11 0x4001b1f8 in merge_file_added (adm_access=0x805d190, mine=0x80eaf48
"trunk/Keyframe.cpp",
older=0x80cc278 "tmp.49720.00001", yours=0x80eb240 "tmp.44824.00001",
baton=0xbffffa2c) at subversion/libsvn_client/diff.c:411
#12 0x4001fa95 in close_file (file_baton=0x80eaf00, pool=0x80eaec8) at
subversion/libsvn_client/repos_diff.c:693
#13 0x401064eb in end_element (userdata=0x8080ec0, elm=0x4010c0b4,
cdata=0x807b560 "\n") at
subversion/libsvn_ra_dav/fetch.c:2082
#14 0x401dae40 in end_element (userdata=0x806ca48, name=0x80d7270
"S:add-file") at ne_xml.c:557
#15 0x4020f21e in xmlParseEndTag () from /usr/lib/libxml2.so.2
#16 0x40212566 in xmlParseExtParsedEnt () from /usr/lib/libxml2.so.2
#17 0x4021291d in xmlParseChunk () from /usr/lib/libxml2.so.2
#18 0x401db404 in ne_xml_parse (p=0x806ca48,
block=0x80d823c "<?xml version=\"1.0\"
encoding=\"utf-8\"?>\n<S:update-report xmlns:S=\"svn:\"
xmlns:D=\"DAV:\">\n<S:target-revision rev=\"133\"/>\n<S:open-directory
rev=\"128\">\n<D:checked-in><D:href>/svn/repos/!svn/ver/133/dmesh/b"...,
len=8192) at ne_xml.c:812
#19 0x401db36c in ne_xml_parse_v (userdata=0x806ca48,
block=0x80d823c "<?xml version=\"1.0\"
encoding=\"utf-8\"?>\n<S:update-report xmlns:S=\"svn:\"
xmlns:D=\"DAV:\">\n<S:target-revision rev=\"133\"/>\n<S:open-directory
rev=\"128\">\n<D:checked-in><D:href>/svn/repos/!svn/ver/133/dmesh/b"...,
len=8192) at ne_xml.c:777
#20 0x401d99f6 in do_inflate (ctx=0x80d8238,
---Type <return> to continue, or q <return> to quit---
buf=0x80d41da
"ä]Ms£F\020½ûW(Üù\230\031°,ÊÒVª\234Jm%\227\224\235=ä\222bÅH±\020\001äZÿûÌL\003B\216\027£-ÔeÑ>!\tæ\215\03
7\217\236î\a3Ü~ú¶}\232<˼HvéÜb\216gMdºÜÅIº\236[ûreßX\237\026W·÷á>\213£RÚ¹Ìvy9QG¥Ex?·\212ç4´ª\217wsëîç/¡eö
/£|-Kµÿs¢Û\236¨\rÕ¾\020\226k~Þe2µã$\227Ër\227¿T¿ò\e}ì]¸ÜÈå?2¶\223t¡>mr¹Z¸\nÈÕà\205û\223ÞT]vUkn¼"...,
len=1301) at ne_compress.c:200
#21 0x401d9cc4 in gz_reader (ud=0x80d8238,
buf=0x80d41da
"ä]Ms£F\020½ûW(Üù\230\031°,ÊÒVª\234Jm%\227\224\235=ä\222bÅH±\020\001äZÿûÌL\003B\216\027£-ÔeÑ>!\tæ\215\03
7\217\236î\a3Ü~ú¶}\232<˼HvéÜb\216gMdºÜÅIº\236[ûreßX\237\026W·÷á>\213£RÚ¹Ìvy9QG¥Ex?·\212ç4´ª\217wsëîç/¡eö
/£|-Kµÿs¢Û\236¨\rÕ¾\020\226k~Þe2µã$\227Ër\227¿T¿ò\e}ì]¸ÜÈå?2¶\223t¡>mr¹Z¸\nÈÕà\205û\223ÞT]vUkn¼"...,
len=1311) at ne_compress.c:328
#22 0x401d1914 in ne_read_response_block (req=0x80d41a8,
buffer=0x80d41d0 "\037\213\b", buflen=8192) at
ne_request.c:814
#23 0x401d25c2 in ne_request_dispatch (req=0x80d41a8) at ne_request.c:1253
#24 0x40109760 in svn_ra_dav__parsed_request (ras=0x80be2a0,
method=0x4010a5b1 "REPORT", url=0x8066550
"/svn/repos/dmesh/trunk", body=0x0, fd=8, elements=0x4010c024,
validate_cb=0x40105828 <validate_element>, startelm_cb=0x40105a9c
<start_element>,
endelm_cb=0x4010630c <end_element>, baton=0x8080ec0, pool=0x805cb78)
at subversion/libsvn_ra_dav/util.c:287
#25 0x40106b09 in reporter_finish_report (report_baton=0x8080ec0) at
subversion/libsvn_ra_dav/fetch.c:2306
#26 0x4001b963 in do_merge (notify_func=0x804b8b0 <notify>,
notify_baton=0x805d008, auth_baton=0x805ce50,
URL1=0x805cf08 "http://gray.mine.nu:81/svn/repos/dmesh/trunk",
revision1=0xbffffc40,
URL2=0x805cf90
"http://gray.mine.nu:81/svn/repos/dmesh/branches/animated.textures",
revision2=0xbffffc4c, target_wcpath=0x805cfe8 "trunk", adm_access=0x805d190,
recurse=1, dry_run=0, callbacks=0x40023024,
callback_baton=0xbffffa2c, pool=0x805cb78) at
subversion/libsvn_client/diff.c:763
#27 0x4001c747 in svn_client_merge (notify_func=0x804b8b0 <notify>,
notify_baton=0x805d008,
auth_baton=0x805ce50,
URL1=0x805cf08 "http://gray.mine.nu:81/svn/repos/dmesh/trunk",
revision1=0xbffffc40,
URL2=0x805cf90
"http://gray.mine.nu:81/svn/repos/dmesh/branches/animated.textures",
revision2=0xbffffc4c, target_wcpath=0x805cfe8 "trunk", recurse=1, force=0,
dry_run=0, pool=0x805cb78) at subversion/libsvn_client/diff.c:1359
#28 0x0804d942 in svn_cl__merge (os=0x805cc98, baton=0xbffffc40,
pool=0x805cb78) at
subversion/clients/cmdline/merge-cmd.c:153
#29 0x0804d574 in main (argc=7, argv=0xbffffd14) at
subversion/clients/cmdline/main.c:856
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Dec 21 05:34:18 2002