subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@apache.org
Subject svn commit: r1545955 [1/15] - in /subversion/branches/fsfs-improvements: ./ build/ build/ac-macros/ build/generator/ build/generator/templates/ build/win32/ contrib/server-side/ contrib/server-side/svncutter/ notes/ subversion/bindings/javahl/native/ s...
Date Wed, 27 Nov 2013 07:53:35 GMT
Author: stefan2
Date: Wed Nov 27 07:53:29 2013
New Revision: 1545955

URL: http://svn.apache.org/r1545955
Log:
On the fsfs-improvements branch: sync with /trunk.
There were no conficts.

Added:
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/native/EditorCallbacks.cpp
      - copied unchanged from r1545954, subversion/trunk/subversion/bindings/javahl/native/EditorCallbacks.cpp
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/native/EditorCallbacks.hpp
      - copied unchanged from r1545954, subversion/trunk/subversion/bindings/javahl/native/EditorCallbacks.hpp
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/native/ExternalItem.cpp
      - copied unchanged from r1545954, subversion/trunk/subversion/bindings/javahl/native/ExternalItem.cpp
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/native/ExternalItem.hpp
      - copied unchanged from r1545954, subversion/trunk/subversion/bindings/javahl/native/ExternalItem.hpp
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/native/NativeStream.cpp
      - copied unchanged from r1545954, subversion/trunk/subversion/bindings/javahl/native/NativeStream.cpp
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/native/NativeStream.hpp
      - copied unchanged from r1545954, subversion/trunk/subversion/bindings/javahl/native/NativeStream.hpp
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/native/SubversionException.cpp
      - copied unchanged from r1545954, subversion/trunk/subversion/bindings/javahl/native/SubversionException.cpp
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/native/SubversionException.hpp
      - copied unchanged from r1545954, subversion/trunk/subversion/bindings/javahl/native/SubversionException.hpp
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/native/Utility.cpp
      - copied unchanged from r1545954, subversion/trunk/subversion/bindings/javahl/native/Utility.cpp
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/native/Utility.hpp
      - copied unchanged from r1545954, subversion/trunk/subversion/bindings/javahl/native/Utility.hpp
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/native/jniwrapper/
      - copied from r1545954, subversion/trunk/subversion/bindings/javahl/native/jniwrapper/
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_RuntimeVersion.cpp
      - copied unchanged from r1545954, subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_RuntimeVersion.cpp
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_PropLib.cpp
      - copied unchanged from r1545954, subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_PropLib.cpp
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_SubstLib.cpp
      - copied unchanged from r1545954, subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_SubstLib.cpp
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/ExternalItem.java
      - copied unchanged from r1545954, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/ExternalItem.java
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/NativeInputStream.java
      - copied unchanged from r1545954, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/NativeInputStream.java
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/NativeOutputStream.java
      - copied unchanged from r1545954, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/NativeOutputStream.java
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/RuntimeVersion.java
      - copied unchanged from r1545954, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/RuntimeVersion.java
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/PropLib.java
      - copied unchanged from r1545954, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/PropLib.java
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/SubstLib.java
      - copied unchanged from r1545954, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/SubstLib.java
    subversion/branches/fsfs-improvements/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl__pre_perl.h
      - copied unchanged from r1545954, subversion/trunk/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl__pre_perl.h
    subversion/branches/fsfs-improvements/subversion/include/private/svn_object_pool.h
      - copied unchanged from r1545954, subversion/trunk/subversion/include/private/svn_object_pool.h
    subversion/branches/fsfs-improvements/subversion/libsvn_repos/authz_pool.c
      - copied unchanged from r1545954, subversion/trunk/subversion/libsvn_repos/authz_pool.c
    subversion/branches/fsfs-improvements/subversion/libsvn_repos/repos_pool.c
      - copied unchanged from r1545954, subversion/trunk/subversion/libsvn_repos/repos_pool.c
    subversion/branches/fsfs-improvements/subversion/libsvn_subr/object_pool.c
      - copied unchanged from r1545954, subversion/trunk/subversion/libsvn_subr/object_pool.c
    subversion/branches/fsfs-improvements/subversion/tests/cmdline/svnadmin_tests_data/normalization_check.dump
      - copied unchanged from r1545954, subversion/trunk/subversion/tests/cmdline/svnadmin_tests_data/normalization_check.dump
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_subr/zlib.deflated
      - copied unchanged from r1545954, subversion/trunk/subversion/tests/libsvn_subr/zlib.deflated
    subversion/branches/fsfs-improvements/tools/buildbot/slaves/win32-SharpSvn/svntest-javahl.cmd
      - copied unchanged from r1545954, subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-javahl.cmd
