subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From phi...@apache.org
Subject svn commit: r1576824 [1/7] - in /subversion/branches/fsfs-lock-many: ./ build/generator/ build/generator/templates/ subversion/bindings/ctypes-python/test/ subversion/bindings/javahl/native/ subversion/bindings/javahl/src/org/apache/subversion/javahl/t...
Date Wed, 12 Mar 2014 17:18:26 GMT
Author: philip
Date: Wed Mar 12 17:18:20 2014
New Revision: 1576824

URL: http://svn.apache.org/r1576824
Log:
On fsfs-lock-many branch: sync with trunk at r1576815.

Added:
    subversion/branches/fsfs-lock-many/build/generator/templates/pkg-config.in.ezt
      - copied unchanged from r1576815, subversion/trunk/build/generator/templates/pkg-config.in.ezt
Modified:
    subversion/branches/fsfs-lock-many/   (props changed)
    subversion/branches/fsfs-lock-many/CHANGES
    subversion/branches/fsfs-lock-many/COMMITTERS
    subversion/branches/fsfs-lock-many/Makefile.in
    subversion/branches/fsfs-lock-many/build.conf
    subversion/branches/fsfs-lock-many/build/generator/gen_make.py
    subversion/branches/fsfs-lock-many/build/generator/gen_win_dependencies.py
    subversion/branches/fsfs-lock-many/configure.ac
    subversion/branches/fsfs-lock-many/gen-make.py
    subversion/branches/fsfs-lock-many/subversion/bindings/ctypes-python/test/wc.py
    subversion/branches/fsfs-lock-many/subversion/bindings/javahl/native/CreateJ.cpp
    subversion/branches/fsfs-lock-many/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Status.java
    subversion/branches/fsfs-lock-many/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
    subversion/branches/fsfs-lock-many/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
    subversion/branches/fsfs-lock-many/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c
    subversion/branches/fsfs-lock-many/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
    subversion/branches/fsfs-lock-many/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
    subversion/branches/fsfs-lock-many/subversion/include/private/svn_cache.h
    subversion/branches/fsfs-lock-many/subversion/include/private/svn_delta_private.h
    subversion/branches/fsfs-lock-many/subversion/include/private/svn_wc_private.h
    subversion/branches/fsfs-lock-many/subversion/include/svn_config.h
    subversion/branches/fsfs-lock-many/subversion/include/svn_delta.h
    subversion/branches/fsfs-lock-many/subversion/include/svn_fs.h
    subversion/branches/fsfs-lock-many/subversion/include/svn_repos.h
    subversion/branches/fsfs-lock-many/subversion/libsvn_auth_gnome_keyring/   (props changed)
    subversion/branches/fsfs-lock-many/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_auth_kwallet/   (props changed)
    subversion/branches/fsfs-lock-many/subversion/libsvn_client/   (props changed)
    subversion/branches/fsfs-lock-many/subversion/libsvn_client/add.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_client/cat.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_client/changelist.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_client/cleanup.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_client/commit.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_client/commit_util.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_client/copy.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_client/copy_foreign.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_client/ctx.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_client/delete.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_client/deprecated.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_client/diff.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_client/diff_local.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_client/diff_summarize.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_client/export.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_client/externals.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_client/import.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_client/info.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_client/iprops.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_client/list.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_client/locking_commands.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_client/log.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_client/merge.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_client/mergeinfo.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_client/patch.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_client/prop_commands.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_client/ra.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_client/repos_diff.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_client/resolved.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_client/revert.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_client/switch.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_client/update.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_client/util.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_delta/   (props changed)
    subversion/branches/fsfs-lock-many/subversion/libsvn_delta/compat.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_delta/svndiff.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_delta/xdelta.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_diff/   (props changed)
    subversion/branches/fsfs-lock-many/subversion/libsvn_diff/diff_file.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_diff/parse-diff.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_diff/util.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs/   (props changed)
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs/access.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs/fs-loader.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs/fs-loader.h
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_base/   (props changed)
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_base/bdb/changes-table.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_base/bdb/env.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_base/dag.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_base/fs.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_base/id.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_base/id.h
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_base/lock.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_base/revs-txns.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_base/tree.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_fs/   (props changed)
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_fs/cached_data.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_fs/caching.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_fs/fs.h
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_fs/fs_fs.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_fs/fs_fs.h
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_fs/hotcopy.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_fs/id.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_fs/id.h
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_fs/index.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_fs/lock.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_fs/pack.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_fs/recovery.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_fs/structure
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_fs/temp_serializer.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_fs/transaction.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_fs/tree.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_fs/verify.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_util/   (props changed)
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_x/   (props changed)
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_x/changes.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_x/fs.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_x/fs.h
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_x/id.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_x/id.h
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_x/lock.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_x/noderevs.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_x/noderevs.h
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_x/pack.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_x/string_table.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_x/temp_serializer.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_x/transaction.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_x/tree.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_ra/   (props changed)
    subversion/branches/fsfs-lock-many/subversion/libsvn_ra/compat.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_ra/deprecated.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_ra/ra_loader.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_ra_local/   (props changed)
    subversion/branches/fsfs-lock-many/subversion/libsvn_ra_local/ra_plugin.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_ra_serf/   (props changed)
    subversion/branches/fsfs-lock-many/subversion/libsvn_ra_serf/blame.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_ra_serf/blncache.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_ra_serf/commit.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_ra_serf/getlocations.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_ra_serf/getlocationsegments.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_ra_serf/getlocks.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_ra_serf/inherited_props.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_ra_serf/log.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_ra_serf/merge.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_ra_serf/mergeinfo.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_ra_serf/options.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_ra_serf/property.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_ra_serf/ra_serf.h
    subversion/branches/fsfs-lock-many/subversion/libsvn_ra_serf/replay.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_ra_serf/serf.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_ra_serf/stat.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_ra_serf/update.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_ra_serf/util.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_ra_serf/xml.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_ra_svn/   (props changed)
    subversion/branches/fsfs-lock-many/subversion/libsvn_ra_svn/client.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_ra_svn/editorp.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_ra_svn/marshal.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_repos/   (props changed)
    subversion/branches/fsfs-lock-many/subversion/libsvn_repos/authz.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_repos/commit.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_repos/delta.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_repos/deprecated.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_repos/dump.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_repos/fs-wrap.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_repos/hooks.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_repos/load-fs-vtable.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_repos/load.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_repos/log.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_repos/replay.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_repos/reporter.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_repos/repos.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_repos/rev_hunt.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_subr/   (props changed)
    subversion/branches/fsfs-lock-many/subversion/libsvn_subr/auth.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_subr/cache-membuffer.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_subr/cmdline.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_subr/compat.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_subr/config.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_subr/config_auth.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_subr/config_file.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_subr/config_win.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_subr/deprecated.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_subr/dso.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_subr/error.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_subr/hash.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_subr/io.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_subr/mergeinfo.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_subr/named_atomic.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_subr/opt.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_subr/properties.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_subr/simple_providers.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_subr/sorts.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_subr/sqlite3wrapper.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_subr/ssl_client_cert_providers.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_subr/ssl_client_cert_pw_providers.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_subr/ssl_server_trust_providers.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_subr/subst.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_subr/temp_serializer.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_subr/types.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_subr/username_providers.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_subr/utf.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_subr/utf8proc.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_subr/win32_crypto.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_wc/   (props changed)
    subversion/branches/fsfs-lock-many/subversion/libsvn_wc/adm_crawler.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_wc/adm_files.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_wc/conflicts.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_wc/copy.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_wc/deprecated.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_wc/diff_editor.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_wc/diff_local.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_wc/entries.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_wc/externals.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_wc/info.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_wc/lock.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_wc/node.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_wc/old-and-busted.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_wc/props.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_wc/revert.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_wc/status.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_wc/update_editor.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_wc/upgrade.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_wc/wc.h
    subversion/branches/fsfs-lock-many/subversion/libsvn_wc/wc_db.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_wc/wc_db_update_move.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_wc/wc_db_wcroot.c
    subversion/branches/fsfs-lock-many/subversion/mod_dav_svn/reports/replay.c
    subversion/branches/fsfs-lock-many/subversion/mod_dav_svn/repos.c
    subversion/branches/fsfs-lock-many/subversion/mod_dav_svn/version.c
    subversion/branches/fsfs-lock-many/subversion/svn/auth-cmd.c
    subversion/branches/fsfs-lock-many/subversion/svn/cl-conflicts.c
    subversion/branches/fsfs-lock-many/subversion/svn/commit-cmd.c
    subversion/branches/fsfs-lock-many/subversion/svn/conflict-callbacks.c
    subversion/branches/fsfs-lock-many/subversion/svn/diff-cmd.c
    subversion/branches/fsfs-lock-many/subversion/svn/help-cmd.c
    subversion/branches/fsfs-lock-many/subversion/svn/notify.c
    subversion/branches/fsfs-lock-many/subversion/svn/propedit-cmd.c
    subversion/branches/fsfs-lock-many/subversion/svn/propget-cmd.c
    subversion/branches/fsfs-lock-many/subversion/svn/props.c
    subversion/branches/fsfs-lock-many/subversion/svn/status-cmd.c
    subversion/branches/fsfs-lock-many/subversion/svn/status.c
    subversion/branches/fsfs-lock-many/subversion/svn/svn.c
    subversion/branches/fsfs-lock-many/subversion/svn/util.c
    subversion/branches/fsfs-lock-many/subversion/svnadmin/svnadmin.c
    subversion/branches/fsfs-lock-many/subversion/svnlook/svnlook.c
    subversion/branches/fsfs-lock-many/subversion/svnrdump/dump_editor.c
    subversion/branches/fsfs-lock-many/subversion/svnrdump/svnrdump.c
    subversion/branches/fsfs-lock-many/subversion/svnrdump/util.c
    subversion/branches/fsfs-lock-many/subversion/svnserve/serve.c
    subversion/branches/fsfs-lock-many/subversion/svnserve/svnserve.c
    subversion/branches/fsfs-lock-many/subversion/svnsync/svnsync.c
    subversion/branches/fsfs-lock-many/subversion/svnsync/sync.c
    subversion/branches/fsfs-lock-many/subversion/tests/cmdline/authz_tests.py
    subversion/branches/fsfs-lock-many/subversion/tests/cmdline/commit_tests.py
    subversion/branches/fsfs-lock-many/subversion/tests/cmdline/davautocheck.sh
    subversion/branches/fsfs-lock-many/subversion/tests/cmdline/export_tests.py
    subversion/branches/fsfs-lock-many/subversion/tests/cmdline/getopt_tests.py
    subversion/branches/fsfs-lock-many/subversion/tests/cmdline/prop_tests.py
    subversion/branches/fsfs-lock-many/subversion/tests/cmdline/svnadmin_tests.py
    subversion/branches/fsfs-lock-many/subversion/tests/cmdline/svntest/sandbox.py
    subversion/branches/fsfs-lock-many/subversion/tests/cmdline/update_tests.py
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_client/client-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_client/mtcc-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_delta/random-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_delta/window-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_diff/diff-diff3-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_diff/parse-diff-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_fs/fs-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_fs/locks-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_fs_base/changes-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_fs_base/fs-base-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_fs_base/strings-reps-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_fs_x/   (props changed)
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_fs_x/fs-x-pack-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_fs_x/string-table-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_ra/ra-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_ra_local/ra-local-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_repos/dir-delta-editor.h
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_repos/repos-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_subr/auth-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_subr/cache-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_subr/checksum-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_subr/compat-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_subr/config-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_subr/crypto-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_subr/dirent_uri-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_subr/error-code-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_subr/error-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_subr/hashdump-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_subr/io-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_subr/mergeinfo-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_subr/named_atomic-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_subr/opt-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_subr/packed-data-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_subr/path-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_subr/prefix-string-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_subr/priority-queue-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_subr/revision-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_subr/root-pools-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_subr/skel-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_subr/spillbuf-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_subr/sqlite-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_subr/stream-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_subr/string-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_subr/subst_translate-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_subr/time-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_subr/translate-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_subr/utf-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_wc/conflict-data-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_wc/db-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_wc/entries-compat.c
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_wc/op-depth-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_wc/pristine-store-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_wc/wc-queries-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_wc/wc-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/svn_test.h
    subversion/branches/fsfs-lock-many/subversion/tests/svn_test_fs.c
    subversion/branches/fsfs-lock-many/subversion/tests/svn_test_main.c
    subversion/branches/fsfs-lock-many/tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd
    subversion/branches/fsfs-lock-many/tools/server-side/fsfs-stats.c

