subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From phi...@apache.org
Subject svn commit: r1573603 [1/3] - in /subversion/branches/fsfs-lock-many: ./ build/ build/ac-macros/ contrib/cgi/ contrib/client-side/emacs/ contrib/client-side/svn2cl/ contrib/hook-scripts/ contrib/server-side/svnstsw/ notes/ notes/merge-tracking/ notes/wc...
Date Mon, 03 Mar 2014 16:39:01 GMT
Author: philip
Date: Mon Mar  3 16:38:58 2014
New Revision: 1573603

URL: http://svn.apache.org/r1573603
Log:
On fsfs-lock-many branch: sync with trunk at r1573585.

Added:
    subversion/branches/fsfs-lock-many/tools/buildbot/slaves/svn-x64-centos/
      - copied from r1573585, subversion/trunk/tools/buildbot/slaves/svn-x64-centos/
Removed:
    subversion/branches/fsfs-lock-many/tools/buildbot/slaves/centos/
Modified:
    subversion/branches/fsfs-lock-many/   (props changed)
    subversion/branches/fsfs-lock-many/CHANGES
    subversion/branches/fsfs-lock-many/Makefile.in
    subversion/branches/fsfs-lock-many/build/ac-macros/compiler.m4
    subversion/branches/fsfs-lock-many/build/ac-macros/serf.m4
    subversion/branches/fsfs-lock-many/build/run_tests.py
    subversion/branches/fsfs-lock-many/configure.ac
    subversion/branches/fsfs-lock-many/contrib/cgi/mirror_dir_through_svn.cgi
    subversion/branches/fsfs-lock-many/contrib/client-side/emacs/psvn.el
    subversion/branches/fsfs-lock-many/contrib/client-side/svn2cl/svn2cl.xsl
    subversion/branches/fsfs-lock-many/contrib/hook-scripts/remove-zombie-locks.py
    subversion/branches/fsfs-lock-many/contrib/hook-scripts/syntax-check.sh
    subversion/branches/fsfs-lock-many/contrib/server-side/svnstsw/configure.ac
    subversion/branches/fsfs-lock-many/notes/assurance.txt
    subversion/branches/fsfs-lock-many/notes/fs-improvements.txt
    subversion/branches/fsfs-lock-many/notes/knobs
    subversion/branches/fsfs-lock-many/notes/merge-tracking/func-spec.html
    subversion/branches/fsfs-lock-many/notes/merge-tracking/summit-survey.html
    subversion/branches/fsfs-lock-many/notes/wc-ng/design
    subversion/branches/fsfs-lock-many/notes/wc-ng/locking
    subversion/branches/fsfs-lock-many/notes/wc-ng/nodes
    subversion/branches/fsfs-lock-many/subversion/bindings/ctypes-python/csvn/core/__init__.py
    subversion/branches/fsfs-lock-many/subversion/bindings/ctypes-python/examples/example.py
    subversion/branches/fsfs-lock-many/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictResult.java
    subversion/branches/fsfs-lock-many/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
    subversion/branches/fsfs-lock-many/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
    subversion/branches/fsfs-lock-many/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java
    subversion/branches/fsfs-lock-many/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictResult.java
    subversion/branches/fsfs-lock-many/subversion/bindings/javahl/src/org/tigris/subversion/javahl/PropertyData.java
    subversion/branches/fsfs-lock-many/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java
    subversion/branches/fsfs-lock-many/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
    subversion/branches/fsfs-lock-many/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java
    subversion/branches/fsfs-lock-many/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
    subversion/branches/fsfs-lock-many/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
    subversion/branches/fsfs-lock-many/subversion/bindings/swig/include/proxy_apr.swg
    subversion/branches/fsfs-lock-many/subversion/bindings/swig/perl/native/Client.pm
    subversion/branches/fsfs-lock-many/subversion/bindings/swig/perl/native/t/3client.t
    subversion/branches/fsfs-lock-many/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
    subversion/branches/fsfs-lock-many/subversion/include/private/svn_diff_tree.h
    subversion/branches/fsfs-lock-many/subversion/include/private/svn_io_private.h
    subversion/branches/fsfs-lock-many/subversion/include/private/svn_magic.h
    subversion/branches/fsfs-lock-many/subversion/include/private/svn_ra_svn_private.h
    subversion/branches/fsfs-lock-many/subversion/include/private/svn_string_private.h
    subversion/branches/fsfs-lock-many/subversion/include/svn_config.h
    subversion/branches/fsfs-lock-many/subversion/include/svn_fs.h
    subversion/branches/fsfs-lock-many/subversion/include/svn_io.h
    subversion/branches/fsfs-lock-many/subversion/include/svn_iter.h
    subversion/branches/fsfs-lock-many/subversion/include/svn_props.h
    subversion/branches/fsfs-lock-many/subversion/include/svn_ra.h
    subversion/branches/fsfs-lock-many/subversion/include/svn_repos.h
    subversion/branches/fsfs-lock-many/subversion/libsvn_client/add.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_client/copy_foreign.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_client/diff.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_client/import.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_client/merge.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_delta/xdelta.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_diff/diff4.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_diff/util.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs/editor.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs/fs-loader.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_fs/cached_data.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_fs/fs_fs.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_fs/index.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_fs/pack.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_fs/temp_serializer.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_fs/temp_serializer.h
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_fs/transaction.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_fs/tree.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_fs/verify.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_x/   (props changed)
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_x/fs.h
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_x/fs_x.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_x/index.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_x/pack.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_x/reps.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_x/string_table.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_x/temp_serializer.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_x/temp_serializer.h
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_x/transaction.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_fs_x/tree.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_ra_serf/README
    subversion/branches/fsfs-lock-many/subversion/libsvn_ra_svn/protocol
    subversion/branches/fsfs-lock-many/subversion/libsvn_repos/delta.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_repos/dump.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_repos/hooks.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_repos/load-fs-vtable.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_repos/log.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_repos/reporter.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_repos/rev_hunt.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_subr/checksum.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_subr/config_file.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_subr/dirent_uri.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_subr/fnv1a.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_subr/io.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_subr/magic.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_subr/opt.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_subr/simple_providers.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_subr/ssl_client_cert_pw_providers.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_subr/ssl_server_trust_providers.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_subr/string.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_subr/subst.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_subr/sysinfo.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_subr/username_providers.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_subr/utf8proc.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_subr/utf8proc/utf8proc.h
    subversion/branches/fsfs-lock-many/subversion/libsvn_wc/entries.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_wc/externals.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_wc/lock.c
    subversion/branches/fsfs-lock-many/subversion/libsvn_wc/update_editor.c
    subversion/branches/fsfs-lock-many/subversion/svn/auth-cmd.c
    subversion/branches/fsfs-lock-many/subversion/svn/file-merge.c
    subversion/branches/fsfs-lock-many/subversion/svn/status-cmd.c
    subversion/branches/fsfs-lock-many/subversion/svn/svn.c
    subversion/branches/fsfs-lock-many/subversion/svnlook/svnlook.c
    subversion/branches/fsfs-lock-many/subversion/svnrdump/load_editor.c
    subversion/branches/fsfs-lock-many/subversion/svnserve/svnserve.c
    subversion/branches/fsfs-lock-many/subversion/tests/cmdline/commit_tests.py
    subversion/branches/fsfs-lock-many/subversion/tests/cmdline/diff_tests.py
    subversion/branches/fsfs-lock-many/subversion/tests/cmdline/merge_reintegrate_tests.py
    subversion/branches/fsfs-lock-many/subversion/tests/cmdline/merge_tests.py
    subversion/branches/fsfs-lock-many/subversion/tests/cmdline/revert_tests.py
    subversion/branches/fsfs-lock-many/subversion/tests/cmdline/svnauthz_tests.py
    subversion/branches/fsfs-lock-many/subversion/tests/cmdline/svntest/factory.py
    subversion/branches/fsfs-lock-many/subversion/tests/cmdline/svntest/main.py
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_repos/repos-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_subr/string-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_subr/utf-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/libsvn_wc/db-test.c
    subversion/branches/fsfs-lock-many/subversion/tests/svn_test_main.c
    subversion/branches/fsfs-lock-many/tools/dev/trails.py

Propchange: subversion/branches/fsfs-lock-many/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1572540-1573585

Modified: subversion/branches/fsfs-lock-many/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/CHANGES?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/CHANGES (original)
+++ subversion/branches/fsfs-lock-many/CHANGES Mon Mar  3 16:38:58 2014
@@ -1270,7 +1270,7 @@ http://svn.apache.org/repos/asf/subversi
     * fix ra_serf against Subversion 1.2 servers (r1349367)
     * fix 'svn upgrade' on working copies with certain tree conflicts (r1345482)
     * avoid workqueue references to system temp dir (r1367854)
-    * allow non-existant canonical paths (r1367853)
+    * allow non-existent canonical paths (r1367853)
     * fix 'svn revert --depth files' to operate on files (r1365554)
     * fix ra_serf XML namespace handling against malicious server (r1337441)
     * fix relocate with server-relative externals (issue 4216)
