On Mon, Dec 3, 2012 at 9:23 PM, Hyrum K Wright <[email protected]> wrote:
> 'svn merge' appears to hang when running a simple merge:
I just tried it on one of our branches and did not see the problem. I
started getting response pretty immediately. Here is transcript:
$ svn mergeinfo .
youngest last repos.
common full tip of path of
ancestor merge branch branch
1416944 1416945
| |
-------| |------------ subversion/branches/fsfs-format7
\
\
--| |------------ subversion/branches/fsfs-format7
|
1416944
Julian, might want to look at this and why the mergeinfo output for
this brach seems ... not right.
$ time svn merge ^/subversion/trunk
--- Merging r1414756 through r1416947 into '.':
U Makefile.in
U subversion/libsvn_subr/cmdline.c
U subversion/libsvn_subr/properties.c
U subversion/libsvn_ra_local/ra_plugin.c
U subversion/bindings/swig/perl/native/Base.pm
U subversion/mod_dav_svn/repos.c
U subversion/mod_dav_svn/reports/inherited-props.c
U subversion/tests/libsvn_repos/repos-test.c
U subversion/tests/cmdline/svnlook_tests.py
U subversion/tests/cmdline/info_tests.py
U subversion/tests/cmdline/svntest/actions.py
U subversion/tests/cmdline/merge_tests.py
A subversion/svndumpfilter/svndumpfilter.c
U subversion/svn/props.c
U subversion/svn/cl.h
U subversion/svn/list-cmd.c
U subversion/svn/util.c
U subversion/svn/propget-cmd.c
U subversion/svn/log-cmd.c
A subversion/svn/svn.c
U subversion/svn/proplist-cmd.c
U subversion/svn/conflict-callbacks.c
U subversion/svn/schema/info.rnc
U subversion/svn/info-cmd.c
A subversion/svnversion/svnversion.c
A subversion/svnadmin/svnadmin.c
U subversion/include/svn_editor.h
U subversion/include/svn_repos.h
U subversion/include/svn_props.h
U subversion/include/svn_string.h
U subversion/include/svn_wc.h
U subversion/include/svn_client.h
U subversion/include/private/svn_cmdline_private.h
U subversion/libsvn_wc/props.c
U subversion/libsvn_wc/props.h
U subversion/libsvn_wc/diff_editor.c
U subversion/libsvn_wc/adm_ops.c
U subversion/libsvn_wc/conflicts.c
U subversion/libsvn_wc/update_editor.c
U subversion/libsvn_wc/translate.c
U subversion/libsvn_wc/wc-queries.sql
U subversion/libsvn_wc/wc_db_update_move.c
U subversion/libsvn_wc/wc_db.c
U subversion/libsvn_wc/diff_local.c
U subversion/libsvn_wc/wc_db.h
U subversion/libsvn_client/merge.c
U subversion/libsvn_client/prop_commands.c
U subversion/libsvn_client/mergeinfo.c
U subversion/libsvn_client/mergeinfo.h
U subversion/libsvn_client/add.c
A subversion/svnlook/svnlook.c
U subversion/libsvn_ra_serf/update.c
A subversion/svnsync/svnsync.c
U subversion/libsvn_repos/fs-wrap.c
U subversion/libsvn_delta/svndiff.c
U subversion/svnserve/serve.c
A subversion/svnserve/svnserve.c
U subversion/libsvn_fs_fs/tree.c
U tools/client-side/svn-bench/cl.h
A tools/client-side/svn-bench/svn-bench.c
U tools/client-side/svn-bench/null-list-cmd.c
U tools/server-side/svnauthz-validate.c
U tools/server-side/fsfs-reorg.c
A tools/dev/svnraisetreeconflict/svnraisetreeconflict.c
U configure.ac
D tools/dev/svnraisetreeconflict/main.c
D tools/dev/gcov.patch
D tools/client-side/svn-bench/main.c
D subversion/svnserve/main.c
D subversion/svnsync/main.c
D subversion/svnlook/main.c
D subversion/svnadmin/main.c
D subversion/svnversion/main.c
D subversion/svn/main.c
D subversion/svndumpfilter/main.c
U .
--- Recording mergeinfo for merge of r1414756 through r1416947 into '.':
G .
real 1m19.426s
user 0m0.454s
sys 0m0.389s
$ svn --version --verbose
svn, version 1.8.0-dev (under development)
compiled Dec 4 2012, 08:58:02 on x86_64-apple-darwin11.4.2
Copyright (C) 2012 The Apache Software Foundation.
This software consists of contributions made by many people;
see the NOTICE file for more information.
Subversion is open source software, see http://subversion.apache.org/
The following repository access (RA) modules are available:
* 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
System information:
* running on x86_64-apple-darwin11.4.2
- Mac OS X 10.7.5 Lion, build 11G63
* linked dependencies:
- APR 1.4.6 (compiled with 1.4.6)
- APR-Util 1.4.1 (compiled with 1.4.1)
- SQLite 3.7.14.1 (compiled with 3.7.14.1)
* loaded shared libraries:
- /tmp/svn/bin/svn (Intel 64-bit)
- /tmp/svn/lib/libsvn_client-1.0.dylib (Intel 64-bit)
- /tmp/svn/lib/libsvn_wc-1.0.dylib (Intel 64-bit)
- /tmp/svn/lib/libsvn_ra-1.0.dylib (Intel 64-bit)
- /tmp/svn/lib/libsvn_diff-1.0.dylib (Intel 64-bit)
- /tmp/svn/lib/libsvn_ra_local-1.0.dylib (Intel 64-bit)
- /tmp/svn/lib/libsvn_repos-1.0.dylib (Intel 64-bit)
- /tmp/svn/lib/libsvn_fs-1.0.dylib (Intel 64-bit)
- /tmp/svn/lib/libsvn_fs_fs-1.0.dylib (Intel 64-bit)
- /tmp/svn/lib/libsvn_fs_base-1.0.dylib (Intel 64-bit)
- /tmp/svn/lib/libsvn_fs_util-1.0.dylib (Intel 64-bit)
- /tmp/svn/lib/libsvn_ra_svn-1.0.dylib (Intel 64-bit)
- /opt/local/lib/libsasl2.2.dylib (Intel 64-bit)
- /usr/lib/libSystem.B.dylib (Intel 64-bit)
- /usr/lib/libresolv.9.dylib (Intel 64-bit)
- /tmp/svn/lib/libsvn_ra_serf-1.0.dylib (Intel 64-bit)
- /opt/local/lib/libserf-1.0.dylib (Intel 64-bit)
- /opt/local/lib/db46/libdb-4.6.dylib (Intel 64-bit)
- /opt/local/lib/libssl.1.0.0.dylib (Intel 64-bit)
- /opt/local/lib/libcrypto.1.0.0.dylib (Intel 64-bit)
- /tmp/svn/lib/libsvn_delta-1.0.dylib (Intel 64-bit)
- /tmp/svn/lib/libsvn_subr-1.0.dylib (Intel 64-bit)
- /opt/local/lib/libz.1.dylib (Intel 64-bit)
- /opt/local/lib/libsqlite3.0.dylib (Intel 64-bit)
- /opt/local/lib/libaprutil-1.0.dylib (Intel 64-bit)
- /opt/local/lib/libexpat.1.dylib (Intel 64-bit)
- /opt/local/lib/libapr-1.0.dylib (Intel 64-bit)
- /opt/local/lib/libintl.8.dylib (Intel 64-bit)
- /opt/local/lib/libiconv.2.dylib (Intel 64-bit)
- /usr/lib/libauto.dylib (Intel 64-bit)
- /usr/lib/libDiagnosticMessagesClient.dylib (Intel 64-bit)
- /usr/lib/libicucore.A.dylib (Intel 64-bit)
- /usr/lib/libobjc.A.dylib (Intel 64-bit)
- /usr/lib/libz.1.dylib (Intel 64-bit)
- /usr/lib/libc++.1.dylib (Intel 64-bit)
- /usr/lib/libstdc++.6.dylib (Intel 64-bit)
- /usr/lib/libc++abi.dylib (Intel 64-bit)
- /usr/lib/libOpenScriptingUtil.dylib (Intel 64-bit)
- /usr/lib/libpam.2.dylib (Intel 64-bit)
- /usr/lib/libsqlite3.dylib (Intel 64-bit)
- /usr/lib/libbsm.0.dylib (Intel 64-bit)
- /usr/lib/libxar-nossl.dylib (Intel 64-bit)
- /usr/lib/libbz2.1.0.dylib (Intel 64-bit)
- /usr/lib/libxml2.2.dylib (Intel 64-bit)
- /usr/lib/libcrypto.0.9.8.dylib (Intel 64-bit)
- /usr/lib/liblangid.dylib (Intel 64-bit)
- /usr/lib/libCRFSuite.dylib (Intel 64-bit)
- /usr/lib/libxslt.1.dylib (Intel 64-bit)
- /opt/local/lib/sasl2/libanonymous.2.so (Intel 64-bit)
- /opt/local/lib/sasl2/libcrammd5.2.so (Intel 64-bit)
- /opt/local/lib/sasl2/libdigestmd5.2.so (Intel 64-bit)
- /opt/local/lib/sasl2/libgssapiv2.2.so (Intel 64-bit)
- /opt/local/lib/libgssapi_krb5.2.2.dylib (Intel 64-bit)
- /opt/local/lib/libkrb5.3.3.dylib (Intel 64-bit)
- /opt/local/lib/libk5crypto.3.1.dylib (Intel 64-bit)
- /opt/local/lib/libcom_err.3.0.dylib (Intel 64-bit)
- /opt/local/lib/libkrb5support.1.1.dylib (Intel 64-bit)
- /opt/local/lib/sasl2/liblogin.2.so (Intel 64-bit)
- /opt/local/lib/sasl2/libntlm.2.so (Intel 64-bit)
- /opt/local/lib/sasl2/libotp.2.so (Intel 64-bit)
- /opt/local/lib/sasl2/libplain.2.so (Intel 64-bit)
- /opt/local/lib/sasl2/libsasldb.2.so (Intel 64-bit)
- /opt/local/lib/sasl2/libscram.2.so (Intel 64-bit)
- /opt/local/lib/sasl2/libsrp.2.so (Intel 64-bit)
--
Thanks
Mark Phippard
http://markphip.blogspot.com/
