Author: rhuijben
Date: Tue Oct 11 09:11:50 2016
New Revision: 1764214

URL: http://svn.apache.org/viewvc?rev=1764214&view=rev
Log:
Bring up to date with trunk, resolving a few minor text conflicts in build.conf

Added:
    subversion/branches/ra-git/notes/meetings/berlin-16-minutes
      - copied unchanged from r1764213, 
subversion/trunk/notes/meetings/berlin-16-minutes
    subversion/branches/ra-git/notes/move-tracking/path_pairs_to_eid_map.py
      - copied unchanged from r1764213, 
subversion/trunk/notes/move-tracking/path_pairs_to_eid_map.py
    subversion/branches/ra-git/subversion/bindings/swig/include/proxy.py
      - copied unchanged from r1764213, 
subversion/trunk/subversion/bindings/swig/include/proxy.py
    subversion/branches/ra-git/subversion/include/private/ra_svn_wrapped_sasl.h
      - copied unchanged from r1764213, 
subversion/trunk/subversion/include/private/ra_svn_wrapped_sasl.h
    subversion/branches/ra-git/subversion/libsvn_client/conflicts.c
      - copied unchanged from r1764213, 
subversion/trunk/subversion/libsvn_client/conflicts.c
    subversion/branches/ra-git/subversion/libsvn_client/merge_elements.c
      - copied unchanged from r1764213, 
subversion/trunk/subversion/libsvn_client/merge_elements.c
    subversion/branches/ra-git/subversion/libsvn_ra_serf/request_body.c
      - copied unchanged from r1764213, 
subversion/trunk/subversion/libsvn_ra_serf/request_body.c
    subversion/branches/ra-git/subversion/libsvn_ra_svn/wrapped_sasl.c
      - copied unchanged from r1764213, 
subversion/trunk/subversion/libsvn_ra_svn/wrapped_sasl.c
    subversion/branches/ra-git/subversion/libsvn_repos/compat.c
      - copied unchanged from r1764213, 
subversion/trunk/subversion/libsvn_repos/compat.c
    subversion/branches/ra-git/subversion/tests/libsvn_client/conflicts-test.c
      - copied unchanged from r1764213, 
subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c
    
subversion/branches/ra-git/tools/buildbot/slaves/svn-sparc-solaris/mount-tmpfs.c
      - copied unchanged from r1764213, 
subversion/trunk/tools/buildbot/slaves/svn-sparc-solaris/mount-tmpfs.c
    
subversion/branches/ra-git/tools/buildbot/slaves/svn-sparc-solaris/rebuild-svn-bits.sh
      - copied unchanged from r1764213, 
subversion/trunk/tools/buildbot/slaves/svn-sparc-solaris/rebuild-svn-bits.sh
    
subversion/branches/ra-git/tools/buildbot/slaves/svn-sparc-solaris/serf.patch
      - copied unchanged from r1764213, 
subversion/trunk/tools/buildbot/slaves/svn-sparc-solaris/serf.patch
    
subversion/branches/ra-git/tools/buildbot/slaves/svn-sparc-solaris/twisted.patch
      - copied unchanged from r1764213, 
subversion/trunk/tools/buildbot/slaves/svn-sparc-solaris/twisted.patch
    subversion/branches/ra-git/tools/dev/find-control-statements.py
      - copied unchanged from r1764213, 
subversion/trunk/tools/dev/find-control-statements.py
    subversion/branches/ra-git/tools/dist/backport_unicode_entry.dump
      - copied unchanged from r1764213, 
subversion/trunk/tools/dist/backport_unicode_entry.dump
Removed:
    subversion/branches/ra-git/contrib/server-side/svncutter/svncutter
    subversion/branches/ra-git/subversion/libsvn_ra_serf/README
Modified:
    subversion/branches/ra-git/   (props changed)
    subversion/branches/ra-git/CHANGES
    subversion/branches/ra-git/COMMITTERS
    subversion/branches/ra-git/INSTALL
    subversion/branches/ra-git/Makefile.in
    subversion/branches/ra-git/NOTICE
    subversion/branches/ra-git/README
    subversion/branches/ra-git/build.conf
    subversion/branches/ra-git/build/ac-macros/apache.m4
    subversion/branches/ra-git/build/ac-macros/kwallet.m4
    subversion/branches/ra-git/build/ac-macros/swig.m4
    subversion/branches/ra-git/build/ac-macros/zlib.m4
    subversion/branches/ra-git/build/generator/gen_base.py
    subversion/branches/ra-git/build/generator/gen_win_dependencies.py
    subversion/branches/ra-git/build/run_tests.py
    subversion/branches/ra-git/build/win32/svn.rc
    subversion/branches/ra-git/configure.ac
    subversion/branches/ra-git/contrib/client-side/incremental-update.py
    subversion/branches/ra-git/contrib/client-side/svn-hgmerge.py
    subversion/branches/ra-git/contrib/client-side/svn-merge-vendor.py
    subversion/branches/ra-git/contrib/client-side/svn_apply_autoprops.py
    subversion/branches/ra-git/contrib/client-side/svn_export_empty_files.py
    
subversion/branches/ra-git/contrib/client-side/svnmerge/svnmerge-migrate-history-remotely.py
    
subversion/branches/ra-git/contrib/client-side/svnmerge/svnmerge-migrate-history.py
    subversion/branches/ra-git/contrib/client-side/svnmerge/svnmerge.py
    subversion/branches/ra-git/contrib/client-side/svnmerge/svnmerge_test.py
    subversion/branches/ra-git/contrib/hook-scripts/hook_toolbox.py
    subversion/branches/ra-git/contrib/hook-scripts/remove-zombie-locks.py
    subversion/branches/ra-git/contrib/server-side/add-needs-lock.py
    
subversion/branches/ra-git/contrib/server-side/fsfsfixer/fixer/find_good_id.py
    subversion/branches/ra-git/contrib/server-side/fsfsfixer/fixer/fix-rev.py
    subversion/branches/ra-git/contrib/server-side/fsfsverify.py
    subversion/branches/ra-git/contrib/server-side/svn-tweak-author.py
    subversion/branches/ra-git/contrib/server-side/svncutter/README
    subversion/branches/ra-git/get-deps.sh
    subversion/branches/ra-git/notes/directory-index/dirindex.py
    subversion/branches/ra-git/notes/knobs
    subversion/branches/ra-git/notes/svnsync.txt
    subversion/branches/ra-git/subversion/bindings/ctypes-python/README
    
subversion/branches/ra-git/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
    
subversion/branches/ra-git/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRemote.java
    
subversion/branches/ra-git/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/StatusEditor.java
    subversion/branches/ra-git/subversion/bindings/swig/INSTALL
    subversion/branches/ra-git/subversion/bindings/swig/include/proxy.swg
    subversion/branches/ra-git/subversion/bindings/swig/perl/native/Base.pm
    subversion/branches/ra-git/subversion/bindings/swig/python/tests/core.py
    
subversion/branches/ra-git/subversion/bindings/swig/python/tests/repository.py
    subversion/branches/ra-git/subversion/include/private/ra_svn_sasl.h
    subversion/branches/ra-git/subversion/include/private/svn_branch.h
    subversion/branches/ra-git/subversion/include/private/svn_branch_impl.h
    subversion/branches/ra-git/subversion/include/private/svn_cmdline_private.h
    subversion/branches/ra-git/subversion/include/private/svn_diff_private.h
    subversion/branches/ra-git/subversion/include/private/svn_fs_private.h
    subversion/branches/ra-git/subversion/include/private/svn_fs_util.h
    subversion/branches/ra-git/subversion/include/private/svn_io_private.h
    subversion/branches/ra-git/subversion/include/private/svn_packed_data.h
    subversion/branches/ra-git/subversion/include/private/svn_ra_svn_private.h
    subversion/branches/ra-git/subversion/include/private/svn_repos_private.h
    subversion/branches/ra-git/subversion/include/private/svn_sqlite.h
    subversion/branches/ra-git/subversion/include/private/svn_utf_private.h
    subversion/branches/ra-git/subversion/include/private/svn_wc_private.h
    subversion/branches/ra-git/subversion/include/svn_client.h
    subversion/branches/ra-git/subversion/include/svn_error_codes.h
    subversion/branches/ra-git/subversion/include/svn_fs.h
    subversion/branches/ra-git/subversion/include/svn_io.h
    subversion/branches/ra-git/subversion/include/svn_repos.h
    subversion/branches/ra-git/subversion/include/svn_types.h
    subversion/branches/ra-git/subversion/include/svn_wc.h
    subversion/branches/ra-git/subversion/include/svn_x509.h
    subversion/branches/ra-git/subversion/libsvn_client/client.h
    subversion/branches/ra-git/subversion/libsvn_client/copy.c
    subversion/branches/ra-git/subversion/libsvn_client/diff.c
    subversion/branches/ra-git/subversion/libsvn_client/diff_local.c
    subversion/branches/ra-git/subversion/libsvn_client/externals.c
    subversion/branches/ra-git/subversion/libsvn_client/merge.c
    subversion/branches/ra-git/subversion/libsvn_client/mtcc.c
    subversion/branches/ra-git/subversion/libsvn_client/patch.c
    subversion/branches/ra-git/subversion/libsvn_client/relocate.c
    subversion/branches/ra-git/subversion/libsvn_client/resolved.c
    subversion/branches/ra-git/subversion/libsvn_client/revisions.c
    subversion/branches/ra-git/subversion/libsvn_delta/branch.c
    subversion/branches/ra-git/subversion/libsvn_delta/branch_compat.c
    subversion/branches/ra-git/subversion/libsvn_delta/branch_nested.c
    subversion/branches/ra-git/subversion/libsvn_diff/binary_diff.c
    subversion/branches/ra-git/subversion/libsvn_diff/diff3.c
    subversion/branches/ra-git/subversion/libsvn_diff/parse-diff.c
    subversion/branches/ra-git/subversion/libsvn_fs/deprecated.c
    subversion/branches/ra-git/subversion/libsvn_fs/fs-loader.c
    subversion/branches/ra-git/subversion/libsvn_fs/fs-loader.h
    subversion/branches/ra-git/subversion/libsvn_fs_base/tree.c
    subversion/branches/ra-git/subversion/libsvn_fs_fs/cached_data.c
    subversion/branches/ra-git/subversion/libsvn_fs_fs/cached_data.h
    subversion/branches/ra-git/subversion/libsvn_fs_fs/caching.c
    subversion/branches/ra-git/subversion/libsvn_fs_fs/dag.c
    subversion/branches/ra-git/subversion/libsvn_fs_fs/fs.c
    subversion/branches/ra-git/subversion/libsvn_fs_fs/fs.h
    subversion/branches/ra-git/subversion/libsvn_fs_fs/fs_fs.c
    subversion/branches/ra-git/subversion/libsvn_fs_fs/hotcopy.c
    subversion/branches/ra-git/subversion/libsvn_fs_fs/id.c
    subversion/branches/ra-git/subversion/libsvn_fs_fs/low_level.c
    subversion/branches/ra-git/subversion/libsvn_fs_fs/low_level.h
    subversion/branches/ra-git/subversion/libsvn_fs_fs/pack.c
    subversion/branches/ra-git/subversion/libsvn_fs_fs/pack.h
    subversion/branches/ra-git/subversion/libsvn_fs_fs/rep-cache.c
    subversion/branches/ra-git/subversion/libsvn_fs_fs/rep-cache.h
    subversion/branches/ra-git/subversion/libsvn_fs_fs/revprops.c
    subversion/branches/ra-git/subversion/libsvn_fs_fs/revprops.h
    subversion/branches/ra-git/subversion/libsvn_fs_fs/stats.c
    subversion/branches/ra-git/subversion/libsvn_fs_fs/temp_serializer.c
    subversion/branches/ra-git/subversion/libsvn_fs_fs/temp_serializer.h
    subversion/branches/ra-git/subversion/libsvn_fs_fs/transaction.c
    subversion/branches/ra-git/subversion/libsvn_fs_fs/tree.c
    subversion/branches/ra-git/subversion/libsvn_fs_fs/util.c
    subversion/branches/ra-git/subversion/libsvn_fs_fs/util.h
    subversion/branches/ra-git/subversion/libsvn_fs_util/fs-util.c
    subversion/branches/ra-git/subversion/libsvn_fs_x/   (props changed)
    subversion/branches/ra-git/subversion/libsvn_fs_x/batch_fsync.c
    subversion/branches/ra-git/subversion/libsvn_fs_x/batch_fsync.h
    subversion/branches/ra-git/subversion/libsvn_fs_x/cached_data.c
    subversion/branches/ra-git/subversion/libsvn_fs_x/cached_data.h
    subversion/branches/ra-git/subversion/libsvn_fs_x/caching.c
    subversion/branches/ra-git/subversion/libsvn_fs_x/changes.c
    subversion/branches/ra-git/subversion/libsvn_fs_x/changes.h
    subversion/branches/ra-git/subversion/libsvn_fs_x/fs.c
    subversion/branches/ra-git/subversion/libsvn_fs_x/fs.h
    subversion/branches/ra-git/subversion/libsvn_fs_x/fs_x.c
    subversion/branches/ra-git/subversion/libsvn_fs_x/hotcopy.c
    subversion/branches/ra-git/subversion/libsvn_fs_x/index.c
    subversion/branches/ra-git/subversion/libsvn_fs_x/index.h
    subversion/branches/ra-git/subversion/libsvn_fs_x/lock.c
    subversion/branches/ra-git/subversion/libsvn_fs_x/low_level.c
    subversion/branches/ra-git/subversion/libsvn_fs_x/low_level.h
    subversion/branches/ra-git/subversion/libsvn_fs_x/pack.c
    subversion/branches/ra-git/subversion/libsvn_fs_x/rep-cache.c
    subversion/branches/ra-git/subversion/libsvn_fs_x/rep-cache.h
    subversion/branches/ra-git/subversion/libsvn_fs_x/rev_file.c
    subversion/branches/ra-git/subversion/libsvn_fs_x/revprops.c
    subversion/branches/ra-git/subversion/libsvn_fs_x/revprops.h
    subversion/branches/ra-git/subversion/libsvn_fs_x/temp_serializer.c
    subversion/branches/ra-git/subversion/libsvn_fs_x/temp_serializer.h
    subversion/branches/ra-git/subversion/libsvn_fs_x/transaction.c
    subversion/branches/ra-git/subversion/libsvn_fs_x/transaction.h
    subversion/branches/ra-git/subversion/libsvn_fs_x/tree.c
    subversion/branches/ra-git/subversion/libsvn_fs_x/util.c
    subversion/branches/ra-git/subversion/libsvn_fs_x/util.h
    subversion/branches/ra-git/subversion/libsvn_ra_local/ra_plugin.c
    subversion/branches/ra-git/subversion/libsvn_ra_serf/commit.c
    subversion/branches/ra-git/subversion/libsvn_ra_serf/ra_serf.h
    subversion/branches/ra-git/subversion/libsvn_ra_serf/update.c
    subversion/branches/ra-git/subversion/libsvn_ra_svn/cyrus_auth.c
    subversion/branches/ra-git/subversion/libsvn_ra_svn/marshal.c
    subversion/branches/ra-git/subversion/libsvn_repos/commit.c
    subversion/branches/ra-git/subversion/libsvn_repos/config_pool.c
    subversion/branches/ra-git/subversion/libsvn_repos/delta.c
    subversion/branches/ra-git/subversion/libsvn_repos/deprecated.c
    subversion/branches/ra-git/subversion/libsvn_repos/log.c
    subversion/branches/ra-git/subversion/libsvn_repos/replay.c
    subversion/branches/ra-git/subversion/libsvn_repos/reporter.c
    subversion/branches/ra-git/subversion/libsvn_repos/repos.c
    subversion/branches/ra-git/subversion/libsvn_repos/repos.h
    subversion/branches/ra-git/subversion/libsvn_repos/rev_hunt.c
    subversion/branches/ra-git/subversion/libsvn_subr/cache-membuffer.c
    subversion/branches/ra-git/subversion/libsvn_subr/checksum.c
    subversion/branches/ra-git/subversion/libsvn_subr/cmdline.c
    subversion/branches/ra-git/subversion/libsvn_subr/deprecated.c
    subversion/branches/ra-git/subversion/libsvn_subr/eol.c
    subversion/branches/ra-git/subversion/libsvn_subr/gpg_agent.c
    subversion/branches/ra-git/subversion/libsvn_subr/io.c
    subversion/branches/ra-git/subversion/libsvn_subr/packed_data.c
    subversion/branches/ra-git/subversion/libsvn_subr/path.c
    subversion/branches/ra-git/subversion/libsvn_subr/pool.c
    subversion/branches/ra-git/subversion/libsvn_subr/prefix_string.c
    subversion/branches/ra-git/subversion/libsvn_subr/prompt.c
    subversion/branches/ra-git/subversion/libsvn_subr/sqlite.c
    subversion/branches/ra-git/subversion/libsvn_subr/stream.c
    subversion/branches/ra-git/subversion/libsvn_subr/string.c
    subversion/branches/ra-git/subversion/libsvn_subr/subst.c
    subversion/branches/ra-git/subversion/libsvn_subr/sysinfo.c
    subversion/branches/ra-git/subversion/libsvn_subr/utf8proc.c
    subversion/branches/ra-git/subversion/libsvn_subr/utf_validate.c
    subversion/branches/ra-git/subversion/libsvn_subr/version.c
    subversion/branches/ra-git/subversion/libsvn_subr/win32_crashrpt.c
    subversion/branches/ra-git/subversion/libsvn_subr/win32_crashrpt_dll.h
    subversion/branches/ra-git/subversion/libsvn_subr/x509info.c
    subversion/branches/ra-git/subversion/libsvn_wc/conflicts.c
    subversion/branches/ra-git/subversion/libsvn_wc/copy.c
    subversion/branches/ra-git/subversion/libsvn_wc/deprecated.c
    subversion/branches/ra-git/subversion/libsvn_wc/questions.c
    subversion/branches/ra-git/subversion/libsvn_wc/update_editor.c
    subversion/branches/ra-git/subversion/libsvn_wc/wc-queries.sql
    subversion/branches/ra-git/subversion/libsvn_wc/wc_db.c
    subversion/branches/ra-git/subversion/libsvn_wc/wc_db.h
    subversion/branches/ra-git/subversion/libsvn_wc/wc_db_pristine.c
    subversion/branches/ra-git/subversion/libsvn_wc/wc_db_update_move.c
    subversion/branches/ra-git/subversion/mod_authz_svn/INSTALL
    subversion/branches/ra-git/subversion/mod_authz_svn/mod_authz_svn.c
    subversion/branches/ra-git/subversion/mod_dav_svn/activity.c
    subversion/branches/ra-git/subversion/mod_dav_svn/dav_svn.h
    subversion/branches/ra-git/subversion/mod_dav_svn/deadprops.c
    subversion/branches/ra-git/subversion/mod_dav_svn/liveprops.c
    subversion/branches/ra-git/subversion/mod_dav_svn/lock.c
    subversion/branches/ra-git/subversion/mod_dav_svn/merge.c
    subversion/branches/ra-git/subversion/mod_dav_svn/mod_dav_svn.c
    subversion/branches/ra-git/subversion/mod_dav_svn/posts/create_txn.c
    subversion/branches/ra-git/subversion/mod_dav_svn/reports/dated-rev.c
    subversion/branches/ra-git/subversion/mod_dav_svn/reports/deleted-rev.c
    subversion/branches/ra-git/subversion/mod_dav_svn/reports/file-revs.c
    
