You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2022/01/14 14:01:51 UTC
svn commit: r1897034 [34/37] - in /subversion/branches/multi-wc-format: ./ build/ build/ac-macros/ build/generator/ build/generator/swig/ build/generator/templates/ contrib/client-side/ contrib/client-side/svn_load_dirs/ contrib/hook-scripts/ contrib/s...
Modified: subversion/branches/multi-wc-format/tools/buildbot/slaves/bb-openbsd/svncheck-bindings.sh
URL: http://svn.apache.org/viewvc/subversion/branches/multi-wc-format/tools/buildbot/slaves/bb-openbsd/svncheck-bindings.sh?rev=1897034&r1=1897033&r2=1897034&view=diff
==============================================================================
--- subversion/branches/multi-wc-format/tools/buildbot/slaves/bb-openbsd/svncheck-bindings.sh (original)
+++ subversion/branches/multi-wc-format/tools/buildbot/slaves/bb-openbsd/svncheck-bindings.sh Fri Jan 14 14:01:45 2022
@@ -27,6 +27,7 @@ branch="${url##*/}"
export MALLOC_OPTIONS=S
(cd .. && gmake BRANCH="$branch" THREADING="no" JAVA="no" svn-check-bindings)
grep -q "^Result: PASS$" tests.log.bindings.pl || exit 1
-grep -q "^OK$" tests.log.bindings.py || exit 1
+grep -q "^OK$" tests.log.bindings.py || \
+ grep -q "^OK (skipped=[0-9]" tests.log.bindings.py || exit 1
grep -q ", 0 failures, 0 errors" tests.log.bindings.rb || exit 1
exit 0
Modified: subversion/branches/multi-wc-format/tools/buildbot/slaves/bb-openbsd/svncheck.sh
URL: http://svn.apache.org/viewvc/subversion/branches/multi-wc-format/tools/buildbot/slaves/bb-openbsd/svncheck.sh?rev=1897034&r1=1897033&r2=1897034&view=diff
==============================================================================
--- subversion/branches/multi-wc-format/tools/buildbot/slaves/bb-openbsd/svncheck.sh (original)
+++ subversion/branches/multi-wc-format/tools/buildbot/slaves/bb-openbsd/svncheck.sh Fri Jan 14 14:01:45 2022
@@ -26,7 +26,7 @@ url="$(svn info --show-item url)"
branch="${url##*/}"
export MALLOC_OPTIONS=S
(cd .. && gmake BRANCH="$branch" PARALLEL="4" THREADING="no" JAVA="no" \
- EXCLUSIVE_WC_LOCKS=1 \
+ EXCLUSIVE_WC_LOCKS=1 SVN_CHECK_FS_BACKENDS=fsfs \
svn-check-local \
svn-check-svn \
svn-check-neon \
Modified: subversion/branches/multi-wc-format/tools/buildbot/slaves/bb-openbsd/svnclean.sh
URL: http://svn.apache.org/viewvc/subversion/branches/multi-wc-format/tools/buildbot/slaves/bb-openbsd/svnclean.sh?rev=1897034&r1=1897033&r2=1897034&view=diff
==============================================================================
--- subversion/branches/multi-wc-format/tools/buildbot/slaves/bb-openbsd/svnclean.sh (original)
+++ subversion/branches/multi-wc-format/tools/buildbot/slaves/bb-openbsd/svnclean.sh Fri Jan 14 14:01:45 2022
@@ -22,20 +22,33 @@
set -e
set -x
-url="$(svn info --show-item url)"
-branch="${url##*/}"
+if [ -d ../build/.svn ]; then
+ svn cleanup ../build
+fi
(test -h ../svn-trunk || ln -s build ../svn-trunk)
for i in $(jot - 6 12); do
(test -h ../svn-1.${i}.x || ln -s build ../svn-1.${i}.x)
done
lastchangedrev="$(svn info --show-item=last-changed-revision ../../unix-build/Makefile.svn)"
+svn cleanup ../../unix-build
svn update ../../unix-build
newlastchangedrev="$(svn info --show-item=last-changed-revision ../../unix-build/Makefile.svn)"
(test -h ../GNUmakefile || ln -s ../unix-build/Makefile.svn ../GNUmakefile)
-# always rebuild svn, but only rebuild dependencies if Makefile.svn has changed
-if [ "$lastchangedrev" != "$newlastchangedrev" ]; then
- (cd .. && gmake BRANCH="$branch" reset clean)
+if [ -d .svn ]; then
+ # always rebuild svn, but only rebuild deps if Makefile.svn has changed
+ url="$(svn info --show-item url)"
+ branch="${url##*/}"
+ if [ "$lastchangedrev" != "$newlastchangedrev" ]; then
+ (cd .. && gmake BRANCH="$branch" reset clean)
+ rm -f ../prefix/httpd/conf/httpd-svn-check-*.conf
+ rm -f ../prefix/httpd/conf/httpd-svn-proxy-*.conf
+ rm -f ../prefix/httpd/conf/httpd-svn-check-users
+ rm -f ../prefix/httpd/conf/httpd-svn-check-groups
+ rm -f ../prefix/httpd/conf/dontdothat
+ else
+ (cd .. && gmake BRANCH="$branch" svn-reset svn-bindings-reset svn-clean)
+ fi
else
- (cd .. && gmake BRANCH="$branch" svn-reset svn-bindings-reset svn-clean)
+ (cd .. && gmake reset clean)
fi
rm -f tests.log* fails.log*
Modified: subversion/branches/multi-wc-format/tools/buildbot/slaves/svn-x64-macosx/setenv.sh
URL: http://svn.apache.org/viewvc/subversion/branches/multi-wc-format/tools/buildbot/slaves/svn-x64-macosx/setenv.sh?rev=1897034&r1=1897033&r2=1897034&view=diff
==============================================================================
--- subversion/branches/multi-wc-format/tools/buildbot/slaves/svn-x64-macosx/setenv.sh (original)
+++ subversion/branches/multi-wc-format/tools/buildbot/slaves/svn-x64-macosx/setenv.sh Fri Jan 14 14:01:45 2022
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-## This script calls a helper that provides the folloing environemnt
+## This script calls a helper that provides the following environment
## variables:
##
## PATH The search path
Modified: subversion/branches/multi-wc-format/tools/buildbot/slaves/svn-x64-macosx/svnbuild-bindings.sh
URL: http://svn.apache.org/viewvc/subversion/branches/multi-wc-format/tools/buildbot/slaves/svn-x64-macosx/svnbuild-bindings.sh?rev=1897034&r1=1897033&r2=1897034&view=diff
==============================================================================
--- subversion/branches/multi-wc-format/tools/buildbot/slaves/svn-x64-macosx/svnbuild-bindings.sh (original)
+++ subversion/branches/multi-wc-format/tools/buildbot/slaves/svn-x64-macosx/svnbuild-bindings.sh Fri Jan 14 14:01:45 2022
@@ -24,18 +24,51 @@ scripts=$(cd $(dirname "$0") && pwd)
. ${scripts}/setenv.sh
+# Parse arguments to find out which bindings we should build
+if [ -z "$1" ]; then
+ use_python3=false
+ build_swig_py=true
+ build_swig_pl=true
+ build_swig_rb=true
+ build_javahl=true
+else
+ use_python3=false
+ build_swig_py=false
+ build_swig_pl=false
+ build_swig_rb=false
+ build_javahl=false
+
+ while [ ! -z "$1" ]; do
+ case "$1" in
+ python3) use_python3=true;;
+ swig-py) build_swig_py=true;;
+ swig-pl) build_swig_pl=true;;
+ swig-rb) build_swig_rb=true;;
+ javahl) build_javahl=true;;
+ *) exit 1;;
+ esac
+ shift
+ done
+fi
+
+${use_python3} \
+ && test -n "${SVNBB_PYTHON3ENV}" \
+ && . ${SVNBB_PYTHON3ENV}/bin/activate \
+ && export PYTHON="$(which python)"
+
#
-# Step 4: build bindings
+# Step 1: build bindings
#
build_bindings() {
echo "============ make $1"
cd ${absbld}
- make $1 2>&1 \
- | grep -v '^ld: [w]arning:.*Falling back to library file for linking. *$'
+ make $1 || exit 1
}
-build_bindings swig-py
-build_bindings swig-pl
-build_bindings swig-rb
-build_bindings javahl
+${build_swig_py} && build_bindings swig-py
+${build_swig_pl} && build_bindings swig-pl
+${build_swig_rb} && build_bindings swig-rb
+${build_javahl} && build_bindings javahl
+
+exit 0
Modified: subversion/branches/multi-wc-format/tools/buildbot/slaves/svn-x64-macosx/svnbuild.sh
URL: http://svn.apache.org/viewvc/subversion/branches/multi-wc-format/tools/buildbot/slaves/svn-x64-macosx/svnbuild.sh?rev=1897034&r1=1897033&r2=1897034&view=diff
==============================================================================
--- subversion/branches/multi-wc-format/tools/buildbot/slaves/svn-x64-macosx/svnbuild.sh (original)
+++ subversion/branches/multi-wc-format/tools/buildbot/slaves/svn-x64-macosx/svnbuild.sh Fri Jan 14 14:01:45 2022
@@ -40,6 +40,27 @@ if [ ! -z "${aprdir}" -a -d "${aprdir}"
serfconfig=" --without-serf --without-apxs"
fi
+# An optional parameter tells us if this is a warnings-only build.
+# We run the warnings build with a number of additional options.
+if [ "$2" = "warnings" ]; then
+ parallel=1
+ maintainer_mode=' -q --enable-maintainer-mode'
+ config_cflags="-Wno-deprecated-declarations"
+ config_cflags="${config_cflags} -DPACK_AFTER_EVERY_COMMIT"
+ config_cflags="${config_cflags} -DSVN_UNALIGNED_ACCESS_IS_OK=0"
+ config_cflags="${config_cflags} -DSUFFIX_LINES_TO_KEEP=0"
+ config_cflags="${config_cflags} -DSVN_DEPRECATED="
+else
+ parallel=${SVNBB_PARALLEL}
+fi
+
+# An optional parameter tells us if this build should use Python 3.
+if [ "$3" = "python3" ]; then
+ test -n "${SVNBB_PYTHON3ENV}" \
+ && . ${SVNBB_PYTHON3ENV}/bin/activate \
+ && export PYTHON="$(which python)"
+fi
+
#
# Step 0: Create a directory for the test log files
#
@@ -84,8 +105,10 @@ fi
echo "============ configure"
cd ${absbld}
-env CC=clang CXX=clang++ \
-${abssrc}/configure \
+env CC=clang CFLAGS="${config_cflags}" \
+ CXX=clang++ CXXFLAGS="${config_cxxflags}" \
+ LDFLAGS='-Wl,-w' \
+${abssrc}/configure${maintainer_mode} \
--prefix="${absbld}/.install-prefix" \
--enable-debug${optimizeconfig} \
--disable-nls \
@@ -106,14 +129,6 @@ test -f config.log && mv config.log "${a
# Step 4: build
#
-# An optional parameter tells build scripts how to parallelize the build
-if [ "$2" = "serial" ]; then
- parallel=1
-else
- parallel=${SVNBB_PARALLEL}
-fi
-
echo "============ make"
cd ${absbld}
-make -j${parallel} 2>&1 \
- | grep -v '^ld: [w]arning:.*Falling back to library file for linking. *$'
+make -j${parallel}
Modified: subversion/branches/multi-wc-format/tools/buildbot/slaves/svn-x64-macosx/svncheck-bindings.sh
URL: http://svn.apache.org/viewvc/subversion/branches/multi-wc-format/tools/buildbot/slaves/svn-x64-macosx/svncheck-bindings.sh?rev=1897034&r1=1897033&r2=1897034&view=diff
==============================================================================
--- subversion/branches/multi-wc-format/tools/buildbot/slaves/svn-x64-macosx/svncheck-bindings.sh (original)
+++ subversion/branches/multi-wc-format/tools/buildbot/slaves/svn-x64-macosx/svncheck-bindings.sh Fri Jan 14 14:01:45 2022
@@ -37,6 +37,7 @@ scripts=$(cd $(dirname "$0") && pwd)
. ${scripts}/setenv.sh
# Parse arguments to find out which tests we should run
+use_python3=false
check_swig_py=false
check_swig_pl=false
check_swig_rb=false
@@ -44,15 +45,21 @@ check_javahl=false
while [ ! -z "$1" ]; do
case "$1" in
+ python3) use_python3=true;;
swig-py) check_swig_py=true;;
swig-pl) check_swig_pl=true;;
swig-rb) check_swig_rb=true;;
javahl) check_javahl=true;;
- *) exit 1;;
+ *) exit 1;;
esac
shift
done
+${use_python3} \
+ && test -n "${SVNBB_PYTHON3ENV}" \
+ && . ${SVNBB_PYTHON3ENV}/bin/activate \
+ && export PYTHON="$(which python)"
+
${check_swig_py} && run_tests swig-py
${check_swig_pl} && run_tests swig-pl
${check_swig_rb} && run_tests swig-rb
Modified: subversion/branches/multi-wc-format/tools/buildbot/slaves/svn-x64-macosx/svncheck.sh
URL: http://svn.apache.org/viewvc/subversion/branches/multi-wc-format/tools/buildbot/slaves/svn-x64-macosx/svncheck.sh?rev=1897034&r1=1897033&r2=1897034&view=diff
==============================================================================
--- subversion/branches/multi-wc-format/tools/buildbot/slaves/svn-x64-macosx/svncheck.sh (original)
+++ subversion/branches/multi-wc-format/tools/buildbot/slaves/svn-x64-macosx/svncheck.sh Fri Jan 14 14:01:45 2022
@@ -24,20 +24,22 @@ run_tests() {
ok=true
case "${ra}" in
- local) check=check; skipC=;;
- svn) check=svnserveautocheck; skipC="SKIP_C_TESTS=1";;
- dav) check=davautocheck; skipC="SKIP_C_TESTS=1";
+ local) check=check; more=;;
+ svn) check=svnserveautocheck; more="SKIP_C_TESTS=1";;
+ dav) check=davautocheck; more="SKIP_C_TESTS=1";
if [ "${fs}" == "bdb" ]; then
- mpm="APACHE_MPM=prefork"
+ more="${more} APACHE_MPM=prefork"
else
- mpm="APACHE_MPM=event"
+ more="${more} APACHE_MPM=event"
fi;;
*) exit 1;;
esac
+ ${allow_remote} && more="${more} ALLOW_REMOTE_HTTP_CONNECTION=1"
+
echo "============ make check ${ra}+${fs}"
cd ${absbld}
- make ${check} FS_TYPE=${fs} PARALLEL=${SVNBB_PARALLEL} CLEANUP=1 ${skipC} ${mpm} || ok=false
+ make ${check} FS_TYPE=${fs} PARALLEL=${SVNBB_PARALLEL} CLEANUP=1 ${more} || ok=false
# Move any log files to the buildbot work directory
test -f tests.log && mv tests.log "${abssrc}/.test-logs/tests-${ra}-${fs}.log"
@@ -77,6 +79,7 @@ check_fsfs_v6=false
check_fsfs_v4=false
check_fsx=false
check_bdb=false
+allow_remote=false
while [ ! -z "$1" ]; do
case "$1" in
@@ -89,12 +92,16 @@ while [ ! -z "$1" ]; do
fsfs-v4) check_fsfs_v4=true;;
fsx) check_fsx=true;;
bdb) check_bdb=true;;
+ remote) allow_remote=true;;
*) exit 1;;
esac
shift
done
-${use_python3} && test -n "${SVNBB_PYTHON3ENV}" && . ${SVNBB_PYTHON3ENV}/bin/activate
+${use_python3} \
+ && test -n "${SVNBB_PYTHON3ENV}" \
+ && . ${SVNBB_PYTHON3ENV}/bin/activate \
+ && export PYTHON="$(which python)"
${check_local} && check_tests local
${check_svn} && check_tests svn
Modified: subversion/branches/multi-wc-format/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd
URL: http://svn.apache.org/viewvc/subversion/branches/multi-wc-format/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd?rev=1897034&r1=1897033&r2=1897034&view=diff
==============================================================================
--- subversion/branches/multi-wc-format/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd (original)
+++ subversion/branches/multi-wc-format/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd Fri Jan 14 14:01:45 2022
@@ -39,7 +39,7 @@ SET result=0
if "%SVN_BRANCH%" GTR "1.9." (
- python win-tests.py -r -f fsfs --swig=python "%TESTDIR%\tests"
+ python2 win-tests.py -r -f fsfs --swig=python "%TESTDIR%\tests"
IF ERRORLEVEL 1 (
echo [Python tests reported error !ERRORLEVEL!] 1>&2
@@ -60,7 +60,7 @@ if "%SVN_BRANCH%" GTR "1.9." (
SET PYTHONPATH=%TESTDIR%\swig\py-release
- python subversion\bindings\swig\python\tests\run_all.py
+ python2 subversion\bindings\swig\python\tests\run_all.py
IF ERRORLEVEL 1 (
echo [Python tests reported error !ERRORLEVEL!] 1>&2
REM SET result=1
Modified: subversion/branches/multi-wc-format/tools/buildbot/slaves/win32-SharpSvn/svntest-test.cmd
URL: http://svn.apache.org/viewvc/subversion/branches/multi-wc-format/tools/buildbot/slaves/win32-SharpSvn/svntest-test.cmd?rev=1897034&r1=1897033&r2=1897034&view=diff
==============================================================================
--- subversion/branches/multi-wc-format/tools/buildbot/slaves/win32-SharpSvn/svntest-test.cmd (original)
+++ subversion/branches/multi-wc-format/tools/buildbot/slaves/win32-SharpSvn/svntest-test.cmd Fri Jan 14 14:01:45 2022
@@ -75,19 +75,19 @@ IF "%SVN_BRANCH%" LSS "1.9." (
IF "%LOCAL%+%FSFS%" == "1+1" (
echo win-tests.py -c %PARALLEL% %MODE% -f fsfs %ARGS% "%TESTDIR%\tests"
- win-tests.py -c %PARALLEL% %MODE% -f fsfs %ARGS% "%TESTDIR%\tests"
+ python win-tests.py -c %PARALLEL% %MODE% -f fsfs %ARGS% "%TESTDIR%\tests"
IF ERRORLEVEL 1 SET RC=1
)
IF "%SVN%+%FSFS%" == "1+1" (
echo win-tests.py -c %PARALLEL% %MODE% -f fsfs -u svn://127.0.0.1 %ARGS% "%TESTDIR%\tests"
- win-tests.py -c %PARALLEL% %MODE% -f fsfs -u svn://127.0.0.1 %ARGS% "%TESTDIR%\tests"
+ python win-tests.py -c %PARALLEL% %MODE% -f fsfs -u svn://127.0.0.1 %ARGS% "%TESTDIR%\tests"
IF ERRORLEVEL 1 SET RC=1
)
IF "%DAV%+%FSFS%" == "1+1" (
echo win-tests.py -c %PARALLEL% %MODE% -f fsfs --httpd-no-log --httpd-dir "%CD%\..\deps\release\httpd" --httpd-port %TESTPORT% -u http://127.0.0.1:%TESTPORT% %ARGS% "%TESTDIR%\tests"
- win-tests.py -c %PARALLEL% %MODE% -f fsfs --httpd-no-log --httpd-dir "%CD%\..\deps\release\httpd" --httpd-port %TESTPORT% -u http://127.0.0.1:%TESTPORT% %ARGS% "%TESTDIR%\tests"
+ python win-tests.py -c %PARALLEL% %MODE% -f fsfs --httpd-no-log --httpd-dir "%CD%\..\deps\release\httpd" --httpd-port %TESTPORT% -u http://127.0.0.1:%TESTPORT% %ARGS% "%TESTDIR%\tests"
IF ERRORLEVEL 1 SET RC=1
)
Propchange: subversion/branches/multi-wc-format/tools/buildbot/slaves/win32-vcpkg/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jan 14 14:01:45 2022
@@ -0,0 +1,3 @@
+build
+deps
+svn-config.cmd
Propchange: subversion/branches/multi-wc-format/tools/buildbot/slaves/win32-vcpkg/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jan 14 14:01:45 2022
@@ -0,0 +1,217 @@
+/subversion/branches/1.10-cache-improvements/tools/buildbot/slaves/win32-SharpSvn:1669168-1694487
+/subversion/branches/1.10-cache-improvements/tools/buildbot/slaves/win32-vcpkg:1669168-1694487
+/subversion/branches/1.11.x/tools/buildbot/slaves/win32-SharpSvn:1841316,1841548
+/subversion/branches/1.11.x/tools/buildbot/slaves/win32-vcpkg:1841316,1841548
+/subversion/branches/1.5.x-r30215/tools/buildbot/slaves/win32-SharpSvn:870312
+/subversion/branches/1.5.x-r30215/tools/buildbot/slaves/win32-vcpkg:870312
+/subversion/branches/1.7.x-fs-verify/tools/buildbot/slaves/win32-SharpSvn:1146708,1161180
+/subversion/branches/1.7.x-fs-verify/tools/buildbot/slaves/win32-vcpkg:1146708,1161180
+/subversion/branches/1.9-cache-improvements/tools/buildbot/slaves/win32-SharpSvn:1678948-1679863
+/subversion/branches/1.9-cache-improvements/tools/buildbot/slaves/win32-vcpkg:1678948-1679863
+/subversion/branches/1.9.x/tools/buildbot/slaves/win32-SharpSvn:1735680
+/subversion/branches/1.9.x/tools/buildbot/slaves/win32-vcpkg:1735680
+/subversion/branches/10Gb/tools/buildbot/slaves/win32-SharpSvn:1388102,1388163-1388190,1388195,1388202,1388205,1388211,1388276,1388362,1388375,1388394,1388636,1388639-1388640,1388643-1388644,1388654,1388720,1388789,1388795,1388801,1388805,1388807,1388810,1388816,1389044,1389276,1389289,1389662,1389867,1390017,1390209,1390216,1390407,1390409,1390414,1390419,1390955
+/subversion/branches/10Gb/tools/buildbot/slaves/win32-vcpkg:1388102,1388163-1388190,1388195,1388202,1388205,1388211,1388276,1388362,1388375,1388394,1388636,1388639-1388640,1388643-1388644,1388654,1388720,1388789,1388795,1388801,1388805,1388807,1388810,1388816,1389044,1389276,1389289,1389662,1389867,1390017,1390209,1390216,1390407,1390409,1390414,1390419,1390955
+/subversion/branches/atomic-revprop/tools/buildbot/slaves/win32-SharpSvn:965046-1000689
+/subversion/branches/atomic-revprop/tools/buildbot/slaves/win32-vcpkg:965046-1000689
+/subversion/branches/authzperf/tools/buildbot/slaves/win32-SharpSvn:1613053-1776831
+/subversion/branches/authzperf/tools/buildbot/slaves/win32-vcpkg:1613053-1776831
+/subversion/branches/auto-props-sdc/tools/buildbot/slaves/win32-SharpSvn:1384106-1401643
+/subversion/branches/auto-props-sdc/tools/buildbot/slaves/win32-vcpkg:1384106-1401643
+/subversion/branches/bdb-reverse-deltas/tools/buildbot/slaves/win32-SharpSvn:872050-872529
+/subversion/branches/bdb-reverse-deltas/tools/buildbot/slaves/win32-vcpkg:872050-872529
+/subversion/branches/cache-server/tools/buildbot/slaves/win32-SharpSvn:1458643-1476567
+/subversion/branches/cache-server/tools/buildbot/slaves/win32-vcpkg:1458643-1476567
+/subversion/branches/decouple-shelving-cli/tools/buildbot/slaves/win32-SharpSvn:1874630-1875035
+/subversion/branches/decouple-shelving-cli/tools/buildbot/slaves/win32-vcpkg:1874630-1875035
+/subversion/branches/diff-callbacks3/tools/buildbot/slaves/win32-SharpSvn:870059-870761
+/subversion/branches/diff-callbacks3/tools/buildbot/slaves/win32-vcpkg:870059-870761
+/subversion/branches/diff-optimizations/tools/buildbot/slaves/win32-SharpSvn:1031270-1037352
+/subversion/branches/diff-optimizations/tools/buildbot/slaves/win32-vcpkg:1031270-1037352
+/subversion/branches/diff-optimizations-bytes/tools/buildbot/slaves/win32-SharpSvn:1037353-1067789
+/subversion/branches/diff-optimizations-bytes/tools/buildbot/slaves/win32-vcpkg:1037353-1067789
+/subversion/branches/dont-save-plaintext-passwords-by-default/tools/buildbot/slaves/win32-SharpSvn:870728-871118
+/subversion/branches/dont-save-plaintext-passwords-by-default/tools/buildbot/slaves/win32-vcpkg:870728-871118
+/subversion/branches/double-delete/tools/buildbot/slaves/win32-SharpSvn:870511-872970
+/subversion/branches/double-delete/tools/buildbot/slaves/win32-vcpkg:870511-872970
+/subversion/branches/dump-load-cross-check/tools/buildbot/slaves/win32-SharpSvn:1654853-1657295
+/subversion/branches/dump-load-cross-check/tools/buildbot/slaves/win32-vcpkg:1654853-1657295
+/subversion/branches/ev2-export/tools/buildbot/slaves/win32-SharpSvn:1325914,1332738,1413107
+/subversion/branches/ev2-export/tools/buildbot/slaves/win32-vcpkg:1325914,1332738,1413107
+/subversion/branches/explore-wc/tools/buildbot/slaves/win32-SharpSvn:875486,875493,875497,875507,875511,875514,875559,875580-875581,875584,875587,875611,875627,875647,875667-875668,875711-875712,875733-875734,875736,875744-875748,875751,875758,875782,875795-875796,875830,875836,875838,875842,875852,875855,875864,875870,875873,875880,875885-875888,875890,875897-875898,875905,875907-875909,875935,875943-875944,875946,875979,875982-875983,875985-875986,875990,875997
+/subversion/branches/explore-wc/tools/buildbot/slaves/win32-vcpkg:875486,875493,875497,875507,875511,875514,875559,875580-875581,875584,875587,875611,875627,875647,875667-875668,875711-875712,875733-875734,875736,875744-875748,875751,875758,875782,875795-875796,875830,875836,875838,875842,875852,875855,875864,875870,875873,875880,875885-875888,875890,875897-875898,875905,875907-875909,875935,875943-875944,875946,875979,875982-875983,875985-875986,875990,875997
+/subversion/branches/file-externals/tools/buildbot/slaves/win32-SharpSvn:871779-873302
+/subversion/branches/file-externals/tools/buildbot/slaves/win32-vcpkg:871779-873302
+/subversion/branches/fs-rep-sharing/tools/buildbot/slaves/win32-SharpSvn:869036-873803
+/subversion/branches/fs-rep-sharing/tools/buildbot/slaves/win32-vcpkg:869036-873803
+/subversion/branches/fsfs-format7/tools/buildbot/slaves/win32-SharpSvn:1426304,1430673,1433848,1438408,1438982,1441129,1442051,1442068,1442504,1442910,1443171,1443803,1444690,1444693,1444695,1445040,1445080,1446103,1451129,1453590,1454307,1460579,1461851,1461865,1462837,1462904,1463120,1467362,1467382,1469487,1471208,1477166,1478055,1481447,1489817,1489949,1490673-1490674,1491784,1493042,1498029,1498103,1498155,1500054,1507729-1507731,1507735-1507736
+/subversion/branches/fsfs-format7/tools/buildbot/slaves/win32-vcpkg:1426304,1430673,1433848,1438408,1438982,1441129,1442051,1442068,1442504,1442910,1443171,1443803,1444690,1444693,1444695,1445040,1445080,1446103,1451129,1453590,1454307,1460579,1461851,1461865,1462837,1462904,1463120,1467362,1467382,1469487,1471208,1477166,1478055,1481447,1489817,1489949,1490673-1490674,1491784,1493042,1498029,1498103,1498155,1500054,1507729-1507731,1507735-1507736
+/subversion/branches/fsfs-improvements/tools/buildbot/slaves/win32-SharpSvn:1499981-1547039
+/subversion/branches/fsfs-improvements/tools/buildbot/slaves/win32-vcpkg:1499981-1547039
+/subversion/branches/fsfs-lock-many/tools/buildbot/slaves/win32-SharpSvn:1571740-1577217
+/subversion/branches/fsfs-lock-many/tools/buildbot/slaves/win32-vcpkg:1571740-1577217
+/subversion/branches/fsfs-pack/tools/buildbot/slaves/win32-SharpSvn:873717-874575
+/subversion/branches/fsfs-pack/tools/buildbot/slaves/win32-vcpkg:873717-874575
+/subversion/branches/fsx/tools/buildbot/slaves/win32-SharpSvn:1507845-1509914
+/subversion/branches/fsx/tools/buildbot/slaves/win32-vcpkg:1507845-1509914
+/subversion/branches/fsx-1.10/tools/buildbot/slaves/win32-SharpSvn:1658219-1694500
+/subversion/branches/fsx-1.10/tools/buildbot/slaves/win32-vcpkg:1658219-1694500
+/subversion/branches/fsx-id/tools/buildbot/slaves/win32-SharpSvn:1645603-1649011
+/subversion/branches/fsx-id/tools/buildbot/slaves/win32-vcpkg:1645603-1649011
+/subversion/branches/gnome-keyring/tools/buildbot/slaves/win32-SharpSvn:870558-871410
+/subversion/branches/gnome-keyring/tools/buildbot/slaves/win32-vcpkg:870558-871410
+/subversion/branches/gpg-agent-password-store/tools/buildbot/slaves/win32-SharpSvn:1005036-1150766
+/subversion/branches/gpg-agent-password-store/tools/buildbot/slaves/win32-vcpkg:1005036-1150766
+/subversion/branches/gtest_addition/tools/buildbot/slaves/win32-SharpSvn:1452117-1502138
+/subversion/branches/gtest_addition/tools/buildbot/slaves/win32-vcpkg:1452117-1502138
+/subversion/branches/http-protocol-v2/tools/buildbot/slaves/win32-SharpSvn:874395-876041
+/subversion/branches/http-protocol-v2/tools/buildbot/slaves/win32-vcpkg:874395-876041
+/subversion/branches/in-memory-cache/tools/buildbot/slaves/win32-SharpSvn:869829-871452
+/subversion/branches/in-memory-cache/tools/buildbot/slaves/win32-vcpkg:869829-871452
+/subversion/branches/in-repo-authz/tools/buildbot/slaves/win32-SharpSvn:1414342-1424779
+/subversion/branches/in-repo-authz/tools/buildbot/slaves/win32-vcpkg:1414342-1424779
+/subversion/branches/inheritable-props/tools/buildbot/slaves/win32-SharpSvn:1297080-1395089
+/subversion/branches/inheritable-props/tools/buildbot/slaves/win32-vcpkg:1297080-1395089
+/subversion/branches/integrate-cache-item-serialization/tools/buildbot/slaves/win32-SharpSvn:1068724-1068739
+/subversion/branches/integrate-cache-item-serialization/tools/buildbot/slaves/win32-vcpkg:1068724-1068739
+/subversion/branches/integrate-cache-membuffer/tools/buildbot/slaves/win32-SharpSvn:998649-998852
+/subversion/branches/integrate-cache-membuffer/tools/buildbot/slaves/win32-vcpkg:998649-998852
+/subversion/branches/integrate-compression-level/tools/buildbot/slaves/win32-SharpSvn:1068651-1072287
+/subversion/branches/integrate-compression-level/tools/buildbot/slaves/win32-vcpkg:1068651-1072287
+/subversion/branches/integrate-io-improvements/tools/buildbot/slaves/win32-SharpSvn:1068684-1072297
+/subversion/branches/integrate-io-improvements/tools/buildbot/slaves/win32-vcpkg:1068684-1072297
+/subversion/branches/integrate-is-cachable/tools/buildbot/slaves/win32-SharpSvn:1072568-1074082
+/subversion/branches/integrate-is-cachable/tools/buildbot/slaves/win32-vcpkg:1072568-1074082
+/subversion/branches/integrate-partial-getter/tools/buildbot/slaves/win32-SharpSvn:1072558-1076552
+/subversion/branches/integrate-partial-getter/tools/buildbot/slaves/win32-vcpkg:1072558-1076552
+/subversion/branches/integrate-readline-speedup/tools/buildbot/slaves/win32-SharpSvn:1072553-1072555
+/subversion/branches/integrate-readline-speedup/tools/buildbot/slaves/win32-vcpkg:1072553-1072555
+/subversion/branches/integrate-stream-api-extensions/tools/buildbot/slaves/win32-SharpSvn:1068695-1072516
+/subversion/branches/integrate-stream-api-extensions/tools/buildbot/slaves/win32-vcpkg:1068695-1072516
+/subversion/branches/integrate-string-improvements/tools/buildbot/slaves/win32-SharpSvn:1068251-1190617
+/subversion/branches/integrate-string-improvements/tools/buildbot/slaves/win32-vcpkg:1068251-1190617
+/subversion/branches/integrate-txdelta-caching/tools/buildbot/slaves/win32-SharpSvn:1072541-1078213
+/subversion/branches/integrate-txdelta-caching/tools/buildbot/slaves/win32-vcpkg:1072541-1078213
+/subversion/branches/issue-2779-dev/tools/buildbot/slaves/win32-SharpSvn:965496-984198
+/subversion/branches/issue-2779-dev/tools/buildbot/slaves/win32-vcpkg:965496-984198
+/subversion/branches/issue-2843-dev/tools/buildbot/slaves/win32-SharpSvn:871432-874179
+/subversion/branches/issue-2843-dev/tools/buildbot/slaves/win32-vcpkg:871432-874179
+/subversion/branches/issue-3000/tools/buildbot/slaves/win32-SharpSvn:871713,871716-871719,871721-871726,871728,871734
+/subversion/branches/issue-3000/tools/buildbot/slaves/win32-vcpkg:871713,871716-871719,871721-871726,871728,871734
+/subversion/branches/issue-3067-deleted-subtrees/tools/buildbot/slaves/win32-SharpSvn:873375-874084
+/subversion/branches/issue-3067-deleted-subtrees/tools/buildbot/slaves/win32-vcpkg:873375-874084
+/subversion/branches/issue-3148-dev/tools/buildbot/slaves/win32-SharpSvn:875193-875204
+/subversion/branches/issue-3148-dev/tools/buildbot/slaves/win32-vcpkg:875193-875204
+/subversion/branches/issue-3220-dev/tools/buildbot/slaves/win32-SharpSvn:872210-872226
+/subversion/branches/issue-3220-dev/tools/buildbot/slaves/win32-vcpkg:872210-872226
+/subversion/branches/issue-3242-dev/tools/buildbot/slaves/win32-SharpSvn:879653-896436
+/subversion/branches/issue-3242-dev/tools/buildbot/slaves/win32-vcpkg:879653-896436
+/subversion/branches/issue-3334-dirs/tools/buildbot/slaves/win32-SharpSvn:875156-875867
+/subversion/branches/issue-3334-dirs/tools/buildbot/slaves/win32-vcpkg:875156-875867
+/subversion/branches/issue-3975/tools/buildbot/slaves/win32-SharpSvn:1152931-1160746
+/subversion/branches/issue-3975/tools/buildbot/slaves/win32-vcpkg:1152931-1160746
+/subversion/branches/issue-4116-dev/tools/buildbot/slaves/win32-SharpSvn:1424719-1425040
+/subversion/branches/issue-4116-dev/tools/buildbot/slaves/win32-vcpkg:1424719-1425040
+/subversion/branches/issue-4194-dev/tools/buildbot/slaves/win32-SharpSvn:1410507-1414880
+/subversion/branches/issue-4194-dev/tools/buildbot/slaves/win32-vcpkg:1410507-1414880
+/subversion/branches/issue-4869/tools/buildbot/slaves/win32-SharpSvn:1885862-1885981
+/subversion/branches/issue-4869/tools/buildbot/slaves/win32-vcpkg:1885862-1885981
+/subversion/branches/java10-compat/tools/buildbot/slaves/win32-SharpSvn:1840620-1841179
+/subversion/branches/java10-compat/tools/buildbot/slaves/win32-vcpkg:1840620-1841179
+/subversion/branches/javahl-1.14-fixes/tools/buildbot/slaves/win32-SharpSvn:1882126-1886028
+/subversion/branches/javahl-1.14-fixes/tools/buildbot/slaves/win32-vcpkg:1882126-1886028
+/subversion/branches/javahl-ra/tools/buildbot/slaves/win32-SharpSvn:991978-1494640
+/subversion/branches/javahl-ra/tools/buildbot/slaves/win32-vcpkg:991978-1494640
+/subversion/branches/kwallet/tools/buildbot/slaves/win32-SharpSvn:870785-871314
+/subversion/branches/kwallet/tools/buildbot/slaves/win32-vcpkg:870785-871314
+/subversion/branches/log-addressing/tools/buildbot/slaves/win32-SharpSvn:1509279-1546844
+/subversion/branches/log-addressing/tools/buildbot/slaves/win32-vcpkg:1509279-1546844
+/subversion/branches/log-g-performance/tools/buildbot/slaves/win32-SharpSvn:870941-871032
+/subversion/branches/log-g-performance/tools/buildbot/slaves/win32-vcpkg:870941-871032
+/subversion/branches/merge-skips-obstructions/tools/buildbot/slaves/win32-SharpSvn:874525-874615
+/subversion/branches/merge-skips-obstructions/tools/buildbot/slaves/win32-vcpkg:874525-874615
+/subversion/branches/move-tracking-2/tools/buildbot/slaves/win32-SharpSvn:1606692-1714632
+/subversion/branches/move-tracking-2/tools/buildbot/slaves/win32-vcpkg:1606692-1714632
+/subversion/branches/multi-layer-moves/tools/buildbot/slaves/win32-SharpSvn:1239019-1300930
+/subversion/branches/multi-layer-moves/tools/buildbot/slaves/win32-vcpkg:1239019-1300930
+/subversion/branches/nfc-nfd-aware-client/tools/buildbot/slaves/win32-SharpSvn:870276,870376
+/subversion/branches/nfc-nfd-aware-client/tools/buildbot/slaves/win32-vcpkg:870276,870376
+/subversion/branches/node_pool/tools/buildbot/slaves/win32-SharpSvn:1304828-1305388
+/subversion/branches/node_pool/tools/buildbot/slaves/win32-vcpkg:1304828-1305388
+/subversion/branches/patch-exec/tools/buildbot/slaves/win32-SharpSvn:1692717-1705390
+/subversion/branches/patch-exec/tools/buildbot/slaves/win32-vcpkg:1692717-1705390
+/subversion/branches/performance/tools/buildbot/slaves/win32-SharpSvn:979193,980118,981087,981090,981189,981194,981287,981684,981827,982043,982355,983398,983406,983430,983474,983488,983490,983760,983764,983766,983770,984927,984973,984984,985014,985037,985046,985472,985477,985482,985487-985488,985493,985497,985500,985514,985601,985603,985606,985669,985673,985695,985697,986453,986465,986485,986491-986492,986517,986521,986605,986608,986817,986832,987865,987868-987869,987872,987886-987888,987893,988319,988898,990330,990533,990535-990537,990541,990568,990572,990574-990575,990600,990759,992899,992904,992911,993127,993141,994956,995478,995507,995603,998012,998858,999098,1001413,1001417,1004291,1022668,1022670,1022676,1022715,1022719,1025660,1025672,1027193,1027203,1027206,1027214,1027227,1028077,1028092,1028094,1028104,1028107,1028111,1028354,1029038,1029042-1029043,1029054-1029055,1029062-1029063,1029078,1029080,1029090,1029092-1029093,1029111,1029151,1029158,1029229-1029230,1029232,10293
35-1029336,1029339-1029340,1029342,1029344,1030763,1030827,1031203,1031235,1032285,1032333,1033040,1033057,1033294,1035869,1035882,1039511,1043705,1053735,1056015,1066452,1067683,1067697-1078365
+/subversion/branches/performance/tools/buildbot/slaves/win32-vcpkg:979193,980118,981087,981090,981189,981194,981287,981684,981827,982043,982355,983398,983406,983430,983474,983488,983490,983760,983764,983766,983770,984927,984973,984984,985014,985037,985046,985472,985477,985482,985487-985488,985493,985497,985500,985514,985601,985603,985606,985669,985673,985695,985697,986453,986465,986485,986491-986492,986517,986521,986605,986608,986817,986832,987865,987868-987869,987872,987886-987888,987893,988319,988898,990330,990533,990535-990537,990541,990568,990572,990574-990575,990600,990759,992899,992904,992911,993127,993141,994956,995478,995507,995603,998012,998858,999098,1001413,1001417,1004291,1022668,1022670,1022676,1022715,1022719,1025660,1025672,1027193,1027203,1027206,1027214,1027227,1028077,1028092,1028094,1028104,1028107,1028111,1028354,1029038,1029042-1029043,1029054-1029055,1029062-1029063,1029078,1029080,1029090,1029092-1029093,1029111,1029151,1029158,1029229-1029230,1029232,1029335-
1029336,1029339-1029340,1029342,1029344,1030763,1030827,1031203,1031235,1032285,1032333,1033040,1033057,1033294,1035869,1035882,1039511,1043705,1053735,1056015,1066452,1067683,1067697-1078365
+/subversion/branches/pin-externals/tools/buildbot/slaves/win32-SharpSvn:1643757-1659392
+/subversion/branches/pin-externals/tools/buildbot/slaves/win32-vcpkg:1643757-1659392
+/subversion/branches/py-tests-as-modules/tools/buildbot/slaves/win32-SharpSvn:956579-1033052
+/subversion/branches/py-tests-as-modules/tools/buildbot/slaves/win32-vcpkg:956579-1033052
+/subversion/branches/ra-svn-tuning/tools/buildbot/slaves/win32-SharpSvn:1658201-1694489
+/subversion/branches/ra-svn-tuning/tools/buildbot/slaves/win32-vcpkg:1658201-1694489
+/subversion/branches/ra_serf-digest-authn/tools/buildbot/slaves/win32-SharpSvn:875693-876404
+/subversion/branches/ra_serf-digest-authn/tools/buildbot/slaves/win32-vcpkg:875693-876404
+/subversion/branches/reintegrate-improvements/tools/buildbot/slaves/win32-SharpSvn:873853-874164
+/subversion/branches/reintegrate-improvements/tools/buildbot/slaves/win32-vcpkg:873853-874164
+/subversion/branches/remote-only-status/tools/buildbot/slaves/win32-SharpSvn:1581845-1586090
+/subversion/branches/remote-only-status/tools/buildbot/slaves/win32-vcpkg:1581845-1586090
+/subversion/branches/resolve-incoming-add/tools/buildbot/slaves/win32-SharpSvn:1762797-1764284
+/subversion/branches/resolve-incoming-add/tools/buildbot/slaves/win32-vcpkg:1762797-1764284
+/subversion/branches/revprop-cache/tools/buildbot/slaves/win32-SharpSvn:1298521-1326293
+/subversion/branches/revprop-cache/tools/buildbot/slaves/win32-vcpkg:1298521-1326293
+/subversion/branches/revprop-caching-ng/tools/buildbot/slaves/win32-SharpSvn:1620597,1620599
+/subversion/branches/revprop-caching-ng/tools/buildbot/slaves/win32-vcpkg:1620597,1620599
+/subversion/branches/revprop-packing/tools/buildbot/slaves/win32-SharpSvn:1143907,1143971,1143997,1144017,1144499,1144568,1146145
+/subversion/branches/revprop-packing/tools/buildbot/slaves/win32-vcpkg:1143907,1143971,1143997,1144017,1144499,1144568,1146145
+/subversion/branches/shelve/tools/buildbot/slaves/win32-SharpSvn:1802592-1815226
+/subversion/branches/shelve/tools/buildbot/slaves/win32-vcpkg:1802592-1815226
+/subversion/branches/shelve-checkpoint/tools/buildbot/slaves/win32-SharpSvn:1801593-1801923,1801970,1817320,1828508,1828521
+/subversion/branches/shelve-checkpoint/tools/buildbot/slaves/win32-vcpkg:1801593-1801923,1801970,1817320,1828508,1828521
+/subversion/branches/shelving-v3/tools/buildbot/slaves/win32-SharpSvn:1853394-1853901
+/subversion/branches/shelving-v3/tools/buildbot/slaves/win32-vcpkg:1853394-1853901
+/subversion/branches/subtree-mergeinfo/tools/buildbot/slaves/win32-SharpSvn:876734-878766
+/subversion/branches/subtree-mergeinfo/tools/buildbot/slaves/win32-vcpkg:876734-878766
+/subversion/branches/svn-auth-x509/tools/buildbot/slaves/win32-SharpSvn:1603509-1655900
+/subversion/branches/svn-auth-x509/tools/buildbot/slaves/win32-vcpkg:1603509-1655900
+/subversion/branches/svn-info-detail/tools/buildbot/slaves/win32-SharpSvn:1660035-1662618
+/subversion/branches/svn-info-detail/tools/buildbot/slaves/win32-vcpkg:1660035-1662618
+/subversion/branches/svn-mergeinfo-enhancements/tools/buildbot/slaves/win32-SharpSvn:870119-870195,870197-870288
+/subversion/branches/svn-mergeinfo-enhancements/tools/buildbot/slaves/win32-vcpkg:870119-870195,870197-870288
+/subversion/branches/svn-mergeinfo-normalizer/tools/buildbot/slaves/win32-SharpSvn:1642232-1695991
+/subversion/branches/svn-mergeinfo-normalizer/tools/buildbot/slaves/win32-vcpkg:1642232-1695991
+/subversion/branches/svn-patch-improvements/tools/buildbot/slaves/win32-SharpSvn:918519-934609
+/subversion/branches/svn-patch-improvements/tools/buildbot/slaves/win32-vcpkg:918519-934609
+/subversion/branches/svn_mutex/tools/buildbot/slaves/win32-SharpSvn:1141683-1182099
+/subversion/branches/svn_mutex/tools/buildbot/slaves/win32-vcpkg:1141683-1182099
+/subversion/branches/svnpatch-diff/tools/buildbot/slaves/win32-SharpSvn:865738-876477
+/subversion/branches/svnpatch-diff/tools/buildbot/slaves/win32-vcpkg:865738-876477
+/subversion/branches/svnraisetc/tools/buildbot/slaves/win32-SharpSvn:874709-875149
+/subversion/branches/svnraisetc/tools/buildbot/slaves/win32-vcpkg:874709-875149
+/subversion/branches/svnserve-logging/tools/buildbot/slaves/win32-SharpSvn:869828-870893
+/subversion/branches/svnserve-logging/tools/buildbot/slaves/win32-vcpkg:869828-870893
+/subversion/branches/swig-py3/tools/buildbot/slaves/win32-SharpSvn:1813660-1869353
+/subversion/branches/swig-py3/tools/buildbot/slaves/win32-vcpkg:1813660-1869353
+/subversion/branches/tc-issue-3334/tools/buildbot/slaves/win32-SharpSvn:874697-874773
+/subversion/branches/tc-issue-3334/tools/buildbot/slaves/win32-vcpkg:874697-874773
+/subversion/branches/tc-merge-notify/tools/buildbot/slaves/win32-SharpSvn:874017-874062
+/subversion/branches/tc-merge-notify/tools/buildbot/slaves/win32-vcpkg:874017-874062
+/subversion/branches/tc-resolve/tools/buildbot/slaves/win32-SharpSvn:874191-874239
+/subversion/branches/tc-resolve/tools/buildbot/slaves/win32-vcpkg:874191-874239
+/subversion/branches/tc_url_rev/tools/buildbot/slaves/win32-SharpSvn:874351-874483
+/subversion/branches/tc_url_rev/tools/buildbot/slaves/win32-vcpkg:874351-874483
+/subversion/branches/tree-conflicts/tools/buildbot/slaves/win32-SharpSvn:868291-873154
+/subversion/branches/tree-conflicts/tools/buildbot/slaves/win32-vcpkg:868291-873154
+/subversion/branches/tree-conflicts-notify/tools/buildbot/slaves/win32-SharpSvn:873926-874008
+/subversion/branches/tree-conflicts-notify/tools/buildbot/slaves/win32-vcpkg:873926-874008
+/subversion/branches/tristate-chunked-request/tools/buildbot/slaves/win32-SharpSvn:1502394-1502681
+/subversion/branches/tristate-chunked-request/tools/buildbot/slaves/win32-vcpkg:1502394-1502681
+/subversion/branches/tweak-build-take-two/tools/buildbot/slaves/win32-SharpSvn:1424288-1425049,1425051-1425613
+/subversion/branches/tweak-build-take-two/tools/buildbot/slaves/win32-vcpkg:1424288-1425049,1425051-1425613
+/subversion/branches/uris-as-urls/tools/buildbot/slaves/win32-SharpSvn:1060426-1064427
+/subversion/branches/uris-as-urls/tools/buildbot/slaves/win32-vcpkg:1060426-1064427
+/subversion/branches/verify-at-commit/tools/buildbot/slaves/win32-SharpSvn:1462039-1462408
+/subversion/branches/verify-at-commit/tools/buildbot/slaves/win32-vcpkg:1462039-1462408
+/subversion/branches/verify-keep-going/tools/buildbot/slaves/win32-SharpSvn:1439280-1546110
+/subversion/branches/verify-keep-going/tools/buildbot/slaves/win32-vcpkg:1439280-1546110
+/subversion/branches/wc-collate-path/tools/buildbot/slaves/win32-SharpSvn:1402685-1480384
+/subversion/branches/wc-collate-path/tools/buildbot/slaves/win32-vcpkg:1402685-1480384
+/subversion/trunk/tools/buildbot/slaves/win32-vcpkg:1807118-1845475,1890000-1897029
Modified: subversion/branches/multi-wc-format/tools/client-side/bash_completion
URL: http://svn.apache.org/viewvc/subversion/branches/multi-wc-format/tools/client-side/bash_completion?rev=1897034&r1=1897033&r2=1897034&view=diff
==============================================================================
--- subversion/branches/multi-wc-format/tools/client-side/bash_completion (original)
+++ subversion/branches/multi-wc-format/tools/client-side/bash_completion Fri Jan 14 14:01:45 2022
@@ -1127,7 +1127,7 @@ _svn()
COMPREPLY=( $( compgen -W "$cmdOpts" -- $cur ) )
return 0
}
-complete -F _svn -o default -X '@(*/.svn|*/.svn/|.svn|.svn/)' svn
+complete -F _svn -o bashdefault -o default -X '@(*/.svn|*/.svn/|.svn|.svn/)' svn
_svnadmin ()
{
@@ -1137,9 +1137,9 @@ _svnadmin ()
cur=${COMP_WORDS[COMP_CWORD]}
# Possible expansions, without pure-prefix abbreviations such as "h".
- cmds='crashtest create delrevprop deltify dump dump-revprops freeze \
+ cmds='build-repcache crashtest create delrevprop deltify dump dump-revprops freeze \
help hotcopy info list-dblogs list-unused-dblogs \
- load load-revprops lock lslocks lstxns pack recover rmlocks \
+ load load-revprops lock lslocks lstxns pack recover rev-size rmlocks \
rmtxns setlog setrevprop setuuid unlock upgrade verify --version'
if [[ $COMP_CWORD -eq 1 ]] ; then
@@ -1163,6 +1163,9 @@ _svnadmin ()
cmdOpts=
case ${COMP_WORDS[1]} in
+ build-repcache)
+ cmdOpts="-r --revision -q --quiet -M --memory-cache-size"
+ ;;
create)
cmdOpts="--bdb-txn-nosync --bdb-log-keep --config-dir \
--fs-type --compatible-version"
@@ -1211,6 +1214,9 @@ _svnadmin ()
recover)
cmdOpts="--wait"
;;
+ rev-size)
+ cmdOpts="-r --revision -M --memory-cache-size -q --quiet"
+ ;;
rmlocks)
cmdOpts="-q --quiet"
;;
@@ -1274,7 +1280,7 @@ _svnadmin ()
return 0
}
-complete -F _svnadmin -o default svnadmin
+complete -F _svnadmin -o bashdefault -o default svnadmin
_svndumpfilter ()
{
@@ -1348,7 +1354,7 @@ _svndumpfilter ()
return 0
}
-complete -F _svndumpfilter -o default svndumpfilter
+complete -F _svndumpfilter -o bashdefault -o default svndumpfilter
_svnlook ()
{
@@ -1479,7 +1485,7 @@ _svnlook ()
return 0
}
-complete -F _svnlook -o default svnlook
+complete -F _svnlook -o bashdefault -o default svnlook
_svnsync ()
{
@@ -1562,7 +1568,7 @@ _svnsync ()
return 0
}
-complete -F _svnsync -o default svnsync
+complete -F _svnsync -o bashdefault -o default svnsync
# reasonable completion for 'svnversion'
_svnversion ()
Modified: subversion/branches/multi-wc-format/tools/client-side/svn-mergeinfo-normalizer/log.c
URL: http://svn.apache.org/viewvc/subversion/branches/multi-wc-format/tools/client-side/svn-mergeinfo-normalizer/log.c?rev=1897034&r1=1897033&r2=1897034&view=diff
==============================================================================
--- subversion/branches/multi-wc-format/tools/client-side/svn-mergeinfo-normalizer/log.c (original)
+++ subversion/branches/multi-wc-format/tools/client-side/svn-mergeinfo-normalizer/log.c Fri Jan 14 14:01:45 2022
@@ -866,7 +866,7 @@ svn_min__get_copies(svn_min__log_t *log,
if (copies[idx]->copyfrom_revision <= start_rev)
APR_ARRAY_PUSH(result, const svn_min__copy_t *) = copies[idx];
}
-
+
/* Find all parent copies. */
while (!svn_fspath__is_root(to_find->copyfrom_path,
strlen(to_find->copyfrom_path)))
Modified: subversion/branches/multi-wc-format/tools/client-side/svn-mergeinfo-normalizer/logic.c
URL: http://svn.apache.org/viewvc/subversion/branches/multi-wc-format/tools/client-side/svn-mergeinfo-normalizer/logic.c?rev=1897034&r1=1897033&r2=1897034&view=diff
==============================================================================
--- subversion/branches/multi-wc-format/tools/client-side/svn-mergeinfo-normalizer/logic.c (original)
+++ subversion/branches/multi-wc-format/tools/client-side/svn-mergeinfo-normalizer/logic.c Fri Jan 14 14:01:45 2022
@@ -436,7 +436,7 @@ find_surviving_copy(svn_min__log_t *log,
survivor = apr_pstrdup(result_pool, copy_target);
}
}
-
+
svn_pool_destroy(iterpool);
return survivor;
@@ -488,7 +488,7 @@ find_surviving_copies(apr_array_header_t
copy_target);
}
}
-
+
svn_pool_destroy(iterpool);
}
@@ -1351,7 +1351,7 @@ progress_string(const progress_t *progre
/* Depending on the options in OPT_STATE, print the header to be shown
* before processing the m/i at REL_PATH relative to the parent mergeinfo
- * at PARENT_PATH. If there is no parent m/i, RELPATH is empty.
+ * at PARENT_PATH. If there is no parent m/i, RELPATH is empty.
* Use SCRATCH_POOL temporary allocations.*/
static svn_error_t *
show_elision_header(const char *parent_path,
@@ -1651,7 +1651,7 @@ eliminate_subpaths(apr_array_header_t *p
}
/* If enabled by OPT_STATE, show the list of missing paths encountered by
- * LOOKUP and use LOG to determine their fate. LOG may be NULL.
+ * LOOKUP and use LOG to determine their fate. LOG may be NULL.
* Use SCRATCH_POOL for temporary allocations. */
static svn_error_t *
show_obsoletes_summary(svn_min__branch_lookup_t *lookup,
@@ -1702,7 +1702,7 @@ show_obsoletes_summary(svn_min__branch_l
SVN_INVALID_REVNUM,
creation_rev, iterpool);
find_surviving_copies(surviving_copies, log, path,
- SVN_IS_VALID_REVNUM(deletion_rev)
+ SVN_IS_VALID_REVNUM(deletion_rev)
? deletion_rev - 1
: deletion_rev,
creation_rev,
Modified: subversion/branches/multi-wc-format/tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer.c
URL: http://svn.apache.org/viewvc/subversion/branches/multi-wc-format/tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer.c?rev=1897034&r1=1897033&r2=1897034&view=diff
==============================================================================
--- subversion/branches/multi-wc-format/tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer.c (original)
+++ subversion/branches/multi-wc-format/tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer.c Fri Jan 14 14:01:45 2022
@@ -566,7 +566,8 @@ sub_main(int *exit_code, int argc, const
break;
case opt_config_dir:
SVN_ERR(svn_utf_cstring_to_utf8(&utf8_opt_arg, opt_arg, pool));
- opt_state.config_dir = svn_dirent_internal_style(utf8_opt_arg, pool);
+ SVN_ERR(svn_dirent_internal_style_safe(&opt_state.config_dir, NULL,
+ utf8_opt_arg, pool, pool));
break;
case opt_config_options:
if (!opt_state.config_options)
Modified: subversion/branches/multi-wc-format/tools/client-side/svn-mergeinfo-normalizer/wc_mergeinfo.c
URL: http://svn.apache.org/viewvc/subversion/branches/multi-wc-format/tools/client-side/svn-mergeinfo-normalizer/wc_mergeinfo.c?rev=1897034&r1=1897033&r2=1897034&view=diff
==============================================================================
--- subversion/branches/multi-wc-format/tools/client-side/svn-mergeinfo-normalizer/wc_mergeinfo.c (original)
+++ subversion/branches/multi-wc-format/tools/client-side/svn-mergeinfo-normalizer/wc_mergeinfo.c Fri Jan 14 14:01:45 2022
@@ -130,7 +130,7 @@ get_urls(void *baton,
apr_pool_t *target_pool = apr_hash_pool_get(mi->mergeinfo);
const char *rel_path = svn_uri_skip_ancestor(info->repos_root_URL,
info->URL, pool);
-
+
mi->url = apr_pstrdup(target_pool, info->URL);
mi->fs_path = svn_fspath__canonicalize(rel_path, target_pool);
Propchange: subversion/branches/multi-wc-format/tools/client-side/svnconflict/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Jan 14 14:01:45 2022
@@ -1 +1,2 @@
svnconflict
+.libs
Modified: subversion/branches/multi-wc-format/tools/client-side/svnconflict/svnconflict.c
URL: http://svn.apache.org/viewvc/subversion/branches/multi-wc-format/tools/client-side/svnconflict/svnconflict.c?rev=1897034&r1=1897033&r2=1897034&view=diff
==============================================================================
--- subversion/branches/multi-wc-format/tools/client-side/svnconflict/svnconflict.c (original)
+++ subversion/branches/multi-wc-format/tools/client-side/svnconflict/svnconflict.c Fri Jan 14 14:01:45 2022
@@ -373,7 +373,7 @@ svnconflict_list(apr_getopt_t *os, void
for (i = 0; i < props_conflicted->nelts; i++)
{
- const char *propname = APR_ARRAY_IDX(props_conflicted, i, const char *);
+ const char *propname = APR_ARRAY_IDX(props_conflicted, i, const char *);
SVN_ERR(svn_cmdline_printf(pool, "prop-conflict: %s\n", propname));
}
@@ -717,7 +717,8 @@ sub_main(int *exit_code, int argc, const
break;
case opt_config_dir:
SVN_ERR(svn_utf_cstring_to_utf8(&utf8_opt_arg, opt_arg, pool));
- opt_state.config_dir = svn_dirent_internal_style(utf8_opt_arg, pool);
+ SVN_ERR(svn_dirent_internal_style_safe(&opt_state.config_dir, NULL,
+ utf8_opt_arg, pool, pool));
break;
case opt_config_options:
if (!opt_state.config_options)
Modified: subversion/branches/multi-wc-format/tools/dev/build-svn-deps-win.pl
URL: http://svn.apache.org/viewvc/subversion/branches/multi-wc-format/tools/dev/build-svn-deps-win.pl?rev=1897034&r1=1897033&r2=1897034&view=diff
==============================================================================
--- subversion/branches/multi-wc-format/tools/dev/build-svn-deps-win.pl (original)
+++ subversion/branches/multi-wc-format/tools/dev/build-svn-deps-win.pl Fri Jan 14 14:01:45 2022
@@ -61,7 +61,7 @@
###### V A R I A B L E S ######
###################################
package Vars;
-# variables in the Vars package can be overriden from the command
+# variables in the Vars package can be overridden from the command
# line with the FOO=BAR syntax. If you want any defaults to reference
# other variables the defaults need to be in set_defaults() below to
# allow the defaults to be set after processing user set variables.
@@ -92,7 +92,7 @@ our $SERF_VER = '1.3.6';
our $NEON_VER = '0.29.6';
# Sources for files to download
-our $AWK_URL = 'http://www.cs.princeton.edu/~bwk/btl.mirror/awk95.exe';
+our $AWK_URL = 'https://www.cs.princeton.edu/~bwk/btl.mirror/awk95.exe';
our $HTTPD_URL;
our $APR_URL;
our $APU_URL;
@@ -108,9 +108,9 @@ our $PROJREF_URL = 'https://downloads.re
# Location of the already downloaded file.
# by default these are undefined and set by the downloader.
-# However, they can be overriden from the commandline and then
+# However, they can be overridden from the commandline and then
# the downloader is skipped. Note that BDB has no downloader
-# so it must be overriden from the command line.
+# so it must be overridden from the command line.
our $AWK_FILE;
our $HTTPD_FILE;
our $APR_FILE;
@@ -168,17 +168,17 @@ sub set_svn_ver_defaults {
# Any variables with defaults that reference other values
# should be set here. This defers setting of the default until runtime in these cases.
sub set_defaults {
- set_default(\$HTTPD_URL, "http://archive.apache.org/dist/httpd/httpd-$HTTPD_VER.tar.bz2");
- set_default(\$APR_URL, "http://archive.apache.org/dist/apr/apr-$APR_VER.tar.bz2");
- set_default(\$APU_URL, "http://archive.apache.org/dist/apr/apr-util-$APU_VER.tar.bz2");
- set_default(\$API_URL, "http://archive.apache.org/dist/apr/apr-iconv-$API_VER.tar.bz2");
- set_default(\$ZLIB_URL, "http://sourceforge.net/projects/libpng/files/zlib/$ZLIB_VER/zlib" . remove_dots($ZLIB_VER) . '.zip');
- set_default(\$OPENSSL_URL, "http://www.openssl.org/source/openssl-$OPENSSL_VER.tar.gz");
+ set_default(\$HTTPD_URL, "https://archive.apache.org/dist/httpd/httpd-$HTTPD_VER.tar.bz2");
+ set_default(\$APR_URL, "https://archive.apache.org/dist/apr/apr-$APR_VER.tar.bz2");
+ set_default(\$APU_URL, "https://archive.apache.org/dist/apr/apr-util-$APU_VER.tar.bz2");
+ set_default(\$API_URL, "https://archive.apache.org/dist/apr/apr-iconv-$API_VER.tar.bz2");
+ set_default(\$ZLIB_URL, "https://sourceforge.net/projects/libpng/files/zlib/$ZLIB_VER/zlib" . remove_dots($ZLIB_VER) . '.zip');
+ set_default(\$OPENSSL_URL, "https://www.openssl.org/source/openssl-$OPENSSL_VER.tar.gz");
set_default(\$PCRE_URL, "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-$PCRE_VER.zip");
- set_default(\$BDB_URL, "http://download.oracle.com/berkeley-db/db-5.3.21.zip");
- set_default(\$SQLITE_URL, "http://www.sqlite.org/2013/sqlite-amalgamation-$SQLITE_VER.zip");
+ set_default(\$BDB_URL, "https://download.oracle.com/berkeley-db/db-5.3.21.zip");
+ set_default(\$SQLITE_URL, "https://www.sqlite.org/2013/sqlite-amalgamation-$SQLITE_VER.zip");
set_default(\$SERF_URL, "https://archive.apache.org/dist/serf/serf-$SERF_VER.zip");
- set_default(\$NEON_URL, "http://www.webdav.org/neon/neon-$NEON_VER.tar.gz");
+ set_default(\$NEON_URL, "https://www.webdav.org/neon/neon-$NEON_VER.tar.gz");
set_default(\$INSTDIR, $TOPDIR);
set_default(\$BLDDIR, "$TOPDIR\\build");
set_default(\$SRCDIR, "$TOPDIR\\sources");
@@ -861,7 +861,7 @@ sub main {
# Look for variable assignment
if (my ($lhs, $rhs) = $arg =~ /([^=]+)=(.*)/) {
# Bit of hackery to allow the global values in the
- # Vars package to be overriden from the command line.
+ # Vars package to be overridden from the command line.
# E.G. "CMAKE=C:\CMake\cmake.exe" would replace the
# default value with this value.
if (exists($Vars::{$lhs})) {
Modified: subversion/branches/multi-wc-format/tools/dev/contribulyze.py
URL: http://svn.apache.org/viewvc/subversion/branches/multi-wc-format/tools/dev/contribulyze.py?rev=1897034&r1=1897033&r2=1897034&view=diff
==============================================================================
--- subversion/branches/multi-wc-format/tools/dev/contribulyze.py (original)
+++ subversion/branches/multi-wc-format/tools/dev/contribulyze.py Fri Jan 14 14:01:45 2022
@@ -56,6 +56,7 @@
# a lot easier to whip up for straight 'svn log' output. I'd have no
# objection to it being rewritten to take XML input.
+import functools
import os
import sys
import re
@@ -256,6 +257,9 @@ class Contributor(object):
else:
return 0 - result
+ def sort_key(self):
+ return (self.is_full_committer, self.score(), self.big_name())
+
@staticmethod
def parse(name):
"""Parse NAME, which can be
@@ -398,7 +402,7 @@ class Contributor(object):
out.write('</table>\n\n')
out.write('</div>\n\n')
- sorted_logs = sorted(unique_logs.keys())
+ sorted_logs = sorted(unique_logs.keys(), key=LogMessage.sort_key)
for log in sorted_logs:
out.write('<hr />\n')
out.write('<div class="h3" id="%s" title="%s">\n' % (log.revision,
@@ -490,6 +494,9 @@ class LogMessage(object):
if a < b: return 1
else: return 0
+ def sort_key(self):
+ return int(self.revision[1:])
+
def __str__(self):
s = '=' * 15
header = ' LOG: %s | %s ' % (self.revision, self.committer)
@@ -661,7 +668,9 @@ def drop(revision_url_pattern):
# sort by number of contributions, so the most active people appear at
# the top -- that way we know whom to look at first for commit access
# proposals.
- sorted_contributors = sorted(Contributor.all_contributors.values())
+ sorted_contributors = sorted(Contributor.all_contributors.values(),
+ key=Contributor.sort_key,
+ reverse=True)
for c in sorted_contributors:
if c not in seen_contributors:
if c.score() > 0:
@@ -713,6 +722,9 @@ def process_committers(committers):
c.is_committer = True
c.is_full_committer = in_full_committers
line = committers.readline()
+ svn_role = Contributor.parse('svn-role <svnsvn{_AT_}svn-qavm.apache.org>')
+ Contributor.get(*svn_role).is_committer = True
+ Contributor.get(*svn_role).is_full_committer = True # elide it from the listing
def usage():
Modified: subversion/branches/multi-wc-format/tools/dev/find-control-statements.py
URL: http://svn.apache.org/viewvc/subversion/branches/multi-wc-format/tools/dev/find-control-statements.py?rev=1897034&r1=1897033&r2=1897034&view=diff
==============================================================================
--- subversion/branches/multi-wc-format/tools/dev/find-control-statements.py (original)
+++ subversion/branches/multi-wc-format/tools/dev/find-control-statements.py Fri Jan 14 14:01:45 2022
@@ -56,7 +56,7 @@ def print_line(fname, line_num, line):
def is_control(line, index, word):
""" Return whether LINE[INDEX] is actual the start position of
control statement WORD. It must be followed by an opening
- parantheses and only whitespace in between WORD and the '('.
+ parentheses and only whitespace in between WORD and the '('.
"""
if index > 0:
if not (line[index-1] in [' ', '\t', ';']):
@@ -117,7 +117,7 @@ def find_control(line):
def parantheses_delta(line):
""" Return the number of opening minus the number of closing
- parantheses in LINE. Don't count those inside strings or chars.
+ parentheses in LINE. Don't count those inside strings or chars.
"""
escaped = False
in_squote = False
Modified: subversion/branches/multi-wc-format/tools/dev/mergegraph/mergegraph.py
URL: http://svn.apache.org/viewvc/subversion/branches/multi-wc-format/tools/dev/mergegraph/mergegraph.py?rev=1897034&r1=1897033&r2=1897034&view=diff
==============================================================================
--- subversion/branches/multi-wc-format/tools/dev/mergegraph/mergegraph.py (original)
+++ subversion/branches/multi-wc-format/tools/dev/mergegraph/mergegraph.py Fri Jan 14 14:01:45 2022
@@ -177,7 +177,7 @@ class MergeGraph(pydot.Graph):
def get_subgraph(graph, name):
"""Equivalent to pydot.Graph.get_subgraph() when there is no more than
- one subgraph of the given name, but working aroung a bug in
+ one subgraph of the given name, but working around a bug in
pydot.Graph.get_subgraph().
"""
for subg in graph.get_subgraph_list():
Modified: subversion/branches/multi-wc-format/tools/dev/stress.pl
URL: http://svn.apache.org/viewvc/subversion/branches/multi-wc-format/tools/dev/stress.pl?rev=1897034&r1=1897033&r2=1897034&view=diff
==============================================================================
--- subversion/branches/multi-wc-format/tools/dev/stress.pl (original)
+++ subversion/branches/multi-wc-format/tools/dev/stress.pl Fri Jan 14 14:01:45 2022
@@ -43,7 +43,7 @@
# 9
#
# The script runs with an ID in the range 0-9, and when it modifies a
-# file it modifes the line that starts with its ID. Thus scripts with
+# file it modifies the line that starts with its ID. Thus scripts with
# different IDs will make changes that can be merged automatically.
#
# The main loop is then:
@@ -430,7 +430,7 @@ where
# stress testing one could remove this fixed seed and Perl will
# automatically use a pseudo-random seed. However it doesn't much
# matter, the stress testing really depends on the real-time timing
-# differences between mutiple instances of the script, rather than the
+# differences between multiple instances of the script, rather than the
# randomness of the chosen files.
srand 123456789;
Propchange: subversion/branches/multi-wc-format/tools/dev/svnmover/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Jan 14 14:01:45 2022
@@ -1 +1,2 @@
svnmover
+.libs
Modified: subversion/branches/multi-wc-format/tools/dev/svnmover/scanlog.c
URL: http://svn.apache.org/viewvc/subversion/branches/multi-wc-format/tools/dev/svnmover/scanlog.c?rev=1897034&r1=1897033&r2=1897034&view=diff
==============================================================================
--- subversion/branches/multi-wc-format/tools/dev/svnmover/scanlog.c (original)
+++ subversion/branches/multi-wc-format/tools/dev/svnmover/scanlog.c Fri Jan 14 14:01:45 2022
@@ -136,7 +136,7 @@ typedef struct scan_moves_log_receiver_b
* rB: mv b->c
* rC: mv c->d
* we map each revision number to all moves which happened in the
- * revision, which looks as follows:
+ * revision, which looks as follows:
* rA : [(rA, x->z), (rA, a->b)]
* rB : [(rB, b->c)]
* rC : [(rC, c->d)]