subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1660173 [1/10] - in /subversion/branches/move-tracking-2: ./ build/ build/generator/ contrib/ contrib/client-side/svncopy/ notes/ subversion/ subversion/bindings/javahl/native/ subversion/bindings/javahl/src/org/apache/subversion/javahl/ s...
Date Mon, 16 Feb 2015 17:40:11 GMT
Author: julianfoad
Date: Mon Feb 16 17:40:07 2015
New Revision: 1660173

URL: http://svn.apache.org/r1660173
Log:
On the 'move-tracking-2' branch: catch up with trunk@1660163.

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

Propchange: subversion/branches/move-tracking-2/
------------------------------------------------------------------------------
--- svn:auto-props (original)
+++ svn:auto-props Mon Feb 16 17:40:07 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/move-tracking-2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 16 17:40:07 2015
@@ -59,6 +59,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
@@ -86,4 +87,4 @@
 /subversion/branches/verify-at-commit:1462039-1462408
 /subversion/branches/verify-keep-going:1439280-1546110
 /subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1606692-1658954
+/subversion/trunk:1606692-1660163

Propchange: subversion/branches/move-tracking-2/
------------------------------------------------------------------------------
    webviewer:revision = http://svn.apache.org/r%REVISION%

Modified: subversion/branches/move-tracking-2/.ycm_extra_conf.py
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/.ycm_extra_conf.py?rev=1660173&r1=1660172&r2=1660173&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/.ycm_extra_conf.py (original)
+++ subversion/branches/move-tracking-2/.ycm_extra_conf.py Mon Feb 16 17:40:07 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
   }