subversion/branches/ra-git/subversion/mod_dav_svn/reports/get-location-segments.c
    subversion/branches/ra-git/subversion/mod_dav_svn/reports/get-locations.c
    subversion/branches/ra-git/subversion/mod_dav_svn/reports/get-locks.c
    subversion/branches/ra-git/subversion/mod_dav_svn/reports/inherited-props.c
    subversion/branches/ra-git/subversion/mod_dav_svn/reports/log.c
    subversion/branches/ra-git/subversion/mod_dav_svn/reports/mergeinfo.c
    subversion/branches/ra-git/subversion/mod_dav_svn/reports/replay.c
    subversion/branches/ra-git/subversion/mod_dav_svn/reports/update.c
    subversion/branches/ra-git/subversion/mod_dav_svn/repos.c
    subversion/branches/ra-git/subversion/mod_dav_svn/util.c
    subversion/branches/ra-git/subversion/mod_dav_svn/version.c
    subversion/branches/ra-git/subversion/svn/cl-conflicts.c
    subversion/branches/ra-git/subversion/svn/cl-conflicts.h
    subversion/branches/ra-git/subversion/svn/cl-log.h
    subversion/branches/ra-git/subversion/svn/cl.h
    subversion/branches/ra-git/subversion/svn/conflict-callbacks.c
    subversion/branches/ra-git/subversion/svn/info-cmd.c
    subversion/branches/ra-git/subversion/svn/log-cmd.c
    subversion/branches/ra-git/subversion/svn/merge-cmd.c
    subversion/branches/ra-git/subversion/svn/notify.c
    subversion/branches/ra-git/subversion/svn/resolve-cmd.c
    subversion/branches/ra-git/subversion/svn/status.c
    subversion/branches/ra-git/subversion/svn/svn.c
    subversion/branches/ra-git/subversion/svn/switch-cmd.c
    subversion/branches/ra-git/subversion/svn/update-cmd.c
    subversion/branches/ra-git/subversion/svnadmin/svnadmin.c
    subversion/branches/ra-git/subversion/svnbench/cl.h
    subversion/branches/ra-git/subversion/svnbench/svnbench.c
    subversion/branches/ra-git/subversion/svnfsfs/svnfsfs.c
    subversion/branches/ra-git/subversion/svnfsfs/svnfsfs.h
    subversion/branches/ra-git/subversion/svnlook/svnlook.c
    subversion/branches/ra-git/subversion/svnmucc/svnmucc.c
    subversion/branches/ra-git/subversion/svnrdump/svnrdump.c
    subversion/branches/ra-git/subversion/svnserve/cyrus_auth.c
    subversion/branches/ra-git/subversion/svnserve/serve.c
    subversion/branches/ra-git/subversion/svnserve/server.h
    subversion/branches/ra-git/subversion/svnserve/svnserve.c
    subversion/branches/ra-git/subversion/svnsync/svnsync.c
    subversion/branches/ra-git/subversion/tests/cmdline/authz_tests.py
    subversion/branches/ra-git/subversion/tests/cmdline/autoprop_tests.py
    subversion/branches/ra-git/subversion/tests/cmdline/basic_tests.py
    subversion/branches/ra-git/subversion/tests/cmdline/copy_tests.py
    subversion/branches/ra-git/subversion/tests/cmdline/export_tests.py
    subversion/branches/ra-git/subversion/tests/cmdline/externals_tests.py
    subversion/branches/ra-git/subversion/tests/cmdline/import_tests.py
    subversion/branches/ra-git/subversion/tests/cmdline/lock_tests.py
    subversion/branches/ra-git/subversion/tests/cmdline/log_tests.py
    subversion/branches/ra-git/subversion/tests/cmdline/merge_automatic_tests.py
    
subversion/branches/ra-git/subversion/tests/cmdline/merge_reintegrate_tests.py
    subversion/branches/ra-git/subversion/tests/cmdline/merge_tests.py
    
subversion/branches/ra-git/subversion/tests/cmdline/merge_tree_conflict_tests.py
    subversion/branches/ra-git/subversion/tests/cmdline/mod_authz_svn_tests.py
    subversion/branches/ra-git/subversion/tests/cmdline/mod_dav_svn_tests.py
    subversion/branches/ra-git/subversion/tests/cmdline/move_tests.py
    subversion/branches/ra-git/subversion/tests/cmdline/patch_tests.py
    subversion/branches/ra-git/subversion/tests/cmdline/prop_tests.py
    subversion/branches/ra-git/subversion/tests/cmdline/relocate_tests.py
    subversion/branches/ra-git/subversion/tests/cmdline/resolve_tests.py
    subversion/branches/ra-git/subversion/tests/cmdline/revert_tests.py
    subversion/branches/ra-git/subversion/tests/cmdline/schedule_tests.py
    subversion/branches/ra-git/subversion/tests/cmdline/special_tests.py
    subversion/branches/ra-git/subversion/tests/cmdline/svnadmin_tests.py
    subversion/branches/ra-git/subversion/tests/cmdline/svnauthz_tests.py
    subversion/branches/ra-git/subversion/tests/cmdline/svndumpfilter_tests.py
    subversion/branches/ra-git/subversion/tests/cmdline/svnfsfs_tests.py
    subversion/branches/ra-git/subversion/tests/cmdline/svnlook_tests.py
    subversion/branches/ra-git/subversion/tests/cmdline/svnmover_tests.py
    subversion/branches/ra-git/subversion/tests/cmdline/svnmucc_tests.py
    subversion/branches/ra-git/subversion/tests/cmdline/svnrdump_tests.py
    subversion/branches/ra-git/subversion/tests/cmdline/svnsync_tests.py
    subversion/branches/ra-git/subversion/tests/cmdline/svntest/__init__.py
    subversion/branches/ra-git/subversion/tests/cmdline/svntest/actions.py
    subversion/branches/ra-git/subversion/tests/cmdline/svntest/deeptrees.py
    subversion/branches/ra-git/subversion/tests/cmdline/svntest/main.py
    subversion/branches/ra-git/subversion/tests/cmdline/svntest/mergetrees.py
    subversion/branches/ra-git/subversion/tests/cmdline/svntest/objects.py
    subversion/branches/ra-git/subversion/tests/cmdline/svntest/sandbox.py
    subversion/branches/ra-git/subversion/tests/cmdline/svntest/testcase.py
    subversion/branches/ra-git/subversion/tests/cmdline/svntest/tree.py
    subversion/branches/ra-git/subversion/tests/cmdline/svntest/verify.py
    subversion/branches/ra-git/subversion/tests/cmdline/svntest/wc.py
    subversion/branches/ra-git/subversion/tests/cmdline/trans_tests.py
    subversion/branches/ra-git/subversion/tests/cmdline/tree_conflict_tests.py
    subversion/branches/ra-git/subversion/tests/cmdline/update_tests.py
    subversion/branches/ra-git/subversion/tests/cmdline/upgrade_tests.py
    subversion/branches/ra-git/subversion/tests/cmdline/wc_tests.py
    subversion/branches/ra-git/subversion/tests/libsvn_client/   (props changed)
    subversion/branches/ra-git/subversion/tests/libsvn_diff/diff-diff3-test.c
    subversion/branches/ra-git/subversion/tests/libsvn_diff/parse-diff-test.c
    subversion/branches/ra-git/subversion/tests/libsvn_fs/fs-test.c
    subversion/branches/ra-git/subversion/tests/libsvn_fs_fs/fs-fs-fuzzy-test.c
    subversion/branches/ra-git/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c
    subversion/branches/ra-git/subversion/tests/libsvn_fs_x/fs-x-pack-test.c
    subversion/branches/ra-git/subversion/tests/libsvn_ra/ra-test.c
    subversion/branches/ra-git/subversion/tests/libsvn_subr/io-test.c
    subversion/branches/ra-git/subversion/tests/libsvn_subr/packed-data-test.c
    subversion/branches/ra-git/subversion/tests/libsvn_subr/sqlite-test.c
    subversion/branches/ra-git/subversion/tests/libsvn_subr/stream-test.c
    subversion/branches/ra-git/subversion/tests/libsvn_subr/string-test.c
    subversion/branches/ra-git/subversion/tests/libsvn_subr/utf-test.c
    subversion/branches/ra-git/subversion/tests/libsvn_wc/op-depth-test.c
    subversion/branches/ra-git/subversion/tests/libsvn_wc/utils.c
    subversion/branches/ra-git/subversion/tests/libsvn_wc/wc-queries-test.c
    subversion/branches/ra-git/subversion/tests/libsvn_wc/wc-test.c
    