Modified:
    subversion/branches/fsfs-improvements/   (props changed)
    subversion/branches/fsfs-improvements/CHANGES
    subversion/branches/fsfs-improvements/Makefile.in
    subversion/branches/fsfs-improvements/NOTICE
    subversion/branches/fsfs-improvements/build.conf
    subversion/branches/fsfs-improvements/build/ac-macros/apache.m4
    subversion/branches/fsfs-improvements/build/ac-macros/java.m4
    subversion/branches/fsfs-improvements/build/ac-macros/kwallet.m4
    subversion/branches/fsfs-improvements/build/generator/gen_base.py
    subversion/branches/fsfs-improvements/build/generator/gen_win.py
    subversion/branches/fsfs-improvements/build/generator/gen_win_dependencies.py
    subversion/branches/fsfs-improvements/build/generator/templates/vcnet_vcproj.ezt
    subversion/branches/fsfs-improvements/build/generator/templates/vcnet_vcxproj.ezt
    subversion/branches/fsfs-improvements/build/run_tests.py
    subversion/branches/fsfs-improvements/build/transform_sql.py
    subversion/branches/fsfs-improvements/build/win32/svn.rc
    subversion/branches/fsfs-improvements/configure.ac
    subversion/branches/fsfs-improvements/contrib/server-side/fsfsverify.py
    subversion/branches/fsfs-improvements/contrib/server-side/svncutter/svncutter
    subversion/branches/fsfs-improvements/notes/knobs
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/native/CommitEditor.cpp
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/native/CommitEditor.h
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/native/CreateJ.cpp
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/native/GlobalConfig.h
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/native/JNIUtil.cpp
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/native/JNIUtil.h
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/native/OperationContext.cpp
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/native/OperationContext.h
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/native/PropertyTable.cpp
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/native/PropertyTable.h
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/native/RemoteSession.cpp
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/native/RemoteSession.h
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/native/RemoteSessionContext.cpp
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/native/RemoteSessionContext.h
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/native/Revision.h
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/native/SVNClient.cpp
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_CommitEditor.cpp
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_RemoteFactory.cpp
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigLib.cpp
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_TunnelChannel.cpp
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientException.java
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitInfo.java
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItem.java
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/DiffSummary.java
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNConfig.java
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNEditor.java
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRemote.java
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/JNIError.java
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeException.java
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/ProgressEvent.java
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/ReposNotifyInformation.java
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNUtil.java
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/SubversionException.java
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/CommitEditor.java
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/RemoteFactory.java
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/RemoteSession.java
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/ChangePath.java
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Checksum.java
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/CopySource.java
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/DirEntry.java
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Info.java
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Lock.java
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Mergeinfo.java
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Revision.java
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/RevisionRange.java
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Status.java
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/ConfigLib.java
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/DiffLib.java
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/tests/org/apache/subversion/javahl/UtilTests.java
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java
    subversion/branches/fsfs-improvements/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
    subversion/branches/fsfs-improvements/subversion/bindings/swig/core.i
    subversion/branches/fsfs-improvements/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c
    subversion/branches/fsfs-improvements/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h
    subversion/branches/fsfs-improvements/subversion/include/private/svn_diff_tree.h
    subversion/branches/fsfs-improvements/subversion/include/private/svn_ra_svn_private.h
    subversion/branches/fsfs-improvements/subversion/include/private/svn_repos_private.h
    subversion/branches/fsfs-improvements/subversion/include/private/svn_sqlite.h
    subversion/branches/fsfs-improvements/subversion/include/private/svn_subr_private.h
    subversion/branches/fsfs-improvements/subversion/include/private/svn_utf_private.h
    subversion/branches/fsfs-improvements/subversion/include/svn_auth.h
    subversion/branches/fsfs-improvements/subversion/include/svn_client.h
    subversion/branches/fsfs-improvements/subversion/include/svn_config.h
    subversion/branches/fsfs-improvements/subversion/include/svn_dirent_uri.h
    subversion/branches/fsfs-improvements/subversion/include/svn_error.h
    subversion/branches/fsfs-improvements/subversion/include/svn_path.h
    subversion/branches/fsfs-improvements/subversion/include/svn_repos.h
    subversion/branches/fsfs-improvements/subversion/include/svn_types.h
    subversion/branches/fsfs-improvements/subversion/include/svn_xml.h
    subversion/branches/fsfs-improvements/subversion/libsvn_client/cat.c
    subversion/branches/fsfs-improvements/subversion/libsvn_client/deprecated.c
    subversion/branches/fsfs-improvements/subversion/libsvn_client/iprops.c
    subversion/branches/fsfs-improvements/subversion/libsvn_client/merge.c
    subversion/branches/fsfs-improvements/subversion/libsvn_client/update.c
    subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/caching.c
    subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/hotcopy.c
    subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/lock.c
    subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/low_level.c
    subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/transaction.c
    subversion/branches/fsfs-improvements/subversion/libsvn_fs_x/   (props changed)
    subversion/branches/fsfs-improvements/subversion/libsvn_fs_x/caching.c
    subversion/branches/fsfs-improvements/subversion/libsvn_fs_x/changes.c
    subversion/branches/fsfs-improvements/subversion/libsvn_fs_x/fs_x.c
    subversion/branches/fsfs-improvements/subversion/libsvn_fs_x/noderevs.c
    subversion/branches/fsfs-improvements/subversion/libsvn_fs_x/pack.c
    subversion/branches/fsfs-improvements/subversion/libsvn_fs_x/reps.c
    subversion/branches/fsfs-improvements/subversion/libsvn_fs_x/string_table.c
    subversion/branches/fsfs-improvements/subversion/libsvn_fs_x/transaction.c
    subversion/branches/fsfs-improvements/subversion/libsvn_ra_serf/blame.c
    subversion/branches/fsfs-improvements/subversion/libsvn_ra_serf/commit.c
    subversion/branches/fsfs-improvements/subversion/libsvn_ra_serf/get_deleted_rev.c
    subversion/branches/fsfs-improvements/subversion/libsvn_ra_serf/getdate.c
    subversion/branches/fsfs-improvements/subversion/libsvn_ra_serf/getlocations.c
    subversion/branches/fsfs-improvements/subversion/libsvn_ra_serf/getlocationsegments.c
    subversion/branches/fsfs-improvements/subversion/libsvn_ra_serf/getlocks.c
    subversion/branches/fsfs-improvements/subversion/libsvn_ra_serf/inherited_props.c
    subversion/branches/fsfs-improvements/subversion/libsvn_ra_serf/locks.c
    subversion/branches/fsfs-improvements/subversion/libsvn_ra_serf/log.c
    subversion/branches/fsfs-improvements/subversion/libsvn_ra_serf/merge.c
    subversion/branches/fsfs-improvements/subversion/libsvn_ra_serf/mergeinfo.c
    subversion/branches/fsfs-improvements/subversion/libsvn_ra_serf/options.c
    subversion/branches/fsfs-improvements/subversion/libsvn_ra_serf/ra_serf.h
    subversion/branches/fsfs-improvements/subversion/libsvn_ra_serf/replay.c
    subversion/branches/fsfs-improvements/subversion/libsvn_ra_serf/serf.c
    subversion/branches/fsfs-improvements/subversion/libsvn_ra_serf/update.c
    subversion/branches/fsfs-improvements/subversion/libsvn_ra_serf/xml.c
    subversion/branches/fsfs-improvements/subversion/libsvn_ra_svn/marshal.c
    subversion/branches/fsfs-improvements/subversion/libsvn_repos/authz.c
    subversion/branches/fsfs-improvements/subversion/libsvn_repos/config_pool.c
    subversion/branches/fsfs-improvements/subversion/libsvn_repos/deprecated.c
    subversion/branches/fsfs-improvements/subversion/libsvn_repos/dump.c
    subversion/branches/fsfs-improvements/subversion/libsvn_repos/hooks.c
    subversion/branches/fsfs-improvements/subversion/libsvn_repos/repos.c
    subversion/branches/fsfs-improvements/subversion/libsvn_repos/repos.h
    subversion/branches/fsfs-improvements/subversion/libsvn_subr/auth.c
    subversion/branches/fsfs-improvements/subversion/libsvn_subr/auth.h
    subversion/branches/fsfs-improvements/subversion/libsvn_subr/cache-membuffer.c
    subversion/branches/fsfs-improvements/subversion/libsvn_subr/cmdline.c
    subversion/branches/fsfs-improvements/subversion/libsvn_subr/config.c
    subversion/branches/fsfs-improvements/subversion/libsvn_subr/config_file.c
    subversion/branches/fsfs-improvements/subversion/libsvn_subr/config_impl.h
    subversion/branches/fsfs-improvements/subversion/libsvn_subr/deprecated.c
    subversion/branches/fsfs-improvements/subversion/libsvn_subr/dirent_uri.c
    subversion/branches/fsfs-improvements/subversion/libsvn_subr/error.c
    subversion/branches/fsfs-improvements/subversion/libsvn_subr/gpg_agent.c
    subversion/branches/fsfs-improvements/subversion/libsvn_subr/io.c
    subversion/branches/fsfs-improvements/subversion/libsvn_subr/iter.c
    subversion/branches/fsfs-improvements/subversion/libsvn_subr/macos_keychain.c
    subversion/branches/fsfs-improvements/subversion/libsvn_subr/packed_data.c
    subversion/branches/fsfs-improvements/subversion/libsvn_subr/prefix_string.c
    subversion/branches/fsfs-improvements/subversion/libsvn_subr/sorts.c
    subversion/branches/fsfs-improvements/subversion/libsvn_subr/sysinfo.c
    subversion/branches/fsfs-improvements/subversion/libsvn_subr/utf8proc.c
    subversion/branches/fsfs-improvements/subversion/libsvn_subr/utf8proc/utf8proc.c
    subversion/branches/fsfs-improvements/subversion/libsvn_subr/win32_crashrpt.c
    subversion/branches/fsfs-improvements/subversion/libsvn_subr/win32_crypto.c
    subversion/branches/fsfs-improvements/subversion/libsvn_wc/conflicts.c
    subversion/branches/fsfs-improvements/subversion/libsvn_wc/diff.h
    subversion/branches/fsfs-improvements/subversion/libsvn_wc/diff_local.c
    subversion/branches/fsfs-improvements/subversion/libsvn_wc/status.c
    subversion/branches/fsfs-improvements/subversion/libsvn_wc/upgrade.c
    subversion/branches/fsfs-improvements/subversion/libsvn_wc/wc-metadata.sql
    subversion/branches/fsfs-improvements/subversion/libsvn_wc/wc-queries.sql
    subversion/branches/fsfs-improvements/subversion/libsvn_wc/wc_db.c
    subversion/branches/fsfs-improvements/subversion/libsvn_wc/wc_db.h
    subversion/branches/fsfs-improvements/subversion/libsvn_wc/wc_db_private.h
    subversion/branches/fsfs-improvements/subversion/libsvn_wc/wc_db_update_move.c
    subversion/branches/fsfs-improvements/subversion/mod_authz_svn/mod_authz_svn.c
    subversion/branches/fsfs-improvements/subversion/mod_dav_svn/dav_svn.h
    subversion/branches/fsfs-improvements/subversion/mod_dav_svn/mod_dav_svn.c
    subversion/branches/fsfs-improvements/subversion/mod_dav_svn/reports/update.c
    subversion/branches/fsfs-improvements/subversion/mod_dav_svn/repos.c
    subversion/branches/fsfs-improvements/subversion/mod_dav_svn/util.c
    subversion/branches/fsfs-improvements/subversion/svn/add-cmd.c
    subversion/branches/fsfs-improvements/subversion/svn/blame-cmd.c
    subversion/branches/fsfs-improvements/subversion/svn/cat-cmd.c
    subversion/branches/fsfs-improvements/subversion/svn/changelist-cmd.c
    subversion/branches/fsfs-improvements/subversion/svn/cl.h
    subversion/branches/fsfs-improvements/subversion/svn/diff-cmd.c
    subversion/branches/fsfs-improvements/subversion/svn/info-cmd.c
    subversion/branches/fsfs-improvements/subversion/svn/list-cmd.c
    subversion/branches/fsfs-improvements/subversion/svn/log-cmd.c
    subversion/branches/fsfs-improvements/subversion/svn/propget-cmd.c
    subversion/branches/fsfs-improvements/subversion/svn/proplist-cmd.c
    subversion/branches/fsfs-improvements/subversion/svn/status-cmd.c
    subversion/branches/fsfs-improvements/subversion/svn/status.c
    subversion/branches/fsfs-improvements/subversion/svn/svn.c
    subversion/branches/fsfs-improvements/subversion/svn/util.c
    subversion/branches/fsfs-improvements/subversion/svnadmin/svnadmin.c
    subversion/branches/fsfs-improvements/subversion/svnauth/svnauth.c
    subversion/branches/fsfs-improvements/subversion/svndumpfilter/svndumpfilter.c
    subversion/branches/fsfs-improvements/subversion/svnlook/svnlook.c
    subversion/branches/fsfs-improvements/subversion/svnmucc/svnmucc.c
    subversion/branches/fsfs-improvements/subversion/svnrdump/svnrdump.c
    subversion/branches/fsfs-improvements/subversion/svnserve/logger.c
    subversion/branches/fsfs-improvements/subversion/svnserve/logger.h
    subversion/branches/fsfs-improvements/subversion/svnserve/serve.c
    subversion/branches/fsfs-improvements/subversion/svnserve/server.h
    subversion/branches/fsfs-improvements/subversion/svnserve/svnserve.c
    subversion/branches/fsfs-improvements/subversion/svnsync/svnsync.c
    subversion/branches/fsfs-improvements/subversion/svnversion/svnversion.c
    subversion/branches/fsfs-improvements/subversion/tests/cmdline/checkout_tests.py
    subversion/branches/fsfs-improvements/subversion/tests/cmdline/davautocheck.sh
    subversion/branches/fsfs-improvements/subversion/tests/cmdline/diff_tests.py
    subversion/branches/fsfs-improvements/subversion/tests/cmdline/move_tests.py
    subversion/branches/fsfs-improvements/subversion/tests/cmdline/redirect_tests.py
    subversion/branches/fsfs-improvements/subversion/tests/cmdline/stat_tests.py
    subversion/branches/fsfs-improvements/subversion/tests/cmdline/svnadmin_tests.py
    subversion/branches/fsfs-improvements/subversion/tests/cmdline/svntest/main.py
    subversion/branches/fsfs-improvements/subversion/tests/cmdline/switch_tests.py
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_client/client-test.c
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_delta/random-test.c
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_delta/window-test.c
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_diff/diff-diff3-test.c
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_diff/parse-diff-test.c
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_fs/fs-test.c
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_fs/locks-test.c
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_fs_base/changes-test.c
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_fs_base/fs-base-test.c
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_fs_base/strings-reps-test.c
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_fs_x/   (props changed)
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_fs_x/fs-x-pack-test.c
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_fs_x/string-table-test.c
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_ra/ra-test.c
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_ra_local/ra-local-test.c
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_repos/   (props changed)
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_repos/repos-test.c
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_subr/   (props changed)
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_subr/auth-test.c
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_subr/cache-test.c
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_subr/checksum-test.c
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_subr/compat-test.c
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_subr/config-test.c
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_subr/crypto-test.c
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_subr/dirent_uri-test.c
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_subr/error-code-test.c
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_subr/error-test.c
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_subr/hashdump-test.c
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_subr/io-test.c
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_subr/mergeinfo-test.c
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_subr/named_atomic-test-common.h
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_subr/named_atomic-test.c
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_subr/opt-test.c
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_subr/packed-data-test.c
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_subr/path-test.c
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_subr/prefix-string-test.c
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_subr/priority-queue-test.c
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_subr/revision-test.c
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_subr/root-pools-test.c
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_subr/skel-test.c
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_subr/spillbuf-test.c
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_subr/sqlite-test.c   (contents, props changed)
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_subr/stream-test.c
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_subr/string-test.c
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_subr/subst_translate-test.c
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_subr/time-test.c
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_subr/translate-test.c
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_subr/utf-test.c
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_wc/conflict-data-test.c
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_wc/db-test.c
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_wc/entries-compat.c
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_wc/op-depth-test.c
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_wc/pristine-store-test.c
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_wc/utils.c
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_wc/wc-queries-test.c
    subversion/branches/fsfs-improvements/subversion/tests/libsvn_wc/wc-test.c
    subversion/branches/fsfs-improvements/subversion/tests/svn_test.h
    subversion/branches/fsfs-improvements/subversion/tests/svn_test_main.c
    subversion/branches/fsfs-improvements/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd
    subversion/branches/fsfs-improvements/tools/buildbot/slaves/win32-SharpSvn/svntest-build-bindings.cmd
    subversion/branches/fsfs-improvements/tools/buildbot/slaves/win32-SharpSvn/svntest-build.cmd
    subversion/branches/fsfs-improvements/tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd
    subversion/branches/fsfs-improvements/tools/buildbot/slaves/win32-SharpSvn/svntest-test.cmd
    subversion/branches/fsfs-improvements/tools/client-side/svn-bench/cl.h
    subversion/branches/fsfs-improvements/tools/client-side/svn-bench/svn-bench.c
    subversion/branches/fsfs-improvements/tools/dev/svnraisetreeconflict/svnraisetreeconflict.c
    subversion/branches/fsfs-improvements/tools/dev/unix-build/Makefile.svn
    subversion/branches/fsfs-improvements/tools/dist/backport.pl
    subversion/branches/fsfs-improvements/tools/dist/release.py
    subversion/branches/fsfs-improvements/tools/examples/svnlook.py   (contents, props changed)
    subversion/branches/fsfs-improvements/tools/server-side/mod_dontdothat/mod_dontdothat.c
    subversion/branches/fsfs-improvements/tools/server-side/svn-rep-sharing-stats.c
    subversion/branches/fsfs-improvements/tools/server-side/svnauthz.c
    subversion/branches/fsfs-improvements/win-tests.py

