subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1662177 [1/18] - in /subversion/branches/reuse-ra-session: ./ build/ build/generator/ contrib/client-side/svncopy/ subversion/bindings/javahl/native/ subversion/bindings/javahl/src/org/apache/subversion/javahl/ subversion/bindings/javahl/s...
Date Wed, 25 Feb 2015 08:15:42 GMT
Author: brane
Date: Wed Feb 25 08:15:39 2015
New Revision: 1662177

URL: http://svn.apache.org/r1662177
Log:
On the reuse-ra-session branch: Sync with trunk up to r1662176.

Added:
    subversion/branches/reuse-ra-session/subversion/svnbench/
      - copied from r1662176, subversion/trunk/subversion/svnbench/
    subversion/branches/reuse-ra-session/tools/dev/wc-ng/svn-wc-db-tester.c
      - copied unchanged from r1662176, subversion/trunk/tools/dev/wc-ng/svn-wc-db-tester.c
Removed:
    subversion/branches/reuse-ra-session/subversion/svn-bench/
    subversion/branches/reuse-ra-session/subversion/svn/youngest-cmd.c
Modified:
    subversion/branches/reuse-ra-session/   (props changed)
    subversion/branches/reuse-ra-session/.ycm_extra_conf.py
    subversion/branches/reuse-ra-session/CHANGES
    subversion/branches/reuse-ra-session/INSTALL
    subversion/branches/reuse-ra-session/Makefile.in
    subversion/branches/reuse-ra-session/autogen.sh
    subversion/branches/reuse-ra-session/build.conf
    subversion/branches/reuse-ra-session/build/generator/gen_base.py
    subversion/branches/reuse-ra-session/build/generator/gen_msvc_dsp.py
    subversion/branches/reuse-ra-session/build/generator/gen_win.py
    subversion/branches/reuse-ra-session/build/generator/gen_win_dependencies.py
    subversion/branches/reuse-ra-session/build/getversion.py
    subversion/branches/reuse-ra-session/build/run_tests.py
    subversion/branches/reuse-ra-session/build/transform_sql.py
    subversion/branches/reuse-ra-session/contrib/client-side/svncopy/svncopy.pl.in
    subversion/branches/reuse-ra-session/gen-make.py
    subversion/branches/reuse-ra-session/subversion/bindings/javahl/native/EditorProxy.h
    subversion/branches/reuse-ra-session/subversion/bindings/javahl/native/SVNClient.cpp
    subversion/branches/reuse-ra-session/subversion/bindings/javahl/native/SVNClient.h
    subversion/branches/reuse-ra-session/subversion/bindings/javahl/native/StateReporter.cpp
    subversion/branches/reuse-ra-session/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
    subversion/branches/reuse-ra-session/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp
    subversion/branches/reuse-ra-session/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
    subversion/branches/reuse-ra-session/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNEditor.java
    subversion/branches/reuse-ra-session/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java
    subversion/branches/reuse-ra-session/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java
    subversion/branches/reuse-ra-session/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
    subversion/branches/reuse-ra-session/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
    subversion/branches/reuse-ra-session/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
    subversion/branches/reuse-ra-session/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c
    subversion/branches/reuse-ra-session/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h
    subversion/branches/reuse-ra-session/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
    subversion/branches/reuse-ra-session/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
    subversion/branches/reuse-ra-session/subversion/bindings/swig/ruby/test/test_fs.rb
    subversion/branches/reuse-ra-session/subversion/bindings/swig/ruby/test/util.rb
    subversion/branches/reuse-ra-session/subversion/bindings/swig/ruby/test/windows_util.rb
    subversion/branches/reuse-ra-session/subversion/bindings/swig/svn_wc.i
    subversion/branches/reuse-ra-session/subversion/include/private/svn_cache.h
    subversion/branches/reuse-ra-session/subversion/include/private/svn_fs_fs_private.h
    subversion/branches/reuse-ra-session/subversion/include/private/svn_packed_data.h
    subversion/branches/reuse-ra-session/subversion/include/private/svn_repos_private.h
    subversion/branches/reuse-ra-session/subversion/include/private/svn_sorts_private.h
    subversion/branches/reuse-ra-session/subversion/include/private/svn_sqlite.h
    subversion/branches/reuse-ra-session/subversion/include/private/svn_subr_private.h
    subversion/branches/reuse-ra-session/subversion/include/private/svn_wc_private.h
    subversion/branches/reuse-ra-session/subversion/include/svn_auth.h
    subversion/branches/reuse-ra-session/subversion/include/svn_cache_config.h
    subversion/branches/reuse-ra-session/subversion/include/svn_client.h
    subversion/branches/reuse-ra-session/subversion/include/svn_cmdline.h
    subversion/branches/reuse-ra-session/subversion/include/svn_diff.h
    subversion/branches/reuse-ra-session/subversion/include/svn_fs.h
    subversion/branches/reuse-ra-session/subversion/include/svn_io.h
    subversion/branches/reuse-ra-session/subversion/include/svn_props.h
    subversion/branches/reuse-ra-session/subversion/include/svn_ra.h
    subversion/branches/reuse-ra-session/subversion/include/svn_repos.h
    subversion/branches/reuse-ra-session/subversion/include/svn_string.h
    subversion/branches/reuse-ra-session/subversion/include/svn_version.h
    subversion/branches/reuse-ra-session/subversion/include/svn_wc.h
    subversion/branches/reuse-ra-session/subversion/libsvn_client/add.c
    subversion/branches/reuse-ra-session/subversion/libsvn_client/blame.c
    subversion/branches/reuse-ra-session/subversion/libsvn_client/client.h
    subversion/branches/reuse-ra-session/subversion/libsvn_client/commit.c
    subversion/branches/reuse-ra-session/subversion/libsvn_client/commit_util.c
    subversion/branches/reuse-ra-session/subversion/libsvn_client/copy.c
    subversion/branches/reuse-ra-session/subversion/libsvn_client/deprecated.c
    subversion/branches/reuse-ra-session/subversion/libsvn_client/diff.c
    subversion/branches/reuse-ra-session/subversion/libsvn_client/externals.c
    subversion/branches/reuse-ra-session/subversion/libsvn_client/log.c
    subversion/branches/reuse-ra-session/subversion/libsvn_client/merge.c
    subversion/branches/reuse-ra-session/subversion/libsvn_client/patch.c
    subversion/branches/reuse-ra-session/subversion/libsvn_client/prop_commands.c
    subversion/branches/reuse-ra-session/subversion/libsvn_client/ra.c
    subversion/branches/reuse-ra-session/subversion/libsvn_client/update.c
    subversion/branches/reuse-ra-session/subversion/libsvn_delta/svndiff.c
    subversion/branches/reuse-ra-session/subversion/libsvn_diff/parse-diff.c
    subversion/branches/reuse-ra-session/subversion/libsvn_fs/fs-loader.c
    subversion/branches/reuse-ra-session/subversion/libsvn_fs_base/fs.c
    subversion/branches/reuse-ra-session/subversion/libsvn_fs_base/lock.c
    subversion/branches/reuse-ra-session/subversion/libsvn_fs_fs/cached_data.c
    subversion/branches/reuse-ra-session/subversion/libsvn_fs_fs/fs_fs.c
    subversion/branches/reuse-ra-session/subversion/libsvn_fs_fs/hotcopy.c
    subversion/branches/reuse-ra-session/subversion/libsvn_fs_fs/id.c
    subversion/branches/reuse-ra-session/subversion/libsvn_fs_fs/index.c
    subversion/branches/reuse-ra-session/subversion/libsvn_fs_fs/index.h
    subversion/branches/reuse-ra-session/subversion/libsvn_fs_fs/lock.c
    subversion/branches/reuse-ra-session/subversion/libsvn_fs_fs/low_level.c
    subversion/branches/reuse-ra-session/subversion/libsvn_fs_fs/low_level.h
    subversion/branches/reuse-ra-session/subversion/libsvn_fs_fs/pack.c
    subversion/branches/reuse-ra-session/subversion/libsvn_fs_fs/recovery.c
    subversion/branches/reuse-ra-session/subversion/libsvn_fs_fs/rev_file.c
    subversion/branches/reuse-ra-session/subversion/libsvn_fs_fs/revprops.c
    subversion/branches/reuse-ra-session/subversion/libsvn_fs_fs/revprops.h
    subversion/branches/reuse-ra-session/subversion/libsvn_fs_fs/stats.c
    subversion/branches/reuse-ra-session/subversion/libsvn_fs_fs/transaction.c
    subversion/branches/reuse-ra-session/subversion/libsvn_fs_fs/tree.c
    subversion/branches/reuse-ra-session/subversion/libsvn_fs_fs/verify.c
    subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/   (props changed)
    subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/cached_data.c
    subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/changes.c
    subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/dag.h
    subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/fs.h
    subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/fs_id.c
    subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/fs_x.c
    subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/hotcopy.c
    subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/hotcopy.h
    subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/index.c
    subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/index.h
    subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/lock.c
    subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/lock.h
    subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/low_level.c
    subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/low_level.h
    subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/noderevs.c
    subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/pack.c
    subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/reps.c
    subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/rev_file.c
    subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/revprops.c
    subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/revprops.h
    subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/string_table.c
    subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/string_table.h
    subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/transaction.c
    subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/tree.c
    subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/util.c
    subversion/branches/reuse-ra-session/subversion/libsvn_fs_x/verify.c
    subversion/branches/reuse-ra-session/subversion/libsvn_ra/ra_loader.c
    subversion/branches/reuse-ra-session/subversion/libsvn_ra_local/ra_plugin.c
    subversion/branches/reuse-ra-session/subversion/libsvn_ra_serf/commit.c
    subversion/branches/reuse-ra-session/subversion/libsvn_ra_serf/merge.c
    subversion/branches/reuse-ra-session/subversion/libsvn_ra_serf/ra_serf.h
    subversion/branches/reuse-ra-session/subversion/libsvn_ra_serf/serf.c
    subversion/branches/reuse-ra-session/subversion/libsvn_ra_serf/update.c
    subversion/branches/reuse-ra-session/subversion/libsvn_ra_serf/util.c
    subversion/branches/reuse-ra-session/subversion/libsvn_ra_svn/client.c
    subversion/branches/reuse-ra-session/subversion/libsvn_ra_svn/marshal.c
    subversion/branches/reuse-ra-session/subversion/libsvn_repos/authz_pool.c
    subversion/branches/reuse-ra-session/subversion/libsvn_repos/commit.c
    subversion/branches/reuse-ra-session/subversion/libsvn_repos/config_pool.c
    subversion/branches/reuse-ra-session/subversion/libsvn_repos/dump.c
    subversion/branches/reuse-ra-session/subversion/libsvn_repos/fs-wrap.c
    subversion/branches/reuse-ra-session/subversion/libsvn_repos/load-fs-vtable.c
    subversion/branches/reuse-ra-session/subversion/libsvn_repos/log.c
    subversion/branches/reuse-ra-session/subversion/libsvn_repos/rev_hunt.c
    subversion/branches/reuse-ra-session/subversion/libsvn_subr/bit_array.c
    subversion/branches/reuse-ra-session/subversion/libsvn_subr/cache-membuffer.c
    subversion/branches/reuse-ra-session/subversion/libsvn_subr/cache.c
    subversion/branches/reuse-ra-session/subversion/libsvn_subr/config.c
    subversion/branches/reuse-ra-session/subversion/libsvn_subr/dirent_uri.c
    subversion/branches/reuse-ra-session/subversion/libsvn_subr/dso.c
    subversion/branches/reuse-ra-session/subversion/libsvn_subr/fnv1a.c
    subversion/branches/reuse-ra-session/subversion/libsvn_subr/gpg_agent.c
    subversion/branches/reuse-ra-session/subversion/libsvn_subr/hash.c
    subversion/branches/reuse-ra-session/subversion/libsvn_subr/io.c
    subversion/branches/reuse-ra-session/subversion/libsvn_subr/object_pool.c
    subversion/branches/reuse-ra-session/subversion/libsvn_subr/packed_data.c
    subversion/branches/reuse-ra-session/subversion/libsvn_subr/prefix_string.c
    subversion/branches/reuse-ra-session/subversion/libsvn_subr/sorts.c
    subversion/branches/reuse-ra-session/subversion/libsvn_subr/sqlite.c
    subversion/branches/reuse-ra-session/subversion/libsvn_subr/sqlite3wrapper.c
    subversion/branches/reuse-ra-session/subversion/libsvn_subr/subst.c
    subversion/branches/reuse-ra-session/subversion/libsvn_subr/sysinfo.c
    subversion/branches/reuse-ra-session/subversion/libsvn_subr/types.c
    subversion/branches/reuse-ra-session/subversion/libsvn_subr/utf.c
    subversion/branches/reuse-ra-session/subversion/libsvn_subr/utf8proc/utf8proc_data.c
    subversion/branches/reuse-ra-session/subversion/libsvn_subr/x509info.c
    subversion/branches/reuse-ra-session/subversion/libsvn_wc/adm_ops.c
    subversion/branches/reuse-ra-session/subversion/libsvn_wc/conflicts.c
    subversion/branches/reuse-ra-session/subversion/libsvn_wc/copy.c
    subversion/branches/reuse-ra-session/subversion/libsvn_wc/crop.c
    subversion/branches/reuse-ra-session/subversion/libsvn_wc/delete.c
    subversion/branches/reuse-ra-session/subversion/libsvn_wc/diff.h
    subversion/branches/reuse-ra-session/subversion/libsvn_wc/diff_editor.c
    subversion/branches/reuse-ra-session/subversion/libsvn_wc/entries.c
    subversion/branches/reuse-ra-session/subversion/libsvn_wc/externals.c
    subversion/branches/reuse-ra-session/subversion/libsvn_wc/info.c
    subversion/branches/reuse-ra-session/subversion/libsvn_wc/node.c
    subversion/branches/reuse-ra-session/subversion/libsvn_wc/props.c
    subversion/branches/reuse-ra-session/subversion/libsvn_wc/questions.c
    subversion/branches/reuse-ra-session/subversion/libsvn_wc/revision_status.c
    subversion/branches/reuse-ra-session/subversion/libsvn_wc/status.c
    subversion/branches/reuse-ra-session/subversion/libsvn_wc/translate.c
    subversion/branches/reuse-ra-session/subversion/libsvn_wc/update_editor.c
    subversion/branches/reuse-ra-session/subversion/libsvn_wc/upgrade.c
    subversion/branches/reuse-ra-session/subversion/libsvn_wc/wc-checks.sql
    subversion/branches/reuse-ra-session/subversion/libsvn_wc/wc-metadata.sql
    subversion/branches/reuse-ra-session/subversion/libsvn_wc/wc-queries.sql
    subversion/branches/reuse-ra-session/subversion/libsvn_wc/wc.h
    subversion/branches/reuse-ra-session/subversion/libsvn_wc/wc_db.c
    subversion/branches/reuse-ra-session/subversion/libsvn_wc/wc_db.h
    subversion/branches/reuse-ra-session/subversion/libsvn_wc/wc_db_private.h
    subversion/branches/reuse-ra-session/subversion/libsvn_wc/wc_db_update_move.c
    subversion/branches/reuse-ra-session/subversion/libsvn_wc/wc_db_util.c
    subversion/branches/reuse-ra-session/subversion/libsvn_wc/wc_db_wcroot.c
    subversion/branches/reuse-ra-session/subversion/libsvn_wc/workqueue.c
    subversion/branches/reuse-ra-session/subversion/mod_dav_svn/lock.c
    subversion/branches/reuse-ra-session/subversion/mod_dav_svn/mod_dav_svn.c
    subversion/branches/reuse-ra-session/subversion/mod_dav_svn/status.c
    subversion/branches/reuse-ra-session/subversion/svn/auth-cmd.c
    subversion/branches/reuse-ra-session/subversion/svn/blame-cmd.c
    subversion/branches/reuse-ra-session/subversion/svn/changelist-cmd.c
    subversion/branches/reuse-ra-session/subversion/svn/cl-conflicts.c
    subversion/branches/reuse-ra-session/subversion/svn/cl-conflicts.h
    subversion/branches/reuse-ra-session/subversion/svn/cl.h
    subversion/branches/reuse-ra-session/subversion/svn/commit-cmd.c
    subversion/branches/reuse-ra-session/subversion/svn/copy-cmd.c
    subversion/branches/reuse-ra-session/subversion/svn/diff-cmd.c
    subversion/branches/reuse-ra-session/subversion/svn/info-cmd.c
    subversion/branches/reuse-ra-session/subversion/svn/mergeinfo-cmd.c
    subversion/branches/reuse-ra-session/subversion/svn/notify.c
    subversion/branches/reuse-ra-session/subversion/svn/propget-cmd.c
    subversion/branches/reuse-ra-session/subversion/svn/status.c
    subversion/branches/reuse-ra-session/subversion/svn/svn.c
    subversion/branches/reuse-ra-session/subversion/svn/util.c
    subversion/branches/reuse-ra-session/subversion/svnadmin/svnadmin.c
    subversion/branches/reuse-ra-session/subversion/svndumpfilter/svndumpfilter.c
    subversion/branches/reuse-ra-session/subversion/svnrdump/dump_editor.c
    subversion/branches/reuse-ra-session/subversion/svnserve/logger.c
    subversion/branches/reuse-ra-session/subversion/svnserve/serve.c
    subversion/branches/reuse-ra-session/subversion/svnserve/server.h
    subversion/branches/reuse-ra-session/subversion/svnserve/svnserve.c
    subversion/branches/reuse-ra-session/subversion/tests/cmdline/README
    subversion/branches/reuse-ra-session/subversion/tests/cmdline/basic_tests.py
    subversion/branches/reuse-ra-session/subversion/tests/cmdline/blame_tests.py
    subversion/branches/reuse-ra-session/subversion/tests/cmdline/checkout_tests.py
    subversion/branches/reuse-ra-session/subversion/tests/cmdline/commit_tests.py
    subversion/branches/reuse-ra-session/subversion/tests/cmdline/copy_tests.py
    subversion/branches/reuse-ra-session/subversion/tests/cmdline/dav-mirror-autocheck.sh
    subversion/branches/reuse-ra-session/subversion/tests/cmdline/davautocheck.sh
    subversion/branches/reuse-ra-session/subversion/tests/cmdline/depth_tests.py
    subversion/branches/reuse-ra-session/subversion/tests/cmdline/export_tests.py
    subversion/branches/reuse-ra-session/subversion/tests/cmdline/externals_tests.py
    subversion/branches/reuse-ra-session/subversion/tests/cmdline/getopt_tests_data/svn--help_stdout
    subversion/branches/reuse-ra-session/subversion/tests/cmdline/getopt_tests_data/svn_help_stdout
    subversion/branches/reuse-ra-session/subversion/tests/cmdline/info_tests.py
    subversion/branches/reuse-ra-session/subversion/tests/cmdline/lock_tests.py
    subversion/branches/reuse-ra-session/subversion/tests/cmdline/log_tests.py
    subversion/branches/reuse-ra-session/subversion/tests/cmdline/merge_tests.py
    subversion/branches/reuse-ra-session/subversion/tests/cmdline/merge_tree_conflict_tests.py
    subversion/branches/reuse-ra-session/subversion/tests/cmdline/move_tests.py
    subversion/branches/reuse-ra-session/subversion/tests/cmdline/prop_tests.py
    subversion/branches/reuse-ra-session/subversion/tests/cmdline/redirect_tests.py
    subversion/branches/reuse-ra-session/subversion/tests/cmdline/special_tests.py
    subversion/branches/reuse-ra-session/subversion/tests/cmdline/stat_tests.py
    subversion/branches/reuse-ra-session/subversion/tests/cmdline/svnadmin_tests.py
    subversion/branches/reuse-ra-session/subversion/tests/cmdline/svntest/actions.py
    subversion/branches/reuse-ra-session/subversion/tests/cmdline/svntest/factory.py
    subversion/branches/reuse-ra-session/subversion/tests/cmdline/svntest/main.py
    subversion/branches/reuse-ra-session/subversion/tests/cmdline/svntest/sandbox.py
    subversion/branches/reuse-ra-session/subversion/tests/cmdline/svntest/wc.py
    subversion/branches/reuse-ra-session/subversion/tests/cmdline/switch_tests.py
    subversion/branches/reuse-ra-session/subversion/tests/cmdline/tree_conflict_tests.py
    subversion/branches/reuse-ra-session/subversion/tests/cmdline/update_tests.py
    subversion/branches/reuse-ra-session/subversion/tests/cmdline/upgrade_tests.py
    subversion/branches/reuse-ra-session/subversion/tests/libsvn_client/client-test.c
    subversion/branches/reuse-ra-session/subversion/tests/libsvn_client/mtcc-test.c
    subversion/branches/reuse-ra-session/subversion/tests/libsvn_fs/fs-test.c
    subversion/branches/reuse-ra-session/subversion/tests/libsvn_fs/locks-test.c
    subversion/branches/reuse-ra-session/subversion/tests/libsvn_fs_fs/fs-fs-fuzzy-test.c
    subversion/branches/reuse-ra-session/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c
    subversion/branches/reuse-ra-session/subversion/tests/libsvn_fs_x/   (props changed)
    subversion/branches/reuse-ra-session/subversion/tests/libsvn_fs_x/fs-x-pack-test.c
    subversion/branches/reuse-ra-session/subversion/tests/libsvn_fs_x/string-table-test.c
    subversion/branches/reuse-ra-session/subversion/tests/libsvn_ra/ra-test.c
    subversion/branches/reuse-ra-session/subversion/tests/libsvn_subr/cache-test.c
    subversion/branches/reuse-ra-session/subversion/tests/libsvn_subr/checksum-test.c
    subversion/branches/reuse-ra-session/subversion/tests/libsvn_subr/config-test.c
    subversion/branches/reuse-ra-session/subversion/tests/libsvn_subr/io-test.c
    subversion/branches/reuse-ra-session/subversion/tests/libsvn_subr/packed-data-test.c
    subversion/branches/reuse-ra-session/subversion/tests/libsvn_subr/priority-queue-test.c
    subversion/branches/reuse-ra-session/subversion/tests/libsvn_subr/sqlite-test.c
    subversion/branches/reuse-ra-session/subversion/tests/libsvn_subr/string-test.c
    subversion/branches/reuse-ra-session/subversion/tests/libsvn_subr/subst_translate-test.c
    subversion/branches/reuse-ra-session/subversion/tests/libsvn_subr/x509-test.c   (contents, props changed)
    subversion/branches/reuse-ra-session/subversion/tests/libsvn_wc/conflict-data-test.c
    subversion/branches/reuse-ra-session/subversion/tests/libsvn_wc/db-test.c
    subversion/branches/reuse-ra-session/subversion/tests/libsvn_wc/entries-compat.c
    subversion/branches/reuse-ra-session/subversion/tests/libsvn_wc/op-depth-test.c
    subversion/branches/reuse-ra-session/subversion/tests/libsvn_wc/utils.c
    subversion/branches/reuse-ra-session/subversion/tests/libsvn_wc/utils.h
    subversion/branches/reuse-ra-session/subversion/tests/libsvn_wc/wc-queries-test.c
    subversion/branches/reuse-ra-session/subversion/tests/libsvn_wc/wc-test-queries.sql
    subversion/branches/reuse-ra-session/subversion/tests/svn_test.h
    subversion/branches/reuse-ra-session/subversion/tests/svn_test_main.c
    subversion/branches/reuse-ra-session/tools/buildbot/slaves/i686-debian-sarge1/svnlog.sh
    subversion/branches/reuse-ra-session/tools/buildbot/slaves/svn-sparc-solaris/svncheck.sh
    subversion/branches/reuse-ra-session/tools/buildbot/slaves/svn-x64-centos/svnbuild.sh
    subversion/branches/reuse-ra-session/tools/buildbot/slaves/svn-x64-centos/svnlog.sh
    subversion/branches/reuse-ra-session/tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnlog.sh
    subversion/branches/reuse-ra-session/tools/buildbot/slaves/svn-x64-macosx-gnu-shared/svnlog.sh
    subversion/branches/reuse-ra-session/tools/buildbot/slaves/svn-x64-macosx/mkramdisk.sh
    subversion/branches/reuse-ra-session/tools/buildbot/slaves/svn-x64-macosx/rmramdisk.sh
    subversion/branches/reuse-ra-session/tools/buildbot/slaves/svn-x64-macosx/setenv.sh
    subversion/branches/reuse-ra-session/tools/buildbot/slaves/svn-x64-macosx/svnbuild.sh
    subversion/branches/reuse-ra-session/tools/buildbot/slaves/svn-x64-macosx/svnclean.sh
    subversion/branches/reuse-ra-session/tools/buildbot/slaves/ubuntu-x64/svnlog.sh
    subversion/branches/reuse-ra-session/tools/client-side/bash_completion
    subversion/branches/reuse-ra-session/tools/client-side/svn-ssl-fingerprints.sh
    subversion/branches/reuse-ra-session/tools/dev/benchmarks/RepoPerf/copy_repo.py
    subversion/branches/reuse-ra-session/tools/dev/benchmarks/RepoPerf/win_repo_bench.py
    subversion/branches/reuse-ra-session/tools/dev/benchmarks/large_dirs/create_bigdir.sh
    subversion/branches/reuse-ra-session/tools/dev/build-svn-deps-win.pl
    subversion/branches/reuse-ra-session/tools/dev/fsfs-access-map.c
    subversion/branches/reuse-ra-session/tools/dev/po-merge.py
    subversion/branches/reuse-ra-session/tools/dev/remove-trailing-whitespace.sh
    subversion/branches/reuse-ra-session/tools/dev/x509-parser.c
    subversion/branches/reuse-ra-session/tools/diff/diff.c
    subversion/branches/reuse-ra-session/tools/dist/backport.pl
    subversion/branches/reuse-ra-session/tools/dist/backport_tests.py   (contents, props changed)
    subversion/branches/reuse-ra-session/tools/dist/dist.sh
    subversion/branches/reuse-ra-session/tools/dist/nightly.sh
    subversion/branches/reuse-ra-session/tools/hook-scripts/control-chars.py   (props changed)
    subversion/branches/reuse-ra-session/tools/hook-scripts/mailer/mailer.py
    subversion/branches/reuse-ra-session/tools/hook-scripts/mailer/tests/mailer-init.sh
    subversion/branches/reuse-ra-session/tools/hook-scripts/validate-files.py   (props changed)
    subversion/branches/reuse-ra-session/tools/po/po-update.sh
    subversion/branches/reuse-ra-session/tools/server-side/svnpubsub/daemonize.py
    subversion/branches/reuse-ra-session/tools/server-side/svnpubsub/svnpubsub/util.py   (props changed)
    subversion/branches/reuse-ra-session/win-tests.py

