Author: julianfoad
Date: Mon Apr 16 14:04:11 2018
New Revision: 1829281
URL: http://svn.apache.org/viewvc?rev=1829281&view=rev
Log:
On the 'shelve-checkpoint' branch: catch up with trunk@1829280.
Modified:
subversion/branches/shelve-checkpoint/ (props changed)
subversion/branches/shelve-checkpoint/CHANGES
subversion/branches/shelve-checkpoint/build/ac-macros/swig.m4
subversion/branches/shelve-checkpoint/notes/EuroOSCON-2005-vc-bof.txt
subversion/branches/shelve-checkpoint/notes/client-configuration
subversion/branches/shelve-checkpoint/notes/diff-optimizations.txt
subversion/branches/shelve-checkpoint/notes/http-and-webdav/webdav-protocol
subversion/branches/shelve-checkpoint/notes/merge-tracking/func-spec.html
subversion/branches/shelve-checkpoint/notes/merge-tracking/requirements.html
subversion/branches/shelve-checkpoint/notes/merge-tracking/summit.html
subversion/branches/shelve-checkpoint/notes/obliterate/obliterate-functional-spec.txt
subversion/branches/shelve-checkpoint/notes/tree-conflicts/design-overview.txt
subversion/branches/shelve-checkpoint/notes/tree-conflicts/detection.txt
subversion/branches/shelve-checkpoint/notes/tree-conflicts/use-cases.txt
Propchange: subversion/branches/shelve-checkpoint/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 16 14:04:11 2018
@@ -98,4 +98,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1801593-1829253
+/subversion/trunk:1801593-1829280
Modified: subversion/branches/shelve-checkpoint/CHANGES
URL:
http://svn.apache.org/viewvc/subversion/branches/shelve-checkpoint/CHANGES?rev=1829281&r1=1829280&r2=1829281&view=diff
==============================================================================
--- subversion/branches/shelve-checkpoint/CHANGES (original)
+++ subversion/branches/shelve-checkpoint/CHANGES Mon Apr 16 14:04:11 2018
@@ -5725,7 +5725,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/shelve-checkpoint/build/ac-macros/swig.m4
URL:
http://svn.apache.org/viewvc/subversion/branches/shelve-checkpoint/build/ac-macros/swig.m4?rev=1829281&r1=1829280&r2=1829281&view=diff
==============================================================================
--- subversion/branches/shelve-checkpoint/build/ac-macros/swig.m4 (original)
+++ subversion/branches/shelve-checkpoint/build/ac-macros/swig.m4 Mon Apr 16
14:04:11 2018
@@ -98,202 +98,202 @@ AC_DEFUN(SVN_FIND_SWIG,
AC_MSG_WARN([Detected SWIG version $SWIG_VERSION_RAW])
AC_MSG_WARN([Subversion requires SWIG >= 1.3.24])
fi
+ fi
+
+ SWIG_PY_COMPILE="none"
+ SWIG_PY_LINK="none"
+ if test "$PYTHON" != "none"; then
+ AC_MSG_NOTICE([Configuring python swig binding])
+
+ AC_CACHE_CHECK([for Python includes], [ac_cv_python_includes],[
+ ac_cv_python_includes="`$PYTHON ${abs_srcdir}/build/get-py-info.py
--includes`"
+ ])
+ SWIG_PY_INCLUDES="\$(SWIG_INCLUDES) $ac_cv_python_includes"
- SWIG_PY_COMPILE="none"
- SWIG_PY_LINK="none"
- if test "$PYTHON" != "none"; then
- AC_MSG_NOTICE([Configuring python swig binding])
-
- AC_CACHE_CHECK([for Python includes], [ac_cv_python_includes],[
- ac_cv_python_includes="`$PYTHON ${abs_srcdir}/build/get-py-info.py
--includes`"
- ])
- SWIG_PY_INCLUDES="\$(SWIG_INCLUDES) $ac_cv_python_includes"
+ if test "$ac_cv_python_includes" = "none"; then
+ AC_MSG_WARN([python bindings cannot be built without distutils module])
+ fi
- if test "$ac_cv_python_includes" = "none"; then
- AC_MSG_WARN([python bindings cannot be built without distutils module])
+ AC_CACHE_CHECK([for compiling Python extensions], [ac_cv_python_compile],[
+ ac_cv_python_compile="`$PYTHON ${abs_srcdir}/build/get-py-info.py
--compile`"
+ ])
+ SWIG_PY_COMPILE="$ac_cv_python_compile $CFLAGS"
+
+ AC_CACHE_CHECK([for linking Python extensions], [ac_cv_python_link],[
+ ac_cv_python_link="`$PYTHON ${abs_srcdir}/build/get-py-info.py --link`"
+ ])
+ SWIG_PY_LINK="$ac_cv_python_link"
+
+ AC_CACHE_CHECK([for linking Python libraries], [ac_cv_python_libs],[
+ ac_cv_python_libs="`$PYTHON ${abs_srcdir}/build/get-py-info.py --libs`"
+ ])
+ SWIG_PY_LIBS="`SVN_REMOVE_STANDARD_LIB_DIRS($ac_cv_python_libs)`"
+
+ dnl Sun Forte adds an extra space before substituting APR_INT64_T_FMT
+ dnl gcc-2.95 adds an extra space after substituting APR_INT64_T_FMT
+ dnl thus the egrep patterns have a + in them.
+ SVN_PYCFMT_SAVE_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES"
+ AC_CACHE_CHECK([for apr_int64_t Python/C API format string],
+ [svn_cv_pycfmt_apr_int64_t], [
+ if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
+ AC_EGREP_CPP([MaTcHtHiS +\"lld\" +EnDeNd],
+ [#include <apr.h>
+ MaTcHtHiS APR_INT64_T_FMT EnDeNd],
+ [svn_cv_pycfmt_apr_int64_t="L"])
fi
-
- AC_CACHE_CHECK([for compiling Python extensions],
[ac_cv_python_compile],[
- ac_cv_python_compile="`$PYTHON ${abs_srcdir}/build/get-py-info.py
--compile`"
- ])
- SWIG_PY_COMPILE="$ac_cv_python_compile $CFLAGS"
-
- AC_CACHE_CHECK([for linking Python extensions], [ac_cv_python_link],[
- ac_cv_python_link="`$PYTHON ${abs_srcdir}/build/get-py-info.py --link`"
- ])
- SWIG_PY_LINK="$ac_cv_python_link"
-
- AC_CACHE_CHECK([for linking Python libraries], [ac_cv_python_libs],[
- ac_cv_python_libs="`$PYTHON ${abs_srcdir}/build/get-py-info.py --libs`"
- ])
- SWIG_PY_LIBS="`SVN_REMOVE_STANDARD_LIB_DIRS($ac_cv_python_libs)`"
-
- dnl Sun Forte adds an extra space before substituting APR_INT64_T_FMT
- dnl gcc-2.95 adds an extra space after substituting APR_INT64_T_FMT
- dnl thus the egrep patterns have a + in them.
- SVN_PYCFMT_SAVE_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES"
- AC_CACHE_CHECK([for apr_int64_t Python/C API format string],
- [svn_cv_pycfmt_apr_int64_t], [
- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
- AC_EGREP_CPP([MaTcHtHiS +\"lld\" +EnDeNd],
- [#include <apr.h>
- MaTcHtHiS APR_INT64_T_FMT EnDeNd],
- [svn_cv_pycfmt_apr_int64_t="L"])
- fi
- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
- AC_EGREP_CPP([MaTcHtHiS +\"ld\" +EnDeNd],r
- [#include <apr.h>
- MaTcHtHiS APR_INT64_T_FMT EnDeNd],
- [svn_cv_pycfmt_apr_int64_t="l"])
- fi
- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
- AC_EGREP_CPP([MaTcHtHiS +\"d\" +EnDeNd],
- [#include <apr.h>
- MaTcHtHiS APR_INT64_T_FMT EnDeNd],
- [svn_cv_pycfmt_apr_int64_t="i"])
- fi
- ])
- CPPFLAGS="$SVN_PYCFMT_SAVE_CPPFLAGS"
if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
- AC_MSG_ERROR([failed to recognize APR_INT64_T_FMT on this platform])
+ AC_EGREP_CPP([MaTcHtHiS +\"ld\" +EnDeNd],r
+ [#include <apr.h>
+ MaTcHtHiS APR_INT64_T_FMT EnDeNd],
+ [svn_cv_pycfmt_apr_int64_t="l"])
fi
- AC_DEFINE_UNQUOTED([SVN_APR_INT64_T_PYCFMT],
- ["$svn_cv_pycfmt_apr_int64_t"],
- [Define to the Python/C API format character suitable]
- [ for apr_int64_t])
- fi
-
- if test "$PERL" != "none"; then
- AC_MSG_CHECKING([perl version])
- dnl Note that the q() bit is there to avoid unbalanced brackets
- dnl which m4 really doesn't like.
- PERL_VERSION="`$PERL -e 'q([[); print $]] * 1000000,$/;'`"
- AC_MSG_RESULT([$PERL_VERSION])
- if test "$PERL_VERSION" -ge "5008000"; then
- SWIG_PL_INCLUDES="\$(SWIG_INCLUDES) `$PERL -MExtUtils::Embed -e
ccopts`"
- SWIG_PL_LINK="`$PERL -MExtUtils::Embed -e ldopts`"
- SWIG_PL_LINK="`SVN_REMOVE_STANDARD_LIB_DIRS($SWIG_PL_LINK)`"
- else
- AC_MSG_WARN([perl bindings require perl 5.8.0 or newer.])
+ if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
+ AC_EGREP_CPP([MaTcHtHiS +\"d\" +EnDeNd],
+ [#include <apr.h>
+ MaTcHtHiS APR_INT64_T_FMT EnDeNd],
+ [svn_cv_pycfmt_apr_int64_t="i"])
fi
+ ])
+ CPPFLAGS="$SVN_PYCFMT_SAVE_CPPFLAGS"
+ if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
+ AC_MSG_ERROR([failed to recognize APR_INT64_T_FMT on this platform])
fi
+ AC_DEFINE_UNQUOTED([SVN_APR_INT64_T_PYCFMT],
+ ["$svn_cv_pycfmt_apr_int64_t"],
+ [Define to the Python/C API format character suitable]
+ [ for apr_int64_t])
+ fi
- SWIG_RB_COMPILE="none"
- SWIG_RB_LINK="none"
- if test "$RUBY" != "none"; then
- rbconfig="$RUBY -rrbconfig -e "
-
- for var_name in arch archdir CC LDSHARED DLEXT LIBS LIBRUBYARG \
- rubyhdrdir rubyarchhdrdir sitedir sitelibdir sitearchdir
libdir
- do
- rbconfig_tmp=`$rbconfig "print RbConfig::CONFIG@<:@'$var_name'@:>@"`
- eval "rbconfig_$var_name=\"$rbconfig_tmp\""
- done
-
- AC_MSG_NOTICE([Configuring Ruby SWIG binding])
-
- AC_CACHE_CHECK([for Ruby include path], [svn_cv_ruby_includes],[
- if test -d "$rbconfig_rubyhdrdir"; then
- dnl Ruby >=1.9
- svn_cv_ruby_includes="-I. -I$rbconfig_rubyhdrdir
-I$rbconfig_rubyhdrdir/ruby -I$rbconfig_rubyhdrdir/ruby/backward"
- if test -d "$rbconfig_rubyarchhdrdir"; then
- dnl Ruby >=2.0
- svn_cv_ruby_includes="$svn_cv_ruby_includes
-I$rbconfig_rubyarchhdrdir"
- else
- svn_cv_ruby_includes="$svn_cv_ruby_includes
-I$rbconfig_rubyhdrdir/$rbconfig_arch"
- fi
+ if test "$PERL" != "none"; then
+ AC_MSG_CHECKING([perl version])
+ dnl Note that the q() bit is there to avoid unbalanced brackets
+ dnl which m4 really doesn't like.
+ PERL_VERSION="`$PERL -e 'q([[); print $]] * 1000000,$/;'`"
+ AC_MSG_RESULT([$PERL_VERSION])
+ if test "$PERL_VERSION" -ge "5008000"; then
+ SWIG_PL_INCLUDES="\$(SWIG_INCLUDES) `$PERL -MExtUtils::Embed -e ccopts`"
+ SWIG_PL_LINK="`$PERL -MExtUtils::Embed -e ldopts`"
+ SWIG_PL_LINK="`SVN_REMOVE_STANDARD_LIB_DIRS($SWIG_PL_LINK)`"
+ else
+ AC_MSG_WARN([perl bindings require perl 5.8.0 or newer.])
+ fi
+ fi
+
+ SWIG_RB_COMPILE="none"
+ SWIG_RB_LINK="none"
+ if test "$RUBY" != "none"; then
+ rbconfig="$RUBY -rrbconfig -e "
+
+ for var_name in arch archdir CC LDSHARED DLEXT LIBS LIBRUBYARG \
+ rubyhdrdir rubyarchhdrdir sitedir sitelibdir sitearchdir
libdir
+ do
+ rbconfig_tmp=`$rbconfig "print RbConfig::CONFIG@<:@'$var_name'@:>@"`
+ eval "rbconfig_$var_name=\"$rbconfig_tmp\""
+ done
+
+ AC_MSG_NOTICE([Configuring Ruby SWIG binding])
+
+ AC_CACHE_CHECK([for Ruby include path], [svn_cv_ruby_includes],[
+ if test -d "$rbconfig_rubyhdrdir"; then
+ dnl Ruby >=1.9
+ svn_cv_ruby_includes="-I. -I$rbconfig_rubyhdrdir
-I$rbconfig_rubyhdrdir/ruby -I$rbconfig_rubyhdrdir/ruby/backward"
+ if test -d "$rbconfig_rubyarchhdrdir"; then
+ dnl Ruby >=2.0
+ svn_cv_ruby_includes="$svn_cv_ruby_includes -I$rbconfig_rubyarchhdrdir"
else
- dnl Ruby 1.8
- svn_cv_ruby_includes="-I. -I$rbconfig_archdir"
+ svn_cv_ruby_includes="$svn_cv_ruby_includes
-I$rbconfig_rubyhdrdir/$rbconfig_arch"
fi
- ])
- SWIG_RB_INCLUDES="\$(SWIG_INCLUDES) $svn_cv_ruby_includes"
+ else
+ dnl Ruby 1.8
+ svn_cv_ruby_includes="-I. -I$rbconfig_archdir"
+ fi
+ ])
+ SWIG_RB_INCLUDES="\$(SWIG_INCLUDES) $svn_cv_ruby_includes"
- AC_CACHE_CHECK([how to compile Ruby extensions], [svn_cv_ruby_compile],[
- svn_cv_ruby_compile="$rbconfig_CC $CFLAGS"
- ])
- SWIG_RB_COMPILE="$svn_cv_ruby_compile"
- SVN_STRIP_FLAG([SWIG_RB_COMPILE], [-ansi])
- SVN_STRIP_FLAG([SWIG_RB_COMPILE], [-std=c89])
- SVN_STRIP_FLAG([SWIG_RB_COMPILE], [-std=c90])
- dnl FIXME: Check that the compiler for Ruby actually supports this flag
- SWIG_RB_COMPILE="$SWIG_RB_COMPILE -Wno-int-to-pointer-cast"
-
- AC_CACHE_CHECK([how to link Ruby extensions], [svn_cv_ruby_link],[
- svn_cv_ruby_link="`$RUBY -e 'ARGV.shift; print ARGV.join(%q( ))' \
- $rbconfig_LDSHARED`"
- svn_cv_ruby_link="$rbconfig_CC $svn_cv_ruby_link"
- svn_cv_ruby_link="$svn_cv_ruby_link -shrext .$rbconfig_DLEXT"
- ])
- SWIG_RB_LINK="$svn_cv_ruby_link"
-
- AC_CACHE_CHECK([how to link Ruby libraries], [ac_cv_ruby_libs], [
- ac_cv_ruby_libs="$rbconfig_LIBRUBYARG $rbconfig_LIBS"
- ])
- SWIG_RB_LIBS="`SVN_REMOVE_STANDARD_LIB_DIRS($ac_cv_ruby_libs)`"
-
- AC_MSG_CHECKING([for rb_errinfo])
- old_CFLAGS="$CFLAGS"
- old_LIBS="$LIBS"
- CFLAGS="$CFLAGS $svn_cv_ruby_includes"
- SVN_STRIP_FLAG([CFLAGS], [-ansi])
- SVN_STRIP_FLAG([CFLAGS], [-std=c89])
- SVN_STRIP_FLAG([CFLAGS], [-std=c90])
- LIBS="$SWIG_RB_LIBS"
- AC_LINK_IFELSE([AC_LANG_SOURCE([[
+ AC_CACHE_CHECK([how to compile Ruby extensions], [svn_cv_ruby_compile],[
+ svn_cv_ruby_compile="$rbconfig_CC $CFLAGS"
+ ])
+ SWIG_RB_COMPILE="$svn_cv_ruby_compile"
+ SVN_STRIP_FLAG([SWIG_RB_COMPILE], [-ansi])
+ SVN_STRIP_FLAG([SWIG_RB_COMPILE], [-std=c89])
+ SVN_STRIP_FLAG([SWIG_RB_COMPILE], [-std=c90])
+ dnl FIXME: Check that the compiler for Ruby actually supports this flag
+ SWIG_RB_COMPILE="$SWIG_RB_COMPILE -Wno-int-to-pointer-cast"
+
+ AC_CACHE_CHECK([how to link Ruby extensions], [svn_cv_ruby_link],[
+ svn_cv_ruby_link="`$RUBY -e 'ARGV.shift; print ARGV.join(%q( ))' \
+ $rbconfig_LDSHARED`"
+ svn_cv_ruby_link="$rbconfig_CC $svn_cv_ruby_link"
+ svn_cv_ruby_link="$svn_cv_ruby_link -shrext .$rbconfig_DLEXT"
+ ])
+ SWIG_RB_LINK="$svn_cv_ruby_link"
+
+ AC_CACHE_CHECK([how to link Ruby libraries], [ac_cv_ruby_libs], [
+ ac_cv_ruby_libs="$rbconfig_LIBRUBYARG $rbconfig_LIBS"
+ ])
+ SWIG_RB_LIBS="`SVN_REMOVE_STANDARD_LIB_DIRS($ac_cv_ruby_libs)`"
+
+ AC_MSG_CHECKING([for rb_errinfo])
+ old_CFLAGS="$CFLAGS"
+ old_LIBS="$LIBS"
+ CFLAGS="$CFLAGS $svn_cv_ruby_includes"
+ SVN_STRIP_FLAG([CFLAGS], [-ansi])
+ SVN_STRIP_FLAG([CFLAGS], [-std=c89])
+ SVN_STRIP_FLAG([CFLAGS], [-std=c90])
+ LIBS="$SWIG_RB_LIBS"
+ AC_LINK_IFELSE([AC_LANG_SOURCE([[
#include <ruby.h>
int main()
{rb_errinfo();}]])], have_rb_errinfo="yes", have_rb_errinfo="no")
- if test "$have_rb_errinfo" = "yes"; then
- AC_MSG_RESULT([yes])
- AC_DEFINE([HAVE_RB_ERRINFO], [1],
- [Define to 1 if you have the `rb_errinfo' function.])
- else
- AC_MSG_RESULT([no])
- fi
- CFLAGS="$old_CFLAGS"
- LIBS="$old_LIBS"
-
- AC_CACHE_VAL([svn_cv_ruby_sitedir],[
- svn_cv_ruby_sitedir="$rbconfig_sitedir"
- ])
- AC_ARG_WITH([ruby-sitedir],
- AS_HELP_STRING([--with-ruby-sitedir=SITEDIR],
- [install Ruby bindings in SITEDIR
- (default is same as ruby's one)]),
- [svn_ruby_installdir="$withval"],
- [svn_ruby_installdir="$svn_cv_ruby_sitedir"])
-
- AC_MSG_CHECKING([where to install Ruby scripts])
- AC_CACHE_VAL([svn_cv_ruby_sitedir_libsuffix],[
- svn_cv_ruby_sitedir_libsuffix="`echo "$rbconfig_sitelibdir" | \
- $SED -e "s,^$rbconfig_sitedir,,"`"
- ])
-
SWIG_RB_SITE_LIB_DIR="${svn_ruby_installdir}${svn_cv_ruby_sitedir_libsuffix}"
- AC_MSG_RESULT([$SWIG_RB_SITE_LIB_DIR])
-
- AC_MSG_CHECKING([where to install Ruby extensions])
- AC_CACHE_VAL([svn_cv_ruby_sitedir_archsuffix],[
- svn_cv_ruby_sitedir_archsuffix="`echo "$rbconfig_sitearchdir" | \
- $SED -e "s,^$rbconfig_sitedir,,"`"
- ])
-
SWIG_RB_SITE_ARCH_DIR="${svn_ruby_installdir}${svn_cv_ruby_sitedir_archsuffix}"
- AC_MSG_RESULT([$SWIG_RB_SITE_ARCH_DIR])
-
- AC_MSG_CHECKING([how to use output level for Ruby bindings tests])
- AC_CACHE_VAL([svn_cv_ruby_test_verbose],[
- svn_cv_ruby_test_verbose="normal"
- ])
- AC_ARG_WITH([ruby-test-verbose],
- AS_HELP_STRING([--with-ruby-test-verbose=LEVEL],
- [how to use output level for Ruby bindings
tests
- (default is normal)]),
- [svn_ruby_test_verbose="$withval"],
- [svn_ruby_test_verbose="$svn_cv_ruby_test_verbose"])
- SWIG_RB_TEST_VERBOSE="$svn_ruby_test_verbose"
- AC_MSG_RESULT([$SWIG_RB_TEST_VERBOSE])
+ if test "$have_rb_errinfo" = "yes"; then
+ AC_MSG_RESULT([yes])
+ AC_DEFINE([HAVE_RB_ERRINFO], [1],
+ [Define to 1 if you have the `rb_errinfo' function.])
+ else
+ AC_MSG_RESULT([no])
fi
+ CFLAGS="$old_CFLAGS"
+ LIBS="$old_LIBS"
+
+ AC_CACHE_VAL([svn_cv_ruby_sitedir],[
+ svn_cv_ruby_sitedir="$rbconfig_sitedir"
+ ])
+ AC_ARG_WITH([ruby-sitedir],
+ AS_HELP_STRING([--with-ruby-sitedir=SITEDIR],
+ [install Ruby bindings in SITEDIR
+ (default is same as ruby's one)]),
+ [svn_ruby_installdir="$withval"],
+ [svn_ruby_installdir="$svn_cv_ruby_sitedir"])
+
+ AC_MSG_CHECKING([where to install Ruby scripts])
+ AC_CACHE_VAL([svn_cv_ruby_sitedir_libsuffix],[
+ svn_cv_ruby_sitedir_libsuffix="`echo "$rbconfig_sitelibdir" | \
+ $SED -e "s,^$rbconfig_sitedir,,"`"
+ ])
+
SWIG_RB_SITE_LIB_DIR="${svn_ruby_installdir}${svn_cv_ruby_sitedir_libsuffix}"
+ AC_MSG_RESULT([$SWIG_RB_SITE_LIB_DIR])
+
+ AC_MSG_CHECKING([where to install Ruby extensions])
+ AC_CACHE_VAL([svn_cv_ruby_sitedir_archsuffix],[
+ svn_cv_ruby_sitedir_archsuffix="`echo "$rbconfig_sitearchdir" | \
+ $SED -e "s,^$rbconfig_sitedir,,"`"
+ ])
+
SWIG_RB_SITE_ARCH_DIR="${svn_ruby_installdir}${svn_cv_ruby_sitedir_archsuffix}"
+ AC_MSG_RESULT([$SWIG_RB_SITE_ARCH_DIR])
+
+ AC_MSG_CHECKING([how to use output level for Ruby bindings tests])
+ AC_CACHE_VAL([svn_cv_ruby_test_verbose],[
+ svn_cv_ruby_test_verbose="normal"
+ ])
+ AC_ARG_WITH([ruby-test-verbose],
+ AS_HELP_STRING([--with-ruby-test-verbose=LEVEL],
+ [how to use output level for Ruby bindings tests
+ (default is normal)]),
+ [svn_ruby_test_verbose="$withval"],
+ [svn_ruby_test_verbose="$svn_cv_ruby_test_verbose"])
+ SWIG_RB_TEST_VERBOSE="$svn_ruby_test_verbose"
+ AC_MSG_RESULT([$SWIG_RB_TEST_VERBOSE])
fi
AC_SUBST(SWIG)
AC_SUBST(SWIG_PY_INCLUDES)
Modified: subversion/branches/shelve-checkpoint/notes/EuroOSCON-2005-vc-bof.txt
URL:
http://svn.apache.org/viewvc/subversion/branches/shelve-checkpoint/notes/EuroOSCON-2005-vc-bof.txt?rev=1829281&r1=1829280&r2=1829281&view=diff
==============================================================================
--- subversion/branches/shelve-checkpoint/notes/EuroOSCON-2005-vc-bof.txt
(original)
+++ subversion/branches/shelve-checkpoint/notes/EuroOSCON-2005-vc-bof.txt Mon
Apr 16 14:04:11 2018
@@ -151,7 +151,7 @@ Comments from projects that switched fro
* The w.c. space penalty is a real issue for large projects. Disk
space is not as cheap as we thought, those .svn/text-base/* files
- hurt. See http://subversion.tigris.org/issues/show_bug.cgi?id=525.
+ hurt. See https://issues.apache.org/jira/browse/SVN-525.
[gerv: Random thought - if you can't easily do copy-on-write, could
you perhaps share text-base files by hard-linking between multiple
Modified: subversion/branches/shelve-checkpoint/notes/client-configuration
URL:
http://svn.apache.org/viewvc/subversion/branches/shelve-checkpoint/notes/client-configuration?rev=1829281&r1=1829280&r2=1829281&view=diff
==============================================================================
--- subversion/branches/shelve-checkpoint/notes/client-configuration (original)
+++ subversion/branches/shelve-checkpoint/notes/client-configuration Mon Apr 16
14:04:11 2018
@@ -59,8 +59,8 @@ dev@s.a.o: "Bikeshed: configuration over
dev@s.a.o: "Default commandline args";
http://svn.haxx.se/dev/archive-2010-12/0449.shtml
Issue 1974: "server-side config which 'broadcasts' to clients";
- http://subversion.tigris.org/issues/show_bug.cgi?id=1974
+ https://issues.apache.org/jira/browse/SVN-1974
Issue 3765: "client-configurable default args";
- http://subversion.tigris.org/issues/show_bug.cgi?id=3765
+ https://issues.apache.org/jira/browse/SVN-3765
Issue 3769: "Add APIs which allow library consumers to specify configuration
options"
- http://subversion.tigris.org/issues/show_bug.cgi?id=3769
+ https://issues.apache.org/jira/browse/SVN-3769
Modified: subversion/branches/shelve-checkpoint/notes/diff-optimizations.txt
URL:
http://svn.apache.org/viewvc/subversion/branches/shelve-checkpoint/notes/diff-optimizations.txt?rev=1829281&r1=1829280&r2=1829281&view=diff
==============================================================================
--- subversion/branches/shelve-checkpoint/notes/diff-optimizations.txt
(original)
+++ subversion/branches/shelve-checkpoint/notes/diff-optimizations.txt Mon Apr
16 14:04:11 2018
@@ -80,7 +80,7 @@ See also issue #1966 (libsvn_diff needs
References
----------
-[1] http://subversion.tigris.org/issues/show_bug.cgi?id=1966 (libsvn_diff
+[1] https://issues.apache.org/jira/browse/SVN-1966 (libsvn_diff
needs 'non-minimal-diff' mode)
[2] Miller, W., and Myers, E.W. "A File Comparison Program.", Software -
Practice & Experience 15 (1985), pp. 1025-1040.
Modified:
subversion/branches/shelve-checkpoint/notes/http-and-webdav/webdav-protocol
URL:
http://svn.apache.org/viewvc/subversion/branches/shelve-checkpoint/notes/http-and-webdav/webdav-protocol?rev=1829281&r1=1829280&r2=1829281&view=diff
==============================================================================
--- subversion/branches/shelve-checkpoint/notes/http-and-webdav/webdav-protocol
(original)
+++ subversion/branches/shelve-checkpoint/notes/http-and-webdav/webdav-protocol
Mon Apr 16 14:04:11 2018
@@ -425,7 +425,7 @@ Purpose: Retrieve a record of the change
Target URL: Prior to Subversion 1.8, the target URL was the public
resource URL of the aforementioned subtree. Per issue #4287
- (http://subversion.tigris.org/issues/show_bug.cgi?id=4287),
+ (https://issues.apache.org/jira/browse/SVN-4287),
it was discovered that this was an incorrect approach, so
in Subversion 1.8, mod_dav_svn allowed clients to submit
this report (with a slightly different Request syntax)
Modified:
subversion/branches/shelve-checkpoint/notes/merge-tracking/func-spec.html
URL:
http://svn.apache.org/viewvc/subversion/branches/shelve-checkpoint/notes/merge-tracking/func-spec.html?rev=1829281&r1=1829280&r2=1829281&view=diff
==============================================================================
--- subversion/branches/shelve-checkpoint/notes/merge-tracking/func-spec.html
(original)
+++ subversion/branches/shelve-checkpoint/notes/merge-tracking/func-spec.html
Mon Apr 16 14:04:11 2018
@@ -166,7 +166,7 @@ mergeinfo for the merge is set on the de
was present in the WC despite being outside its parent's 'depth'
attribute) and could not then re-add a node of the same name in order to
perform both halves of an incoming replacement. <a
- href="http://subversion.tigris.org/issues/show_bug.cgi?id=4164"; >Issue
+ href="https://issues.apache.org/jira/browse/SVN-4164"; >Issue
#4164 "inconsistencies in merge handling of adds vs. edits in shallow
targets"</a> is related.</em></p>
@@ -264,7 +264,7 @@ SSRP - Switched subtree's repository par
<h3>Delete</h3>
-<p><a href="http://subversion.tigris.org/issues/show_bug.cgi?id=4163";
+<p><a href="https://issues.apache.org/jira/browse/SVN-4163";
>Issue #4163 "merged deletion of switched subtrees records non-inheritable
mergeinfo"</a>: If a merge deletes the path SS, the desired behaviour
is currently undefined and the actual behaviour is that a commit will
@@ -473,7 +473,7 @@ command-line could also produce an outpu
<p>Recent discussion can be found <a
href="http://subversion.tigris.org/servlets/ReadMsg?listName=dev&msgNo=128233";
>here</a>. Development is tracked <a
-href="http://subversion.tigris.org/issues/show_bug.cgi?id=2820";>here</a>.</p>
+href="https://issues.apache.org/jira/browse/SVN-2820";>here</a>.</p>
<p>The <a href="requirements.html#change-set-availability">Show
Changesets Blocked from Merging</a> portion of this feature is
@@ -493,7 +493,7 @@ allow for XML-formatted output (for mach
<p>Recent discussion can be found <a
href="http://subversion.tigris.org/servlets/ReadMsg?listName=dev&msgNo=128233";
>here</a>. Development is tracked <a
-href="http://subversion.tigris.org/issues/show_bug.cgi?id=2835";>here</a>.</p>
+href="https://issues.apache.org/jira/browse/SVN-2835";>here</a>.</p>
<p>The <a href="requirements.html#find-changeset">Find Paths
containing Specific Incarnation of Versioned Resource</a> portion of
@@ -951,7 +951,7 @@ here:</p>
>Original API proposal</a></li>
</ul>
-<p><a href="http://subversion.tigris.org/issues/show_bug.cgi?id=2022";
+<p><a href="https://issues.apache.org/jira/browse/SVN-2022";
>Issue #2022</a> is loosely related.</p>
<div class="h3" id="distributable-resolution">
Modified:
subversion/branches/shelve-checkpoint/notes/merge-tracking/requirements.html
URL:
http://svn.apache.org/viewvc/subversion/branches/shelve-checkpoint/notes/merge-tracking/requirements.html?rev=1829281&r1=1829280&r2=1829281&view=diff
==============================================================================
---
subversion/branches/shelve-checkpoint/notes/merge-tracking/requirements.html
(original)
+++
subversion/branches/shelve-checkpoint/notes/merge-tracking/requirements.html
Mon Apr 16 14:04:11 2018
@@ -122,7 +122,7 @@ section).</p>
<p><code>svn merge</code> needs to handle renames better. This
requires <a
-href="http://subversion.tigris.org/issues/show_bug.cgi?id=898";>true
+href="https://issues.apache.org/jira/browse/SVN-898";>true
rename support</a>.</p>
<p>Edit foo.c on branch A. Rename foo.c to bar.c on branch B.</p>
@@ -138,7 +138,7 @@ rename support</a>.</p>
</ol>
<p>Problem #2 stems from the fact that we don't have <a
-href="http://subversion.tigris.org/issues/show_bug.cgi?id=898";>true
+href="https://issues.apache.org/jira/browse/SVN-898";>true
renames</a>, just copies (with history) and deletes. That's not
fixable without a FS schema change, and (probably) a libsvn_wc
rewrite.</p>
@@ -372,7 +372,7 @@ some filesystem backend implementation d
items in the dump as a sort of "soft data" (which would allow them to
be used for "translating" the merge tracking data at load time, where
those IDs would be otherwise irrelevant). See <a
-href="http://subversion.tigris.org/issues/show_bug.cgi?id=1525";>issue
+href="https://issues.apache.org/jira/browse/SVN-1525";>issue
1525</a> about user-visible entity IDs.</p>
</div> <!-- dump-load -->
Modified: subversion/branches/shelve-checkpoint/notes/merge-tracking/summit.html
URL:
http://svn.apache.org/viewvc/subversion/branches/shelve-checkpoint/notes/merge-tracking/summit.html?rev=1829281&r1=1829280&r2=1829281&view=diff
==============================================================================
--- subversion/branches/shelve-checkpoint/notes/merge-tracking/summit.html
(original)
+++ subversion/branches/shelve-checkpoint/notes/merge-tracking/summit.html Mon
Apr 16 14:04:11 2018
@@ -166,7 +166,7 @@ the average user needs.</p>
resources in the first place? Can this be achieved with a
finer-grained <code>svn switch</code>? Note: This is related to the
shared file storage issue in Subversion's own issue tracker,
- <a href="http://subversion.tigris.org/issues/show_bug.cgi?id=2286";
+ <a href="https://issues.apache.org/jira/browse/SVN-2286";
>issue #2286</a>. It was also expressed at the
<a
href="http://svn.apache.org/repos/asf/subversion/trunk/notes/EuroOSCON-2005-vc-bof.txt";
Modified:
subversion/branches/shelve-checkpoint/notes/obliterate/obliterate-functional-spec.txt
URL:
http://svn.apache.org/viewvc/subversion/branches/shelve-checkpoint/notes/obliterate/obliterate-functional-spec.txt?rev=1829281&r1=1829280&r2=1829281&view=diff
==============================================================================
---
subversion/branches/shelve-checkpoint/notes/obliterate/obliterate-functional-spec.txt
(original)
+++
subversion/branches/shelve-checkpoint/notes/obliterate/obliterate-functional-spec.txt
Mon Apr 16 14:04:11 2018
@@ -1021,7 +1021,7 @@ VII. Appendix
1. Link to external documentation
- [1] Issue 516: http://subversion.tigris.org/issues/show_bug.cgi?id=516
+ [1] Issue 516: https://issues.apache.org/jira/browse/SVN-516
[2] Karl Fogel's proposal to use the replay API and filters:
http://svn.haxx.se/dev/archive-2008-04/0687.shtml
[3] Bob Jenkins's thread about "Auditability": keep log of what has been
Modified:
subversion/branches/shelve-checkpoint/notes/tree-conflicts/design-overview.txt
URL:
http://svn.apache.org/viewvc/subversion/branches/shelve-checkpoint/notes/tree-conflicts/design-overview.txt?rev=1829281&r1=1829280&r2=1829281&view=diff
==============================================================================
---
subversion/branches/shelve-checkpoint/notes/tree-conflicts/design-overview.txt
(original)
+++
subversion/branches/shelve-checkpoint/notes/tree-conflicts/design-overview.txt
Mon Apr 16 14:04:11 2018
@@ -246,10 +246,10 @@ Status: incomplete
* Mark as resolved, by command: the basic "svn resolved PARENT" works to some
extent, but needs attention.
- Issue #3145 <http://subversion.tigris.org/issues/show_bug.cgi?id=3145>
+ Issue #3145 <https://issues.apache.org/jira/browse/SVN-3145>
* Mark as resolved, interactively: not started.
- Issue #3144 <http://subversion.tigris.org/issues/show_bug.cgi?id=3144>
+ Issue #3144 <https://issues.apache.org/jira/browse/SVN-3144>
To do:
Modified:
subversion/branches/shelve-checkpoint/notes/tree-conflicts/detection.txt
URL:
http://svn.apache.org/viewvc/subversion/branches/shelve-checkpoint/notes/tree-conflicts/detection.txt?rev=1829281&r1=1829280&r2=1829281&view=diff
==============================================================================
--- subversion/branches/shelve-checkpoint/notes/tree-conflicts/detection.txt
(original)
+++ subversion/branches/shelve-checkpoint/notes/tree-conflicts/detection.txt
Mon Apr 16 14:04:11 2018
@@ -8,7 +8,7 @@ in use-cases.txt, for both files and dir
Issue reference:
- http://subversion.tigris.org/issues/show_bug.cgi?id=2282
+ https://issues.apache.org/jira/browse/SVN-2282
==========
USE CASE 1
Modified:
subversion/branches/shelve-checkpoint/notes/tree-conflicts/use-cases.txt
URL:
http://svn.apache.org/viewvc/subversion/branches/shelve-checkpoint/notes/tree-conflicts/use-cases.txt?rev=1829281&r1=1829280&r2=1829281&view=diff
==============================================================================
--- subversion/branches/shelve-checkpoint/notes/tree-conflicts/use-cases.txt
(original)
+++ subversion/branches/shelve-checkpoint/notes/tree-conflicts/use-cases.txt
Mon Apr 16 14:04:11 2018
@@ -3,8 +3,8 @@
TREE CONFLICTS USE CASES AND DESIRED BEHAVIOURS
-Issue reference: http://subversion.tigris.org/issues/show_bug.cgi?id=2282
- http://subversion.tigris.org/issues/show_bug.cgi?id=3630
+Issue reference: https://issues.apache.org/jira/browse/SVN-2282
+ https://issues.apache.org/jira/browse/SVN-3630
These use cases are based on a scenario paper "SVN move/rename
problems & suggested improvements" submitted by a corporate Subversion
