Author: rinrab
Date: Mon Mar 16 19:55:15 2026
New Revision: 1932345

Log:
On the 'utf8-cmdline' branch: Sync with trunk, resolving minor conflicts in
svn_opt.h (left unchanged).

Added:
   subversion/branches/utf8-cmdline/build/cmake/FindXDIGEST.cmake
      - copied unchanged from r1932344, 
subversion/trunk/build/cmake/FindXDIGEST.cmake
   subversion/branches/utf8-cmdline/subversion/include/private/svn_xml_private.h
      - copied unchanged from r1932344, 
subversion/trunk/subversion/include/private/svn_xml_private.h
   subversion/branches/utf8-cmdline/subversion/libsvn_subr/checksum_apr.c
      - copied unchanged from r1932344, 
subversion/trunk/subversion/libsvn_subr/checksum_apr.c
   subversion/branches/utf8-cmdline/subversion/libsvn_subr/checksum_bcrypt.c
      - copied unchanged from r1932344, 
subversion/trunk/subversion/libsvn_subr/checksum_bcrypt.c
   subversion/branches/utf8-cmdline/subversion/libsvn_subr/checksum_context.c
      - copied unchanged from r1932344, 
subversion/trunk/subversion/libsvn_subr/checksum_context.c
   subversion/branches/utf8-cmdline/subversion/libsvn_subr/checksum_openssl.c
      - copied unchanged from r1932344, 
subversion/trunk/subversion/libsvn_subr/checksum_openssl.c
   subversion/branches/utf8-cmdline/subversion/libsvn_subr/checksum_xdigest.c
      - copied unchanged from r1932344, 
subversion/trunk/subversion/libsvn_subr/checksum_xdigest.c
   subversion/branches/utf8-cmdline/subversion/tests/libsvn_subr/adler32-test.c
      - copied unchanged from r1932344, 
subversion/trunk/subversion/tests/libsvn_subr/adler32-test.c
Modified:
   subversion/branches/utf8-cmdline/   (props changed)
   subversion/branches/utf8-cmdline/.github/workflows/cmake.yml
   subversion/branches/utf8-cmdline/CHANGES
   subversion/branches/utf8-cmdline/CMakeLists.txt
   subversion/branches/utf8-cmdline/COMMITTERS
   subversion/branches/utf8-cmdline/NOTICE
   subversion/branches/utf8-cmdline/build.conf
   subversion/branches/utf8-cmdline/build/ac-macros/zlib.m4
   subversion/branches/utf8-cmdline/build/cmake/FindSerf.cmake
   subversion/branches/utf8-cmdline/build/generator/gen_base.py
   subversion/branches/utf8-cmdline/build/generator/gen_win_dependencies.py
   subversion/branches/utf8-cmdline/build/generator/templates/targets.cmake.ezt
   subversion/branches/utf8-cmdline/configure.ac
   subversion/branches/utf8-cmdline/notes/knobs
   
subversion/branches/utf8-cmdline/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java
   
subversion/branches/utf8-cmdline/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java
   
subversion/branches/utf8-cmdline/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
   
subversion/branches/utf8-cmdline/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/SVNTests.java
   
subversion/branches/utf8-cmdline/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
   subversion/branches/utf8-cmdline/subversion/bindings/swig/python/svn/fs.py
   
subversion/branches/utf8-cmdline/subversion/bindings/swig/python/tests/client.py
   subversion/branches/utf8-cmdline/subversion/bindings/swig/python/tests/fs.py
   
subversion/branches/utf8-cmdline/subversion/bindings/swig/python/tests/mergeinfo.py
   