Propchange: subversion/branches/move-tracking-2/.ycm_extra_conf.py
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Feb 16 17:40:07 2015
@@ -0,0 +1,89 @@
+/subversion/branches/1.5.x-r30215/.ycm_extra_conf.py:870312
+/subversion/branches/1.7.x-fs-verify/.ycm_extra_conf.py:1146708,1161180
+/subversion/branches/10Gb/.ycm_extra_conf.py:1388102,1388163-1388190,1388195,1388202,1388205,1388211,1388276,1388362,1388375,1388394,1388636,1388639-1388640,1388643-1388644,1388654,1388720,1388789,1388795,1388801,1388805,1388807,1388810,1388816,1389044,1389276,1389289,1389662,1389867,1390017,1390209,1390216,1390407,1390409,1390414,1390419,1390955
+/subversion/branches/atomic-revprop/.ycm_extra_conf.py:965046-1000689
+/subversion/branches/authzperf/.ycm_extra_conf.py:1615360
+/subversion/branches/auto-props-sdc/.ycm_extra_conf.py:1384106-1401643
+/subversion/branches/bdb-reverse-deltas/.ycm_extra_conf.py:872050-872529
+/subversion/branches/cache-server/.ycm_extra_conf.py:1458643-1476567
+/subversion/branches/diff-callbacks3/.ycm_extra_conf.py:870059-870761
+/subversion/branches/diff-optimizations/.ycm_extra_conf.py:1031270-1037352
+/subversion/branches/diff-optimizations-bytes/.ycm_extra_conf.py:1037353-1067789
+/subversion/branches/dont-save-plaintext-passwords-by-default/.ycm_extra_conf.py:870728-871118
+/subversion/branches/double-delete/.ycm_extra_conf.py:870511-872970
+/subversion/branches/dump-load-cross-check/.ycm_extra_conf.py:1654853-1657295
+/subversion/branches/ev2-export/.ycm_extra_conf.py:1325914,1332738,1413107
+/subversion/branches/explore-wc/.ycm_extra_conf.py:875486,875493,875497,875507,875511,875514,875559,875580-875581,875584,875587,875611,875627,875647,875667-875668,875711-875712,875733-875734,875736,875744-875748,875751,875758,875782,875795-875796,875830,875836,875838,875842,875852,875855,875864,875870,875873,875880,875885-875888,875890,875897-875898,875905,875907-875909,875935,875943-875944,875946,875979,875982-875983,875985-875986,875990,875997
+/subversion/branches/file-externals/.ycm_extra_conf.py:871779-873302
+/subversion/branches/fs-rep-sharing/.ycm_extra_conf.py:869036-873803
+/subversion/branches/fsfs-format7/.ycm_extra_conf.py:1426304,1430673,1433848,1438408,1438982,1441129,1442051,1442068,1442504,1442910,1443171,1443803,1444690,1444693,1444695,1445040,1445080,1446103,1451129,1453590,1454307,1460579,1461851,1461865,1462837,1462904,1463120,1467362,1467382,1469487,1471208,1477166,1478055,1481447,1489817,1489949,1490673-1490674,1491784,1493042,1498029,1498103,1498155,1500054,1507729-1507731,1507735-1507736
+/subversion/branches/fsfs-improvements/.ycm_extra_conf.py:1499981-1547039
+/subversion/branches/fsfs-lock-many/.ycm_extra_conf.py:1571740-1577217
+/subversion/branches/fsfs-pack/.ycm_extra_conf.py:873717-874575
+/subversion/branches/fsx/.ycm_extra_conf.py:1507845-1509914
+/subversion/branches/fsx-id/.ycm_extra_conf.py:1645603-1649011
+/subversion/branches/gnome-keyring/.ycm_extra_conf.py:870558-871410
+/subversion/branches/gpg-agent-password-store/.ycm_extra_conf.py:1005036-1150766
+/subversion/branches/gtest_addition/.ycm_extra_conf.py:1452117-1502138
+/subversion/branches/http-protocol-v2/.ycm_extra_conf.py:874395-876041
+/subversion/branches/in-memory-cache/.ycm_extra_conf.py:869829-871452
+/subversion/branches/in-repo-authz/.ycm_extra_conf.py:1414342-1424779
+/subversion/branches/inheritable-props/.ycm_extra_conf.py:1297080-1395089
+/subversion/branches/integrate-cache-item-serialization/.ycm_extra_conf.py:1068724-1068739
+/subversion/branches/integrate-cache-membuffer/.ycm_extra_conf.py:998649-998852
+/subversion/branches/integrate-compression-level/.ycm_extra_conf.py:1068651-1072287
+/subversion/branches/integrate-io-improvements/.ycm_extra_conf.py:1068684-1072297
+/subversion/branches/integrate-is-cachable/.ycm_extra_conf.py:1072568-1074082
+/subversion/branches/integrate-partial-getter/.ycm_extra_conf.py:1072558-1076552
+/subversion/branches/integrate-readline-speedup/.ycm_extra_conf.py:1072553-1072555
+/subversion/branches/integrate-stream-api-extensions/.ycm_extra_conf.py:1068695-1072516
+/subversion/branches/integrate-string-improvements/.ycm_extra_conf.py:1068251-1190617
+/subversion/branches/integrate-txdelta-caching/.ycm_extra_conf.py:1072541-1078213
+/subversion/branches/issue-2779-dev/.ycm_extra_conf.py:965496-984198
+/subversion/branches/issue-2843-dev/.ycm_extra_conf.py:871432-874179
+/subversion/branches/issue-3000/.ycm_extra_conf.py:871713,871716-871719,871721-871726,871728,871734
+/subversion/branches/issue-3067-deleted-subtrees/.ycm_extra_conf.py:873375-874084
+/subversion/branches/issue-3148-dev/.ycm_extra_conf.py:875193-875204
+/subversion/branches/issue-3220-dev/.ycm_extra_conf.py:872210-872226
+/subversion/branches/issue-3242-dev/.ycm_extra_conf.py:879653-896436
+/subversion/branches/issue-3334-dirs/.ycm_extra_conf.py:875156-875867
+/subversion/branches/issue-3975/.ycm_extra_conf.py:1152931-1160746
+/subversion/branches/issue-4116-dev/.ycm_extra_conf.py:1424719-1425040
+/subversion/branches/issue-4194-dev/.ycm_extra_conf.py:1410507-1414880
+/subversion/branches/javahl-ra/.ycm_extra_conf.py:991978-1494640
+/subversion/branches/kwallet/.ycm_extra_conf.py:870785-871314
+/subversion/branches/log-addressing/.ycm_extra_conf.py:1509279-1546844
+/subversion/branches/log-g-performance/.ycm_extra_conf.py:870941-871032
+/subversion/branches/merge-skips-obstructions/.ycm_extra_conf.py:874525-874615
+/subversion/branches/multi-layer-moves/.ycm_extra_conf.py:1239019-1300930
+/subversion/branches/nfc-nfd-aware-client/.ycm_extra_conf.py:870276,870376
+/subversion/branches/node_pool/.ycm_extra_conf.py:1304828-1305388
+/subversion/branches/performance/.ycm_extra_conf.py: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,1029344,1030763,1030827,1031203,1031235,1032285,1032333,1033040,1033057,1033294,1035869,1035882,1039511,1043705,1053735,1056015,1066452,1067683,1067697-1078365
+/subversion/branches/py-tests-as-modules/.ycm_extra_conf.py:956579-1033052
+/subversion/branches/ra_serf-digest-authn/.ycm_extra_conf.py:875693-876404
+/subversion/branches/reintegrate-improvements/.ycm_extra_conf.py:873853-874164
+/subversion/branches/remote-only-status/.ycm_extra_conf.py:1581845-1586090
+/subversion/branches/revprop-cache/.ycm_extra_conf.py:1298521-1326293
+/subversion/branches/revprop-caching-ng/.ycm_extra_conf.py:1620597,1620599
+/subversion/branches/revprop-packing/.ycm_extra_conf.py:1143907,1143971,1143997,1144017,1144499,1144568,1146145
+/subversion/branches/subtree-mergeinfo/.ycm_extra_conf.py:876734-878766
+/subversion/branches/svn-auth-x509/.ycm_extra_conf.py:1603509-1655900
+/subversion/branches/svn-mergeinfo-enhancements/.ycm_extra_conf.py:870119-870195,870197-870288
+/subversion/branches/svn-patch-improvements/.ycm_extra_conf.py:918519-934609
+/subversion/branches/svn_mutex/.ycm_extra_conf.py:1141683-1182099
+/subversion/branches/svnpatch-diff/.ycm_extra_conf.py:865738-876477
+/subversion/branches/svnraisetc/.ycm_extra_conf.py:874709-875149
+/subversion/branches/svnserve-logging/.ycm_extra_conf.py:869828-870893
+/subversion/branches/tc-issue-3334/.ycm_extra_conf.py:874697-874773
+/subversion/branches/tc-merge-notify/.ycm_extra_conf.py:874017-874062
+/subversion/branches/tc-resolve/.ycm_extra_conf.py:874191-874239
+/subversion/branches/tc_url_rev/.ycm_extra_conf.py:874351-874483
+/subversion/branches/tree-conflicts/.ycm_extra_conf.py:868291-873154
+/subversion/branches/tree-conflicts-notify/.ycm_extra_conf.py:873926-874008
+/subversion/branches/tristate-chunked-request/.ycm_extra_conf.py:1502394-1502681
+/subversion/branches/tweak-build-take-two/.ycm_extra_conf.py:1424288-1425049,1425051-1425613
+/subversion/branches/uris-as-urls/.ycm_extra_conf.py:1060426-1064427
+/subversion/branches/verify-at-commit/.ycm_extra_conf.py:1462039-1462408
+/subversion/branches/verify-keep-going/.ycm_extra_conf.py:1439280-1546110
+/subversion/branches/wc-collate-path/.ycm_extra_conf.py:1402685-1480384
+/subversion/trunk/.ycm_extra_conf.py:1606692-1660163

