subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@apache.org
Subject svn commit: r1462850 [1/14] - in /subversion/branches/fsfs-format7: ./ build/ build/ac-macros/ build/generator/ contrib/client-side/svncopy/ notes/ subversion/bindings/javahl/native/ subversion/bindings/javahl/src/org/apache/subversion/javahl/ subversi...
Date Sat, 30 Mar 2013 20:02:33 GMT
Author: stefan2
Date: Sat Mar 30 20:02:27 2013
New Revision: 1462850

URL: http://svn.apache.org/r1462850
Log:
On the fsfs-format7 branch: Sync with trunk up to and including r1462834.
A number conflicts due to refactored fs_fs.c had to be resolved manually.

Added:
    subversion/branches/fsfs-format7/subversion/bindings/javahl/native/DiffOptions.cpp
      - copied unchanged from r1462839, subversion/trunk/subversion/bindings/javahl/native/DiffOptions.cpp
    subversion/branches/fsfs-format7/subversion/bindings/javahl/native/DiffOptions.h
      - copied unchanged from r1462839, subversion/trunk/subversion/bindings/javahl/native/DiffOptions.h
    subversion/branches/fsfs-format7/subversion/bindings/javahl/native/ReposFreezeAction.cpp
      - copied unchanged from r1462839, subversion/trunk/subversion/bindings/javahl/native/ReposFreezeAction.cpp
    subversion/branches/fsfs-format7/subversion/bindings/javahl/native/ReposFreezeAction.h
      - copied unchanged from r1462839, subversion/trunk/subversion/bindings/javahl/native/ReposFreezeAction.h
    subversion/branches/fsfs-format7/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ReposFreezeAction.java
      - copied unchanged from r1462839, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ReposFreezeAction.java
    subversion/branches/fsfs-format7/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/DiffOptions.java
      - copied unchanged from r1462839, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/DiffOptions.java
    subversion/branches/fsfs-format7/subversion/include/private/svn_ra_svn_private.h
      - copied unchanged from r1462839, subversion/trunk/subversion/include/private/svn_ra_svn_private.h
    subversion/branches/fsfs-format7/subversion/tests/cmdline/legacy/
      - copied from r1462839, subversion/trunk/subversion/tests/cmdline/legacy/
    subversion/branches/fsfs-format7/subversion/tests/cmdline/legacy/utf8_tests.py
      - copied unchanged from r1462839, subversion/trunk/subversion/tests/cmdline/legacy/utf8_tests.py
    subversion/branches/fsfs-format7/tools/hook-scripts/control-chars.py
      - copied unchanged from r1462839, subversion/trunk/tools/hook-scripts/control-chars.py
Removed:
    subversion/branches/fsfs-format7/subversion/tests/cmdline/utf8_tests.py