subversion/branches/utf8-cmdline/subversion/bindings/swig/python/tests/repository.py
   subversion/branches/utf8-cmdline/subversion/include/private/svn_atomic.h
   subversion/branches/utf8-cmdline/subversion/include/private/svn_dep_compat.h
   subversion/branches/utf8-cmdline/subversion/include/private/svn_io_private.h
   subversion/branches/utf8-cmdline/subversion/include/private/svn_task.h
   subversion/branches/utf8-cmdline/subversion/include/private/svn_thread_cond.h
   subversion/branches/utf8-cmdline/subversion/include/private/svn_wc_private.h
   subversion/branches/utf8-cmdline/subversion/include/svn_client.h
   subversion/branches/utf8-cmdline/subversion/include/svn_error_codes.h
   subversion/branches/utf8-cmdline/subversion/include/svn_string.h
   subversion/branches/utf8-cmdline/subversion/include/svn_utf.h
   subversion/branches/utf8-cmdline/subversion/include/svn_version.h
   subversion/branches/utf8-cmdline/subversion/include/svn_wc.h
   subversion/branches/utf8-cmdline/subversion/include/svn_xml.h
   subversion/branches/utf8-cmdline/subversion/libsvn_client/deprecated.c
   subversion/branches/utf8-cmdline/subversion/libsvn_client/upgrade.c
   subversion/branches/utf8-cmdline/subversion/libsvn_diff/diff_tree_debug.c
   subversion/branches/utf8-cmdline/subversion/libsvn_diff/parse-diff.c
   subversion/branches/utf8-cmdline/subversion/libsvn_fs/fs-loader.c
   subversion/branches/utf8-cmdline/subversion/libsvn_fs_fs/tree.c
   subversion/branches/utf8-cmdline/subversion/libsvn_ra_serf/eagain_bucket.c
   subversion/branches/utf8-cmdline/subversion/libsvn_ra_serf/ra_serf.h
   subversion/branches/utf8-cmdline/subversion/libsvn_ra_serf/sb_bucket.c
   subversion/branches/utf8-cmdline/subversion/libsvn_ra_serf/serf.c
   subversion/branches/utf8-cmdline/subversion/libsvn_ra_serf/update.c
   subversion/branches/utf8-cmdline/subversion/libsvn_ra_serf/util.c
   subversion/branches/utf8-cmdline/subversion/libsvn_subr/adler32.c
   subversion/branches/utf8-cmdline/subversion/libsvn_subr/apr_escape.c
   subversion/branches/utf8-cmdline/subversion/libsvn_subr/atomic.c
   subversion/branches/utf8-cmdline/subversion/libsvn_subr/checksum.c
   subversion/branches/utf8-cmdline/subversion/libsvn_subr/checksum.h
   subversion/branches/utf8-cmdline/subversion/libsvn_subr/gpg_agent.c
   subversion/branches/utf8-cmdline/subversion/libsvn_subr/io.c
   subversion/branches/utf8-cmdline/subversion/libsvn_subr/lz4/LICENSE
   subversion/branches/utf8-cmdline/subversion/libsvn_subr/lz4/lz4.c
   subversion/branches/utf8-cmdline/subversion/libsvn_subr/lz4/lz4internal.h
   subversion/branches/utf8-cmdline/subversion/libsvn_subr/mergeinfo.c
   subversion/branches/utf8-cmdline/subversion/libsvn_subr/string.c
   subversion/branches/utf8-cmdline/subversion/libsvn_subr/subst.c
   subversion/branches/utf8-cmdline/subversion/libsvn_subr/utf8proc/   (props 
changed)
   subversion/branches/utf8-cmdline/subversion/libsvn_subr/utf8proc.c
   subversion/branches/utf8-cmdline/subversion/libsvn_subr/utf8proc/LICENSE.md
   subversion/branches/utf8-cmdline/subversion/libsvn_subr/utf8proc/NEWS.md
   subversion/branches/utf8-cmdline/subversion/libsvn_subr/utf8proc/README.md
   subversion/branches/utf8-cmdline/subversion/libsvn_subr/utf8proc/utf8proc.c
   
subversion/branches/utf8-cmdline/subversion/libsvn_subr/utf8proc/utf8proc_data.c
   
