You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2013/08/19 13:21:06 UTC
svn commit: r1515362 [1/13] - in /subversion/branches/move-tracking-1: ./
build/ build/ac-macros/ build/generator/ build/generator/templates/
notes/tree-conflicts/ subversion/bindings/cxxhl/include/
subversion/bindings/cxxhl/include/svncxxhl/ subversio...
Author: julianfoad
Date: Mon Aug 19 11:21:01 2013
New Revision: 1515362
URL: http://svn.apache.org/r1515362
Log:
On the merge-tracking-1 branch: catch up to trunk@1500000.
Added:
subversion/branches/move-tracking-1/subversion/bindings/javahl/native/CommitEditor.cpp
- copied unchanged from r1500000, subversion/trunk/subversion/bindings/javahl/native/CommitEditor.cpp
subversion/branches/move-tracking-1/subversion/bindings/javahl/native/CommitEditor.h
- copied unchanged from r1500000, subversion/trunk/subversion/bindings/javahl/native/CommitEditor.h
subversion/branches/move-tracking-1/subversion/bindings/javahl/native/EditorProxy.cpp
- copied unchanged from r1500000, subversion/trunk/subversion/bindings/javahl/native/EditorProxy.cpp
subversion/branches/move-tracking-1/subversion/bindings/javahl/native/EditorProxy.h
- copied unchanged from r1500000, subversion/trunk/subversion/bindings/javahl/native/EditorProxy.h
subversion/branches/move-tracking-1/subversion/bindings/javahl/native/Iterator.cpp
- copied unchanged from r1500000, subversion/trunk/subversion/bindings/javahl/native/Iterator.cpp
subversion/branches/move-tracking-1/subversion/bindings/javahl/native/Iterator.h
- copied unchanged from r1500000, subversion/trunk/subversion/bindings/javahl/native/Iterator.h
subversion/branches/move-tracking-1/subversion/bindings/javahl/native/LockTokenTable.cpp
- copied unchanged from r1500000, subversion/trunk/subversion/bindings/javahl/native/LockTokenTable.cpp
subversion/branches/move-tracking-1/subversion/bindings/javahl/native/LockTokenTable.h
- copied unchanged from r1500000, subversion/trunk/subversion/bindings/javahl/native/LockTokenTable.h
subversion/branches/move-tracking-1/subversion/bindings/javahl/native/OperationContext.cpp
- copied unchanged from r1500000, subversion/trunk/subversion/bindings/javahl/native/OperationContext.cpp
subversion/branches/move-tracking-1/subversion/bindings/javahl/native/OperationContext.h
- copied unchanged from r1500000, subversion/trunk/subversion/bindings/javahl/native/OperationContext.h
subversion/branches/move-tracking-1/subversion/bindings/javahl/native/RemoteSession.cpp
- copied unchanged from r1500000, subversion/trunk/subversion/bindings/javahl/native/RemoteSession.cpp
subversion/branches/move-tracking-1/subversion/bindings/javahl/native/RemoteSession.h
- copied unchanged from r1500000, subversion/trunk/subversion/bindings/javahl/native/RemoteSession.h
subversion/branches/move-tracking-1/subversion/bindings/javahl/native/RemoteSessionContext.cpp
- copied unchanged from r1500000, subversion/trunk/subversion/bindings/javahl/native/RemoteSessionContext.cpp
subversion/branches/move-tracking-1/subversion/bindings/javahl/native/RemoteSessionContext.h
- copied unchanged from r1500000, subversion/trunk/subversion/bindings/javahl/native/RemoteSessionContext.h
subversion/branches/move-tracking-1/subversion/bindings/javahl/native/StateReporter.cpp
- copied unchanged from r1500000, subversion/trunk/subversion/bindings/javahl/native/StateReporter.cpp
subversion/branches/move-tracking-1/subversion/bindings/javahl/native/StateReporter.h
- copied unchanged from r1500000, subversion/trunk/subversion/bindings/javahl/native/StateReporter.h
subversion/branches/move-tracking-1/subversion/bindings/javahl/native/org_apache_subversion_javahl_ConfigImpl_Category.cpp
- copied unchanged from r1500000, subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_ConfigImpl_Category.cpp
subversion/branches/move-tracking-1/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_CommitEditor.cpp
- copied unchanged from r1500000, subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_CommitEditor.cpp
subversion/branches/move-tracking-1/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_RemoteFactory.cpp
- copied unchanged from r1500000, subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_RemoteFactory.cpp
subversion/branches/move-tracking-1/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_RemoteSession.cpp
- copied unchanged from r1500000, subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_RemoteSession.cpp
subversion/branches/move-tracking-1/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_StateReporter.cpp
- copied unchanged from r1500000, subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_StateReporter.cpp
subversion/branches/move-tracking-1/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConfigImpl.java
- copied unchanged from r1500000, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConfigImpl.java
subversion/branches/move-tracking-1/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNConfig.java
- copied unchanged from r1500000, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNConfig.java
subversion/branches/move-tracking-1/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNEditor.java
- copied unchanged from r1500000, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNEditor.java
subversion/branches/move-tracking-1/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRemote.java
- copied unchanged from r1500000, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRemote.java
subversion/branches/move-tracking-1/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNReporter.java
- copied unchanged from r1500000, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNReporter.java
subversion/branches/move-tracking-1/subversion/bindings/javahl/src/org/apache/subversion/javahl/JNIObject.java
- copied unchanged from r1500000, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/JNIObject.java
subversion/branches/move-tracking-1/subversion/bindings/javahl/src/org/apache/subversion/javahl/OperationContext.java
- copied unchanged from r1500000, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/OperationContext.java
subversion/branches/move-tracking-1/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ConfigEvent.java
- copied unchanged from r1500000, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ConfigEvent.java
subversion/branches/move-tracking-1/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/RemoteStatus.java
- copied unchanged from r1500000, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/RemoteStatus.java
subversion/branches/move-tracking-1/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/
- copied from r1500000, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/
subversion/branches/move-tracking-1/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java
- copied unchanged from r1500000, subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java
subversion/branches/move-tracking-1/subversion/libsvn_subr/utf8proc/utf8proc.c
- copied unchanged from r1500000, subversion/trunk/subversion/libsvn_subr/utf8proc/utf8proc.c
subversion/branches/move-tracking-1/subversion/libsvn_subr/utf8proc/utf8proc_data.c
- copied unchanged from r1500000, subversion/trunk/subversion/libsvn_subr/utf8proc/utf8proc_data.c
subversion/branches/move-tracking-1/subversion/svnauth/ (props changed)
- copied from r1500000, subversion/trunk/subversion/svnauth/
subversion/branches/move-tracking-1/subversion/tests/cmdline/svntest/mergetrees.py
- copied unchanged from r1500000, subversion/trunk/subversion/tests/cmdline/svntest/mergetrees.py
Removed:
subversion/branches/move-tracking-1/subversion/libsvn_subr/utf8proc/utf8proc.c.inline
subversion/branches/move-tracking-1/subversion/libsvn_subr/utf8proc/utf8proc_data.c.inline
Modified:
subversion/branches/move-tracking-1/ (props changed)
subversion/branches/move-tracking-1/CHANGES
subversion/branches/move-tracking-1/COMMITTERS
subversion/branches/move-tracking-1/Makefile.in
subversion/branches/move-tracking-1/build.conf
subversion/branches/move-tracking-1/build/ac-macros/berkeley-db.m4
subversion/branches/move-tracking-1/build/ac-macros/sqlite.m4
subversion/branches/move-tracking-1/build/generator/gen_win.py
subversion/branches/move-tracking-1/build/generator/templates/vcnet_vcproj.ezt
subversion/branches/move-tracking-1/build/generator/templates/vcnet_vcxproj.ezt
subversion/branches/move-tracking-1/build/run_tests.py
subversion/branches/move-tracking-1/configure.ac
subversion/branches/move-tracking-1/notes/tree-conflicts/use-cases.txt
subversion/branches/move-tracking-1/subversion/bindings/cxxhl/include/svncxxhl.hpp
subversion/branches/move-tracking-1/subversion/bindings/cxxhl/include/svncxxhl/_compat.hpp
subversion/branches/move-tracking-1/subversion/bindings/cxxhl/include/svncxxhl/exception.hpp
subversion/branches/move-tracking-1/subversion/bindings/cxxhl/include/svncxxhl/tristate.hpp
subversion/branches/move-tracking-1/subversion/bindings/cxxhl/src/exception.cpp
subversion/branches/move-tracking-1/subversion/bindings/cxxhl/src/tristate.cpp
subversion/branches/move-tracking-1/subversion/bindings/cxxhl/tests/test_exception.cpp
subversion/branches/move-tracking-1/subversion/bindings/javahl/native/BlameCallback.cpp
subversion/branches/move-tracking-1/subversion/bindings/javahl/native/ClientContext.cpp
subversion/branches/move-tracking-1/subversion/bindings/javahl/native/ClientContext.h
subversion/branches/move-tracking-1/subversion/bindings/javahl/native/CommitCallback.cpp
subversion/branches/move-tracking-1/subversion/bindings/javahl/native/CommitCallback.h
subversion/branches/move-tracking-1/subversion/bindings/javahl/native/CreateJ.cpp
subversion/branches/move-tracking-1/subversion/bindings/javahl/native/CreateJ.h
subversion/branches/move-tracking-1/subversion/bindings/javahl/native/EnumMapper.cpp
subversion/branches/move-tracking-1/subversion/bindings/javahl/native/EnumMapper.h
subversion/branches/move-tracking-1/subversion/bindings/javahl/native/JNIStringHolder.h
subversion/branches/move-tracking-1/subversion/bindings/javahl/native/JNIUtil.cpp
subversion/branches/move-tracking-1/subversion/bindings/javahl/native/JNIUtil.h
subversion/branches/move-tracking-1/subversion/bindings/javahl/native/ListCallback.cpp
subversion/branches/move-tracking-1/subversion/bindings/javahl/native/LogMessageCallback.cpp
subversion/branches/move-tracking-1/subversion/bindings/javahl/native/Path.cpp
subversion/branches/move-tracking-1/subversion/bindings/javahl/native/Path.h
subversion/branches/move-tracking-1/subversion/bindings/javahl/native/Prompter.cpp
subversion/branches/move-tracking-1/subversion/bindings/javahl/native/ProplistCallback.cpp
subversion/branches/move-tracking-1/subversion/bindings/javahl/native/RevisionRange.cpp
subversion/branches/move-tracking-1/subversion/bindings/javahl/native/RevpropTable.cpp
subversion/branches/move-tracking-1/subversion/bindings/javahl/native/RevpropTable.h
subversion/branches/move-tracking-1/subversion/bindings/javahl/native/SVNBase.cpp
subversion/branches/move-tracking-1/subversion/bindings/javahl/native/SVNBase.h
subversion/branches/move-tracking-1/subversion/bindings/javahl/native/SVNClient.cpp
subversion/branches/move-tracking-1/subversion/bindings/javahl/native/SVNClient.h
subversion/branches/move-tracking-1/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
subversion/branches/move-tracking-1/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientException.java
subversion/branches/move-tracking-1/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
subversion/branches/move-tracking-1/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
subversion/branches/move-tracking-1/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Mergeinfo.java
subversion/branches/move-tracking-1/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/RevisionRange.java
subversion/branches/move-tracking-1/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/VersionExtended.java
subversion/branches/move-tracking-1/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
subversion/branches/move-tracking-1/subversion/bindings/javahl/tests/org/apache/subversion/javahl/RunTests.java
subversion/branches/move-tracking-1/subversion/bindings/swig/perl/native/Client.pm
subversion/branches/move-tracking-1/subversion/bindings/swig/ruby/test/util.rb
subversion/branches/move-tracking-1/subversion/include/private/svn_cache.h
subversion/branches/move-tracking-1/subversion/include/private/svn_client_private.h
subversion/branches/move-tracking-1/subversion/include/private/svn_editor.h
subversion/branches/move-tracking-1/subversion/include/private/svn_io_private.h
subversion/branches/move-tracking-1/subversion/include/private/svn_ra_private.h
subversion/branches/move-tracking-1/subversion/include/private/svn_ra_svn_private.h
subversion/branches/move-tracking-1/subversion/include/private/svn_repos_private.h
subversion/branches/move-tracking-1/subversion/include/private/svn_string_private.h
subversion/branches/move-tracking-1/subversion/include/private/svn_wc_private.h
subversion/branches/move-tracking-1/subversion/include/svn_client.h
subversion/branches/move-tracking-1/subversion/include/svn_config.h
subversion/branches/move-tracking-1/subversion/include/svn_error_codes.h
subversion/branches/move-tracking-1/subversion/include/svn_fs.h
subversion/branches/move-tracking-1/subversion/include/svn_ra.h
subversion/branches/move-tracking-1/subversion/include/svn_repos.h
subversion/branches/move-tracking-1/subversion/include/svn_wc.h
subversion/branches/move-tracking-1/subversion/libsvn_client/blame.c
subversion/branches/move-tracking-1/subversion/libsvn_client/cleanup.c
subversion/branches/move-tracking-1/subversion/libsvn_client/client.h
subversion/branches/move-tracking-1/subversion/libsvn_client/commit.c
subversion/branches/move-tracking-1/subversion/libsvn_client/copy.c
subversion/branches/move-tracking-1/subversion/libsvn_client/deprecated.c
subversion/branches/move-tracking-1/subversion/libsvn_client/diff.c
subversion/branches/move-tracking-1/subversion/libsvn_client/log.c
subversion/branches/move-tracking-1/subversion/libsvn_client/merge.c
subversion/branches/move-tracking-1/subversion/libsvn_client/patch.c
subversion/branches/move-tracking-1/subversion/libsvn_client/ra.c
subversion/branches/move-tracking-1/subversion/libsvn_client/switch.c
subversion/branches/move-tracking-1/subversion/libsvn_delta/compat.c
subversion/branches/move-tracking-1/subversion/libsvn_delta/editor.c
subversion/branches/move-tracking-1/subversion/libsvn_fs/editor.c
subversion/branches/move-tracking-1/subversion/libsvn_fs/fs-loader.c
subversion/branches/move-tracking-1/subversion/libsvn_fs/fs-loader.h
subversion/branches/move-tracking-1/subversion/libsvn_fs_base/bdb/env.c
subversion/branches/move-tracking-1/subversion/libsvn_fs_base/fs.c
subversion/branches/move-tracking-1/subversion/libsvn_fs_base/tree.c
subversion/branches/move-tracking-1/subversion/libsvn_fs_fs/caching.c
subversion/branches/move-tracking-1/subversion/libsvn_fs_fs/fs.c
subversion/branches/move-tracking-1/subversion/libsvn_fs_fs/fs.h
subversion/branches/move-tracking-1/subversion/libsvn_fs_fs/fs_fs.c
subversion/branches/move-tracking-1/subversion/libsvn_fs_fs/fs_fs.h
subversion/branches/move-tracking-1/subversion/libsvn_fs_fs/tree.c
subversion/branches/move-tracking-1/subversion/libsvn_ra/ra_loader.c
subversion/branches/move-tracking-1/subversion/libsvn_ra/util.c
subversion/branches/move-tracking-1/subversion/libsvn_ra_local/ra_local.h
subversion/branches/move-tracking-1/subversion/libsvn_ra_local/ra_plugin.c
subversion/branches/move-tracking-1/subversion/libsvn_ra_serf/blame.c
subversion/branches/move-tracking-1/subversion/libsvn_ra_serf/commit.c
subversion/branches/move-tracking-1/subversion/libsvn_ra_serf/get_deleted_rev.c
subversion/branches/move-tracking-1/subversion/libsvn_ra_serf/getdate.c
subversion/branches/move-tracking-1/subversion/libsvn_ra_serf/getlocations.c
subversion/branches/move-tracking-1/subversion/libsvn_ra_serf/getlocationsegments.c
subversion/branches/move-tracking-1/subversion/libsvn_ra_serf/getlocks.c
subversion/branches/move-tracking-1/subversion/libsvn_ra_serf/inherited_props.c
subversion/branches/move-tracking-1/subversion/libsvn_ra_serf/locks.c
subversion/branches/move-tracking-1/subversion/libsvn_ra_serf/log.c
subversion/branches/move-tracking-1/subversion/libsvn_ra_serf/merge.c
subversion/branches/move-tracking-1/subversion/libsvn_ra_serf/mergeinfo.c
subversion/branches/move-tracking-1/subversion/libsvn_ra_serf/options.c
subversion/branches/move-tracking-1/subversion/libsvn_ra_serf/property.c
subversion/branches/move-tracking-1/subversion/libsvn_ra_serf/ra_serf.h
subversion/branches/move-tracking-1/subversion/libsvn_ra_serf/replay.c
subversion/branches/move-tracking-1/subversion/libsvn_ra_serf/serf.c
subversion/branches/move-tracking-1/subversion/libsvn_ra_serf/update.c
subversion/branches/move-tracking-1/subversion/libsvn_ra_serf/util.c
subversion/branches/move-tracking-1/subversion/libsvn_ra_serf/xml.c
subversion/branches/move-tracking-1/subversion/libsvn_ra_svn/client.c
subversion/branches/move-tracking-1/subversion/libsvn_ra_svn/marshal.c
subversion/branches/move-tracking-1/subversion/libsvn_ra_svn/protocol
subversion/branches/move-tracking-1/subversion/libsvn_repos/commit.c
subversion/branches/move-tracking-1/subversion/libsvn_repos/deprecated.c
subversion/branches/move-tracking-1/subversion/libsvn_repos/dump.c
subversion/branches/move-tracking-1/subversion/libsvn_repos/fs-wrap.c
subversion/branches/move-tracking-1/subversion/libsvn_repos/replay.c
subversion/branches/move-tracking-1/subversion/libsvn_repos/repos.c
subversion/branches/move-tracking-1/subversion/libsvn_subr/cache-membuffer.c
subversion/branches/move-tracking-1/subversion/libsvn_subr/cache-memcache.c
subversion/branches/move-tracking-1/subversion/libsvn_subr/cache.c
subversion/branches/move-tracking-1/subversion/libsvn_subr/config_file.c
subversion/branches/move-tracking-1/subversion/libsvn_subr/dirent_uri.c
subversion/branches/move-tracking-1/subversion/libsvn_subr/io.c
subversion/branches/move-tracking-1/subversion/libsvn_subr/named_atomic.c
subversion/branches/move-tracking-1/subversion/libsvn_subr/pool.c
subversion/branches/move-tracking-1/subversion/libsvn_subr/sqlite.c
subversion/branches/move-tracking-1/subversion/libsvn_subr/stream.c
subversion/branches/move-tracking-1/subversion/libsvn_subr/string.c
subversion/branches/move-tracking-1/subversion/libsvn_subr/types.c
subversion/branches/move-tracking-1/subversion/libsvn_subr/utf8proc.c
subversion/branches/move-tracking-1/subversion/libsvn_wc/adm_ops.c
subversion/branches/move-tracking-1/subversion/libsvn_wc/conflicts.c
subversion/branches/move-tracking-1/subversion/libsvn_wc/crop.c
subversion/branches/move-tracking-1/subversion/libsvn_wc/deprecated.c
subversion/branches/move-tracking-1/subversion/libsvn_wc/entries.c
subversion/branches/move-tracking-1/subversion/libsvn_wc/externals.c
subversion/branches/move-tracking-1/subversion/libsvn_wc/info.c
subversion/branches/move-tracking-1/subversion/libsvn_wc/tree_conflicts.c
subversion/branches/move-tracking-1/subversion/libsvn_wc/tree_conflicts.h
subversion/branches/move-tracking-1/subversion/libsvn_wc/update_editor.c
subversion/branches/move-tracking-1/subversion/libsvn_wc/upgrade.c
subversion/branches/move-tracking-1/subversion/libsvn_wc/util.c
subversion/branches/move-tracking-1/subversion/libsvn_wc/wc-queries.sql
subversion/branches/move-tracking-1/subversion/libsvn_wc/wc.h
subversion/branches/move-tracking-1/subversion/libsvn_wc/wc_db.c
subversion/branches/move-tracking-1/subversion/libsvn_wc/wc_db.h
subversion/branches/move-tracking-1/subversion/libsvn_wc/wc_db_update_move.c
subversion/branches/move-tracking-1/subversion/libsvn_wc/wc_db_wcroot.c
subversion/branches/move-tracking-1/subversion/libsvn_wc/workqueue.c
subversion/branches/move-tracking-1/subversion/mod_dav_svn/version.c
subversion/branches/move-tracking-1/subversion/po/de.po
subversion/branches/move-tracking-1/subversion/po/zh_CN.po
subversion/branches/move-tracking-1/subversion/svn/cl.h
subversion/branches/move-tracking-1/subversion/svn/cleanup-cmd.c
subversion/branches/move-tracking-1/subversion/svn/conflict-callbacks.c
subversion/branches/move-tracking-1/subversion/svn/file-merge.c
subversion/branches/move-tracking-1/subversion/svn/merge-cmd.c
subversion/branches/move-tracking-1/subversion/svn/mergeinfo-cmd.c
subversion/branches/move-tracking-1/subversion/svn/notify.c
subversion/branches/move-tracking-1/subversion/svn/status.c
subversion/branches/move-tracking-1/subversion/svn/svn.c
subversion/branches/move-tracking-1/subversion/svn/util.c
subversion/branches/move-tracking-1/subversion/svnadmin/svnadmin.c
subversion/branches/move-tracking-1/subversion/svnlook/svnlook.c
subversion/branches/move-tracking-1/subversion/svnserve/serve.c
subversion/branches/move-tracking-1/subversion/tests/cmdline/README
subversion/branches/move-tracking-1/subversion/tests/cmdline/autoprop_tests.py
subversion/branches/move-tracking-1/subversion/tests/cmdline/blame_tests.py
subversion/branches/move-tracking-1/subversion/tests/cmdline/checkout_tests.py
subversion/branches/move-tracking-1/subversion/tests/cmdline/commit_tests.py
subversion/branches/move-tracking-1/subversion/tests/cmdline/davautocheck.sh
subversion/branches/move-tracking-1/subversion/tests/cmdline/history_tests.py
subversion/branches/move-tracking-1/subversion/tests/cmdline/lock_tests.py
subversion/branches/move-tracking-1/subversion/tests/cmdline/log_tests.py
subversion/branches/move-tracking-1/subversion/tests/cmdline/merge_authz_tests.py
subversion/branches/move-tracking-1/subversion/tests/cmdline/merge_automatic_tests.py
subversion/branches/move-tracking-1/subversion/tests/cmdline/merge_reintegrate_tests.py
subversion/branches/move-tracking-1/subversion/tests/cmdline/merge_tests.py
subversion/branches/move-tracking-1/subversion/tests/cmdline/merge_tree_conflict_tests.py
subversion/branches/move-tracking-1/subversion/tests/cmdline/mergeinfo_tests.py
subversion/branches/move-tracking-1/subversion/tests/cmdline/move_tests.py
subversion/branches/move-tracking-1/subversion/tests/cmdline/resolve_tests.py
subversion/branches/move-tracking-1/subversion/tests/cmdline/revert_tests.py
subversion/branches/move-tracking-1/subversion/tests/cmdline/stat_tests.py
subversion/branches/move-tracking-1/subversion/tests/cmdline/svnadmin_tests.py
subversion/branches/move-tracking-1/subversion/tests/cmdline/svnlook_tests.py
subversion/branches/move-tracking-1/subversion/tests/cmdline/svnmucc_tests.py
subversion/branches/move-tracking-1/subversion/tests/cmdline/svntest/main.py
subversion/branches/move-tracking-1/subversion/tests/cmdline/switch_tests.py
subversion/branches/move-tracking-1/subversion/tests/cmdline/tree_conflict_tests.py
subversion/branches/move-tracking-1/subversion/tests/cmdline/update_tests.py
subversion/branches/move-tracking-1/subversion/tests/cmdline/wc_tests.py
subversion/branches/move-tracking-1/subversion/tests/libsvn_client/ (props changed)
subversion/branches/move-tracking-1/subversion/tests/libsvn_fs/ (props changed)
subversion/branches/move-tracking-1/subversion/tests/libsvn_fs/fs-test.c
subversion/branches/move-tracking-1/subversion/tests/libsvn_fs_fs/fs-pack-test.c
subversion/branches/move-tracking-1/subversion/tests/libsvn_subr/config-test.c
subversion/branches/move-tracking-1/subversion/tests/libsvn_subr/io-test.c
subversion/branches/move-tracking-1/subversion/tests/libsvn_wc/conflict-data-test.c
subversion/branches/move-tracking-1/subversion/tests/libsvn_wc/op-depth-test.c
subversion/branches/move-tracking-1/subversion/tests/svn_test_fs.c
subversion/branches/move-tracking-1/subversion/tests/svn_test_fs.h
subversion/branches/move-tracking-1/tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd
subversion/branches/move-tracking-1/tools/client-side/svn-bench/help-cmd.c
subversion/branches/move-tracking-1/tools/dev/po-merge.py
subversion/branches/move-tracking-1/tools/dev/unix-build/Makefile.svn
subversion/branches/move-tracking-1/tools/dist/backport.pl
subversion/branches/move-tracking-1/tools/dist/make-deps-tarball.sh (props changed)
subversion/branches/move-tracking-1/tools/server-side/fsfs-stats.c
subversion/branches/move-tracking-1/tools/server-side/svnpubsub/svnpubsub/server.py
subversion/branches/move-tracking-1/tools/server-side/svnpubsub/svnwcsub.py
subversion/branches/move-tracking-1/win-tests.py
Propchange: subversion/branches/move-tracking-1/
------------------------------------------------------------------------------
Merged /subversion/branches/javahl-ra:r991978-1342681,1342683-1344976,1344978-1494640
Merged /subversion/trunk:r1489601-1500000
Merged /subversion/branches/verify-keep-going:r1439280-1492639
Modified: subversion/branches/move-tracking-1/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-1/CHANGES?rev=1515362&r1=1515361&r2=1515362&view=diff
==============================================================================
--- subversion/branches/move-tracking-1/CHANGES (original)
+++ subversion/branches/move-tracking-1/CHANGES Mon Aug 19 11:21:01 2013
@@ -24,6 +24,50 @@ http://svn.apache.org/repos/asf/subversi
- Bindings:
+Version 1.8.1
+(?? July 2013, from /branches/1.8.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.8.1
+
+ User-visible changes:
+ - Client-side bugfixes:
+ * rename 'automatic merge' to 'complete merge' (r1491432)
+ * resolve endless loop problem when files contain inproper data (r1492145)
+ * remove revision property buffer limit in fsfs (r1491770)
+ * reduce network usage for 'svn mergeinfo --show-revs' (r1492005)
+ * resolve segfault in fsfs-stats when passing invalid path (r1492164)
+ * fix 'svnadmin upgrade' error of non-shared fsfs repositories (r1494287)
+ * fix data loss when cancelling 'svnadmin upgrade' in last stage (r1494298)
+ * deny 'svnadmin create --fs-type=fsfs --compatible-version=1.0' (r1494223)
+ * improve http status handling in ra_serf (r1495104)
+ * avoid unneeded ra session in 'svn merge' (r1495279)
+ * reduce network usage for 'svn merge' (r1478987)
+ * remove duplicated ancestry check in 'svn merge' (r1493424)
+ * fix the standard 'Accept-Encoding' header (r1497641)
+
+ - Server-side bugfixes:
+ * provide better http status for anonymous user errors (r1495918)
+ * provide better http status for commit failures (r1490684)
+ * fix performance regression in 'svn log' against root (r1494913)
+ * allow deleting non-default 'svn:' properties (r1495432)
+
+ Developer-visible changes
+ - General:
+ * fix some ra_serf specific test runner issues on Windows (r1490679)
+ * fix help output of 'svn-bench' (r1493951)
+ * fix two issues in reverse svn_ra_get_file_revs() (r1492148, et al)
+ * handle --compatible-version=1.8 in the C tests (r1494342)
+ * improve clang compatibility (r1480080 et all)
+ * add version header to svnpubsub server (r1491707)
+ * use proper cancel baton when handling conflicts (r1495850)
+ * tweak configure.ac documentation (r1495967)
+ * provide proper error value from BDB (r1495428)
+ * tweak ra_serf connection failed error value (r1496132, et al)
+ * resolve possible segfault in 'svn log' (r1496110)
+
+ - Bindings:
+ * fix swig-rb tests with out-of-tree-builds (r1492295)
+
+
Version 1.8.0
(18 Jun 2013, from /branches/1.8.x)
http://svn.apache.org/repos/asf/subversion/tags/1.8.0
@@ -125,7 +169,6 @@ http://svn.apache.org/repos/asf/subversi
* support ipv6 in URLs (e.g. http://[::1]/svn/repos) (r1454047)
* conflict resolver now iterates paths in a sorted order (r1461820)
* mod_dav_svn does keyword expansion with 'kw=1' query arg (r1466055)
- * add support for custom keyword definitions (issue #890)
- Minor new features and improvements (server-side):
* improve performance of config file parsing (r1344347 et al)
Modified: subversion/branches/move-tracking-1/COMMITTERS
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-1/COMMITTERS?rev=1515362&r1=1515361&r2=1515362&view=diff
==============================================================================
--- subversion/branches/move-tracking-1/COMMITTERS [UTF-8] (original)
+++ subversion/branches/move-tracking-1/COMMITTERS [UTF-8] Mon Aug 19 11:21:01 2013
@@ -159,6 +159,7 @@ Commit access for specific areas:
arwin Arwin Arni <ar...@collab.net> (svn-bisect)
joes Joe Schaefer <jo...@yahoo.com> (svnpubsub)
prabhugs Prabhu Gnana Sundar <pr...@collab.net> (verify-keep-going)
+ schabi Markus Schaber <sc...@apache.org> (testsuite)
Translation of message files:
Modified: subversion/branches/move-tracking-1/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-1/Makefile.in?rev=1515362&r1=1515361&r2=1515362&view=diff
==============================================================================
--- subversion/branches/move-tracking-1/Makefile.in (original)
+++ subversion/branches/move-tracking-1/Makefile.in Mon Aug 19 11:21:01 2013
@@ -523,6 +523,9 @@ check: bin @TRANSFORM_LIBTOOL_SCRIPTS@ $
if test "$(HTTP_PROXY)" != ""; then \
flags="--http-proxy $(HTTP_PROXY) $$flags"; \
fi; \
+ if test "$(EXCLUSIVE_WC_LOCKS)" != ""; then \
+ flags="--exclusive-wc-locks $$flags"; \
+ fi; \
LD_LIBRARY_PATH='$(auth_plugin_dirs):$(LD_LIBRARY_PATH)' \
$(PYTHON) $(top_srcdir)/build/run_tests.py \
--config-file $(top_srcdir)/subversion/tests/tests.conf \
@@ -642,9 +645,10 @@ doc-javahl:
-sourcepath $(top_srcdir)/subversion/bindings/javahl/src \
-link http://java.sun.com/javase/6/docs/api/ \
org.tigris.subversion.javahl \
- org.apache.subversion.javahl \
- org.apache.subversion.javahl.callback \
- org.apache.subversion.javahl.types
+ org.apache.subversion.javahl \
+ org.apache.subversion.javahl.remote \
+ org.apache.subversion.javahl.callback \
+ org.apache.subversion.javahl.types
doc-clean:
rm -rf $(top_srcdir)/doc/doxygen
@@ -912,5 +916,5 @@ INSTALL_EXTRA_TOOLS=\
test -n "$$SVN_SVNMUCC_IS_SVNSYITF" && \
ln -sf svnmucc$(EXEEXT) $(DESTDIR)$(bindir)/svnsyitf$(EXEEXT); \
if test "$(DESTDIR)$(bindir)" != "$(DESTDIR)$(toolsdir)"; then \
- ln -sf $(DESTDIR)$(bindir)/svnmucc$(EXEEXT) $(DESTDIR)$(toolsdir)/svnmucc$(EXEEXT); \
+ ln -sf $(bindir)/svnmucc$(EXEEXT) $(DESTDIR)$(toolsdir)/svnmucc$(EXEEXT); \
fi
Modified: subversion/branches/move-tracking-1/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-1/build.conf?rev=1515362&r1=1515361&r2=1515362&view=diff
==============================================================================
--- subversion/branches/move-tracking-1/build.conf (original)
+++ subversion/branches/move-tracking-1/build.conf Mon Aug 19 11:21:01 2013
@@ -41,8 +41,8 @@ private-includes =
subversion/bindings/cxxhl/include/*.hpp
subversion/bindings/cxxhl/include/svncxxhl/*.hpp
subversion/libsvn_subr/utf8proc/utf8proc.h
- subversion/libsvn_subr/utf8proc/utf8proc.c.inline
- subversion/libsvn_subr/utf8proc/utf8proc_data.c.inline
+ subversion/libsvn_subr/utf8proc/utf8proc.c
+ subversion/libsvn_subr/utf8proc/utf8proc_data.c
private-built-includes =
subversion/svn_private_config.h
subversion/libsvn_fs_fs/rep-cache-db.h
@@ -67,7 +67,11 @@ private-built-includes =
subversion/bindings/javahl/include/org_apache_subversion_javahl_types_VersionExtended_LoadedLibIterator.h
subversion/bindings/javahl/include/org_apache_subversion_javahl_types_Revision.h
subversion/bindings/javahl/include/org_apache_subversion_javahl_callback_UserPasswordCallback.h
-
+ subversion/bindings/javahl/include/org_apache_subversion_javahl_remote_RemoteSession.h
+ subversion/bindings/javahl/include/org_apache_subversion_javahl_remote_RemoteFactory.h
+ subversion/bindings/javahl/include/org_apache_subversion_javahl_remote_CommitEditor.h
+ subversion/bindings/javahl/include/org_apache_subversion_javahl_remote_StateReporter.h
+ subversion/bindings/javahl/include/org_apache_subversion_javahl_ConfigImpl_Category.h
test-scripts =
subversion/tests/cmdline/*_tests.py
@@ -194,6 +198,14 @@ libs = libsvn_client libsvn_ra libsvn_su
install = bin
manpages = subversion/svnmucc/svnmucc.1
+[svnauth]
+description = Subversion Authentication Credentials Management Tool
+type = exe
+path = subversion/svnauth
+libs = libsvn_subr apriconv apr
+install = bin
+manpages = subversion/svnauth/svnauth.1
+
# Support for GNOME Keyring
[libsvn_auth_gnome_keyring]
description = Subversion GNOME Keyring Library
@@ -542,6 +554,7 @@ type = java
path = subversion/bindings/javahl/src/org/apache/subversion/javahl
subversion/bindings/javahl/src/org/apache/subversion/javahl/callback
subversion/bindings/javahl/src/org/apache/subversion/javahl/types
+ subversion/bindings/javahl/src/org/apache/subversion/javahl/remote
src-root = subversion/bindings/javahl/src
sources = *.java
install = javahl-java
@@ -596,6 +609,17 @@ add-deps = $(javahl_java_DEPS)
install = javahl-javah
link-cmd = $(COMPILE_JAVAHL_JAVAH) -force
+[javahl-remote-javah]
+type = javah
+path = subversion/bindings/javahl/src/org/apache/subversion/javahl/remote
+classes = subversion/bindings/javahl/classes
+headers = subversion/bindings/javahl/include
+package = org.apache.subversion.javahl.remote
+sources = *.java
+add-deps = $(javahl_java_DEPS)
+install = javahl-javah
+link-cmd = $(COMPILE_JAVAHL_JAVAH) -force
+
[javahl-callback-javah]
type = javah
path = subversion/bindings/javahl/src/org/apache/subversion/javahl/callback
@@ -625,7 +649,7 @@ path = subversion/bindings/javahl/native
libs = libsvn_repos libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_diff
libsvn_subr libsvn_fs aprutil apriconv apr
sources = *.cpp *.c
-add-deps = $(javahl_javah_DEPS) $(javahl_java_DEPS) $(javahl_callback_javah_DEPS) $(javahl_types_javah_DEPS)
+add-deps = $(javahl_javah_DEPS) $(javahl_java_DEPS) $(javahl_callback_javah_DEPS) $(javahl_types_javah_DEPS) $(javahl_remote_javah_DEPS)
install = javahl-lib
# need special build rule to include -I$(JDK)/include/jni.h
compile-cmd = $(COMPILE_JAVAHL_CXX)
Modified: subversion/branches/move-tracking-1/build/ac-macros/berkeley-db.m4
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-1/build/ac-macros/berkeley-db.m4?rev=1515362&r1=1515361&r2=1515362&view=diff
==============================================================================
--- subversion/branches/move-tracking-1/build/ac-macros/berkeley-db.m4 (original)
+++ subversion/branches/move-tracking-1/build/ac-macros/berkeley-db.m4 Mon Aug 19 11:21:01 2013
@@ -48,7 +48,7 @@ AC_DEFUN(SVN_LIB_BERKELEY_DB,
AC_ARG_WITH(berkeley-db, [AS_HELP_STRING(
[[--with-berkeley-db[=HEADER:INCLUDES:LIB_SEARCH_DIRS:LIBS]]], [
The Subversion Berkeley DB based filesystem library
- requires Berkeley DB $db_version or newer. If you
+ requires Berkeley DB $db_version or $db_alt_version. If you
specify `--without-berkeley-db', that library will
not be built. If you omit the argument of this option
completely, the configure script will use Berkeley DB
@@ -126,22 +126,35 @@ AC_DEFUN(SVN_LIB_BERKELEY_DB,
svn_lib_berkeley_db=no
else
AC_MSG_CHECKING([for availability of Berkeley DB])
- SVN_LIB_BERKELEY_DB_TRY($1, $2, $3)
+ AC_ARG_ENABLE(banging-head-against-wall,
+ AS_HELP_STRING([---disable-banging-head-against-wall],
+ [Allow building against BDB 6+.
+ See --with-berkeley-db for specifying the location of
+ the Berkeley DB installation. Using BDB 6 will fail if
+ this option is not used.]),
+ [enable_bdb6=$enableval],[enable_bdb6=unspecified])
+
+ SVN_LIB_BERKELEY_DB_TRY($1, $2, $3, $enable_bdb6)
if test "$svn_have_berkeley_db" = "yes"; then
AC_MSG_RESULT([yes])
svn_lib_berkeley_db=yes
else
- AC_MSG_RESULT([no])
+ if test "$svn_have_berkeley_db" = "no6"; then
+ AC_MSG_RESULT([no (found version 6, but --enable-banging-head-against-wall not specified)])
+ # A warning will be printed at the end of configure.ac.
+ else
+ AC_MSG_RESULT([no])
+ fi
svn_lib_berkeley_db=no
if test "$bdb_status" = "required"; then
- AC_MSG_ERROR([Berkeley DB $db_version or newer wasn't found.])
+ AC_MSG_ERROR([Berkeley DB $db_version or $db_alt_version wasn't found.])
fi
fi
fi
])
-dnl SVN_LIB_BERKELEY_DB_TRY(major, minor, patch)
+dnl SVN_LIB_BERKELEY_DB_TRY(major, minor, patch, enable_bdb6)
dnl
dnl A subroutine of SVN_LIB_BERKELEY_DB.
dnl
@@ -174,6 +187,7 @@ AC_DEFUN(SVN_LIB_BERKELEY_DB_TRY,
svn_check_berkeley_db_major=$1
svn_check_berkeley_db_minor=$2
svn_check_berkeley_db_patch=$3
+ enable_bdb6=$4
if test -z "$SVN_DB_LIBS"; then
# We pass --dbm-libs here since Debian has modified apu-config not
@@ -215,6 +229,7 @@ AC_DEFUN(SVN_LIB_BERKELEY_DB_TRY,
)
AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#include <string.h>
#include <stdlib.h>
$svn_db_header
@@ -230,6 +245,12 @@ int main ()
|| patch != DB_VERSION_PATCH)
exit (1);
+ /* Block Berkeley DB 6, because (a) we haven't tested with it, (b) 6.0.20
+ and newer are under the AGPL, and we want use of AGPL dependencies to be
+ opt-in. */
+ if (major >= 6 && strcmp("$enable_bdb6", "yes"))
+ exit(2);
+
/* Run-time check: ensure the library claims to be the correct version. */
if (major < $svn_check_berkeley_db_major)
@@ -249,7 +270,11 @@ int main ()
}
]])],
[svn_have_berkeley_db=yes],
- [svn_have_berkeley_db=no],
+ [rc=$?
+ svn_have_berkeley_db=no
+ if test $rc = 2; then
+ svn_have_berkeley_db=no6
+ fi],
[svn_have_berkeley_db=yes]
)
Modified: subversion/branches/move-tracking-1/build/ac-macros/sqlite.m4
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-1/build/ac-macros/sqlite.m4?rev=1515362&r1=1515361&r2=1515362&view=diff
==============================================================================
--- subversion/branches/move-tracking-1/build/ac-macros/sqlite.m4 (original)
+++ subversion/branches/move-tracking-1/build/ac-macros/sqlite.m4 Mon Aug 19 11:21:01 2013
@@ -78,6 +78,10 @@ AC_DEFUN(SVN_LIB_SQLITE,
SVN_SQLITE_FILE_CONFIG($abs_srcdir/sqlite-amalgamation/sqlite3.c)
if test -z "$svn_lib_sqlite"; then
+ SVN_SQLITE_FILE_CONFIG($abs_builddir/sqlite-amalgamation/sqlite3.c)
+ fi
+
+ if test -z "$svn_lib_sqlite"; then
dnl check the "standard" location of /usr
SVN_SQLITE_DIR_CONFIG()
fi
@@ -246,6 +250,8 @@ AC_DEFUN(SVN_DOWNLOAD_SQLITE,
echo "unpack the archive using unzip and rename the resulting"
echo "directory to:"
echo "$abs_srcdir/sqlite-amalgamation"
+ echo "or to:"
+ echo "$abs_builddir/sqlite-amalgamation"
echo ""
AC_MSG_ERROR([Subversion requires SQLite])
])
Modified: subversion/branches/move-tracking-1/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-1/build/generator/gen_win.py?rev=1515362&r1=1515361&r2=1515362&view=diff
==============================================================================
--- subversion/branches/move-tracking-1/build/generator/gen_win.py (original)
+++ subversion/branches/move-tracking-1/build/generator/gen_win.py Mon Aug 19 11:21:01 2013
@@ -207,11 +207,17 @@ class GeneratorBase(gen_base.GeneratorBa
# Initialize parent
gen_base.GeneratorBase.__init__(self, fname, verfname, options)
+ # These files will be excluded from the build when they're not
+ # explicitly listed as project sources.
+ self._excluded_from_build = frozenset(self.private_includes
+ + self.private_built_includes)
+
# Find Berkeley DB
self._find_bdb()
def _find_bdb(self):
"Find the Berkeley DB library and version"
+ # Before adding "60" to this list, see build/ac-macros/berkeley-db.m4.
for ver in ("53", "52", "51", "50", "48", "47", "46",
"45", "44", "43", "42", "41", "40"):
lib = "libdb" + ver
@@ -514,6 +520,7 @@ class WinGeneratorBase(GeneratorBase):
cbuild = None
ctarget = None
cdesc = None
+ cignore = None
if isinstance(target, gen_base.TargetJavaHeaders):
classes = self.path(target.classes)
if self.junit_path is not None:
@@ -548,9 +555,18 @@ class WinGeneratorBase(GeneratorBase):
if quote_path and '-' in rsrc:
rsrc = '"%s"' % rsrc
+ if (not isinstance(source, gen_base.SourceFile)
+ and cbuild is None and ctarget is None and cdesc is None
+ and source in self._excluded_from_build):
+ # Make sure include dependencies are excluded from the build.
+ # This is an 'orrible 'ack that relies on the source being a
+ # string if it's an include dependency, or a SourceFile object
+ # otherwise.
+ cignore = 'yes'
+
sources.append(ProjectItem(path=rsrc, reldir=reldir, user_deps=[],
custom_build=cbuild, custom_target=ctarget,
- custom_desc=cdesc,
+ custom_desc=cdesc, ignored = cignore,
extension=os.path.splitext(rsrc)[1]))
if isinstance(target, gen_base.TargetJavaClasses) and target.jar:
@@ -1641,6 +1657,7 @@ class WinGeneratorBase(GeneratorBase):
class ProjectItem:
"A generic item class for holding sources info, config info, etc for a project"
def __init__(self, **kw):
+ self.ignored = None
vars(self).update(kw)
# ============================================================================
Modified: subversion/branches/move-tracking-1/build/generator/templates/vcnet_vcproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-1/build/generator/templates/vcnet_vcproj.ezt?rev=1515362&r1=1515361&r2=1515362&view=diff
==============================================================================
--- subversion/branches/move-tracking-1/build/generator/templates/vcnet_vcproj.ezt (original)
+++ subversion/branches/move-tracking-1/build/generator/templates/vcnet_vcproj.ezt Mon Aug 19 11:21:01 2013
@@ -121,9 +121,15 @@
<Filter
Name="Source Files"
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
-[for sources][is sources.extension ".h"][else] <File
+[for sources][is sources.extension ".h"][else][is sources.extension ".hpp"][else] <File
RelativePath="[sources.path]">
-[if-any sources.custom_build][for platforms][for configs]
+[if-any sources.ignored][for platforms][for configs] <FileConfiguration
+ Name="[configs.name]|[platforms]"
+ ExcludedFromBuild="TRUE">
+ <Tool
+ Name="VCCustomBuildTool"/>
+ </FileConfiguration>
+[end][end][else][if-any sources.custom_build][for platforms][for configs]
<FileConfiguration
Name="[configs.name]|[platforms]">
<Tool
@@ -142,9 +148,9 @@
ObjectFile="$(IntDir)/[sources.reldir]/"
ProgramDataBaseFileName="$(IntDir)/[sources.reldir]/[target.proj_name]-[sources.reldir].pdb"/>
</FileConfiguration>
-[end][end][end]
+[end][end][end][end]
</File>
-[end][end]
+[end][end][end]
[is target_type "2"] <File RelativePath="..\empty.c"/>[end]
</Filter>
<Filter
@@ -153,7 +159,10 @@
[for sources][is sources.extension ".h"]
<File
RelativePath="[sources.path]" />
-[end][end]
+[else][is sources.extension ".hpp"]
+ <File
+ RelativePath="[sources.path]" />
+[end][end][end]
</Filter>
</Files>
<Globals>
Modified: subversion/branches/move-tracking-1/build/generator/templates/vcnet_vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-1/build/generator/templates/vcnet_vcxproj.ezt?rev=1515362&r1=1515361&r2=1515362&view=diff
==============================================================================
--- subversion/branches/move-tracking-1/build/generator/templates/vcnet_vcxproj.ezt (original)
+++ subversion/branches/move-tracking-1/build/generator/templates/vcnet_vcxproj.ezt Mon Aug 19 11:21:01 2013
@@ -94,20 +94,21 @@
[end][end] </ResourceCompile>
</ItemGroup>
[end] <ItemGroup>
-[for sources][is sources.extension ".h"][else][if-any sources.custom_build] <CustomBuild Include="[sources.path]">
+[for sources][is sources.extension ".h"][else][is sources.extension ".hpp"][else][if-any sources.custom_build] <CustomBuild Include="[sources.path]">
<FileType>Document</FileType>
[for configs][for platforms] <Command Condition="'$(Configuration)|$(Platform)'=='[configs.name]|[platforms]'">[sources.custom_build]</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='[configs.name]|[platforms]'">[for sources.user_deps][sources.user_deps];[end]%(AdditionalInputs)</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='[configs.name]|[platforms]'">[sources.custom_target];%(Outputs)</Outputs>
[if-any sources.custom_desc]<Message Condition="'$(Configuration)|$(Platform)'=='[configs.name]|[platforms]'">[sources.custom_desc]</Message>
[end][end][end] </CustomBuild>
-[else][is sources.extension ".c"] <ClCompile Include="[sources.path]" />
-[else][is sources.extension ".cpp"] <ClCompile Include="[sources.path]" />
+[else][is sources.extension ".c"][if-any sources.ignored] <None Include="[sources.path]" />[else] <ClCompile Include="[sources.path]" />[end]
+[else][is sources.extension ".cpp"][if-any sources.ignored] <None Include="[sources.path]" />[else] <ClCompile Include="[sources.path]" />[end]
[else] <None Include="[sources.path]" />
-[end][end][end][end][end] </ItemGroup>
+[end][end][end][end][end][end] </ItemGroup>
<ItemGroup>
[for sources][is sources.extension ".h"] <ClInclude Include="[sources.path]" />
-[end][end] </ItemGroup>
+[else][is sources.extension ".hpp"] <ClInclude Include="[sources.path]" />
+[end][end][end] </ItemGroup>
<ItemGroup>
[for depends] <ProjectReference Include="[depends.path]">
<Project>[depends.guid]</Project>
Modified: subversion/branches/move-tracking-1/build/run_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-1/build/run_tests.py?rev=1515362&r1=1515361&r2=1515362&view=diff
==============================================================================
--- subversion/branches/move-tracking-1/build/run_tests.py (original)
+++ subversion/branches/move-tracking-1/build/run_tests.py Mon Aug 19 11:21:01 2013
@@ -30,6 +30,7 @@
[--list] [--milestone-filter=<regex>] [--mode-filter=<type>]
[--server-minor-version=<version>] [--http-proxy=<host>:<port>]
[--config-file=<file>] [--ssl-cert=<file>]
+ [--exclusive-wc-locks]
<abs_srcdir> <abs_builddir>
<prog ...>
@@ -125,7 +126,8 @@ class TestHarness:
fsfs_sharding=None, fsfs_packing=None,
list_tests=None, svn_bin=None, mode_filter=None,
milestone_filter=None, set_log_level=None, ssl_cert=None,
- http_proxy=None):
+ http_proxy=None, http_proxy_username=None,
+ http_proxy_password=None, exclusive_wc_locks=None):
'''Construct a TestHarness instance.
ABS_SRCDIR and ABS_BUILDDIR are the source and build directories.
@@ -143,6 +145,8 @@ class TestHarness:
in conjunction with LIST_TESTS, the only tests that are listed are
those with an associated issue in the tracker which has a target
milestone that matches the regex.
+ HTTP_PROXY (hostname:port), HTTP_PROXY_USERNAME and HTTP_PROXY_PASSWORD
+ define the params to run the tests over a proxy server.
'''
self.srcdir = abs_srcdir
self.builddir = abs_builddir
@@ -178,6 +182,9 @@ class TestHarness:
self.log = None
self.ssl_cert = ssl_cert
self.http_proxy = http_proxy
+ self.http_proxy_username = http_proxy_username
+ self.http_proxy_password = http_proxy_password
+ self.exclusive_wc_locks = exclusive_wc_locks
if not sys.stdout.isatty() or sys.platform == 'win32':
TextColors.disable()
@@ -186,6 +193,7 @@ class TestHarness:
there is a log file. Return zero iff all test programs passed.'''
self._open_log('w')
failed = 0
+
for cnt, prog in enumerate(list):
failed = self._run_test(prog, cnt, len(list)) or failed
@@ -481,6 +489,12 @@ class TestHarness:
svntest.main.options.ssl_cert = self.ssl_cert
if self.http_proxy is not None:
svntest.main.options.http_proxy = self.http_proxy
+ if self.http_proxy_username is not None:
+ svntest.main.options.http_proxy_username = self.http_proxy_username
+ if self.http_proxy_password is not None:
+ svntest.main.options.http_proxy_password = self.http_proxy_password
+ if self.exclusive_wc_locks is not None:
+ svntest.main.options.exclusive_wc_locks = self.exclusive_wc_locks
svntest.main.options.srcdir = self.srcdir
@@ -645,7 +659,8 @@ def main():
'enable-sasl', 'parallel', 'config-file=',
'log-to-stdout', 'list', 'milestone-filter=',
'mode-filter=', 'set-log-level=', 'ssl-cert=',
- 'http-proxy='])
+ 'http-proxy=', 'http-proxy-username=',
+ 'http-proxy-password=','exclusive-wc-locks'])
except getopt.GetoptError:
args = []
@@ -656,9 +671,10 @@ def main():
base_url, fs_type, verbose, cleanup, enable_sasl, http_library, \
server_minor_version, fsfs_sharding, fsfs_packing, parallel, \
config_file, log_to_stdout, list_tests, mode_filter, milestone_filter, \
- set_log_level, ssl_cert, http_proxy = \
+ set_log_level, ssl_cert, http_proxy, http_proxy_username, \
+ http_proxy_password, exclusive_wc_locks = \
None, None, None, None, None, None, None, None, None, None, None, \
- None, None, None, None, None, None, None
+ None, None, None, None, None, None, None, None, None, None
for opt, val in opts:
if opt in ['-u', '--url']:
base_url = val
@@ -696,6 +712,12 @@ def main():
ssl_cert = val
elif opt in ['--http-proxy']:
http_proxy = val
+ elif opt in ['--http-proxy-username']:
+ http_proxy_username = val
+ elif opt in ['--http-proxy-password']:
+ http_proxy_password = val
+ elif opt in ['--exclusive-wc-locks']:
+ exclusive_wc_locks = 1
else:
raise getopt.GetoptError
@@ -712,7 +734,10 @@ def main():
fsfs_sharding, fsfs_packing, list_tests,
mode_filter=mode_filter, milestone_filter=milestone_filter,
set_log_level=set_log_level, ssl_cert=ssl_cert,
- http_proxy=http_proxy)
+ http_proxy=http_proxy,
+ http_proxy_username=http_proxy_username,
+ http_proxy_password=http_proxy_password,
+ exclusive_wc_locks=exclusive_wc_locks)
failed = th.run(args[2:])
if failed:
Modified: subversion/branches/move-tracking-1/configure.ac
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-1/configure.ac?rev=1515362&r1=1515361&r2=1515362&view=diff
==============================================================================
--- subversion/branches/move-tracking-1/configure.ac (original)
+++ subversion/branches/move-tracking-1/configure.ac Mon Aug 19 11:21:01 2013
@@ -460,6 +460,7 @@ powerpc-apple-darwin*)
SVN_FS_WANT_DB_PATCH=14
;;
esac
+db_alt_version="5.x"
# Look for libdb4.so first:
SVN_LIB_BERKELEY_DB($SVN_FS_WANT_DB_MAJOR, $SVN_FS_WANT_DB_MINOR,
$SVN_FS_WANT_DB_PATCH, [db4 db])
@@ -1511,18 +1512,28 @@ dnl Configure is long - users tend to mi
dnl Hence, print a warnings about what we did and didn't configure at the
dnl end, where people will actually see them.
-if test "$svn_lib_berkeley_db" = "no" && test "$with_berkeley_db" != "no"; then
- db_version="$SVN_FS_WANT_DB_MAJOR.$SVN_FS_WANT_DB_MINOR.$SVN_FS_WANT_DB_PATCH"
- AC_MSG_WARN([we have configured without BDB filesystem support
+if test "$svn_have_berkeley_db" = "no6" && test "$enable_bdb6" != "no"; then
+ AC_MSG_WARN([We have configured without BDB filesystem support
-You don't seem to have Berkeley DB version $db_version or newer
-installed and linked to APR-UTIL. We have created a Makefile which will build
-Subversion without support for the Berkeley DB back-end. You can find the
-latest version of Berkeley DB here:
+Berkeley DB 6 was found, but not used. Please re-run configure (see
+./config.nice) with the '--enable-banging-head-against-wall' flag to use it,
+or explicitly specify '--disable-banging-head-against-wall' or
+'--without-berkeley-db' to silence this warning.
- http://www.oracle.com/technetwork/products/berkeleydb/downloads/index.html
+Please note that some versions of Berkeley DB 6+ are under the GNU Affero
+General Public License, version 3:
+https://oss.oracle.com/pipermail/bdb/2013-June/000056.html
-or explicitly specify --without-berkeley-db to silence this warning.
+The AGPL-3.0 licence may impose special requirements for making available
+source code of server-side software. The text of the licence is:
+https://www.gnu.org/licenses/agpl-3.0.html
+http://opensource.org/licenses/AGPL-3.0
+
+The Berkeley DB backend to Subversion is deprecated; see
+http://subversion.apache.org/docs/release-notes/1.8#bdb-deprecated
+
+The Subversion developers have not tested Subversion with Berkeley DB 6 for
+technical problems or bugs.
])
fi
Modified: subversion/branches/move-tracking-1/notes/tree-conflicts/use-cases.txt
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-1/notes/tree-conflicts/use-cases.txt?rev=1515362&r1=1515361&r2=1515362&view=diff
==============================================================================
--- subversion/branches/move-tracking-1/notes/tree-conflicts/use-cases.txt (original)
+++ subversion/branches/move-tracking-1/notes/tree-conflicts/use-cases.txt Mon Aug 19 11:21:01 2013
@@ -4,10 +4,16 @@
Issue reference: http://subversion.tigris.org/issues/show_bug.cgi?id=2282
+ http://subversion.tigris.org/issues/show_bug.cgi?id=3630
-(These use cases are based on a scenario paper "SVN move/rename
+These use cases are based on a scenario paper "SVN move/rename
problems & suggested improvements" submitted by a corporate Subversion
-user, which may be found attached to issue #2282.)
+user, which may be found attached to issue #2282.
+
+These notes were originally written during development of Subversion 1.6.
+The original version focussed on detection of tree conflicts. The notes
+have since been updated with behaviour changes up to Subversion 1.8.
+Any 'desired behaviour' mentioned here is yet to be implemented.
--------------------------------------------------------------------------
@@ -19,7 +25,7 @@ Description
During an update, a file modification is merged onto a file move.
-Current Behavior
+Behavior of Subversion <= 1.5
Developer A modifies Foo.c and commits it to the repository.
@@ -30,7 +36,7 @@ Current Behavior
update'. The update will apply A's modifications to Foo.c in the
repository to Foo.c in B's working copy.
-Problems With Current Behavior
+Problems With Behavior of Subversion <= 1.5
First problem:
@@ -46,7 +52,7 @@ Problems With Current Behavior
B's working copy because it has "local" modifications (which were in
fact made by A). This will likely escape B's attention.
-Diagram of current behavior
+Diagram of behavior of Subversion <= 1.5
(edit)
@@ -61,18 +67,23 @@ Diagram of current behavior
wcB -- +Bar.c ---------- +Bar.c ---- Bar.c --->
(move) -Foo.c -Foo.c' ?Foo.c' (unversioned)
+Behaviour of Subversion >= 1.6
-Desired behavior
+ Foo.c will be deleted from B's working copy.
- When user B updates, A's modifications to Foo.c should be merged into
- Bar.c. Signal a text conflict if necessary.
-
- Foo.c should be deleted from B's working copy.
+ A tree conflict is signalled to inform B of the new changes to Bar.c,
+ so that B can review the modified Bar.c before committing it.
+
+Behavior of Subversion >= 1.8
- A tree conflict should be signalled to inform B of the new changes
- to Bar.c, so that B can review the modified Bar.c before committing it.
+ As above, a tree conflict is flagged on Foo.c.
-Diagram of desired behaviour
+ When user B resolves the tree conflict on Foo.c, A's modifications
+ to Foo.c will be merged into Bar.c.
+
+ Text/Prop conflicts are signalled necessary.
+
+Diagram of Behaviour of Subversion >= 1.8
(edit)
@@ -101,7 +112,7 @@ Description
This is essentially the same as Use Case 1, with the difference that
this time, B does the edit and A does the move.
-Current Behavior
+Behavior of Subversion <= 1.5
Developer B modifies Foo.c in his working copy.
@@ -114,7 +125,7 @@ Current Behavior
B's working copy. Since B made local modifications to Foo.c,
it will not be deleted from disk but left behind unversioned.
-Problems with Current Behavior
+Problems with behavior of Subversion <= 1.5
Developer B may not notice that Foo.c fell out of version control.
B's source tree in the working copy likely builds fine because Foo.c
@@ -122,7 +133,7 @@ Problems with Current Behavior
possibly breaking the tree. Everybody will get angry with B if this
happens.
-Diagram of Current Behaviour
+Diagram of Behaviour of Subversion <= 1.5
(move)
@@ -137,6 +148,11 @@ Diagram of Current Behaviour
wcB -- Foo.c' ------------ Bar.c ------->
(edit) ?Foo.c' (unversioned)
+Behavior of Subversion >= 1.6
+
+ When B updates, Bar.c is added to B's working copy, and a tree conflict
+ is flagged on Foo.c. B is expected to figure out that A renamed Foo.c
+ to Bar.c, and must resolve the conflict in some way before committing.
Desired Behavior
@@ -174,7 +190,7 @@ Description
During an update, a file move is merged onto a conflicting file move.
-Current Behavior
+Behavior of Subversion <= 1.5
Developer A moves Foo.c to Bar.c and commits the move to the repository.
@@ -184,7 +200,7 @@ Current Behavior
'svn update'. The update will add Bar.c to B's working copy and
delete Foo.c from B's working copy (the latter is a no-op).
-Problems with Current Behavior
+Problems with behavior of Subversion <= 1.5
After B's next commit, the content of the original Foo.c
will exist twice in the source tree under two different paths,
@@ -192,7 +208,7 @@ Problems with Current Behavior
This may not have been intended.
-Diagram of Current Behavior
+Diagram of behavior of Subversion <= 1.5
(move)
@@ -208,12 +224,12 @@ Diagram of Current Behavior
(move) -Foo.c Bar.c
-Desired Behavior
+Behavior of Subversion >= 1.6
- A tree conflict should be signaled to inform B of the conflicting rename
+ A tree conflict is signaled to inform B of the conflicting rename
operation. B can now decide on deleting either file or committing both.
-Diagram of Desired Behavior
+Diagram of behavior of Subversion >= 1.6
(move)
@@ -230,6 +246,13 @@ Diagram of Desired Behavior
|
resolved
+Problems with Behaviour of Subversion >= 1.6
+
+ The incoming move is labeled as 'incoming delete' in the tree
+ conflict description, rather than 'incoming move'. No assistance
+ is provided while resolving the tree conflict. Inexperienced users
+ are often unsure why the conflict occurred and don't know how to
+ proceed.
==========
USE CASE 4
@@ -239,7 +262,7 @@ Description
A file modification is merged onto the source of a file move.
-Current Behavior
+Behavior of Subversion <= 1.5
Developer A modifies Foo.c and commits it to the repository.
@@ -249,7 +272,7 @@ Current Behavior
will apply A's modification to Foo.c to the Foo.c in B's working
copy.
-Problems With Current Behavior
+Problems With behavior of Subversion <= 1.5
First problem:
@@ -262,7 +285,7 @@ Problems With Current Behavior
except for a "skipped" warning in the output of the merge command,
which might not be noticed.
-Diagram of current behavior
+Diagram of behavior of Subversion <= 1.5
(edit)
@@ -279,15 +302,12 @@ Diagram of current behavior
wcB -- Bar.c -- Bar.c ------ -->
-Desired behavior
+Behavior of Subversion >= 1.6
- When user B merges, A's modifications to Foo.c should be merged into
- Bar.c. Signal a text conflict if necessary.
-
- A tree conflict should be signalled to inform B of the new changes
- to Bar.c, so that B can review the modified Bar.c before committing it.
+ A tree conflict is signalled to inform B of the new changes to Bar.c,
+ so that B can review the modified Bar.c before committing it.
-Diagram of desired behaviour
+Diagram of Behaviour of Subversion >= 1.6
(edit)
@@ -306,6 +326,17 @@ Diagram of desired behaviour
|
resolved
+Problems with Behaviour of Subversion >= 1.6
+
+ No assistance is provided while resolving the tree conflict.
+ Inexperienced users are often unsure why the conflict occurred
+ and don't know how to proceed.
+
+Desired Behaviour
+
+ When user B merges, A's modifications to Foo.c should be merged into
+ Bar.c. Signal a text conflict if necessary.
+
==========
USE CASE 5
@@ -318,7 +349,7 @@ Description
This is essentially the same as Use Case 4, with the difference that
this time, B does the edit and A does the move.
-Current Behavior
+Behavior of Subversion <= 1.5
Developer A moves Foo.c to Bar.c and commits it to the repository.
@@ -328,15 +359,13 @@ Current Behavior
will add Bar.c (with the same content as the original Foo.c) and
will delete B's Foo.c.
-Problems With Current Behavior
+Problems with behavior of Subversion <= 1.5
- First problem:
-
B's has modified Foo.c in the past. This modification will be lost
unless B reviews the history of Foo.c and Bar.c at both URLs and
corrects the problem (e.g., via 'svn copy').
-Diagram of current behavior
+Diagram of behavior of Subversion <= 1.5
(move)
@@ -354,17 +383,31 @@ Diagram of current behavior
-Foo.c'
+Behavior Subversion >= 1.6
+
+ A tree conflict is signaled on Foo.c to inform B that Foo.c has been
+ renamed to Bar.c
+
+Problems with Behaviour of Subversion >= 1.6
+
+ The incoming move is labeled as 'incoming delete' in the tree
+ conflict description, rather than 'incoming move'. No assistance
+ is provided while resolving the tree conflict. Inexperienced users
+ are often unsure why the conflict occurred and don't know how to
+ proceed.
+
+Behavior of Subversion <= 1.8
+
+ Same as 1.6, but also for directories instead of just files.
+
Desired behavior
In B's working copy, the update should add Bar.c and merge the local
modifications to Foo.c into Bar.c. Signal a text conflict if necessary.
Foo.c should be deleted from B's working copy.
-
- A tree conflict should be signaled to inform B that Foo.c has been
- renamed to Bar.c
-Diagram of desired behaviour
+Diagram of Desired Behaviour
(move)
@@ -383,7 +426,6 @@ Diagram of desired behaviour
|
resolved
-
==========
USE CASE 6
==========
@@ -392,7 +434,7 @@ Description
A file move is merged onto a conflicting file move.
-Current Behavior
+Behavior of Subversion <= 1.5
Developer A moves Foo.c to Bar.c and commits it to the repository.
@@ -401,13 +443,13 @@ Current Behavior
Developer B merges A's new revision into his working copy. The merge
will add Bar.c with history in B's working copy.
-Problems With Current Behavior
+Problems with behavior of Subversion <= 1.5
After B's next commit, the content of the original Foo.c will exist
twice in the source tree under two different paths (Bar.c and
Bix.c). This may not have been intended.
-Diagram of current behavior
+Diagram of Behavior of Subversion <= 1.5
(move)
@@ -425,12 +467,24 @@ Diagram of current behavior
+Bar.c
+Behavior of Subversion <= 1.6
+
+ A tree conflict is flagged on Foo.c in B's working copy.
+
+Problems with Behaviour of Subversion >= 1.6
+
+ The incoming move is labeled as 'incoming delete' in the tree
+ conflict description, rather than 'incoming move'. No assistance
+ is provided while resolving the tree conflict. Inexperienced users
+ are often unsure why the conflict occurred and don't know how to
+ proceed.
+
Desired behavior
A tree conflict should be signaled to inform B of the conflicting
rename operation. B can delete either file or commit both.
-Diagram of desired behaviour
+Diagram of Desired Behaviour
(move)
Modified: subversion/branches/move-tracking-1/subversion/bindings/cxxhl/include/svncxxhl.hpp
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-1/subversion/bindings/cxxhl/include/svncxxhl.hpp?rev=1515362&r1=1515361&r2=1515362&view=diff
==============================================================================
--- subversion/branches/move-tracking-1/subversion/bindings/cxxhl/include/svncxxhl.hpp (original)
+++ subversion/branches/move-tracking-1/subversion/bindings/cxxhl/include/svncxxhl.hpp Mon Aug 19 11:21:01 2013
@@ -32,6 +32,6 @@
#include "svncxxhl/exception.hpp"
#include "svncxxhl/tristate.hpp"
-namespace svn = ::subversion::cxxhl::version_1_9_dev;
+namespace SVN = ::apache::subversion::cxxhl;
#endif // SVN_CXXHL_HPP
Modified: subversion/branches/move-tracking-1/subversion/bindings/cxxhl/include/svncxxhl/_compat.hpp
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-1/subversion/bindings/cxxhl/include/svncxxhl/_compat.hpp?rev=1515362&r1=1515361&r2=1515362&view=diff
==============================================================================
--- subversion/branches/move-tracking-1/subversion/bindings/cxxhl/include/svncxxhl/_compat.hpp (original)
+++ subversion/branches/move-tracking-1/subversion/bindings/cxxhl/include/svncxxhl/_compat.hpp Mon Aug 19 11:21:01 2013
@@ -28,64 +28,76 @@
#ifndef SVN_CXXHL_COMPAT_HPP
#define SVN_CXXHL_COMPAT_HPP
-// Configuration test: std::shared_ptr<>
+// Configuration test: std::shared_ptr<> and friends
// Currently detects: clang++, g++, msvc-2010+
-#ifndef SVN_CXXHL_HAVE_STD_SHARED_PTR
+#ifndef SVN_CXXHL_HAVE_STD_SMART_PTRS
# if (defined(__clang__) && __cplusplus >= 201103L) \
|| (defined(__GNUC__) && defined(__GXX_EXPERIMENTAL_CXX0X__)) \
|| (defined(_MSC_VER) && _MSC_VER >= 1600)
-# define SVN_CXXHL_HAVE_STD_SHARED_PTR
+# define SVN_CXXHL_HAVE_STD_SMART_PTRS
# endif // config test: std::shared_ptr<>
-#endif // SVN_CXXHL_HAVE_STD_SHARED_PTR
+#endif // SVN_CXXHL_HAVE_STD_SMART_PTRS
-// Configuration test: std::tr1::shared_ptr<>
+// Configuration test: std::tr1::shared_ptr<> and friends
// Currently detects: clang++, g++
-#ifndef SVN_CXXHL_HAVE_STD_SHARED_PTR
-# ifndef SVN_CXXHL_HAVE_STD_TR1_SHARED_PTR
+#ifndef SVN_CXXHL_HAVE_STD_SMART_PTRS
+# ifndef SVN_CXXHL_HAVE_STD_TR1_SMART_PTRS
# if defined(__GNUC__) \
&& (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ >= 1)
-# define SVN_CXXHL_HAVE_STD_TR1_SHARED_PTR
+# define SVN_CXXHL_HAVE_STD_TR1_SMART_PTRS
# endif // config test: std::tr1::shared_ptr<>
-# endif // SVN_CXXHL_HAVE_STD_TR1_SHARED_PTR
-#endif // SVN_CXXHL_HAVE_STD_SHARED_PTR
+# endif // SVN_CXXHL_HAVE_STD_TR1_SMART_PTRS
+#endif // SVN_CXXHL_HAVE_STD_SMART_PTRS
-#if defined(SVN_CXXHL_HAVE_STD_SHARED_PTR)
+#if defined(SVN_CXXHL_HAVE_STD_SMART_PTRS)
#include <memory>
+namespace apache {
namespace subversion {
namespace cxxhl {
namespace compat {
+using std::weak_ptr;
using std::shared_ptr;
+using std::enable_shared_from_this;
} // namespace compat
} // namespace cxxhl
} // namespace subversion
+} // namespace apache
-#elif defined(SVN_CXXHL_HAVE_STD_TR1_SHARED_PTR)
+#elif defined(SVN_CXXHL_HAVE_STD_TR1_SMART_PTRS)
#include <tr1/memory>
+namespace apache {
namespace subversion {
namespace cxxhl {
namespace compat {
+using std::tr1::weak_ptr;
using std::tr1::shared_ptr;
+using std::tr1::enable_shared_from_this;
} // namespace compat
} // namespace cxxhl
} // namespace subversion
+} // namespace apache
#else
-// We need shared_ptr<> from somewhere. If we cannot find it in ::std
-// given known compiler characteristics, then try boost as a last
-// resort.
+// We need smart pointers from somewhere. If we cannot find them in
+// ::std given known compiler characteristics, then try Boost as a
+// last resort.
#include <boost/shared_ptr.hpp>
+namespace apache {
namespace subversion {
namespace cxxhl {
namespace compat {
+using boost::weak_ptr;
using boost::shared_ptr;
+using boost::enable_shared_from_this;
} // namespace compat
} // namespace cxxhl
} // namespace subversion
+} // namespace apache
-#endif // SVN_CXXHL_HAVE_STD_SHARED_PTR
+#endif // SVN_CXXHL_HAVE_STD_SMART_PTRS
#endif // SVN_CXXHL_COMPAT_HPP
Modified: subversion/branches/move-tracking-1/subversion/bindings/cxxhl/include/svncxxhl/exception.hpp
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-1/subversion/bindings/cxxhl/include/svncxxhl/exception.hpp?rev=1515362&r1=1515361&r2=1515362&view=diff
==============================================================================
--- subversion/branches/move-tracking-1/subversion/bindings/cxxhl/include/svncxxhl/exception.hpp (original)
+++ subversion/branches/move-tracking-1/subversion/bindings/cxxhl/include/svncxxhl/exception.hpp Mon Aug 19 11:21:01 2013
@@ -38,6 +38,7 @@
// Forward declaration of implementation-specific structure
struct svn_error_t;
+namespace apache {
namespace subversion {
namespace cxxhl {
@@ -45,22 +46,20 @@ namespace compat {} // Announce the comp
namespace detail {
// Forward declaration of implementation-specific structure
-class error_description;
+class ErrorDescription;
} // namespace detail
-namespace version_1_9_dev {
-
-class error : public std::exception
+class Error : public std::exception
{
public:
- typedef compat::shared_ptr<error> shared_ptr;
+ typedef compat::shared_ptr<Error> shared_ptr;
- error(const char* description, int error_code);
- error(const char* description, int error_code, shared_ptr nested_error);
+ Error(const char* description, int error_code);
+ Error(const char* description, int error_code, shared_ptr nested_error);
- error(const error& that) throw();
- error& operator=(const error& that) throw();
- virtual ~error() throw();
+ Error(const Error& that) throw();
+ Error& operator=(const Error& that) throw();
+ virtual ~Error() throw();
/**
* Returns the error code associated with the exception.
@@ -83,18 +82,18 @@ public:
* describes the location in the source code where the error was
* generated from.
*/
- typedef std::pair<int, std::string> message;
+ typedef std::pair<int, std::string> Message;
/**
* The list of messages associated with an error.
*/
- typedef std::vector<message> message_list;
+ typedef std::vector<Message> MessageList;
/**
* Returns the complete list of error messages, including those from
* nested exceptions.
*/
- virtual message_list messages() const
+ virtual MessageList messages() const
{
return compile_messages(false);
}
@@ -106,7 +105,7 @@ public:
* Traceback is only available if the Subversion libraries were
* compiled with tracing enabled.
*/
- virtual message_list traced_messages() const
+ virtual MessageList traced_messages() const
{
return compile_messages(true);
}
@@ -116,29 +115,29 @@ public:
static void throw_svn_error(svn_error_t*);
protected:
- error(int error_code, detail::error_description* description) throw();
+ Error(int error_code, detail::ErrorDescription* description) throw();
private:
- std::vector<message> compile_messages(bool show_traces) const;
+ MessageList compile_messages(bool show_traces) const;
int m_errno; /**< The (SVN or APR) error code. */
shared_ptr m_nested; /**< Optional pointer to nessted error. */
/** Error description and trace location information. */
- detail::error_description* m_description;
+ detail::ErrorDescription* m_description;
};
-class cancelled : public error
+class Cancelled : public Error
{
- friend void error::throw_svn_error(svn_error_t*);
+ friend void Error::throw_svn_error(svn_error_t*);
protected:
- cancelled(int error_code, detail::error_description* description) throw()
- : error(error_code, description)
+ Cancelled(int error_code, detail::ErrorDescription* description) throw()
+ : Error(error_code, description)
{}
};
-} // namespace version_1_9_dev
} // namespace cxxhl
} // namespace subversion
+} // namespace apache
#endif // SVN_CXXHL_EXCEPTION_HPP
Modified: subversion/branches/move-tracking-1/subversion/bindings/cxxhl/include/svncxxhl/tristate.hpp
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-1/subversion/bindings/cxxhl/include/svncxxhl/tristate.hpp?rev=1515362&r1=1515361&r2=1515362&view=diff
==============================================================================
--- subversion/branches/move-tracking-1/subversion/bindings/cxxhl/include/svncxxhl/tristate.hpp (original)
+++ subversion/branches/move-tracking-1/subversion/bindings/cxxhl/include/svncxxhl/tristate.hpp Mon Aug 19 11:21:01 2013
@@ -28,37 +28,37 @@
#ifndef SVN_CXXHL_TRISTATE_HPP
#define SVN_CXXHL_TRISTATE_HPP
+namespace apache {
namespace subversion {
namespace cxxhl {
-namespace version_1_9_dev {
-class tristate
+class Tristate
{
public:
- static const tristate TRUE;
- static const tristate FALSE;
- static const tristate UNKNOWN;
+ static const Tristate TRUE;
+ static const Tristate FALSE;
+ static const Tristate UNKNOWN;
- tristate(const tristate& that) throw()
+ Tristate(const Tristate& that) throw()
: m_value(that.m_value)
{}
- bool operator==(const tristate& that) const throw()
+ bool operator==(const Tristate& that) const throw()
{ return m_value == that.m_value; }
- bool operator!=(const tristate& that) const throw()
+ bool operator!=(const Tristate& that) const throw()
{ return !(*this == that); }
bool known() const throw()
{ return *this != UNKNOWN; }
private:
- explicit tristate(short int value) throw();
+ explicit Tristate(short int value) throw();
short int m_value;
};
-} // namespace version_1_9_dev
} // namespace cxxhl
} // namespace subversion
+} // namespace apache
#endif // SVN_CXXHL_TRISTATE_HPP
Modified: subversion/branches/move-tracking-1/subversion/bindings/cxxhl/src/exception.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-1/subversion/bindings/cxxhl/src/exception.cpp?rev=1515362&r1=1515361&r2=1515362&view=diff
==============================================================================
--- subversion/branches/move-tracking-1/subversion/bindings/cxxhl/src/exception.cpp (original)
+++ subversion/branches/move-tracking-1/subversion/bindings/cxxhl/src/exception.cpp Mon Aug 19 11:21:01 2013
@@ -37,23 +37,24 @@
#undef TRUE
#undef FALSE
+namespace apache {
namespace subversion {
namespace cxxhl {
namespace detail {
-class error_description
+class ErrorDescription
{
public:
- static error_description* create(const char* message,
- const char *loc_file, long loc_line,
- bool trace_link)
+ static ErrorDescription* create(const char* message,
+ const char *loc_file, long loc_line,
+ bool trace_link)
{
bool empty_message = (message == NULL);
const std::size_t length = (empty_message ? 0 : std::strlen(message));
- void *memblock = ::operator new(length + sizeof(error_description));
+ void *memblock = ::operator new(length + sizeof(ErrorDescription));
- error_description* description = new(memblock) error_description(
+ ErrorDescription* description = new(memblock) ErrorDescription(
loc_file, loc_line, trace_link, empty_message);
if (length)
std::memcpy(description->m_message, message, length);
@@ -61,23 +62,23 @@ public:
return description;
}
- static error_description* create(const char* message)
+ static ErrorDescription* create(const char* message)
{
return create(message, NULL, 0, false);
}
- error_description* reference() throw()
+ ErrorDescription* reference() throw()
{
if (this)
svn_atomic_inc(&m_refcount);
return this;
}
- error_description* dereference() throw()
+ ErrorDescription* dereference() throw()
{
if (this && 0 == svn_atomic_dec(&m_refcount))
{
- this->~error_description();
+ this->~ErrorDescription();
::operator delete(this, std::nothrow);
return NULL;
}
@@ -90,8 +91,8 @@ public:
bool trace() const throw() { return m_trace; }
private:
- error_description(const char *loc_file, long loc_line,
- bool trace_link, bool empty_message) throw()
+ ErrorDescription(const char *loc_file, long loc_line,
+ bool trace_link, bool empty_message) throw()
: m_loc_file(loc_file),
m_loc_line(loc_line),
m_trace(trace_link),
@@ -99,7 +100,7 @@ private:
m_refcount(0)
{}
- ~error_description() throw() {}
+ ~ErrorDescription() throw() {}
const char* m_loc_file;
long m_loc_line;
@@ -113,27 +114,25 @@ private:
} // namespace detail
-namespace version_1_9_dev {
-
-error::error(const char* description, int error_code)
+Error::Error(const char* description, int error_code)
: m_errno(error_code),
- m_description(detail::error_description::create(description)->reference())
+ m_description(detail::ErrorDescription::create(description)->reference())
{}
-error::error(const char* description, int error_code,
- error::shared_ptr nested_error)
+Error::Error(const char* description, int error_code,
+ Error::shared_ptr nested_error)
: m_errno(error_code),
m_nested(nested_error),
- m_description(detail::error_description::create(description)->reference())
+ m_description(detail::ErrorDescription::create(description)->reference())
{}
-error::error(const error& that) throw()
+Error::Error(const Error& that) throw()
: m_errno(that.m_errno),
m_nested(that.m_nested),
m_description(that.m_description->reference())
{}
-error& error::operator=(const error& that) throw()
+Error& Error::operator=(const Error& that) throw()
{
if (this == &that)
return *this;
@@ -141,29 +140,28 @@ error& error::operator=(const error& tha
// This in-place destroy+copy implementation of the assignment
// operator is safe because both the destructor and the copy
// constructor do not throw exceptions.
- this->~error();
- return *new(this) error(that);
+ this->~Error();
+ return *new(this) Error(that);
}
-error::~error() throw()
+Error::~Error() throw()
{
m_description->dereference();
}
-const char* error::what() const throw()
+const char* Error::what() const throw()
{
return m_description->what();
}
-error::error(int error_code, detail::error_description* description) throw()
+Error::Error(int error_code, detail::ErrorDescription* description) throw()
: m_errno(error_code),
m_description(description)
{}
-void error::throw_svn_error(svn_error_t* err)
+void Error::throw_svn_error(svn_error_t* err)
{
- const bool throw_cancelled = (err->apr_err == SVN_ERR_CANCELLED);
- detail::error_description* description = NULL;
+ detail::ErrorDescription* description = NULL;
try
{
// Be very careful when creating the error descriptions, so that
@@ -174,33 +172,36 @@ void error::throw_svn_error(svn_error_t*
shared_ptr nested;
shared_ptr* current = &nested;
+ bool cancelled = (err->apr_err == SVN_ERR_CANCELLED);
for (svn_error_t* next = err->child; next; next = next->child)
{
- description = detail::error_description::create(
+ description = detail::ErrorDescription::create(
next->message, next->file, next->line,
svn_error__is_tracing_link(next));
description->reference();
- current->reset(new error(next->apr_err, description));
+ current->reset(new Error(next->apr_err, description));
description = NULL;
current = &(*current)->m_nested;
+ if (next->apr_err == SVN_ERR_CANCELLED)
+ cancelled = true;
}
const int apr_err = err->apr_err;
- description = detail::error_description::create(
+ description = detail::ErrorDescription::create(
err->message, err->file, err->line,
svn_error__is_tracing_link(err));
description->reference();
svn_error_clear(err);
- if (throw_cancelled)
+ if (cancelled)
{
- cancelled converted = cancelled(apr_err, description);
+ Cancelled converted = Cancelled(apr_err, description);
description = NULL;
converted.m_nested = nested;
throw converted;
}
else
{
- error converted = error(apr_err, description);
+ Error converted = Error(apr_err, description);
description = NULL;
converted.m_nested = nested;
throw converted;
@@ -215,8 +216,8 @@ void error::throw_svn_error(svn_error_t*
namespace {
-void handle_one_error(error::message_list& ml, bool show_traces,
- int error_code, detail::error_description* descr,
+void handle_one_error(Error::MessageList& ml, bool show_traces,
+ int error_code, detail::ErrorDescription* descr,
apr_pool_t* pool)
{
if (show_traces && descr->file())
@@ -234,8 +235,20 @@ void handle_one_error(error::message_lis
buffer << file_utf8 << ':' << descr->line();
else
buffer << "svn:<undefined>";
- buffer << ": (apr_err=" << error_code << ')';
- ml.push_back(error::message(0, buffer.str()));
+ if (descr->trace())
+ buffer << ',';
+ else
+ {
+#ifdef SVN_DEBUG
+ if (const char *const symbolic_name =
+ svn_error_symbolic_name(error_code))
+ //if (symbolic_name)
+ buffer << ": (apr_err=" << symbolic_name << ')';
+ else
+#endif
+ buffer << ": (apr_err=" << error_code << ')';
+ }
+ ml.push_back(Error::Message(0, buffer.str()));
}
if (descr->trace())
@@ -264,22 +277,22 @@ void handle_one_error(error::message_lis
}
}
}
- ml.push_back(error::message(error_code, std::string(description)));
+ ml.push_back(Error::Message(error_code, std::string(description)));
}
} // anonymous namespace
-error::message_list error::compile_messages(bool show_traces) const
+Error::MessageList Error::compile_messages(bool show_traces) const
{
// Determine the maximum size of the returned list
- message_list::size_type max_length = 0;
- for (const error* err = this; err; err = err->m_nested.get())
+ MessageList::size_type max_length = 0;
+ for (const Error* err = this; err; err = err->m_nested.get())
{
if (show_traces && m_description->file())
++max_length; // We will display an error location
if (!m_description->trace())
++max_length; // Traces do not emit a message line
}
- message_list ml;
+ MessageList ml;
ml.reserve(max_length);
// This vector holds a list of all error codes that we've printed
@@ -291,7 +304,7 @@ error::message_list error::compile_messa
apr_pool_create(&pool, NULL);
try
{
- for (const error* err = this; err; err = err->m_nested.get())
+ for (const Error* err = this; err; err = err->m_nested.get())
{
if (!err->m_description->what())
{
@@ -317,6 +330,6 @@ error::message_list error::compile_messa
return ml;
}
-} // namespace version_1_9_dev
} // namespace cxxhl
} // namespace subversion
+} // namespace apache
Modified: subversion/branches/move-tracking-1/subversion/bindings/cxxhl/src/tristate.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-1/subversion/bindings/cxxhl/src/tristate.cpp?rev=1515362&r1=1515361&r2=1515362&view=diff
==============================================================================
--- subversion/branches/move-tracking-1/subversion/bindings/cxxhl/src/tristate.cpp (original)
+++ subversion/branches/move-tracking-1/subversion/bindings/cxxhl/src/tristate.cpp Mon Aug 19 11:21:01 2013
@@ -27,18 +27,18 @@
#undef TRUE
#undef FALSE
+namespace apache {
namespace subversion {
namespace cxxhl {
-namespace version_1_9_dev {
-tristate::tristate(short value) throw()
+Tristate::Tristate(short value) throw()
: m_value(value)
{}
-const tristate tristate::TRUE = tristate(svn_tristate_true);
-const tristate tristate::FALSE = tristate(svn_tristate_false);
-const tristate tristate::UNKNOWN = tristate(svn_tristate_unknown);
+const Tristate Tristate::TRUE = Tristate(svn_tristate_true);
+const Tristate Tristate::FALSE = Tristate(svn_tristate_false);
+const Tristate Tristate::UNKNOWN = Tristate(svn_tristate_unknown);
-} // namespace version_1_9_dev
} // namespace cxxhl
} // namespace subversion
+} // namespace apache