Modified: subversion/branches/move-tracking-2/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/CHANGES?rev=1660173&r1=1660172&r2=1660173&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/CHANGES (original)
+++ subversion/branches/move-tracking-2/CHANGES Mon Feb 16 17:40:07 2015
@@ -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)

Propchange: subversion/branches/move-tracking-2/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Feb 16 17:40:07 2015
@@ -0,0 +1,89 @@
+/subversion/branches/1.5.x-r30215/CHANGES:870312
+/subversion/branches/1.7.x-fs-verify/CHANGES:1146708,1161180
+/subversion/branches/10Gb/CHANGES:1388102,1388163-1388190,1388195,1388202,1388205,1388211,1388276,1388362,1388375,1388394,1388636,1388639-1388640,1388643-1388644,1388654,1388720,1388789,1388795,1388801,1388805,1388807,1388810,1388816,1389044,1389276,1389289,1389662,1389867,1390017,1390209,1390216,1390407,1390409,1390414,1390419,1390955
+/subversion/branches/atomic-revprop/CHANGES:965046-1000689
+/subversion/branches/authzperf/CHANGES:1615360
+/subversion/branches/auto-props-sdc/CHANGES:1384106-1401643
+/subversion/branches/bdb-reverse-deltas/CHANGES:872050-872529
+/subversion/branches/cache-server/CHANGES:1458643-1476567
+/subversion/branches/diff-callbacks3/CHANGES:870059-870761
+/subversion/branches/diff-optimizations/CHANGES:1031270-1037352
+/subversion/branches/diff-optimizations-bytes/CHANGES:1037353-1067789
+/subversion/branches/dont-save-plaintext-passwords-by-default/CHANGES:870728-871118
+/subversion/branches/double-delete/CHANGES:870511-872970
+/subversion/branches/dump-load-cross-check/CHANGES:1654853-1657295
+/subversion/branches/ev2-export/CHANGES:1325914,1332738,1413107
+/subversion/branches/explore-wc/CHANGES:875486,875493,875497,875507,875511,875514,875559,875580-875581,875584,875587,875611,875627,875647,875667-875668,875711-875712,875733-875734,875736,875744-875748,875751,875758,875782,875795-875796,875830,875836,875838,875842,875852,875855,875864,875870,875873,875880,875885-875888,875890,875897-875898,875905,875907-875909,875935,875943-875944,875946,875979,875982-875983,875985-875986,875990,875997
+/subversion/branches/file-externals/CHANGES:871779-873302
+/subversion/branches/fs-rep-sharing/CHANGES:869036-873803
+/subversion/branches/fsfs-format7/CHANGES:1426304,1430673,1433848,1438408,1438982,1441129,1442051,1442068,1442504,1442910,1443171,1443803,1444690,1444693,1444695,1445040,1445080,1446103,1451129,1453590,1454307,1460579,1461851,1461865,1462837,1462904,1463120,1467362,1467382,1469487,1471208,1477166,1478055,1481447,1489817,1489949,1490673-1490674,1491784,1493042,1498029,1498103,1498155,1500054,1507729-1507731,1507735-1507736
+/subversion/branches/fsfs-improvements/CHANGES:1499981-1547039
+/subversion/branches/fsfs-lock-many/CHANGES:1571740-1577217
+/subversion/branches/fsfs-pack/CHANGES:873717-874575
+/subversion/branches/fsx/CHANGES:1507845-1509914
+/subversion/branches/fsx-id/CHANGES:1645603-1649011
+/subversion/branches/gnome-keyring/CHANGES:870558-871410
+/subversion/branches/gpg-agent-password-store/CHANGES:1005036-1150766
+/subversion/branches/gtest_addition/CHANGES:1452117-1502138
+/subversion/branches/http-protocol-v2/CHANGES:874395-876041
+/subversion/branches/in-memory-cache/CHANGES:869829-871452
+/subversion/branches/in-repo-authz/CHANGES:1414342-1424779
+/subversion/branches/inheritable-props/CHANGES:1297080-1395089
+/subversion/branches/integrate-cache-item-serialization/CHANGES:1068724-1068739
+/subversion/branches/integrate-cache-membuffer/CHANGES:998649-998852
+/subversion/branches/integrate-compression-level/CHANGES:1068651-1072287
+/subversion/branches/integrate-io-improvements/CHANGES:1068684-1072297
+/subversion/branches/integrate-is-cachable/CHANGES:1072568-1074082
+/subversion/branches/integrate-partial-getter/CHANGES:1072558-1076552
+/subversion/branches/integrate-readline-speedup/CHANGES:1072553-1072555
+/subversion/branches/integrate-stream-api-extensions/CHANGES:1068695-1072516
+/subversion/branches/integrate-string-improvements/CHANGES:1068251-1190617
+/subversion/branches/integrate-txdelta-caching/CHANGES:1072541-1078213
+/subversion/branches/issue-2779-dev/CHANGES:965496-984198
+/subversion/branches/issue-2843-dev/CHANGES:871432-874179
+/subversion/branches/issue-3000/CHANGES:871713,871716-871719,871721-871726,871728,871734
+/subversion/branches/issue-3067-deleted-subtrees/CHANGES:873375-874084
+/subversion/branches/issue-3148-dev/CHANGES:875193-875204
+/subversion/branches/issue-3220-dev/CHANGES:872210-872226
+/subversion/branches/issue-3242-dev/CHANGES:879653-896436
+/subversion/branches/issue-3334-dirs/CHANGES:875156-875867
+/subversion/branches/issue-3975/CHANGES:1152931-1160746
+/subversion/branches/issue-4116-dev/CHANGES:1424719-1425040
+/subversion/branches/issue-4194-dev/CHANGES:1410507-1414880
+/subversion/branches/javahl-ra/CHANGES:991978-1494640
+/subversion/branches/kwallet/CHANGES:870785-871314
+/subversion/branches/log-addressing/CHANGES:1509279-1546844
+/subversion/branches/log-g-performance/CHANGES:870941-871032
+/subversion/branches/merge-skips-obstructions/CHANGES:874525-874615
+/subversion/branches/multi-layer-moves/CHANGES:1239019-1300930
+/subversion/branches/nfc-nfd-aware-client/CHANGES:870276,870376
+/subversion/branches/node_pool/CHANGES:1304828-1305388
+/subversion/branches/performance/CHANGES: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,10
 29342,1029344,1030763,1030827,1031203,1031235,1032285,1032333,1033040,1033057,1033294,1035869,1035882,1039511,1043705,1053735,1056015,1066452,1067683,1067697-1078365
