subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g..@apache.org
Subject svn commit: r1526487 [1/10] - in /subversion/branches/invoke-diff-cmd-feature: ./ build/ac-macros/ build/generator/ build/generator/templates/ contrib/client-side/emacs/ notes/ subversion/bindings/javahl/native/ subversion/bindings/javahl/src/org/apach...
Date Thu, 26 Sep 2013 13:47:26 GMT
Author: gbg
Date: Thu Sep 26 13:47:21 2013
New Revision: 1526487

URL: http://svn.apache.org/r1526487
Log:
On the invoke-diff-cmd branch: Merge to trunk r1526439.


Added:
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/GlobalConfig.h
      - copied unchanged from r1526468, subversion/trunk/subversion/bindings/javahl/native/GlobalConfig.h
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp
      - copied unchanged from r1526468, subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigLib.cpp
      - copied unchanged from r1526468, subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigLib.cpp
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/ConfigImpl.java
      - copied unchanged from r1526468, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/ConfigImpl.java
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/ConfigLib.java
      - copied unchanged from r1526468, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/ConfigLib.java
    subversion/branches/invoke-diff-cmd-feature/subversion/include/private/svn_file.h
      - copied unchanged from r1526468, subversion/trunk/subversion/include/private/svn_file.h
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_fs/cached_data.c
      - copied unchanged from r1526468, subversion/trunk/subversion/libsvn_fs_fs/cached_data.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_fs/cached_data.h
      - copied unchanged from r1526468, subversion/trunk/subversion/libsvn_fs_fs/cached_data.h
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_fs/hotcopy.c
      - copied unchanged from r1526468, subversion/trunk/subversion/libsvn_fs_fs/hotcopy.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_fs/hotcopy.h
      - copied unchanged from r1526468, subversion/trunk/subversion/libsvn_fs_fs/hotcopy.h
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_fs/low_level.c
      - copied unchanged from r1526468, subversion/trunk/subversion/libsvn_fs_fs/low_level.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_fs/low_level.h
      - copied unchanged from r1526468, subversion/trunk/subversion/libsvn_fs_fs/low_level.h
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_fs/pack.c
      - copied unchanged from r1526468, subversion/trunk/subversion/libsvn_fs_fs/pack.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_fs/pack.h
      - copied unchanged from r1526468, subversion/trunk/subversion/libsvn_fs_fs/pack.h
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_fs/recovery.c
      - copied unchanged from r1526468, subversion/trunk/subversion/libsvn_fs_fs/recovery.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_fs/recovery.h
      - copied unchanged from r1526468, subversion/trunk/subversion/libsvn_fs_fs/recovery.h
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_fs/revprops.c
      - copied unchanged from r1526468, subversion/trunk/subversion/libsvn_fs_fs/revprops.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_fs/revprops.h
      - copied unchanged from r1526468, subversion/trunk/subversion/libsvn_fs_fs/revprops.h
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_fs/transaction.c
      - copied unchanged from r1526468, subversion/trunk/subversion/libsvn_fs_fs/transaction.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_fs/transaction.h
      - copied unchanged from r1526468, subversion/trunk/subversion/libsvn_fs_fs/transaction.h
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_fs/util.c
      - copied unchanged from r1526468, subversion/trunk/subversion/libsvn_fs_fs/util.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_fs/util.h
      - copied unchanged from r1526468, subversion/trunk/subversion/libsvn_fs_fs/util.h
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_fs/verify.c
      - copied unchanged from r1526468, subversion/trunk/subversion/libsvn_fs_fs/verify.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_fs/verify.h
      - copied unchanged from r1526468, subversion/trunk/subversion/libsvn_fs_fs/verify.h
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_subr/file.c
      - copied unchanged from r1526468, subversion/trunk/subversion/libsvn_subr/file.c