Propchange: subversion/branches/fsfs-improvements/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1536947-1545954

Modified: subversion/branches/fsfs-improvements/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/CHANGES?rev=1545955&r1=1545954&r2=1545955&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/CHANGES (original)
+++ subversion/branches/fsfs-improvements/CHANGES Wed Nov 27 07:53:29 2013
@@ -9,10 +9,13 @@ http://svn.apache.org/repos/asf/subversi
 
   - Minor new features and improvements:
     * new 'diff-ignore-content-type' runtime configuration option.
+    * new option for 'svnadmin verify': --check-ucs-normalization.
 
   - Client-side bugfixes:
 
   - Server-side bugfixes:
+    * svnserve: don't ignore socket initialization errors (r1544253)
+    * svnserve: don't hide fatal errors in inetd and tunnel modes (r1544256)
 
   - Other tool improvements and bugfixes:
 
@@ -26,6 +29,36 @@ http://svn.apache.org/repos/asf/subversi
   - Bindings:
 
 
+Version 1.8.5
+(25 November 2013, from /branches/1.8.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.8.5
+
+ User-visible changes:
+  - Client-side bugfixes:
+    * fix externals that point at redirected locations (issues #4428, #4429)
+    * diff: fix assertion with move inside a copy (issue #4444)
+
+  - Server-side bugfixes:
+    * mod_dav_svn: Prevent crashes with some 3rd party modules (r1537360 et al)
+    * mod_dav_svn: canonicalize paths properly (r1542071)
+    * mod_authz_svn: fix crash of mod_authz_svn with invalid config (r1541432)
+    * hotcopy: fix hotcopy losing revprop files in packed repos (issue #4448)
+ 
+  - Other tool improvements and bugfixes:
+    * mod_dontdothat: Fix the uri parser (r1542069 et al)
+
+ Developer-visible changes:
+  - General:
+    * fix compilation with '--enable-optimize' with clang (r1534860)
+    * fix compilation with debug build of BDB on Windows (r1501656, r1501702)
+    * fix '--with-openssl' option when building on Windows (r1535139) 
+    * add test to fail when built against broken ZLib (r1537193 et al)
+
+  - Bindings:
+    * swig-rb: fix tests to run without installing on OS X (r1535161)
+    * ctypes-python: build with compiler selected via configure (r1536537)
+
+
 Version 1.8.4
 (29 October 2013, from /branches/1.8.x)
 http://svn.apache.org/repos/asf/subversion/tags/1.8.4
@@ -551,6 +584,36 @@ http://svn.apache.org/repos/asf/subversi
     * fix some reference counting bugs in swig-py bindings (r1464899, r1466524)
 
 
+Version 1.7.14
+(25 Nov 2013, from /branches/1.7.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.7.14
+
+ User-visible changes:
+  - Client- and server-side bugfixes:
+    * fix assertion on urls of the form 'file://./' (r1516806)
+
+  - Client-side bugfixes:
+    * upgrade: fix an assertion when used with pre-1.3 wcs (r1530849)
+    * ra_local: fix error with repository in Windows drive root (r1518184)
+    * fix crash on windows when piped command is interrupted (r1522892)
+    * fix externals that point at redirected locations (issues #4428, #4429)
+    * diff: fix incorrect calculation of changes in some cases (issue #4283)
+    * diff: fix errors with added/deleted targets (issues #4153, #4421)
+
+  - Server-side bugfixes:
+    * mod_dav_svn: Prevent crashes with some 3rd party modules (r1537360 et al)
+    * fix OOM on concurrent requests at threaded server start (r1527103 et al)
+    * fsfs: limit commit time of files with deep change histories (r1536790)
+    * mod_dav_svn: canonicalize paths properly (r1542071)
+
+  - Other tool improvements and bugfixes:
+    * mod_dontdothat: Fix the uri parser (r1542069 et al)
+
+ Developer-visible changes:
+  - Bindings:
+    * javahl: canonicalize path for streamFileContent method (r1524869)
+
+
 Version 1.7.13
 (29 Aug 2013, from /branches/1.7.x)
 http://svn.apache.org/repos/asf/subversion/tags/1.7.13

Modified: subversion/branches/fsfs-improvements/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/Makefile.in?rev=1545955&r1=1545954&r2=1545955&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/Makefile.in (original)
+++ subversion/branches/fsfs-improvements/Makefile.in Wed Nov 27 07:53:29 2013
@@ -206,6 +206,7 @@ COMPILE_SWIG_RB = $(LIBTOOL) $(LTFLAGS) 
 COMPILE_JAVAHL_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=compile $(COMPILE_CXX) $(LT_CFLAGS) $(JAVAHL_INCLUDES) -o $@ -c
 COMPILE_JAVAHL_JAVAC = $(JAVAC) $(JAVAC_FLAGS)
 COMPILE_JAVAHL_JAVAH = $(JAVAH)
+COMPILE_JAVAHL_COMPAT_JAVAC = $(JAVAC) $(JAVAC_COMPAT_FLAGS)
 
 # export an env variable so that the tests can run without being installed
 TEST_SHLIB_VAR_JAVAHL=\
@@ -375,6 +376,7 @@ JAVA = @JAVA@
 JAVAC = @JAVAC@
 JAVADOC = @JAVADOC@
 JAVAC_FLAGS = @JAVAC_FLAGS@
+JAVAC_COMPAT_FLAGS = @JAVAC_COMPAT_FLAGS@
 JAVAH = @JAVAH@
 JAR = @JAR@
 
@@ -480,8 +482,11 @@ install-javahl: javahl install-javahl-ja
 javahl-compat: javahl-compat-java @JAVAHL_COMPAT_TESTS_TARGET@
 
 clean-javahl:
+	if [ -d $(javahl_test_rootdir) ]; then \
+	  find $(javahl_test_rootdir) -mindepth 1 -maxdepth 1 \
+               -print0 | xargs -0 rm -rf --;   \
+	fi
 	rm -rf $(javahl_java_PATH) $(javahl_javah_PATH) @JAVAHL_OBJDIR@
-	rm -fr $(javahl_test_rootdir)
 	rm -f $(libsvnjavahl_PATH)/*.la $(JAVAHL_JAR)
 	rm -f $(libsvnjavahl_PATH)/*.lo
 	rm -f $(libsvnjavahl_PATH)/*.o
@@ -678,8 +683,8 @@ doc-javahl:
 	  org.apache.subversion.javahl.util
 
 doc-clean:
-	rm -rf $(top_srcdir)/doc/doxygen
-	rm -rf $(top_srcdir)/doc/javadoc
+	rm -rf $(abs_builddir)/doc/doxygen
+	rm -rf $(abs_builddir)/doc/javadoc
 
 # Converting from the .rnc XML shcemas to various other schema formats.
 SCHEMAS_DTD = $(SCHEMA_DIR)/blame.dtd $(SCHEMA_DIR)/info.dtd \

Modified: subversion/branches/fsfs-improvements/NOTICE
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/NOTICE?rev=1545955&r1=1545954&r2=1545955&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/NOTICE (original)
+++ subversion/branches/fsfs-improvements/NOTICE Wed Nov 27 07:53:29 2013
@@ -1,5 +1,5 @@
-Subversion
-Copyright 2010 The Apache Software Foundation
+Apache Subversion
+Copyright 2013 The Apache Software Foundation
 
 This product includes software developed by many people, and distributed
 under Contributor License Agreements to The Apache Software Foundation

Modified: subversion/branches/fsfs-improvements/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/build.conf?rev=1545955&r1=1545954&r2=1545955&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/build.conf (original)
+++ subversion/branches/fsfs-improvements/build.conf Wed Nov 27 07:53:29 2013
@@ -43,6 +43,8 @@ private-includes =
         subversion/bindings/cxxhl/src/*.hpp
         subversion/bindings/cxxhl/src/aprwrap/*.hpp
         subversion/bindings/cxxhl/src/private/*.hpp
+        subversion/bindings/javahl/native/*.hpp
+        subversion/bindings/javahl/native/jniwrapper/jni_*.hpp
         subversion/libsvn_subr/utf8proc/utf8proc.h
         subversion/libsvn_subr/utf8proc/utf8proc.c
         subversion/libsvn_subr/utf8proc/utf8proc_data.c
@@ -63,12 +65,15 @@ private-built-includes =
         subversion/bindings/javahl/include/org_apache_subversion_javahl_Path.h
         subversion/bindings/javahl/include/org_apache_subversion_javahl_SVNRepos.h
         subversion/bindings/javahl/include/org_apache_subversion_javahl_SVNClient.h
+        subversion/bindings/javahl/include/org_apache_subversion_javahl_types_NativeInputStream.h
+        subversion/bindings/javahl/include/org_apache_subversion_javahl_types_NativeOutputStream.h
         subversion/bindings/javahl/include/org_apache_subversion_javahl_types_Version.h
         subversion/bindings/javahl/include/org_apache_subversion_javahl_types_VersionExtended.h
         subversion/bindings/javahl/include/org_apache_subversion_javahl_types_VersionExtended_LinkedLib.h
         subversion/bindings/javahl/include/org_apache_subversion_javahl_types_VersionExtended_LinkedLibIterator.h
         subversion/bindings/javahl/include/org_apache_subversion_javahl_types_VersionExtended_LoadedLib.h
         subversion/bindings/javahl/include/org_apache_subversion_javahl_types_VersionExtended_LoadedLibIterator.h
+        subversion/bindings/javahl/include/org_apache_subversion_javahl_types_RuntimeVersion.h
         subversion/bindings/javahl/include/org_apache_subversion_javahl_types_Revision.h
         subversion/bindings/javahl/include/org_apache_subversion_javahl_types_RevisionRangeList.h
         subversion/bindings/javahl/include/org_apache_subversion_javahl_callback_UserPasswordCallback.h
@@ -79,6 +84,8 @@ private-built-includes =
         subversion/bindings/javahl/include/org_apache_subversion_javahl_util_ConfigImpl_Category.h
         subversion/bindings/javahl/include/org_apache_subversion_javahl_util_ConfigLib.h
         subversion/bindings/javahl/include/org_apache_subversion_javahl_util_DiffLib.h
+        subversion/bindings/javahl/include/org_apache_subversion_javahl_util_PropLib.h
+        subversion/bindings/javahl/include/org_apache_subversion_javahl_util_SubstLib.h
         subversion/bindings/javahl/include/org_apache_subversion_javahl_util_TunnelChannel.h
         subversion/bindings/javahl/include/org_apache_subversion_javahl_util_RequestChannel.h
         subversion/bindings/javahl/include/org_apache_subversion_javahl_util_ResponseChannel.h
@@ -374,7 +381,7 @@ msvc-export = 
         private\svn_temp_serializer.h private\svn_io_private.h
         private\svn_string_private.h private\svn_magic.h
         private\svn_subr_private.h private\svn_mutex.h private\svn_named_atomic.h
-        private\svn_packed_data.h
+        private\svn_packed_data.h private\svn_object_pool.h
 
 # Working copy management lib
 [libsvn_wc]
@@ -392,10 +399,9 @@ when = INSTALL_APACHE_MODS
 type = apache-mod
 path = subversion/mod_dav_svn
 sources = *.c reports/*.c posts/*.c
-libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr
+libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr libhttpd mod_dav
 nonlibs = apr aprutil
 install = apache-mod
-msvc-libs = mod_dav.lib libhttpd.lib
 
 [mod_authz_svn]
 description = Subversion path-based authorization module for Apache
@@ -403,9 +409,8 @@ when = INSTALL_APACHE_MODS
 type = apache-mod
 path = subversion/mod_authz_svn
 nonlibs = mod_dav_svn apr aprutil
-libs = libsvn_repos libsvn_subr
+libs = libsvn_repos libsvn_subr libhttpd
 install = apache-mod
-msvc-libs = libhttpd.lib
 
 [mod_dontdothat]
 description = Apache Httpd module to block certain kinds of Apache Subversion requests
@@ -413,9 +418,8 @@ when = INSTALL_APACHE_MODS
 type = apache-mod
 path = tools/server-side/mod_dontdothat
 nonlibs = mod_dav_svn apr aprutil
-libs = libsvn_subr xml
+libs = libsvn_subr xml libhttpd
 install = tools
-msvc-libs = libhttpd.lib
 
 # ----------------------------------------------------------------------------
 #
@@ -594,7 +598,7 @@ type = java
 path = subversion/bindings/javahl/src/org/tigris/subversion/javahl
 sources = *.java
 install = javahl-java
-link-cmd = $(COMPILE_JAVAHL_JAVAC)
+link-cmd = $(COMPILE_JAVAHL_COMPAT_JAVAC)
 classes = subversion/bindings/javahl/classes
 add-deps = $(javahl_java_DEPS)
 ### Replace JAR call in INSTALL_EXTRA_JAVAHL_JAVA macro Makefile.in.
@@ -618,7 +622,7 @@ type = java
 path = subversion/bindings/javahl/tests/org/tigris/subversion/javahl
 sources = *.java
 install = javahl-java
-link-cmd = $(COMPILE_JAVAHL_JAVAC)
+link-cmd = $(COMPILE_JAVAHL_COMPAT_JAVAC)
 classes = subversion/bindings/javahl/classes
 package-roots = org
 ### Java targets don't do up-to-date checks yet.
@@ -686,7 +690,7 @@ type = lib
 path = subversion/bindings/javahl/native
 libs = libsvn_repos libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_diff 
        libsvn_subr libsvn_fs aprutil apriconv apr java-sdk
-sources = *.cpp
+sources = *.cpp jniwrapper/*.cpp
 add-deps = $(javahl_java_DEPS) $(javahl_callback_javah_DEPS)
            $(javahl_remote_javah_DEPS) $(javahl_types_javah_DEPS)
            $(javahl_util_javah_DEPS) $(javahl_javah_DEPS)
@@ -871,7 +875,7 @@ type = exe
 path = subversion/tests/libsvn_subr
 sources = checksum-test.c
 install = test
-libs = libsvn_test libsvn_subr apr
+libs = libsvn_test libsvn_subr apr zlib
 msvc-force-static = yes
 
 [compat-test]
@@ -1307,6 +1311,14 @@ external-lib = $(SVN_APRUTIL_LIBS)
 type = lib
 external-lib = $(SVN_APRUTIL_LIBS)
 
+[libhttpd]
+type = lib
+external-lib = $(SVN_HTTPD_LIBS)
+
+[mod_dav]
+type = lib
+external-lib = $(SVN_MOD_DAV_LIBS)
+
 [bdb]
 type = lib
 external-lib = $(SVN_DB_LIBS)
@@ -1547,6 +1559,7 @@ install = tools
 libs = libsvn_repos libsvn_fs libsvn_subr apr
 
 [svn-populate-node-origins-index]
+description = Repository node origin cache populate tool
 type = exe
 path = tools/server-side
 sources = svn-populate-node-origins-index.c

Modified: subversion/branches/fsfs-improvements/build/ac-macros/apache.m4
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/build/ac-macros/apache.m4?rev=1545955&r1=1545954&r2=1545955&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/build/ac-macros/apache.m4 (original)
+++ subversion/branches/fsfs-improvements/build/ac-macros/apache.m4 Wed Nov 27 07:53:29 2013
@@ -118,6 +118,27 @@ apache_minor_version=AP_SERVER_MINORVERS
   CPPFLAGS="$old_CPPFLAGS"
 fi
 
+# check for some busted versions of mod_dav
+# in particular 2.2.25, 2.4.5, and 2.4.6 had the following bugs which are
+# troublesome for Subversion:
+# PR 55304: https://issues.apache.org/bugzilla/show_bug.cgi?id=55304
+# PR 55306: https://issues.apache.org/bugzilla/show_bug.cgi?id=55306
+# PR 55397: https://issues.apache.org/bugzilla/show_bug.cgi?id=55397
+if test -n "$APXS" && test "$APXS" != "no"; then
+  AC_MSG_CHECKING([mod_dav version])
+  old_CPPFLAGS="$CPPFLAGS"
+  CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES"
+  blacklisted_versions_regex=["\"2\" \"\.\" (\"2\" \"\.\" \"25\"|\"4\" \"\.\" \"[56]\")"]
+  AC_EGREP_CPP([apache_version= *$blacklisted_versions_regex],
+               [
+#include "$APXS_INCLUDE/ap_release.h"
+apache_version=AP_SERVER_BASEREVISION],
+               [AC_MSG_RESULT([broken])
+                AC_MSG_ERROR([Apache httpd version includes a broken mod_dav; use a newer version of httpd])],
+               [AC_MSG_RESULT([acceptable])])
+  CPPFLAGS="$old_CPPFLAGS"
+fi
+
 AC_ARG_WITH(apache-libexecdir,
             [AS_HELP_STRING([[--with-apache-libexecdir[=PATH]]],
                             [Install Apache modules to Apache's configured

Modified: subversion/branches/fsfs-improvements/build/ac-macros/java.m4
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/build/ac-macros/java.m4?rev=1545955&r1=1545954&r2=1545955&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/build/ac-macros/java.m4 (original)
+++ subversion/branches/fsfs-improvements/build/ac-macros/java.m4 Wed Nov 27 07:53:29 2013
@@ -192,7 +192,10 @@ AC_DEFUN(SVN_FIND_JDK,
     if test -z "$JAVAC_FLAGS"; then
       JAVAC_FLAGS="-target $JAVA_OLDEST_WORKING_VER -source 1.5"
       if test "$enable_debugging" = "yes"; then
-        JAVAC_FLAGS="-g -Xlint:unchecked $JAVAC_FLAGS"
+        JAVAC_FLAGS="-g -Xlint -Xlint:unchecked -Xlint:serial -Xlint:path $JAVAC_FLAGS"
+        if test -z "$JAVAC_COMPAT_FLAGS"; then
+          JAVAC_COMPAT_FLAGS="$JAVAC_FLAGS -Xlint:-unchecked -Xlint:-deprecation -Xlint:-dep-ann"
+        fi
       fi
     fi
 
@@ -208,6 +211,7 @@ AC_DEFUN(SVN_FIND_JDK,
   AC_SUBST(JAVA)
   AC_SUBST(JAVAC)
   AC_SUBST(JAVAC_FLAGS)
+  AC_SUBST(JAVAC_COMPAT_FLAGS)
   AC_SUBST(JAVADOC)
   AC_SUBST(JAVAH)
   AC_SUBST(JAR)

Modified: subversion/branches/fsfs-improvements/build/ac-macros/kwallet.m4
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/build/ac-macros/kwallet.m4?rev=1545955&r1=1545954&r2=1545955&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/build/ac-macros/kwallet.m4 (original)
+++ subversion/branches/fsfs-improvements/build/ac-macros/kwallet.m4 Wed Nov 27 07:53:29 2013
@@ -33,78 +33,85 @@ AC_DEFUN(SVN_LIB_KWALLET,
   AC_MSG_CHECKING([whether to look for KWallet])
   if test "$svn_lib_kwallet" != "no"; then
     AC_MSG_RESULT([yes])
-    if test "$svn_enable_shared" = "yes"; then
-      if test "$APR_HAS_DSO" = "yes"; then
-        if test -n "$PKG_CONFIG"; then
-          if test "$HAVE_DBUS" = "yes"; then
-            AC_MSG_CHECKING([for QtCore, QtDBus, QtGui])
-            if $PKG_CONFIG --exists QtCore QtDBus QtGui; then
-              AC_MSG_RESULT([yes])
-              if test "$svn_lib_kwallet" != "yes"; then
-                AC_MSG_CHECKING([for kde4-config])
-                KDE4_CONFIG="$svn_lib_kwallet/bin/kde4-config"
-                if test -f "$KDE4_CONFIG" && test -x "$KDE4_CONFIG"; then
-                  AC_MSG_RESULT([yes])
+    case "$host" in
+    *-*-darwin*)
+      AC_MSG_ERROR([--with-kwallet is not supported on Mac OS X.])
+      ;;
+    *)
+      if test "$svn_enable_shared" = "yes"; then
+        if test "$APR_HAS_DSO" = "yes"; then
+          if test -n "$PKG_CONFIG"; then
+            if test "$HAVE_DBUS" = "yes"; then
+              AC_MSG_CHECKING([for QtCore, QtDBus, QtGui])
+              if $PKG_CONFIG --exists QtCore QtDBus QtGui; then
+                AC_MSG_RESULT([yes])
+                if test "$svn_lib_kwallet" != "yes"; then
+                  AC_MSG_CHECKING([for kde4-config])
+                  KDE4_CONFIG="$svn_lib_kwallet/bin/kde4-config"
+                  if test -f "$KDE4_CONFIG" && test -x "$KDE4_CONFIG"; then
+                    AC_MSG_RESULT([yes])
+                  else
+                    KDE4_CONFIG=""
+                    AC_MSG_RESULT([no])
+                  fi
                 else
-                  KDE4_CONFIG=""
-                  AC_MSG_RESULT([no])
+                  AC_PATH_PROG(KDE4_CONFIG, kde4-config)
                 fi
-              else
-                AC_PATH_PROG(KDE4_CONFIG, kde4-config)
-              fi
-              if test -n "$KDE4_CONFIG"; then
-                AC_MSG_CHECKING([for KWallet])
-                old_CXXFLAGS="$CXXFLAGS"
-                old_LDFLAGS="$LDFLAGS"
-                old_LIBS="$LIBS"
-                for d in [`$PKG_CONFIG --cflags QtCore QtDBus QtGui`]; do
-                  if test -n ["`echo "$d" | $EGREP -- '^-D[^[:space:]]*'`"]; then
-                    CPPFLAGS="$CPPFLAGS $d"
-                  fi
-                done
-                qt_include_dirs="`$PKG_CONFIG --cflags-only-I QtCore QtDBus QtGui`"
-                kde_dir="`$KDE4_CONFIG --prefix`"
-                SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs -I$kde_dir/include"
-                qt_libs_other_options="`$PKG_CONFIG --libs-only-other QtCore QtDBus QtGui`"
-                SVN_KWALLET_LIBS="$DBUS_LIBS -lQtCore -lQtDBus -lQtGui -lkdecore -lkdeui $qt_libs_other_options"
-                CXXFLAGS="$CXXFLAGS $SVN_KWALLET_INCLUDES"
-                LIBS="$LIBS $SVN_KWALLET_LIBS"
-                qt_lib_dirs="`$PKG_CONFIG --libs-only-L QtCore QtDBus QtGui`"
-                kde_lib_suffix="`$KDE4_CONFIG --libsuffix`"
-                LDFLAGS="$old_LDFLAGS `SVN_REMOVE_STANDARD_LIB_DIRS($qt_lib_dirs -L$kde_dir/lib$kde_lib_suffix)`"
-                AC_LANG(C++)
-                AC_LINK_IFELSE([AC_LANG_SOURCE([[
+                if test -n "$KDE4_CONFIG"; then
+                  AC_MSG_CHECKING([for KWallet])
+                  old_CXXFLAGS="$CXXFLAGS"
+                  old_LDFLAGS="$LDFLAGS"
+                  old_LIBS="$LIBS"
+                  for d in [`$PKG_CONFIG --cflags QtCore QtDBus QtGui`]; do
+                    if test -n ["`echo "$d" | $EGREP -- '^-D[^[:space:]]*'`"]; then
+                      CPPFLAGS="$CPPFLAGS $d"
+                    fi
+                  done
+                  qt_include_dirs="`$PKG_CONFIG --cflags-only-I QtCore QtDBus QtGui`"
+                  kde_dir="`$KDE4_CONFIG --prefix`"
+                  SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs -I$kde_dir/include"
+                  qt_libs_other_options="`$PKG_CONFIG --libs-only-other QtCore QtDBus QtGui`"
+                  SVN_KWALLET_LIBS="$DBUS_LIBS -lQtCore -lQtDBus -lQtGui -lkdecore -lkdeui $qt_libs_other_options"
+                  CXXFLAGS="$CXXFLAGS $SVN_KWALLET_INCLUDES"
+                  LIBS="$LIBS $SVN_KWALLET_LIBS"
+                  qt_lib_dirs="`$PKG_CONFIG --libs-only-L QtCore QtDBus QtGui`"
+                  kde_lib_suffix="`$KDE4_CONFIG --libsuffix`"
+                  LDFLAGS="$old_LDFLAGS `SVN_REMOVE_STANDARD_LIB_DIRS($qt_lib_dirs -L$kde_dir/lib$kde_lib_suffix)`"
+                  AC_LANG(C++)
+                  AC_LINK_IFELSE([AC_LANG_SOURCE([[
 #include <kwallet.h>
 int main()
 {KWallet::Wallet::walletList();}]])], svn_lib_kwallet="yes", svn_lib_kwallet="no")
-                AC_LANG(C)
-                if test "$svn_lib_kwallet" = "yes"; then
-                  AC_MSG_RESULT([yes])
-                  CXXFLAGS="$old_CXXFLAGS"
-                  LIBS="$old_LIBS"
+                  AC_LANG(C)
+                  if test "$svn_lib_kwallet" = "yes"; then
+                    AC_MSG_RESULT([yes])
+                    CXXFLAGS="$old_CXXFLAGS"
+                    LIBS="$old_LIBS"
+                  else
+                    AC_MSG_RESULT([no])
+                    AC_MSG_ERROR([cannot find KWallet])
+                  fi
                 else
-                  AC_MSG_RESULT([no])
-                  AC_MSG_ERROR([cannot find KWallet])
+                  AC_MSG_ERROR([cannot find kde4-config])
                 fi
               else
-                AC_MSG_ERROR([cannot find kde4-config])
+                AC_MSG_RESULT([no])
+                AC_MSG_ERROR([cannot find QtCore, QtDBus, QtGui])
               fi
             else
-              AC_MSG_RESULT([no])
-              AC_MSG_ERROR([cannot find QtCore, QtDBus, QtGui])
+              AC_MSG_ERROR([cannot find D-Bus])
             fi
           else
-            AC_MSG_ERROR([cannot find D-Bus])
+            AC_MSG_ERROR([cannot find pkg-config])
           fi
         else
-          AC_MSG_ERROR([cannot find pkg-config])
+          AC_MSG_ERROR([APR does not have support for DSOs])
         fi
       else
-        AC_MSG_ERROR([APR does not have support for DSOs])
+        AC_MSG_ERROR([--with-kwallet conflicts with --disable-shared])
       fi
-    else
-      AC_MSG_ERROR([--with-kwallet conflicts with --disable-shared])
-    fi
+    ;;
+    esac
   else
     AC_MSG_RESULT([no])
   fi

Modified: subversion/branches/fsfs-improvements/build/generator/gen_base.py
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/build/generator/gen_base.py?rev=1545955&r1=1545954&r2=1545955&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/build/generator/gen_base.py (original)
+++ subversion/branches/fsfs-improvements/build/generator/gen_base.py Wed Nov 27 07:53:29 2013
@@ -393,11 +393,16 @@ class ObjectFile(DependencyNode):
     self.source_generated = 0
 
 class SWIGObject(ObjectFile):
-  def __init__(self, filename, lang):
+  def __init__(self, filename, lang, release_mode):
     ObjectFile.__init__(self, filename)
     self.lang = lang
     self.lang_abbrev = lang_abbrev[lang]
-    self.source_generated = 1
+    # in release mode the sources are not generated by the build
+    # but rather by the packager
+    if release_mode:
+      self.source_generated = 0
+    else:
+      self.source_generated = 1
     ### hmm. this is Makefile-specific
     self.compile_cmd = '$(COMPILE_%s_WRAPPER)' % self.lang_abbrev.upper()
 
@@ -703,8 +708,10 @@ class TargetSWIG(TargetLib):
     self.filename = build_path_join(self.path, lib_filename)
 
     ifile = SWIGSource(ipath)
-    cfile = SWIGObject(build_path_join(self.path, cname), self.lang)
-    ofile = SWIGObject(build_path_join(self.path, oname), self.lang)
+    cfile = SWIGObject(build_path_join(self.path, cname), self.lang,
+                       self.gen_obj.release_mode)
+    ofile = SWIGObject(build_path_join(self.path, oname), self.lang,
+                       self.gen_obj.release_mode)
 
     # the .c file depends upon the .i file
     self.gen_obj.graph.add(DT_SWIG_C, cfile, ifile)

Modified: subversion/branches/fsfs-improvements/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/build/generator/gen_win.py?rev=1545955&r1=1545954&r2=1545955&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/build/generator/gen_win.py (original)
+++ subversion/branches/fsfs-improvements/build/generator/gen_win.py Wed Nov 27 07:53:29 2013
@@ -385,11 +385,21 @@ class WinGeneratorBase(gen_win_dependenc
 
           sourcepath = self.path(source.sourcepath)
 
-          cbuild = "%s -g -target 1.5 -source 1.5 -classpath %s -d %s " \
-                   "-sourcepath %s $(InputPath)" \
+          per_project_flags = ""
+
+          if target.name.find("-compat-"):
+            per_project_flags += "-Xlint:-deprecation -Xlint:-dep-ann" \
+                                 " -Xlint:-rawtypes"
+
+          cbuild = ("%s -g -Xlint -Xlint:-options " +
+                    per_project_flags +
+                    " -target 1.5 -source 1.5 -classpath "
+                    " %s -d %s "
+                    " -sourcepath %s $(InputPath)") \
                    % tuple(map(self.quote, (javac_exe, classes,
                                             targetdir, sourcepath)))
 
+
           ctarget = self.path(object.filename)
           cdesc = "Compiling %s" % (source)
 
@@ -768,8 +778,7 @@ class WinGeneratorBase(gen_win_dependenc
   def get_win_includes(self, target, cfg='Release'):
     "Return the list of include directories for target"
 
-    fakeincludes = [ "subversion/include",
-                     "subversion" ]
+    fakeincludes = [ "subversion/include" ]
                      
     for dep in self.get_win_depends(target, FILTER_EXTERNALLIBS):
       if dep.external_lib:
@@ -781,12 +790,7 @@ class WinGeneratorBase(gen_win_dependenc
 
           fakeincludes.extend(lib.include_dirs)
 
-    if target.name == 'mod_authz_svn':
-      fakeincludes.extend([ os.path.join(self.httpd_path, "modules/aaa") ])
-
-    if isinstance(target, gen_base.TargetApacheMod):
-      fakeincludes.extend([ os.path.join(self.httpd_path, "include") ])
-    elif (isinstance(target, gen_base.TargetSWIG)
+    if (isinstance(target, gen_base.TargetSWIG)
           or isinstance(target, gen_base.TargetSWIGLib)):
       util_includes = "subversion/bindings/swig/%s/libsvn_swig_%s" \
                       % (target.lang,
@@ -828,6 +832,16 @@ class WinGeneratorBase(gen_win_dependenc
 
     fakelibdirs = []
 
+    if (isinstance(target, gen_base.TargetSWIG)
+          or isinstance(target, gen_base.TargetSWIGLib)):
+      if target.lang in self._libraries:
+        lib = self._libraries[target.lang]
+
+        if debug and lib.debug_lib_dir:
+          fakelibdirs.append(lib.debug_lib_dir)
+        elif lib.lib_dir:
+          fakelibdirs.append(lib.lib_dir)
+
     for dep in self.get_win_depends(target, FILTER_LIBS):
       if dep.external_lib:
         for elib in re.findall('\$\(SVN_([^\)]*)_LIBS\)', dep.external_lib):
@@ -847,12 +861,6 @@ class WinGeneratorBase(gen_win_dependenc
 
           fakelibdirs.append(lib_dir)
 
-    if isinstance(target, gen_base.TargetApacheMod):
-      fakelibdirs.append(self.apath(self.httpd_path, cfg))
-      if target.name == 'mod_dav_svn':
-        fakelibdirs.append(self.apath(self.httpd_path, "modules/dav/main",
-                                      cfg))
-
     return gen_base.unique(fakelibdirs)
 
   def get_win_libs(self, target, cfg):
@@ -871,6 +879,15 @@ class WinGeneratorBase(gen_win_dependenc
     if isinstance(target, gen_base.TargetExe):
       nondeplibs.append('setargv.obj')
 
+    if (isinstance(target, gen_base.TargetSWIG)
+          or isinstance(target, gen_base.TargetSWIGLib)):
+      if target.lang in self._libraries:
+        lib = self._libraries[target.lang]
+        if debug and lib.debug_lib_name:
+          nondeplibs.append(lib.debug_lib_name)
+        elif lib.lib_name:
+          nondeplibs.append(lib.lib_name)
+
     for dep in self.get_win_depends(target, FILTER_LIBS):
       nondeplibs.extend(dep.msvc_libs)
 

Modified: subversion/branches/fsfs-improvements/build/generator/gen_win_dependencies.py
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/build/generator/gen_win_dependencies.py?rev=1545955&r1=1545954&r2=1545955&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/build/generator/gen_win_dependencies.py (original)
+++ subversion/branches/fsfs-improvements/build/generator/gen_win_dependencies.py Wed Nov 27 07:53:29 2013
@@ -51,7 +51,7 @@ class SVNCommonLibrary:
   def __init__(self, name, include_dirs, lib_dir, lib_name, version=None,
                debug_lib_dir=None, debug_lib_name=None, dll_dir=None,
                dll_name=None, debug_dll_dir=None, debug_dll_name=None,
-               is_src=False, defines=[], forced_includes=[]):
+               is_src=False, defines=[], forced_includes=[], extra_bin=[]):
     self.name = name
     if include_dirs:
       self.include_dirs = include_dirs if isinstance(include_dirs, list) \
@@ -89,6 +89,8 @@ class SVNCommonLibrary:
       self.debug_dll_name = debug_dll_name
     else:
       self.debug_dll_name = dll_name
+      
+    self.extra_bin = extra_bin
 
 class GenDependenciesBase(gen_base.GeneratorBase):
   """This intermediate base class exists to be instantiated by win-tests.py,
@@ -284,6 +286,7 @@ class GenDependenciesBase(gen_base.Gener
       self.find_libraries(False)
       
   def find_libraries(self, show_warnings):
+    "find required and optional libraries"
 
     # Required dependencies
     self._find_apr()
@@ -292,6 +295,7 @@ class GenDependenciesBase(gen_base.Gener
     self._find_sqlite(show_warnings)
 
     # Optional dependencies
+    self._find_httpd(show_warnings)
     self._find_bdb(show_warnings)
     self._find_openssl(show_warnings)
     self._find_serf(show_warnings)
@@ -387,6 +391,19 @@ class GenDependenciesBase(gen_base.Gener
       else:
         dll_dir = os.path.join(self.apr_path, 'bin')
         debug_dll_dir = None
+        
+    bin_files = os.listdir(dll_dir)
+    if debug_dll_dir:
+      debug_bin_files = os.listdir(debug_dll_dir)
+    else:
+      debug_bin_files = bin_files 
+    
+    extra_bin = []
+    
+    for bin in bin_files:
+      if bin in debug_bin_files:
+        if re.match('^(lib)?apr[-_].*' + suffix + '(d)?.dll$', bin):
+          extra_bin.append(bin)
       
     self._libraries['apr'] = SVNCommonLibrary('apr', inc_path, lib_dir, lib_name,
                                               apr_version,
@@ -394,7 +411,8 @@ class GenDependenciesBase(gen_base.Gener
                                               dll_dir=dll_dir,
                                               dll_name=dll_name,
                                               debug_dll_dir=debug_dll_dir,
-                                              defines=defines)
+                                              defines=defines,
+                                              extra_bin=extra_bin)
 
   def _find_apr_util_and_expat(self):
     "Find the APR-util library and version"
@@ -479,6 +497,19 @@ class GenDependenciesBase(gen_base.Gener
         dll_dir = os.path.join(self.apr_util_path, 'bin')
         debug_dll_dir = None
 
+    bin_files = os.listdir(dll_dir)
+    if debug_dll_dir:
+      debug_bin_files = os.listdir(debug_dll_dir)
+    else:
+      debug_bin_files = bin_files 
+
+    extra_bin = []
+
+    for bin in bin_files:
+      if bin in debug_bin_files:
+        if re.match('^(lib)?aprutil[-_].*' + suffix + '(d)?.dll$', bin):
+          extra_bin.append(bin)
+
     self._libraries['aprutil'] = SVNCommonLibrary('apr-util', inc_path, lib_dir,
                                                    lib_name,
                                                    aprutil_version,
@@ -486,7 +517,8 @@ class GenDependenciesBase(gen_base.Gener
                                                    dll_dir=dll_dir,
                                                    dll_name=dll_name,
                                                    debug_dll_dir=debug_dll_dir,
-                                                   defines=defines)
+                                                   defines=defines,
+                                                   extra_bin=extra_bin)
 
     # And now find expat
     # If we have apr-util as a source location, it is in a subdir.
@@ -499,14 +531,14 @@ class GenDependenciesBase(gen_base.Gener
       inc_path = os.path.join(self.apr_util_path, 'include')
       lib_dir = os.path.join(self.apr_util_path, 'lib')
       debug_lib_dir = None
-      
+
     version_file_path = os.path.join(inc_path, 'expat.h')
 
     if not os.path.exists(version_file_path):
       sys.stderr.write("ERROR: '%s' not found.\n" % version_file_path);
       sys.stderr.write("Use '--with-apr-util' option to configure APR-Util's XML location.\n");
       sys.exit(1)
-      
+
     txt = open(version_file_path).read()
 
     vermatch = re.search(r'^\s*#define\s+XML_MAJOR_VERSION\s+(\d+)', txt, re.M)
@@ -518,14 +550,130 @@ class GenDependenciesBase(gen_base.Gener
     vermatch = re.search(r'^\s*#define\s+XML_MICRO_VERSION\s+(\d+)', txt, re.M)
     patch = int(vermatch.group(1))
 
+    # apr-Util 0.9-1.4 compiled expat to 'xml.lib', but apr-util 1.5 switched
+    # to the more common 'libexpat.lib'
+    libname = 'libexpat.lib'
+    if not os.path.exists(os.path.join(lib_dir, 'libexpat.lib')):
+      libname = 'xml.lib'
+
     version = (major, minor, patch)
     xml_version = '%d.%d.%d' % version
 
     self._libraries['xml'] = SVNCommonLibrary('expat', inc_path, lib_dir,
-                                               'xml.lib', xml_version,
+                                               libname, xml_version,
                                                debug_lib_dir = debug_lib_dir,
                                                defines=['XML_STATIC'])
 
+  def _find_httpd(self, show_warning):
+    "Find Apache HTTPD and version"
+
+    minimal_httpd_version = (2, 0, 0)
+    if not self.httpd_path:
+      return
+
+    inc_base = os.path.join(self.httpd_path, 'include')
+
+    if os.path.isfile(os.path.join(inc_base, 'apache26', 'ap_release.h')):
+      inc_path = os.path.join(inc_base, 'apache26')
+    elif os.path.isfile(os.path.join(inc_base, 'apache24', 'ap_release.h')):
+      inc_path = os.path.join(inc_base, 'apache24')
+    elif os.path.isfile(os.path.join(inc_base, 'apache22', 'ap_release.h')):
+      inc_path = os.path.join(inc_base, 'apache22')
+    elif os.path.isfile(os.path.join(inc_base, 'apache20', 'ap_release.h')):
+      inc_path = os.path.join(inc_base, 'apache20')
+    elif os.path.isfile(os.path.join(inc_base, 'apache2', 'ap_release.h')):
+      inc_path = os.path.join(inc_base, 'apache2')
+    elif os.path.isfile(os.path.join(inc_base, 'apache', 'ap_release.h')):
+      inc_path = os.path.join(inc_base, 'apache')
+    elif os.path.isfile(os.path.join(inc_base, 'ap_release.h')):
+      inc_path = inc_base
+    else:
+      if show_warning:
+        print('WARNING: \'ap_release.h\' not found')
+        print("Use '--with-httpd' to configure openssl location.");
+      return
+
+    version_file_path = os.path.join(inc_path, 'ap_release.h')
+    txt = open(version_file_path).read()
+
+    vermatch = re.search(r'^\s*#define\s+AP_SERVER_MAJORVERSION_NUMBER\s+(\d+)',
+                         txt, re.M)
+    major = int(vermatch.group(1))
+
+    vermatch = re.search(r'^\s*#define\s+AP_SERVER_MINORVERSION_NUMBER\s+(\d+)',
+                         txt, re.M)
+    minor = int(vermatch.group(1))
+
+    vermatch = re.search(r'^\s*#define\s+AP_SERVER_PATCHLEVEL_NUMBER\s+(\d+)',
+                         txt, re.M)
+    patch = int(vermatch.group(1))
+
+    version = (major, minor, patch)
+    httpd_version = '%d.%d.%d' % version
+
+    if version < minimal_httpd_version:
+      if show_warning:
+        print("WARNING: httpd %s or higher is required "
+                        "(%s found)\n" % (
+                          '.'.join(str(v) for v in minimal_httpd_version),
+                          httpd_version))
+      return
+
+    lib_name = 'libhttpd.lib'
+    lib_base = self.httpd_path
+
+    debug_lib_dir = None
+
+    if os.path.isfile(os.path.join(lib_base, 'lib', lib_name)):
+      # Install location
+      lib_dir = os.path.join(lib_base, 'lib')
+    elif os.path.isfile(os.path.join(lib_base, 'Release', lib_name)):
+      # Source location
+      lib_dir = os.path.join(lib_base, 'Release')
+      if os.path.isfile(os.path.join(lib_base, 'Debug', lib_name)):
+        debug_lib_dir = os.path.join(lib_base, 'Debug')
+
+    # Our modules run inside httpd, so we don't have to find binaries
+
+    self._libraries['httpd'] = SVNCommonLibrary('httpd', inc_path, lib_dir, lib_name,
+                                                httpd_version,
+                                                debug_lib_dir=debug_lib_dir,
+                                                defines=['AP_DECLARE_EXPORT'])
+
+    # And now find mod_dav
+
+    if os.path.isfile(os.path.join(inc_path, 'mod_dav.h')):
+      # Install location, we are lucky
+      inc_path = inc_path
+    elif os.path.isfile(os.path.join(lib_base, 'modules/dav/main/mod_dav.h')):
+      # Source location
+      inc_path = os.path.join(lib_base, 'modules/dav/main')
+    else:
+      if show_warning:
+        print("WARNING: Can't find mod_dav.h in the httpd directory")
+        return
+
+    lib_name = 'mod_dav.lib'
+    if os.path.isfile(os.path.join(lib_dir, lib_name)):
+      # Same location as httpd
+      lib_dir = lib_dir
+    elif os.path.isfile(os.path.join(lib_base, 'modules/dav/main/Release', lib_name)):
+      # Source location
+      lib_dir = os.path.join(lib_base, 'modules/dav/main/Release')
+
+      if os.path.isfile(os.path.join(lib_base, 'modules/dav/main/Debug', lib_name)):
+        debug_lib_dir = os.path.join(lib_base, 'modules/dav/main/Debug')
+      else:
+        debug_lib_dir = None
+    else:
+      if show_warning:
+        print("WARNING: Can't find mod_dav.lib in the httpd directory")
+        return
+
+    self._libraries['mod_dav'] = SVNCommonLibrary('mod_dav', inc_path, lib_dir, lib_name,
+                                                  httpd_version,
+                                                  debug_lib_dir=debug_lib_dir)
+
   def _find_zlib(self):
     "Find the ZLib library and version"
 
@@ -732,8 +880,8 @@ class GenDependenciesBase(gen_base.Gener
       line = fp.readline()
       if line:
         perl_version = line.strip()
-        perlv = perl_version.split('.')
-        perl_lib = 'perl%s%s.lib' % (perlv[0], perlv[1])
+        perl_ver = perl_version.split('.')
+        perl_lib = 'perl%s%s.lib' % (perl_ver[0], perl_ver[1])
       else:
         return
 
@@ -744,8 +892,15 @@ class GenDependenciesBase(gen_base.Gener
     finally:
       fp.close()
 
+    perl_ver = tuple(map(int, perl_ver))
+    forced_includes = []
+
+    if perl_ver >= (5, 18, 0):
+      forced_includes.append('swigutil_pl__pre_perl.h')
+
     self._libraries['perl'] = SVNCommonLibrary('perl', inc_dir, lib_dir,
-                                               perl_lib, perl_version)
+                                               perl_lib, perl_version,
+                                               forced_includes=forced_includes)
 
   def _find_ruby(self, show_warnings):
     "Find the right Ruby library name to link swig bindings with"

Modified: subversion/branches/fsfs-improvements/build/generator/templates/vcnet_vcproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/build/generator/templates/vcnet_vcproj.ezt?rev=1545955&r1=1545954&r2=1545955&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/build/generator/templates/vcnet_vcproj.ezt (original)
+++ subversion/branches/fsfs-improvements/build/generator/templates/vcnet_vcproj.ezt Wed Nov 27 07:53:29 2013
@@ -56,7 +56,7 @@
 				RuntimeLibrary="2"
 				BufferSecurityCheck="FALSE"
 [end]				WarningLevel="4"
-				DisableSpecificWarnings="4100;4127;4206;4701;4706"
+				DisableSpecificWarnings="4100;4127;4206;4512;4701;4706;4800"
 				Detect64BitPortabilityProblems="FALSE"
 				AdditionalOptions="
 				/we4002 /we4003 /we4013 /we4020 /we4022 /we4024 /we4028 /we4029 /we4030 /we4031 /we4033 /we4047 /we4089 /we4113 /we4115 /we4204 /we4715"
@@ -75,7 +75,7 @@
 [is target_type "4"][else]				OutputFile="$(OutDir)\[target.output_name]"
 [end][is configs.name "Debug"]				LinkIncremental="2"
 [else]				LinkIncremental="1"
-[end]				AdditionalLibraryDirectories="..\..\..\db4-win32\lib;[for configs.libdirs][configs.libdirs];[end]"
+[end]				AdditionalLibraryDirectories="[for configs.libdirs][configs.libdirs];[end]"
 				TargetMachine="[is platforms "Win32"]1[end][is platforms "x64"]17[end]"
 				IgnoreDefaultLibraryNames="libc.lib[is configs.name "debug"];msvcrt.lib[end]"
 [if-any def_file]				ModuleDefinitionFile="[def_file]"

Modified: subversion/branches/fsfs-improvements/build/generator/templates/vcnet_vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/build/generator/templates/vcnet_vcxproj.ezt?rev=1545955&r1=1545954&r2=1545955&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/build/generator/templates/vcnet_vcxproj.ezt (original)
+++ subversion/branches/fsfs-improvements/build/generator/templates/vcnet_vcxproj.ezt Wed Nov 27 07:53:29 2013
@@ -63,7 +63,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <BrowseInformation>true</BrowseInformation>
       <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <DisableSpecificWarnings>4100;4127;4206;4701;4706;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4100;4127;4206;4512;4701;4706;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <TreatSpecificWarningsAsErrors>4002;4003;4013;4020;4022;4024;4028;4029;4030;4031;4033;4047;4089;4113;4115;4204;4715;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
 [if-any configs.forced_include_files]      <ForcedIncludeFiles>[for configs.forced_include_files][configs.forced_include_files];[end]%(ForcedIncludeFiles)</ForcedIncludeFiles>
 [end]    </ClCompile>

Modified: subversion/branches/fsfs-improvements/build/run_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/build/run_tests.py?rev=1545955&r1=1545954&r2=1545955&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/build/run_tests.py (original)
+++ subversion/branches/fsfs-improvements/build/run_tests.py Wed Nov 27 07:53:29 2013
@@ -377,6 +377,8 @@ class TestHarness:
       cmdline.append('--list')
     if self.mode_filter is not None:
       cmdline.append('--mode-filter=' + self.mode_filter)
+    if self.parallel is not None:
+      cmdline.append('--parallel')
 
     if test_nums:
       test_nums = test_nums.split(',')

Modified: subversion/branches/fsfs-improvements/build/transform_sql.py
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/build/transform_sql.py?rev=1545955&r1=1545954&r2=1545955&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/build/transform_sql.py (original)
+++ subversion/branches/fsfs-improvements/build/transform_sql.py Wed Nov 27 07:53:29 2013
@@ -148,6 +148,12 @@ class Processor(object):
       # RELPATH_SKIP_JOIN(x, y, z) skips the x prefix from z and the joins the
       # result after y. In other words it replaces x with y, but follows the
       # relpath rules.
+      #
+      # This matches the C version of:
+      #     svn_relpath_join(y, svn_relpath_skip_ancestor(x, z), pool)
+      # but returns an SQL NULL in case z is not below x.
+      #
+
       line = re.sub(
              r'RELPATH_SKIP_JOIN[(]([?]?[A-Za-z0-9_.]+), ' +
                                  r'([?]?[A-Za-z0-9_.]+), ' +

Modified: subversion/branches/fsfs-improvements/build/win32/svn.rc
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/build/win32/svn.rc?rev=1545955&r1=1545954&r2=1545955&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/build/win32/svn.rc (original)
+++ subversion/branches/fsfs-improvements/build/win32/svn.rc Wed Nov 27 07:53:29 2013
@@ -74,7 +74,7 @@ BEGIN
       VALUE "FileDescription", APR_STRINGIFY(SVN_FILE_DESCRIPTION) "\0"
       VALUE "FileVersion", SVN_VER_NUMBER "\0"
       VALUE "InternalName", "SVN\0"
-      VALUE "LegalCopyright", "Copyright (c) 2011 The Apache Software Foundation\0"
+      VALUE "LegalCopyright", "Copyright (c) The Apache Software Foundation\0"
       VALUE "OriginalFilename", APR_STRINGIFY(SVN_FILE_NAME) "\0"
       VALUE "ProductName", "Subversion\0"
       VALUE "ProductVersion", SVN_VERSION "\0"

Modified: subversion/branches/fsfs-improvements/configure.ac
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/configure.ac?rev=1545955&r1=1545954&r2=1545955&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/configure.ac (original)
+++ subversion/branches/fsfs-improvements/configure.ac Wed Nov 27 07:53:29 2013
@@ -567,58 +567,69 @@ found_gnome_keyring=no
 AC_MSG_CHECKING([whether to look for GNOME Keyring])
 if test "$with_gnome_keyring" != "no"; then
   AC_MSG_RESULT([yes])
-  if test "$svn_enable_shared" = "yes"; then
-    if test "$APR_HAS_DSO" = "yes"; then
-      if test -n "$PKG_CONFIG"; then
-        AC_MSG_CHECKING([for GLib and GNOME Keyring .pc files])
-        if $PKG_CONFIG --exists glib-2.0 gnome-keyring-1; then
-          AC_MSG_RESULT([yes])
-          old_CPPFLAGS="$CPPFLAGS"
-          SVN_GNOME_KEYRING_INCLUDES="`$PKG_CONFIG --cflags glib-2.0 gnome-keyring-1`"
-          CPPFLAGS="$CPPFLAGS $SVN_GNOME_KEYRING_INCLUDES"
-          AC_CHECK_HEADER(gnome-keyring.h, found_gnome_keyring=yes, found_gnome_keyring=no)
-          AC_MSG_CHECKING([for GNOME Keyring])
-          if test "$found_gnome_keyring" = "yes"; then
+  case "$host" in
+  *-*-darwin*)
+    if test "$with_gnome_keyring" = "yes"; then
+      AC_MSG_ERROR([--with-gnome-keyring is not supported on Mac OS X.])
+    else
+      with_gnome_keyring=no
+    fi
+    ;;
+  *)
+    if test "$svn_enable_shared" = "yes"; then
+      if test "$APR_HAS_DSO" = "yes"; then
+        if test -n "$PKG_CONFIG"; then
+          AC_MSG_CHECKING([for GLib and GNOME Keyring .pc files])
+          if $PKG_CONFIG --exists glib-2.0 gnome-keyring-1; then
             AC_MSG_RESULT([yes])
-            AC_DEFINE([SVN_HAVE_GNOME_KEYRING], [1], 
-                      [Is GNOME Keyring support enabled?])
-            CPPFLAGS="$old_CPPFLAGS"
-            SVN_GNOME_KEYRING_LIBS="`$PKG_CONFIG --libs glib-2.0 gnome-keyring-1`"
+            old_CPPFLAGS="$CPPFLAGS"
+            SVN_GNOME_KEYRING_INCLUDES="`$PKG_CONFIG --cflags glib-2.0 gnome-keyring-1`"
+            CPPFLAGS="$CPPFLAGS $SVN_GNOME_KEYRING_INCLUDES"
+            AC_CHECK_HEADER(gnome-keyring.h, found_gnome_keyring=yes, found_gnome_keyring=no)
+            AC_MSG_CHECKING([for GNOME Keyring])
+            if test "$found_gnome_keyring" = "yes"; then
+              AC_MSG_RESULT([yes])
+              AC_DEFINE([SVN_HAVE_GNOME_KEYRING], [1], 
+                        [Is GNOME Keyring support enabled?])
+              CPPFLAGS="$old_CPPFLAGS"
+              SVN_GNOME_KEYRING_LIBS="`$PKG_CONFIG --libs glib-2.0 gnome-keyring-1`"
+            else
+              AC_MSG_RESULT([no])
+              if test "$with_gnome_keyring" = "yes"; then
+                AC_MSG_ERROR([cannot find GNOME Keyring])
+              fi
+            fi
           else
             AC_MSG_RESULT([no])
             if test "$with_gnome_keyring" = "yes"; then
-              AC_MSG_ERROR([cannot find GNOME Keyring])
+              AC_MSG_ERROR([cannot find GLib and GNOME Keyring .pc files.])
+            else
+              with_gnome_keyring=no
             fi
           fi
         else
-          AC_MSG_RESULT([no])
           if test "$with_gnome_keyring" = "yes"; then
-            AC_MSG_ERROR([cannot find GLib and GNOME Keyring .pc files.])
+            AC_MSG_ERROR([cannot find pkg-config. GNOME Keyring requires this.])
           else
             with_gnome_keyring=no
           fi
         fi
       else
         if test "$with_gnome_keyring" = "yes"; then
-          AC_MSG_ERROR([cannot find pkg-config. GNOME Keyring requires this.])
+          AC_MSG_ERROR([APR does not have support for DSOs. GNOME Keyring requires this.])
         else
           with_gnome_keyring=no
         fi
       fi
     else
       if test "$with_gnome_keyring" = "yes"; then
-        AC_MSG_ERROR([APR does not have support for DSOs. GNOME Keyring requires this.])
+        AC_MSG_ERROR([--with-gnome-keyring conflicts with --disable-shared])
       else
         with_gnome_keyring=no
       fi
     fi
-  else
-    if test "$with_gnome_keyring" = "yes"; then
-      AC_MSG_ERROR([--with-gnome-keyring conflicts with --disable-shared])
-    else
-      with_gnome_keyring=no
-    fi
-  fi
+    ;;
+  esac
 else
   AC_MSG_RESULT([no])
 fi

Modified: subversion/branches/fsfs-improvements/contrib/server-side/fsfsverify.py
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/contrib/server-side/fsfsverify.py?rev=1545955&r1=1545954&r2=1545955&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/contrib/server-side/fsfsverify.py (original)
+++ subversion/branches/fsfs-improvements/contrib/server-side/fsfsverify.py Wed Nov 27 07:53:29 2013
@@ -767,9 +767,10 @@ class NodeRev(object):
                   if not os.path.exists(str(nodeId.rev)):
                       print "Can't check %s" % repr(nodeId)
                       continue
-                  with open(str(nodeId.rev),'rb') as tmp:
-                      tmp.seek(nodeId.offset)
-                      idLine = tmp.readline()
+                  tmp = open(str(nodeId.rev),'rb')
+                  tmp.seek(nodeId.offset)
+                  idLine = tmp.readline()
+                  tmp.close()
               else:
                   f.seek(nodeId.offset)
                   idLine = f.readline()

Modified: subversion/branches/fsfs-improvements/contrib/server-side/svncutter/svncutter
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/contrib/server-side/svncutter/svncutter?rev=1545955&r1=1545954&r2=1545955&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/contrib/server-side/svncutter/svncutter (original)
+++ subversion/branches/fsfs-improvements/contrib/server-side/svncutter/svncutter Wed Nov 27 07:53:29 2013
@@ -126,10 +126,12 @@ in the LOGFILE, which should be in the f
 Replacements may be restricted to a specified range.
 """,
     "skeleton": """\
-skeleton: usage: svncutter [-r SELECTION] skeleton
+skeleton: usage: svncutter [-r SELECTION] skeleton PATTERN...
 
-Replace content with unique generated cookies.  Useful
-when you need to examine a particularly complex node structure.
+Replace content with unique generated cookies on all node paths
+matching the specified regular expressions; if no expressions are
+given, match all paths.  Useful when you need to examine a
+particularly complex node structure.
 """,
     "expunge": """\
 expunge: usage: svncutter [-r SELECTION ] expunge PATTERN...
@@ -725,7 +727,7 @@ def setlog(source, logpatch, selection):
         return (propkeys, propdict)
     source.apply_property_hook(selection, loghook)
 
-def skeletonize(source, selection):
+def skeletonize(source, selection, patterns):
     "Skeletonize a portion of the dump file defined by a revision selection."
     def __skeletonize(header, properties, content):
         def get_header(hd, name):
@@ -733,6 +735,18 @@ def skeletonize(source, selection):
             return m and m.group(1)
         def set_length(hd, name, val):
             return re.sub("(?<=%s: )[0-9]+" % name, str(val), hd)
+
+        # first check against the pattern
+        ok = True
+        for pattern in patterns:
+            if header.startswith("Node-path: ") and re.search(pattern, header[11:]):
+                #sys.stderr.write("skeletonize skipping: " + header[11:header.index("\n")] +"\n")
+                ok = False
+                break
+        if not ok:
+            return header + properties + content
+        del ok
+
         if content:
             tell = "Revision is %s, file path is %s.\n\n\n" % \
                       (source.revision, get_header(header, "Node-path"),)
@@ -756,7 +770,8 @@ def expunge(source, selection, patterns)
     "Strip out ops defined by a revision selection and a path regexp."
     def __expunge(header, properties, content):
         for pattern in patterns:
-            if re.search("Node-path: " + pattern, header):
+            if header.startswith("Node-path: ") and re.search(pattern, header[11:]):
+                #sys.stderr.write("expunge skipping: " + header[11:header.index("\n")] +"\n")
                 return ""
         else:
             return header + properties + content
@@ -840,9 +855,9 @@ if __name__ == '__main__':
                 sys.stderr.write("svncutter: setlog requires a log entries file.\n")
             setlog(DumpfileSource(sys.stdin, baton), logpatch, selection)
         elif arguments[0] == "skeleton":
-            skeletonize(DumpfileSource(sys.stdin, baton), selection)
+            skeletonize(DumpfileSource(sys.stdin, baton), selection, arguments[1:])
         elif arguments[0] == "expunge":
-            expunge(DumpfileSource(sys.stdin, baton), selection, arguments)
+            expunge(DumpfileSource(sys.stdin, baton), selection, arguments[1:])
         elif arguments[0] == "renumber":
             renumber(DumpfileSource(sys.stdin, baton))
         elif arguments[0] == "help":

Modified: subversion/branches/fsfs-improvements/notes/knobs
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/notes/knobs?rev=1545955&r1=1545954&r2=1545955&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/notes/knobs (original)
+++ subversion/branches/fsfs-improvements/notes/knobs Wed Nov 27 07:53:29 2013
@@ -52,6 +52,7 @@ SVN_FS_FS_DELTIFY_DIRECTORIES
 SVN_FS_FS_DELTIFY_PROPS
 SVN_SQLITE_MIN_VERSION_NUMBER
 SVN_SQLITE_MIN_VERSION
+SVN_SERF_NO_LOGGING
 
 2.3 Debugging Support
 



Mime
View raw message