Propchange: subversion/branches/fsfs-lock-many/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1573586-1576815

Modified: subversion/branches/fsfs-lock-many/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/CHANGES?rev=1576824&r1=1576823&r2=1576824&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/CHANGES (original)
+++ subversion/branches/fsfs-lock-many/CHANGES Wed Mar 12 17:18:20 2014
@@ -79,6 +79,7 @@ http://svn.apache.org/repos/asf/subversi
     * fsfs: speed up serialization into cache buffer format (r1505056)
     * fsfs: checkpoint after each rev during hotcopy (r1560723)
     * fsfs: avoid caching intermediate fulltexts (r1565100)
+    * fsfs: reduce lock contention on txn-list-lock (r1569549)
     * svnadmin: don't display warnings as errors (r1556297)
     * ra_serf: avoid caching properties in the update editor (r1557538)
     * ra_serf: decrease latency of requests to get directory contents by
@@ -126,6 +127,19 @@ http://svn.apache.org/repos/asf/subversi
     * membuffer: reduce memory usage by using shorter lived pools (r1564217)
     * svnadmin load: add '--ignore-dates' option (r1564789)
     * update: reduce sessions used with '--parents' option (r1565920)
+    * fix L1->L2 promotion/eviction heuristics for high hit counts (r1568599)
+    * diff: report properties on deleted nodes (r1569320, r1570055)
+    * diff: switch to diff processor APIs instead of old style callbacks, step
+      towards resolving long standing bugs and feature requests (r1569551 et al)
+    * diff: use the proper revision in headers for addition and deletion
+      of files (r1570053)
+    * svnadmin lslocks: add cancellation (r1571992)
+    * svn --version: list available authentication credential caches (r1572106)
+    * improved detection of changes between two nodes, this should reduce the
+      number of out of date errors clients see (r1572336)
+    * alow the use of libmagic to be configured via subversion configuration
+      file or SVN_CONFIG_OPTION_ENABLE_MAGIC_FILE env variable (r1572916)
+    * store human readable info about SSL certs in auth store (r1573625)
 
   - Client-side bugfixes:
     * export: fix problem exporting symlinks on windows (r1476093)
@@ -171,6 +185,16 @@ http://svn.apache.org/repos/asf/subversi
     * wc: reduce dependence on unspecified SQLite behavior (r1567080 et al)
     * delete/move: explicitly specify node to delete rather than querying
       wc db multiple times to determine on the fly (r1567204 et al)
+    * diff: fix diff of directory failing without permissions to read ancester
+      directory on server (r1569265, 1569290)
+    * diff: improve resolving peg revisions (r1570205 et al)
+    * diff: fix bug in calculating header paths (r1570584)
+    * wc: prevent duplicated rows in sqlite_stat1 table (r1571214)
+    * commit: fix assertion from commit of deep descendant of deleted node
+      (r1571747, r1571787, r1571795)
+    * upgrade: fix error upgrading wc with externals when exclusive locking is
+      enabled (1572200)
+    * ra_serf: add SSL certificate issuers common name to output (r1573728)
 
   - Server-side bugfixes:
     * svnserve: don't ignore socket initialization errors (r1544253)
@@ -199,11 +223,17 @@ http://svn.apache.org/repos/asf/subversi
     * fsfs: fix a problem verifying pre-1.4 repos used with 1.8 (r1561419)
     * fsfs: don't write uniquifiers for old repo formats (r1561426)
     * fsfs: fix hotcopy for pre-1.4 repositories (r1561427)
