subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1416996 [1/13] - in /subversion/branches/wc-collate-path: ./ build/ build/ac-macros/ build/generator/ contrib/client-side/svnmerge/ contrib/server-side/svncutter/ notes/ subversion/bindings/cxxhl/ subversion/bindings/javahl/native/ subvers...
Date Tue, 04 Dec 2012 15:35:57 GMT
Author: brane
Date: Tue Dec  4 15:35:13 2012
New Revision: 1416996

URL: http://svn.apache.org/viewvc?rev=1416996&view=rev
Log:
Sync wc-collate-path branch with trunk@1416958.

Added:
    subversion/branches/wc-collate-path/subversion/bindings/cxxhl/
      - copied from r1416958, subversion/trunk/subversion/bindings/cxxhl/
    subversion/branches/wc-collate-path/subversion/include/private/svn_diff_private.h
      - copied unchanged from r1416958, subversion/trunk/subversion/include/private/svn_diff_private.h
    subversion/branches/wc-collate-path/subversion/svn/svn.c
      - copied unchanged from r1416958, subversion/trunk/subversion/svn/svn.c
    subversion/branches/wc-collate-path/subversion/svnadmin/svnadmin.c
      - copied unchanged from r1416958, subversion/trunk/subversion/svnadmin/svnadmin.c
    subversion/branches/wc-collate-path/subversion/svndumpfilter/svndumpfilter.c
      - copied unchanged from r1416958, subversion/trunk/subversion/svndumpfilter/svndumpfilter.c
    subversion/branches/wc-collate-path/subversion/svnlook/svnlook.c
      - copied unchanged from r1416958, subversion/trunk/subversion/svnlook/svnlook.c
    subversion/branches/wc-collate-path/subversion/svnserve/svnserve.c
      - copied unchanged from r1416958, subversion/trunk/subversion/svnserve/svnserve.c
    subversion/branches/wc-collate-path/subversion/svnsync/svnsync.c
      - copied unchanged from r1416958, subversion/trunk/subversion/svnsync/svnsync.c
    subversion/branches/wc-collate-path/subversion/svnversion/svnversion.c
      - copied unchanged from r1416958, subversion/trunk/subversion/svnversion/svnversion.c
    subversion/branches/wc-collate-path/subversion/tests/libsvn_wc/wc-test.c
      - copied unchanged from r1416958, subversion/trunk/subversion/tests/libsvn_wc/wc-test.c
    subversion/branches/wc-collate-path/tools/client-side/svn-bench/svn-bench.c
      - copied unchanged from r1416958, subversion/trunk/tools/client-side/svn-bench/svn-bench.c
    subversion/branches/wc-collate-path/tools/dev/svnraisetreeconflict/svnraisetreeconflict.c
      - copied unchanged from r1416958, subversion/trunk/tools/dev/svnraisetreeconflict/svnraisetreeconflict.c
    subversion/branches/wc-collate-path/tools/server-side/fsfs-stats.c
      - copied unchanged from r1416958, subversion/trunk/tools/server-side/fsfs-stats.c
Removed:
    subversion/branches/wc-collate-path/subversion/svn/main.c
    subversion/branches/wc-collate-path/subversion/svnadmin/main.c
    subversion/branches/wc-collate-path/subversion/svndumpfilter/main.c
    subversion/branches/wc-collate-path/subversion/svnlook/main.c
    subversion/branches/wc-collate-path/subversion/svnserve/main.c
    subversion/branches/wc-collate-path/subversion/svnsync/main.c
    subversion/branches/wc-collate-path/subversion/svnversion/main.c
    subversion/branches/wc-collate-path/subversion/tests/libsvn_subr/target-test.c
    subversion/branches/wc-collate-path/tools/client-side/svn-bench/main.c
    subversion/branches/wc-collate-path/tools/dev/gcov.patch
    subversion/branches/wc-collate-path/tools/dev/svnraisetreeconflict/main.c