Propchange: subversion/branches/reuse-ra-session/
------------------------------------------------------------------------------
--- svn:auto-props (original)
+++ svn:auto-props Wed Feb 25 08:15:39 2015
@@ -2,9 +2,12 @@
 *.cpp = svn:eol-style=native
 *.h = svn:eol-style=native
 *.hpp = svn:eol-style=native
+*.java = svn:eol-style=native
 *.py = svn:eol-style=native
 *.pl = svn:eol-style=native
 *.rb = svn:eol-style=native
+*.sql = svn:eol-style=native
 *.txt = svn:eol-style=native
 README = svn:eol-style=native
 BRANCH-README = svn:eol-style=native
+STATUS = svn:eol-style=native

Propchange: subversion/branches/reuse-ra-session/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 25 08:15:39 2015
@@ -60,6 +60,7 @@
 /subversion/branches/nfc-nfd-aware-client:870276,870376
 /subversion/branches/node_pool:1304828-1305388
 /subversion/branches/performance:979193,980118,981087,981090,981189,981194,981287,981684,981827,982043,982355,983398,983406,983430,983474,983488,983490,983760,983764,983766,983770,984927,984973,984984,985014,985037,985046,985472,985477,985482,985487-985488,985493,985497,985500,985514,985601,985603,985606,985669,985673,985695,985697,986453,986465,986485,986491-986492,986517,986521,986605,986608,986817,986832,987865,987868-987869,987872,987886-987888,987893,988319,988898,990330,990533,990535-990537,990541,990568,990572,990574-990575,990600,990759,992899,992904,992911,993127,993141,994956,995478,995507,995603,998012,998858,999098,1001413,1001417,1004291,1022668,1022670,1022676,1022715,1022719,1025660,1025672,1027193,1027203,1027206,1027214,1027227,1028077,1028092,1028094,1028104,1028107,1028111,1028354,1029038,1029042-1029043,1029054-1029055,1029062-1029063,1029078,1029080,1029090,1029092-1029093,1029111,1029151,1029158,1029229-1029230,1029232,1029335-1029336,1029339-1029340,1029342,10
 29344,1030763,1030827,1031203,1031235,1032285,1032333,1033040,1033057,1033294,1035869,1035882,1039511,1043705,1053735,1056015,1066452,1067683,1067697-1078365
