Author: stefan2
Date: Thu Oct 13 15:25:15 2016
New Revision: 1764707

URL: http://svn.apache.org/viewvc?rev=1764707&view=rev
Log:
On the authzperf branch:
Sync with /trunk up to r1764705. Fix a simple conflict in string-test.c .

Added:
    subversion/branches/authzperf/notes/meetings/berlin-16-minutes
      - copied unchanged from r1764704, 
subversion/trunk/notes/meetings/berlin-16-minutes
Modified:
    subversion/branches/authzperf/   (props changed)
    subversion/branches/authzperf/INSTALL
    subversion/branches/authzperf/build/ac-macros/swig.m4
    subversion/branches/authzperf/build/ac-macros/zlib.m4
    subversion/branches/authzperf/build/generator/gen_win_dependencies.py
    subversion/branches/authzperf/build/win32/svn.rc
    subversion/branches/authzperf/configure.ac
    
subversion/branches/authzperf/subversion/bindings/swig/ruby/test/test_core.rb
    subversion/branches/authzperf/subversion/bindings/swig/ruby/test/test_fs.rb
    subversion/branches/authzperf/subversion/include/private/svn_io_private.h
    subversion/branches/authzperf/subversion/include/private/svn_utf_private.h
    subversion/branches/authzperf/subversion/include/private/svn_wc_private.h
    subversion/branches/authzperf/subversion/include/svn_client.h
    subversion/branches/authzperf/subversion/include/svn_fs.h
    subversion/branches/authzperf/subversion/include/svn_io.h
    subversion/branches/authzperf/subversion/include/svn_types.h
    subversion/branches/authzperf/subversion/include/svn_wc.h
    subversion/branches/authzperf/subversion/libsvn_client/conflicts.c
    subversion/branches/authzperf/subversion/libsvn_client/merge.c
    subversion/branches/authzperf/subversion/libsvn_client/patch.c
    subversion/branches/authzperf/subversion/libsvn_fs/fs-loader.c
    subversion/branches/authzperf/subversion/libsvn_fs_fs/cached_data.c
    subversion/branches/authzperf/subversion/libsvn_fs_fs/caching.c
    subversion/branches/authzperf/subversion/libsvn_fs_fs/fs.c
    subversion/branches/authzperf/subversion/libsvn_fs_fs/fs.h
    subversion/branches/authzperf/subversion/libsvn_fs_fs/low_level.c
    subversion/branches/authzperf/subversion/libsvn_fs_fs/pack.c
    subversion/branches/authzperf/subversion/libsvn_fs_fs/pack.h
    subversion/branches/authzperf/subversion/libsvn_fs_fs/revprops.c
    subversion/branches/authzperf/subversion/libsvn_fs_fs/temp_serializer.h
    subversion/branches/authzperf/subversion/libsvn_fs_fs/transaction.c
    subversion/branches/authzperf/subversion/libsvn_fs_fs/tree.c
    subversion/branches/authzperf/subversion/libsvn_fs_x/   (props changed)
    subversion/branches/authzperf/subversion/libsvn_fs_x/batch_fsync.c
    subversion/branches/authzperf/subversion/libsvn_fs_x/pack.c
    subversion/branches/authzperf/subversion/libsvn_repos/config_pool.c
    subversion/branches/authzperf/subversion/libsvn_repos/reporter.c
    subversion/branches/authzperf/subversion/libsvn_repos/repos.c
    subversion/branches/authzperf/subversion/libsvn_subr/cmdline.c
    subversion/branches/authzperf/subversion/libsvn_subr/deprecated.c
    subversion/branches/authzperf/subversion/libsvn_subr/io.c
    subversion/branches/authzperf/subversion/libsvn_subr/prefix_string.c
    subversion/branches/authzperf/subversion/libsvn_subr/stream.c
    subversion/branches/authzperf/subversion/libsvn_subr/string.c
    subversion/branches/authzperf/subversion/libsvn_subr/subst.c
    subversion/branches/authzperf/subversion/libsvn_subr/sysinfo.c
    subversion/branches/authzperf/subversion/libsvn_subr/win32_crashrpt.c
    subversion/branches/authzperf/subversion/libsvn_subr/win32_crashrpt_dll.h
    subversion/branches/authzperf/subversion/libsvn_wc/conflicts.c
    subversion/branches/authzperf/subversion/libsvn_wc/copy.c
    subversion/branches/authzperf/subversion/libsvn_wc/crop.c
    subversion/branches/authzperf/subversion/libsvn_wc/entries.c
    subversion/branches/authzperf/subversion/libsvn_wc/questions.c
    subversion/branches/authzperf/subversion/libsvn_wc/wc-queries.sql
    subversion/branches/authzperf/subversion/libsvn_wc/wc_db.c
    subversion/branches/authzperf/subversion/libsvn_wc/wc_db.h
    subversion/branches/authzperf/subversion/libsvn_wc/wc_db_pristine.c
    subversion/branches/authzperf/subversion/libsvn_wc/wc_db_update_move.c
    subversion/branches/authzperf/subversion/mod_dav_svn/dav_svn.h
    subversion/branches/authzperf/subversion/mod_dav_svn/merge.c
    subversion/branches/authzperf/subversion/mod_dav_svn/posts/create_txn.c
    subversion/branches/authzperf/subversion/mod_dav_svn/reports/dated-rev.c
    subversion/branches/authzperf/subversion/mod_dav_svn/reports/deleted-rev.c
    subversion/branches/authzperf/subversion/mod_dav_svn/reports/file-revs.c
    
subversion/branches/authzperf/subversion/mod_dav_svn/reports/get-location-segments.c
    subversion/branches/authzperf/subversion/mod_dav_svn/reports/get-locations.c
    subversion/branches/authzperf/subversion/mod_dav_svn/reports/get-locks.c
    