@@ -1622,7 +1622,7 @@ the 1.6 release:  http://subversion.apac
     * fixed: rm -> ci -> cp = missing directory (issue #2763)
     * fixed: 'svn info' returns parent info on missing dirs (issue #3178)
     * fixed: spurious prop conflict with 'merge --reintegrate' (issue #3919)
-    * fixed: 'svn --version' fails with non-existant $HOME (issue #3947)
+    * fixed: 'svn --version' fails with non-existent $HOME (issue #3947)
     * fixed: unforced export silently overwites existing file (issue #3799)
     * fixed: reverse merge which adds subtree mergeinfo fails (issue #3978)
     * fixed: 'svn up -r{R>HEAD}' hangs client over ra_svn (issue #3963)
@@ -1797,7 +1797,7 @@ http://svn.apache.org/repos/asf/subversi
     * fix crash in mod_dav_svn with GETs of baselined resources (r1104126)
             See CVE-2011-1752, and descriptive advisory at
             http://subversion.apache.org/security/CVE-2011-1752-advisory.txt
-    * fixed: write-through proxy could direcly commit to slave (r917523)
+    * fixed: write-through proxy could directly commit to slave (r917523)
     * detect a particular corruption condition in FSFS (r1100213)
     * improve error message when clients refer to unknown revisions (r939000)
     * bugfixes and optimizations to the DAV mirroring code (r878607)

Modified: subversion/branches/fsfs-lock-many/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/Makefile.in?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/Makefile.in (original)
+++ subversion/branches/fsfs-lock-many/Makefile.in Mon Mar  3 16:38:58 2014
@@ -536,7 +536,7 @@ check: bin @TRANSFORM_LIBTOOL_SCRIPTS@ $
 	    flags="--fsfs-packing $$flags";                                  \
 	  fi;                                                                \
 	  if test "$(PARALLEL)" != ""; then                                  \
-	    flags="--parallel $$flags";                                      \
+	    flags="--parallel $(PARALLEL) $$flags";                          \
 	  fi;                                                                \
 	  if test "$(LOG_TO_STDOUT)" != ""; then                             \
 	    flags="--log-to-stdout $$flags";                                 \

Modified: subversion/branches/fsfs-lock-many/build/ac-macros/compiler.m4
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/build/ac-macros/compiler.m4?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/build/ac-macros/compiler.m4 (original)
+++ subversion/branches/fsfs-lock-many/build/ac-macros/compiler.m4 Mon Mar  3 16:38:58 2014
@@ -33,24 +33,27 @@ AC_DEFUN([_SVN_XXFLAGS_ADD_IFELSE],
 [
   _svn_xxflags__save="[$][$3]"
   AC_LANG_PUSH([$1])
-  AC_MSG_CHECKING([if [$][$2] accepts $4])
-  [$3]="$4 [$][$3]"
-  AC_COMPILE_IFELSE([AC_LANG_SOURCE([[]])],[
+  AC_MSG_CHECKING([if [$][$2] accepts $5])
+  [$3]="$5 [$][$3]"
+  dnl Compiling is not enough: Solaris cc accepts invalid options at
+  dnl compile-time and just warns, assuming they are for the linker,
+  dnl but they cause errors at link-time.
+  AC_LINK_IFELSE([AC_LANG_SOURCE([$4])],[
     AC_MSG_RESULT([yes])
-    $5
+    $6
   ],[
     AC_MSG_RESULT([no])
     [$3]="$_svn_xxflags__save"
-    $6
+    $7
   ])
   AC_LANG_POP([$1])
 ])
 
 AC_DEFUN([SVN_CFLAGS_ADD_IFELSE],
-  [_SVN_XXFLAGS_ADD_IFELSE([C],[CC],[CFLAGS],[$1],[$2],[$3])])
+  [_SVN_XXFLAGS_ADD_IFELSE([C],[CC],[CFLAGS],[[int main(void){return 0;}]],[$1],[$2],[$3])])
 
 AC_DEFUN([SVN_CXXFLAGS_ADD_IFELSE],
-  [_SVN_XXFLAGS_ADD_IFELSE([C++],[CXX],[CXXFLAGS],[$1],[$2],[$3])])
+  [_SVN_XXFLAGS_ADD_IFELSE([C++],[CXX],[CXXFLAGS],[[int main(){}]],[$1],[$2],[$3])])
 
 
 AC_DEFUN([SVN_CC_MODE_SETUP],

Modified: subversion/branches/fsfs-lock-many/build/ac-macros/serf.m4
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/build/ac-macros/serf.m4?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/build/ac-macros/serf.m4 (original)
+++ subversion/branches/fsfs-lock-many/build/ac-macros/serf.m4 Mon Mar  3 16:38:58 2014
@@ -29,8 +29,14 @@ dnl  performed with pkg-config.  If --wi
 dnl  then we error if we can't actually find serf.
 dnl
 dnl  If a --with-serf=PREFIX option is passed search for a suitable
-dnl  serf installed on the system under that PREFIX.  We will
-dnl  error if we can't find serf.
+dnl  serf installed on the system under that PREFIX.  First we will
+dnl  try to find a pc file for serf under the prefix or directly
+dnl  in the prefix (allowing the path that the serf-?.pc file to be
+dnl  passed to configure if the pc file is in a non-standard location)
+dnl  and then use pkg-config to determine the options to use that library.
+dnl  If pkg-confg can't provide us the options to use that library fall
+dnl  back on trying to use the guess the options based on just the prefix.
+dnl  We will error if we can't find serf.
 dnl
 dnl  If a --with-serf=no option is passed then no search will be
 dnl  conducted.
@@ -58,13 +64,15 @@ AC_DEFUN(SVN_LIB_SERF,
     elif test "$withval" = "no" ; then
       serf_skip=yes 
     else
-      SVN_SERF_PREFIX_CONFIG()
+      serf_required=yes
+      serf_prefix="$withval"
     fi
   ])
 
   if test "$serf_skip" = "no" ; then
-    if test "$serf_found" = "no" ; then
-      SVN_SERF_PKG_CONFIG()
+    SVN_SERF_PKG_CONFIG()
+    if test -n "$serf_prefix" && test "$serf_found" = "no" ; then
+      SVN_SERF_PREFIX_CONFIG()
     fi
   
     AC_MSG_CHECKING([was serf enabled])
@@ -91,7 +99,6 @@ AC_DEFUN(SVN_SERF_PREFIX_CONFIG,
 [
   AC_MSG_NOTICE([serf library configuration via prefix])
   serf_required=yes
-  serf_prefix=$withval
   for serf_major in serf-2 serf-1; do
     if ! test -d $serf_prefix/include/$serf_major; then continue; fi
     save_cppflags="$CPPFLAGS"
@@ -134,17 +141,37 @@ AC_DEFUN(SVN_SERF_PKG_CONFIG,
   if test -n "$PKG_CONFIG"; then
     for serf_major in serf-2 serf-1; do
       AC_MSG_CHECKING([for $serf_major library])
-      if $PKG_CONFIG $serf_major --exists; then
+      if test -n "$serf_prefix" ; then
+        dnl User provided a prefix so we try to find the pc file under
+        dnl the prefix.  PKG_CONFIG_PATH isn't useful for this because
+        dnl we want to make sure that we get the library in the prefix
+        dnl the user specifies and we want to allow the prefix path to
+        dnl point at the path for the pc file is in (if it's in some
+        dnl other path than $serf_prefx/lib/pkgconfig).
+        if test -e "$serf_prefix/$serf_major.pc" ; then
+          serf_pc_arg="$serf_prefix/$serf_major.pc"
+        elif test -e "$serf_prefix/lib/pkgconfig/$serf_major.pc" ; then
+          serf_pc_arg="$serf_prefix/lib/pkgconfig/$serf_major.pc"
+        else
+          AC_MSG_RESULT([no])
+          continue
+        fi
+      else
+        serf_pc_arg="$serf_major"
+      fi
+      if $PKG_CONFIG $serf_pc_arg --exists; then
         AC_MSG_RESULT([yes])
         AC_MSG_CHECKING([serf library version])
-        SERF_VERSION=`$PKG_CONFIG $serf_major --modversion`
+        SERF_VERSION=`$PKG_CONFIG $serf_pc_arg --modversion`
         AC_MSG_RESULT([$SERF_VERSION])
         AC_MSG_CHECKING([serf version is suitable])
-        if $PKG_CONFIG $serf_major --atleast-version=$serf_check_version; then
+        if $PKG_CONFIG $serf_pc_arg --atleast-version=$serf_check_version; then
           AC_MSG_RESULT([yes])
           serf_found=yes
-          SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_major --cflags | $SED -e 's/-D[^ ]*//g'`]
-          SVN_SERF_LIBS=`$PKG_CONFIG $serf_major --libs` 
+          SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_pc_arg --cflags | $SED -e 's/-D[^ ]*//g'`]
+          SVN_SERF_LIBS=`$PKG_CONFIG $serf_pc_arg --libs-only-l` 
+          dnl don't use --libs-only-L because then we might miss some options
+          LDFLAGS=["$LDFLAGS `$PKG_CONFIG $serf_pc_arg --libs | $SED -e 's/-l[^ ]*//g'`"]
           break
         else
           AC_MSG_RESULT([no])

Modified: subversion/branches/fsfs-lock-many/build/run_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/build/run_tests.py?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/build/run_tests.py (original)
+++ subversion/branches/fsfs-lock-many/build/run_tests.py Mon Mar  3 16:38:58 2014
@@ -46,7 +46,7 @@ separated list of test numbers; the defa
 # A few useful constants
 SVN_VER_MINOR = 9
 
-import os, re, subprocess, sys, imp, threading, traceback
+import os, re, subprocess, sys, imp, threading, traceback, exceptions
 from datetime import datetime
 
 import getopt
@@ -456,7 +456,14 @@ class TestHarness:
     if self.enable_sasl is not None:
       svntest.main.options.enable_sasl = True
     if self.parallel is not None:
-      svntest.main.options.parallel = svntest.main.default_num_threads
+      try:
+        num_parallel = int(self.parallel) 
+      except exceptions.ValueError:
+        num_parallel = svntest.main.default_num_threads
+      if num_parallel > 1:
+        svntest.main.options.parallel = num_parallel
+      else:
+        svntest.main.options.parallel = svntest.main.default_num_threads
     if self.config_file is not None:
       svntest.main.options.config_file = self.config_file
     if self.verbose is not None:
@@ -659,7 +666,7 @@ def main():
                            ['url=', 'fs-type=', 'verbose', 'cleanup',
                             'http-library=', 'server-minor-version=',
                             'fsfs-packing', 'fsfs-sharding=',
-                            'enable-sasl', 'parallel', 'config-file=',
+                            'enable-sasl', 'parallel=', 'config-file=',
                             'log-to-stdout', 'list', 'milestone-filter=',
                             'mode-filter=', 'set-log-level=', 'ssl-cert=',
                             'http-proxy=', 'http-proxy-username=',
@@ -698,7 +705,7 @@ def main():
     elif opt in ['--enable-sasl']:
       enable_sasl = 1
     elif opt in ['--parallel']:
-      parallel = 1
+      parallel = val
     elif opt in ['--config-file']:
       config_file = val
     elif opt in ['--log-to-stdout']:

Modified: subversion/branches/fsfs-lock-many/configure.ac
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/configure.ac?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/configure.ac (original)
+++ subversion/branches/fsfs-lock-many/configure.ac Mon Mar  3 16:38:58 2014
@@ -1486,6 +1486,8 @@ AC_SUBST(JAVAHL_COMPAT_TESTS_TARGET)
 
 # ==== Miscellaneous bits ====================================================
 
+AC_CHECK_HEADERS([stdbool.h inttypes.h])
+
 # Strip '-no-cpp-precomp' from CPPFLAGS for the clang compiler
 ### I think we get this flag from APR, so the fix probably belongs there
 if test "$CC" = "clang"; then

Modified: subversion/branches/fsfs-lock-many/contrib/cgi/mirror_dir_through_svn.cgi
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/contrib/cgi/mirror_dir_through_svn.cgi?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/contrib/cgi/mirror_dir_through_svn.cgi (original)
+++ subversion/branches/fsfs-lock-many/contrib/cgi/mirror_dir_through_svn.cgi Mon Mar  3 16:38:58 2014
@@ -146,7 +146,7 @@ chdir $target_dirname
 my_system($svn, 'update', '.') == 0
   or my_die "$0: system failed.  Quitting.\n";
 
-print "\nTarget directory sucessfully updated to mirror source directory.\n";
+print "\nTarget directory successfully updated to mirror source directory.\n";
 
 exit 0;
 

Modified: subversion/branches/fsfs-lock-many/contrib/client-side/emacs/psvn.el
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/contrib/client-side/emacs/psvn.el?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/contrib/client-side/emacs/psvn.el (original)
+++ subversion/branches/fsfs-lock-many/contrib/client-side/emacs/psvn.el Mon Mar  3 16:38:58 2014
@@ -1347,7 +1347,7 @@ The hook svn-pre-run-hook allows to moni
                 (setq svn-pre-run-mode-line-process nil))))))
     (error "You can only run one svn process at once!")))
 
-(defun svn-process-sentinel-fixup-path-seperators ()
+(defun svn-process-sentinel-fixup-path-separators ()
     "Convert all path separators to UNIX style.
 \(This is a no-op unless `system-type' is windows-nt\)"
   (when (eq system-type 'windows-nt)
@@ -1371,7 +1371,7 @@ The hook svn-pre-run-hook allows to moni
            (run-hooks 'svn-post-process-svn-output-hook)
            (cond ((eq svn-process-cmd 'status)
                   ;;(message "svn status finished")
-                  (svn-process-sentinel-fixup-path-seperators)
+                  (svn-process-sentinel-fixup-path-separators)
                   (svn-parse-status-result)
                   (svn-status-apply-elide-list)
                   (when svn-status-update-previous-process-output
@@ -1423,7 +1423,7 @@ The hook svn-pre-run-hook allows to moni
                     (svn-status-activate-blame-mode))
                   (message "svn blame finished"))
                  ((eq svn-process-cmd 'commit)
-                  (svn-process-sentinel-fixup-path-seperators)
+                  (svn-process-sentinel-fixup-path-separators)
                   (svn-status-remove-temp-file-maybe)
                   (when (member 'commit svn-status-unmark-files-after-list)
                     (svn-status-unset-all-usermarks))

Modified: subversion/branches/fsfs-lock-many/contrib/client-side/svn2cl/svn2cl.xsl
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/contrib/client-side/svn2cl/svn2cl.xsl?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/contrib/client-side/svn2cl/svn2cl.xsl (original)
+++ subversion/branches/fsfs-lock-many/contrib/client-side/svn2cl/svn2cl.xsl Mon Mar  3 16:38:58 2014
@@ -78,7 +78,7 @@
  <!-- whether entries should be grouped by day -->
  <xsl:param name="groupbyday" select="'no'" />
 
- <!-- whether to seperate log messages by empty lines -->
+ <!-- whether to separate log messages by empty lines -->
  <xsl:param name="separate-daylogs" select="'no'" />
 
  <!-- whether a revision number should be included -->

Modified: subversion/branches/fsfs-lock-many/contrib/hook-scripts/remove-zombie-locks.py
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/contrib/hook-scripts/remove-zombie-locks.py?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/contrib/hook-scripts/remove-zombie-locks.py (original)
+++ subversion/branches/fsfs-lock-many/contrib/hook-scripts/remove-zombie-locks.py Mon Mar  3 16:38:58 2014
@@ -88,7 +88,7 @@ def usage_and_exit():
   sys.exit(1)
 
 class RepositoryZombieLockRemover:
-  """Remove all locks on non-existant files in repository@HEAD"""
+  """Remove all locks on non-existent files in repository@HEAD"""
   def __init__(self, repos_path, repos_subpath=""):
     self.repos_path = repos_path  # path to repository on disk
     self.repos_subpath = repos_subpath  # if only cleaning part of the repo
@@ -108,7 +108,7 @@ class RepositoryZombieLockRemover:
     svn.core.svn_pool_destroy(self.pool)
     svn.core.apr_terminate()
 
-  def unlock_nonexistant_files(self, lock, callback_pool):
+  def unlock_nonexistent_files(self, lock, callback_pool):
     """check if the file still exists in HEAD, removing the lock if not"""
     if svn.fs.svn_fs_check_path(self.rev_root, lock.path, callback_pool) \
            == svn.core.svn_node_none:
@@ -118,7 +118,7 @@ class RepositoryZombieLockRemover:
 
   def run(self):
     """iterate over every locked file in repo_path/repo_subpath,
-       calling unlock_nonexistant_files for each"""
+       calling unlock_nonexistent_files for each"""
 
     print "Removing all zombie locks from repository at %s\n" \
           "This may take several minutes..." % self.repos_path
@@ -135,7 +135,7 @@ class RepositoryZombieLockRemover:
     if hasattr(svn.fs, 'svn_fs_get_locks2'):
       svn.fs.svn_fs_get_locks2(self.fs_ptr, self.repos_subpath,
                                svn.core.svn_depth_infinity,
-                               self.unlock_nonexistant_files, self.pool)
+                               self.unlock_nonexistent_files, self.pool)
     else:
       if self.fs_type == svn.fs.SVN_FS_TYPE_BDB:
         self.locks = []
@@ -146,11 +146,11 @@ class RepositoryZombieLockRemover:
         subpool = svn.core.svn_pool_create(self.pool)
         for lock in self.locks:
           svn.core.svn_pool_clear(subpool)
-          self.unlock_nonexistant_files(lock, subpool)
+          self.unlock_nonexistent_files(lock, subpool)
         svn.core.svn_pool_destroy(subpool)
       else:
         svn.fs.svn_fs_get_locks(self.fs_ptr, self.repos_subpath,
-                                self.unlock_nonexistant_files, self.pool)
+                                self.unlock_nonexistent_files, self.pool)
     print "Done."
 
 

Modified: subversion/branches/fsfs-lock-many/contrib/hook-scripts/syntax-check.sh
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/contrib/hook-scripts/syntax-check.sh?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/contrib/hook-scripts/syntax-check.sh (original)
+++ subversion/branches/fsfs-lock-many/contrib/hook-scripts/syntax-check.sh Mon Mar  3 16:38:58 2014
@@ -20,7 +20,7 @@
 #
 # --------------------------------------------------------------------
 #
-# This script provides language independant syntax checking
+# This script provides language independent syntax checking
 # functionality intended to be invoked from a subversion pre-commit
 # hook.
 #

Modified: subversion/branches/fsfs-lock-many/contrib/server-side/svnstsw/configure.ac
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/contrib/server-side/svnstsw/configure.ac?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/contrib/server-side/svnstsw/configure.ac (original)
+++ subversion/branches/fsfs-lock-many/contrib/server-side/svnstsw/configure.ac Mon Mar  3 16:38:58 2014
@@ -98,7 +98,7 @@ fi
 # even in VPATH builds.  Unfortunately, autoconf doesn't define a
 # shell variable containing the absolute path to the top source
 # directory (at least it's not documented), so we can't use that here.
-# However, it does have a preset *ouput* variable.  The following
+# However, it does have a preset *output* variable.  The following
 # causes a literal '-I${top_srcdir}/include' to appear in the
 # definition of the CONFIGURECPPFLAGS variable.  The '${top_srcdir}'
 # is then substituted by make.  Unfortunately, this is somewhat

Modified: subversion/branches/fsfs-lock-many/notes/assurance.txt
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/notes/assurance.txt?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/notes/assurance.txt (original)
+++ subversion/branches/fsfs-lock-many/notes/assurance.txt Mon Mar  3 16:38:58 2014
@@ -18,7 +18,7 @@ _secure_ features.
 You may have access control, but what if the code implementing this
 access control was written poorly, and contains a buffer overflow?  2
 hours ago you worried about who could read or write to a document in
-your repository. Now you discover that an attacker can execute arbitary
+your repository. Now you discover that an attacker can execute arbitrary
 code as the userid your service is running as. This is not ideal. 
 
 Hence, we distinquish between "security features" and assurance. Brian

Modified: subversion/branches/fsfs-lock-many/notes/fs-improvements.txt
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/notes/fs-improvements.txt?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/notes/fs-improvements.txt (original)
+++ subversion/branches/fsfs-lock-many/notes/fs-improvements.txt Mon Mar  3 16:38:58 2014
@@ -171,7 +171,7 @@ it's quite possible that a higher copyID
 revision history before a lower one.
 
 The one thing we can know is that a lower copyID can never be a
-branchwise descendent of a lower copyID, since the lower one must have
+branchwise descendant of a lower copyID, since the lower one must have
 been committed before any of its descendants txns were started, of
 course.  I'm not sure this minimal inference will ever be useful, but
 anyway it's all we've got.  Anyway, right now, we only ever need ask

Modified: subversion/branches/fsfs-lock-many/notes/knobs
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/notes/knobs?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/notes/knobs (original)
+++ subversion/branches/fsfs-lock-many/notes/knobs Mon Mar  3 16:38:58 2014
@@ -5,7 +5,7 @@
 2 Condensed list of defines and environment variables
 3 Defines tweaking SVN defaults
 4 Defines enabling or disabling features
-5 Defines controling debug support
+5 Defines controlling debug support
 6 Defines that affect unit tests
 7 Environment variables
 
@@ -291,7 +291,7 @@ SVN_I_LIKE_LATENCY_SO_IGNORE_HTTPV2
   Suggested: not defined (to ensure correct behaviour)
 
 
-5 Defines controling debug support
+5 Defines controlling debug support
 ==================================
 
 5.1 SVN_DBG_QUIET

Modified: subversion/branches/fsfs-lock-many/notes/merge-tracking/func-spec.html
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/notes/merge-tracking/func-spec.html?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/notes/merge-tracking/func-spec.html (original)
+++ subversion/branches/fsfs-lock-many/notes/merge-tracking/func-spec.html Mon Mar  3 16:38:58 2014
@@ -546,9 +546,9 @@ information.  The new functionality adde
 
   <p>The <code>--verbose</code> switch will output the log information
   for the merged revisions in place of the information for the revision
-  in which the merge occured.  Each of the original message(s) will have an
+  in which the merge occurred.  Each of the original message(s) will have an
   additional line indicating that it is the result of a merge, and which
-  revision the merge occured in.</p>
+  revision the merge occurred in.</p>
 
   <p>For instance, if Alice was the original author of r12, Bob was the
   orginial author of r14, and Chuck merged them both r12 and r14 as part

Modified: subversion/branches/fsfs-lock-many/notes/merge-tracking/summit-survey.html
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/notes/merge-tracking/summit-survey.html?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/notes/merge-tracking/summit-survey.html (original)
+++ subversion/branches/fsfs-lock-many/notes/merge-tracking/summit-survey.html Mon Mar  3 16:38:58 2014
@@ -361,7 +361,7 @@ strategy.</p>
 <div class="answer"><p>Our branch strategy is minimize branches and their
 associated overhead.  We create branches only when we have a past tag
 that needs work or if we really need it for parallel development.
-Branches are a sometimes neccessary evil.  People always have a
+Branches are a sometimes necessary evil.  People always have a
 tendency to make a mess with them.  If anything, the most important
 part of merge tracking is to protect people from themselves.  Warn
 them when they're about to double merge or do something eqally

Modified: subversion/branches/fsfs-lock-many/notes/wc-ng/design
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/notes/wc-ng/design?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/notes/wc-ng/design (original)
+++ subversion/branches/fsfs-lock-many/notes/wc-ng/design Mon Mar  3 16:38:58 2014
@@ -869,9 +869,9 @@ base-presence: *
 working-presence: excluded
 base-presence: *
   A new, excluded BASE_NODE is constructed, and the WORKING_NODE is
-  removed. Any BASE_NODE rows which appear to be descendents of this
+  removed. Any BASE_NODE rows which appear to be descendants of this
   (used-to-be-directory) node are removed. There should be no
-  descendents in the WORKING_NODE table.
+  descendants in the WORKING_NODE table.
   
   ### what information do we keep for excluded nodes?
   ### note: at this point, there is no user command to exclude
@@ -945,10 +945,10 @@ base-presence: *
       handled as a separate action (via recursion).
 
     not-present
-      This row in WORKING_NODE is removed, along with descendent
+      This row in WORKING_NODE is removed, along with descendant
       nodes. The directory will not list this node in its (new) set of
       children. Any BASE_NODE row at this path is also removed, along
-      with any descendent nodes.
+      with any descendant nodes.
 
     base-deleted
       No action taken. This node will be removed when it is handled
@@ -958,9 +958,9 @@ base-presence: *
 working-presence: excluded
 base-presence: *
   A new, excluded BASE_NODE is constructed, and the WORKING_NODE is
-  removed. Any BASE_NODE rows which appear to be descendents of this
+  removed. Any BASE_NODE rows which appear to be descendants of this
   (used-to-be-directory) node are removed. There should be no
-  descendents in the WORKING_NODE table.
+  descendants in the WORKING_NODE table.
 
   ### what information do we keep for excluded nodes?
 

Modified: subversion/branches/fsfs-lock-many/notes/wc-ng/locking
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/notes/wc-ng/locking?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/notes/wc-ng/locking (original)
+++ subversion/branches/fsfs-lock-many/notes/wc-ng/locking Mon Mar  3 16:38:58 2014
@@ -113,7 +113,7 @@ operation to the first class of operatio
 Lock Overlapping
 ----------------
 As in wc-1, locks may not overlap.  For instance, a process which acquires
-a depth-infinity lock for /A/B will encounter an error if it attemps to
+a depth-infinity lock for /A/B will encounter an error if it attempts to
 later acquire a lock for /A/B/C, even though it already owns the logical
 lock for that path.  In this way wc-ng can ensure the explicit lock for a
 given logical lock is stored in one location.  This location will be the

Modified: subversion/branches/fsfs-lock-many/notes/wc-ng/nodes
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/notes/wc-ng/nodes?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/notes/wc-ng/nodes (original)
+++ subversion/branches/fsfs-lock-many/notes/wc-ng/nodes Mon Mar  3 16:38:58 2014
@@ -204,14 +204,14 @@ become an op_depth layer of their own.
   commit rules to act on revision-number changes within this flat tree.
 
   GJS: correct. Consider a root of the subtree at r10, and a
-  descendent is at r12. We cannot create one layer at r10, and another
-  at r12 because we do not have the descendent@r10 to place into the
+  descendant is at r12. We cannot create one layer at r10, and another
+  at r12 because we do not have the descendant@r10 to place into the
   first layer. Thus, we need to use a single op_depth layer for this
   operation. At commit time, one copy will be me for the subtree from
-  r10, a deletion will be made for the descendent, and then another
-  copy performed for the r12 descendent.
+  r10, a deletion will be made for the descendant, and then another
+  copy performed for the r12 descendant.
 
-### GJS: in the above scenario, we do not know if the descendent
+### GJS: in the above scenario, we do not know if the descendant
   existed in r10, so the deletion may not be necessary (and could even
   throw an error!). I do not recall if our copy's destination is
   allowed to exist (ie. we have implied overwrite semantics in the

Modified: subversion/branches/fsfs-lock-many/subversion/bindings/ctypes-python/csvn/core/__init__.py
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/bindings/ctypes-python/csvn/core/__init__.py?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/bindings/ctypes-python/csvn/core/__init__.py (original)
+++ subversion/branches/fsfs-lock-many/subversion/bindings/ctypes-python/csvn/core/__init__.py Mon Mar  3 16:38:58 2014
@@ -107,7 +107,7 @@ class Pool(object):
       # Make sure that the parent object is valid
       self._parent_pool.assert_valid()
 
-      # Refer to self using a weakrefrence so that we don't
+      # Refer to self using a weakreference so that we don't
       # create a reference cycle
       weakself = weakref.ref(self)
 

Modified: subversion/branches/fsfs-lock-many/subversion/bindings/ctypes-python/examples/example.py
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/bindings/ctypes-python/examples/example.py?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/bindings/ctypes-python/examples/example.py (original)
+++ subversion/branches/fsfs-lock-many/subversion/bindings/ctypes-python/examples/example.py Mon Mar  3 16:38:58 2014
@@ -101,7 +101,7 @@ txn.mkdir("blahdir/dj/a/b/c/d/e/f")
 txn.mkdir("blahdir/dj/a/b/c/d/e/f/g")
 txn.upload("blahdir/dj/a/b/c/d/e/f/g/h.txt", "/tmp/contents.txt")
 
-rev = txn.commit("create blahdir and descendents")
+rev = txn.commit("create blahdir and descendants")
 print("Committed revision %d" % rev)
 
 def ignore(path, kind):

Modified: subversion/branches/fsfs-lock-many/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictResult.java
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictResult.java?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictResult.java (original)
+++ subversion/branches/fsfs-lock-many/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictResult.java Mon Mar  3 16:38:58 2014
@@ -42,7 +42,7 @@ public class ConflictResult
     private String mergedPath;
 
     /**
-     * Create a new conflict result instace.
+     * Create a new conflict result instance.
      */
     public ConflictResult(Choice choice, String mergedPath)
     {

Modified: subversion/branches/fsfs-lock-many/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java (original)
+++ subversion/branches/fsfs-lock-many/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java Mon Mar  3 16:38:58 2014
@@ -1022,9 +1022,9 @@ public interface ISVNClient
      * #diffSummarize(String, Revision, String, Revision, Depth,
      * Collection, boolean, DiffSummaryCallback)}, using
      * <code>path</code> for both of that method's targets.
-     * @param startRevision Beginning of range for comparsion of
+     * @param startRevision Beginning of range for comparison of
      * <code>target</code>.
-     * @param endRevision End of range for comparsion of
+     * @param endRevision End of range for comparison of
      * <code>target</code>.
      * @param depth how deep to recurse.
      * @param changelists  if non-null, filter paths using changelists

Modified: subversion/branches/fsfs-lock-many/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java (original)
+++ subversion/branches/fsfs-lock-many/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java Mon Mar  3 16:38:58 2014
@@ -53,7 +53,7 @@ public class SVNClient implements ISVNCl
     }
 
     /**
-     * Standard empty contructor, builds just the native peer.
+     * Standard empty constructor, builds just the native peer.
      */
     public SVNClient()
     {

Modified: subversion/branches/fsfs-lock-many/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java (original)
+++ subversion/branches/fsfs-lock-many/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java Mon Mar  3 16:38:58 2014
@@ -47,7 +47,7 @@ public class SVNRepos implements ISVNRep
     }
 
     /**
-     * Standard empty contructor, builds just the native peer.
+     * Standard empty constructor, builds just the native peer.
      */
     public SVNRepos()
     {

Modified: subversion/branches/fsfs-lock-many/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictResult.java
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictResult.java?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictResult.java (original)
+++ subversion/branches/fsfs-lock-many/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictResult.java Mon Mar  3 16:38:58 2014
@@ -84,7 +84,7 @@ public class ConflictResult
     private String mergedPath;
 
     /**
-     * Create a new conflict result instace.
+     * Create a new conflict result instance.
      */
     public ConflictResult(int choice, String mergedPath)
     {

Modified: subversion/branches/fsfs-lock-many/subversion/bindings/javahl/src/org/tigris/subversion/javahl/PropertyData.java
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/bindings/javahl/src/org/tigris/subversion/javahl/PropertyData.java?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/bindings/javahl/src/org/tigris/subversion/javahl/PropertyData.java (original)
+++ subversion/branches/fsfs-lock-many/subversion/bindings/javahl/src/org/tigris/subversion/javahl/PropertyData.java Mon Mar  3 16:38:58 2014
@@ -138,7 +138,7 @@ public class PropertyData
     }
 
     /**
-     * this contructor is used when building a thin wrapper around other
+     * this constructor is used when building a thin wrapper around other
      * property retrieval methods
      * @param p     the path of the item owning this property
      * @param n     the name of the property

Modified: subversion/branches/fsfs-lock-many/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java (original)
+++ subversion/branches/fsfs-lock-many/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java Mon Mar  3 16:38:58 2014
@@ -38,7 +38,7 @@ public class SVNAdmin
     private org.apache.subversion.javahl.SVNRepos aSVNAdmin;
 
     /**
-     * Standard empty contructor, builds just the native peer.
+     * Standard empty constructor, builds just the native peer.
      */
     public SVNAdmin()
     {

Modified: subversion/branches/fsfs-lock-many/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java (original)
+++ subversion/branches/fsfs-lock-many/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java Mon Mar  3 16:38:58 2014
@@ -47,7 +47,7 @@ public class SVNClient implements SVNCli
     private org.apache.subversion.javahl.SVNClient aSVNClient;
 
     /**
-     * Standard empty contructor, builds just the native peer.
+     * Standard empty constructor, builds just the native peer.
      */
     public SVNClient()
     {

Modified: subversion/branches/fsfs-lock-many/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java (original)
+++ subversion/branches/fsfs-lock-many/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java Mon Mar  3 16:38:58 2014
@@ -1330,9 +1330,9 @@ public interface SVNClientInterface
      * #diffSummarize(String, Revision, String, Revision, int,
      * boolean, DiffSummaryReceiver)}, using <code>path</code> for
      * both of that method's targets.
-     * @param startRevision Beginning of range for comparsion of
+     * @param startRevision Beginning of range for comparison of
      * <code>target</code>.
-     * @param endRevision End of range for comparsion of
+     * @param endRevision End of range for comparison of
      * <code>target</code>.
      * @param depth how deep to recurse.
      * @param changelists  if non-null, filter paths using changelists

Modified: subversion/branches/fsfs-lock-many/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java (original)
+++ subversion/branches/fsfs-lock-many/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java Mon Mar  3 16:38:58 2014
@@ -1832,7 +1832,7 @@ public class BasicTests extends SVNTests
         // check the status of the working copy
         thisTest.checkStatus();
 
-        // confirm that the file are realy deleted
+        // confirm that the file are really deleted
         assertFalse("failed to remove text modified file",
                 new File(thisTest.getWorkingCopy(), "A/D/G/rho").exists());
         assertFalse("failed to remove prop modified file",
@@ -1860,7 +1860,7 @@ public class BasicTests extends SVNTests
 
         try
         {
-            // delete non-existant file foo
+            // delete non-existent file foo
             Set<String> paths = new HashSet<String>(1);
             paths.add(file.getAbsolutePath());
             client.remove(paths, true, false, null, null, null);
@@ -3043,7 +3043,7 @@ public class BasicTests extends SVNTests
                         thisTest.getUrl().toString(), diffOutput.getPath(),
                         Depth.infinity, null, true, true, false, false);
 
-            fail("This test should fail becaus the relativeToDir parameter " +
+            fail("This test should fail because the relativeToDir parameter " +
                  "does not work with URLs");
         }
         catch (Exception ignored)

Modified: subversion/branches/fsfs-lock-many/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java (original)
+++ subversion/branches/fsfs-lock-many/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java Mon Mar  3 16:38:58 2014
@@ -1630,7 +1630,7 @@ public class BasicTests extends SVNTests
         // check the status of the working copy
         thisTest.checkStatus();
 
-        // confirm that the file are realy deleted
+        // confirm that the file are really deleted
         assertFalse("failed to remove text modified file",
                 new File(thisTest.getWorkingCopy(), "A/D/G/rho").exists());
         assertFalse("failed to remove prop modified file",
@@ -1656,7 +1656,7 @@ public class BasicTests extends SVNTests
 
         try
         {
-            // delete non-existant file foo
+            // delete non-existent file foo
             client.remove(new String[] {file.getAbsolutePath()}, null, true);
             fail("missing exception");
         }
@@ -2644,7 +2644,7 @@ public class BasicTests extends SVNTests
                         thisTest.getUrl(), diffOutput.getPath(),
                         Depth.infinity, null, true, true, false);
 
-            fail("This test should fail becaus the relativeToDir parameter " +
+            fail("This test should fail because the relativeToDir parameter " +
                  "does not work with URLs");
         }
         catch (Exception ignored)

Modified: subversion/branches/fsfs-lock-many/subversion/bindings/swig/include/proxy_apr.swg
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/bindings/swig/include/proxy_apr.swg?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/bindings/swig/include/proxy_apr.swg (original)
+++ subversion/branches/fsfs-lock-many/subversion/bindings/swig/include/proxy_apr.swg Mon Mar  3 16:38:58 2014
@@ -185,7 +185,7 @@ struct apr_pool_t {
           # Make sure that the parent object is valid
           self._parent_pool.assert_valid()
 
-          # Refer to self using a weakrefrence so that we don't
+          # Refer to self using a weakreference so that we don't
           # create a reference cycle
           weakself = weakref.ref(self)
 

Modified: subversion/branches/fsfs-lock-many/subversion/bindings/swig/perl/native/Client.pm
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/bindings/swig/perl/native/Client.pm?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/bindings/swig/perl/native/Client.pm (original)
+++ subversion/branches/fsfs-lock-many/subversion/bindings/swig/perl/native/Client.pm Mon Mar  3 16:38:58 2014
@@ -760,7 +760,7 @@ object.
 Else, create the directories on disk, and attempt to schedule them for addition.
 In this case returns undef.
 
-If $make_parents is TRUE, create any non-existant parent directories also.
+If $make_parents is TRUE, create any non-existent parent directories also.
 
 If not undef, $revprop_hash is a reference to a hash table holding additional
 custom revision properites (property names mapped to strings) to be set on the
@@ -970,7 +970,7 @@ $path, $status, $pool
 
 $path is the pathname of the file or directory which status is being
 reported.  $status is a svn_wc_status2_t object.  $pool is an apr_pool_t
-object which is cleaned beteween invocations to the callback.
+object which is cleaned between invocations to the callback.
 
 The return of the status_func subroutine can be a svn_error_t object created by
 SVN::Error::create in order to propagate an error up.

Modified: subversion/branches/fsfs-lock-many/subversion/bindings/swig/perl/native/t/3client.t
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/bindings/swig/perl/native/t/3client.t?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/bindings/swig/perl/native/t/3client.t (original)
+++ subversion/branches/fsfs-lock-many/subversion/bindings/swig/perl/native/t/3client.t Mon Mar  3 16:38:58 2014
@@ -1236,7 +1236,7 @@ SKIP: {
   my $result = SVN::Core::auth_set_gnome_keyring_unlock_prompt_func(
                    $ctx->auth(), $callback);
   # TEST
-  is(${$result}, $callback, 'auth_set_gnome_keyring_unlock_prompt_func result equals paramter');
+  is(${$result}, $callback, 'auth_set_gnome_keyring_unlock_prompt_func result equals parameter');
 }
 
 END {

Modified: subversion/branches/fsfs-lock-many/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c (original)
+++ subversion/branches/fsfs-lock-many/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c Mon Mar  3 16:38:58 2014
@@ -1550,7 +1550,7 @@ static item_baton *make_baton(apr_pool_t
   /* Note: We steal the caller's reference to 'baton'. Also, to avoid
      memory leaks, we borrow the caller's reference to 'editor'. In this
      case, borrowing the reference to 'editor' is safe because the contents
-     of an item_baton struct are only used by functino calls which operate on
+     of an item_baton struct are only used by function calls which operate on
      the editor itself. */
   newb->editor = editor;
   newb->baton = baton;

Modified: subversion/branches/fsfs-lock-many/subversion/include/private/svn_diff_tree.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/include/private/svn_diff_tree.h?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/include/private/svn_diff_tree.h (original)
+++ subversion/branches/fsfs-lock-many/subversion/include/private/svn_diff_tree.h Mon Mar  3 16:38:58 2014
@@ -319,7 +319,7 @@ svn_diff__tree_processor_filter_create(c
                                        apr_pool_t *result_pool);
 
 /**
- * Create a new svn_diff_tree_processor_t instace with all function setup
+ * Create a new svn_diff_tree_processor_t instance with all function setup
  * to call into processor with all adds with copyfrom information transformed
  * to simple node changes.
  *

Modified: subversion/branches/fsfs-lock-many/subversion/include/private/svn_io_private.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/include/private/svn_io_private.h?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/include/private/svn_io_private.h (original)
+++ subversion/branches/fsfs-lock-many/subversion/include/private/svn_io_private.h Mon Mar  3 16:38:58 2014
@@ -106,7 +106,7 @@ apr_file_t *
 svn_stream__aprfile(svn_stream_t *stream);
 
 /* Creates as *INSTALL_STREAM a stream that once completed can be installed
-   using Windows checkouts much slower then Unix.
+   using Windows checkouts much slower than Unix.
 
    While writing the stream is temporarily stored in TMP_ABSPATH.
  */

Modified: subversion/branches/fsfs-lock-many/subversion/include/private/svn_magic.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/include/private/svn_magic.h?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/include/private/svn_magic.h (original)
+++ subversion/branches/fsfs-lock-many/subversion/include/private/svn_magic.h Mon Mar  3 16:38:58 2014
@@ -30,14 +30,16 @@
 /* An opaque struct that wraps a libmagic cookie. */
 typedef struct svn_magic__cookie_t svn_magic__cookie_t;
 
-/* This routine initialises libmagic.
+/* This routine initialises libmagic.  CONFIG is a config hash and
+ * may be NULL.
  * Upon success a new *MAGIC_COOKIE is allocated in RESULT_POOL.
  * On failure *MAGIC_COOKIE is set to NULL.
  * All resources used by libmagic are freed by a cleanup handler
  * installed on RESULT_POOL, i.e. *MAGIC_COOKIE becomes invalid when
  * the pool is cleared! */
-void
+svn_error_t *
 svn_magic__init(svn_magic__cookie_t **magic_cookie,
+                apr_hash_t *config,
                 apr_pool_t *result_pool);
 
 /* Detect the mime-type of the file at LOCAL_ABSPATH using MAGIC_COOKIE.

Modified: subversion/branches/fsfs-lock-many/subversion/include/private/svn_ra_svn_private.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/include/private/svn_ra_svn_private.h?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/include/private/svn_ra_svn_private.h (original)
+++ subversion/branches/fsfs-lock-many/subversion/include/private/svn_ra_svn_private.h Mon Mar  3 16:38:58 2014
@@ -257,7 +257,7 @@ svn_ra_svn__read_cmd_response(svn_ra_svn
                               const char *fmt, ...);
 
 /** Check the receive buffer and socket of @a conn whether there is some
- * unprocessed incomming data without waiting for new data to come in.
+ * unprocessed incoming data without waiting for new data to come in.
  * If data is found, set @a *has_command to TRUE.  If the connection does
  * not contain any more data and has been closed, set @a *terminated to
  * TRUE.

Modified: subversion/branches/fsfs-lock-many/subversion/include/private/svn_string_private.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/include/private/svn_string_private.h?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/include/private/svn_string_private.h (original)
+++ subversion/branches/fsfs-lock-many/subversion/include/private/svn_string_private.h Mon Mar  3 16:38:58 2014
@@ -159,16 +159,16 @@ apr_size_t
 svn__i64toa(char * dest, apr_int64_t number);
 
 /** Returns a decimal string for @a number allocated in @a pool.  Put in
- * the @a seperator at each third place.
+ * the @a separator at each third place.
  */
 char *
-svn__ui64toa_sep(apr_uint64_t number, char seperator, apr_pool_t *pool);
+svn__ui64toa_sep(apr_uint64_t number, char separator, apr_pool_t *pool);
 
 /** Returns a decimal string for @a number allocated in @a pool.  Put in
- * the @a seperator at each third place.
+ * the @a separator at each third place.
  */
 char *
-svn__i64toa_sep(apr_int64_t number, char seperator, apr_pool_t *pool);
+svn__i64toa_sep(apr_int64_t number, char separator, apr_pool_t *pool);
 
 
 /** Writes the @a number as base36-encoded string into @a dest. The latter

Modified: subversion/branches/fsfs-lock-many/subversion/include/svn_config.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/include/svn_config.h?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/include/svn_config.h (original)
+++ subversion/branches/fsfs-lock-many/subversion/include/svn_config.h Mon Mar  3 16:38:58 2014
@@ -131,6 +131,8 @@ typedef struct svn_config_t svn_config_t
 /** @deprecated Not used by Subversion since 2003/r847039 (well before 1.0) */
 #define SVN_CONFIG_OPTION_TEMPLATE_ROOT             "template-root"
 #define SVN_CONFIG_OPTION_ENABLE_AUTO_PROPS         "enable-auto-props"
+/** @since New in 1.9. */
+#define SVN_CONFIG_OPTION_ENABLE_MAGIC_FILE         "enable-magic-file"
 #define SVN_CONFIG_OPTION_NO_UNLOCK                 "no-unlock"
 #define SVN_CONFIG_OPTION_MIMETYPES_FILE            "mime-types-file"
 #define SVN_CONFIG_OPTION_PRESERVED_CF_EXTS         "preserved-conflict-file-exts"
@@ -669,11 +671,61 @@ svn_config_ensure(const char *config_dir
  */
 
 
-/** A hash-key pointing to a realmstring.  Every file containing
- * authentication data should have this key.
+/**
+ * Attributes of authentication credentials.
+ *
+ * The values of these keys are C strings.
+ *
+ * @since New in 1.9.
+ * @note These hash keys were also used in versions < 1.9 but were
+ *       not part of the public API (except #SVN_CONFIG_REALMSTRING_KEY).
+ *
+ * @defgroup cached_authentication_data_attributes
+ * @{
+ */
+
+/** A hash-key pointing to a realmstring.  This attribute is mandatory.
+ *
+ * @since New in 1.0.
  */
 #define SVN_CONFIG_REALMSTRING_KEY  "svn:realmstring"
 
+/** A hash-key for usernames.
+ * @since New in 1.9.
+ */
+#define SVN_CONFIG_AUTHN_USERNAME_KEY           "username"
+
+/** A hash-key for passwords.
+ * The password may be in plaintext or encrypted form, depending on
+ * the authentication provider.
+ */
+#define SVN_CONFIG_AUTHN_PASSWORD_KEY           "password"
+
+/** A hash-key for passphrases,
+ * such as SSL client ceritifcate passphrases. The passphrase may be in
+ * plaintext or encrypted form, depending on the authentication provider.
+ */
+#define SVN_CONFIG_AUTHN_PASSPHRASE_KEY         "passphrase"
+
+/** A hash-key for the type of a password or passphrase.  The type
+ * indicates which provider owns the credential.
+ */
+#define SVN_CONFIG_AUTHN_PASSTYPE_KEY           "passtype"
+
+/** A hash-key for SSL certificates.   The value is the base64-encoded DER form
+ * certificate.
+ * @note The value is not human readable.
+ */
+#define SVN_CONFIG_AUTHN_ASCII_CERT_KEY         "ascii_cert"
+
+/** A hash-key for recorded SSL certificate verification
+ * failures.  Failures encoded as an ASCII integer containing any of the
+ * SVN_AUTH_SSL_* SSL server certificate failure bits defined in svn_auth.h.
+ */
+#define SVN_CONFIG_AUTHN_FAILURES_KEY           "failures"
+
+/** @} */
+
 /** Use @a cred_kind and @a realmstring to locate a file within the
  * ~/.subversion/auth/ area.  If the file exists, initialize @a *hash
  * and load the file contents into the hash, using @a pool.  If the
@@ -757,7 +809,7 @@ typedef svn_error_t *
  *
  * @note Removing credentials from the config-based disk store will
  * not purge them from any open svn_auth_baton_t instance.  Consider
- * using svn_auth_forget_credentials() -- from the @a cleanup_func,
+ * using svn_auth_forget_credentials() -- from the @a walk_func,
  * even -- for this purpose.
  *
  * @note Removing credentials from the config-based disk store will

Modified: subversion/branches/fsfs-lock-many/subversion/include/svn_fs.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/include/svn_fs.h?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/include/svn_fs.h (original)
+++ subversion/branches/fsfs-lock-many/subversion/include/svn_fs.h Mon Mar  3 16:38:58 2014
@@ -1670,37 +1670,43 @@ svn_fs_change_node_prop(svn_fs_root_t *r
 
 /** Determine if the properties of two path/root combinations are different.
  *
- * Set @a *changed_p to #TRUE if the properties at @a path1 under @a root1
+ * Set @a *different_p to #TRUE if the properties at @a path1 under @a root1
  * differ from those at @a path2 under @a root2, or set it to #FALSE if they
- * are the same.  If @a strict is #FALSE, the function may report false
- * positives, otherwise a full comparison may be necessary.  Both paths must
- * exist under their respective roots, and both roots must be in the same
- * filesystem.
+ * are the same.  Both paths must exist under their respective roots, and
+ * both roots must be in the same filesystem.
  * Do any necessary temporary allocation in @a pool.
  *
- * @note The behavior under @a strict == #FALSE is implementation dependent
- * in that the false positives reported may differ from release to release
- * and backend to backend.  It is perfectly legal to report all combinations
- * as "changed" even for @a path1 == @a path2 and @a root1 == @a root2.
- * There is also no guarantee that there will be false positives at all.
- *
  * @since New in 1.9.
  */
 svn_error_t *
-svn_fs_props_changed2(svn_boolean_t *changed_p,
-                      svn_fs_root_t *root1,
-                      const char *path1,
-                      svn_fs_root_t *root2,
-                      const char *path2,
-                      svn_boolean_t strict,
-                      apr_pool_t *pool);
+svn_fs_props_different(svn_boolean_t *different_p,
+                       svn_fs_root_t *root1,
+                       const char *path1,
+                       svn_fs_root_t *root2,
+                       const char *path2,
+                       apr_pool_t *pool);
 
 
-/** Similar to svn_fs_props_changed2 with @a strict set to #FALSE.
+/** Determine if the properties of two path/root combinations are different.
+ * In contrast to #svn_fs_props_different, we only perform a quick test and
+ * allow for false positives.
  *
- * @deprecated Provided for backward compatibility with the 1.8 API.
+ * Set @a *changed_p to #TRUE if the properties at @a path1 under @a root1
+ * differ from those at @a path2 under @a root2, or set it to #FALSE if they
+ * are the same.  Both paths must exist under their respective roots, and
+ * both roots must be in the same filesystem.
+ * Do any necessary temporary allocation in @a pool.
+ *
+ * @note The behavior is implementation dependent in that the false
+ * positives reported may differ from release to release and backend to
+ * backend.  There is also no guarantee that there will be false positives
+ * at all.
+ *
+ * @note Prior to Subversion 1.9, this function would return false negatives
+ * as well for FSFS: If @a root1 and @a root2 were both transaction roots
+ * and the proplists of both paths had been changed in their respective
+ * transactions, @a changed_p would be set to #FALSE.
  */
-SVN_DEPRECATED
 svn_error_t *
 svn_fs_props_changed(svn_boolean_t *changed_p,
                      svn_fs_root_t *root1,
@@ -2253,36 +2259,37 @@ svn_fs_apply_text(svn_stream_t **content
 
 /** Check if the contents of two root/path combos have changed.
  *
- * Set @a *changed_p to #TRUE if the file contents at @a path1 under
+ * Set @a *different_p to #TRUE if the file contents at @a path1 under
  * @a root1 differ from those at @a path2 under @a root2, or set it to
- * #FALSE if they are the same.  If @a strict is #FALSE, the function may
- * report false positives, otherwise a full comparison may be necessary.
- * Both paths must exist under their respective roots, and both roots must
- * be in the same filesystem.
+ * #FALSE if they are the same.  Both paths must exist under their
+ * respective roots, and both roots must be in the same filesystem.
  * Do any necessary temporary allocation in @a pool.
  *
- * @note The behavior under @a strict == #FALSE is implementation dependent
- * in that the false positives reported may differ from release to release
- * and backend to backend.  It is perfectly legal to report all combinations
- * as "changed" even for @a path1 == @a path2 and @a root1 == @a root2.
- * There is also no guarantee that there will be false positives at all.
- *
  * @since New in 1.9.
  */
 svn_error_t *
-svn_fs_contents_changed2(svn_boolean_t *changed_p,
-                         svn_fs_root_t *root1,
-                         const char *path1,
-                         svn_fs_root_t *root2,
-                         const char *path2,
-                         svn_boolean_t strict,
-                         apr_pool_t *pool);
-
-/** Similar to svn_fs_contents_changed2 with @a strict set to #FALSE.
+svn_fs_contents_different(svn_boolean_t *different_p,
+                          svn_fs_root_t *root1,
+                          const char *path1,
+                          svn_fs_root_t *root2,
+                          const char *path2,
+                          apr_pool_t *pool);
+
+/** Check if the contents of two root/path combos have changed.  In
+ * contrast to #svn_fs_contents_different, we only perform a quick test
+ * and allow for false positives.
  *
- * @deprecated Provided for backward compatibility with the 1.8 API.
+ * Set @a *changed_p to #TRUE if the file contents at @a path1 under
+ * @a root1 differ from those at @a path2 under @a root2, or set it to
+ * #FALSE if they are the same.  Both paths must exist under their
+ * respective roots, and both roots must be in the same filesystem.
+ * Do any necessary temporary allocation in @a pool.
+ *
+ * @note The behavior is implementation dependent in that the false
+ * positives reported may differ from release to release and backend to
+ * backend.  There is also no guarantee that there will be false positives
+ * at all.
  */
-SVN_DEPRECATED
 svn_error_t *
 svn_fs_contents_changed(svn_boolean_t *changed_p,
                         svn_fs_root_t *root1,

Modified: subversion/branches/fsfs-lock-many/subversion/include/svn_io.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/include/svn_io.h?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/include/svn_io.h (original)
+++ subversion/branches/fsfs-lock-many/subversion/include/svn_io.h Mon Mar  3 16:38:58 2014
@@ -1246,7 +1246,7 @@ svn_stream_read2(svn_stream_t *stream,
  * @note This function is a wrapper of svn_stream_read_full() now, which name
  * better documents the behavior of this function.
  *
- * @deprecated Provided for backward compatibilty with the 1.8 API
+ * @deprecated Provided for backward compatibility with the 1.8 API
  */
 SVN_DEPRECATED
 svn_error_t *

Modified: subversion/branches/fsfs-lock-many/subversion/include/svn_iter.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/include/svn_iter.h?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/include/svn_iter.h (original)
+++ subversion/branches/fsfs-lock-many/subversion/include/svn_iter.h Mon Mar  3 16:38:58 2014
@@ -77,7 +77,7 @@ svn_iter_apr_hash(svn_boolean_t *complet
                   void *baton,
                   apr_pool_t *pool);
 
-/** Iteration callback used in conjuction with svn_iter_apr_array().
+/** Iteration callback used in conjunction with svn_iter_apr_array().
  *
  * Use @a pool for temporary allocation, it's cleared between invocations.
  *

Modified: subversion/branches/fsfs-lock-many/subversion/include/svn_props.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/include/svn_props.h?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/include/svn_props.h (original)
+++ subversion/branches/fsfs-lock-many/subversion/include/svn_props.h Mon Mar  3 16:38:58 2014
@@ -671,7 +671,7 @@ svn_prop_name_is_valid(const char *prop_
  */
 #define SVN_PROP_TXN_PREFIX  SVN_PROP_PREFIX "txn-"
 
-/** Identifies the client version compability level.  For clients
+/** Identifies the client version compatibility level.  For clients
  * compiled against Subversion libraries, this is @c SVN_VER_NUMBER.
  * Third-party implementations are advised to use similar formatting
  * for values of this property.

Modified: subversion/branches/fsfs-lock-many/subversion/include/svn_ra.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/include/svn_ra.h?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/include/svn_ra.h (original)
+++ subversion/branches/fsfs-lock-many/subversion/include/svn_ra.h Mon Mar  3 16:38:58 2014
@@ -1846,6 +1846,12 @@ svn_ra_get_location_segments(svn_ra_sess
  * to support reversion of the revision range for @a include_merged_revision
  * @c FALSE reporting by switching  @a end with @a start.
  *
+ * @note Prior to Subversion 1.9, this function may accept delta handlers
+ * from @handler even for empty text deltas.  Starting with 1.9, the
+ * delta handler / baton return arguments passed to @handler will be
+ * #NULL unless there is an actual difference in the file contents between
+ * the current and the previous call.
+ *
  * @since New in 1.5.
  */
 svn_error_t *

Modified: subversion/branches/fsfs-lock-many/subversion/include/svn_repos.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/include/svn_repos.h?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/include/svn_repos.h (original)
+++ subversion/branches/fsfs-lock-many/subversion/include/svn_repos.h Mon Mar  3 16:38:58 2014
@@ -2036,6 +2036,12 @@ svn_repos_fs_get_mergeinfo(svn_mergeinfo
  * the revision range for @a include_merged_revision @c FALSE reporting by
  * switching @a start with @a end.
  *
+ * @note Prior to Subversion 1.9, this function may accept delta handlers
+ * from @handler even for empty text deltas.  Starting with 1.9, the
+ * delta handler / baton return arguments passed to @handler will be
+ * #NULL unless there is an actual difference in the file contents between
+ * the current and the previous call.
+ *
  * @since New in 1.5.
  */
 svn_error_t *

Modified: subversion/branches/fsfs-lock-many/subversion/libsvn_client/add.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/libsvn_client/add.c?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/libsvn_client/add.c (original)
+++ subversion/branches/fsfs-lock-many/subversion/libsvn_client/add.c Mon Mar  3 16:38:58 2014
@@ -840,7 +840,7 @@ add(const char *local_abspath,
   svn_magic__cookie_t *magic_cookie;
   apr_array_header_t *ignores = NULL;
 
-  svn_magic__init(&magic_cookie, scratch_pool);
+  SVN_ERR(svn_magic__init(&magic_cookie, ctx->config, scratch_pool));
 
   if (existing_parent_abspath)
     {

Modified: subversion/branches/fsfs-lock-many/subversion/libsvn_client/copy_foreign.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/libsvn_client/copy_foreign.c?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/libsvn_client/copy_foreign.c (original)
+++ subversion/branches/fsfs-lock-many/subversion/libsvn_client/copy_foreign.c Mon Mar  3 16:38:58 2014
@@ -174,7 +174,7 @@ dir_change_prop(void *dir_baton,
       /* We have already notified for this directory, so don't do that again */
       SVN_ERR(svn_wc_prop_set4(eb->wc_ctx, db->local_abspath, name, value,
                                svn_depth_empty, FALSE, NULL,
-                               NULL, NULL, /* Cancelation */
+                               NULL, NULL, /* Cancellation */
                                NULL, NULL, /* Notification */
                                scratch_pool));
     }

Modified: subversion/branches/fsfs-lock-many/subversion/libsvn_client/diff.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/libsvn_client/diff.c?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/libsvn_client/diff.c (original)
+++ subversion/branches/fsfs-lock-many/subversion/libsvn_client/diff.c Mon Mar  3 16:38:58 2014
@@ -1551,7 +1551,7 @@ diff_prepare_repos_repos(const char **ur
 
    Since Subversion 1.8 we also have a variant of svn_wc_diff called
    svn_client__arbitrary_nodes_diff, that allows handling WORKING-WORKING
-   comparisions between nodes in the working copy.
+   comparisons between nodes in the working copy.
 
    So the truth of the matter is, if the caller's arguments can't be
    pigeonholed into one of these use-cases, we currently bail with a

Modified: subversion/branches/fsfs-lock-many/subversion/libsvn_client/import.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/libsvn_client/import.c?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/libsvn_client/import.c (original)
+++ subversion/branches/fsfs-lock-many/subversion/libsvn_client/import.c Mon Mar  3 16:38:58 2014
@@ -664,7 +664,7 @@ import(const char *local_abspath,
   const svn_io_dirent2_t *dirent;
 
   import_ctx->autoprops = autoprops;
-  svn_magic__init(&import_ctx->magic_cookie, pool);
+  SVN_ERR(svn_magic__init(&import_ctx->magic_cookie, ctx->config, pool));
 
   /* Get a root dir baton.  We pass the revnum we used for testing our
      assumptions and obtaining inherited properties. */

Modified: subversion/branches/fsfs-lock-many/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/libsvn_client/merge.c?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/libsvn_client/merge.c (original)
+++ subversion/branches/fsfs-lock-many/subversion/libsvn_client/merge.c Mon Mar  3 16:38:58 2014
@@ -2419,7 +2419,7 @@ merge_file_deleted(const char *relpath,
    When *SKIP is TRUE, the diff driver avoids work on getting the details
    for the closing callbacks.
 
-   The SKIP and SKIP_DESCENDANTS work independantly.
+   The SKIP and SKIP_DESCENDANTS work independently.
  */
 static svn_error_t *
 merge_dir_opened(void **new_dir_baton,
@@ -3133,7 +3133,7 @@ merge_dir_deleted(const char *relpath,
          descendants we haven't walked?
 
          Note that we aren't interested in changes, as we already verified
-         changes in the paths touched by the merge. And the existance of
+         changes in the paths touched by the merge. And the existence of
          other paths is enough to mark the directory edited */
       err = svn_wc_walk_status(merge_b->ctx->wc_ctx, local_abspath,
                                svn_depth_infinity, TRUE /* get-all */,

Modified: subversion/branches/fsfs-lock-many/subversion/libsvn_delta/xdelta.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/libsvn_delta/xdelta.c?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/libsvn_delta/xdelta.c (original)
+++ subversion/branches/fsfs-lock-many/subversion/libsvn_delta/xdelta.c Mon Mar  3 16:38:58 2014
@@ -45,7 +45,7 @@
  */
 #define MATCH_BLOCKSIZE 64
 
-/* Size of the checksum presense FLAGS array in BLOCKS_T.  With standard
+/* Size of the checksum presence FLAGS array in BLOCKS_T.  With standard
    MATCH_BLOCKSIZE and SVN_DELTA_WINDOW_SIZE, 32k entries is about 20x
    the number of checksums that actually occur, i.e. we expect a >95%
    probability that non-matching checksums get already detected by checking

Modified: subversion/branches/fsfs-lock-many/subversion/libsvn_diff/diff4.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/libsvn_diff/diff4.c?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/libsvn_diff/diff4.c (original)
+++ subversion/branches/fsfs-lock-many/subversion/libsvn_diff/diff4.c Mon Mar  3 16:38:58 2014
@@ -270,7 +270,7 @@ svn_diff_diff4_2(svn_diff_t **diff,
     }
 
   /* Get the lcs for common ancestor - original
-   * Do reverse adjustements
+   * Do reverse adjustments
    */
   lcs_adjust = svn_diff__lcs(position_list[3], position_list[2],
                              token_counts[3], token_counts[2],

Modified: subversion/branches/fsfs-lock-many/subversion/libsvn_diff/util.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/libsvn_diff/util.c?rev=1573603&r1=1573602&r2=1573603&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/libsvn_diff/util.c (original)
+++ subversion/branches/fsfs-lock-many/subversion/libsvn_diff/util.c Mon Mar  3 16:38:58 2014
@@ -575,7 +575,7 @@ svn_diff__display_prop_diffs(svn_stream_
          * from the diff header. But there usually are no files which
          * UNIX patch could apply the property diff to, so we use "##"
          * instead of "@@" as the default hunk delimiter for property diffs.
-         * We also supress the diff header. */
+         * We also suppress the diff header. */
         SVN_ERR(svn_diff_mem_string_output_unified2(
                   outstream, diff, FALSE /* no header */, "##", NULL, NULL,
                   encoding, orig, val, iterpool));



Mime
View raw message