Modified:
    subversion/branches/wc-collate-path/   (props changed)
    subversion/branches/wc-collate-path/CHANGES
    subversion/branches/wc-collate-path/Makefile.in
    subversion/branches/wc-collate-path/build.conf
    subversion/branches/wc-collate-path/build/ac-macros/apache.m4
    subversion/branches/wc-collate-path/build/ac-macros/apr.m4
    subversion/branches/wc-collate-path/build/ac-macros/aprutil.m4
    subversion/branches/wc-collate-path/build/ac-macros/macosx.m4
    subversion/branches/wc-collate-path/build/ac-macros/serf.m4
    subversion/branches/wc-collate-path/build/ac-macros/sqlite.m4
    subversion/branches/wc-collate-path/build/generator/gen_make.py
    subversion/branches/wc-collate-path/build/run_tests.py
    subversion/branches/wc-collate-path/configure.ac
    subversion/branches/wc-collate-path/contrib/client-side/svnmerge/svnmerge_test.py
    subversion/branches/wc-collate-path/contrib/server-side/svncutter/svncutter
    subversion/branches/wc-collate-path/notes/dump-load-format.txt
    subversion/branches/wc-collate-path/subversion/bindings/javahl/native/CopySources.cpp
    subversion/branches/wc-collate-path/subversion/bindings/javahl/native/CreateJ.cpp
    subversion/branches/wc-collate-path/subversion/bindings/javahl/native/InputStream.cpp
    subversion/branches/wc-collate-path/subversion/bindings/javahl/native/JNIThreadData.h
    subversion/branches/wc-collate-path/subversion/bindings/javahl/native/JNIUtil.cpp
    subversion/branches/wc-collate-path/subversion/bindings/javahl/native/JNIUtil.h
    subversion/branches/wc-collate-path/subversion/bindings/javahl/native/OutputStream.cpp
    subversion/branches/wc-collate-path/subversion/bindings/javahl/native/Path.cpp
    subversion/branches/wc-collate-path/subversion/bindings/javahl/native/Path.h
    subversion/branches/wc-collate-path/subversion/bindings/javahl/native/RevisionRange.cpp
    subversion/branches/wc-collate-path/subversion/bindings/javahl/native/SVNClient.cpp
    subversion/branches/wc-collate-path/subversion/bindings/javahl/native/Targets.cpp
    subversion/branches/wc-collate-path/subversion/bindings/javahl/native/Targets.h
    subversion/branches/wc-collate-path/subversion/bindings/swig/perl/native/Base.pm
    subversion/branches/wc-collate-path/subversion/bindings/swig/perl/native/Makefile.PL.in
    subversion/branches/wc-collate-path/subversion/bindings/swig/perl/native/Repos.pm
    subversion/branches/wc-collate-path/subversion/bindings/swig/ruby/svn/info.rb
    subversion/branches/wc-collate-path/subversion/bindings/swig/ruby/svn/util.rb
    subversion/branches/wc-collate-path/subversion/bindings/swig/ruby/test/my-assertions.rb
    subversion/branches/wc-collate-path/subversion/bindings/swig/ruby/test/test-unit-ext.rb
    subversion/branches/wc-collate-path/subversion/bindings/swig/ruby/test/test-unit-ext/priority.rb
    subversion/branches/wc-collate-path/subversion/bindings/swig/ruby/test/test_client.rb
    subversion/branches/wc-collate-path/subversion/bindings/swig/ruby/test/test_core.rb
    subversion/branches/wc-collate-path/subversion/bindings/swig/ruby/test/test_delta.rb
    subversion/branches/wc-collate-path/subversion/bindings/swig/ruby/test/test_fs.rb
    subversion/branches/wc-collate-path/subversion/bindings/swig/ruby/test/test_repos.rb
    subversion/branches/wc-collate-path/subversion/bindings/swig/ruby/test/test_wc.rb
    subversion/branches/wc-collate-path/subversion/include/private/svn_client_private.h
    subversion/branches/wc-collate-path/subversion/include/private/svn_cmdline_private.h
    subversion/branches/wc-collate-path/subversion/include/private/svn_named_atomic.h
    subversion/branches/wc-collate-path/subversion/include/private/svn_string_private.h
    subversion/branches/wc-collate-path/subversion/include/private/svn_utf_private.h
    subversion/branches/wc-collate-path/subversion/include/private/svn_wc_private.h
    subversion/branches/wc-collate-path/subversion/include/svn_client.h
    subversion/branches/wc-collate-path/subversion/include/svn_delta.h
    subversion/branches/wc-collate-path/subversion/include/svn_diff.h
    subversion/branches/wc-collate-path/subversion/include/svn_dirent_uri.h
    subversion/branches/wc-collate-path/subversion/include/svn_editor.h
    subversion/branches/wc-collate-path/subversion/include/svn_error_codes.h
    subversion/branches/wc-collate-path/subversion/include/svn_fs.h
    subversion/branches/wc-collate-path/subversion/include/svn_props.h
    subversion/branches/wc-collate-path/subversion/include/svn_repos.h
    subversion/branches/wc-collate-path/subversion/include/svn_string.h
    subversion/branches/wc-collate-path/subversion/include/svn_wc.h
    subversion/branches/wc-collate-path/subversion/libsvn_client/add.c
    subversion/branches/wc-collate-path/subversion/libsvn_client/client.h
    subversion/branches/wc-collate-path/subversion/libsvn_client/commit.c
    subversion/branches/wc-collate-path/subversion/libsvn_client/copy.c
    subversion/branches/wc-collate-path/subversion/libsvn_client/deprecated.c
    subversion/branches/wc-collate-path/subversion/libsvn_client/diff.c
    subversion/branches/wc-collate-path/subversion/libsvn_client/export.c
    subversion/branches/wc-collate-path/subversion/libsvn_client/externals.c
    subversion/branches/wc-collate-path/subversion/libsvn_client/info.c
    subversion/branches/wc-collate-path/subversion/libsvn_client/iprops.c
    subversion/branches/wc-collate-path/subversion/libsvn_client/list.c
    subversion/branches/wc-collate-path/subversion/libsvn_client/merge.c
    subversion/branches/wc-collate-path/subversion/libsvn_client/mergeinfo.c
    subversion/branches/wc-collate-path/subversion/libsvn_client/mergeinfo.h
    subversion/branches/wc-collate-path/subversion/libsvn_client/prop_commands.c
    subversion/branches/wc-collate-path/subversion/libsvn_client/ra.c
    subversion/branches/wc-collate-path/subversion/libsvn_client/revisions.c
    subversion/branches/wc-collate-path/subversion/libsvn_delta/compat.c
    subversion/branches/wc-collate-path/subversion/libsvn_delta/debug_editor.c
    subversion/branches/wc-collate-path/subversion/libsvn_delta/svndiff.c
    subversion/branches/wc-collate-path/subversion/libsvn_delta/text_delta.c
    subversion/branches/wc-collate-path/subversion/libsvn_diff/diff.h
    subversion/branches/wc-collate-path/subversion/libsvn_diff/diff_file.c
    subversion/branches/wc-collate-path/subversion/libsvn_diff/diff_memory.c
    subversion/branches/wc-collate-path/subversion/libsvn_diff/parse-diff.c
    subversion/branches/wc-collate-path/subversion/libsvn_diff/util.c
    subversion/branches/wc-collate-path/subversion/libsvn_fs_fs/fs.h
    subversion/branches/wc-collate-path/subversion/libsvn_fs_fs/fs_fs.c
    subversion/branches/wc-collate-path/subversion/libsvn_fs_fs/structure
    subversion/branches/wc-collate-path/subversion/libsvn_fs_fs/temp_serializer.c
    subversion/branches/wc-collate-path/subversion/libsvn_fs_fs/temp_serializer.h
    subversion/branches/wc-collate-path/subversion/libsvn_fs_fs/tree.c
    subversion/branches/wc-collate-path/subversion/libsvn_ra_local/ra_plugin.c
    subversion/branches/wc-collate-path/subversion/libsvn_ra_local/split_url.c
    subversion/branches/wc-collate-path/subversion/libsvn_ra_serf/inherited_props.c
    subversion/branches/wc-collate-path/subversion/libsvn_ra_serf/property.c
    subversion/branches/wc-collate-path/subversion/libsvn_ra_serf/ra_serf.h
    subversion/branches/wc-collate-path/subversion/libsvn_ra_serf/replay.c
    subversion/branches/wc-collate-path/subversion/libsvn_ra_serf/serf.c
    subversion/branches/wc-collate-path/subversion/libsvn_ra_serf/update.c
    subversion/branches/wc-collate-path/subversion/libsvn_ra_serf/util.c
    subversion/branches/wc-collate-path/subversion/libsvn_ra_svn/client.c
    subversion/branches/wc-collate-path/subversion/libsvn_ra_svn/cyrus_auth.c
    subversion/branches/wc-collate-path/subversion/libsvn_repos/fs-wrap.c
    subversion/branches/wc-collate-path/subversion/libsvn_repos/reporter.c
    subversion/branches/wc-collate-path/subversion/libsvn_subr/cache_config.c
    subversion/branches/wc-collate-path/subversion/libsvn_subr/cmdline.c
    subversion/branches/wc-collate-path/subversion/libsvn_subr/dirent_uri.c
    subversion/branches/wc-collate-path/subversion/libsvn_subr/error.c
    subversion/branches/wc-collate-path/subversion/libsvn_subr/named_atomic.c
    subversion/branches/wc-collate-path/subversion/libsvn_subr/properties.c
    subversion/branches/wc-collate-path/subversion/libsvn_subr/sqlite.c
    subversion/branches/wc-collate-path/subversion/libsvn_subr/string.c
    subversion/branches/wc-collate-path/subversion/libsvn_subr/temp_serializer.c
    subversion/branches/wc-collate-path/subversion/libsvn_subr/utf8proc.c
    subversion/branches/wc-collate-path/subversion/libsvn_subr/win32_crashrpt.c
    subversion/branches/wc-collate-path/subversion/libsvn_subr/win32_crypto.c
    subversion/branches/wc-collate-path/subversion/libsvn_subr/win32_xlate.c
    subversion/branches/wc-collate-path/subversion/libsvn_wc/adm_files.c
    subversion/branches/wc-collate-path/subversion/libsvn_wc/adm_ops.c
    subversion/branches/wc-collate-path/subversion/libsvn_wc/conflicts.c
    subversion/branches/wc-collate-path/subversion/libsvn_wc/copy.c
    subversion/branches/wc-collate-path/subversion/libsvn_wc/deprecated.c
    subversion/branches/wc-collate-path/subversion/libsvn_wc/diff_editor.c
    subversion/branches/wc-collate-path/subversion/libsvn_wc/diff_local.c
    subversion/branches/wc-collate-path/subversion/libsvn_wc/externals.c
    subversion/branches/wc-collate-path/subversion/libsvn_wc/info.c
    subversion/branches/wc-collate-path/subversion/libsvn_wc/lock.c
    subversion/branches/wc-collate-path/subversion/libsvn_wc/node.c
    subversion/branches/wc-collate-path/subversion/libsvn_wc/props.c
    subversion/branches/wc-collate-path/subversion/libsvn_wc/props.h
    subversion/branches/wc-collate-path/subversion/libsvn_wc/status.c
    subversion/branches/wc-collate-path/subversion/libsvn_wc/translate.c
    subversion/branches/wc-collate-path/subversion/libsvn_wc/update_editor.c
    subversion/branches/wc-collate-path/subversion/libsvn_wc/wc-metadata.sql
    subversion/branches/wc-collate-path/subversion/libsvn_wc/wc-queries.sql
    subversion/branches/wc-collate-path/subversion/libsvn_wc/wc.h
    subversion/branches/wc-collate-path/subversion/libsvn_wc/wc_db.c
    subversion/branches/wc-collate-path/subversion/libsvn_wc/wc_db.h
    subversion/branches/wc-collate-path/subversion/libsvn_wc/wc_db_private.h
    subversion/branches/wc-collate-path/subversion/libsvn_wc/wc_db_update_move.c
    subversion/branches/wc-collate-path/subversion/libsvn_wc/wc_db_wcroot.c
    subversion/branches/wc-collate-path/subversion/mod_dav_svn/authz.c
    subversion/branches/wc-collate-path/subversion/mod_dav_svn/dav_svn.h
    subversion/branches/wc-collate-path/subversion/mod_dav_svn/reports/inherited-props.c
    subversion/branches/wc-collate-path/subversion/mod_dav_svn/reports/update.c
    subversion/branches/wc-collate-path/subversion/mod_dav_svn/repos.c
    subversion/branches/wc-collate-path/subversion/svn/add-cmd.c
    subversion/branches/wc-collate-path/subversion/svn/cl.h
    subversion/branches/wc-collate-path/subversion/svn/conflict-callbacks.c
    subversion/branches/wc-collate-path/subversion/svn/import-cmd.c
    subversion/branches/wc-collate-path/subversion/svn/info-cmd.c
    subversion/branches/wc-collate-path/subversion/svn/list-cmd.c
    subversion/branches/wc-collate-path/subversion/svn/log-cmd.c
    subversion/branches/wc-collate-path/subversion/svn/mergeinfo-cmd.c
    subversion/branches/wc-collate-path/subversion/svn/propedit-cmd.c
    subversion/branches/wc-collate-path/subversion/svn/propget-cmd.c
    subversion/branches/wc-collate-path/subversion/svn/proplist-cmd.c
    subversion/branches/wc-collate-path/subversion/svn/props.c
    subversion/branches/wc-collate-path/subversion/svn/propset-cmd.c
    subversion/branches/wc-collate-path/subversion/svn/schema/info.rnc
    subversion/branches/wc-collate-path/subversion/svn/util.c
    subversion/branches/wc-collate-path/subversion/svnmucc/svnmucc.c
    subversion/branches/wc-collate-path/subversion/svnrdump/dump_editor.c
    subversion/branches/wc-collate-path/subversion/svnrdump/svnrdump.c
    subversion/branches/wc-collate-path/subversion/svnrdump/svnrdump.h
    subversion/branches/wc-collate-path/subversion/svnserve/cyrus_auth.c
    subversion/branches/wc-collate-path/subversion/svnserve/serve.c
    subversion/branches/wc-collate-path/subversion/tests/cmdline/autoprop_tests.py
    subversion/branches/wc-collate-path/subversion/tests/cmdline/copy_tests.py
    subversion/branches/wc-collate-path/subversion/tests/cmdline/depth_tests.py
    subversion/branches/wc-collate-path/subversion/tests/cmdline/diff_tests.py
    subversion/branches/wc-collate-path/subversion/tests/cmdline/externals_tests.py
    subversion/branches/wc-collate-path/subversion/tests/cmdline/getopt_tests.py
    subversion/branches/wc-collate-path/subversion/tests/cmdline/import_tests.py
    subversion/branches/wc-collate-path/subversion/tests/cmdline/info_tests.py
    subversion/branches/wc-collate-path/subversion/tests/cmdline/iprop_tests.py
    subversion/branches/wc-collate-path/subversion/tests/cmdline/merge_automatic_tests.py
    subversion/branches/wc-collate-path/subversion/tests/cmdline/merge_tests.py
    subversion/branches/wc-collate-path/subversion/tests/cmdline/patch_tests.py
    subversion/branches/wc-collate-path/subversion/tests/cmdline/prop_tests.py
    subversion/branches/wc-collate-path/subversion/tests/cmdline/special_tests.py
    subversion/branches/wc-collate-path/subversion/tests/cmdline/stat_tests.py
    subversion/branches/wc-collate-path/subversion/tests/cmdline/svnadmin_tests.py
    subversion/branches/wc-collate-path/subversion/tests/cmdline/svnlook_tests.py
    subversion/branches/wc-collate-path/subversion/tests/cmdline/svnmucc_tests.py
    subversion/branches/wc-collate-path/subversion/tests/cmdline/svnrdump_tests.py
    subversion/branches/wc-collate-path/subversion/tests/cmdline/svnrdump_tests_data/trunk-A-changes.expected.dump
    subversion/branches/wc-collate-path/subversion/tests/cmdline/svnrdump_tests_data/trunk-only.expected.dump
    subversion/branches/wc-collate-path/subversion/tests/cmdline/svntest/actions.py
    subversion/branches/wc-collate-path/subversion/tests/cmdline/svntest/factory.py
    subversion/branches/wc-collate-path/subversion/tests/cmdline/svntest/main.py
    subversion/branches/wc-collate-path/subversion/tests/cmdline/svntest/sandbox.py
    subversion/branches/wc-collate-path/subversion/tests/cmdline/svntest/verify.py
    subversion/branches/wc-collate-path/subversion/tests/cmdline/svntest/wc.py
    subversion/branches/wc-collate-path/subversion/tests/cmdline/switch_tests.py
    subversion/branches/wc-collate-path/subversion/tests/cmdline/update_tests.py
    subversion/branches/wc-collate-path/subversion/tests/libsvn_client/client-test.c
    subversion/branches/wc-collate-path/subversion/tests/libsvn_fs/fs-test.c
    subversion/branches/wc-collate-path/subversion/tests/libsvn_repos/repos-test.c
    subversion/branches/wc-collate-path/subversion/tests/libsvn_subr/dirent_uri-test.c
    subversion/branches/wc-collate-path/subversion/tests/libsvn_subr/path-test.c
    subversion/branches/wc-collate-path/subversion/tests/libsvn_subr/spillbuf-test.c
    subversion/branches/wc-collate-path/subversion/tests/libsvn_subr/stream-test.c
    subversion/branches/wc-collate-path/subversion/tests/libsvn_subr/string-test.c
    subversion/branches/wc-collate-path/subversion/tests/libsvn_wc/   (props changed)
    subversion/branches/wc-collate-path/subversion/tests/libsvn_wc/db-test.c
    subversion/branches/wc-collate-path/subversion/tests/libsvn_wc/op-depth-test.c
    subversion/branches/wc-collate-path/subversion/tests/libsvn_wc/utils.c
    subversion/branches/wc-collate-path/subversion/tests/libsvn_wc/utils.h
    subversion/branches/wc-collate-path/subversion/tests/svn_test_fs.c
    subversion/branches/wc-collate-path/tools/client-side/svn-bench/cl.h
    subversion/branches/wc-collate-path/tools/client-side/svn-bench/null-list-cmd.c
    subversion/branches/wc-collate-path/tools/client-side/svn-bench/null-log-cmd.c
    subversion/branches/wc-collate-path/tools/server-side/   (props changed)
    subversion/branches/wc-collate-path/tools/server-side/fsfs-reorg.c
    subversion/branches/wc-collate-path/tools/server-side/svn-backup-dumps.py
    subversion/branches/wc-collate-path/tools/server-side/svnauthz-validate.c

