I've got a question (perhaps problem?) with 'svn merge', which I can't
figure out from looking at the book. What I've done is
1) copied the trunk to /branches/OBJS1
2) 'svn co https://.../branches/OBJS1'
3) modified some files, removed files, added files, etc. and checked
in back to the branch
now I am trying to merge the changes back to the trunk by:
1) svn co https://.../trunk
2) cd trunk
3) svn merge https://.../trunk https://.../branches/OBJS1 .
the third step segfaulted (stack trace below). I tried again, with the
"--dry-run" arg, and seems to be blowing up because it can't merge
properties on a file that was created on the branch:
svn: Can't find an entry
svn: Can't merge props into 'docs/samplecode.html':it's not under
revision control.
Am I doing something wrong, or is this a svn bug??
-- Rob
**********
Date/Time: 2003-01-05 17:56:58 -0800
OS Version: 10.2.3 (Build 6G30)
Host: iCandy.local.
Command: svn
PID: 14427
Exception: EXC_BAD_ACCESS (0x0001)
Codes: KERN_PROTECTION_FAILURE (0x0002) at 0x00000000
Thread 0 Crashed:
#0 0x003a6e9c in svn_io_check_path (io.c:64)
#1 0x001e6cdc in svn_wc_check_wc (questions.c:53)
#2 0x00105180 in store_auth_info (auth.c:240)
#3 0x00105368 in store_user_and_pass (auth.c:316)
#4 0x0024d0b0 in svn_ra_dav__maybe_store_auth_info (util.c:369)
#5 0x002486b8 in svn_ra_dav__get_latest_revnum (fetch.c:1333)
#6 0x00111184 in svn_client__get_revision_number (revisions.c:68)
#7 0x00109d34 in repos_to_wc_copy (copy.c:701)
#8 0x0010a52c in setup_copy (copy.c:1017)
#9 0x0010a5b4 in svn_client_copy (copy.c:1049)
#10 0x0010b268 in merge_file_added (diff.c:414)
#11 0x00110acc in close_file (repos_diff.c:691)
#12 0x002497d4 in end_element (fetch.c:2082)
#13 0x0056e4d8 in end_element (ne_xml.c:559)
#14 0x00400134 in doContent (xmlparse.c:1744)
#15 0x003ff284 in XML_ParseBuffer (xmlparse.c:1157)
#16 0x0056eb10 in ne_xml_parse (ne_xml.c:805)
#17 0x005635d8 in ne_read_response_block (ne_request.c:814)
#18 0x00564468 in ne_request_dispatch (ne_request.c:1255)
#19 0x0024cea4 in svn_ra_dav__parsed_request (util.c:289)
#20 0x00249ea0 in reporter_finish_report (fetch.c:2306)
#21 0x0010bb70 in do_merge (diff.c:763)
#22 0x0010cb0c in svn_client_merge (diff.c:1372)
#23 0x00005d84 in svn_cl__merge (merge-cmd.c:164)
#24 0x000058bc in main (main.c:857)
#25 0x000022a4 in _start (crt.c:267)
#26 0x00002124 in start
PPC Thread State:
srr0: 0x003a6e9c srr1: 0x0200f030 vrsave: 0x00000000
xer: 0x00000000 lr: 0x003a6e8c ctr: 0x003a6e7c mq: 0x00000000
r0: 0x001e6cdc r1: 0xbfffed50 r2: 0x42002242 r3: 0x00000000
r4: 0xbfffee50 r5: 0x000c8848 r6: 0x00000001 r7: 0x000c8848
r8: 0x006a8440 r9: 0x000c8b58 r10: 0x0010525c r11: 0x001f01e0
r12: 0x003a6e7c r13: 0x00000000 r14: 0x00000000 r15: 0x00000000
r16: 0x000fbe60 r17: 0x00000000 r18: 0x00000000 r19: 0x00000000
r20: 0x00000000 r21: 0x00000000 r22: 0x000c8b58 r23: 0x00000000
r24: 0x00000000 r25: 0x000fbe60 r26: 0x006a7af0 r27: 0x00000000
r28: 0xbfffee50 r29: 0xbfffeec0 r30: 0x00000000 r31: 0x003a6e8c
Received on Mon Jan 6 03:00:35 2003