+    * fix 64-bit underflows in update hit counters (r1567996 et al)
+    * svnserve: fix potential integer overflow in Cyrus SASL support (r1570434)
+    * svnserve: fix memcached caching causes segfault (issue #4470)
+    * bdb: fix potential integer overflow and underflow (r1570701)
+    * bdb: prevent silent propogation of some corruption (r1570778)
 
   - Client-side and server-side bugfixes:
     * use less memory when retrieving extension from filename (r1548480)
     * use more optimal code path with old txdelta v1 data (r1485480)
     * windows: allow opening SQLite databases on long paths (r1564338)
+    * fix an out-of-bounds read in the delta combiner (r1569415)
 
   - Other tool improvements and bugfixes:
     * windows: add build-svn-deps-win.pl tool to build dependencies (r1467715)
@@ -226,6 +256,8 @@ http://svn.apache.org/repos/asf/subversi
       programs (r1544194)
     * bash_completion: support for youngest command (r1546975)
     * which-error.py: allow which-error.py to be run from symlink (r1547977)
+    * bash-completion: add svnlook filesize command and options to svn cat,
+      info, and mergeinfo commands (r1569021)
 
  Developer-visible changes:
   - General:
@@ -264,6 +296,25 @@ http://svn.apache.org/repos/asf/subversi
     * allow building with APR-2 (r1560586)
     * remove support for ASM Zlib from Windows build system (r1560864)
     * gen-make.py: new -D option (r1567046)
+    * svn-populate-node-origins-index: fix build with Visual Studio
+      (r1568180 et al)
+    * improve how we fetch the version of Windows (r1568798, 1568806)
+    * move common code in python tests to library files to avoid side effects of
+      having tests depending on each other (r1570654)
+    * disable compiling on platforms where int is shorter than 32-bits and add
+      the SVN_ALLOW_SHORT_INTS compile definition to override (r1570882)
+    * disable building *.sbr files with Visual C++ 2010 or later (r1571020)
+    * require serf 1.3.4 (r1572261)
+    * require APR and APR-Util 1.3.x (r1572261)
+    * add mod_dontdothat to davautocheck.sh (r1572312)
+    * require Apache httpd 2.2.x (r1572339)
+    * support pkg-config for serf when using a prefix (r1572762)
+    * don't depend on stdbool.h and inttypes.h for utf8proc (r1573069 et al)
+    * correctly disable some compiler flags at configure time if they aren't
+      available with the selected compiler (r1573106, r1573209)
+    * avoid non-portable find extensions so the build works on Solaris (r1573780)
+    * Allow PARALLEL value to specify the number of threads to run tests with,
+      PARALLEL=1 means to use the default (r1573320)
 
   - API changes:
     * New RA callbacks for managing ra_svn tunnels:
@@ -331,6 +382,17 @@ http://svn.apache.org/repos/asf/subversi
     * New error code SVN_ERR_XML_UNEXPECTED_ELEMENT (r1498938)
     * Extend stream API to also support incomplete reads (r1561688 et al)
     * New api svn_wc_add_from_disk3() (r1563361)
+    * New api svn_client_revert3() to allow clearing changelists (r1568635)
+    * svn_rangelist_inheritable2(): don't change inheritabilty of remaining
+      ranges (r1569731)
+    * svn_rangelist_inheritable2() and svn_mergeinfo_inheritable2(): fix a
+      pool lifetime issue (r1569764)
+    * New apis to support cancelation during unified diff output (r1570149)
+    * APIs related to retrieving logs are now documented to be unlimited when
+      a negative value is passed for the limit (r1570330, 1570335)
+    * New apis: svn_fs_props_different() and svn_fs_contents_different()
+      (r1572363, r1573111)
+    * Expose SVN_CONFIG_AUTHN_* macros in public API (r1572640)
 
   - Bindings:
     * javahl: add support for the RA layer (r1494650 et al)
@@ -376,8 +438,10 @@ http://svn.apache.org/repos/asf/subversi
     * javahl: expose inheritiable property names (r1560338)
     * javahl: fix bug in parsing single revision merginfo data (r1563140)
     * javahl: create JVM crashlogs from svn malfunctions (r1563927, r1564252)
-    * javahl: avoid problems when building without NLS support (r1566578)
+    * javahl: avoid problems when building without NLS support (r1566578 et al)
     * javahl: expose --alow-mixed-revisions merge option (r1567602)
+    * javahl: support incomplete reads from streams (r1569631)
+    * javahl: allow revert API to take a set of paths (r1571461)
 
 
 Version 1.8.8

Modified: subversion/branches/fsfs-lock-many/COMMITTERS
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/COMMITTERS?rev=1576824&r1=1576823&r2=1576824&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/COMMITTERS [UTF-8] (original)
+++ subversion/branches/fsfs-lock-many/COMMITTERS [UTF-8] Wed Mar 12 17:18:20 2014
@@ -58,6 +58,7 @@ Blanket commit access:
        stefan2   Stefan Fuhrmann <stefan.fuhrmann@wandisco.com>
        jcorvel   Johan Corveleyn <jcorvel@gmail.com>
          trent   Trent Nelson <trent@snakebite.org>
+        kotkov   Evgeny Kotkov <evgeny.kotkov@visualsvn.com>
 
 [[END ACTIVE FULL COMMITTERS.  LEAVE THIS LINE HERE; SCRIPTS LOOK FOR IT.]]
 

Modified: subversion/branches/fsfs-lock-many/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/Makefile.in?rev=1576824&r1=1576823&r2=1576824&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/Makefile.in (original)
+++ subversion/branches/fsfs-lock-many/Makefile.in Wed Mar 12 17:18:20 2014
@@ -483,8 +483,7 @@ javahl-compat: javahl-compat-java @JAVAH
 
 clean-javahl:
 	if [ -d $(javahl_test_rootdir) ]; then \
-	  find $(javahl_test_rootdir) -mindepth 1 -maxdepth 1 \
-               -print0 | xargs -0 rm -rf --;   \
+	  rm -rf $(javahl_test_rootdir)/*;     \
 	fi
 	rm -rf $(javahl_java_PATH) $(javahl_javah_PATH) @JAVAHL_OBJDIR@
 	rm -f $(libsvnjavahl_PATH)/*.la $(JAVAHL_JAR)
@@ -577,7 +576,7 @@ davcheck: bin $(TEST_DEPS) @BDB_TEST_DEP
 # run make check.
 davautocheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ apache-mod
 	@# Takes MODULE_PATH, USE_HTTPV1 and SVN_PATH_AUTHZ in the environment.
-	@APXS=$(APXS) $(top_srcdir)/subversion/tests/cmdline/davautocheck.sh
+	@APXS=$(APXS) $(SHELL) $(top_srcdir)/subversion/tests/cmdline/davautocheck.sh
 
 # First, run:
 #   subversion/svnserve/svnserve -d -r `pwd`/subversion/tests/cmdline
@@ -587,7 +586,7 @@ svncheck: bin $(TEST_DEPS) @BDB_TEST_DEP
 # 'make svnserveautocheck' runs svnserve for you and kills it.
 svnserveautocheck: svnserve bin $(TEST_DEPS) @BDB_TEST_DEPS@
 	@env PYTHON=$(PYTHON) THREADED=$(THREADED) \
-	  $(top_srcdir)/subversion/tests/cmdline/svnserveautocheck.sh
+	  $(SHELL) $(top_srcdir)/subversion/tests/cmdline/svnserveautocheck.sh
 
 # First, run:
 #   subversion/svnserve/svnserve --listen-host "::1" -d -r `pwd`/subversion/tests/cmdline
@@ -627,12 +626,11 @@ gcov-reset:
 gcov-clean:
 	rm -f gcov-lcov.dat gcov-lcov.log gcov-genhtml.log
 	rm -rf gcov-report
-	find . -name "*.gcda" -o -name "*.gcno" -print0 | xargs -0 rm -f --
+	find . -name "*.gcda" -o -name "*.gcno" -exec rm -f -- {} \;
 
 check-clean: gcov-clean
 	if [ -d subversion/tests/cmdline/svn-test-work ]; then \
-	  find subversion/tests/cmdline/svn-test-work -mindepth 1 -maxdepth 1 \
-               -print0 | xargs -0 rm -rf --;   \
+	  rm -rf subversion/tests/cmdline/svn-test-work/*;     \
 	fi
 	rm -rf subversion/tests/libsvn_fs/test-repo-*          \
 	       subversion/tests/libsvn_fs_base/test-repo-*     \

Modified: subversion/branches/fsfs-lock-many/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/build.conf?rev=1576824&r1=1576823&r2=1576824&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/build.conf (original)
+++ subversion/branches/fsfs-lock-many/build.conf Wed Mar 12 17:18:20 2014
@@ -143,7 +143,7 @@ description = Subversion Client
 type = exe
 path = subversion/svn
 libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_diff libsvn_subr
-       apriconv apr serf
+       apriconv apr
 manpages = subversion/svn/svn.1
 install = bin
 
@@ -273,6 +273,7 @@ add-install-deps = $(SVN_FS_LIB_INSTALL_
 msvc-export = svn_fs.h private/svn_fs_private.h
 
 [libsvn_fs_base]
+description = Subversion Filesystem Base Library
 type = fs-module
 path = subversion/libsvn_fs_base
 sources = *.c bdb/*.c util/*.c
@@ -281,6 +282,7 @@ libs = libsvn_delta libsvn_subr aprutil 
 msvc-static = yes
 
 [libsvn_fs_fs]
+description = Subversion FSFS Repository Filesystem Library
 type = fs-module
 path = subversion/libsvn_fs_fs
 install = fsmod-lib
@@ -288,6 +290,7 @@ libs = libsvn_delta libsvn_subr aprutil 
 msvc-static = yes
 
 [libsvn_fs_x]
+description = Subversion FSX Repository Filesystem Library
 type = fs-module
 path = subversion/libsvn_fs_x
 install = fsmod-lib
@@ -296,6 +299,7 @@ msvc-static = yes
 
 # Low-level grab bag of utilities
 [libsvn_fs_util]
+description = Subversion Filesystem Utility Library
 type = lib
 install = fsmod-lib
 path = subversion/libsvn_fs_util
@@ -305,7 +309,7 @@ msvc-static = yes
 
 # General API for accessing repositories
 [libsvn_ra]
-description = Subversion Repository Access Library
+description = Subversion General Repository Access Library
 type = lib
 path = subversion/libsvn_ra
 libs = libsvn_delta libsvn_subr ra-libs apriconv apr
@@ -317,6 +321,7 @@ msvc-export = svn_ra.h private\svn_ra_pr
 
 # Accessing repositories via DAV through serf
 [libsvn_ra_serf]
+description = Subversion HTTP/WebDAV Protocol Repository Access Library
 type = ra-module
 path = subversion/libsvn_ra_serf
 install = serf-lib
@@ -325,6 +330,7 @@ msvc-static = yes
 
 # Accessing repositories via SVN
 [libsvn_ra_svn]
+description = Subversion SVN Protocol Repository Access Library
 type = ra-module
 path = subversion/libsvn_ra_svn
 install = ramod-lib
@@ -333,6 +339,7 @@ msvc-static = yes
 
 # Accessing repositories via direct libsvn_fs
 [libsvn_ra_local]
+description = Subversion Local Repository Access Library
 type = ra-module
 path = subversion/libsvn_ra_local
 install = ramod-lib
@@ -1303,10 +1310,12 @@ testing = skip
 type = lib
 external-lib = $(SVN_APR_LIBS)
 msvc-libs = ws2_32.lib rpcrt4.lib mswsock.lib
+pkg-config = apr-@SVN_APR_MAJOR_VERSION@
 
 [aprutil]
 type = lib
 external-lib = $(SVN_APRUTIL_LIBS)
+pkg-config = apr-util-@SVN_APR_MAJOR_VERSION@
 
 [apriconv]
 type = lib
@@ -1327,6 +1336,7 @@ external-lib = $(SVN_DB_LIBS)
 [gnome-keyring]
 type = lib
 external-lib = $(SVN_GNOME_KEYRING_LIBS)
+pkg-config = gnome-keyring-1
 
 [kwallet]
 type = lib
@@ -1363,10 +1373,14 @@ type = lib
 external-lib = $(SVN_SERF_LIBS)
 libs = apr aprutil openssl xml zlib
 msvc-libs = secur32.lib
+pkg-config = serf-1
+pkg-config-private = yes
 
 [sqlite]
 type = lib
 external-lib = $(SVN_SQLITE_LIBS)
+pkg-config = sqlite3
+pkg-config-private = yes
 
 [xml]
 type = lib

Modified: subversion/branches/fsfs-lock-many/build/generator/gen_make.py
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/build/generator/gen_make.py?rev=1576824&r1=1576823&r2=1576824&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/build/generator/gen_make.py (original)
+++ subversion/branches/fsfs-lock-many/build/generator/gen_make.py Wed Mar 12 17:18:20 2014
@@ -472,6 +472,8 @@ class Generator(gen_base.GeneratorBase):
 
     self.write_transform_libtool_scripts(install_sources)
 
+    self.write_pkg_config_dot_in_files(install_sources)
+
   def write_standalone(self):
     """Write autogen-standalone.mk"""
 
@@ -583,6 +585,64 @@ DIR=`pwd`
       libdep_cache[target_name] = sorted(libs)
     return libdep_cache[target_name]
 
+  def write_pkg_config_dot_in_files(self, install_sources):
+    """Write pkg-config .pc.in files for Subversion libraries."""
+    for target_ob in install_sources:
+      if not (isinstance(target_ob, gen_base.TargetLib) and
+              target_ob.path.startswith('subversion/libsvn_')):
+        continue
+
+      lib_name = target_ob.name
+      lib_path = self.sections[lib_name].options.get('path')
+      lib_deps = self.sections[lib_name].options.get('libs')
+      lib_desc = self.sections[lib_name].options.get('description')
+      output_path = build_path_join(lib_path, lib_name + '.pc.in')
+      template = ezt.Template(os.path.join('build', 'generator', 'templates',
+                                           'pkg-config.in.ezt'),
+                              compress_whitespace=False)
+      class _eztdata(object):
+        def __init__(self, **kw):
+          vars(self).update(kw)
+
+      data = _eztdata(
+        lib_name=lib_name,
+        lib_desc=lib_desc,
+        lib_deps=[],
+        lib_required=[],
+        lib_required_private=[],
+        )
+      for lib_dep in lib_deps.split():
+        if lib_dep == 'apriconv':
+          # apriconv is part of apr-util, skip it
+          continue
+        if lib_dep == 'intl':
+          # this library seems to be used only by the windows build, skip it
+          continue
+        external_lib = self.sections[lib_dep].options.get('external-lib')
+        if external_lib:
+          ### Some of Subversion's internal libraries can appear as external
+          ### libs to handle conditional compilation. Skip these for now.
+          if external_lib in ['$(SVN_RA_LIB_LINK)', '$(SVN_FS_LIB_LINK)']:
+            continue
+          # If the external library is known to support pkg-config,
+          # add it to the Required: or Required.private: section.
+          # Otherwise, add the external library to linker flags.
+          pkg_config = self.sections[lib_dep].options.get('pkg-config')
+          if pkg_config:
+            private = self.sections[lib_dep].options.get('pkg-config-private')
+            if private:
+              data.lib_required_private.append(pkg_config)
+            else:
+              data.lib_required.append(pkg_config)
+          else:
+            # $(EXTERNAL_LIB) -> @EXTERNAL_LIB@
+            data.lib_deps.append('@%s@' % external_lib[2:-1])
+        else:
+          # libsvn_foo -> -lsvn_foo
+          data.lib_deps.append('-l%s' % lib_dep.replace('lib', '', 1))
+
+      template.generate(open(output_path, 'w'), data)
+
 class UnknownDependency(Exception):
   "We don't know how to deal with the dependent to link it in."
   pass

Modified: subversion/branches/fsfs-lock-many/build/generator/gen_win_dependencies.py
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/build/generator/gen_win_dependencies.py?rev=1576824&r1=1576823&r2=1576824&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/build/generator/gen_win_dependencies.py (original)
+++ subversion/branches/fsfs-lock-many/build/generator/gen_win_dependencies.py Wed Mar 12 17:18:20 2014
@@ -161,7 +161,6 @@ class GenDependenciesBase(gen_base.Gener
     self.static_openssl = None
     self.instrument_apr_pools = None
     self.instrument_purify_quantify = None
-    self.configure_apr_util = None
     self.sasl_path = None
     self.cpp_defines = []
 
@@ -210,8 +209,6 @@ class GenDependenciesBase(gen_base.Gener
         self.instrument_apr_pools = 1
       elif opt == '--enable-nls':
         self.enable_nls = 1
-      elif opt == '--enable-bdb-in-apr-util':
-        self.configure_apr_util = 1
       elif opt == '--disable-shared':
         self.disable_shared = 1
       elif opt == '--with-static-apr':

Modified: subversion/branches/fsfs-lock-many/configure.ac
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/configure.ac?rev=1576824&r1=1576823&r2=1576824&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/configure.ac (original)
+++ subversion/branches/fsfs-lock-many/configure.ac Wed Mar 12 17:18:20 2014
@@ -109,11 +109,14 @@ if test `expr $apr_version : 2` -ne 0; t
   AC_SUBST(SVN_APRUTIL_INCLUDES)
   AC_SUBST(SVN_APRUTIL_CONFIG, ["$apu_config"])
   AC_SUBST(SVN_APRUTIL_LIBS)
+  SVN_APR_MAJOR_VERSION=2
 else
   svn_lib_ver=0
   APU_VER_REGEXES=["1\.[345]\."]
   SVN_LIB_APRUTIL($APU_VER_REGEXES)
+  SVN_APR_MAJOR_VERSION=1
 fi
+AC_SUBST(SVN_APR_MAJOR_VERSION)
 SVN_LT_SOVERSION="-version-info $svn_lib_ver"
 AC_SUBST(SVN_LT_SOVERSION)
 AC_DEFINE_UNQUOTED(SVN_SOVERSION, $svn_lib_ver,
@@ -224,7 +227,7 @@ if test "$experimental_libtool" = "yes";
   SVN_LIBTOOL="$sh_libtool"
 else
   sh_libtool="$abs_builddir/libtool"
-  SVN_LIBTOOL="\$(SHELL) $sh_libtool"
+  SVN_LIBTOOL="\$(SHELL) \"$sh_libtool\""
 fi
 AC_SUBST(SVN_LIBTOOL)
 
@@ -1539,6 +1542,13 @@ AC_CONFIG_COMMANDS([svn_private_config.h
                     SVN_DB_HEADER="$SVN_DB_HEADER"])
 AC_CONFIG_FILES([Makefile])
 
+# Create pkg-config .pc files from .pc.in files
+for pc_in_file in "${abs_srcdir}"/subversion/libsvn_*/*.pc.in; do
+  pc_file=${pc_in_file#${abs_srcdir}/}
+  pc_file=${pc_file%.in}
+  AC_CONFIG_FILES([${pc_file}])
+done
+
 SVN_CONFIG_SCRIPT(tools/backup/hot-backup.py)
 SVN_CONFIG_SCRIPT(tools/hook-scripts/commit-access-control.pl)
 SVN_CONFIG_SCRIPT(subversion/bindings/swig/perl/native/Makefile.PL)

Modified: subversion/branches/fsfs-lock-many/gen-make.py
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/gen-make.py?rev=1576824&r1=1576823&r2=1576824&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/gen-make.py (original)
+++ subversion/branches/fsfs-lock-many/gen-make.py Wed Mar 12 17:18:20 2014
@@ -193,9 +193,6 @@ def _usage_exit(err=None):
   print("  --enable-nls")
   print("           add support for gettext localization")
   print("")
-  print("  --enable-bdb-in-apr-util")
-  print("           configure APR-Util to use Berkeley DB")
-  print("")
   print("  --disable-shared")
   print("           only build static libraries")
   print("")
@@ -262,17 +259,10 @@ if __name__ == '__main__':
                             'enable-purify',
                             'enable-quantify',
                             'enable-nls',
-                            'enable-bdb-in-apr-util',
                             'disable-shared',
                             'installed-libs=',
                             'vsnet-version=',
                             'disable-gmock',
-                            # Keep distributions that help by adding a path
-                            # working. On unix this would be filtered by
-                            # configure, but on Windows gen-make.py is used
-                            # directly.
-                            'with-neon=',
-                            'without-neon',
                             ])
     if len(args) > 1:
       _usage_exit("Too many arguments")