Propchange: subversion/branches/wc-collate-path/
------------------------------------------------------------------------------
  Merged /subversion/branches/issue-4194-dev:r1410507-1414880
  Merged /subversion/trunk:r1405864-1416958
  Merged /subversion/branches/ev2-export:r1413107

Modified: subversion/branches/wc-collate-path/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/CHANGES?rev=1416996&r1=1416995&r2=1416996&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/CHANGES (original)
+++ subversion/branches/wc-collate-path/CHANGES Tue Dec  4 15:35:13 2012
@@ -104,7 +104,7 @@ http://svn.apache.org/repos/asf/subversi
   - Client-side bugfixes:
     * Fix "svn status -u --depth empty FILE" (r1348822, r1349215)
     * Fix example output of 'svn help status' (issue #3962)
-    * svn propset of svn:eol-style might not notice related text changes (r1353572)
+    * propset of svn:eol-style might not notice related text changes (r1353572)
     * sort output of 'svn propget -R' (r1355699)
     * sort output of 'svn proplist' (r1355698)
     * sort output of 'svn status' (r1341012)

Modified: subversion/branches/wc-collate-path/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/Makefile.in?rev=1416996&r1=1416995&r2=1416996&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/Makefile.in (original)
+++ subversion/branches/wc-collate-path/Makefile.in Tue Dec  4 15:35:13 2012
@@ -156,6 +156,8 @@ CTYPES_PYTHON_SRC_DIR = $(abs_srcdir)/su
 JAVAHL_JAR=subversion/bindings/javahl/svn-javahl.jar
 JAVAHL_INCLUDES= @JNI_INCLUDES@ -I$(abs_builddir)/subversion/bindings/javahl/include
 
+CXXHL_INCLUDES = -I$(abs_srcdir)/subversion/bindings/cxxhl/include
+
 SVN_APR_CONFIG = @SVN_APR_CONFIG@
 SVN_APR_INCLUDES = @SVN_APR_INCLUDES@
 SVN_APRUTIL_CONFIG = @SVN_APRUTIL_CONFIG@
@@ -196,6 +198,9 @@ COMPILE_JAVAHL_CXX = $(LIBTOOL) $(LTCXXF
 COMPILE_JAVAHL_JAVAC = $(JAVAC) $(JAVAC_FLAGS)
 COMPILE_JAVAHL_JAVAH = $(JAVAH)
 
+# special compilation for files destined for cxxhl
+COMPILE_CXXHL_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=compile $(COMPILE_CXX) $(LT_CFLAGS) $(CXXHL_INCLUDES) -o $@ -c
+
 LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(libdir)
 LINK_LIB = $(LINK) $(LT_SO_VERSION)
 LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) -rpath $(libdir)
@@ -283,7 +288,7 @@ INSTALL_EXTRA_SWIG_PY=\
 
 # export an env variable so that the tests can run without being installed
 TEST_SHLIB_VAR_SWIG_PY=\
-  if [ "@SVN_APR_SHLIB_PATH_VAR@" == "DYLD_LIBRARY_PATH" ]; then \
+  if [ "@SVN_APR_SHLIB_PATH_VAR@" = "DYLD_LIBRARY_PATH" ]; then \
     for d in $(SWIG_PY_DIR)/libsvn_swig_py $(SWIG_PY_DIR)/../../../libsvn_*; do \
       if [ -n "$$DYLD_LIBRARY_PATH" ]; then \
         @SVN_APR_SHLIB_PATH_VAR@="$$@SVN_APR_SHLIB_PATH_VAR@:$$d/.libs"; \
@@ -326,7 +331,7 @@ INSTALL_EXTRA_SWIG_RB=\
 
 # export an env variable so that the tests can run without being installed
 TEST_SHLIB_VAR_SWIG_RB=\
-  if [ "@SVN_APR_SHLIB_PATH_VAR@" == "DYLD_LIBRARY_PATH" ]; then \
+  if [ "@SVN_APR_SHLIB_PATH_VAR@" = "DYLD_LIBRARY_PATH" ]; then \
     for d in $(SWIG_PY_DIR)/libsvn_swig_rb $(SWIG_PY_DIR)/../../../libsvn_*; do \
       if [ -n "$$DYLD_LIBRARY_PATH" ]; then \
         @SVN_APR_SHLIB_PATH_VAR@="$$@SVN_APR_SHLIB_PATH_VAR@:$$d/.libs"; \
@@ -517,6 +522,9 @@ check: bin @TRANSFORM_LIBTOOL_SCRIPTS@ $
 	  if test "$(SSL_CERT)" != ""; then                                  \
 	    flags="--ssl-cert $(SSL_CERT) $$flags";                          \
 	  fi;                                                                \
+	  if test "$(HTTP_PROXY)" != ""; then                                \
+	    flags="--http-proxy $(HTTP_PROXY) $$flags";                      \
+	  fi;                                                                \
 	  LD_LIBRARY_PATH='$(auth_plugin_dirs):$(LD_LIBRARY_PATH)'           \
 	  $(PYTHON) $(top_srcdir)/build/run_tests.py                         \
 	            --config-file $(top_srcdir)/subversion/tests/tests.conf  \
@@ -564,7 +572,23 @@ svnsshcheck: bin $(TEST_DEPS) @BDB_TEST_
 bdbcheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@
 	@$(MAKE) check FS_TYPE=bdb
 
-check-clean:
+# Create an execution coverage report from the data collected during
+# all execution since the last reset.
+gcov:
+	lcov --capture -d . -b . -o gcov-lcov.dat > gcov-lcov.log
+	genhtml gcov-lcov.dat -o gcov-report > gcov-genhtml.log
+
+# Reset all execution coverage counters to zero.
+gcov-reset:
+	lcov --zerocounters -d .
+
+# Remove the execution coverage data and the report.
+gcov-clean:
+	rm -f gcov-lcov.dat gcov-lcov.log gcov-genhtml.log
+	rm -rf gcov-report
+	find . -name "*.gcda" -o -name "*.gcno" -print0 | xargs -0 rm -f
+
+check-clean: gcov-clean
 	rm -rf subversion/tests/cmdline/svn-test-work          \
 	       subversion/tests/libsvn_fs/test-repo-*          \
 	       subversion/tests/libsvn_fs_base/test-repo-*     \
@@ -842,9 +866,14 @@ swig-rb: autogen-swig-rb
 check-swig-rb: swig-rb svnserve
 	$(TEST_SHLIB_VAR_SWIG_RB) \
 	cd $(SWIG_RB_DIR); \
-	  $(RUBY) -I $(SWIG_RB_SRC_DIR) \
-	    $(SWIG_RB_SRC_DIR)/test/run-test.rb \
-	    --verbose=$(SWIG_RB_TEST_VERBOSE)
+          if [ "$(RUBY_MAJOR)" -eq 1 -a "$(RUBY_MINOR)" -lt 9 ] ; then \
+            $(RUBY) -I $(SWIG_RB_SRC_DIR) \
+              $(SWIG_RB_SRC_DIR)/test/run-test.rb \
+	      --verbose=$(SWIG_RB_TEST_VERBOSE); \
+          else \
+	    $(RUBY) -I $(SWIG_RB_SRC_DIR) \
+	      $(SWIG_RB_SRC_DIR)/test/run-test.rb; \
+          fi
 
 EXTRACLEAN_SWIG_RB=rm -f $(SWIG_RB_SRC_DIR)/svn_*.c $(SWIG_RB_SRC_DIR)/core.c
 

Modified: subversion/branches/wc-collate-path/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/build.conf?rev=1416996&r1=1416995&r2=1416996&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/build.conf (original)
+++ subversion/branches/wc-collate-path/build.conf Tue Dec  4 15:35:13 2012
@@ -38,6 +38,8 @@ private-includes =
         subversion/include/private/*.h
         subversion/bindings/swig/include/*.swg
         subversion/libsvn_delta/compose_delta.c
+        subversion/bindings/cxxhl/include/*.h
+        subversion/bindings/cxxhl/include/types/*.h
         subversion/libsvn_subr/utf8proc/utf8proc.c
         subversion/libsvn_subr/utf8proc/utf8proc.h
         subversion/libsvn_subr/utf8proc/utf8proc_data.c
@@ -229,7 +231,7 @@ type = lib
 path = subversion/libsvn_diff
 libs = libsvn_subr apriconv apr zlib
 install = lib
-msvc-export = svn_diff.h
+msvc-export = svn_diff.h private\svn_diff_private.h
 
 # The repository filesystem library
 [libsvn_fs]
@@ -626,6 +628,22 @@ link-cmd = $(LINK_JAVAHL_CXX)
 
 # ----------------------------------------------------------------------------
 #
+# C++HL targets
+#
+
+[libsvncxxhl]
+description = Subversion C++ HighLevel binding
+type = lib
+path = subversion/bindings/cxxhl
+libs = libsvn_repos libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_diff
+       libsvn_subr libsvn_fs aprutil apriconv apr
+sources = src/*.cpp src/types/*.cpp
+install = cxxhl-lib
+compile-cmd = $(COMPILE_CXXHL_CXX)
+link-cmd = $(LINK_CXX_LIB)
+
+# ----------------------------------------------------------------------------
+#
 # TESTING TARGETS
 #
 
@@ -889,14 +907,6 @@ sources = utf-test.c
 install = test
 libs = libsvn_test libsvn_subr apriconv apr
 
-[target-test]
-description = Test the condense_targets functions
-type = exe
-path = subversion/tests/libsvn_subr
-sources = target-test.c
-install = test
-libs = libsvn_test libsvn_subr apriconv apr
-
 [subst_translate-test]
 description = Test the svn_subst_translate* functions
 type = exe
@@ -1025,6 +1035,14 @@ sources = wc-queries-test.c
 install = test
 libs = libsvn_test libsvn_subr apriconv apr sqlite
 
+[wc-test]
+description = Test the main WC API functions
+type = exe
+path = subversion/tests/libsvn_wc
+sources = wc-test.c utils.c
+install = test
+libs = libsvn_client libsvn_test libsvn_wc libsvn_subr apriconv apr
+
 # ----------------------------------------------------------------------------
 # These are not unit tests at all, they are small programs that exercise
 # parts of the libsvn_delta API from the command line.  They are stuck here
@@ -1174,7 +1192,7 @@ libs = __ALL__
        strings-reps-test changes-test locks-test repos-test
        checksum-test compat-test config-test hashdump-test mergeinfo-test
        opt-test path-test stream-test string-test time-test utf-test
-       target-test error-test cache-test spillbuf-test crypto-test
+       error-test cache-test spillbuf-test crypto-test
        named_atomic-test named_atomic-proc-test revision-test
        subst_translate-test io-test
        translate-test
@@ -1183,10 +1201,10 @@ libs = __ALL__
        ra-local-test
        svndiff-test vdelta-test
        entries-dump atomic-ra-revprop-change wc-lock-tester wc-incomplete-tester
-       diff diff3 diff4 fsfs-reorg svn-bench
+       diff diff3 diff4 fsfs-reorg fsfs-stats svn-bench
        client-test
        conflict-data-test db-test pristine-store-test entries-compat-test
-       op-depth-test dirent_uri-test wc-queries-test
+       op-depth-test dirent_uri-test wc-queries-test wc-test
        auth-test
        parse-diff-test
        svn-rep-sharing-stats svn-populate-node-origins-index
@@ -1239,6 +1257,13 @@ sources = fsfs-reorg.c
 install = tools
 libs = libsvn_delta libsvn_subr apr
 
+[fsfs-stats]
+type = exe
+path = tools/server-side
+sources = fsfs-stats.c
+install = tools
+libs = libsvn_delta libsvn_subr apr
+
 [diff]
 type = exe
 path = tools/diff

Modified: subversion/branches/wc-collate-path/build/ac-macros/apache.m4
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/build/ac-macros/apache.m4?rev=1416996&r1=1416995&r2=1416996&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/build/ac-macros/apache.m4 (original)
+++ subversion/branches/wc-collate-path/build/ac-macros/apache.m4 Tue Dec  4 15:35:13 2012
@@ -97,7 +97,7 @@ if test -n "$APXS" && test "$APXS" != "n
       apache_minor_version_wanted_regex="0"
       ;;
     1)
-      apache_minor_version_wanted_regex=["[1-4]"]
+      apache_minor_version_wanted_regex=["[1-5]"]
       ;;
     2)
       apache_minor_version_wanted_regex=["[3-5]"]

Modified: subversion/branches/wc-collate-path/build/ac-macros/apr.m4
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/build/ac-macros/apr.m4?rev=1416996&r1=1416995&r2=1416996&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/build/ac-macros/apr.m4 (original)
+++ subversion/branches/wc-collate-path/build/ac-macros/apr.m4 Tue Dec  4 15:35:13 2012
@@ -125,11 +125,11 @@ AC_DEFUN(SVN_DOWNLOAD_APR,
   echo "get it with SVN and put it in a subdirectory of this source:"
   echo ""
   echo "   svn co \\"
-  echo "    http://svn.apache.org/repos/asf/apr/apr/branches/1.3.x \\"
+  echo "    http://svn.apache.org/repos/asf/apr/apr/branches/1.4.x \\"
   echo "    apr"
   echo ""
   echo "Run that right here in the top level of the Subversion tree."
-  echo "Afterwards, run apr/buildconf in that subdirectory and"
+  echo "Afterwards, run ./buildconf in that subdirectory and"
   echo "then run configure again here."
   echo ""
   echo "Whichever of the above you do, you probably need to do"
@@ -138,7 +138,7 @@ AC_DEFUN(SVN_DOWNLOAD_APR,
   echo "getting both from SVN with:"
   echo ""
   echo "   svn co \\"
-  echo "    http://svn.apache.org/repos/asf/apr/apr-util/branches/1.3.x \\"
+  echo "    http://svn.apache.org/repos/asf/apr/apr-util/branches/1.5.x \\"
   echo "    apr-util"
   echo ""
   AC_MSG_ERROR([no suitable apr found])

Modified: subversion/branches/wc-collate-path/build/ac-macros/aprutil.m4
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/build/ac-macros/aprutil.m4?rev=1416996&r1=1416995&r2=1416996&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/build/ac-macros/aprutil.m4 (original)
+++ subversion/branches/wc-collate-path/build/ac-macros/aprutil.m4 Tue Dec  4 15:35:13 2012
@@ -129,11 +129,11 @@ AC_DEFUN(SVN_DOWNLOAD_APRUTIL,
   echo "get it with SVN and put it in a subdirectory of this source:"
   echo ""
   echo "   svn co \\"
-  echo "    http://svn.apache.org/repos/asf/apr/apr-util/branches/1.3.x \\"
+  echo "    http://svn.apache.org/repos/asf/apr/apr-util/branches/1.5.x \\"
   echo "    apr-util"
   echo ""
   echo "Run that right here in the top level of the Subversion tree."
-  echo "Afterwards, run apr-util/buildconf in that subdirectory and"
+  echo "Afterwards, run ./buildconf in that subdirectory and"
   echo "then run configure again here."
   echo ""
   AC_MSG_ERROR([no suitable APRUTIL found])

Modified: subversion/branches/wc-collate-path/build/ac-macros/macosx.m4
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/build/ac-macros/macosx.m4?rev=1416996&r1=1416995&r2=1416996&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/build/ac-macros/macosx.m4 (original)
+++ subversion/branches/wc-collate-path/build/ac-macros/macosx.m4 Tue Dec  4 15:35:13 2012
@@ -24,25 +24,21 @@ dnl Check for _dyld_image_name and _dyld
 AC_DEFUN(SVN_LIB_MACHO_ITERATE,
 [
   AC_MSG_CHECKING([for Mach-O dynamic module iteration functions])
-
-  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+  AC_RUN_IFELSE([AC_LANG_PROGRAM([[
     #include <mach-o/dyld.h>
     #include <mach-o/loader.h>
-    int check(void) {
-      const struct mach_header *header = _dyld_get_image_header(0);
-      const char *name = _dyld_get_image_name(0);
-      if (name && header) return 1;
-      return 0;
-    }
-  ]],[[]])],[have_macho_iterate=yes],[have_macho_iterate=no])
-
-  if test "$have_macho_iterate" = "yes"; then
+  ]],[[
+    const struct mach_header *header = _dyld_get_image_header(0);
+    const char *name = _dyld_get_image_name(0);
+    if (name && header) return 0;
+    return 1;
+  ]])],[
     AC_DEFINE([SVN_HAVE_MACHO_ITERATE], [1],
               [Is Mach-O low-level _dyld API available?])
     AC_MSG_RESULT([yes])
-  else
+  ],[
     AC_MSG_RESULT([no])
-  fi
+  ])
 ])
 
 dnl SVN_LIB_MACOS_PLIST
@@ -53,12 +49,12 @@ AC_DEFUN(SVN_LIB_MACOS_PLIST,
 
   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
     #include <AvailabilityMacros.h>
-    #if !DARWIN || (MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_0)
+    #if !defined(MAC_OS_X_VERSION_MAX_ALLOWED) \
+     || !defined(MAC_OS_X_VERSION_10_0) \
+     || (MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_0)
     #error ProperyList API unavailable.
     #endif
-  ]],[[]])],[have_macos_plist=yes],[have_macos_plist=no])
-
-  if test "$have_macos_plist" = "yes"; then
+  ]],[[]])],[
     dnl ### Hack.  We should only need to pass the -framework options when
     dnl linking libsvn_subr, since it is the only library that uses Keychain.
     dnl
@@ -75,9 +71,9 @@ AC_DEFUN(SVN_LIB_MACOS_PLIST,
     AC_DEFINE([SVN_HAVE_MACOS_PLIST], [1],
               [Is Mac OS property list API available?])
     AC_MSG_RESULT([yes])
-  else
+  ],[
     AC_MSG_RESULT([no])
-  fi
+  ])
 ])
 
 dnl SVN_LIB_MACOS_KEYCHAIN
@@ -92,28 +88,23 @@ AC_DEFUN(SVN_LIB_MACOS_KEYCHAIN,
 
   AC_MSG_CHECKING([for Mac OS KeyChain Services])
 
-  if test "$have_macos_plist" != "yes"; then
-    dnl There's no sense in checking for KeyChain if plists are not available
-    enable_keychain=no
-    AC_MSG_RESULT([no])
-  else
-    if test "$enable_keychain" = "yes"; then
-      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-        #include <AvailabilityMacros.h>
-        #if !DARWIN || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_2)
-        #error KeyChain API unavailable.
-        #endif
-      ]],[[]])],[],[enable_keychain=no])
-    fi
-
-    if test "$enable_keychain" = "yes"; then
+  if test "$enable_keychain" = "yes"; then
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+      #include <AvailabilityMacros.h>
+      #if !defined(MAC_OS_X_VERSION_MAX_ALLOWED) \
+       || !defined(MAC_OS_X_VERSION_10_2) \
+       || (MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2)
+      #error KeyChain API unavailable.
+      #endif
+    ]],[[]])],[
       dnl ### Hack, see SVN_LIB_MACOS_PLIST
       LIBS="$LIBS -framework Security"
       LIBS="$LIBS -framework CoreServices"
       AC_DEFINE([SVN_HAVE_KEYCHAIN_SERVICES], [1], [Is Mac OS KeyChain support enabled?])
       AC_MSG_RESULT([yes])
-    else
+    ],[
+      enable_keychain=no
       AC_MSG_RESULT([no])
-    fi
+    ])
   fi
 ])

Modified: subversion/branches/wc-collate-path/build/ac-macros/serf.m4
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/build/ac-macros/serf.m4?rev=1416996&r1=1416995&r2=1416996&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/build/ac-macros/serf.m4 (original)
+++ subversion/branches/wc-collate-path/build/ac-macros/serf.m4 Tue Dec  4 15:35:13 2012
@@ -145,6 +145,7 @@ AC_DEFUN(SVN_SERF_PKG_CONFIG,
           serf_found=yes
           SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_major --cflags | $SED -e 's/-D[^ ]*//g'`]
           SVN_SERF_LIBS=`$PKG_CONFIG $serf_major --libs` 
+          break
         else
           AC_MSG_RESULT([no])
           AC_MSG_WARN([Serf version too old: need $serf_check_version])

Modified: subversion/branches/wc-collate-path/build/ac-macros/sqlite.m4
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/build/ac-macros/sqlite.m4?rev=1416996&r1=1416995&r2=1416996&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/build/ac-macros/sqlite.m4 (original)
+++ subversion/branches/wc-collate-path/build/ac-macros/sqlite.m4 Tue Dec  4 15:35:13 2012
@@ -243,9 +243,9 @@ AC_DEFUN(SVN_DOWNLOAD_SQLITE,
   echo ""
   echo "get the sqlite ${SQLITE_RECOMMENDED_VER} amalgamation from:"
   echo "    ${SQLITE_URL}"
-  echo "unpack the archive using tar/gunzip and copy sqlite3.c from the"
+  echo "unpack the archive using tar/gunzip and rename the"
   echo "resulting directory to:"
-  echo "$abs_srcdir/sqlite-amalgamation/sqlite3.c"
+  echo "$abs_srcdir/sqlite-amalgamation"
   echo ""
   AC_MSG_ERROR([Subversion requires SQLite])
 ])