Removed:
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/org_apache_subversion_javahl_ConfigImpl_Category.cpp
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConfigImpl.java
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_fs/key-gen.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_fs/key-gen.h
Modified:
    subversion/branches/invoke-diff-cmd-feature/   (props changed)
    subversion/branches/invoke-diff-cmd-feature/CHANGES
    subversion/branches/invoke-diff-cmd-feature/Makefile.in
    subversion/branches/invoke-diff-cmd-feature/build.conf
    subversion/branches/invoke-diff-cmd-feature/build/ac-macros/compiler.m4
    subversion/branches/invoke-diff-cmd-feature/build/generator/gen_base.py
    subversion/branches/invoke-diff-cmd-feature/build/generator/gen_win.py
    subversion/branches/invoke-diff-cmd-feature/build/generator/gen_win_dependencies.py
    subversion/branches/invoke-diff-cmd-feature/build/generator/templates/build_locale.ezt
    subversion/branches/invoke-diff-cmd-feature/configure.ac
    subversion/branches/invoke-diff-cmd-feature/contrib/client-side/emacs/vc-svn.el
    subversion/branches/invoke-diff-cmd-feature/notes/ev2-callbacks-template.c
    subversion/branches/invoke-diff-cmd-feature/notes/knobs
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/CommitEditor.cpp   (contents, props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/CommitEditor.h   (contents, props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/CreateJ.cpp
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/EditorProxy.cpp   (contents, props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/EditorProxy.h   (contents, props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/Iterator.cpp   (props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/Iterator.h   (props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/JNIUtil.cpp
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/JNIUtil.h
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/LockTokenTable.cpp   (props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/LockTokenTable.h   (props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/OperationContext.cpp
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/OperationContext.h
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/RemoteSession.cpp   (contents, props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/RemoteSession.h   (contents, props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/RemoteSessionContext.cpp   (contents, props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/RemoteSessionContext.h   (contents, props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/RevisionRangeList.cpp   (props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/RevisionRangeList.h   (props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/SVNClient.cpp
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/StateReporter.cpp   (props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/StateReporter.h   (props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/org_apache_subversion_javahl_NativeResources.cpp
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_CommitEditor.cpp   (contents, props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_RemoteFactory.cpp   (contents, props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_RemoteSession.cpp   (props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_StateReporter.cpp   (props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_RevisionRangeList.cpp   (props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_DiffLib.cpp   (contents, props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNConfig.java
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNEditor.java
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNUtil.java
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/CommitEditor.java
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/RemoteFactory.java
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/RemoteSession.java
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/StateReporter.java
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/RevisionRangeList.java
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Version.java
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/VersionExtended.java
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/DiffLib.java
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Path.java
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/tests/org/apache/subversion/javahl/UtilTests.java
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/swig/ruby/test/test_fs.rb
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/swig/ruby/test/util.rb
    subversion/branches/invoke-diff-cmd-feature/subversion/bindings/swig/ruby/test/windows_util.rb
    subversion/branches/invoke-diff-cmd-feature/subversion/include/private/svn_editor.h
    subversion/branches/invoke-diff-cmd-feature/subversion/include/private/svn_packed_data.h   (contents, props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/include/svn_client.h
    subversion/branches/invoke-diff-cmd-feature/subversion/include/svn_dirent_uri.h
    subversion/branches/invoke-diff-cmd-feature/subversion/include/svn_error_codes.h
    subversion/branches/invoke-diff-cmd-feature/subversion/include/svn_fs.h
    subversion/branches/invoke-diff-cmd-feature/subversion/include/svn_ra.h
    subversion/branches/invoke-diff-cmd-feature/subversion/include/svn_repos.h
    subversion/branches/invoke-diff-cmd-feature/subversion/include/svn_types.h
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_client/add.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_client/client.h
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_client/copy.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_client/deprecated.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_client/externals.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_client/log.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_client/merge.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_client/mergeinfo.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_client/ra.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_delta/compat.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_delta/editor.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs/editor.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs/fs-loader.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs/fs-loader.h
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_base/fs.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_base/tree.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_fs/caching.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_fs/dag.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_fs/dag.h
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_fs/fs.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_fs/fs.h
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_fs/fs_fs.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_fs/fs_fs.h
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_fs/id.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_fs/id.h
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_fs/lock.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_fs/rep-cache.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_fs/temp_serializer.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_fs/temp_serializer.h
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_fs/tree.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_x/   (props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_x/cached_data.c   (contents, props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_x/cached_data.h   (contents, props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_x/changes.c   (contents, props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_x/changes.h   (props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_x/fs.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_x/hotcopy.c   (props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_x/hotcopy.h   (props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_x/index.c   (props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_x/index.h   (props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_x/low_level.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_x/low_level.h   (props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_x/noderevs.c   (contents, props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_x/noderevs.h   (contents, props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_x/pack.c   (props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_x/pack.h   (props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_x/recovery.c   (props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_x/recovery.h   (props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_x/reps.c   (props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_x/reps.h   (props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_x/revprops.h   (props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_x/string_table.c   (props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_x/string_table.h   (props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_x/transaction.c   (contents, props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_x/transaction.h   (props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_x/tree.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_fs_x/util.h   (props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_ra/compat.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_ra/deprecated.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_ra/ra_loader.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_ra/ra_loader.h
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_ra/wrapper_template.h
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_ra_local/ra_plugin.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_ra_local/split_url.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_ra_serf/commit.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_ra_serf/log.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_ra_serf/ra_serf.h
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_ra_serf/update.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_ra_serf/util.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_ra_svn/client.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_ra_svn/deprecated.c   (props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_ra_svn/protocol
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_repos/commit.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_repos/deprecated.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_repos/dump.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_repos/log.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_repos/reporter.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_subr/cache-membuffer.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_subr/cache_config.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_subr/cmdline.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_subr/compress.c   (props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_subr/dirent_uri.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_subr/io.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_subr/packed_data.c   (props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_subr/prefix_string.c   (props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_subr/utf8proc.c   (props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_subr/utf8proc/utf8proc.c   (props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_subr/utf8proc/utf8proc.h   (props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_subr/utf8proc/utf8proc_data.c   (props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_wc/old-and-busted.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_wc/update_editor.c
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_wc/wc_db_update_move.c
    subversion/branches/invoke-diff-cmd-feature/subversion/mod_dav_svn/merge.c
    subversion/branches/invoke-diff-cmd-feature/subversion/mod_dav_svn/mod_dav_svn.c
    subversion/branches/invoke-diff-cmd-feature/subversion/mod_dav_svn/reports/log.c
    subversion/branches/invoke-diff-cmd-feature/subversion/svn/cl.h
    subversion/branches/invoke-diff-cmd-feature/subversion/svn/conflict-callbacks.c
    subversion/branches/invoke-diff-cmd-feature/subversion/svn/help-cmd.c
    subversion/branches/invoke-diff-cmd-feature/subversion/svn/log-cmd.c
    subversion/branches/invoke-diff-cmd-feature/subversion/svn/svn.c
    subversion/branches/invoke-diff-cmd-feature/subversion/svnadmin/svnadmin.c
    subversion/branches/invoke-diff-cmd-feature/subversion/svnauth/svnauth.c
    subversion/branches/invoke-diff-cmd-feature/subversion/svndumpfilter/svndumpfilter.c
    subversion/branches/invoke-diff-cmd-feature/subversion/svnlook/svnlook.c
    subversion/branches/invoke-diff-cmd-feature/subversion/svnmucc/svnmucc.c
    subversion/branches/invoke-diff-cmd-feature/subversion/svnrdump/svnrdump.c
    subversion/branches/invoke-diff-cmd-feature/subversion/svnserve/serve.c
    subversion/branches/invoke-diff-cmd-feature/subversion/svnserve/server.h
    subversion/branches/invoke-diff-cmd-feature/subversion/svnserve/svnserve.c
    subversion/branches/invoke-diff-cmd-feature/subversion/svnsync/svnsync.c
    subversion/branches/invoke-diff-cmd-feature/subversion/svnversion/svnversion.c
    subversion/branches/invoke-diff-cmd-feature/subversion/tests/cmdline/authz_tests.py
    subversion/branches/invoke-diff-cmd-feature/subversion/tests/cmdline/checkout_tests.py
    subversion/branches/invoke-diff-cmd-feature/subversion/tests/cmdline/commit_tests.py
    subversion/branches/invoke-diff-cmd-feature/subversion/tests/cmdline/externals_tests.py
    subversion/branches/invoke-diff-cmd-feature/subversion/tests/cmdline/getopt_tests.py
    subversion/branches/invoke-diff-cmd-feature/subversion/tests/cmdline/getopt_tests_data/svn--help_stdout
    subversion/branches/invoke-diff-cmd-feature/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
    subversion/branches/invoke-diff-cmd-feature/subversion/tests/cmdline/getopt_tests_data/svn_help_stdout
    subversion/branches/invoke-diff-cmd-feature/subversion/tests/cmdline/lock_tests.py
    subversion/branches/invoke-diff-cmd-feature/subversion/tests/cmdline/log_tests.py
    subversion/branches/invoke-diff-cmd-feature/subversion/tests/cmdline/tree_conflict_tests.py
    subversion/branches/invoke-diff-cmd-feature/subversion/tests/cmdline/upgrade_tests.py
    subversion/branches/invoke-diff-cmd-feature/subversion/tests/libsvn_fs_fs/   (props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/tests/libsvn_fs_x/   (props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/tests/libsvn_fs_x/string-table-test.c   (props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/tests/libsvn_subr/dirent_uri-test.c
    subversion/branches/invoke-diff-cmd-feature/subversion/tests/libsvn_subr/packed-data-test.c   (props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/tests/libsvn_subr/prefix-string-test.c   (props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/tests/libsvn_subr/priority-queue-test.c   (props changed)
    subversion/branches/invoke-diff-cmd-feature/subversion/tests/libsvn_subr/string-test.c
    subversion/branches/invoke-diff-cmd-feature/subversion/tests/libsvn_wc/op-depth-test.c
    subversion/branches/invoke-diff-cmd-feature/subversion/tests/libsvn_wc/wc-queries-test.c
    subversion/branches/invoke-diff-cmd-feature/tools/dev/fsfs-access-map.c
    subversion/branches/invoke-diff-cmd-feature/tools/dev/unix-build/Makefile.svn
    subversion/branches/invoke-diff-cmd-feature/tools/dist/backport.pl
    subversion/branches/invoke-diff-cmd-feature/tools/server-side/fsfs-stats.c
    subversion/branches/invoke-diff-cmd-feature/tools/server-side/svn-populate-node-origins-index.c
    subversion/branches/invoke-diff-cmd-feature/tools/server-side/svn-rep-sharing-stats.c
    subversion/branches/invoke-diff-cmd-feature/tools/server-side/svnpubsub/svnwcsub.py

Propchange: subversion/branches/invoke-diff-cmd-feature/
------------------------------------------------------------------------------
  Merged /subversion/branches/fsfs-improvements:r1499981-1517476
  Merged /subversion/trunk:r1516160-1526468

Modified: subversion/branches/invoke-diff-cmd-feature/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/CHANGES?rev=1526487&r1=1526486&r2=1526487&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/CHANGES (original)
+++ subversion/branches/invoke-diff-cmd-feature/CHANGES Thu Sep 26 13:47:21 2013
@@ -24,9 +24,9 @@ http://svn.apache.org/repos/asf/subversi
   - Bindings:
 
 
-Version 1.8.2
-(27 August 2013, from /branches/1.8.x)
-http://svn.apache.org/repos/asf/subversion/tags/1.8.2
+Version 1.8.3
+(29 August 2013, from /branches/1.8.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.8.3
 
  User-visible changes:
   - Client- and server-side bugfixes:
@@ -53,6 +53,7 @@ http://svn.apache.org/repos/asf/subversi
     * info: fix spurious error on wc root with child in conflict (r1515366)
 
   - Server-side bugfixes:
+    * svnserve: fix creation of pid files (r1516556)
     * svnadmin: fix output encoding in non-UTF8 environments (r1506966)
     * svnsync: fix high memory usage when running over ra_serf (r1515249 et al)
     * mod_dav_svn: do not map requests to filesystem (r1512432 et al)
@@ -61,7 +62,7 @@ http://svn.apache.org/repos/asf/subversi
     * fsfs: fix packed revprops causing loss of revprops (r1513879 et al)
   
   - Other tool improvements and bugfixes:
-    * svnpubsub: fix symlink attack via pid file (r175 from upstream)
+    * svnwcsub/irkerbridge: fix symlink attack via pid file (r175 from upstream)
 
  Developer-visible changes:
   - General:
@@ -77,6 +78,10 @@ http://svn.apache.org/repos/asf/subversi
     * swig-pl & swig-py: disable unusable svn_fs_set_warning_func (r1515119)
 
 
+Version 1.8.2
+(Not released, see changes for 1.8.3.)
+ 
+ 
 Version 1.8.1
 (23 July 2013, from /branches/1.8.x)
 http://svn.apache.org/repos/asf/subversion/tags/1.8.1
@@ -507,9 +512,9 @@ http://svn.apache.org/repos/asf/subversi
     * fix some reference counting bugs in swig-py bindings (r1464899, r1466524)
 
 
-Version 1.7.12
-(27 Aug 2013, from /branches/1.7.x)
-http://svn.apache.org/repos/asf/subversion/tags/1.7.12
+Version 1.7.13
+(29 Aug 2013, from /branches/1.7.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.7.13
 
  User-visible changes:
   - General
@@ -518,6 +523,7 @@ http://svn.apache.org/repos/asf/subversi
     * ra_serf: ignore case when checking certificate common names (r1514763)
 
   - Server-side bugfixes:
+    * svnserve: fix creation of pid files (r1516556)
     * mod_dav_svn: better status codes for commit failures (r1490684)
     * mod_dav_svn: do not map requests to filesystem (r1512432 et al)
 
@@ -529,6 +535,10 @@ http://svn.apache.org/repos/asf/subversi
   - Bindings:
     * swig-pl: fix SVN::Client not honoring config file settings (r150744)
     * swig-pl & swig-py: disable unusable svn_fs_set_warning_func (r1515119)
+
+
+Version 1.7.12
+(Not released, see changes for 1.7.13.)
  
  
 Version 1.7.11

Modified: subversion/branches/invoke-diff-cmd-feature/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/Makefile.in?rev=1526487&r1=1526486&r2=1526487&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/Makefile.in (original)
+++ subversion/branches/invoke-diff-cmd-feature/Makefile.in Thu Sep 26 13:47:21 2013
@@ -167,11 +167,11 @@ MKDIR = @MKDIR@
 DOXYGEN = @DOXYGEN@
 
 # The EXTRA_ parameters can be used to pass extra flags at 'make' time.
-CFLAGS = @CFLAGS@ $(EXTRA_CFLAGS)
+CFLAGS = @CFLAGS@ @CUSERFLAGS@ $(EXTRA_CFLAGS)
 CMODEFLAGS = @CMODEFLAGS@
 CNOWARNFLAGS = @CNOWARNFLAGS@
 CMAINTAINERFLAGS = @CMAINTAINERFLAGS@
-CXXFLAGS = @CXXFLAGS@ $(EXTRA_CXXFLAGS)
+CXXFLAGS = @CXXFLAGS@ @CXXUSERFLAGS@ $(EXTRA_CXXFLAGS)
 CXXMODEFLAGS = @CXXMODEFLAGS@
 CXXNOWARNFLAGS = @CXXNOWARNFLAGS@
 CXXMAINTAINERFLAGS = @CXXMAINTAINERFLAGS@

Modified: subversion/branches/invoke-diff-cmd-feature/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/build.conf?rev=1526487&r1=1526486&r2=1526487&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/build.conf (original)
+++ subversion/branches/invoke-diff-cmd-feature/build.conf Thu Sep 26 13:47:21 2013
@@ -76,7 +76,8 @@ private-built-includes =
         subversion/bindings/javahl/include/org_apache_subversion_javahl_remote_RemoteFactory.h
         subversion/bindings/javahl/include/org_apache_subversion_javahl_remote_CommitEditor.h
         subversion/bindings/javahl/include/org_apache_subversion_javahl_remote_StateReporter.h
-        subversion/bindings/javahl/include/org_apache_subversion_javahl_ConfigImpl_Category.h
+        subversion/bindings/javahl/include/org_apache_subversion_javahl_util_ConfigImpl_Category.h
+        subversion/bindings/javahl/include/org_apache_subversion_javahl_util_ConfigLib.h
         subversion/bindings/javahl/include/org_apache_subversion_javahl_util_DiffLib.h
 
 test-scripts =
@@ -119,6 +120,7 @@ swig-checkout-files = common.swg swigrun
 #    msvc-libs        - additional libraries to link with on Windows
 #    msvc-export      - additional list of files to expose in dsp/vc(x)proj
 #    msvc-static      - visual studio target produces only a static lib
+#    msvc-force-static- visual studio always uses static libraries for svn libs
 #    add-deps         - expands to additional autoconf-defined dependencies
 #    add-install-deps - like add-deps, but for the install step
 #    external-lib     - expands to additional autoconf-defined libs
@@ -317,7 +319,6 @@ type = ra-module
 path = subversion/libsvn_ra_serf
 install = serf-lib
 libs = libsvn_delta libsvn_subr aprutil apriconv apr serf xml zlib
-msvc-libs = secur32.lib
 msvc-static = yes
 
 # Accessing repositories via SVN
@@ -732,6 +733,7 @@ type = lib
 path = gmock-fused
 sources = gmock-gtest-all.cc
 install = tests
+msvc-static = yes
 compile-cmd = $(COMPILE_GMOCK_CXX)
 link-cmd = $(LINK_CXX_LIB)
 
@@ -819,6 +821,7 @@ path = subversion/tests/libsvn_fs
 sources = locks-test.c
 install = test
 libs = libsvn_test libsvn_fs libsvn_delta libsvn_subr apriconv apr
+msvc-force-static = yes
 
 [fs-test]
 description = Test locks in libsvn_fs
@@ -866,6 +869,7 @@ path = subversion/tests/libsvn_subr
 sources = checksum-test.c
 install = test
 libs = libsvn_test libsvn_subr apr
+msvc-force-static = yes
 
 [compat-test]
 description = Test compatibility functions
@@ -890,6 +894,7 @@ path = subversion/tests/libsvn_subr
 sources = crypto-test.c
 install = test
 libs = libsvn_test libsvn_subr aprutil apr
+msvc-force-static = yes
 
 [dirent_uri-test]
 description = Test dirent_uri library
@@ -1096,6 +1101,7 @@ path = subversion/tests/libsvn_client
 sources = client-test.c
 install = test
 libs = libsvn_test libsvn_client libsvn_wc libsvn_repos libsvn_ra libsvn_fs libsvn_delta libsvn_subr apriconv apr
+msvc-force-static = yes
 
 # ----------------------------------------------------------------------------
 # Tests for libsvn_diff
@@ -1150,6 +1156,7 @@ path = subversion/tests/libsvn_wc
 sources = conflict-data-test.c utils.c
 install = test
 libs = libsvn_client libsvn_test libsvn_wc libsvn_subr apriconv apr
+msvc-force-static = yes
 
 [db-test]
 description = Test the wc-ng database subsystem
@@ -1158,6 +1165,7 @@ path = subversion/tests/libsvn_wc
 sources = db-test.c utils.c
 install = test
 libs = libsvn_client libsvn_test libsvn_wc libsvn_subr apriconv apr
+msvc-force-static = yes
 
 [pristine-store-test]
 description = Test the wc-ng pristine text storage subsystem
@@ -1166,6 +1174,7 @@ path = subversion/tests/libsvn_wc
 sources = pristine-store-test.c utils.c
 install = test
 libs = libsvn_client libsvn_test libsvn_wc libsvn_subr apriconv apr
+msvc-force-static = yes
 
 [entries-compat-test]
 description = Test backwards compat for the entry interface
@@ -1174,6 +1183,7 @@ path = subversion/tests/libsvn_wc
 sources = entries-compat.c utils.c
 install = test
 libs = libsvn_client libsvn_test libsvn_wc libsvn_subr apriconv apr
+msvc-force-static = yes
 
 [op-depth-test]
 description = Test layered tree changes
@@ -1182,6 +1192,7 @@ path = subversion/tests/libsvn_wc
 sources = op-depth-test.c utils.c
 install = test
 libs = libsvn_client libsvn_test libsvn_wc libsvn_subr apriconv apr
+msvc-force-static = yes
 
 [wc-queries-test]
 description = Test Sqlite query evaluation
@@ -1198,6 +1209,7 @@ path = subversion/tests/libsvn_wc
 sources = wc-test.c utils.c
 install = test
 libs = libsvn_client libsvn_test libsvn_wc libsvn_subr apriconv apr
+msvc-force-static = yes
 
 # ----------------------------------------------------------------------------
 # These are not unit tests at all, they are small programs that exercise
@@ -1229,6 +1241,7 @@ path = subversion/tests/cmdline
 sources = entries-dump.c
 install = test
 libs = libsvn_wc libsvn_subr apriconv apr
+msvc-force-static = yes
 testing = skip
 
 [atomic-ra-revprop-change]
@@ -1245,6 +1258,7 @@ path = subversion/tests/libsvn_wc
 sources = wc-lock-tester.c
 install = test
 libs = libsvn_wc libsvn_subr apriconv apr
+msvc-force-static = yes
 testing = skip
 
 [wc-incomplete-tester]
@@ -1253,6 +1267,7 @@ path = subversion/tests/libsvn_wc
 sources = wc-incomplete-tester.c
 install = test
 libs = libsvn_wc libsvn_subr apriconv apr
+msvc-force-static = yes
 testing = skip
 
 # ----------------------------------------------------------------------------
@@ -1316,7 +1331,8 @@ external-lib = $(SVN_APR_MEMCACHE_LIBS)
 type = lib
 external-lib = $(SVN_SERF_LIBS)
 external-project = serf/serf
-libs = apr aprutil xml openssl
+libs = apr aprutil openssl xml zlib
+msvc-libs = secur32.lib
 msvc-static = yes
 
 [sqlite]
@@ -1395,7 +1411,7 @@ libs = __ALL__
 type = project
 path = build/win32
 libs = __ALL_TESTS__
-       diff diff3 diff4 fsfs-reorg fsfs-stats fsfs-access-map svn-bench
+       diff diff3 diff4 fsfs-reorg fsfs-stats fsfs-access-map svnauth svn-bench
        svn-rep-sharing-stats svn-populate-node-origins-index
 
 [__LIBS__]

Modified: subversion/branches/invoke-diff-cmd-feature/build/ac-macros/compiler.m4
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/build/ac-macros/compiler.m4?rev=1526487&r1=1526486&r2=1526487&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/build/ac-macros/compiler.m4 (original)
+++ subversion/branches/invoke-diff-cmd-feature/build/ac-macros/compiler.m4 Thu Sep 26 13:47:21 2013
@@ -58,19 +58,23 @@ AC_DEFUN([SVN_CC_MODE_SETUP],
   CFLAGS_KEEP="$CFLAGS"
   CFLAGS=""
 
-  dnl Find flags to force C90 mode
-                dnl gcc and clang
-  SVN_CFLAGS_ADD_IFELSE([-std=c90],[],[
-    SVN_CFLAGS_ADD_IFELSE([-std=c89],[],[
-      SVN_CFLAGS_ADD_IFELSE([-ansi])
+  if test "$GCC" = "yes"; then
+    dnl Find flags to force C90 mode
+                  dnl gcc and clang
+    SVN_CFLAGS_ADD_IFELSE([-std=c90],[],[
+      SVN_CFLAGS_ADD_IFELSE([-std=c89],[],[
+        SVN_CFLAGS_ADD_IFELSE([-ansi])
+      ])
     ])
-  ])
+  fi
 
   CMODEFLAGS="$CFLAGS"
   CFLAGS=""
 
-  dnl Find flags to silence all warnings
-  SVN_CFLAGS_ADD_IFELSE([-w])
+  if test "$GCC" = "yes"; then
+    dnl Find flags to silence all warnings
+    SVN_CFLAGS_ADD_IFELSE([-w])
+  fi
 
   CNOWARNFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS_KEEP"
@@ -78,9 +82,12 @@ AC_DEFUN([SVN_CC_MODE_SETUP],
   AC_SUBST(CMODEFLAGS)
   AC_SUBST(CNOWARNFLAGS)
   AC_SUBST(CMAINTAINERFLAGS)
+  AC_SUBST(CUSERFLAGS)
 
-  dnl Tell clang to not accept unknown warning flags
-  SVN_CFLAGS_ADD_IFELSE([-Werror=unknown-warning-option])
+  if test "$GCC" = "yes"; then
+    dnl Tell clang to not accept unknown warning flags
+    SVN_CFLAGS_ADD_IFELSE([-Werror=unknown-warning-option])
+  fi
 ])
 
 
@@ -89,15 +96,19 @@ AC_DEFUN([SVN_CXX_MODE_SETUP],
   CXXFLAGS_KEEP="$CXXFLAGS"
   CXXFLAGS=""
 
-  dnl Find flags to force C++98 mode
-                dnl g++ and clang++
-  SVN_CXXFLAGS_ADD_IFELSE([-std=c++98])
+  if test "$GXX" = "yes"; then
+    dnl Find flags to force C++98 mode
+                  dnl g++ and clang++
+    SVN_CXXFLAGS_ADD_IFELSE([-std=c++98])
+  fi
 
   CXXMODEFLAGS="$CFLAGS"
   CXXFLAGS=""
 
-  dnl Find flags to silence all warnings
-  SVN_CXXFLAGS_ADD_IFELSE([-w])
+  if test "$GXX" = "yes"; then
+    dnl Find flags to silence all warnings
+    SVN_CXXFLAGS_ADD_IFELSE([-w])
+  fi
 
   CXXNOWARNFLAGS="$CXXFLAGS"
   CXXFLAGS="$CXXFLAGS_KEEP"
@@ -105,7 +116,10 @@ AC_DEFUN([SVN_CXX_MODE_SETUP],
   AC_SUBST(CXXMODEFLAGS)
   AC_SUBST(CXXNOWARNFLAGS)
   AC_SUBST(CXXMAINTAINERFLAGS)
+  AC_SUBST(CXXUSERFLAGS)
 
-  dnl Tell clang++ to not accept unknown warning flags
-  SVN_CXXFLAGS_ADD_IFELSE([-Werror=unknown-warning-option])
+  if test "$GXX" = "yes"; then
+    dnl Tell clang++ to not accept unknown warning flags
+    SVN_CXXFLAGS_ADD_IFELSE([-Werror=unknown-warning-option])
+  fi
 ])

Modified: subversion/branches/invoke-diff-cmd-feature/build/generator/gen_base.py
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/build/generator/gen_base.py?rev=1526487&r1=1526486&r2=1526487&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/build/generator/gen_base.py (original)
+++ subversion/branches/invoke-diff-cmd-feature/build/generator/gen_base.py Thu Sep 26 13:47:21 2013
@@ -334,6 +334,10 @@ class DependencyGraph:
     else:
       self.deps[type][target] = [ source ]
 
+  def remove(self, type, target, source):
+    if target in self.deps[type] and source in self.deps[type][target]:
+      self.deps[type][target].remove(source)
+
   def bulk_add(self, type, target, sources):
     if target in self.deps[type]:
       self.deps[type][target].extend(sources)
@@ -541,6 +545,8 @@ class TargetExe(TargetLinked):
     self.manpages = options.get('manpages', '')
     self.testing = options.get('testing')
 
+    self.msvc_force_static = options.get('msvc-force-static') == 'yes'
+
   def add_dependencies(self):
     TargetLinked.add_dependencies(self)
 
@@ -594,7 +600,6 @@ class TargetLib(TargetLinked):
     "tries to disable building as a shared library,"
 
     self.msvc_static = True
-    self.msvc_export = []
 
 class TargetApacheMod(TargetLib):
 

Modified: subversion/branches/invoke-diff-cmd-feature/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/build/generator/gen_win.py?rev=1526487&r1=1526486&r2=1526487&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/build/generator/gen_win.py (original)
+++ subversion/branches/invoke-diff-cmd-feature/build/generator/gen_win.py Thu Sep 26 13:47:21 2013
@@ -198,6 +198,9 @@ class WinGeneratorBase(gen_win_dependenc
     install_targets = self.graph.get_all_sources(gen_base.DT_INSTALL) \
                       + self.projects
 
+    install_targets = [x for x in install_targets if not x.when or
+                                                     x.when in self._windows_when]
+
     # Don't create projects for scripts
     install_targets = [x for x in install_targets if not isinstance(x, gen_base.TargetScript)]
 
@@ -252,6 +255,21 @@ class WinGeneratorBase(gen_win_dependenc
             dll_targets.append(self.create_dll_target(target))
     install_targets.extend(dll_targets)
 
+    # Fix up targets that can't be linked to libraries
+    if not self.disable_shared:
+      for target in install_targets:
+        if isinstance(target, gen_base.TargetExe) and target.msvc_force_static:
+
+          # Make direct dependencies of all the indirect dependencies
+          linked_deps = {}
+          self.get_linked_win_depends(target, linked_deps)
+
+          for lk in linked_deps.keys():
+            if not isinstance(lk, gen_base.TargetLib) or not lk.msvc_export:
+              self.graph.add(gen_base.DT_LINK, target.name, lk)
+            else:
+              self.graph.remove(gen_base.DT_LINK, target.name, lk)
+
     for target in install_targets:
       target.project_guid = self.makeguid(target.name)
 
@@ -302,9 +320,7 @@ class WinGeneratorBase(gen_win_dependenc
       # against the static libraries because they sometimes access internal
       # library functions.
 
-      # ### The magic behavior for 'test' in a name and 'entries-dump' should
-      # ### move to another option in build.conf
-      if dep in deps[key] and key.find("test") == -1 and key != 'entries-dump':
+      if dep in deps[key]:
         deps[key].remove(dep)
         deps[key].append(target)
 

Modified: subversion/branches/invoke-diff-cmd-feature/build/generator/gen_win_dependencies.py
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/build/generator/gen_win_dependencies.py?rev=1526487&r1=1526486&r2=1526487&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/build/generator/gen_win_dependencies.py (original)
+++ subversion/branches/invoke-diff-cmd-feature/build/generator/gen_win_dependencies.py Thu Sep 26 13:47:21 2013
@@ -123,6 +123,13 @@ class GenDependenciesBase(gen_base.Gener
         'magic',
   ]
 
+  # When build.conf contains a 'when = SOMETHING' where SOMETHING is not in
+  # this list, then the project is not generated on Windows.
+  _windows_when = [
+     'INSTALL_APACHE_MODS',
+     # not 'SVN_USE_GMOCK',
+  ]
+
   def parse_options(self, options):
     self.apr_path = 'apr'
     self.apr_util_path = 'apr-util'
@@ -787,6 +794,13 @@ class GenDependenciesBase(gen_base.Gener
       defines.extend(["HAVE_RB_ERRINFO"])
 
     forced_includes = []
+
+    if ver >= (1, 8, 0):
+      # Swig redefines NUM2LL as NUM2LONG if it isn't defined, but on Windows
+      # ruby 1.8+ declares NUM2LL as a static inline function.
+      # (LL2NUM and NUM2ULL don't have these problems)
+      defines.extend(['NUM2LL=NUM2LL'])
+
     if ver >= (1, 9, 0):
       forced_includes.append('swigutil_rb__pre_ruby.h')
       defines.extend(["SVN_SWIG_RUBY__CUSTOM_RUBY_CONFIG"])
@@ -1033,10 +1047,12 @@ class GenDependenciesBase(gen_base.Gener
       if version < (1, 3, 0):
         lib_dir = os.path.join(self.serf_path, 'Release')
         debug_lib_dir = os.path.join(self.serf_path, 'Debug')
+        is_src = True
       else:
         lib_dir = self.serf_path
         debug_lib_dir = None
-      is_src = True
+        inc_dir = self.serf_path
+        is_src = False
     elif os.path.isfile(os.path.join(self.serf_path, 'include/serf-1/serf.h')):
       # Install layout
       inc_dir = os.path.join(self.serf_path, 'include/serf-1')

Modified: subversion/branches/invoke-diff-cmd-feature/build/generator/templates/build_locale.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/build/generator/templates/build_locale.ezt?rev=1526487&r1=1526486&r2=1526487&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/build/generator/templates/build_locale.ezt (original)
+++ subversion/branches/invoke-diff-cmd-feature/build/generator/templates/build_locale.ezt Thu Sep 26 13:47:21 2013
@@ -19,7 +19,7 @@
 @echo off
 @rem **************************************************************************
 cd ..\..\..\subversion\po
-mkdir ..\..\%1\mo
+if not exist ..\..\%1\mo mkdir ..\..\%1\mo
 set exitcode=0
 [for pofiles]echo Running msgfmt on [pofiles.po]...
 msgfmt.exe -c -o ..\..\%1\mo\[pofiles.mo] [pofiles.po]

Modified: subversion/branches/invoke-diff-cmd-feature/configure.ac
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/configure.ac?rev=1526487&r1=1526486&r2=1526487&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/configure.ac (original)
+++ subversion/branches/invoke-diff-cmd-feature/configure.ac Thu Sep 26 13:47:21 2013
@@ -49,13 +49,11 @@ SVN_CONFIG_NICE(config.nice)
 # ==== Check for programs ====================================================
 
 # Look for a C compiler (before anything can set CFLAGS)
-CMAINTAINERFLAGS="$CUSERFLAGS"
 CUSERFLAGS="$CFLAGS"
 AC_PROG_CC
 SVN_CC_MODE_SETUP
 
 # Look for a C++ compiler (before anything can set CXXFLAGS)
-CXXMAINTAINERFLAGS="$CXXUSERFLAGS"
 CXXUSERFLAGS="$CXXFLAGS"
 AC_PROG_CXX
 SVN_CXX_MODE_SETUP
@@ -1030,7 +1028,7 @@ AS_HELP_STRING([--enable-maintainer-mode
         dnl but throw too many warnings in svn code, of too little importance,
         dnl to keep these enabled. Remove the "dnl" to do a run with these
         dnl switches enabled.
-        dnl ./configure CUSERFLAGS="-Wswitch-enum -Wswitch-default"
+        dnl ./configure CFLAGS="-Wswitch-enum -Wswitch-default"
 
         dnl Add each of the following flags only if the C compiler accepts it.
         CFLAGS_KEEP="$CFLAGS"
@@ -1046,7 +1044,7 @@ AS_HELP_STRING([--enable-maintainer-mode
         SVN_CFLAGS_ADD_IFELSE([-Wno-format-nonliteral])
         SVN_CFLAGS_ADD_IFELSE([-Wno-string-plus-int])
 
-        CMAINTAINERFLAGS="$CFLAGS $CMAINTAINERFLAGS"
+        CMAINTAINERFLAGS="$CFLAGS"
         CFLAGS="$CFLAGS_KEEP"
 
         dnl Add flags that all versions of GCC (should) support
@@ -1064,7 +1062,7 @@ AS_HELP_STRING([--enable-maintainer-mode
         SVN_CXXFLAGS_ADD_IFELSE([-Wshorten-64-to-32])
         SVN_CXXFLAGS_ADD_IFELSE([-Wno-system-headers])
 
-        CXXMAINTAINERFLAGS="$CXXFLAGS $CXXMAINTAINERFLAGS"
+        CXXMAINTAINERFLAGS="$CXXFLAGS"
         CXXFLAGS="$CXXFLAGS_KEEP"
 
         dnl Add flags that all versions of G++ (should) support

Modified: subversion/branches/invoke-diff-cmd-feature/contrib/client-side/emacs/vc-svn.el
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/contrib/client-side/emacs/vc-svn.el?rev=1526487&r1=1526486&r2=1526487&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/contrib/client-side/emacs/vc-svn.el (original)
+++ subversion/branches/invoke-diff-cmd-feature/contrib/client-side/emacs/vc-svn.el Thu Sep 26 13:47:21 2013
@@ -162,7 +162,7 @@ See `vc-svn-parse-status' for a descript
     (let ((status (apply 'call-process vc-svn-program-name nil t nil
                          (append '("status" "-v")
                                  (if update '("-u") '())
-                                 (list file)))))
+                                 (list (concat file "@"))))))
       (goto-char (point-min))
       (if (not (equal 0 status)) ; not zerop; status can be a string
           ;; If you ask for the status of a file that isn't even in a
@@ -205,7 +205,8 @@ If the file is newly added, LOCAL is \"0
             (match-string 3)))
      ((looking-at "^I +") nil)       ;; An ignored file
      ((looking-at " \\{40\\}") nil)  ;; A file that is not in the wc nor svn?
-     (t (error "Couldn't parse output from `svn status -v'")))))
+     ;; Since svn status is run on every file, don't complain if it fails.
+     (t nil))))
 
 
 (defun vc-svn-parse-state-only ()

Modified: subversion/branches/invoke-diff-cmd-feature/notes/ev2-callbacks-template.c
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/notes/ev2-callbacks-template.c?rev=1526487&r1=1526486&r2=1526487&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/notes/ev2-callbacks-template.c (original)
+++ subversion/branches/invoke-diff-cmd-feature/notes/ev2-callbacks-template.c Thu Sep 26 13:47:21 2013
@@ -155,19 +155,6 @@ move_cb(void *baton,
 }
 
 
-/* This implements svn_editor_cb_rotate_t */
-static svn_error_t *
-rotate_cb(void *baton,
-          const apr_array_header_t *relpaths,
-          const apr_array_header_t *revisions,
-          apr_pool_t *scratch_pool)
-{
-  struct edit_baton *eb = baton;
-
-  UNUSED(eb); SVN__NOT_IMPLEMENTED();
-}
-
-
 /* This implements svn_editor_cb_complete_t */
 static svn_error_t *
 complete_cb(void *baton,
@@ -208,7 +195,6 @@ make_editor(svn_editor_t **editor,
     delete_cb,
     copy_cb,
     move_cb,
-    rotate_cb,
     complete_cb,
     abort_cb
   };

Modified: subversion/branches/invoke-diff-cmd-feature/notes/knobs
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/notes/knobs?rev=1526487&r1=1526486&r2=1526487&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/notes/knobs (original)
+++ subversion/branches/invoke-diff-cmd-feature/notes/knobs Thu Sep 26 13:47:21 2013
@@ -68,6 +68,7 @@ SERF_VERBOSE
 SSL_VERBOSE
 SVN_DEPRECATED
 SVN_FS__TRAIL_DEBUG
+SVN_FS_FS__LOG_ACCESS
 SVN_UTF_NO_UNINITIALISED_ACCESS
 
 2.4 Test-only
@@ -80,6 +81,7 @@ TEST16K_ADD
 
 SVNSYNC_UNSUPPORTED_STRIP_MERGEINFO
 SVNSYNC_UNSUPPORTED_MIGRATE_SVNMERGE
+SVN_CMDLINE_DISABLE_CRASH_HANDLER
 SVN_I_LOVE_CORRUPTED_WORKING_COPIES_SO_DISABLE_RELOCATE_VALIDATION
 SVN_I_LOVE_CORRUPTED_WORKING_COPIES_SO_DISABLE_SLEEP_FOR_TIMESTAMPS
 SVN_I_LOVE_PANGALACTIC_GARGLE_BLASTERS
@@ -395,7 +397,17 @@ SVN_I_LIKE_LATENCY_SO_IGNORE_HTTPV2
   Default:   not defined
   Suggested: defined, not defined
 
-5.14 SVN_UTF_NO_UNINITIALISED_ACCESS
+5.14 SVN_FS_FS__LOG_ACCESS
+  
+  Scope:     libsvn_fs_fs/cached_data.c
+  Purpose:   logs type and location info for any fsfs data access above the
+             cache layer to console (i.e. what data gets requested from FSFS
+             rather than disk)
+  Range:     definedness
+  Default:   not defined
+  Suggested: defined, not defined
+
+5.15 SVN_UTF_NO_UNINITIALISED_ACCESS
 
   Scope:     libsvn_subr
   Purpose:   Disables some code that triggers warnings in memory tools
@@ -448,34 +460,41 @@ SVN_I_LIKE_LATENCY_SO_IGNORE_HTTPV2
   Scope:     
   Purpose:   
 
-7.3 SVN_I_LOVE_CORRUPTED_WORKING_COPIES_SO_DISABLE_RELOCATE_VALIDATION
+7.3. SVN_CMDLINE_DISABLE_CRASH_HANDLER
+
+  Scope:     All command line executables. Windows specific.
+  Purpose:   Setting any value disables internal Subversion crash handler
+             for creating minidump and stack trace information on failure on
+             Windows.
+
+7.4 SVN_I_LOVE_CORRUPTED_WORKING_COPIES_SO_DISABLE_RELOCATE_VALIDATION
 
   Scope:     
   Purpose:   
 
-7.4 SVN_I_LOVE_CORRUPTED_WORKING_COPIES_SO_DISABLE_SLEEP_FOR_TIMESTAMPS
+7.5 SVN_I_LOVE_CORRUPTED_WORKING_COPIES_SO_DISABLE_SLEEP_FOR_TIMESTAMPS
 
   Scope:     
   Purpose:   
 
-7.5 SVN_I_LOVE_PANGALACTIC_GARGLE_BLASTERS
+7.6 SVN_I_LOVE_PANGALACTIC_GARGLE_BLASTERS
 
   Scope:     
   Purpose:   
 
-7.6 SVN_I_LIKE_LATENCY_SO_IGNORE_HTTPV2
+7.7 SVN_I_LIKE_LATENCY_SO_IGNORE_HTTPV2
 
   Scope:     libsvn_ra_neon and libsvn_ra_serf, if SVN_DEBUG
   Purpose:   A "yes" value causes the RA modules to ignore the server's
              advertisement of HTTPv2 protocol support (if any), effectively
              causing them to only speak our original HTTP protocol.
 
-7.7 SVN_SVNMUCC_IS_SVNSYITF
+7.8 SVN_SVNMUCC_IS_SVNSYITF
 
   Scope:     'make install-tools'
   Purpose:   Symlinks $prefix/bin/svnsyitf to $prefix/bin/svnmucc
 
-7.8 SVN_X_DOES_NOT_MARK_THE_SPOT
+7.9 SVN_X_DOES_NOT_MARK_THE_SPOT
 
   Scope:     svn_cache__t subsystem (used by FSFS, svnserve, etc)
   Purpose:   Disable the subsystem.  Requires -D SVN_DEBUG.

Modified: subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/CommitEditor.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/CommitEditor.cpp?rev=1526487&r1=1526486&r2=1526487&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/CommitEditor.cpp (original)
+++ subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/CommitEditor.cpp Thu Sep 26 13:47:21 2013
@@ -200,57 +200,6 @@ build_checksum(jobject jchecksum, SVN::P
 
   return checksum;
 }
-
-// void
-// build_rotation(const apr_array_header_t **p_relpaths,
-//                const apr_array_header_t **p_revisions,
-//                const Iterator& iter, SVN::Pool& pool)
-// {
-//   *p_relpaths = *p_revisions = NULL;
-//
-//   static jfieldID relpath_fid = 0;
-//   static jfieldID revision_fid = 0;
-//
-//   JNIEnv *env = JNIUtil::getEnv();
-//   if (0 == relpath_fid || 0 == revision_fid)
-//     {
-//       jclass cls = env->FindClass(JAVA_PACKAGE"/ISVNEditor$RotatePair");
-//       if (JNIUtil::isJavaExceptionThrown())
-//         return;
-//
-//       relpath_fid = env->GetFieldID(cls, "relativePath", "Ljava/lang/String;");
-//       if (JNIUtil::isJavaExceptionThrown())
-//         return;
-//       revision_fid = env->GetFieldID(cls, "revision", "J");
-//       if (JNIUtil::isJavaExceptionThrown())
-//         return;
-//     }
-//
-//   apr_pool_t* result_pool = pool.getPool();
-//   apr_array_header_t* relpaths = apr_array_make(
-//       result_pool, 0, sizeof(const char*));
-//   apr_array_header_t* revisions = apr_array_make(
-//       result_pool, 0, sizeof(svn_revnum_t));
-//   while (iter.hasNext())
-//     {
-//       jobject jpair = iter.next();
-//       jobject jrelpath = env->GetObjectField(jpair, relpath_fid);
-//       if (JNIUtil::isJavaExceptionThrown())
-//         return;
-//       jlong jrevision = env->GetLongField(jpair, revision_fid);
-//       if (JNIUtil::isJavaExceptionThrown())
-//         return;
-//       JNIStringHolder relpath((jstring)jrelpath);
-//       if (JNIUtil::isJavaExceptionThrown())
-//         return;
-//
-//       APR_ARRAY_PUSH(relpaths, const char*) = relpath.pstrdup(result_pool);
-//       APR_ARRAY_PUSH(revisions, svn_revnum_t) = svn_revnum_t(jrevision);
-//     }
-//
-//   *p_relpaths = relpaths;
-//   *p_revisions = revisions;
-// }
 } // anonymous namespace
 
 
@@ -452,21 +401,6 @@ void CommitEditor::move(jstring jsrc_rel
                               svn_revnum_t(jreplaces_revision)),);
 }
 
-// void CommitEditor::rotate(jobject jelements)
-// {
-//   if (!m_valid) { throw_editor_inactive(); return; }
-//   SVN_JNI_ERR(m_session->m_context->checkCancel(m_session->m_context),);
-//
-//   SVN::Pool subPool(pool);
-//   const apr_array_header_t* relpaths;
-//   const apr_array_header_t* revisions;
-//   build_rotation(&relpaths, &revisions, jelements, subPool);
-//   if (JNIUtil::isJavaExceptionThrown())
-//     return;
-//
-//   SVN_JNI_ERR(svn_editor_rotate(m_editor, relpaths, revisions),);
-// }
-
 void CommitEditor::complete()
 {
   if (!m_valid) { throw_editor_inactive(); return; }

Propchange: subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/CommitEditor.cpp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/CommitEditor.h
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/CommitEditor.h?rev=1526487&r1=1526486&r2=1526487&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/CommitEditor.h (original)
+++ subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/CommitEditor.h Thu Sep 26 13:47:21 2013
@@ -81,7 +81,6 @@ public:
             jstring jdst_relpath, jlong jreplaces_revision);
   void move(jstring jsrc_relpath, jlong jsrc_revision,
             jstring jdst_relpath, jlong jreplaces_revision);
-  // void rotate(jobject jelements);
   void complete();
   void abort();
 

Propchange: subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/CommitEditor.h
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/CreateJ.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/CreateJ.cpp?rev=1526487&r1=1526486&r2=1526487&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/CreateJ.cpp (original)
+++ subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/CreateJ.cpp Thu Sep 26 13:47:21 2013
@@ -858,7 +858,7 @@ CreateJ::ClientNotifyInformation(const s
   jlong jhunkModifiedLength = wcNotify->hunk_modified_length;
   jlong jhunkMatchedLine = wcNotify->hunk_matched_line;
   jint jhunkFuzz = static_cast<jint>(wcNotify->hunk_fuzz);
-  if (jhunkFuzz != wcNotify->hunk_fuzz)
+  if (jhunkFuzz < 0 || jhunkFuzz != wcNotify->hunk_fuzz)
     {
       env->ThrowNew(env->FindClass("java.lang.ArithmeticException"),
                     "Overflow converting C svn_linenum_t to Java int");

Modified: subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/EditorProxy.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/EditorProxy.cpp?rev=1526487&r1=1526486&r2=1526487&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/EditorProxy.cpp (original)
+++ subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/EditorProxy.cpp Thu Sep 26 13:47:21 2013
@@ -55,7 +55,7 @@ EditorProxy::EditorProxy(jobject jeditor
   static const svn_editor_cb_many_t editor_many_cb = {
     cb_add_directory, cb_add_file, cb_add_symlink, cb_add_absent,
     cb_alter_directory, cb_alter_file, cb_alter_symlink,
-    cb_delete, cb_copy, cb_move, cb_rotate,
+    cb_delete, cb_copy, cb_move,
     cb_complete, cb_abort
   };
 
@@ -473,15 +473,6 @@ EditorProxy::cb_move(void *baton,
 }
 
 svn_error_t*
-EditorProxy::cb_rotate(void*,
-                       const apr_array_header_t*,
-                       const apr_array_header_t*,
-                       apr_pool_t*)
-{
-  return svn_error_create(APR_ENOTIMPL, NULL, "EditorProxy::cb_rotate");
-}
-
-svn_error_t*
 EditorProxy::cb_complete(void *baton, apr_pool_t *scratch_pool)
 {
   //DEBUG:fprintf(stderr, "  (n) EditorProxy::cb_complete()\n");

Propchange: subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/EditorProxy.cpp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/EditorProxy.h
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/EditorProxy.h?rev=1526487&r1=1526486&r2=1526487&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/EditorProxy.h (original)
+++ subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/EditorProxy.h Thu Sep 26 13:47:21 2013
@@ -129,10 +129,6 @@ private:
                               const char *dst_relpath,
                               svn_revnum_t replaces_rev,
                               apr_pool_t *scratch_pool);
-  static svn_error_t* cb_rotate(void *baton,
-                                const apr_array_header_t *relpaths,
-                                const apr_array_header_t *revisions,
-                                apr_pool_t *scratch_pool);
   static svn_error_t* cb_complete(void *baton,
                                   apr_pool_t *scratch_pool);
   static svn_error_t* cb_abort(void *baton,

Propchange: subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/EditorProxy.h
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/Iterator.cpp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/Iterator.h
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/JNIUtil.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/JNIUtil.cpp?rev=1526487&r1=1526486&r2=1526487&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/JNIUtil.cpp (original)
+++ subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/JNIUtil.cpp Thu Sep 26 13:47:21 2013
@@ -24,6 +24,13 @@
  * @brief Implementation of the class JNIUtil
  */
 
+/* Include apr.h first, or INT64_C won't be defined properly on some C99
+   compilers, when other headers include <stdint.h> before defining some
+   macros.
+
+   See apr.h for the ugly details */
+#include <apr.h>
+
 #include "JNIUtil.h"
 #include "Array.h"
 
@@ -35,6 +42,8 @@
 #include <apr_tables.h>
 #include <apr_general.h>
 #include <apr_lib.h>
+#include <apr_file_info.h>
+#include <apr_time.h>
 
 #include "svn_pools.h"
 #include "svn_fs.h"
@@ -44,7 +53,7 @@
 #include "svn_dso.h"
 #include "svn_path.h"
 #include "svn_cache_config.h"
-#include <apr_file_info.h>
+#include "private/svn_atomic.h"
 #include "svn_private_config.h"
 #ifdef WIN32
 /* FIXME: We're using an internal APR header here, which means we
@@ -68,6 +77,7 @@ apr_pool_t *JNIUtil::g_pool = NULL;
 std::list<SVNBase*> JNIUtil::g_finalizedObjects;
 JNIMutex *JNIUtil::g_finalizedObjectsMutex = NULL;
 JNIMutex *JNIUtil::g_logMutex = NULL;
+JNIMutex *JNIUtil::g_configMutex = NULL;
 bool JNIUtil::g_initException;
 bool JNIUtil::g_inInit;
 JNIEnv *JNIUtil::g_initEnv;
@@ -104,6 +114,93 @@ bool JNIUtil::JNIInit(JNIEnv *env)
   return true;
 }
 
+namespace
+{
+struct GlobalInitGuard
+{
+  enum InitState
+    {
+      state_null,
+      state_init,
+      state_done,
+      state_error
+    };
+
+  GlobalInitGuard()
+    : m_finished(false),
+      m_state(InitState(svn_atomic_cas(&m_global_state,
+                                       state_init, state_null)))
+    {
+      switch (m_state)
+        {
+        case state_null:
+          // This thread won the initialization contest.
+          break;
+
+        case state_done:
+          // The library is already initialized.
+          break;
+
+        case state_init:
+          // Another thread is currently initializing the
+          // library. Spin and wait for it to finish, with exponential
+          // backoff, but no longer than half a second.
+          for (unsigned shift = 0;
+               m_state == state_init && shift < 8;
+               ++shift)
+            {
+              apr_sleep((APR_USEC_PER_SEC / 1000) << shift);
+              m_state = InitState(svn_atomic_cas(&m_global_state,
+                                                 state_null, state_null));
+            }
+          if (m_state == state_init)
+            // The initialization didn't complete in half a second,
+            // which probably implies a thread crash or a deadlock.
+            m_state = state_error;
+          break;
+
+        default:
+          // Error state, or unknown state. In any case, do not continue.
+          m_state = state_error;
+        }
+    }
+
+  ~GlobalInitGuard()
+    {
+      // Signal the end of the library intialization if we're the
+      // initializing thread.
+      if (m_finished && m_state == state_null)
+        {
+          SVN_ERR_ASSERT_NO_RETURN(
+              state_init == svn_atomic_cas(&m_global_state,
+                                           state_done, state_init));
+        }
+    }
+
+  bool done() const
+    {
+      return (m_state == state_done);
+    }
+
+  bool error() const
+    {
+      return (m_state == state_error);
+    }
+
+  void finish()
+    {
+      m_finished = true;
+    }
+
+private:
+  bool m_finished;
+  InitState m_state;
+  static volatile svn_atomic_t m_global_state;
+};
+volatile svn_atomic_t
+GlobalInitGuard::m_global_state = GlobalInitGuard::state_null;
+} // anonymous namespace
+
 /**
  * Initialize the environment for all requests.
  * @param env   the JNI environment for this request
@@ -111,27 +208,19 @@ bool JNIUtil::JNIInit(JNIEnv *env)
 bool JNIUtil::JNIGlobalInit(JNIEnv *env)
 {
   // This method has to be run only once during the run a program.
-  static bool run = false;
-  svn_error_t *err;
-  if (run) // already run
+  GlobalInitGuard guard;
+  if (guard.done())
     return true;
-
-  run = true;
-
-  // Do not run this part more than one time.  This leaves a small
-  // time window when two threads create their first SVNClient and
-  // SVNAdmin at the same time, but I do not see a better option
-  // without APR already initialized
-  if (g_inInit)
+  else if (guard.error())
     return false;
 
   g_inInit = true;
   g_initEnv = env;
 
+  svn_error_t *err;
   apr_status_t status;
 
 
-
   /* Initialize the APR subsystem, and register an atexit() function
    * to Uninitialize that subsystem at program exit. */
   status = apr_initialize();
@@ -268,6 +357,10 @@ bool JNIUtil::JNIGlobalInit(JNIEnv *env)
   if (isExceptionThrown())
     return false;
 
+  g_configMutex = new JNIMutex(g_pool);
+  if (isExceptionThrown())
+    return false;
+
   // initialized the thread local storage
   if (!JNIThreadData::initThreadData())
     return false;
@@ -278,6 +371,8 @@ bool JNIUtil::JNIGlobalInit(JNIEnv *env)
 
   g_initEnv = NULL;
   g_inInit = false;
+
+  guard.finish();
   return true;
 }
 
@@ -575,7 +670,7 @@ void JNIUtil::handleSVNError(svn_error_t
     POP_AND_RETURN_NOTHING();
 
   const jsize stSize = static_cast<jsize>(newStackTrace.size());
-  if (stSize != newStackTrace.size())
+  if (stSize < 0 || stSize != newStackTrace.size())
     {
       env->ThrowNew(env->FindClass("java.lang.ArithmeticException"),
                     "Overflow converting C size_t to JNI jsize");

Modified: subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/JNIUtil.h
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/JNIUtil.h?rev=1526487&r1=1526486&r2=1526487&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/JNIUtil.h (original)
+++ subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/JNIUtil.h Thu Sep 26 13:47:21 2013
@@ -165,6 +165,11 @@ class JNIUtil
   };
   typedef std::vector<message_stack_item> error_message_stack_t;
 
+  /**
+   * Mutex that secures the global configuration object.
+   */
+  static JNIMutex *g_configMutex;
+
  private:
   static void assembleErrorMessage(svn_error_t *err, int depth,
                                    apr_status_t parent_apr_err,

Propchange: subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/LockTokenTable.cpp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/LockTokenTable.h
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/OperationContext.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/OperationContext.cpp?rev=1526487&r1=1526486&r2=1526487&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/OperationContext.cpp (original)
+++ subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/OperationContext.cpp Thu Sep 26 13:47:21 2013
@@ -28,6 +28,7 @@
 #include "private/svn_wc_private.h"
 #include "svn_private_config.h"
 
+#include "GlobalConfig.h"
 #include "OperationContext.h"
 #include "JNIUtil.h"
 #include "JNICriticalSection.h"
@@ -77,6 +78,10 @@ OperationContext::attachJavaObject(
     return;
 
   env->DeleteLocalRef(jctx);
+
+  m_jcfgcb = env->NewGlobalRef(GlobalConfig::getConfigCallback());
+  if (JNIUtil::isJavaExceptionThrown())
+    return;
 }
 
 OperationContext::~OperationContext()
@@ -123,65 +128,78 @@ OperationContext::getAuthBaton(SVN::Pool
       return NULL;
     }
 
-  svn_config_t *config = reinterpret_cast<svn_config_t *>(apr_hash_get(configData,
+  svn_config_t *config = static_cast<svn_config_t *>(apr_hash_get(configData,
       SVN_CONFIG_CATEGORY_CONFIG, APR_HASH_KEY_STRING));
 
+  const bool use_native_store = GlobalConfig::useNativeCredentialsStore();
+
   /* The whole list of registered providers */
   apr_array_header_t *providers;
+  svn_auth_provider_object_t *provider;
 
-  /* Populate the registered providers with the platform-specific providers */
-  SVN_JNI_ERR(
-      svn_auth_get_platform_specific_client_providers(&providers, config, pool),
-      NULL);
-
-  /* Use the prompter (if available) to prompt for password and cert
-   * caching. */
-  svn_auth_plaintext_prompt_func_t plaintext_prompt_func = NULL;
-  void *plaintext_prompt_baton = NULL;
-  svn_auth_plaintext_passphrase_prompt_func_t plaintext_passphrase_prompt_func;
-  void *plaintext_passphrase_prompt_baton = NULL;
-
-  if (m_prompter != NULL)
+  if (use_native_store)
     {
-      plaintext_prompt_func = Prompter::plaintext_prompt;
-      plaintext_prompt_baton = m_prompter;
-      plaintext_passphrase_prompt_func = Prompter::plaintext_passphrase_prompt;
-      plaintext_passphrase_prompt_baton = m_prompter;
-    }
+      /* Populate the registered providers with the platform-specific providers */
+      SVN_JNI_ERR(
+          svn_auth_get_platform_specific_client_providers(
+              &providers, config, pool),
+          NULL);
+
+      /* Use the prompter (if available) to prompt for password and cert
+       * caching. */
+      svn_auth_plaintext_prompt_func_t plaintext_prompt_func = NULL;
+      void *plaintext_prompt_baton = NULL;
+      svn_auth_plaintext_passphrase_prompt_func_t plaintext_passphrase_prompt_func;
+      void *plaintext_passphrase_prompt_baton = NULL;
+
+      if (m_prompter != NULL)
+        {
+          plaintext_prompt_func = Prompter::plaintext_prompt;
+          plaintext_prompt_baton = m_prompter;
+          plaintext_passphrase_prompt_func = Prompter::plaintext_passphrase_prompt;
+          plaintext_passphrase_prompt_baton = m_prompter;
+        }
 
-  /* The main disk-caching auth providers, for both
-   * 'username/password' creds and 'username' creds.  */
-  svn_auth_provider_object_t *provider;
+      /* The main disk-caching auth providers, for both
+       * 'username/password' creds and 'username' creds.  */
 
-  svn_auth_get_simple_provider2(&provider, plaintext_prompt_func,
-      plaintext_prompt_baton, pool);
-  APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
-
-  svn_auth_get_username_provider(&provider, pool);
-  APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
-
-  /* The server-cert, client-cert, and client-cert-password providers. */
-  SVN_JNI_ERR(
-      svn_auth_get_platform_specific_provider(&provider, "windows", "ssl_server_trust", pool),
-      NULL);
-
-  if (provider)
-    APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
-
-  svn_auth_get_ssl_server_trust_file_provider(&provider, pool);
-  APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
-  svn_auth_get_ssl_client_cert_file_provider(&provider, pool);
-  APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
-  svn_auth_get_ssl_client_cert_pw_file_provider2(&provider,
-      plaintext_passphrase_prompt_func, plaintext_passphrase_prompt_baton,
-      pool);
-  APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
+      svn_auth_get_simple_provider2(&provider, plaintext_prompt_func,
+                                    plaintext_prompt_baton, pool);
+      APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
+
+      svn_auth_get_username_provider(&provider, pool);
+      APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
+
+      /* The server-cert, client-cert, and client-cert-password providers. */
+      SVN_JNI_ERR(
+          svn_auth_get_platform_specific_provider(
+              &provider, "windows", "ssl_server_trust", pool),
+          NULL);
+
+      if (provider)
+        APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
+
+      svn_auth_get_ssl_server_trust_file_provider(&provider, pool);
+      APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
+      svn_auth_get_ssl_client_cert_file_provider(&provider, pool);
+      APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
+      svn_auth_get_ssl_client_cert_pw_file_provider2(
+          &provider,
+          plaintext_passphrase_prompt_func, plaintext_passphrase_prompt_baton,
+          pool);
+      APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
+    }
+  else
+    {
+      // Not using hte native credentials store, start with an empty
+      // providers array.
+      providers = apr_array_make(pool, 0, sizeof(svn_auth_provider_object_t *));
+    }
 
   if (m_prompter != NULL)
     {
       /* Two basic prompt providers: username/password, and just username.*/
       provider = m_prompter->getProviderSimple(in_pool);
-
       APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
 
       provider = m_prompter->getProviderUsername(in_pool);
@@ -254,34 +272,12 @@ OperationContext::setConfigDirectory(con
   m_config = NULL;
 }
 
-void
-OperationContext::setConfigCallback(jobject configCallback)
-{
-  JNIEnv* env = JNIUtil::getEnv();
-
-  if (m_jcfgcb)
-    {
-      env->DeleteGlobalRef(m_jcfgcb);
-      m_jcfgcb = NULL;
-    }
-  if (configCallback)
-    {
-      m_jcfgcb = env->NewGlobalRef(configCallback);
-      env->DeleteLocalRef(configCallback);
-    }
-}
-
 const char *
 OperationContext::getConfigDirectory() const
 {
   return (m_configDir.empty() ? NULL : m_configDir.c_str());
 }
 
-jobject OperationContext::getConfigCallback() const
-{
-  return m_jcfgcb;
-}
-
 const char *
 OperationContext::getUsername() const
 {
@@ -411,7 +407,7 @@ OperationContext::notifyConfigLoad()
         return;
     }
 
-  jclass cfg_cls = env->FindClass(JAVA_PACKAGE"/ConfigImpl");
+  jclass cfg_cls = env->FindClass(JAVA_PACKAGE"/util/ConfigImpl");
   if (JNIUtil::isJavaExceptionThrown())
     return;
 

Modified: subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/OperationContext.h
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/OperationContext.h?rev=1526487&r1=1526486&r2=1526487&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/OperationContext.h (original)
+++ subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/OperationContext.h Thu Sep 26 13:47:21 2013
@@ -79,7 +79,6 @@ class OperationContext
   virtual bool isCancelledOperation();
   jobject getSelf() const;
   const char *getConfigDirectory() const;
-  jobject getConfigCallback() const;
   const char *getUsername() const;
   const char *getPassword() const;
   const Prompter& getPrompter() const;
@@ -92,12 +91,6 @@ class OperationContext
   void setConfigDirectory(const char *configDir);
 
   /**
-   * Set the config ConfigCallback instance to call when configuration
-   * is loaded..
-   */
-  void setConfigCallback(jobject configCallback);
-
-  /**
    * Return configuration data for the context.
    * Read it from config directory if necessary
    */

Modified: subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/RemoteSession.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/RemoteSession.cpp?rev=1526487&r1=1526486&r2=1526487&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/RemoteSession.cpp (original)
+++ subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/RemoteSession.cpp Thu Sep 26 13:47:21 2013
@@ -36,6 +36,7 @@
 #include "svn_ra.h"
 #include "svn_string.h"
 #include "svn_dirent_uri.h"
+#include "svn_delta.h"
 
 #include "CreateJ.h"
 #include "EnumMapper.h"
@@ -66,7 +67,6 @@ jobject
 RemoteSession::open(jint jretryAttempts,
                     jstring jurl, jstring juuid,
                     jstring jconfigDirectory,
-                    jobject jconfigHandler,
                     jstring jusername, jstring jpassword,
                     jobject jprompter, jobject jprogress)
 {
@@ -111,7 +111,7 @@ RemoteSession::open(jint jretryAttempts,
   jobject jremoteSession = open(
       jretryAttempts, url.c_str(), uuid,
       (jconfigDirectory ? configDirectory.c_str() : NULL),
-      jconfigHandler, usernameStr, passwordStr, prompter, jprogress);
+      usernameStr, passwordStr, prompter, jprogress);
   if (JNIUtil::isExceptionThrown() || !jremoteSession)
     {
       delete prompter;
@@ -123,7 +123,7 @@ RemoteSession::open(jint jretryAttempts,
 jobject
 RemoteSession::open(jint jretryAttempts,
                     const char* url, const char* uuid,
-                    const char* configDirectory, jobject jconfigHandler,
+                    const char* configDirectory,
                     const char*  usernameStr, const char*  passwordStr,
                     Prompter*& prompter, jobject jprogress)
 {
@@ -140,7 +140,7 @@ RemoteSession::open(jint jretryAttempts,
   jobject jthis_out = NULL;
   RemoteSession* session = new RemoteSession(
       &jthis_out, jretryAttempts, url, uuid,
-      configDirectory, jconfigHandler,
+      configDirectory,
       usernameStr, passwordStr, prompter, jprogress);
   if (JNIUtil::isJavaExceptionThrown() || !session)
     {
@@ -166,7 +166,6 @@ namespace{
 RemoteSession::RemoteSession(jobject* jthis_out, int retryAttempts,
                              const char* url, const char* uuid,
                              const char* configDirectory,
-                             jobject jconfigHandler,
                              const char*  username, const char*  password,
                              Prompter*& prompter, jobject jprogress)
   : m_session(NULL), m_context(NULL)
@@ -193,7 +192,7 @@ RemoteSession::RemoteSession(jobject* jt
     return;
 
   m_context = new RemoteSessionContext(
-      jremoteSession, pool, configDirectory, jconfigHandler,
+      jremoteSession, pool, configDirectory,
       username, password, prompter, jprogress);
   if (JNIUtil::isJavaExceptionThrown())
     return;
@@ -1173,10 +1172,16 @@ public:
                                // We ignore the deltas as they're not
                                // exposed in the JavaHL API.
                                svn_boolean_t result_of_merge,
-                               svn_txdelta_window_handler_t*, void**,
+                               svn_txdelta_window_handler_t* delta_handler,
+                               void** delta_handler_baton,
                                apr_array_header_t* prop_diffs,
                                apr_pool_t* scratch_pool)
     {
+      if (delta_handler)
+        *delta_handler = svn_delta_noop_window_handler;
+      if (delta_handler_baton)
+        *delta_handler_baton = NULL;
+
       FileRevisionHandler* const self =
         static_cast<FileRevisionHandler*>(baton);
       SVN_ERR_ASSERT(self->m_jcallback != NULL);

Propchange: subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/RemoteSession.cpp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/RemoteSession.h
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/RemoteSession.h?rev=1526487&r1=1526486&r2=1526487&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/RemoteSession.h (original)
+++ subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/RemoteSession.h Thu Sep 26 13:47:21 2013
@@ -47,13 +47,11 @@ class RemoteSession : public SVNBase
     static jobject open(jint jretryAttempts,
                         jstring jurl, jstring juuid,
                         jstring jconfigDirectory,
-                        jobject jconfigHandler,
                         jstring jusername, jstring jpassword,
                         jobject jprompter, jobject jprogress);
     static jobject open(jint jretryAttempts,
                         const char* url, const char* uuid,
                         const char* configDirectory,
-                        jobject jconfigHandler,
                         const char* username, const char* password,
                         Prompter*& prompter, jobject jprogress);
     ~RemoteSession();
@@ -118,7 +116,6 @@ class RemoteSession : public SVNBase
     RemoteSession(jobject*, int retryAttempts,
                   const char* url, const char* uuid,
                   const char* configDirectory,
-                  jobject jconfigHandler,
                   const char* username, const char* password,
                   Prompter*& prompter, jobject jprogress);
 

Propchange: subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/RemoteSession.h
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/RemoteSessionContext.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/RemoteSessionContext.cpp?rev=1526487&r1=1526486&r2=1526487&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/RemoteSessionContext.cpp (original)
+++ subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/RemoteSessionContext.cpp Thu Sep 26 13:47:21 2013
@@ -33,13 +33,12 @@
 
 RemoteSessionContext::RemoteSessionContext(
     jobject contextHolder, SVN::Pool &pool,
-    const char* configDirectory, jobject jconfigHandler,
+    const char* configDirectory,
     const char*  usernameStr, const char*  passwordStr,
     Prompter* prompter, jobject jprogress)
   : OperationContext(pool), m_raCallbacks(NULL)
 {
   setConfigDirectory(configDirectory);
-  setConfigCallback(jconfigHandler);
   if (usernameStr != NULL)
     username(usernameStr);
 

Propchange: subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/RemoteSessionContext.cpp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/RemoteSessionContext.h
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/RemoteSessionContext.h?rev=1526487&r1=1526486&r2=1526487&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/RemoteSessionContext.h (original)
+++ subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/RemoteSessionContext.h Thu Sep 26 13:47:21 2013
@@ -36,7 +36,6 @@ class RemoteSessionContext : public Oper
   public:
     RemoteSessionContext(jobject contextHolder, SVN::Pool &pool,
                          const char* jconfigDirectory,
-                         jobject jconfigHandler,
                          const char* jusername, const char* jpassword,
                          Prompter* prompter, jobject jprogress);
     virtual ~RemoteSessionContext();

Propchange: subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/RemoteSessionContext.h
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/RevisionRangeList.cpp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/RevisionRangeList.h
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/SVNClient.cpp?rev=1526487&r1=1526486&r2=1526487&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/SVNClient.cpp (original)
+++ subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/SVNClient.cpp Thu Sep 26 13:47:21 2013
@@ -1120,7 +1120,7 @@ void SVNClient::streamFileContent(const 
         return;
 
     SVN_JNI_ERR(svn_client_cat2(outputStream.getStream(subPool),
-                                path, pegRevision.revision(),
+                                intPath.c_str(), pegRevision.revision(),
                                 revision.revision(), ctx, subPool.getPool()),
                 );
 }
@@ -1529,7 +1529,6 @@ SVNClient::openRemoteSession(const char*
     jobject jremoteSession = RemoteSession::open(
         retryAttempts, path_info.url.c_str(), path_info.uuid.c_str(),
         context.getConfigDirectory(),
-        context.getConfigCallback(),
         context.getUsername(), context.getPassword(),
         prompter, jctx);
     if (JNIUtil::isJavaExceptionThrown())

Propchange: subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/StateReporter.cpp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: subversion/branches/invoke-diff-cmd-feature/subversion/bindings/javahl/native/StateReporter.h
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message