Modified:
    subversion/branches/fsfs-format7/   (props changed)
    subversion/branches/fsfs-format7/CHANGES
    subversion/branches/fsfs-format7/INSTALL
    subversion/branches/fsfs-format7/Makefile.in
    subversion/branches/fsfs-format7/aclocal.m4
    subversion/branches/fsfs-format7/build.conf
    subversion/branches/fsfs-format7/build/ac-macros/apr.m4
    subversion/branches/fsfs-format7/build/ac-macros/apr_memcache.m4
    subversion/branches/fsfs-format7/build/ac-macros/aprutil.m4
    subversion/branches/fsfs-format7/build/ac-macros/svn-macros.m4
    subversion/branches/fsfs-format7/build/generator/gen_win.py
    subversion/branches/fsfs-format7/build/transform_sql.py
    subversion/branches/fsfs-format7/contrib/client-side/svncopy/svncopy.pl.in
    subversion/branches/fsfs-format7/notes/ev2-callbacks-template.c
    subversion/branches/fsfs-format7/notes/knobs
    subversion/branches/fsfs-format7/subversion/bindings/javahl/native/CreateJ.cpp
    subversion/branches/fsfs-format7/subversion/bindings/javahl/native/JNIUtil.cpp
    subversion/branches/fsfs-format7/subversion/bindings/javahl/native/ListCallback.cpp
    subversion/branches/fsfs-format7/subversion/bindings/javahl/native/ListCallback.h
    subversion/branches/fsfs-format7/subversion/bindings/javahl/native/Pool.h
    subversion/branches/fsfs-format7/subversion/bindings/javahl/native/SVNClient.cpp
    subversion/branches/fsfs-format7/subversion/bindings/javahl/native/SVNClient.h
    subversion/branches/fsfs-format7/subversion/bindings/javahl/native/SVNRepos.cpp
    subversion/branches/fsfs-format7/subversion/bindings/javahl/native/SVNRepos.h
    subversion/branches/fsfs-format7/subversion/bindings/javahl/native/StatusCallback.cpp
    subversion/branches/fsfs-format7/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
    subversion/branches/fsfs-format7/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.cpp
    subversion/branches/fsfs-format7/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
    subversion/branches/fsfs-format7/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java
    subversion/branches/fsfs-format7/subversion/bindings/javahl/src/org/apache/subversion/javahl/ReposNotifyInformation.java
    subversion/branches/fsfs-format7/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
    subversion/branches/fsfs-format7/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java
    subversion/branches/fsfs-format7/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ImportFilterCallback.java
    subversion/branches/fsfs-format7/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ListCallback.java
    subversion/branches/fsfs-format7/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/NodeKind.java
    subversion/branches/fsfs-format7/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Status.java
    subversion/branches/fsfs-format7/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
    subversion/branches/fsfs-format7/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
    subversion/branches/fsfs-format7/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNReposTests.java
    subversion/branches/fsfs-format7/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
    subversion/branches/fsfs-format7/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/RunTests.java
    subversion/branches/fsfs-format7/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/SVNTests.java
    subversion/branches/fsfs-format7/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/WC.java
    subversion/branches/fsfs-format7/subversion/bindings/swig/INSTALL
    subversion/branches/fsfs-format7/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c
    subversion/branches/fsfs-format7/subversion/bindings/swig/python/README
    subversion/branches/fsfs-format7/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
    subversion/branches/fsfs-format7/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
    subversion/branches/fsfs-format7/subversion/include/private/svn_cmdline_private.h
    subversion/branches/fsfs-format7/subversion/include/private/svn_debug.h
    subversion/branches/fsfs-format7/subversion/include/private/svn_dep_compat.h
    subversion/branches/fsfs-format7/subversion/include/private/svn_editor.h
    subversion/branches/fsfs-format7/subversion/include/private/svn_io_private.h
    subversion/branches/fsfs-format7/subversion/include/private/svn_ra_private.h
    subversion/branches/fsfs-format7/subversion/include/private/svn_subr_private.h
    subversion/branches/fsfs-format7/subversion/include/private/svn_wc_private.h
    subversion/branches/fsfs-format7/subversion/include/svn_checksum.h
    subversion/branches/fsfs-format7/subversion/include/svn_client.h
    subversion/branches/fsfs-format7/subversion/include/svn_cmdline.h
    subversion/branches/fsfs-format7/subversion/include/svn_config.h
    subversion/branches/fsfs-format7/subversion/include/svn_dav.h
    subversion/branches/fsfs-format7/subversion/include/svn_delta.h
    subversion/branches/fsfs-format7/subversion/include/svn_error.h
    subversion/branches/fsfs-format7/subversion/include/svn_error_codes.h
    subversion/branches/fsfs-format7/subversion/include/svn_fs.h
    subversion/branches/fsfs-format7/subversion/include/svn_io.h
    subversion/branches/fsfs-format7/subversion/include/svn_mergeinfo.h
    subversion/branches/fsfs-format7/subversion/include/svn_path.h
    subversion/branches/fsfs-format7/subversion/include/svn_pools.h
    subversion/branches/fsfs-format7/subversion/include/svn_props.h
    subversion/branches/fsfs-format7/subversion/include/svn_ra.h
    subversion/branches/fsfs-format7/subversion/include/svn_ra_svn.h
    subversion/branches/fsfs-format7/subversion/include/svn_repos.h
    subversion/branches/fsfs-format7/subversion/include/svn_sorts.h
    subversion/branches/fsfs-format7/subversion/include/svn_string.h
    subversion/branches/fsfs-format7/subversion/include/svn_types.h
    subversion/branches/fsfs-format7/subversion/include/svn_utf.h
    subversion/branches/fsfs-format7/subversion/include/svn_version.h
    subversion/branches/fsfs-format7/subversion/include/svn_wc.h
    subversion/branches/fsfs-format7/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
    subversion/branches/fsfs-format7/subversion/libsvn_client/add.c
    subversion/branches/fsfs-format7/subversion/libsvn_client/cat.c
    subversion/branches/fsfs-format7/subversion/libsvn_client/client.h
    subversion/branches/fsfs-format7/subversion/libsvn_client/commit.c
    subversion/branches/fsfs-format7/subversion/libsvn_client/commit_util.c
    subversion/branches/fsfs-format7/subversion/libsvn_client/copy.c
    subversion/branches/fsfs-format7/subversion/libsvn_client/copy_foreign.c
    subversion/branches/fsfs-format7/subversion/libsvn_client/ctx.c
    subversion/branches/fsfs-format7/subversion/libsvn_client/delete.c
    subversion/branches/fsfs-format7/subversion/libsvn_client/deprecated.c
    subversion/branches/fsfs-format7/subversion/libsvn_client/diff.c
    subversion/branches/fsfs-format7/subversion/libsvn_client/diff_local.c
    subversion/branches/fsfs-format7/subversion/libsvn_client/diff_summarize.c
    subversion/branches/fsfs-format7/subversion/libsvn_client/export.c
    subversion/branches/fsfs-format7/subversion/libsvn_client/externals.c
    subversion/branches/fsfs-format7/subversion/libsvn_client/import.c
    subversion/branches/fsfs-format7/subversion/libsvn_client/info.c
    subversion/branches/fsfs-format7/subversion/libsvn_client/iprops.c
    subversion/branches/fsfs-format7/subversion/libsvn_client/list.c
    subversion/branches/fsfs-format7/subversion/libsvn_client/locking_commands.c
    subversion/branches/fsfs-format7/subversion/libsvn_client/log.c
    subversion/branches/fsfs-format7/subversion/libsvn_client/merge.c
    subversion/branches/fsfs-format7/subversion/libsvn_client/mergeinfo.c
    subversion/branches/fsfs-format7/subversion/libsvn_client/patch.c
    subversion/branches/fsfs-format7/subversion/libsvn_client/prop_commands.c
    subversion/branches/fsfs-format7/subversion/libsvn_client/ra.c
    subversion/branches/fsfs-format7/subversion/libsvn_client/repos_diff.c
    subversion/branches/fsfs-format7/subversion/libsvn_client/resolved.c
    subversion/branches/fsfs-format7/subversion/libsvn_client/revert.c
    subversion/branches/fsfs-format7/subversion/libsvn_client/status.c
    subversion/branches/fsfs-format7/subversion/libsvn_client/switch.c
    subversion/branches/fsfs-format7/subversion/libsvn_client/update.c
    subversion/branches/fsfs-format7/subversion/libsvn_client/util.c
    subversion/branches/fsfs-format7/subversion/libsvn_delta/compat.c
    subversion/branches/fsfs-format7/subversion/libsvn_delta/editor.c
    subversion/branches/fsfs-format7/subversion/libsvn_delta/xdelta.c
    subversion/branches/fsfs-format7/subversion/libsvn_diff/diff_file.c
    subversion/branches/fsfs-format7/subversion/libsvn_diff/parse-diff.c
    subversion/branches/fsfs-format7/subversion/libsvn_diff/util.c
    subversion/branches/fsfs-format7/subversion/libsvn_fs/access.c
    subversion/branches/fsfs-format7/subversion/libsvn_fs/editor.c
    subversion/branches/fsfs-format7/subversion/libsvn_fs/fs-loader.c
    subversion/branches/fsfs-format7/subversion/libsvn_fs/fs-loader.h
    subversion/branches/fsfs-format7/subversion/libsvn_fs_base/bdb/changes-table.c
    subversion/branches/fsfs-format7/subversion/libsvn_fs_base/bdb/env.c
    subversion/branches/fsfs-format7/subversion/libsvn_fs_base/dag.c
    subversion/branches/fsfs-format7/subversion/libsvn_fs_base/fs.c
    subversion/branches/fsfs-format7/subversion/libsvn_fs_base/lock.c
    subversion/branches/fsfs-format7/subversion/libsvn_fs_base/revs-txns.c
    subversion/branches/fsfs-format7/subversion/libsvn_fs_base/tree.c
    subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/cached_data.c
    subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/caching.c
    subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/fs.c
    subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/fs.h
    subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/fs_fs.c
    subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/fs_fs.h
    subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/lock.c
    subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/low_level.c
    subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/revprops.c
    subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/temp_serializer.c
    subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/transaction.c
    subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/tree.c
    subversion/branches/fsfs-format7/subversion/libsvn_fs_util/fs-util.c
    subversion/branches/fsfs-format7/subversion/libsvn_ra/compat.c
    subversion/branches/fsfs-format7/subversion/libsvn_ra/deprecated.c
    subversion/branches/fsfs-format7/subversion/libsvn_ra/ra_loader.c
    subversion/branches/fsfs-format7/subversion/libsvn_ra_local/ra_plugin.c
    subversion/branches/fsfs-format7/subversion/libsvn_ra_serf/blame.c
    subversion/branches/fsfs-format7/subversion/libsvn_ra_serf/blncache.c
    subversion/branches/fsfs-format7/subversion/libsvn_ra_serf/commit.c
    subversion/branches/fsfs-format7/subversion/libsvn_ra_serf/getlocations.c
    subversion/branches/fsfs-format7/subversion/libsvn_ra_serf/getlocationsegments.c
    subversion/branches/fsfs-format7/subversion/libsvn_ra_serf/getlocks.c
    subversion/branches/fsfs-format7/subversion/libsvn_ra_serf/inherited_props.c
    subversion/branches/fsfs-format7/subversion/libsvn_ra_serf/log.c
    subversion/branches/fsfs-format7/subversion/libsvn_ra_serf/merge.c
    subversion/branches/fsfs-format7/subversion/libsvn_ra_serf/mergeinfo.c
    subversion/branches/fsfs-format7/subversion/libsvn_ra_serf/options.c
    subversion/branches/fsfs-format7/subversion/libsvn_ra_serf/property.c
    subversion/branches/fsfs-format7/subversion/libsvn_ra_serf/ra_serf.h
    subversion/branches/fsfs-format7/subversion/libsvn_ra_serf/serf.c
    subversion/branches/fsfs-format7/subversion/libsvn_ra_serf/update.c
    subversion/branches/fsfs-format7/subversion/libsvn_ra_serf/util.c
    subversion/branches/fsfs-format7/subversion/libsvn_ra_serf/xml.c
    subversion/branches/fsfs-format7/subversion/libsvn_ra_svn/client.c
    subversion/branches/fsfs-format7/subversion/libsvn_ra_svn/editorp.c
    subversion/branches/fsfs-format7/subversion/libsvn_ra_svn/marshal.c
    subversion/branches/fsfs-format7/subversion/libsvn_ra_svn/ra_svn.h
    subversion/branches/fsfs-format7/subversion/libsvn_repos/authz.c
    subversion/branches/fsfs-format7/subversion/libsvn_repos/commit.c
    subversion/branches/fsfs-format7/subversion/libsvn_repos/delta.c
    subversion/branches/fsfs-format7/subversion/libsvn_repos/deprecated.c
    subversion/branches/fsfs-format7/subversion/libsvn_repos/dump.c
    subversion/branches/fsfs-format7/subversion/libsvn_repos/fs-wrap.c
    subversion/branches/fsfs-format7/subversion/libsvn_repos/hooks.c
    subversion/branches/fsfs-format7/subversion/libsvn_repos/load-fs-vtable.c
    subversion/branches/fsfs-format7/subversion/libsvn_repos/load.c
    subversion/branches/fsfs-format7/subversion/libsvn_repos/log.c
    subversion/branches/fsfs-format7/subversion/libsvn_repos/replay.c
    subversion/branches/fsfs-format7/subversion/libsvn_repos/reporter.c
    subversion/branches/fsfs-format7/subversion/libsvn_repos/repos.c
    subversion/branches/fsfs-format7/subversion/libsvn_repos/rev_hunt.c
    subversion/branches/fsfs-format7/subversion/libsvn_subr/auth.c
    subversion/branches/fsfs-format7/subversion/libsvn_subr/cache-membuffer.c
    subversion/branches/fsfs-format7/subversion/libsvn_subr/cache.c
    subversion/branches/fsfs-format7/subversion/libsvn_subr/cmdline.c
    subversion/branches/fsfs-format7/subversion/libsvn_subr/compat.c
    subversion/branches/fsfs-format7/subversion/libsvn_subr/config.c
    subversion/branches/fsfs-format7/subversion/libsvn_subr/config_auth.c
    subversion/branches/fsfs-format7/subversion/libsvn_subr/debug.c
    subversion/branches/fsfs-format7/subversion/libsvn_subr/deprecated.c
    subversion/branches/fsfs-format7/subversion/libsvn_subr/dso.c
    subversion/branches/fsfs-format7/subversion/libsvn_subr/error.c
    subversion/branches/fsfs-format7/subversion/libsvn_subr/hash.c
    subversion/branches/fsfs-format7/subversion/libsvn_subr/io.c
    subversion/branches/fsfs-format7/subversion/libsvn_subr/mergeinfo.c
    subversion/branches/fsfs-format7/subversion/libsvn_subr/opt.c
    subversion/branches/fsfs-format7/subversion/libsvn_subr/pool.c
    subversion/branches/fsfs-format7/subversion/libsvn_subr/properties.c
    subversion/branches/fsfs-format7/subversion/libsvn_subr/simple_providers.c
    subversion/branches/fsfs-format7/subversion/libsvn_subr/sorts.c
    subversion/branches/fsfs-format7/subversion/libsvn_subr/ssl_client_cert_providers.c
    subversion/branches/fsfs-format7/subversion/libsvn_subr/ssl_client_cert_pw_providers.c
    subversion/branches/fsfs-format7/subversion/libsvn_subr/ssl_server_trust_providers.c
    subversion/branches/fsfs-format7/subversion/libsvn_subr/stream.c
    subversion/branches/fsfs-format7/subversion/libsvn_subr/subst.c
    subversion/branches/fsfs-format7/subversion/libsvn_subr/types.c
    subversion/branches/fsfs-format7/subversion/libsvn_subr/username_providers.c
    subversion/branches/fsfs-format7/subversion/libsvn_subr/utf.c
    subversion/branches/fsfs-format7/subversion/libsvn_subr/utf_validate.c
    subversion/branches/fsfs-format7/subversion/libsvn_subr/version.c
    subversion/branches/fsfs-format7/subversion/libsvn_subr/win32_crashrpt.c
    subversion/branches/fsfs-format7/subversion/libsvn_subr/win32_crypto.c
    subversion/branches/fsfs-format7/subversion/libsvn_subr/xml.c
    subversion/branches/fsfs-format7/subversion/libsvn_wc/adm_crawler.c
    subversion/branches/fsfs-format7/subversion/libsvn_wc/adm_files.c
    subversion/branches/fsfs-format7/subversion/libsvn_wc/adm_ops.c
    subversion/branches/fsfs-format7/subversion/libsvn_wc/ambient_depth_filter_editor.c
    subversion/branches/fsfs-format7/subversion/libsvn_wc/cleanup.c
    subversion/branches/fsfs-format7/subversion/libsvn_wc/conflicts.c
    subversion/branches/fsfs-format7/subversion/libsvn_wc/copy.c
    subversion/branches/fsfs-format7/subversion/libsvn_wc/crop.c
    subversion/branches/fsfs-format7/subversion/libsvn_wc/delete.c
    subversion/branches/fsfs-format7/subversion/libsvn_wc/deprecated.c
    subversion/branches/fsfs-format7/subversion/libsvn_wc/diff_editor.c
    subversion/branches/fsfs-format7/subversion/libsvn_wc/diff_local.c
    subversion/branches/fsfs-format7/subversion/libsvn_wc/entries.c
    subversion/branches/fsfs-format7/subversion/libsvn_wc/externals.c
    subversion/branches/fsfs-format7/subversion/libsvn_wc/info.c
    subversion/branches/fsfs-format7/subversion/libsvn_wc/lock.c
    subversion/branches/fsfs-format7/subversion/libsvn_wc/merge.c
    subversion/branches/fsfs-format7/subversion/libsvn_wc/node.c
    subversion/branches/fsfs-format7/subversion/libsvn_wc/old-and-busted.c
    subversion/branches/fsfs-format7/subversion/libsvn_wc/props.c
    subversion/branches/fsfs-format7/subversion/libsvn_wc/questions.c
    subversion/branches/fsfs-format7/subversion/libsvn_wc/relocate.c
    subversion/branches/fsfs-format7/subversion/libsvn_wc/revert.c
    subversion/branches/fsfs-format7/subversion/libsvn_wc/status.c
    subversion/branches/fsfs-format7/subversion/libsvn_wc/token-map.h
    subversion/branches/fsfs-format7/subversion/libsvn_wc/translate.c
    subversion/branches/fsfs-format7/subversion/libsvn_wc/tree_conflicts.c
    subversion/branches/fsfs-format7/subversion/libsvn_wc/update_editor.c
    subversion/branches/fsfs-format7/subversion/libsvn_wc/upgrade.c
    subversion/branches/fsfs-format7/subversion/libsvn_wc/util.c
    subversion/branches/fsfs-format7/subversion/libsvn_wc/wc-queries.sql
    subversion/branches/fsfs-format7/subversion/libsvn_wc/wc.h
    subversion/branches/fsfs-format7/subversion/libsvn_wc/wc_db.c
    subversion/branches/fsfs-format7/subversion/libsvn_wc/wc_db.h
    subversion/branches/fsfs-format7/subversion/libsvn_wc/wc_db_private.h
    subversion/branches/fsfs-format7/subversion/libsvn_wc/wc_db_update_move.c
    subversion/branches/fsfs-format7/subversion/libsvn_wc/wc_db_wcroot.c
    subversion/branches/fsfs-format7/subversion/libsvn_wc/wcroot_anchor.c
    subversion/branches/fsfs-format7/subversion/libsvn_wc/workqueue.c
    subversion/branches/fsfs-format7/subversion/mod_authz_svn/INSTALL
    subversion/branches/fsfs-format7/subversion/mod_dav_svn/activity.c
    subversion/branches/fsfs-format7/subversion/mod_dav_svn/deadprops.c
    subversion/branches/fsfs-format7/subversion/mod_dav_svn/lock.c
    subversion/branches/fsfs-format7/subversion/mod_dav_svn/merge.c
    subversion/branches/fsfs-format7/subversion/mod_dav_svn/mod_dav_svn.c
    subversion/branches/fsfs-format7/subversion/mod_dav_svn/reports/log.c
    subversion/branches/fsfs-format7/subversion/mod_dav_svn/reports/update.c
    subversion/branches/fsfs-format7/subversion/mod_dav_svn/repos.c
    subversion/branches/fsfs-format7/subversion/mod_dav_svn/version.c
    subversion/branches/fsfs-format7/subversion/svn/cl-conflicts.c
    subversion/branches/fsfs-format7/subversion/svn/cl.h
    subversion/branches/fsfs-format7/subversion/svn/commit-cmd.c
    subversion/branches/fsfs-format7/subversion/svn/conflict-callbacks.c
    subversion/branches/fsfs-format7/subversion/svn/help-cmd.c
    subversion/branches/fsfs-format7/subversion/svn/merge-cmd.c
    subversion/branches/fsfs-format7/subversion/svn/notify.c
    subversion/branches/fsfs-format7/subversion/svn/propedit-cmd.c
    subversion/branches/fsfs-format7/subversion/svn/propget-cmd.c
    subversion/branches/fsfs-format7/subversion/svn/props.c
    subversion/branches/fsfs-format7/subversion/svn/status-cmd.c
    subversion/branches/fsfs-format7/subversion/svn/status.c
    subversion/branches/fsfs-format7/subversion/svn/svn.c
    subversion/branches/fsfs-format7/subversion/svn/switch-cmd.c
    subversion/branches/fsfs-format7/subversion/svn/update-cmd.c
    subversion/branches/fsfs-format7/subversion/svn/util.c
    subversion/branches/fsfs-format7/subversion/svnadmin/svnadmin.c
    subversion/branches/fsfs-format7/subversion/svndumpfilter/svndumpfilter.c
    subversion/branches/fsfs-format7/subversion/svnlook/svnlook.c
    subversion/branches/fsfs-format7/subversion/svnmucc/svnmucc.c
    subversion/branches/fsfs-format7/subversion/svnrdump/dump_editor.c
    subversion/branches/fsfs-format7/subversion/svnrdump/load_editor.c
    subversion/branches/fsfs-format7/subversion/svnrdump/svnrdump.c
    subversion/branches/fsfs-format7/subversion/svnrdump/util.c
    subversion/branches/fsfs-format7/subversion/svnserve/serve.c
    subversion/branches/fsfs-format7/subversion/svnserve/svnserve.c
    subversion/branches/fsfs-format7/subversion/svnsync/svnsync.c
    subversion/branches/fsfs-format7/subversion/svnsync/sync.c
    subversion/branches/fsfs-format7/subversion/svnversion/svnversion.c
    subversion/branches/fsfs-format7/subversion/tests/cmdline/davautocheck.sh
    subversion/branches/fsfs-format7/subversion/tests/cmdline/merge_authz_tests.py
    subversion/branches/fsfs-format7/subversion/tests/cmdline/merge_tests.py
    subversion/branches/fsfs-format7/subversion/tests/cmdline/stat_tests.py
    subversion/branches/fsfs-format7/subversion/tests/cmdline/svntest/main.py
    subversion/branches/fsfs-format7/subversion/tests/cmdline/update_tests.py
    subversion/branches/fsfs-format7/subversion/tests/libsvn_diff/diff-diff3-test.c
    subversion/branches/fsfs-format7/subversion/tests/libsvn_fs/fs-test.c
    subversion/branches/fsfs-format7/subversion/tests/libsvn_repos/repos-test.c
    subversion/branches/fsfs-format7/subversion/tests/libsvn_subr/checksum-test.c
    subversion/branches/fsfs-format7/subversion/tests/libsvn_subr/mergeinfo-test.c
    subversion/branches/fsfs-format7/subversion/tests/libsvn_wc/db-test.c
    subversion/branches/fsfs-format7/subversion/tests/libsvn_wc/op-depth-test.c
    subversion/branches/fsfs-format7/subversion/tests/libsvn_wc/utils.c
    subversion/branches/fsfs-format7/subversion/tests/libsvn_wc/utils.h
    subversion/branches/fsfs-format7/subversion/tests/svn_test_main.c
    subversion/branches/fsfs-format7/tools/dev/svnraisetreeconflict/svnraisetreeconflict.c
    subversion/branches/fsfs-format7/tools/dev/unix-build/Makefile.svn
    subversion/branches/fsfs-format7/tools/dist/backport.pl
    subversion/branches/fsfs-format7/tools/dist/make-deps-tarball.sh   (props changed)
    subversion/branches/fsfs-format7/tools/server-side/svn-rep-sharing-stats.c
    subversion/branches/fsfs-format7/tools/server-side/svnauthz.c