+/subversion/branches/pin-externals:1643757-1659392
 /subversion/branches/py-tests-as-modules:956579-1033052
 /subversion/branches/ra_serf-digest-authn:875693-876404
 /subversion/branches/reintegrate-improvements:873853-874164
@@ -69,6 +70,7 @@
 /subversion/branches/revprop-packing:1143907,1143971,1143997,1144017,1144499,1144568,1146145
 /subversion/branches/subtree-mergeinfo:876734-878766
 /subversion/branches/svn-auth-x509:1603509-1655900
+/subversion/branches/svn-info-detail:1660035-1660413
 /subversion/branches/svn-mergeinfo-enhancements:870119-870195,870197-870288
 /subversion/branches/svn-patch-improvements:918519-934609
 /subversion/branches/svn_mutex:1141683-1182099
@@ -87,4 +89,4 @@
 /subversion/branches/verify-at-commit:1462039-1462408
 /subversion/branches/verify-keep-going:1439280-1546110
 /subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1501802-1658952
+/subversion/trunk:1501802-1662176

Propchange: subversion/branches/reuse-ra-session/
------------------------------------------------------------------------------
    webviewer:revision = http://svn.apache.org/r%REVISION%

Modified: subversion/branches/reuse-ra-session/.ycm_extra_conf.py
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/.ycm_extra_conf.py?rev=1662177&r1=1662176&r2=1662177&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/.ycm_extra_conf.py (original)
+++ subversion/branches/reuse-ra-session/.ycm_extra_conf.py Wed Feb 25 08:15:39 2015
@@ -31,7 +31,7 @@ import os
 import ycm_core
 from clang_helpers import PrepareClangFlags
 