+/subversion/branches/py-tests-as-modules/CHANGES:956579-1033052
+/subversion/branches/ra_serf-digest-authn/CHANGES:875693-876404
+/subversion/branches/reintegrate-improvements/CHANGES:873853-874164
+/subversion/branches/remote-only-status/CHANGES:1581845-1586090
+/subversion/branches/revprop-cache/CHANGES:1298521-1326293
+/subversion/branches/revprop-caching-ng/CHANGES:1620597,1620599
+/subversion/branches/revprop-packing/CHANGES:1143907,1143971,1143997,1144017,1144499,1144568,1146145
+/subversion/branches/subtree-mergeinfo/CHANGES:876734-878766
+/subversion/branches/svn-auth-x509/CHANGES:1603509-1655900
+/subversion/branches/svn-mergeinfo-enhancements/CHANGES:870119-870195,870197-870288
+/subversion/branches/svn-patch-improvements/CHANGES:918519-934609
+/subversion/branches/svn_mutex/CHANGES:1141683-1182099
+/subversion/branches/svnpatch-diff/CHANGES:865738-876477
+/subversion/branches/svnraisetc/CHANGES:874709-875149
+/subversion/branches/svnserve-logging/CHANGES:869828-870893
+/subversion/branches/tc-issue-3334/CHANGES:874697-874773
+/subversion/branches/tc-merge-notify/CHANGES:874017-874062
+/subversion/branches/tc-resolve/CHANGES:874191-874239
+/subversion/branches/tc_url_rev/CHANGES:874351-874483
+/subversion/branches/tree-conflicts/CHANGES:868291-873154
+/subversion/branches/tree-conflicts-notify/CHANGES:873926-874008
+/subversion/branches/tristate-chunked-request/CHANGES:1502394-1502681
+/subversion/branches/tweak-build-take-two/CHANGES:1424288-1425049,1425051-1425613
+/subversion/branches/uris-as-urls/CHANGES:1060426-1064427
+/subversion/branches/verify-at-commit/CHANGES:1462039-1462408
+/subversion/branches/verify-keep-going/CHANGES:1439280-1546110
+/subversion/branches/wc-collate-path/CHANGES:1402685-1480384
+/subversion/trunk/CHANGES:1606692-1660163

Modified: subversion/branches/move-tracking-2/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/Makefile.in?rev=1660173&r1=1660172&r2=1660173&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/Makefile.in (original)
+++ subversion/branches/move-tracking-2/Makefile.in Mon Feb 16 17:40:07 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

