You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2018/11/13 07:49:08 UTC

svn commit: r1846488 [1/23] - in /subversion/branches/mod-dav-svn-expressions: ./ build/ build/ac-macros/ build/generator/ build/generator/swig/ build/generator/templates/ build/generator/util/ build/win32/ contrib/client-side/ contrib/client-side/svn_...

Author: brane
Date: Tue Nov 13 07:49:04 2018
New Revision: 1846488

URL: http://svn.apache.org/viewvc?rev=1846488&view=rev
Log:
On the mod-dav-svn-expressions branch: Sync with trunk to r1846487.

Added:
    subversion/branches/mod-dav-svn-expressions/notes/api-errata/1.10/ra001.txt
      - copied unchanged from r1846487, subversion/trunk/notes/api-errata/1.10/ra001.txt
    subversion/branches/mod-dav-svn-expressions/notes/logo/subversion_logo.svg
      - copied unchanged from r1846487, subversion/trunk/notes/logo/subversion_logo.svg
    subversion/branches/mod-dav-svn-expressions/notes/shelving/
      - copied from r1846487, subversion/trunk/notes/shelving/
    subversion/branches/mod-dav-svn-expressions/subversion/bindings/swig/python/tests/fs.py
      - copied unchanged from r1846487, subversion/trunk/subversion/bindings/swig/python/tests/fs.py
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_client/layout.c
      - copied unchanged from r1846487, subversion/trunk/subversion/libsvn_client/layout.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_client/shelf.c
      - copied unchanged from r1846487, subversion/trunk/subversion/libsvn_client/shelf.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_ra_serf/list.c
      - copied unchanged from r1846487, subversion/trunk/subversion/libsvn_ra_serf/list.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_repos/dump_editor.c
      - copied unchanged from r1846487, subversion/trunk/subversion/libsvn_repos/dump_editor.c
    subversion/branches/mod-dav-svn-expressions/subversion/mod_dav_svn/reports/list.c
      - copied unchanged from r1846487, subversion/trunk/subversion/mod_dav_svn/reports/list.c
    subversion/branches/mod-dav-svn-expressions/subversion/svn/shelf-cmd.c
      - copied unchanged from r1846487, subversion/trunk/subversion/svn/shelf-cmd.c
    subversion/branches/mod-dav-svn-expressions/subversion/tests/afl/afl-svndiff-testcase/
      - copied from r1846487, subversion/trunk/subversion/tests/afl/afl-svndiff-testcase/
    subversion/branches/mod-dav-svn-expressions/subversion/tests/afl/afl-svndiff.c
      - copied unchanged from r1846487, subversion/trunk/subversion/tests/afl/afl-svndiff.c
    subversion/branches/mod-dav-svn-expressions/subversion/tests/afl/afl-x509-testcase/test2
      - copied unchanged from r1846487, subversion/trunk/subversion/tests/afl/afl-x509-testcase/test2
    subversion/branches/mod-dav-svn-expressions/subversion/tests/afl/afl-x509-testcase/test3
      - copied unchanged from r1846487, subversion/trunk/subversion/tests/afl/afl-x509-testcase/test3
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/dav_tests.py
      - copied unchanged from r1846487, subversion/trunk/subversion/tests/cmdline/dav_tests.py
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/pegrev_parse_tests.py
      - copied unchanged from r1846487, subversion/trunk/subversion/tests/cmdline/pegrev_parse_tests.py
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/shelf_tests.py
      - copied unchanged from r1846487, subversion/trunk/subversion/tests/cmdline/shelf_tests.py
    subversion/branches/mod-dav-svn-expressions/subversion/tests/libsvn_delta/svndiff-stream-test.c
      - copied unchanged from r1846487, subversion/trunk/subversion/tests/libsvn_delta/svndiff-stream-test.c
    subversion/branches/mod-dav-svn-expressions/subversion/tests/templates/empty-fsfs-v1.zip
      - copied unchanged from r1846487, subversion/trunk/subversion/tests/templates/empty-fsfs-v1.zip
    subversion/branches/mod-dav-svn-expressions/subversion/tests/templates/empty-fsfs-v2.zip
      - copied unchanged from r1846487, subversion/trunk/subversion/tests/templates/empty-fsfs-v2.zip
    subversion/branches/mod-dav-svn-expressions/subversion/tests/templates/empty-fsfs-v3.zip
      - copied unchanged from r1846487, subversion/trunk/subversion/tests/templates/empty-fsfs-v3.zip
    subversion/branches/mod-dav-svn-expressions/subversion/tests/templates/empty-fsfs-v7.zip
      - copied unchanged from r1846487, subversion/trunk/subversion/tests/templates/empty-fsfs-v7.zip
    subversion/branches/mod-dav-svn-expressions/subversion/tests/templates/greek-fsfs-v1.zip
      - copied unchanged from r1846487, subversion/trunk/subversion/tests/templates/greek-fsfs-v1.zip
    subversion/branches/mod-dav-svn-expressions/subversion/tests/templates/greek-fsfs-v2.zip
      - copied unchanged from r1846487, subversion/trunk/subversion/tests/templates/greek-fsfs-v2.zip
    subversion/branches/mod-dav-svn-expressions/subversion/tests/templates/greek-fsfs-v3.zip
      - copied unchanged from r1846487, subversion/trunk/subversion/tests/templates/greek-fsfs-v3.zip
    subversion/branches/mod-dav-svn-expressions/subversion/tests/templates/greek-fsfs-v7.zip
      - copied unchanged from r1846487, subversion/trunk/subversion/tests/templates/greek-fsfs-v7.zip
    subversion/branches/mod-dav-svn-expressions/tools/client-side/svnviewspec_test.py
      - copied unchanged from r1846487, subversion/trunk/tools/client-side/svnviewspec_test.py
    subversion/branches/mod-dav-svn-expressions/tools/dist/backport_tests_data/backport_logsummary_colon.dump
      - copied unchanged from r1846487, subversion/trunk/tools/dist/backport_tests_data/backport_logsummary_colon.dump
    subversion/branches/mod-dav-svn-expressions/tools/dist/changes-to-html.py
      - copied unchanged from r1846487, subversion/trunk/tools/dist/changes-to-html.py
    subversion/branches/mod-dav-svn-expressions/tools/dist/create-minor-release-branch.py
      - copied unchanged from r1846487, subversion/trunk/tools/dist/create-minor-release-branch.py
    subversion/branches/mod-dav-svn-expressions/tools/dist/edit-N-log-messages
      - copied unchanged from r1846487, subversion/trunk/tools/dist/edit-N-log-messages
Removed:
    subversion/branches/mod-dav-svn-expressions/build/generator/util/executable.py
    subversion/branches/mod-dav-svn-expressions/build/win32/vc6-build.bat.in
    subversion/branches/mod-dav-svn-expressions/notes/commit-access-templates/contrib-committer.tmpl
    subversion/branches/mod-dav-svn-expressions/tools/buildbot/slaves/xp-vc60-ia32/