subversion/branches/ra-git/subversion/tests/manual/tree-conflicts-add-vs-add.py
    subversion/branches/ra-git/subversion/tests/svn_test_fs.c
    subversion/branches/ra-git/subversion/tests/svn_test_fs.h
    subversion/branches/ra-git/subversion/tests/svn_test_main.c
    subversion/branches/ra-git/tools/backup/hot-backup.py.in
    subversion/branches/ra-git/tools/client-side/bash_completion
    subversion/branches/ra-git/tools/client-side/change-svn-wc-format.py
    subversion/branches/ra-git/tools/client-side/mergeinfo-sanitizer.py
    subversion/branches/ra-git/tools/client-side/svn-graph.pl
    
subversion/branches/ra-git/tools/client-side/svn-mergeinfo-normalizer/logic.c
    subversion/branches/ra-git/tools/client-side/svn-vendor.py
    subversion/branches/ra-git/tools/dev/benchmarks/RepoPerf/copy_repo.py
    subversion/branches/ra-git/tools/dev/benchmarks/RepoPerf/win_repo_bench.py
    subversion/branches/ra-git/tools/dev/benchmarks/suite1/benchmark.py
    subversion/branches/ra-git/tools/dev/build-svn-deps-win.pl
    subversion/branches/ra-git/tools/dev/contribulyze.py
    subversion/branches/ra-git/tools/dev/gen-javahl-errors.py
    subversion/branches/ra-git/tools/dev/gen-py-errors.py
    subversion/branches/ra-git/tools/dev/gen_junit_report.py
    subversion/branches/ra-git/tools/dev/graph-dav-servers.py
    subversion/branches/ra-git/tools/dev/histogram.py
    subversion/branches/ra-git/tools/dev/iz/ff2csv.py
    subversion/branches/ra-git/tools/dev/iz/find-fix.py
    subversion/branches/ra-git/tools/dev/merge-graph.py
    subversion/branches/ra-git/tools/dev/mergegraph/mergegraph.py
    subversion/branches/ra-git/tools/dev/mergegraph/save_as_sh.py
    subversion/branches/ra-git/tools/dev/sbox-ospath.py
    subversion/branches/ra-git/tools/dev/svnmover/   (props changed)
    subversion/branches/ra-git/tools/dev/svnmover/linenoise/linenoise.c
    subversion/branches/ra-git/tools/dev/svnmover/merge3.c
    subversion/branches/ra-git/tools/dev/svnmover/scanlog.c
    subversion/branches/ra-git/tools/dev/svnmover/svnmover.c
    subversion/branches/ra-git/tools/dev/unix-build/Makefile.svn
    subversion/branches/ra-git/tools/dev/wc-format.py
    subversion/branches/ra-git/tools/dev/wc-ng/bump-to-19.py
    subversion/branches/ra-git/tools/dev/wc-ng/populate-pristine.py
    subversion/branches/ra-git/tools/dev/which-error.py
    subversion/branches/ra-git/tools/dist/   (props changed)
    subversion/branches/ra-git/tools/dist/backport.pl
    subversion/branches/ra-git/tools/dist/backport/merger.py
    subversion/branches/ra-git/tools/dist/backport_tests.py
    subversion/branches/ra-git/tools/dist/collect_sigs.py
    subversion/branches/ra-git/tools/dist/detect-conflicting-backports.py
    subversion/branches/ra-git/tools/dist/merge-approved-backports.py
    subversion/branches/ra-git/tools/examples/get-location-segments.py
    subversion/branches/ra-git/tools/hook-scripts/svn2feed.py
    subversion/branches/ra-git/tools/hook-scripts/svnperms.py
    subversion/branches/ra-git/tools/po/l10n-report.py
    subversion/branches/ra-git/tools/server-side/fsfs-reshard.py
    subversion/branches/ra-git/tools/server-side/svn-backup-dumps.py
    
subversion/branches/ra-git/tools/server-side/svn-populate-node-origins-index.c
    subversion/branches/ra-git/tools/server-side/svnpredumpfilter.py
    subversion/branches/ra-git/tools/server-side/svnpubsub/daemonize.py
    subversion/branches/ra-git/tools/server-side/svnpubsub/irkerbridge.py
    subversion/branches/ra-git/tools/server-side/svnpubsub/svntweet.py
    subversion/branches/ra-git/tools/server-side/svnpubsub/svnwcsub.py
    subversion/branches/ra-git/tools/server-side/test_svn_server_log_parse.py
    subversion/branches/ra-git/win-tests.py

Propchange: subversion/branches/ra-git/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Oct 11 09:11:50 2016
@@ -44,7 +44,7 @@ mkmf.log
 zlib
 sqlite-amalgamation
 serf
-gmock-fused
+googlemock
 .git
 .gitignore
 .idea

Propchange: subversion/branches/ra-git/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 11 09:11:50 2016
@@ -2,6 +2,7 @@
 /subversion/branches/1.5.x-r30215:870312
 /subversion/branches/1.7.x-fs-verify:1146708,1161180
 /subversion/branches/1.9-cache-improvements:1678948-1679863
+/subversion/branches/1.9.x:1735680
 
/subversion/branches/10Gb:1388102,1388163-1388190,1388195,1388202,1388205,1388211,1388276,1388362,1388375,1388394,1388636,1388639-1388640,1388643-1388644,1388654,1388720,1388789,1388795,1388801,1388805,1388807,1388810,1388816,1389044,1389276,1389289,1389662,1389867,1390017,1390209,1390216,1390407,1390409,1390414,1390419,1390955
 /subversion/branches/atomic-revprop:965046-1000689
 /subversion/branches/authzperf:1615360
@@ -95,4 +96,4 @@
 /subversion/branches/verify-at-commit:1462039-1462408
 /subversion/branches/verify-keep-going:1439280-1546110
 /subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1583624-1719651
+/subversion/trunk:1583624-1764213

