svn commit: r361693 - in head: contrib/subversion contrib/subversion/doc contrib/subversion/doc/programmer contrib/subversion/doc/user contrib/subversion/subversion contrib/subversion/subversion/in...

Mon Jun 1 10:27:07 UTC 2020

Author: dim
Date: Mon Jun  1 10:27:05 2020
New Revision: 361693
URL: https://svnweb.freebsd.org/changeset/base/361693

Log:
  Update Subversion to 1.14.0 LTS. See contrib/subversion/CHANGES for a
  summary of changes, or for a more thorough overview:
  
  https://subversion.apache.org/docs/release-notes/1.14
  
  NOTE: there is no need to dump and reload repositories, and the working
  copy format is still the same as Subversion 1.8 through 1.13.
  
  Relnotes:	yes
  MFC after:	2 weeks
  X-MFC-With:	r361677

Added:
  head/contrib/subversion/.swig_pl_checked
     - copied unchanged from r361678, vendor/subversion/dist/.swig_pl_checked
  head/contrib/subversion/.swig_py_checked
     - copied unchanged from r361678, vendor/subversion/dist/.swig_py_checked
  head/contrib/subversion/.swig_rb_checked
     - copied unchanged from r361678, vendor/subversion/dist/.swig_rb_checked
  head/contrib/subversion/subversion/include/private/svn_client_shelf.h
     - copied unchanged from r361678, vendor/subversion/dist/subversion/include/private/svn_client_shelf.h
  head/contrib/subversion/subversion/include/private/svn_client_shelf2.h
     - copied unchanged from r361678, vendor/subversion/dist/subversion/include/private/svn_client_shelf2.h
  head/contrib/subversion/subversion/include/private/svn_dirent_uri_private.h
     - copied unchanged from r361678, vendor/subversion/dist/subversion/include/private/svn_dirent_uri_private.h
  head/contrib/subversion/subversion/include/svn_opt_impl.h
     - copied unchanged from r361678, vendor/subversion/dist/subversion/include/svn_opt_impl.h
  head/contrib/subversion/subversion/include/svn_types_impl.h
     - copied unchanged from r361678, vendor/subversion/dist/subversion/include/svn_types_impl.h
  head/contrib/subversion/subversion/libsvn_client/layout.c
     - copied unchanged from r361678, vendor/subversion/dist/subversion/libsvn_client/layout.c
  head/contrib/subversion/subversion/libsvn_client/shelf.c
     - copied unchanged from r361678, vendor/subversion/dist/subversion/libsvn_client/shelf.c
  head/contrib/subversion/subversion/libsvn_client/shelf2.c
     - copied unchanged from r361678, vendor/subversion/dist/subversion/libsvn_client/shelf2.c
  head/contrib/subversion/subversion/libsvn_client/wc_editor.c
     - copied unchanged from r361678, vendor/subversion/dist/subversion/libsvn_client/wc_editor.c
  head/contrib/subversion/subversion/libsvn_repos/dump_editor.c
     - copied unchanged from r361678, vendor/subversion/dist/subversion/libsvn_repos/dump_editor.c
  head/contrib/subversion/subversion/svn/filesize.c
     - copied unchanged from r361678, vendor/subversion/dist/subversion/svn/filesize.c
  head/contrib/subversion/subversion/svn/shelf-cmd.c
     - copied unchanged from r361678, vendor/subversion/dist/subversion/svn/shelf-cmd.c
  head/contrib/subversion/subversion/svn/shelf-cmd.h
     - copied unchanged from r361678, vendor/subversion/dist/subversion/svn/shelf-cmd.h
  head/contrib/subversion/subversion/svn/shelf2-cmd.c
     - copied unchanged from r361678, vendor/subversion/dist/subversion/svn/shelf2-cmd.c
  head/contrib/subversion/subversion/svn/shelf2-cmd.h
     - copied unchanged from r361678, vendor/subversion/dist/subversion/svn/shelf2-cmd.h
Deleted:
  head/contrib/subversion/doc/programmer/gtest-guide.txt
  head/contrib/subversion/subversion/libsvn_client/copy_foreign.c
  head/contrib/subversion/subversion/libsvn_client/shelve.c
  head/contrib/subversion/subversion/svn/shelve-cmd.c