Modified:
    subversion/branches/mod-dav-svn-expressions/   (props changed)
    subversion/branches/mod-dav-svn-expressions/CHANGES
    subversion/branches/mod-dav-svn-expressions/COMMITTERS
    subversion/branches/mod-dav-svn-expressions/INSTALL
    subversion/branches/mod-dav-svn-expressions/Makefile.in
    subversion/branches/mod-dav-svn-expressions/NOTICE
    subversion/branches/mod-dav-svn-expressions/build.conf
    subversion/branches/mod-dav-svn-expressions/build/PrintPath
    subversion/branches/mod-dav-svn-expressions/build/ac-macros/find_apr.m4
    subversion/branches/mod-dav-svn-expressions/build/ac-macros/find_apu.m4
    subversion/branches/mod-dav-svn-expressions/build/ac-macros/java.m4
    subversion/branches/mod-dav-svn-expressions/build/ac-macros/libsecret.m4
    subversion/branches/mod-dav-svn-expressions/build/ac-macros/lz4.m4
    subversion/branches/mod-dav-svn-expressions/build/ac-macros/macosx.m4
    subversion/branches/mod-dav-svn-expressions/build/ac-macros/serf.m4
    subversion/branches/mod-dav-svn-expressions/build/ac-macros/swig.m4
    subversion/branches/mod-dav-svn-expressions/build/ac-macros/utf8proc.m4
    subversion/branches/mod-dav-svn-expressions/build/buildcheck.sh
    subversion/branches/mod-dav-svn-expressions/build/generator/extractor.py
    subversion/branches/mod-dav-svn-expressions/build/generator/gen_base.py
    subversion/branches/mod-dav-svn-expressions/build/generator/gen_make.py
    subversion/branches/mod-dav-svn-expressions/build/generator/gen_win.py
    subversion/branches/mod-dav-svn-expressions/build/generator/gen_win_dependencies.py
    subversion/branches/mod-dav-svn-expressions/build/generator/swig/__init__.py
    subversion/branches/mod-dav-svn-expressions/build/generator/swig/checkout_swig_header.py
    subversion/branches/mod-dav-svn-expressions/build/generator/swig/external_runtime.py
    subversion/branches/mod-dav-svn-expressions/build/generator/templates/build-outputs.mk.ezt
    subversion/branches/mod-dav-svn-expressions/build/generator/templates/vcnet_vcxproj.ezt
    subversion/branches/mod-dav-svn-expressions/build/run_tests.py
    subversion/branches/mod-dav-svn-expressions/build/transform_sql.py
    subversion/branches/mod-dav-svn-expressions/configure.ac
    subversion/branches/mod-dav-svn-expressions/contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in
    subversion/branches/mod-dav-svn-expressions/contrib/client-side/svn_update.pl
    subversion/branches/mod-dav-svn-expressions/contrib/client-side/svnmerge/svnmerge-migrate-history.py
    subversion/branches/mod-dav-svn-expressions/contrib/client-side/svnmerge/svnmerge.py
    subversion/branches/mod-dav-svn-expressions/contrib/hook-scripts/remove-zombie-locks.py
    subversion/branches/mod-dav-svn-expressions/doc/user/svn-best-practices.html
    subversion/branches/mod-dav-svn-expressions/gen-make.py
    subversion/branches/mod-dav-svn-expressions/get-deps.sh
    subversion/branches/mod-dav-svn-expressions/notes/EuroOSCON-2005-vc-bof.txt
    subversion/branches/mod-dav-svn-expressions/notes/client-configuration
    subversion/branches/mod-dav-svn-expressions/notes/commit-access-templates/partial-committer.tmpl
    subversion/branches/mod-dav-svn-expressions/notes/diff-optimizations.txt
    subversion/branches/mod-dav-svn-expressions/notes/dump-load-format.txt
    subversion/branches/mod-dav-svn-expressions/notes/http-and-webdav/webdav-protocol
    subversion/branches/mod-dav-svn-expressions/notes/merge-tracking/func-spec.html
    subversion/branches/mod-dav-svn-expressions/notes/merge-tracking/requirements.html
    subversion/branches/mod-dav-svn-expressions/notes/merge-tracking/summit.html
    subversion/branches/mod-dav-svn-expressions/notes/obliterate/obliterate-functional-spec.txt
    subversion/branches/mod-dav-svn-expressions/notes/tree-conflicts/design-overview.txt
    subversion/branches/mod-dav-svn-expressions/notes/tree-conflicts/detection.txt
    subversion/branches/mod-dav-svn-expressions/notes/tree-conflicts/use-cases.txt
    subversion/branches/mod-dav-svn-expressions/subversion/bindings/javahl/README
    subversion/branches/mod-dav-svn-expressions/subversion/bindings/javahl/native/JNIUtil.cpp
    subversion/branches/mod-dav-svn-expressions/subversion/bindings/javahl/native/Prompter.cpp
    subversion/branches/mod-dav-svn-expressions/subversion/bindings/javahl/native/SVNClient.cpp
    subversion/branches/mod-dav-svn-expressions/subversion/bindings/javahl/native/SVNRepos.cpp
    subversion/branches/mod-dav-svn-expressions/subversion/bindings/javahl/native/SVNRepos.h
    subversion/branches/mod-dav-svn-expressions/subversion/bindings/javahl/native/jniwrapper/jni_list.hpp
    subversion/branches/mod-dav-svn-expressions/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.cpp
    subversion/branches/mod-dav-svn-expressions/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItemStateFlags.java
    subversion/branches/mod-dav-svn-expressions/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java
    subversion/branches/mod-dav-svn-expressions/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java
    subversion/branches/mod-dav-svn-expressions/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java
    subversion/branches/mod-dav-svn-expressions/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/UserPasswordCallback.java
    subversion/branches/mod-dav-svn-expressions/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Revision.java
    subversion/branches/mod-dav-svn-expressions/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
    subversion/branches/mod-dav-svn-expressions/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
    subversion/branches/mod-dav-svn-expressions/subversion/bindings/swig/include/svn_types.swg
    subversion/branches/mod-dav-svn-expressions/subversion/bindings/swig/perl/native/Core.pm
    subversion/branches/mod-dav-svn-expressions/subversion/bindings/swig/perl/native/t/3client.t
    subversion/branches/mod-dav-svn-expressions/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
    subversion/branches/mod-dav-svn-expressions/subversion/bindings/swig/python/svn/fs.py
    subversion/branches/mod-dav-svn-expressions/subversion/bindings/swig/python/tests/run_all.py
    subversion/branches/mod-dav-svn-expressions/subversion/bindings/swig/ruby/svn/util.rb
    subversion/branches/mod-dav-svn-expressions/subversion/bindings/swig/ruby/test/test_client.rb
    subversion/branches/mod-dav-svn-expressions/subversion/bindings/swig/ruby/test/test_util.rb
    subversion/branches/mod-dav-svn-expressions/subversion/include/private/svn_client_private.h
    subversion/branches/mod-dav-svn-expressions/subversion/include/private/svn_cmdline_private.h
    subversion/branches/mod-dav-svn-expressions/subversion/include/private/svn_diff_tree.h
    subversion/branches/mod-dav-svn-expressions/subversion/include/private/svn_element.h
    subversion/branches/mod-dav-svn-expressions/subversion/include/private/svn_ra_svn_private.h
    subversion/branches/mod-dav-svn-expressions/subversion/include/private/svn_repos_private.h
    subversion/branches/mod-dav-svn-expressions/subversion/include/private/svn_sorts_private.h
    subversion/branches/mod-dav-svn-expressions/subversion/include/private/svn_subr_private.h
    subversion/branches/mod-dav-svn-expressions/subversion/include/private/svn_wc_private.h
    subversion/branches/mod-dav-svn-expressions/subversion/include/svn_base64.h
    subversion/branches/mod-dav-svn-expressions/subversion/include/svn_client.h
    subversion/branches/mod-dav-svn-expressions/subversion/include/svn_dav.h
    subversion/branches/mod-dav-svn-expressions/subversion/include/svn_delta.h
    subversion/branches/mod-dav-svn-expressions/subversion/include/svn_diff.h
    subversion/branches/mod-dav-svn-expressions/subversion/include/svn_fs.h
    subversion/branches/mod-dav-svn-expressions/subversion/include/svn_io.h
    subversion/branches/mod-dav-svn-expressions/subversion/include/svn_opt.h
    subversion/branches/mod-dav-svn-expressions/subversion/include/svn_props.h
    subversion/branches/mod-dav-svn-expressions/subversion/include/svn_ra.h
    subversion/branches/mod-dav-svn-expressions/subversion/include/svn_ra_svn.h
    subversion/branches/mod-dav-svn-expressions/subversion/include/svn_repos.h
    subversion/branches/mod-dav-svn-expressions/subversion/include/svn_string.h
    subversion/branches/mod-dav-svn-expressions/subversion/include/svn_time.h
    subversion/branches/mod-dav-svn-expressions/subversion/include/svn_types.h
    subversion/branches/mod-dav-svn-expressions/subversion/include/svn_utf.h
    subversion/branches/mod-dav-svn-expressions/subversion/include/svn_version.h
    subversion/branches/mod-dav-svn-expressions/subversion/include/svn_wc.h
    subversion/branches/mod-dav-svn-expressions/subversion/include/svn_xml.h
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_client/client.h
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_client/commit.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_client/conflicts.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_client/copy.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_client/copy_foreign.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_client/deprecated.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_client/diff.c   (contents, props changed)
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_client/diff_local.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_client/diff_summarize.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_client/export.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_client/info.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_client/list.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_client/merge.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_client/patch.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_client/repos_diff.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_client/revert.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_client/revisions.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_client/status.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_client/update.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_delta/debug_editor.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_delta/element.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_delta/svndiff.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_diff/diff_tree.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_diff/parse-diff.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_fs_fs/cached_data.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_fs_fs/cached_data.h
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_fs_fs/dag.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_fs_fs/fs.h
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_fs_fs/fs_fs.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_fs_fs/id.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_fs_fs/index.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_fs_fs/load-index.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_fs_fs/low_level.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_fs_fs/pack.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_fs_fs/recovery.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_fs_fs/rep-cache-db.sql
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_fs_fs/rep-cache.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_fs_fs/structure
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_fs_fs/temp_serializer.h
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_fs_fs/transaction.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_fs_x/   (props changed)
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_fs_x/changes.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_fs_x/low_level.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_fs_x/pack.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_fs_x/transaction.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_fs_x/tree.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_ra_local/ra_plugin.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_ra_serf/commit.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_ra_serf/options.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_ra_serf/ra_serf.h
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_ra_serf/replay.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_ra_serf/serf.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_ra_serf/stat.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_ra_serf/update.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_ra_serf/util.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_ra_svn/editorp.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_ra_svn/marshal.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_ra_svn/protocol
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_repos/authz_parse.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_repos/deprecated.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_repos/dump.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_repos/list.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_repos/load-fs-vtable.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_repos/log.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_repos/reporter.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_repos/repos.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_subr/cmdline.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_subr/compress_lz4.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_subr/config_file.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_subr/config_win.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_subr/deprecated.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_subr/io.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_subr/lz4/lz4.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_subr/lz4/lz4internal.h
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_subr/mergeinfo.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_subr/object_pool.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_subr/opt.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_subr/sqlite.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_subr/sqlite3wrapper.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_subr/ssl_client_cert_pw_providers.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_subr/stream.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_subr/sysinfo.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_subr/utf.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_subr/utf8proc/   (props changed)
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_subr/utf8proc.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_subr/version.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_subr/win32_crashrpt.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_subr/win32_crypto.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_subr/win32_xlate.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_subr/x509info.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_subr/x509parse.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_wc/README
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_wc/conflicts.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_wc/conflicts.h
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_wc/deprecated.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_wc/diff_local.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_wc/node.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_wc/props.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_wc/questions.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_wc/revert.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_wc/tree_conflicts.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_wc/update_editor.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_wc/upgrade.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_wc/wc-queries.sql
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_wc/wc.h
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_wc/wc_db.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_wc/wc_db.h
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_wc/wc_db_update_move.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_wc/wc_db_wcroot.c
    subversion/branches/mod-dav-svn-expressions/subversion/libsvn_wc/wcroot_anchor.c
    subversion/branches/mod-dav-svn-expressions/subversion/mod_authz_svn/mod_authz_svn.c
    subversion/branches/mod-dav-svn-expressions/subversion/mod_dav_svn/dav_svn.h
    subversion/branches/mod-dav-svn-expressions/subversion/mod_dav_svn/liveprops.c
    subversion/branches/mod-dav-svn-expressions/subversion/mod_dav_svn/mod_dav_svn.c
    subversion/branches/mod-dav-svn-expressions/subversion/mod_dav_svn/reports/file-revs.c
    subversion/branches/mod-dav-svn-expressions/subversion/mod_dav_svn/reports/replay.c
    subversion/branches/mod-dav-svn-expressions/subversion/mod_dav_svn/repos.c
    subversion/branches/mod-dav-svn-expressions/subversion/mod_dav_svn/util.c
    subversion/branches/mod-dav-svn-expressions/subversion/mod_dav_svn/version.c
    subversion/branches/mod-dav-svn-expressions/subversion/po/de.po
    subversion/branches/mod-dav-svn-expressions/subversion/po/sv.po
    subversion/branches/mod-dav-svn-expressions/subversion/svn/auth-cmd.c
    subversion/branches/mod-dav-svn-expressions/subversion/svn/cl.h
    subversion/branches/mod-dav-svn-expressions/subversion/svn/conflict-callbacks.c
    subversion/branches/mod-dav-svn-expressions/subversion/svn/diff-cmd.c
    subversion/branches/mod-dav-svn-expressions/subversion/svn/help-cmd.c
    subversion/branches/mod-dav-svn-expressions/subversion/svn/info-cmd.c
    subversion/branches/mod-dav-svn-expressions/subversion/svn/list-cmd.c
    subversion/branches/mod-dav-svn-expressions/subversion/svn/log-cmd.c
    subversion/branches/mod-dav-svn-expressions/subversion/svn/merge-cmd.c
    subversion/branches/mod-dav-svn-expressions/subversion/svn/notify.c
    subversion/branches/mod-dav-svn-expressions/subversion/svn/propset-cmd.c
    subversion/branches/mod-dav-svn-expressions/subversion/svn/revert-cmd.c
    subversion/branches/mod-dav-svn-expressions/subversion/svn/svn.c
    subversion/branches/mod-dav-svn-expressions/subversion/svn/util.c
    subversion/branches/mod-dav-svn-expressions/subversion/svnadmin/svnadmin.c
    subversion/branches/mod-dav-svn-expressions/subversion/svnbench/cl.h
    subversion/branches/mod-dav-svn-expressions/subversion/svnbench/help-cmd.c
    subversion/branches/mod-dav-svn-expressions/subversion/svnbench/svnbench.c
    subversion/branches/mod-dav-svn-expressions/subversion/svndumpfilter/svndumpfilter.c
    subversion/branches/mod-dav-svn-expressions/subversion/svnfsfs/load-index-cmd.c
    subversion/branches/mod-dav-svn-expressions/subversion/svnfsfs/svnfsfs.c
    subversion/branches/mod-dav-svn-expressions/subversion/svnlook/svnlook.c
    subversion/branches/mod-dav-svn-expressions/subversion/svnmucc/svnmucc.c
    subversion/branches/mod-dav-svn-expressions/subversion/svnrdump/dump_editor.c
    subversion/branches/mod-dav-svn-expressions/subversion/svnrdump/load_editor.c
    subversion/branches/mod-dav-svn-expressions/subversion/svnrdump/svnrdump.c
    subversion/branches/mod-dav-svn-expressions/subversion/svnrdump/svnrdump.h
    subversion/branches/mod-dav-svn-expressions/subversion/svnserve/serve.c
    subversion/branches/mod-dav-svn-expressions/subversion/svnserve/svnserve.c
    subversion/branches/mod-dav-svn-expressions/subversion/svnsync/svnsync.c
    subversion/branches/mod-dav-svn-expressions/subversion/svnversion/svnversion.c
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/authz_tests.py
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/basic_tests.py
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/blame_tests.py
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/commit_tests.py
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/copy_tests.py
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/dav-mirror-autocheck.sh
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/davautocheck.sh
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/depth_tests.py
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/diff_tests.py
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/entries_tests.py
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/export_tests.py
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/externals_tests.py
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/getopt_tests_data/svn--help_stdout
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/getopt_tests_data/svn_help_stdout
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/iprop_authz_tests.py
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/lock_tests.py
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/log_tests.py
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/merge_authz_tests.py
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/merge_automatic_tests.py
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/merge_reintegrate_tests.py
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/merge_tests.py
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/merge_tree_conflict_tests.py
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/mergeinfo_tests.py
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/mod_dav_svn_tests.py   (props changed)
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/move_tests.py
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/patch_tests.py
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/prop_tests.py
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/revert_tests.py
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/special_tests.py
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/stat_tests.py
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/svnadmin_tests.py
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/svnauthz_tests.py
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/svndumpfilter_tests.py
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/svnfsfs_tests.py
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/svnmover_tests.py
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/svnmucc_tests.py
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/svnrdump_tests.py
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/svnserveautocheck.sh
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/svnsync_authz_tests.py
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/svnsync_tests.py
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/svntest/__init__.py
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/svntest/actions.py
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/svntest/main.py
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/svntest/mergetrees.py   (props changed)
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/svntest/sandbox.py
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/svntest/testcase.py
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/svntest/tree.py
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/svntest/verify.py
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/svntest/wc.py
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/svnversion_tests.py
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/trans_tests.py
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/tree_conflict_tests.py
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/update_tests.py
    subversion/branches/mod-dav-svn-expressions/subversion/tests/cmdline/upgrade_tests.py
    subversion/branches/mod-dav-svn-expressions/subversion/tests/libsvn_client/client-test.c
    subversion/branches/mod-dav-svn-expressions/subversion/tests/libsvn_client/conflicts-test.c
    subversion/branches/mod-dav-svn-expressions/subversion/tests/libsvn_delta/   (props changed)
    subversion/branches/mod-dav-svn-expressions/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c
    subversion/branches/mod-dav-svn-expressions/subversion/tests/libsvn_ra/ra-test.c
    subversion/branches/mod-dav-svn-expressions/subversion/tests/libsvn_repos/authz-test.c
    subversion/branches/mod-dav-svn-expressions/subversion/tests/libsvn_repos/dump-load-test.c
    subversion/branches/mod-dav-svn-expressions/subversion/tests/libsvn_repos/repos-test.c
    subversion/branches/mod-dav-svn-expressions/subversion/tests/libsvn_subr/config-test.c
    subversion/branches/mod-dav-svn-expressions/subversion/tests/libsvn_subr/config-test.cfg
    subversion/branches/mod-dav-svn-expressions/subversion/tests/libsvn_subr/mergeinfo-test.c
    subversion/branches/mod-dav-svn-expressions/subversion/tests/libsvn_subr/priority-queue-test.c
    subversion/branches/mod-dav-svn-expressions/subversion/tests/libsvn_subr/subst_translate-test.c
    subversion/branches/mod-dav-svn-expressions/subversion/tests/libsvn_subr/utf-test.c
    subversion/branches/mod-dav-svn-expressions/subversion/tests/libsvn_subr/x509-test.c
    subversion/branches/mod-dav-svn-expressions/subversion/tests/libsvn_wc/conflict-data-test.c
    subversion/branches/mod-dav-svn-expressions/subversion/tests/libsvn_wc/op-depth-test.c
    subversion/branches/mod-dav-svn-expressions/subversion/tests/libsvn_wc/utils.c
    subversion/branches/mod-dav-svn-expressions/subversion/tests/libsvn_wc/wc-queries-test.c
    subversion/branches/mod-dav-svn-expressions/subversion/tests/svn_test_main.c
    subversion/branches/mod-dav-svn-expressions/tools/buildbot/slaves/bb-openbsd/svnbuild.sh
    subversion/branches/mod-dav-svn-expressions/tools/buildbot/slaves/bb-openbsd/svncheck-bindings.sh
    subversion/branches/mod-dav-svn-expressions/tools/buildbot/slaves/bb-openbsd/svncheck.sh
    subversion/branches/mod-dav-svn-expressions/tools/buildbot/slaves/bb-openbsd/svnclean.sh
    subversion/branches/mod-dav-svn-expressions/tools/buildbot/slaves/svn-x64-macosx/setenv.sh
    subversion/branches/mod-dav-svn-expressions/tools/buildbot/slaves/svn-x64-macosx/svnbuild-bindings.sh
    subversion/branches/mod-dav-svn-expressions/tools/buildbot/slaves/svn-x64-macosx/svnbuild.sh
    subversion/branches/mod-dav-svn-expressions/tools/buildbot/slaves/svn-x64-macosx/svncheck-bindings.sh
    subversion/branches/mod-dav-svn-expressions/tools/buildbot/slaves/svn-x64-macosx/svncheck.sh
    subversion/branches/mod-dav-svn-expressions/tools/client-side/bash_completion
    subversion/branches/mod-dav-svn-expressions/tools/client-side/bash_completion_test
    subversion/branches/mod-dav-svn-expressions/tools/client-side/svn-mergeinfo-normalizer/help-cmd.c
    subversion/branches/mod-dav-svn-expressions/tools/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h
    subversion/branches/mod-dav-svn-expressions/tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer.c
    subversion/branches/mod-dav-svn-expressions/tools/client-side/svn-mergeinfo-normalizer/wc_mergeinfo.c
    subversion/branches/mod-dav-svn-expressions/tools/client-side/svn-viewspec.py
    subversion/branches/mod-dav-svn-expressions/tools/client-side/svnconflict/svnconflict.c
    subversion/branches/mod-dav-svn-expressions/tools/dev/svnmover/svnmover.c
    subversion/branches/mod-dav-svn-expressions/tools/dev/svnraisetreeconflict/svnraisetreeconflict.c
    subversion/branches/mod-dav-svn-expressions/tools/dev/unix-build/Makefile.svn
    subversion/branches/mod-dav-svn-expressions/tools/dev/unix-build/README
    subversion/branches/mod-dav-svn-expressions/tools/dev/wc-ng/svn-wc-db-tester.c
    subversion/branches/mod-dav-svn-expressions/tools/dist/README.backport
    subversion/branches/mod-dav-svn-expressions/tools/dist/backport.pl
    subversion/branches/mod-dav-svn-expressions/tools/dist/backport/status.py
    subversion/branches/mod-dav-svn-expressions/tools/dist/backport_tests.py
    subversion/branches/mod-dav-svn-expressions/tools/dist/release.py
    subversion/branches/mod-dav-svn-expressions/tools/dist/security/parser.py
    subversion/branches/mod-dav-svn-expressions/tools/dist/templates/download.ezt
    subversion/branches/mod-dav-svn-expressions/tools/dist/templates/rc-news.ezt
    subversion/branches/mod-dav-svn-expressions/tools/dist/templates/rc-release-ann.ezt
    subversion/branches/mod-dav-svn-expressions/tools/dist/templates/stable-news.ezt
    subversion/branches/mod-dav-svn-expressions/tools/dist/templates/stable-release-ann.ezt
    subversion/branches/mod-dav-svn-expressions/tools/examples/ExampleAuthn.java
    subversion/branches/mod-dav-svn-expressions/tools/hook-scripts/mailer/mailer.py
    subversion/branches/mod-dav-svn-expressions/tools/server-side/svnauthz.c
    subversion/branches/mod-dav-svn-expressions/tools/server-side/svnpubsub/svnwcsub.py
    subversion/branches/mod-dav-svn-expressions/win-tests.py