Modified: subversion/branches/ra-git/CHANGES
URL: 
http://svn.apache.org/viewvc/subversion/branches/ra-git/CHANGES?rev=1764214&r1=1764213&r2=1764214&view=diff
==============================================================================
--- subversion/branches/ra-git/CHANGES (original)
+++ subversion/branches/ra-git/CHANGES Tue Oct 11 09:11:50 2016
@@ -1,3 +1,44 @@
+Version 1.9.4
+(28 Apr 2016, from /branches/1.9.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.9.4
+
+ User-visible changes:
+  - Client-side bugfixes:
+    * diff: support '--summarize --ignore-properties' (part of issue #4567)
+    * checkout: fix performance regression on NFS (r1710167)
+    * gpg-agent: properly handle passwords with percent characters (issue 
#4611)
+    * svn-graph.pl: fix assertion about a non-canonical path (r1729060 et al)
+    * hot-backup.py: better input validation (r1721174, r1721175)
+    * commit: abort on Ctrl-C in plaintext password prompt (issue #4624)
+    * diff: produce proper forward binary diffs with --git (r1704292, r1704573)
+    * ra_serf: fix deleting directories with many files (issue #4557)
+
+  - Server-side bugfixes:
+    * improve documentation for AuthzSVNGroupsFile and groups-db (r1730856)
+    * fsfs: reduce peak memory usage when listing large directories (r1725180)
+    * fsfs: fix a rare source of incomplete dump files and reports (r1717876)
+
+  - Client-side and server-side bugfixes:
+    * update INSTALL documentation file (r1703470 et al)
+    * fix potential memory access bugs (r1722860 et al)
+    * fix potential out of bounds read in svn_repos_get_logs5() (r1738259)
+
+  - Bindings bugfixes:
+    * ignore absent nodes in javahl version of svn status -u (r1720643)
+
+ Developer-visible changes:
+  - General:
+    * fix ruby test suite to work with test-unit gem (r1714790)
+    * allow building against KDE4 without conflict with KDE5 (r1734926)
+    * fix update_tests.py#76 with SVNPathAuthz short_circuit (r1736432)
+    * build system tweaks:
+    * tweak how symbolic error names in maintainer mode (r1735179)
+    * fix inconsistent behavior of inherited property API (r1717874 et al)
+
+  - API changes:
+    * properly interpret parameters in svn_wc_get_diff_editor6() (r1728308)
+
+
 Version 1.9.3
 (15 Dec 2015, from /branches/1.9.x)
 http://svn.apache.org/repos/asf/subversion/tags/1.9.3
@@ -19,12 +60,16 @@ http://svn.apache.org/repos/asf/subversi
     * ra_local: disable zero-copy code path (r1718167)
 
   - Server-side bugfixes:
+    * mod_dav_svn: fix heap overflow with skel-encoded requests (CVE-2015-5343)
     * mod_authz_svn: fix authz with mod_auth_kerb/mod_auth_ntlm (issue #4602)
     * mod_dav_svn: fix display of process ID in cache statistics (r1709553)
     * mod_dav_svn: use LimitXMLRequestBody for skel-encoded requests (r1687812)
     * svnadmin dump: preserve no-op changes (r1709388 et al, issue #4598)
     * fsfs: avoid unneeded I/O when opening transactions (r1715793)
 
+  - Client-side and server-side bugfixes:
+    * fix heap overflow in svn:// protocol parser (CVE-2015-5259)
+
   - Bindings bugfixes:
     * javahl: fix ABI incompatibilty with 1.8 (r1710104)
     * javahl: allow non-absolute paths in SVNClient.vacuum (r1710215, r1710290)
@@ -837,6 +882,25 @@ http://svn.apache.org/repos/asf/subversi
     * javahl: allow compiling with a C++11 compiler (r1684412)
 
 
+Version 1.8.16
+(28 Apr 2016, from /branches/1.8.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.8.16
+
+ User-visible changes:
+  - Server-side bugfixes:
+    * mod_authz_svn: fix authz with mod_auth_kerb/mod_auth_ntlm (issue #4602)
+    * dump: don't write broken dump files in some ambiguously encoded fsfs
+      repositories (issue #4554)
+
+  - Client-side and server-side bugfixes:
+    * update INSTALL documentation file (r1703470, r1703475)
+
+ Developer-visible changes:
+  - General:
+    * fix javahl test suite to work on a symlinked RAM disk (r1539230)
+    * fix ruby test suite to work with test-unit gem (r1714790)
+
+
 Version 1.8.15
 (15 Dec 2015, from /branches/1.8.x)
 http://svn.apache.org/repos/asf/subversion/tags/1.8.15
@@ -849,6 +913,7 @@ http://svn.apache.org/repos/asf/subversi
     * fix a segfault with old style text delta (r1618472 et al)
 
   - Server-side bugfixes:
+    * mod_dav_svn: fix heap overflow with skel-encoded requests (CVE-2015-5343)
     * fsfs: reduce memory allocation with Apache (r1591005 et al)
     * mod_dav_svn: emit first log items as soon as possible (r1666965 et al)
     * mod_dav_svn: use LimitXMLRequestBody for skel-encoded requests (r1687812)
@@ -1576,7 +1641,7 @@ http://svn.apache.org/repos/asf/subversi
     * fix bug in mergeinfo recording during foreign-repos merge (r1430310)
     * fix spurious merge conflicts for binary files with keywords (issue #4221)
     * fix patching symlinks with 'svn patch' (issue #4273)
-    * make 'svn switch' refresh lock information (issue #3376)
+    * make 'svn switch' refresh lock information (issue #3378)
     * fix 'svn diff' output doesn't apply as patch without fuzz (issue #3362)
     * fix mergeinfo recording for multiple-revision-range merge (issue #4306)
     * fix diffs shown by 'show-diff' conflict prompt option (r1438879)

Modified: subversion/branches/ra-git/COMMITTERS
URL: 
http://svn.apache.org/viewvc/subversion/branches/ra-git/COMMITTERS?rev=1764214&r1=1764213&r2=1764214&view=diff
==============================================================================
--- subversion/branches/ra-git/COMMITTERS [UTF-8] (original)
+++ subversion/branches/ra-git/COMMITTERS [UTF-8] Tue Oct 11 09:11:50 2016
@@ -19,7 +19,7 @@ Blanket commit access:
           fitz   Brian W. Fitzpatrick <f...@red-bean.com>
         daniel   Daniel Stenberg <dan...@haxx.se>
       cmpilato   C. Michael Pilato <cmpil...@collab.net>
-        philip   Philip Martin <philip.mar...@wandisco.com>
+        philip   Philip Martin <phi...@apache.org>
    jerenkrantz   Justin Erenkrantz <jus...@erenkrantz.com>
         rooneg   Garrett Rooney <roo...@electricjellyfish.net>
          blair   Blair Zajac <bl...@orcaware.com>
@@ -55,7 +55,7 @@ Blanket commit access:
      jwhitlock   Jeremy Whitlock <jcscoob...@gmail.com>
        sbutler   Stephen Butler <sbut...@elego.de>
         dannas   Daniel Näslund <dan...@dannas.name>
-       stefan2   Stefan Fuhrmann <stefan.fuhrm...@wandisco.com>
+       stefan2   Stefan Fuhrmann <stef...@apache.org>
        jcorvel   Johan Corveleyn <jcor...@gmail.com>
          trent   Trent Nelson <tr...@snakebite.org>
         kotkov   Evgeny Kotkov <evgeny.kot...@visualsvn.com>
@@ -190,8 +190,7 @@ Commit access for specific areas:
           lark   Wang Jian <l...@linux.net.cn>               (po: zh_CN) [EMAIL
                                                              IS BOUNCING]
 giorgio_valoti   Giorgio Valoti <giorgi...@mac.com>          (po: it)
-        nebiac   Federico Nebiacolombo <ci...@amsjv.it>      (po: it) [EMAIL
-                                                             IS BOUNCING]
+        nebiac   Federico Nebiacolombo <ci...@amsjv.it>      (po: it)
         fabien   Fabien Coelho <fab...@coelho.net>           (po: fr)
        marcelg   Marcel Gosselin <marcel.gosse...@polymtl.ca> (po: fr)
       mattiase   Mattias Engdegård <matti...@acm.org>        (po: sv)

Modified: subversion/branches/ra-git/INSTALL
URL: 
http://svn.apache.org/viewvc/subversion/branches/ra-git/INSTALL?rev=1764214&r1=1764213&r2=1764214&view=diff
==============================================================================
--- subversion/branches/ra-git/INSTALL (original)
+++ subversion/branches/ra-git/INSTALL Tue Oct 11 09:11:50 2016
@@ -715,9 +715,8 @@ II.   INSTALLATION
         Note that Python 3.x is not supported (yet).
       * Perl 5.8 or higher from http://www.perl.org/get.html
       * Awk (from http://www.cs.princeton.edu/~bwk/btl.mirror/awk95.exe) is
-        needed to compile Apache or APR without using CMake.  Note that this
-        is the actual awk program, not an installer - just rename it to
-        awk.exe and it is ready to use.
+        needed to compile Apache.  Note that this is the actual awk program,
+        not an installer - just rename it to awk.exe and it is ready to use.
       * Apache apr, apr-util, and optionally apr-iconv libraries, version
         1.3 or later (1.2 for apr-iconv). If you are building from a Subversion
         checkout and have not downloaded Apache 2, then get these 3 libraries

Modified: subversion/branches/ra-git/Makefile.in
URL: 
http://svn.apache.org/viewvc/subversion/branches/ra-git/Makefile.in?rev=1764214&r1=1764213&r2=1764214&view=diff
==============================================================================
--- subversion/branches/ra-git/Makefile.in (original)
+++ subversion/branches/ra-git/Makefile.in Tue Oct 11 09:11:50 2016
@@ -137,8 +137,9 @@ APACHE_INCLUDES = @APACHE_INCLUDES@
 APACHE_LIBEXECDIR = $(DESTDIR)@APACHE_LIBEXECDIR@
 APACHE_LDFLAGS = @APACHE_LDFLAGS@
 
-SVN_USE_GMOCK = @SVN_USE_GMOCK@
-GMOCK_INCLUDES = -I@GMOCK_SRCDIR@
+SVN_USE_GOOGLEMOCK = @SVN_USE_GOOGLEMOCK@
+GOOGLEMOCK_INCLUDES = -I@GOOGLEMOCK_SRCDIR@/googlemock/include 
-I@GOOGLEMOCK_SRCDIR@/googletest/include
+GOOGLEMOCK_LIB_INCLUDES = -I@GOOGLEMOCK_SRCDIR@/googlemock 
-I@GOOGLEMOCK_SRCDIR@/googletest $(GOOGLEMOCK_INCLUDES)
 
 SWIG = @SWIG@
 SWIG_PY_INCLUDES = @SWIG_PY_INCLUDES@ -I$(SWIG_SRC_DIR)/python/libsvn_swig_py
@@ -253,8 +254,8 @@ TEST_SHLIB_VAR_SWIG_RB=\
 
 # special compilation for files destined for cxxhl
 COMPILE_CXXHL_CXX = $(LT_COMPILE_CXX) $(CXXHL_INCLUDES) -o $@ -c
-COMPILE_GMOCK_CXX = $(LT_COMPILE_CXX_NOWARN) $(GMOCK_INCLUDES) -o $@ -c
-COMPILE_CXXHL_GMOCK_CXX = $(LT_COMPILE_CXX) $(CXXHL_INCLUDES) 
$(GMOCK_INCLUDES) -o $@ -c
+COMPILE_GOOGLEMOCK_CXX = $(LT_COMPILE_CXX_NOWARN) $(GOOGLEMOCK_LIB_INCLUDES) 
-o $@ -c
+COMPILE_CXXHL_GOOGLEMOCK_CXX = $(LT_COMPILE_CXX) $(CXXHL_INCLUDES) 
$(GOOGLEMOCK_INCLUDES) -o $@ -c
 
 LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) 
$(LDFLAGS) -rpath $(libdir)
 LINK_LIB = $(LINK) $(LT_SO_VERSION)
@@ -373,6 +374,7 @@ INSTALL_EXTRA_SWIG_RB=\
 
 APXS = @APXS@
 HTTPD_VERSION = @HTTPD_VERSION@
+HTTPD_WHITELIST = @HTTPD_WHITELIST@
 
 PYTHON = @PYTHON@
 PERL = @PERL@
@@ -542,6 +544,9 @@ check: bin @TRANSFORM_LIBTOOL_SCRIPTS@ $
          if test "$(HTTPD_VERSION)" != ""; then                             \
             flags="--httpd-version $(HTTPD_VERSION) $$flags";               \
          fi;                                                                \
+         if test "$(HTTPD_WHITELIST)" != ""; then                           \
+            flags="--httpd-whitelist $(HTTPD_WHITELIST) $$flags";           \
+         fi;                                                                \
          if test "$(SERVER_MINOR_VERSION)" != ""; then                      \
            flags="--server-minor-version $(SERVER_MINOR_VERSION) $$flags";  \
          fi;                                                                \

Modified: subversion/branches/ra-git/NOTICE
URL: 
http://svn.apache.org/viewvc/subversion/branches/ra-git/NOTICE?rev=1764214&r1=1764213&r2=1764214&view=diff
==============================================================================
--- subversion/branches/ra-git/NOTICE (original)
+++ subversion/branches/ra-git/NOTICE Tue Oct 11 09:11:50 2016
@@ -1,5 +1,5 @@
 Apache Subversion
-Copyright 2015 The Apache Software Foundation
+Copyright 2016 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/ra-git/README
URL: 
http://svn.apache.org/viewvc/subversion/branches/ra-git/README?rev=1764214&r1=1764213&r2=1764214&view=diff
==============================================================================
--- subversion/branches/ra-git/README (original)
+++ subversion/branches/ra-git/README Tue Oct 11 09:11:50 2016
@@ -36,10 +36,10 @@ II.   DOCUMENTATION
 
       It is written in DocBook XML, and the sources can be found at:
 
-         http://svnbook.googlecode.com/svn/trunk/
+         http://svn.code.sf.net/p/svnbook/source/trunk/
          
       If you wish to build the documentation from source, read the
-      src/en/README file within the book source.
+      en/README file within the book source.
 
 
 

Modified: subversion/branches/ra-git/build.conf
URL: 
http://svn.apache.org/viewvc/subversion/branches/ra-git/build.conf?rev=1764214&r1=1764213&r2=1764214&view=diff
==============================================================================
--- subversion/branches/ra-git/build.conf (original)
+++ subversion/branches/ra-git/build.conf Tue Oct 11 09:11:50 2016
@@ -767,30 +767,30 @@ link-cmd = $(LINK_CXX_LIB)
 
 [cxxhl-tests]
 description = Unit tests for Subversion C++ HighLevel bindings
-when = SVN_USE_GMOCK
+when = SVN_USE_GOOGLEMOCK
 type = exe
 path = subversion/bindings/cxxhl
-libs = libsvncxxhl libgmock libsvn_subr apr
+libs = libsvncxxhl libgooglemock libsvn_subr apr
 sources = tests/*.cpp
 install = tests
-compile-cmd = $(COMPILE_CXXHL_GMOCK_CXX)
+compile-cmd = $(COMPILE_CXXHL_GOOGLEMOCK_CXX)
 link-cmd = $(LINK_CXX)
 
 
 # ----------------------------------------------------------------------------
 #
-# Gmock targets
+# Googlemock targets
 #
 
-[libgmock]
+[libgooglemock]
 description = Googlemock Library
-when = SVN_USE_GMOCK
+when = SVN_USE_GOOGLEMOCK
 type = lib
-path = gmock-fused
-sources = gmock-gtest-all.cc
+path = googlemock
+sources = googletest/src/gtest-all.cc googlemock/src/gmock-all.cc
 install = tests
 msvc-static = yes
-compile-cmd = $(COMPILE_GMOCK_CXX)
+compile-cmd = $(COMPILE_GOOGLEMOCK_CXX)
 link-cmd = $(LINK_CXX_LIB)
 
 # ----------------------------------------------------------------------------
@@ -1227,6 +1227,15 @@ sources = mtcc-test.c
 install = test
 libs = libsvn_test libsvn_client libsvn_wc libsvn_repos libsvn_ra libsvn_fs 
libsvn_delta libsvn_subr apriconv apr
 
+[conflicts-test]
+description = Test libsvn_client conflict resolver
+type = exe
+path = subversion/tests/libsvn_client
+sources = conflicts-test.c ../libsvn_wc/utils.c
+install = test
+libs = libsvn_test libsvn_client libsvn_wc libsvn_repos libsvn_ra libsvn_fs 
libsvn_delta libsvn_subr apriconv apr
+msvc-force-static = yes
+
 [git-client-test]
 description = Test git support via libsvn_client
 type = exe
@@ -1572,7 +1581,7 @@ libs = __ALL__
        svndiff-test vdelta-test
        entries-dump atomic-ra-revprop-change wc-lock-tester 
wc-incomplete-tester
        lock-helper
-       client-test mtcc-test git-client-test
+       client-test conflicts-test mtcc-test git-client-test
        conflict-data-test db-test pristine-store-test entries-compat-test
        op-depth-test dirent_uri-test wc-queries-test wc-test
        auth-test

Modified: subversion/branches/ra-git/build/ac-macros/apache.m4
URL: 
http://svn.apache.org/viewvc/subversion/branches/ra-git/build/ac-macros/apache.m4?rev=1764214&r1=1764213&r2=1764214&view=diff
==============================================================================
--- subversion/branches/ra-git/build/ac-macros/apache.m4 (original)
+++ subversion/branches/ra-git/build/ac-macros/apache.m4 Tue Oct 11 09:11:50 
2016
@@ -30,6 +30,8 @@ AC_REQUIRE([AC_CANONICAL_HOST])
 
 HTTPD_WANTED_MMN="$1"
 
+HTTPD_WHITELIST_VER="$2"
+
 AC_MSG_CHECKING(for Apache module support via DSO through APXS)
 AC_ARG_WITH(apxs,
             [AS_HELP_STRING([[--with-apxs[=FILE]]],
@@ -102,6 +104,9 @@ if test -n "$APXS" && test "$APXS" != "n
   HTTPD_PATCH=`$SED -ne '/^#define AP_SERVER_PATCHLEVEL_NUMBER/p' 
"$APXS_INCLUDE/ap_release.h" | $SED -e 's/^.*NUMBER *//'`
   HTTPD_VERSION="${HTTPD_MAJOR}.${HTTPD_MINOR}.${HTTPD_PATCH}"
   case "$HTTPD_VERSION" in
+    $HTTPD_WHITELIST_VER)
+      AC_MSG_RESULT([acceptable (whitelist)])
+      ;;
     2.2.25 | 2.4.[[5-6]])
       AC_MSG_RESULT([broken])
       AC_MSG_ERROR([Apache httpd version $HTTPD_VERSION includes a broken 
mod_dav; use a newer version of httpd])
@@ -171,7 +176,9 @@ if test -n "$APXS" && test "$APXS" != "n
       # API but the installation may have been patched.
       AC_ARG_ENABLE(broken-httpd-auth,
         AS_HELP_STRING([--enable-broken-httpd-auth],
-                       [Force build against httpd 2.4 with broken auth]),
+                       [Force build against httpd 2.4 with broken auth. (This
+                        is not recommended as Subversion will be vulnerable to
+                        CVE-2015-3184.)]),
         [broken_httpd_auth=$enableval],[broken_httpd_auth=no])
       AC_MSG_CHECKING([for ap_some_authn_required])
       old_CPPFLAGS="$CPPFLAGS"

Modified: subversion/branches/ra-git/build/ac-macros/kwallet.m4
URL: 
http://svn.apache.org/viewvc/subversion/branches/ra-git/build/ac-macros/kwallet.m4?rev=1764214&r1=1764213&r2=1764214&view=diff
==============================================================================
--- subversion/branches/ra-git/build/ac-macros/kwallet.m4 (original)
+++ subversion/branches/ra-git/build/ac-macros/kwallet.m4 Tue Oct 11 09:11:50 
2016
@@ -68,15 +68,15 @@ AC_DEFUN(SVN_LIB_KWALLET,
                     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"
+                  kde_incdir="`$KDE4_CONFIG --install include`"
+                  SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs 
-I$kde_incdir"
                   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)`"
+                  kde_libdir="`$KDE4_CONFIG --install lib`"
+                  LDFLAGS="$old_LDFLAGS 
`SVN_REMOVE_STANDARD_LIB_DIRS($qt_lib_dirs -L$kde_libdir)`"
                   AC_LANG(C++)
                   AC_LINK_IFELSE([AC_LANG_SOURCE([[
 #include <kwallet.h>

Modified: subversion/branches/ra-git/build/ac-macros/swig.m4
URL: 
http://svn.apache.org/viewvc/subversion/branches/ra-git/build/ac-macros/swig.m4?rev=1764214&r1=1764213&r2=1764214&view=diff
==============================================================================
--- subversion/branches/ra-git/build/ac-macros/swig.m4 (original)
+++ subversion/branches/ra-git/build/ac-macros/swig.m4 Tue Oct 11 09:11:50 2016
@@ -91,208 +91,207 @@ AC_DEFUN(SVN_FIND_SWIG,
     AC_MSG_RESULT([$SWIG_VERSION_RAW])
     # If you change the required swig version number, don't forget to update:
     #   subversion/bindings/swig/INSTALL
-    if test -n "$SWIG_VERSION" && test "$SWIG_VERSION" -ge "103024" && \
-       test "$SWIG_VERSION" -lt "300000"; then
+    if test -n "$SWIG_VERSION" && test "$SWIG_VERSION" -ge "103024"; then
       SWIG_SUITABLE=yes
     else
       SWIG_SUITABLE=no
       AC_MSG_WARN([Detected SWIG version $SWIG_VERSION_RAW])
-      AC_MSG_WARN([Subversion requires SWIG >= 1.3.24 and < 3.0.0 ])
+      AC_MSG_WARN([Subversion requires SWIG >= 1.3.24])
     fi
-  fi
- 
-  SWIG_PY_COMPILE="none"
-  SWIG_PY_LINK="none"
-  if test "$PYTHON" != "none"; then
-    AC_MSG_NOTICE([Configuring python swig binding])
-
-    AC_CACHE_CHECK([for Python includes], [ac_cv_python_includes],[
-      ac_cv_python_includes="`$PYTHON ${abs_srcdir}/build/get-py-info.py 
--includes`"
-    ])
-    SWIG_PY_INCLUDES="\$(SWIG_INCLUDES) $ac_cv_python_includes"
 
-    if test "$ac_cv_python_includes" = "none"; then
-      AC_MSG_WARN([python bindings cannot be built without distutils module])
-    fi
+    SWIG_PY_COMPILE="none"
+    SWIG_PY_LINK="none"
+    if test "$PYTHON" != "none"; then
+      AC_MSG_NOTICE([Configuring python swig binding])
 
-    AC_CACHE_CHECK([for compiling Python extensions], [ac_cv_python_compile],[
-      ac_cv_python_compile="`$PYTHON ${abs_srcdir}/build/get-py-info.py 
--compile`"
-    ])
-    SWIG_PY_COMPILE="$ac_cv_python_compile $CFLAGS"
-
-    AC_CACHE_CHECK([for linking Python extensions], [ac_cv_python_link],[
-      ac_cv_python_link="`$PYTHON ${abs_srcdir}/build/get-py-info.py --link`"
-    ])
-    SWIG_PY_LINK="$ac_cv_python_link"
-
-    AC_CACHE_CHECK([for linking Python libraries], [ac_cv_python_libs],[
-      ac_cv_python_libs="`$PYTHON ${abs_srcdir}/build/get-py-info.py --libs`"
-    ])
-    SWIG_PY_LIBS="`SVN_REMOVE_STANDARD_LIB_DIRS($ac_cv_python_libs)`"
-
-    dnl Sun Forte adds an extra space before substituting APR_INT64_T_FMT
-    dnl gcc-2.95 adds an extra space after substituting APR_INT64_T_FMT
-    dnl thus the egrep patterns have a + in them.
-    SVN_PYCFMT_SAVE_CPPFLAGS="$CPPFLAGS"
-    CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES"
-    AC_CACHE_CHECK([for apr_int64_t Python/C API format string],
-                   [svn_cv_pycfmt_apr_int64_t], [
-      if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
-        AC_EGREP_CPP([MaTcHtHiS +\"lld\" +EnDeNd],
-                     [#include <apr.h>
-                      MaTcHtHiS APR_INT64_T_FMT EnDeNd],
-                     [svn_cv_pycfmt_apr_int64_t="L"])
-      fi
-      if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
-        AC_EGREP_CPP([MaTcHtHiS +\"ld\" +EnDeNd],r
-                     [#include <apr.h>
-                      MaTcHtHiS APR_INT64_T_FMT EnDeNd],
-                     [svn_cv_pycfmt_apr_int64_t="l"])
+      AC_CACHE_CHECK([for Python includes], [ac_cv_python_includes],[
+        ac_cv_python_includes="`$PYTHON ${abs_srcdir}/build/get-py-info.py 
--includes`"
+      ])
+      SWIG_PY_INCLUDES="\$(SWIG_INCLUDES) $ac_cv_python_includes"
+
+      if test "$ac_cv_python_includes" = "none"; then
+        AC_MSG_WARN([python bindings cannot be built without distutils module])
       fi
+
+      AC_CACHE_CHECK([for compiling Python extensions], 
[ac_cv_python_compile],[
+        ac_cv_python_compile="`$PYTHON ${abs_srcdir}/build/get-py-info.py 
--compile`"
+      ])
+      SWIG_PY_COMPILE="$ac_cv_python_compile $CFLAGS"
+
+      AC_CACHE_CHECK([for linking Python extensions], [ac_cv_python_link],[
+        ac_cv_python_link="`$PYTHON ${abs_srcdir}/build/get-py-info.py --link`"
+      ])
+      SWIG_PY_LINK="$ac_cv_python_link"
+
+      AC_CACHE_CHECK([for linking Python libraries], [ac_cv_python_libs],[
+        ac_cv_python_libs="`$PYTHON ${abs_srcdir}/build/get-py-info.py --libs`"
+      ])
+      SWIG_PY_LIBS="`SVN_REMOVE_STANDARD_LIB_DIRS($ac_cv_python_libs)`"
+
+      dnl Sun Forte adds an extra space before substituting APR_INT64_T_FMT
+      dnl gcc-2.95 adds an extra space after substituting APR_INT64_T_FMT
+      dnl thus the egrep patterns have a + in them.
+      SVN_PYCFMT_SAVE_CPPFLAGS="$CPPFLAGS"
+      CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES"
+      AC_CACHE_CHECK([for apr_int64_t Python/C API format string],
+                     [svn_cv_pycfmt_apr_int64_t], [
+        if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
+          AC_EGREP_CPP([MaTcHtHiS +\"lld\" +EnDeNd],
+                       [#include <apr.h>
+                        MaTcHtHiS APR_INT64_T_FMT EnDeNd],
+                       [svn_cv_pycfmt_apr_int64_t="L"])
+        fi
+        if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
+          AC_EGREP_CPP([MaTcHtHiS +\"ld\" +EnDeNd],r
+                       [#include <apr.h>
+                        MaTcHtHiS APR_INT64_T_FMT EnDeNd],
+                       [svn_cv_pycfmt_apr_int64_t="l"])
+        fi
+        if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
+          AC_EGREP_CPP([MaTcHtHiS +\"d\" +EnDeNd],
+                       [#include <apr.h>
+                        MaTcHtHiS APR_INT64_T_FMT EnDeNd],
+                       [svn_cv_pycfmt_apr_int64_t="i"])
+        fi
+      ])
+      CPPFLAGS="$SVN_PYCFMT_SAVE_CPPFLAGS"
       if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
-        AC_EGREP_CPP([MaTcHtHiS +\"d\" +EnDeNd],
-                     [#include <apr.h>
-                      MaTcHtHiS APR_INT64_T_FMT EnDeNd],
-                     [svn_cv_pycfmt_apr_int64_t="i"])
+        AC_MSG_ERROR([failed to recognize APR_INT64_T_FMT on this platform])
       fi
-    ])
-    CPPFLAGS="$SVN_PYCFMT_SAVE_CPPFLAGS"
-    if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
-      AC_MSG_ERROR([failed to recognize APR_INT64_T_FMT on this platform])
+      AC_DEFINE_UNQUOTED([SVN_APR_INT64_T_PYCFMT],
+                         ["$svn_cv_pycfmt_apr_int64_t"],
+                         [Define to the Python/C API format character suitable]
+                         [ for apr_int64_t])
     fi
-    AC_DEFINE_UNQUOTED([SVN_APR_INT64_T_PYCFMT],
-                       ["$svn_cv_pycfmt_apr_int64_t"],
-                       [Define to the Python/C API format character suitable]
-                       [ for apr_int64_t])
-  fi
 
-  if test "$PERL" != "none"; then
-    AC_MSG_CHECKING([perl version])
-    dnl Note that the q() bit is there to avoid unbalanced brackets
-    dnl which m4 really doesn't like.
-    PERL_VERSION="`$PERL -e 'q([[); print $]] * 1000000,$/;'`"
-    AC_MSG_RESULT([$PERL_VERSION])
-    if test "$PERL_VERSION" -ge "5008000"; then
-      SWIG_PL_INCLUDES="\$(SWIG_INCLUDES) `$PERL -MExtUtils::Embed -e ccopts`"
-    else
-      AC_MSG_WARN([perl bindings require perl 5.8.0 or newer.])
+    if test "$PERL" != "none"; then
+      AC_MSG_CHECKING([perl version])
+      dnl Note that the q() bit is there to avoid unbalanced brackets
+      dnl which m4 really doesn't like.
+      PERL_VERSION="`$PERL -e 'q([[); print $]] * 1000000,$/;'`"
+      AC_MSG_RESULT([$PERL_VERSION])
+      if test "$PERL_VERSION" -ge "5008000"; then
+        SWIG_PL_INCLUDES="\$(SWIG_INCLUDES) `$PERL -MExtUtils::Embed -e 
ccopts`"
+      else
+        AC_MSG_WARN([perl bindings require perl 5.8.0 or newer.])
+      fi
     fi
-  fi
 
-  SWIG_RB_COMPILE="none"
-  SWIG_RB_LINK="none"
-  if test "$RUBY" != "none"; then
-    rbconfig="$RUBY -rrbconfig -e "
-
-    for var_name in arch archdir CC LDSHARED DLEXT LIBS LIBRUBYARG \
-                    rubyhdrdir rubyarchhdrdir sitedir sitelibdir sitearchdir 
libdir
-    do
-      rbconfig_tmp=`$rbconfig "print RbConfig::CONFIG@<:@'$var_name'@:>@"`
-      eval "rbconfig_$var_name=\"$rbconfig_tmp\""
-    done
-
-    AC_MSG_NOTICE([Configuring Ruby SWIG binding])
-
-    AC_CACHE_CHECK([for Ruby include path], [svn_cv_ruby_includes],[
-    if test -d "$rbconfig_rubyhdrdir"; then
-      dnl Ruby >=1.9
-      svn_cv_ruby_includes="-I. -I$rbconfig_rubyhdrdir 
-I$rbconfig_rubyhdrdir/ruby -I$rbconfig_rubyhdrdir/ruby/backward"
-      if test -d "$rbconfig_rubyarchhdrdir"; then
-        dnl Ruby >=2.0
-        svn_cv_ruby_includes="$svn_cv_ruby_includes -I$rbconfig_rubyarchhdrdir"
+    SWIG_RB_COMPILE="none"
+    SWIG_RB_LINK="none"
+    if test "$RUBY" != "none"; then
+      rbconfig="$RUBY -rrbconfig -e "
+
+      for var_name in arch archdir CC LDSHARED DLEXT LIBS LIBRUBYARG \
+                      rubyhdrdir rubyarchhdrdir sitedir sitelibdir sitearchdir 
libdir
+      do
+        rbconfig_tmp=`$rbconfig "print RbConfig::CONFIG@<:@'$var_name'@:>@"`
+        eval "rbconfig_$var_name=\"$rbconfig_tmp\""
+      done
+
+      AC_MSG_NOTICE([Configuring Ruby SWIG binding])
+
+      AC_CACHE_CHECK([for Ruby include path], [svn_cv_ruby_includes],[
+      if test -d "$rbconfig_rubyhdrdir"; then
+        dnl Ruby >=1.9
+        svn_cv_ruby_includes="-I. -I$rbconfig_rubyhdrdir 
-I$rbconfig_rubyhdrdir/ruby -I$rbconfig_rubyhdrdir/ruby/backward"
+        if test -d "$rbconfig_rubyarchhdrdir"; then
+          dnl Ruby >=2.0
+          svn_cv_ruby_includes="$svn_cv_ruby_includes 
-I$rbconfig_rubyarchhdrdir"
+        else
+          svn_cv_ruby_includes="$svn_cv_ruby_includes 
-I$rbconfig_rubyhdrdir/$rbconfig_arch"
+        fi
       else
-        svn_cv_ruby_includes="$svn_cv_ruby_includes 
-I$rbconfig_rubyhdrdir/$rbconfig_arch"
+        dnl Ruby 1.8
+        svn_cv_ruby_includes="-I. -I$rbconfig_archdir"
       fi
-    else
-      dnl Ruby 1.8
-      svn_cv_ruby_includes="-I. -I$rbconfig_archdir"
-    fi
-    ])
-    SWIG_RB_INCLUDES="\$(SWIG_INCLUDES) $svn_cv_ruby_includes"
+      ])
+      SWIG_RB_INCLUDES="\$(SWIG_INCLUDES) $svn_cv_ruby_includes"
 
-    AC_CACHE_CHECK([how to compile Ruby extensions], [svn_cv_ruby_compile],[
-      svn_cv_ruby_compile="$rbconfig_CC $CFLAGS"
-    ])
-    SWIG_RB_COMPILE="$svn_cv_ruby_compile"
-    SVN_STRIP_FLAG([SWIG_RB_COMPILE], [-ansi])
-    SVN_STRIP_FLAG([SWIG_RB_COMPILE], [-std=c89])
-    SVN_STRIP_FLAG([SWIG_RB_COMPILE], [-std=c90])
-    dnl FIXME: Check that the compiler for Ruby actually supports this flag
-    SWIG_RB_COMPILE="$SWIG_RB_COMPILE -Wno-int-to-pointer-cast"
-
-    AC_CACHE_CHECK([how to link Ruby extensions], [svn_cv_ruby_link],[
-      svn_cv_ruby_link="`$RUBY -e 'ARGV.shift; print ARGV.join(%q( ))' \
-                           $rbconfig_LDSHARED`"
-      svn_cv_ruby_link="$rbconfig_CC $svn_cv_ruby_link"
-      svn_cv_ruby_link="$svn_cv_ruby_link -shrext .$rbconfig_DLEXT"
-    ])
-    SWIG_RB_LINK="$svn_cv_ruby_link"
-
-    AC_CACHE_CHECK([how to link Ruby libraries], [ac_cv_ruby_libs], [
-      ac_cv_ruby_libs="$rbconfig_LIBRUBYARG $rbconfig_LIBS"
-    ])
-    SWIG_RB_LIBS="`SVN_REMOVE_STANDARD_LIB_DIRS($ac_cv_ruby_libs)`"
-
-    AC_MSG_CHECKING([for rb_errinfo])
-    old_CFLAGS="$CFLAGS"
-    old_LIBS="$LIBS"
-    CFLAGS="$CFLAGS $svn_cv_ruby_includes"
-    SVN_STRIP_FLAG([CFLAGS], [-ansi])
-    SVN_STRIP_FLAG([CFLAGS], [-std=c89])
-    SVN_STRIP_FLAG([CFLAGS], [-std=c90])
-    LIBS="$SWIG_RB_LIBS"
-    AC_LINK_IFELSE([AC_LANG_SOURCE([[
+      AC_CACHE_CHECK([how to compile Ruby extensions], [svn_cv_ruby_compile],[
+        svn_cv_ruby_compile="$rbconfig_CC $CFLAGS"
+      ])
+      SWIG_RB_COMPILE="$svn_cv_ruby_compile"
+      SVN_STRIP_FLAG([SWIG_RB_COMPILE], [-ansi])
+      SVN_STRIP_FLAG([SWIG_RB_COMPILE], [-std=c89])
+      SVN_STRIP_FLAG([SWIG_RB_COMPILE], [-std=c90])
+      dnl FIXME: Check that the compiler for Ruby actually supports this flag
+      SWIG_RB_COMPILE="$SWIG_RB_COMPILE -Wno-int-to-pointer-cast"
+
+      AC_CACHE_CHECK([how to link Ruby extensions], [svn_cv_ruby_link],[
+        svn_cv_ruby_link="`$RUBY -e 'ARGV.shift; print ARGV.join(%q( ))' \
+                             $rbconfig_LDSHARED`"
+        svn_cv_ruby_link="$rbconfig_CC $svn_cv_ruby_link"
+        svn_cv_ruby_link="$svn_cv_ruby_link -shrext .$rbconfig_DLEXT"
+      ])
+      SWIG_RB_LINK="$svn_cv_ruby_link"
+
+      AC_CACHE_CHECK([how to link Ruby libraries], [ac_cv_ruby_libs], [
+        ac_cv_ruby_libs="$rbconfig_LIBRUBYARG $rbconfig_LIBS"
+      ])
+      SWIG_RB_LIBS="`SVN_REMOVE_STANDARD_LIB_DIRS($ac_cv_ruby_libs)`"
+
+      AC_MSG_CHECKING([for rb_errinfo])
+      old_CFLAGS="$CFLAGS"
+      old_LIBS="$LIBS"
+      CFLAGS="$CFLAGS $svn_cv_ruby_includes"
+      SVN_STRIP_FLAG([CFLAGS], [-ansi])
+      SVN_STRIP_FLAG([CFLAGS], [-std=c89])
+      SVN_STRIP_FLAG([CFLAGS], [-std=c90])
+      LIBS="$SWIG_RB_LIBS"
+      AC_LINK_IFELSE([AC_LANG_SOURCE([[
 #include <ruby.h>
 int main()
 {rb_errinfo();}]])], have_rb_errinfo="yes", have_rb_errinfo="no")
-    if test "$have_rb_errinfo" = "yes"; then
-      AC_MSG_RESULT([yes])
-      AC_DEFINE([HAVE_RB_ERRINFO], [1],
-                [Define to 1 if you have the `rb_errinfo' function.])
-    else
-      AC_MSG_RESULT([no])
-    fi
-    CFLAGS="$old_CFLAGS"
-    LIBS="$old_LIBS"
+      if test "$have_rb_errinfo" = "yes"; then
+        AC_MSG_RESULT([yes])
+        AC_DEFINE([HAVE_RB_ERRINFO], [1],
+                  [Define to 1 if you have the `rb_errinfo' function.])
+      else
+        AC_MSG_RESULT([no])
+      fi
+      CFLAGS="$old_CFLAGS"
+      LIBS="$old_LIBS"
 
-    AC_CACHE_VAL([svn_cv_ruby_sitedir],[
-      svn_cv_ruby_sitedir="$rbconfig_sitedir"
-    ])
-    AC_ARG_WITH([ruby-sitedir],
-    AS_HELP_STRING([--with-ruby-sitedir=SITEDIR],
-                               [install Ruby bindings in SITEDIR
-                                (default is same as ruby's one)]),
-    [svn_ruby_installdir="$withval"],
-    [svn_ruby_installdir="$svn_cv_ruby_sitedir"])
-
-    AC_MSG_CHECKING([where to install Ruby scripts])
-    AC_CACHE_VAL([svn_cv_ruby_sitedir_libsuffix],[
-      svn_cv_ruby_sitedir_libsuffix="`echo "$rbconfig_sitelibdir" | \
-                                        $SED -e "s,^$rbconfig_sitedir,,"`"
-    ])
-    
SWIG_RB_SITE_LIB_DIR="${svn_ruby_installdir}${svn_cv_ruby_sitedir_libsuffix}"
-    AC_MSG_RESULT([$SWIG_RB_SITE_LIB_DIR])
-
-    AC_MSG_CHECKING([where to install Ruby extensions])
-    AC_CACHE_VAL([svn_cv_ruby_sitedir_archsuffix],[
-      svn_cv_ruby_sitedir_archsuffix="`echo "$rbconfig_sitearchdir" | \
-                                        $SED -e "s,^$rbconfig_sitedir,,"`"
-    ])
-    
SWIG_RB_SITE_ARCH_DIR="${svn_ruby_installdir}${svn_cv_ruby_sitedir_archsuffix}"
-    AC_MSG_RESULT([$SWIG_RB_SITE_ARCH_DIR])
-
-    AC_MSG_CHECKING([how to use output level for Ruby bindings tests])
-    AC_CACHE_VAL([svn_cv_ruby_test_verbose],[
-      svn_cv_ruby_test_verbose="normal"
-    ])
-    AC_ARG_WITH([ruby-test-verbose],
-    AS_HELP_STRING([--with-ruby-test-verbose=LEVEL],
-                               [how to use output level for Ruby bindings tests
-                                (default is normal)]),
-    [svn_ruby_test_verbose="$withval"],
-                  [svn_ruby_test_verbose="$svn_cv_ruby_test_verbose"])
-      SWIG_RB_TEST_VERBOSE="$svn_ruby_test_verbose"
-      AC_MSG_RESULT([$SWIG_RB_TEST_VERBOSE])
+      AC_CACHE_VAL([svn_cv_ruby_sitedir],[
+        svn_cv_ruby_sitedir="$rbconfig_sitedir"
+      ])
+      AC_ARG_WITH([ruby-sitedir],
+      AS_HELP_STRING([--with-ruby-sitedir=SITEDIR],
+                                 [install Ruby bindings in SITEDIR
+                                  (default is same as ruby's one)]),
+      [svn_ruby_installdir="$withval"],
+      [svn_ruby_installdir="$svn_cv_ruby_sitedir"])
+
+      AC_MSG_CHECKING([where to install Ruby scripts])
+      AC_CACHE_VAL([svn_cv_ruby_sitedir_libsuffix],[
+        svn_cv_ruby_sitedir_libsuffix="`echo "$rbconfig_sitelibdir" | \
+                                          $SED -e "s,^$rbconfig_sitedir,,"`"
+      ])
+      
SWIG_RB_SITE_LIB_DIR="${svn_ruby_installdir}${svn_cv_ruby_sitedir_libsuffix}"
+      AC_MSG_RESULT([$SWIG_RB_SITE_LIB_DIR])
+
+      AC_MSG_CHECKING([where to install Ruby extensions])
+      AC_CACHE_VAL([svn_cv_ruby_sitedir_archsuffix],[
+        svn_cv_ruby_sitedir_archsuffix="`echo "$rbconfig_sitearchdir" | \
+                                          $SED -e "s,^$rbconfig_sitedir,,"`"
+      ])
+      
SWIG_RB_SITE_ARCH_DIR="${svn_ruby_installdir}${svn_cv_ruby_sitedir_archsuffix}"
+      AC_MSG_RESULT([$SWIG_RB_SITE_ARCH_DIR])
+
+      AC_MSG_CHECKING([how to use output level for Ruby bindings tests])
+      AC_CACHE_VAL([svn_cv_ruby_test_verbose],[
+        svn_cv_ruby_test_verbose="normal"
+      ])
+      AC_ARG_WITH([ruby-test-verbose],
+      AS_HELP_STRING([--with-ruby-test-verbose=LEVEL],
+                                 [how to use output level for Ruby bindings 
tests
+                                  (default is normal)]),
+      [svn_ruby_test_verbose="$withval"],
+                    [svn_ruby_test_verbose="$svn_cv_ruby_test_verbose"])
+        SWIG_RB_TEST_VERBOSE="$svn_ruby_test_verbose"
+        AC_MSG_RESULT([$SWIG_RB_TEST_VERBOSE])
+    fi
   fi
   AC_SUBST(SWIG)
   AC_SUBST(SWIG_PY_INCLUDES)

Modified: subversion/branches/ra-git/build/ac-macros/zlib.m4
URL: 
http://svn.apache.org/viewvc/subversion/branches/ra-git/build/ac-macros/zlib.m4?rev=1764214&r1=1764213&r2=1764214&view=diff
==============================================================================
--- subversion/branches/ra-git/build/ac-macros/zlib.m4 (original)
+++ subversion/branches/ra-git/build/ac-macros/zlib.m4 Tue Oct 11 09:11:50 2016
@@ -26,47 +26,76 @@ dnl
 AC_DEFUN(SVN_LIB_Z,
 [
   zlib_found=no
+  zlib_skip=no
 
   AC_ARG_WITH(zlib,AS_HELP_STRING([--with-zlib=PREFIX],
                                   [zlib compression library]),
   [
-    if test "$withval" = "yes" ; then
-      AC_CHECK_HEADER(zlib.h, [
-        AC_CHECK_LIB(z, inflate, [zlib_found="builtin"])
-      ])
-    elif test "$withval" = "no" ; then
-      AC_MSG_ERROR([cannot compile without zlib.])
+    if test "$withval" = "yes"; then
+      zlib_skip=no
+    elif test "$withval" = "no"; then
+      zlib_skip=yes
     else
-      AC_MSG_NOTICE([zlib library configuration])
-      zlib_prefix=$withval
-      save_cppflags="$CPPFLAGS"
-      CPPFLAGS="$CPPFLAGS -I$zlib_prefix/include"
-      AC_CHECK_HEADERS(zlib.h,[
-        save_ldflags="$LDFLAGS"
-        LDFLAGS="$LDFLAGS -L$zlib_prefix/lib"
-        AC_CHECK_LIB(z, inflate, [zlib_found="yes"])
-        LDFLAGS="$save_ldflags"
-      ])
-      CPPFLAGS="$save_cppflags"
+      zlib_skip=no
+      zlib_prefix="$withval"
     fi
-  ],
-  [
-    AC_CHECK_HEADER(zlib.h, [
-      AC_CHECK_LIB(z, inflate, [zlib_found="builtin"])
-    ])
   ])
 
-  if test "$zlib_found" = "no"; then
+  if test "$zlib_skip" = "yes"; then
     AC_MSG_ERROR([subversion requires zlib])
   fi
 
-  if test "$zlib_found" = "yes"; then
-    SVN_ZLIB_INCLUDES="-I$zlib_prefix/include"
-    LDFLAGS="$LDFLAGS `SVN_REMOVE_STANDARD_LIB_DIRS(-L$zlib_prefix/lib)`"
-  fi
+  if test -n "$zlib_prefix"; then
+    AC_MSG_NOTICE([zlib library configuration via prefix])
+    save_cppflags="$CPPFLAGS"
+    CPPFLAGS="$CPPFLAGS -I$zlib_prefix/include"
+    AC_CHECK_HEADERS(zlib.h,[
+      save_ldflags="$LDFLAGS"
+      LDFLAGS="$LDFLAGS -L$zlib_prefix/lib"
+      AC_CHECK_LIB(z, inflate, [
+        zlib_found="yes"
+        SVN_ZLIB_INCLUDES="-I$zlib_prefix/include"
+        SVN_ZLIB_LIBS="`SVN_REMOVE_STANDARD_LIB_DIRS(-L$zlib_prefix/lib)` -lz"
+      ])
+      LDFLAGS="$save_ldflags"
+    ])
+    CPPFLAGS="$save_cppflags"
+  else
+    SVN_ZLIB_PKG_CONFIG()
 
-  SVN_ZLIB_LIBS="-lz"
+    if test "$zlib_found" = "no"; then
+      AC_MSG_NOTICE([zlib library configuration])
+      AC_CHECK_HEADER(zlib.h, [
+        AC_CHECK_LIB(z, inflate, [
+          zlib_found="builtin"
+          SVN_ZLIB_LIBS="-lz"
+        ])
+      ])
+    fi
+  fi
+ 
+  if test "$zlib_found" = "no"; then
+    AC_MSG_ERROR([subversion requires zlib])
+  fi
 
   AC_SUBST(SVN_ZLIB_INCLUDES)
   AC_SUBST(SVN_ZLIB_LIBS)
 ])
+
+dnl SVN_ZLIB_PKG_CONFIG()
+dnl Use pkg-config to try and detect and configure zlib
+AC_DEFUN(SVN_ZLIB_PKG_CONFIG,
+[
+  AC_MSG_NOTICE([zlib library configuration via pkg-config])
+  if test -n "$PKG_CONFIG"; then
+    AC_MSG_CHECKING([for zlib library])
+    if $PKG_CONFIG zlib --exists; then
+      AC_MSG_RESULT([yes])
+      zlib_found=yes
+      SVN_ZLIB_INCLUDES=`$PKG_CONFIG zlib --cflags`
+      SVN_ZLIB_LIBS=`$PKG_CONFIG zlib --libs`
+    else
+      AC_MSG_RESULT([no])
+    fi
+  fi
+])

Modified: subversion/branches/ra-git/build/generator/gen_base.py
URL: 
http://svn.apache.org/viewvc/subversion/branches/ra-git/build/generator/gen_base.py?rev=1764214&r1=1764213&r2=1764214&view=diff
==============================================================================
--- subversion/branches/ra-git/build/generator/gen_base.py (original)
+++ subversion/branches/ra-git/build/generator/gen_base.py Tue Oct 11 09:11:50 
2016
@@ -308,11 +308,17 @@ class GeneratorBase:
       key, _, val = line.split()
       aprerr += [(int(val), key)]
     write_struct('svn__apr_errno', aprerr)
+    aprdict = dict(aprerr)
+    del aprerr
 
     ## sanity check
-    intersection = set(errno.errorcode.keys()) & set(dict(aprerr).keys())
+    intersection = set(errno.errorcode.keys()) & set(aprdict.keys())
+    intersection = filter(lambda x: errno.errorcode[x] != aprdict[x],
+                          intersection)
     if self.errno_filter(intersection):
-        print("WARNING: errno intersects APR error codes: %r" % intersection)
+        print("WARNING: errno intersects APR error codes; "
+              "runtime computation of symbolic error names for the following 
numeric codes might be wrong: "
+              "%r" % (intersection,))
 
     self.write_file_if_changed('subversion/libsvn_subr/errorcode.inc',
                                '\n'.join(lines))

Modified: subversion/branches/ra-git/build/generator/gen_win_dependencies.py
URL: 
http://svn.apache.org/viewvc/subversion/branches/ra-git/build/generator/gen_win_dependencies.py?rev=1764214&r1=1764213&r2=1764214&view=diff
==============================================================================
--- subversion/branches/ra-git/build/generator/gen_win_dependencies.py 
(original)
+++ subversion/branches/ra-git/build/generator/gen_win_dependencies.py Tue Oct 
11 09:11:50 2016
@@ -586,7 +586,7 @@ class GenDependenciesBase(gen_base.Gener
   def _find_httpd(self, show_warnings):
     "Find Apache HTTPD and version"
 
-    minimal_httpd_version = (2, 0, 0)
+    minimal_httpd_version = (2, 2, 0)
     if not self.httpd_path:
       return
 

Modified: subversion/branches/ra-git/build/run_tests.py
URL: 
http://svn.apache.org/viewvc/subversion/branches/ra-git/build/run_tests.py?rev=1764214&r1=1764213&r2=1764214&view=diff
==============================================================================
--- subversion/branches/ra-git/build/run_tests.py (original)
+++ subversion/branches/ra-git/build/run_tests.py Tue Oct 11 09:11:50 2016
@@ -30,7 +30,7 @@
             [--fs-type=<fs-type>] [--fsfs-packing] [--fsfs-sharding=<n>]
             [--list] [--milestone-filter=<regex>] [--mode-filter=<type>]
             [--server-minor-version=<version>] [--http-proxy=<host>:<port>]
-            [--httpd-version=<version>]
+            [--httpd-version=<version>] [--httpd-whitelist=<version>]
             [--config-file=<file>] [--ssl-cert=<file>]
             [--exclusive-wc-locks] [--memcached-server=<url:port>]
             <abs_srcdir> <abs_builddir>
@@ -45,10 +45,10 @@ and filename of a test program, optional
 separated list of test numbers; the default is to run all the tests in it.
 '''
 
-import os, sys, shutil
+import os, sys, shutil, codecs
 import re
 import logging
-import optparse, subprocess, imp, threading, traceback, exceptions
+import optparse, subprocess, imp, threading, traceback
 from datetime import datetime
 
 try:
@@ -58,6 +58,10 @@ except ImportError:
   # Python <3.0
   import Queue as queue
 
+if sys.version_info < (3, 0):
+  # Python >= 3.0 already has this build in
+  import exceptions
+
 # Ensure the compiled C tests use a known locale (Python tests set the locale
 # explicitly).
 os.environ['LC_ALL'] = 'C'
@@ -121,6 +125,12 @@ def _get_term_width():
       cr = (25, 80)
   return int(cr[1])
 
+def ensure_str(s):
+  '''If S is not a string already, convert it to a string'''
+  if isinstance(s, str):
+    return s
+  else:
+    return s.decode("latin-1")
 
 class TestHarness:
   '''Test harness for Subversion tests.
@@ -259,6 +269,8 @@ class TestHarness:
       cmdline.append('--http-proxy-password=%s' % 
self.opts.http_proxy_password)
     if self.opts.httpd_version is not None:
       cmdline.append('--httpd-version=%s' % self.opts.httpd_version)
+    if self.opts.httpd_whitelist is not None:
+      cmdline.append('--httpd-whitelist=%s' % self.opts.httpd_whitelist)
     if self.opts.exclusive_wc_locks is not None:
       cmdline.append('--exclusive-wc-locks')
     if self.opts.memcached_server is not None:
@@ -404,9 +416,9 @@ class TestHarness:
         job.execute(self.harness)
 
         if job.result:
-          os.write(sys.stdout.fileno(), '!' * job.test_count())
+          os.write(sys.stdout.fileno(), b'!' * job.test_count())
         else:
-          os.write(sys.stdout.fileno(), '.' * job.test_count())
+          os.write(sys.stdout.fileno(), b'.' * job.test_count())
 
 
   def _run_global_sheduler(self, testlist, has_py_tests):
@@ -470,7 +482,7 @@ class TestHarness:
     for t in threads:
       t.join()
 
-    print
+    print("")
 
     # Aggregate and log the results
     failed = 0
@@ -479,22 +491,22 @@ class TestHarness:
     for job in jobs:
       if last_test_name != job.progbase:
         if last_test_name != "":
-          log.write('ELAPSED: %s %s\n' % (last_test_name, str(taken)))
-          log.write('\n')
+          log.write('ELAPSED: %s %s\n\n' % (last_test_name, str(taken)))
         last_test_name = job.progbase
         taken = job.taken
       else:
         taken += job.taken
 
-      log.writelines(job.stderr_lines)
+      for line in job.stderr_lines:
+        log.write(ensure_str(line))
+
       for line in job.stdout_lines:
-        self._process_test_output_line(line)
+        self._process_test_output_line(ensure_str(line))
 
       self._check_for_unknown_failure(log, job.progbase, job.result)
       failed = job.result or failed
 
-    log.write('ELAPSED: %s %s\n' % (last_test_name, str(taken)))
-    log.write('\n')
+    log.write('ELAPSED: %s %s\n\n' % (last_test_name, str(taken)))
 
     return failed
 
@@ -563,12 +575,12 @@ class TestHarness:
     else:
       failed = self._run_global_sheduler(testlist, len(py_tests) > 0)
 
-    # Open the log in binary mode because it can contain binary data
-    # from diff_tests.py's testing of svnpatch. This may prevent
-    # readlines() from reading the whole log because it thinks it
-    # has encountered the EOF marker.
-    self._open_log('rb')
-    log_lines = self.log.readlines()
+    # Open the log again to for filtering.
+    if self.logfile:
+      self._open_log('r')
+      log_lines = self.log.readlines()
+    else:
+      log_lines = []
 
     # Remove \r characters introduced by opening the log as binary
     if sys.platform == 'win32':
@@ -672,7 +684,7 @@ class TestHarness:
     # Copy the truly interesting verbose logs to a separate file, for easier
     # viewing.
     if xpassed or failed_list:
-      faillog = open(self.faillogfile, 'wb')
+      faillog = codecs.open(self.faillogfile, 'w', encoding="latin-1")
       last_start_lineno = None
       last_start_re = re.compile('^(FAIL|SKIP|XFAIL|PASS|START|CLEANUP|END):')
       for lineno, line in enumerate(log_lines):
@@ -686,7 +698,7 @@ class TestHarness:
         if last_start_re.match(line):
           last_start_lineno = lineno + 1
       faillog.close()
-    elif os.path.exists(self.faillogfile):
+    elif self.faillogfile and os.path.exists(self.faillogfile):
       print("WARNING: no failures, but '%s' exists from a previous run."
             % self.faillogfile)
 
@@ -703,7 +715,7 @@ class TestHarness:
     'Open the log file with the required MODE.'
     if self.logfile:
       self._close_log()
-      self.log = open(self.logfile, mode)
+      self.log = codecs.open(self.logfile, mode, encoding="latin-1")
 
   def _close_log(self):
     'Close the log file.'
@@ -742,7 +754,7 @@ class TestHarness:
   def _run_c_test(self, progabs, progdir, progbase, test_nums, dot_count):
     'Run a c test, escaping parameters as required.'
     if self.opts.list_tests and self.opts.milestone_filter:
-      print 'WARNING: --milestone-filter option does not currently work with C 
tests'
+      print('WARNING: --milestone-filter option does not currently work with C 
tests')
 
     if not os.access(progbase, os.X_OK):
       print("\nNot an executable file: " + progbase)
@@ -766,11 +778,11 @@ class TestHarness:
     def progress_func(completed):
       if not self.log or self.dots_written >= dot_count:
         return
-      dots = (completed * dot_count) / total
+      dots = (completed * dot_count) // total
       if dots > dot_count:
         dots = dot_count
       dots_to_write = dots - self.dots_written
-      os.write(sys.stdout.fileno(), '.' * dots_to_write)
+      os.write(sys.stdout.fileno(), b'.' * dots_to_write)
       self.dots_written = dots
 
     tests_completed = 0
@@ -778,6 +790,7 @@ class TestHarness:
                             stderr=self.log)
     line = prog.stdout.readline()
     while line:
+      line = ensure_str(line)
       if self._process_test_output_line(line):
         tests_completed += 1
         progress_func(tests_completed)
@@ -786,7 +799,7 @@ class TestHarness:
 
     # If we didn't run any tests, still print out the dots
     if not tests_completed:
-      os.write(sys.stdout.fileno(), '.' * dot_count)
+      os.write(sys.stdout.fileno(), b'.' * dot_count)
 
     prog.wait()
     return prog.returncode
@@ -794,8 +807,13 @@ class TestHarness:
   def _run_py_test(self, progabs, progdir, progbase, test_nums, dot_count):
     'Run a python test, passing parameters as needed.'
     try:
-      prog_mod = imp.load_module(progbase[:-3], open(progabs, 'r'), progabs,
-                                 ('.py', 'U', imp.PY_SOURCE))
+      if sys.version_info < (3, 0):
+        prog_mod = imp.load_module(progbase[:-3], open(progabs, 'r'), progabs,
+                                   ('.py', 'U', imp.PY_SOURCE))
+      else:
+        prog_mod = imp.load_module(progbase[:-3],
+                                   open(progabs, 'r', encoding="utf-8"),
+                                   progabs, ('.py', 'U', imp.PY_SOURCE))
     except:
       print("\nError loading test (details in following traceback): " + 
progbase)
       traceback.print_exc()
@@ -819,14 +837,14 @@ class TestHarness:
          in parallel mode."""
       if not self.log:
         return
-      dots = (completed * dot_count) / total
+      dots = (completed * dot_count) // total
       if dots > dot_count:
         dots = dot_count
       self.progress_lock.acquire()
       if self.dots_written < dot_count:
         dots_to_write = dots - self.dots_written
         self.dots_written = dots
-        os.write(old_stdout, '.' * dots_to_write)
+        os.write(old_stdout, b'.' * dots_to_write)
       self.progress_lock.release()
 
     serial_only = hasattr(prog_mod, 'serial_only') and prog_mod.serial_only
@@ -845,7 +863,7 @@ class TestHarness:
                                           test_selection=test_nums)
     except svntest.Failure:
       if self.log:
-        os.write(old_stdout, '.' * dot_count)
+        os.write(old_stdout, b'.' * dot_count)
       failed = True
 
     # restore some values
@@ -923,7 +941,7 @@ class TestHarness:
     # we printed a "Running all tests in ..." line, add the test result.
     if self.log:
       if self.opts.list_tests:
-        print ''
+        print()
       else:
         if failed:
           print(TextColors.FAILURE + 'FAILURE' + TextColors.ENDC)
@@ -999,6 +1017,8 @@ def create_parser():
                     help='Password for the HTTP Proxy.')
   parser.add_option('--httpd-version', action='store',
                     help='Assume HTTPD is this version.')
+  parser.add_option('--httpd-whitelist', action='store',
+                    help='Assume HTTPD whitelist is this version.')
   parser.add_option('--exclusive-wc-locks', action='store_true',
                     help='Use sqlite exclusive locking for working copies')
   parser.add_option('--memcached-server', action='store',

Modified: subversion/branches/ra-git/build/win32/svn.rc
URL: 
http://svn.apache.org/viewvc/subversion/branches/ra-git/build/win32/svn.rc?rev=1764214&r1=1764213&r2=1764214&view=diff
==============================================================================
--- subversion/branches/ra-git/build/win32/svn.rc (original)
+++ subversion/branches/ra-git/build/win32/svn.rc Tue Oct 11 09:11:50 2016
@@ -70,7 +70,7 @@ BEGIN
   BEGIN
     BLOCK "040904B0"
     BEGIN
-      VALUE "CompanyName", "http://subversion.apache.org/\0";
+      VALUE "CompanyName", "Apache Software Foundation\0"
       VALUE "FileDescription", APR_STRINGIFY(SVN_FILE_DESCRIPTION) "\0"
       VALUE "FileVersion", SVN_VER_NUMBER "\0"
       VALUE "InternalName", "SVN\0"

Modified: subversion/branches/ra-git/configure.ac
URL: 
http://svn.apache.org/viewvc/subversion/branches/ra-git/configure.ac?rev=1764214&r1=1764213&r2=1764214&view=diff
==============================================================================
--- subversion/branches/ra-git/configure.ac (original)
+++ subversion/branches/ra-git/configure.ac Tue Oct 11 09:11:50 2016
@@ -139,9 +139,18 @@ if test "$svn_lib_apr_memcache" = "yes";
             [Defined if apr_memcache (standalone or in apr-util) is present])
 fi
 
+AC_ARG_ENABLE(apache-whitelist,
+  AS_HELP_STRING([--enable-apache-whitelist=VER],
+                 [Whitelist a particular Apache version number,
+                  typically used to enable the use of a old version
+                  patched by a distribution.]),
+                 [apache_whitelist_ver=$enableval],
+                 [apache_whitelist_ver=no])
+HTTPD_WHITELIST="$apache_whitelist_ver"
+AC_SUBST(HTTPD_WHITELIST)
 
 dnl Find Apache with a recent-enough magic module number
-SVN_FIND_APACHE(20051115)
+SVN_FIND_APACHE(20051115, $apache_whitelist_ver)
 
 dnl Search for SQLite.  If you change SQLITE_URL from a .zip to
 dnl something else also update build/ac-macros/sqlite.m4 to reflect
@@ -202,7 +211,10 @@ localedir='${datadir}/locale'
 AC_SUBST(localedir)
 
 dnl For SVN_LOCALE_DIR, we have to expand it to something.  See SVN_BINDIR.
-if test "${datadir}" = '${prefix}/share' && test "${prefix}" = "NONE"; then
+if test "${prefix}" = "NONE" \
+  && ( test "${datadir}" = '${prefix}/share' \
+       || ( test "${datadir}" = '${datarootdir}' \
+            && test "${datarootdir}" = '${prefix}/share' ) ); then
   exp_localedir='${ac_default_prefix}/share/locale'
 else
   exp_localedir=$localedir
@@ -626,27 +638,27 @@ AC_SUBST(SVN_GNOME_KEYRING_INCLUDES)
 AC_SUBST(SVN_GNOME_KEYRING_LIBS)
 
 dnl Googlemock -----------------
-AC_ARG_ENABLE([gmock],
-  AS_HELP_STRING([--disable-gmock],
+AC_ARG_ENABLE([googlemock],
+  AS_HELP_STRING([--disable-googlemock],
                  [Do not use the Googlemock testing framework]),
   [],
-  [enable_gmock=yes])
+  [enable_googlemock=yes])
 
-AC_SUBST([GMOCK_SRCDIR], [$abs_srcdir/gmock-fused])
+AC_SUBST([GOOGLEMOCK_SRCDIR], [$abs_srcdir/googlemock])
 AC_MSG_CHECKING([whether use Googlemock])
-if test "$enable_gmock" != "no"; then
-  if test -d "$GMOCK_SRCDIR"; then
+if test "$enable_googlemock" != "no"; then
+  if test -d "$GOOGLEMOCK_SRCDIR"; then
     AC_MSG_RESULT([yes])
-    SVN_USE_GMOCK=true
+    SVN_USE_GOOGLEMOCK=true
   else
     AC_MSG_RESULT([no])
-    SVN_USE_GMOCK=false
+    SVN_USE_GOOGLEMOCK=false
   fi
 else
   AC_MSG_RESULT([no])
-  SVN_USE_GMOCK_SOURCES=false
+  SVN_USE_GOOGLEMOCK=false
 fi
-AC_SUBST([SVN_USE_GMOCK])
+AC_SUBST([SVN_USE_GOOGLEMOCK])
 
 dnl Ev2 experimental features ----------------------
 dnl Note: The Ev2 implementations will be built unconditionally, but by
@@ -1539,6 +1551,7 @@ fi
 # Need to strip '-no-cpp-precomp' from CPPFLAGS for SWIG as well.
 SWIG_CPPFLAGS="$CPPFLAGS"
 SVN_STRIP_FLAG(SWIG_CPPFLAGS, [-no-cpp-precomp ])
+SVN_STRIP_FLAG(SWIG_CPPFLAGS, [-Wdate-time ])
 AC_SUBST([SWIG_CPPFLAGS])
 
 dnl Since this is used only on Unix-y systems, define the path separator as '/'

Modified: subversion/branches/ra-git/contrib/client-side/incremental-update.py
URL: 
http://svn.apache.org/viewvc/subversion/branches/ra-git/contrib/client-side/incremental-update.py?rev=1764214&r1=1764213&r2=1764214&view=diff
==============================================================================
--- subversion/branches/ra-git/contrib/client-side/incremental-update.py 
(original)
+++ subversion/branches/ra-git/contrib/client-side/incremental-update.py Tue 
Oct 11 09:11:50 2016
@@ -156,24 +156,24 @@ def main():
         usage_and_exit(None)
     path = sys.argv[-1]
     args = ' '.join(sys.argv[1:-1] + ['--non-interactive'])
-    print "Fetch HEAD revision...",
+    sys.stdout.write("Fetch HEAD revision... ")
     head_revision = get_head_revision(path, args)
-    print "done."
-    print "Updating to revision %d" % (head_revision)
-    print "Harvesting the list of subdirectories...",
+    print("done.")
+    print("Updating to revision %d" % (head_revision))
+    sys.stdout.write("Harvesting the list of subdirectories... ")
     dirs = harvest_dirs(path)
-    print "done."
+    print("done.")
     dirs.sort(compare_paths)
     dirs.reverse()
-    print "Update the tree, one subdirectory at a time.  This could take " \
-          "a while."
+    print("Update the tree, one subdirectory at a time.  This could take " \
+          "a while.")
     num_dirs = len(dirs)
     width = len(str(num_dirs))
     format_string = '[%%%dd/%%%dd] Updating %%s' % (width, width)
     current = 0
     for dir in dirs:
         current = current + 1
-        print format_string % (current, num_dirs, dir)
+        print(format_string % (current, num_dirs, dir))
         os.system('%s update --quiet --revision %d %s %s'
                   % (SVN_BINARY, head_revision, args, dir))
 
@@ -183,6 +183,6 @@ if __name__ == "__main__":
         main()
     except SystemExit:
         raise
-    except Exception, e:
+    except Exception as e:
         print_error(str(e))
         sys.exit(1)

Modified: subversion/branches/ra-git/contrib/client-side/svn-hgmerge.py
URL: 
http://svn.apache.org/viewvc/subversion/branches/ra-git/contrib/client-side/svn-hgmerge.py?rev=1764214&r1=1764213&r2=1764214&view=diff
==============================================================================
--- subversion/branches/ra-git/contrib/client-side/svn-hgmerge.py (original)
+++ subversion/branches/ra-git/contrib/client-side/svn-hgmerge.py Tue Oct 11 
09:11:50 2016
@@ -38,7 +38,7 @@ def do_hgmerge(base, repo, local, merged
   shutil.copyfile(local, temp_file)
   args = [HGMERGE_BINARY, temp_file, base, repo]
   status = os.spawnvp(os.P_WAIT, HGMERGE_BINARY, args)
-  print status
+  print(status)
   if status == 0:
     os.unlink(merged)
     shutil.copyfile(temp_file, merged)

Modified: subversion/branches/ra-git/contrib/client-side/svn-merge-vendor.py
URL: 
http://svn.apache.org/viewvc/subversion/branches/ra-git/contrib/client-side/svn-merge-vendor.py?rev=1764214&r1=1764213&r2=1764214&view=diff
==============================================================================
--- subversion/branches/ra-git/contrib/client-side/svn-merge-vendor.py 
(original)
+++ subversion/branches/ra-git/contrib/client-side/svn-merge-vendor.py Tue Oct 
11 09:11:50 2016
@@ -72,7 +72,7 @@ def del_temp_tree(tmpdir):
     try:
         shutil.rmtree(tmpdir)
     except OSError:
-        print logger.warn("Couldn't delete tmpdir %s. Don't forget to remove 
it manually." % (tmpdir))
+        print(logger.warn("Couldn't delete tmpdir %s. Don't forget to remove 
it manually." % (tmpdir)))
 
 
 def checkout(url, revision=None):
@@ -282,7 +282,7 @@ def fine_tune(wc_dir):
 def alert(messages):
     """Wait the user to <ENTER> or abort the program"""
     for message in messages:
-        print >> sys.stderr, message
+        sys.stderr.write(message + "\n")
     try:
         return sys.stdin.readline()
     except KeyboardInterrupt:
@@ -336,7 +336,7 @@ def get_xml_text_content(xml_doc, xpath)
 
 def usage(error = None):
     """Print usage message and exit"""
-    print >>sys.stderr, """%s: Merges the difference between two revisions of 
the original repository of the vendor, to the vendor branch
+    sys.stderr.write("""%s: Merges the difference between two revisions of the 
original repository of the vendor, to the vendor branch
 usage: %s [options] REPO_URL CURRENT_PATH ORIGINAL_REPO_URL -r N:M
 
   - REPO_URL : repository URL for the vendor branch (i.e: 
http://svn.example.com/repos/vendor/libcomplex)
@@ -369,10 +369,10 @@ Valid options:
   -v [--verbose]           : verbose mode
   -c [--merged-vendor] arg : working copy path of the original already merged 
vendor trunk (skips the steps 1. and 2.)
   -w [--current-wc] arg    : working copy path of the current checked out 
trunk of the vendor branch (skips the step 3.)
-    """ % ((prog_name,) * 2)
+    """ % ((prog_name,) * 2))
 
     if error:
-        print >>sys.stder, "", "Current error : "+error
+        sys.stder.write("\nCurrent error : " + error + "\n")
 
     sys.exit(1)
 



Reply via email to