Propchange: subversion/branches/move-tracking-2/Makefile.in
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Feb 16 17:40:07 2015
@@ -0,0 +1,89 @@
+/subversion/branches/1.5.x-r30215/Makefile.in:870312
+/subversion/branches/1.7.x-fs-verify/Makefile.in:1146708,1161180
+/subversion/branches/10Gb/Makefile.in:1388102,1388163-1388190,1388195,1388202,1388205,1388211,1388276,1388362,1388375,1388394,1388636,1388639-1388640,1388643-1388644,1388654,1388720,1388789,1388795,1388801,1388805,1388807,1388810,1388816,1389044,1389276,1389289,1389662,1389867,1390017,1390209,1390216,1390407,1390409,1390414,1390419,1390955
+/subversion/branches/atomic-revprop/Makefile.in:965046-1000689
+/subversion/branches/authzperf/Makefile.in:1615360
+/subversion/branches/auto-props-sdc/Makefile.in:1384106-1401643
+/subversion/branches/bdb-reverse-deltas/Makefile.in:872050-872529
+/subversion/branches/cache-server/Makefile.in:1458643-1476567
+/subversion/branches/diff-callbacks3/Makefile.in:870059-870761
+/subversion/branches/diff-optimizations/Makefile.in:1031270-1037352
+/subversion/branches/diff-optimizations-bytes/Makefile.in:1037353-1067789
+/subversion/branches/dont-save-plaintext-passwords-by-default/Makefile.in:870728-871118
+/subversion/branches/double-delete/Makefile.in:870511-872970
+/subversion/branches/dump-load-cross-check/Makefile.in:1654853-1657295
+/subversion/branches/ev2-export/Makefile.in:1325914,1332738,1413107
+/subversion/branches/explore-wc/Makefile.in:875486,875493,875497,875507,875511,875514,875559,875580-875581,875584,875587,875611,875627,875647,875667-875668,875711-875712,875733-875734,875736,875744-875748,875751,875758,875782,875795-875796,875830,875836,875838,875842,875852,875855,875864,875870,875873,875880,875885-875888,875890,875897-875898,875905,875907-875909,875935,875943-875944,875946,875979,875982-875983,875985-875986,875990,875997
+/subversion/branches/file-externals/Makefile.in:871779-873302
+/subversion/branches/fs-rep-sharing/Makefile.in:869036-873803
+/subversion/branches/fsfs-format7/Makefile.in:1426304,1430673,1433848,1438408,1438982,1441129,1442051,1442068,1442504,1442910,1443171,1443803,1444690,1444693,1444695,1445040,1445080,1446103,1451129,1453590,1454307,1460579,1461851,1461865,1462837,1462904,1463120,1467362,1467382,1469487,1471208,1477166,1478055,1481447,1489817,1489949,1490673-1490674,1491784,1493042,1498029,1498103,1498155,1500054,1507729-1507731,1507735-1507736
+/subversion/branches/fsfs-improvements/Makefile.in:1499981-1547039
+/subversion/branches/fsfs-lock-many/Makefile.in:1571740-1577217
+/subversion/branches/fsfs-pack/Makefile.in:873717-874575
+/subversion/branches/fsx/Makefile.in:1507845-1509914
+/subversion/branches/fsx-id/Makefile.in:1645603-1649011
+/subversion/branches/gnome-keyring/Makefile.in:870558-871410
+/subversion/branches/gpg-agent-password-store/Makefile.in:1005036-1150766
+/subversion/branches/gtest_addition/Makefile.in:1452117-1502138
+/subversion/branches/http-protocol-v2/Makefile.in:874395-876041
+/subversion/branches/in-memory-cache/Makefile.in:869829-871452
+/subversion/branches/in-repo-authz/Makefile.in:1414342-1424779
+/subversion/branches/inheritable-props/Makefile.in:1297080-1395089
+/subversion/branches/integrate-cache-item-serialization/Makefile.in:1068724-1068739
+/subversion/branches/integrate-cache-membuffer/Makefile.in:998649-998852
+/subversion/branches/integrate-compression-level/Makefile.in:1068651-1072287
+/subversion/branches/integrate-io-improvements/Makefile.in:1068684-1072297
+/subversion/branches/integrate-is-cachable/Makefile.in:1072568-1074082
+/subversion/branches/integrate-partial-getter/Makefile.in:1072558-1076552
+/subversion/branches/integrate-readline-speedup/Makefile.in:1072553-1072555
+/subversion/branches/integrate-stream-api-extensions/Makefile.in:1068695-1072516
+/subversion/branches/integrate-string-improvements/Makefile.in:1068251-1190617
+/subversion/branches/integrate-txdelta-caching/Makefile.in:1072541-1078213
+/subversion/branches/issue-2779-dev/Makefile.in:965496-984198
+/subversion/branches/issue-2843-dev/Makefile.in:871432-874179
+/subversion/branches/issue-3000/Makefile.in:871713,871716-871719,871721-871726,871728,871734
+/subversion/branches/issue-3067-deleted-subtrees/Makefile.in:873375-874084
+/subversion/branches/issue-3148-dev/Makefile.in:875193-875204
+/subversion/branches/issue-3220-dev/Makefile.in:872210-872226
+/subversion/branches/issue-3242-dev/Makefile.in:879653-896436
+/subversion/branches/issue-3334-dirs/Makefile.in:875156-875867
+/subversion/branches/issue-3975/Makefile.in:1152931-1160746
+/subversion/branches/issue-4116-dev/Makefile.in:1424719-1425040
+/subversion/branches/issue-4194-dev/Makefile.in:1410507-1414880
+/subversion/branches/javahl-ra/Makefile.in:991978-1494640
+/subversion/branches/kwallet/Makefile.in:870785-871314
+/subversion/branches/log-addressing/Makefile.in:1509279-1546844
+/subversion/branches/log-g-performance/Makefile.in:870941-871032
+/subversion/branches/merge-skips-obstructions/Makefile.in:874525-874615
+/subversion/branches/multi-layer-moves/Makefile.in:1239019-1300930
+/subversion/branches/nfc-nfd-aware-client/Makefile.in:870276,870376
+/subversion/branches/node_pool/Makefile.in:1304828-1305388
+/subversion/branches/performance/Makefile.in: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-102934
 0,1029342,1029344,1030763,1030827,1031203,1031235,1032285,1032333,1033040,1033057,1033294,1035869,1035882,1039511,1043705,1053735,1056015,1066452,1067683,1067697-1078365
+/subversion/branches/py-tests-as-modules/Makefile.in:956579-1033052
+/subversion/branches/ra_serf-digest-authn/Makefile.in:875693-876404
+/subversion/branches/reintegrate-improvements/Makefile.in:873853-874164
+/subversion/branches/remote-only-status/Makefile.in:1581845-1586090
+/subversion/branches/revprop-cache/Makefile.in:1298521-1326293
+/subversion/branches/revprop-caching-ng/Makefile.in:1620597,1620599
+/subversion/branches/revprop-packing/Makefile.in:1143907,1143971,1143997,1144017,1144499,1144568,1146145
+/subversion/branches/subtree-mergeinfo/Makefile.in:876734-878766
+/subversion/branches/svn-auth-x509/Makefile.in:1603509-1655900
+/subversion/branches/svn-mergeinfo-enhancements/Makefile.in:870119-870195,870197-870288
+/subversion/branches/svn-patch-improvements/Makefile.in:918519-934609
+/subversion/branches/svn_mutex/Makefile.in:1141683-1182099
+/subversion/branches/svnpatch-diff/Makefile.in:865738-876477
+/subversion/branches/svnraisetc/Makefile.in:874709-875149
+/subversion/branches/svnserve-logging/Makefile.in:869828-870893
+/subversion/branches/tc-issue-3334/Makefile.in:874697-874773
+/subversion/branches/tc-merge-notify/Makefile.in:874017-874062
+/subversion/branches/tc-resolve/Makefile.in:874191-874239
+/subversion/branches/tc_url_rev/Makefile.in:874351-874483
+/subversion/branches/tree-conflicts/Makefile.in:868291-873154
+/subversion/branches/tree-conflicts-notify/Makefile.in:873926-874008
+/subversion/branches/tristate-chunked-request/Makefile.in:1502394-1502681
+/subversion/branches/tweak-build-take-two/Makefile.in:1424288-1425049,1425051-1425613
+/subversion/branches/uris-as-urls/Makefile.in:1060426-1064427
+/subversion/branches/verify-at-commit/Makefile.in:1462039-1462408
+/subversion/branches/verify-keep-going/Makefile.in:1439280-1546110
+/subversion/branches/wc-collate-path/Makefile.in:1402685-1480384
+/subversion/trunk/Makefile.in:1606692-1660163