Propchange: subversion/branches/mod-dav-svn-expressions/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 13 07:49:04 2018
@@ -1,4 +1,5 @@
 /subversion/branches/1.10-cache-improvements:1669168-1694487
+/subversion/branches/1.11.x:1841316,1841548
 /subversion/branches/1.5.x-r30215:870312
 /subversion/branches/1.7.x-fs-verify:1146708,1161180
 /subversion/branches/1.9-cache-improvements:1678948-1679863
@@ -54,6 +55,7 @@
 /subversion/branches/issue-3975:1152931-1160746
 /subversion/branches/issue-4116-dev:1424719-1425040
 /subversion/branches/issue-4194-dev:1410507-1414880
+/subversion/branches/java10-compat:1840620-1841179
 /subversion/branches/javahl-ra:991978-1494640
 /subversion/branches/kwallet:870785-871314
 /subversion/branches/log-addressing:1509279-1546844
@@ -75,6 +77,8 @@
 /subversion/branches/revprop-cache:1298521-1326293
 /subversion/branches/revprop-caching-ng:1620597,1620599
 /subversion/branches/revprop-packing:1143907,1143971,1143997,1144017,1144499,1144568,1146145
+/subversion/branches/shelve:1802592-1815226
+/subversion/branches/shelve-checkpoint:1801593-1801923,1801970,1817320,1828508,1828521
 /subversion/branches/subtree-mergeinfo:876734-878766
 /subversion/branches/svn-auth-x509:1603509-1655900
 /subversion/branches/svn-info-detail:1660035-1662618