subversion/branches/authzperf/subversion/mod_dav_svn/reports/inherited-props.c
    subversion/branches/authzperf/subversion/mod_dav_svn/reports/log.c
    subversion/branches/authzperf/subversion/mod_dav_svn/reports/mergeinfo.c
    subversion/branches/authzperf/subversion/mod_dav_svn/reports/replay.c
    subversion/branches/authzperf/subversion/mod_dav_svn/reports/update.c
    subversion/branches/authzperf/subversion/mod_dav_svn/repos.c
    subversion/branches/authzperf/subversion/mod_dav_svn/util.c
    subversion/branches/authzperf/subversion/mod_dav_svn/version.c
    subversion/branches/authzperf/subversion/svn/cl.h
    subversion/branches/authzperf/subversion/svn/conflict-callbacks.c
    subversion/branches/authzperf/subversion/svn/merge-cmd.c
    subversion/branches/authzperf/subversion/svn/notify.c
    subversion/branches/authzperf/subversion/svn/svn.c
    subversion/branches/authzperf/subversion/svn/update-cmd.c
    subversion/branches/authzperf/subversion/svnmucc/svnmucc.c
    subversion/branches/authzperf/subversion/tests/cmdline/depth_tests.py
    
subversion/branches/authzperf/subversion/tests/cmdline/merge_tree_conflict_tests.py
    subversion/branches/authzperf/subversion/tests/cmdline/resolve_tests.py
    subversion/branches/authzperf/subversion/tests/cmdline/update_tests.py
    subversion/branches/authzperf/subversion/tests/cmdline/upgrade_tests.py
    
subversion/branches/authzperf/subversion/tests/libsvn_client/conflicts-test.c
    subversion/branches/authzperf/subversion/tests/libsvn_fs/fs-test.c
    
subversion/branches/authzperf/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c
    subversion/branches/authzperf/subversion/tests/libsvn_subr/io-test.c
    subversion/branches/authzperf/subversion/tests/libsvn_subr/stream-test.c
    subversion/branches/authzperf/subversion/tests/libsvn_subr/string-test.c
    subversion/branches/authzperf/subversion/tests/libsvn_wc/utils.c
    subversion/branches/authzperf/subversion/tests/libsvn_wc/wc-queries-test.c
    subversion/branches/authzperf/subversion/tests/libsvn_wc/wc-test.c
    subversion/branches/authzperf/tools/dev/fsfs-access-map.c
    subversion/branches/authzperf/win-tests.py

Propchange: subversion/branches/authzperf/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 13 15:25:15 2016
@@ -70,6 +70,7 @@
 /subversion/branches/ra_serf-digest-authn:875693-876404
 /subversion/branches/reintegrate-improvements:873853-874164
 /subversion/branches/remote-only-status:1581845-1586090
+/subversion/branches/resolve-incoming-add:1762797-1764284
 /subversion/branches/revprop-cache:1298521-1326293
 /subversion/branches/revprop-caching-ng:1620597,1620599
 
/subversion/branches/revprop-packing:1143907,1143971,1143997,1144017,1144499,1144568,1146145
@@ -95,4 +96,4 @@
 /subversion/branches/verify-at-commit:1462039-1462408
 /subversion/branches/verify-keep-going:1439280-1546110
 /subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1613053-1746926
+/subversion/trunk:1613053-1764705

Modified: subversion/branches/authzperf/INSTALL
URL: 
http://svn.apache.org/viewvc/subversion/branches/authzperf/INSTALL?rev=1764707&r1=1764706&r2=1764707&view=diff
==============================================================================
--- subversion/branches/authzperf/INSTALL (original)
+++ subversion/branches/authzperf/INSTALL Thu Oct 13 15:25:15 2016
@@ -715,9 +715,8 @@ II.   INSTALLATION
         Note that Python 3.x is not supported (yet).
       * Perl 5.8 or higher from http://www.perl.org/get.html
       * Awk (from http://www.cs.princeton.edu/~bwk/btl.mirror/awk95.exe) is
-        needed to compile Apache or APR without using CMake.  Note that this
-        is the actual awk program, not an installer - just rename it to
-        awk.exe and it is ready to use.
+        needed to compile Apache.  Note that this is the actual awk program,
+        not an installer - just rename it to awk.exe and it is ready to use.
       * Apache apr, apr-util, and optionally apr-iconv libraries, version
         1.3 or later (1.2 for apr-iconv). If you are building from a Subversion
         checkout and have not downloaded Apache 2, then get these 3 libraries

Modified: subversion/branches/authzperf/build/ac-macros/swig.m4
URL: 
http://svn.apache.org/viewvc/subversion/branches/authzperf/build/ac-macros/swig.m4?rev=1764707&r1=1764706&r2=1764707&view=diff
==============================================================================
--- subversion/branches/authzperf/build/ac-macros/swig.m4 (original)
+++ subversion/branches/authzperf/build/ac-macros/swig.m4 Thu Oct 13 15:25:15 
2016
@@ -98,200 +98,200 @@ 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"
 
-    if test "$ac_cv_python_includes" = "none"; then
-      AC_MSG_WARN([python bindings cannot be built without distutils module])
-    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"
 
-    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"])
+      if test "$ac_cv_python_includes" = "none"; then
+        AC_MSG_WARN([python bindings cannot be built without distutils module])
       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_EGREP_CPP([MaTcHtHiS +\"d\" +EnDeNd],
-                     [#include <apr.h>
-                      MaTcHtHiS APR_INT64_T_FMT EnDeNd],
-                     [svn_cv_pycfmt_apr_int64_t="i"])
+        AC_MSG_ERROR([failed to recognize APR_INT64_T_FMT on this platform])
       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_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
-    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`"
-    else
-      AC_MSG_WARN([perl bindings require perl 5.8.0 or newer.])
+    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`"
+      else
+        AC_MSG_WARN([perl bindings require perl 5.8.0 or newer.])
+      fi
     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"
+    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
       else
-        svn_cv_ruby_includes="$svn_cv_ruby_includes 
-I$rbconfig_rubyhdrdir/$rbconfig_arch"
+        dnl Ruby 1.8
+        svn_cv_ruby_includes="-I. -I$rbconfig_archdir"
       fi
-    else
-      dnl Ruby 1.8
-      svn_cv_ruby_includes="-I. -I$rbconfig_archdir"
-    fi
-    ])
-    SWIG_RB_INCLUDES="\$(SWIG_INCLUDES) $svn_cv_ruby_includes"
+      ])
+      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"
+      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])
+      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
   fi
   AC_SUBST(SWIG)
   AC_SUBST(SWIG_PY_INCLUDES)