subversion/branches/utf8-cmdline/subversion/libsvn_subr/utf8proc/utf8proc_internal.h
   subversion/branches/utf8-cmdline/subversion/libsvn_subr/version.c
   subversion/branches/utf8-cmdline/subversion/libsvn_subr/waitable_counter.c
   subversion/branches/utf8-cmdline/subversion/libsvn_subr/xml_stream.c
   subversion/branches/utf8-cmdline/subversion/libsvn_wc/questions.c
   subversion/branches/utf8-cmdline/subversion/libsvn_wc/revert.c
   subversion/branches/utf8-cmdline/subversion/libsvn_wc/upgrade.c
   subversion/branches/utf8-cmdline/subversion/libsvn_wc/wc.h
   subversion/branches/utf8-cmdline/subversion/libsvn_wc/workqueue.c
   subversion/branches/utf8-cmdline/subversion/svn/notify.c
   subversion/branches/utf8-cmdline/subversion/svn/propedit-cmd.c
   subversion/branches/utf8-cmdline/subversion/svn_private_config.hw
   subversion/branches/utf8-cmdline/subversion/svnbench/notify.c
   subversion/branches/utf8-cmdline/subversion/tests/cmdline/authz_tests.py
   subversion/branches/utf8-cmdline/subversion/tests/cmdline/basic_tests.py
   subversion/branches/utf8-cmdline/subversion/tests/cmdline/copy_tests.py
   subversion/branches/utf8-cmdline/subversion/tests/cmdline/davautocheck.sh
   subversion/branches/utf8-cmdline/subversion/tests/cmdline/entries-dump.c
   subversion/branches/utf8-cmdline/subversion/tests/cmdline/externals_tests.py
   subversion/branches/utf8-cmdline/subversion/tests/cmdline/log_tests.py
   subversion/branches/utf8-cmdline/subversion/tests/cmdline/prop_tests.py
   subversion/branches/utf8-cmdline/subversion/tests/cmdline/svntest/main.py
   subversion/branches/utf8-cmdline/subversion/tests/cmdline/svntest/verify.py
   subversion/branches/utf8-cmdline/subversion/tests/cmdline/upgrade_tests.py
   subversion/branches/utf8-cmdline/subversion/tests/libsvn_subr/checksum-test.c
   subversion/branches/utf8-cmdline/subversion/tests/libsvn_subr/xml-test.c
   subversion/branches/utf8-cmdline/tools/dev/contribulyze.py
   subversion/branches/utf8-cmdline/tools/dist/backport/status.py
   subversion/branches/utf8-cmdline/tools/dist/make-keys.sh
   subversion/branches/utf8-cmdline/tools/dist/manage-backports.py
   subversion/branches/utf8-cmdline/tools/dist/nominate-backport.py
   subversion/branches/utf8-cmdline/tools/dist/release-lines.yaml
   subversion/branches/utf8-cmdline/tools/dist/release.py
   subversion/branches/utf8-cmdline/tools/server-side/svn-backup-dumps.py

NOTE: this message was too long when including "diff" contents.
      The contents have been replaced with URLs to display the
      diff contents on a web page.


Modified: subversion/branches/utf8-cmdline/.github/workflows/cmake.yml

Modified: subversion/branches/utf8-cmdline/CHANGES

Modified: subversion/branches/utf8-cmdline/CMakeLists.txt

Modified: subversion/branches/utf8-cmdline/COMMITTERS

Modified: subversion/branches/utf8-cmdline/NOTICE

Modified: subversion/branches/utf8-cmdline/build.conf

Modified: subversion/branches/utf8-cmdline/build/ac-macros/zlib.m4

Modified: subversion/branches/utf8-cmdline/build/cmake/FindSerf.cmake

Copied: subversion/branches/utf8-cmdline/build/cmake/FindXDIGEST.cmake (from 
r1932344, subversion/trunk/build/cmake/FindXDIGEST.cmake)

Modified: subversion/branches/utf8-cmdline/build/generator/gen_base.py

Modified: 
subversion/branches/utf8-cmdline/build/generator/gen_win_dependencies.py

Modified: 
subversion/branches/utf8-cmdline/build/generator/templates/targets.cmake.ezt

Modified: subversion/branches/utf8-cmdline/configure.ac

Modified: subversion/branches/utf8-cmdline/notes/knobs

Modified: 
subversion/branches/utf8-cmdline/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java

Modified: 
subversion/branches/utf8-cmdline/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java

Modified: 
subversion/branches/utf8-cmdline/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java

Modified: 
subversion/branches/utf8-cmdline/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/SVNTests.java

Modified: 
subversion/branches/utf8-cmdline/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c

Modified: 
subversion/branches/utf8-cmdline/subversion/bindings/swig/python/svn/fs.py

Modified: 
subversion/branches/utf8-cmdline/subversion/bindings/swig/python/tests/client.py

Modified: 
subversion/branches/utf8-cmdline/subversion/bindings/swig/python/tests/fs.py

Modified: 
subversion/branches/utf8-cmdline/subversion/bindings/swig/python/tests/mergeinfo.py

Modified: 
subversion/branches/utf8-cmdline/subversion/bindings/swig/python/tests/repository.py

Modified: 
subversion/branches/utf8-cmdline/subversion/include/private/svn_atomic.h

Modified: 
subversion/branches/utf8-cmdline/subversion/include/private/svn_dep_compat.h

Modified: 
subversion/branches/utf8-cmdline/subversion/include/private/svn_io_private.h