-compilation_database_folder = os.path.dirname(os.path.realpath(__file__)) 
+compilation_database_folder = os.path.dirname(os.path.realpath(__file__))
 
 if compilation_database_folder:
   database = ycm_core.CompilationDatabase( compilation_database_folder )
@@ -79,10 +79,10 @@ def FlagsForFile( filename ):
         filename )
     do_cache = True
   else:
-    final_flags = [ ] 
-    do_cache = False 
+    final_flags = [ ]
+    do_cache = False
 
   return {
     'flags': final_flags,
-    'do_cache': do_cache 
+    'do_cache': do_cache
   }

Modified: subversion/branches/reuse-ra-session/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/CHANGES?rev=1662177&r1=1662176&r2=1662177&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/CHANGES (original)
+++ subversion/branches/reuse-ra-session/CHANGES Wed Feb 25 08:15:39 2015
@@ -11,7 +11,7 @@ http://svn.apache.org/repos/asf/subversi
     * membuffer: virtually perfect short-term cache efficiency (r1476664 et at)
     * membuffer: quadruple the maximum cacheable directory size (r1545948 et al)
     * resolve: improve interactive conflict resolution menus
-    * blame: allow -r M:N with M>N
+    * blame: support showing prospective as well as previous changes
     * svn auth: new subcommand to manage cached credentials and certs
     * svn youngest: new remote version of svnlook youngest (issue #4299)
     * new experimental filesystem fsx (faster, smaller)
@@ -138,6 +138,7 @@ http://svn.apache.org/repos/asf/subversi
     * alow the use of libmagic to be configured via subversion configuration
       file or SVN_CONFIG_OPTION_ENABLE_MAGIC_FILE env variable (r1572916)
     * store human readable info about SSL certs in auth store (r1573625)
+    * new '--pin-externals' option for svn copy (issue #1258)
 
   - Client-side bugfixes:
     * export: fix problem exporting symlinks on windows (r1476093)

Modified: subversion/branches/reuse-ra-session/INSTALL
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/INSTALL?rev=1662177&r1=1662176&r2=1662177&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/INSTALL (original)
+++ subversion/branches/reuse-ra-session/INSTALL Wed Feb 25 08:15:39 2015
@@ -15,7 +15,7 @@ Contents:
        D. Documentation
 
     II. INSTALLATION
-       A. Building from a Tarball or RPM
+       A. Building from a Tarball
        B. Building the Latest Source under Unix
        C. Building under Unix in Different Directories
        D. Installing from a Zip or Installer File under Windows
@@ -123,7 +123,8 @@ I.    INTRODUCTION
          create a repository, you have the option of specifying a
          storage back-end.  The Berkeley DB back-end will only be
          available if the BDB libraries are discovered at compile
-         time.
+         time.  The Berkeley DB back-end has been deprecated and
+         is not recommend.
 
       * libsasl (OPTIONAL for client and server)
 
@@ -192,7 +193,7 @@ I.    INTRODUCTION
       commands described in section II.B before installing the following.
 
 
-      1.  Apache Portable Runtime 0.9.7 or 1.X.X  (REQUIRED)
+      1.  Apache Portable Runtime 1.3 or newer  (REQUIRED)
 
       Whenever you want to build any part of Subversion, you need the
       Apache Portable Runtime (APR) and the APR Utility (APR-util)
@@ -200,8 +201,8 @@ I.    INTRODUCTION
 
 
         ****************************************************************
-        **       IMPORTANT ISSUE ABOUT APR VERSIONS:  READ THIS.      **
-        **                                                            **
+        **       IMPORTANT ISSUE ABOUT APR VERSIONS:  READ THIS       **
+        **       IF UPGRADING FROM MUCH OLDER SUBVERSION              **
         ****************************************************************
         |                                                              |
         | APR 0.9.X and 1.X are binary-incompatible.                   |
@@ -355,10 +356,6 @@ I.    INTRODUCTION
           Under Windows, you can specify the paths to these libraries by
           passing the options --with-zlib and --with-openssl to gen-make.py.
 
-            ### Is that right? In-tree build of Neon was disabled in r875974.
-                This may now apply to Serf, or else gen-make.py should be
-                updated to remove such options.
-
         c. Using OpenSSL on the Apache server
 
           You can also add support for these features to an Apache httpd
@@ -465,23 +462,7 @@ I.    INTRODUCTION
       script.
 
 
-      12. MASM 6 or newer (Windows only, OPTIONAL)
-
-      The Windows build scripts for Subversion can use the Microsoft
-      Macro Assembler (MASM) to build an optimized version of the ZLib
-      library. Make sure that the version of MASM you use is compatible
-      with the C compiler. If you're using MSVC 6, and don't have MASM 6,
-      a free MASM-compatible assembler is available here:
-
-          http://www.masm32.com/
-
-      You only need ML.EXE and ML.ERR from this distribution.
-
-      The VS.NET installation already contains MASM (but note, that
-      version if MASM is not compatible with MSVC 6).
-
-
-      13. SQLite  (REQUIRED)
+      12. SQLite  (REQUIRED)
 
       Subversion 1.8 requires SQLite version 3.7.12 or above.  You can meet
       this dependency several ways:
@@ -497,26 +478,26 @@ I.    INTRODUCTION
           http://www.sqlite.org/download.html
 
 
-      14. pkg-config  (Unix only, OPTIONAL)
+      13. pkg-config  (Unix only, OPTIONAL)
 
       Subversion uses pkg-config to find appropriate options used
       at build time.
 
 
-      15. D-Bus  (Unix only, OPTIONAL)
+      14. D-Bus  (Unix only, OPTIONAL)
 
       D-Bus is a message bus system. D-Bus is required for support for KWallet
       and GNOME Keyring. pkg-config is needed to find D-Bus headers and library.
 
 
-      16. Qt 4  (Unix only, OPTIONAL)
+      15. Qt 4  (Unix only, OPTIONAL)
 
       Qt is a cross-platform application framework. QtCore, QtDBus and QtGui
       modules are required for support for KWallet. pkg-config is needed
       to find Qt headers and libraries.
 
 
-      17. KDELibs 4  (Unix only, OPTIONAL)
+      16. KDELibs 4  (Unix only, OPTIONAL)
 
       Subversion contains optional support for storing passwords in KWallet.
       KDELibs contains core KDE libraries. Subversion uses libkdecore and libkdeui
@@ -528,13 +509,13 @@ I.    INTRODUCTION
 
           --with-kwallet=/path/to/KDE/prefix
 
-      18. GLib 2  (Unix only, OPTIONAL)
+      17. GLib 2  (Unix only, OPTIONAL)
 
       GLib is a general-purpose utility library. GLib is required for support
       for GNOME Keyring. pkg-config is needed to find GLib headers and library.
 
 
-      19. GNOME Keyring  (Unix only, OPTIONAL)
+      18. GNOME Keyring  (Unix only, OPTIONAL)
 
       Subversion contains optional support for storing passwords in GNOME Keyring.
       pkg-config is needed to find GNOME Keyring headers and library. D-Bus and
@@ -542,7 +523,7 @@ I.    INTRODUCTION
       then pass the '--with-gnome-keyring' option to `configure`.
 
 
-      20. Ctypesgen  (OPTIONAL)
+      19. Ctypesgen  (OPTIONAL)
 
       Ctypesgen is Python wrapper generator for ctypes. It is used to generate
       a part of Subversion Ctypes Python bindings (CSVN). If you want to build
@@ -553,7 +534,7 @@ I.    INTRODUCTION
 
       For more information on CSVN, see subversion/bindings/ctypes-python/README.
 
-      21. libmagic (OPTIONAL)
+      20. libmagic (OPTIONAL)
 
       Subversion's configure script attempts to find libmagic automatically.
       If it is installed in a non-standard location, then use:
@@ -574,7 +555,7 @@ I.    INTRODUCTION
 
         --with-libmagic
 
-      22. Googlemock (OPTIONAL)
+      21. Googlemock (OPTIONAL)
 
       Googlemock can be installed and built in-tree by invoking
 
@@ -594,7 +575,7 @@ I.    INTRODUCTION
 II.   INSTALLATION
       ============
 
-  A.  Building from a Tarball or RPM
+  A.  Building from a Tarball
       ------------------------------
 
       1.  Building from a Tarball
@@ -612,33 +593,6 @@ II.   INSTALLATION
       You can also run the full test suite by running 'make check'.
 
 
-      2.  Building from an RPM
-
-      If you are using Linux (or any OS that can use RPM) then another
-      possibility is to download the binary RPM from the
-      http://summersoft.fay.ar.us/pub/subversion directory.
-
-      Currently only Linux on the i386 platform is supported
-      using this method.  You might also require additional RPMS
-      (which can be found in the above mentioned directory) to use the
-      subversion RPM depending on what packages you already have installed:
-
-          subversion*.i386.rpm
-          apache*.i386.rpm (Version 2.0.49 or greater)
-          db*.i386.rpm     (Version 4.0.14 or greater; version 4.3.27 or
-                            4.2.52 is preferred however)
-          expat            (Comes with RedHat)
-
-      After downloading, install it (as root user):
-
-          # rpm -ivh subversion*.386.rpm (add other packages as necessary)
-
-      Note: For an easy way to generate a new version of the RPM
-      source and binary package from the latest source code you
-      just checked out, see the packages/rpm/README file for a
-      one-line build procedure.
-
-
   B.  Building the Latest Source under Unix
       -------------------------------------
 
@@ -658,7 +612,6 @@ II.   INSTALLATION
 
           # rm -f /usr/local/lib/libsvn*
           # rm -f /usr/local/lib/libapr*
-          # rm -f /usr/local/lib/libexpat*
           # rm -f /usr/local/lib/libserf*
 
       Start the process by running "autogen.sh":
@@ -813,7 +766,7 @@ II.   INSTALLATION
         program, not an installer - just rename it to awk.exe and it is
         ready to use.
       * Apache apr, apr-util, and optionally apr-iconv libraries, version
-        0.9.12 or later. Included in both the Subversion dependencies ZIP file
+        1.3 or later. Included in both the Subversion dependencies ZIP file
         and the Apache 2 source zip.  If you are building from a Subversion
         checkout and have not downloaded Apache 2, then get these 3 libraries
         from http://www.apache.org/dist/apr/.
@@ -830,11 +783,7 @@ II.   INSTALLATION
       * [Optional] Apache 2 source, downloaded from
         http://httpd.apache.org/download.cgi, these instructions assume
         version 2.0.58.  This is only needed for building the Subversion
-        server Apache modules.  Note that although Subversion will compile
-        against Apache 2.2.3 and APR 1.2.7, there is a bug that causes
-        runtime failures with Subversion on Windows.  The fix is included in
-        APR 1.2.8 and will be bundled in the next HTTP Server release
-        (likely to be 2.2.4).
+        server Apache modules.  ### FIXME Apache 2.2 or greater required.
       * [Optional] Apache 2 msi install file, also from
         http://httpd.apache.org/download.cgi (required for running the
         tests).  Only needed for testing the server dso modules and if
@@ -1164,12 +1113,6 @@ III.  BUILDING A SUBVERSION SERVER
   A.  Setting Up Apache
       -----------------
 
-      (Following the BOOTSTRAPPING FROM RPM procedures above will install and
-      build the latest Subversion server for Linux RedHat 7.1, 7.2, and PPC
-      Linux systems *IF* the apache-devel-2.0.41 or greater package is already
-      installed when the SUBVERSION RPM is built.)
-
-
       1.  Obtaining and Installing Apache 2
 
       Subversion tries to compile against the latest released version

Modified: subversion/branches/reuse-ra-session/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/Makefile.in?rev=1662177&r1=1662176&r2=1662177&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/Makefile.in (original)
+++ subversion/branches/reuse-ra-session/Makefile.in Wed Feb 25 08:15:39 2015
@@ -981,4 +981,5 @@ INSTALL_EXTRA_TOOLS=\
   ln -sf svnmucc$(EXEEXT) $(DESTDIR)$(bindir)/svnsyitf$(EXEEXT); \
   if test "$(DESTDIR)$(bindir)" != "$(DESTDIR)$(toolsdir)"; then \
     ln -sf $(bindir)/svnmucc$(EXEEXT) $(DESTDIR)$(toolsdir)/svnmucc$(EXEEXT); \
+    ln -sf $(bindir)/svnbench$(EXEEXT) $(DESTDIR)$(toolsdir)/svn-bench$(EXEEXT); \
   fi

Modified: subversion/branches/reuse-ra-session/autogen.sh
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/autogen.sh?rev=1662177&r1=1662176&r2=1662177&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/autogen.sh (original)
+++ subversion/branches/reuse-ra-session/autogen.sh Wed Feb 25 08:15:39 2015
@@ -205,7 +205,7 @@ fi
 echo "Creating svn_private_config.h.in..."
 ${AUTOHEADER:-autoheader}
 
-# If there's a config.cache file, we may need to delete it.  
+# If there's a config.cache file, we may need to delete it.
 # If we have an existing configure script, save a copy for comparison.
 if [ -f config.cache ] && [ -f configure ]; then
   cp configure configure.$$.tmp

Modified: subversion/branches/reuse-ra-session/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/build.conf?rev=1662177&r1=1662176&r2=1662177&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/build.conf (original)
+++ subversion/branches/reuse-ra-session/build.conf Wed Feb 25 08:15:39 2015
@@ -1354,6 +1354,15 @@ libs = libsvn_wc libsvn_subr apriconv ap
 msvc-force-static = yes
 testing = skip
 
+[svn-wc-db-tester]
+type = exe
+path = tools/dev/wc-ng
+sources = svn-wc-db-tester.c
+install = test
+libs = libsvn_wc libsvn_subr apr
+msvc-force-static = yes
+testing = skip
+
 # ----------------------------------------------------------------------------
 #
 # EXTERNAL TARGETS (NO BUILD NEEDED)
@@ -1476,7 +1485,7 @@ libs = svn svnadmin svndumpfilter svnloo
        svnversion
        mod_authz_svn mod_dav_svn mod_dontdothat
        svnauthz svnauthz-validate svnraisetreeconflict
-       svnfsfs svn-bench
+       svnfsfs svnbench
 
 [__ALL_TESTS__]
 type = project
@@ -1513,7 +1522,7 @@ type = project
 path = build/win32
 libs = __ALL_TESTS__
        diff diff3 diff4 fsfs-access-map svnauth 
-       svn-populate-node-origins-index
+       svn-populate-node-origins-index x509-parser svn-wc-db-tester
 
 [__LIBS__]
 type = project
@@ -1584,9 +1593,9 @@ sources = diff4.c
 install = tools
 libs = libsvn_diff libsvn_subr apriconv apr
 
-[svn-bench]
+[svnbench]
 type = exe
-path = subversion/svn-bench
+path = subversion/svnbench
 install = tools
 libs = libsvn_client libsvn_wc libsvn_ra libsvn_subr libsvn_delta
        apriconv apr
@@ -1628,6 +1637,7 @@ libs = libsvn_wc libsvn_subr apriconv ap
 install = tools
 
 [x509-parser]
+description = Tool to verify x509 certificates
 type = exe
 path = tools/dev
 sources = x509-parser.c

Modified: subversion/branches/reuse-ra-session/build/generator/gen_base.py
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/build/generator/gen_base.py?rev=1662177&r1=1662176&r2=1662177&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/build/generator/gen_base.py (original)
+++ subversion/branches/reuse-ra-session/build/generator/gen_base.py Wed Feb 25 08:15:39 2015
@@ -240,12 +240,16 @@ class GeneratorBase:
         os.rename(new_hdrfile, hdrfile)
 
   def write_file_if_changed(self, fname, new_contents):
-    """Rewrite the file if new_contents are different than its current content.
+    """Rewrite the file if NEW_CONTENTS are different than its current content.
 
     If you have your windows projects open and generate the projects
     it's not a small thing for windows to re-read all projects so
     only update those that have changed.
+
+    Under Python >=3, NEW_CONTENTS must be a 'str', not a 'bytes'.
     """
+    if sys.version_info[0] >= 3:
+      new_contents = new_contents.encode()
 
     try:
       old_contents = open(fname, 'rb').read()

Modified: subversion/branches/reuse-ra-session/build/generator/gen_msvc_dsp.py
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/build/generator/gen_msvc_dsp.py?rev=1662177&r1=1662176&r2=1662177&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/build/generator/gen_msvc_dsp.py (original)
+++ subversion/branches/reuse-ra-session/build/generator/gen_msvc_dsp.py Wed Feb 25 08:15:39 2015
@@ -148,9 +148,9 @@ class Generator(gen_win.WinGeneratorBase
       depends = [ ]
       if not isinstance(target, gen_base.TargetI18N):
         depends = self.adjust_win_depends(target, name)
-	#print name
-	#for dep in depends:
-	#  print "	",dep.name
+        #print name
+        #for dep in depends:
+        #  print "	",dep.name
 
       dep_names = [ ]
       for dep in depends:

Modified: subversion/branches/reuse-ra-session/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/build/generator/gen_win.py?rev=1662177&r1=1662176&r2=1662177&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/build/generator/gen_win.py (original)
+++ subversion/branches/reuse-ra-session/build/generator/gen_win.py Wed Feb 25 08:15:39 2015
@@ -70,7 +70,7 @@ class WinGeneratorBase(gen_win_dependenc
 
     # On Windows we create svn_private_config.h in the output directory since
     # r1370526.
-    # 
+    #
     # Without this replacement all projects include a not-existing file,
     # which makes the MSBuild calculation to see whether a project is changed
     # far more expensive than necessary.
@@ -86,7 +86,7 @@ class WinGeneratorBase(gen_win_dependenc
     printed = []
     for lib in sorted(self._libraries.values(), key = lambda s: s.name):
       if lib.name in printed:
-        continue 
+        continue
       printed.append(lib.name)
       print('Found %s %s' % (lib.name, lib.version))
 
@@ -761,7 +761,7 @@ class WinGeneratorBase(gen_win_dependenc
     "Return the list of include directories for target"
 
     fakeincludes = [ "subversion/include" ]
-                     
+
     for dep in self.get_win_depends(target, FILTER_EXTERNALLIBS):
       if dep.external_lib:
         for elib in re.findall('\$\(SVN_([^\)]*)_LIBS\)', dep.external_lib):

Modified: subversion/branches/reuse-ra-session/build/generator/gen_win_dependencies.py
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/build/generator/gen_win_dependencies.py?rev=1662177&r1=1662176&r2=1662177&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/build/generator/gen_win_dependencies.py (original)
+++ subversion/branches/reuse-ra-session/build/generator/gen_win_dependencies.py Wed Feb 25 08:15:39 2015
@@ -19,7 +19,7 @@
 #
 #
 #
-# gen_win_dependencies.py 
+# gen_win_dependencies.py
 #
 #   base class for generating windows projects, containing the
 #   dependency locator code shared between the test runner and
@@ -73,22 +73,22 @@ class SVNCommonLibrary:
       self.debug_lib_dir = debug_lib_dir
     else:
       self.debug_lib_dir = lib_dir
-      
+
     if debug_lib_name:
       self.debug_lib_name = debug_lib_name
     else:
       self.debug_lib_name = lib_name
-      
+
     if debug_dll_dir:
       self.debug_dll_dir = debug_dll_dir
     else:
       self.debug_dll_dir = dll_dir
-      
+
     if debug_dll_name:
       self.debug_dll_name = debug_dll_name
     else:
       self.debug_dll_name = dll_name
-      
+
     self.extra_bin = extra_bin
 
 class GenDependenciesBase(gen_base.GeneratorBase):
@@ -278,7 +278,7 @@ class GenDependenciesBase(gen_base.Gener
 
     if find_libs:
       self.find_libraries(False)
-      
+
   def find_libraries(self, show_warnings):
     "find required and optional libraries"
 
@@ -312,7 +312,7 @@ class GenDependenciesBase(gen_base.Gener
     if not self.apr_path:
       sys.stderr.write("ERROR: Use '--with-apr' option to configure APR " + \
                        "location.\n")
-      sys.exit(1)                       
+      sys.exit(1)
 
     inc_base = os.path.join(self.apr_path, 'include')
 
@@ -391,18 +391,18 @@ class GenDependenciesBase(gen_base.Gener
 
     extra_bin = []
 
-    if dll_dir:        
+    if dll_dir:
       bin_files = os.listdir(dll_dir)
       if debug_dll_dir and os.path.isdir(debug_dll_dir):
         debug_bin_files = os.listdir(debug_dll_dir)
       else:
-        debug_bin_files = bin_files 
-      
+        debug_bin_files = bin_files
+
       for bin in bin_files:
         if bin in debug_bin_files:
           if re.match('^(lib)?apr[-_].*' + suffix + '(d)?.dll$', bin):
             extra_bin.append(bin)
-      
+
     self._libraries['apr'] = SVNCommonLibrary('apr', inc_path, lib_dir, lib_name,
                                               apr_version,
                                               debug_lib_dir=debug_lib_dir,
@@ -442,7 +442,7 @@ class GenDependenciesBase(gen_base.Gener
 
     version = (major, minor, patch)
     self.aprutil_version = aprutil_version = '%d.%d.%d' % version
-    
+
     if version < minimal_aprutil_version:
       sys.stderr.write("ERROR: apr-util %s or higher is required "
                        "(%s found)\n" % (
@@ -462,7 +462,7 @@ class GenDependenciesBase(gen_base.Gener
       debug_dll_dir = None
       dll_name = None
       defines.extend(["APU_DECLARE_STATIC"])
-      
+
       if not os.path.isdir(lib_dir) and \
          os.path.isfile(os.path.join(self.apr_util_path, 'lib', lib_name)):
         # Installed APR-Util instead of APR-Util-Source
@@ -473,7 +473,7 @@ class GenDependenciesBase(gen_base.Gener
     else:
       lib_name = 'libaprutil%s.lib' % suffix
       lib_dir = os.path.join(self.apr_util_path, 'Release')
-      
+
       if not os.path.isdir(lib_dir) and \
          os.path.isfile(os.path.join(self.apr_util_path, 'lib', lib_name)):
         # Installed APR-Util instead of APR-Util-Source
@@ -481,7 +481,7 @@ class GenDependenciesBase(gen_base.Gener
         debug_lib_dir = lib_dir
       else:
         debug_lib_dir = os.path.join(self.apr_util_path, 'Debug')
-        
+
       dll_name = 'libaprutil%s.dll' % suffix
       if os.path.isfile(os.path.join(lib_dir, dll_name)):
         dll_dir = lib_dir
@@ -491,13 +491,13 @@ class GenDependenciesBase(gen_base.Gener
         debug_dll_dir = None
 
     extra_bin = []
-    
+
     if dll_dir:
       bin_files = os.listdir(dll_dir)
       if debug_dll_dir and os.path.isdir(debug_dll_dir):
         debug_bin_files = os.listdir(debug_dll_dir)
       else:
-        debug_bin_files = bin_files 
+        debug_bin_files = bin_files
 
       for bin in bin_files:
         if bin in debug_bin_files:
@@ -688,7 +688,7 @@ class GenDependenciesBase(gen_base.Gener
         # CMake default: zlibstatic.lib (static) and zlib.lib (dll)
         lib_name = 'zlibstatic.lib'
       else:
-        # Standard makefile produces zlib.lib (static) and zdll.lib (dll)      
+        # Standard makefile produces zlib.lib (static) and zdll.lib (dll)
         lib_name = 'zlib.lib'
       debug_lib_name = None
     else:
@@ -711,7 +711,7 @@ class GenDependenciesBase(gen_base.Gener
 
     version = tuple(map(int, vermatch.groups()))
     self.zlib_version = '%d.%d.%d' % version
-    
+
     if version < minimal_zlib_version:
       sys.stderr.write("ERROR: ZLib %s or higher is required "
                        "(%s found)\n" % (
@@ -804,10 +804,10 @@ class GenDependenciesBase(gen_base.Gener
 
   def _find_openssl(self, show_warnings):
     "Find openssl"
-    
+
     if not self.openssl_path:
       return
-      
+
     version_path = os.path.join(self.openssl_path, 'inc32/openssl/opensslv.h')
     if os.path.isfile(version_path):
       # We have an OpenSSL Source location
@@ -840,12 +840,12 @@ class GenDependenciesBase(gen_base.Gener
     vermatch = re.search(
       r'#\s*define\s+OPENSSL_VERSION_TEXT\s+"OpenSSL\s+((\d+)\.(\d+).(\d+)([^ -]*))',
       txt)
-  
-    version = (int(vermatch.group(2)), 
+
+    version = (int(vermatch.group(2)),
                int(vermatch.group(3)),
                int(vermatch.group(4)))
     openssl_version = vermatch.group(1)
-  
+
     self._libraries['openssl'] = SVNCommonLibrary('openssl', inc_dir, lib_dir,
                                                   'ssleay32.lib',
                                                   openssl_version,
@@ -1378,7 +1378,7 @@ class GenDependenciesBase(gen_base.Gener
       # Amalgamation
       inc_dir = sqlite_base
       lib_dir = None
-      lib_name = None 
+      lib_name = None
       defines.append('SVN_SQLITE_INLINE')
     else:
       sys.stderr.write("ERROR: SQLite not found\n")

Modified: subversion/branches/reuse-ra-session/build/getversion.py
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/build/getversion.py?rev=1662177&r1=1662176&r2=1662177&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/build/getversion.py (original)
+++ subversion/branches/reuse-ra-session/build/getversion.py Wed Feb 25 08:15:39 2015
@@ -26,6 +26,7 @@
 import os
 import re
 import sys
+import traceback
 
 __all__ = ['Parser', 'Result']
 
@@ -64,8 +65,10 @@ def svn_extractor(parser, include_file):
 
   try:
     r = p.parse(include_file)
-  except IOError, e:
-    usage_and_exit(str(e))
+  except IOError:
+    typ, val, tb = sys.exc_info()
+    msg = ''.join(traceback.format_exception_only(typ, val))
+    usage_and_exit(msg)
   sys.stdout.write("%d.%d.%d" % (r.major, r.minor, r.patch))
 
 
@@ -75,8 +78,10 @@ def sqlite_extractor(parser, include_fil
 
   try:
     r = p.parse(include_file)
-  except IOError, e:
-    usage_and_exit(str(e))
+  except IOError:
+    typ, val, tb = sys.exc_info()
+    msg = ''.join(traceback.format_exception_only(typ, val))
+    usage_and_exit(msg)
   major = r.version / 1000000
   minor = (r.version - (major * 1000000)) / 1000
   micro = (r.version - (major * 1000000) - (minor * 1000))

Modified: subversion/branches/reuse-ra-session/build/run_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/build/run_tests.py?rev=1662177&r1=1662176&r2=1662177&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/build/run_tests.py (original)
+++ subversion/branches/reuse-ra-session/build/run_tests.py Wed Feb 25 08:15:39 2015
@@ -45,7 +45,7 @@ separated list of test numbers; the defa
 '''
 
 # A few useful constants
-SVN_VER_MINOR = 9
+SVN_VER_MINOR = 10
 
 import os, re, subprocess, sys, imp, threading, traceback, exceptions
 from datetime import datetime

Modified: subversion/branches/reuse-ra-session/build/transform_sql.py
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/build/transform_sql.py?rev=1662177&r1=1662176&r2=1662177&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/build/transform_sql.py (original)
+++ subversion/branches/reuse-ra-session/build/transform_sql.py Wed Feb 25 08:15:39 2015
@@ -140,7 +140,7 @@ class Processor(object):
 
       # '/'+1 == '0'
       line = re.sub(
-            r'IS_STRICT_DESCENDANT_OF[(]([A-Za-z_.]+), ([?][0-9]+)[)]',
+            r'IS_STRICT_DESCENDANT_OF[(]([?]?[A-Za-z0-9_.]+), ([?]?[A-Za-z0-9_.]+)[)]',
             r"(((\1) > (CASE (\2) WHEN '' THEN '' ELSE (\2) || '/' END))" +
             r" AND ((\1) < CASE (\2) WHEN '' THEN X'FFFF' ELSE (\2) || '0' END))",
             line)
@@ -194,14 +194,14 @@ class Processor(object):
             line)
 
       # Another preprocessing.
-      for symbol, string in self.token_map.iteritems():
+      for symbol, string in self.token_map.items():
         # ### This doesn't sql-escape 'string'
         line = re.sub(r'\b%s\b' % re.escape(symbol), "'%s'" % string, line)
 
       if line.strip():
         handled = False
 
-        for regex, handler in self._directives.iteritems():
+        for regex, handler in self._directives.items():
           match = regex.match(line)
           if match:
             handler(match)

Modified: subversion/branches/reuse-ra-session/contrib/client-side/svncopy/svncopy.pl.in
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/contrib/client-side/svncopy/svncopy.pl.in?rev=1662177&r1=1662176&r2=1662177&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/contrib/client-side/svncopy/svncopy.pl.in (original)
+++ subversion/branches/reuse-ra-session/contrib/client-side/svncopy/svncopy.pl.in Wed Feb 25 08:15:39 2015
@@ -970,6 +970,12 @@ B<svncopy> - extended form of B<svn copy
 
 B<svncopy.pl> [option ...] source [source ...] destination
 
+--------------------------------------------------------------------------
+NOTE: This script is deprecated. Please use 'svn copy --pin-externals' for
+pinning externals, and use the relative external URL syntax instead of the
+'--update-externals' functionality of this script.
+--------------------------------------------------------------------------
+
 This script copies one Subversion location or set of locations to another,
 in the same way as B<svn copy>.  Using the script allows more advanced operations,
 in particular allowing svn:externals to be dealt with properly for branching

Modified: subversion/branches/reuse-ra-session/gen-make.py
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/gen-make.py?rev=1662177&r1=1662176&r2=1662177&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/gen-make.py (original)
+++ subversion/branches/reuse-ra-session/gen-make.py Wed Feb 25 08:15:39 2015
@@ -25,7 +25,9 @@
 
 
 import os
+import traceback
 import sys
+
 import getopt
 try:
   my_getopt = getopt.gnu_getopt
@@ -266,8 +268,10 @@ if __name__ == '__main__':
                             ])
     if len(args) > 1:
       _usage_exit("Too many arguments")
-  except getopt.GetoptError, e:
-    _usage_exit(str(e))
+  except getopt.GetoptError:
+    typ, val, tb = sys.exc_info()
+    msg = ''.join(traceback.format_exception_only(typ, val))
+    _usage_exit(msg)
 
   conf = 'build.conf'
   skip = 0

Modified: subversion/branches/reuse-ra-session/subversion/bindings/javahl/native/EditorProxy.h
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/bindings/javahl/native/EditorProxy.h?rev=1662177&r1=1662176&r2=1662177&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/bindings/javahl/native/EditorProxy.h (original)
+++ subversion/branches/reuse-ra-session/subversion/bindings/javahl/native/EditorProxy.h Wed Feb 25 08:15:39 2015
@@ -142,7 +142,7 @@ private:
   const char* m_repos_root_url; ///< The root of the repository
   const char* m_base_relpath;   ///< The root of the session within the repo
   bool m_found_paths;           ///< Returned paths are absolute
-  
+
   svn_editor_t* m_editor;
   const svn_delta_editor_t* m_delta_editor;
   void* m_delta_baton;

Modified: subversion/branches/reuse-ra-session/subversion/bindings/javahl/native/SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/bindings/javahl/native/SVNClient.cpp?rev=1662177&r1=1662176&r2=1662177&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/bindings/javahl/native/SVNClient.cpp (original)
+++ subversion/branches/reuse-ra-session/subversion/bindings/javahl/native/SVNClient.cpp Wed Feb 25 08:15:39 2015
@@ -70,11 +70,19 @@
 #include "svn_diff.h"
 #include "svn_config.h"
 #include "svn_io.h"
+#include "svn_hash.h"
 #include "svn_dirent_uri.h"
 #include "svn_path.h"
 #include "svn_utf.h"
+#include "private/svn_subr_private.h"
 #include "svn_private_config.h"
 
+#include "ExternalItem.hpp"
+#include "jniwrapper/jni_list.hpp"
+#include "jniwrapper/jni_stack.hpp"
+#include "jniwrapper/jni_string_map.hpp"
+
+
 SVNClient::SVNClient(jobject jthis_in)
     : m_lastPath("", pool), context(jthis_in, pool)
 {
@@ -443,9 +451,76 @@ void SVNClient::commit(Targets &targets,
                 );
 }
 
+
+namespace {
+typedef Java::ImmutableList<JavaHL::ExternalItem> PinList;
+typedef Java::ImmutableMap<PinList> PinMap;
+
+struct PinListFunctor
+{
+  explicit PinListFunctor(const Java::Env& env, SVN::Pool& pool, int refs_len)
+    : m_pool(pool),
+      m_refs(apr_array_make(pool.getPool(), refs_len,
+                            sizeof(svn_wc_external_item2_t*)))
+      {}
+
+  void operator()(const JavaHL::ExternalItem& item)
+    {
+      APR_ARRAY_PUSH(m_refs, svn_wc_external_item2_t*) =
+        item.get_external_item(m_pool);
+    }
+
+  SVN::Pool& m_pool;
+  apr_array_header_t *m_refs;
+};
+
+struct PinMapFunctor
+{
+  explicit PinMapFunctor(const Java::Env& env, SVN::Pool& pool)
+    : m_env(env),
+      m_pool(pool),
+      m_pin_set(svn_hash__make(pool.getPool()))
+    {}
+
+  void operator()(const std::string& path, const PinList& refs)
+    {
+      PinListFunctor lf(m_env, m_pool, refs.length());
+      refs.for_each(lf);
+      const char* key = static_cast<const char*>(
+          apr_pmemdup(m_pool.getPool(), path.c_str(), path.size() + 1));
+      svn_hash_sets(m_pin_set, key, lf.m_refs);
+    }
+
+  const Java::Env& m_env;
+  SVN::Pool& m_pool;
+  apr_hash_t *m_pin_set;
+};
+
+apr_hash_t *get_externals_to_pin(jobject jexternalsToPin, SVN::Pool& pool)
+{
+  if (!jexternalsToPin)
+    return NULL;
+
+  const Java::Env env;
+  JNIEnv *jenv = env.get();
+
+  try
+    {
+      PinMap pin_map(env, jexternalsToPin);
+      PinMapFunctor mf(env, pool);
+      pin_map.for_each(mf);
+      return mf.m_pin_set;
+    }
+  SVN_JAVAHL_JNI_CATCH;
+  return NULL;
+}
+} // anonymous namespace
+
 void SVNClient::copy(CopySources &copySources, const char *destPath,
                      CommitMessage *message, bool copyAsChild,
                      bool makeParents, bool ignoreExternals,
+                     bool metadataOnly,
+                     bool pinExternals, jobject jexternalsToPin,
                      PropertyTable &revprops, CommitCallback *callback)
 {
     SVN::Pool subPool(pool);
@@ -460,10 +535,14 @@ void SVNClient::copy(CopySources &copySo
     if (ctx == NULL)
         return;
 
-    SVN_JNI_ERR(svn_client_copy6(srcs, destinationPath.c_str(),
-                                 copyAsChild, makeParents, ignoreExternals,
-                                 revprops.hash(subPool),
-                                 CommitCallback::callback, callback,
+    apr_hash_t *pin_set = get_externals_to_pin(jexternalsToPin, subPool);
+    if (!JNIUtil::isJavaExceptionThrown())
+      SVN_JNI_ERR(svn_client_copy7(srcs, destinationPath.c_str(),
+                                   copyAsChild, makeParents, ignoreExternals,
+                                   metadataOnly,
+                                   pinExternals, pin_set,
+                                   revprops.hash(subPool),
+                                   CommitCallback::callback, callback,
                                  ctx, subPool.getPool()), );
 }
 

Modified: subversion/branches/reuse-ra-session/subversion/bindings/javahl/native/SVNClient.h
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/bindings/javahl/native/SVNClient.h?rev=1662177&r1=1662176&r2=1662177&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/bindings/javahl/native/SVNClient.h (original)
+++ subversion/branches/reuse-ra-session/subversion/bindings/javahl/native/SVNClient.h Wed Feb 25 08:15:39 2015
@@ -149,8 +149,9 @@ class SVNClient :public SVNBase
             PropertyTable &revprops, CommitCallback *callback);
   void copy(CopySources &copySources, const char *destPath,
             CommitMessage *message, bool copyAsChild, bool makeParents,
-            bool ignoreExternals, PropertyTable &revprops,
-            CommitCallback *callback);
+            bool ignoreExternals, bool metaDataOnly, bool pinExternals,
+            jobject jexternalsToPin,
+            PropertyTable &revprops, CommitCallback *callback);
   void commit(Targets &targets, CommitMessage *message, svn_depth_t depth,
               bool noUnlock, bool keepChangelist,
               StringArray &changelists, PropertyTable &revprops,

Modified: subversion/branches/reuse-ra-session/subversion/bindings/javahl/native/StateReporter.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/bindings/javahl/native/StateReporter.cpp?rev=1662177&r1=1662176&r2=1662177&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/bindings/javahl/native/StateReporter.cpp (original)
+++ subversion/branches/reuse-ra-session/subversion/bindings/javahl/native/StateReporter.cpp Wed Feb 25 08:15:39 2015
@@ -83,7 +83,7 @@ StateReporter::setPath(jstring jpath, jl
   //DEBUG:fprintf(stderr, "  (n) StateReporter::setPath()\n");
 
   if (!m_valid) { throw_reporter_inactive(); return; }
-  
+
   JNIStringHolder lock_token(jlock_token);
   if (JNIUtil::isJavaExceptionThrown())
     return;

Modified: subversion/branches/reuse-ra-session/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp?rev=1662177&r1=1662176&r2=1662177&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp (original)
+++ subversion/branches/reuse-ra-session/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp Wed Feb 25 08:15:39 2015
@@ -559,6 +559,7 @@ JNIEXPORT void JNICALL
 Java_org_apache_subversion_javahl_SVNClient_copy
 (JNIEnv *env, jobject jthis, jobject jcopySources, jstring jdestPath,
  jboolean jcopyAsChild, jboolean jmakeParents, jboolean jignoreExternals,
+ jboolean jmetadataOnly, jboolean jpinExternals, jobject jexternalsToPin,
  jobject jrevpropTable, jobject jmessage, jobject jcallback)
 {
   JNIEntry(SVNClient, copy);
@@ -590,8 +591,10 @@ Java_org_apache_subversion_javahl_SVNCli
     return;
 
   CommitCallback callback(jcallback);
-  cl->copy(copySources, destPath, &message, jcopyAsChild ? true : false,
-           jmakeParents ? true : false, jignoreExternals ? true : false,
+  cl->copy(copySources, destPath, &message,
+           bool(jcopyAsChild), bool(jmakeParents),
+           bool(jignoreExternals), bool(jmetadataOnly),
+           bool(jpinExternals), jexternalsToPin,
            revprops, jcallback ? &callback : NULL);
 }
 

Modified: subversion/branches/reuse-ra-session/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp?rev=1662177&r1=1662176&r2=1662177&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp (original)
+++ subversion/branches/reuse-ra-session/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp Wed Feb 25 08:15:39 2015
@@ -178,7 +178,7 @@ Java_org_apache_subversion_javahl_util_C
                   ctx.m_config, &value,
                   ctx.m_section.c_str(), ctx.m_option.c_str(),
                   default_value.c_str()),
-              NULL);              
+              NULL);
   return JNIUtil::makeJString(value);
 }
 

Modified: subversion/branches/reuse-ra-session/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java?rev=1662177&r1=1662176&r2=1662177&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java (original)
+++ subversion/branches/reuse-ra-session/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java Wed Feb 25 08:15:39 2015
@@ -376,6 +376,21 @@ public interface ISVNClient
      * @param makeParents Whether to create intermediate parents
      * @param ignoreExternals Whether or not to process external definitions
      *                        as part of this operation.
+     * @param metadataOnly Copy just the metadata and not the working files/dirs
+     * @param pinExternals Whether or not to pin external definitions as part
+     *                     of this operation.
+     * @param externalsToPin The set of externals to pin.
+     *            Keys are either local absolute paths (when the source of the
+     *            copy is the working copy) or URLs within the repository
+     *            (when the source is the repository) where an
+     *            <code>svn:externals</code> property is defined.
+     *            Values are lists of parsed {@link ExternalItem}
+     *            objects from each external definitions.
+     *            If <code>pinExternals</code> is <code>true</code>, only
+     *            the externals in this set will be pinned; if this parameter
+     *            is <code>null</code>, all externals will be pinned.
+     *            If <code>pinExternals</code> is <code>false</code>,
+     *            this parameter will be ignored.
      * @param revpropTable A string-to-string mapping of revision properties
      *                     to values which will be set if this operation
      *                     results in a commit.
@@ -383,6 +398,24 @@ public interface ISVNClient
      *                  if <code>destPath</code> is not a URL
      * @throws ClientException If the copy operation fails.
      * @throws NullPointerException if the <code>sources</code> list is empty.
+     * @since 1.9
+     */
+    void copy(List<CopySource> sources, String destPath,
+              boolean copyAsChild, boolean makeParents,
+              boolean ignoreExternals, boolean metadataOnly,
+              boolean pinExternals,
+              Map<String, List<ExternalItem>> externalsToPin,
+              Map<String, String> revpropTable,
+              CommitMessageCallback handler, CommitCallback callback)
+            throws ClientException;
+
+    /**
+     * Copy versioned paths with the history preserved.
+     * <p>
+     * Behaves like the 1.9 version with
+     *     <code>pinExternals</code> set to <code>false</code> and
+     *     <code>externalsToPin</code> set to <code>null</code> and
+     *     <code>metadataOnly</code> set to <code>false</code>.
      */
     void copy(List<CopySource> sources, String destPath,
               boolean copyAsChild, boolean makeParents,

Modified: subversion/branches/reuse-ra-session/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNEditor.java
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNEditor.java?rev=1662177&r1=1662176&r2=1662177&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNEditor.java (original)
+++ subversion/branches/reuse-ra-session/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNEditor.java Wed Feb 25 08:15:39 2015
@@ -30,7 +30,10 @@ import java.io.InputStream;
 import java.util.Map;
 
 /**
- * Editor interface (implements the EV2 abstraction).
+ * Commit/update/status editor interface.
+ * <p>
+ * <b>This interface is EXPERIMENTAL.
+ * It may change or be removed in a future version of JavaHL</b>
  * @see <a href="http://svn.apache.org/repos/asf/subversion/trunk/subversion/include/private/svn_editor.h">svn_editor.h</a>
  *      for all restrictions on driving an editor.
  * @since 1.9



Mime
View raw message