Author: svn-role Date: Thu Dec 20 04:00:30 2012 New Revision: 1424283 URL: http://svn.apache.org/viewvc?rev=1424283&view=rev Log: Reintegrate the 1.7.x-r1423646 branch:
* ^/subversion/branches/1.7.x-r1423646 Work around http://www.freebsd.org/cgi/query-pr.cgi?pr=174521 . Justification: Small fix, avoids cryptic error message, works elsewhere. Branch: ^/subversion/branches/1.7.x-r1423646 Votes: +1: danielsh, arfrever, rhuijben Modified: subversion/branches/1.7.x/ (props changed) subversion/branches/1.7.x/CHANGES (props changed) subversion/branches/1.7.x/STATUS subversion/branches/1.7.x/get-deps.sh subversion/branches/1.7.x/subversion/include/private/svn_adler32.h (props changed) subversion/branches/1.7.x/subversion/include/private/svn_string_private.h (props changed) subversion/branches/1.7.x/subversion/include/private/svn_temp_serializer.h (props changed) subversion/branches/1.7.x/subversion/libsvn_fs_fs/temp_serializer.c (props changed) subversion/branches/1.7.x/subversion/libsvn_fs_fs/temp_serializer.h (props changed) subversion/branches/1.7.x/subversion/libsvn_subr/adler32.c (props changed) subversion/branches/1.7.x/subversion/libsvn_subr/hash.c (props changed) subversion/branches/1.7.x/subversion/libsvn_subr/svn_base64.c (props changed) subversion/branches/1.7.x/subversion/libsvn_subr/svn_cache_config.c (props changed) subversion/branches/1.7.x/subversion/libsvn_subr/svn_temp_serializer.c (props changed) subversion/branches/1.7.x/subversion/svnserve/main.c (props changed) subversion/branches/1.7.x/subversion/tests/cmdline/basic_tests.py (props changed) subversion/branches/1.7.x/subversion/tests/cmdline/svntest/ (props changed) subversion/branches/1.7.x/tools/client-side/svnmucc/svnmucc.c (props changed) Propchange: subversion/branches/1.7.x/ ------------------------------------------------------------------------------ Merged /subversion/trunk:r1423646 Merged /subversion/branches/1.7.x-r1423646:r1423647-1424282 Propchange: subversion/branches/1.7.x/CHANGES ------------------------------------------------------------------------------ Merged /subversion/branches/1.7.x-r1423646/CHANGES:r1423647-1424282 Merged /subversion/trunk/CHANGES:r1423646 Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1424283&r1=1424282&r2=1424283&view=diff ============================================================================== --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Thu Dec 20 04:00:30 2012 @@ -103,15 +103,6 @@ Veto-blocked changes: Approved changes: ================= - * ^/subversion/branches/1.7.x-r1423646 - Work around http://www.freebsd.org/cgi/query-pr.cgi?pr=174521 . - Justification: - Small fix, avoids cryptic error message, works elsewhere. - Branch: - ^/subversion/branches/1.7.x-r1423646 - Votes: - +1: danielsh, arfrever, rhuijben - * r1422100 Delay storing handle to fix assert when rep-cache is inaccessible. Justification: Modified: subversion/branches/1.7.x/get-deps.sh URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/get-deps.sh?rev=1424283&r1=1424282&r2=1424283&view=diff ============================================================================== --- subversion/branches/1.7.x/get-deps.sh (original) +++ subversion/branches/1.7.x/get-deps.sh Thu Dec 20 04:00:30 2012 @@ -29,7 +29,8 @@ NEON=neon-0.29.6 SERF=serf-0.7.2 ZLIB=zlib-1.2.5 SQLITE_VERSION=3.7.6.3 -SQLITE=sqlite-amalgamation-$(printf %u%02u%02u%02u $(echo $SQLITE_VERSION | sed -e "s/\./ /g")) +SQLITE=sqlite-amalgamation-$(printf %d%02d%02d%02d $(echo $SQLITE_VERSION | sed -e 's/\./ /g')) + HTTPD=httpd-2.2.19 APR_ICONV=apr-iconv-1.2.1 Propchange: subversion/branches/1.7.x/subversion/include/private/svn_adler32.h ------------------------------------------------------------------------------ Merged /subversion/trunk/subversion/include/private/svn_adler32.h:r1423646 Merged /subversion/branches/1.7.x-r1423646/subversion/include/private/svn_adler32.h:r1423647-1424282 Propchange: subversion/branches/1.7.x/subversion/include/private/svn_string_private.h ------------------------------------------------------------------------------ Merged /subversion/branches/1.7.x-r1423646/subversion/include/private/svn_string_private.h:r1423647-1424282 Merged /subversion/trunk/subversion/include/private/svn_string_private.h:r1423646 Propchange: subversion/branches/1.7.x/subversion/include/private/svn_temp_serializer.h ------------------------------------------------------------------------------ Merged /subversion/branches/1.7.x-r1423646/subversion/include/private/svn_temp_serializer.h:r1423647-1424282 Merged /subversion/trunk/subversion/include/private/svn_temp_serializer.h:r1423646 Propchange: subversion/branches/1.7.x/subversion/libsvn_fs_fs/temp_serializer.c ------------------------------------------------------------------------------ Merged /subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c:r1423646 Merged /subversion/branches/1.7.x-r1423646/subversion/libsvn_fs_fs/temp_serializer.c:r1423647-1424282 Propchange: subversion/branches/1.7.x/subversion/libsvn_fs_fs/temp_serializer.h ------------------------------------------------------------------------------ Merged /subversion/branches/1.7.x-r1423646/subversion/libsvn_fs_fs/temp_serializer.h:r1423647-1424282 Merged /subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.h:r1423646 Propchange: subversion/branches/1.7.x/subversion/libsvn_subr/adler32.c ------------------------------------------------------------------------------ Merged /subversion/trunk/subversion/libsvn_subr/adler32.c:r1423646 Merged /subversion/branches/1.7.x-r1423646/subversion/libsvn_subr/adler32.c:r1423647-1424282 Propchange: subversion/branches/1.7.x/subversion/libsvn_subr/hash.c ------------------------------------------------------------------------------ Merged /subversion/trunk/subversion/libsvn_subr/hash.c:r1423646 Merged /subversion/branches/1.7.x-r1423646/subversion/libsvn_subr/hash.c:r1423647-1424282 Propchange: subversion/branches/1.7.x/subversion/libsvn_subr/svn_base64.c ------------------------------------------------------------------------------ Merged /subversion/trunk/subversion/libsvn_subr/svn_base64.c:r1423646 Merged /subversion/branches/1.7.x-r1423646/subversion/libsvn_subr/svn_base64.c:r1423647-1424282 Propchange: subversion/branches/1.7.x/subversion/libsvn_subr/svn_cache_config.c ------------------------------------------------------------------------------ Merged /subversion/branches/1.7.x-r1423646/subversion/libsvn_subr/svn_cache_config.c:r1423647-1424282 Merged /subversion/trunk/subversion/libsvn_subr/svn_cache_config.c:r1423646 Propchange: subversion/branches/1.7.x/subversion/libsvn_subr/svn_temp_serializer.c ------------------------------------------------------------------------------ Merged /subversion/branches/1.7.x-r1423646/subversion/libsvn_subr/svn_temp_serializer.c:r1423647-1424282 Merged /subversion/trunk/subversion/libsvn_subr/svn_temp_serializer.c:r1423646 Propchange: subversion/branches/1.7.x/subversion/svnserve/main.c ------------------------------------------------------------------------------ Merged /subversion/branches/1.7.x-r1423646/subversion/svnserve/main.c:r1423647-1424282 Merged /subversion/trunk/subversion/svnserve/main.c:r1423646 Propchange: subversion/branches/1.7.x/subversion/tests/cmdline/basic_tests.py ------------------------------------------------------------------------------ Merged /subversion/branches/1.7.x-r1423646/subversion/tests/cmdline/basic_tests.py:r1423647-1424282 Merged /subversion/trunk/subversion/tests/cmdline/basic_tests.py:r1423646 Propchange: subversion/branches/1.7.x/subversion/tests/cmdline/svntest/ ------------------------------------------------------------------------------ Merged /subversion/trunk/subversion/tests/cmdline/svntest:r1423646 Merged /subversion/branches/1.7.x-r1423646/subversion/tests/cmdline/svntest:r1423647-1424282 Propchange: subversion/branches/1.7.x/tools/client-side/svnmucc/svnmucc.c ------------------------------------------------------------------------------ Merged /subversion/branches/1.7.x-r1423646/tools/client-side/svnmucc/svnmucc.c:r1423647-1424282 Merged /subversion/trunk/tools/client-side/svnmucc/svnmucc.c:r1423646