Modified: subversion/branches/utf8-cmdline/subversion/include/private/svn_task.h

Modified: 
subversion/branches/utf8-cmdline/subversion/include/private/svn_thread_cond.h

Modified: 
subversion/branches/utf8-cmdline/subversion/include/private/svn_wc_private.h

Copied: 
subversion/branches/utf8-cmdline/subversion/include/private/svn_xml_private.h 
(from r1932344, subversion/trunk/subversion/include/private/svn_xml_private.h)

Modified: subversion/branches/utf8-cmdline/subversion/include/svn_client.h

Modified: subversion/branches/utf8-cmdline/subversion/include/svn_error_codes.h

Modified: subversion/branches/utf8-cmdline/subversion/include/svn_string.h

Modified: subversion/branches/utf8-cmdline/subversion/include/svn_utf.h

Modified: subversion/branches/utf8-cmdline/subversion/include/svn_version.h

Modified: subversion/branches/utf8-cmdline/subversion/include/svn_wc.h

Modified: subversion/branches/utf8-cmdline/subversion/include/svn_xml.h

Modified: subversion/branches/utf8-cmdline/subversion/libsvn_client/deprecated.c

Modified: subversion/branches/utf8-cmdline/subversion/libsvn_client/upgrade.c

Modified: 
subversion/branches/utf8-cmdline/subversion/libsvn_diff/diff_tree_debug.c

Modified: subversion/branches/utf8-cmdline/subversion/libsvn_diff/parse-diff.c

Modified: subversion/branches/utf8-cmdline/subversion/libsvn_fs/fs-loader.c

Modified: subversion/branches/utf8-cmdline/subversion/libsvn_fs_fs/tree.c

Modified: 
subversion/branches/utf8-cmdline/subversion/libsvn_ra_serf/eagain_bucket.c

Modified: subversion/branches/utf8-cmdline/subversion/libsvn_ra_serf/ra_serf.h

Modified: subversion/branches/utf8-cmdline/subversion/libsvn_ra_serf/sb_bucket.c

Modified: subversion/branches/utf8-cmdline/subversion/libsvn_ra_serf/serf.c

Modified: subversion/branches/utf8-cmdline/subversion/libsvn_ra_serf/update.c

Modified: subversion/branches/utf8-cmdline/subversion/libsvn_ra_serf/util.c

Modified: subversion/branches/utf8-cmdline/subversion/libsvn_subr/adler32.c

Modified: subversion/branches/utf8-cmdline/subversion/libsvn_subr/apr_escape.c

Modified: subversion/branches/utf8-cmdline/subversion/libsvn_subr/atomic.c

Modified: subversion/branches/utf8-cmdline/subversion/libsvn_subr/checksum.c

Modified: subversion/branches/utf8-cmdline/subversion/libsvn_subr/checksum.h

Copied: subversion/branches/utf8-cmdline/subversion/libsvn_subr/checksum_apr.c 
(from r1932344, subversion/trunk/subversion/libsvn_subr/checksum_apr.c)

Copied: 
subversion/branches/utf8-cmdline/subversion/libsvn_subr/checksum_bcrypt.c (from 
r1932344, subversion/trunk/subversion/libsvn_subr/checksum_bcrypt.c)

Copied: 
subversion/branches/utf8-cmdline/subversion/libsvn_subr/checksum_context.c 
(from r1932344, subversion/trunk/subversion/libsvn_subr/checksum_context.c)

Copied: 
subversion/branches/utf8-cmdline/subversion/libsvn_subr/checksum_openssl.c 
(from r1932344, subversion/trunk/subversion/libsvn_subr/checksum_openssl.c)

Copied: 
subversion/branches/utf8-cmdline/subversion/libsvn_subr/checksum_xdigest.c 
(from r1932344, subversion/trunk/subversion/libsvn_subr/checksum_xdigest.c)

Modified: subversion/branches/utf8-cmdline/subversion/libsvn_subr/gpg_agent.c

Modified: subversion/branches/utf8-cmdline/subversion/libsvn_subr/io.c

Modified: subversion/branches/utf8-cmdline/subversion/libsvn_subr/lz4/LICENSE

Modified: subversion/branches/utf8-cmdline/subversion/libsvn_subr/lz4/lz4.c

Modified: 
subversion/branches/utf8-cmdline/subversion/libsvn_subr/lz4/lz4internal.h

Modified: subversion/branches/utf8-cmdline/subversion/libsvn_subr/mergeinfo.c