Modified: subversion/branches/authzperf/build/ac-macros/zlib.m4
URL: 
http://svn.apache.org/viewvc/subversion/branches/authzperf/build/ac-macros/zlib.m4?rev=1764707&r1=1764706&r2=1764707&view=diff
==============================================================================
--- subversion/branches/authzperf/build/ac-macros/zlib.m4 (original)
+++ subversion/branches/authzperf/build/ac-macros/zlib.m4 Thu Oct 13 15:25:15 
2016
@@ -26,47 +26,76 @@ dnl
 AC_DEFUN(SVN_LIB_Z,
 [
   zlib_found=no
+  zlib_skip=no
 
   AC_ARG_WITH(zlib,AS_HELP_STRING([--with-zlib=PREFIX],
                                   [zlib compression library]),
   [
-    if test "$withval" = "yes" ; then
-      AC_CHECK_HEADER(zlib.h, [
-        AC_CHECK_LIB(z, inflate, [zlib_found="builtin"])
-      ])
-    elif test "$withval" = "no" ; then
-      AC_MSG_ERROR([cannot compile without zlib.])
+    if test "$withval" = "yes"; then
+      zlib_skip=no
+    elif test "$withval" = "no"; then
+      zlib_skip=yes
     else
-      AC_MSG_NOTICE([zlib library configuration])
-      zlib_prefix=$withval
-      save_cppflags="$CPPFLAGS"
-      CPPFLAGS="$CPPFLAGS -I$zlib_prefix/include"
-      AC_CHECK_HEADERS(zlib.h,[
-        save_ldflags="$LDFLAGS"
-        LDFLAGS="$LDFLAGS -L$zlib_prefix/lib"
-        AC_CHECK_LIB(z, inflate, [zlib_found="yes"])
-        LDFLAGS="$save_ldflags"
-      ])
-      CPPFLAGS="$save_cppflags"
+      zlib_skip=no
+      zlib_prefix="$withval"
     fi
-  ],
-  [
-    AC_CHECK_HEADER(zlib.h, [
-      AC_CHECK_LIB(z, inflate, [zlib_found="builtin"])
-    ])
   ])
 
-  if test "$zlib_found" = "no"; then
+  if test "$zlib_skip" = "yes"; then
     AC_MSG_ERROR([subversion requires zlib])
   fi
 
-  if test "$zlib_found" = "yes"; then
-    SVN_ZLIB_INCLUDES="-I$zlib_prefix/include"
-    LDFLAGS="$LDFLAGS `SVN_REMOVE_STANDARD_LIB_DIRS(-L$zlib_prefix/lib)`"
-  fi
+  if test -n "$zlib_prefix"; then
+    AC_MSG_NOTICE([zlib library configuration via prefix])
+    save_cppflags="$CPPFLAGS"
+    CPPFLAGS="$CPPFLAGS -I$zlib_prefix/include"
+    AC_CHECK_HEADERS(zlib.h,[
+      save_ldflags="$LDFLAGS"
+      LDFLAGS="$LDFLAGS -L$zlib_prefix/lib"
+      AC_CHECK_LIB(z, inflate, [
+        zlib_found="yes"
+        SVN_ZLIB_INCLUDES="-I$zlib_prefix/include"
+        SVN_ZLIB_LIBS="`SVN_REMOVE_STANDARD_LIB_DIRS(-L$zlib_prefix/lib)` -lz"
+      ])
+      LDFLAGS="$save_ldflags"
+    ])
+    CPPFLAGS="$save_cppflags"
+  else
+    SVN_ZLIB_PKG_CONFIG()
 
-  SVN_ZLIB_LIBS="-lz"
+    if test "$zlib_found" = "no"; then
+      AC_MSG_NOTICE([zlib library configuration])
+      AC_CHECK_HEADER(zlib.h, [
+        AC_CHECK_LIB(z, inflate, [
+          zlib_found="builtin"
+          SVN_ZLIB_LIBS="-lz"
+        ])
+      ])
+    fi
+  fi
+ 
+  if test "$zlib_found" = "no"; then
+    AC_MSG_ERROR([subversion requires zlib])
+  fi
 
   AC_SUBST(SVN_ZLIB_INCLUDES)
   AC_SUBST(SVN_ZLIB_LIBS)
 ])
+
+dnl SVN_ZLIB_PKG_CONFIG()
+dnl Use pkg-config to try and detect and configure zlib
+AC_DEFUN(SVN_ZLIB_PKG_CONFIG,
+[
+  AC_MSG_NOTICE([zlib library configuration via pkg-config])
+  if test -n "$PKG_CONFIG"; then
+    AC_MSG_CHECKING([for zlib library])
+    if $PKG_CONFIG zlib --exists; then
+      AC_MSG_RESULT([yes])
+      zlib_found=yes
+      SVN_ZLIB_INCLUDES=`$PKG_CONFIG zlib --cflags`
+      SVN_ZLIB_LIBS=`$PKG_CONFIG zlib --libs`
+    else
+      AC_MSG_RESULT([no])
+    fi
+  fi
+])