@@ -97,4 +101,4 @@
 /subversion/branches/verify-at-commit:1462039-1462408
 /subversion/branches/verify-keep-going:1439280-1546110
 /subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1662643-1809768
+/subversion/trunk:1662643-1846487

Modified: subversion/branches/mod-dav-svn-expressions/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/mod-dav-svn-expressions/CHANGES?rev=1846488&r1=1846487&r2=1846488&view=diff
==============================================================================
--- subversion/branches/mod-dav-svn-expressions/CHANGES (original)
+++ subversion/branches/mod-dav-svn-expressions/CHANGES Tue Nov 13 07:49:04 2018
@@ -1,5 +1,151 @@
+# To view a revision listed as (rXXXXXXX), visit:
+#   https://svn.apache.org/rXXXXXXX
+#
+# To view an issue listed as (issue #XXXX), visit:
+#   https://issues.apache.org/jira/browse/SVN-XXXX
+
+Version 1.12.0
+(?? ??? 20XX, 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:
+    * 'svn --version --verbose' shows loaded libraries on Linux (r1843774)
+    * 'svnrdump' can read/write a file instead of stdin/stdout (r1844906)
+
+  - 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:
+
+  - Client-side and server-side bugfixes:
+
+  - Other tool improvements and bugfixes:
+
+ Developer-visible changes:
+  - General:
+    * Storing passwords in plain text on disk is disabled by default (r1845377)
+    * Updated the required libtool version to 2.x (r1845716)
+
+  - Bindings:
+    * Fixed potential core dump in JavaHL's ISVNClient.diff (r1845408)
+
+
+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.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
-(?? ??? 2017, 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,28 +154,28 @@ the 1.9 release:  https://subversion.apa
  User-visible changes:
   - Major new features:
     * Better interactive conflict resolution for tree conflicts (r1687489 et al)
-    * New and improved implementation of path-based authorization (r1776832)
+    * Wilcards and improved performance in path-based authorization (r1776832)
+    * New experimental 'svn shelve' command (issue #3625)
   - Minor new features and improvements:
-    * svnbench: Show wall-clock time when done (r1703383)
-    * svnbench: Show number of bytes transferred across the network (r1710586)
-    * svnbench: Actually evaluate the '--with-no-revprops' option (r1709593)
-    * New 'svnadmin load-revprops' subcommand (r1694191)
-    * New 'svnadmin dump-revprops' subcommand (r1694225)
+    * svnbench: Show time taken & bytes transferred (r1703383, r1710586)
+    * New 'svnadmin dump' options to include/exclude paths (r1811992 et al)
+    * New '--normalize-props' option for 'svnadmin dump' (r1807836 et al)
+    * New 'svnadmin 'load-revprops', 'dump-revprops' subcommands (r1694191, -225)
     * New '--no-flush-to-disk' option for 'svnadmin load' (r1736357, -7357)
     * New '--file' option for several svnadmin subcommands (r1738021)
-    * New '--max-request-size' option for svnserve (r1714330)
-    * New '--max-response-size' option for svnserve (r1714333)
+    * New '--max-request-size', '--max-response-size' options for svnserve (r1714330, -333)
     * New '-rN' option for 'svnadmin lstxns' (r1703699)
     * New '--search' option for fast 'svn ls' searches (r1767186 et al)
     * Add '--search' option support to 'svnbench null-list' (r1767202)
     * New '-M' option for 'svnlook tree' (r1708222)
     * New '--skip-unchanged' option for 'svnsync copy-revprops' (r1692655)
-    * 'svn log --search' is now case-insensitive (r1731300)
-    * 'svn log --search' now ignores diacriticals when matching words (r1735614)
+    * 'svn log --search' now ignores case and diacriticals (r1731300, r1735614)
     * Improved performance of server-side log processing (r1732768, r1731656)
     * diff3: Reduce processing time and memory usage (r1731659)
     * 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)
     * '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)
@@ -57,8 +203,9 @@ the 1.9 release:  https://subversion.apa
     * FSFS: Warn if a possible rep-cache SHA1 collision is detected (r1674673)
     * FSFS: Optimize revprop cache filling strategy under high load (r1795324)
     * FSFS: New "verify-before-commit" fsfs.conf option (r1795351)
+    * FSFS: New format 8 with various performance improvements (r1801940 et al)
     * FSFS/FSX: Chunked read support for changed paths lists (r1746026, -4987)
-    * FSFS/FSX: Several improvements made to cache implementation (r1694489)
+    * FSFS/FSX: Improvements to cache implementation (r1694489)
     * FSX: Add checksums to packed revprop manifests and files (r1713132, -9717)
     * FSX: Significantly reduce size of packed revprop manifest data (r1713109)
     * FSX: Improved on-disk representation of property lists (r1717427)
@@ -72,26 +219,36 @@ the 1.9 release:  https://subversion.apa
     * svnsync: Fix assertion failure with up-to-date repositories (r1727140)
     * ra_serf: Parallel requests for text and property changes (r1716575)
     * svnserve: Remove disk I/O to TMPDIR during first commit (r1716240)
-    * 'svn blame': Optimize a bit on the server side (r1711666)
     * Triple performance of URI escaping (r1710099, -103)
+    * 'svn blame': Optimize a bit on the server side (r1711666)
+    * 'svn cleanup': Add --vacuum-pristines option (r1802787 et al)
     * 'svn diff --git': Show diffs of symlinks like git and hg (r1706372)
     * 'svn patch': Capable of handling git-like symlink changes (r1706446)
     * 'svn patch': Improve detection of additions and deletions (r1706623)
+    * 'svn patch': Handle zero-byte files vs deleted files (r1705856)
     * 'svn diff --git': Produce 'rename from/to' headers (r1706855)
     * 'svn diff --git': Produce proper mode headers (r1706041)
-    * 'svn patch': Handle zero-byte files vs deleted files (r1705856)
+    * 'svn lock', 'svn unlock': Take the -q option (r1796288)
+    * 'svn help': improved wording and consistency (r1802989 et al)
+    * 'svn': Add a new '--accept recommended' option. (r1805623)
+    * 'svn': --non-interactive uses recommended tree conflict resolution (r1805620)
     * Evaluate 'old mode' and 'new mode' lines from git-syle diffs (r1705391)
     * svnrdump, svndumpfilter: Enable buffered stdin (r1703074)
-    * ra_serf: Receive svndiff1 and gzip compressed deltas (r1781282, -3, -4)
-    * 'svn lock', 'svn unlock': Take the -q option (r1796288)
+    * ra_serf: Receive svndiff1 and gzip compressed deltas (r1791282, -3, -4)
     * svnadmin: 'lock', 'unlock', 'rmlocks': Take the -q option (r1796406)
     * New svndiff2 binary delta format using lz4 compression (r1801938, et al)
     * gpg-agent: Support gpg ≥2.1.13 and unset GPG_AGENT_INFO (r1795087)
+    * Add 'http-compression=auto' client config option as default (r1803899 et al)
+    * Speed up processing of mergeinfo (r1802470 et al)
+    * Check for invalid 'xt' fields in x509 certs (r1809290)
+    * New '--password-from-stdin' option for 'svn' (r1819093)
   - Client-side bugfixes:
+    * svnbench: Honour the '--with-no-revprops' option (r1709593)
     * ra_serf: Fix segfault when running over HTTP v1 (r1766089)
     * ra_serf: Keep small svndiffs in memory during commit (r1724455)
     * ra_serf: Improve error messages related to lock operations (r1716450)
     * ra_serf: Work around a bug in serf bucket handling (r1714806)
+    * ra_serf: Fix lock token handling for file-path commits (r1815799 et al)
     * Raise a malfunction instead of segfaulting with corrupt wc.db (r1749887)
     * Fix check for unversioned obstructions blocking file externals (r1735932)
     * 'svn patch' bugfixes:
@@ -118,6 +275,7 @@ the 1.9 release:  https://subversion.apa
       + Fix problems with --git diffs applied in reverse (r1704854, -88)
       + Fix removal of EOL if final patch context line has no EOL (#4315)
     * 'svn diff --git': Fix file permission modes to match git and hg (r1695384)
+    * 'svn diff --git': added/deleted filenames are never /dev/null (issue #4689)
     * Fix a problem with relocating some externals (r1723385)
     * Fix 'svn diff URL@REV WC' wrongly looks up URL@HEAD (issue #4597)
     * Fix 'svn diff --no-diff-added' shows properties as added (issue #4596)
@@ -125,6 +283,7 @@ the 1.9 release:  https://subversion.apa
     * Fix 'svn diff' with local directories marked incomplete (r1674413 et al)
     * ra_svn/ra_serf: Make negative log limits work as documented (r1665530)
     * ra_svn: Eliminate unnecessary URL reparenting (r1779611, r1779611)
+    * ra_svn: Use svndiff2 deltas when supported on both ends (r1803269 et al)
     * Handle invalid revision numbers consistently across RA layers (r1665328)
     * Handle commits to revs > HEAD consistently across RA layers (r1664698)
     * Eliminate one client/server roundtrip from checkouts of HEAD (r1779620)
@@ -147,6 +306,7 @@ the 1.9 release:  https://subversion.apa
     * FSFS: Fix false positive "Not a directory" error involving file moved and
       replaced by dir (issue #4677)
     * FSFS: Fix crash accessing revprops with --memory-cache-size=0 (r1795164)
+    * FSFS: Fix issue #4623 for FSFS. (r1813794 et al)
     * mod_dav_svn: Omit Cache-Control HTTP header for HEAD URLs (issue #4514)
     * mod_dav_svn: Reduced memory consumption for DAV merge responses (r1727790)
     * mod_dav_svn: Don't set a Last-Modified header in GET responses (r1724790)
@@ -155,13 +315,16 @@ the 1.9 release:  https://subversion.apa
     * Fix insertion of very large items into the membuffer cache (r1717337, -8)
     * Fix capacity check of the membuffer cache's prefix pool (r1714356)
     * Prevent paths containing newlines from being committed (r1662585)
+    * Fix for properties: Null updates break last-changed-revision (issue #4700)
     * 'svnfsfs stats': Fix false positive checksum errors reading old revisions
       (r1785904)
+    * 'svnfsfs stats': Fix support for pre-v4 FSFS repositories. (r1816966)
     * svnadmin, svnfsfs: Detect invalid arguments to -M (r1787023, r1787045)
     * svnlook, svnserve: Detect invalid arguments to -M (r1787023, r1787045)
     * svnadmin: Output locked paths in canonical form (r1796420)
     * svnadmin: Output locked paths correctly encoded (r1797122)
     * svn: propdel, propset: Transcode property names on output (r1797186)
+    * svnserve: Make use-sasl=true a fatal error in SASL-less builds. (r1803188)
   - Client-side and server-side bugfixes:
     * Fix integer overflow check with >= 1G mergeinfo ranges per path (r1714380)
     * Fix integer overflow checks on WoW64 platforms (r1714372)
@@ -171,16 +334,18 @@ the 1.9 release:  https://subversion.apa
     * FSFS: Improve error messages when DAG lookup fails (r1795120)
     * Transcode command-line arguments to UTF-8 (r1797190, r1797362, et al)
     * Fix segfault on x509 certificate with empty name (r1798157)
+    * Fix segfault with invalid URLs in svn:externals (r1803471)
+    * Windows: Failure to write files might remain undetected (r1806014)
   - Other tool improvements and bugfixes:
     * New svn-mergeinfo-normalizer tool (r1695992 et al)
     * Allow configuring mailer.py to use SMTP SSL (r1777846)
     * svnmucc can now delete directories with deleted children (issue #4666)
     * svn-vendor.py: Minor enhancements, mostly in treating symlinks (r1732669)
-    * bash_completion: Implement much better URL completion (r1701494)
+    * bash_completion: Better URL completion (r1701494)
     * bash_completion: Complete arguments to 'svn info --show-item' (r1698276)
-    * bash_completion: Add 1.10 options (r1802196)
-    * fsfs-stats: Following rename to svnfsfs in r1594860, install a wrapper
-      for compatibility (r1802032)
+    * fsfs-stats: New 1.8-compatible wrapper for 'svnfsfs stats' (r1802032)
+    * Drop support for upgrading working copies created with Subversion 1.7
+      (r1807584 et al)
 
  Developer-visible changes:
   - General:
@@ -191,11 +356,16 @@ the 1.9 release:  https://subversion.apa
     * get-deps.sh: download Googlemock and Googletest from GitHub (r1746303)
     * windows: Add autodetection for 'zlibstat.lib' (r1783704)
     * windows: Compile libsvn_fs_* as DLLs (r1696758, -83)
+    * windows: Allow building against OpenSSL 1.1.0 (r1814724 et al)
     * OS X: Silence compile-time deprecation warnings with SASL (r1739649)
+    * OS X: Silence ranlib warnings about disabled WIN32 code (r1809792)
     * 'make check GLOBAL_SCHEDULER=1' will run many tests in parallel (r1716399)
     * unix: New '--enable-apache-whitelist' configure script option (r1732294)
     * OS X: Support 'configure --enable-runtime-module-search' (r1677273)
     * tests: Allow tests to be run over HTTP/2 (r1710707)
+    * tests: httpd compile-time and run-time version may differ (r1808955 et al)
+    * tests: Add pre-cooked repos for all FSFS versions. (r1816402 et al)
+    * tests: Add FSFS_DIR_DELTIFICATION option. (r1813897)
     * Add basic tests for svn_xml_parser_t API (r1765214)
     * Unbreak the test suite on Python 3 (r1743034, -81, et al)
     * Make the test suite work when checked out of a git repository (r1771118)
@@ -210,12 +380,19 @@ the 1.9 release:  https://subversion.apa
     * gnome-keyring: Support libsecret in preference to libgnome-keyring
       (r1798004)
     * kwallet: Support KDE 5 in preference to KDE 4 (r1798731)
+    * kwallet: Fix KDE5 support with clang 3.8 (r1802536 et al)
+    * kwallet: Add --with-kwallet=INCDIR:LIBDIR build option (r1802646)
     * Rename cxxhl bindings 'make tests' to avoid confusion with 'make test'
       (r1800849)
     * 'make check': Allow testing with FSFS compression (r1801936)
     * svnserveautocheck.sh: Support out-of-tree builds when running a single
       test file (r1802081)
     * Distribution artifacts now prepared with swig 3.0.10 (r1802135)
+    * SQLite: Use https:// links to download amalgamation sources (r1817043)
+    * Create reproducible tarballs (r1804618 et al)
+    * Disable static builds of the apache and auth provider modules (r1802612)
+    * utf8proc: Update to version 2.1.0 (r1809090 et al)
+    * utf8proc: Build against the system library by default (r1803210 et al)
   - API changes:
     * New svn_client_conflict_* API functions for the new conflict resolver.
     * New svn_repos_fs_get_mergeinfo2() with streamy access (r1780810 et al)
@@ -235,7 +412,10 @@ the 1.9 release:  https://subversion.apa
     * New svn_error_quick_wrapf() API function (r1662668)
     * New svn_repos_path_change_t type (r1802114)
     * New svn_repos_log_entry_t type (r1802114)
+    * New svn_cstring_join2() API (r1806041)
+    * New svn_txdelta_to_svndiff_stream() API (r1803140 et al)
     * svn_repos_parse_dumpstream3() now accepts NULL pointers (r1700180)
+    * Return resettable streams from svn_stream_checksummed2(). (r1804807)
     * Fix svnserveautocheck&davautocheck when time is only a built-in (r1665652)
   - Bindings:
     * Configure the swig bindings only if swig has been enabled (r1751167)
@@ -248,6 +428,43 @@ the 1.9 release:  https://subversion.apa
     * Disable some swig wrappers that aren't working (r1700966)
     * JavaHL: Make StringArray nullable (r1785429)
     * JavaHL: Add missing exception checks (r1801108)
+    * Ruby: Fix handling of NULL MD5 digests (r1811786)
+    * Ruby: Detect versions up to 2.4 (r1806570)
+
+
+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
@@ -2963,7 +3180,7 @@ the 1.6 release:  http://subversion.apac
     * fixed: ra_serf doesn't support http-auth-types config (issue #3435)
     * fixed: merge sets incorrect mergeinfo on skipped paths (issue #3440)
     * fixed: ra_serf inconsistent handling of cached authn creds (issue #3450)
-    * fixed: ra_serf sefault with using NTLM or Negotiate auth (r876910)
+    * fixed: ra_serf segfault with using NTLM or Negotiate auth (r876910)
     * fixed: excluded subtrees are not detected by svnversion (issue #3461)
     * fixed: submitting a changelist while obstructed item exists (issue #3484)
     * fixed: crash when changing an external's URL (issue #3530)
@@ -5684,7 +5901,7 @@ http://svn.apache.org/repos/asf/subversi
       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

Modified: subversion/branches/mod-dav-svn-expressions/COMMITTERS
URL: http://svn.apache.org/viewvc/subversion/branches/mod-dav-svn-expressions/COMMITTERS?rev=1846488&r1=1846487&r2=1846488&view=diff
==============================================================================
--- subversion/branches/mod-dav-svn-expressions/COMMITTERS [UTF-8] (original)
+++ subversion/branches/mod-dav-svn-expressions/COMMITTERS [UTF-8] Tue Nov 13 07:49:04 2018
@@ -27,7 +27,7 @@ Blanket commit access:
            dlr   Daniel Rall <dl...@finemaltcoding.com>
            mbk   Mark Benedetto King <mb...@lowlatency.com>
            jaa   Jani Averbach <ja...@iki.fi>
-    julianfoad   Julian Foad <ju...@foad.me.uk>
+    julianfoad   Julian Foad <ju...@apache.org>
   jszakmeister   John Szakmeister <jo...@szakmeister.net>
            ehu   Erik Hülsmann <eh...@gmail.com>
         breser   Ben Reser <be...@reser.org>
@@ -47,7 +47,7 @@ Blanket commit access:
            kou   Kouhei Sutou <ko...@cozmixng.org>
       danielsh   Daniel Shahaf <d....@daniel.shahaf.name>
         peters   Peter Samuelson <pe...@p12n.org>
-      rhuijben   Bert Huijben <rh...@collab.net>
+      rhuijben   Bert Huijben <rh...@apache.org>
       stylesen   Senthil Kumaran S <st...@gmail.com>
      steveking   Stefan Küng <to...@gmail.com>
          neels   Neels J. Hofmeyr <ne...@hofmeyr.de>
@@ -87,6 +87,7 @@ Partial committers who have asked to be
       rassilon   Bill Tutt <bi...@tutts.org> (Win32, COM, issue-1003-dev br.)
            pll   Paul lussier <p....@comcast.net>        (releases)
         rdonch   Роман Донченко <dp...@corrigendum.ru>         (Swig-Python b.)
+      karolszk   Karol Szkudlarek <ka...@mikronika.com.pl>   (po: pl)
 
 
 Commit access for specific areas:
@@ -103,6 +104,7 @@ Commit access for specific areas:
        rschupp   Roderich Schupp <ro...@gmail.com> (Swig bindings)
         stilor   Alexey Neyman <st...@att.net>              (Python bindings,
                                                              svn-vendor.py)
+  troycurtisjr   Troy Curtis, Jr <tr...@gmail.com>    (Swig bindings)
 
   Packages:
 
@@ -168,6 +170,7 @@ Commit access for specific areas:
       prabhugs   Prabhu Gnana Sundar <pp...@gmail.com>   (verify-keep-going)
         schabi   Markus Schaber <sc...@apache.org>          (testsuite)
            gbg   Gabriela Gibson <ga...@gmail.com> (gtest)
+     lyalyakin   Pavel Lyalyakin <pa...@visualsvn.com> (site)
 
   Translation of message files:
 
@@ -177,7 +180,6 @@ Commit access for specific areas:
       oyvindmo   Øyvind Møll <sv...@moll.no>                   (po: nb)
       sunny256   Øyvind A. Holm <su...@sunbase.org>          (po: nb)
         jzgoda   Jaroslaw Zgoda <jz...@o2.pl>               (po: pl)
-      karolszk   Karol Szkudlarek <ka...@mikronika.com.pl>   (po: pl)
         plasma   Wei-Hon Chen <pl...@ms9.hinet.net>         (po: zh_TW)
        jihuang   June-Yen Huang <ji...@iis.sinica.edu.tw>  (po: zh_TW) [EMAIL
                                                              IS BOUNCING]

Modified: subversion/branches/mod-dav-svn-expressions/INSTALL
URL: http://svn.apache.org/viewvc/subversion/branches/mod-dav-svn-expressions/INSTALL?rev=1846488&r1=1846487&r2=1846488&view=diff
==============================================================================
--- subversion/branches/mod-dav-svn-expressions/INSTALL (original)
+++ subversion/branches/mod-dav-svn-expressions/INSTALL Tue Nov 13 07:49:04 2018
@@ -147,10 +147,11 @@ I.    INTRODUCTION
          for other languages, you need to have those languages
          available at build time.
 
-      * KDELibs, GNOME Keyring  (OPTIONAL for client)
+      * 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)
 
@@ -430,7 +431,7 @@ I.    INTRODUCTION
 
       12. SQLite  (REQUIRED)
 
-      Subversion requires SQLite version 3.7.12 or above.  You can meet this
+      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.
@@ -456,19 +457,22 @@ I.    INTRODUCTION
       and GNOME Keyring. pkg-config is needed to find D-Bus headers and library.
 
 
-      15. Qt 4  (Unix only, OPTIONAL)
+      15. Qt 5 or Qt 4  (Unix only, OPTIONAL)
 
       Qt is a cross-platform application framework. QtCore, QtDBus and QtGui
       modules are required for support for KWallet. pkg-config is needed
       to find Qt headers and libraries.
 
 
-      16. KDELibs 4  (Unix only, OPTIONAL)
+      16. KDE 5 Framework libraries or KDELibs 4  (Unix only, OPTIONAL)
 
       Subversion contains optional support for storing passwords in KWallet.
+      Subversion will look for KF5Wallet, KF5CoreAddons, KF5I18n APIs by default,
+      and needs kf5-config to find them. The KDELibs 4 api is also supported.
       KDELibs contains core KDE libraries. Subversion uses libkdecore and libkdeui
       libraries when support for KWallet is enabled. kde4-config is used to get
       some necessary options. pkg-config, D-Bus and Qt 4 are also required.
+
       If you want to build support for KWallet, then pass the '--with-kwallet'
       option to `configure`. If KDE is installed in a non-standard prefix, then
       use:
@@ -527,6 +531,19 @@ I.    INTRODUCTION
 
       $ ./get-dep.sh gmock
 
+      22. LZ4 (OPTIONAL)
+
+      Subversion uses LZ4 compression libary version r129 or above. Configure
+      will attempt to locate the system library by default using pkg-config
+      and known paths.
+
+      If it is installed in a non-standard location, then use:
+
+        --with-lz4=/path/to/liblz4
+
+      If configure should use the version bundled with the sources, use:
+        --with-lz4=internal
+
   D. Documentation
 
       The primary documentation for Subversion is the free book
@@ -727,8 +744,8 @@ II.   INSTALLATION
         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
         from https://www.apache.org/dist/apr/.
-      * SQLite 3.7.12 or higher from https://www.sqlite.org/download.html
-        (3.8.0 or higher recommended)
+      * SQLite 3.8.2 or higher from https://www.sqlite.org/download.html
+        (3.8.11.1 or higher recommended)
       * ZLib 1.2 or higher is required and can be obtained from
         http://www.zlib.net/
       * Either a Subversion client binary from
@@ -843,11 +860,7 @@ II.   INSTALLATION
 
   E.4 Building the Binaries
 
-      To build the binaries either follow the instructions here or use
-      build\win32\vc6-build.bat.in after editing its default paths to match
-      yours and saving it as vc6-build.bat.  The vc6-build.bat does a full build
-      using all options so it requires Apache 2 source and the other optional
-      components.
+      To build the binaries either follow these instructions.
 
       Start in the SVN directory you created.
 

Modified: subversion/branches/mod-dav-svn-expressions/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/branches/mod-dav-svn-expressions/Makefile.in?rev=1846488&r1=1846487&r2=1846488&view=diff
==============================================================================
--- subversion/branches/mod-dav-svn-expressions/Makefile.in (original)
+++ subversion/branches/mod-dav-svn-expressions/Makefile.in Tue Nov 13 07:49:04 2018
@@ -56,6 +56,8 @@ SVN_XML_LIBS = @SVN_XML_LIBS@
 SVN_ZLIB_LIBS = @SVN_ZLIB_LIBS@
 SVN_LZ4_LIBS = @SVN_LZ4_LIBS@
 SVN_UTF8PROC_LIBS = @SVN_UTF8PROC_LIBS@
+SVN_MACOS_PLIST_LIBS = @SVN_MACOS_PLIST_LIBS@
+SVN_MACOS_KEYCHAIN_LIBS = @SVN_MACOS_KEYCHAIN_LIBS@
 
 LIBS = @LIBS@
 
@@ -190,7 +192,10 @@ CXXMAINTAINERFLAGS = @CXXMAINTAINERFLAGS
 CPPFLAGS = @CPPFLAGS@ $(EXTRA_CPPFLAGS)
 LDFLAGS = @LDFLAGS@ $(EXTRA_LDFLAGS)
 SWIG_LDFLAGS = @SWIG_LDFLAGS@ $(EXTRA_SWIG_LDFLAGS)
-SWIG_CPPFLAGS = @SWIG_CPPFLAGS@ $(EXTRA_CPPFLAGS)
+SWIG_FEATURES = @SWIG_FEATURES@
+SWIG_PY_FEATURES = @SWIG_PY_FEATURES@
+SWIG_PL_FEATURES = @SWIG_PL_FEATURES@
+SWIG_RB_FEATURES = @SWIG_RB_FEATURES@
 
 COMPILE = $(CC) $(CMODEFLAGS) $(CPPFLAGS) $(CMAINTAINERFLAGS) $(CFLAGS) $(INCLUDES)
 COMPILE_NOWARN = $(CC) $(CMODEFLAGS) $(CPPFLAGS) $(CNOWARNFLAGS) $(CFLAGS) $(INCLUDES)
@@ -215,7 +220,6 @@ COMPILE_SWIG_RB = $(LIBTOOL) $(LTFLAGS)
 # special compilation for files destined for javahl (i.e. C++)
 COMPILE_JAVAHL_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=compile $(COMPILE_CXX) $(LT_CFLAGS) $(JAVAHL_INCLUDES) -o $@ -c
 COMPILE_JAVAHL_JAVAC = $(JAVAC) $(JAVAC_FLAGS)
-COMPILE_JAVAHL_JAVAH = $(JAVAH)
 COMPILE_JAVAHL_COMPAT_JAVAC = $(JAVAC) $(JAVAC_COMPAT_FLAGS)
 
 # On Mac OS X, export an env variable so that the tests can run without
@@ -390,7 +394,6 @@ JAVAC = @JAVAC@
 JAVADOC = @JAVADOC@
 JAVAC_FLAGS = @JAVAC_FLAGS@
 JAVAC_COMPAT_FLAGS = @JAVAC_COMPAT_FLAGS@
-JAVAH = @JAVAH@
 JAR = @JAR@
 
 JAVA_CLASSPATH=$(abs_srcdir)/subversion/bindings/javahl/src:@JAVA_CLASSPATH@
@@ -491,8 +494,8 @@ revision-install:
 install-static: @INSTALL_STATIC_RULES@
 
 # JavaHL target aliases
-javahl: mkdir-init javahl-java javahl-javah javahl-callback-javah javahl-remote-javah javahl-types-javah javahl-util-javah javahl-lib @JAVAHL_TESTS_TARGET@ javahl-compat
-install-javahl: javahl install-javahl-java install-javahl-javah install-javahl-lib
+javahl: mkdir-init javahl-java javahl-callback-java javahl-remote-java javahl-types-java javahl-util-java javahl-lib @JAVAHL_TESTS_TARGET@ javahl-compat
+install-javahl: javahl install-javahl-java install-javahl-lib
 javahl-compat: javahl-compat-java @JAVAHL_COMPAT_TESTS_TARGET@
 
 clean-javahl:
@@ -595,6 +598,15 @@ check: bin @TRANSFORM_LIBTOOL_SCRIPTS@ $
 	  if test "$(FSFS_COMPRESSION)" != ""; then                          \
 	    flags="--fsfs-compression $(FSFS_COMPRESSION) $$flags";          \
 	  fi;                                                                \
+	  if test "$(FSFS_DIR_DELTIFICATION)" != ""; then                    \
+	    flags="--fsfs-dir-deltification $(FSFS_DIR_DELTIFICATION) $$flags";\
+	  fi;                                                                \
+	  if test "$(ALLOW_REMOTE_HTTP_CONNECTION)" != ""; then              \
+	    flags="--allow-remote-http-connection $$flags";                  \
+	  fi;                                                                \
+	  if test "$(SVN_BIN_DIR)" != ""; then                               \
+	    flags="--bin $(SVN_BIN_DIR) $$flags";                            \
+	  fi;                                                                \
 	  LD_LIBRARY_PATH='$(auth_plugin_dirs):$(LD_LIBRARY_PATH)'           \
 	  $(PYTHON) $(top_srcdir)/build/run_tests.py                         \
 	            --config-file $(top_srcdir)/subversion/tests/tests.conf  \
@@ -854,7 +866,7 @@ extraclean-swig-headers: clean-swig-head
 $(SWIG_PL_DIR)/native/Makefile.PL: $(SWIG_SRC_DIR)/perl/native/Makefile.PL.in
 	./config.status subversion/bindings/swig/perl/native/Makefile.PL
 
-$(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL
+$(SWIG_PL_DIR)/native/Makefile: libsvn_swig_perl $(SWIG_PL_DIR)/native/Makefile.PL
 	cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL PREFIX=$(prefix)
 
 # There is a "readlink -f" command on some systems for the same purpose,
@@ -863,9 +875,7 @@ $(SWIG_PL_DIR)/native/Makefile: $(SWIG_P
 READLINK_PY=$(PYTHON) -c 'import sys,os; print(os.path.realpath(sys.argv[1]))'
 READLINK_PL=$(PERL) -e 'use Cwd; print Cwd::realpath(shift)'
 
-swig-pl_DEPS = autogen-swig-pl libsvn_swig_perl \
-  $(SWIG_PL_DIR)/native/Makefile
-swig-pl: $(swig-pl_DEPS)
+swig-pl: autogen-swig-pl $(SWIG_PL_DIR)/native/Makefile
 	if test "`$(READLINK_PL) $(SWIG_PL_DIR)`" != "`$(READLINK_PL) $(SWIG_PL_SRC_DIR)`"; then \
 	  for f in $(SWIG_PL_SRC_DIR)/native/*.c ; do \
 	     if [ -e "$$f" ] ; then \

Modified: subversion/branches/mod-dav-svn-expressions/NOTICE
URL: http://svn.apache.org/viewvc/subversion/branches/mod-dav-svn-expressions/NOTICE?rev=1846488&r1=1846487&r2=1846488&view=diff
==============================================================================
--- subversion/branches/mod-dav-svn-expressions/NOTICE (original)
+++ subversion/branches/mod-dav-svn-expressions/NOTICE Tue Nov 13 07:49:04 2018
@@ -1,5 +1,5 @@
 Apache Subversion
-Copyright 2017 The Apache Software Foundation
+Copyright 2018 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/mod-dav-svn-expressions/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/mod-dav-svn-expressions/build.conf?rev=1846488&r1=1846487&r2=1846488&view=diff
==============================================================================
--- subversion/branches/mod-dav-svn-expressions/build.conf (original)
+++ subversion/branches/mod-dav-svn-expressions/build.conf Tue Nov 13 07:49:04 2018
@@ -98,9 +98,9 @@ test-scripts =
 
 bdb-test-scripts =
 
-swig-python-opts = $(SWIG_CPPFLAGS) -python -classic
-swig-perl-opts = $(SWIG_CPPFLAGS) -perl -nopm -noproxy
-swig-ruby-opts = $(SWIG_CPPFLAGS) -ruby
+swig-python-opts = $(SWIG_FEATURES) -python $(SWIG_PY_FEATURES) -classic
+swig-perl-opts = $(SWIG_FEATURES) -perl $(SWIG_PL_FEATURES) -nopm -noproxy
+swig-ruby-opts = $(SWIG_FEATURES) -ruby $(SWIG_RB_FEATURES)
 swig-languages = python perl ruby
 swig-dirs = 
         subversion/bindings/swig/python
@@ -371,7 +371,8 @@ type = lib
 install = fsmod-lib
 path = subversion/libsvn_subr
 sources = *.c lz4/*.c
-libs = aprutil apriconv apr xml zlib apr_memcache sqlite magic intl lz4 utf8proc
+libs = aprutil apriconv apr xml zlib apr_memcache
+       sqlite magic intl lz4 utf8proc macos-plist macos-keychain
 msvc-libs = kernel32.lib advapi32.lib shfolder.lib ole32.lib
             crypt32.lib version.lib
 msvc-export = 
@@ -608,16 +609,14 @@ msvc-export = ../bindings/swig/ruby/libs
 [javahl-java]
 type = java
 path = subversion/bindings/javahl/src/org/apache/subversion/javahl
-  subversion/bindings/javahl/src/org/apache/subversion/javahl/callback
-  subversion/bindings/javahl/src/org/apache/subversion/javahl/remote
-  subversion/bindings/javahl/src/org/apache/subversion/javahl/types
-  subversion/bindings/javahl/src/org/apache/subversion/javahl/util
-src-root = subversion/bindings/javahl/src
 sources = *.java
+native = CommitItemStateFlags.java NativeResources.java SVNClient.java
+         SVNRepos.java
 install = javahl-java
 link-cmd = $(COMPILE_JAVAHL_JAVAC)
 classes = subversion/bindings/javahl/classes
-package-roots = org
+headers = subversion/bindings/javahl/include
+package = org.apache.subversion.javahl
 
 [javahl-compat-java]
 type = java
@@ -626,10 +625,12 @@ sources = *.java
 install = javahl-java
 link-cmd = $(COMPILE_JAVAHL_COMPAT_JAVAC)
 classes = subversion/bindings/javahl/classes
-add-deps = $(javahl_java_DEPS)
+add-deps = $(javahl_callback_java_DEPS) $(javahl_remote_java_DEPS)
+           $(javahl_types_java_DEPS) $(javahl_util_java_DEPS)
+           $(javahl_java_DEPS)
 ### Replace JAR call in INSTALL_EXTRA_JAVAHL_JAVA macro Makefile.in.
 #jar = svn-javahl.jar
-package-roots = org
+package = org.tigris.subversion.javahl
 
 [javahl-tests]
 type = java
@@ -638,10 +639,12 @@ sources = *.java
 install = javahl-java
 link-cmd = $(COMPILE_JAVAHL_JAVAC)
 classes = subversion/bindings/javahl/classes
-package-roots = org
+package = org.apache.subversion.javahl
 ### Java targets don't do up-to-date checks yet.
 #add-deps = javahl-java
-add-deps = $(javahl_java_DEPS)
+add-deps = $(javahl_callback_java_DEPS) $(javahl_remote_java_DEPS)
+           $(javahl_types_java_DEPS) $(javahl_util_java_DEPS)
+           $(javahl_java_DEPS)
 
 [javahl-compat-tests]
 type = java
@@ -650,65 +653,59 @@ sources = *.java
 install = javahl-java
 link-cmd = $(COMPILE_JAVAHL_COMPAT_JAVAC)
 classes = subversion/bindings/javahl/classes
-package-roots = org
+package = org.tigris.subversion.javahl
 ### Java targets don't do up-to-date checks yet.
 #add-deps = javahl-compat-java
 add-deps = $(javahl_compat_java_DEPS)
 
-[javahl-callback-javah]
-type = javah
+[javahl-callback-java]
+type = java
 path = subversion/bindings/javahl/src/org/apache/subversion/javahl/callback
 classes = subversion/bindings/javahl/classes
 headers = subversion/bindings/javahl/include
 package = org.apache.subversion.javahl.callback
 sources = *.java
-add-deps = $(javahl_java_DEPS)
-install = javahl-javah
-link-cmd = $(COMPILE_JAVAHL_JAVAH) -force
+native = UserPasswordCallback.java
+install = javahl-java
+link-cmd = $(COMPILE_JAVAHL_JAVAC)
 
-[javahl-remote-javah]
-type = javah
+[javahl-remote-java]
+type = java
 path = subversion/bindings/javahl/src/org/apache/subversion/javahl/remote
 classes = subversion/bindings/javahl/classes
 headers = subversion/bindings/javahl/include
 package = org.apache.subversion.javahl.remote
 sources = *.java
-add-deps = $(javahl_java_DEPS)
-install = javahl-javah
-link-cmd = $(COMPILE_JAVAHL_JAVAH) -force
+native = CommitEditor.java RemoteFactory.java RemoteSession.java
+         StateReporter.java
+install = javahl-java
+link-cmd = $(COMPILE_JAVAHL_JAVAC)
 
-[javahl-types-javah]
-type = javah
+[javahl-types-java]
+type = java
 path = subversion/bindings/javahl/src/org/apache/subversion/javahl/types
 classes = subversion/bindings/javahl/classes
 headers = subversion/bindings/javahl/include
 package = org.apache.subversion.javahl.types
 sources = *.java
-add-deps = $(javahl_java_DEPS)
-install = javahl-javah
-link-cmd = $(COMPILE_JAVAHL_JAVAH) -force
+native = NativeInputStream.java NativeOutputStream.java Revision.java
+         RevisionRangeList.java RuntimeVersion.java VersionExtended.java
+         Version.java
+install = javahl-java
+link-cmd = $(COMPILE_JAVAHL_JAVAC)
 
-[javahl-util-javah]
-type = javah
+[javahl-util-java]
+type = java
 path = subversion/bindings/javahl/src/org/apache/subversion/javahl/util
 classes = subversion/bindings/javahl/classes
 headers = subversion/bindings/javahl/include
 package = org.apache.subversion.javahl.util
 sources = *.java
-add-deps = $(javahl_java_DEPS)
-install = javahl-javah
-link-cmd = $(COMPILE_JAVAHL_JAVAH) -force
-
-[javahl-javah]
-type = javah
-path = subversion/bindings/javahl/src/org/apache/subversion/javahl
-classes = subversion/bindings/javahl/classes
-headers = subversion/bindings/javahl/include
-package = org.apache.subversion.javahl
-sources = *.java
-add-deps = $(javahl_java_DEPS)
-install = javahl-javah
-link-cmd = $(COMPILE_JAVAHL_JAVAH) -force
+native = ConfigImpl.java ConfigLib.java DiffLib.java PropLib.java
+         RequestChannel.java ResponseChannel.java SubstLib.java
+         TunnelChannel.java
+install = javahl-java
+link-cmd = $(COMPILE_JAVAHL_JAVAC)
 
 [libsvnjavahl]
 description = Subversion Java HighLevel binding
@@ -717,9 +714,9 @@ path = subversion/bindings/javahl/native
 libs = libsvn_repos libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_diff 
        libsvn_subr libsvn_fs aprutil apriconv apr java-sdk
 sources = *.cpp jniwrapper/*.cpp
-add-deps = $(javahl_java_DEPS) $(javahl_callback_javah_DEPS)
-           $(javahl_remote_javah_DEPS) $(javahl_types_javah_DEPS)
-           $(javahl_util_javah_DEPS) $(javahl_javah_DEPS)
+add-deps = $(javahl_java_DEPS) $(javahl_callback_java_DEPS)
+           $(javahl_remote_java_DEPS) $(javahl_types_java_DEPS)
+           $(javahl_util_java_DEPS) $(javahl_java_DEPS)
 install = javahl-lib
 # need special build rule to include -I$(JDK)/include/jni.h
 compile-cmd = $(COMPILE_JAVAHL_CXX)
@@ -1207,6 +1204,14 @@ sources = window-test.c
 install = test
 libs = libsvn_test libsvn_delta libsvn_subr apriconv apr
 
+[svndiff-stream-test]
+description = Test svndiff streams
+type = exe
+path = subversion/tests/libsvn_delta
+sources = svndiff-stream-test.c
+install = test
+libs = libsvn_test libsvn_delta libsvn_subr apriconv apr
+
 # ----------------------------------------------------------------------------
 # Tests for libsvn_client
 
@@ -1455,7 +1460,8 @@ external-lib = $(SVN_DB_LIBS)
 [gnome-keyring]
 type = lib
 external-lib = $(SVN_GNOME_KEYRING_LIBS)
-pkg-config = gnome-keyring-1
+pkg-config = @SVN_GNOME_KEYRING_PCLIBS@
+pkg-config-private = yes
 
 [kwallet]
 type = lib
@@ -1465,14 +1471,21 @@ external-lib = $(SVN_KWALLET_LIBS)
 type = lib
 external-lib = $(SVN_MAGIC_LIBS)
 
+[macos-plist]
+type = lib
+external-lib = $(SVN_MACOS_PLIST_LIBS)
+
+[macos-keychain]
+type = lib
+external-lib = $(SVN_MACOS_KEYCHAIN_LIBS)
+
 [sasl]
 type = lib
 external-lib = $(SVN_SASL_LIBS)
 
 [openssl]
 type = lib
-external-lib = $(SVN_OPENSSL_LIBS)
-msvc-libs = ssleay32.lib libeay32.lib
+external-lib = $(SVN_OPENSSL_LIBS) $(SVN_LIBCRYPTO_LIBS)
 
 [intl]
 type = lib
@@ -1580,7 +1593,8 @@ libs = __ALL__
        conflict-data-test db-test pristine-store-test entries-compat-test
        op-depth-test dirent_uri-test wc-queries-test wc-test
        auth-test
-       parse-diff-test x509-test xml-test afl-x509 compress-test
+       parse-diff-test x509-test xml-test afl-x509 afl-svndiff compress-test
+       svndiff-stream-test
 
 [__MORE__]
 type = project
@@ -1621,7 +1635,7 @@ lang = ruby
 [__JAVAHL__]
 type = project
 path = build/win32
-libs = javahl-java javahl-javah libsvnjavahl
+libs = javahl-java libsvnjavahl
 
 [__JAVAHL_TESTS__]
 type = project
@@ -1740,3 +1754,12 @@ sources = afl-x509.c
 install = test
 libs = libsvn_subr apr
 testing = skip
+
+[afl-svndiff]
+description = AFL fuzzer for svndiff to txdelta parser
+type = exe
+path = subversion/tests/afl
+sources = afl-svndiff.c
+install = test
+libs = libsvn_delta libsvn_subr apr
+testing = skip

Modified: subversion/branches/mod-dav-svn-expressions/build/PrintPath
URL: http://svn.apache.org/viewvc/subversion/branches/mod-dav-svn-expressions/build/PrintPath?rev=1846488&r1=1846487&r2=1846488&view=diff
==============================================================================
--- subversion/branches/mod-dav-svn-expressions/build/PrintPath (original)
+++ subversion/branches/mod-dav-svn-expressions/build/PrintPath Tue Nov 13 07:49:04 2018
@@ -1,22 +1,19 @@
 #!/bin/sh
 #
-#
-#   Licensed to the Apache Software Foundation (ASF) under one
-#   or more contributor license agreements.  See the NOTICE file
-#   distributed with this work for additional information
-#   regarding copyright ownership.  The ASF licenses this file
-#   to you under the Apache License, Version 2.0 (the
-#   "License"); you may not use this file except in compliance
-#   with the License.  You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
-#   Unless required by applicable law or agreed to in writing,
-#   software distributed under the License is distributed on an
-#   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#   KIND, either express or implied.  See the License for the
-#   specific language governing permissions and limitations
-#   under the License.
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 #
 # Look for program[s] somewhere in $PATH.
@@ -32,9 +29,6 @@
 #
 # Initially written by Jim Jagielski for the Apache configuration mechanism
 #  (with kudos to Kernighan/Pike)
-#
-# This script falls under the Apache License.
-# See http://www.apache.org/docs/LICENSE
 
 ##
 # Some "constants"
@@ -69,7 +63,7 @@ done
 # Finally, we try to determine the best flag to use for
 # test/[] to look for an executable file. OS/2 just has '-r'
 # but with other OSs, we do some funny stuff to check to see
-# if test/[] knows about -x, which is the preferred flag.
+# if test/[] knows about -x, which is the prefered flag.
 ##
 
 if [ "x$os" = "xOS/2" ]