Modified: subversion/branches/wc-collate-path/build/generator/gen_make.py
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/build/generator/gen_make.py?rev=1416996&r1=1416995&r2=1416996&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/build/generator/gen_make.py (original)
+++ subversion/branches/wc-collate-path/build/generator/gen_make.py Tue Dec  4 15:35:13 2012
@@ -423,8 +423,9 @@ class Generator(gen_base.GeneratorBase):
         # certain areas require hooks for extra install rules defined
         # in Makefile.in
         ### we should turn AREA into an object, then test it instead of this
-        if area[:5] == 'swig-' and area[-4:] != '-lib' or \
-           area[:7] == 'javahl-' \
+        if area[:5] == 'swig-' and area[-4:] != '-lib' \
+           or area[:7] == 'javahl-' \
+           or area[:6] == 'cxxhl-' \
            or area == 'tools':
           ezt_area.extra_install = 'yes'
 

Modified: subversion/branches/wc-collate-path/build/run_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/build/run_tests.py?rev=1416996&r1=1416995&r2=1416996&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/build/run_tests.py (original)
+++ subversion/branches/wc-collate-path/build/run_tests.py Tue Dec  4 15:35:13 2012
@@ -28,7 +28,7 @@
             [--url=<base-url>] [--http-library=<http-library>] [--enable-sasl]
             [--fs-type=<fs-type>] [--fsfs-packing] [--fsfs-sharding=<n>]
             [--list] [--milestone-filter=<regex>] [--mode-filter=<type>]