Modified: subversion/branches/authzperf/build/generator/gen_win_dependencies.py
URL: 
http://svn.apache.org/viewvc/subversion/branches/authzperf/build/generator/gen_win_dependencies.py?rev=1764707&r1=1764706&r2=1764707&view=diff
==============================================================================
--- subversion/branches/authzperf/build/generator/gen_win_dependencies.py 
(original)
+++ subversion/branches/authzperf/build/generator/gen_win_dependencies.py Thu 
Oct 13 15:25:15 2016
@@ -581,7 +581,7 @@ class GenDependenciesBase(gen_base.Gener
   def _find_httpd(self, show_warnings):
     "Find Apache HTTPD and version"
 
-    minimal_httpd_version = (2, 0, 0)
+    minimal_httpd_version = (2, 2, 0)
     if not self.httpd_path:
       return
 

Modified: subversion/branches/authzperf/build/win32/svn.rc
URL: 
http://svn.apache.org/viewvc/subversion/branches/authzperf/build/win32/svn.rc?rev=1764707&r1=1764706&r2=1764707&view=diff
==============================================================================
--- subversion/branches/authzperf/build/win32/svn.rc (original)
+++ subversion/branches/authzperf/build/win32/svn.rc Thu Oct 13 15:25:15 2016
@@ -70,7 +70,7 @@ BEGIN
   BEGIN
     BLOCK "040904B0"
     BEGIN
-      VALUE "CompanyName", "http://subversion.apache.org/\0";
+      VALUE "CompanyName", "Apache Software Foundation\0"
       VALUE "FileDescription", APR_STRINGIFY(SVN_FILE_DESCRIPTION) "\0"
       VALUE "FileVersion", SVN_VER_NUMBER "\0"
       VALUE "InternalName", "SVN\0"

Modified: subversion/branches/authzperf/configure.ac
URL: 
http://svn.apache.org/viewvc/subversion/branches/authzperf/configure.ac?rev=1764707&r1=1764706&r2=1764707&view=diff
==============================================================================
--- subversion/branches/authzperf/configure.ac (original)
+++ subversion/branches/authzperf/configure.ac Thu Oct 13 15:25:15 2016
@@ -208,7 +208,10 @@ localedir='${datadir}/locale'
 AC_SUBST(localedir)
 
 dnl For SVN_LOCALE_DIR, we have to expand it to something.  See SVN_BINDIR.
-if test "${datadir}" = '${prefix}/share' && test "${prefix}" = "NONE"; then
+if test "${prefix}" = "NONE" \
+  && ( test "${datadir}" = '${prefix}/share' \
+       || ( test "${datadir}" = '${datarootdir}' \
+            && test "${datarootdir}" = '${prefix}/share' ) ); then
   exp_localedir='${ac_default_prefix}/share/locale'
 else
   exp_localedir=$localedir

Modified: 
subversion/branches/authzperf/subversion/bindings/swig/ruby/test/test_core.rb
URL: 
http://svn.apache.org/viewvc/subversion/branches/authzperf/subversion/bindings/swig/ruby/test/test_core.rb?rev=1764707&r1=1764706&r2=1764707&view=diff
==============================================================================
--- 
subversion/branches/authzperf/subversion/bindings/swig/ruby/test/test_core.rb 
(original)
+++ 
subversion/branches/authzperf/subversion/bindings/swig/ruby/test/test_core.rb 
Thu Oct 13 15:25:15 2016
@@ -472,9 +472,19 @@ EOS
     latest.close
 
     expected = <<-EOD
+<<<<<<< #{modified.path}
+a
+ b
 
-  b
+||||||| #{original.path}
+a
+ b
+c
+=======
 
+  b
+c
+>>>>>>> #{latest.path}
 d
  e
 EOD

Modified: 
subversion/branches/authzperf/subversion/bindings/swig/ruby/test/test_fs.rb
URL: 
http://svn.apache.org/viewvc/subversion/branches/authzperf/subversion/bindings/swig/ruby/test/test_fs.rb?rev=1764707&r1=1764706&r2=1764707&view=diff
==============================================================================
--- subversion/branches/authzperf/subversion/bindings/swig/ruby/test/test_fs.rb 
(original)
+++ subversion/branches/authzperf/subversion/bindings/swig/ruby/test/test_fs.rb 
Thu Oct 13 15:25:15 2016
@@ -358,7 +358,7 @@ class SvnFsTest < Test::Unit::TestCase
     src = "a\nb\nc\nd\ne\n"
     modified = "A\nb\nc\nd\nE\n"
     result = "a\n\n\n\ne\n"
-    expected = "A\n\n\n\nE\n"
+    expected = "<<<<<<< .mine\nA\nb\nc\nd\n||||||| 
.r1\na\nb\nc\nd\n=======\na\n\n\n\n>>>>>>> .r2\nE\n"
     path_in_repos = "/#{file}"
     path = File.join(@wc_path, file)
 
@@ -378,6 +378,10 @@ class SvnFsTest < Test::Unit::TestCase
       ctx.up(@wc_path)
       assert_equal(expected, File.open(path){|f| f.read})
 
+      ctx.resolve(:path=>@wc_path,
+                  :conflict_choice=>Svn::Wc::CONFLICT_CHOOSE_THEIRS_CONFLICT)
+      expected = "a\n\n\n\nE\n"
+
       rev2 = ctx.ci(@wc_path).revision
       if use_deprecated_api
         stream = @fs.root(rev2).file_delta_stream(@fs.root(rev1),

Modified: 
subversion/branches/authzperf/subversion/include/private/svn_io_private.h
URL: 
http://svn.apache.org/viewvc/subversion/branches/authzperf/subversion/include/private/svn_io_private.h?rev=1764707&r1=1764706&r2=1764707&view=diff
==============================================================================
--- subversion/branches/authzperf/subversion/include/private/svn_io_private.h 
(original)
+++ subversion/branches/authzperf/subversion/include/private/svn_io_private.h 
Thu Oct 13 15:25:15 2016
@@ -85,32 +85,6 @@ svn_io__file_lock_autocreate(const char
                              apr_pool_t *pool);
 
 
-/** Buffer test handler function for a generic stream. @see svn_stream_t
- * and svn_stream__is_buffered().
- *
- * @since New in 1.7.
- */
-typedef svn_boolean_t (*svn_stream__is_buffered_fn_t)(void *baton);
-
-/** Set @a stream's buffer test function to @a is_buffered_fn
- *
- * @since New in 1.7.
- */
-void
-svn_stream__set_is_buffered(svn_stream_t *stream,
-                            svn_stream__is_buffered_fn_t is_buffered_fn);
-
-/** Return whether this generic @a stream uses internal buffering.
- * This may be used to work around subtle differences between buffered
- * and non-buffered APR files.  A lazy-open stream cannot report the
- * true buffering state until after the lazy open: a stream that
- * initially reports as non-buffered may report as buffered later.
- *
- * @since New in 1.7.
- */
-svn_boolean_t
-svn_stream__is_buffered(svn_stream_t *stream);
-
 /** Return the underlying file, if any, associated with the stream, or
  * NULL if not available.  Accessing the file bypasses the stream.
  */

Modified: 
subversion/branches/authzperf/subversion/include/private/svn_utf_private.h
URL: 
http://svn.apache.org/viewvc/subversion/branches/authzperf/subversion/include/private/svn_utf_private.h?rev=1764707&r1=1764706&r2=1764707&view=diff
==============================================================================
--- subversion/branches/authzperf/subversion/include/private/svn_utf_private.h 
(original)
+++ subversion/branches/authzperf/subversion/include/private/svn_utf_private.h 
Thu Oct 13 15:25:15 2016
@@ -198,7 +198,7 @@ svn_utf__encode_ucs4_string(svn_membuf_t
                             apr_size_t length,
                             apr_size_t *result_length);
 
-/* Pattern matching similar to the the SQLite LIKE and GLOB
+/* Pattern matching similar to the SQLite LIKE and GLOB
  * operators. PATTERN, KEY and ESCAPE must all point to UTF-8
  * strings. Furthermore, ESCAPE, if provided, must be a character from
  * the ASCII subset.

Modified: 
subversion/branches/authzperf/subversion/include/private/svn_wc_private.h
URL: 
http://svn.apache.org/viewvc/subversion/branches/authzperf/subversion/include/private/svn_wc_private.h?rev=1764707&r1=1764706&r2=1764707&view=diff
==============================================================================
--- subversion/branches/authzperf/subversion/include/private/svn_wc_private.h 
(original)
+++ subversion/branches/authzperf/subversion/include/private/svn_wc_private.h 
Thu Oct 13 15:25:15 2016
@@ -1767,7 +1767,9 @@ svn_wc__conflict_text_mark_resolved(svn_
 
 /** 
  * Resolve the conflicted property PROPNAME at LOCAL_ABSPATH as per CHOICE,
- * and then mark the conflict resolved.
+ * and then mark the conflict resolved.  If MERGED_VALUE is not NULL, this is
+ * the new merged property, used when choosing #svn_wc_conflict_choose_merged.
+ *
  * The working copy must already be locked for resolving, e.g. by calling
  * svn_wc__acquire_write_lock_for_resolve() first.
  * @since New in 1.10.
@@ -1777,6 +1779,7 @@ svn_wc__conflict_prop_mark_resolved(svn_
                                     const char *local_abspath,
                                     const char *propname,
                                     svn_wc_conflict_choice_t choice,
+                                    const svn_string_t *merged_value,
                                     svn_wc_notify_func2_t notify_func,
                                     void *notify_baton,
                                     apr_pool_t *scratch_pool);
@@ -1890,6 +1893,50 @@ svn_wc__conflict_tree_update_moved_away_
                                              void *notify_baton,
                                              apr_pool_t *scratch_pool);
 
+/* Merge local changes from a tree conflict victim of an incoming deletion
+ * to the specified DEST_ABSPATH. Both LOCAL_ABSPATH and DEST_ABSPATH must
+ * be directories.
+ *
+ * Assuming DEST_ABSPATH is the correct destination, this function allows
+ * local changes to "follow" incoming moves.
+ *
+ * @since New in 1.10. */
+svn_error_t *
+svn_wc__conflict_tree_merge_local_changes(svn_wc_context_t *wc_ctx,
+                                          const char *local_abspath,
+                                          const char *dest_abspath,
+                                          svn_cancel_func_t cancel_func,
+                                          void *cancel_baton,
+                                          svn_wc_notify_func2_t notify_func,
+                                          void *notify_baton,
+                                          apr_pool_t *scratch_pool);
+
+/* Find nodes in the working copy which corresponds to the new location
+ * MOVED_TO_REPOS_RELPATH@REV of the tree conflict victim at VICTIM_ABSPATH.
+ * The nodes must be of the same node kind as VICTIM_NODE_KIND.
+ * If no such node can be found, set *POSSIBLE_TARGETS to an empty array.
+ *
+ * The nodes should be useful for conflict resolution, e.g. it should be
+ * possible to merge changes into these nodes to resolve an incoming-move
+ * tree conflict. But the exact criteria for selecting a node are left
+ * to the implementation of this function.
+ * Note that this function may not necessarily return a node which was
+ * actually moved. The only hard guarantee is that the node corresponds to
+ * the repository node MOVED_TO_REPOS_RELPATH@REV specified by the caller.
+ * In many cases, this will be a moved node if the caller's parameters are
+ * correct. Users should be able to perform a sanity check on the results
+ * returned from this function.
+ */
+svn_error_t *
+svn_wc__guess_incoming_move_target_nodes(apr_array_header_t **possible_targets,
+                                         svn_wc_context_t *wc_ctx,
+                                         const char *victim_abspath,
+                                         svn_node_kind_t victim_node_kind,
+                                         const char *moved_to_repos_relpath,
+                                         svn_revnum_t rev,
+                                         apr_pool_t *result_pool,
+                                         apr_pool_t *scratch_pool);
+
 /**
  * Move @a src_abspath to @a dst_abspath, by scheduling @a dst_abspath
  * for addition to the repository, remembering the history. Mark @a src_abspath

Modified: subversion/branches/authzperf/subversion/include/svn_client.h
URL: 
http://svn.apache.org/viewvc/subversion/branches/authzperf/subversion/include/svn_client.h?rev=1764707&r1=1764706&r2=1764707&view=diff
==============================================================================
--- subversion/branches/authzperf/subversion/include/svn_client.h (original)
+++ subversion/branches/authzperf/subversion/include/svn_client.h Thu Oct 13 
15:25:15 2016
@@ -4406,23 +4406,26 @@ typedef enum svn_client_conflict_option_
   /* Options for local delete/replace vs incoming edit on update. */
   svn_client_conflict_option_update_any_moved_away_children,
 
-  /* Options for incoming add vs local 'obstruction' on merge. */
-  svn_client_conflict_option_merge_incoming_add_ignore,
+  /* Options for incoming add vs local add or obstruction. */
+  svn_client_conflict_option_incoming_add_ignore,
 
-  /* Options for incoming file add vs local file 'obstruction' on merge. */
-  svn_client_conflict_option_merge_incoming_added_file_text_merge,
-  svn_client_conflict_option_merge_incoming_added_file_replace,
-  svn_client_conflict_option_merge_incoming_added_file_replace_and_merge,
-
-  /* Options for incoming dir add vs local dir 'obstruction' on merge. */
-  svn_client_conflict_option_merge_incoming_added_dir_merge,
-  svn_client_conflict_option_merge_incoming_added_dir_replace,
-  svn_client_conflict_option_merge_incoming_added_dir_replace_and_merge,
+  /* Options for incoming file add vs local file add or obstruction. */
+  svn_client_conflict_option_incoming_added_file_text_merge,
+  svn_client_conflict_option_incoming_added_file_replace_and_merge,
+
+  /* Options for incoming dir add vs local dir add or obstruction. */
+  svn_client_conflict_option_incoming_added_dir_merge,
+  svn_client_conflict_option_incoming_added_dir_replace,
+  svn_client_conflict_option_incoming_added_dir_replace_and_merge,
 
   /* Options for incoming delete vs any */
   svn_client_conflict_option_incoming_delete_ignore,
   svn_client_conflict_option_incoming_delete_accept,
 
+  /* Options for incoming move vs local edit */
+  svn_client_conflict_option_incoming_move_file_text_merge,
+  svn_client_conflict_option_incoming_move_dir_merge,
+
 } svn_client_conflict_option_id_t;
 
 /**
@@ -4443,6 +4446,96 @@ svn_client_conflict_option_set_merged_pr
   const svn_string_t *merged_propval);
 
 /**
+ * Get a list of possible repository paths which can be applied to the
+ * svn_client_conflict_option_incoming_move_file_text_merge or
+ * svn_client_conflict_option_incoming_move_dir_merge resolution
+ * @a option. (If a different option is passed in, this function will
+ * raise an assertion failure.)
+ *
+ * In some situations, there can be multiple possible destinations for an
+ * incoming move. One such situation is where a file was copied and moved
+ * in the same revision: svn cp a b; svn mv a c; svn commit
+ * When this move is merged elsewhere, both b and c will appear as valid move
+ * destinations to the conflict resolver. To resolve such ambiguity, the client
+ * may call this function to obtain a list of possible destinations the user
+ * may choose from.
+ *
+ * The array is allocated in @a result_pool and will have "const char *"
+ * elements pointing to strings also allocated in @a result_pool.
+ * All paths are relpaths, and relative to the repository root.
+ *
+ * @see svn_client_conflict_option_set_moved_to_repos_relpath()
+ * @since New in 1.10.
+ */
+svn_error_t *
+svn_client_conflict_option_get_moved_to_repos_relpath_candidates(
+  apr_array_header_t **possible_moved_to_repos_relpaths,
+  svn_client_conflict_option_t *option,
+  apr_pool_t *result_pool,
+  apr_pool_t *scratch_pool);
+
+/**
+ * Set the preferred moved target repository path for the
+ * svn_client_conflict_option_incoming_move_file_text_merge or
+ * svn_client_conflict_option_incoming_move_dir_merge resolution option.
+ * 
+ * @a preferred_move_target_idx must be a valid index into the list returned
+ * by svn_client_conflict_option_get_moved_to_repos_relpath_candidates().
+ * 
+ * @since New in 1.10.
+ */
+svn_error_t *
+svn_client_conflict_option_set_moved_to_repos_relpath(
+  svn_client_conflict_option_t *option,
+  int preferred_move_target_idx,
+  apr_pool_t *scratch_pool);
+
+/**
+ * Get a list of possible moved-to abspaths in the working copy which can be
+ * applied to the svn_client_conflict_option_incoming_move_file_text_merge
+ * or svn_client_conflict_option_incoming_move_dir_merge resolution @a option.
+ * (If a different option is passed in, this function will raise an assertion
+ * failure.)
+ *
+ * All paths in the returned list correspond to the repository path which
+ * is assumed to be the destination of the incoming move operation.
+ * To support cases where this destination path is ambiguous, the client may
+ * call svn_client_conflict_option_get_moved_to_repos_relpath_candidates()
+ * before calling this function to let the user select a repository path first.
+ * 
+ * If no possible moved-to paths can be found, return an empty array.
+ * This doesn't mean that no move happened in the repository. It is possible
+ * that the move destination is outside the scope of the current working copy,
+ * for example, in which case the conflict must be resolved in some other way.
+ *
+ * @see svn_client_conflict_option_set_moved_to_abspath()
+ * @since New in 1.10.
+ */
+svn_error_t *
+svn_client_conflict_option_get_moved_to_abspath_candidates(
+  apr_array_header_t **possible_moved_to_abspaths,
+  svn_client_conflict_option_t *option,
+  apr_pool_t *result_pool,
+  apr_pool_t *scratch_pool);
+
+/**
+ * Set the preferred moved target abspath for the
+ * svn_client_conflict_option_incoming_move_file_text_merge or
+ * svn_client_conflict_option_incoming_move_dir_merge resolution option.
+ * 
+ * @a preferred_move_target_idx must be a valid index into the list
+ * returned by svn_client_conflict_option_get_moved_to_abspath_candidates().
+ * 
+ * @since New in 1.10.
+ */
+svn_error_t *
+svn_client_conflict_option_set_moved_to_abspath(
+  svn_client_conflict_option_t *option,
+  int preferred_move_target_idx,
+  svn_client_ctx_t *ctx,
+  apr_pool_t *scratch_pool);
+
+/**
  * Given an @a option_id, try to find the corresponding option in @a options,
  * which is an array of svn_client_conflict_option_t * elements.
  *
@@ -4546,6 +4639,7 @@ svn_client_conflict_tree_get_description
   const char **incoming_change_description,
   const char **local_change_description,
   svn_client_conflict_t *conflict,
+  svn_client_ctx_t *ctx,
   apr_pool_t *result_pool,
   apr_pool_t *scratch_pool);
 
@@ -4558,6 +4652,7 @@ svn_client_conflict_tree_get_description
 svn_error_t *
 svn_client_conflict_text_get_resolution_options(apr_array_header_t **options,
                                                 svn_client_conflict_t 
*conflict,
+                                                svn_client_ctx_t *ctx,
                                                 apr_pool_t *result_pool,
                                                 apr_pool_t *scratch_pool);
 
@@ -4570,6 +4665,7 @@ svn_client_conflict_text_get_resolution_
 svn_error_t *
 svn_client_conflict_prop_get_resolution_options(apr_array_header_t **options,
                                                 svn_client_conflict_t 
*conflict,
+                                                svn_client_ctx_t *ctx,
                                                 apr_pool_t *result_pool,
                                                 apr_pool_t *scratch_pool);
 
@@ -4586,6 +4682,7 @@ svn_client_conflict_prop_get_resolution_
 svn_error_t *
 svn_client_conflict_tree_get_resolution_options(apr_array_header_t **options,
                                                 svn_client_conflict_t 
*conflict,
+                                                svn_client_ctx_t *ctx,
                                                 apr_pool_t *result_pool,
                                                 apr_pool_t *scratch_pool);
 
@@ -4598,12 +4695,14 @@ svn_client_conflict_tree_get_resolution_
  * A call to svn_client_conflict_tree_get_resolution_options() may provide
  * more useful resolution options if this function has been called.
  *
- * This function may contact the repository.
+ * This function may contact the repository. Use the authentication baton
+ * cached in @a ctx for authentication if contacting the repository.
  *
  * @since New in 1.10.
  */
 svn_error_t *
 svn_client_conflict_tree_get_details(svn_client_conflict_t *conflict,
+                                     svn_client_ctx_t *ctx,
                                      apr_pool_t *scratch_pool);
 
 /**
@@ -4766,6 +4865,7 @@ svn_client_conflict_tree_get_victim_node
 svn_error_t *
 svn_client_conflict_tree_resolve(svn_client_conflict_t *conflict,
                                  svn_client_conflict_option_t *option,
+                                 svn_client_ctx_t *ctx,
                                  apr_pool_t *scratch_pool);
 
 /**
@@ -4782,6 +4882,7 @@ svn_error_t *
 svn_client_conflict_tree_resolve_by_id(
   svn_client_conflict_t *conflict,
   svn_client_conflict_option_id_t option_id,
+  svn_client_ctx_t *ctx,
   apr_pool_t *scratch_pool);
 
 /**
@@ -4837,6 +4938,7 @@ svn_error_t *
 svn_client_conflict_prop_resolve(svn_client_conflict_t *conflict,
                                  const char *propname,
                                  svn_client_conflict_option_t *option,
+                                 svn_client_ctx_t *ctx,
                                  apr_pool_t *scratch_pool);
 /**
  * If the provided @a option_id is the ID of an option which resolves
@@ -4851,6 +4953,7 @@ svn_client_conflict_prop_resolve_by_id(
   svn_client_conflict_t *conflict,
   const char *propname,
   svn_client_conflict_option_id_t option_id,
+  svn_client_ctx_t *ctx,
   apr_pool_t *scratch_pool);
 
 /**
@@ -4901,6 +5004,7 @@ svn_client_conflict_text_get_contents(co
 svn_error_t *
 svn_client_conflict_text_resolve(svn_client_conflict_t *conflict,
                                  svn_client_conflict_option_t *option,
+                                 svn_client_ctx_t *ctx,
                                  apr_pool_t *scratch_pool);
 
 /**
@@ -4914,6 +5018,7 @@ svn_error_t *
 svn_client_conflict_text_resolve_by_id(
   svn_client_conflict_t *conflict,
   svn_client_conflict_option_id_t option_id,
+  svn_client_ctx_t *ctx,
   apr_pool_t *scratch_pool);
 
 /**

Modified: subversion/branches/authzperf/subversion/include/svn_fs.h
URL: 
http://svn.apache.org/viewvc/subversion/branches/authzperf/subversion/include/svn_fs.h?rev=1764707&r1=1764706&r2=1764707&view=diff
==============================================================================
--- subversion/branches/authzperf/subversion/include/svn_fs.h (original)
+++ subversion/branches/authzperf/subversion/include/svn_fs.h Thu Oct 13 
15:25:15 2016
@@ -2731,7 +2731,7 @@ svn_fs_deltify_revision(svn_fs_t *fs,
  * as old as the last barrier.
  *
  * The intended use of this is implementing efficient queries in upper layers
- * where the result only needs to include all changes up the the start of
+ * where the result only needs to include all changes up to the start of
  * that query but does not need to pick up on changes while the query is
  * running:
  *

Modified: subversion/branches/authzperf/subversion/include/svn_io.h
URL: 
http://svn.apache.org/viewvc/subversion/branches/authzperf/subversion/include/svn_io.h?rev=1764707&r1=1764706&r2=1764707&view=diff
==============================================================================
--- subversion/branches/authzperf/subversion/include/svn_io.h (original)
+++ subversion/branches/authzperf/subversion/include/svn_io.h Thu Oct 13 
15:25:15 2016
@@ -918,6 +918,17 @@ typedef svn_error_t *(*svn_stream_seek_f
 typedef svn_error_t *(*svn_stream_data_available_fn_t)(void *baton,
                                               svn_boolean_t *data_available);
 
+/** Readline handler function for a generic stream. @see svn_stream_t and
+ * svn_stream_readline().
+ *
+ * @since New in 1.10.
+ */
+typedef svn_error_t *(*svn_stream_readline_fn_t)(void *baton,
+                                                 svn_stringbuf_t **stringbuf,
+                                                 const char *eol,
+                                                 svn_boolean_t *eof,
+                                                 apr_pool_t *pool);
+
 /** Create a generic stream.  @see svn_stream_t. */
 svn_stream_t *
 svn_stream_create(void *baton,
@@ -992,6 +1003,14 @@ void
 svn_stream_set_data_available(svn_stream_t *stream,
                               svn_stream_data_available_fn_t data_available);
 
+/** Set @a stream's readline function to @a readline_fn
+ *
+ * @since New in 1.10.
+ */
+void
+svn_stream_set_readline(svn_stream_t *stream,
+                        svn_stream_readline_fn_t readline_fn);
+
 /** Create a stream that is empty for reading and infinite for writing. */
 svn_stream_t *
 svn_stream_empty(apr_pool_t *pool);
@@ -1254,6 +1273,24 @@ svn_stream_checksummed(svn_stream_t *str
                        svn_boolean_t read_all,
                        apr_pool_t *pool);
 
+/** Read the contents of the readable stream @a stream and return its
+ * checksum of type @a kind in @a *checksum.
+ *
+ * The stream will be closed before this function returns (regardless
+ * of the result, or any possible error).
+ *
+ * Use @a scratch_pool for temporary allocations and @a result_pool
+ * to allocate @a *checksum.
+ *
+ * @since New in 1.10.
+ */
+svn_error_t *
+svn_stream_contents_checksum(svn_checksum_t **checksum,
+                             svn_stream_t *stream,
+                             svn_checksum_kind_t kind,
+                             apr_pool_t *result_pool,
+                             apr_pool_t *scratch_pool);
+
 /** Read from a generic stream until @a buffer is filled upto @a *len or
  * until EOF is reached. @see svn_stream_t
  *

Modified: subversion/branches/authzperf/subversion/include/svn_types.h
URL: 
http://svn.apache.org/viewvc/subversion/branches/authzperf/subversion/include/svn_types.h?rev=1764707&r1=1764706&r2=1764707&view=diff
==============================================================================
--- subversion/branches/authzperf/subversion/include/svn_types.h (original)
+++ subversion/branches/authzperf/subversion/include/svn_types.h Thu Oct 13 
15:25:15 2016
@@ -416,7 +416,7 @@ svn_tristate__from_word(const char * wor
  *  2. Creating a new textual name similar to
  *     SVN_SUBST__SPECIAL_LINK_STR in libsvn_subr/subst.c.
  *  3. Handling the translation/detranslation case for the new type in
- *     create_special_file and detranslate_special_file, using the
+ *     create_special_file_from_stream and detranslate_special_file, using the
  *     routines from 1.
  */
 
@@ -1078,6 +1078,11 @@ typedef svn_error_t *(*svn_log_message_r
  * @a commit_info, along with the @a baton closure.
  * @a pool can be used for temporary allocations.
  *
+ * @note Implementers of this callback that pass this callback to
+ * svn_ra_get_commit_editor3() should be careful with returning errors
+ * as these might be returned as commit errors. See the documentation
+ * of svn_ra_get_commit_editor3() for more details.
+ *
  * @since New in 1.4.
  */
 typedef svn_error_t *(*svn_commit_callback2_t)(

Modified: subversion/branches/authzperf/subversion/include/svn_wc.h
URL: 
http://svn.apache.org/viewvc/subversion/branches/authzperf/subversion/include/svn_wc.h?rev=1764707&r1=1764706&r2=1764707&view=diff
==============================================================================
--- subversion/branches/authzperf/subversion/include/svn_wc.h (original)
+++ subversion/branches/authzperf/subversion/include/svn_wc.h Thu Oct 13 
15:25:15 2016
@@ -1292,6 +1292,19 @@ typedef enum svn_wc_notify_action_t
    * @since New in 1.10. */
   svn_wc_notify_resolved_tree,
 
+  /** Starting to search the repository for details about a tree conflict.
+   * @since New in 1.10. */
+  svn_wc_notify_begin_search_tree_conflict_details,
+
+  /** Progressing in search of repository for details about a tree conflict.
+   * The revision being searched is specified in #svn_wc_notify_t.revision.
+   * @since New in 1.10. */
+  svn_wc_notify_tree_conflict_details_progress,
+
+  /** Done searching the repository for details about a conflict.
+   * @since New in 1.10. */
+  svn_wc_notify_end_search_tree_conflict_details,
+
 } svn_wc_notify_action_t;
 
 


Reply via email to