Modified:
  head/contrib/subversion/.editorconfig
  head/contrib/subversion/CHANGES
  head/contrib/subversion/COMMITTERS
  head/contrib/subversion/INSTALL
  head/contrib/subversion/LICENSE
  head/contrib/subversion/Makefile.in
  head/contrib/subversion/NOTICE
  head/contrib/subversion/aclocal.m4
  head/contrib/subversion/autogen.sh
  head/contrib/subversion/build-outputs.mk
  head/contrib/subversion/build.conf
  head/contrib/subversion/configure
  head/contrib/subversion/configure.ac
  head/contrib/subversion/doc/doxygen.conf
  head/contrib/subversion/doc/user/svn-best-practices.html
  head/contrib/subversion/gen-make.py
  head/contrib/subversion/get-deps.sh
  head/contrib/subversion/subversion/include/private/svn_branch.h
  head/contrib/subversion/subversion/include/private/svn_client_mtcc.h
  head/contrib/subversion/subversion/include/private/svn_client_private.h
  head/contrib/subversion/subversion/include/private/svn_dep_compat.h
  head/contrib/subversion/subversion/include/private/svn_diff_tree.h
  head/contrib/subversion/subversion/include/private/svn_element.h
  head/contrib/subversion/subversion/include/private/svn_fs_fs_private.h
  head/contrib/subversion/subversion/include/private/svn_repos_private.h
  head/contrib/subversion/subversion/include/private/svn_sorts_private.h
  head/contrib/subversion/subversion/include/private/svn_subr_private.h
  head/contrib/subversion/subversion/include/private/svn_wc_private.h
  head/contrib/subversion/subversion/include/svn_client.h
  head/contrib/subversion/subversion/include/svn_config.h
  head/contrib/subversion/subversion/include/svn_delta.h
  head/contrib/subversion/subversion/include/svn_diff.h
  head/contrib/subversion/subversion/include/svn_dirent_uri.h
  head/contrib/subversion/subversion/include/svn_error_codes.h
  head/contrib/subversion/subversion/include/svn_fs.h
  head/contrib/subversion/subversion/include/svn_opt.h
  head/contrib/subversion/subversion/include/svn_props.h
  head/contrib/subversion/subversion/include/svn_ra.h
  head/contrib/subversion/subversion/include/svn_ra_svn.h
  head/contrib/subversion/subversion/include/svn_repos.h
  head/contrib/subversion/subversion/include/svn_time.h
  head/contrib/subversion/subversion/include/svn_types.h
  head/contrib/subversion/subversion/include/svn_utf.h
  head/contrib/subversion/subversion/include/svn_version.h
  head/contrib/subversion/subversion/include/svn_wc.h
  head/contrib/subversion/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
  head/contrib/subversion/subversion/libsvn_auth_gnome_keyring/libsvn_auth_gnome_keyring.pc.in
  head/contrib/subversion/subversion/libsvn_auth_kwallet/kwallet.cpp
  head/contrib/subversion/subversion/libsvn_auth_kwallet/libsvn_auth_kwallet.pc.in
  head/contrib/subversion/subversion/libsvn_client/add.c
  head/contrib/subversion/subversion/libsvn_client/blame.c
  head/contrib/subversion/subversion/libsvn_client/client.h
  head/contrib/subversion/subversion/libsvn_client/commit.c
  head/contrib/subversion/subversion/libsvn_client/commit_util.c
  head/contrib/subversion/subversion/libsvn_client/conflicts.c
  head/contrib/subversion/subversion/libsvn_client/copy.c
  head/contrib/subversion/subversion/libsvn_client/delete.c
  head/contrib/subversion/subversion/libsvn_client/deprecated.c
  head/contrib/subversion/subversion/libsvn_client/diff.c
  head/contrib/subversion/subversion/libsvn_client/diff_local.c
  head/contrib/subversion/subversion/libsvn_client/diff_summarize.c
  head/contrib/subversion/subversion/libsvn_client/export.c
  head/contrib/subversion/subversion/libsvn_client/info.c
  head/contrib/subversion/subversion/libsvn_client/libsvn_client.pc.in
  head/contrib/subversion/subversion/libsvn_client/list.c
  head/contrib/subversion/subversion/libsvn_client/merge.c
  head/contrib/subversion/subversion/libsvn_client/mtcc.c
  head/contrib/subversion/subversion/libsvn_client/patch.c
  head/contrib/subversion/subversion/libsvn_client/ra.c
  head/contrib/subversion/subversion/libsvn_client/repos_diff.c
  head/contrib/subversion/subversion/libsvn_client/revert.c
  head/contrib/subversion/subversion/libsvn_client/revisions.c
  head/contrib/subversion/subversion/libsvn_client/status.c
  head/contrib/subversion/subversion/libsvn_client/update.c
  head/contrib/subversion/subversion/libsvn_client/upgrade.c
  head/contrib/subversion/subversion/libsvn_client/util.c
  head/contrib/subversion/subversion/libsvn_delta/branch.c
  head/contrib/subversion/subversion/libsvn_delta/branch_compat.c
  head/contrib/subversion/subversion/libsvn_delta/compat.c
  head/contrib/subversion/subversion/libsvn_delta/debug_editor.c
  head/contrib/subversion/subversion/libsvn_delta/deprecated.c
  head/contrib/subversion/subversion/libsvn_delta/element.c
  head/contrib/subversion/subversion/libsvn_delta/libsvn_delta.pc.in
  head/contrib/subversion/subversion/libsvn_delta/path_driver.c
  head/contrib/subversion/subversion/libsvn_diff/diff_file.c
  head/contrib/subversion/subversion/libsvn_diff/diff_tree.c
  head/contrib/subversion/subversion/libsvn_diff/libsvn_diff.pc.in
  head/contrib/subversion/subversion/libsvn_diff/parse-diff.c
  head/contrib/subversion/subversion/libsvn_fs/fs-loader.c
  head/contrib/subversion/subversion/libsvn_fs/fs-loader.h
  head/contrib/subversion/subversion/libsvn_fs/libsvn_fs.pc.in
  head/contrib/subversion/subversion/libsvn_fs_base/fs.c
  head/contrib/subversion/subversion/libsvn_fs_base/libsvn_fs_base.pc.in
  head/contrib/subversion/subversion/libsvn_fs_fs/cached_data.c
  head/contrib/subversion/subversion/libsvn_fs_fs/cached_data.h
  head/contrib/subversion/subversion/libsvn_fs_fs/dag.c
  head/contrib/subversion/subversion/libsvn_fs_fs/dump-index.c
  head/contrib/subversion/subversion/libsvn_fs_fs/fs.c
  head/contrib/subversion/subversion/libsvn_fs_fs/fs_fs.c
  head/contrib/subversion/subversion/libsvn_fs_fs/fs_fs.h
  head/contrib/subversion/subversion/libsvn_fs_fs/id.c
  head/contrib/subversion/subversion/libsvn_fs_fs/index.c
  head/contrib/subversion/subversion/libsvn_fs_fs/libsvn_fs_fs.pc.in
  head/contrib/subversion/subversion/libsvn_fs_fs/load-index.c
  head/contrib/subversion/subversion/libsvn_fs_fs/low_level.c
  head/contrib/subversion/subversion/libsvn_fs_fs/pack.c
  head/contrib/subversion/subversion/libsvn_fs_fs/recovery.c
  head/contrib/subversion/subversion/libsvn_fs_fs/rep-cache-db.h
  head/contrib/subversion/subversion/libsvn_fs_fs/rep-cache-db.sql
  head/contrib/subversion/subversion/libsvn_fs_fs/rep-cache.c
  head/contrib/subversion/subversion/libsvn_fs_fs/revprops.c
  head/contrib/subversion/subversion/libsvn_fs_fs/revprops.h
  head/contrib/subversion/subversion/libsvn_fs_fs/stats.c
  head/contrib/subversion/subversion/libsvn_fs_fs/temp_serializer.c
  head/contrib/subversion/subversion/libsvn_fs_fs/temp_serializer.h
  head/contrib/subversion/subversion/libsvn_fs_fs/transaction.c
  head/contrib/subversion/subversion/libsvn_fs_fs/tree.c
  head/contrib/subversion/subversion/libsvn_fs_fs/verify.c
  head/contrib/subversion/subversion/libsvn_fs_util/libsvn_fs_util.pc.in
  head/contrib/subversion/subversion/libsvn_fs_x/cached_data.c
  head/contrib/subversion/subversion/libsvn_fs_x/changes.c
  head/contrib/subversion/subversion/libsvn_fs_x/dag_cache.c
  head/contrib/subversion/subversion/libsvn_fs_x/dag_cache.h
  head/contrib/subversion/subversion/libsvn_fs_x/fs.c
  head/contrib/subversion/subversion/libsvn_fs_x/fs_x.c
  head/contrib/subversion/subversion/libsvn_fs_x/libsvn_fs_x.pc.in
  head/contrib/subversion/subversion/libsvn_fs_x/low_level.c
  head/contrib/subversion/subversion/libsvn_fs_x/pack.c
  head/contrib/subversion/subversion/libsvn_fs_x/rep-cache-db.h
  head/contrib/subversion/subversion/libsvn_fs_x/revprops.c
  head/contrib/subversion/subversion/libsvn_fs_x/temp_serializer.c
  head/contrib/subversion/subversion/libsvn_fs_x/transaction.c
  head/contrib/subversion/subversion/libsvn_fs_x/tree.c
  head/contrib/subversion/subversion/libsvn_fs_x/verify.c
  head/contrib/subversion/subversion/libsvn_ra/compat.c
  head/contrib/subversion/subversion/libsvn_ra/deprecated.c
  head/contrib/subversion/subversion/libsvn_ra/libsvn_ra.pc.in
  head/contrib/subversion/subversion/libsvn_ra/ra_loader.c
  head/contrib/subversion/subversion/libsvn_ra/ra_loader.h
  head/contrib/subversion/subversion/libsvn_ra/wrapper_template.h
  head/contrib/subversion/subversion/libsvn_ra_local/libsvn_ra_local.pc.in
  head/contrib/subversion/subversion/libsvn_ra_local/ra_plugin.c
  head/contrib/subversion/subversion/libsvn_ra_serf/commit.c
  head/contrib/subversion/subversion/libsvn_ra_serf/inherited_props.c
  head/contrib/subversion/subversion/libsvn_ra_serf/libsvn_ra_serf.pc.in
  head/contrib/subversion/subversion/libsvn_ra_serf/list.c
  head/contrib/subversion/subversion/libsvn_ra_serf/lock.c
  head/contrib/subversion/subversion/libsvn_ra_serf/options.c
  head/contrib/subversion/subversion/libsvn_ra_serf/ra_serf.h
  head/contrib/subversion/subversion/libsvn_ra_serf/replay.c
  head/contrib/subversion/subversion/libsvn_ra_serf/serf.c
  head/contrib/subversion/subversion/libsvn_ra_serf/update.c
  head/contrib/subversion/subversion/libsvn_ra_serf/util.c
  head/contrib/subversion/subversion/libsvn_ra_svn/client.c
  head/contrib/subversion/subversion/libsvn_ra_svn/editorp.c
  head/contrib/subversion/subversion/libsvn_ra_svn/libsvn_ra_svn.pc.in
  head/contrib/subversion/subversion/libsvn_ra_svn/protocol
  head/contrib/subversion/subversion/libsvn_repos/authz.c
  head/contrib/subversion/subversion/libsvn_repos/authz.h
  head/contrib/subversion/subversion/libsvn_repos/authz_info.c
  head/contrib/subversion/subversion/libsvn_repos/authz_parse.c
  head/contrib/subversion/subversion/libsvn_repos/commit.c
  head/contrib/subversion/subversion/libsvn_repos/config_file.c
  head/contrib/subversion/subversion/libsvn_repos/config_file.h
  head/contrib/subversion/subversion/libsvn_repos/delta.c
  head/contrib/subversion/subversion/libsvn_repos/deprecated.c
  head/contrib/subversion/subversion/libsvn_repos/dump.c
  head/contrib/subversion/subversion/libsvn_repos/fs-wrap.c
  head/contrib/subversion/subversion/libsvn_repos/libsvn_repos.pc.in
  head/contrib/subversion/subversion/libsvn_repos/list.c
  head/contrib/subversion/subversion/libsvn_repos/load-fs-vtable.c
  head/contrib/subversion/subversion/libsvn_repos/load.c
  head/contrib/subversion/subversion/libsvn_repos/log.c
  head/contrib/subversion/subversion/libsvn_repos/replay.c
  head/contrib/subversion/subversion/libsvn_repos/repos.c
  head/contrib/subversion/subversion/libsvn_subr/cmdline.c
  head/contrib/subversion/subversion/libsvn_subr/compress_lz4.c
  head/contrib/subversion/subversion/libsvn_subr/config_file.c
  head/contrib/subversion/subversion/libsvn_subr/config_keys.inc
  head/contrib/subversion/subversion/libsvn_subr/config_win.c
  head/contrib/subversion/subversion/libsvn_subr/deprecated.c
  head/contrib/subversion/subversion/libsvn_subr/dirent_uri.c
  head/contrib/subversion/subversion/libsvn_subr/error.c
  head/contrib/subversion/subversion/libsvn_subr/gpg_agent.c
  head/contrib/subversion/subversion/libsvn_subr/internal_statements.h
  head/contrib/subversion/subversion/libsvn_subr/io.c
  head/contrib/subversion/subversion/libsvn_subr/iter.c
  head/contrib/subversion/subversion/libsvn_subr/libsvn_subr.pc.in
  head/contrib/subversion/subversion/libsvn_subr/lz4/lz4.c
  head/contrib/subversion/subversion/libsvn_subr/lz4/lz4internal.h
  head/contrib/subversion/subversion/libsvn_subr/mergeinfo.c
  head/contrib/subversion/subversion/libsvn_subr/object_pool.c
  head/contrib/subversion/subversion/libsvn_subr/opt.c
  head/contrib/subversion/subversion/libsvn_subr/pool.c
  head/contrib/subversion/subversion/libsvn_subr/sorts.c
  head/contrib/subversion/subversion/libsvn_subr/sqlite3wrapper.c
  head/contrib/subversion/subversion/libsvn_subr/ssl_client_cert_pw_providers.c
  head/contrib/subversion/subversion/libsvn_subr/stream.c
  head/contrib/subversion/subversion/libsvn_subr/sysinfo.c
  head/contrib/subversion/subversion/libsvn_subr/utf.c
  head/contrib/subversion/subversion/libsvn_subr/utf8proc/utf8proc_data.c
  head/contrib/subversion/subversion/libsvn_subr/version.c
  head/contrib/subversion/subversion/libsvn_subr/win32_crashrpt.c
  head/contrib/subversion/subversion/libsvn_subr/win32_crypto.c
  head/contrib/subversion/subversion/libsvn_subr/x509info.c
  head/contrib/subversion/subversion/libsvn_subr/x509parse.c
  head/contrib/subversion/subversion/libsvn_wc/README
  head/contrib/subversion/subversion/libsvn_wc/conflicts.c
  head/contrib/subversion/subversion/libsvn_wc/conflicts.h
  head/contrib/subversion/subversion/libsvn_wc/deprecated.c
  head/contrib/subversion/subversion/libsvn_wc/diff_local.c
  head/contrib/subversion/subversion/libsvn_wc/entries.c
  head/contrib/subversion/subversion/libsvn_wc/libsvn_wc.pc.in
  head/contrib/subversion/subversion/libsvn_wc/node.c
  head/contrib/subversion/subversion/libsvn_wc/props.c
  head/contrib/subversion/subversion/libsvn_wc/questions.c
  head/contrib/subversion/subversion/libsvn_wc/revert.c
  head/contrib/subversion/subversion/libsvn_wc/tree_conflicts.c
  head/contrib/subversion/subversion/libsvn_wc/update_editor.c
  head/contrib/subversion/subversion/libsvn_wc/upgrade.c
  head/contrib/subversion/subversion/libsvn_wc/wc-checks.h
  head/contrib/subversion/subversion/libsvn_wc/wc-metadata.h
  head/contrib/subversion/subversion/libsvn_wc/wc-queries.h
  head/contrib/subversion/subversion/libsvn_wc/wc-queries.sql
  head/contrib/subversion/subversion/libsvn_wc/wc.h
  head/contrib/subversion/subversion/libsvn_wc/wc_db.c
  head/contrib/subversion/subversion/libsvn_wc/wc_db.h
  head/contrib/subversion/subversion/libsvn_wc/wc_db_update_move.c
  head/contrib/subversion/subversion/libsvn_wc/wc_db_wcroot.c
  head/contrib/subversion/subversion/libsvn_wc/wcroot_anchor.c
  head/contrib/subversion/subversion/svn/auth-cmd.c
  head/contrib/subversion/subversion/svn/blame-cmd.c
  head/contrib/subversion/subversion/svn/cl.h
  head/contrib/subversion/subversion/svn/conflict-callbacks.c
  head/contrib/subversion/subversion/svn/diff-cmd.c
  head/contrib/subversion/subversion/svn/help-cmd.c
  head/contrib/subversion/subversion/svn/info-cmd.c
  head/contrib/subversion/subversion/svn/list-cmd.c
  head/contrib/subversion/subversion/svn/log-cmd.c
  head/contrib/subversion/subversion/svn/merge-cmd.c
  head/contrib/subversion/subversion/svn/notify.c
  head/contrib/subversion/subversion/svn/propset-cmd.c
  head/contrib/subversion/subversion/svn/resolve-cmd.c
  head/contrib/subversion/subversion/svn/revert-cmd.c
  head/contrib/subversion/subversion/svn/svn.c
  head/contrib/subversion/subversion/svn/util.c
  head/contrib/subversion/subversion/svn_private_config.h.in
  head/contrib/subversion/subversion/svnadmin/svnadmin.c
  head/contrib/subversion/subversion/svnbench/cl.h
  head/contrib/subversion/subversion/svnbench/help-cmd.c
  head/contrib/subversion/subversion/svnbench/svnbench.c
  head/contrib/subversion/subversion/svndumpfilter/svndumpfilter.c
  head/contrib/subversion/subversion/svnfsfs/dump-index-cmd.c
  head/contrib/subversion/subversion/svnfsfs/load-index-cmd.c
  head/contrib/subversion/subversion/svnfsfs/stats-cmd.c
  head/contrib/subversion/subversion/svnfsfs/svnfsfs.c
  head/contrib/subversion/subversion/svnlook/svnlook.c
  head/contrib/subversion/subversion/svnmucc/svnmucc.c
  head/contrib/subversion/subversion/svnrdump/dump_editor.c
  head/contrib/subversion/subversion/svnrdump/load_editor.c
  head/contrib/subversion/subversion/svnrdump/svnrdump.c
  head/contrib/subversion/subversion/svnrdump/svnrdump.h
  head/contrib/subversion/subversion/svnrdump/util.c
  head/contrib/subversion/subversion/svnserve/logger.c
  head/contrib/subversion/subversion/svnserve/logger.h
  head/contrib/subversion/subversion/svnserve/serve.c
  head/contrib/subversion/subversion/svnserve/svnserve.c
  head/contrib/subversion/subversion/svnsync/svnsync.c
  head/contrib/subversion/subversion/svnversion/svnversion.c
  head/contrib/subversion/win-tests.py
  head/usr.bin/svn/lib/libsvn_client/Makefile
  head/usr.bin/svn/lib/libsvn_repos/Makefile
  head/usr.bin/svn/svn/Makefile
  head/usr.bin/svn/svn_private_config.h