Modified: subversion/branches/move-tracking-2/autogen.sh
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/autogen.sh?rev=1660173&r1=1660172&r2=1660173&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/autogen.sh (original)
+++ subversion/branches/move-tracking-2/autogen.sh Mon Feb 16 17:40:07 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

Propchange: subversion/branches/move-tracking-2/autogen.sh
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 16 17:40:07 2015
@@ -82,4 +82,4 @@
 /subversion/branches/verify-at-commit/autogen.sh:1462039-1462408
 /subversion/branches/verify-keep-going/autogen.sh:1439280-1546110
 /subversion/branches/wc-collate-path/autogen.sh:1402685-1480384
-/subversion/trunk/autogen.sh:1606692-1653312
+/subversion/trunk/autogen.sh:1606692-1660163

Propchange: subversion/branches/move-tracking-2/build/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 16 17:40:07 2015
@@ -82,4 +82,4 @@
 /subversion/branches/verify-at-commit/build:1462039-1462408
 /subversion/branches/verify-keep-going/build:1439280-1546110
 /subversion/branches/wc-collate-path/build:1402685-1480384
-/subversion/trunk/build:1606692-1658451
+/subversion/trunk/build:1606692-1660163

Modified: subversion/branches/move-tracking-2/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/build.conf?rev=1660173&r1=1660172&r2=1660173&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/build.conf (original)
+++ subversion/branches/move-tracking-2/build.conf Mon Feb 16 17:40:07 2015
@@ -1484,7 +1484,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
@@ -1592,9 +1592,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

Propchange: subversion/branches/move-tracking-2/build.conf
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 16 17:40:07 2015
@@ -82,4 +82,4 @@
 /subversion/branches/verify-at-commit/build.conf:1462039-1462408
 /subversion/branches/verify-keep-going/build.conf:1439280-1546110
 /subversion/branches/wc-collate-path/build.conf:1402685-1480384
-/subversion/trunk/build.conf:1606692-1658954
+/subversion/trunk/build.conf:1606692-1660163

Modified: subversion/branches/move-tracking-2/build/generator/gen_msvc_dsp.py
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/build/generator/gen_msvc_dsp.py?rev=1660173&r1=1660172&r2=1660173&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/build/generator/gen_msvc_dsp.py (original)
+++ subversion/branches/move-tracking-2/build/generator/gen_msvc_dsp.py Mon Feb 16 17:40:07 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/move-tracking-2/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/build/generator/gen_win.py?rev=1660173&r1=1660172&r2=1660173&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/build/generator/gen_win.py (original)
+++ subversion/branches/move-tracking-2/build/generator/gen_win.py Mon Feb 16 17:40:07 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/move-tracking-2/build/generator/gen_win_dependencies.py
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/build/generator/gen_win_dependencies.py?rev=1660173&r1=1660172&r2=1660173&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/build/generator/gen_win_dependencies.py (original)
+++ subversion/branches/move-tracking-2/build/generator/gen_win_dependencies.py Mon Feb 16 17:40:07 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")