Propchange: subversion/branches/fsfs-format7/
------------------------------------------------------------------------------
  Merged /subversion/branches/verify-at-commit:r1462039-1462408
  Merged /subversion/trunk:r1454791-1462839

Modified: subversion/branches/fsfs-format7/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/CHANGES?rev=1462850&r1=1462849&r2=1462850&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/CHANGES (original)
+++ subversion/branches/fsfs-format7/CHANGES Sat Mar 30 20:02:27 2013
@@ -7,11 +7,18 @@ http://svn.apache.org/repos/asf/subversi
     *
 
   - Major new features:
-    *
+    * inheritable properties (r1395109)
+    * GPG agent support. (r1151069)
+    * fsfs: Packing of revision property shards (issue #3944)
+    * explicit handling of local moves/renames (issue #3631, #4232)
+    * new more detailed conflict storage
+    * use svn_ra_serf as our new http library.
+    * automatic merge avoids explicit reintegration merges.
 
   - Minor new features and improvements:
     * new 'svnadmin load --revision' load filtering support (issue #3734)
     * new 'commit --include-externals' option (related to issues #1167, #3563)
+    * new '--include-externals' option for 'svn list' (issue #4225)
     * remove extraneous externals output from 'svn status -q' (issue #1935)
     * new 'svnadmin hotcopy --incremental' support for FSFS (issue #3815)
     * reject some attempts to merge between unrelated branches (r1215273)
@@ -39,6 +46,7 @@ http://svn.apache.org/repos/asf/subversi
     * 'svn' is now non-interactive when not run in a terminal device (r1424037)
     * 'svn propset' checks spelling of reserved property names.
     * improve working copy performance on network disks (issue #4176) 
+    * repos suggested config via svn:auto-props and svn:global-ignores (r1401908)
 
   - Client-side bugfixes:
     * 
@@ -60,6 +68,38 @@ http://svn.apache.org/repos/asf/subversi
     * star-imports in swig-py only import 'svn_*' symbols (r1303375)
 
 
+Version 1.7.9
+(04 Apr 2013, from /branches/1.7.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.7.9
+ User-visible changes
+  - Client-side bugfixes:
+    * improved error messages about svn:date and svn:author props. (r1440620)
+    * fix local_relpath assertion (issue #4257)
+    * fix memory leak in `svn log` over svn:// (r1458341)
+    * fix incorrect authz failure when using neon http library (issue #4332)
+    * fix segfault when using kwallet (r1421103)
+    
+  - Server-side bugfixes:
+    * svnserve will log the replayed rev not the low-water rev. (r1461278)
+    * mod_dav_svn will omit some property values for activity urls (r1453780)
+    * fix an assertion in mod_dav_svn when acting as a proxy on / (issue #4272)
+    * improve memory usage when committing properties in mod_dav_svn (r1443929)
+    * fix svnrdump to load dump files with non-LF line endings (issue #4263)
+    * fix assertion when rep-cache is inaccessible (r1422100)
+    * improved logic in mod_dav_svn's implementation of lock. (r1455352)
+    * avoid executing unnecessary code in log with limit (r1459599)
+
+ Developer-visible changes:
+  - General:
+    * fix an assertion in dav_svn_get_repos_path() on Windows (r1425368)
+    * fix get-deps.sh to correctly download zlib (r13520131)
+    * doxygen docs will now ignore prefixes when producing the index (r1429201)
+    * fix get-deps.sh on freebsd (r1423646)
+
+  - Bindings:
+    * javahl status api now respects the ignoreExternals boolean (r1435361)
+
+
 Version 1.7.8
 (17 Dec 2012, from /branches/1.7.x)
 http://svn.apache.org/repos/asf/subversion/tags/1.7.8
@@ -569,6 +609,23 @@ the 1.6 release:  http://subversion.apac
     * fix type mapping of svn_txdelta_window_t in python bindings (issue #3688)
 
 
+Version 1.6.21
+(04 Apr 2013, from /branches/1.6.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.6.21
+
+ User-visible changes
+  - Server-side bugfixes:
+    * mod_dav_svn will omit some property values for activity urls (r1453780)
+    * improve memory usage when committing properties in mod_dav_svn (r1443929)
+    * fix mod_dav_svn runs pre-revprop-change twice (issue #3085)
+    * fixed: post-revprop-change errors cancel commit (issue #2990)
+    * improved logic in mod_dav_svn's implementation of lock. (r1455352)
+
+ Developer-visible changes:
+  - General:
+    * fix a compatibility issue with g++ 4.7 (r1345740)
+
+
 Version 1.6.20
 (04 Jan 2013, from /branches/1.6.x)
 http://svn.apache.org/repos/asf/subversion/tags/1.6.20

Modified: subversion/branches/fsfs-format7/INSTALL
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/INSTALL?rev=1462850&r1=1462849&r2=1462850&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/INSTALL (original)
+++ subversion/branches/fsfs-format7/INSTALL Sat Mar 30 20:02:27 2013
@@ -243,11 +243,10 @@ I.    INTRODUCTION
       be able to find them.
 
       There are a couple of options to "./configure" that tell it where
-      to look for the APR and APR-util libraries. By default, it will first
-      look for bundled versions of APR and APR-util, and then try to locate
-      already installed versions of the libraries using the apr-config and
-      apu-config scripts. These scripts provide all the relevant information
-      for the APR and APR-util installations.
+      to look for the APR and APR-util libraries. By default it will try
+      to locate the libraries using apr-config and apu-config scripts.
+      These scripts provide all the relevant information for the APR and
+      APR-util installations.
 
       If you want to specify the location of the APR library, you can use
       the "--with-apr=" option of "./configure". It should be able to find
@@ -264,10 +263,6 @@ I.    INTRODUCTION
           $ ./configure --with-apr=/usr/local/apache2 \
             --with-apr-util=/usr/local/apache2  ...
 
-      If you want Subversion to build the APR libraries from source
-      code as part of the Subversion build process, you can put their
-      source code into the "./apr" and "./apr-util" directories.
-
       Be sure to use a native Windows SVN client (as opposed to
       Cygwin's version) so that the .dsp files get carriage-returns at
       the ends of their lines.  Otherwise Visual Studio will complain
@@ -278,9 +273,12 @@ I.    INTRODUCTION
       library's directory, to regenerate the configure scripts and
       other files required for compiling the libraries:
 
-      $ cd apr; ./buildconf; cd ..
+      $ cd apr; ./buildconf; ./configure ...; make; make install; cd ..
+
+      $ cd apr-util; ./buildconf; ./configure ...; make; make install; cd ..
 
-      $ cd apr-util; ./buildconf; cd ..
+      Configure build and install both libraries before running Subversion's
+      configure script.
 
 
       2. Zlib  (REQUIRED)
@@ -695,19 +693,6 @@ II.   INSTALLATION
       It probably means that the dynamic loader/linker can't find all
       of the libsvn_* libraries.
 
-      Note that if you commonly build with the -jN option to make and
-      have used the get-deps.sh script to fetch dependencies, the make
-      step above may fail, because we don't ensure that third party
-      libraries in our source tree will finish building before
-      subversion itself.  If you want to use -jN, use the following
-      instead:
-
-          $ ./configure
-          $ make -jN external-all
-          $ make -jN local-all
-          $ make check
-          # make install
-
 
   C.  Building under Unix in Different Directories
       --------------------------------------------
@@ -717,7 +702,7 @@ II.   INSTALLATION
 
           $ svn co https://svn.apache.org/repos/asf/subversion/trunk svn
           $ cd svn
-          $ # get any dependencies to be built in-tree, if required
+          $ # get SQLite amalgamation if required
           $ chmod +x autogen.sh
           $ ./autogen.sh
           $ mkdir ../obj

Modified: subversion/branches/fsfs-format7/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/Makefile.in?rev=1462850&r1=1462849&r2=1462850&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/Makefile.in (original)
+++ subversion/branches/fsfs-format7/Makefile.in Sat Mar 30 20:02:27 2013
@@ -38,8 +38,6 @@ SVN_FS_LIB_LINK = @SVN_FS_LIB_LINK@
 SWIG_SRC_DIR = $(abs_srcdir)/subversion/bindings/swig
 SWIG_BUILD_DIR = $(abs_builddir)/subversion/bindings/swig
 
-SVN_EXTERNAL_PROJECT_SUBDIRS = @SVN_EXTERNAL_PROJECT_SUBDIRS@
-
 SCHEMA_DIR = subversion/svn/schema
 
 SVN_APR_LIBS = @SVN_APR_LIBS@
@@ -66,7 +64,6 @@ ramod_libdir = @libdir@
 bdb_libdir = @libdir@
 gnome_keyring_libdir = @libdir@
 gpg_agent_libdir = @libdir@
-gssapi_libdir = @libdir@
 kwallet_libdir = @libdir@
 serf_libdir = @libdir@
 bindir = @bindir@
@@ -373,11 +370,11 @@ ECHO_N = @ECHO_N@
 
 TESTS = $(TEST_PROGRAMS) @BDB_TEST_PROGRAMS@
 
-all: mkdir-init external-all local-all
-clean: external-clean local-clean
-distclean: external-distclean local-distclean
-extraclean: external-extraclean local-extraclean
-install: external-install local-install revision-install
+all: mkdir-init local-all
+clean: local-clean
+distclean: local-distclean
+extraclean: local-extraclean
+install: local-install revision-install
 
 @INCLUDE_OUTPUTS@
 
@@ -617,32 +614,6 @@ mkdir-init:
             fi;                                          \
         done
 
-# recursive targets to handle external projects (e.g. APR, Neon)
-external-all external-install:
-	@target=`echo $@ | sed s/external-//`;          \
-        list='$(SVN_EXTERNAL_PROJECT_SUBDIRS)';         \
-        for i in $$list; do                             \
-            echo "------ making $$target in $$i";       \
-            (cd $$i && $(MAKE) $$target) || exit 1;     \
-            echo "------ completed $$target in $$i";    \
-        done;
-
-### apr-util relies on generated files in apr, so reverse the
-### list so that it is cleaned before apr. also note that Neon does
-### not have an extraclean target, so get "close" with distclean
-external-clean external-distclean external-extraclean:
-	@target=`echo $@ | sed s/external-//`;          \
-        list='$(SVN_EXTERNAL_PROJECT_SUBDIRS)';         \
-        for i in $$list; do                             \
-            revlist="$$i $$revlist";                    \
-        done;                                           \
-        for i in $$revlist; do                          \
-            echo "------ making $$target in $$i";       \
-            (cd $$i && $(MAKE) $$target) || exit 1;     \
-            echo "------ completed $$target in $$i";    \
-        done;
-
-
 # DOCUMENTATION RULES
 
 # Every single document in every format.

Modified: subversion/branches/fsfs-format7/aclocal.m4
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/aclocal.m4?rev=1462850&r1=1462849&r2=1462850&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/aclocal.m4 (original)
+++ subversion/branches/fsfs-format7/aclocal.m4 Sat Mar 30 20:02:27 2013
@@ -38,7 +38,6 @@ sinclude(build/ac-macros/apr_memcache.m4
 sinclude(build/ac-macros/berkeley-db.m4)
 sinclude(build/ac-macros/compiler.m4)
 sinclude(build/ac-macros/ctypesgen.m4)
-sinclude(build/ac-macros/gssapi.m4)
 sinclude(build/ac-macros/java.m4)
 sinclude(build/ac-macros/sasl.m4)
 sinclude(build/ac-macros/serf.m4)

Modified: subversion/branches/fsfs-format7/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/build.conf?rev=1462850&r1=1462849&r2=1462850&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/build.conf (original)
+++ subversion/branches/fsfs-format7/build.conf Sat Mar 30 20:02:27 2013
@@ -64,8 +64,6 @@ private-built-includes =
         subversion/bindings/javahl/include/org_apache_subversion_javahl_types_VersionExtended_LoadedLibIterator.h
         subversion/bindings/javahl/include/org_apache_subversion_javahl_types_Revision.h
         subversion/bindings/javahl/include/org_apache_subversion_javahl_callback_UserPasswordCallback.h
-        subversion/svn/svn-help.inc
-        subversion/svn/svn-help.man
 
 
 test-scripts =
@@ -290,7 +288,7 @@ msvc-export = svn_ra.h private\svn_ra_pr
 type = ra-module
 path = subversion/libsvn_ra_serf
 install = serf-lib
-libs = libsvn_delta libsvn_subr aprutil apriconv apr serf gssapi xml
+libs = libsvn_delta libsvn_subr aprutil apriconv apr serf xml
 msvc-libs = secur32.lib
 msvc-static = yes
 
@@ -1160,10 +1158,6 @@ external-lib = $(SVN_DB_LIBS)
 type = lib
 external-lib = $(SVN_GNOME_KEYRING_LIBS)
 
-[gssapi]
-type = lib
-external-lib = $(SVN_GSSAPI_LIBS)
-
 [kwallet]
 type = lib
 external-lib = $(SVN_KWALLET_LIBS)

Modified: subversion/branches/fsfs-format7/build/ac-macros/apr.m4
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/build/ac-macros/apr.m4?rev=1462850&r1=1462849&r2=1462850&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/build/ac-macros/apr.m4 (original)
+++ subversion/branches/fsfs-format7/build/ac-macros/apr.m4 Sat Mar 30 20:02:27 2013
@@ -32,7 +32,7 @@ AC_DEFUN(SVN_LIB_APR,
 
   AC_MSG_NOTICE([Apache Portable Runtime (APR) library configuration])
 
-  APR_FIND_APR("$abs_srcdir/apr", "$abs_builddir/apr", 1, [1 0])
+  APR_FIND_APR("", "", 1, [1 0])
 
   if test $apr_found = "no"; then
     AC_MSG_WARN([APR not found])
@@ -40,7 +40,7 @@ AC_DEFUN(SVN_LIB_APR,
   fi
 
   if test $apr_found = "reconfig"; then
-    SVN_EXTERNAL_PROJECT([apr])
+    AC_MSG_ERROR([Unexpected APR reconfig])
   fi
 
   dnl check APR version number against regex  
@@ -117,29 +117,12 @@ dnl no apr found, print out a message te
 AC_DEFUN(SVN_DOWNLOAD_APR,
 [
   echo "The Apache Portable Runtime (APR) library cannot be found."
-  echo "Please install APR on this system and supply the appropriate"
-  echo "--with-apr option to 'configure'"
+  echo "Please install APR on this system and configure Subversion"
+  echo "with the appropriate --with-apr option."
   echo ""
-  echo "or"
+  echo "You probably need to do something similar with the Apache"
+  echo "Portable Runtime Utility (APRUTIL) library and then configure"
+  echo "Subversion with both the --with-apr and --with-apr-util options."
   echo ""
-  echo "get it with SVN and put it in a subdirectory of this source:"
-  echo ""
-  echo "   svn co \\"
-  echo "    http://svn.apache.org/repos/asf/apr/apr/branches/1.4.x \\"
-  echo "    apr"
-  echo ""
-  echo "Run that right here in the top level of the Subversion tree."
-  echo "Afterwards, run ./buildconf in that subdirectory and"
-  echo "then run configure again here."
-  echo ""
-  echo "Whichever of the above you do, you probably need to do"
-  echo "something similar for apr-util, either providing both"
-  echo "--with-apr and --with-apr-util to 'configure', or"
-  echo "getting both from SVN with:"
-  echo ""
-  echo "   svn co \\"
-  echo "    http://svn.apache.org/repos/asf/apr/apr-util/branches/1.5.x \\"
-  echo "    apr-util"
-  echo ""
-  AC_MSG_ERROR([no suitable apr found])
+  AC_MSG_ERROR([no suitable APR found])
 ])

Modified: subversion/branches/fsfs-format7/build/ac-macros/apr_memcache.m4
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/build/ac-macros/apr_memcache.m4?rev=1462850&r1=1462849&r2=1462850&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/build/ac-macros/apr_memcache.m4 (original)
+++ subversion/branches/fsfs-format7/build/ac-macros/apr_memcache.m4 Sat Mar 30 20:02:27 2013
@@ -48,32 +48,20 @@ AC_DEFUN(SVN_LIB_APR_MEMCACHE,
       CPPFLAGS="$save_cppflags"
     fi
   ], [
-    if test -d "$srcdir/apr_memcache"; then
-      apr_memcache_found=reconfig
-    else
 dnl   Try just looking in apr-util (>= 1.3 has it already).
-      AC_MSG_NOTICE([looking for apr_memcache as part of apr-util])
-      save_cppflags="$CPPFLAGS"
-      CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES $SVN_APRUTIL_INCLUDES"
-      AC_CHECK_HEADER(apr_memcache.h,[
-        save_ldflags="$LDFLAGS"
-        LDFLAGS="$LDFLAGS $SVN_APRUTIL_LIBS"
-        AC_CHECK_LIB(aprutil-1, apr_memcache_create,
-          [apr_memcache_found="aprutil"])
-        LDFLAGS="$save_ldflags"])
-      CPPFLAGS="$save_cppflags"
-
-    fi
+    AC_MSG_NOTICE([looking for apr_memcache as part of apr-util])
+    save_cppflags="$CPPFLAGS"
+    CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES $SVN_APRUTIL_INCLUDES"
+    AC_CHECK_HEADER(apr_memcache.h,[
+      save_ldflags="$LDFLAGS"
+      LDFLAGS="$LDFLAGS $SVN_APRUTIL_LIBS"
+      AC_CHECK_LIB(aprutil-1, apr_memcache_create,
+        [apr_memcache_found="aprutil"])
+      LDFLAGS="$save_ldflags"])
+    CPPFLAGS="$save_cppflags"
    ])
 
 
-  if test $apr_memcache_found = "reconfig"; then
-    SVN_EXTERNAL_PROJECT([apr_memcache], [--with-apr=$apr_config --with-apr-util=$apu_config])
-    apr_memcache_prefix=$prefix
-    SVN_APR_MEMCACHE_INCLUDES="-I$srcdir/memcache"
-    SVN_APR_MEMCACHE_LIBS="$abs_builddir/memcache/libapr_memcache.la"
-  fi
-
   if test $apr_memcache_found = "standalone"; then
     SVN_APR_MEMCACHE_INCLUDES="-I$apr_memcache_prefix/include/apr_memcache-0"
     SVN_APR_MEMCACHE_LIBS="$apr_memcache_prefix/lib/libapr_memcache.la"

Modified: subversion/branches/fsfs-format7/build/ac-macros/aprutil.m4
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/build/ac-macros/aprutil.m4?rev=1462850&r1=1462849&r2=1462850&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/build/ac-macros/aprutil.m4 (original)
+++ subversion/branches/fsfs-format7/build/ac-macros/aprutil.m4 Sat Mar 30 20:02:27 2013
@@ -38,7 +38,7 @@ AC_DEFUN(SVN_LIB_APRUTIL,
 
   AC_MSG_NOTICE([Apache Portable Runtime Utility (APRUTIL) library configuration])
 
-  APR_FIND_APU("$abs_srcdir/apr-util", "$abs_builddir/apr-util", 1, [1 0])
+  APR_FIND_APU("", "", 1, [1 0])
 
   if test $apu_found = "no"; then
     AC_MSG_WARN([APRUTIL not found])
@@ -46,12 +46,12 @@ AC_DEFUN(SVN_LIB_APRUTIL,
   fi
 
   if test $apu_found = "reconfig"; then
-    SVN_EXTERNAL_PROJECT([apr-util], [--with-apr=../apr])
+    AC_MSG_ERROR([Unexpected APRUTIL reconfig])
   fi
 
   dnl check APRUTIL version number against regex  
 
-  AC_MSG_CHECKING([APR-UTIL version])    
+  AC_MSG_CHECKING([APRUTIL version])    
   apu_version="`$apu_config --version`"
   if test $? -ne 0; then
     # This is a hack as suggested by Ben Collins-Sussman.  It can be
@@ -76,7 +76,7 @@ AC_DEFUN(SVN_LIB_APRUTIL,
 
   if test $APU_WANTED_REGEX_MATCH -eq 0; then
     echo "wanted regexes are $APRUTIL_WANTED_REGEXES"
-    AC_MSG_ERROR([invalid apr-util version found])
+    AC_MSG_ERROR([invalid APRUTIL version found])
   fi
 
   dnl Get libraries and thread flags from APRUTIL ---------------------
@@ -121,20 +121,8 @@ dnl no apr-util found, print out a messa
 AC_DEFUN(SVN_DOWNLOAD_APRUTIL,
 [
   echo "The Apache Portable Runtime Utility (APRUTIL) library cannot be found."
-  echo "Either install APRUTIL on this system and supply the appropriate"
-  echo "--with-apr-util option"
-  echo ""
-  echo "or"
-  echo ""
-  echo "get it with SVN and put it in a subdirectory of this source:"
-  echo ""
-  echo "   svn co \\"
-  echo "    http://svn.apache.org/repos/asf/apr/apr-util/branches/1.5.x \\"
-  echo "    apr-util"
-  echo ""
-  echo "Run that right here in the top level of the Subversion tree."
-  echo "Afterwards, run ./buildconf in that subdirectory and"
-  echo "then run configure again here."
+  echo "Install APRUTIL on this system and configure Subversion with the"
+  echo " appropriate --with-apr-util option."
   echo ""
   AC_MSG_ERROR([no suitable APRUTIL found])
 ])

Modified: subversion/branches/fsfs-format7/build/ac-macros/svn-macros.m4
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/build/ac-macros/svn-macros.m4?rev=1462850&r1=1462849&r2=1462850&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/build/ac-macros/svn-macros.m4 (original)
+++ subversion/branches/fsfs-format7/build/ac-macros/svn-macros.m4 Sat Mar 30 20:02:27 2013
@@ -46,65 +46,6 @@ EOF
 ])
 
 
-# SVN_EXTERNAL_PROJECT_SETUP()
-# Internal helper for SVN_EXTERNAL_PROJECT.
-AC_DEFUN([SVN_EXTERNAL_PROJECT_SETUP], [
-  do_subdir_config="yes"
-  AC_ARG_ENABLE([subdir-config],
-    AS_HELP_STRING([--disable-subdir-config],
-                   [do not reconfigure packages in subdirectories]),
-    [if test "$enableval" = "no"; then do_subdir_config="no"; fi])
-  AC_SUBST([SVN_EXTERNAL_PROJECT_SUBDIRS], [""])
-])
-
-# SVN_EXTERNAL_PROJECT(SUBDIR [, ADDITIONAL-CONFIGURE-ARGS])
-# Setup SUBDIR as an external project. This means:
-# - Execute the configure script immediately at the point of macro invocation.
-# - Add SUBDIR to the substitution variable SVN_EXTERNAL_PROJECT_SUBDIRS,
-#   for the Makefile.in to arrange to execute make in the subdir.
-#
-# Derived from APR_SUBDIR_CONFIG
-AC_DEFUN([SVN_EXTERNAL_PROJECT], [
-  AC_REQUIRE([SVN_EXTERNAL_PROJECT_SETUP])
-  SVN_EXTERNAL_PROJECT_SUBDIRS="$SVN_EXTERNAL_PROJECT_SUBDIRS $1"
-  if test "$do_subdir_config" = "yes" ; then
-    # save our work to this point; this allows the sub-package to use it
-    AC_CACHE_SAVE
-
-    AC_MSG_NOTICE([configuring package in $1 now])
-    ac_popdir=`pwd`
-    ac_abs_srcdir=`(cd $srcdir/$1 && pwd)`
-    apr_config_subdirs="$1"
-    test -d $1 || $MKDIR $1
-    cd $1
-
-    # A "../" for each directory in /$config_subdirs.
-    ac_dots=[`echo $apr_config_subdirs| $SED -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'`]
-
-    # Make the cache file name correct relative to the subdirectory.
-    case "$cache_file" in
-    /*) ac_sub_cache_file=$cache_file ;;
-    *) # Relative path.
-      ac_sub_cache_file="$ac_dots$cache_file" ;;
-    esac
-
-    # The eval makes quoting arguments work.
-    if eval $SHELL $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir $2
-    then :
-      echo "$1 configured properly"
-    else
-      echo "configure failed for $1"
-      exit 1
-    fi
-    cd $ac_popdir
-
-    # grab any updates from the sub-package
-    AC_CACHE_LOAD
-  else
-    AC_MSG_WARN([not running configure in $1])
-  fi
-])
-
 dnl
 dnl SVN_CONFIG_SCRIPT(path)
 dnl

Modified: subversion/branches/fsfs-format7/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/build/generator/gen_win.py?rev=1462850&r1=1462849&r2=1462850&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/build/generator/gen_win.py (original)
+++ subversion/branches/fsfs-format7/build/generator/gen_win.py Sat Mar 30 20:02:27 2013
@@ -401,7 +401,6 @@ class WinGeneratorBase(GeneratorBase):
       install_targets = [x for x in install_targets
                                      if not (isinstance(x, gen_base.TargetJava)
                                              or isinstance(x, gen_base.TargetJavaHeaders)
-                                             or isinstance(x, gen_base.TargetSWIGProject)
                                              or x.name == '__JAVAHL__'
                                              or x.name == '__JAVAHL_TESTS__'
                                              or x.name == 'libsvnjavahl')]

Modified: subversion/branches/fsfs-format7/build/transform_sql.py
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/build/transform_sql.py?rev=1462850&r1=1462849&r2=1462850&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/build/transform_sql.py (original)
+++ subversion/branches/fsfs-format7/build/transform_sql.py Sat Mar 30 20:02:27 2013
@@ -272,10 +272,10 @@ def main(input_filepath, output):
   var_name = re.sub('[-.]', '_', filename).upper()
 
   output.write(
-    '/* This file is automatically generated from %s.\n'
+    '/* This file is automatically generated from %s and %s.\n'
     ' * Do not edit this file -- edit the source and rerun gen-make.py */\n'
     '\n'
-    % (filename,))
+    % (filename, token_map_filename))
 
   proc = Processor(os.path.dirname(input_filepath), output, var_name, token_map)
   proc.process_file(input)

Modified: subversion/branches/fsfs-format7/contrib/client-side/svncopy/svncopy.pl.in
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/contrib/client-side/svncopy/svncopy.pl.in?rev=1462850&r1=1462849&r2=1462850&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/contrib/client-side/svncopy/svncopy.pl.in (original)
+++ subversion/branches/fsfs-format7/contrib/client-side/svncopy/svncopy.pl.in Sat Mar 30 20:02:27 2013
@@ -92,7 +92,7 @@ GetOptions( "pin-externals|tag|t" => \$p
             "revision|r=s" => \$revision,
             "verbose!" => \$verbose,
             "quiet|q" => sub { $verbose = 0; push( @svn_options, "--quiet" ) },
-            "file|F=s" => sub { push( @svn_options, "--file", $_[1] ) },
+            "file|F=s" => sub { open FILE, $_[1]; my @content = <FILE>; $message = join("\n", @content, "\n"); close FILE; },
             "username=s" => sub { push( @svn_options, "--username", $_[1] ) },
             "password=s" => sub { push( @svn_options, "--password", $_[1] ) },
             "no_auth_cache" => sub { push( @svn_options, "--no-auth-cache" ) },

Modified: subversion/branches/fsfs-format7/notes/ev2-callbacks-template.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/notes/ev2-callbacks-template.c?rev=1462850&r1=1462849&r2=1462850&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/notes/ev2-callbacks-template.c (original)
+++ subversion/branches/fsfs-format7/notes/ev2-callbacks-template.c Sat Mar 30 20:02:27 2013
@@ -56,7 +56,7 @@ add_symlink_cb(void *baton,
 static svn_error_t *
 add_absent_cb(void *baton,
               const char *relpath,
-              svn_kind_t kind,
+              svn_node_kind_t kind,
               svn_revnum_t replaces_rev,
               apr_pool_t *scratch_pool)
 {

Modified: subversion/branches/fsfs-format7/notes/knobs
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/notes/knobs?rev=1462850&r1=1462849&r2=1462850&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/notes/knobs (original)
+++ subversion/branches/fsfs-format7/notes/knobs Sat Mar 30 20:02:27 2013
@@ -68,6 +68,7 @@ SERF_VERBOSE
 SSL_VERBOSE
 SVN_DEPRECATED
 SVN_FS__TRAIL_DEBUG
+SVN_UTF_NO_UNINITIALISED_ACCESS
 
 2.4 Test-only
 
@@ -394,6 +395,15 @@ SVN_I_LIKE_LATENCY_SO_IGNORE_HTTPV2
   Default:   not defined
   Suggested: defined, not defined
 
+5.14 SVN_UTF_NO_UNINITIALISED_ACCESS
+
+  Scope:     libsvn_subr
+  Purpose:   Disables some code that triggers warnings in memory tools
+             such as valgrind and address sanitizer.
+  Range:     definedness
+  Default:   not defined
+  Suggested: defined, not defined
+
 6 Defines that affect unit tests
 ================================
 
@@ -465,5 +475,10 @@ SVN_I_LIKE_LATENCY_SO_IGNORE_HTTPV2
   Scope:     'make install-tools'
   Purpose:   Symlinks $prefix/bin/svnsyitf to $prefix/bin/svnmucc
 
+7.8 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.
+
 * (TODO: others)
 

Modified: subversion/branches/fsfs-format7/subversion/bindings/javahl/native/CreateJ.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/bindings/javahl/native/CreateJ.cpp?rev=1462850&r1=1462849&r2=1462850&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/bindings/javahl/native/CreateJ.cpp (original)
+++ subversion/branches/fsfs-format7/subversion/bindings/javahl/native/CreateJ.cpp Sat Mar 30 20:02:27 2013
@@ -430,7 +430,7 @@ CreateJ::ChangedPath(const char *path, s
 
   jclass clazzCP = env->FindClass(JAVA_PACKAGE"/types/ChangePath");
   if (JNIUtil::isJavaExceptionThrown())
-    POP_AND_RETURN(SVN_NO_ERROR);
+    POP_AND_RETURN_NULL;
 
   static jmethodID midCP = 0;
   if (midCP == 0)
@@ -443,7 +443,7 @@ CreateJ::ChangedPath(const char *path, s
                                "L"JAVA_PACKAGE"/types/Tristate;"
                                "L"JAVA_PACKAGE"/types/Tristate;)V");
       if (JNIUtil::isJavaExceptionThrown())
-        POP_AND_RETURN(SVN_NO_ERROR);
+        POP_AND_RETURN_NULL;
     }
 
   jstring jpath = JNIUtil::makeJString(path);
@@ -507,6 +507,7 @@ CreateJ::Status(svn_wc_context_t *wc_ctx
                              "ZZZZZL"JAVA_PACKAGE"/types/Lock;"
                              "L"JAVA_PACKAGE"/types/Lock;"
                              "JJL"JAVA_PACKAGE"/types/NodeKind;"
+                             "Ljava/lang/String;Ljava/lang/String;"
                              "Ljava/lang/String;Ljava/lang/String;)V");
       if (JNIUtil::isJavaExceptionThrown())
         POP_AND_RETURN_NULL;
@@ -526,6 +527,8 @@ CreateJ::Status(svn_wc_context_t *wc_ctx
   jstring jLastCommitAuthor = NULL;
   jobject jLocalLock = NULL;
   jstring jChangelist = NULL;
+  jstring jMovedFromAbspath = NULL;
+  jstring jMovedToAbspath = NULL;
 
   enum svn_wc_status_kind text_status = status->node_status;
 
@@ -597,6 +600,20 @@ CreateJ::Status(svn_wc_context_t *wc_ctx
         POP_AND_RETURN_NULL;
     }
 
+  if (status->moved_from_abspath)
+    {
+      jMovedFromAbspath = JNIUtil::makeJString(status->moved_from_abspath);
+      if (JNIUtil::isJavaExceptionThrown())
+        POP_AND_RETURN_NULL;
+    }
+
+  if (status->moved_to_abspath)
+    {
+      jMovedToAbspath = JNIUtil::makeJString(status->moved_to_abspath);
+      if (JNIUtil::isJavaExceptionThrown())
+        POP_AND_RETURN_NULL;
+    }
+
   jobject ret = env->NewObject(clazz, mid, jPath, jUrl, jNodeKind, jRevision,
                                jLastChangedRevision, jLastChangedDate,
                                jLastCommitAuthor, jTextType, jPropType,
@@ -605,7 +622,8 @@ CreateJ::Status(svn_wc_context_t *wc_ctx
                                jIsSwitched, jIsFileExternal, jLocalLock,
                                jReposLock,
                                jOODLastCmtRevision, jOODLastCmtDate,
-                               jOODKind, jOODLastCmtAuthor, jChangelist);
+                               jOODKind, jOODLastCmtAuthor, jChangelist,
+                               jMovedFromAbspath, jMovedToAbspath);
 
   return env->PopLocalFrame(ret);
 }
@@ -712,7 +730,13 @@ CreateJ::ClientNotifyInformation(const s
   jlong jhunkModifiedStart = wcNotify->hunk_modified_start;
   jlong jhunkModifiedLength = wcNotify->hunk_modified_length;
   jlong jhunkMatchedLine = wcNotify->hunk_matched_line;
-  jint jhunkFuzz = wcNotify->hunk_fuzz;
+  jint jhunkFuzz = static_cast<jint>(wcNotify->hunk_fuzz);
+  if (jhunkFuzz != wcNotify->hunk_fuzz)
+    {
+      env->ThrowNew(env->FindClass("java.lang.ArithmeticException"),
+                    "Overflow converting C svn_linenum_t to Java int");
+      POP_AND_RETURN_NULL;
+    }
 
   // call the Java method
   jobject jInfo = env->NewObject(clazz, midCT, jPath, jAction,

Modified: subversion/branches/fsfs-format7/subversion/bindings/javahl/native/JNIUtil.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/bindings/javahl/native/JNIUtil.cpp?rev=1462850&r1=1462849&r2=1462850&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/bindings/javahl/native/JNIUtil.cpp (original)
+++ subversion/branches/fsfs-format7/subversion/bindings/javahl/native/JNIUtil.cpp Sat Mar 30 20:02:27 2013
@@ -512,8 +512,14 @@ void JNIUtil::handleSVNError(svn_error_t
   if (isJavaExceptionThrown())
     POP_AND_RETURN_NOTHING();
 
-  jobjectArray jStackTrace = env->NewObjectArray(newStackTrace.size(), stClazz,
-                                                 NULL);
+  const jsize stSize = static_cast<jsize>(newStackTrace.size());
+  if (stSize != newStackTrace.size())
+    {
+      env->ThrowNew(env->FindClass("java.lang.ArithmeticException"),
+                    "Overflow converting C size_t to JNI jsize");
+      POP_AND_RETURN_NOTHING();
+    }
+  jobjectArray jStackTrace = env->NewObjectArray(stSize, stClazz, NULL);
   if (isJavaExceptionThrown())
     POP_AND_RETURN_NOTHING();
 

Modified: subversion/branches/fsfs-format7/subversion/bindings/javahl/native/ListCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/bindings/javahl/native/ListCallback.cpp?rev=1462850&r1=1462849&r2=1462850&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/bindings/javahl/native/ListCallback.cpp (original)
+++ subversion/branches/fsfs-format7/subversion/bindings/javahl/native/ListCallback.cpp Sat Mar 30 20:02:27 2013
@@ -54,11 +54,13 @@ ListCallback::callback(void *baton,
                        const svn_dirent_t *dirent,
                        const svn_lock_t *lock,
                        const char *abs_path,
-                       apr_pool_t *pool)
+                       const char * /* external_parent_url */,
+                       const char * /* external_target */,
+                       apr_pool_t *scratch_pool)
 {
   if (baton)
     return static_cast<ListCallback *>(baton)->doList(
-            path, dirent, lock, abs_path, pool);
+            path, dirent, lock, abs_path, scratch_pool);
 
   return SVN_NO_ERROR;
 }

Modified: subversion/branches/fsfs-format7/subversion/bindings/javahl/native/ListCallback.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/bindings/javahl/native/ListCallback.h?rev=1462850&r1=1462849&r2=1462850&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/bindings/javahl/native/ListCallback.h (original)
+++ subversion/branches/fsfs-format7/subversion/bindings/javahl/native/ListCallback.h Sat Mar 30 20:02:27 2013
@@ -45,7 +45,9 @@ public:
                                const svn_dirent_t *dirent,
                                const svn_lock_t *lock,
                                const char *abs_path,
-                               apr_pool_t *pool);
+                               const char *external_parent_url,
+                               const char *external_target,
+                               apr_pool_t *scratch_pool);
 
 protected:
   svn_error_t *doList(const char *path,

Modified: subversion/branches/fsfs-format7/subversion/bindings/javahl/native/Pool.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/bindings/javahl/native/Pool.h?rev=1462850&r1=1462849&r2=1462850&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/bindings/javahl/native/Pool.h (original)
+++ subversion/branches/fsfs-format7/subversion/bindings/javahl/native/Pool.h Sat Mar 30 20:02:27 2013
@@ -39,7 +39,7 @@ namespace SVN {
   {
   public:
     Pool();
-    Pool(const Pool &parent_pool);
+    explicit Pool(const Pool &parent_pool);
     Pool(apr_pool_t *parent_pool);
     ~Pool();
     apr_pool_t *getPool() const;

Modified: subversion/branches/fsfs-format7/subversion/bindings/javahl/native/SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/bindings/javahl/native/SVNClient.cpp?rev=1462850&r1=1462849&r2=1462850&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/bindings/javahl/native/SVNClient.cpp (original)
+++ subversion/branches/fsfs-format7/subversion/bindings/javahl/native/SVNClient.cpp Sat Mar 30 20:02:27 2013
@@ -51,6 +51,7 @@
 #include "EnumMapper.h"
 #include "StringArray.h"
 #include "RevpropTable.h"
+#include "DiffOptions.h"
 #include "CreateJ.h"
 #include "svn_auth.h"
 #include "svn_dso.h"
@@ -169,12 +170,13 @@ void SVNClient::list(const char *url, Re
     Path urlPath(url, subPool);
     SVN_JNI_ERR(urlPath.error_occurred(), );
 
-    SVN_JNI_ERR(svn_client_list2(urlPath.c_str(),
+    SVN_JNI_ERR(svn_client_list3(urlPath.c_str(),
                                  pegRevision.revision(),
                                  revision.revision(),
                                  depth,
                                  direntFields,
                                  fetchLocks,
+                                 FALSE, // include_externals
                                  ListCallback::callback,
                                  callback,
                                  ctx, subPool.getPool()), );
@@ -352,7 +354,8 @@ void SVNClient::revert(const char *path,
 }
 
 void SVNClient::add(const char *path,
-                    svn_depth_t depth, bool force, bool no_ignore,
+                    svn_depth_t depth, bool force,
+                    bool no_ignore, bool no_autoprops,
                     bool add_parents)
 {
     SVN::Pool subPool(pool);
@@ -365,8 +368,8 @@ void SVNClient::add(const char *path,
     if (ctx == NULL)
         return;
 
-    SVN_JNI_ERR(svn_client_add4(intPath.c_str(), depth, force,
-                                no_ignore, add_parents, ctx,
+    SVN_JNI_ERR(svn_client_add5(intPath.c_str(), depth, force,
+                                no_ignore, no_autoprops, add_parents, ctx,
                                 subPool.getPool()), );
 }
 
@@ -424,8 +427,11 @@ void SVNClient::commit(Targets &targets,
     if (ctx == NULL)
         return;
 
-    SVN_JNI_ERR(svn_client_commit5(targets2, depth,
-                                   noUnlock, keepChangelist, TRUE,
+    SVN_JNI_ERR(svn_client_commit6(targets2, depth,
+                                   noUnlock, keepChangelist,
+                                   TRUE,
+                                   FALSE, // include_file_externals
+                                   FALSE, // include_dir_externals
                                    changelists.array(subPool),
                                    revprops.hash(subPool),
                                    CommitCallback::callback, callback,
@@ -464,8 +470,8 @@ void SVNClient::copy(CopySources &copySo
 
 void SVNClient::move(Targets &srcPaths, const char *destPath,
                      CommitMessage *message, bool force, bool moveAsChild,
-                     bool makeParents, RevpropTable &revprops,
-                     CommitCallback *callback)
+                     bool makeParents, bool metadataOnly, bool allowMixRev,
+                     RevpropTable &revprops, CommitCallback *callback)
 {
     SVN::Pool subPool(pool);
 
@@ -479,9 +485,12 @@ void SVNClient::move(Targets &srcPaths, 
     if (ctx == NULL)
         return;
 
-    SVN_JNI_ERR(svn_client_move6((apr_array_header_t *) srcs,
+    SVN_JNI_ERR(svn_client_move7((apr_array_header_t *) srcs,
                                  destinationPath.c_str(), moveAsChild,
-                                 makeParents, revprops.hash(subPool),
+                                 makeParents,
+                                 allowMixRev,
+                                 metadataOnly,
+                                 revprops.hash(subPool),
                                  CommitCallback::callback, callback, ctx,
                                  subPool.getPool()), );
 }
@@ -602,7 +611,8 @@ jlong SVNClient::doSwitch(const char *pa
 
 void SVNClient::doImport(const char *path, const char *url,
                          CommitMessage *message, svn_depth_t depth,
-                         bool noIgnore, bool ignoreUnknownNodeTypes,
+                         bool noIgnore, bool noAutoProps,
+                         bool ignoreUnknownNodeTypes,
                          RevpropTable &revprops,
                          ImportFilterCallback *ifCallback,
                          CommitCallback *commitCallback)
@@ -620,7 +630,7 @@ void SVNClient::doImport(const char *pat
         return;
 
     SVN_JNI_ERR(svn_client_import5(intPath.c_str(), intUrl.c_str(), depth,
-                                   noIgnore, FALSE, ignoreUnknownNodeTypes,
+                                   noIgnore, noAutoProps, ignoreUnknownNodeTypes,
                                    revprops.hash(subPool),
                                    ImportFilterCallback::callback, ifCallback,
                                    CommitCallback::callback, commitCallback,
@@ -971,7 +981,8 @@ void SVNClient::diff(const char *target1
                      OutputStream &outputStream, svn_depth_t depth,
                      StringArray &changelists,
                      bool ignoreAncestry, bool noDiffDelete, bool force,
-                     bool showCopiesAsAdds, bool ignoreProps, bool propsOnly)
+                     bool showCopiesAsAdds, bool ignoreProps, bool propsOnly,
+                     DiffOptions const& options)
 {
     SVN::Pool subPool(pool);
     const char *c_relToDir = relativeToDir ?
@@ -991,9 +1002,7 @@ void SVNClient::diff(const char *target1
     Path path1(target1, subPool);
     SVN_JNI_ERR(path1.error_occurred(), );
 
-    // We don't use any options to diff.
-    apr_array_header_t *diffOptions = apr_array_make(subPool.getPool(),
-                                                     0, sizeof(char *));
+    apr_array_header_t *diffOptions = options.optionsArray(subPool);
 
     if (pegRevision)
     {
@@ -1011,7 +1020,7 @@ void SVNClient::diff(const char *target1
                                    force,
                                    ignoreProps,
                                    propsOnly,
-                                   FALSE, /* use_git_diff_format */
+                                   options.useGitDiffFormat(),
                                    SVN_APR_LOCALE_CHARSET,
                                    outputStream.getStream(subPool),
                                    NULL /* error file */,
@@ -1040,7 +1049,7 @@ void SVNClient::diff(const char *target1
                                force,
                                ignoreProps,
                                propsOnly,
-                               FALSE, /* use_git_diff_format */
+                               options.useGitDiffFormat(),
                                SVN_APR_LOCALE_CHARSET,
                                outputStream.getStream(subPool),
                                NULL /* error stream */,
@@ -1056,11 +1065,12 @@ void SVNClient::diff(const char *target1
                      const char *relativeToDir, OutputStream &outputStream,
                      svn_depth_t depth, StringArray &changelists,
                      bool ignoreAncestry, bool noDiffDelete, bool force,
-                     bool showCopiesAsAdds, bool ignoreProps, bool propsOnly)
+                     bool showCopiesAsAdds, bool ignoreProps, bool propsOnly,
+                     DiffOptions const& options)
 {
     diff(target1, revision1, target2, revision2, NULL, relativeToDir,
          outputStream, depth, changelists, ignoreAncestry, noDiffDelete, force,
-         showCopiesAsAdds, ignoreProps, propsOnly);
+         showCopiesAsAdds, ignoreProps, propsOnly, options);
 }
 
 void SVNClient::diff(const char *target, Revision &pegRevision,
@@ -1068,12 +1078,13 @@ void SVNClient::diff(const char *target,
                      const char *relativeToDir, OutputStream &outputStream,
                      svn_depth_t depth, StringArray &changelists,
                      bool ignoreAncestry, bool noDiffDelete, bool force,
-                     bool showCopiesAsAdds, bool ignoreProps, bool propsOnly)
+                     bool showCopiesAsAdds, bool ignoreProps, bool propsOnly,
+                     DiffOptions const& options)
 {
     diff(target, startRevision, NULL, endRevision, &pegRevision,
          relativeToDir, outputStream, depth, changelists,
          ignoreAncestry, noDiffDelete, force, showCopiesAsAdds,
-         ignoreProps, propsOnly);
+         ignoreProps, propsOnly, options);
 }
 
 void

Modified: subversion/branches/fsfs-format7/subversion/bindings/javahl/native/SVNClient.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/bindings/javahl/native/SVNClient.h?rev=1462850&r1=1462849&r2=1462850&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/bindings/javahl/native/SVNClient.h (original)
+++ subversion/branches/fsfs-format7/subversion/bindings/javahl/native/SVNClient.h Sat Mar 30 20:02:27 2013
@@ -54,6 +54,7 @@ class ChangelistCallback;
 class CommitMessage;
 class StringArray;
 class RevpropTable;
+class DiffOptions;
 #include "svn_types.h"
 #include "svn_client.h"
 #include "SVNBase.h"
@@ -107,7 +108,8 @@ class SVNClient :public SVNBase
   void mergeReintegrate(const char *path, Revision &pegRevision,
                         const char *localPath, bool dryRun);
   void doImport(const char *path, const char *url, CommitMessage *message,
-                svn_depth_t depth, bool noIgnore, bool ignoreUnknownNodeTypes,
+                svn_depth_t depth, bool noIgnore, bool noAutoProps,
+                bool ignoreUnknownNodeTypes,
                 RevpropTable &revprops, ImportFilterCallback *ifCallback,
                 CommitCallback *commitCallback);
   jlong doSwitch(const char *path, const char *url, Revision &revision,
@@ -125,7 +127,8 @@ class SVNClient :public SVNBase
              RevpropTable &revprops, CommitCallback *callback);
   void move(Targets &srcPaths, const char *destPath,
             CommitMessage *message, bool force, bool moveAsChild,
-            bool makeParents, RevpropTable &revprops, CommitCallback *callback);
+            bool makeParents, bool metadataOnly, bool allowMixRev,
+            RevpropTable &revprops, CommitCallback *callback);
   void copy(CopySources &copySources, const char *destPath,
             CommitMessage *message, bool copyAsChild, bool makeParents,
             bool ignoreExternals, RevpropTable &revprops,
@@ -137,8 +140,8 @@ class SVNClient :public SVNBase
   jlongArray update(Targets &targets, Revision &revision, svn_depth_t depth,
                     bool depthIsSticky, bool makeParents, bool ignoreExternals,
                     bool allowUnverObstructions);
-  void add(const char *path, svn_depth_t depth, bool force, bool no_ignore,
-           bool add_parents);
+  void add(const char *path, svn_depth_t depth, bool force,
+           bool no_ignore, bool no_autoprops, bool add_parents);
   void revert(const char *path, svn_depth_t depth, StringArray &changelists);
   void remove(Targets &targets, CommitMessage *message, bool force,
               bool keep_local, RevpropTable &revprops,
@@ -181,13 +184,15 @@ class SVNClient :public SVNBase
             const char *relativeToDir, OutputStream &outputStream,
             svn_depth_t depth, StringArray &changelists,
             bool ignoreAncestry, bool noDiffDelete, bool force,
-            bool showCopiesAsAdds, bool ignoreProps, bool propsOnly);
+            bool showCopiesAsAdds, bool ignoreProps, bool propsOnly,
+            DiffOptions const& options);
   void diff(const char *target, Revision &pegevision,
             Revision &startRevision, Revision &endRevision,
             const char *relativeToDir, OutputStream &outputStream,
             svn_depth_t depth, StringArray &changelists,
             bool ignoreAncestry, bool noDiffDelete, bool force,
-            bool showCopiesAsAdds, bool ignoreProps, bool propsOnly);
+            bool showCopiesAsAdds, bool ignoreProps, bool propsOnly,
+            DiffOptions const& options);
   void diffSummarize(const char *target1, Revision &revision1,
                      const char *target2, Revision &revision2,
                      svn_depth_t depth, StringArray &changelists,
@@ -216,7 +221,8 @@ class SVNClient :public SVNBase
             OutputStream &outputStream, svn_depth_t depth,
             StringArray &changelists,
             bool ignoreAncestry, bool noDiffDelete, bool force,
-            bool showCopiesAsAdds, bool ignoreProps, bool propsOnly);
+            bool showCopiesAsAdds, bool ignoreProps, bool propsOnly,
+            DiffOptions const& options);
 
   Path m_lastPath;
   ClientContext context;

Modified: subversion/branches/fsfs-format7/subversion/bindings/javahl/native/SVNRepos.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/bindings/javahl/native/SVNRepos.cpp?rev=1462850&r1=1462849&r2=1462850&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/bindings/javahl/native/SVNRepos.cpp (original)
+++ subversion/branches/fsfs-format7/subversion/bindings/javahl/native/SVNRepos.cpp Sat Mar 30 20:02:27 2013
@@ -177,7 +177,7 @@ void SVNRepos::deltify(File &path, Revis
 }
 
 void SVNRepos::dump(File &path, OutputStream &dataOut,
-                    Revision &revsionStart, Revision &revisionEnd,
+                    Revision &revisionStart, Revision &revisionEnd,
                     bool incremental, bool useDeltas,
                     ReposNotifyCallback *notifyCallback)
 {
@@ -199,9 +199,9 @@ void SVNRepos::dump(File &path, OutputSt
   SVN_JNI_ERR(svn_fs_youngest_rev(&youngest, fs, requestPool.getPool()), );
 
   /* ### We only handle revision numbers right now, not dates. */
-  if (revsionStart.revision()->kind == svn_opt_revision_number)
-    lower = revsionStart.revision()->value.number;
-  else if (revsionStart.revision()->kind == svn_opt_revision_head)
+  if (revisionStart.revision()->kind == svn_opt_revision_number)
+    lower = revisionStart.revision()->value.number;
+  else if (revisionStart.revision()->kind == svn_opt_revision_head)
     lower = youngest;
   else
     lower = SVN_INVALID_REVNUM;
@@ -315,6 +315,8 @@ void SVNRepos::listUnusedDBLogs(File &pa
 
 void SVNRepos::load(File &path,
                     InputStream &dataIn,
+                    Revision &revisionStart,
+                    Revision &revisionEnd,
                     bool ignoreUUID,
                     bool forceUUID,
                     bool usePreCommitHook,
@@ -324,6 +326,7 @@ void SVNRepos::load(File &path,
 {
   SVN::Pool requestPool;
   svn_repos_t *repos;
+  svn_revnum_t lower = SVN_INVALID_REVNUM, upper = SVN_INVALID_REVNUM;
   enum svn_repos_load_uuid uuid_action = svn_repos_load_uuid_default;
   if (ignoreUUID)
     uuid_action = svn_repos_load_uuid_ignore;
@@ -336,11 +339,25 @@ void SVNRepos::load(File &path,
       return;
     }
 
+  /* ### We only handle revision numbers right now, not dates. */
+  if (revisionStart.revision()->kind == svn_opt_revision_number)
+    lower = revisionStart.revision()->value.number;
+  if (revisionEnd.revision()->kind == svn_opt_revision_number)
+    upper = revisionEnd.revision()->value.number;
+  if (upper < lower
+      && lower != SVN_INVALID_REVNUM
+      && upper != SVN_INVALID_REVNUM)
+    {
+      SVN_JNI_ERR(svn_error_create
+                  (SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
+                   _("First revision cannot be higher than second")), );
+    }
+
   SVN_JNI_ERR(svn_repos_open2(&repos, path.getInternalStyle(requestPool),
                               NULL, requestPool.getPool()), );
 
-  SVN_JNI_ERR(svn_repos_load_fs3(repos, dataIn.getStream(requestPool),
-                                 uuid_action, relativePath,
+  SVN_JNI_ERR(svn_repos_load_fs4(repos, dataIn.getStream(requestPool),
+                                 lower, upper, uuid_action, relativePath,
                                  usePreCommitHook, usePostCommitHook,
                                  FALSE,
                                  notifyCallback != NULL
@@ -408,6 +425,28 @@ jlong SVNRepos::recover(File &path, Repo
   return youngest_rev;
 }
 
+void SVNRepos::freeze(jobjectArray jpaths, ReposFreezeAction* action)
+{
+  JNIEnv *env = JNIUtil::getEnv();
+  SVN::Pool subPool(pool);
+  const jsize num_paths = env->GetArrayLength(jpaths);
+
+  apr_array_header_t *paths = apr_array_make(subPool.getPool(), num_paths,
+                                             sizeof(const char*));
+  for (jsize i = 0; i < num_paths; ++i)
+    {
+      jobject obj = env->GetObjectArrayElement(jpaths, i);
+      APR_ARRAY_PUSH(paths, const char*) =
+        apr_pstrdup(subPool.getPool(), File(obj).getAbsPath());
+      env->DeleteLocalRef(obj);
+    }
+
+  SVN_JNI_ERR(svn_repos_freeze(paths, action->callback, action,
+                               subPool.getPool()),
+              );
+}
+
+
 void SVNRepos::rmtxns(File &path, StringArray &transactions)
 {
   SVN::Pool requestPool;
@@ -694,7 +733,7 @@ void SVNRepos::rmlocks(File &path, Strin
   SVN_JNI_ERR(svn_repos_open2(&repos, path.getInternalStyle(requestPool),
                               NULL, requestPool.getPool()), );
   fs = svn_repos_fs(repos);
-  const char *username;
+  const char *username = NULL;
 
   /* svn_fs_unlock() demands that some username be associated with the
    * filesystem, so just use the UID of the person running 'svnadmin'.*/

Modified: subversion/branches/fsfs-format7/subversion/bindings/javahl/native/SVNRepos.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/bindings/javahl/native/SVNRepos.h?rev=1462850&r1=1462849&r2=1462850&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/bindings/javahl/native/SVNRepos.h (original)
+++ subversion/branches/fsfs-format7/subversion/bindings/javahl/native/SVNRepos.h Sat Mar 30 20:02:27 2013
@@ -35,6 +35,7 @@
 #include "InputStream.h"
 #include "MessageReceiver.h"
 #include "ReposNotifyCallback.h"
+#include "ReposFreezeAction.h"
 #include "StringArray.h"
 #include "File.h"
 
@@ -51,8 +52,11 @@ class SVNRepos : public SVNBase
                   bool usePostRevPropChangeHook);
   void rmtxns(File &path, StringArray &transactions);
   jlong recover(File &path, ReposNotifyCallback *notifyCallback);
+  void freeze(jobjectArray jpaths, ReposFreezeAction* action);
   void lstxns(File &path, MessageReceiver &messageReceiver);
-  void load(File &path, InputStream &dataIn, bool ignoreUUID, bool forceUUID,
+  void load(File &path, InputStream &dataIn,
+            Revision &revsionStart, Revision &revisionEnd,
+            bool ignoreUUID, bool forceUUID,
             bool usePreCommitHook, bool usePostCommitHook,
             const char *relativePath, ReposNotifyCallback *notifyCallback);
   void listUnusedDBLogs(File &path,

Modified: subversion/branches/fsfs-format7/subversion/bindings/javahl/native/StatusCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/bindings/javahl/native/StatusCallback.cpp?rev=1462850&r1=1462849&r2=1462850&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/bindings/javahl/native/StatusCallback.cpp (original)
+++ subversion/branches/fsfs-format7/subversion/bindings/javahl/native/StatusCallback.cpp Sat Mar 30 20:02:27 2013
@@ -94,7 +94,7 @@ StatusCallback::doStatus(const char *loc
 
   jstring jPath = JNIUtil::makeJString(local_abspath);
   if (JNIUtil::isJavaExceptionThrown())
-    POP_AND_RETURN_NULL;
+    POP_AND_RETURN(SVN_NO_ERROR);
 
   jobject jStatus = CreateJ::Status(wc_ctx, status, pool);
   if (JNIUtil::isJavaExceptionThrown())

Modified: subversion/branches/fsfs-format7/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp?rev=1462850&r1=1462849&r2=1462850&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp (original)
+++ subversion/branches/fsfs-format7/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp Sat Mar 30 20:02:27 2013
@@ -52,6 +52,7 @@
 #include "StringArray.h"
 #include "RevpropTable.h"
 #include "VersionExtended.h"
+#include "DiffOptions.h"
 #include "svn_version.h"
 #include "svn_private_config.h"
 #include "version.h"
@@ -418,7 +419,8 @@ Java_org_apache_subversion_javahl_SVNCli
 JNIEXPORT void JNICALL
 Java_org_apache_subversion_javahl_SVNClient_add
 (JNIEnv *env, jobject jthis, jstring jpath, jobject jdepth,
- jboolean jforce, jboolean jnoIgnore, jboolean jaddParents)
+ jboolean jforce, jboolean jnoIgnore, jboolean jnoAutoProps,
+ jboolean jaddParents)
 {
   JNIEntry(SVNClient, add);
   SVNClient *cl = SVNClient::getCppObject(jthis);
@@ -431,8 +433,11 @@ Java_org_apache_subversion_javahl_SVNCli
   if (JNIUtil::isExceptionThrown())
     return;
 
-  cl->add(path, EnumMapper::toDepth(jdepth), jforce ? true : false,
-          jnoIgnore ? true : false, jaddParents ? true : false);
+  cl->add(path, EnumMapper::toDepth(jdepth),
+          jforce ? true : false,
+          jnoIgnore ? true : false,
+          jnoAutoProps ? true : false,
+          jaddParents ? true : false);
 }
 
 JNIEXPORT jlongArray JNICALL
@@ -548,7 +553,8 @@ JNIEXPORT void JNICALL
 Java_org_apache_subversion_javahl_SVNClient_move
 (JNIEnv *env, jobject jthis, jobject jsrcPaths, jstring jdestPath,
  jboolean jforce, jboolean jmoveAsChild, jboolean jmakeParents,
- jobject jrevpropTable, jobject jmessage, jobject jcallback)
+ jboolean jmetadataOnly, jboolean jallowMixRev, jobject jrevpropTable,
+ jobject jmessage, jobject jcallback)
 {
   JNIEntry(SVNClient, move);
 
@@ -578,6 +584,7 @@ Java_org_apache_subversion_javahl_SVNCli
   CommitCallback callback(jcallback);
   cl->move(srcPaths, destPath, &message, jforce ? true : false,
            jmoveAsChild ? true : false, jmakeParents ? true : false,
+           jmetadataOnly ? true: false, jallowMixRev ? true : false,
            revprops, jcallback ? &callback : NULL);
 }
 
@@ -728,7 +735,8 @@ Java_org_apache_subversion_javahl_SVNCli
 JNIEXPORT void JNICALL
 Java_org_apache_subversion_javahl_SVNClient_doImport
 (JNIEnv *env, jobject jthis, jstring jpath, jstring jurl, jobject jdepth,
- jboolean jnoIgnore, jboolean jignoreUnknownNodeTypes, jobject jrevpropTable,
+ jboolean jnoIgnore, jboolean jnoAutoProps,
+ jboolean jignoreUnknownNodeTypes, jobject jrevpropTable,
  jobject jimportFilterCallback, jobject jmessage, jobject jcommitCallback)
 {
   JNIEntry(SVNClient, doImport);
@@ -758,7 +766,7 @@ Java_org_apache_subversion_javahl_SVNCli
   CommitCallback commitCallback(jcommitCallback);
 
   cl->doImport(path, url, &message, EnumMapper::toDepth(jdepth),
-               jnoIgnore ? true : false,
+               jnoIgnore ? true : false, jnoAutoProps ? true : false,
                jignoreUnknownNodeTypes ? true : false, revprops,
                jimportFilterCallback ? &importFilterCallback : NULL,
                jcommitCallback ? &commitCallback : NULL);
@@ -1215,12 +1223,13 @@ JNIEXPORT void JNICALL Java_org_apache_s
 }
 
 JNIEXPORT void JNICALL
-Java_org_apache_subversion_javahl_SVNClient_diff__Ljava_lang_String_2Lorg_apache_subversion_javahl_types_Revision_2Ljava_lang_String_2Lorg_apache_subversion_javahl_types_Revision_2Ljava_lang_String_2Ljava_io_OutputStream_2Lorg_apache_subversion_javahl_types_Depth_2Ljava_util_Collection_2ZZZZZZ
+Java_org_apache_subversion_javahl_SVNClient_diff__Ljava_lang_String_2Lorg_apache_subversion_javahl_types_Revision_2Ljava_lang_String_2Lorg_apache_subversion_javahl_types_Revision_2Ljava_lang_String_2Ljava_io_OutputStream_2Lorg_apache_subversion_javahl_types_Depth_2Ljava_util_Collection_2ZZZZZZLorg_apache_subversion_javahl_types_DiffOptions_2
 (JNIEnv *env, jobject jthis, jstring jtarget1, jobject jrevision1,
  jstring jtarget2, jobject jrevision2, jstring jrelativeToDir,
  jobject jstream, jobject jdepth, jobject jchangelists,
  jboolean jignoreAncestry, jboolean jnoDiffDeleted, jboolean jforce,
- jboolean jcopiesAsAdds, jboolean jignoreProps, jboolean jpropsOnly)
+ jboolean jcopiesAsAdds, jboolean jignoreProps, jboolean jpropsOnly,
+ jobject jdiffOptions)
 {
   JNIEntry(SVNClient, diff);
   SVNClient *cl = SVNClient::getCppObject(jthis);
@@ -1257,21 +1266,26 @@ Java_org_apache_subversion_javahl_SVNCli
   if (JNIUtil::isExceptionThrown())
     return;
 
+  DiffOptions options(jdiffOptions);
+  if (JNIUtil::isExceptionThrown())
+    return;
+
   cl->diff(target1, revision1, target2, revision2, relativeToDir, dataOut,
            EnumMapper::toDepth(jdepth), changelists,
            jignoreAncestry ? true:false,
            jnoDiffDeleted ? true:false, jforce ? true:false,
            jcopiesAsAdds ? true:false, jignoreProps ? true:false,
-           jpropsOnly ? true:false);
+           jpropsOnly ? true:false, options);
 }
 
 JNIEXPORT void JNICALL
-Java_org_apache_subversion_javahl_SVNClient_diff__Ljava_lang_String_2Lorg_apache_subversion_javahl_types_Revision_2Lorg_apache_subversion_javahl_types_Revision_2Lorg_apache_subversion_javahl_types_Revision_2Ljava_lang_String_2Ljava_io_OutputStream_2Lorg_apache_subversion_javahl_types_Depth_2Ljava_util_Collection_2ZZZZZZ
+Java_org_apache_subversion_javahl_SVNClient_diff__Ljava_lang_String_2Lorg_apache_subversion_javahl_types_Revision_2Lorg_apache_subversion_javahl_types_Revision_2Lorg_apache_subversion_javahl_types_Revision_2Ljava_lang_String_2Ljava_io_OutputStream_2Lorg_apache_subversion_javahl_types_Depth_2Ljava_util_Collection_2ZZZZZZLorg_apache_subversion_javahl_types_DiffOptions_2
 (JNIEnv *env, jobject jthis, jstring jtarget, jobject jpegRevision,
  jobject jstartRevision, jobject jendRevision, jstring jrelativeToDir,
  jobject jstream, jobject jdepth, jobject jchangelists,
  jboolean jignoreAncestry, jboolean jnoDiffDeleted, jboolean jforce,
- jboolean jcopiesAsAdds, jboolean jignoreProps, jboolean jpropsOnly)
+ jboolean jcopiesAsAdds, jboolean jignoreProps, jboolean jpropsOnly,
+ jobject jdiffOptions)
 {
   JNIEntry(SVNClient, diff);
   SVNClient *cl = SVNClient::getCppObject(jthis);
@@ -1308,12 +1322,16 @@ Java_org_apache_subversion_javahl_SVNCli
   if (JNIUtil::isExceptionThrown())
     return;
 
+  DiffOptions options(jdiffOptions);
+  if (JNIUtil::isExceptionThrown())
+    return;
+
   cl->diff(target, pegRevision, startRevision, endRevision, relativeToDir,
            dataOut, EnumMapper::toDepth(jdepth), changelists,
            jignoreAncestry ? true:false,
            jnoDiffDeleted ? true:false, jforce ? true:false,
            jcopiesAsAdds ? true:false, jignoreProps ? true:false,
-           jpropsOnly ? true:false);
+           jpropsOnly ? true:false, options);
 }
 
 JNIEXPORT void JNICALL



Mime
View raw message