subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From i...@apache.org
Subject svn commit: r1658362 [1/34] - in /subversion/branches/remove-log-addressing: ./ build/ build/generator/ build/generator/templates/ notes/ subversion/bindings/cxxhl/include/svncxxhl/ subversion/bindings/javahl/native/ subversion/bindings/javahl/native/j...
Date Mon, 09 Feb 2015 11:23:43 GMT
Author: ivan
Date: Mon Feb  9 11:23:39 2015
New Revision: 1658362

URL: http://svn.apache.org/r1658362
Log:
On the remove-log-addressing branch: Merge changes from trunk.

Added:
    subversion/branches/remove-log-addressing/TODO
      - copied unchanged from r1658357, subversion/trunk/TODO
    subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/jniwrapper/jni_iterator.cpp
      - copied unchanged from r1658357, subversion/trunk/subversion/bindings/javahl/native/jniwrapper/jni_iterator.cpp
    subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/jniwrapper/jni_iterator.hpp
      - copied unchanged from r1658357, subversion/trunk/subversion/bindings/javahl/native/jniwrapper/jni_iterator.hpp
    subversion/branches/remove-log-addressing/subversion/include/svn_x509.h
      - copied unchanged from r1658357, subversion/trunk/subversion/include/svn_x509.h
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/fs_id.c
      - copied unchanged from r1658357, subversion/trunk/subversion/libsvn_fs_x/fs_id.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/fs_id.h
      - copied unchanged from r1658357, subversion/trunk/subversion/libsvn_fs_x/fs_id.h
    subversion/branches/remove-log-addressing/subversion/libsvn_subr/x509.h
      - copied unchanged from r1658357, subversion/trunk/subversion/libsvn_subr/x509.h
    subversion/branches/remove-log-addressing/subversion/libsvn_subr/x509info.c
      - copied unchanged from r1658357, subversion/trunk/subversion/libsvn_subr/x509info.c
    subversion/branches/remove-log-addressing/subversion/libsvn_subr/x509parse.c
      - copied unchanged from r1658357, subversion/trunk/subversion/libsvn_subr/x509parse.c
    subversion/branches/remove-log-addressing/subversion/tests/cmdline/svnrdump_tests_data/mergeinfo-contains-r0.dump
      - copied unchanged from r1658357, subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/mergeinfo-contains-r0.dump
    subversion/branches/remove-log-addressing/subversion/tests/cmdline/svnrdump_tests_data/mergeinfo-contains-r0.expected.dump
      - copied unchanged from r1658357, subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/mergeinfo-contains-r0.expected.dump
    subversion/branches/remove-log-addressing/subversion/tests/cmdline/svnsync_tests_data/mergeinfo-contains-r0.dump
      - copied unchanged from r1658357, subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/mergeinfo-contains-r0.dump
    subversion/branches/remove-log-addressing/subversion/tests/libsvn_subr/x509-test.c
      - copied unchanged from r1658357, subversion/trunk/subversion/tests/libsvn_subr/x509-test.c
    subversion/branches/remove-log-addressing/tools/dev/x509-parser.c
      - copied unchanged from r1658357, subversion/trunk/tools/dev/x509-parser.c