Propchange: subversion/branches/move-tracking-2/contrib/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Feb 16 17:40:07 2015
@@ -0,0 +1,89 @@
+/subversion/branches/1.5.x-r30215/contrib:870312
+/subversion/branches/1.7.x-fs-verify/contrib:1146708,1161180
+/subversion/branches/10Gb/contrib:1388102,1388163-1388190,1388195,1388202,1388205,1388211,1388276,1388362,1388375,1388394,1388636,1388639-1388640,1388643-1388644,1388654,1388720,1388789,1388795,1388801,1388805,1388807,1388810,1388816,1389044,1389276,1389289,1389662,1389867,1390017,1390209,1390216,1390407,1390409,1390414,1390419,1390955
+/subversion/branches/atomic-revprop/contrib:965046-1000689
+/subversion/branches/authzperf/contrib:1615360
+/subversion/branches/auto-props-sdc/contrib:1384106-1401643
+/subversion/branches/bdb-reverse-deltas/contrib:872050-872529
+/subversion/branches/cache-server/contrib:1458643-1476567
+/subversion/branches/diff-callbacks3/contrib:870059-870761
+/subversion/branches/diff-optimizations/contrib:1031270-1037352
+/subversion/branches/diff-optimizations-bytes/contrib:1037353-1067789
+/subversion/branches/dont-save-plaintext-passwords-by-default/contrib:870728-871118
+/subversion/branches/double-delete/contrib:870511-872970
+/subversion/branches/dump-load-cross-check/contrib:1654853-1657295
+/subversion/branches/ev2-export/contrib:1325914,1332738,1413107
+/subversion/branches/explore-wc/contrib:875486,875493,875497,875507,875511,875514,875559,875580-875581,875584,875587,875611,875627,875647,875667-875668,875711-875712,875733-875734,875736,875744-875748,875751,875758,875782,875795-875796,875830,875836,875838,875842,875852,875855,875864,875870,875873,875880,875885-875888,875890,875897-875898,875905,875907-875909,875935,875943-875944,875946,875979,875982-875983,875985-875986,875990,875997
+/subversion/branches/file-externals/contrib:871779-873302
+/subversion/branches/fs-rep-sharing/contrib:869036-873803
+/subversion/branches/fsfs-format7/contrib:1426304,1430673,1433848,1438408,1438982,1441129,1442051,1442068,1442504,1442910,1443171,1443803,1444690,1444693,1444695,1445040,1445080,1446103,1451129,1453590,1454307,1460579,1461851,1461865,1462837,1462904,1463120,1467362,1467382,1469487,1471208,1477166,1478055,1481447,1489817,1489949,1490673-1490674,1491784,1493042,1498029,1498103,1498155,1500054,1507729-1507731,1507735-1507736
+/subversion/branches/fsfs-improvements/contrib:1499981-1547039
+/subversion/branches/fsfs-lock-many/contrib:1571740-1577217
+/subversion/branches/fsfs-pack/contrib:873717-874575
+/subversion/branches/fsx/contrib:1507845-1509914
+/subversion/branches/fsx-id/contrib:1645603-1649011
+/subversion/branches/gnome-keyring/contrib:870558-871410
+/subversion/branches/gpg-agent-password-store/contrib:1005036-1150766
+/subversion/branches/gtest_addition/contrib:1452117-1502138
+/subversion/branches/http-protocol-v2/contrib:874395-876041
+/subversion/branches/in-memory-cache/contrib:869829-871452
+/subversion/branches/in-repo-authz/contrib:1414342-1424779
+/subversion/branches/inheritable-props/contrib:1297080-1395089
+/subversion/branches/integrate-cache-item-serialization/contrib:1068724-1068739
+/subversion/branches/integrate-cache-membuffer/contrib:998649-998852
+/subversion/branches/integrate-compression-level/contrib:1068651-1072287
+/subversion/branches/integrate-io-improvements/contrib:1068684-1072297
+/subversion/branches/integrate-is-cachable/contrib:1072568-1074082
+/subversion/branches/integrate-partial-getter/contrib:1072558-1076552
+/subversion/branches/integrate-readline-speedup/contrib:1072553-1072555
+/subversion/branches/integrate-stream-api-extensions/contrib:1068695-1072516
+/subversion/branches/integrate-string-improvements/contrib:1068251-1190617
+/subversion/branches/integrate-txdelta-caching/contrib:1072541-1078213
+/subversion/branches/issue-2779-dev/contrib:965496-984198
+/subversion/branches/issue-2843-dev/contrib:871432-874179
+/subversion/branches/issue-3000/contrib:871713,871716-871719,871721-871726,871728,871734
+/subversion/branches/issue-3067-deleted-subtrees/contrib:873375-874084
+/subversion/branches/issue-3148-dev/contrib:875193-875204
+/subversion/branches/issue-3220-dev/contrib:872210-872226
+/subversion/branches/issue-3242-dev/contrib:879653-896436
+/subversion/branches/issue-3334-dirs/contrib:875156-875867
+/subversion/branches/issue-3975/contrib:1152931-1160746
+/subversion/branches/issue-4116-dev/contrib:1424719-1425040
+/subversion/branches/issue-4194-dev/contrib:1410507-1414880
+/subversion/branches/javahl-ra/contrib:991978-1494640
+/subversion/branches/kwallet/contrib:870785-871314
+/subversion/branches/log-addressing/contrib:1509279-1546844
+/subversion/branches/log-g-performance/contrib:870941-871032
+/subversion/branches/merge-skips-obstructions/contrib:874525-874615
+/subversion/branches/multi-layer-moves/contrib:1239019-1300930
+/subversion/branches/nfc-nfd-aware-client/contrib:870276,870376
+/subversion/branches/node_pool/contrib:1304828-1305388
+/subversion/branches/performance/contrib: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,10
 29342,1029344,1030763,1030827,1031203,1031235,1032285,1032333,1033040,1033057,1033294,1035869,1035882,1039511,1043705,1053735,1056015,1066452,1067683,1067697-1078365
+/subversion/branches/py-tests-as-modules/contrib:956579-1033052
+/subversion/branches/ra_serf-digest-authn/contrib:875693-876404
+/subversion/branches/reintegrate-improvements/contrib:873853-874164
+/subversion/branches/remote-only-status/contrib:1581845-1586090
+/subversion/branches/revprop-cache/contrib:1298521-1326293
+/subversion/branches/revprop-caching-ng/contrib:1620597,1620599
+/subversion/branches/revprop-packing/contrib:1143907,1143971,1143997,1144017,1144499,1144568,1146145
+/subversion/branches/subtree-mergeinfo/contrib:876734-878766
+/subversion/branches/svn-auth-x509/contrib:1603509-1655900
+/subversion/branches/svn-mergeinfo-enhancements/contrib:870119-870195,870197-870288
+/subversion/branches/svn-patch-improvements/contrib:918519-934609
+/subversion/branches/svn_mutex/contrib:1141683-1182099
+/subversion/branches/svnpatch-diff/contrib:865738-876477
+/subversion/branches/svnraisetc/contrib:874709-875149
+/subversion/branches/svnserve-logging/contrib:869828-870893
+/subversion/branches/tc-issue-3334/contrib:874697-874773
+/subversion/branches/tc-merge-notify/contrib:874017-874062
+/subversion/branches/tc-resolve/contrib:874191-874239
+/subversion/branches/tc_url_rev/contrib:874351-874483
+/subversion/branches/tree-conflicts/contrib:868291-873154
+/subversion/branches/tree-conflicts-notify/contrib:873926-874008
+/subversion/branches/tristate-chunked-request/contrib:1502394-1502681
+/subversion/branches/tweak-build-take-two/contrib:1424288-1425049,1425051-1425613
+/subversion/branches/uris-as-urls/contrib:1060426-1064427
+/subversion/branches/verify-at-commit/contrib:1462039-1462408
+/subversion/branches/verify-keep-going/contrib:1439280-1546110
+/subversion/branches/wc-collate-path/contrib:1402685-1480384
+/subversion/trunk/contrib:1606692-1660163