Directory Properties:
  head/contrib/subversion/   (props changed)

Modified: head/contrib/subversion/.editorconfig
==============================================================================

--- head/contrib/subversion/.editorconfig	Mon Jun  1 10:14:45 2020	(r361692)
+++ head/contrib/subversion/.editorconfig	Mon Jun  1 10:27:05 2020	(r361693)
@@ -7,3 +7,13 @@ indent_style = space
 indent_size = 2
 insert_final_newline = true
 trim_trailing_whitespace = false
+
+[**/Makefile*]
+indent_style = tab
+
+[build-outputs.mk]
+indent_style = tab
+
+[build/generator/templates/build-outputs.mk.ezt]
+indent_style = tab
+

Copied: head/contrib/subversion/.swig_pl_checked (from r361678, vendor/subversion/dist/.swig_pl_checked)
==============================================================================

Copied: head/contrib/subversion/.swig_py_checked (from r361678, vendor/subversion/dist/.swig_py_checked)
==============================================================================

Copied: head/contrib/subversion/.swig_rb_checked (from r361678, vendor/subversion/dist/.swig_rb_checked)
==============================================================================

Modified: head/contrib/subversion/CHANGES
==============================================================================
--- head/contrib/subversion/CHANGES	Mon Jun  1 10:14:45 2020	(r361692)
+++ head/contrib/subversion/CHANGES	Mon Jun  1 10:27:05 2020	(r361693)
@@ -1,5 +1,355 @@
+# To view a revision listed as (rXXXXXXX), visit:
+#   https://svn.apache.org/rXXXXXXX
+#
+# To view an issue listed as (issue #XXXX), visit:
+#   https://subversion.apache.org/issue-XXXX
+
+Version 1.14.0
+(6 May 2020, from /branches/1.14.x)
+https://svn.apache.org/repos/asf/subversion/tags/1.14.0
+
+ User-visible changes:
+  - Minor new features and improvements:
+    * Experimental shelving feature is now disabled by default (r1875039)
+    * Reinstate support for experimental shelving v2 from SVN 1.11 (r1875037)
+    * Introduce 'svnadmin build-repcache' command (r1875921 et al)
+
+  - Client-side improvements and bugfixes:
+    * Add 'changelist' option to 'svn info --show-item' (r1869481)
+    * Allow simultaneous use of 'svn log' --quiet and --diff options (r1871916)
+    * Fix 'svn info' for file that was inside replaced directory (issue #4837)
+    * Don't abort if the server redirects to a non-canonical URL (r1873375)
+    * Fix merge assertion failure in svn_sort__array_insert (issue #4840)
+    * Escape filenames when invoking $SVN_EDITOR (r1874057 et al)
+    * Small performance optimization for FSFS rep-cache.db (r1875918)
+    * Fix a crash seen when using git-svn with kwallet (r1875680)
+
+  - Server-side improvements and bugfixes:
+    * Fix 'svnadmin load --normalize-props' for versioned properties (r1868203)
+    * mailer.py: prevent SMTP errors from impeding later emails (issue #1804)
+    * mailer.py: Add option to specify the SMTP port to connect to (r1872398)
+    * Make svn-backup-dump.py work on Python 3 
+    * validate-files.py: Fix handling for non-ASCII characters (r1874393)
+    * Fix an undefined behavior problem in FSFS caching code (r1876054)
+
+ Developer-visible changes:
+    * Require at least version 1.5 of APR (r1874094)
+    * Support Python3 in the py-swig bindings; requires py3c (r1869354 et al)
+    * Support building with SWIG 4 on Python 3.x (r1869853)
+    * Fix svnserveautocheck for Python 3 (r1868151)
+    * contribulyze.py: Support Python 3 in addition to Python 2 (r1871211)
+    * Fix Proc.new warnings in Ruby bindings with Ruby >= 2.7 (r1876020)
+
+Version 1.13.0
+(30 Oct 2019, from /branches/1.13.x)
+https://svn.apache.org/repos/asf/subversion/tags/1.13.0
+
+ User-visible changes:
+  - Minor new features and improvements:
+    * New 'svnadmin rev-size' command to report revision size (r1857624)
+    * In 'svn help', hide experimental commands and global options (issue #4828)
+    * Add a hint about mod_dav_svn misconfiguration (r1866738)
+    * Performance improvement for 'svn st' etc., in WC SQLite DB (r1865523)
+
+  - Client-side bugfixes:
+    * Windows: avoid delays in SSL certificate validation override (r1863018)
+    * Fix 'svn patch' setting mode 0600 on patched files with props (r1864440)
+    * Fix "svn diff --changelist ARG" broken in subdirectories (issue #4822)
+    * Fix misleading 'redirect cycle' error on a non-repository URL (r1866899)
+
+  - Server-side bugfixes:
+    * svnserve: Report some errors that we previously ignored (r1866062)
+    * Make server code more resilient to malformed paths and URLs (r1866318 et al)
+    * Make dump stream parser more resilient to malformed dump stream (r1866951)
+    * mod_dav_svn: Fix missing Last-Modified header on 'external' GET requests (r1866425)
+
+  - Client-side and server-side bugfixes:
+    * Fix excessive memory usage in some cases reading binary data (r1866950)
+    * Win32: fix svn_io_file_rename2() spinning in a retry loop (r1865518)
+
+  - Other tool improvements and bugfixes:
+    * svn_load_dirs.pl: do not show password; fix cleanup (r1863262, r1863392)
+
+ Developer-visible changes:
+    * New svn_fs_ioctl() API for FSFS stats, dump/load index, rev-size (r1857435)
+
+
+Version 1.12.2
+(24 Jul 2019, from /branches/1.12.x)
+https://svn.apache.org/repos/asf/subversion/tags/1.12.2
+
+ User-visible changes:
+    * Fix conflict resolver bug: local and incoming edits swapped. (r1863285)
+    * Fix memory lifetime problem in a libsvn_wc error code path. (r1863287)
+    * Faster Windows file existence checks, improving 'svn st' etc. (r1863289)
+
+ Developer-visible changes:
+    * Allow generating Visual Studio 2019 projects (r1863286)
+    * Fix build with APR 1.7.0. (r1860377)
+    * Fix building Subversion with Visual Studio 2005 and 2008. (r1863288)
+    * Allow svnserve's 'get-deleted-rev' API to return 'not deleted'. (r1863290)
+
+
+Version 1.12.1
+(Not released; see changes for 1.12.2.)
+
+
+Version 1.12.0
+(12 Apr 2019, from /branches/1.12.x)
+https://svn.apache.org/repos/asf/subversion/tags/1.12.0
+
+ User-visible changes:
+  - Major new features:
+
+  - Minor new features and improvements:
+    * 'move vs. move' merge conflicts can now be resolved (r1846851, r1851913)
+    * 'svn --version --verbose' shows loaded libraries on Linux (r1843774)
+    * 'svnrdump' can read/write a file instead of stdin/stdout (r1844906)
+    * 'svn list' tries to not truncate the author's name (r1847384 et al.)
+    * 'svn list' can show sizes in base-2 unit suffixes (r1847384 et al.)
+    * 'svn info' shows the size of files in the repository (r1847441 et al.)
+    * 'svn cleanup' can remove read-only directories (#4806, r1854072 et al.)
+
+  - Client-side bugfixes:
+    * Repos-to-WC copy with --parents works with absent target (r1843888)
+    * Repos-to-WC copy from foreign repo with peg/operative revs (#4785)
+
+  - Server-side bugfixes:
+    * Ignore empty group definitions in authz files (#4802, r1851687)
+
+  - Client-side and server-side bugfixes:
+
+  - Other tool improvements and bugfixes:
+    * svnauthz: warn about empty groups in authz files (#4803, r1851823)
+    * Storing passwords in plain text on disk is disabled by default (r1845377)
+
+ Developer-visible changes:
+  - General:
+    * Updated the required libtool version to 2.x (r1845716)
+    * get-deps.sh: Remove references to Googlemock and Googletest (r1849200)
+    * All C++ code is compiled in C++11 mode by default (r1849202)
+
+  - Bindings:
+    * JavaHL: Fixed potential core dump in ISVNClient.diff (r1845408)
+    * JavaHL: Let clients decode file contents from ISVNClient.blame (r1851333)
+
+
+Version 1.11.1
+(11 Jan 2019, from /branches/1.11.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.11.1
+
+ User-visible changes:
+  - Minor new features and improvements:
+    * Conflict resolver support for added vs unversioned file (r1845577)
+    * Conflict resolver support for unversioned directories (r1846299)
+    * Improve help for 'svn add' and the '-N' option (r1842814 et al.)
+    * Improve display of Mac OS name in 'svn --version --verbose' (r1842334)
+
+  - Client-side bugfixes:
+    * Fix: repos-to-WC copy with --parents doesn't create dirs (#4768)
+    * Fix: foreign repo copy with peg/operative revisions (#4785)
+    * Fix: foreign repo copy of file adding mergeinfo (#4792)
+    * Fix: assertion failure using -rPREV on a working copy at r0 (#4532)
+    * Fix: tree conflict message ends a sentence with a colon (#4717)
+
+  - Server-side bugfixes:
+    * Fix CVE-2018-11803: malicious SVN clients can crash mod_dav_svn
+    * Fix: unexpected SVN_ERR_FS_NOT_DIRECTORY errors (#4791)
+    * Fix: mod_dav_svn's SVNUseUTF8 had no effect in some setups (r1844882)
+    * Fix crash in mod_http2 (#4782)
+
+  - Other tool improvements and bugfixes:
+    * svndumpfilter: Clarify error messages by including node path (r1845261)
+
+  - Bindings bugfixes:
+    * JavaHL: Fix crash in client code when using external diff (r1845408)
+
+ Developer-visible changes:
+  - General:
+    * Fix build on systems without python in $PATH (r1845555)
+    * Fix compiler warnings about indentation (r1845556 et al.)
+
+  - API changes:
+    (none)
+
+
+Version 1.11.0
+(30 Oct 2018, from /branches/1.11.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.11.0
+
+ User-visible changes:
+  - Major new features:
+    * Shelving is no longer based on patch files (experimental) (issue #3625)
+    * Checkpointing (experimental) (issue #3626)
+    * Viewspec output command (experimental) (issue #4753)
+
+  - Minor new features and improvements:
+    * Improvements to tree conflict resolution (issue #4694 #4766 ...)
+    * 'patch' can now read non-pretty-printed svn:mergeinfo diffs (r1822151)
+    * Better error when http:// URL is not a Subversion repository (r1825302)
+    * Add 'schedule' and 'depth' items to 'svn info --show-item' (r1827032)
+    * Allow the client cert password to be saved (r1836762)
+
+  - Client-side bugfixes:
+    * Fix a crash in a repo:WC summary diff of a local copy (r1835218)
+    * Fix double diff headers (r1836746)
+    * Tree conflict resolver: avoid endless scan in some cases (r1839662)
+
+  - Server-side bugfixes:
+    * svnadmin dump shouldn't canonicalize svn:date (issue #4767)
+    * 'svnadmin verify --keep-going --quiet' shows an error summary (r1837790)
+    * Let 'svnadmin recover' prune the rep-cache even if disabled (r1838813)
+
+  - Client-side and server-side bugfixes:
+    * Fix pattern-matching of top level path in listing with search (r1830599)
+    * Allow commands like 'svn ci --file X' to work when X is a FIFO (r1836306)
+
+  - Other tool improvements and bugfixes:
+    * tools/client-side/bash_completion: Add '--password-from-stdin' (r1820045)
+
+ Developer-visible changes:
+  - General:
+    * new tool: tools/dist/edit-N-log-messages (r1819207)
+    * tools/dev/unix-build/Makefile.svn: various fixes
+    * Expose the diff option 'pretty_print_mergeinfo' in APIs (r1822014)
+    * In 'revert' APIs, choose whether to delete schedule-add nodes (r1822534)
+
+  - Bindings:
+    * Fix Python binding fs.FileDiff behaviour with python-future (r1823802)
+    * Fix Python unit test, fs.SubversionFSTestCase, on Windows (r1824410)
+    * Bump minimum JDK version required for JavaHL to 1.8 (r1831895)
+    * Enable building against Java 10 (r1841180 et al)
+    * Fix a potential crash in JavaHL (issue #4764)
+
+
+Version 1.10.6
+(24 Jul 2019, from /branches/1.10.x)
+https://svn.apache.org/repos/asf/subversion/tags/1.10.6
+
+ User-visible changes:
+    * Allow the use of empty groups in authz rules. (r1854883)
+    * Fix conflict resolver case with move vs move conflicts. (r1863297)
+    * Fix #4760: Missing children in svnadmin dump --include/exclude. (r1863298)
+    * Fix #4793: authz rights from inverted access selectors. (r1854882)
+    * Fix conflict resolver bug: local and incoming edits swapped. (r1863300)
+    * Fix #4806: Remove on-disk trees with read-only dirs. (r1863299)
+    * Fix memory lifetime problem in a libsvn_wc error code path. (r1863302)
+    * No tree conflict when 'svn up' deletes unmodified dir with unversioned items. (r1863296)
+    * Remove a useless common ancestor search from conflict resolver. (r1863294)
+
+ Developer-visible changes:
+    * Allow generating Visual Studio 2019 projects (r1863304)
+    * Fix a use-after-free in mod_dav_svn's logging of FS warnings. (r1863292)
+    * Fix "unused static function" warning in release-mode builds. (r1854884)
+    * Fix build with APR 1.7.0. (r1863303)
+    * Fix issue #4804: spurious SQLite-related test failures. (r1863295)
+    * Allow svnserve's 'get-deleted-rev' API to return 'not deleted'. (r1863305)
+    * Silence a deprecation warning from amalgamated SQLite on macOS. (r1863291)
+
+
+Version 1.10.5
+(Not released; see changes for 1.10.6.)
+
+
+Version 1.10.4
+(11 Jan 2019, from /branches/1.10.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.10.4
+
+ User-visible changes:
+  - Minor new features and improvements:
+    * Conflict resolver support for added vs unversioned file (r1845577)
+    * Conflict resolver support for unversioned directories (r1846299)
+
+  - Client-side bugfixes:
+    * Fix: repos-to-WC copy with --parents doesn't create dirs (#4768)
+    * Fix: foreign repo copy with peg/operative revisions (#4785)
+    * Fix: foreign repo copy of file adding mergeinfo (#4792)
+    * Fix: assertion failure using -rPREV on a working copy at r0 (#4532)
+    * Fix: tree conflict message ends a sentence with a colon (#4717)
+
+  - Server-side bugfixes:
+    * Fix CVE-2018-11803: malicious SVN clients can crash mod_dav_svn
+    * Fix: unexpected SVN_ERR_FS_NOT_DIRECTORY errors (#4791)
+    * Fix: mod_dav_svn's SVNUseUTF8 had no effect in some setups (r1844882)
+    * Fix crash in mod_http2 (#4782)
+
+  - Other tool improvements and bugfixes:
+    * svndumpfilter: Clarify error messages by including node path (r1845261)
+
+  - Bindings bugfixes:
+    * JavaHL: Fix crash in client code when using external diff (r1845408)
+
+ Developer-visible changes:
+  - General:
+    * Fix build on systems without python in $PATH (r1845555)
+
+  - API changes:
+    (none)
+
+
+Version 1.10.3
+(10 Oct 2018, from /branches/1.10.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.10.3
+
+ User-visible changes:
+  - Minor new features and improvements:
+    * Store the HTTPS client cert password (r1842578)
+
+  - Client-side bugfixes:
+    * Fix shelving when custom diff command is configured (issue #4758)
+    * Fix conflict resolver crashes (issue #4744, r1842581, r1842582, r1842583)
+    * Fix conflict resolver endless scan in some cases (r1842586)
+    * Fix "Accept incoming deletion" on locally deleted file (issue #4739)
+    * Fix "resolver adds unrelated moves to move target list" (issue #4766)
+
+  - Server-side bugfixes:
+    * Reject bad PUT before CHECKOUT in v1 HTTP protocol (r1841281)
+    * Let 'svnadmin recover' prune the rep-cache even if disabled (r1842585)
+
+  - Client-side and server-side bugfixes:
+    * Allow commands like 'svn ci --file X' to work when X is a FIFO (r1841282)
+
+  - Other tool improvements and bugfixes:
+    * 'svnadmin verify --keep-going --quiet' shows an error summary (r1842584)
+    * Fix error in german translation for 'svn help merge' (r1837038)
+
+ Developer-visible changes:
+  - General:
+    * Python tests use the current python executable (r1842626)
+
+
+Version 1.10.2
+(20 Jul 2018, from /branches/1.10.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.10.2
+
+ User-visible changes:
+  - Client-side bugfixes:
+    * Correctly claim to offer Gnome Keyring support with libsecret (r1831142)
+    * Fix segfault using Gnome Keyring with libsecret (r1835782)
+    * Fix JavaHL local refs capacity warning when unparsing externals (r1831143)
+    * Since on Windows Subversion does not handle symlinks, never check for reparse points (r1835701)
+    * Prune externals after 'update --set-depth=exclude' (r1835702)
+    * Fix issue #4740, "conflict resolver searches too far back ..." (r1835703)
+  - Server-side bugfixes:
+    * Fix regression issue #4741: authz group refers to multiple groups (r1831220)
+
+ Developer-visible changes:
+  - General:
+    * Regression test and FSFS checksum test, part of issue #4722 (r1828043)
+    * Explicit error on configure --without-lz4 or --without-utf8proc (r1831604)
+    * configure.ac: Fix regression relating to path to 'rdoc' (r1833486)
+    * Ensure consistent use of $PYTHON during build and test (r1833487)
+    * Fix libsvn_auth_gnome_keyring.pc when built using libsecret (r1835781)
+  - Bindings:
+    * Fix regression in use of pre-generated Swig bindings in release builds (r1833488)
+
+
+Version 1.10.1
+(Not released; see changes for 1.10.2.)
+
+
 Version 1.10.0
-(?? ??? 2018, from /branches/1.10.x)
+(13 Apr 2018, from /branches/1.10.x)
 http://svn.apache.org/repos/asf/subversion/tags/1.10.0
 
 See the 1.10 release notes for a more verbose overview of the changes since
@@ -8,7 +358,7 @@ the 1.9 release:  https://subversion.apache.org/docs/r
  User-visible changes:
   - Major new features:
     * Better interactive conflict resolution for tree conflicts (r1687489 et al)
-    * Wilcards and improved performance in path-based authorization (r1776832)
+    * Wildcards and improved performance in path-based authorization (r1776832)
     * New experimental 'svn shelve' command (issue #3625)
   - Minor new features and improvements:
     * svnbench: Show time taken & bytes transferred (r1703383, r1710586)
@@ -29,7 +379,7 @@ the 1.9 release:  https://subversion.apache.org/docs/r
     * ra_serf: Adjustments for serf versions with HTTP/2 support (r1716400)
     * ra_serf: Send svndiff1 deltas during commit (r1704317, r1704613, r1791290)
     * ra_serf: Stream svndiff deltas w/o creating temporary files (r1803143 et al)
-    * ra_serf: Don't necessarily request full MERGE reponses (r1806017 et al)
+    * ra_serf: Don't necessarily request full MERGE responses (r1806017 et al)
     * 'svn patch': Parse binary diffs in git-style patches (r1703925)
     * 'svnadmin info' now reports latest revision in the repository (r1697953)
     * ra_svn: Various performance-related tweaks (r1694490)
@@ -286,6 +636,102 @@ the 1.9 release:  https://subversion.apache.org/docs/r
     * Ruby: Detect versions up to 2.4 (r1806570)
 
 
+Version 1.9.12
+(24 Jul 2019, from /branches/1.9.x)
+https://svn.apache.org/repos/asf/subversion/tags/1.9.12
+
+ User-visible changes:
+    * No tree conflict when 'svn up' deletes unmodified dir with unversioned items. (r1863309)
+
+ Developer-visible changes:
+    * Allow generating Visual Studio 2019 projects (r1863311)
+    * Fix a use-after-free in mod_dav_svn's logging of FS warnings. (r1863307)
+    * Fix "unused static function" warning in release-mode builds. (r1854881)
+    * Fix build with APR 1.7.0. (r1863310)
+    * Fix issue #4804: spurious SQLite-related test failures. (r1863308)
+    * Allow svnserve's 'get-deleted-rev' API to return 'not deleted'. (r1863312)
+    * Silence a deprecation warning from amalgamated SQLite on macOS. (r1863306)
+
+
+Version 1.9.11
+(Not released; see changes for 1.9.12.)
+
+
+Version 1.9.10
+(11 Jan 2019, from /branches/1.9.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.9.10
+
+ User-visible changes:
+  - Client-side bugfixes:
+    * Fix: repos-to-WC copy with --parents doesn't create dirs (#4768)
+    * Fix: foreign repo copy with peg/operative revisions (#4785)
+    * Fix: assertion failure using -rPREV on a working copy at r0 (#4532)
+    * Fix: german translation for 'svn help merge' (r1837037)
+    * Fix: prune externals after 'update --set-depth=exclude' (r1830883 et al.)
+    * Fix: detection of GPG-agent (r1794166 et al.)
+    * Fix: null updates don't update last-changed-revision (#4700)
+    * Fix: merge "Unable to parse reversed revision range" (#4686)
+
+  - Server-side bugfixes:
+    * Fix: unexpected SVN_ERR_FS_NOT_DIRECTORY errors (#4791)
+    * Fix: mod_dav_svn's SVNUseUTF8 had no effect in some setups (r1844882)
+    * Fix: crash in mod_http2 (#4782)
+    * Fix: 'svnadmin upgrade' of BDB: Error out on too-new formats (r1804013)
+    * Fix: Enforce v1 HTTP protocol: error if PUT before CHECKOUT (r1833465)
+    * Fix: Let 'svnadmin recover' prune rep-cache even if disabled (r1838813)
+    * Add test and FSFS checksum verification for issue #4722 (r1826720 et al.)
+
+  - Other tool improvements and bugfixes:
+    * Install 'fsfs-stats' wrapper for 1.8 compat (r1802032 et al.)
+    * Note that 'tools/client-side/detach.py' doesn't work on 1.8+ (r1696722)
+
+  - Bindings bugfixes:
+    * JavaHL: Fix crash in client code when using external diff (r1845408)
+    * JavaHL: SSL server trust prompt: allow accepting temporarily (r1820718)
+
+ Developer-visible changes:
+  - General:
+    (none)
+
+  - API changes:
+    (none)
+
+
+Version 1.9.9
+(20 Jul 2018, from /branches/1.9.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.9.9
+
+ User-visible changes:
+  - Client-side bugfixes:
+    * Fix SEGV for 'svn export -rN WC' with relative externals (r1803755)
+    * Fix issue #4677: 'svn up' after a directory replaced a file (r1814248)
+    * Fix segfault when no home directory is available (r1819199)
+    * Performance: Make 'svn info' fast on old repository revisions (r1827690)
+    * Fix RA-serf problem with proxy username and password (r1833571)
+
+  - Server-side bugfixes:
+    * svnadmin: Fix false errors on some valid LOCK_PATH arguments (r1803754)
+    * Fix crash when exiting 'svnserve --config-file' (r1824405)
+    * Fix issue #4722: false "filesystem is corrupt" error on commit (r1827688)
+    * Reword confusing "nested" wording in an httpd.conf warning (r1835700)
+
+  - Bindings bugfixes:
+    * swig-py: svn.core.Stream supports raw binary file-like objects (r1820620)
+    * swig-rb: Don't crash if svn_md5_digest_to_cstring returns NULL (r1823805)
+
+ Developer-visible changes:
+  - General:
+    * Fix CVE-2017-9800: Malicious server can execute arbitrary command on client (r1804698)
+    * Fix test failure if compile- and run-time HTTPD versions differ (r1820523)
+
+  - API changes:
+    (none)
+
+
+Version 1.9.8
+(Not released; see changes for 1.9.9.)
+
+
 Version 1.9.7
 (10 Aug 2017, from /branches/1.9.x)
 http://svn.apache.org/repos/asf/subversion/tags/1.9.7
@@ -883,7 +1329,7 @@ http://svn.apache.org/repos/asf/subversion/tags/1.9.0
     * cache: fix premature eviction due to 64-bit underflows (r1567996 et al)
     * svnserve: fix potential integer overflow in Cyrus SASL support (r1570434)
     * bdb: fix potential integer overflow and underflow (r1570701)
-    * bdb: prevent silent propogation of some corruption (r1570778)
+    * bdb: prevent silent propagation of some corruption (r1570778)
     * svnadmin hotcopy: do not corrupt db/current contents when copying old
       FSFS repos (r1603485)
     * svnadmin hotcopy: don't produce broken copies when a concurrent pack
@@ -1143,7 +1589,7 @@ http://svn.apache.org/repos/asf/subversion/tags/1.9.0
       ranges (r1569731)
     * svn_rangelist_inheritable2() and svn_mergeinfo_inheritable2(): fix a
       pool lifetime issue (r1569764)
-    * new APIs to support cancelation during unified diff output and
+    * new APIs to support cancellation during unified diff output and
       allow the context size to be specified (r1570149 et al)
     * APIs related to retrieving logs are now documented to be unlimited when
       a negative value is passed for the limit (r1570330, 1570335)
@@ -1261,7 +1707,7 @@ http://svn.apache.org/repos/asf/subversion/tags/1.9.0
     * swig-py: Add close to the core.Stream class (r1619077)
     * javahl: add example clients that use the authn API (r1640533)
     * swig-py: implement dump stream parser (r1642813)
-    * swig-pl: remove some unneded cleanup code that triggered a cleanup
+    * swig-pl: remove some unneeded cleanup code that triggered a cleanup
       failure on windows (r1643072)
     * swig-pl: make cancel_func, cancel_baton parameter pairs work (r1648852)
     * javahl: expose whitespace diff parameters to blame method (issue #4475)
@@ -1592,7 +2038,7 @@ http://svn.apache.org/repos/asf/subversion/tags/1.8.9
   - Client-side bugfixes:
     * log: use proper peg revision over DAV (r1568872)
     * upgrade: allow upgrading from 1.7 with exclusive locks (r1572102 et al)
-    * proplist: resolve inconsitent inherited property results (r1575270 et al)
+    * proplist: resolve inconsistent inherited property results (r1575270 et al)
     * increase minimal timestamp sleep from 1ms to 10ms (r1581305 et al)
     * merge: automatic merge confused by subtree merge (issue #4481)
     * propget: report proper error on invalid revision for url (r1586255)
@@ -1634,7 +2080,7 @@ http://svn.apache.org/repos/asf/subversion/tags/1.8.9
  Developer-visible changes:
   - General:
     * improve consistency checks of DAV inherited property requests (r1498000)
-    * fix ocassional failure in autoprop_tests.py (r1567752)
+    * fix occasional failure in autoprop_tests.py (r1567752)
     * avoid duplicate sqlite analyze information rows (r1571214)
     * add Mavericks to our sysinfo output (r1573088)
     * bump copyright years to 2014 (r1555403)
@@ -1687,7 +2133,7 @@ http://svn.apache.org/repos/asf/subversion/tags/1.8.8
 
  Developer-visible changes:
   - General:
-    * fix ocassional failure of check_tests.py 12 (r1496127 et al)
+    * fix occasional failure of check_tests.py 12 (r1496127 et al)
     * fix failure with SQLite 3.8.1-3.8.3 when built with
       SQLITE_ENABLE_STAT3/4 due to bug in SQLite (r1567286, r1567392)
     * specify SQLite defaults that can be changed when SQLite is built
@@ -1793,7 +2239,7 @@ http://svn.apache.org/repos/asf/subversion/tags/1.8.3
   - Client- and server-side bugfixes:
     * translation updates for Swedish
     * enforce strict version equality between tools and libraries (r1502267)
-    * consistently output revisions as "r%ld" in error messags (r1499044 et al)
+    * consistently output revisions as "r%ld" in error messages (r1499044 et al)
 
   - Client-side bugfixes:
     * status: always use absolute paths in XML output (issue #4398)
@@ -2372,7 +2818,7 @@ http://svn.apache.org/repos/asf/subversion/tags/1.7.18
 
  Developer-visible changes:
   - General:
-    * fix ocassional failure in checkout_tests.py test 12. (r1496127)
+    * fix occasional failure in checkout_tests.py test 12. (r1496127)
     * disable building ZLib's assembly optimizations on Windows.
 
 
@@ -2987,7 +3433,7 @@ the 1.6 release:  http://subversion.apache.org/docs/re
     * fixed: wc-to-wc copy of a switch source (issue #1802)
     * fixed: 'svn st' reports symlinks as obstructed items (issue #2284)
     * fixed: 'cd e:\; svn up e:\' fails (issue #2556)
-    * fixed: svn aborts on commiting from root dir on windows (issue #3346)
+    * fixed: svn aborts on committing from root dir on windows (issue #3346)
     * fixed: removing a dir scheduled for deletion corrupts wc (issue #2741)
     * fixed: 'svn cleanup' fails on obstructed paths (issue #2867)
     * fixed: case-only renames resulting from merges don't work (issue #3115)
@@ -3024,7 +3470,7 @@ the 1.6 release:  http://subversion.apache.org/docs/re
     * fixed: 'svn info' returns parent info on missing dirs (issue #3178)
     * fixed: spurious prop conflict with 'merge --reintegrate' (issue #3919)
     * fixed: 'svn --version' fails with non-existent $HOME (issue #3947)
-    * fixed: unforced export silently overwites existing file (issue #3799)
+    * fixed: unforced export silently overwrites existing file (issue #3799)
     * fixed: reverse merge which adds subtree mergeinfo fails (issue #3978)
     * fixed: 'svn up -r{R>HEAD}' hangs client over ra_svn (issue #3963)
     * fixed: 'svn up' updates file externals in target siblings (issue #3819)
@@ -3368,7 +3814,7 @@ http://svn.apache.org/repos/asf/subversion/tags/1.6.11
  Developer-visible changes:
   * disable checks for wc-ng working copies when running the test suite
   * on Windows, don't ignore move operation error codes (r896915)
-  * more precise reporting of errors occuring with sqlite init (r927323, -8)
+  * more precise reporting of errors occurring with sqlite init (r927323, -8)
   * ensure rangelist APIs are commutative (r923389, -91)
 
 
@@ -5720,7 +6166,7 @@ http://svn.apache.org/repos/asf/subversion/tags/0.28.2
       twice as slow and lose all concurrent-client scalability.
 
       This is a temporary fix for a larger design problem.  See issue
-      http://subversion.tigris.org/issues/show_bug.cgi?id=1499
+      https://issues.apache.org/jira/browse/SVN-1499
 
 
 Version 0.28.1
@@ -6731,7 +7177,7 @@ Version 0.9 (released 15 Feb 2002, revision 1302)
     - no more 'path styles' in path library
     - rewrite bootstrapping code for python test framework
     - rewrite commandline app's help-system and alias-system
-    - feedback table replaced with notfication callback
+    - feedback table replaced with notification callback
     - rewrite sorting of hashes
     - svnadmin internal rewrite
     - faster post-update processing

Modified: head/contrib/subversion/COMMITTERS
==============================================================================
--- head/contrib/subversion/COMMITTERS	Mon Jun  1 10:14:45 2020	(r361692)
+++ head/contrib/subversion/COMMITTERS	Mon Jun  1 10:27:05 2020	(r361693)
@@ -27,7 +27,7 @@ Blanket commit access:
            dlr   Daniel Rall <dlr at finemaltcoding.com>
            mbk   Mark Benedetto King <mbk at lowlatency.com>
            jaa   Jani Averbach <jaa at iki.fi>
-    julianfoad   Julian Foad <julian at foad.me.uk>
+    julianfoad   Julian Foad <julianfoad at apache.org>
   jszakmeister   John Szakmeister <john at szakmeister.net>
            ehu   Erik Hülsmann <ehuels at gmail.com>
         breser   Ben Reser <ben at reser.org>
@@ -61,6 +61,9 @@ Blanket commit access:
       astieger   Andreas Stieger <andreas.stieger at gmx.de>
       jamessan   James McCoy <jamessan at jamessan.com>
       luke1410   Stefan Hett <luke1410 at posteo.de>
+  troycurtisjr   Troy Curtis, Jr <troycurtisjr at gmail.com>
+ hartmannathan   Nathan Hartman <hartman.nathan at gmail.com>
+      futatuki   Yasuhito Futatsuki <futatuki at yf.bsdclub.org>
 
 [[END ACTIVE FULL COMMITTERS.  LEAVE THIS LINE HERE; SCRIPTS LOOK FOR IT.]]
 
@@ -87,6 +90,7 @@ Partial committers who have asked to be listed as dorm
       rassilon   Bill Tutt <bill at tutts.org> (Win32, COM, issue-1003-dev br.)
            pll   Paul lussier <p.lussier at comcast.net>        (releases)
         rdonch   Роман Донченко <dpb at corrigendum.ru>         (Swig-Python b.)
+      karolszk   Karol Szkudlarek <karol at mikronika.com.pl>   (po: pl)
 
 
 Commit access for specific areas:
@@ -103,7 +107,6 @@ Commit access for specific areas:
        rschupp   Roderich Schupp <roderich.schupp at gmail.com> (Swig bindings)
         stilor   Alexey Neyman <stilor at att.net>              (Python bindings,
                                                              svn-vendor.py)
-  troycurtisjr   Troy Curtis, Jr <troycurtisjr at gmail.com>    (Swig bindings)
 
   Packages:
 
@@ -179,7 +182,6 @@ Commit access for specific areas:
       oyvindmo   Øyvind Møll <svn at moll.no>                   (po: nb)
       sunny256   Øyvind A. Holm <sunny at sunbase.org>          (po: nb)
         jzgoda   Jaroslaw Zgoda <jzgoda at o2.pl>               (po: pl)
-      karolszk   Karol Szkudlarek <karol at mikronika.com.pl>   (po: pl)
         plasma   Wei-Hon Chen <plasma at ms9.hinet.net>         (po: zh_TW)
        jihuang   June-Yen Huang <jihuang at iis.sinica.edu.tw>  (po: zh_TW) [EMAIL
                                                              IS BOUNCING]

Modified: head/contrib/subversion/INSTALL
==============================================================================
--- head/contrib/subversion/INSTALL	Mon Jun  1 10:14:45 2020	(r361692)
+++ head/contrib/subversion/INSTALL	Mon Jun  1 10:27:05 2020	(r361693)
@@ -3,7 +3,7 @@
                           A Quick Guide
                ======================================
 
-$LastChangedDate: 2017-12-25 04:00:08 +0000 (Mon, 25 Dec 2017) $
+$LastChangedDate: 2020-02-17 03:49:42 +0000 (Mon, 17 Feb 2020) $
 
 
 Contents:
@@ -23,8 +23,8 @@ Contents:
 
    III. BUILDING A SUBVERSION SERVER
        A. Setting Up Apache Httpd
-       B. Making and Installing the Subversion Server
-       C. Configuring Apache for Subversion
+       B. Making and Installing the Subversion Apache Server Module
+       C. Configuring Apache Httpd for Subversion
        D. Running and Testing
        E. Alternative:  'svnserve' and ra_svn
 
@@ -96,6 +96,11 @@ I.    INTRODUCTION
          These diff streams are used everywhere -- over the network,
          in the repository, and in the client's working copy.
 
+      * utf8proc  (REQUIRED for client and server)
+      
+         Subversion uses utf8proc for UTF-8 support, including Unicode
+         normalization.
+
       * Apache Serf  (OPTIONAL for client)
 
          The Apache Serf library allows the Subversion client to send HTTP
@@ -116,21 +121,21 @@ I.    INTRODUCTION
 
       * Netwide Assembler (OPTIONAL for client and server)
 
-        The Netwide Assembler (NASM) is used to build the (optionally)
+        The Netwide Assembler (NASM) is used to build the (optional)
         assembler modules of OpenSSL.  As of OpenSSL 1.1.0 NASM is the
         only supported assembler.
 
-      * Berkeley DB (OPTIONAL for client and server)
+      * Berkeley DB (DEPRECATED and OPTIONAL for client and server)
 
-         There are two different repository 'back-end'
-         implementations.  One implementation stores data in a flat
-         filesystem (known as FSFS); the other implementation stores
-         data in a Berkeley DB database (known as BDB).  When you
-         create a repository, you have the option of specifying a
-         storage back-end.  The Berkeley DB back-end will only be
-         available if the BDB libraries are discovered at compile
-         time.  The Berkeley DB back-end has been deprecated and
-         is not recommend.
+         When you create a repository, you have the option of
+         specifying a storage 'back-end' implementation.  Currently,
+         there are two options.  The newer and recommended one, known
+         as FSFS, does not require Berkeley DB.  FSFS stores data in a
+         flat filesystem.  The older implementation, known as BDB, has
+         been deprecated and is not recommended for new repositories,
+         but is still available.  BDB stores data in a Berkeley DB
+         database.  This back-end will only be available if the BDB
+         libraries are discovered at compile time.
 
       * libsasl (OPTIONAL for client and server)
 
@@ -147,10 +152,16 @@ I.    INTRODUCTION
          for other languages, you need to have those languages
          available at build time.
 
-      * KDELibs, GNOME Keyring  (OPTIONAL for client)
+      * py3c (OPTIONAL, but REQUIRED for Python bindings)
 
+        The Python 3 Compatibility Layer for C Extensions is required
+        to build the Python language bindings.
+
+      * KDE Framework 5, libsecret, GNOME Keyring (OPTIONAL for client)
+
          Subversion contains optional support for storing passwords in
-         KWallet (KDE 4) or GNOME Keyring.
+         KWallet via KDE Framework 5 libraries (preferred) or kdelibs4,
+         and GNOME Keyring via libsecret (preferred) or GNOME APIs.
 
       * libmagic (OPTIONAL)
 
@@ -160,12 +171,8 @@ I.    INTRODUCTION
          configured via auto-props or the mime-types-file option
          take precedence.
 
-      * Googlemock aka Gmock (OPTIONAL)
 
-         This optional package is used by the tests for Subversions'
-         C++ bindings.
 
-
   C. Dependencies in Detail
 
       Subversion depends on a number of third party tools and libraries.
@@ -199,7 +206,7 @@ I.    INTRODUCTION
       commands described in section II.B before installing the following.
 
 
-      1.  Apache Portable Runtime 1.3 or newer  (REQUIRED)
+      1.  Apache Portable Runtime 1.5 or newer  (REQUIRED)
 
       Whenever you want to build any part of Subversion, you need the
       Apache Portable Runtime (APR) and the APR Utility (APR-util)
@@ -253,22 +260,55 @@ I.    INTRODUCTION
       configure script.
 
 
-      2. Zlib  (REQUIRED)
+      2.  SQLite  (REQUIRED)
 
-         Subversion's binary-differencing engine depends on zlib for
-         compression.   Most Unix systems have libz pre-installed, but
-         if you need it, you can get it from
+      Subversion requires SQLite version 3.8.2 or above.  You can meet this
+      dependency several ways:
+        * Use an SQLite amalgamation file.
+        * Specify an SQLite installation to use.
+        * Let Subversion find an installed SQLite.
 
-            http://www.zlib.net/
+      To use an SQLite-provided amalgamation, just drop sqlite3.c into
+      Subversion's sqlite-amalgamation/ directory, or point to it with the
+      --with-sqlite configure option.  This file also ships with the Subversion
+      dependencies distribution, or you can download it from SQLite:
 
+          https://www.sqlite.org/download.html
 
-      3.  autoconf 2.59 or newer (Unix only)
 
+      3.  Zlib  (REQUIRED)
+
+      Subversion's binary-differencing engine depends on zlib for
+      compression.  Most Unix systems have libz pre-installed, but if
+      you need it, you can get it from
+
+          http://www.zlib.net/
+
+
+      4.  utf8proc  (REQUIRED)
+
+      Subversion uses utf8proc for UTF-8 support.  Configure will
+      attempt to locate utf8proc by default using pkg-config and known
+      paths.
+
+      If it is installed in a non-standard location, then use:
+
+        --with-utf8proc=/path/to/libutf8proc
+
+      Alternatively, a copy of utf8proc comes bundled with the
+      Subversion sources.  If configure should use the bundled copy,
+      use:
+
+        --with-utf8proc=internal
+
+
+      5.  autoconf 2.59 or newer (Unix only)
+
       This is required only if you plan to build from the latest source
       (see section II.B). Generally only developers would be doing this.
 
 
-      4.  libtool 1.4 or newer (Unix only)
+      6.  libtool 1.4 or newer (Unix only)
 
       This is required only if you plan to build from the latest source
       (see section II.B).
@@ -277,7 +317,7 @@ I.    INTRODUCTION
       newer. The autogen.sh script knows about that.
 
 
-      5.  Apache Serf library 1.3.4 or newer (OPTIONAL)
+      7.  Apache Serf library 1.3.4 or newer (OPTIONAL)
 
       If you want your client to be able to speak to an Apache
       server (via a http:// or https:// URL), you must link against
@@ -292,13 +332,14 @@ I.    INTRODUCTION
       instead.
 
       Apache Serf can be obtained via your system's package distribution
-      system or directly from http://code.google.com/p/serf/.
+      system or directly from https://serf.apache.org/.
 
       For more information on Apache Serf and Subversion's ra_serf, see the
       file subversion/libsvn_ra_serf/README.
 
-      6. OpenSSL  (OPTIONAL)
 
+      8.  OpenSSL  (OPTIONAL)
+
       ### needs some updates. I think Apache Serf automagically handles
       ### finding OpenSSL, but we may need more docco here. and w.r.t
       ### zlib.
@@ -343,18 +384,26 @@ I.    INTRODUCTION
           https://www.openssl.org/
 
 
-      7.  Berkeley DB 4.X  (OPTIONAL)
+      9.  Berkeley DB 4.X  (DEPRECATED and OPTIONAL)
 
-      Berkeley DB is needed to build a Subversion server that supports
-      the BDB repository filesystem, or to access a BDB repository on
-      local disk.  If you will only use the FSFS repository filesystem,
-      or if you are building a Subversion client that will only speak
-      to remote (networked) repositories, you don't need it.
+      You need the Berkeley DB libraries only if you are building a
+      Subversion server that supports the older BDB repository storage
+      back-end, or a Subversion client that can access local BDB
+      repositories via the file:// URI scheme.
 
-      The current recommended version is 4.4.20 or newer, which brings
-      auto-recovery functionality to the Berkeley DB database
-      environment.
+      The BDB back-end has been deprecated and is not recommended for
+      new repositories.  BDB may be removed in Subversion 2.0.  We
+      recommend the newer FSFS back-end for all new repositories.
+      FSFS does not require the Berkeley DB libraries.
 
+      If in doubt, the 'svnadmin info' command, added in Subversion
+      1.9, can identify whether an existing repository uses BDB or
+      FSFS.
+
+      The current recommended version of Berkeley DB is 4.4.20 or
+      newer, which brings auto-recovery functionality to the Berkeley
+      DB database environment.
+
       If you must use an older version of Berkeley DB, we *strongly*
       recommend using 4.3 or 4.2 over the 4.1 or 4.0 versions.  Not
       only are these significantly faster and more stable, but they
@@ -386,7 +435,7 @@ I.    INTRODUCTION
       Look in the "Releases > Windows > Windows BDB" section.
 
 
-      8.  Cyrus SASL library (OPTIONAL)
+      10. Cyrus SASL library (OPTIONAL)
 
       If the Simple Authentication and Security Layer (SASL) library
       is detected on your system, then the Subversion client and
@@ -397,7 +446,7 @@ I.    INTRODUCTION
          http://freshmeat.net/projects/cyrussasl/
 
 
-      9.  Apache Web Server 2.2.X or newer  (OPTIONAL)
+      11. Apache Web Server 2.2.X or newer  (OPTIONAL)
 
           (https://httpd.apache.org/download.cgi)
 
@@ -410,78 +459,103 @@ I.    INTRODUCTION
       is done: See section III for details.
 
 
-      10.  Python 2.7 or newer (https://www.python.org/)  (OPTIONAL)
+      12. Python 3.x or newer (https://www.python.org/)  (OPTIONAL)
 
-      If you want to run "make check" or build from the latest source
-      under Unix/Windows as described in section II.B, II.E and III.D,
-      install Python 2.7 or higher on your system. The majority of the
-      test suite is written in Python, as is part of Subversion's build
-      system.
+      Subversion does not require Python for its basic operation.
+      However, Python is required for building and testing Subversion
+      and for using Subversion's SWIG Python bindings or hook scripts
+      coded in Python.
 
-      Note that Python 3.x is not supported and most likely won't work.
+      The majority of Subversion's test suite is written in Python, as
+      is part of Subversion's build system.
 
+      In more detail, Python is required to do any of the following:
 
-      11. Perl 5.8 or newer (Windows only)  (OPTIONAL)
+      * Use the SWIG Python bindings.
+      * Use the ctypes Python bindings.
+      * Use hook scripts coded in Python.
+      * Build Subversion from a tarball on Unix-like systems and run
+        Subversion's test suite as described in section II.B.
+      * Build Subversion on Windows as described in section II.E.
+      * Build Subversion from a working copy checked out from
+        Subversion's own repository (whether or not running the test
+        suite).
+      * Build the SWIG Python bindings.
+      * Build the ctypes Python bindings.
+      * Testing as described in section III.D.
 
-      To build Subversion under any of the MS Windows platforms, you
-      will also need Perl 5.8 or newer to run apr-util's w32locatedb.pl
-      script.
+      The Python bindings are used by:
 
+      * Third-party programs (e.g., ViewVC)
+      * Scripts distributed with Subversion itself in the tools/
+        subdirectory.
+      * Any in-house scripts you may have.
 
-      12. SQLite  (REQUIRED)
+      Python is NOT required to do any of the following:
 
-      Subversion requires SQLite version 3.8.2 or above.  You can meet this
-      dependency several ways:
-        * Use an SQLite amalgamation file.
-        * Specify an SQLite installation to use.
-        * Let Subversion find an installed SQLite.
+      * Use the core command-line binaries (svn, svnadmin, svnsync,
+        etc.)
+      * Use Subversion's C libraries.
+      * Use any of Subversion's other language bindings.
+      * Build Subversion from a tarball on Unix-like systems without
+        running Subversion's test suite
 
-      To use an SQLite-provided amalgamation, just drop sqlite3.c into
-      Subversion's sqlite-amalgamation/ directory, or point to it with the
-      --with-sqlite configure option.  This file also ships with the Subversion
-      dependencies distribution, or you can download it from SQLite:
+      Although this section calls for Python 3.x, Subversion still
+      technically works with Python 2.7.  However, Support for Python
+      2.7 is being phased out.  As of 1 January 2020, Python 2.7 has
+      reached end of life.  All users are strongly encouraged to move
+      to Python 3.
 
-          https://www.sqlite.org/download.html
 
+      13. Perl 5.8 or newer (Windows only)  (OPTIONAL)
 
-      13. pkg-config  (Unix only, OPTIONAL)
+      To build Subversion under any of the MS Windows platforms, you
+      will also need Perl 5.8 or newer to run apr-util's w32locatedb.pl
+      script.
 
+
+      14. pkg-config  (Unix only, OPTIONAL)
+
       Subversion uses pkg-config to find appropriate options used
       at build time.
 
 
-      14. D-Bus  (Unix only, OPTIONAL)
+      15. D-Bus  (Unix only, OPTIONAL)
 

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