Modified: subversion/branches/utf8-cmdline/subversion/libsvn_subr/string.c

Modified: subversion/branches/utf8-cmdline/subversion/libsvn_subr/subst.c

Modified: subversion/branches/utf8-cmdline/subversion/libsvn_subr/utf8proc.c

Modified: 
subversion/branches/utf8-cmdline/subversion/libsvn_subr/utf8proc/LICENSE.md

Modified: 
subversion/branches/utf8-cmdline/subversion/libsvn_subr/utf8proc/NEWS.md

Modified: 
subversion/branches/utf8-cmdline/subversion/libsvn_subr/utf8proc/README.md

Modified: 
subversion/branches/utf8-cmdline/subversion/libsvn_subr/utf8proc/utf8proc.c

Modified: 
subversion/branches/utf8-cmdline/subversion/libsvn_subr/utf8proc/utf8proc_data.c

Modified: 
subversion/branches/utf8-cmdline/subversion/libsvn_subr/utf8proc/utf8proc_internal.h

Modified: subversion/branches/utf8-cmdline/subversion/libsvn_subr/version.c

Modified: 
subversion/branches/utf8-cmdline/subversion/libsvn_subr/waitable_counter.c

Modified: subversion/branches/utf8-cmdline/subversion/libsvn_subr/xml_stream.c

Modified: subversion/branches/utf8-cmdline/subversion/libsvn_wc/questions.c

Modified: subversion/branches/utf8-cmdline/subversion/libsvn_wc/revert.c

Modified: subversion/branches/utf8-cmdline/subversion/libsvn_wc/upgrade.c

Modified: subversion/branches/utf8-cmdline/subversion/libsvn_wc/wc.h

Modified: subversion/branches/utf8-cmdline/subversion/libsvn_wc/workqueue.c

Modified: subversion/branches/utf8-cmdline/subversion/svn/notify.c

Modified: subversion/branches/utf8-cmdline/subversion/svn/propedit-cmd.c

Modified: subversion/branches/utf8-cmdline/subversion/svn_private_config.hw

Modified: subversion/branches/utf8-cmdline/subversion/svnbench/notify.c

Modified: 
subversion/branches/utf8-cmdline/subversion/tests/cmdline/authz_tests.py

Modified: 
subversion/branches/utf8-cmdline/subversion/tests/cmdline/basic_tests.py

Modified: 
subversion/branches/utf8-cmdline/subversion/tests/cmdline/copy_tests.py

Modified: 
subversion/branches/utf8-cmdline/subversion/tests/cmdline/davautocheck.sh

Modified: 
subversion/branches/utf8-cmdline/subversion/tests/cmdline/entries-dump.c

Modified: 
subversion/branches/utf8-cmdline/subversion/tests/cmdline/externals_tests.py

Modified: subversion/branches/utf8-cmdline/subversion/tests/cmdline/log_tests.py

Modified: 
subversion/branches/utf8-cmdline/subversion/tests/cmdline/prop_tests.py

Modified: 
subversion/branches/utf8-cmdline/subversion/tests/cmdline/svntest/main.py

Modified: 
subversion/branches/utf8-cmdline/subversion/tests/cmdline/svntest/verify.py

Modified: 
subversion/branches/utf8-cmdline/subversion/tests/cmdline/upgrade_tests.py

Copied: 
subversion/branches/utf8-cmdline/subversion/tests/libsvn_subr/adler32-test.c 
(from r1932344, subversion/trunk/subversion/tests/libsvn_subr/adler32-test.c)

Modified: 
subversion/branches/utf8-cmdline/subversion/tests/libsvn_subr/checksum-test.c

Modified: 
subversion/branches/utf8-cmdline/subversion/tests/libsvn_subr/xml-test.c

Modified: subversion/branches/utf8-cmdline/tools/dev/contribulyze.py

Modified: subversion/branches/utf8-cmdline/tools/dist/backport/status.py

Modified: subversion/branches/utf8-cmdline/tools/dist/make-keys.sh

Modified: subversion/branches/utf8-cmdline/tools/dist/manage-backports.py

Modified: subversion/branches/utf8-cmdline/tools/dist/nominate-backport.py

Modified: subversion/branches/utf8-cmdline/tools/dist/release-lines.yaml

Modified: subversion/branches/utf8-cmdline/tools/dist/release.py

Modified: subversion/branches/utf8-cmdline/tools/server-side/svn-backup-dumps.py

Reply via email to