Modified:
    subversion/branches/remove-log-addressing/   (props changed)
    subversion/branches/remove-log-addressing/CHANGES
    subversion/branches/remove-log-addressing/COMMITTERS
    subversion/branches/remove-log-addressing/LICENSE
    subversion/branches/remove-log-addressing/Makefile.in
    subversion/branches/remove-log-addressing/NOTICE
    subversion/branches/remove-log-addressing/autogen.sh
    subversion/branches/remove-log-addressing/build.conf
    subversion/branches/remove-log-addressing/build/generator/gen_make.py
    subversion/branches/remove-log-addressing/build/generator/gen_win_dependencies.py
    subversion/branches/remove-log-addressing/build/generator/templates/build-outputs.mk.ezt
    subversion/branches/remove-log-addressing/build/run_tests.py
    subversion/branches/remove-log-addressing/get-deps.sh
    subversion/branches/remove-log-addressing/notes/   (props changed)
    subversion/branches/remove-log-addressing/notes/dump-load-format.txt
    subversion/branches/remove-log-addressing/subversion/bindings/cxxhl/include/svncxxhl/exception.hpp
    subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/AuthnCallback.cpp
    subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/AuthnCallback.hpp
    subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/CommitMessage.cpp
    subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/CreateJ.cpp
    subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/DiffOptions.cpp
    subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/DiffOptions.h
    subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/EnumMapper.cpp
    subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/EnumMapper.h
    subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/Prompter.cpp
    subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/RemoteSession.cpp
    subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/SVNClient.cpp
    subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/SVNClient.h
    subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/Utility.cpp
    subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/jniwrapper/jni_base.cpp
    subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/jniwrapper/jni_class_cache.cpp
    subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/jniwrapper/jni_exception.hpp
    subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/jniwrapper/jni_list.cpp
    subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/jniwrapper/jni_list.hpp
    subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/jniwrapper/jni_object.hpp
    subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/jniwrapper/jni_string_map.cpp
    subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/jniwrapper/jni_string_map.hpp
    subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
    subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_Version.cpp
    subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigLib.cpp
    subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_PropLib.cpp
    subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_SubstLib.cpp
    subversion/branches/remove-log-addressing/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java
    subversion/branches/remove-log-addressing/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
    subversion/branches/remove-log-addressing/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRemote.java
    subversion/branches/remove-log-addressing/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
    subversion/branches/remove-log-addressing/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNUtil.java
    subversion/branches/remove-log-addressing/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/AuthnCallback.java
    subversion/branches/remove-log-addressing/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/ConfigLib.java
    subversion/branches/remove-log-addressing/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
    subversion/branches/remove-log-addressing/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java
    subversion/branches/remove-log-addressing/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java
    subversion/branches/remove-log-addressing/subversion/bindings/javahl/tests/org/apache/subversion/javahl/UtilTests.java
    subversion/branches/remove-log-addressing/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/SVNTests.java
    subversion/branches/remove-log-addressing/subversion/bindings/swig/core.i
    subversion/branches/remove-log-addressing/subversion/bindings/swig/include/svn_types.swg
    subversion/branches/remove-log-addressing/subversion/bindings/swig/perl/native/Client.pm
    subversion/branches/remove-log-addressing/subversion/bindings/swig/perl/native/Repos.pm
    subversion/branches/remove-log-addressing/subversion/bindings/swig/perl/native/t/1repos.t
    subversion/branches/remove-log-addressing/subversion/bindings/swig/perl/native/t/3client.t
    subversion/branches/remove-log-addressing/subversion/bindings/swig/perl/native/t/6ra.t
    subversion/branches/remove-log-addressing/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
    subversion/branches/remove-log-addressing/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h
    subversion/branches/remove-log-addressing/subversion/bindings/swig/python/svn/core.py
    subversion/branches/remove-log-addressing/subversion/bindings/swig/python/svn/repos.py
    subversion/branches/remove-log-addressing/subversion/bindings/swig/python/tests/repository.py
    subversion/branches/remove-log-addressing/subversion/bindings/swig/ruby/test/test_client.rb
    subversion/branches/remove-log-addressing/subversion/bindings/swig/svn_client.i
    subversion/branches/remove-log-addressing/subversion/bindings/swig/svn_delta.i
    subversion/branches/remove-log-addressing/subversion/bindings/swig/svn_repos.i
    subversion/branches/remove-log-addressing/subversion/include/mod_dav_svn.h
    subversion/branches/remove-log-addressing/subversion/include/private/svn_auth_private.h
    subversion/branches/remove-log-addressing/subversion/include/private/svn_fs_util.h
    subversion/branches/remove-log-addressing/subversion/include/private/svn_mergeinfo_private.h
    subversion/branches/remove-log-addressing/subversion/include/private/svn_ra_private.h
    subversion/branches/remove-log-addressing/subversion/include/private/svn_repos_private.h
    subversion/branches/remove-log-addressing/subversion/include/private/svn_utf_private.h
    subversion/branches/remove-log-addressing/subversion/include/svn_client.h
    subversion/branches/remove-log-addressing/subversion/include/svn_config.h
    subversion/branches/remove-log-addressing/subversion/include/svn_diff.h
    subversion/branches/remove-log-addressing/subversion/include/svn_error_codes.h
    subversion/branches/remove-log-addressing/subversion/include/svn_fs.h
    subversion/branches/remove-log-addressing/subversion/include/svn_io.h
    subversion/branches/remove-log-addressing/subversion/include/svn_ra.h
    subversion/branches/remove-log-addressing/subversion/include/svn_ra_svn.h
    subversion/branches/remove-log-addressing/subversion/include/svn_repos.h
    subversion/branches/remove-log-addressing/subversion/include/svn_string.h
    subversion/branches/remove-log-addressing/subversion/include/svn_version.h
    subversion/branches/remove-log-addressing/subversion/include/svn_wc.h
    subversion/branches/remove-log-addressing/subversion/libsvn_client/add.c
    subversion/branches/remove-log-addressing/subversion/libsvn_client/client.h
    subversion/branches/remove-log-addressing/subversion/libsvn_client/copy.c
    subversion/branches/remove-log-addressing/subversion/libsvn_client/ctx.c
    subversion/branches/remove-log-addressing/subversion/libsvn_client/deprecated.c
    subversion/branches/remove-log-addressing/subversion/libsvn_client/diff.c
    subversion/branches/remove-log-addressing/subversion/libsvn_client/externals.c
    subversion/branches/remove-log-addressing/subversion/libsvn_client/import.c
    subversion/branches/remove-log-addressing/subversion/libsvn_client/info.c
    subversion/branches/remove-log-addressing/subversion/libsvn_client/locking_commands.c
    subversion/branches/remove-log-addressing/subversion/libsvn_client/log.c
    subversion/branches/remove-log-addressing/subversion/libsvn_client/mergeinfo.c
    subversion/branches/remove-log-addressing/subversion/libsvn_client/mtcc.c
    subversion/branches/remove-log-addressing/subversion/libsvn_client/patch.c
    subversion/branches/remove-log-addressing/subversion/libsvn_client/prop_commands.c
    subversion/branches/remove-log-addressing/subversion/libsvn_client/ra.c
    subversion/branches/remove-log-addressing/subversion/libsvn_client/repos_diff.c
    subversion/branches/remove-log-addressing/subversion/libsvn_client/revert.c
    subversion/branches/remove-log-addressing/subversion/libsvn_client/util.c
    subversion/branches/remove-log-addressing/subversion/libsvn_delta/path_driver.c
    subversion/branches/remove-log-addressing/subversion/libsvn_diff/diff_file.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs/fs-loader.h
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_base/dag.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_base/fs.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_base/tree.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/cached_data.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/caching.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/dag.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/fs.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/fs_fs.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/lock.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/revprops.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/stats.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/structure
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/transaction.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/tree.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_util/fs-util.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/   (props changed)
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/cached_data.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/cached_data.h
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/caching.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/changes.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/changes.h
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/dag.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/dag.h
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/fs.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/fs.h
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/fs_x.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/fs_x.h
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/hotcopy.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/hotcopy.h
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/id.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/id.h
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/index.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/index.h
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/lock.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/lock.h
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/low_level.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/low_level.h
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/noderevs.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/noderevs.h
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/pack.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/pack.h
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/recovery.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/recovery.h
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/rep-cache.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/rep-cache.h
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/reps.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/reps.h
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/rev_file.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/revprops.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/revprops.h
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/string_table.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/string_table.h
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/temp_serializer.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/temp_serializer.h
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/transaction.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/transaction.h
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/tree.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/tree.h
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/util.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/util.h
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/verify.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/verify.h
    subversion/branches/remove-log-addressing/subversion/libsvn_ra/ra_loader.c
    subversion/branches/remove-log-addressing/subversion/libsvn_ra_serf/blame.c
    subversion/branches/remove-log-addressing/subversion/libsvn_ra_serf/blncache.c
    subversion/branches/remove-log-addressing/subversion/libsvn_ra_serf/blncache.h
    subversion/branches/remove-log-addressing/subversion/libsvn_ra_serf/commit.c
    subversion/branches/remove-log-addressing/subversion/libsvn_ra_serf/get_deleted_rev.c
    subversion/branches/remove-log-addressing/subversion/libsvn_ra_serf/get_file.c
    subversion/branches/remove-log-addressing/subversion/libsvn_ra_serf/get_lock.c
    subversion/branches/remove-log-addressing/subversion/libsvn_ra_serf/getdate.c
    subversion/branches/remove-log-addressing/subversion/libsvn_ra_serf/getlocations.c
    subversion/branches/remove-log-addressing/subversion/libsvn_ra_serf/getlocationsegments.c
    subversion/branches/remove-log-addressing/subversion/libsvn_ra_serf/getlocks.c
    subversion/branches/remove-log-addressing/subversion/libsvn_ra_serf/inherited_props.c
    subversion/branches/remove-log-addressing/subversion/libsvn_ra_serf/lock.c
    subversion/branches/remove-log-addressing/subversion/libsvn_ra_serf/log.c
    subversion/branches/remove-log-addressing/subversion/libsvn_ra_serf/merge.c
    subversion/branches/remove-log-addressing/subversion/libsvn_ra_serf/mergeinfo.c
    subversion/branches/remove-log-addressing/subversion/libsvn_ra_serf/multistatus.c
    subversion/branches/remove-log-addressing/subversion/libsvn_ra_serf/options.c
    subversion/branches/remove-log-addressing/subversion/libsvn_ra_serf/property.c
    subversion/branches/remove-log-addressing/subversion/libsvn_ra_serf/ra_serf.h
    subversion/branches/remove-log-addressing/subversion/libsvn_ra_serf/replay.c
    subversion/branches/remove-log-addressing/subversion/libsvn_ra_serf/serf.c
    subversion/branches/remove-log-addressing/subversion/libsvn_ra_serf/stat.c
    subversion/branches/remove-log-addressing/subversion/libsvn_ra_serf/update.c
    subversion/branches/remove-log-addressing/subversion/libsvn_ra_serf/util.c
    subversion/branches/remove-log-addressing/subversion/libsvn_ra_serf/xml.c
    subversion/branches/remove-log-addressing/subversion/libsvn_ra_svn/editorp.c
    subversion/branches/remove-log-addressing/subversion/libsvn_ra_svn/marshal.c
    subversion/branches/remove-log-addressing/subversion/libsvn_repos/commit.c
    subversion/branches/remove-log-addressing/subversion/libsvn_repos/deprecated.c
    subversion/branches/remove-log-addressing/subversion/libsvn_repos/dump.c
    subversion/branches/remove-log-addressing/subversion/libsvn_repos/hooks.c
    subversion/branches/remove-log-addressing/subversion/libsvn_repos/load-fs-vtable.c
    subversion/branches/remove-log-addressing/subversion/libsvn_repos/log.c
    subversion/branches/remove-log-addressing/subversion/libsvn_repos/reporter.c
    subversion/branches/remove-log-addressing/subversion/libsvn_repos/rev_hunt.c
    subversion/branches/remove-log-addressing/subversion/libsvn_subr/auth.c
    subversion/branches/remove-log-addressing/subversion/libsvn_subr/cache-membuffer.c
    subversion/branches/remove-log-addressing/subversion/libsvn_subr/cache.c
    subversion/branches/remove-log-addressing/subversion/libsvn_subr/cache_config.c
    subversion/branches/remove-log-addressing/subversion/libsvn_subr/checksum.c
    subversion/branches/remove-log-addressing/subversion/libsvn_subr/config.c
    subversion/branches/remove-log-addressing/subversion/libsvn_subr/error.c
    subversion/branches/remove-log-addressing/subversion/libsvn_subr/io.c
    subversion/branches/remove-log-addressing/subversion/libsvn_subr/mergeinfo.c
    subversion/branches/remove-log-addressing/subversion/libsvn_subr/prefix_string.c
    subversion/branches/remove-log-addressing/subversion/libsvn_subr/sqlite.c
    subversion/branches/remove-log-addressing/subversion/libsvn_subr/ssl_server_trust_providers.c
    subversion/branches/remove-log-addressing/subversion/libsvn_subr/stream.c
    subversion/branches/remove-log-addressing/subversion/libsvn_subr/string.c
    subversion/branches/remove-log-addressing/subversion/libsvn_subr/sysinfo.c
    subversion/branches/remove-log-addressing/subversion/libsvn_subr/utf.c
    subversion/branches/remove-log-addressing/subversion/libsvn_subr/utf8proc.c
    subversion/branches/remove-log-addressing/subversion/libsvn_subr/win32_xlate.c
    subversion/branches/remove-log-addressing/subversion/libsvn_subr/win32_xlate.h
    subversion/branches/remove-log-addressing/subversion/libsvn_wc/adm_crawler.c
    subversion/branches/remove-log-addressing/subversion/libsvn_wc/conflicts.c
    subversion/branches/remove-log-addressing/subversion/libsvn_wc/copy.c
    subversion/branches/remove-log-addressing/subversion/libsvn_wc/deprecated.c
    subversion/branches/remove-log-addressing/subversion/libsvn_wc/diff_editor.c
    subversion/branches/remove-log-addressing/subversion/libsvn_wc/externals.c
    subversion/branches/remove-log-addressing/subversion/libsvn_wc/merge.c
    subversion/branches/remove-log-addressing/subversion/libsvn_wc/props.c
    subversion/branches/remove-log-addressing/subversion/libsvn_wc/revert.c
    subversion/branches/remove-log-addressing/subversion/libsvn_wc/update_editor.c
    subversion/branches/remove-log-addressing/subversion/libsvn_wc/wc-queries.sql
    subversion/branches/remove-log-addressing/subversion/libsvn_wc/wc_db.c
    subversion/branches/remove-log-addressing/subversion/libsvn_wc/wc_db.h
    subversion/branches/remove-log-addressing/subversion/libsvn_wc/wc_db_private.h
    subversion/branches/remove-log-addressing/subversion/libsvn_wc/wc_db_update_move.c
    subversion/branches/remove-log-addressing/subversion/mod_authz_svn/mod_authz_svn.c
    subversion/branches/remove-log-addressing/subversion/mod_dav_svn/liveprops.c
    subversion/branches/remove-log-addressing/subversion/mod_dav_svn/merge.c
    subversion/branches/remove-log-addressing/subversion/mod_dav_svn/mod_dav_svn.c
    subversion/branches/remove-log-addressing/subversion/mod_dav_svn/reports/deleted-rev.c
    subversion/branches/remove-log-addressing/subversion/mod_dav_svn/reports/file-revs.c
    subversion/branches/remove-log-addressing/subversion/mod_dav_svn/reports/get-location-segments.c
    subversion/branches/remove-log-addressing/subversion/mod_dav_svn/reports/get-locations.c
    subversion/branches/remove-log-addressing/subversion/mod_dav_svn/reports/get-locks.c
    subversion/branches/remove-log-addressing/subversion/mod_dav_svn/reports/inherited-props.c
    subversion/branches/remove-log-addressing/subversion/mod_dav_svn/reports/log.c
    subversion/branches/remove-log-addressing/subversion/mod_dav_svn/reports/mergeinfo.c
    subversion/branches/remove-log-addressing/subversion/mod_dav_svn/repos.c
    subversion/branches/remove-log-addressing/subversion/mod_dav_svn/util.c
    subversion/branches/remove-log-addressing/subversion/mod_dav_svn/version.c
    subversion/branches/remove-log-addressing/subversion/po/zh_CN.po
    subversion/branches/remove-log-addressing/subversion/svn/auth-cmd.c
    subversion/branches/remove-log-addressing/subversion/svn/conflict-callbacks.c
    subversion/branches/remove-log-addressing/subversion/svn/notify.c
    subversion/branches/remove-log-addressing/subversion/svn/resolve-cmd.c
    subversion/branches/remove-log-addressing/subversion/svn/revert-cmd.c
    subversion/branches/remove-log-addressing/subversion/svn/svn.c
    subversion/branches/remove-log-addressing/subversion/svnadmin/svnadmin.c
    subversion/branches/remove-log-addressing/subversion/svndumpfilter/svndumpfilter.c
    subversion/branches/remove-log-addressing/subversion/svnfsfs/stats-cmd.c
    subversion/branches/remove-log-addressing/subversion/svnmucc/svnmucc.c
    subversion/branches/remove-log-addressing/subversion/svnrdump/dump_editor.c
    subversion/branches/remove-log-addressing/subversion/svnrdump/load_editor.c
    subversion/branches/remove-log-addressing/subversion/svnrdump/svnrdump.c
    subversion/branches/remove-log-addressing/subversion/svnserve/logger.c
    subversion/branches/remove-log-addressing/subversion/svnserve/serve.c
    subversion/branches/remove-log-addressing/subversion/svnserve/svnserve.c
    subversion/branches/remove-log-addressing/subversion/svnsync/svnsync.c
    subversion/branches/remove-log-addressing/subversion/svnsync/sync.c
    subversion/branches/remove-log-addressing/subversion/tests/cmdline/authz_tests.py
    subversion/branches/remove-log-addressing/subversion/tests/cmdline/basic_tests.py
    subversion/branches/remove-log-addressing/subversion/tests/cmdline/blame_tests.py
    subversion/branches/remove-log-addressing/subversion/tests/cmdline/commit_tests.py
    subversion/branches/remove-log-addressing/subversion/tests/cmdline/copy_tests.py
    subversion/branches/remove-log-addressing/subversion/tests/cmdline/davautocheck.sh
    subversion/branches/remove-log-addressing/subversion/tests/cmdline/externals_tests.py
    subversion/branches/remove-log-addressing/subversion/tests/cmdline/info_tests.py
    subversion/branches/remove-log-addressing/subversion/tests/cmdline/lock_tests.py
    subversion/branches/remove-log-addressing/subversion/tests/cmdline/log_tests.py
    subversion/branches/remove-log-addressing/subversion/tests/cmdline/move_tests.py
    subversion/branches/remove-log-addressing/subversion/tests/cmdline/patch_tests.py
    subversion/branches/remove-log-addressing/subversion/tests/cmdline/prop_tests.py
    subversion/branches/remove-log-addressing/subversion/tests/cmdline/redirect_tests.py
    subversion/branches/remove-log-addressing/subversion/tests/cmdline/schedule_tests.py
    subversion/branches/remove-log-addressing/subversion/tests/cmdline/svnadmin_tests.py
    subversion/branches/remove-log-addressing/subversion/tests/cmdline/svndumpfilter_tests.py
    subversion/branches/remove-log-addressing/subversion/tests/cmdline/svnrdump_tests.py
    subversion/branches/remove-log-addressing/subversion/tests/cmdline/svnsync_authz_tests.py
    subversion/branches/remove-log-addressing/subversion/tests/cmdline/svnsync_tests.py
    subversion/branches/remove-log-addressing/subversion/tests/cmdline/svntest/actions.py
    subversion/branches/remove-log-addressing/subversion/tests/cmdline/svntest/main.py
    subversion/branches/remove-log-addressing/subversion/tests/cmdline/svntest/sandbox.py
    subversion/branches/remove-log-addressing/subversion/tests/cmdline/svntest/testcase.py
    subversion/branches/remove-log-addressing/subversion/tests/cmdline/svntest/verify.py
    subversion/branches/remove-log-addressing/subversion/tests/cmdline/update_tests.py
    subversion/branches/remove-log-addressing/subversion/tests/libsvn_client/mtcc-test.c
    subversion/branches/remove-log-addressing/subversion/tests/libsvn_diff/parse-diff-test.c
    subversion/branches/remove-log-addressing/subversion/tests/libsvn_fs/fs-test.c
    subversion/branches/remove-log-addressing/subversion/tests/libsvn_fs/locks-test.c
    subversion/branches/remove-log-addressing/subversion/tests/libsvn_fs_fs/   (props changed)
    subversion/branches/remove-log-addressing/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c
    subversion/branches/remove-log-addressing/subversion/tests/libsvn_fs_fs/fs-fs-private-test.c
    subversion/branches/remove-log-addressing/subversion/tests/libsvn_fs_x/   (props changed)
    subversion/branches/remove-log-addressing/subversion/tests/libsvn_ra/ra-test.c
    subversion/branches/remove-log-addressing/subversion/tests/libsvn_repos/dump-load-test.c
    subversion/branches/remove-log-addressing/subversion/tests/libsvn_repos/repos-test.c
    subversion/branches/remove-log-addressing/subversion/tests/libsvn_subr/   (props changed)
    subversion/branches/remove-log-addressing/subversion/tests/libsvn_subr/auth-test.c
    subversion/branches/remove-log-addressing/subversion/tests/libsvn_subr/cache-test.c
    subversion/branches/remove-log-addressing/subversion/tests/libsvn_subr/config-test.c
    subversion/branches/remove-log-addressing/subversion/tests/libsvn_subr/dirent_uri-test.c
    subversion/branches/remove-log-addressing/subversion/tests/libsvn_subr/io-test.c
    subversion/branches/remove-log-addressing/subversion/tests/libsvn_subr/mergeinfo-test.c
    subversion/branches/remove-log-addressing/subversion/tests/libsvn_subr/string-test.c
    subversion/branches/remove-log-addressing/subversion/tests/libsvn_subr/utf-test.c
    subversion/branches/remove-log-addressing/subversion/tests/libsvn_wc/conflict-data-test.c
    subversion/branches/remove-log-addressing/subversion/tests/libsvn_wc/op-depth-test.c
    subversion/branches/remove-log-addressing/subversion/tests/libsvn_wc/utils.c
    subversion/branches/remove-log-addressing/subversion/tests/libsvn_wc/utils.h
    subversion/branches/remove-log-addressing/subversion/tests/svn_test.h
    subversion/branches/remove-log-addressing/subversion/tests/svn_test_fs.c
    subversion/branches/remove-log-addressing/subversion/tests/svn_test_fs.h
    subversion/branches/remove-log-addressing/subversion/tests/svn_test_main.c
    subversion/branches/remove-log-addressing/tools/buildbot/slaves/svn-sparc-solaris/svnbuild.sh
    subversion/branches/remove-log-addressing/tools/buildbot/slaves/svn-sparc-solaris/svncheck.sh
    subversion/branches/remove-log-addressing/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd
    subversion/branches/remove-log-addressing/tools/dev/   (props changed)
    subversion/branches/remove-log-addressing/tools/dev/unix-build/Makefile.svn
    subversion/branches/remove-log-addressing/win-tests.py

