Hello,
Here's a transcript of a crash in serf I encountered while
trying to merge from trunk into the tree conflict branch.
Also visible is a bug which prevents the merge to run with 1.5.1,
which I think is related to issue #3067.
stsp_at_ted [svn/svn-tree-conflicts] $ svn info
Path: .
URL: https://svn.collab.net/repos/svn/branches/tree-conflicts
Repository Root: https://svn.collab.net/repos/svn
Repository UUID: 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Revision: 32658
Node Kind: directory
Schedule: normal
Last Changed Author: julianfoad
Last Changed Rev: 32613
Last Changed Date: 2008-08-21 13:17:49 +0200 (Thu, 21 Aug 2008)
stsp_at_ted [svn/svn-tree-conflicts] $ svn diff
stsp_at_ted [svn/svn-tree-conflicts] $ svn --version
svn, version 1.5.1 (r32289)
compiled Aug 1 2008, 20:40:05
Copyright (C) 2000-2008 CollabNet.
Subversion is open source software, see http://subversion.tigris.org/
This product includes software developed by CollabNet (http://www.Collab.Net/).
The following repository access (RA) modules are available:
* ra_neon : Module for accessing a repository via WebDAV protocol using Neon.
- handles 'http' scheme
- handles 'https' scheme
* ra_svn : Module for accessing a repository using the svn network protocol.
- handles 'svn' scheme
* ra_local : Module for accessing a repository on local disk.
- handles 'file' scheme
stsp@ted [svn/svn-tree-conflicts] $ svn merge https://svn.collab.net/repos/svn/trunk
svn: Working copy path 'notes/tree-conflicts/design-overview.txt' does not exist in repository
stsp_at_ted [svn/svn-tree-conflicts] $ svn-super-power trunk
stsp_at_ted [svn/svn-tree-conflicts] trunk-power $ svn --version
svn, version 1.6.0 (dev build)
compiled Aug 22 2008, 19:05:05
Copyright (C) 2000-2008 CollabNet.
Subversion is open source software, see http://subversion.tigris.org/
This product includes software developed by CollabNet (http://www.Collab.Net/).
The following repository access (RA) modules are available:
* ra_neon : Module for accessing a repository via WebDAV protocol using Neon.
- handles 'http' scheme
- handles 'https' scheme
* ra_svn : Module for accessing a repository using the svn network protocol.
- with Cyrus SASL authentication
- handles 'svn' scheme
* ra_local : Module for accessing a repository on local disk.
- handles 'file' scheme
* ra_serf : Module for accessing a repository via WebDAV protocol using serf.
- handles 'http' scheme
- handles 'https' scheme
stsp@ted [svn/svn-tree-conflicts] trunk-power $ svn merge https://svn.collab.net/repos/svn/trunk
Error validating server certificate for 'https://svn.collab.net':
- The certificate is not issued by a trusted authority. Use the
fingerprint to validate the certificate manually!
Certificate information:
- Hostname: svn.collab.net
- Valid: from Sep 24 22:01:07 2007 GMT until Sep 23 22:01:07 2011 GMT
- Issuer: svn, CollabNet, Brisbane, California, US (hostname_at_collab.net)
- Fingerprint: AA:5B:74:B1:E2:7F:38:B3:2B:C2:B1:60:6E:01:BB:F5:7C:37:98:46
(R)eject, accept (t)emporarily or accept (p)ermanently? t
zsh: segmentation fault (core dumped) svn merge https://svn.collab.net/repos/svn/trunk
stsp_at_ted [svn/svn-tree-conflicts] trunk-power $ gdb ~/elego/svn/prefix/svn-trunk/bin/svn svn.core
GNU gdb 6.1.1 [FreeBSD]
Copyright 2004 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-marcel-freebsd"...
Core was generated by `svn'.
Program terminated with signal 11, Segmentation fault.
Reading symbols from /usr/local/lib/libsasl2.so.2...done.
Loaded symbols for /usr/local/lib/libsasl2.so.2
Reading symbols from /usr/local/lib/libdb4.so.0...done.
Loaded symbols for /usr/local/lib/libdb4.so.0
Reading symbols from /usr/local/lib/libexpat.so.6...done.
Loaded symbols for /usr/local/lib/libexpat.so.6
Reading symbols from /lib/libthr.so.3...done.
Loaded symbols for /lib/libthr.so.3
Reading symbols from /usr/lib/libssl.so.5...done.
Loaded symbols for /usr/lib/libssl.so.5
Reading symbols from /usr/lib/libgssapi.so.9...done.
Loaded symbols for /usr/lib/libgssapi.so.9
Reading symbols from /usr/lib/libkrb5.so.9...done.
Loaded symbols for /usr/lib/libkrb5.so.9
Reading symbols from /usr/lib/libasn1.so.9...done.
Loaded symbols for /usr/lib/libasn1.so.9
Reading symbols from /lib/libcrypto.so.5...done.
Loaded symbols for /lib/libcrypto.so.5
Reading symbols from /usr/lib/libroken.so.9...done.
Loaded symbols for /usr/lib/libroken.so.9
Reading symbols from /lib/libcrypt.so.4...done.
Loaded symbols for /lib/libcrypt.so.4
Reading symbols from /usr/lib/libcom_err.so.4...done.
Loaded symbols for /usr/lib/libcom_err.so.4
Reading symbols from /usr/local/lib/libxml2.so.5...done.
Loaded symbols for /usr/local/lib/libxml2.so.5
Reading symbols from /lib/libz.so.4...done.
Loaded symbols for /lib/libz.so.4
Reading symbols from /lib/libm.so.5...done.
Loaded symbols for /lib/libm.so.5
Reading symbols from /usr/local/lib/libintl.so.8...done.
Loaded symbols for /usr/local/lib/libintl.so.8
Reading symbols from /usr/local/lib/libiconv.so.3...done.
Loaded symbols for /usr/local/lib/libiconv.so.3
Reading symbols from /lib/libc.so.7...done.
Loaded symbols for /lib/libc.so.7
Reading symbols from /libexec/ld-elf.so.1...done.
Loaded symbols for /libexec/ld-elf.so.1
#0 0x0815a0c9 in close_all_dirs (dir=0x0)
at subversion/libsvn_ra_serf/update.c:590
590 while (dir->children)
[New Thread 0x28901100 (LWP 100125)]
(gdb) bt
#0 0x0815a0c9 in close_all_dirs (dir=0x0)
at subversion/libsvn_ra_serf/update.c:590
#1 0x0815e410 in finish_report (report_baton=0x28be90d0, pool=0x28be9018)
at subversion/libsvn_ra_serf/update.c:2435
#2 0x08083ee7 in drive_merge_report_editor (target_wcpath=0x81de4a0 "",
url1=0x28a67c68 "https://svn.collab.net/repos/svn/trunk", revision1=31375,
url2=0x28a67ce0 "https://svn.collab.net/repos/svn/trunk", revision2=31377,
children_with_mergeinfo=0x289563a8, is_rollback=0,
depth=svn_depth_infinity, notify_b=0xbfbfdf28, adm_access=0x289570e8,
callbacks=0x81e1ec0, merge_b=0xbfbfdf58, pool=0x28be9018)
at subversion/libsvn_client/merge.c:3007
#3 0x08087c7b in do_directory_merge (
url1=0x28a67c68 "https://svn.collab.net/repos/svn/trunk", revision1=1,
url2=0x28a67ce0 "https://svn.collab.net/repos/svn/trunk", revision2=32658,
parent_entry=0x28957180, adm_access=0x289570e8, depth=svn_depth_infinity,
notify_b=0xbfbfdf28, merge_b=0xbfbfdf58, pool=0x28955018)
at subversion/libsvn_client/merge.c:5114
#4 0x08088d46 in do_merge (merge_sources=0x28a98808, target=0x81de4a0 "",
target_entry=0x28957180, adm_access=0x289570e8, 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=0x28939948, pool=0x28939018) at subversion/libsvn_client/merge.c:5595
#5 0x0808b410 in svn_client_merge_peg3 (
source=0x2893aee0 "https://svn.collab.net/repos/svn/trunk",
ranges_to_merge=0x2893afd8, peg_revision=0xbfbfe0f8,
target_wcpath=0x81de4a0 "", depth=svn_depth_unknown, ignore_ancestry=0,
force=0, record_only=0, dry_run=0, merge_options=0x0, ctx=0x28939948,
pool=0x28939018) at subversion/libsvn_client/merge.c:6539
#6 0x08059976 in svn_cl__merge (os=0x289391c0, baton=0xbfbfe254,
pool=0x28939018) at subversion/svn/merge-cmd.c:307
#7 0x08058f22 in main (argc=3, argv=0xbfbfe418) at subversion/svn/main.c:1987
Stefan
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-08-23 18:50:33 CEST