Modified: subversion/branches/move-tracking-2/contrib/client-side/svncopy/svncopy.pl.in
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/contrib/client-side/svncopy/svncopy.pl.in?rev=1660173&r1=1660172&r2=1660173&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/contrib/client-side/svncopy/svncopy.pl.in (original)
+++ subversion/branches/move-tracking-2/contrib/client-side/svncopy/svncopy.pl.in Mon Feb 16 17:40:07 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

Propchange: subversion/branches/move-tracking-2/notes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 16 17:40:07 2015
@@ -23,6 +23,7 @@
 /subversion/branches/log-g-performance/notes:870941-871032
 /subversion/branches/merge-skips-obstructions/notes:874525-874615
 /subversion/branches/nfc-nfd-aware-client/notes:870276,870376
+/subversion/branches/pin-externals/notes:1643757-1659392
 /subversion/branches/ra_serf-digest-authn/notes:875693-876404
 /subversion/branches/reintegrate-improvements/notes:873853-874164
 /subversion/branches/subtree-mergeinfo/notes:876734-878766
@@ -38,4 +39,4 @@
 /subversion/branches/tc_url_rev/notes:874351-874483
 /subversion/branches/tree-conflicts/notes:868291-873154
 /subversion/branches/tree-conflicts-notify/notes:873926-874008
-/subversion/trunk/notes:1606692-1658451
+/subversion/trunk/notes:1606692-1660163

Propchange: subversion/branches/move-tracking-2/subversion/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 16 17:40:07 2015
@@ -82,4 +82,4 @@
 /subversion/branches/verify-at-commit/subversion:1462039-1462408
 /subversion/branches/verify-keep-going/subversion:1439280-1546110
 /subversion/branches/wc-collate-path/subversion:1402685-1480384
-/subversion/trunk/subversion:1606692-1658954
+/subversion/trunk/subversion:1606692-1660163

Modified: subversion/branches/move-tracking-2/subversion/bindings/javahl/native/EditorProxy.h
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/bindings/javahl/native/EditorProxy.h?rev=1660173&r1=1660172&r2=1660173&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/bindings/javahl/native/EditorProxy.h (original)
+++ subversion/branches/move-tracking-2/subversion/bindings/javahl/native/EditorProxy.h Mon Feb 16 17:40:07 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/move-tracking-2/subversion/bindings/javahl/native/SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/bindings/javahl/native/SVNClient.cpp?rev=1660173&r1=1660172&r2=1660173&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/bindings/javahl/native/SVNClient.cpp (original)
+++ subversion/branches/move-tracking-2/subversion/bindings/javahl/native/SVNClient.cpp Mon Feb 16 17:40:07 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,75 @@ 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 pinExternals, jobject jexternalsToPin,
                      PropertyTable &revprops, CommitCallback *callback)
 {
     SVN::Pool subPool(pool);
@@ -460,10 +534,13 @@ 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,
+                                   pinExternals, pin_set,
+                                   revprops.hash(subPool),
+                                   CommitCallback::callback, callback,
                                  ctx, subPool.getPool()), );
 }
 

Modified: subversion/branches/move-tracking-2/subversion/bindings/javahl/native/SVNClient.h
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/bindings/javahl/native/SVNClient.h?rev=1660173&r1=1660172&r2=1660173&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/bindings/javahl/native/SVNClient.h (original)
+++ subversion/branches/move-tracking-2/subversion/bindings/javahl/native/SVNClient.h Mon Feb 16 17:40:07 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 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/move-tracking-2/subversion/bindings/javahl/native/StateReporter.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/bindings/javahl/native/StateReporter.cpp?rev=1660173&r1=1660172&r2=1660173&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/bindings/javahl/native/StateReporter.cpp (original)
+++ subversion/branches/move-tracking-2/subversion/bindings/javahl/native/StateReporter.cpp Mon Feb 16 17:40:07 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/move-tracking-2/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp?rev=1660173&r1=1660172&r2=1660173&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp (original)
+++ subversion/branches/move-tracking-2/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp Mon Feb 16 17:40:07 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 jpinExternals, jobject jexternalsToPin,
  jobject jrevpropTable, jobject jmessage, jobject jcallback)
 {
   JNIEntry(SVNClient, copy);
@@ -590,8 +591,9 @@ 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(jpinExternals), jexternalsToPin,
            revprops, jcallback ? &callback : NULL);
 }
 

Modified: subversion/branches/move-tracking-2/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp?rev=1660173&r1=1660172&r2=1660173&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp (original)
+++ subversion/branches/move-tracking-2/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp Mon Feb 16 17:40:07 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/move-tracking-2/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java?rev=1660173&r1=1660172&r2=1660173&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java (original)
+++ subversion/branches/move-tracking-2/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java Mon Feb 16 17:40:07 2015
@@ -376,6 +376,20 @@ 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 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 +397,22 @@ 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 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>.
      */
     void copy(List<CopySource> sources, String destPath,
               boolean copyAsChild, boolean makeParents,

Modified: subversion/branches/move-tracking-2/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNEditor.java
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNEditor.java?rev=1660173&r1=1660172&r2=1660173&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNEditor.java (original)
+++ subversion/branches/move-tracking-2/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNEditor.java Mon Feb 16 17:40:07 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