Propchange: subversion/branches/remove-log-addressing/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb  9 11:23:39 2015
@@ -11,6 +11,7 @@
 /subversion/branches/diff-optimizations-bytes:1037353-1067789
 /subversion/branches/dont-save-plaintext-passwords-by-default:870728-871118
 /subversion/branches/double-delete:870511-872970
+/subversion/branches/dump-load-cross-check:1654853-1657295
 /subversion/branches/ev2-export:1325914,1332738,1413107
 /subversion/branches/explore-wc: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:871779-873302
@@ -20,6 +21,7 @@
 /subversion/branches/fsfs-lock-many:1571740-1577217
 /subversion/branches/fsfs-pack:873717-874575
 /subversion/branches/fsx:1507845-1509914
+/subversion/branches/fsx-id:1645603-1649011
 /subversion/branches/gnome-keyring:870558-871410
 /subversion/branches/gpg-agent-password-store:1005036-1150766
 /subversion/branches/gtest_addition:1452117-1502138
@@ -66,6 +68,7 @@
 /subversion/branches/revprop-caching-ng:1620597,1620599
 /subversion/branches/revprop-packing:1143907,1143971,1143997,1144017,1144499,1144568,1146145
 /subversion/branches/subtree-mergeinfo:876734-878766
+/subversion/branches/svn-auth-x509:1603509-1655900
 /subversion/branches/svn-mergeinfo-enhancements:870119-870195,870197-870288
 /subversion/branches/svn-patch-improvements:918519-934609
 /subversion/branches/svn_mutex:1141683-1182099
@@ -84,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:1603891-1641359
+/subversion/trunk:1603891-1658357