-            [--server-minor-version=<version>]
+            [--server-minor-version=<version>] [--http-proxy=<host>:<port>]
             [--config-file=<file>] [--ssl-cert=<file>]
             <abs_srcdir> <abs_builddir>
             <prog ...>
@@ -124,7 +124,8 @@ class TestHarness:
                cleanup=None, enable_sasl=None, parallel=None, config_file=None,
                fsfs_sharding=None, fsfs_packing=None,
                list_tests=None, svn_bin=None, mode_filter=None,
-               milestone_filter=None, set_log_level=None, ssl_cert=None):
+               milestone_filter=None, set_log_level=None, ssl_cert=None,
+               http_proxy=None):
     '''Construct a TestHarness instance.
 
     ABS_SRCDIR and ABS_BUILDDIR are the source and build directories.
@@ -176,6 +177,7 @@ class TestHarness:
     self.mode_filter = mode_filter
     self.log = None
     self.ssl_cert = ssl_cert
+    self.http_proxy = http_proxy
     if not sys.stdout.isatty() or sys.platform == 'win32':
       TextColors.disable()
 
@@ -477,6 +479,8 @@ class TestHarness:
       svntest.main.options.mode_filter = self.mode_filter
     if self.ssl_cert is not None:
       svntest.main.options.ssl_cert = self.ssl_cert
+    if self.http_proxy is not None:
+      svntest.main.options.http_proxy = self.http_proxy
 
     svntest.main.options.srcdir = self.srcdir
 
@@ -640,7 +644,8 @@ def main():
                             'fsfs-packing', 'fsfs-sharding=',
                             'enable-sasl', 'parallel', 'config-file=',
                             'log-to-stdout', 'list', 'milestone-filter=',
-                            'mode-filter=', 'set-log-level=', 'ssl-cert='])
+                            'mode-filter=', 'set-log-level=', 'ssl-cert=',
+                            'http-proxy='])
   except getopt.GetoptError:
     args = []
 
@@ -651,9 +656,9 @@ def main():
   base_url, fs_type, verbose, cleanup, enable_sasl, http_library, \
     server_minor_version, fsfs_sharding, fsfs_packing, parallel, \
     config_file, log_to_stdout, list_tests, mode_filter, milestone_filter, \
-    set_log_level, ssl_cert = \
+    set_log_level, ssl_cert, http_proxy = \
             None, None, None, None, None, None, None, None, None, None, None, \
-            None, None, None, None, None, None
+            None, None, None, None, None, None, None
   for opt, val in opts:
     if opt in ['-u', '--url']:
       base_url = val
@@ -689,6 +694,8 @@ def main():
       set_log_level = val
     elif opt in ['--ssl-cert']:
       ssl_cert = val
+    elif opt in ['--http-proxy']:
+      http_proxy = val
     else:
       raise getopt.GetoptError
 
@@ -704,7 +711,8 @@ def main():
                    verbose, cleanup, enable_sasl, parallel, config_file,
                    fsfs_sharding, fsfs_packing, list_tests,
                    mode_filter=mode_filter, milestone_filter=milestone_filter,
-                   set_log_level=set_log_level, ssl_cert=ssl_cert)
+                   set_log_level=set_log_level, ssl_cert=ssl_cert,
+                   http_proxy=http_proxy)
 
   failed = th.run(args[2:])
   if failed:

Modified: subversion/branches/wc-collate-path/configure.ac
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/configure.ac?rev=1416996&r1=1416995&r2=1416996&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/configure.ac (original)
+++ subversion/branches/wc-collate-path/configure.ac Tue Dec  4 15:35:13 2012
@@ -626,16 +626,18 @@ AC_SUBST(SVN_GNOME_KEYRING_INCLUDES)
 AC_SUBST(SVN_GNOME_KEYRING_LIBS)
 
 
-dnl Ev2 experimental feature ----------------------
-dnl Note: The Ev2 compat code will be built unconditionally, but by providing
-dnl this flag, users can enforce Ev2 compliance for testing purposes
-AC_ARG_ENABLE(ev2-shims,
-  AS_HELP_STRING([--enable-ev2-shims],
-                 [Compile with Ev2 translation [EXPERIMENTAL]]),
-  [enable_ev2_shims=$enableval],[enable_ev2_shims=no])
-if test "$enable_ev2_shims" = "yes"; then
-  AC_DEFINE(ENABLE_EV2_SHIMS, 1,
-            [Define to 1 if Ev2 should be interjected into editor stacks.])
+dnl Ev2 experimental features ----------------------
+dnl Note: The Ev2 implementations will be built unconditionally, but by
+dnl providing this flag, users can choose to use the currently-shimmed Ev2
+dnl editor implementations for various operations.  This will probably
+dnl negatively impact performance, but is useful for testing.
+AC_ARG_ENABLE(ev2-impl,
+  AS_HELP_STRING([--enable-ev2-impl],
+                 [Use Ev2 implementations, where available [EXPERIMENTAL]]),
+  [enable_ev2_impl=$enableval],[enable_ev2_impl=no])
+if test "$enable_ev2_impl" = "yes"; then
+  AC_DEFINE(ENABLE_EV2_IMPL, 1,
+            [Define to 1 if Ev2 implementations should be used.])
 fi
 
 
@@ -986,7 +988,7 @@ AS_HELP_STRING([--enable-maintainer-mode
         dnl Enable some extra warnings. Put these before the user's flags
         dnl so the user can specify flags that override these.
         CFLAGS="-Wpointer-arith -Wwrite-strings -Wshadow -ansi -Wall -Wformat=2 -Wunused -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wno-multichar -Wredundant-decls -Wnested-externs -Wunreachable-code -Winline -Wno-long-long $CFLAGS"
-        CXXFLAGS="-Wpointer-arith -Wwrite-strings -Wshadow $CXXFLAGS"
+        CXXFLAGS="-Wpointer-arith -Wwrite-strings -Wshadow -ansi -Wall $CXXFLAGS"
 
         dnl some additional flags that can be handy for an occasional review,
         dnl but throw too many warnings in svn code, of too little importance,
@@ -994,7 +996,7 @@ AS_HELP_STRING([--enable-maintainer-mode
         dnl switches enabled.
         dnl CFLAGS="-Wswitch-enum -Wswitch-default $CFLAGS"
 
-        dnl Add each of the following flags only if the compiler accepts it.
+        dnl Add each of the following flags only if the C compiler accepts it.
 
         CFLAGS_KEEP="$CFLAGS"
         AC_LANG_PUSH([C])
@@ -1024,6 +1026,23 @@ AS_HELP_STRING([--enable-maintainer-mode
 
         AC_LANG_POP([C])
         CFLAGS="$CFLAGS_KEEP"
+
+        dnl Add each of the following flags only if the C++ compiler accepts it.
+
+        CXXFLAGS_KEEP="$CXXFLAGS"
+        AC_LANG_PUSH([C++])
+
+        CXXFLAGS="-Wextra-tokens $CXXFLAGS_KEEP"
+        AC_COMPILE_IFELSE([AC_LANG_SOURCE([[]])], [CXXFLAGS_KEEP="$CXXFLAGS"])
+
+        CXXFLAGS="-Wshorten-64-to-32 $CXXFLAGS_KEEP"
+        AC_COMPILE_IFELSE([AC_LANG_SOURCE([[]])], [CXXFLAGS_KEEP="$CXXFLAGS"])
+
+        CXXFLAGS="-Wno-system-headers $CXXFLAGS_KEEP"
+        AC_COMPILE_IFELSE([AC_LANG_SOURCE([[]])], [CXXFLAGS_KEEP="$CXXFLAGS"])
+
+        AC_LANG_POP([C++])
+        CXXFLAGS="$CXXFLAGS_KEEP"
       fi
     fi
 ])
@@ -1093,6 +1112,30 @@ AC_SUBST(MOD_ACTIVATION)
 
 
 
+AC_ARG_ENABLE(gcov,
+AC_HELP_STRING([--enable-gcov],
+               [Turn on gcov coverage testing (GCC only).]),
+[
+    if test "$enableval" = "yes" ; then
+      dnl Probably other compilers support something similar;
+      dnl feel free to extend this to include them.
+      if test "$GCC" = "yes"; then
+        if test "$svn_enable_shared" = "yes" ; then
+          AC_MSG_ERROR([Can't have --enable-gcov without --disable-shared (we
+                        recommend also using --enable-all-static).])
+        fi
+        if test ! "$enable_all_static" = "yes" ; then
+          AC_MSG_WARN(We recommend --enable-all-static with --enable-gcov.)
+        fi
+        AC_MSG_NOTICE([Enabling gcov coverage testing.])
+        CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage"
+        CXXFLAGS="$CXXFLAGS -fprofile-arcs -ftest-coverage"
+      else
+        AC_MSG_ERROR([We only support --enable-gcov with GCC right now.])
+      fi
+    fi
+])
+
 AC_ARG_ENABLE(gprof,
 AS_HELP_STRING([--enable-gprof],
                [Produce gprof profiling data in 'gmon.out' (GCC only).]),
@@ -1145,7 +1188,7 @@ AC_PATH_PROG(PERL, perl, none)
 if test -n "$RUBY"; then
   AC_PATH_PROG(RUBY, "$RUBY", none)
 else
-  AC_PATH_PROGS(RUBY, ruby ruby1.8 ruby18, none)
+  AC_PATH_PROGS(RUBY, ruby ruby1.8 ruby18 ruby1.9 ruby1 ruby1.9.3 ruby193, none)
 fi
 if test "$RUBY" != "none"; then
   AC_MSG_CHECKING([rb_hash_foreach])
@@ -1154,7 +1197,7 @@ if test "$RUBY" != "none"; then
     if test -n "$RDOC"; then
       AC_PATH_PROG(RDOC, "$RDOC", none)
     else
-      AC_PATH_PROGS(RDOC, rdoc rdoc1.8 rdoc18, none)
+      AC_PATH_PROGS(RDOC, rdoc rdoc1.8 rdoc18 rdoc1.9 rdoc19 rdoc1.9.3 rdoc193, none)
     fi
     AC_CACHE_CHECK([for Ruby major version], [svn_cv_ruby_major],[
     svn_cv_ruby_major="`$RUBY -rrbconfig -e 'print RbConfig::CONFIG.fetch(%q(MAJOR))'`"
@@ -1166,14 +1209,23 @@ if test "$RUBY" != "none"; then
     ])
     RUBY_MINOR="$svn_cv_ruby_minor"
 
+    AC_CACHE_CHECK([for Ruby teeny version], [svn_cv_ruby_teeny],[
+    svn_cv_ruby_teeny="`$RUBY -rrbconfig -e 'major, minor, teeny = RUBY_VERSION.split("."); print teeny;'`"
+    ])
+    RUBY_TEENY="$svn_cv_ruby_teeny"
+    
     AC_SUBST(RUBY_MAJOR)
     AC_SUBST(RUBY_MINOR)
-    if test ! \( "$RUBY_MAJOR" -eq "1" -a "$RUBY_MINOR" -eq "8" \); then
-      # Disallow Ruby 1.9 or later until the binding tests get fixed
-      # to run with those versions.
+    AC_SUBST(RUBY_TEENY)
+    if test \( "$RUBY_MAJOR" -eq "1" -a "$RUBY_MINOR" -gt "8" -a "$RUBY_TEENY" -lt "3" \); then
+      # Disallow Ruby between 1.8.7 and 1.9.3
       RUBY="none"
-      AC_MSG_WARN([The detected Ruby is too new for Subversion to use])
-      AC_MSG_WARN([Only 1.8.x releases are supported at this time])
+      AC_MSG_WARN([The detected Ruby is between 1.9 and 1.9.3])
+      AC_MSG_WARN([Only 1.8.x and 1.9.3 releases are supported at this time])
+    elif test \(  "$RUBY_MAJOR" -eq "1" -a "$RUBY_MINOR" -eq "9" -a "$RUBY_TEENY" -eq "3" \); then
+      #Warn about 1.9.3 support
+      AC_MSG_WARN([WARNING: The detected Ruby is 1.9.3])
+      AC_MSG_WARN([WARNING: Only 1.8.x releases are fully supported, 1.9.3 support is new])
     fi
   else
     AC_MSG_RESULT([no])

Modified: subversion/branches/wc-collate-path/contrib/client-side/svnmerge/svnmerge_test.py
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/contrib/client-side/svnmerge/svnmerge_test.py?rev=1416996&r1=1416995&r2=1416996&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/contrib/client-side/svnmerge/svnmerge_test.py (original)
+++ subversion/branches/wc-collate-path/contrib/client-side/svnmerge/svnmerge_test.py Tue Dec  4 15:35:13 2012
@@ -1139,7 +1139,7 @@ D    test3"""
 
     def testMergeAndRollbackEmptyRevisionRange(self):
         """Init svnmerge, modify source head, merge, rollback where no merge
-           occured."""
+           occurred."""
 
         # Initialize svnmerge
         self.svnmerge2(["init", self.test_repo_url + "/trunk"])

Modified: subversion/branches/wc-collate-path/contrib/server-side/svncutter/svncutter
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/contrib/server-side/svncutter/svncutter?rev=1416996&r1=1416995&r2=1416996&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/contrib/server-side/svncutter/svncutter (original)
+++ subversion/branches/wc-collate-path/contrib/server-side/svncutter/svncutter Tue Dec  4 15:35:13 2012
@@ -5,14 +5,14 @@
 # under the prevailing license of their project.
 
 """
-svncutter - clique-squash, range-selection, and property mutations on SVN dump files 
+svncutter - clique-squash, range-selection, property mutations, and skeletonization on SVN dump files 
 general usage: svncutter [-q] [-r SELECTION] SUBCOMMAND
 
 In all commands, the -r (or --range) option limits the selection of revisions
 over which an operation will be performed. A selection consists of
 one or more comma-separated ranges. A range may consist of an integer
 revision number or the special name HEAD for the head revision. Or it
-may be a colon-separated pair of integers, ir an integer followed by a
+may be a colon-separated pair of integers, or an integer followed by a
 colon followed by HEAD.
 
 Normally, each subcommand produces a progress spinner on standard
@@ -29,6 +29,7 @@ Available subcommands:
    proprename
    log
    setlog
+   skeleton
 """
 
 oneliners = {
@@ -39,6 +40,7 @@ oneliners = {
     "proprename": "Renaming revision properties",
     "log":        "Extracting log entries",
     "setlog":     "Mutating log entries",
+    "skeleton":   "strip content, leave only headers",
     }
 
 helpdict = {
@@ -51,7 +53,7 @@ This can be helpful in cleaning up after
 revision control systems, or if a developer has been using a pre-2006
 version of Emacs VC.
 
-With the -m (or --mapfile) option, squash emits a map to tne named
+With the -m (or --mapfile) option, squash emits a map to the named
 file showing how old revision numbers map into new ones.
 
 With the -e (or --excise) option, the specified set of revisions in
@@ -68,7 +70,7 @@ anything that looks like the regular exp
 a comment reference (this is the same format that Subversion uses
 in log headers).
 
-Every revision in the file after the first omiited onf gets the property
+Every revision in the file after the first omitted one gets the property
 'svncutter:original' set to the revision number it had before the
 squash operation.
 
@@ -121,6 +123,12 @@ Replace the log entries in the input dum
 in the LOGFILE, which should be in the format of an svn log output.
 Replacements may be restricted to a specified range.
 """,
+    "skeleton": """\
+skeleton: usage: svncutter [-r SELECTION] skeleton
+
+Strip out all content.  Does not produce a valid dumpfile, but may be useful
+when you need to examine a particularly complex node structure.
+""",
     }
 
 import os, sys, calendar, time, getopt, re
@@ -177,7 +185,7 @@ class LineBufferedSource:
         "Read a line, require it to have a specified prefix."
         line = self.readline()
         if not line:
-            sys.stderr.write("svncutter: unexpected end of input." + os.linesep)
+            sys.stderr.write("svncutter: unexpected end of input while requiring '%s' input." % prefix + os.linesep)
             sys.exit(1)
         assert line.startswith(prefix)
         return line
@@ -211,7 +219,7 @@ class DumpfileSource(LineBufferedSource)
         LineBufferedSource.__init__(self, infile)
         self.baton = baton
     def read_revision_header(self, property_hook=None):
-        "Read a revision header, parsing its proprties."
+        "Read a revision header, parsing its properties."
         properties = {}
         propkeys = []
         stash = self.require("Revision-number:")
@@ -241,6 +249,43 @@ class DumpfileSource(LineBufferedSource)
         if self.baton:
             self.baton.twirl()
         return (revision, stash, properties)
+    def read_node(self):
+        "Read a node header and body."
+        #print "READ NODE BEGINS"
+        header = self.require("Node-path:")
+        while True:
+            line = self.readline()
+            #print "I see header line", repr(line)
+            if not line:
+                sys.stderr.write('unexpected EOF in node header' + os.linesep)
+                sys.exit(1)
+            header += line
+            if line == '\n':
+                break
+        properties = ""
+        if "Prop-content-length" in header:
+            while True:
+                line = self.readline()
+                #print "I see property line", repr(line)
+                if not line:
+                    sys.stderr.write('unexpected EOF in node properties' + os.linesep)
+                    sys.exit(1)
+                properties += line
+                if line == 'PROPS-END\n':
+                    break
+        content = ""
+        if "Text-content-length" in header:
+            while True:
+                line = self.readline()
+                #print "I see contents line", repr(line)
+                if not line:
+                    break
+                content += line
+                if line.startswith("Node-path:") or line.startswith("Revision-number"):
+                    self.push(line)
+                    break
+        #print "READ NODE ENDS"
+        return (header, properties, content)
     def read_until_next(self, prefix, revmap=None):
         "Accumulate lines until the next matches a specified prefix."
         stash = ""
@@ -312,7 +357,7 @@ class SubversionRange:
         return self.txt
 
 class Logfile:
-    "Represent the state of a lofile"
+    "Represent the state of a logfile"
     def __init__(self, readable, restriction=None):
         self.comments = {}
         self.source = LineBufferedSource(readable)
@@ -610,12 +655,49 @@ def setlog(source, logpatch, selection):
         return (propkeys, propdict)
     source.apply_property_hook(selection, loghook)
 
+def skeletonize(source, selection):
+    "Skeletonize a portion of the dump file defined by a revision selection."
+    emit = 0 in selection
+    stash = source.read_until_next("Revision-number:")
+    if emit:
+        sys.stdout.write(stash)
+    if not source.has_line_buffered():    
+        return
+    while True:
+        (revision,stash,properties) = source.read_revision_header()
+        if revision in selection:
+            sys.stdout.write(stash)
+            emit = True
+        elif revision == selection.upperbound()+1:
+            return
+        else:
+            source.read_until_next("Revision-number:")
+            continue
+        while True:
+            line = source.readline()
+            if not line:
+                return
+            elif line == '\n':
+                sys.stdout.write(line)
+                continue
+            elif line.startswith("Revision-number:"):
+                source.push(line)
+                break
+            elif line.startswith("Node-path:"):
+                source.push(line)
+                (header, properties, content) = source.read_node()
+                sys.stdout.write(header + properties)
+                continue
+            else:
+                sys.stderr.write("svncutter: parse at %s doesn't look right (%s), aborting!\n" % (revision, repr(line)))
+                sys.exit(1)
+
 if __name__ == '__main__':
     try:
-        (options, arguments) = getopt.getopt(sys.argv[1:], "ce:fl:m:p:qr:",
+        (options, arguments) = getopt.getopt(sys.argv[1:], "ce:fl:m:p:qr:s",
                                              ["excise", "flagrefs", "revprop=",
                                               "logpatch=", "map=",
-                                              "quiet", "range="])
+                                              "quiet", "range=", "skeleton"])
         selection = SubversionRange("0:HEAD")
         timefuzz = 300	# 5 minute fuzz
         compressmap = False
@@ -646,11 +728,11 @@ if __name__ == '__main__':
             sys.stderr.write("Type 'svncutter help' for usage." + os.linesep)
             sys.exit(1)
         baton = None
-        #if arguments[0] != 'help':
-        #    if progress:
-        #        baton = Baton(oneliners[arguments[0]], "done")
-        #    else:
-        #        baton = None
+        if arguments[0] != 'help':
+            if progress:
+                baton = Baton(oneliners[arguments[0]], "done")
+            else:
+                baton = None
         if arguments[0] == "squash":
             squash(DumpfileSource(sys.stdin, baton),
                    timefuzz, mapto, selection, excise, flagrefs, compressmap)
@@ -678,6 +760,8 @@ if __name__ == '__main__':
             if not logpatch:
                 sys.stderr.write("svncutter: setlog requires a log entries file.\n")
             setlog(DumpfileSource(sys.stdin, baton), logpatch, selection)
+        elif arguments[0] == "skeleton":
+            skeletonize(DumpfileSource(sys.stdin, baton), selection)            
         elif arguments[0] == "help":
             if len(arguments) == 1:
                 sys.stdout.write(__doc__)

Modified: subversion/branches/wc-collate-path/notes/dump-load-format.txt
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/notes/dump-load-format.txt?rev=1416996&r1=1416995&r2=1416996&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/notes/dump-load-format.txt (original)
+++ subversion/branches/wc-collate-path/notes/dump-load-format.txt Tue Dec  4 15:35:13 2012
@@ -297,7 +297,7 @@ $ echo "Replacement text" > dir/file.txt
 $ svn ci -m "Replace dir/file.txt with a copy of otherdir/otherfile.txt and replace its text, too."
 -------------------------------------------------------------------
 
-$Subversion filesystems do not allow the root directory ("/") to be
+Subversion filesystems do not allow the root directory ("/") to be
 deleted or replaced.
 
 === Some details about copyfroms ===

Modified: subversion/branches/wc-collate-path/subversion/bindings/javahl/native/CopySources.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/subversion/bindings/javahl/native/CopySources.cpp?rev=1416996&r1=1416995&r2=1416996&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/subversion/bindings/javahl/native/CopySources.cpp (original)
+++ subversion/branches/wc-collate-path/subversion/bindings/javahl/native/CopySources.cpp Tue Dec  4 15:35:13 2012
@@ -143,10 +143,7 @@ CopySources::array(SVN::Pool &pool)
       // TODO: Default this to svn_opt_revision_undefined (or HEAD)
       Revision rev(jrev);
       src->revision = reinterpret_cast<const svn_opt_revision_t *>
-        (apr_palloc(p, sizeof(*src->revision)));
-      memcpy(const_cast<svn_opt_revision_t *>(src->revision),
-             rev.revision(),
-             sizeof(*src->revision));
+        (apr_pmemdup(p, rev.revision(), sizeof(*src->revision)));
       env->DeleteLocalRef(jrev);
 
       // Extract pegRevision from the copy source.
@@ -164,10 +161,7 @@ CopySources::array(SVN::Pool &pool)
 
       Revision pegRev(jPegRev, true);
       src->peg_revision = reinterpret_cast<const svn_opt_revision_t *>
-        (apr_palloc(p, sizeof(*src->peg_revision)));
-      memcpy(const_cast<svn_opt_revision_t *>(src->peg_revision),
-             pegRev.revision(),
-             sizeof(*src->peg_revision));
+        (apr_pmemdup(p, pegRev.revision(), sizeof(*src->peg_revision)));
       env->DeleteLocalRef(jPegRev);
 
       APR_ARRAY_PUSH(copySources, svn_client_copy_source_t *) = src;

Modified: subversion/branches/wc-collate-path/subversion/bindings/javahl/native/CreateJ.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/subversion/bindings/javahl/native/CreateJ.cpp?rev=1416996&r1=1416995&r2=1416996&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/subversion/bindings/javahl/native/CreateJ.cpp (original)
+++ subversion/branches/wc-collate-path/subversion/bindings/javahl/native/CreateJ.cpp Tue Dec  4 15:35:13 2012
@@ -20,8 +20,8 @@
  * ====================================================================
  * @endcopyright
  *
- * @file ConflictResolverCallback.cpp
- * @brief Implementation of the class ConflictResolverCallback.
+ * @file CreateJ.cpp
+ * @brief Implementation of the class CreateJ.
  */
 
 #include "svn_error.h"
@@ -207,9 +207,8 @@ CreateJ::Checksum(const svn_checksum_t *
     }
 
   jbyteArray jdigest
-    = JNIUtil::makeJByteArray(
-        reinterpret_cast<const signed char *>(checksum->digest),
-        static_cast<int>(svn_checksum_size(checksum)));
+    = JNIUtil::makeJByteArray(checksum->digest,
+                              static_cast<int>(svn_checksum_size(checksum)));
   if (JNIUtil::isExceptionThrown())
     POP_AND_RETURN_NULL;
 
@@ -1020,9 +1019,8 @@ jobject CreateJ::PropertyMap(apr_hash_t 
     POP_AND_RETURN_NULL;
 
   apr_hash_index_t *hi;
-  int i = 0;
   for (hi = apr_hash_first(apr_hash_pool_get(prop_hash), prop_hash);
-       hi; hi = apr_hash_next(hi), ++i)
+       hi; hi = apr_hash_next(hi))
     {
       const char *key;
       svn_string_t *val;
@@ -1036,9 +1034,7 @@ jobject CreateJ::PropertyMap(apr_hash_t 
       if (JNIUtil::isJavaExceptionThrown())
         POP_AND_RETURN_NULL;
 
-      jbyteArray jpropVal = JNIUtil::makeJByteArray(
-                              reinterpret_cast<const signed char *>(val->data),
-                              static_cast<int>(val->len));
+      jbyteArray jpropVal = JNIUtil::makeJByteArray(val);
       if (JNIUtil::isJavaExceptionThrown())
         POP_AND_RETURN_NULL;
 

Modified: subversion/branches/wc-collate-path/subversion/bindings/javahl/native/InputStream.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/subversion/bindings/javahl/native/InputStream.cpp?rev=1416996&r1=1416995&r2=1416996&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/subversion/bindings/javahl/native/InputStream.cpp (original)
+++ subversion/branches/wc-collate-path/subversion/bindings/javahl/native/InputStream.cpp Tue Dec  4 15:35:13 2012
@@ -89,9 +89,7 @@ svn_error_t *InputStream::read(void *bat
     }
 
   // Allocate a Java byte array to read the data.
-  jbyteArray data = JNIUtil::makeJByteArray
-                       (reinterpret_cast<const signed char*>(buffer),
-                        static_cast<int>(*len));
+  jbyteArray data = JNIUtil::makeJByteArray(buffer, static_cast<int>(*len));
   if (JNIUtil::isJavaExceptionThrown())
     return SVN_NO_ERROR;
 

Modified: subversion/branches/wc-collate-path/subversion/bindings/javahl/native/JNIThreadData.h
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/subversion/bindings/javahl/native/JNIThreadData.h?rev=1416996&r1=1416995&r2=1416996&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/subversion/bindings/javahl/native/JNIThreadData.h (original)
+++ subversion/branches/wc-collate-path/subversion/bindings/javahl/native/JNIThreadData.h Tue Dec  4 15:35:13 2012
@@ -21,7 +21,7 @@
  * @endcopyright
  *
  * @file JNIThreadData.h
- * @brief Interface of the class JNIData
+ * @brief Interface of the class JNIThreadData
  */
 
 #ifndef JNITHREADDATA_H

Modified: subversion/branches/wc-collate-path/subversion/bindings/javahl/native/JNIUtil.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/subversion/bindings/javahl/native/JNIUtil.cpp?rev=1416996&r1=1416995&r2=1416996&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/subversion/bindings/javahl/native/JNIUtil.cpp (original)
+++ subversion/branches/wc-collate-path/subversion/bindings/javahl/native/JNIUtil.cpp Tue Dec  4 15:35:13 2012
@@ -395,7 +395,7 @@ JNIUtil::putErrorsInTrace(svn_error_t *e
     return;
 
   char *tmp_path;
-  char *path = svn_relpath_dirname(err->file, err->pool);
+  char *path = svn_dirent_dirname(err->file, err->pool);
   while (tmp_path = strchr(path, '/'))
     *tmp_path = '.';
 
@@ -403,7 +403,7 @@ JNIUtil::putErrorsInTrace(svn_error_t *e
   if (isJavaExceptionThrown())
     return;
 
-  jstring jfileName = makeJString(svn_relpath_basename(err->file, err->pool));
+  jstring jfileName = makeJString(svn_dirent_basename(err->file, err->pool));
   if (isJavaExceptionThrown())
     return;
 
@@ -795,7 +795,7 @@ jobject JNIUtil::createDate(apr_time_t t
  * @param data      the character array
  * @param length    the number of characters in the array
  */
-jbyteArray JNIUtil::makeJByteArray(const signed char *data, int length)
+jbyteArray JNIUtil::makeJByteArray(const void *data, int length)
 {
   if (data == NULL)
     {
@@ -827,6 +827,15 @@ jbyteArray JNIUtil::makeJByteArray(const
 }
 
 /**
+ * Create a Java byte array from an svn_string_t.
+ * @param str       the string
+ */
+jbyteArray JNIUtil::makeJByteArray(const svn_string_t *str)
+{
+  return JNIUtil::makeJByteArray(str->data, static_cast<int>(str->len));
+}
+
+/**
  * Build the error message from the svn error into buffer.  This
  * method calls itselft recursively for all the chained errors
  *

Modified: subversion/branches/wc-collate-path/subversion/bindings/javahl/native/JNIUtil.h
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/subversion/bindings/javahl/native/JNIUtil.h?rev=1416996&r1=1416995&r2=1416996&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/subversion/bindings/javahl/native/JNIUtil.h (original)
+++ subversion/branches/wc-collate-path/subversion/bindings/javahl/native/JNIUtil.h Tue Dec  4 15:35:13 2012
@@ -41,6 +41,8 @@ struct svn_error_t;
 
 #define JAVA_PACKAGE "org/apache/subversion/javahl"
 
+struct svn_string_t;
+
 /**
  * Class to hold a number of JNI related utility methods.  No Objects
  * of this class are ever created.
@@ -62,7 +64,8 @@ class JNIUtil
                                    int aprErr = -1);
 
   static void throwNullPointerException(const char *message);
-  static jbyteArray makeJByteArray(const signed char *data, int length);
+  static jbyteArray makeJByteArray(const void *data, int length);
+  static jbyteArray makeJByteArray(const svn_string_t *str);
   static jobject createDate(apr_time_t time);
   static void logMessage(const char *message);
   static int getLogLevel();

Modified: subversion/branches/wc-collate-path/subversion/bindings/javahl/native/OutputStream.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/subversion/bindings/javahl/native/OutputStream.cpp?rev=1416996&r1=1416995&r2=1416996&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/subversion/bindings/javahl/native/OutputStream.cpp (original)
+++ subversion/branches/wc-collate-path/subversion/bindings/javahl/native/OutputStream.cpp Tue Dec  4 15:35:13 2012
@@ -95,9 +95,7 @@ svn_error_t *OutputStream::write(void *b
     }
 
   // convert the data to a Java byte array
-  jbyteArray data = JNIUtil::makeJByteArray
-                       (reinterpret_cast<const signed char*>(buffer),
-                        static_cast<int>(*len));
+  jbyteArray data = JNIUtil::makeJByteArray(buffer, static_cast<int>(*len));
   if (JNIUtil::isJavaExceptionThrown())
     return SVN_NO_ERROR;
 

Modified: subversion/branches/wc-collate-path/subversion/bindings/javahl/native/Path.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/subversion/bindings/javahl/native/Path.cpp?rev=1416996&r1=1416995&r2=1416996&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/subversion/bindings/javahl/native/Path.cpp (original)
+++ subversion/branches/wc-collate-path/subversion/bindings/javahl/native/Path.cpp Tue Dec  4 15:35:13 2012
@@ -73,12 +73,12 @@ Path::init(const char *pi_path, SVN::Poo
 {
   if (*pi_path == 0)
     {
-      m_error_occured = NULL;
+      m_error_occurred = NULL;
       m_path = "";
     }
   else
     {
-      m_error_occured = JNIUtil::preprocessPath(pi_path, in_pool.getPool());
+      m_error_occurred = JNIUtil::preprocessPath(pi_path, in_pool.getPool());
 
       m_path = pi_path;
     }
@@ -108,15 +108,15 @@ Path::c_str() const
 Path&
 Path::operator=(const Path &pi_path)
 {
-  m_error_occured = NULL;
+  m_error_occurred = NULL;
   m_path = pi_path.m_path;
 
   return *this;
 }
 
-  svn_error_t *Path::error_occured() const
+  svn_error_t *Path::error_occurred() const
 {
-  return m_error_occured;
+  return m_error_occurred;
 }
 
 jboolean Path::isValid(const char *p)

Modified: subversion/branches/wc-collate-path/subversion/bindings/javahl/native/Path.h
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/subversion/bindings/javahl/native/Path.h?rev=1416996&r1=1416995&r2=1416996&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/subversion/bindings/javahl/native/Path.h (original)
+++ subversion/branches/wc-collate-path/subversion/bindings/javahl/native/Path.h Tue Dec  4 15:35:13 2012
@@ -41,7 +41,7 @@ class Path
   // The path to be stored.
   std::string m_path;
 
-  svn_error_t *m_error_occured;
+  svn_error_t *m_error_occurred;
 
   /**
    * Initialize the class.
@@ -90,7 +90,7 @@ class Path
    */
   const char *c_str() const;
 
-  svn_error_t *error_occured() const;
+  svn_error_t *error_occurred() const;
 
   /**
    * Returns whether @a path is non-NULL and passes the @c

Modified: subversion/branches/wc-collate-path/subversion/bindings/javahl/native/RevisionRange.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/subversion/bindings/javahl/native/RevisionRange.cpp?rev=1416996&r1=1416995&r2=1416996&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/subversion/bindings/javahl/native/RevisionRange.cpp (original)
+++ subversion/branches/wc-collate-path/subversion/bindings/javahl/native/RevisionRange.cpp Tue Dec  4 15:35:13 2012
@@ -20,7 +20,7 @@
  * ====================================================================
  * @endcopyright
  *
- * @file RevisionRanges.cpp
+ * @file RevisionRange.cpp
  * @brief Implementation of the class RevisionRange.
  */
 



Mime
View raw message