Modified: subversion/branches/fsfs-lock-many/subversion/bindings/ctypes-python/test/wc.py
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/bindings/ctypes-python/test/wc.py?rev=1576824&r1=1576823&r2=1576824&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/bindings/ctypes-python/test/wc.py (original)
+++ subversion/branches/fsfs-lock-many/subversion/bindings/ctypes-python/test/wc.py Wed Mar 12 17:18:20 2014
@@ -168,7 +168,7 @@ class WCTestCase(unittest.TestCase):
         path = "%s/branches/0.x/README.txt" % wc_location
         diffstring="""Index: """+path+"""
 ===================================================================
---- """+path+"""\t(revision 0)
+--- """+path+"""\t(nonexistent)
 +++ """+path+"""\t(revision 5)
 @@ -0,0 +1,9 @@
 +This repository is for test purposes only. Any resemblance to any other

Modified: subversion/branches/fsfs-lock-many/subversion/bindings/javahl/native/CreateJ.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/bindings/javahl/native/CreateJ.cpp?rev=1576824&r1=1576823&r2=1576824&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/bindings/javahl/native/CreateJ.cpp (original)
+++ subversion/branches/fsfs-lock-many/subversion/bindings/javahl/native/CreateJ.cpp Wed Mar 12 17:18:20 2014
@@ -631,7 +631,10 @@ CreateJ::Status(svn_wc_context_t *wc_ctx
                              "L"JAVA_PACKAGE"/types/Status$Kind;"
                              "L"JAVA_PACKAGE"/types/Status$Kind;"
                              "L"JAVA_PACKAGE"/types/Status$Kind;"
-                             "ZZZZZL"JAVA_PACKAGE"/types/Lock;"
+                             "L"JAVA_PACKAGE"/types/Status$Kind;"
+                             "L"JAVA_PACKAGE"/types/Status$Kind;"
+                             "ZZL"JAVA_PACKAGE"/types/Depth;"
+                             "ZZZL"JAVA_PACKAGE"/types/Lock;"
                              "L"JAVA_PACKAGE"/types/Lock;"
                              "JJL"JAVA_PACKAGE"/types/NodeKind;"
                              "Ljava/lang/String;Ljava/lang/String;"
@@ -657,27 +660,16 @@ CreateJ::Status(svn_wc_context_t *wc_ctx
   jstring jMovedFromAbspath = NULL;
   jstring jMovedToAbspath = NULL;
 
-  enum svn_wc_status_kind text_status = status->node_status;
-
-  /* Avoid using values that might come from prop changes */
-  if (text_status == svn_wc_status_modified
-      || text_status == svn_wc_status_conflicted)
-    text_status = status->text_status;
-
-  enum svn_wc_status_kind repos_text_status = status->repos_node_status;
-
-  if (repos_text_status == svn_wc_status_modified
-      || repos_text_status == svn_wc_status_conflicted)
-    repos_text_status = status->repos_text_status;
-
-  jboolean jIsConflicted = (status->conflicted == 1) ? JNI_TRUE : JNI_FALSE;
-  jobject jTextType = EnumMapper::mapStatusKind(text_status);
+  jobject jNodeType = EnumMapper::mapStatusKind(status->node_status);
+  jobject jTextType = EnumMapper::mapStatusKind(status->text_status);
   jobject jPropType = EnumMapper::mapStatusKind(status->prop_status);
-  jobject jRepositoryTextType = EnumMapper::mapStatusKind(repos_text_status);
-  jobject jRepositoryPropType = EnumMapper::mapStatusKind(
-                                                  status->repos_prop_status);
-  jboolean jIsCopied = (status->copied == 1) ? JNI_TRUE: JNI_FALSE;
+  jobject jRpNodeType = EnumMapper::mapStatusKind(status->repos_node_status);
+  jobject jRpTextType = EnumMapper::mapStatusKind(status->repos_text_status);
+  jobject jRpPropType = EnumMapper::mapStatusKind(status->repos_prop_status);
+  jobject jDepth = EnumMapper::mapDepth(status->depth);
   jboolean jIsLocked = (status->wc_is_locked == 1) ? JNI_TRUE: JNI_FALSE;
+  jboolean jIsCopied = (status->copied == 1) ? JNI_TRUE: JNI_FALSE;
+  jboolean jIsConflicted = (status->conflicted == 1) ? JNI_TRUE : JNI_FALSE;
   jboolean jIsSwitched = (status->switched == 1) ? JNI_TRUE: JNI_FALSE;
   jboolean jIsFileExternal = (status->file_external == 1) ? JNI_TRUE
                                                           : JNI_FALSE;
@@ -743,9 +735,10 @@ CreateJ::Status(svn_wc_context_t *wc_ctx
 
   jobject ret = env->NewObject(clazz, mid, jPath, jUrl, jNodeKind, jRevision,
                                jLastChangedRevision, jLastChangedDate,
-                               jLastCommitAuthor, jTextType, jPropType,
-                               jRepositoryTextType, jRepositoryPropType,
-                               jIsLocked, jIsCopied, jIsConflicted,
+                               jLastCommitAuthor,
+                               jNodeType, jTextType, jPropType,
+                               jRpNodeType, jRpTextType, jRpPropType,
+                               jIsLocked, jIsCopied, jDepth, jIsConflicted,
                                jIsSwitched, jIsFileExternal, jLocalLock,
                                jReposLock,
                                jOODLastCmtRevision, jOODLastCmtDate,

Modified: subversion/branches/fsfs-lock-many/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Status.java
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Status.java?rev=1576824&r1=1576823&r2=1576824&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Status.java (original)
+++ subversion/branches/fsfs-lock-many/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Status.java Wed Mar 12 17:18:20 2014
@@ -38,7 +38,7 @@ public class Status implements java.io.S
     // Update the serialVersionUID when there is a incompatible change made to
     // this class.  See the java documentation for when a change is incompatible.
     // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
-    private static final long serialVersionUID = 2L;
+    private static final long serialVersionUID = 3L;
 
     /**
      * the url for accessing the item
@@ -77,12 +77,19 @@ public class Status implements java.io.S
     private String lastCommitAuthor;
 
     /**
-     * the file or directory status (See StatusKind)
+     * The status of the node, based on restructuring changes; if the node
+     * has no restructuring changes, it's based on textStatus and propStatus.
+     * @since 1.9
+     */
+    private Kind nodeStatus;
+
+    /**
+     * The file or directory status, not including restructuring changes.
      */
     private Kind textStatus;
 
     /**
-     * the status of the properties (See StatusKind)
+     * The status of the properties.
      */
     private Kind propStatus;
 
@@ -108,11 +115,24 @@ public class Status implements java.io.S
     private boolean fileExternal;
 
     /**
+     * The depth of the node as recorded in the working copy.
+     * @since 1.9
+     */
+    private Depth depth;
+
+    /**
      * is this item in a conflicted state
      */
     private boolean isConflicted;
 
     /**
+     * The status of the node, based on text and property status, unless the
+     * node has restructuring changes.
+     * @since 1.9
+     */
+    private Kind repositoryNodeStatus;
+
+    /**
      * the file or directory status of base (See StatusKind)
      */
     private Kind repositoryTextStatus;
@@ -164,7 +184,6 @@ public class Status implements java.io.S
     private String movedFromAbspath;
 
     private String movedToAbspath;
-
     /**
      * this constructor should only called from JNI code
      * @param path                  the file system path of item
@@ -174,22 +193,17 @@ public class Status implements java.io.S
      * @param lastChangedRevision   the last revision this item was changed
      * @param lastChangedDate       the last date this item was changed
      * @param lastCommitAuthor      the author of the last change
-     * @param textStatus            the file or directory status (See
-     *                              StatusKind)
-     * @param propStatus            the property status (See StatusKind)
-     * @param repositoryTextStatus  the file or directory status of the base
+     * @param nodeStatus            the status of the node
+     * @param textStatus            the file or directory contents status
+     * @param propStatus            the property status
+     * @param repositoryNodeStatus  the status of the base node
+     * @param repositoryTextStatus  the file or directory contents status of the base
      * @param repositoryPropStatus  the property status of the base
      * @param locked                if the item is locked (running or aborted
      *                              operation)
      * @param copied                if the item is copy
+     * @param depth                 the inherent depth of the node in the working copy
      * @param isConflicted          if the item is part of a conflict
-     * @param conflictDescriptor    the description of the tree conflict
-     * @param conflictOld           in case of conflict, the file name of the
-     *                              the common base version
-     * @param conflictNew           in case of conflict, the file name of new
-     *                              repository version
-     * @param conflictWorking       in case of conflict, the file name of the
-     *                              former working copy version
      * @param switched              flag if the node has been switched in the
      *                              path
      * @param fileExternal          flag if the node is a file external
@@ -205,12 +219,16 @@ public class Status implements java.io.S
      * @param changelist            the changelist the item is a member of
      * @param movedFromAbspath      path moved from
      * @param movedToAbspath        path moved from
+     * @since 1.9
      */
     public Status(String path, String url, NodeKind nodeKind, long revision,
                   long lastChangedRevision, long lastChangedDate,
-                  String lastCommitAuthor, Kind textStatus, Kind propStatus,
+                  String lastCommitAuthor,
+                  Kind nodeStatus, Kind textStatus, Kind propStatus,
+                  Kind repositoryNodeStatus,
                   Kind repositoryTextStatus, Kind repositoryPropStatus,
-                  boolean locked, boolean copied, boolean isConflicted,
+                  boolean locked, boolean copied, Depth depth,
+                  boolean isConflicted,
                   boolean switched, boolean fileExternal, Lock localLock,
                   Lock reposLock, long reposLastCmtRevision,
                   long reposLastCmtDate, NodeKind reposKind,
@@ -224,13 +242,16 @@ public class Status implements java.io.S
         this.lastChangedRevision = lastChangedRevision;
         this.lastChangedDate = lastChangedDate;
         this.lastCommitAuthor = lastCommitAuthor;
+        this.nodeStatus = nodeStatus;
         this.textStatus = textStatus;
         this.propStatus = propStatus;
+        this.repositoryNodeStatus = repositoryNodeStatus;
+        this.repositoryTextStatus = repositoryTextStatus;
+        this.repositoryPropStatus = repositoryPropStatus;
         this.locked = locked;
         this.copied = copied;
+        this.depth = depth;
         this.isConflicted = isConflicted;
-        this.repositoryTextStatus = repositoryTextStatus;
-        this.repositoryPropStatus = repositoryPropStatus;
         this.switched = switched;
         this.fileExternal = fileExternal;
         this.localLock = localLock;
@@ -245,6 +266,64 @@ public class Status implements java.io.S
     }
 
     /**
+     * this constructor should only called from JNI code
+     * @param path                  the file system path of item
+     * @param url                   the url of the item
+     * @param nodeKind              kind of item (directory, file or unknown
+     * @param revision              the revision number of the base
+     * @param lastChangedRevision   the last revision this item was changed
+     * @param lastChangedDate       the last date this item was changed
+     * @param lastCommitAuthor      the author of the last change
+     * @param textStatus            the file or directory status (See
+     *                              StatusKind)
+     * @param propStatus            the property status (See StatusKind)
+     * @param repositoryTextStatus  the file or directory status of the base
+     * @param repositoryPropStatus  the property status of the base
+     * @param locked                if the item is locked (running or aborted
+     *                              operation)
+     * @param copied                if the item is copy
+     * @param isConflicted          if the item is part of a conflict
+     * @param switched              flag if the node has been switched in the
+     *                              path
+     * @param fileExternal          flag if the node is a file external
+     * @param localLock             the current lock
+     * @param reposLock             the lock as stored in the repository if
+     *                              any
+     * @param reposLastCmtRevision  the youngest revision, if out of date
+     * @param reposLastCmtDate      the last commit date, if out of date
+     * @param reposKind             the kind of the youngest revision, if
+     *                              out of date
+     * @param reposLastCmtAuthor    the author of the last commit, if out of
+     *                              date
+     * @param changelist            the changelist the item is a member of
+     * @param movedFromAbspath      path moved from
+     * @param movedToAbspath        path moved from
+     * @deprecated
+     */
+    @Deprecated
+    public Status(String path, String url, NodeKind nodeKind, long revision,
+                  long lastChangedRevision, long lastChangedDate,
+                  String lastCommitAuthor, Kind textStatus, Kind propStatus,
+                  Kind repositoryTextStatus, Kind repositoryPropStatus,
+                  boolean locked, boolean copied, boolean isConflicted,
+                  boolean switched, boolean fileExternal, Lock localLock,
+                  Lock reposLock, long reposLastCmtRevision,
+                  long reposLastCmtDate, NodeKind reposKind,
+                  String reposLastCmtAuthor, String changelist,
+                  String movedFromAbspath, String movedToAbspath)
+    {
+        this(path, url, nodeKind, revision,
+             lastChangedRevision, lastChangedDate, lastCommitAuthor,
+             Kind.none, textStatus, propStatus,
+             Kind.none, repositoryTextStatus, repositoryPropStatus,
+             locked, copied, Depth.unknown, isConflicted,
+             switched, fileExternal, localLock, reposLock,
+             reposLastCmtRevision, reposLastCmtDate, reposKind,
+             reposLastCmtAuthor, changelist,
+             movedFromAbspath, movedToAbspath);
+    }
+
+    /**
      * Returns the file system path of the item
      * @return path of status entry
      */
@@ -301,25 +380,64 @@ public class Status implements java.io.S
     }
 
     /**
-     * Returns the status of the item (See StatusKind)
+     * Returns the status of the node.
+     * @since 1.9
+     */
+    public Kind getNodeStatus()
+    {
+        return nodeStatus;
+    }
+
+    /**
+     * Returns the status of the node as text.
+     * @since 1.9
+     */
+    public String getNodeStatusDescription()
+    {
+        return nodeStatus.toString();
+    }
+
+    /**
+     * Returns the real status of the item's contents.
+     * @since 1.9
+     */
+    public Kind getRawTextStatus()
+    {
+        return textStatus;
+    }
+
+    /**
+     * Returns the real status of the item's contents as a string.
+     * @since 1.9
+     */
+    public String getRawTextStatusDescription()
+    {
+        return textStatus.toString();
+    }
+
+    /**
+     * Returns the adjusted status of the item's contents, as
+     * compatible with JavaHL 1.8 and older verions.
      * @return file status property enum of the "textual" component.
      */
     public Kind getTextStatus()
     {
-        return textStatus;
+        if (nodeStatus == Kind.modified || nodeStatus == Kind.conflicted)
+            return textStatus;
+        return nodeStatus;
     }
 
     /**
-     * Returns the status of the item as text.
+     * Returns the adjusted status of the item's contents as text.
      * @return english text
      */
     public String getTextStatusDescription()
     {
-        return textStatus.toString();
+        return getTextStatus().toString();
     }
 
     /**
-     * Returns the status of the properties (See Status Kind)
+     * Returns the status of the properties.
      * @return file status property enum of the "property" component.
      */
     public Kind getPropStatus()
@@ -337,17 +455,39 @@ public class Status implements java.io.S
     }
 
     /**
-     * Returns the status of the item in the repository (See StatusKind)
+     * Returns the status of the node in the repository.
+     * @since 1.9
+     */
+    public Kind getRepositoryNodeStatus()
+    {
+        return repositoryNodeStatus;
+    }
+
+    /**
+     * Returns the real status of the item's contents in the repository.
+     * @since 1.9
+     */
+    public Kind getRawRepositoryTextStatus()
+    {
+        return repositoryTextStatus;
+    }
+
+    /**
+     * Returns the adjusted status of the item's contents in the
+     * repository, as compatible with JavaHL 1.8 and older verions.
      * @return file status property enum of the "textual" component in the
      * repository.
      */
     public Kind getRepositoryTextStatus()
     {
-        return repositoryTextStatus;
+        if (repositoryNodeStatus == Kind.modified
+            || repositoryNodeStatus == Kind.conflicted)
+            return repositoryTextStatus;
+        return repositoryNodeStatus;
     }
 
     /**
-     * Returns test status of the properties in the repository (See StatusKind)
+     * Returns test status of the properties in the repository.
      * @return file status property enum of the "property" component im the
      * repository.
      */
@@ -440,7 +580,7 @@ public class Status implements java.io.S
      */
     public boolean isManaged()
     {
-        Kind status = getTextStatus();
+        Kind status = getNodeStatus();
         return (status != Status.Kind.unversioned &&
                 status != Status.Kind.none &&
                 status != Status.Kind.ignored);
@@ -452,7 +592,7 @@ public class Status implements java.io.S
      */
     public boolean hasRemote()
     {
-        return (isManaged() && getTextStatus() != Status.Kind.added);
+        return (isManaged() && !isAdded());
     }
 
     /**
@@ -461,7 +601,7 @@ public class Status implements java.io.S
      */
     public boolean isAdded()
     {
-        return getTextStatus() == Status.Kind.added;
+        return getNodeStatus() == Status.Kind.added;
     }
 
     /**
@@ -470,7 +610,7 @@ public class Status implements java.io.S
      */
     public boolean isDeleted()
     {
-        return getTextStatus() == Status.Kind.deleted;
+        return getNodeStatus() == Status.Kind.deleted;
     }
 
     /**
@@ -479,7 +619,7 @@ public class Status implements java.io.S
      */
     public boolean isMerged()
     {
-        return getTextStatus() == Status.Kind.merged;
+        return getNodeStatus() == Status.Kind.merged;
     }
 
     /**
@@ -489,7 +629,7 @@ public class Status implements java.io.S
      */
     public boolean isIgnored()
     {
-        return getTextStatus() == Status.Kind.ignored;
+        return getNodeStatus() == Status.Kind.ignored;
     }
 
     /**
@@ -601,6 +741,15 @@ public class Status implements java.io.S
     }
 
     /**
+     * Returns the inherent depth of the node, as recorded in the working copy.
+     * @since 1.9
+     */
+    public Depth getDepth()
+    {
+        return depth;
+    }
+
+    /**
      * Converts microseconds since the epoch to a Date object.
      *
      * @param micros Microseconds since the epoch.

Modified: subversion/branches/fsfs-lock-many/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java?rev=1576824&r1=1576823&r2=1576824&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java (original)
+++ subversion/branches/fsfs-lock-many/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java Wed Mar 12 17:18:20 2014
@@ -315,8 +315,16 @@ public class BasicTests extends SVNTests
         MyStatusCallback statusCallback = new MyStatusCallback();
         client.status(fileToSVNPath(fileC, false), Depth.unknown, false, true,
                     false, false, null, statusCallback);
-        if (statusCallback.getStatusArray().length > 0)
-            fail("File foo.c should not return a status.");
+        if (statusCallback.getStatusArray().length > 1)
+            fail("File foo.c should not return more than one status.");
+        if (statusCallback.getStatusArray().length == 1)
+        {
+            Status st = statusCallback.getStatusArray()[0];
+            if (st.isConflicted()
+                || st.getNodeStatus() != Status.Kind.none
+                || st.getRepositoryNodeStatus() != Status.Kind.none)
+                fail("File foo.c should not return a status.");
+        }
 
     }
 

Modified: subversion/branches/fsfs-lock-many/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java?rev=1576824&r1=1576823&r2=1576824&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java (original)
+++ subversion/branches/fsfs-lock-many/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java Wed Mar 12 17:18:20 2014
@@ -213,7 +213,16 @@ public class BasicTests extends SVNTests
 
         Status s = client.singleStatus(fileToSVNPath(fileC, false), false);
         if (s != null)
-            fail("File foo.c should not return a status.");
+        {
+            if (s.hasTreeConflict()
+                || s.getTextStatus() != Status.Kind.none
+                || s.getPropStatus() != Status.Kind.none
+                || s.getRepositoryTextStatus() != Status.Kind.none
+                || s.getRepositoryPropStatus() != Status.Kind.none)
+            {
+                fail("File foo.c should not return a status.");
+            }
+        }
 
     }
 

Modified: subversion/branches/fsfs-lock-many/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c?rev=1576824&r1=1576823&r2=1576824&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c (original)
+++ subversion/branches/fsfs-lock-many/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c Wed Mar 12 17:18:20 2014
@@ -41,11 +41,11 @@
 #include <io.h>
 #endif
 
-#include "svn_private_config.h"
 #include "svn_hash.h"
 #include "svn_pools.h"
 #include "svn_opt.h"
 #include "svn_time.h"
+#include "svn_private_config.h"
 
 #include "swig_perl_external_runtime.swg"
 

Modified: subversion/branches/fsfs-lock-many/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c?rev=1576824&r1=1576823&r2=1576824&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c (original)
+++ subversion/branches/fsfs-lock-many/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c Wed Mar 12 17:18:20 2014
@@ -35,7 +35,6 @@
 #include <apr_portable.h>
 #include <apr_thread_proc.h>
 
-#include "svn_private_config.h"
 #include "svn_hash.h"
 #include "svn_client.h"
 #include "svn_string.h"
@@ -47,6 +46,8 @@
 #include "svn_mergeinfo.h"
 #include "svn_types.h"
 
+#include "svn_private_config.h" /* for SVN_APR_INT64_T_PYCFMT */
+
 #include "swig_python_external_runtime.swg"
 #include "swigutil_py.h"
 

Modified: subversion/branches/fsfs-lock-many/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c?rev=1576824&r1=1576823&r2=1576824&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c (original)
+++ subversion/branches/fsfs-lock-many/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c Wed Mar 12 17:18:20 2014
@@ -60,7 +60,6 @@
 #include <locale.h>
 #include <math.h>
 
-#include "svn_private_config.h"
 #include "svn_hash.h"
 #include "svn_nls.h"
 #include "svn_pools.h"

Modified: subversion/branches/fsfs-lock-many/subversion/include/private/svn_cache.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/include/private/svn_cache.h?rev=1576824&r1=1576823&r2=1576824&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/include/private/svn_cache.h (original)
+++ subversion/branches/fsfs-lock-many/subversion/include/private/svn_cache.h Wed Mar 12 17:18:20 2014
@@ -317,14 +317,14 @@ svn_cache__membuffer_cache_create(svn_me
 
 /**
  * Data in this priority class has a good chance to remain in cache unless
- * there is more data in this class than the cache's capcity.  Use of this
+ * there is more data in this class than the cache's capacity.  Use of this
  * as the default for all information that is costly to fetch from disk.
  */
 #define SVN_CACHE__MEMBUFFER_DEFAULT_PRIORITY 1000
 
 /**
  * Data in this priority class will be removed as soon as the cache starts
- * filling up.  Use of this for ephemeral data that can easisly be acquired
+ * filling up.  Use of this for ephemeral data that can easily be acquired
  * again from other sources.
  */
 #define SVN_CACHE__MEMBUFFER_LOW_PRIORITY      100

Modified: subversion/branches/fsfs-lock-many/subversion/include/private/svn_delta_private.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/include/private/svn_delta_private.h?rev=1576824&r1=1576823&r2=1576824&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/include/private/svn_delta_private.h (original)
+++ subversion/branches/fsfs-lock-many/subversion/include/private/svn_delta_private.h Wed Mar 12 17:18:20 2014
@@ -101,16 +101,6 @@ svn_delta__delta_from_editor(const svn_d
                              struct svn_delta__extra_baton *exb,
                              apr_pool_t *pool);
 
-/**
- * Similar to #svn_txdelta_read_svndiff_window but only returns the window
- * header information, i.e. does not decode the window contents.
- */
-svn_error_t *
-svn_txdelta__read_svndiff_window_sizes(svn_txdelta_window_t **window,
-                                       svn_stream_t *stream,
-                                       int svndiff_version,
-                                       apr_pool_t *pool);
-
 
 #ifdef __cplusplus
 }

Modified: subversion/branches/fsfs-lock-many/subversion/include/private/svn_wc_private.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/include/private/svn_wc_private.h?rev=1576824&r1=1576823&r2=1576824&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/include/private/svn_wc_private.h (original)
+++ subversion/branches/fsfs-lock-many/subversion/include/private/svn_wc_private.h Wed Mar 12 17:18:20 2014
@@ -773,20 +773,6 @@ svn_wc__call_with_write_lock(svn_wc__wit
   } while (0)
 
 
-/**
- * Calculates the schedule and copied status of a node as that would
- * have been stored in an svn_wc_entry_t instance.
- *
- * If not @c NULL, @a schedule and @a copied are set to their calculated
- * values.
- */
-svn_error_t *
-svn_wc__node_get_schedule(svn_wc_schedule_t *schedule,
-                          svn_boolean_t *copied,
-                          svn_wc_context_t *wc_ctx,
-                          const char *local_abspath,
-                          apr_pool_t *scratch_pool);
-
 /** A callback invoked by svn_wc__prop_list_recursive().
  * It is equivalent to svn_proplist_receiver_t declared in svn_client.h,
  * but kept private within the svn_wc__ namespace because it is used within

Modified: subversion/branches/fsfs-lock-many/subversion/include/svn_config.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/include/svn_config.h?rev=1576824&r1=1576823&r2=1576824&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/include/svn_config.h (original)
+++ subversion/branches/fsfs-lock-many/subversion/include/svn_config.h Wed Mar 12 17:18:20 2014
@@ -676,9 +676,9 @@ svn_config_ensure(const char *config_dir
  *
  * The values of these keys are C strings.
  *
- * @since New in 1.9.
- * @note These hash keys were also used in versions < 1.9 but were
- *       not part of the public API (except #SVN_CONFIG_REALMSTRING_KEY).
+ * @note Some of these hash keys were also used in versions < 1.9 but were
+ *       not part of the public API (except #SVN_CONFIG_REALMSTRING_KEY which
+ *       has been present since 1.0).
  *
  * @defgroup cached_authentication_data_attributes
  * @{
@@ -698,22 +698,26 @@ svn_config_ensure(const char *config_dir
 /** A hash-key for passwords.
  * The password may be in plaintext or encrypted form, depending on
  * the authentication provider.
+ * @since New in 1.9.
  */
 #define SVN_CONFIG_AUTHN_PASSWORD_KEY           "password"
 
 /** A hash-key for passphrases,
  * such as SSL client ceritifcate passphrases. The passphrase may be in
  * plaintext or encrypted form, depending on the authentication provider.
+ * @since New in 1.9.
  */
 #define SVN_CONFIG_AUTHN_PASSPHRASE_KEY         "passphrase"
 
 /** A hash-key for the type of a password or passphrase.  The type
  * indicates which provider owns the credential.
+ * @since New in 1.9.
  */
 #define SVN_CONFIG_AUTHN_PASSTYPE_KEY           "passtype"
 
 /** A hash-key for SSL certificates.   The value is the base64-encoded DER form
  * certificate.
+ * @since New in 1.9.
  * @note The value is not human readable.
  */
 #define SVN_CONFIG_AUTHN_ASCII_CERT_KEY         "ascii_cert"
@@ -721,9 +725,36 @@ svn_config_ensure(const char *config_dir
 /** A hash-key for recorded SSL certificate verification
  * failures.  Failures encoded as an ASCII integer containing any of the
  * SVN_AUTH_SSL_* SSL server certificate failure bits defined in svn_auth.h.
+ * @since New in 1.9.
  */
 #define SVN_CONFIG_AUTHN_FAILURES_KEY           "failures"
 
+/** A hash-key for a hostname, such as hostnames in SSL certificates.
+ * @since New in 1.9.
+ */
+#define SVN_CONFIG_AUTHN_HOSTNAME_KEY           "hostname"
+
+/** A hash-key for a fingerprint, such as fingerprints in SSL certificates.
+ * @since New in 1.9.
+ */
+#define SVN_CONFIG_AUTHN_FINGERPRINT_KEY        "fingerprint"
+
+/** A hash-key for a valid-from date, such as dates in SSL certificates.
+ * @since New in 1.9.
+ */
+#define SVN_CONFIG_AUTHN_VALID_FROM_KEY         "valid_from"
+
+/** A hash-key for a valid-to date, such as dates in SSL certificates.
+ * @since New in 1.9.
+ */
+#define SVN_CONFIG_AUTHN_VALID_UNTIL_KEY        "valid_until"
+
+/** A hash-key for an issuer distinguished name, such as issuer names
+ * in SSL certificates.
+ * @since New in 1.9.
+ */
+#define SVN_CONFIG_AUTHN_ISSUER_DN_KEY        "issuer_dn"
+
 /** @} */
 
 /** Use @a cred_kind and @a realmstring to locate a file within the

Modified: subversion/branches/fsfs-lock-many/subversion/include/svn_delta.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/include/svn_delta.h?rev=1576824&r1=1576823&r2=1576824&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/include/svn_delta.h (original)
+++ subversion/branches/fsfs-lock-many/subversion/include/svn_delta.h Wed Mar 12 17:18:20 2014
@@ -545,10 +545,26 @@ svn_txdelta_to_svndiff(svn_stream_t *out
 
 /** Return a writable generic stream which will parse svndiff-format
  * data into a text delta, invoking @a handler with @a handler_baton
- * whenever a new window is ready.  If @a error_on_early_close is @c
- * TRUE, attempting to close this stream before it has handled the entire
- * svndiff data set will result in #SVN_ERR_SVNDIFF_UNEXPECTED_END,
- * else this error condition will be ignored.
+ * whenever a new window is ready.
+ *
+ * When the caller closes this stream, this will signal completion to
+ * the window handler by invoking @a handler once more, passing zero for
+ * the @c window argument.
+ *
+ * If @a error_on_early_close is @c TRUE, then attempt to avoid
+ * signaling completion to the window handler if the delta was
+ * incomplete. Specifically, attempting to close the stream will be
+ * successful only if the data written to the stream consisted of one or
+ * more complete windows of svndiff data and no extra bytes. Otherwise,
+ * closing the stream will not signal completion to the window handler,
+ * and will return a #SVN_ERR_SVNDIFF_UNEXPECTED_END error. Note that if
+ * no data at all was written, the delta is considered incomplete.
+ *
+ * If @a error_on_early_close is @c FALSE, closing the stream will
+ * signal completion to the window handler, regardless of how much data
+ * was written, and discard any pending incomplete data.
+ *
+ * Allocate the stream in @a pool.
  */
 svn_stream_t *
 svn_txdelta_parse_svndiff(svn_txdelta_window_handler_t handler,

Modified: subversion/branches/fsfs-lock-many/subversion/include/svn_fs.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/include/svn_fs.h?rev=1576824&r1=1576823&r2=1576824&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/include/svn_fs.h (original)
+++ subversion/branches/fsfs-lock-many/subversion/include/svn_fs.h Wed Mar 12 17:18:20 2014
@@ -364,7 +364,7 @@ svn_fs_upgrade(const char *path,
 /**
  * Callback function type for progress notification.
  *
- * @a revision is the number of the revision currently begin processed,
+ * @a revision is the number of the revision currently being processed,
  * #SVN_INVALID_REVNUM if the current stage is not linked to any specific
  * revision. @a baton is the callback baton.
  *
@@ -798,19 +798,23 @@ svn_fs_access_add_lock_token(svn_fs_acce
 typedef enum svn_fs_node_relation_t
 {
   /** The nodes are not related.
-   * Nodes from different repositories are always unrelated. */
+   * Nodes from different repositories are always unrelated.
+   * #svn_fs_compare_ids would return the value -1 in this case.
+   */
   svn_fs_node_unrelated = 0,
 
-  /** They are the same physical node, i.e. there is no intermittent change.
-   * However, due to lazy copying, they may be intermittent parent copies.
+  /** They are the same physical node, i.e. there is no intervening change.
+   * However, due to lazy copying, there may be part of different parent
+   * copies.  #svn_fs_compare_ids would return the value 0 in this case.
    */
   svn_fs_node_same,
 
   /** The nodes have a common ancestor (which may be one of these nodes)
    * but are not the same.
+   * #svn_fs_compare_ids would return the value 1 in this case.
    */
-  svn_fs_node_common_anchestor
-  
+  svn_fs_node_common_ancestor
+
 } svn_fs_node_relation_t;
 
 /** An object representing a node-revision id.  */
@@ -819,6 +823,10 @@ typedef struct svn_fs_id_t svn_fs_id_t;
 
 /** Return -1, 0, or 1 if node revisions @a a and @a b are respectively
  * unrelated, equivalent, or otherwise related (part of the same node).
+ *
+ * @note Using FS ID based functions is now discouraged and may be fully
+ * deprecated in future releases.  New code should use #svn_fs_node_relation()
+ * and #svn_fs_node_relation_t instead.
  */
 int
 svn_fs_compare_ids(const svn_fs_id_t *a,
@@ -828,6 +836,10 @@ svn_fs_compare_ids(const svn_fs_id_t *a,
 
 /** Return TRUE if node revisions @a id1 and @a id2 are related (part of the
  * same node), else return FALSE.
+ *
+ * @note Using FS ID based functions is now discouraged and may be fully
+ * deprecated in future releases.  New code should use #svn_fs_node_relation()
+ * and #svn_fs_node_relation_t instead.
  */
 svn_boolean_t
 svn_fs_check_related(const svn_fs_id_t *id1,
@@ -1573,9 +1585,9 @@ svn_fs_node_id(const svn_fs_id_t **id_p,
  * arbitrary revision order and any of them may pertain to a transaction.
  * @a pool is used for temporary allocations.
  *
- * @note The current implementation considers paths from different svn_fs_t
- * as unrelated even if the underlying physical repository is the same.
- * 
+ * @note Paths from different svn_fs_t will be reported as unrelated even
+ * if the underlying physical repository is the same.
+ *
  * @since New in 1.9.
  */
 svn_error_t *
@@ -2243,11 +2255,8 @@ svn_fs_apply_textdelta(svn_txdelta_windo
  *
  * Do any necessary temporary allocation in @a pool.
  *
- * ### This is like svn_fs_apply_textdelta(), but takes the text
- * straight.  It is currently used only by the loader, see
- * libsvn_repos/load.c.  It should accept a checksum, of course, which
- * would come from an (optional) header in the dump file.  See
- * http://subversion.tigris.org/issues/show_bug.cgi?id=1102 for more.
+ * @note This is like svn_fs_apply_textdelta(), but takes the text
+ * straight.
  */
 svn_error_t *
 svn_fs_apply_text(svn_stream_t **contents_p,
@@ -2475,12 +2484,6 @@ svn_fs_set_uuid(svn_fs_t *fs,
                 apr_pool_t *pool);
 
 
-/* Non-historical properties.  */
-
-/* [[Yes, do tell.]] */
-
-
-
 /** @defgroup svn_fs_locks Filesystem locks
  * @{
  * @since New in 1.2. */



Mime
View raw message