Modified: subversion/branches/remove-log-addressing/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/CHANGES?rev=1658362&r1=1658361&r2=1658362&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/CHANGES (original)
+++ subversion/branches/remove-log-addressing/CHANGES Mon Feb  9 11:23:39 2015
@@ -298,6 +298,7 @@ http://svn.apache.org/repos/asf/subversi
     * Allow PARALLEL value to specify the number of threads to run tests with,
       PARALLEL=1 means to use the default (r1573320)
     * pkg-config support for libsvn_* libraries (issue #4435)
+    * binaries built on Mac OS X 10.6+ will not run on older versions (r1651549)
 
   - API changes:
     * New RA callbacks for managing ra_svn tunnels:
@@ -315,7 +316,7 @@ http://svn.apache.org/repos/asf/subversi
     * New api svn_io_file_aligned_seek() (r1502539)
     * ra_svn: fix svn_ra_get_log*() to apply limit when server can't (r1503043)
     * svn_client_commit6: notify which path prevents a mv commit (r1503662)
-    * New apis svn_io_file_create_empty() and svn_io_file_create_binary()
+    * New apis svn_io_file_create_empty() and svn_io_file_create_bytes()
       (r1505006)
     * New api svn_ver_check_list2() (r1502267)
     * svn_fs_paths_changed() gains support for moves (r1525448)
@@ -425,6 +426,52 @@ http://svn.apache.org/repos/asf/subversi
     * javahl: support incomplete reads from streams (r1569631)
     * javahl: allow revert API to take a set of paths (r1571461)
 
+
+Version 1.8.11
+(15 Dec 2014, from /branches/1.8.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.8.10
+
+ User-visible changes:
+  - Client-side bugfixes:
+    * checkout/update: fix file externals failing to follow history and
+      subsequently silently failing (issue #4185)
+    * patch: don't skip targets in valid --git difs (r1592014, r1592034)
+    * diff: make property output in diffs stable (r1589360)
+    * diff: fix diff of local copied directory with props (r1619380, r1619393)
+    * diff: fix changelist filter for repos-WC and WC-WC (r1621978, r1621981)
+    * remove broken conflict resolver menu options that always error out
+      (r1620332)
+    * improve gpg-agent support (r1600331, r1600348, 1600368, r1600563,
+      r1600781)
+    * fix crash in eclipse IDE with GNOME Keyring (issue #3498)
+    * fix externals shadowing a versioned directory (issue #4085)
+    * fix problems working on unix file systems that don't support
+      permissions (r1612225)
+    * upgrade: keep external registrations (issue #4519)
+    * cleanup: iprove performance of recorded timestamp fixups (r1633126)
+    * translation updates for German
+
+  - Server-side bugfixes:
+    * disable revprop caching feature due to cache invalidation problems
+      (r1543594, r1619774, r1619105, r1619118, r1619153, r1619802)
+    * skip generating uniquifiers if rep-sharing is not supported (r1561426)
+    * mod_dav_svn: reject requests with missing repository paths (r1643409)
+    * mod_dav_svn: reject requests with invalid virtual transaction names
+      (r1643437)
+    * mod_dav_svn: avoid unneeded memory growth in resource walking
+      (issue #4531)
+
+ Developer-visible changes:
+  - General:
+    * make sure all members of the repos layer notify struct are valid,
+      fixes crashes in API users using all members (r1616131)
+    * properly generate a version resource when building on Windows (r1542610,
+      r1564576, r1568180)
+    * fix LIBTOOL_M4 and LIBTOOL_CONFIG variable not be evaluated properly
+      during a unix build (r1637826)
+    * allow the use of libtool 2.4.3 (r1640862, r1640873, r1643793)
+
+
 Version 1.8.10
 (11 Aug 2014, from /branches/1.8.x)
 http://svn.apache.org/repos/asf/subversion/tags/1.8.10
@@ -1156,6 +1203,39 @@ http://svn.apache.org/repos/asf/subversi
     * fix some reference counting bugs in swig-py bindings (r1464899, r1466524)
 
 
+Version 1.7.19
+(15 Dec 2014, from /branches/1.7.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.7.19
+
+ User-visible changes:
+  - Client-side bugfixes:
+    * rm: display the proper URL in commit log editor (r1591123)
+    * diff: fix invalid read during suffix scanning (issue #4339)
+    * fix crash in eclipse IDE with GNOME Keyring (issue #3498)
+    * checkout/update: fix file externals failing to follow history and
+      subsequently silently failing (issue #4185)
+
+  - Server-side bugfixes:
+    * svnadmin dump: don't let invalid mergeinfo prevent a dump (issue #4476)
+    * mod_dav_svn: reject requests with missing repository paths (r1643409)
+    * mod_dav_svn: reject requests with invalid virtual transaction names
+      (r1643437)
+    * mod_dav_svn: avoid unneeded memory growth in resource walking
+      (issue #4531)
+
+ Developer-visible changes:
+  - General:
+    * properly generate a version resource when building on Windows (r1542610,
+      r1564576, r1568180)
+    * fix a problem with the unix build that could result in linking to the
+      wrong Subversion libraries at build or at run time (r1594157)
+    * use a proper intermediate directory when building with Visual Studio
+      2003-2008 (r1595431)
+    * fix LIBTOOL_M4 and LIBTOOL_CONFIG variable not be evaluated properly
+      during a unix build (r1637826)
+    * allow the use of libtool 2.4.3 (r1640862, r1640873, r1643793)
+
+
 Version 1.7.18
 (11 Aug 2014, from /branches/1.7.x)
 http://svn.apache.org/repos/asf/subversion/tags/1.7.18

Modified: subversion/branches/remove-log-addressing/COMMITTERS
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/COMMITTERS?rev=1658362&r1=1658361&r2=1658362&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/COMMITTERS [UTF-8] (original)
+++ subversion/branches/remove-log-addressing/COMMITTERS [UTF-8] Mon Feb  9 11:23:39 2015
@@ -164,7 +164,7 @@ Commit access for specific areas:
      humbedooh   Daniel Gruno <humbedooh@apache.org>         (svnpubsub)
       prabhugs   Prabhu Gnana Sundar <pprabhugs@gmail.com>   (verify-keep-going)
         schabi   Markus Schaber <schabi@apache.org>          (testsuite)
-	gbg      Gabriela Gibson <gabriela.gibson@gmail.com> (gtest) 
+           gbg   Gabriela Gibson <gabriela.gibson@gmail.com> (gtest) 
 
   Translation of message files:
 

Modified: subversion/branches/remove-log-addressing/LICENSE
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/LICENSE?rev=1658362&r1=1658361&r2=1658362&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/LICENSE (original)
+++ subversion/branches/remove-log-addressing/LICENSE Mon Feb  9 11:23:39 2015
@@ -332,3 +332,37 @@ For the (modified) utf8proc library in s
   Unicode and the Unicode logo are trademarks of Unicode, Inc., and may be
   registered in some jurisdictions. All other trademarks and registered
   trademarks mentioned herein are the property of their respective owners.
+
+For the files subversion/libsvn_subr/x509parse.c and
+subversion/libsvn_subr/x509.h
+
+ *  Based on XySSL: Copyright (C) 2006-2008   Christophe Devine
+ *
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
+ *
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *    * Neither the names of PolarSSL or XySSL nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ *  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Modified: subversion/branches/remove-log-addressing/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/Makefile.in?rev=1658362&r1=1658361&r2=1658362&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/Makefile.in (original)
+++ subversion/branches/remove-log-addressing/Makefile.in Mon Feb  9 11:23:39 2015
@@ -529,6 +529,9 @@ check: bin @TRANSFORM_LIBTOOL_SCRIPTS@ $
 	  if test "$(SKIP_C_TESTS)" != ""; then                              \
 	    flags="--skip-c-tests $$flags";                                  \
 	  fi;                                                                \
+	  if test "$(DUMP_LOAD_CROSS_CHECK)" != ""; then                     \
+	    flags="--dump-load-cross-check $$flags";                         \
+	  fi;                                                                \
 	  if test "$(FS_TYPE)" != ""; then                                   \
 	    flags="--fs-type $(FS_TYPE) $$flags";                            \
 	  fi;                                                                \

Modified: subversion/branches/remove-log-addressing/NOTICE
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/NOTICE?rev=1658362&r1=1658361&r2=1658362&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/NOTICE (original)
+++ subversion/branches/remove-log-addressing/NOTICE Mon Feb  9 11:23:39 2015
@@ -22,4 +22,7 @@ modifications by Spyglass Inc., Carnegie
 Bell Communications Research, Inc (Bellcore).
 
 This product includes software developed by Public Software Group e. V.
-under a permissive license, see LICENSE.
\ No newline at end of file
+under a permissive license, see LICENSE.
+
+This software contains code derived from TropicSSL under a BSD 3-Clause
+license, see LICENSE.

Modified: subversion/branches/remove-log-addressing/autogen.sh
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/autogen.sh?rev=1658362&r1=1658361&r2=1658362&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/autogen.sh (original)
+++ subversion/branches/remove-log-addressing/autogen.sh Mon Feb  9 11:23:39 2015
@@ -23,6 +23,10 @@
 ### Run this to produce everything needed for configuration. ###
 
 
+# Some shells can produce output when running 'cd' which interferes
+# with the construct 'abs=`cd dir && pwd`'.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
 # Run tests to ensure that our build requirements are met
 RELEASE_MODE=""
 RELEASE_ARGS=""

Modified: subversion/branches/remove-log-addressing/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/build.conf?rev=1658362&r1=1658361&r2=1658362&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/build.conf (original)
+++ subversion/branches/remove-log-addressing/build.conf Mon Feb  9 11:23:39 2015
@@ -372,7 +372,7 @@ msvc-export =
         svn_error.h svn_hash.h svn_io.h svn_iter.h svn_md5.h svn_mergeinfo.h 
         svn_nls.h svn_opt.h svn_path.h svn_pools.h svn_props.h svn_quoprint.h 
         svn_sorts.h svn_string.h svn_subst.h svn_time.h svn_types.h svn_user.h
-        svn_utf.h svn_version.h svn_xml.h 
+        svn_utf.h svn_version.h svn_xml.h svn_x509.h
         private\svn_atomic.h private\svn_cache.h private\svn_cmdline_private.h
         private\svn_debug.h private\svn_error_private.h private\svn_fspath.h
         private\svn_log.h private\svn_mergeinfo_private.h
@@ -380,7 +380,7 @@ msvc-export =
         private\svn_utf_private.h private\svn_eol_private.h
         private\svn_token.h  private\svn_adler32.h
         private\svn_temp_serializer.h private\svn_io_private.h
-        private\svn_sorts_private.h
+        private\svn_sorts_private.h private\svn_auth_private.h
         private\svn_string_private.h private\svn_magic.h
         private\svn_subr_private.h private\svn_mutex.h
         private\svn_packed_data.h private\svn_object_pool.h private\svn_cert.h
@@ -1124,6 +1124,15 @@ sources = translate-test.c
 install = test
 libs = libsvn_test libsvn_subr apriconv apr
 
+[x509-test]
+description = Test x509 parser
+type = exe
+path = subversion/tests/libsvn_subr
+sources = x509-test.c
+install = test
+libs = libsvn_test libsvn_subr apriconv apr
+
+
 # ----------------------------------------------------------------------------
 # Tests for libsvn_delta
 
@@ -1490,7 +1499,7 @@ libs = __ALL__
        conflict-data-test db-test pristine-store-test entries-compat-test
        op-depth-test dirent_uri-test wc-queries-test wc-test
        auth-test
-       parse-diff-test
+       parse-diff-test x509-test
 
 [__MORE__]
 type = project
@@ -1610,3 +1619,10 @@ type = exe
 path = tools/dev/svnraisetreeconflict
 libs = libsvn_wc libsvn_subr apriconv apr
 install = tools
+
+[x509-parser]
+type = exe
+path = tools/dev
+sources = x509-parser.c
+install = tools
+libs = libsvn_subr apr

Modified: subversion/branches/remove-log-addressing/build/generator/gen_make.py
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/build/generator/gen_make.py?rev=1658362&r1=1658361&r2=1658362&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/build/generator/gen_make.py (original)
+++ subversion/branches/remove-log-addressing/build/generator/gen_make.py Mon Feb  9 11:23:39 2015
@@ -53,6 +53,12 @@ from gen_base import build_path_join, bu
       build_path_basename, build_path_dirname, build_path_retreat, unique
 
 
+def _normstr(x):
+  if os.sep == '/':
+    return os.path.normpath(str(x))
+  else:
+    return os.path.normpath(str(x).replace('/', os.sep)).replace(os.sep, '/')
+
 class Generator(gen_base.GeneratorBase):
 
   _extension_map = {
@@ -232,6 +238,7 @@ class Generator(gen_base.GeneratorBase):
 
       # get the source items (.o and .la) for the link unit
       objects = [ ]
+      objdeps = [ ]
       object_srcs = [ ]
       headers = [ ]
       header_classes = [ ]
@@ -263,6 +270,7 @@ class Generator(gen_base.GeneratorBase):
         elif isinstance(link_dep, gen_base.ObjectFile):
           # link in the object file
           objects.append(link_dep.filename)
+          objdeps.append(_normstr(link_dep.filename))
           for dep in self.graph.get_sources(gen_base.DT_OBJECT, link_dep, gen_base.SourceFile):
             object_srcs.append(
               build_path_join('$(abs_srcdir)', dep.filename))
@@ -291,6 +299,7 @@ class Generator(gen_base.GeneratorBase):
                             install=None,
                             add_deps=add_deps,
                             objects=objects,
+                            objdeps=objdeps,
                             deps=deps,
                             when=target_ob.when,
                             )
@@ -467,11 +476,11 @@ class Generator(gen_base.GeneratorBase):
                       key=lambda t: t[0].filename)
 
     for objname, sources in obj_deps:
-      dep = _eztdata(name=str(objname),
+      dep = _eztdata(name=_normstr(objname),
                      when=objname.when,
-                     deps=list(map(str, sources)),
+                     deps=list(map(_normstr, sources)),
                      cmd=objname.compile_cmd,
-                     source=str(sources[0]))
+                     source=_normstr(sources[0]))
       data.deps.append(dep)
       dep.generated = ezt.boolean(getattr(objname, 'source_generated', 0))
 

Modified: subversion/branches/remove-log-addressing/build/generator/gen_win_dependencies.py
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/build/generator/gen_win_dependencies.py?rev=1658362&r1=1658361&r2=1658362&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/build/generator/gen_win_dependencies.py (original)
+++ subversion/branches/remove-log-addressing/build/generator/gen_win_dependencies.py Mon Feb  9 11:23:39 2015
@@ -838,7 +838,7 @@ class GenDependenciesBase(gen_base.Gener
     txt = open(version_path).read()
 
     vermatch = re.search(
-      r'#define OPENSSL_VERSION_TEXT\s+"OpenSSL\s+((\d+)\.(\d+).(\d+)([^ -]*))',
+      r'#\s*define\s+OPENSSL_VERSION_TEXT\s+"OpenSSL\s+((\d+)\.(\d+).(\d+)([^ -]*))',
       txt)
   
     version = (int(vermatch.group(2)), 

Modified: subversion/branches/remove-log-addressing/build/generator/templates/build-outputs.mk.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/build/generator/templates/build-outputs.mk.ezt?rev=1658362&r1=1658361&r2=1658362&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/build/generator/templates/build-outputs.mk.ezt (original)
+++ subversion/branches/remove-log-addressing/build/generator/templates/build-outputs.mk.ezt Mon Feb  9 11:23:39 2015
@@ -112,7 +112,7 @@ $([target.varname]_OBJECTS): $([target.v
 	$(JAR) cf [target.jar_path] -C [target.classes][for target.packages] [target.packages][end][end][end]
 [else][is target.type "i18n"][target.varname]_DEPS =[for target.add_deps] [target.add_deps][end][for target.objects] [target.objects][end][for target.deps] [target.deps][end]
 [target.name]: $([target.varname]_DEPS)
-[else][target.varname]_DEPS =[for target.add_deps] [target.add_deps][end][for target.objects] [target.objects][end][for target.deps] [target.deps][end]
+[else][target.varname]_DEPS =[for target.add_deps] [target.add_deps][end][for target.objdeps] [target.objdeps][end][for target.deps] [target.deps][end]
 [target.varname]_OBJECTS =[for target.objnames] [target.objnames][end]
 [target.filename]: $([target.varname]_DEPS)
 	[if-any target.when]if $([target.when]) ; then [else][end]cd [target.path] && [target.link_cmd] $([target.varname]_LDFLAGS) -o [target.basename] [target.undefined_flag] $([target.varname]_OBJECTS)[for target.libs] [target.libs][end] $(LIBS)[if-any target.when] ; else echo "fake" > [target.filename] ; fi[else][end]

Modified: subversion/branches/remove-log-addressing/build/run_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/build/run_tests.py?rev=1658362&r1=1658361&r2=1658362&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/build/run_tests.py (original)
+++ subversion/branches/remove-log-addressing/build/run_tests.py Mon Feb  9 11:23:39 2015
@@ -130,7 +130,8 @@ class TestHarness:
                http_proxy=None, http_proxy_username=None,
                http_proxy_password=None, httpd_version=None,
                exclusive_wc_locks=None,
-               memcached_server=None, skip_c_tests=None):
+               memcached_server=None, skip_c_tests=None,
+               dump_load_cross_check=None):
     '''Construct a TestHarness instance.
 
     ABS_SRCDIR and ABS_BUILDDIR are the source and build directories.
@@ -193,6 +194,7 @@ class TestHarness:
     if not sys.stdout.isatty() or sys.platform == 'win32':
       TextColors.disable()
     self.skip_c_tests = (not not skip_c_tests)
+    self.dump_load_cross_check = (not not dump_load_cross_check)
 
     # Parse out the FSFS version number
     if self.fs_type is not None and self.fs_type.startswith('fsfs-v'):
@@ -207,15 +209,12 @@ class TestHarness:
     self._open_log('w')
     failed = 0
 
-    # Only run the C tests when testing ra_local
+    # If asked to skip C tests, remove non-Python tests from the list
     if self.skip_c_tests:
-      filtered_list = []
-      for cnt, prog in enumerate(list):
+      def is_py_test(prog):
         progpath, nums = self._split_nums(prog)
-        if not progpath.endswith('.py'):
-          continue
-        filtered_list.append(prog)
-      list = filtered_list
+        return progpath.endswith('.py')
+      list = filter(is_py_test, list)
 
     for cnt, prog in enumerate(list):
       failed = self._run_test(prog, cnt, len(list)) or failed
@@ -388,6 +387,24 @@ class TestHarness:
     if self.config_file is not None:
       cmdline.append('--config-file=' + self.config_file)
 
+    if self.base_url is not None:
+      subdir = 'subversion/tests/cmdline/svn-test-work'
+
+      cmdline.append('--repos-url=%s' % self.base_url +
+                        '/svn-test-work/repositories')
+      cmdline.append('--repos-dir=%s'
+                     % os.path.abspath(
+                         os.path.join(self.builddir, subdir, 'repositories')))
+
+      # Enable access for http
+      if self.base_url.startswith('http'):
+        authzparent = os.path.join(self.builddir, subdir)
+        if not os.path.exists(authzparent):
+          os.makedirs(authzparent);
+        open(os.path.join(authzparent, 'authz'), 'w').write('[/]\n'
+                                                            '* = rw\n')
+
+    # ### Support --repos-template
     if self.verbose is not None:
       cmdline.append('--verbose')
     if self.cleanup is not None:
@@ -536,6 +553,8 @@ class TestHarness:
       svntest.main.options.exclusive_wc_locks = self.exclusive_wc_locks
     if self.memcached_server is not None:
       svntest.main.options.memcached_server = self.memcached_server
+    if self.dump_load_cross_check is not None:
+      svntest.main.options.dump_load_cross_check = self.dump_load_cross_check
 
     svntest.main.options.srcdir = self.srcdir
 
@@ -699,6 +718,7 @@ def main():
     opts, args = my_getopt(sys.argv[1:], 'u:f:vc',
                            ['url=', 'fs-type=', 'verbose', 'cleanup',
                             'skip-c-tests', 'skip-C-tests',
+                            'dump-load-cross-check',
                             'http-library=', 'server-minor-version=',
                             'fsfs-packing', 'fsfs-sharding=',
                             'enable-sasl', 'parallel=', 'config-file=',
@@ -720,10 +740,10 @@ def main():
     parallel, config_file, log_to_stdout, list_tests, mode_filter, \
     milestone_filter, set_log_level, ssl_cert, http_proxy, \
     http_proxy_username, http_proxy_password, httpd_version, \
-    exclusive_wc_locks, memcached_server = \
+    exclusive_wc_locks, memcached_server, dump_load_cross_check = \
             None, None, None, None, None, None, None, None, None, None, \
             None, None, None, None, None, None, None, None, None, None, \
-            None, None, None, None,
+            None, None, None, None, None
   for opt, val in opts:
     if opt in ['-u', '--url']:
       base_url = val
@@ -743,6 +763,8 @@ def main():
       cleanup = 1
     elif opt in ['--skip-c-tests', '--skip-C-tests']:
       skip_c_tests = 1
+    elif opt in ['--dump-load-cross-check']:
+      dump_load_cross_check = 1
     elif opt in ['--enable-sasl']:
       enable_sasl = 1
     elif opt in ['--parallel']:
@@ -795,7 +817,8 @@ def main():
                    httpd_version=httpd_version,
                    exclusive_wc_locks=exclusive_wc_locks,
                    memcached_server=memcached_server,
-                   skip_c_tests=skip_c_tests)
+                   skip_c_tests=skip_c_tests,
+                   dump_load_cross_check=dump_load_cross_check)
 
   failed = th.run(args[2:])
   if failed:

Modified: subversion/branches/remove-log-addressing/get-deps.sh
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/get-deps.sh?rev=1658362&r1=1658361&r2=1658362&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/get-deps.sh (original)
+++ subversion/branches/remove-log-addressing/get-deps.sh Mon Feb  9 11:23:39 2015
@@ -33,7 +33,7 @@
 
 APR_VERSION=${APR_VERSION:-"1.4.6"}
 APU_VERSION=${APU_VERSION:-"1.5.1"}
-SERF_VERSION=${SERF_VERSION:-"1.3.4"}
+SERF_VERSION=${SERF_VERSION:-"1.3.8"}
 ZLIB_VERSION=${ZLIB_VERSION:-"1.2.8"}
 SQLITE_VERSION=${SQLITE_VERSION:-"3.7.15.1"}
 GMOCK_VERSION=${GMOCK_VERSION:-"1.6.0"}

Propchange: subversion/branches/remove-log-addressing/notes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb  9 11:23:39 2015
@@ -3,6 +3,7 @@
 /subversion/branches/diff-callbacks3/notes:870059-870761
 /subversion/branches/dont-save-plaintext-passwords-by-default/notes:870728-871118
 /subversion/branches/double-delete/notes:870511-872970
+/subversion/branches/dump-load-cross-check/notes:1654853-1657295
 /subversion/branches/explore-wc/notes: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/notes:871779-873302
 /subversion/branches/fs-rep-sharing/notes:869036-873803
@@ -25,6 +26,7 @@
 /subversion/branches/ra_serf-digest-authn/notes:875693-876404
 /subversion/branches/reintegrate-improvements/notes:873853-874164
 /subversion/branches/subtree-mergeinfo/notes:876734-878766
+/subversion/branches/svn-auth-x509/notes:1603509-1655900
 /subversion/branches/svn-mergeinfo-enhancements/notes:870119-870195,870197-870288
 /subversion/branches/svn-patch-improvements/notes:918519-934609
 /subversion/branches/svnpatch-diff/notes:865738-876477
@@ -36,4 +38,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:1603891-1628178
+/subversion/trunk/notes:1603891-1658357

Modified: subversion/branches/remove-log-addressing/notes/dump-load-format.txt
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/notes/dump-load-format.txt?rev=1658362&r1=1658361&r2=1658362&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/notes/dump-load-format.txt (original)
+++ subversion/branches/remove-log-addressing/notes/dump-load-format.txt Mon Feb  9 11:23:39 2015
@@ -47,6 +47,8 @@ Dumpfiles include four record types.  Tw
 record, consist of single header lines. The bulk of a dumpfile
 consists of Revision and Node records.
 
+==== Version stamp records ====
+
 A version stamp record is always the first line of the file and
 looks like this:
 
@@ -55,9 +57,11 @@ SVN-fs-dump-format-version: <N>\n
 -------------------------------------------------------------------
 
 where <N> is replaced by the dump format version. Except where 
-specified, the descriptions in this document aapply to all
+specified, the descriptions in this document apply to all
 versions of the format.
 
+==== UUID records ====
+
 Versions 2 and later may have a UUID record following the version
 stamp. It is of the form 
 
@@ -68,12 +72,14 @@ UUID: <hex-string>
 where the <hex-string> is the UUID of the originating repository.
 An example UUID is "7bf7a5ef-cabf-0310-b7d4-93df341afa7e".
 
-A Revision record has three headers and is always followed by a
+==== Revision records ====
+
+A Revision record has three headers and is usually followed by a
 property section.  Expect the following form and sequence:
 
 -------------------------------------------------------------------
 Revision-number: <N>
-Prop-content-length: <P>
+[Prop-content-length: <P>]
 Content-length: <L>
 !
 -------------------------------------------------------------------
@@ -87,42 +93,7 @@ that can parse RFC-822 messages.
 
 A revision record is followed by one or more Node records (see below).
 
-=== Property sections ==
-
-A Revision record *must* have a property section, and a Node record *may*
-have a property section. Every record with a property section has 
-a Prop-content-length header.
-
-A property section consists of pairs of key and value records and
-is ended by a fixed trailer.  Here is an example attached to a
-Revision record:
-
--------------------------------------------------------------------
-Revision-number: 1422
-Prop-content-length: 80
-Content-length: 80
-
-K 6
-author
-V 7
-sussman
-K 3
-log
-V 33
-Added two files, changed a third.
-PROPS-END
--------------------------------------------------------------------
-
-The fixed trailer is "PROPS-END\n" and its length is included in the
-Prop-content-length. Before it, each K and V record consists of a
-header line giving the length of the key or value content in bytes.  
-The content follows.  The content is itself always followed by \n.
-
-In version 3 of the format, a third type 'D' of property record is
-introduced to describe property deletion. This feature will be
-described later, in the specification of delta dumps.
-
-=== Node records ===
+==== Node records ====
 
 Each Revision record is followed by one or more Node records.
 Node records have the following sequence of header lines:
@@ -168,7 +139,7 @@ this document.
 
 The Text-content-{md5,sha1} and Text-copy-source-{md5,sha1} lines are
 hash integrity checks and will be present only if Text-content-length
-and the copfyrom pair (respectively) are also present. A decoder may
+and the copyfrom pair (respectively) are also present. A decoder may
 use them to verify that the source content they refer to has not been
 corrupted.
 
@@ -185,6 +156,41 @@ copyfrom sources may also not have eithe
 Again, the '!' stands in for a mandatory empty line following the
 RFC822-style headers. A body may follow.
 
+=== Property sections ===
+
+A Revision record *may* have a property section, and a Node record *may*
+have a property section. Every record with a property section has 
+a Prop-content-length header.
+
+A property section consists of pairs of key and value records and
+is ended by a fixed trailer.  Here is an example attached to a
+Revision record:
+
+-------------------------------------------------------------------
+Revision-number: 1422
+Prop-content-length: 80
+Content-length: 80
+
+K 6
+author
+V 7
+sussman
+K 3
+log
+V 33
+Added two files, changed a third.
+PROPS-END
+-------------------------------------------------------------------
+
+The fixed trailer is "PROPS-END\n" and its length is included in the
+Prop-content-length. Before it, each K and V record consists of a
+header line giving the length of the key or value content in bytes.  
+The content follows.  The content is itself always followed by \n.
+
+In version 3 of the format, a third type 'D' of property record is
+introduced to describe property deletion. This feature will be
+described later, in the specification of delta dumps.
+
 == Semantics ==
 
 === The kinds of things ===
@@ -339,9 +345,13 @@ to the same directory.
 
 === Properties and persistence ===
 
-The properties section of a Revision record consists of some subset
-of the three reserved per-commit properties: svn:author, svn:date,
-and svn:log. These properties do not persist to later revisions.
+The properties section of a Revision record consists of some (possibly
+empty) subset of the three reserved revision properties: svn:author,
+svn:date, and svn:log, along with any other revision properties.
+
+The revision properties do not persist to later revisions.  Each revision
+has exactly the revision properties specified in its revision record, or
+no revision properties if there is no property section.
 
 The key thing to know about Node properties is that they are 
 persistent, once set, until modified by a future property 
@@ -449,7 +459,7 @@ Notice that this file has no properties.
 Version 3 format is a delta dump; text changes are represented 
 as diffs against the original file, and properties as incremental
 changes to a persistent set (that is, a property section does not
-necessarily implcitly clear the property set on a path before the
+necessarily implicitly clear the property set on a path before the
 new property settings are evaluated).
 
 This change is a space optimization. It requires additional 
@@ -514,6 +524,15 @@ properties block.
 This note is included for historical completeness only, at is it highly
 unlikely that any Subversion instances that old remain in production.
 
+== Implementation choices for optional behaviour ==
+
+This section lists some of the ways existing implementations interpret the
+optional aspects of the specification.
+
+When a Revision record has no revision properties, svnadmin and svnrdump
+write an empty properties section whereas svndumpfilter omits the properties
+section. (At least in Subversion 1.0 through 1.8.)
+
 == Ancient history ==
 
 Old discussion: 

Modified: subversion/branches/remove-log-addressing/subversion/bindings/cxxhl/include/svncxxhl/exception.hpp
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/bindings/cxxhl/include/svncxxhl/exception.hpp?rev=1658362&r1=1658361&r2=1658362&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/bindings/cxxhl/include/svncxxhl/exception.hpp (original)
+++ subversion/branches/remove-log-addressing/subversion/bindings/cxxhl/include/svncxxhl/exception.hpp Mon Feb  9 11:23:39 2015
@@ -94,8 +94,8 @@ public:
     /**
      * Create a message object given an error code and error message.
      */
-    Message(int errno, const std::string& message)
-      : m_errno(errno),
+    Message(int errval, const std::string& message)
+      : m_errno(errval),
         m_message(message),
         m_trace(false)
       {}
@@ -104,8 +104,8 @@ public:
      * Create a message object given an error code and error message,
      * and set the flag that tells if this is a debugging traceback entry.
      */
-    Message(int errno, const std::string& message, bool trace)
-      : m_errno(errno),
+    Message(int errval, const std::string& message, bool trace)
+      : m_errno(errval),
         m_message(message),
         m_trace(trace)
       {}

Modified: subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/AuthnCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/AuthnCallback.cpp?rev=1658362&r1=1658361&r2=1658362&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/AuthnCallback.cpp (original)
+++ subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/AuthnCallback.cpp Mon Feb  9 11:23:39 2015
@@ -21,10 +21,19 @@
  * @endcopyright
  */
 
+#include "svn_base64.h"
+#include "svn_x509.h"
+
 #include "jniwrapper/jni_stack.hpp"
+#include "jniwrapper/jni_exception.hpp"
+#include "jniwrapper/jni_string.hpp"
+#include "jniwrapper/jni_array.hpp"
+#include "jniwrapper/jni_list.hpp"
 
 #include "AuthnCallback.hpp"
 
+#include "svn_private_config.h"
+
 namespace JavaHL {
 
 // Class JavaHL::AuthnCallback
@@ -176,30 +185,75 @@ AuthnCallback::SSLServerCertInfo::ClassI
   : ::Java::Object::ClassImpl(env, cls),
     m_mid_ctor(env.GetMethodID(cls, "<init>",
                                "(Ljava/lang/String;"
-                               "Ljava/lang/String;"
-                               "Ljava/lang/String;"
-                               "Ljava/lang/String;"
-                               "Ljava/lang/String;"
+                               "Ljava/lang/String;JJ[B"
+                               "Ljava/util/List;"
                                "Ljava/lang/String;)V"))
 {}
 
 AuthnCallback::SSLServerCertInfo::ClassImpl::~ClassImpl() {}
 
 AuthnCallback::SSLServerCertInfo::SSLServerCertInfo(
-    ::Java::Env env,
-    const ::Java::String& hostname,
-    const ::Java::String& fingerprint,
-    const ::Java::String& validFrom,
-    const ::Java::String& validUntil,
-    const ::Java::String& issuer,
-    const ::Java::String& der)
+    ::Java::Env env, const char* ascii_cert)
   : ::Java::Object(env,
                    ::Java::ClassCache::get_authn_ssl_server_cert_info(env))
 {
+  SVN::Pool pool;
+
+  /* Convert header-less PEM to DER by undoing base64 encoding. */
+  const svn_string_t cert_string = { ascii_cert, strlen(ascii_cert) };
+  const svn_string_t* der = svn_base64_decode_string(&cert_string,
+                                                     pool.getPool());
+
+  svn_x509_certinfo_t *certinfo;
+  SVN_JAVAHL_CHECK(env, svn_x509_parse_cert(&certinfo, der->data, der->len,
+                                            pool.getPool(), pool.getPool()));
+
+  const ::Java::String subject(
+      env, svn_x509_certinfo_get_subject(certinfo, pool.getPool()));
+  const ::Java::String issuer(
+      env, svn_x509_certinfo_get_issuer(certinfo, pool.getPool()));
+  const ::Java::String cert(env, ascii_cert);
+  const jlong valid_from =
+    (jlong(svn_x509_certinfo_get_valid_from(certinfo)) + 500) / 1000;
+  const jlong valid_to =
+    (jlong(svn_x509_certinfo_get_valid_to(certinfo)) + 500) / 1000;
+
+  const svn_checksum_t* digest = svn_x509_certinfo_get_digest(certinfo);
+  jsize digest_size;
+  switch (digest->kind)
+    {
+    case svn_checksum_sha1:
+      digest_size = 160 / 8;
+      break;
+
+    case svn_checksum_md5:
+      digest_size = 128 / 8;
+      break;
+
+    default:
+      digest_size = 0;          // Initialize this to avoid compiler warnings
+      ::Java::IllegalArgumentException(env).raise(
+          _("Unknown certificate digest type"));
+    }
+  const ::Java::ByteArray fingerprint(env, digest->digest, digest_size);
+
+  jobject jhostnames = NULL;
+  const apr_array_header_t* hostnames =
+    svn_x509_certinfo_get_hostnames(certinfo);
+  if (hostnames)
+    {
+      ::Java::List< ::Java::String> hn(env, hostnames->nelts);
+      for (int i = 0; i < hostnames->nelts; ++i)
+        hn.add(::Java::String(env, APR_ARRAY_IDX(hostnames, i, const char*)));
+      jhostnames = hn.get();
+    }
+
   set_this(env.NewObject(get_class(), impl().m_mid_ctor,
-                         hostname.get(), fingerprint.get(),
-                         validFrom.get(), validUntil.get(),
-                         issuer.get(), der.get()));
+                         subject.get(), issuer.get(),
+                         valid_from, valid_to,
+                         fingerprint.get(),
+                         jhostnames,
+                         cert.get()));
 }
 
 

Modified: subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/AuthnCallback.hpp
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/AuthnCallback.hpp?rev=1658362&r1=1658361&r2=1658362&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/AuthnCallback.hpp (original)
+++ subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/AuthnCallback.hpp Mon Feb  9 11:23:39 2015
@@ -153,13 +153,7 @@ public:
     /**
      * Creates and initializes a wrapped object;
      */
-    explicit SSLServerCertInfo(::Java::Env env,
-                               const ::Java::String& hostname,
-                               const ::Java::String& fingerprint,
-                               const ::Java::String& validFrom,
-                               const ::Java::String& validUntil,
-                               const ::Java::String& issuer,
-                               const ::Java::String& der);
+    explicit SSLServerCertInfo(::Java::Env env, const char* ascii_cert);
 
   private:
     /**

Modified: subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/CommitMessage.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/CommitMessage.cpp?rev=1658362&r1=1658361&r2=1658362&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/CommitMessage.cpp (original)
+++ subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/CommitMessage.cpp Mon Feb  9 11:23:39 2015
@@ -65,6 +65,7 @@ CommitMessage::getCommitMessage(const ch
                                 const apr_array_header_t *commit_items,
                                 apr_pool_t *pool)
 {
+  *log_msg = NULL;
   *tmp_file = NULL;
   JNIEnv *env = JNIUtil::getEnv();
 
@@ -93,6 +94,9 @@ CommitMessage::getCommitMessage(const ch
 
       jobject jitem = CreateJ::CommitItem(item);
 
+      if (!jitem)
+        return SVN_NO_ERROR; /* Exception thrown */
+
       // store the Java object into the array
       jitems.push_back(jitem);
     }
@@ -102,7 +106,7 @@ CommitMessage::getCommitMessage(const ch
                                                     midCallback,
                                                     CreateJ::Set(jitems));
   if (JNIUtil::isJavaExceptionThrown())
-    return SVN_NO_ERROR;
+    POP_AND_RETURN(SVN_NO_ERROR);
 
   if (jmessage != NULL)
     {

Modified: subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/CreateJ.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/CreateJ.cpp?rev=1658362&r1=1658361&r2=1658362&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/CreateJ.cpp (original)
+++ subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/CreateJ.cpp Mon Feb  9 11:23:39 2015
@@ -71,7 +71,8 @@ CreateJ::ConflictDescriptor(const svn_wc
                               "Ljava/lang/String;Ljava/lang/String;"
                               "Ljava/lang/String;Ljava/lang/String;"
                               "L"JAVA_PACKAGE"/types/ConflictVersion;"
-                              "L"JAVA_PACKAGE"/types/ConflictVersion;)V");
+                              "L"JAVA_PACKAGE"/types/ConflictVersion;"
+                              "Ljava/lang/String;[B[B[B[B)V");
       if (JNIUtil::isJavaExceptionThrown() || ctor == 0)
         POP_AND_RETURN_NULL;
     }
@@ -118,6 +119,33 @@ CreateJ::ConflictDescriptor(const svn_wc
   jobject joperation = EnumMapper::mapOperation(desc->operation);
   if (JNIUtil::isJavaExceptionThrown())
     POP_AND_RETURN_NULL;
+  jstring jpropRejectAbspath = JNIUtil::makeJString(desc->prop_reject_abspath);
+  if (JNIUtil::isJavaExceptionThrown())
+    POP_AND_RETURN_NULL;
+  jbyteArray jpropValueBase = (
+      !desc->prop_value_base ? NULL
+      :JNIUtil::makeJByteArray(desc->prop_value_base->data,
+                               int(desc->prop_value_base->len)));
+  if (JNIUtil::isExceptionThrown())
+    POP_AND_RETURN_NULL;
+  jbyteArray jpropValueWorking = (
+      !desc->prop_value_working ? NULL
+      :JNIUtil::makeJByteArray(desc->prop_value_working->data,
+                               int(desc->prop_value_working->len)));
+  if (JNIUtil::isExceptionThrown())
+    POP_AND_RETURN_NULL;
+  jbyteArray jpropValueIncomingOld = (
+      !desc->prop_value_incoming_old ? NULL
+      :JNIUtil::makeJByteArray(desc->prop_value_incoming_old->data,
+                               int(desc->prop_value_incoming_old->len)));
+  if (JNIUtil::isExceptionThrown())
+    POP_AND_RETURN_NULL;
+  jbyteArray jpropValueIncomingNew = (
+      !desc->prop_value_incoming_new ? NULL
+      :JNIUtil::makeJByteArray(desc->prop_value_incoming_new->data,
+                               int(desc->prop_value_incoming_new->len)));
+  if (JNIUtil::isExceptionThrown())
+    POP_AND_RETURN_NULL;
 
   // Instantiate the conflict descriptor.
   jobject jdesc = env->NewObject(clazz, ctor, jpath, jconflictKind,
@@ -125,7 +153,10 @@ CreateJ::ConflictDescriptor(const svn_wc
                                  (jboolean) desc->is_binary, jmimeType,
                                  jconflictAction, jconflictReason, joperation,
                                  jbasePath, jreposPath, juserPath,
-                                 jmergedPath, jsrcLeft, jsrcRight);
+                                 jmergedPath, jsrcLeft, jsrcRight,
+                                 jpropRejectAbspath, jpropValueBase,
+                                 jpropValueWorking, jpropValueIncomingOld,
+                                 jpropValueIncomingNew);
   if (JNIUtil::isJavaExceptionThrown())
     POP_AND_RETURN_NULL;
 
@@ -1096,8 +1127,7 @@ void fill_property_map(jobject map,
                        apr_hash_t* prop_hash, apr_array_header_t* prop_diffs,
                        apr_pool_t* scratch_pool, jmethodID put_mid)
 {
-  SVN_ERR_ASSERT_NO_RETURN(!prop_hash != !prop_diffs
-                           || !prop_hash && !prop_diffs);
+  SVN_ERR_ASSERT_NO_RETURN(!(prop_hash && prop_diffs));
 
   if (!map || (prop_hash == NULL && prop_diffs == NULL))
     return;
@@ -1189,8 +1219,7 @@ void fill_property_map(jobject map,
 jobject property_map(apr_hash_t *prop_hash, apr_array_header_t* prop_diffs,
                      apr_pool_t* scratch_pool)
 {
-  SVN_ERR_ASSERT_NO_RETURN(!prop_hash != !prop_diffs
-                           || !prop_hash && !prop_diffs);
+  SVN_ERR_ASSERT_NO_RETURN(!(prop_hash && prop_diffs));
 
   if (prop_hash == NULL && prop_diffs == NULL)
     return NULL;

Modified: subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/DiffOptions.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/DiffOptions.cpp?rev=1658362&r1=1658361&r2=1658362&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/DiffOptions.cpp (original)
+++ subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/DiffOptions.cpp Mon Feb  9 11:23:39 2015
@@ -71,5 +71,29 @@ apr_array_header_t *DiffOptions::options
   if (flags & SHOW_C_FUNCTION)
     APR_ARRAY_PUSH(opt, const char*) = "--show-c-function";
 
+  /* TODO: Support -U (context size) */
+
+  return opt;
+}
+
+svn_diff_file_options_t *DiffOptions::fileOptions(SVN::Pool &resultPool) const
+{
+  svn_diff_file_options_t *opt;
+
+  opt = svn_diff_file_options_create(resultPool.getPool());
+
+  if (flags & IGNORE_ALL_SPACE)
+    opt->ignore_space = svn_diff_file_ignore_space_all;
+  else if (flags & IGNORE_SPACE_CHANGE)
+    opt->ignore_eol_style = svn_diff_file_ignore_space_change;
+
+  if (flags & IGNORE_EOL_STYLE)
+    opt->ignore_eol_style = TRUE;
+
+  if (flags & SHOW_C_FUNCTION)
+    opt->show_c_function = TRUE;
+
+  /* TODO: Support context size */
+
   return opt;
 }

Modified: subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/DiffOptions.h
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/DiffOptions.h?rev=1658362&r1=1658361&r2=1658362&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/DiffOptions.h (original)
+++ subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/DiffOptions.h Mon Feb  9 11:23:39 2015
@@ -29,6 +29,7 @@
 
 #include <apr_tables.h>
 #include "svn_types.h"
+#include "svn_diff.h"
 #include "Pool.h"
 #include "JNIUtil.h"
 
@@ -38,6 +39,7 @@ class DiffOptions
   DiffOptions(jobject joptions);
 
   apr_array_header_t *optionsArray(SVN::Pool &resultPool) const;
+  svn_diff_file_options_t *fileOptions(SVN::Pool &resultPool) const;
 
   svn_boolean_t useGitDiffFormat() const
   {

Modified: subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/EnumMapper.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/EnumMapper.cpp?rev=1658362&r1=1658361&r2=1658362&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/EnumMapper.cpp (original)
+++ subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/EnumMapper.cpp Mon Feb  9 11:23:39 2015
@@ -32,32 +32,6 @@
 #include "JNIStringHolder.h"
 #include "../include/org_apache_subversion_javahl_CommitItemStateFlags.h"
 
-/**
- * Map a C commit state flag constant to the Java constant.
- * @param state     the C commit state flage constant
- * @returns the Java constant
- */
-jint EnumMapper::mapCommitMessageStateFlags(apr_byte_t flags)
-{
-  jint jstateFlags = 0;
-  if (flags & SVN_CLIENT_COMMIT_ITEM_ADD)
-    jstateFlags |=
-      org_apache_subversion_javahl_CommitItemStateFlags_Add;
-  if (flags & SVN_CLIENT_COMMIT_ITEM_DELETE)
-    jstateFlags |=
-      org_apache_subversion_javahl_CommitItemStateFlags_Delete;
-  if (flags & SVN_CLIENT_COMMIT_ITEM_TEXT_MODS)
-    jstateFlags |=
-      org_apache_subversion_javahl_CommitItemStateFlags_TextMods;
-  if (flags & SVN_CLIENT_COMMIT_ITEM_PROP_MODS)
-    jstateFlags |=
-      org_apache_subversion_javahl_CommitItemStateFlags_PropMods;
-  if (flags & SVN_CLIENT_COMMIT_ITEM_IS_COPY)
-    jstateFlags |=
-      org_apache_subversion_javahl_CommitItemStateFlags_IsCopy;
-  return jstateFlags;
-}
-
 jobject EnumMapper::mapChangePathAction(const char action)
 {
   switch (action)

Modified: subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/EnumMapper.h
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/EnumMapper.h?rev=1658362&r1=1658361&r2=1658362&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/EnumMapper.h (original)
+++ subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/EnumMapper.h Mon Feb  9 11:23:39 2015
@@ -55,7 +55,6 @@ class EnumMapper
     toMergeinfoInheritance(jobject jInheritance);
 
   /* Converting from C enum's */
-  static jint mapCommitMessageStateFlags(apr_byte_t flags);
   static jobject mapChangePathAction(const char action);
   static jobject mapNotifyState(svn_wc_notify_state_t state);
   static jobject mapNotifyAction(svn_wc_notify_action_t action);

Modified: subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/Prompter.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/Prompter.cpp?rev=1658362&r1=1658361&r2=1658362&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/Prompter.cpp (original)
+++ subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/Prompter.cpp Mon Feb  9 11:23:39 2015
@@ -325,14 +325,7 @@ svn_error_t *Prompter::dispatch_ssl_serv
       authn.ssl_server_trust_prompt(
           ::Java::String(env, realm),
           ::JavaHL::AuthnCallback::SSLServerCertFailures(env, jint(failures)),
-          ::JavaHL::AuthnCallback::SSLServerCertInfo(
-              env,
-              ::Java::String(env, cert_info->hostname),
-              ::Java::String(env, cert_info->fingerprint),
-              ::Java::String(env, cert_info->valid_from),
-              ::Java::String(env, cert_info->valid_until),
-              ::Java::String(env, cert_info->issuer_dname),
-              ::Java::String(env, cert_info->ascii_cert)),
+          ::JavaHL::AuthnCallback::SSLServerCertInfo(env, cert_info->ascii_cert),
           may_save));
   if (!result.get())
     return svn_error_create(SVN_ERR_RA_NOT_AUTHORIZED, NULL,

Modified: subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/RemoteSession.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/RemoteSession.cpp?rev=1658362&r1=1658361&r2=1658362&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/RemoteSession.cpp (original)
+++ subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/RemoteSession.cpp Mon Feb  9 11:23:39 2015
@@ -71,8 +71,7 @@ RemoteSession::open(jint jretryAttempts,
                     jobject jprompter, jobject jdeprecatedPrompter,
                     jobject jprogress, jobject jcfgcb, jobject jtunnelcb)
 {
-  SVN_ERR_ASSERT_NO_RETURN(!jprompter != !jdeprecatedPrompter
-                           || !jprompter && !jdeprecatedPrompter);
+  SVN_ERR_ASSERT_NO_RETURN(!(jprompter && jdeprecatedPrompter));
 
   SVN::Pool requestPool;
   URL url(jurl, requestPool);
@@ -1175,7 +1174,9 @@ public:
         static_cast<FileRevisionHandler*>(baton);
       SVN_ERR_ASSERT(self->m_jcallback != NULL);
       self->call(path, revision, revision_props,
-                result_of_merge, prop_diffs, scratch_pool);
+                result_of_merge, prop_diffs,
+                (delta_handler != NULL),
+                scratch_pool);
       SVN_ERR(JNIUtil::checkJavaException(SVN_ERR_BASE));
       return SVN_NO_ERROR;
     }
@@ -1200,6 +1201,7 @@ private:
            apr_hash_t* revision_props,
            svn_boolean_t result_of_merge,
            apr_array_header_t* prop_diffs,
+           svn_boolean_t has_text_delta,
            apr_pool_t* scratch_pool)
     {
       JNIEnv* env = JNIUtil::getEnv();
@@ -1212,7 +1214,7 @@ private:
         {
           mid = env->GetMethodID(cls, "<init>",
                                  "(Ljava/lang/String;JZ"
-                                 "Ljava/util/Map;Ljava/util/Map;)V");
+                                 "Ljava/util/Map;Ljava/util/Map;Z)V");
           if (JNIUtil::isJavaExceptionThrown())
             return;
         }
@@ -1230,7 +1232,8 @@ private:
       env->CallVoidMethod(m_jcallback, m_call_mid,
                           env->NewObject(cls, mid, jpath, jlong(revision),
                                          jboolean(result_of_merge),
-                                         jrevprops, jpropdelta));
+                                         jrevprops, jpropdelta,
+                                         jboolean(has_text_delta)));
       if (JNIUtil::isJavaExceptionThrown())
         return;
       env->DeleteLocalRef(jpath);



Mime
View raw message