subversion-1.9.7HEADsubversion-1.9.7master

316 files changed, 75653 insertions, 23194 deletions

diff --git a/subversion/bindings/ctypes-python/csvn/core/__init__.py b/subversion/bindings/ctypes-python/csvn/core/__init__.py
index 46395d9..c098b1e 100644
--- a/subversion/bindings/ctypes-python/csvn/core/__init__.py
+++ b/subversion/bindings/ctypes-python/csvn/core/__init__.py
@@ -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)
 
diff --git a/subversion/bindings/ctypes-python/csvn/types.py b/subversion/bindings/ctypes-python/csvn/types.py
index 97253b1..8a2369e 100644
--- a/subversion/bindings/ctypes-python/csvn/types.py
+++ b/subversion/bindings/ctypes-python/csvn/types.py
@@ -237,7 +237,8 @@ class Stream(object):
         self.pool = Pool()
         self.buffer = buffer
         self.stream = svn_stream_create(c_void_p(), self.pool)
-        svn_stream_set_read(self.stream, svn_read_fn_t(self._read))
+        svn_stream_set_read2(self.stream, NULL, # only full read support
+                             svn_read_fn_t(self._read))
         svn_stream_set_write(self.stream, svn_write_fn_t(self._write))
         if not disown:
             svn_stream_set_close(self.stream, svn_close_fn_t(self._close))
diff --git a/subversion/bindings/ctypes-python/examples/example.py b/subversion/bindings/ctypes-python/examples/example.py
index 9afdbb5..0a717be 100755
--- a/subversion/bindings/ctypes-python/examples/example.py
+++ b/subversion/bindings/ctypes-python/examples/example.py
@@ -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):
diff --git a/subversion/bindings/ctypes-python/test/wc.py b/subversion/bindings/ctypes-python/test/wc.py
index 6d57902..dee438a 100755
--- a/subversion/bindings/ctypes-python/test/wc.py
+++ b/subversion/bindings/ctypes-python/test/wc.py
@@ -168,7 +168,7 @@ class WCTestCase(unittest.TestCase):
         path = "%s/branches/0.x/README.txt" % wc_location
         diffstring="""Index: """+path+"""
 ===================================================================
---- """+path+"""\t(revision 0)
+--- """+path+"""\t(nonexistent)
 +++ """+path+"""\t(revision 5)
 @@ -0,0 +1,9 @@
 +This repository is for test purposes only. Any resemblance to any other
@@ -233,7 +233,7 @@ class WCTestCase(unittest.TestCase):
         self.wc.info(path="trunk/README.txt",
             info_func=self._info_receiver)
         if not self.last_info.lock:
-            self.fail("Lock not aquired")
+            self.fail("Lock not acquired")
 
     def test_unlock(self):
         path = "%s/trunk/README.txt" % wc_location
@@ -241,7 +241,7 @@ class WCTestCase(unittest.TestCase):
         self.wc.info(path=path,
             info_func=self._info_receiver)
         if not self.last_info.lock:
-            self.fail("Lock not aquired")
+            self.fail("Lock not acquired")
         self.wc.unlock([path])
 
         self.wc.info(path="trunk/README.txt",
diff --git a/subversion/bindings/cxxhl/include/svncxxhl.hpp b/subversion/bindings/cxxhl/include/svncxxhl.hpp
index 29b618b..0175bdf 100644
--- a/subversion/bindings/cxxhl/include/svncxxhl.hpp
+++ b/subversion/bindings/cxxhl/include/svncxxhl.hpp
@@ -32,6 +32,6 @@
 #include "svncxxhl/exception.hpp"
 #include "svncxxhl/tristate.hpp"
 
-namespace svn = ::subversion::cxxhl::version_1_9_dev;
+namespace SVN = ::apache::subversion::cxxhl;
 
 #endif  // SVN_CXXHL_HPP
diff --git a/subversion/bindings/cxxhl/include/svncxxhl/_compat.hpp b/subversion/bindings/cxxhl/include/svncxxhl/_compat.hpp
index 264e533..28c99f1 100644
--- a/subversion/bindings/cxxhl/include/svncxxhl/_compat.hpp
+++ b/subversion/bindings/cxxhl/include/svncxxhl/_compat.hpp
@@ -28,64 +28,117 @@
 #ifndef SVN_CXXHL_COMPAT_HPP
 #define SVN_CXXHL_COMPAT_HPP
 
-// Configuration test: std::shared_ptr<>
+// Configuration test: std::shared_ptr<> and friends
 // Currently detects: clang++, g++, msvc-2010+
-#ifndef SVN_CXXHL_HAVE_STD_SHARED_PTR
+#ifndef SVN_CXXHL_HAVE_STD_SMART_PTRS
 #  if   (defined(__clang__) && __cplusplus >= 201103L) \
      || (defined(__GNUC__) && defined(__GXX_EXPERIMENTAL_CXX0X__)) \
      || (defined(_MSC_VER) && _MSC_VER >= 1600)
-#    define SVN_CXXHL_HAVE_STD_SHARED_PTR
+#    define SVN_CXXHL_HAVE_STD_SMART_PTRS
 #  endif  // config test: std::shared_ptr<>
-#endif  // SVN_CXXHL_HAVE_STD_SHARED_PTR
+#endif  // SVN_CXXHL_HAVE_STD_SMART_PTRS
 
-// Configuration test: std::tr1::shared_ptr<>
+// Configuration test: std::tr1::shared_ptr<> and friends
 // Currently detects: clang++, g++
-#ifndef SVN_CXXHL_HAVE_STD_SHARED_PTR
-#  ifndef SVN_CXXHL_HAVE_STD_TR1_SHARED_PTR
+#ifndef SVN_CXXHL_HAVE_STD_SMART_PTRS
+#  ifndef SVN_CXXHL_HAVE_STD_TR1_SMART_PTRS
 #    if   defined(__GNUC__) \
        && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ >= 1)
-#      define SVN_CXXHL_HAVE_STD_TR1_SHARED_PTR
+#      define SVN_CXXHL_HAVE_STD_TR1_SMART_PTRS
 #    endif  // config test: std::tr1::shared_ptr<>
-#  endif  // SVN_CXXHL_HAVE_STD_TR1_SHARED_PTR
-#endif  // SVN_CXXHL_HAVE_STD_SHARED_PTR
+#  endif  // SVN_CXXHL_HAVE_STD_TR1_SMART_PTRS
+#endif  // SVN_CXXHL_HAVE_STD_SMART_PTRS
 
 
-#if defined(SVN_CXXHL_HAVE_STD_SHARED_PTR)
+#if defined(SVN_CXXHL_HAVE_STD_SMART_PTRS)
 
 #include <memory>
+namespace apache {
 namespace subversion {
 namespace cxxhl {
 namespace compat {
+using std::weak_ptr;
 using std::shared_ptr;
+using std::enable_shared_from_this;
 } // namespace compat
 } // namespace cxxhl
 } // namespace subversion
+} // namespace apache
 
-#elif defined(SVN_CXXHL_HAVE_STD_TR1_SHARED_PTR)
+#elif defined(SVN_CXXHL_HAVE_STD_TR1_SMART_PTRS)
 
 #include <tr1/memory>
+namespace apache {
 namespace subversion {
 namespace cxxhl {
 namespace compat {
+using std::tr1::weak_ptr;
 using std::tr1::shared_ptr;
+using std::tr1::enable_shared_from_this;
 } // namespace compat
 } // namespace cxxhl
 } // namespace subversion
+} // namespace apache
 
 #else
-// We need shared_ptr<> from somewhere. If we cannot find it in ::std
-// given known compiler characteristics, then try boost as a last
-// resort.
+// We need smart pointers from somewhere. If we cannot find them in
+// ::std given known compiler characteristics, then try Boost as a
+// last resort.
 
+#define SVN_CXXHL_USING_BOOST
 #include <boost/shared_ptr.hpp>
+namespace apache {
 namespace subversion {
 namespace cxxhl {
 namespace compat {
+using boost::weak_ptr;
 using boost::shared_ptr;
+using boost::enable_shared_from_this;
 } // namespace compat
 } // namespace cxxhl
 } // namespace subversion
+} // namespace apache
 
-#endif  // SVN_CXXHL_HAVE_STD_SHARED_PTR
+#endif  // SVN_CXXHL_HAVE_STD_SMART_PTRS
+
+// Configuration test: noncopyable mixin.
+#ifdef SVN_CXXHL_USING_BOOST
+
+#include <boost/noncopyable.hpp>
+namespace apache {
+namespace subversion {
+namespace cxxhl {
+namespace compat {
+using boost::noncopyable;
+} // namespace compat
+} // namespace cxxhl
+} // namespace subversion
+} // namespace apache
+
+#else  // !SVN_CXXHL_USING_BOOST
+
+namespace apache {
+namespace subversion {
+namespace cxxhl {
+namespace compat {
+namespace noncopyable_
+{
+class noncopyable
+{
+protected:
+  noncopyable() {}
+  ~noncopyable() {}
+private:
+  noncopyable(const noncopyable&);
+  noncopyable& operator=(const noncopyable&);
+};
+} // namespace noncopyable_
+typedef noncopyable_::noncopyable noncopyable;
+} // namespace compat
+} // namespace cxxhl
+} // namespace subversion
+} // namespace apache
+
+#endif // SVN_CXXHL_USING_BOOST
 
 #endif  // SVN_CXXHL_COMPAT_HPP
diff --git a/subversion/bindings/cxxhl/include/svncxxhl/exception.hpp b/subversion/bindings/cxxhl/include/svncxxhl/exception.hpp
index 3a1b9a0..13e5fbd 100644
--- a/subversion/bindings/cxxhl/include/svncxxhl/exception.hpp
+++ b/subversion/bindings/cxxhl/include/svncxxhl/exception.hpp
@@ -35,9 +35,7 @@
 
 #include "svncxxhl/_compat.hpp"
 
-// Forward declaration of implementation-specific structure
-struct svn_error_t;
-
+namespace apache {
 namespace subversion {
 namespace cxxhl {
 
@@ -45,56 +43,109 @@ namespace compat {} // Announce the compat namespace for shared_ptr lookup
 
 namespace detail {
 // Forward declaration of implementation-specific structure
-class error_description;
+class ErrorDescription;
 } // namespace detail
 
-namespace version_1_9_dev {
-
-class error : public std::exception
+/**
+ * Exceptions generated by the C++HL implementation.
+ */
+class InternalError : public std::exception
 {
 public:
-  typedef compat::shared_ptr<error> shared_ptr;
-
-  error(const char* description, int error_code);
-  error(const char* description, int error_code, shared_ptr nested_error);
+  explicit InternalError(const char* description);
 
-  error(const error& that) throw();
-  error& operator=(const error& that) throw();
-  virtual ~error() throw();
+  InternalError(const InternalError& that) throw();
+  InternalError& operator= (const InternalError& that) throw();
+  virtual ~InternalError() throw();
 
   /**
-   * Returns the error code associated with the exception.
+   * Returns the message associated with this exception object.
    */
-  virtual int code() const throw() { return m_errno; }
+  virtual const char* what() const throw();
+
+protected:
+  typedef compat::shared_ptr<detail::ErrorDescription> description_ptr;
+  explicit InternalError(description_ptr description) throw();
+  description_ptr m_description;
+};
+
+/**
+ * Encapsulate a stack of Subversion error codes and messages.
+ */
+class Error : public InternalError
+{
+public:
+  Error(const Error& that) throw();
+  Error& operator=(const Error& that) throw();
+  virtual ~Error() throw();
 
   /**
-   * Returns a shared pointer to the nested exception object, if any.
+   * Returns the error code associated with the top-level error that
+   * caused the exception.
    */
-  virtual shared_ptr nested() const throw() { return m_nested; }
-
-  /// Returns the message associated with this exception object.
-  virtual const char* what() const throw();
+  virtual int code() const throw();
 
   /**
    * Error message description.
-   *
-   * The first element of this pair is the error code, the second the
-   * associated error message. If the error code is 0, the message
-   * describes the location in the source code where the error was
-   * generated from.
    */
-  typedef std::pair<int, std::string> message;
+  class Message
+  {
+  public:
+    /**
+     * Create a message object given an error code and error message.
+     */
+    Message(int errval, const std::string& message)
+      : m_errno(errval),
+        m_message(message),
+        m_trace(false)
+      {}
+
+    /**
+     * Create a message object given an error code and error message,
+     * and set the flag that tells if this is a debugging traceback entry.
+     */
+    Message(int errval, const std::string& message, bool trace)
+      : m_errno(errval),
+        m_message(message),
+        m_trace(trace)
+      {}
+
+    /**
+     * Return the error code.
+     */
+    int code() const throw() { return m_errno; }
+
+    /**
+     * Return the error message.
+     */
+    const std::string& message() const throw() { return m_message; }
+
+    /**
+     * Return the generic error message associated with the error code.
+     */
+    const char* generic_message() const;
+
+    /**
+     * Check if this message is in fact a debugging traceback entry.
+     */
+    bool trace() const throw() { return m_trace; }
+
+  private:
+    int m_errno;
+    std::string m_message;
+    bool m_trace;
+  };
 
   /**
    * The list of messages associated with an error.
    */
-  typedef std::vector<message> message_list;
+  typedef std::vector<Message> MessageList;
 
   /**
    * Returns the complete list of error messages, including those from
-   * nested exceptions.
+   * nested errors.
    */
-  virtual message_list messages() const
+  virtual MessageList messages() const
     {
       return compile_messages(false);
     }
@@ -106,39 +157,32 @@ public:
    * Traceback is only available if the Subversion libraries were
    * compiled with tracing enabled.
    */
-  virtual message_list traced_messages() const
+  virtual MessageList traced_messages() const
     {
       return compile_messages(true);
     }
 
-public:
-  /** Used internally by the implementation. */
-  static void throw_svn_error(svn_error_t*);
-
 protected:
-  error(int error_code, detail::error_description* description) throw();
-
-private:
-  std::vector<message> compile_messages(bool show_traces) const;
-
-  int m_errno;                /**< The (SVN or APR) error code. */
-  shared_ptr m_nested;        /**< Optional pointer to nessted error. */
-  /** Error description and trace location information. */
-  detail::error_description* m_description;
+  explicit Error(description_ptr description) throw()
+    : InternalError(description)
+    {}
+  MessageList compile_messages(bool show_traces) const;
 };
 
-class cancelled : public error
+/**
+ * Thrown instead of Error when the error chain contains a
+ * @c SVN_ERR_CANCELLED error code.
+ */
+class Cancelled : public Error
 {
-  friend void error::throw_svn_error(svn_error_t*);
-
 protected:
-  cancelled(int error_code, detail::error_description* description) throw()
-    : error(error_code, description)
+  explicit Cancelled(description_ptr description) throw()
+    : Error(description)
     {}
 };
 
-} // namespace version_1_9_dev
 } // namespace cxxhl
 } // namespace subversion
+} // namespace apache
 
 #endif  // SVN_CXXHL_EXCEPTION_HPP
diff --git a/subversion/bindings/cxxhl/include/svncxxhl/tristate.hpp b/subversion/bindings/cxxhl/include/svncxxhl/tristate.hpp
index 15a60b4..2b52ef1 100644
--- a/subversion/bindings/cxxhl/include/svncxxhl/tristate.hpp
+++ b/subversion/bindings/cxxhl/include/svncxxhl/tristate.hpp
@@ -28,37 +28,37 @@
 #ifndef SVN_CXXHL_TRISTATE_HPP
 #define SVN_CXXHL_TRISTATE_HPP
 
+namespace apache {
 namespace subversion {
 namespace cxxhl {
-namespace version_1_9_dev {
 
-class tristate
+class Tristate
 {
 public:
-  static const tristate TRUE;
-  static const tristate FALSE;
-  static const tristate UNKNOWN;
+  static const Tristate TRUE;
+  static const Tristate FALSE;
+  static const Tristate UNKNOWN;
 
-  tristate(const tristate& that) throw()
+  Tristate(const Tristate& that) throw()
     : m_value(that.m_value)
     {}
 
-  bool operator==(const tristate& that) const throw()
+  bool operator==(const Tristate& that) const throw()
     { return m_value == that.m_value; }
 
-  bool operator!=(const tristate& that) const throw()
+  bool operator!=(const Tristate& that) const throw()
     { return !(*this == that); }
 
   bool known() const throw()
     { return *this != UNKNOWN; }
 
 private:
-  explicit tristate(short int value) throw();
+  explicit Tristate(short int value) throw();
   short int m_value;
 };
 
-} // namespace version_1_9_dev
 } // namespace cxxhl
 } // namespace subversion
+} // namespace apache
 
 #endif  // SVN_CXXHL_TRISTATE_HPP
diff --git a/subversion/bindings/cxxhl/src/aprwrap.hpp b/subversion/bindings/cxxhl/src/aprwrap.hpp
new file mode 100644
index 0000000..f1525f3
--- /dev/null
+++ b/subversion/bindings/cxxhl/src/aprwrap.hpp
@@ -0,0 +1,34 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+#ifndef SVN_CXXHL_PRIVATE_APRWRAP_H
+#define SVN_CXXHL_PRIVATE_APRWRAP_H
+
+// Expose the whole APR wrapper API and alias the namespace
+#include "aprwrap/pool.hpp"
+#include "aprwrap/hash.hpp"
+#include "aprwrap/array.hpp"
+
+namespace APR = ::apache::subversion::cxxhl::apr;
+
+#endif // SVN_CXXHL_PRIVATE_APRWRAP_H
diff --git a/subversion/bindings/cxxhl/src/aprwrap/array.hpp b/subversion/bindings/cxxhl/src/aprwrap/array.hpp
new file mode 100644
index 0000000..681489e
--- /dev/null
+++ b/subversion/bindings/cxxhl/src/aprwrap/array.hpp
@@ -0,0 +1,280 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+#ifndef SVN_CXXHL_PRIVATE_APRWRAP_ARRAY_H
+#define SVN_CXXHL_PRIVATE_APRWRAP_ARRAY_H
+
+#include <stdexcept>
+
+#include <apr_tables.h>
+#include "pool.hpp"
+
+#include "svn_private_config.h"
+
+namespace apache {
+namespace subversion {
+namespace cxxhl {
+namespace apr {
+
+/**
+ * Proxy for an APR array.
+ *
+ * This class does not own the array. The array's lifetime is tied to
+ * its pool. The caller is responsible for making sure that the
+ * array's lifetime is longer than this proxy object's.
+ */
+template<typename T> class Array
+{
+public:
+  typedef T value_type;
+  typedef int size_type;
+
+  /**
+   * Create and proxy a new APR array allocated from @a pool.
+   * Reserve space for @a nelts array elements.
+   */
+  explicit Array(const Pool& pool, size_type nelts = 0) throw()
+    : m_array(apr_array_make(pool.get(), nelts, sizeof(value_type)))
+    {}
+
+  /**
+   * Create a new proxy for the APR array @a array.
+   */
+  explicit Array(apr_array_header_t* array)
+    : m_array(array)
+    {
+      if (m_array->elt_size != sizeof(value_type))
+        throw std::invalid_argument(
+            _("APR array element size does not match template parameter"));
+    }
+
+  /**
+   * @return The wrapped APR array.
+   */
+  apr_array_header_t* array() const throw()
+    {
+      return m_array;
+    }
+
+  /**
+   * @return the number of elements in the wrapped APR array.
+   */
+  size_type size() const throw()
+    {
+      return m_array->nelts;
+    }
+
+  /**
+   * @return An immutable reference to the array element at @a index.
+   */
+  const value_type& operator[](size_type index) const throw()
+    {
+      return APR_ARRAY_IDX(m_array, index, value_type);
+    }
+
+  /**
+   * @return An immutable reference to the array element at @a index.
+   * Like operator[] but perfoms a range check on the index.
+   */
+  const value_type& at(size_type index) const
+    {
+      if (index < 0 || index >= size())
+        throw std::out_of_range(_("APR array index is out of range"));
+      return (*this)[index];
+    }
+
+  /**
+   * @return A mutable reference to the array element at @a index.
+   */
+  value_type& operator[](size_type index) throw()
+    {
+      return APR_ARRAY_IDX(m_array, index, value_type);
+    }
+
+  /**
+   * @return A mutable reference to the array element at @a index.
+   * Like operator[] but perfoms a range check on the index.
+   */
+  value_type& at(size_type index)
+    {
+      if (index < 0 || index >= size())
+        throw std::out_of_range(_("APR array index is out of range"));
+      return (*this)[index];
+    }
+
+  /**
+   * Push @a value onto the end of the APR array.
+   */
+  void push(const value_type& value) throw()
+    {
+      APR_ARRAY_PUSH(m_array, value_type) = value;
+    }
+
+  /**
+   * Pop a value from the end of the array.
+   * @return A pointer to the value that was removed, or @c NULL if
+   * the array was empty.
+   */
+  value_type* pop() throw()
+    {
+      return static_cast<value_type*>(apr_array_pop(m_array));
+    }
+
+  /**
+   * Abstract base class for mutable iteration callback functors.
+   */
+  struct Iteration
+  {
+    /**
+     * Called by Array::iterate for every value in the array.
+     * @return @c false to terminate the iteration, @c true otherwise.
+     */
+    virtual bool operator() (value_type& value) = 0;
+  };
+
+  /**
+   * Iterate over all the values pairs in the array, invoking
+   * @a callback for each one.
+   */
+  void iterate(Iteration& callback)
+    {
+      for (size_type n = 0; n < size(); ++n)
+        if (!callback((*this)[n]))
+          break;
+    }
+
+  /**
+   * Abstract base class for immutable iteration callback functors.
+   */
+  struct ConstIteration
+  {
+    /**
+     * Called by Array::iterate for every value in the array.
+     * @return @c false to terminate the iteration, @c true otherwise.
+     */
+    virtual bool operator() (const value_type& value) = 0;
+  };
+
+  /**
+   * Iterate over all the values pairs in the array, invoking
+   * @a callback for each one.
+   */
+  void iterate(ConstIteration& callback) const
+    {
+      for (size_type n = 0; n < size(); ++n)
+        if (!callback((*this)[n]))
+          break;
+    }
+
+private:
+  apr_array_header_t* const m_array; ///< The wrapperd APR array.
+};
+
+
+/**
+ * Proxy for an immutable APR array.
+ */
+template<typename T>
+class ConstArray : private Array<T>
+{
+  typedef Array<T> inherited;
+
+public:
+  typedef typename inherited::value_type value_type;
+  typedef typename inherited::size_type size_type;
+
+  /**
+   * Create a new proxy for the APR array wrapped by @a that.
+   */
+  ConstArray(const ConstArray& that) throw()
+    : inherited(that)
+    {}
+
+  /**
+   * Create a new proxy for the APR array wrapped by @a that.
+   */
+  explicit ConstArray(const inherited& that) throw()
+    : inherited(that)
+    {}
+
+  /**
+   * Create a new proxy for the APR array @a array.
+   */
+  explicit ConstArray(const apr_array_header_t* array)
+    : inherited(const_cast<apr_array_header_t*>(array))
+    {}
+
+  /**
+   * @return The wrapped APR array.
+   */
+  const apr_array_header_t* array() const throw()
+    {
+      return inherited::array();
+    }
+
+  /**
+   * @return The number of elements in the wrapped APR array.
+   */
+  size_type size() const throw()
+    {
+      return inherited::size();
+    }
+
+  /**
+   * @return An immutable reference to the array element at @a index.
+   */
+  const value_type& operator[](size_type index) const throw()
+    {
+      return inherited::operator[](index);
+    }
+
+  /**
+   * @return An immutable reference to the array element at @a index.
+   * Like operator[] but perfoms a range check on the index.
+   */
+  const value_type& at(size_type index) const
+    {
+      return inherited::at(index);
+    }
+
+  /**
+   * Abstract base class for immutable iteration callback functors.
+   */
+  typedef typename inherited::ConstIteration Iteration;
+
+  /**
+   * Iterate over all the values pairs in the array, invoking
+   * @a callback for each one.
+   */
+  void iterate(Iteration& callback) const
+    {
+      inherited::iterate(callback);
+    }
+};
+
+} // namespace apr
+} // namespace cxxhl
+} // namespace subversion
+} // namespace apache
+
+#endif // SVN_CXXHL_PRIVATE_APRWRAP_HASH_H
diff --git a/subversion/bindings/cxxhl/src/aprwrap/hash.hpp b/subversion/bindings/cxxhl/src/aprwrap/hash.hpp
new file mode 100644
index 0000000..d779cb3
--- /dev/null
+++ b/subversion/bindings/cxxhl/src/aprwrap/hash.hpp
@@ -0,0 +1,371 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+#ifndef SVN_CXXHL_PRIVATE_APRWRAP_HASH_H
+#define SVN_CXXHL_PRIVATE_APRWRAP_HASH_H
+
+#include <apr_hash.h>
+#include "pool.hpp"
+
+namespace apache {
+namespace subversion {
+namespace cxxhl {
+namespace apr {
+
+// Template forward declaration
+template<typename T, typename V, apr_ssize_t KeySize = APR_HASH_KEY_STRING>
+class Hash;
+
+/**
+ * Proxy for an APR hash table.
+ * This is a template specialization for the default hash type.
+ */
+template<>
+class Hash<void, void>
+{
+public:
+  struct Iteration;
+
+  /**
+   * Iterate over all the key-value pairs in the hash table, invoking
+   * @a callback for each pair.
+   * Uses @a scratch_pool for temporary allocations.
+   */
+  void iterate(Iteration& callback, const Pool& scratch_pool);
+
+public:
+  /**
+   * Proxy for a key in an APR hash table.
+   * This is a template specialization for the default hash key type.
+   */
+  class Key
+  {
+  public:
+    typedef const void* key_type;
+    typedef apr_ssize_t size_type;
+
+    /**
+     * Public constructor. Uses the template @a Size parameter.
+     */
+    Key(key_type key) throw()
+      : m_key(key), m_size(APR_HASH_KEY_STRING)
+      {}
+
+    /**
+     * Get the value of the key.
+     */
+    key_type get() const throw() { return m_key; }
+
+    /**
+     * Get the size of the key.
+     */
+    size_type size() const throw() { return m_size; }
+
+  protected:
+    /**
+     * Constructor used by the generic template, specializations and
+     * hash table wrapper. Does not make assumptions about the key size.
+     */
+    Key(key_type key, size_type size) throw()
+      : m_key(key), m_size(size)
+      {}
+
+    /**
+     * The hash table wrapper must be able to call the protected constructor.
+     */
+    friend void Hash::iterate(Hash::Iteration&, const Pool&);
+
+  private:
+    const key_type m_key;       ///< Immutable reference to the key
+    const size_type m_size;     ///< The size of the key
+  };
+
+public:
+  typedef Key::key_type key_type;
+  typedef void* value_type;
+  typedef unsigned int size_type;
+
+  /**
+   * Create and proxy a new APR hash table in @a pool.
+   */
+  explicit Hash(const Pool& pool) throw()
+    : m_hash(apr_hash_make(pool.get()))
+    {}
+
+  /**
+   * Create and proxy a new APR hash table in @a pool, using @a
+   * hash_func as the hash function.
+   */
+  explicit Hash(const Pool& pool, apr_hashfunc_t hash_func) throw()
+    : m_hash(apr_hash_make_custom(pool.get(), hash_func))
+    {}
+
+  /**
+   * Create a proxy for the APR hash table @a hash.
+   */
+  explicit Hash(apr_hash_t* hash)
+    : m_hash(hash)
+    {}
+
+  /**
+   * Return the wrapped APR hash table.
+   */
+  apr_hash_t* hash() const throw()
+    {
+      return m_hash;
+    }
+
+  /**
+   * Return the number of key-value pairs in the wrapped hash table.
+   */
+  size_type size() const throw()
+    {
+      return apr_hash_count(m_hash);
+    }
+
+  /**
+   * Set @a key = @a value in the wrapped hash table.
+   */
+  void set(const Key& key, value_type value) throw()
+    {
+      apr_hash_set(m_hash, key.get(), key.size(), value);
+    }
+
+  /**
+   * Retrieve the value associated with @a key.
+   */
+  value_type get(const Key& key) const throw()
+    {
+      return apr_hash_get(m_hash, key.get(), key.size());
+    }
+
+  /**
+   * Delete the entry for @a key.
+   */
+  void del(const Key& key) throw()
+    {
+      apr_hash_set(m_hash, key.get(), key.size(), NULL);
+    }
+
+  /**
+   * Abstract base class for iteration callback functors.
+   */
+  struct Iteration
+  {
+    /**
+     * Called by Hash::iterate for every key-value pair in the hash table.
+     * @return @c false to terminate the iteration, @c true otherwise.
+     */
+    virtual bool operator() (const Key& key, value_type value) = 0;
+  };
+
+protected:
+  typedef const void* const_value_type;
+
+  /**
+   * Set @a key = @a value in the wrapped hash table.  Overloaded for
+   * deroved template instantiations with constant values; for
+   * example, Hash<char, const char>.
+   */
+  void set(const Key& key, const_value_type const_value) throw()
+    {
+      set(key, const_cast<value_type>(const_value));
+    }
+
+private:
+  apr_hash_t* const m_hash;     ///< The wrapped APR hash table.
+};
+
+
+/**
+ * Proxy for an APR hash table: the template.
+ *
+ * This class does not own the hash table. The hash table's lifetime
+ * is tied to its pool. The caller is responsible for making sure that
+ * the hash table's lifetime is longer than this proxy object's.
+ */
+template<typename K, typename V, apr_ssize_t KeySize>
+class Hash : private Hash<void, void>
+{
+  typedef Hash<void, void> inherited;
+
+public:
+  /**
+   * Proxy for a key in an APR hash table.
+   *
+   * This class does not own the key; it is the caller's responsibility
+   * to make sure that the key's lifetime is longer than the proxy
+   * object's.
+   */
+  class Key : private inherited::Key
+  {
+    typedef Hash<void, void>::Key inherited;
+
+    /**
+     * The wrapper must be able to call the private constructor and
+     * convert references to the base class.
+     */
+    friend class Hash;
+
+  public:
+    typedef const K* key_type;
+    typedef inherited::size_type size_type;
+
+    Key(key_type key) throw()
+      : inherited(key, KeySize)
+      {}
+
+    /**
+     * Get the value of the key.
+     */
+    key_type get() const throw()
+      {
+        return static_cast<key_type>(inherited::get());
+      }
+
+    /**
+     * Get the size of the key.
+     */
+    size_type size() const throw()
+      {
+        return inherited::size();
+      }
+
+  private:
+    /**
+     * Conversion constructor used by the derived iteration class.
+     */
+    explicit Key(const inherited& that) throw()
+      : inherited(that)
+      {}
+  };
+
+public:
+  typedef typename Key::key_type key_type;
+  typedef V* value_type;
+
+  /**
+   * Create and proxy a new APR hash table allocated from @a pool.
+   */
+  explicit Hash(const Pool& pool) throw()
+    : inherited(pool)
+    {}
+
+  /**
+   * Create and proxy a new APR hash table allocated from @a pool,
+   * using @a hash_func as the hash function.
+   */
+  explicit Hash(const Pool& pool, apr_hashfunc_t hash_func) throw()
+    : inherited(pool, hash_func)
+    {}
+
+  /**
+   * Create a proxy for the APR hash table @a hash.
+   */
+  explicit Hash(apr_hash_t* hash)
+    : inherited(hash)
+    {}
+
+  /**
+   * @return The wrapped APR hash table.
+   */
+  apr_hash_t* hash() const throw()
+    {
+      return inherited::hash();
+    }
+
+  /**
+   * Return the number of key-value pairs in the wrapped hash table.
+   */
+  size_type size() const throw()
+    {
+      return inherited::size();
+    }
+
+  /**
+   * Set @a key = @a value in the wrapped hash table.
+   */
+  void set(const Key& key, value_type value) throw()
+    {
+      inherited::set(inherited::Key(key), value);
+    }
+
+  /**
+   * Retrieve the value associated with @a key.
+   */
+  value_type get(const Key& key) const throw()
+    {
+      return static_cast<value_type>(inherited::get(inherited::Key(key)));
+    }
+
+  /**
+   * Delete the entry for @a key.
+   */
+  void del(const Key& key) throw()
+    {
+      inherited::del(inherited::Key(key));
+    }
+
+  /**
+   * Abstract base class for iteration callback functors.
+   */
+  struct Iteration : protected inherited::Iteration
+  {
+    /**
+     * Called by Hash::iterate for every key-value pair in the hash table.
+     * @return @c false to terminate the iteration, @c true otherwise.
+     */
+    virtual bool operator() (const Key& key, value_type value) = 0;
+
+  private:
+    friend void Hash::iterate(Iteration& callback, const Pool& scratch_pool);
+
+    /**
+     * Implementation of the derived virtual operator().
+     * Adapts the callback to the instantiated types.
+     */
+    virtual bool operator() (const inherited::Key& raw_key,
+                             inherited::value_type raw_value)
+      {
+        return (*this)(Key(raw_key), static_cast<value_type>(raw_value));
+      }
+  };
+
+  /**
+   * Iterate over all the key-value pairs in the hash table, invoking
+   * @a callback for each pair.
+   * Uses @a scratch_pool for temporary allocations.
+   */
+  void iterate(Iteration& callback, const Pool& scratch_pool)
+    {
+      inherited::iterate(callback, scratch_pool);
+    }
+};
+
+
+} // namespace apr
+} // namespace cxxhl
+} // namespace subversion
+} // namespace apache
+
+#endif // SVN_CXXHL_PRIVATE_APRWRAP_HASH_H
diff --git a/subversion/bindings/cxxhl/src/aprwrap/impl.cpp b/subversion/bindings/cxxhl/src/aprwrap/impl.cpp
new file mode 100644
index 0000000..01a4ac0
--- /dev/null
+++ b/subversion/bindings/cxxhl/src/aprwrap/impl.cpp
@@ -0,0 +1,110 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+#include <apr_time.h>
+
+#include "private/svn_atomic.h"
+#include "svn_private_config.h"
+#undef TRUE
+#undef FALSE
+
+#include "pool.hpp"
+#include "hash.hpp"
+
+namespace apache {
+namespace subversion {
+namespace cxxhl {
+namespace apr {
+
+//
+// Pool implementation
+//
+
+apr_pool_t* Pool::get_root_pool()
+{
+  static const svn_atomic_t NONE = 0;
+  static const svn_atomic_t START = 1;
+  static const svn_atomic_t DONE = 2;
+
+  static volatile svn_atomic_t init_state = NONE;
+  static apr_pool_t* root_pool = NULL;
+
+  svn_atomic_t state = svn_atomic_cas(&init_state, START, NONE);
+
+  switch (state)
+    {
+    case DONE:
+      // The root pool has already been initialized.
+      return root_pool;
+
+    case START:
+      // Another thread is currently initializing the pool; Spin and
+      // wait for it to finish, with exponential backoff, but no
+      // longer than half a second.
+      for (unsigned shift = 0; state == START && shift < 8; ++shift)
+        {
+          apr_sleep((APR_USEC_PER_SEC / 1000) << shift);
+          state = svn_atomic_cas(&init_state, NONE, NONE);
+        }
+      if (state == START)
+        throw cxxhl::InternalError(
+            _("APR pool initialization failed: Timed out"));
+      return root_pool;
+
+    case NONE:
+      // Initialize the root pool and release the lock.
+      // We'll assume that we always need thread-safe allocation.
+      root_pool = svn_pool_create_ex(NULL, svn_pool_create_allocator(true));
+      svn_atomic_cas(&init_state, DONE, START);
+      return root_pool;
+
+    default:
+      throw cxxhl::InternalError(
+          _("APR pool initialization failed: Invalid state"));
+    }
+}
+
+//
+// Hash implementation
+//
+
+void Hash<void, void>::iterate(Hash<void, void>::Iteration& callback,
+                               const Pool& scratch_pool)
+{
+  for (apr_hash_index_t* hi = apr_hash_first(scratch_pool.get(), m_hash);
+       hi; hi = apr_hash_next(hi))
+    {
+      key_type key;
+      value_type val;
+      Key::size_type klen;
+
+      apr_hash_this(hi, &key, &klen, &val);
+      if (!callback(Key(key, klen), val))
+        break;
+    }
+}
+
+} // namespace apr
+} // namespace cxxhl
+} // namespace subversion
+} // namespace apache
diff --git a/subversion/bindings/cxxhl/src/aprwrap/pool.hpp b/subversion/bindings/cxxhl/src/aprwrap/pool.hpp
new file mode 100644
index 0000000..c253a6a
--- /dev/null
+++ b/subversion/bindings/cxxhl/src/aprwrap/pool.hpp
@@ -0,0 +1,198 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+#ifndef SVN_CXXHL_PRIVATE_APRWRAP_POOL_H
+#define SVN_CXXHL_PRIVATE_APRWRAP_POOL_H
+
+#include <cstdlib>
+
+#include "svncxxhl/exception.hpp"
+#include "svncxxhl/_compat.hpp"
+
+#include "svn_pools.h"
+#undef TRUE
+#undef FALSE
+
+namespace apache {
+namespace subversion {
+namespace cxxhl {
+namespace apr {
+
+// Forward declaration
+class IterationPool;
+
+/**
+ * Encapsulates an APR pool.
+ */
+class Pool : compat::noncopyable
+{
+public:
+  /**
+   * Create a pool as a child of the applications' root pool.
+   */
+  Pool()
+    : m_pool(svn_pool_create(get_root_pool()))
+    {}
+
+  /**
+   * Create a pool as a child of @a parent.
+   */
+  explicit Pool(Pool* parent) throw()
+    : m_pool(svn_pool_create(parent->m_pool))
+    {}
+
+  /**
+   * Destroy the pool.
+   */
+  ~Pool() throw()
+    {
+      svn_pool_destroy(m_pool);
+    }
+
+  /**
+   * Clear the pool.
+   */
+  void clear() throw()
+    {
+      apr_pool_clear(m_pool);
+    }
+
+  /**
+   * Retuurn a pool pointer that can be used by the C APIs.
+   */
+  apr_pool_t* get() const throw()
+    {
+      return m_pool;
+    }
+
+  /**
+   * Allocate space for @a count elements of type @a T from the pool.
+   * The contents of the allocated buffer will contain unspecified data.
+   */
+  template<typename T>
+  T* alloc(std::size_t count) throw()
+    {
+      return static_cast<T*>(apr_palloc(m_pool, count * sizeof(T)));
+    }
+
+  /**
+   * Allocate space for @a count elements of type @a T from the pool.
+   * The contents of the allocated buffer will be initialized to zero.
+   */
+  template<typename T>
+  T* allocz(std::size_t count) throw()
+    {
+      return static_cast<T*>(apr_pcalloc(m_pool, count * sizeof(T)));
+    }
+
+private:
+  static apr_pool_t* get_root_pool();
+  apr_pool_t* const m_pool;
+
+public:
+  /**
+   * Pool proxy used for iteration scratch pools.
+   *
+   * Construct this object inside a loop body in order to clear the
+   * proxied pool on every iteration.
+   */
+  class Iteration : compat::noncopyable
+  {
+  public:
+    /**
+     * The constructor clears the proxied pool.
+     */
+    explicit Iteration(IterationPool& iterbase) throw();
+
+    /**
+     * Returns a reference to the proxied pool.
+     */
+    Pool& pool() const throw()
+      {
+        return m_pool;
+      }
+
+    /**
+     * Proxy method for Pool::get
+     */
+    apr_pool_t* get() const throw()
+      {
+        return m_pool.get();
+      }
+
+    /**
+     * Proxy method for Pool::alloc
+     */
+    template<typename T>
+    T* alloc(std::size_t count) throw()
+      {
+        return m_pool.alloc<T>(count);
+      }
+
+    /**
+     * Proxy method for Pool::allocz
+     */
+    template<typename T>
+    T* allocz(std::size_t count) throw()
+      {
+        return m_pool.allocz<T>(count);
+      }
+
+  private:
+    Pool& m_pool;
+  };
+};
+
+/**
+ * Pool wrapper that hides the pool implementation, except for construction.
+ *
+ * Construct this object outside a loop body, then within the body,
+ * use Pool::Iteration to access the wrapped pool.
+ */
+class IterationPool : compat::noncopyable
+{
+public:
+  IterationPool() {}
+
+  explicit IterationPool(Pool* parent) throw()
+    : m_pool(parent)
+    {}
+
+private:
+  friend class Pool::Iteration;
+  Pool m_pool;
+};
+
+// Pool::Iteration constructor implementation
+inline Pool::Iteration::Iteration(IterationPool& iterbase) throw()
+  : m_pool(iterbase.m_pool)
+{
+  m_pool.clear();
+}
+
+} // namespace apr
+} // namespace cxxhl
+} // namespace subversion
+} // namespace apache
+
+#endif // SVN_CXXHL_PRIVATE_APRWRAP_POOL_H
diff --git a/subversion/bindings/cxxhl/src/exception.cpp b/subversion/bindings/cxxhl/src/exception.cpp
index 6c55792..0f0ee3f 100644
--- a/subversion/bindings/cxxhl/src/exception.cpp
+++ b/subversion/bindings/cxxhl/src/exception.cpp
@@ -28,6 +28,8 @@
 #include <sstream>
 
 #include "svncxxhl/exception.hpp"
+#include "private.hpp"
+#include "aprwrap.hpp"
 
 #include "svn_error.h"
 #include "svn_utf.h"
@@ -37,103 +39,85 @@
 #undef TRUE
 #undef FALSE
 
+namespace apache {
 namespace subversion {
 namespace cxxhl {
 
 namespace detail {
 
-class error_description
+class ErrorDescription
 {
 public:
-  static error_description* create(const char* message,
-                                   const char *loc_file, long loc_line,
-                                   bool trace_link)
+  typedef compat::shared_ptr<ErrorDescription> shared_ptr;
+
+  static shared_ptr create(const char* message, int error_code,
+                           const char *loc_file, long loc_line,
+                           bool trace_link)
     {
-      bool empty_message = (message == NULL);
+      const bool empty_message = (message == NULL);
       const std::size_t length = (empty_message ? 0 : std::strlen(message));
-      void *memblock = ::operator new(length + sizeof(error_description));
+      void* memblock = ::operator new(length + sizeof(ErrorDescription));
 
-      error_description* description = new(memblock) error_description(
-          loc_file, loc_line, trace_link, empty_message);
+      ErrorDescription* description = new(memblock) ErrorDescription(
+          error_code, loc_file, loc_line, trace_link, empty_message);
       if (length)
         std::memcpy(description->m_message, message, length);
       description->m_message[length] = 0;
-      return description;
+      return shared_ptr(description);
     }
 
-  static error_description* create(const char* message)
+  static shared_ptr create(const char* message, int error_code)
     {
-      return create(message, NULL, 0, false);
+      return create(message, error_code, NULL, 0, false);
     }
 
-  error_description* reference() throw()
-    {
-      if (this)
-        svn_atomic_inc(&m_refcount);
-      return this;
-    }
-
-  error_description* dereference() throw()
-    {
-      if (this && 0 == svn_atomic_dec(&m_refcount))
-        {
-          this->~error_description();
-          ::operator delete(this, std::nothrow);
-          return NULL;
-        }
-      return this;
-    }
+  ~ErrorDescription() throw() {}
 
   const char* what() const throw() { return (m_empty ? NULL : m_message); }
+  int code() const throw() { return m_errno; }
   const char* file() const throw() { return m_loc_file; }
   long line() const throw() { return m_loc_line; }
   bool trace() const throw() { return m_trace; }
+  shared_ptr& nested() throw() { return m_nested; }
+  const shared_ptr& nested() const throw() { return m_nested; }
 
 private:
-  error_description(const char *loc_file, long loc_line,
-                    bool trace_link, bool empty_message) throw()
+  ErrorDescription(int error_code,
+                   const char *loc_file, long loc_line,
+                   bool trace_link, bool empty_message) throw()
     : m_loc_file(loc_file),
       m_loc_line(loc_line),
       m_trace(trace_link),
       m_empty(empty_message),
-      m_refcount(0)
+      m_errno(error_code)
     {}
 
-  ~error_description() throw() {}
-
   const char* m_loc_file;
   long m_loc_line;
   bool m_trace;
   bool m_empty;
 
-  volatile svn_atomic_t m_refcount;
-  char m_message[1];
+  shared_ptr m_nested;
+
+  int m_errno;                  ///< The (SVN or APR) error code.
+  char m_message[1];            ///< The error message
 };
 
 } // namespace detail
 
+//
+// Class InternalError
+//
 
-namespace version_1_9_dev {
-
-error::error(const char* description, int error_code)
-  : m_errno(error_code),
-    m_description(detail::error_description::create(description)->reference())
-{}
-
-error::error(const char* description, int error_code,
-             error::shared_ptr nested_error)
-  : m_errno(error_code),
-    m_nested(nested_error),
-    m_description(detail::error_description::create(description)->reference())
+InternalError::InternalError(const char* description)
+  : m_description(detail::ErrorDescription::create(description, 0))
 {}
 
-error::error(const error& that) throw()
-  : m_errno(that.m_errno),
-    m_nested(that.m_nested),
-    m_description(that.m_description->reference())
+InternalError::InternalError(const InternalError& that) throw()
+  : m_description(that.m_description)
 {}
 
-error& error::operator=(const error& that) throw()
+InternalError& InternalError::operator=(const InternalError& that) throw()
 {
   if (this == &that)
     return *this;
@@ -141,89 +125,85 @@ error& error::operator=(const error& that) throw()
   // This in-place destroy+copy implementation of the assignment
   // operator is safe because both the destructor and the copy
   // constructor do not throw exceptions.
-  this->~error();
-  return *new(this) error(that);
+  this->~InternalError();
+  return *new(this) InternalError(that);
 }
 
-error::~error() throw()
-{
-  m_description->dereference();
-}
+InternalError::~InternalError() throw() {}
 
-const char* error::what() const throw()
+const char* InternalError::what() const throw()
 {
   return m_description->what();
 }
 
-error::error(int error_code, detail::error_description* description) throw()
-  : m_errno(error_code),
-    m_description(description)
+InternalError::InternalError(description_ptr description) throw()
+  : m_description(description)
 {}
 
-void error::throw_svn_error(svn_error_t* err)
+//
+// Class Error
+//
+
+Error::Error(const Error& that) throw()
+  : InternalError(that.m_description)
+{}
+
+Error& Error::operator=(const Error& that) throw()
 {
-  const bool throw_cancelled = (err->apr_err == SVN_ERR_CANCELLED);
-  detail::error_description* description = NULL;
-  try
-    {
-      // Be very careful when creating the error descriptions, so that
-      // the exception unwinder can free them if an allocation fails.
-      // The private constructor does not increment the refcount
-      // precisely for this reason.
+  if (this == &that)
+    return *this;
 
-      shared_ptr nested;
-      shared_ptr* current = &nested;
+  // This in-place destroy+copy implementation of the assignment
+  // operator is safe because both the destructor and the copy
+  // constructor do not throw exceptions.
+  this->~Error();
+  return *new(this) Error(that);
+}
 
-      for (svn_error_t* next = err->child; next; next = next->child)
-        {
-          description = detail::error_description::create(
-              next->message, next->file, next->line,
-              svn_error__is_tracing_link(next));
-          description->reference();
-          current->reset(new error(next->apr_err, description));
-          description = NULL;
-          current = &(*current)->m_nested;
-        }
+Error::~Error() throw() {}
 
-      const int apr_err = err->apr_err;
-      description = detail::error_description::create(
-          err->message, err->file, err->line,
-          svn_error__is_tracing_link(err));
-      description->reference();
-      svn_error_clear(err);
-      if (throw_cancelled)
-        {
-          cancelled converted = cancelled(apr_err, description);
-          description = NULL;
-          converted.m_nested = nested;
-          throw converted;
-        }
-      else
-        {
-          error converted = error(apr_err, description);
-          description = NULL;
-          converted.m_nested = nested;
-          throw converted;
-        }
-    }
-  catch (...)
+int Error::code() const throw()
+{
+  return m_description->code();
+}
+
+namespace {
+const char* get_generic_message(apr_status_t error_code,
+                                const APR::Pool& scratch_pool)
+{
+  char errorbuf[512];
+
+  // Is this a Subversion-specific error code?
+  if (error_code > APR_OS_START_USEERR && error_code <= APR_OS_START_CANONERR)
+    return svn_strerror(error_code, errorbuf, sizeof(errorbuf));
+  // Otherwise, this must be an APR error code.
+  else
     {
-      description->dereference();
-      throw;
+      const char* generic;
+      svn_error_t* err = svn_utf_cstring_to_utf8(
+          &generic,
+          apr_strerror(error_code, errorbuf, sizeof(errorbuf)),
+          scratch_pool.get());
+      if (!err)
+        return generic;
+
+      // Use fuzzy transliteration instead.
+      svn_error_clear(err);
+      return svn_utf_cstring_from_utf8_fuzzy(errorbuf, scratch_pool.get());
     }
 }
 
-
-namespace {
-void handle_one_error(error::message_list& ml, bool show_traces,
-                      int error_code, detail::error_description* descr,
-                      apr_pool_t* pool)
+void handle_one_error(Error::MessageList& ml, bool show_traces,
+                      const detail::ErrorDescription* descr,
+                      const APR::Pool& pool)
 {
+  const int error_code = descr->code();
+
   if (show_traces && descr->file())
     {
       const char* file_utf8 = NULL;
       svn_error_t* err =
-        svn_utf_cstring_to_utf8(&file_utf8, descr->file(), pool);
+        svn_utf_cstring_to_utf8(&file_utf8, descr->file(), pool.get());
       if (err)
         {
           svn_error_clear(err);
@@ -234,8 +214,18 @@ void handle_one_error(error::message_list& ml, bool show_traces,
         buffer << file_utf8 << ':' << descr->line();
       else
         buffer << "svn:<undefined>";
-      buffer << ": (apr_err=" << error_code << ')';
-      ml.push_back(error::message(0, buffer.str()));
+      if (descr->trace())
+        buffer << ',';
+      else
+        {
+#ifdef SVN_DEBUG
+          if (const char* symbolic_name = svn_error_symbolic_name(error_code))
+            buffer << ": (apr_err=" << symbolic_name << ')';
+          else
+#endif
+            buffer << ": (apr_err=" << error_code << ')';
+        }
+      ml.push_back(Error::Message(error_code, buffer.str(), true));
     }
 
   if (descr->trace())
@@ -243,43 +233,24 @@ void handle_one_error(error::message_list& ml, bool show_traces,
 
   const char *description = descr->what();
   if (!description)
-    {
-      char errorbuf[512];
-
-      // Is this a Subversion-specific error code?
-      if (error_code > APR_OS_START_USEERR
-          && error_code <= APR_OS_START_CANONERR)
-        description = svn_strerror(error_code, errorbuf, sizeof(errorbuf));
-      // Otherwise, this must be an APR error code.
-      else
-        {
-          svn_error_t* err = svn_utf_cstring_to_utf8(
-              &description,
-              apr_strerror(error_code, errorbuf, sizeof(errorbuf)),
-              pool);
-          if (err)
-            {
-              svn_error_clear(err);
-              description = _("Can't recode error string from APR");
-            }
-        }
-    }
-  ml.push_back(error::message(error_code, std::string(description)));
+    description = get_generic_message(error_code, pool);
+  ml.push_back(Error::Message(error_code, std::string(description), false));
 }
 } // anonymous namespace
 
-error::message_list error::compile_messages(bool show_traces) const
+Error::MessageList Error::compile_messages(bool show_traces) const
 {
   // Determine the maximum size of the returned list
-  message_list::size_type max_length = 0;
-  for (const error* err = this; err; err = err->m_nested.get())
+  MessageList::size_type max_length = 0;
+  for (const detail::ErrorDescription* description = m_description.get();
+       description; description = description->nested().get())
     {
-      if (show_traces && m_description->file())
+      if (show_traces && description->file())
         ++max_length;                   // We will display an error location
-      if (!m_description->trace())
+      if (!description->trace())
         ++max_length;                   // Traces do not emit a message line
     }
-  message_list ml;
+  MessageList ml;
   ml.reserve(max_length);
 
   // This vector holds a list of all error codes that we've printed
@@ -287,36 +258,74 @@ error::message_list error::compile_messages(bool show_traces) const
   std::vector<int> empties;
   empties.reserve(max_length);
 
-  apr_pool_t* pool = NULL;
-  apr_pool_create(&pool, NULL);
-  try
+  APR::IterationPool iterbase;
+  for (const detail::ErrorDescription* description = m_description.get();
+       description; description = description->nested().get())
     {
-      for (const error* err = this; err; err = err->m_nested.get())
+      APR::Pool::Iteration iterpool(iterbase);
+
+      if (!description->what())
         {
-          if (!err->m_description->what())
-            {
-              // Non-specific messages are printed only once.
-              std::vector<int>::iterator it = std::find(
-                  empties.begin(), empties.end(), err->m_errno);
-              if (it != empties.end())
-                continue;
-              empties.push_back(err->m_errno);
-            }
-          handle_one_error(ml, show_traces,
-                           err->m_errno, err->m_description,
-                           pool);
+          // Non-specific messages are printed only once.
+          std::vector<int>::iterator it = std::find(
+              empties.begin(), empties.end(), description->code());
+          if (it != empties.end())
+            continue;
+          empties.push_back(description->code());
         }
+      handle_one_error(ml, show_traces, description, iterpool.pool());
     }
-  catch (...)
+  return ml;
+}
+
+const char* Error::Message::generic_message() const
+{
+  APR::Pool pool;
+  return get_generic_message(m_errno, pool);
+}
+
+namespace detail {
+void checked_call(svn_error_t* err)
+{
+  if (!err)
+    return;
+
+  struct ErrorBuilder : public Error
+  {
+    explicit ErrorBuilder (ErrorDescription::shared_ptr description)
+      : Error(description)
+      {}
+  };
+
+  struct CancelledBuilder : public Cancelled
+  {
+    explicit CancelledBuilder (ErrorDescription::shared_ptr description)
+      : Cancelled(description)
+      {}
+  };
+
+  ErrorDescription::shared_ptr description;
+  ErrorDescription::shared_ptr* current = &description;
+
+  bool cancelled = false;
+  for (svn_error_t* next = err; next; next = next->child)
     {
-      apr_pool_destroy(pool);
-      throw;
+      *current = ErrorDescription::create(next->message, next->apr_err,
+                                          next->file, next->line,
+                                          svn_error__is_tracing_link(next));
+      current = &(*current)->nested();
+      if (next->apr_err == SVN_ERR_CANCELLED)
+        cancelled = true;
     }
+  svn_error_clear(err);
 
-  apr_pool_destroy(pool);
-  return ml;
+  if (cancelled)
+    throw CancelledBuilder(description);
+  else
+    throw ErrorBuilder(description);
 }
+} // namespace detail
 
-} // namespace version_1_9_dev
 } // namespace cxxhl
 } // namespace subversion
+} // namespace apache
diff --git a/subversion/bindings/javahl/native/libsvnjavahl.la.c b/subversion/bindings/cxxhl/src/private.hpp
index 0cbbd2e..bb61012 100644
--- a/subversion/bindings/javahl/native/libsvnjavahl.la.c
+++ b/subversion/bindings/cxxhl/src/private.hpp
@@ -19,19 +19,11 @@
  *    under the License.
  * ====================================================================
  * @endcopyright
- *
- * @file libsvnjavahl.c
- * @brief mandatory file for building with libtool
  */
-#include <jni.h>
 
-JNIEXPORT jint JNICALL
-JNI_OnLoad(JavaVM *vm, void *reserved)
-{
-    return JNI_VERSION_1_2;
-}
+#ifndef SVN_CXXHL_PRIVATE_PRIVATE_H
+#define SVN_CXXHL_PRIVATE_PRIVATE_H
+
+#include "private/exception-private.hpp"
 
-JNIEXPORT void JNICALL
-JNI_OnUnload(JavaVM *vm, void *reserved)
-{
-}
+#endif // SVN_CXXHL_PRIVATE_PRIVATE_H
diff --git a/subversion/bindings/cxxhl/src/private/exception-private.hpp b/subversion/bindings/cxxhl/src/private/exception-private.hpp
new file mode 100644
index 0000000..34ffdfd
--- /dev/null
+++ b/subversion/bindings/cxxhl/src/private/exception-private.hpp
@@ -0,0 +1,49 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+#ifndef __cplusplus
+#error "This is a C++ header file."
+#endif
+
+#ifndef SVN_CXXHL_PRIVATE_EXCEPTION_HPP
+#define SVN_CXXHL_PRIVATE_EXCEPTION_HPP
+
+#include "svn_error.h"
+
+namespace apache {
+namespace subversion {
+namespace cxxhl {
+namespace detail {
+
+/**
+ * Given a @a err, if it is not @c NULL, convert it to a and throw an
+ * Error exception; otherwise do nothing.
+ */
+void checked_call(svn_error_t* err);
+
+} // namespace detail
+} // namespace cxxhl
+} // namespace subversion
+} // namespace apache
+
+#endif // SVN_CXXHL_PRIVATE_EXCEPTION_HPP
diff --git a/subversion/bindings/cxxhl/src/tristate.cpp b/subversion/bindings/cxxhl/src/tristate.cpp
index 10a2207..75a8142 100644
--- a/subversion/bindings/cxxhl/src/tristate.cpp
+++ b/subversion/bindings/cxxhl/src/tristate.cpp
@@ -27,18 +27,18 @@
 #undef TRUE
 #undef FALSE
 
+namespace apache {
 namespace subversion {
 namespace cxxhl {
-namespace version_1_9_dev {
 
-tristate::tristate(short value) throw()
+Tristate::Tristate(short value) throw()
     : m_value(value)
 {}
 
-const tristate tristate::TRUE = tristate(svn_tristate_true);
-const tristate tristate::FALSE = tristate(svn_tristate_false);
-const tristate tristate::UNKNOWN = tristate(svn_tristate_unknown);
+const Tristate Tristate::TRUE = Tristate(svn_tristate_true);
+const Tristate Tristate::FALSE = Tristate(svn_tristate_false);
+const Tristate Tristate::UNKNOWN = Tristate(svn_tristate_unknown);
 
-} // namespace version_1_9_dev
 } // namespace cxxhl
 } // namespace subversion
+} // namespace apache
diff --git a/subversion/bindings/cxxhl/tests/cxxhl-tests.cpp b/subversion/bindings/cxxhl/tests/cxxhl-tests.cpp
new file mode 100644
index 0000000..5589aac
--- /dev/null
+++ b/subversion/bindings/cxxhl/tests/cxxhl-tests.cpp
@@ -0,0 +1,46 @@
+/*
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ */
+
+#include <cstdlib>
+#include <iostream>
+
+#include <apr_errno.h>
+#include <apr_general.h>
+
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+
+int main(int argc, char** argv)
+{
+  apr_status_t status = apr_initialize();
+  if (status)
+    {
+      char errbuf[512];
+      std::cerr << "APR initialization failed: "
+                << apr_strerror(status, errbuf, sizeof(errbuf) - 1)
+                << std::endl;
+      return 7;
+    }
+  std::atexit(apr_terminate);
+
+  testing::InitGoogleMock(&argc, argv);
+  return RUN_ALL_TESTS();
+}
diff --git a/subversion/bindings/cxxhl/tests/test_aprwrap.cpp b/subversion/bindings/cxxhl/tests/test_aprwrap.cpp
new file mode 100644
index 0000000..bf3f180
--- /dev/null
+++ b/subversion/bindings/cxxhl/tests/test_aprwrap.cpp
@@ -0,0 +1,435 @@
+/*
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ */
+
+#include <algorithm>
+#include <stdexcept>
+
+#include "../src/aprwrap.hpp"
+
+#include <gmock/gmock.h>
+
+//
+// Pools
+//
+
+TEST(Pools, InitializeGlobalPool)
+{
+  APR::Pool pool;
+  EXPECT_THAT(pool.get(), testing::NotNull());
+  EXPECT_THAT(apr_pool_parent_get(pool.get()), testing::NotNull());
+}
+
+TEST(Pools, CreateSubpool)
+{
+  APR::Pool pool;
+  APR::Pool subpool(&pool);
+  EXPECT_EQ(pool.get(), apr_pool_parent_get(subpool.get()));
+}
+
+TEST(Pools, TypedAllocate)
+{
+  APR::Pool pool;
+  const unsigned char* buffer = pool.alloc<unsigned char>(1);
+  EXPECT_THAT(buffer, testing::NotNull());
+}
+
+// N.B.: This test may pass randomly even if zero-filled allocation
+// does not work correctly, since we cannot make assumptions about the
+// values of uninitialized memory.
+TEST(Pools, TypedAllocateZerofill)
+{
+  APR::Pool pool;
+  static const std::size_t size = 32757;
+  const unsigned char* buffer = pool.allocz<unsigned char>(size);
+  ASSERT_THAT(buffer, testing::NotNull());
+  EXPECT_EQ(size, std::count(buffer, buffer + size, 0));
+}
+
+//
+// Array helper functions
+//
+
+namespace {
+// Create a randomly-ordered array of constant strings.
+apr_array_header_t* fill_array(APR::Pool& pool)
+{
+  apr_array_header_t* a = apr_array_make(pool.get(), 0, sizeof(const char*));
+  APR_ARRAY_PUSH(a, const char*) = "primus";
+  APR_ARRAY_PUSH(a, const char*) = "secundus";
+  APR_ARRAY_PUSH(a, const char*) = "tertius";
+  APR_ARRAY_PUSH(a, const char*) = "quartus";
+  APR_ARRAY_PUSH(a, const char*) = "quintus";
+  APR_ARRAY_PUSH(a, const char*) = "sextus";
+  APR_ARRAY_PUSH(a, const char*) = "septimus";
+  std::random_shuffle(&APR_ARRAY_IDX(a, 0, const char*),
+                      &APR_ARRAY_IDX(a, a->nelts, const char*));
+  return a;
+}
+} // anonymous namespace
+
+//
+// Arrays
+//
+
+TEST(Arrays, CreateArray)
+{
+  typedef APR::Array<unsigned char> Array;
+
+  APR::Pool pool;
+  Array array(pool);
+
+  EXPECT_THAT(array.array(), testing::NotNull());
+  EXPECT_EQ(0, array.size());
+  EXPECT_EQ(sizeof(unsigned char), sizeof(Array::value_type));
+  EXPECT_EQ(sizeof(Array::value_type), array.array()->elt_size);
+}
+
+TEST(Arrays, WrapArray)
+{
+  typedef APR::Array<unsigned char> Array;
+
+  APR::Pool pool;
+  apr_array_header_t* apr_array =
+    apr_array_make(pool.get(), 0, sizeof(Array::value_type));
+  ASSERT_THAT(apr_array, testing::NotNull());
+
+  Array array(apr_array);
+  EXPECT_EQ(apr_array, array.array());
+  EXPECT_EQ(0, array.size());
+}
+
+TEST(Arrays, RewrapTypeMismatch)
+{
+  typedef APR::Array<unsigned char> ByteArray;
+  typedef APR::Array<int> IntArray;
+
+  APR::Pool pool;
+  EXPECT_THROW(ByteArray array(IntArray(pool).array()),
+               std::invalid_argument);
+}
+
+TEST(Arrays, OutOfBounds)
+{
+  typedef APR::Array<unsigned char> Array;
+
+  APR::Pool pool;
+  Array array(pool);
+
+  EXPECT_THROW(array.at(-1), std::out_of_range);
+  EXPECT_THROW(array.at(array.size()), std::out_of_range);
+}
+
+TEST(Arrays, Indexing)
+{
+  typedef APR::Array<const char*> Array;
+
+  APR::Pool pool;
+  Array array(fill_array(pool));
+
+  EXPECT_STREQ(array[0], APR_ARRAY_IDX(array.array(), 0, Array::value_type));
+  EXPECT_STREQ(array[array.size() - 1], APR_ARRAY_IDX(array.array(),
+                                                      array.array()->nelts - 1,
+                                                      Array::value_type));
+}
+
+TEST(Arrays, CheckedIndexing)
+{
+  typedef APR::Array<const char*> Array;
+
+  APR::Pool pool;
+  Array array(fill_array(pool));
+
+  EXPECT_STREQ(array.at(0), APR_ARRAY_IDX(array.array(), 0, Array::value_type));
+  EXPECT_STREQ(array.at(array.size() - 1),
+               APR_ARRAY_IDX(array.array(), array.array()->nelts - 1,
+                             Array::value_type));
+}
+
+TEST(Arrays, Iteration)
+{
+  typedef APR::Array<const char*> Array;
+
+  APR::Pool pool;
+  Array array(fill_array(pool));
+
+  struct Iteration : public Array::Iteration
+  {
+    Iteration(apr_array_header_t* raw_array)
+      : m_index(0), m_raw_array(raw_array)
+      {}
+
+    bool operator()(Array::value_type& value)
+      {
+        EXPECT_STREQ(value, APR_ARRAY_IDX(m_raw_array, m_index,
+                                          Array::value_type));
+        ++m_index;
+        return true;
+      }
+
+  private:
+    Array::size_type m_index;
+    apr_array_header_t* m_raw_array;
+  } callback(array.array());
+
+  array.iterate(callback);
+}
+
+TEST(Arrays, ConstIteration)
+{
+  typedef APR::Array<const char*> Array;
+
+  APR::Pool pool;
+  Array array(fill_array(pool));
+
+  struct Iteration : public Array::ConstIteration
+  {
+    Iteration(const  apr_array_header_t* raw_array)
+      : m_index(0), m_raw_array(raw_array)
+      {}
+
+    bool operator()(const Array::value_type& value)
+      {
+        EXPECT_STREQ(value, APR_ARRAY_IDX(m_raw_array, m_index,
+                                          Array::value_type));
+        ++m_index;
+        return true;
+      }
+
+  private:
+    Array::size_type m_index;
+    const apr_array_header_t* m_raw_array;
+  } callback(array.array());
+
+  array.iterate(callback);
+}
+
+TEST(Arrays, Push)
+{
+  typedef APR::Array<const char*> Array;
+
+  APR::Pool pool;
+  Array array(fill_array(pool));
+
+  const Array::size_type point = array.size();
+  const Array::value_type first = array[0];
+  const Array::value_type last = array[point - 1];
+
+  array.push("octavius");
+  array.push("nonus");
+  array.push("decimus");
+
+  EXPECT_EQ(point + 3, array.size());
+  EXPECT_STREQ(first, array[0]);
+  EXPECT_STREQ(last, array[point - 1]);
+  EXPECT_STREQ("octavius", array[point]);
+  EXPECT_STREQ("decimus", array[array.size() - 1]);
+}
+
+TEST(Arrays, Pop)
+{
+  typedef APR::Array<const char*> Array;
+
+  APR::Pool pool;
+  Array array(fill_array(pool));
+
+  for (Array::size_type i = 0, z = array.size(); i <= z; ++i)
+    {
+      const char** last = (!array.array()->nelts ? NULL
+                           : &APR_ARRAY_IDX(array.array(),
+                                            array.array()->nelts - 1,
+                                            const char*));
+      EXPECT_EQ(last, array.pop());
+    }
+}
+
+//
+// ConstArrays
+//
+
+TEST(ConstArrays, WrapArray)
+{
+  typedef APR::ConstArray<unsigned char> Array;
+
+  APR::Pool pool;
+  const apr_array_header_t* apr_array =
+    apr_array_make(pool.get(), 0, sizeof(Array::value_type));
+  ASSERT_THAT(apr_array, testing::NotNull());
+
+  Array array(apr_array);
+  EXPECT_EQ(apr_array, array.array());
+  EXPECT_EQ(0, array.size());
+}
+
+TEST(ConstArrays, RewrapTypeMismatch)
+{
+  typedef APR::ConstArray<unsigned char> ByteArray;
+  typedef APR::Array<int> IntArray;
+
+  APR::Pool pool;
+  EXPECT_THROW(ByteArray array(IntArray(pool).array()),
+               std::invalid_argument);
+}
+
+TEST(ConstArrays, OutOfBounds)
+{
+  typedef APR::ConstArray<unsigned char> Array;
+
+  APR::Pool pool;
+  Array array = Array(APR::Array<Array::value_type>(pool));
+
+  EXPECT_THROW(array.at(-1), std::out_of_range);
+  EXPECT_THROW(array.at(array.size()), std::out_of_range);
+}
+
+TEST(ConstArrays, Indexing)
+{
+  typedef APR::ConstArray<const char*> Array;
+
+  APR::Pool pool;
+  Array array(fill_array(pool));
+
+  EXPECT_STREQ(array[0], APR_ARRAY_IDX(array.array(), 0, Array::value_type));
+  EXPECT_STREQ(array[array.size() - 1], APR_ARRAY_IDX(array.array(),
+                                                      array.array()->nelts - 1,
+                                                      Array::value_type));
+}
+
+TEST(ConstArrays, CheckedIndexing)
+{
+  typedef APR::ConstArray<const char*> Array;
+
+  APR::Pool pool;
+  Array array(fill_array(pool));
+
+  EXPECT_STREQ(array.at(0), APR_ARRAY_IDX(array.array(), 0, Array::value_type));
+  EXPECT_STREQ(array.at(array.size() - 1),
+               APR_ARRAY_IDX(array.array(), array.array()->nelts - 1,
+                             Array::value_type));
+}
+
+TEST(ConstArrays, Iteration)
+{
+  typedef APR::ConstArray<const char*> Array;
+
+  APR::Pool pool;
+  Array array(fill_array(pool));
+
+  struct Iteration : public Array::Iteration
+  {
+    Iteration(const  apr_array_header_t* raw_array)
+      : m_index(0), m_raw_array(raw_array)
+      {}
+
+    bool operator()(const Array::value_type& value)
+      {
+        EXPECT_STREQ(value, APR_ARRAY_IDX(m_raw_array, m_index,
+                                          Array::value_type));
+        ++m_index;
+        return true;
+      }
+
+  private:
+    Array::size_type m_index;
+    const apr_array_header_t* m_raw_array;
+  } callback(array.array());
+
+  array.iterate(callback);
+}
+
+//
+// Hash tables
+//
+
+TEST(Hashes, StringHash)
+{
+  typedef APR::Hash<char, const char> H;
+
+  APR::Pool pool;
+  H hash(pool);
+  hash.set("aa", "a");
+  hash.set("bbb", "b");
+  hash.set("cccc", "c");
+
+  EXPECT_EQ(3, hash.size());
+  EXPECT_STREQ("a", hash.get("aa"));
+  EXPECT_STREQ("b", hash.get("bbb"));
+  EXPECT_STREQ("c", hash.get("cccc"));
+}
+
+TEST(Hashes, FixedStringHash)
+{
+  // The point of this test is to verify that the key-length parameter
+  // of the template actually limits the length of the keys.
+  typedef APR::Hash<char, const char, 2> H;
+
+  APR::Pool pool;
+  H hash(pool);
+  hash.set("aa&qux", "a");
+  hash.set("bb#foo", "b");
+  hash.set("cc@bar", "c");
+
+  EXPECT_EQ(3, hash.size());
+  EXPECT_STREQ("a", hash.get("aa%foo"));
+  EXPECT_STREQ("b", hash.get("bb*bar"));
+  EXPECT_STREQ("c", hash.get("cc$qux"));
+}
+
+TEST(Hashes, Delete)
+{
+  typedef APR::Hash<char, const char> H;
+
+  APR::Pool pool;
+  H hash(pool);
+  hash.set("aa", "a");
+  hash.set("bbb", "b");
+  hash.set("cccc", "c");
+
+  hash.del("bbb");
+
+  EXPECT_EQ(2, hash.size());
+  EXPECT_STREQ("a", hash.get("aa"));
+  EXPECT_STREQ("c", hash.get("cccc"));
+}
+
+TEST(Hashes, Iterate)
+{
+  typedef APR::Hash<char, const char> H;
+
+  APR::Pool pool;
+  H hash(pool);
+  hash.set("aa", "a");
+  hash.set("bbb", "b");
+  hash.set("cccc", "c");
+
+  struct C : public H::Iteration
+  {
+    H& m_hash;
+    explicit C(H& hashref) : m_hash(hashref) {}
+
+    bool operator()(const H::Key& key, H::value_type value)
+      {
+        EXPECT_STREQ(value, m_hash.get(key));
+        return true;
+      }
+  } callback(hash);
+
+  hash.iterate(callback, pool);
+}
diff --git a/subversion/bindings/cxxhl/tests/test_exception.cpp b/subversion/bindings/cxxhl/tests/test_exception.cpp
index ccfec6c..7c0637c 100644
--- a/subversion/bindings/cxxhl/tests/test_exception.cpp
+++ b/subversion/bindings/cxxhl/tests/test_exception.cpp
@@ -20,110 +20,114 @@
  */
 
 #include <algorithm>
+#include <cstdio>
 #include <iomanip>
 #include <ios>
 #include <iostream>
 
 #include "svncxxhl.hpp"
+#include "../src/private.hpp"
 
 #include <apr.h>
 #include "svn_error.h"
+#undef TRUE
+#undef FALSE
 
-namespace {
-void trace(const svn::error::message& msg)
-{
-  std::cout << "    ";
-  if (msg.first)
-    std::cout << "test_exception: E"
-              << std::setw(6) << std::setfill('0') << std::right
-              << msg.first << ':' << ' ';
-  std::cout << msg.second << std::endl;
-}
+#include <gmock/gmock.h>
 
-void traceall(const char *message, const svn::error& err)
+namespace {
+svn_error_t* make_error_test_error()
 {
-  typedef svn::error::message_list message_list;
-  std::cout << message << std::endl;
-  std::cout << "Traced Messages:" << std::endl;
-  message_list ml = err.traced_messages();
-  std::for_each(ml.begin(), ml.end(), trace);
-  std::cout << "Just Messages:" << std::endl;
-  ml = err.messages();
-  std::for_each(ml.begin(), ml.end(), trace);
+  svn_error_t* err;
+  err = svn_error_create(SVN_ERR_TEST_FAILED, NULL, "original message");
+  err = svn_error_create(SVN_ERR_BASE, err, "wrapper message");
+  err = svn_error_trace(err);
+  err = svn_error_create(SVN_ERR_UNSUPPORTED_FEATURE, err, NULL);
+  err = svn_error_create(SVN_ERR_UNSUPPORTED_FEATURE, err, NULL);
+  err = svn_error_trace(err);
+  return err;
 }
 } // anonymous namespace
 
-
-bool test_cancel()
+TEST(Exceptions, CatchError)
 {
   try
     {
-      svn_error_t* err;
-      err = svn_error_create(SVN_ERR_TEST_FAILED, NULL, "original message");
-      err = svn_error_create(SVN_ERR_BASE, err, "wrapper message");
-      err = svn_error_create(SVN_ERR_CANCELLED, err, NULL);
-      err = svn_error_create(SVN_ERR_CANCELLED, err, NULL);
-      err = svn_error_trace(err);
-      svn::error::throw_svn_error(err);
-    }
-  catch (const svn::cancelled& err)
-    {
-      traceall("Caught: CANCEL", err);
-      return true;
+      SVN::detail::checked_call(make_error_test_error());
     }
-  catch (const svn::error& err)
+  catch (const SVN::Error& err)
     {
-      traceall("Caught: ERROR", err);
-      return false;
-    }
-  catch (...)
-    {
-      return false;
+      SVN::Error::MessageList ml = err.messages();
+      EXPECT_EQ(3, ml.size());
+      EXPECT_EQ(SVN_ERR_UNSUPPORTED_FEATURE, ml[0].code());
+      EXPECT_EQ(SVN_ERR_BASE, ml[1].code());
+      EXPECT_EQ(SVN_ERR_TEST_FAILED, ml[2].code());
+
+      SVN::Error::MessageList tml = err.traced_messages();
+#ifdef SVN_DEBUG
+      EXPECT_EQ(8, tml.size());
+      EXPECT_EQ(SVN_ERR_UNSUPPORTED_FEATURE, tml[0].code());
+      EXPECT_EQ(SVN_ERR_UNSUPPORTED_FEATURE, tml[1].code());
+      EXPECT_EQ(SVN_ERR_UNSUPPORTED_FEATURE, tml[2].code());
+      EXPECT_EQ(SVN_ERR_BASE, tml[3].code());
+      EXPECT_EQ(SVN_ERR_BASE, tml[4].code());
+      EXPECT_EQ(SVN_ERR_BASE, tml[5].code());
+      EXPECT_EQ(SVN_ERR_TEST_FAILED, tml[6].code());
+      EXPECT_EQ(SVN_ERR_TEST_FAILED, tml[7].code());
+#else  // !SVN_DEBUG
+      EXPECT_EQ(3, tml.size());
+      EXPECT_EQ(SVN_ERR_UNSUPPORTED_FEATURE, tml[0].code());
+      EXPECT_EQ(SVN_ERR_BASE, tml[1].code());
+      EXPECT_EQ(SVN_ERR_TEST_FAILED, tml[2].code());
+#endif // SVN_DEBUG
     }
-  return false;
 }
 
-int test_error()
+
+namespace {
+svn_error_t* make_cancel_test_error()
+{
+  svn_error_t* err;
+  err = svn_error_create(SVN_ERR_CANCELLED, NULL, NULL);
+  err = svn_error_create(SVN_ERR_CANCELLED, err, NULL);
+  err = svn_error_trace(err);
+  err = svn_error_create(SVN_ERR_TEST_FAILED, err, "original message");
+  err = svn_error_create(SVN_ERR_BASE, err, "wrapper message");
+  err = svn_error_trace(err);
+  return err;
+}
+} // anonymous namespace
+
+TEST(Exceptions, CatchCancelled)
 {
   try
     {
-      svn_error_t* err;
-      err = svn_error_create(SVN_ERR_TEST_FAILED, NULL, "original message");
-      err = svn_error_create(SVN_ERR_BASE, err, "wrapper message");
-      err = svn_error_create(SVN_ERR_CANCELLED, err, NULL);
-      err = svn_error_create(SVN_ERR_CANCELLED, err, NULL);
-      err = svn_error_create(SVN_ERR_UNSUPPORTED_FEATURE, err, NULL);
-      err = svn_error_create(SVN_ERR_UNSUPPORTED_FEATURE, err, NULL);
-      err = svn_error_trace(err);
-      svn::error::throw_svn_error(err);
-    }
-  catch (const svn::cancelled& err)
-    {
-      traceall("Caught: CANCEL", err);
-      return false;
+      SVN::detail::checked_call(make_cancel_test_error());
     }
-  catch (const svn::error& err)
+  catch (const SVN::Cancelled& err)
     {
-      traceall("Caught: ERROR", err);
-      return true;
-    }
-  catch (...)
-    {
-      return false;
-    }
-  return false;
-}
-
-int main()
-{
-  apr_initialize();
+      SVN::Error::MessageList ml = err.messages();
+      EXPECT_EQ(3, ml.size());
+      EXPECT_EQ(SVN_ERR_BASE, ml[0].code());
+      EXPECT_EQ(SVN_ERR_TEST_FAILED, ml[1].code());
+      EXPECT_EQ(SVN_ERR_CANCELLED, ml[2].code());
 
-  const char *stat  = (test_cancel() ? "OK" : "ERROR");
-  std::cerr << "test_cancel .... " << stat << std::endl;
-
-  stat = (test_error() ? "OK" : "ERROR");
-  std::cerr << "test_error ..... " << stat << std::endl;
-
-  apr_terminate();
-  return 0;
+      SVN::Error::MessageList tml = err.traced_messages();
+#ifdef SVN_DEBUG
+      EXPECT_EQ(8, tml.size());
+      EXPECT_EQ(SVN_ERR_BASE, tml[0].code());
+      EXPECT_EQ(SVN_ERR_BASE, tml[1].code());
+      EXPECT_EQ(SVN_ERR_BASE, tml[2].code());
+      EXPECT_EQ(SVN_ERR_TEST_FAILED, tml[3].code());
+      EXPECT_EQ(SVN_ERR_TEST_FAILED, tml[4].code());
+      EXPECT_EQ(SVN_ERR_CANCELLED, tml[5].code());
+      EXPECT_EQ(SVN_ERR_CANCELLED, tml[6].code());
+      EXPECT_EQ(SVN_ERR_CANCELLED, tml[7].code());
+#else  // !SVN_DEBUG
+      EXPECT_EQ(3, tml.size());
+      EXPECT_EQ(SVN_ERR_BASE, tml[0].code());
+      EXPECT_EQ(SVN_ERR_TEST_FAILED, tml[1].code());
+      EXPECT_EQ(SVN_ERR_CANCELLED, tml[2].code());
+#endif // SVN_DEBUG
+    }
 }
diff --git a/subversion/bindings/javahl/README b/subversion/bindings/javahl/README
index bcbba3f..ca7b9f4 100644
--- a/subversion/bindings/javahl/README
+++ b/subversion/bindings/javahl/README
@@ -5,7 +5,7 @@ JavaHL provides a (mostly native, using JNI and javah) implementation of
 a high level Java API for Subversion, which was originally targeted for
 implementors of GUI clients and IDE plug-ins for Subversion.  JavaHL
 currently provides a minimal-but-complete set of APIs which expose the
-core Subversion C API to Java.  It requires a JRE 1.5+ (runtime).
+core Subversion C API to Java.  It requires a JRE 1.6+ (runtime).
 
 It is currently quite mature, and can be considered for production use.
 
@@ -13,8 +13,9 @@ It is currently quite mature, and can be considered for production use.
 Build system
 ------------
 
-JavaHL should compile and run under Linux, Win32, and Mac OS X with a
-JDK 1.5+.
+JavaHL should compile and run under Linux, Win32, and Mac OS X with
+JDK 1.6+ and a C++ compiler with a complete implementation of
+C++98 (for example, GCC 3.2 and older cannot compile JavaHL 1.9+).
 
 Its build will produce both a native library (libsvnjavahl-1.so on Unix
 or libsvnjavahl-1.dll on Win32) and a platform independent archive of
@@ -22,27 +23,29 @@ Java bytecode (svn-javahl.jar).
 
 To build JavaHL on non-Win32 platforms, just add "--enable-javahl" to
 the configure script's parameters.  "--with-jdk" can be provided to
-specify the path to a jdk.  "--with-maintainer-mode" will compile Java
-bytecode with debugging information.  Jikes will be the preferred
-compiler if it is auto-detected.  If not auto-detected, you can force
-its use via the "--with-jikes=path" flag to configure.
+specify the path to a jdk.  "--enable-maintainer-mode" will compile
+Java bytecode with debugging information.
 
 The following make targets are provided:
 
-javahl                build javahl
-install-javahl        install javahl
-check-javahl          run javahl tests
+javahl                build JavaHL
+install-javahl        install JavaHL
+check-javahl          run JavaHL tests
+check-all-javahl      run all JavaHL tests, including tests for
+                      deprecated backward-compatibility APIs.
 
-(In order to run check-javahl, you must have already installed JavaHL,
-and you must have specified a path to a JUnit jar file with
---with-junit when running configure; JUnit version 3.8.1 has been
-tested.  JUnit can be downloaded from http://junit.sf.net/ .)
+(In order to run check-javahl, you must have specified a path to a JUnit
+jar file with --with-junit when running configure; JUnit version 4.11
+has been tested.  JUnit can be downloaded from http://junit.org/ .)
 
 
 MacOS X:
 
-After building libsvnjavahl.dynlib, you must rename it to
-libsvnjavahl.jnilib.  Additionally, it should probably be installed in
+After building libsvnjavahl.dylib, you must rename it to
+libsvnjavahl.jnilib. Make install-javahl creates a symbolic
+link with the appropriate name.
+
+Additionally, it should probably be installed in
 /Library/Java/Extensions instead of wherever the build system chose to
 install it; patches to our build system to do this automatically are
 welcome.
@@ -61,6 +64,7 @@ Success stories
 ---------------
 
 Subclipse, Eclipse IDE plug-in <http://subclipse.tigris.org/>
+SmartSVN, cross-platform Subversion client (http://www.smartsvn.com/)
 
 
 Why not 100% pure Java?
@@ -87,6 +91,8 @@ as to its compatibility with the official Subversion implementation.
 TODO
 ----
 
+o Transition all of the implementation to the new-style jniwrapper.
 o Expose more of Subversion's core libraries through JNI.
 o More JUnit test cases.
+o Refactor the JUnit tests to use the improved features of JUnit 4.
 o Improve JavaDoc and coding style.
diff --git a/subversion/bindings/javahl/native/AuthnCallback.cpp b/subversion/bindings/javahl/native/AuthnCallback.cpp
new file mode 100644
index 0000000..3a25e04
--- /dev/null
+++ b/subversion/bindings/javahl/native/AuthnCallback.cpp
@@ -0,0 +1,365 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+#include "svn_base64.h"
+#include "svn_x509.h"
+
+#include "jniwrapper/jni_stack.hpp"
+#include "jniwrapper/jni_exception.hpp"
+#include "jniwrapper/jni_string.hpp"
+#include "jniwrapper/jni_array.hpp"
+#include "jniwrapper/jni_list.hpp"
+
+#include "AuthnCallback.hpp"
+
+#include "svn_private_config.h"
+
+namespace JavaHL {
+
+// Class JavaHL::AuthnCallback
+const char* const AuthnCallback::m_class_name =
+  JAVAHL_CLASS("/callback/AuthnCallback");
+
+AuthnCallback::ClassImpl::ClassImpl(::Java::Env env, jclass cls)
+  : ::Java::Object::ClassImpl(env, cls),
+    m_mid_username_prompt(
+        env.GetMethodID(cls, "usernamePrompt",
+                        "(Ljava/lang/String;Z)"
+                        JAVAHL_ARG("/callback/AuthnCallback")
+                        "$UsernameResult;")),
+    m_mid_user_password_prompt(
+        env.GetMethodID(cls, "userPasswordPrompt",
+                        "(Ljava/lang/String;Ljava/lang/String;Z)"
+                        JAVAHL_ARG("/callback/AuthnCallback")
+                        "$UserPasswordResult;")),
+    m_mid_ssl_server_trust_prompt(
+        env.GetMethodID(cls, "sslServerTrustPrompt",
+                        "(Ljava/lang/String;"
+                        JAVAHL_ARG("/callback/AuthnCallback")
+                        "$SSLServerCertFailures;"
+                        JAVAHL_ARG("/callback/AuthnCallback")
+                        "$SSLServerCertInfo;"
+                        "Z)"
+                        JAVAHL_ARG("/callback/AuthnCallback")
+                        "$SSLServerTrustResult;")),
+    m_mid_ssl_client_cert_prompt(
+        env.GetMethodID(cls, "sslClientCertPrompt",
+                        "(Ljava/lang/String;Z)"
+                        JAVAHL_ARG("/callback/AuthnCallback")
+                        "$SSLClientCertResult;")),
+    m_mid_ssl_client_cert_passphrase_prompt(
+        env.GetMethodID(cls, "sslClientCertPassphrasePrompt",
+                        "(Ljava/lang/String;Z)"
+                        JAVAHL_ARG("/callback/AuthnCallback")
+                        "$SSLClientCertPassphraseResult;")),
+    m_mid_allow_store_plaintext_password(
+        env.GetMethodID(cls, "allowStorePlaintextPassword",
+                        "(Ljava/lang/String;)Z")),
+    m_mid_allow_store_plaintext_passphrase(
+        env.GetMethodID(cls, "allowStorePlaintextPassphrase",
+                        "(Ljava/lang/String;)Z"))
+{}
+
+AuthnCallback::ClassImpl::~ClassImpl() {}
+
+jobject AuthnCallback::username_prompt(const ::Java::String& realm,
+                                       bool may_save)
+{
+  return m_env.CallObjectMethod(m_jthis, impl().m_mid_username_prompt,
+                                realm.get(), jboolean(may_save));
+}
+
+
+jobject AuthnCallback::user_password_prompt(const ::Java::String& realm,
+                                            const ::Java::String& username,
+                                            bool may_save)
+{
+  return m_env.CallObjectMethod(m_jthis, impl().m_mid_user_password_prompt,
+                                realm.get(), username.get(),
+                                jboolean(may_save));
+}
+
+jobject AuthnCallback::ssl_server_trust_prompt(
+    const ::Java::String& realm,
+    const SSLServerCertFailures& failures,
+    const SSLServerCertInfo& info,
+    bool may_save)
+{
+  return m_env.CallObjectMethod(m_jthis, impl().m_mid_ssl_server_trust_prompt,
+                                realm.get(), failures.get(), info.get(),
+                                jboolean(may_save));
+}
+
+jobject AuthnCallback::ssl_client_cert_prompt(const ::Java::String&
+                                              realm, bool may_save)
+{
+  return m_env.CallObjectMethod(m_jthis, impl().m_mid_ssl_client_cert_prompt,
+                                realm.get(), jboolean(may_save));
+}
+
+jobject AuthnCallback::ssl_client_cert_passphrase_prompt(
+    const ::Java::String& realm,
+    bool may_save)
+{
+  return m_env.CallObjectMethod(m_jthis,
+                                impl().m_mid_ssl_client_cert_passphrase_prompt,
+                                realm.get(), jboolean(may_save));
+}
+
+bool AuthnCallback::allow_store_plaintext_password(const ::Java::String& realm)
+{
+  return m_env.CallBooleanMethod(m_jthis,
+                                 impl().m_mid_allow_store_plaintext_password,
+                                 realm.get());
+}
+
+bool AuthnCallback::allow_store_plaintext_passphrase(const ::Java::String& realm)
+{
+  return m_env.CallBooleanMethod(m_jthis,
+                                 impl().m_mid_allow_store_plaintext_passphrase,
+                                 realm.get());
+}
+
+
+// Class JavaHL::AuthnCallback::AuthnResult
+const char* const AuthnCallback::AuthnResult::m_class_name =
+  JAVAHL_CLASS("/callback/AuthnCallback$AuthnResult");
+
+AuthnCallback::AuthnResult::ClassImpl::ClassImpl(::Java::Env env, jclass cls)
+  : ::Java::Object::ClassImpl(env, cls),
+    m_fid_save(env.GetFieldID(cls, "save", "Z")),
+    m_fid_trust(env.GetFieldID(cls, "trust", "Z")),
+    m_fid_identity(env.GetFieldID(cls, "identity", "Ljava/lang/String;")),
+    m_fid_secret(env.GetFieldID(cls, "secret", "Ljava/lang/String;"))
+{}
+
+AuthnCallback::AuthnResult::ClassImpl::~ClassImpl() {}
+
+// Class JavaHL::AuthnCallback::SSLServerCertFailures
+const char* const AuthnCallback::SSLServerCertFailures::m_class_name =
+  JAVAHL_CLASS("/callback/AuthnCallback$SSLServerCertFailures");
+
+AuthnCallback::SSLServerCertFailures::ClassImpl::ClassImpl(
+    ::Java::Env env, jclass cls)
+  : ::Java::Object::ClassImpl(env, cls),
+    m_mid_ctor(env.GetMethodID(cls, "<init>", "(I)V"))
+{}
+
+AuthnCallback::SSLServerCertFailures::ClassImpl::~ClassImpl() {}
+
+AuthnCallback::SSLServerCertFailures::SSLServerCertFailures(
+    ::Java::Env env, jint failures)
+  : ::Java::Object(env,
+                   ::Java::ClassCache::get_authn_ssl_server_cert_failures(env))
+{
+  set_this(env.NewObject(get_class(), impl().m_mid_ctor, failures));
+}
+
+
+// Class JavaHL::AuthnCallback::SSLServerCertInfo
+const char* const AuthnCallback::SSLServerCertInfo::m_class_name =
+  JAVAHL_CLASS("/callback/AuthnCallback$SSLServerCertInfo");
+
+AuthnCallback::SSLServerCertInfo::ClassImpl::ClassImpl(
+    ::Java::Env env, jclass cls)
+  : ::Java::Object::ClassImpl(env, cls),
+    m_mid_ctor(env.GetMethodID(cls, "<init>",
+                               "(Ljava/lang/String;"
+                               "Ljava/lang/String;JJ[B"
+                               "Ljava/util/List;"
+                               "Ljava/lang/String;)V"))
+{}
+
+AuthnCallback::SSLServerCertInfo::ClassImpl::~ClassImpl() {}
+
+AuthnCallback::SSLServerCertInfo::SSLServerCertInfo(
+    ::Java::Env env, const char* ascii_cert)
+  : ::Java::Object(env,
+                   ::Java::ClassCache::get_authn_ssl_server_cert_info(env))
+{
+  SVN::Pool pool;
+
+  /* Convert header-less PEM to DER by undoing base64 encoding. */
+  const svn_string_t cert_string = { ascii_cert, strlen(ascii_cert) };
+  const svn_string_t* der = svn_base64_decode_string(&cert_string,
+                                                     pool.getPool());
+
+  svn_x509_certinfo_t *certinfo;
+  SVN_JAVAHL_CHECK(env, svn_x509_parse_cert(&certinfo, der->data, der->len,
+                                            pool.getPool(), pool.getPool()));
+
+  const ::Java::String subject(
+      env, svn_x509_certinfo_get_subject(certinfo, pool.getPool()));
+  const ::Java::String issuer(
+      env, svn_x509_certinfo_get_issuer(certinfo, pool.getPool()));
+  const ::Java::String cert(env, ascii_cert);
+  const jlong valid_from =
+    (jlong(svn_x509_certinfo_get_valid_from(certinfo)) + 500) / 1000;
+  const jlong valid_to =
+    (jlong(svn_x509_certinfo_get_valid_to(certinfo)) + 500) / 1000;
+
+  const svn_checksum_t* digest = svn_x509_certinfo_get_digest(certinfo);
+  jsize digest_size;
+  switch (digest->kind)
+    {
+    case svn_checksum_sha1:
+      digest_size = 160 / 8;
+      break;
+
+    case svn_checksum_md5:
+      digest_size = 128 / 8;
+      break;
+
+    default:
+      digest_size = 0;          // Initialize this to avoid compiler warnings
+      ::Java::IllegalArgumentException(env).raise(
+          _("Unknown certificate digest type"));
+    }
+  const ::Java::ByteArray fingerprint(env, digest->digest, digest_size);
+
+  jobject jhostnames = NULL;
+  const apr_array_header_t* hostnames =
+    svn_x509_certinfo_get_hostnames(certinfo);
+  if (hostnames)
+    {
+      ::Java::List< ::Java::String> hn(env, hostnames->nelts);
+      for (int i = 0; i < hostnames->nelts; ++i)
+        hn.add(::Java::String(env, APR_ARRAY_IDX(hostnames, i, const char*)));
+      jhostnames = hn.get();
+    }
+
+  set_this(env.NewObject(get_class(), impl().m_mid_ctor,
+                         subject.get(), issuer.get(),
+                         valid_from, valid_to,
+                         fingerprint.get(),
+                         jhostnames,
+                         cert.get()));
+}
+
+
+// Class JavaHL::UserPasswordCallback
+const char* const UserPasswordCallback::m_class_name =
+  JAVAHL_CLASS("/callback/UserPasswordCallback");
+
+UserPasswordCallback::ClassImpl::ClassImpl(::Java::Env env, jclass cls)
+  : ::Java::Object::ClassImpl(env, cls),
+    m_mid_ask_trust_ssl_server(
+        env.GetMethodID(cls, "askTrustSSLServer",
+                        "(Ljava/lang/String;Z)I")),
+    m_mid_prompt_2arg(
+        env.GetMethodID(cls, "prompt",
+                        "(Ljava/lang/String;Ljava/lang/String;)Z")),
+    m_mid_ask_yes_no(
+        env.GetMethodID(cls, "askYesNo",
+                        "(Ljava/lang/String;Ljava/lang/String;Z)Z")),
+    m_mid_ask_question_3arg(
+        env.GetMethodID(cls, "askQuestion",
+                        "(Ljava/lang/String;Ljava/lang/String;Z)"
+                        "Ljava/lang/String;")),
+    m_mid_get_username(
+        env.GetMethodID(cls, "getUsername",
+                        "()Ljava/lang/String;")),
+    m_mid_get_password(
+        env.GetMethodID(cls, "getPassword",
+                        "()Ljava/lang/String;")),
+    m_mid_prompt(
+        env.GetMethodID(cls, "prompt",
+                        "(Ljava/lang/String;Ljava/lang/String;Z)Z")),
+    m_mid_ask_question(
+        env.GetMethodID(cls, "askQuestion",
+                        "(Ljava/lang/String;Ljava/lang/String;ZZ)"
+                        "Ljava/lang/String;")),
+    m_mid_user_allowed_save(
+        env.GetMethodID(cls, "userAllowedSave", "()Z"))
+{}
+
+UserPasswordCallback::ClassImpl::~ClassImpl() {}
+
+jint UserPasswordCallback::ask_trust_ssl_server(const ::Java::String& info,
+                                                bool allow_permanently)
+{
+  return m_env.CallIntMethod(m_jthis, impl().m_mid_ask_trust_ssl_server,
+                             info.get(), jboolean(allow_permanently));
+}
+
+bool UserPasswordCallback::prompt(const ::Java::String& realm,
+                                  const ::Java::String& username)
+{
+  return m_env.CallBooleanMethod(m_jthis, impl().m_mid_prompt_2arg,
+                                 realm.get(), username.get());
+}
+
+bool UserPasswordCallback::ask_yes_no(const ::Java::String& realm,
+                                      const ::Java::String& question,
+                                      bool yes_is_default)
+{
+  return m_env.CallBooleanMethod(m_jthis, impl().m_mid_ask_yes_no,
+                                 realm.get(), question.get(),
+                                 jboolean(yes_is_default));
+}
+
+jstring UserPasswordCallback::ask_question(const ::Java::String& realm,
+                                           const ::Java::String& question,
+                                           bool show_answer)
+{
+  return jstring(m_env.CallObjectMethod(m_jthis,
+                                        impl().m_mid_ask_question_3arg,
+                                        realm.get(), question.get(),
+                                        jboolean(show_answer)));
+}
+
+jstring UserPasswordCallback::get_username()
+{
+  return jstring(m_env.CallObjectMethod(m_jthis, impl().m_mid_get_username));
+}
+
+jstring UserPasswordCallback::get_password()
+{
+  return jstring(m_env.CallObjectMethod(m_jthis, impl().m_mid_get_password));
+}
+
+bool UserPasswordCallback::prompt(const ::Java::String& realm,
+                                  const ::Java::String& username,
+                                  bool may_save)
+{
+  return m_env.CallBooleanMethod(m_jthis, impl().m_mid_prompt,
+                                 realm.get(), username.get(),
+                                 jboolean(may_save));
+}
+
+jstring UserPasswordCallback::ask_question(const ::Java::String& realm,
+                                           const ::Java::String& question,
+                                           bool show_answer, bool may_save)
+{
+  return jstring(m_env.CallObjectMethod(m_jthis, impl().m_mid_ask_question,
+                                        realm.get(), question.get(),
+                                        jboolean(show_answer),
+                                        jboolean(may_save)));
+}
+
+bool UserPasswordCallback::user_allowed_save()
+{
+  return m_env.CallBooleanMethod(m_jthis, impl().m_mid_user_allowed_save);
+}
+
+} // namespace JavaHL
diff --git a/subversion/bindings/javahl/native/AuthnCallback.hpp b/subversion/bindings/javahl/native/AuthnCallback.hpp
new file mode 100644
index 0000000..f30d004
--- /dev/null
+++ b/subversion/bindings/javahl/native/AuthnCallback.hpp
@@ -0,0 +1,376 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+#ifndef SVN_JAVAHL_AUTHN_CALLBACK_HPP
+#define SVN_JAVAHL_AUTHN_CALLBACK_HPP
+
+#include "svn_auth.h"
+
+#include "Pool.h"
+
+#include "jniwrapper/jni_object.hpp"
+#include "jniwrapper/jni_string.hpp"
+
+namespace JavaHL {
+
+/**
+ * Object wrapper for @c org.apache.subversion.javahl.callback.AuthnCallback.
+ *
+ * @since New in 1.9.
+ */
+class AuthnCallback : public ::Java::Object
+{
+public:
+  /**
+   * Object wrapper for @c ...AuthnCallback$AuthnResult.
+   */
+  class AuthnResult : public ::Java::Object
+  {
+  public:
+    /**
+     * Constructs a wrapper around @a jthis.
+     * The constructor does not verify the class of the wrapped object.
+     */
+    explicit AuthnResult(::Java::Env env, jobject jthis)
+      : ::Java::Object(env, ::Java::ClassCache::get_authn_result(env), jthis)
+      {}
+
+    bool save() const
+      {
+        return (0 != m_env.GetBooleanField(m_jthis, impl().m_fid_save));
+      }
+
+    bool trust() const
+      {
+        return (0 != m_env.GetBooleanField(m_jthis, impl().m_fid_trust));
+      }
+
+    jstring identity() const
+      {
+        return jstring(m_env.GetObjectField(m_jthis, impl().m_fid_identity));
+      }
+
+    jstring secret() const
+      {
+        return jstring(m_env.GetObjectField(m_jthis, impl().m_fid_secret));
+      }
+
+  private:
+    /**
+     * This object's implementation details.
+     */
+    class ClassImpl : public Object::ClassImpl
+    {
+      friend class ::Java::ClassCacheImpl;
+
+    protected:
+      explicit ClassImpl(::Java::Env env, jclass cls);
+
+    public:
+      virtual ~ClassImpl();
+
+      const ::Java::FieldID m_fid_save;
+      const ::Java::FieldID m_fid_trust;
+      const ::Java::FieldID m_fid_identity;
+      const ::Java::FieldID m_fid_secret;
+    };
+
+    const ClassImpl& impl() const
+      {
+        return *dynamic_cast<const ClassImpl*>(m_impl);
+      }
+
+    friend class ::Java::ClassCacheImpl;
+    static const char* const m_class_name;
+  };
+
+
+  /**
+   * Object wrapper for @c ...AuthnCallback$SSLServerCertFailures.
+   */
+  class SSLServerCertFailures : public ::Java::Object
+  {
+  public:
+    /**
+     * Creates and initializes a wrapped object;
+     * @a failures is a set of flags.
+     */
+    explicit SSLServerCertFailures(::Java::Env env, jint failures);
+
+  private:
+    /**
+     * This object's implementation details.
+     */
+    class ClassImpl : public Object::ClassImpl
+    {
+      friend class ::Java::ClassCacheImpl;
+
+    protected:
+      explicit ClassImpl(::Java::Env env, jclass cls);
+
+    public:
+      virtual ~ClassImpl();
+
+      const ::Java::MethodID m_mid_ctor;
+    };
+
+    const ClassImpl& impl() const
+      {
+        return *dynamic_cast<const ClassImpl*>(m_impl);
+      }
+
+    friend class ::Java::ClassCacheImpl;
+    static const char* const m_class_name;
+  };
+
+
+  /**
+   * Object wrapper for @c ...AuthnCallback$SSLServerCertInfo.
+   */
+  class SSLServerCertInfo : public ::Java::Object
+  {
+  public:
+    /**
+     * Creates and initializes a wrapped object;
+     */
+    explicit SSLServerCertInfo(::Java::Env env, const char* ascii_cert);
+
+  private:
+    /**
+     * This object's implementation details.
+     */
+    class ClassImpl : public Object::ClassImpl
+    {
+      friend class ::Java::ClassCacheImpl;
+
+    protected:
+      explicit ClassImpl(::Java::Env env, jclass cls);
+
+    public:
+      virtual ~ClassImpl();
+
+      const ::Java::MethodID m_mid_ctor;
+    };
+
+    const ClassImpl& impl() const
+      {
+        return *dynamic_cast<const ClassImpl*>(m_impl);
+      }
+
+    friend class ::Java::ClassCacheImpl;
+    static const char* const m_class_name;
+  };
+
+
+  /**
+   * Constructs a wrapper around @a jthis.
+   * The constructor does not verify the class of the wrapped object.
+   */
+  explicit AuthnCallback(::Java::Env env, jobject jthis)
+    : ::Java::Object(env, ::Java::ClassCache::get_authn_cb(env), jthis)
+    {}
+
+  /**
+   * Invokes the Java method AuthnCallback.usernamePrompt().
+   */
+  jobject username_prompt(const ::Java::String& realm, bool may_save);
+
+
+  /**
+   * Invokes the Java method AuthnCallback.userPasswordPrompt().
+   */
+  jobject user_password_prompt(const ::Java::String& realm,
+                               const ::Java::String& username,
+                               bool may_save);
+
+  /**
+   * Invokes the Java method AuthnCallback.sslServerTrustPrompt().
+   */
+  jobject ssl_server_trust_prompt(const ::Java::String& realm,
+                                  const SSLServerCertFailures& failures,
+                                  const SSLServerCertInfo& info,
+                                  bool may_save);
+
+  /**
+   * Invokes the Java method AuthnCallback.sslClientCertPrompt().
+   */
+  jobject ssl_client_cert_prompt(const ::Java::String& realm, bool may_save);
+
+  /**
+   * Invokes the Java method AuthnCallback.sslClientCertPassphrasePrompt().
+   */
+  jobject ssl_client_cert_passphrase_prompt(const ::Java::String& realm,
+                                            bool may_save);
+
+  /**
+   * Invokes the Java method AuthnCallback.allowStorePlaintextPassword().
+   */
+  bool allow_store_plaintext_password(const ::Java::String& realm);
+
+  /**
+   * Invokes the Java method AuthnCallback.allowStorePlaintextPassphrase().
+   */
+  bool allow_store_plaintext_passphrase(const ::Java::String& realm);
+
+private:
+  /**
+   * This object's implementation details.
+   */
+  class ClassImpl : public Object::ClassImpl
+  {
+    friend class ::Java::ClassCacheImpl;
+
+  protected:
+    explicit ClassImpl(::Java::Env env, jclass cls);
+
+  public:
+    virtual ~ClassImpl();
+
+    const ::Java::MethodID m_mid_username_prompt;
+    const ::Java::MethodID m_mid_user_password_prompt;
+    const ::Java::MethodID m_mid_ssl_server_trust_prompt;
+    const ::Java::MethodID m_mid_ssl_client_cert_prompt;
+    const ::Java::MethodID m_mid_ssl_client_cert_passphrase_prompt;
+    const ::Java::MethodID m_mid_allow_store_plaintext_password;
+    const ::Java::MethodID m_mid_allow_store_plaintext_passphrase;
+  };
+
+  const ClassImpl& impl() const
+    {
+      return *dynamic_cast<const ClassImpl*>(m_impl);
+    }
+
+  friend class ::Java::ClassCacheImpl;
+  static const char* const m_class_name;
+};
+
+
+/**
+ * Object wrapper for the deprecated interface
+ * @c org.apache.subversion.javahl.callback.UserPasswordCallback.
+ *
+ * @since New in 1.9.
+ */
+class UserPasswordCallback : public ::Java::Object
+{
+public:
+  /**
+   * Constructs a wrapper around @a jthis.
+   * The constructor does not verify the class of the wrapped object.
+   */
+  explicit UserPasswordCallback(::Java::Env env, jobject jthis)
+    : ::Java::Object(env, ::Java::ClassCache::get_user_passwd_cb(env), jthis)
+    {}
+
+  /**
+   * Invokes the Java method UserPasswordCallback.askTrustSSLServer().
+   */
+  jint ask_trust_ssl_server(const ::Java::String& info,
+                            bool allow_permanently);
+
+  /**
+   * Invokes the Java method UserPasswordCallback.prompt().
+   */
+  bool prompt(const ::Java::String& realm,
+              const ::Java::String& username);
+
+  /**
+   * Invokes the Java method UserPasswordCallback.askYesNo().
+   */
+  bool ask_yes_no(const ::Java::String& realm,
+                  const ::Java::String& question,
+                  bool yes_is_default);
+
+  /**
+   * Invokes the Java method UserPasswordCallback.askQuestion().
+   */
+  jstring ask_question(const ::Java::String& realm,
+                       const ::Java::String& question,
+                       bool show_answer);
+
+  /**
+   * Invokes the Java method UserPasswordCallback.getUsername().
+   */
+  jstring get_username();
+
+  /**
+   * Invokes the Java method UserPasswordCallback.getPassword().
+   */
+  jstring get_password();
+
+  /**
+   * Invokes the Java method UserPasswordCallback.prompt().
+   */
+  bool prompt(const ::Java::String& realm,
+              const ::Java::String& username,
+              bool may_save);
+
+  /**
+   * Invokes the Java method UserPasswordCallback.askQuestion().
+   */
+  jstring ask_question(const ::Java::String& realm,
+                       const ::Java::String& question,
+                       bool show_answer, bool may_save);
+
+  /**
+   * Invokes the Java method UserPasswordCallback.userAllowedSave().
+   */
+  bool user_allowed_save();
+
+private:
+  /**
+   * This object's implementation details.
+   */
+  class ClassImpl : public Object::ClassImpl
+  {
+    friend class ::Java::ClassCacheImpl;
+
+  protected:
+    explicit ClassImpl(::Java::Env env, jclass cls);
+
+  public:
+    virtual ~ClassImpl();
+
+    const ::Java::MethodID m_mid_ask_trust_ssl_server;
+    const ::Java::MethodID m_mid_prompt_2arg;
+    const ::Java::MethodID m_mid_ask_yes_no;
+    const ::Java::MethodID m_mid_ask_question_3arg;
+    const ::Java::MethodID m_mid_get_username;
+    const ::Java::MethodID m_mid_get_password;
+    const ::Java::MethodID m_mid_prompt;
+    const ::Java::MethodID m_mid_ask_question;
+    const ::Java::MethodID m_mid_user_allowed_save;
+  };
+
+  const ClassImpl& impl() const
+    {
+      return *dynamic_cast<const ClassImpl*>(m_impl);
+    }
+
+  friend class ::Java::ClassCacheImpl;
+  static const char* const m_class_name;
+};
+
+} // namespace JavaHL
+
+#endif // SVN_JAVAHL_AUTHN_CALLBACK_HPP
diff --git a/subversion/bindings/javahl/native/BlameCallback.cpp b/subversion/bindings/javahl/native/BlameCallback.cpp
index 5973707..10a8ff7 100644
--- a/subversion/bindings/javahl/native/BlameCallback.cpp
+++ b/subversion/bindings/javahl/native/BlameCallback.cpp
@@ -92,7 +92,7 @@ BlameCallback::singleLine(svn_revnum_t start_revnum, svn_revnum_t end_revnum,
   static jmethodID mid = 0;
   if (mid == 0)
     {
-      jclass clazz = env->FindClass(JAVA_PACKAGE"/callback/BlameCallback");
+      jclass clazz = env->FindClass(JAVAHL_CLASS("/callback/BlameCallback"));
       if (JNIUtil::isJavaExceptionThrown())
         POP_AND_RETURN(SVN_NO_ERROR);
 
@@ -104,14 +104,14 @@ BlameCallback::singleLine(svn_revnum_t start_revnum, svn_revnum_t end_revnum,
     }
 
   // convert the parameters to their Java relatives
-  jobject jrevProps = CreateJ::PropertyMap(revProps);
+  jobject jrevProps = CreateJ::PropertyMap(revProps, pool);
   if (JNIUtil::isJavaExceptionThrown())
     POP_AND_RETURN(SVN_NO_ERROR);
 
   jobject jmergedRevProps = NULL;
   if (mergedRevProps != NULL)
     {
-      jmergedRevProps = CreateJ::PropertyMap(mergedRevProps);
+      jmergedRevProps = CreateJ::PropertyMap(mergedRevProps, pool);
       if (JNIUtil::isJavaExceptionThrown())
         POP_AND_RETURN(SVN_NO_ERROR);
     }
@@ -128,8 +128,6 @@ BlameCallback::singleLine(svn_revnum_t start_revnum, svn_revnum_t end_revnum,
   env->CallVoidMethod(m_callback, mid, (jlong)line_no, (jlong)revision,
                       jrevProps, (jlong)mergedRevision, jmergedRevProps,
                       jmergedPath, jline, (jboolean)localChange);
-  // No need to check for an exception here, because we return anyway.
 
-  env->PopLocalFrame(NULL);
-  return SVN_NO_ERROR;
+  POP_AND_RETURN_EXCEPTION_AS_SVNERROR();
 }
diff --git a/subversion/bindings/javahl/native/ChangelistCallback.cpp b/subversion/bindings/javahl/native/ChangelistCallback.cpp
index d04ba32..621de3d 100644
--- a/subversion/bindings/javahl/native/ChangelistCallback.cpp
+++ b/subversion/bindings/javahl/native/ChangelistCallback.cpp
@@ -78,7 +78,7 @@ ChangelistCallback::doChangelist(const char *path, const char *changelist,
   // it can be cached.
   if (mid == 0)
     {
-      jclass clazz = env->FindClass(JAVA_PACKAGE"/callback/ChangelistCallback");
+      jclass clazz = env->FindClass(JAVAHL_CLASS("/callback/ChangelistCallback"));
       if (JNIUtil::isJavaExceptionThrown())
         POP_AND_RETURN_NOTHING();
 
diff --git a/subversion/bindings/javahl/native/ClientContext.cpp b/subversion/bindings/javahl/native/ClientContext.cpp
index f1babc9..c9f327b 100644
--- a/subversion/bindings/javahl/native/ClientContext.cpp
+++ b/subversion/bindings/javahl/native/ClientContext.cpp
@@ -26,7 +26,6 @@
 
 #include "svn_client.h"
 #include "private/svn_wc_private.h"
-#include "svn_private_config.h"
 
 #include "ClientContext.h"
 #include "JNIUtil.h"
@@ -37,39 +36,13 @@
 #include "EnumMapper.h"
 #include "CommitMessage.h"
 
+#include "svn_private_config.h"
 
 ClientContext::ClientContext(jobject jsvnclient, SVN::Pool &pool)
-    : m_prompter(NULL),
-      m_cancelOperation(false)
+    : OperationContext(pool)
 {
-    JNIEnv *env = JNIUtil::getEnv();
-
-    /* Grab a global reference to the Java object embedded in the parent Java
-       object. */
     static jfieldID ctxFieldID = 0;
-    if (ctxFieldID == 0)
-    {
-        jclass clazz = env->GetObjectClass(jsvnclient);
-        if (JNIUtil::isJavaExceptionThrown())
-            return;
-
-        ctxFieldID = env->GetFieldID(clazz, "clientContext",
-                                "L"JAVA_PACKAGE"/SVNClient$ClientContext;");
-        if (JNIUtil::isJavaExceptionThrown() || ctxFieldID == 0)
-            return;
-
-        env->DeleteLocalRef(clazz);
-    }
-
-    jobject jctx = env->GetObjectField(jsvnclient, ctxFieldID);
-    if (JNIUtil::isJavaExceptionThrown())
-        return;
-
-    m_jctx = env->NewGlobalRef(jctx);
-    if (JNIUtil::isJavaExceptionThrown())
-        return;
-
-    env->DeleteLocalRef(jctx);
+    attachJavaObject(jsvnclient, JAVAHL_ARG("/SVNClient$ClientContext;"), "clientContext", &ctxFieldID);
 
     SVN_JNI_ERR(svn_client_create_context2(&m_context, NULL,
                                            pool.getPool()),
@@ -96,18 +69,36 @@ ClientContext::ClientContext(jobject jsvnclient, SVN::Pool &pool)
     m_context->conflict_func2 = resolve;
     m_context->conflict_baton2 = m_jctx;
 
-    m_context->client_name = "javahl";
-    m_pool = &pool;
+    m_context->client_name = getClientName();
+
+    if (m_jtunnelcb)
+      {
+        m_context->check_tunnel_func = checkTunnel;
+        m_context->open_tunnel_func = openTunnel;
+        m_context->tunnel_baton = m_jtunnelcb;
+      }
 }
 
 ClientContext::~ClientContext()
 {
-    delete m_prompter;
-
-    JNIEnv *env = JNIUtil::getEnv();
-    env->DeleteGlobalRef(m_jctx);
 }
 
+void ClientContext::setTunnelCallback(jobject jtunnelcb)
+{
+  OperationContext::setTunnelCallback(jtunnelcb);
+  if (m_jtunnelcb)
+    {
+      m_context->check_tunnel_func = checkTunnel;
+      m_context->open_tunnel_func = openTunnel;
+      m_context->tunnel_baton = m_jtunnelcb;
+    }
+  else
+    {
+      m_context->check_tunnel_func = NULL;
+      m_context->open_tunnel_func = NULL;
+      m_context->tunnel_baton = NULL;
+    }
+}
 
 /* Helper function to make sure that we don't keep dangling pointers in ctx.
    Note that this function might be called multiple times if getContext()
@@ -140,7 +131,6 @@ svn_client_ctx_t *
 ClientContext::getContext(CommitMessage *message, SVN::Pool &in_pool)
 {
     apr_pool_t *pool = in_pool.getPool();
-    svn_auth_baton_t *ab;
     svn_client_ctx_t *ctx = m_context;
 
     /* Make a temporary copy of ctx to restore at pool cleanup to avoid
@@ -157,122 +147,17 @@ ClientContext::getContext(CommitMessage *message, SVN::Pool &in_pool)
     apr_pool_cleanup_register(in_pool.getPool(), bt, clear_ctx_ptrs,
                               clear_ctx_ptrs);
 
-
     if (!ctx->config)
       {
-        const char *configDir = m_configDir.c_str();
-        if (m_configDir.empty())
-            configDir = NULL;
-        SVN_JNI_ERR(svn_config_get_config(&(ctx->config), configDir,
-                                          m_pool->getPool()),
-                    NULL);
+        apr_hash_t * configData = getConfigData();
 
+        ctx->config = configData;
         bt->backup->config = ctx->config;
       }
-    svn_config_t *config =
-        reinterpret_cast<svn_config_t *>(apr_hash_get(ctx->config,
-                                                      SVN_CONFIG_CATEGORY_CONFIG,
-                                                      APR_HASH_KEY_STRING));
-
-
-    /* The whole list of registered providers */
-    apr_array_header_t *providers;
-
-    /* Populate the registered providers with the platform-specific providers */
-    SVN_JNI_ERR(svn_auth_get_platform_specific_client_providers(&providers,
-                                                                config,
-                                                                pool),
-                NULL);
-
-    /* Use the prompter (if available) to prompt for password and cert
-     * caching. */
-    svn_auth_plaintext_prompt_func_t plaintext_prompt_func = NULL;
-    void *plaintext_prompt_baton = NULL;
-    svn_auth_plaintext_passphrase_prompt_func_t plaintext_passphrase_prompt_func;
-    void *plaintext_passphrase_prompt_baton = NULL;
-
-    if (m_prompter != NULL)
-    {
-        plaintext_prompt_func = Prompter::plaintext_prompt;
-        plaintext_prompt_baton = m_prompter;
-        plaintext_passphrase_prompt_func = Prompter::plaintext_passphrase_prompt;
-        plaintext_passphrase_prompt_baton = m_prompter;
-    }
-
-    /* The main disk-caching auth providers, for both
-     * 'username/password' creds and 'username' creds.  */
-    svn_auth_provider_object_t *provider;
-
-    svn_auth_get_simple_provider2(&provider, plaintext_prompt_func,
-                                  plaintext_prompt_baton, pool);
-    APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
-
-    svn_auth_get_username_provider(&provider, pool);
-    APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
-
-    /* The server-cert, client-cert, and client-cert-password providers. */
-    SVN_JNI_ERR(svn_auth_get_platform_specific_provider(&provider,
-                                                        "windows",
-                                                        "ssl_server_trust",
-                                                        pool),
-                NULL);
-
-    if (provider)
-        APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
-
-    svn_auth_get_ssl_server_trust_file_provider(&provider, pool);
-    APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
-    svn_auth_get_ssl_client_cert_file_provider(&provider, pool);
-    APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
-    svn_auth_get_ssl_client_cert_pw_file_provider2(&provider,
-                        plaintext_passphrase_prompt_func,
-                        plaintext_passphrase_prompt_baton, pool);
-    APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
-
-    if (m_prompter != NULL)
-    {
-        /* Two basic prompt providers: username/password, and just username.*/
-        provider = m_prompter->getProviderSimple(in_pool);
-
-        APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
-
-        provider = m_prompter->getProviderUsername(in_pool);
-        APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
-
-        /* Three ssl prompt providers, for server-certs, client-certs,
-         * and client-cert-passphrases.  */
-        provider = m_prompter->getProviderServerSSLTrust(in_pool);
-        APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
-
-        provider = m_prompter->getProviderClientSSL(in_pool);
-        APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
-
-        provider = m_prompter->getProviderClientSSLPassword(in_pool);
-        APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
-    }
 
-    /* Build an authentication baton to give to libsvn_client. */
-    svn_auth_open(&ab, providers, pool);
-
-    /* Place any default --username or --password credentials into the
-     * auth_baton's run-time parameter hash.  ### Same with --no-auth-cache? */
-    if (!m_userName.empty())
-        svn_auth_set_parameter(ab, SVN_AUTH_PARAM_DEFAULT_USERNAME,
-                               apr_pstrdup(in_pool.getPool(),
-                                           m_userName.c_str()));
-    if (!m_passWord.empty())
-        svn_auth_set_parameter(ab, SVN_AUTH_PARAM_DEFAULT_PASSWORD,
-                               apr_pstrdup(in_pool.getPool(),
-                                           m_passWord.c_str()));
-    /* Store where to retrieve authentication data? */
-    if (!m_configDir.empty())
-        svn_auth_set_parameter(ab, SVN_AUTH_PARAM_CONFIG_DIR,
-                               apr_pstrdup(in_pool.getPool(),
-                                           m_configDir.c_str()));
-
-    ctx->auth_baton = ab;
+    ctx->auth_baton = getAuthBaton(in_pool);
     ctx->log_msg_baton3 = message;
-    m_cancelOperation = false;
+    resetCancelRequest();
 
     SVN_JNI_ERR(svn_wc_context_create(&ctx->wc_ctx, NULL,
                                       in_pool.getPool(), in_pool.getPool()),
@@ -282,60 +167,6 @@ ClientContext::getContext(CommitMessage *message, SVN::Pool &in_pool)
 }
 
 void
-ClientContext::username(const char *pi_username)
-{
-    m_userName = (pi_username == NULL ? "" : pi_username);
-}
-
-void
-ClientContext::password(const char *pi_password)
-{
-    m_passWord = (pi_password == NULL ? "" : pi_password);
-}
-
-void
-ClientContext::setPrompt(Prompter *prompter)
-{
-    delete m_prompter;
-    m_prompter = prompter;
-}
-
-void
-ClientContext::setConfigDirectory(const char *configDir)
-{
-    // A change to the config directory may necessitate creation of
-    // the config templates.
-    SVN::Pool requestPool;
-    SVN_JNI_ERR(svn_config_ensure(configDir, requestPool.getPool()), );
-
-    m_configDir = (configDir == NULL ? "" : configDir);
-    m_context->config = NULL;
-}
-
-const char *
-ClientContext::getConfigDirectory() const
-{
-    return m_configDir.c_str();
-}
-
-void
-ClientContext::cancelOperation()
-{
-    m_cancelOperation = true;
-}
-
-svn_error_t *
-ClientContext::checkCancel(void *cancelBaton)
-{
-    ClientContext *that = static_cast<ClientContext *>(cancelBaton);
-    if (that->m_cancelOperation)
-        return svn_error_create(SVN_ERR_CANCELLED, NULL,
-                                _("Operation cancelled"));
-    else
-        return SVN_NO_ERROR;
-}
-
-void
 ClientContext::notify(void *baton,
                       const svn_wc_notify_t *notify,
                       apr_pool_t *pool)
@@ -351,7 +182,7 @@ ClientContext::notify(void *baton,
         return;
 
       mid = env->GetMethodID(clazz, "onNotify",
-                             "(L"JAVA_PACKAGE"/ClientNotifyInformation;)V");
+                             "(" JAVAHL_ARG("/ClientNotifyInformation;") ")V");
       if (JNIUtil::isJavaExceptionThrown() || mid == 0)
         return;
 
@@ -369,54 +200,6 @@ ClientContext::notify(void *baton,
   env->DeleteLocalRef(jInfo);
 }
 
-void
-ClientContext::progress(apr_off_t progressVal, apr_off_t total,
-                        void *baton, apr_pool_t *pool)
-{
-  jobject jctx = (jobject) baton;
-  JNIEnv *env = JNIUtil::getEnv();
-
-  // Create a local frame for our references
-  env->PushLocalFrame(LOCAL_FRAME_SIZE);
-  if (JNIUtil::isJavaExceptionThrown())
-    return;
-
-  static jmethodID mid = 0;
-  if (mid == 0)
-    {
-      jclass clazz = env->GetObjectClass(jctx);
-      if (JNIUtil::isJavaExceptionThrown())
-        POP_AND_RETURN_NOTHING();
-
-      mid = env->GetMethodID(clazz, "onProgress",
-                             "(L"JAVA_PACKAGE"/ProgressEvent;)V");
-      if (JNIUtil::isJavaExceptionThrown() || mid == 0)
-        POP_AND_RETURN_NOTHING();
-    }
-
-  static jmethodID midCT = 0;
-  jclass clazz = env->FindClass(JAVA_PACKAGE"/ProgressEvent");
-  if (JNIUtil::isJavaExceptionThrown())
-    POP_AND_RETURN_NOTHING();
-
-  if (midCT == 0)
-    {
-      midCT = env->GetMethodID(clazz, "<init>", "(JJ)V");
-      if (JNIUtil::isJavaExceptionThrown() || midCT == 0)
-        POP_AND_RETURN_NOTHING();
-    }
-
-  // Call the Java method.
-  jobject jevent = env->NewObject(clazz, midCT,
-                                  (jlong) progressVal, (jlong) total);
-  if (JNIUtil::isJavaExceptionThrown())
-    POP_AND_RETURN_NOTHING();
-
-  env->CallVoidMethod(jctx, mid, jevent);
-
-  POP_AND_RETURN_NOTHING();
-}
-
 svn_error_t *
 ClientContext::resolve(svn_wc_conflict_result_t **result,
                        const svn_wc_conflict_description2_t *desc,
@@ -440,8 +223,8 @@ ClientContext::resolve(svn_wc_conflict_result_t **result,
         POP_AND_RETURN(SVN_NO_ERROR);
 
       mid = env->GetMethodID(clazz, "resolve",
-                             "(L"JAVA_PACKAGE"/ConflictDescriptor;)"
-                             "L"JAVA_PACKAGE"/ConflictResult;");
+                             "(" JAVAHL_ARG("/ConflictDescriptor;") ")"
+                             JAVAHL_ARG("/ConflictResult;"));
       if (JNIUtil::isJavaExceptionThrown() || mid == 0)
         POP_AND_RETURN(SVN_NO_ERROR);
     }
@@ -493,7 +276,7 @@ ClientContext::javaResultToC(jobject jresult, apr_pool_t *pool)
   jclass clazz = NULL;
   if (getChoice == 0 || getMergedPath == 0)
     {
-      clazz = env->FindClass(JAVA_PACKAGE "/ConflictResult");
+      clazz = env->FindClass(JAVAHL_CLASS("/ConflictResult"));
       if (JNIUtil::isJavaExceptionThrown())
         POP_AND_RETURN_NULL;
     }
@@ -501,7 +284,7 @@ ClientContext::javaResultToC(jobject jresult, apr_pool_t *pool)
   if (getChoice == 0)
     {
       getChoice = env->GetMethodID(clazz, "getChoice",
-                                   "()L"JAVA_PACKAGE"/ConflictResult$Choice;");
+                                   "()" JAVAHL_ARG("/ConflictResult$Choice;"));
       if (JNIUtil::isJavaExceptionThrown() || getChoice == 0)
         POP_AND_RETURN_NULL;
     }
diff --git a/subversion/bindings/javahl/native/ClientContext.h b/subversion/bindings/javahl/native/ClientContext.h
index de3ece1..55ae9ff 100644
--- a/subversion/bindings/javahl/native/ClientContext.h
+++ b/subversion/bindings/javahl/native/ClientContext.h
@@ -29,6 +29,8 @@
 
 #include <string>
 
+#include "OperationContext.h"
+
 #include "svn_types.h"
 #include "svn_client.h"
 
@@ -36,7 +38,6 @@
 #include "Pool.h"
 #include "JNIStringHolder.h"
 
-class Prompter;
 class CommitMessage;
 
 /**
@@ -44,25 +45,14 @@ class CommitMessage;
  * and implements the functions read & close of svn_stream_t.
  *
  */
-class ClientContext
+class ClientContext : public OperationContext
 {
  private:
   svn_client_ctx_t *m_context;
-  const SVN::Pool *m_pool;
-  jobject m_jctx;
-
-  std::string m_userName;
-  std::string m_passWord;
-  std::string m_configDir;
-
-  Prompter *m_prompter;
-  bool m_cancelOperation;
 
  protected:
   static void notify(void *baton, const svn_wc_notify_t *notify,
                      apr_pool_t *pool);
-  static void progress(apr_off_t progressVal, apr_off_t total,
-                       void *baton, apr_pool_t *pool);
   static svn_error_t *resolve(svn_wc_conflict_result_t **result,
                               const svn_wc_conflict_description2_t *desc,
                               void *baton,
@@ -73,24 +63,10 @@ class ClientContext
 
  public:
   ClientContext(jobject jsvnclient, SVN::Pool &pool);
-  ~ClientContext();
-
-  static svn_error_t *checkCancel(void *cancelBaton);
+  virtual ~ClientContext();
+  virtual void setTunnelCallback(jobject jtunnelcb);
 
   svn_client_ctx_t *getContext(CommitMessage *message, SVN::Pool &in_pool);
-
-  void username(const char *pi_username);
-  void password(const char *pi_password);
-  void setPrompt(Prompter *prompter);
-  void cancelOperation();
-  const char *getConfigDirectory() const;
-
-  /**
-   * Set the configuration directory, taking the usual steps to
-   * ensure that Subversion's config file templates exist in the
-   * specified location.
-   */
-  void setConfigDirectory(const char *configDir);
 };
 
 #endif // CLIENTCONTEXT_H
diff --git a/subversion/bindings/javahl/native/CommitCallback.cpp b/subversion/bindings/javahl/native/CommitCallback.cpp
index 2ffe326..2139312 100644
--- a/subversion/bindings/javahl/native/CommitCallback.cpp
+++ b/subversion/bindings/javahl/native/CommitCallback.cpp
@@ -37,9 +37,8 @@
  * @param jcallback the Java callback object.
  */
 CommitCallback::CommitCallback(jobject jcallback)
-{
-  m_callback = jcallback;
-}
+  : m_callback(jcallback)
+{}
 
 /**
  * Destroy a CommitCallback object
@@ -81,13 +80,13 @@ CommitCallback::commitInfo(const svn_commit_info_t *commit_info,
   static jmethodID sm_mid = 0;
   if (sm_mid == 0)
     {
-      jclass clazz = env->FindClass(JAVA_PACKAGE"/callback/CommitCallback");
+      jclass clazz = env->FindClass(JAVAHL_CLASS("/callback/CommitCallback"));
       if (JNIUtil::isJavaExceptionThrown())
         POP_AND_RETURN(SVN_NO_ERROR);
 
       sm_mid = env->GetMethodID(clazz,
                                 "commitInfo",
-                                "(L"JAVA_PACKAGE"/CommitInfo;)V");
+                                "(" JAVAHL_ARG("/CommitInfo;") ")V");
       if (JNIUtil::isJavaExceptionThrown())
         POP_AND_RETURN(SVN_NO_ERROR);
     }
@@ -97,8 +96,17 @@ CommitCallback::commitInfo(const svn_commit_info_t *commit_info,
     POP_AND_RETURN(SVN_NO_ERROR);
 
   env->CallVoidMethod(m_callback, sm_mid, jcommitInfo);
-  // No need to check for an exception here, because we return anyway.
 
-  env->PopLocalFrame(NULL);
-  return SVN_NO_ERROR;
+  POP_AND_RETURN_EXCEPTION_AS_SVNERROR();
+}
+
+
+PersistentCommitCallback::PersistentCommitCallback(jobject jcallback)
+  : CommitCallback(JNIUtil::getEnv()->NewGlobalRef(jcallback))
+{}
+
+PersistentCommitCallback::~PersistentCommitCallback()
+{
+  if (m_callback)
+    JNIUtil::getEnv()->DeleteGlobalRef(m_callback);
 }
diff --git a/subversion/bindings/javahl/native/CommitCallback.h b/subversion/bindings/javahl/native/CommitCallback.h
index d08219f..0c4fe0f 100644
--- a/subversion/bindings/javahl/native/CommitCallback.h
+++ b/subversion/bindings/javahl/native/CommitCallback.h
@@ -47,11 +47,26 @@ class CommitCallback
   svn_error_t *commitInfo(const svn_commit_info_t *commit_info,
                           apr_pool_t *pool);
 
- private:
   /**
    * This a local reference to the Java object.
    */
   jobject m_callback;
 };
 
+/**
+ * Like CommitCallback, but maintains a reference to the Java object
+ * across JNI calls.
+ */
+class PersistentCommitCallback : protected CommitCallback
+{
+ public:
+  PersistentCommitCallback(jobject jcallback);
+  ~PersistentCommitCallback();
+  static svn_error_t *callback(const svn_commit_info_t *commit_info,
+                               void *baton, apr_pool_t *pool)
+    {
+      return CommitCallback::callback(commit_info, baton, pool);
+    }
+};
+
 #endif  // COMMITCALLBACK_H
diff --git a/subversion/bindings/javahl/native/CommitEditor.cpp b/subversion/bindings/javahl/native/CommitEditor.cpp
new file mode 100644
index 0000000..0a550d8
--- /dev/null
+++ b/subversion/bindings/javahl/native/CommitEditor.cpp
@@ -0,0 +1,618 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ *
+ * @file CommitEditor.cpp
+ * @brief Implementation of the class CommitEditor
+ */
+
+#include "CommitEditor.h"
+#include "EnumMapper.h"
+#include "InputStream.h"
+#include "Iterator.h"
+#include "JNIByteArray.h"
+#include "LockTokenTable.h"
+#include "PropertyTable.h"
+#include "RemoteSession.h"
+
+#include <apr_tables.h>
+#include "svn_checksum.h"
+#include "private/svn_editor.h"
+#include "private/svn_ra_private.h"
+#include "svn_private_config.h"
+
+#include "EditorCallbacks.hpp"
+#include "jniwrapper/jni_string.hpp"
+#include "jniwrapper/jni_stack.hpp"
+
+CommitEditor*
+CommitEditor::getCppObject(jobject jthis)
+{
+  static jfieldID fid = 0;
+  jlong cppAddr = SVNBase::findCppAddrForJObject(
+      jthis, &fid, JAVAHL_CLASS("/remote/CommitEditor"));
+  return (cppAddr == 0 ? NULL : reinterpret_cast<CommitEditor*>(cppAddr));
+}
+
+jlong
+CommitEditor::createInstance(jobject jsession,
+                             jobject jrevprops,
+                             jobject jcommit_callback,
+                             jobject jlock_tokens,
+                             jboolean jkeep_locks,
+                             jobject jget_base_cb,
+                             jobject jget_props_cb,
+                             jobject jget_kind_cb)
+{
+  RemoteSession* session = RemoteSession::getCppObject(jsession);
+  CPPADDR_NULL_PTR(session, 0);
+
+  CommitEditor* editor = new CommitEditor(session,
+                                          jrevprops, jcommit_callback,
+                                          jlock_tokens, jkeep_locks,
+                                          jget_base_cb, jget_props_cb,
+                                          jget_kind_cb);
+  if (JNIUtil::isJavaExceptionThrown())
+    {
+      delete editor;
+      return 0;
+    }
+  return editor->getCppAddr();
+}
+
+CommitEditor::CommitEditor(RemoteSession* session,
+                           jobject jrevprops, jobject jcommit_callback,
+                           jobject jlock_tokens, jboolean jkeep_locks,
+                           jobject jget_base_cb, jobject jget_props_cb,
+                           jobject jget_kind_cb)
+
+  : m_valid(false),
+    m_callback(jcommit_callback),
+    m_session(session),
+    m_editor(NULL),
+    m_get_base_cb(Java::Env(), jget_base_cb),
+    m_get_props_cb(Java::Env(), jget_props_cb),
+    m_get_kind_cb(Java::Env(), jget_kind_cb),
+    m_callback_session(NULL),
+    m_callback_session_url(NULL),
+    m_callback_session_uuid(NULL)
+{
+  // Store the repository root identity from the current session as we
+  // may need it to open another session in get_copysrc_kind_cb.
+  SVN_JNI_ERR(svn_ra_get_repos_root2(session->m_session,
+                                     &m_callback_session_url,
+                                     pool.getPool()),);
+  SVN_JNI_ERR(svn_ra_get_uuid2(session->m_session,
+                               &m_callback_session_uuid,
+                               pool.getPool()),);
+
+  PropertyTable revprops(jrevprops, true, true);
+  if (JNIUtil::isJavaExceptionThrown())
+    return;
+  LockTokenTable lock_tokens(jlock_tokens);
+  if (JNIUtil::isJavaExceptionThrown())
+    return;
+
+  SVN::Pool subPool(pool);
+  SVN_JNI_ERR(svn_ra__get_commit_ev2(
+                  &m_editor,
+                  session->m_session,
+                  revprops.hash(subPool),
+                  m_callback.callback, &m_callback,
+                  lock_tokens.hash(subPool, true),
+                  bool(jkeep_locks),
+                  this->provide_base_cb,
+                  this->provide_props_cb,
+                  this->get_copysrc_kind_cb, this,
+                  pool.getPool(),     // result pool
+                  subPool.getPool()), // scratch pool
+              );
+  m_valid = true;
+}
+
+CommitEditor::~CommitEditor() {}
+
+void CommitEditor::dispose(jobject jthis)
+{
+  if (m_valid)
+    abort();
+
+  static jfieldID fid = 0;
+  SVNBase::dispose(jthis, &fid, JAVAHL_CLASS("/remote/CommitEditor"));
+}
+
+namespace {
+void throw_editor_inactive()
+{
+  JNIUtil::raiseThrowable("java/lang/IllegalStateException",
+                          _("The editor is not active"));
+}
+
+void throw_not_implemented(const char* fname)
+{
+  std::string msg = _("Not implemented: ");
+  msg += "CommitEditor.";
+  msg += fname;
+  JNIUtil::raiseThrowable("java/lang/RuntimeException", msg.c_str());
+}
+
+const apr_array_header_t*
+build_children(const Iterator& iter, SVN::Pool& pool)
+{
+  apr_pool_t* result_pool = pool.getPool();
+  apr_array_header_t* children = apr_array_make(
+      result_pool, 0, sizeof(const char*));
+  while (iter.hasNext())
+    {
+      JNIStringHolder path((jstring)iter.next());
+      if (JNIUtil::isJavaExceptionThrown())
+        return NULL;
+      APR_ARRAY_PUSH(children, const char*) = path.pstrdup(result_pool);
+    }
+  return children;
+}
+
+svn_checksum_t
+build_checksum(jobject jchecksum, SVN::Pool& pool)
+{
+  apr_pool_t* result_pool = pool.getPool();
+  svn_checksum_t checksum = { 0 };
+  if (jchecksum)
+    {
+      JNIEnv *env = JNIUtil::getEnv();
+
+      static jmethodID digest_mid = 0;
+      static jmethodID kind_mid = 0;
+
+      if (0 == digest_mid || 0 == kind_mid)
+        {
+          jclass cls = env->FindClass(JAVAHL_CLASS("/types/Checksum"));
+          if (JNIUtil::isJavaExceptionThrown())
+            return checksum;
+
+          digest_mid = env->GetMethodID(cls, "getDigest", "()[B");
+          if (JNIUtil::isJavaExceptionThrown())
+            return checksum;
+          kind_mid = env->GetMethodID(cls, "getKind", "()L"
+                                      JAVAHL_CLASS("/types/Checksum$Kind;"));
+          if (JNIUtil::isJavaExceptionThrown())
+            return checksum;
+        }
+
+      jobject jdigest = env->CallObjectMethod(jchecksum, digest_mid);
+      if (JNIUtil::isJavaExceptionThrown())
+        return checksum;
+      jobject jkind = env->CallObjectMethod(jchecksum, kind_mid);
+      if (JNIUtil::isJavaExceptionThrown())
+        return checksum;
+      JNIByteArray bdigest((jbyteArray)jdigest, true);
+      if (JNIUtil::isJavaExceptionThrown())
+        return checksum;
+
+      void* digest = apr_palloc(result_pool, bdigest.getLength());
+      memcpy(digest, bdigest.getBytes(), bdigest.getLength());
+      checksum.digest = static_cast<const unsigned char*>(digest);
+      checksum.kind = EnumMapper::toChecksumKind(jkind);
+    }
+
+  return checksum;
+}
+} // anonymous namespace
+
+
+void CommitEditor::addDirectory(jstring jrelpath,
+                                jobject jchildren, jobject jproperties,
+                                jlong jreplaces_revision)
+{
+  if (!m_valid) { throw_editor_inactive(); return; }
+  SVN_JNI_ERR(m_session->m_context->checkCancel(m_session->m_context),);
+
+  Iterator children(jchildren);
+  if (JNIUtil::isJavaExceptionThrown())
+    return;
+  PropertyTable properties(jproperties, true, true);
+  if (JNIUtil::isJavaExceptionThrown())
+    return;
+
+  SVN::Pool subPool(pool);
+  Relpath relpath(jrelpath, subPool);
+  if (JNIUtil::isExceptionThrown())
+    return;
+  SVN_JNI_ERR(relpath.error_occurred(),);
+
+  SVN_JNI_ERR(svn_editor_add_directory(m_editor, relpath.c_str(),
+                                       build_children(children, subPool),
+                                       properties.hash(subPool),
+                                       svn_revnum_t(jreplaces_revision)),);
+}
+
+void CommitEditor::addFile(jstring jrelpath,
+                           jobject jchecksum, jobject jcontents,
+                           jobject jproperties,
+                           jlong jreplaces_revision)
+{
+  if (!m_valid) { throw_editor_inactive(); return; }
+  SVN_JNI_ERR(m_session->m_context->checkCancel(m_session->m_context),);
+
+  InputStream contents(jcontents);
+  PropertyTable properties(jproperties, true, true);
+  if (JNIUtil::isJavaExceptionThrown())
+    return;
+
+  SVN::Pool subPool(pool);
+  Relpath relpath(jrelpath, subPool);
+  if (JNIUtil::isExceptionThrown())
+    return;
+  SVN_JNI_ERR(relpath.error_occurred(),);
+
+  svn_checksum_t checksum = build_checksum(jchecksum, subPool);
+  if (JNIUtil::isJavaExceptionThrown())
+    return;
+  SVN_JNI_ERR(svn_editor_add_file(m_editor, relpath.c_str(),
+                                  &checksum, contents.getStream(subPool),
+                                  properties.hash(subPool),
+                                  svn_revnum_t(jreplaces_revision)),);
+}
+
+void CommitEditor::addSymlink(jstring jrelpath,
+                              jstring jtarget, jobject jproperties,
+                              jlong jreplaces_revision)
+{
+  throw_not_implemented("addSymlink");
+}
+
+void CommitEditor::addAbsent(jstring jrelpath, jobject jkind,
+                             jlong jreplaces_revision)
+{
+  if (!m_valid) { throw_editor_inactive(); return; }
+  SVN_JNI_ERR(m_session->m_context->checkCancel(m_session->m_context),);
+
+  SVN::Pool subPool(pool);
+  Relpath relpath(jrelpath, subPool);
+  if (JNIUtil::isExceptionThrown())
+    return;
+  SVN_JNI_ERR(relpath.error_occurred(),);
+
+  SVN_JNI_ERR(svn_editor_add_absent(m_editor, relpath.c_str(),
+                                    EnumMapper::toNodeKind(jkind),
+                                    svn_revnum_t(jreplaces_revision)),);
+}
+
+void CommitEditor::alterDirectory(jstring jrelpath, jlong jrevision,
+                                  jobject jchildren, jobject jproperties)
+{
+  if (!m_valid) { throw_editor_inactive(); return; }
+  SVN_JNI_ERR(m_session->m_context->checkCancel(m_session->m_context),);
+
+  Iterator children(jchildren);
+  if (JNIUtil::isJavaExceptionThrown())
+    return;
+  PropertyTable properties(jproperties, true, false);
+  if (JNIUtil::isJavaExceptionThrown())
+    return;
+
+  SVN::Pool subPool(pool);
+  Relpath relpath(jrelpath, subPool);
+  if (JNIUtil::isExceptionThrown())
+    return;
+  SVN_JNI_ERR(relpath.error_occurred(),);
+
+  SVN_JNI_ERR(svn_editor_alter_directory(
+                  m_editor, relpath.c_str(), svn_revnum_t(jrevision),
+                  (jchildren ? build_children(children, subPool) : NULL),
+                  properties.hash(subPool)),);
+}
+
+void CommitEditor::alterFile(jstring jrelpath, jlong jrevision,
+                             jobject jchecksum, jobject jcontents,
+                             jobject jproperties)
+{
+  if (!m_valid) { throw_editor_inactive(); return; }
+  SVN_JNI_ERR(m_session->m_context->checkCancel(m_session->m_context),);
+
+  InputStream contents(jcontents);
+  PropertyTable properties(jproperties, true, false);
+  if (JNIUtil::isJavaExceptionThrown())
+    return;
+
+  SVN::Pool subPool(pool);
+  Relpath relpath(jrelpath, subPool);
+  if (JNIUtil::isExceptionThrown())
+    return;
+  SVN_JNI_ERR(relpath.error_occurred(),);
+
+  svn_checksum_t checksum = build_checksum(jchecksum, subPool);
+  if (JNIUtil::isJavaExceptionThrown())
+    return;
+  SVN_JNI_ERR(svn_editor_alter_file(
+                  m_editor, relpath.c_str(), svn_revnum_t(jrevision),
+                  (jcontents ? &checksum : NULL),
+                  (jcontents ? contents.getStream(subPool) : NULL),
+                  properties.hash(subPool)),);
+}
+
+void CommitEditor::alterSymlink(jstring jrelpath, jlong jrevision,
+                                jstring jtarget, jobject jproperties)
+{
+  throw_not_implemented("alterSymlink");
+}
+
+void CommitEditor::remove(jstring jrelpath, jlong jrevision)
+{
+  if (!m_valid) { throw_editor_inactive(); return; }
+  SVN_JNI_ERR(m_session->m_context->checkCancel(m_session->m_context),);
+
+  SVN::Pool subPool(pool);
+  Relpath relpath(jrelpath, subPool);
+  if (JNIUtil::isExceptionThrown())
+    return;
+  SVN_JNI_ERR(relpath.error_occurred(),);
+
+  SVN_JNI_ERR(svn_editor_delete(m_editor, relpath.c_str(),
+                                svn_revnum_t(jrevision)),);
+}
+
+void CommitEditor::copy(jstring jsrc_relpath, jlong jsrc_revision,
+                        jstring jdst_relpath, jlong jreplaces_revision)
+{
+  if (!m_valid) { throw_editor_inactive(); return; }
+  SVN_JNI_ERR(m_session->m_context->checkCancel(m_session->m_context),);
+
+  SVN::Pool subPool(pool);
+  Relpath src_relpath(jsrc_relpath, subPool);
+  if (JNIUtil::isExceptionThrown())
+    return;
+  SVN_JNI_ERR(src_relpath.error_occurred(),);
+  Relpath dst_relpath(jdst_relpath, subPool);
+  if (JNIUtil::isExceptionThrown())
+    return;
+  SVN_JNI_ERR(dst_relpath.error_occurred(),);
+
+  SVN_JNI_ERR(svn_editor_copy(m_editor,
+                              src_relpath.c_str(),
+                              svn_revnum_t(jsrc_revision),
+                              dst_relpath.c_str(),
+                              svn_revnum_t(jreplaces_revision)),);
+}
+
+void CommitEditor::move(jstring jsrc_relpath, jlong jsrc_revision,
+                        jstring jdst_relpath, jlong jreplaces_revision)
+{
+  if (!m_valid) { throw_editor_inactive(); return; }
+  SVN_JNI_ERR(m_session->m_context->checkCancel(m_session->m_context),);
+
+  SVN::Pool subPool(pool);
+  Relpath src_relpath(jsrc_relpath, subPool);
+  if (JNIUtil::isExceptionThrown())
+    return;
+  SVN_JNI_ERR(src_relpath.error_occurred(),);
+  Relpath dst_relpath(jdst_relpath, subPool);
+  if (JNIUtil::isExceptionThrown())
+    return;
+  SVN_JNI_ERR(dst_relpath.error_occurred(),);
+
+  SVN_JNI_ERR(svn_editor_move(m_editor,
+                              src_relpath.c_str(),
+                              svn_revnum_t(jsrc_revision),
+                              dst_relpath.c_str(),
+                              svn_revnum_t(jreplaces_revision)),);
+}
+
+void CommitEditor::complete()
+{
+  if (!m_valid) { throw_editor_inactive(); return; }
+  SVN_JNI_ERR(m_session->m_context->checkCancel(m_session->m_context),);
+
+  SVN_JNI_ERR(svn_editor_complete(m_editor),);
+  m_valid = false;
+}
+
+void CommitEditor::abort()
+{
+  if (!m_valid) { throw_editor_inactive(); return; }
+  SVN_JNI_ERR(m_session->m_context->checkCancel(m_session->m_context),);
+
+  SVN_JNI_ERR(svn_editor_abort(m_editor),);
+  m_valid = false;
+}
+
+
+namespace {
+svn_error_t* open_callback_session(svn_ra_session_t*& session,
+                                   const char* url, const char* uuid,
+                                   RemoteSessionContext* context,
+                                   SVN::Pool& sessionPool)
+{
+  if (!session)
+    {
+      const char* corrected_url = NULL;
+      SVN_ERR(svn_ra_open4(&session, &corrected_url, url, uuid,
+                           context->getCallbacks(),
+                           context->getCallbackBaton(),
+                           context->getConfigData(),
+                           sessionPool.getPool()));
+
+      if (corrected_url)
+        {
+          // This shouldn't happen -- the open session will give us
+          // the final redirected repository URL. There's an edge case
+          // where redirects might change while the session is open;
+          // but we'll just punt handling that to the caller.
+          return svn_error_createf(
+              SVN_ERR_RA_ILLEGAL_URL, NULL,
+              _("Repository URL changed while session was open.\n"
+                "Expected URL: %s\nApparent URL: %s"),
+              url, corrected_url);
+        }
+    }
+  return SVN_NO_ERROR;
+}
+
+void
+invoke_get_base_cb(svn_stream_t **contents, svn_revnum_t *revision,
+                   Java::Env env, jobject get_base_cb,
+                   const char *repos_relpath, apr_pool_t *result_pool)
+{
+  Java::String relpath(env, repos_relpath);
+  jobject jrv =
+    JavaHL::ProvideBaseCallback(env, get_base_cb)(relpath.get());
+  JavaHL::ProvideBaseCallback::ReturnValue rv(env, jrv);
+  *contents = rv.get_global_stream(result_pool);
+  *revision = svn_revnum_t(rv.get_revision());
+}
+
+void
+invoke_get_props_cb(apr_hash_t **props, svn_revnum_t *revision,
+                   Java::Env env, jobject get_props_cb,
+                   const char *repos_relpath, apr_pool_t *result_pool)
+{
+  Java::String relpath(env, repos_relpath);
+  jobject jrv =
+    JavaHL::ProvidePropsCallback(env, get_props_cb)(relpath.get());
+  JavaHL::ProvidePropsCallback::ReturnValue rv(env, jrv);
+  *props = rv.get_property_hash(result_pool);
+  *revision = svn_revnum_t(rv.get_revision());
+}
+
+void
+invoke_get_kind_cb(svn_node_kind_t *kind,
+                   Java::Env env, jobject get_kind_cb,
+                   const char *repos_relpath, svn_revnum_t revision)
+{
+  Java::String relpath(env, repos_relpath);
+  jobject jnode_kind =
+    JavaHL::GetNodeKindCallback(env, get_kind_cb)(relpath.get(),
+                                                  jlong(revision));
+  *kind = EnumMapper::toNodeKind(jnode_kind);
+}
+} // anonymous namespace
+
+
+svn_error_t*
+CommitEditor::provide_base_cb(svn_stream_t **contents,
+                              svn_revnum_t *revision,
+                              void *baton,
+                              const char *repos_relpath,
+                              apr_pool_t *result_pool,
+                              apr_pool_t *scratch_pool)
+{
+  CommitEditor* editor = static_cast<CommitEditor*>(baton);
+  if (editor->m_get_base_cb.get())
+    {
+      const Java::Env env;
+      SVN_JAVAHL_CATCH(env, SVN_ERR_BASE,
+                       invoke_get_base_cb(contents, revision, env,
+                                          editor->m_get_base_cb.get(),
+                                          repos_relpath,
+                                          result_pool));
+    }
+  else
+    {
+      *contents = NULL;
+      *revision = SVN_INVALID_REVNUM;
+    }
+  return SVN_NO_ERROR;
+}
+
+svn_error_t*
+CommitEditor::provide_props_cb(apr_hash_t **props,
+                               svn_revnum_t *revision,
+                               void *baton,
+                               const char *repos_relpath,
+                               apr_pool_t *result_pool,
+                               apr_pool_t *scratch_pool)
+{
+  CommitEditor* editor = static_cast<CommitEditor*>(baton);
+  if (editor->m_get_props_cb.get())
+    {
+      const Java::Env env;
+      SVN_JAVAHL_CATCH(env, SVN_ERR_BASE,
+                       invoke_get_props_cb(props, revision, env,
+                                           editor->m_get_props_cb.get(),
+                                           repos_relpath,
+                                           result_pool));
+    }
+  else
+    {
+      SVN_ERR(open_callback_session(editor->m_callback_session,
+                                    editor->m_callback_session_url,
+                                    editor->m_callback_session_uuid,
+                                    editor->m_session->m_context,
+                                    editor->pool));
+
+      svn_node_kind_t kind = svn_node_unknown;
+      SVN_ERR(svn_ra_check_path(editor->m_callback_session,
+                                repos_relpath, SVN_INVALID_REVNUM, &kind,
+                                scratch_pool));
+
+      // FIXME: Getting properties from the youngest revision is in
+      // fact not such a bright idea, as the path may have been moved
+      // or deleted in the repository. On the other hand, if that
+      // happens, the commit would fail due to a conflict anyway.
+      if (kind == svn_node_file)
+        return svn_ra_get_file(editor->m_callback_session,
+                               repos_relpath, SVN_INVALID_REVNUM,
+                               NULL, revision, props, scratch_pool);
+      else if (kind == svn_node_dir)
+        return svn_ra_get_dir2(editor->m_callback_session, NULL, revision,
+                               props, repos_relpath, SVN_INVALID_REVNUM, 0,
+                               scratch_pool);
+      else
+        return svn_error_createf(
+            SVN_ERR_NODE_UNEXPECTED_KIND, NULL,
+            _("Expected node kind '%s' or '%s' but got '%s'"),
+            svn_node_kind_to_word(svn_node_file),
+            svn_node_kind_to_word(svn_node_dir),
+            svn_node_kind_to_word(kind));
+    }
+  return SVN_NO_ERROR;
+}
+
+svn_error_t*
+CommitEditor::get_copysrc_kind_cb(svn_node_kind_t* kind, void* baton,
+                                  const char* repos_relpath,
+                                  svn_revnum_t src_revision,
+                                  apr_pool_t *scratch_pool)
+{
+  CommitEditor* editor = static_cast<CommitEditor*>(baton);
+  if (editor->m_get_kind_cb.get())
+    {
+      const Java::Env env;
+      SVN_JAVAHL_CATCH(env, SVN_ERR_BASE,
+                       invoke_get_kind_cb(kind, env,
+                                          editor->m_get_kind_cb.get(),
+                                          repos_relpath,
+                                          src_revision));
+    }
+  else
+    {
+      SVN_ERR(open_callback_session(editor->m_callback_session,
+                                    editor->m_callback_session_url,
+                                    editor->m_callback_session_uuid,
+                                    editor->m_session->m_context,
+                                    editor->pool));
+
+      return svn_ra_check_path(editor->m_callback_session,
+                               repos_relpath, src_revision, kind,
+                               scratch_pool);
+    }
+  return SVN_NO_ERROR;
+}
diff --git a/subversion/bindings/javahl/native/CommitEditor.h b/subversion/bindings/javahl/native/CommitEditor.h
new file mode 100644
index 0000000..4160b6c
--- /dev/null
+++ b/subversion/bindings/javahl/native/CommitEditor.h
@@ -0,0 +1,132 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ *
+ * @file CommitEditor.h
+ * @brief Interface of the class CommitEditor
+ */
+
+#ifndef JAVAHL_COMMIT_EDITOR_H
+#define JAVAHL_COMMIT_EDITOR_H
+
+#include <string>
+#include <jni.h>
+
+#include "svn_ra.h"
+
+#include "JNIUtil.h"
+#include "SVNBase.h"
+#include "CommitCallback.h"
+
+#include "jniwrapper/jni_globalref.hpp"
+
+class RemoteSession;
+
+// Forward-declare the currently private EV2 editor struct.
+struct svn_editor_t;
+
+/*
+ * This class wraps an EV2 commit editor.
+ */
+class CommitEditor : public SVNBase
+{
+public:
+  static CommitEditor* getCppObject(jobject jthis);
+  static jlong createInstance(jobject jsession,
+                              jobject jrevprops,
+                              jobject jcommit_callback,
+                              jobject jlock_tokens,
+                              jboolean jkeep_locks,
+                              jobject jget_base_cb,
+                              jobject jget_props_cb,
+                              jobject jget_kind_cb);
+  virtual ~CommitEditor();
+
+  virtual void dispose(jobject jthis);
+
+  void addDirectory(jstring jrelpath,
+                    jobject jchildren, jobject jproperties,
+                    jlong jreplaces_revision);
+  void addFile(jstring jrelpath,
+               jobject jchecksum, jobject jcontents,
+               jobject jproperties,
+               jlong jreplaces_revision);
+  void addSymlink(jstring jrelpath,
+                  jstring jtarget, jobject jproperties,
+                  jlong jreplaces_revision);
+  void addAbsent(jstring jrelpath,
+                 jobject jkind, jlong jreplaces_revision);
+  void alterDirectory(jstring jrelpath, jlong jrevision,
+                      jobject jchildren, jobject jproperties);
+  void alterFile(jstring jrelpath, jlong jrevision,
+                 jobject jchecksum, jobject jcontents,
+                 jobject jproperties);
+  void alterSymlink(jstring jrelpath, jlong jrevision,
+                    jstring jtarget, jobject jproperties);
+  void remove(jstring jrelpath, jlong jrevision);
+  void copy(jstring jsrc_relpath, jlong jsrc_revision,
+            jstring jdst_relpath, jlong jreplaces_revision);
+  void move(jstring jsrc_relpath, jlong jsrc_revision,
+            jstring jdst_relpath, jlong jreplaces_revision);
+  void complete();
+  void abort();
+
+private:
+  CommitEditor(RemoteSession* session,
+               jobject jrevprops, jobject jcommit_callback,
+               jobject jlock_tokens, jboolean jkeep_locks,
+               jobject jget_base_cb, jobject jget_props_cb,
+               jobject jget_kind_cb);
+
+  // This is our private callbacks for the commit editor.
+  static svn_error_t* provide_base_cb(svn_stream_t **contents,
+                                      svn_revnum_t *revision,
+                                      void *baton,
+                                      const char *repos_relpath,
+                                      apr_pool_t *result_pool,
+                                      apr_pool_t *scratch_pool);
+  static svn_error_t* provide_props_cb(apr_hash_t **props,
+                                       svn_revnum_t *revision,
+                                       void *baton,
+                                       const char *repos_relpath,
+                                       apr_pool_t *result_pool,
+                                       apr_pool_t *scratch_pool);
+  static svn_error_t* get_copysrc_kind_cb(svn_node_kind_t* kind, void* baton,
+                                          const char* repos_relpath,
+                                          svn_revnum_t src_revision,
+                                          apr_pool_t *scratch_pool);
+
+  bool m_valid;
+  PersistentCommitCallback m_callback;
+  RemoteSession* m_session;
+  svn_editor_t* m_editor;
+
+  Java::GlobalObject m_get_base_cb;
+  Java::GlobalObject m_get_props_cb;
+  Java::GlobalObject m_get_kind_cb;
+
+  // Temporary, while EV2 shims are in place
+  svn_ra_session_t* m_callback_session;
+  const char* m_callback_session_url;
+  const char* m_callback_session_uuid;
+};
+
+#endif // JAVAHL_COMMIT_EDITOR_H
diff --git a/subversion/bindings/javahl/native/CommitMessage.cpp b/subversion/bindings/javahl/native/CommitMessage.cpp
index a947f97..51bd83d 100644
--- a/subversion/bindings/javahl/native/CommitMessage.cpp
+++ b/subversion/bindings/javahl/native/CommitMessage.cpp
@@ -65,6 +65,7 @@ CommitMessage::getCommitMessage(const char **log_msg,
                                 const apr_array_header_t *commit_items,
                                 apr_pool_t *pool)
 {
+  *log_msg = NULL;
   *tmp_file = NULL;
   JNIEnv *env = JNIUtil::getEnv();
 
@@ -72,7 +73,7 @@ CommitMessage::getCommitMessage(const char **log_msg,
   static jmethodID midCallback = 0;
   if (midCallback == 0)
     {
-      jclass clazz2 = env->FindClass(JAVA_PACKAGE"/callback/CommitMessageCallback");
+      jclass clazz2 = env->FindClass(JAVAHL_CLASS("/callback/CommitMessageCallback"));
       if (JNIUtil::isJavaExceptionThrown())
         return SVN_NO_ERROR;
 
@@ -93,6 +94,9 @@ CommitMessage::getCommitMessage(const char **log_msg,
 
       jobject jitem = CreateJ::CommitItem(item);
 
+      if (!jitem)
+        return SVN_NO_ERROR; /* Exception thrown */
+
       // store the Java object into the array
       jitems.push_back(jitem);
     }
@@ -102,7 +106,7 @@ CommitMessage::getCommitMessage(const char **log_msg,
                                                     midCallback,
                                                     CreateJ::Set(jitems));
   if (JNIUtil::isJavaExceptionThrown())
-    return SVN_NO_ERROR;
+    POP_AND_RETURN_EXCEPTION_AS_SVNERROR();
 
   if (jmessage != NULL)
     {
diff --git a/subversion/bindings/javahl/native/CopySources.cpp b/subversion/bindings/javahl/native/CopySources.cpp
index 0ae471d..a1d93f4 100644
--- a/subversion/bindings/javahl/native/CopySources.cpp
+++ b/subversion/bindings/javahl/native/CopySources.cpp
@@ -60,7 +60,7 @@ CopySources::makeJCopySource(const char *path, svn_revnum_t rev, SVN::Pool &pool
   if (JNIUtil::isJavaExceptionThrown())
     POP_AND_RETURN_NULL;
 
-  jclass clazz = env->FindClass(JAVA_PACKAGE "/types/CopySource");
+  jclass clazz = env->FindClass(JAVAHL_CLASS("/types/CopySource"));
   if (JNIUtil::isJavaExceptionThrown())
     POP_AND_RETURN_NULL;
 
@@ -69,8 +69,8 @@ CopySources::makeJCopySource(const char *path, svn_revnum_t rev, SVN::Pool &pool
     {
       ctor = env->GetMethodID(clazz, "<init>",
                               "(Ljava/lang/String;"
-                              "L" JAVA_PACKAGE "/types/Revision;"
-                              "L" JAVA_PACKAGE "/types/Revision;)V");
+                              JAVAHL_ARG("/types/Revision;")
+                              JAVAHL_ARG("/types/Revision;") ")V");
       if (JNIUtil::isExceptionThrown())
         POP_AND_RETURN_NULL;
     }
@@ -88,7 +88,7 @@ CopySources::array(SVN::Pool &pool)
   apr_pool_t *p = pool.getPool();
 
   JNIEnv *env = JNIUtil::getEnv();
-  jclass clazz = env->FindClass(JAVA_PACKAGE "/types/CopySource");
+  jclass clazz = env->FindClass(JAVAHL_CLASS("/types/CopySource"));
   if (JNIUtil::isJavaExceptionThrown())
     return NULL;
 
@@ -132,7 +132,7 @@ CopySources::array(SVN::Pool &pool)
       if (getRevision == 0)
         {
           getRevision = env->GetMethodID(clazz, "getRevision",
-                                         "()L"JAVA_PACKAGE"/types/Revision;");
+                                         "()" JAVAHL_ARG("/types/Revision;"));
           if (JNIUtil::isJavaExceptionThrown() || getRevision == 0)
             return NULL;
         }
@@ -151,7 +151,7 @@ CopySources::array(SVN::Pool &pool)
       if (getPegRevision == 0)
         {
           getPegRevision = env->GetMethodID(clazz, "getPegRevision",
-                                            "()L"JAVA_PACKAGE"/types/Revision;");
+                                            "()" JAVAHL_ARG("/types/Revision;"));
           if (JNIUtil::isJavaExceptionThrown() || getPegRevision == 0)
             return NULL;
         }
diff --git a/subversion/bindings/javahl/native/CreateJ.cpp b/subversion/bindings/javahl/native/CreateJ.cpp
index 9b40ce7..d9dffa2 100644
--- a/subversion/bindings/javahl/native/CreateJ.cpp
+++ b/subversion/bindings/javahl/native/CreateJ.cpp
@@ -30,12 +30,14 @@
 #include "JNIStringHolder.h"
 #include "EnumMapper.h"
 #include "RevisionRange.h"
+#include "RevisionRangeList.h"
 #include "CreateJ.h"
 #include "../include/org_apache_subversion_javahl_types_Revision.h"
 #include "../include/org_apache_subversion_javahl_CommitItemStateFlags.h"
 
 #include "svn_path.h"
 #include "svn_props.h"
+#include "svn_mergeinfo.h"
 #include "private/svn_wc_private.h"
 
 jobject
@@ -52,7 +54,7 @@ CreateJ::ConflictDescriptor(const svn_wc_conflict_description2_t *desc)
     return NULL;
 
   // Create an instance of the conflict descriptor.
-  jclass clazz = env->FindClass(JAVA_PACKAGE "/ConflictDescriptor");
+  jclass clazz = env->FindClass(JAVAHL_CLASS("/ConflictDescriptor"));
   if (JNIUtil::isJavaExceptionThrown())
     POP_AND_RETURN_NULL;
 
@@ -60,16 +62,17 @@ CreateJ::ConflictDescriptor(const svn_wc_conflict_description2_t *desc)
   if (ctor == 0)
     {
       ctor = env->GetMethodID(clazz, "<init>", "(Ljava/lang/String;"
-                              "L"JAVA_PACKAGE"/ConflictDescriptor$Kind;"
-                              "L"JAVA_PACKAGE"/types/NodeKind;"
+                              JAVAHL_ARG("/ConflictDescriptor$Kind;")
+                              JAVAHL_ARG("/types/NodeKind;")
                               "Ljava/lang/String;ZLjava/lang/String;"
-                              "L"JAVA_PACKAGE"/ConflictDescriptor$Action;"
-                              "L"JAVA_PACKAGE"/ConflictDescriptor$Reason;"
-                              "L"JAVA_PACKAGE"/ConflictDescriptor$Operation;"
+                              JAVAHL_ARG("/ConflictDescriptor$Action;")
+                              JAVAHL_ARG("/ConflictDescriptor$Reason;")
+                              JAVAHL_ARG("/ConflictDescriptor$Operation;")
                               "Ljava/lang/String;Ljava/lang/String;"
                               "Ljava/lang/String;Ljava/lang/String;"
-                              "L"JAVA_PACKAGE"/types/ConflictVersion;"
-                              "L"JAVA_PACKAGE"/types/ConflictVersion;)V");
+                              JAVAHL_ARG("/types/ConflictVersion;")
+                              JAVAHL_ARG("/types/ConflictVersion;")
+                              "Ljava/lang/String;[B[B[B[B)V");
       if (JNIUtil::isJavaExceptionThrown() || ctor == 0)
         POP_AND_RETURN_NULL;
     }
@@ -116,6 +119,33 @@ CreateJ::ConflictDescriptor(const svn_wc_conflict_description2_t *desc)
   jobject joperation = EnumMapper::mapOperation(desc->operation);
   if (JNIUtil::isJavaExceptionThrown())
     POP_AND_RETURN_NULL;
+  jstring jpropRejectAbspath = JNIUtil::makeJString(desc->prop_reject_abspath);
+  if (JNIUtil::isJavaExceptionThrown())
+    POP_AND_RETURN_NULL;
+  jbyteArray jpropValueBase = (
+      !desc->prop_value_base ? NULL
+      :JNIUtil::makeJByteArray(desc->prop_value_base->data,
+                               int(desc->prop_value_base->len)));
+  if (JNIUtil::isExceptionThrown())
+    POP_AND_RETURN_NULL;
+  jbyteArray jpropValueWorking = (
+      !desc->prop_value_working ? NULL
+      :JNIUtil::makeJByteArray(desc->prop_value_working->data,
+                               int(desc->prop_value_working->len)));
+  if (JNIUtil::isExceptionThrown())
+    POP_AND_RETURN_NULL;
+  jbyteArray jpropValueIncomingOld = (
+      !desc->prop_value_incoming_old ? NULL
+      :JNIUtil::makeJByteArray(desc->prop_value_incoming_old->data,
+                               int(desc->prop_value_incoming_old->len)));
+  if (JNIUtil::isExceptionThrown())
+    POP_AND_RETURN_NULL;
+  jbyteArray jpropValueIncomingNew = (
+      !desc->prop_value_incoming_new ? NULL
+      :JNIUtil::makeJByteArray(desc->prop_value_incoming_new->data,
+                               int(desc->prop_value_incoming_new->len)));
+  if (JNIUtil::isExceptionThrown())
+    POP_AND_RETURN_NULL;
 
   // Instantiate the conflict descriptor.
   jobject jdesc = env->NewObject(clazz, ctor, jpath, jconflictKind,
@@ -123,7 +153,10 @@ CreateJ::ConflictDescriptor(const svn_wc_conflict_description2_t *desc)
                                  (jboolean) desc->is_binary, jmimeType,
                                  jconflictAction, jconflictReason, joperation,
                                  jbasePath, jreposPath, juserPath,
-                                 jmergedPath, jsrcLeft, jsrcRight);
+                                 jmergedPath, jsrcLeft, jsrcRight,
+                                 jpropRejectAbspath, jpropValueBase,
+                                 jpropValueWorking, jpropValueIncomingOld,
+                                 jpropValueIncomingNew);
   if (JNIUtil::isJavaExceptionThrown())
     POP_AND_RETURN_NULL;
 
@@ -144,7 +177,7 @@ CreateJ::ConflictVersion(const svn_wc_conflict_version_t *version)
     return NULL;
 
   // Create an instance of the conflict version.
-  jclass clazz = env->FindClass(JAVA_PACKAGE "/types/ConflictVersion");
+  jclass clazz = env->FindClass(JAVAHL_CLASS("/types/ConflictVersion"));
   if (JNIUtil::isJavaExceptionThrown())
     POP_AND_RETURN_NULL;
 
@@ -154,7 +187,7 @@ CreateJ::ConflictVersion(const svn_wc_conflict_version_t *version)
       ctor = env->GetMethodID(clazz, "<init>", "(Ljava/lang/String;"
                                                "Ljava/lang/String;J"
                                                "Ljava/lang/String;"
-                                               "L"JAVA_PACKAGE"/types/NodeKind;"
+                                               JAVAHL_ARG("/types/NodeKind;")
                                                ")V");
       if (JNIUtil::isJavaExceptionThrown() || ctor == 0)
         POP_AND_RETURN_NULL;
@@ -195,7 +228,7 @@ CreateJ::Checksum(const svn_checksum_t *checksum)
   if (JNIUtil::isJavaExceptionThrown())
     return NULL;
 
-  jclass clazz = env->FindClass(JAVA_PACKAGE"/types/Checksum");
+  jclass clazz = env->FindClass(JAVAHL_CLASS("/types/Checksum"));
   if (JNIUtil::isExceptionThrown())
     POP_AND_RETURN_NULL;
 
@@ -205,7 +238,7 @@ CreateJ::Checksum(const svn_checksum_t *checksum)
     {
       midConstructor = env->GetMethodID(clazz, "<init>",
                                         "([B"
-                                        "L"JAVA_PACKAGE"/types/Checksum$Kind;"
+                                        JAVAHL_ARG("/types/Checksum$Kind;")
                                         ")V");
       if (JNIUtil::isExceptionThrown())
         POP_AND_RETURN_NULL;
@@ -230,6 +263,61 @@ CreateJ::Checksum(const svn_checksum_t *checksum)
 }
 
 jobject
+CreateJ::DirEntry(const char *path, const char *absPath,
+                  const svn_dirent_t *dirent)
+{
+  JNIEnv *env = JNIUtil::getEnv();
+
+  // Create a local frame for our references
+  env->PushLocalFrame(LOCAL_FRAME_SIZE);
+  if (JNIUtil::isJavaExceptionThrown())
+    return SVN_NO_ERROR;
+
+  jclass clazz = env->FindClass(JAVAHL_CLASS("/types/DirEntry"));
+  if (JNIUtil::isJavaExceptionThrown())
+    POP_AND_RETURN_NULL;
+
+  static jmethodID mid = 0;
+  if (mid == 0)
+    {
+      mid = env->GetMethodID(clazz, "<init>",
+                             "(Ljava/lang/String;Ljava/lang/String;"
+                             JAVAHL_ARG("/types/NodeKind;")
+                             "JZJJLjava/lang/String;)V");
+      if (JNIUtil::isJavaExceptionThrown())
+        POP_AND_RETURN_NULL;
+    }
+
+  jstring jPath = JNIUtil::makeJString(path);
+  if (JNIUtil::isJavaExceptionThrown())
+    POP_AND_RETURN_NULL;
+
+  jstring jAbsPath = JNIUtil::makeJString(absPath);
+  if (JNIUtil::isJavaExceptionThrown())
+    POP_AND_RETURN_NULL;
+
+  jobject jNodeKind = EnumMapper::mapNodeKind(dirent->kind);
+  if (JNIUtil::isJavaExceptionThrown())
+    POP_AND_RETURN_NULL;
+
+  jlong jSize = dirent->size;
+  jboolean jHasProps = (dirent->has_props? JNI_TRUE : JNI_FALSE);
+  jlong jLastChangedRevision = dirent->created_rev;
+  jlong jLastChanged = dirent->time;
+  jstring jLastAuthor = JNIUtil::makeJString(dirent->last_author);
+  if (JNIUtil::isJavaExceptionThrown())
+    POP_AND_RETURN_NULL;
+
+  jobject ret = env->NewObject(clazz, mid, jPath, jAbsPath, jNodeKind,
+                               jSize, jHasProps, jLastChangedRevision,
+                               jLastChanged, jLastAuthor);
+  if (JNIUtil::isJavaExceptionThrown())
+    POP_AND_RETURN_NULL;
+
+  return env->PopLocalFrame(ret);
+}
+
+jobject
 CreateJ::Info(const char *path, const svn_client_info2_t *info)
 {
   JNIEnv *env = JNIUtil::getEnv();
@@ -239,7 +327,7 @@ CreateJ::Info(const char *path, const svn_client_info2_t *info)
   if (JNIUtil::isJavaExceptionThrown())
     return NULL;
 
-  jclass clazz = env->FindClass(JAVA_PACKAGE "/types/Info");
+  jclass clazz = env->FindClass(JAVAHL_CLASS("/types/Info"));
   if (JNIUtil::isJavaExceptionThrown())
     POP_AND_RETURN_NULL;
 
@@ -249,15 +337,16 @@ CreateJ::Info(const char *path, const svn_client_info2_t *info)
       mid = env->GetMethodID(clazz, "<init>",
                              "(Ljava/lang/String;Ljava/lang/String;"
                              "Ljava/lang/String;J"
-                             "L"JAVA_PACKAGE"/types/NodeKind;"
+                             JAVAHL_ARG("/types/NodeKind;")
                              "Ljava/lang/String;Ljava/lang/String;"
                              "JJLjava/lang/String;"
-                             "L"JAVA_PACKAGE"/types/Lock;Z"
-                             "L"JAVA_PACKAGE"/types/Info$ScheduleKind;"
+                             JAVAHL_ARG("/types/Lock;Z")
+                             JAVAHL_ARG("/types/Info$ScheduleKind;")
                              "Ljava/lang/String;JJ"
-                             "L"JAVA_PACKAGE"/types/Checksum;"
+                             JAVAHL_ARG("/types/Checksum;")
                              "Ljava/lang/String;JJ"
-                             "L"JAVA_PACKAGE"/types/Depth;Ljava/util/Set;)V");
+                             JAVAHL_ARG("/types/Depth;Ljava/util/Set;")
+                             ")V");
       if (mid == 0 || JNIUtil::isJavaExceptionThrown())
         POP_AND_RETURN_NULL;
     }
@@ -384,7 +473,7 @@ CreateJ::Lock(const svn_lock_t *lock)
   if (JNIUtil::isJavaExceptionThrown())
     return NULL;
 
-  jclass clazz = env->FindClass(JAVA_PACKAGE"/types/Lock");
+  jclass clazz = env->FindClass(JAVAHL_CLASS("/types/Lock"));
   if (JNIUtil::isJavaExceptionThrown())
     POP_AND_RETURN_NULL;
 
@@ -423,6 +512,72 @@ CreateJ::Lock(const svn_lock_t *lock)
 }
 
 jobject
+CreateJ::LockMap(const apr_hash_t *locks, apr_pool_t *pool)
+{
+  JNIEnv *env = JNIUtil::getEnv();
+
+  if (locks == NULL)
+    return NULL;
+
+  // Create a local frame for our references
+  env->PushLocalFrame(LOCAL_FRAME_SIZE);
+  if (JNIUtil::isJavaExceptionThrown())
+    return NULL;
+
+  jclass clazz = env->FindClass("java/util/HashMap");
+  if (JNIUtil::isJavaExceptionThrown())
+    POP_AND_RETURN_NULL;
+
+  static jmethodID init_mid = 0;
+  if (init_mid == 0)
+    {
+      init_mid = env->GetMethodID(clazz, "<init>", "()V");
+      if (JNIUtil::isJavaExceptionThrown())
+        POP_AND_RETURN_NULL;
+    }
+
+  static jmethodID put_mid = 0;
+  if (put_mid == 0)
+    {
+      put_mid = env->GetMethodID(clazz, "put",
+                                 "(Ljava/lang/Object;Ljava/lang/Object;)"
+                                 "Ljava/lang/Object;");
+      if (JNIUtil::isJavaExceptionThrown())
+        POP_AND_RETURN_NULL;
+    }
+
+  jobject map = env->NewObject(clazz, init_mid);
+  if (JNIUtil::isJavaExceptionThrown())
+    POP_AND_RETURN_NULL;
+
+  apr_hash_index_t *hi;
+  int i = 0;
+  for (hi = apr_hash_first(pool, (apr_hash_t *) locks); hi;
+        hi = apr_hash_next(hi), ++i)
+    {
+      const char *key = (const char *) apr_hash_this_key(hi);
+      const svn_lock_t *lock = (const svn_lock_t *) apr_hash_this_val(hi);
+
+      jstring jpath = JNIUtil::makeJString(key);
+      if (JNIUtil::isJavaExceptionThrown())
+        POP_AND_RETURN_NULL;
+
+      jobject jlock = Lock(lock);
+      if (JNIUtil::isJavaExceptionThrown())
+        POP_AND_RETURN_NULL;
+
+      env->CallObjectMethod(map, put_mid, jpath, jlock);
+      if (JNIUtil::isJavaExceptionThrown())
+        POP_AND_RETURN_NULL;
+
+      env->DeleteLocalRef(jpath);
+      env->DeleteLocalRef(jlock);
+    }
+
+  return env->PopLocalFrame(map);
+}
+
+jobject
 CreateJ::ChangedPath(const char *path, svn_log_changed_path2_t *log_item)
 {
   JNIEnv *env = JNIUtil::getEnv();
@@ -432,7 +587,7 @@ CreateJ::ChangedPath(const char *path, svn_log_changed_path2_t *log_item)
   if (JNIUtil::isJavaExceptionThrown())
     return NULL;
 
-  jclass clazzCP = env->FindClass(JAVA_PACKAGE"/types/ChangePath");
+  jclass clazzCP = env->FindClass(JAVAHL_CLASS("/types/ChangePath"));
   if (JNIUtil::isJavaExceptionThrown())
     POP_AND_RETURN_NULL;
 
@@ -442,10 +597,11 @@ CreateJ::ChangedPath(const char *path, svn_log_changed_path2_t *log_item)
       midCP = env->GetMethodID(clazzCP,
                                "<init>",
                                "(Ljava/lang/String;JLjava/lang/String;"
-                               "L"JAVA_PACKAGE"/types/ChangePath$Action;"
-                               "L"JAVA_PACKAGE"/types/NodeKind;"
-                               "L"JAVA_PACKAGE"/types/Tristate;"
-                               "L"JAVA_PACKAGE"/types/Tristate;)V");
+                               JAVAHL_ARG("/types/ChangePath$Action;")
+                               JAVAHL_ARG("/types/NodeKind;")
+                               JAVAHL_ARG("/types/Tristate;")
+                               JAVAHL_ARG("/types/Tristate;")
+                               ")V");
       if (JNIUtil::isJavaExceptionThrown())
         POP_AND_RETURN_NULL;
     }
@@ -493,7 +649,7 @@ CreateJ::Status(svn_wc_context_t *wc_ctx,
   if (JNIUtil::isJavaExceptionThrown())
     return NULL;
 
-  jclass clazz = env->FindClass(JAVA_PACKAGE"/types/Status");
+  jclass clazz = env->FindClass(JAVAHL_CLASS("/types/Status"));
   if (JNIUtil::isJavaExceptionThrown())
     POP_AND_RETURN_NULL;
 
@@ -502,15 +658,18 @@ CreateJ::Status(svn_wc_context_t *wc_ctx,
     {
       mid = env->GetMethodID(clazz, "<init>",
                              "(Ljava/lang/String;Ljava/lang/String;"
-                             "L"JAVA_PACKAGE"/types/NodeKind;"
+                             JAVAHL_ARG("/types/NodeKind;")
                              "JJJLjava/lang/String;"
-                             "L"JAVA_PACKAGE"/types/Status$Kind;"
-                             "L"JAVA_PACKAGE"/types/Status$Kind;"
-                             "L"JAVA_PACKAGE"/types/Status$Kind;"
-                             "L"JAVA_PACKAGE"/types/Status$Kind;"
-                             "ZZZZZL"JAVA_PACKAGE"/types/Lock;"
-                             "L"JAVA_PACKAGE"/types/Lock;"
-                             "JJL"JAVA_PACKAGE"/types/NodeKind;"
+                             JAVAHL_ARG("/types/Status$Kind;")
+                             JAVAHL_ARG("/types/Status$Kind;")
+                             JAVAHL_ARG("/types/Status$Kind;")
+                             JAVAHL_ARG("/types/Status$Kind;")
+                             JAVAHL_ARG("/types/Status$Kind;")
+                             JAVAHL_ARG("/types/Status$Kind;")
+                             "ZZ" JAVAHL_ARG("/types/Depth;")
+                             "ZZZ" JAVAHL_ARG("/types/Lock;")
+                             JAVAHL_ARG("/types/Lock;")
+                             "JJ" JAVAHL_ARG("/types/NodeKind;")
                              "Ljava/lang/String;Ljava/lang/String;"
                              "Ljava/lang/String;Ljava/lang/String;)V");
       if (JNIUtil::isJavaExceptionThrown())
@@ -534,27 +693,16 @@ CreateJ::Status(svn_wc_context_t *wc_ctx,
   jstring jMovedFromAbspath = NULL;
   jstring jMovedToAbspath = NULL;
 
-  enum svn_wc_status_kind text_status = status->node_status;
-
-  /* Avoid using values that might come from prop changes */
-  if (text_status == svn_wc_status_modified
-      || text_status == svn_wc_status_conflicted)
-    text_status = status->text_status;
-
-  enum svn_wc_status_kind repos_text_status = status->repos_node_status;
-
-  if (repos_text_status == svn_wc_status_modified
-      || repos_text_status == svn_wc_status_conflicted)
-    repos_text_status = status->repos_text_status;
-
-  jboolean jIsConflicted = (status->conflicted == 1) ? JNI_TRUE : JNI_FALSE;
-  jobject jTextType = EnumMapper::mapStatusKind(text_status);
+  jobject jNodeType = EnumMapper::mapStatusKind(status->node_status);
+  jobject jTextType = EnumMapper::mapStatusKind(status->text_status);
   jobject jPropType = EnumMapper::mapStatusKind(status->prop_status);
-  jobject jRepositoryTextType = EnumMapper::mapStatusKind(repos_text_status);
-  jobject jRepositoryPropType = EnumMapper::mapStatusKind(
-                                                  status->repos_prop_status);
-  jboolean jIsCopied = (status->copied == 1) ? JNI_TRUE: JNI_FALSE;
+  jobject jRpNodeType = EnumMapper::mapStatusKind(status->repos_node_status);
+  jobject jRpTextType = EnumMapper::mapStatusKind(status->repos_text_status);
+  jobject jRpPropType = EnumMapper::mapStatusKind(status->repos_prop_status);
+  jobject jDepth = EnumMapper::mapDepth(status->depth);
   jboolean jIsLocked = (status->wc_is_locked == 1) ? JNI_TRUE: JNI_FALSE;
+  jboolean jIsCopied = (status->copied == 1) ? JNI_TRUE: JNI_FALSE;
+  jboolean jIsConflicted = (status->conflicted == 1) ? JNI_TRUE : JNI_FALSE;
   jboolean jIsSwitched = (status->switched == 1) ? JNI_TRUE: JNI_FALSE;
   jboolean jIsFileExternal = (status->file_external == 1) ? JNI_TRUE
                                                           : JNI_FALSE;
@@ -620,9 +768,10 @@ CreateJ::Status(svn_wc_context_t *wc_ctx,
 
   jobject ret = env->NewObject(clazz, mid, jPath, jUrl, jNodeKind, jRevision,
                                jLastChangedRevision, jLastChangedDate,
-                               jLastCommitAuthor, jTextType, jPropType,
-                               jRepositoryTextType, jRepositoryPropType,
-                               jIsLocked, jIsCopied, jIsConflicted,
+                               jLastCommitAuthor,
+                               jNodeType, jTextType, jPropType,
+                               jRpNodeType, jRpTextType, jRpPropType,
+                               jIsLocked, jIsCopied, jDepth, jIsConflicted,
                                jIsSwitched, jIsFileExternal, jLocalLock,
                                jReposLock,
                                jOODLastCmtRevision, jOODLastCmtDate,
@@ -643,7 +792,7 @@ CreateJ::ClientNotifyInformation(const svn_wc_notify_t *wcNotify)
     return NULL;
 
   static jmethodID midCT = 0;
-  jclass clazz = env->FindClass(JAVA_PACKAGE"/ClientNotifyInformation");
+  jclass clazz = env->FindClass(JAVAHL_CLASS("/ClientNotifyInformation"));
   if (JNIUtil::isJavaExceptionThrown())
     POP_AND_RETURN_NULL;
 
@@ -651,16 +800,17 @@ CreateJ::ClientNotifyInformation(const svn_wc_notify_t *wcNotify)
     {
       midCT = env->GetMethodID(clazz, "<init>",
                                "(Ljava/lang/String;"
-                               "L"JAVA_PACKAGE"/ClientNotifyInformation$Action;"
-                               "L"JAVA_PACKAGE"/types/NodeKind;"
-                               "Ljava/lang/String;"
-                               "L"JAVA_PACKAGE"/types/Lock;"
+                               JAVAHL_ARG("/ClientNotifyInformation$Action;")
+                               JAVAHL_ARG("/types/NodeKind;")
                                "Ljava/lang/String;"
-                               "L"JAVA_PACKAGE"/ClientNotifyInformation$Status;"
-                               "L"JAVA_PACKAGE"/ClientNotifyInformation$Status;"
-                               "L"JAVA_PACKAGE"/ClientNotifyInformation$LockStatus;"
+                               JAVAHL_ARG("/types/Lock;")
+                               "Ljava/lang/String;Ljava/util/List;"
+                               JAVAHL_ARG("/ClientNotifyInformation$Status;")
+                               JAVAHL_ARG("/ClientNotifyInformation$Status;")
+                               JAVAHL_ARG("/ClientNotifyInformation$LockStatus;")
                                "JLjava/lang/String;"
-                               "L"JAVA_PACKAGE"/types/RevisionRange;"
+                               JAVAHL_ARG("/types/RevisionRange;")
+                               "Ljava/lang/String;"
                                "Ljava/lang/String;Ljava/lang/String;"
                                "Ljava/util/Map;JJJJJJI)V");
       if (JNIUtil::isJavaExceptionThrown() || midCT == 0)
@@ -688,7 +838,9 @@ CreateJ::ClientNotifyInformation(const svn_wc_notify_t *wcNotify)
   if (JNIUtil::isJavaExceptionThrown())
     POP_AND_RETURN_NULL;
 
-  jstring jErr = JNIUtil::makeSVNErrorMessage(wcNotify->err);
+  jstring jErr;
+  jobject jErrStack;
+  JNIUtil::makeSVNErrorMessage(wcNotify->err, &jErr, &jErrStack);
   if (JNIUtil::isJavaExceptionThrown())
     POP_AND_RETURN_NULL;
 
@@ -716,6 +868,10 @@ CreateJ::ClientNotifyInformation(const svn_wc_notify_t *wcNotify)
         POP_AND_RETURN_NULL;
     }
 
+  jstring jUrl = JNIUtil::makeJString(wcNotify->url);
+  if (JNIUtil::isJavaExceptionThrown())
+    POP_AND_RETURN_NULL;
+
   jstring jpathPrefix = JNIUtil::makeJString(wcNotify->path_prefix);
   if (JNIUtil::isJavaExceptionThrown())
     POP_AND_RETURN_NULL;
@@ -735,7 +891,7 @@ CreateJ::ClientNotifyInformation(const svn_wc_notify_t *wcNotify)
   jlong jhunkModifiedLength = wcNotify->hunk_modified_length;
   jlong jhunkMatchedLine = wcNotify->hunk_matched_line;
   jint jhunkFuzz = static_cast<jint>(wcNotify->hunk_fuzz);
-  if (jhunkFuzz != wcNotify->hunk_fuzz)
+  if (jhunkFuzz < 0 || jhunkFuzz != wcNotify->hunk_fuzz)
     {
       env->ThrowNew(env->FindClass("java.lang.ArithmeticException"),
                     "Overflow converting C svn_linenum_t to Java int");
@@ -744,10 +900,10 @@ CreateJ::ClientNotifyInformation(const svn_wc_notify_t *wcNotify)
 
   // call the Java method
   jobject jInfo = env->NewObject(clazz, midCT, jPath, jAction,
-                                 jKind, jMimeType, jLock, jErr,
+                                 jKind, jMimeType, jLock, jErr, jErrStack,
                                  jContentState, jPropState, jLockState,
                                  (jlong) wcNotify->revision, jChangelistName,
-                                 jMergeRange, jpathPrefix, jpropName,
+                                 jMergeRange, jUrl, jpathPrefix, jpropName,
                                  jrevProps, joldRevision,
                                  jhunkOriginalStart, jhunkOriginalLength,
                                  jhunkModifiedStart, jhunkModifiedLength,
@@ -769,16 +925,16 @@ CreateJ::ReposNotifyInformation(const svn_repos_notify_t *reposNotify)
     return NULL;
 
   static jmethodID midCT = 0;
-  jclass clazz = env->FindClass(JAVA_PACKAGE"/ReposNotifyInformation");
+  jclass clazz = env->FindClass(JAVAHL_CLASS("/ReposNotifyInformation"));
   if (JNIUtil::isJavaExceptionThrown())
     POP_AND_RETURN_NULL;
 
   if (midCT == 0)
     {
       midCT = env->GetMethodID(clazz, "<init>",
-                               "(L"JAVA_PACKAGE"/ReposNotifyInformation$Action;"
+                               "(" JAVAHL_ARG("/ReposNotifyInformation$Action;")
                                "JLjava/lang/String;JJJ"
-                               "L"JAVA_PACKAGE"/ReposNotifyInformation$NodeAction;"
+                               JAVAHL_ARG("/ReposNotifyInformation$NodeAction;")
                                "Ljava/lang/String;)V");
       if (JNIUtil::isJavaExceptionThrown() || midCT == 0)
         POP_AND_RETURN_NULL;
@@ -827,7 +983,7 @@ CreateJ::CommitItem(svn_client_commit_item3_t *item)
   if (JNIUtil::isJavaExceptionThrown())
     return NULL;
 
-  jclass clazz = env->FindClass(JAVA_PACKAGE"/CommitItem");
+  jclass clazz = env->FindClass(JAVAHL_CLASS("/CommitItem"));
   if (JNIUtil::isExceptionThrown())
     POP_AND_RETURN_NULL;
 
@@ -837,7 +993,7 @@ CreateJ::CommitItem(svn_client_commit_item3_t *item)
     {
       midConstructor = env->GetMethodID(clazz, "<init>",
                                         "(Ljava/lang/String;"
-                                        "L"JAVA_PACKAGE"/types/NodeKind;"
+                                        JAVAHL_ARG("/types/NodeKind;")
                                         "ILjava/lang/String;"
                                         "Ljava/lang/String;J"
                                         "Ljava/lang/String;)V");
@@ -909,7 +1065,7 @@ CreateJ::CommitInfo(const svn_commit_info_t *commit_info)
     return NULL;
 
   static jmethodID midCT = 0;
-  jclass clazz = env->FindClass(JAVA_PACKAGE"/CommitInfo");
+  jclass clazz = env->FindClass(JAVAHL_CLASS("/CommitInfo"));
   if (JNIUtil::isJavaExceptionThrown())
     POP_AND_RETURN_NULL;
 
@@ -951,82 +1107,129 @@ CreateJ::CommitInfo(const svn_commit_info_t *commit_info)
 }
 
 jobject
-CreateJ::RevisionRangeList(svn_rangelist_t *ranges)
+CreateJ::StringSet(const apr_array_header_t *strings)
 {
+  std::vector<jobject> jstrs;
+
+  for (int i = 0; i < strings->nelts; ++i)
+    {
+      const char *str = APR_ARRAY_IDX(strings, i, const char *);
+      jstring jstr = JNIUtil::makeJString(str);
+      if (JNIUtil::isJavaExceptionThrown())
+        return NULL;
+
+      jstrs.push_back(jstr);
+    }
+
+  return CreateJ::Set(jstrs);
+}
+
+namespace {
+void fill_property_map(jobject map,
+                       apr_hash_t* prop_hash, apr_array_header_t* prop_diffs,
+                       apr_pool_t* scratch_pool, jmethodID put_mid)
+{
+  SVN_ERR_ASSERT_NO_RETURN(!(prop_hash && prop_diffs));
+
+  if (!map || (prop_hash == NULL && prop_diffs == NULL))
+    return;
+
   JNIEnv *env = JNIUtil::getEnv();
 
   // Create a local frame for our references
   env->PushLocalFrame(LOCAL_FRAME_SIZE);
   if (JNIUtil::isJavaExceptionThrown())
-    return NULL;
-
-  jclass clazz = env->FindClass("java/util/ArrayList");
-  if (JNIUtil::isJavaExceptionThrown())
-    POP_AND_RETURN_NULL;
+    return;
 
-  static jmethodID init_mid = 0;
-  if (init_mid == 0)
+  // The caller may not know the concrete class of the map, so
+  // determine the "put" method identifier here.
+  if (put_mid == 0)
     {
-      init_mid = env->GetMethodID(clazz, "<init>", "()V");
+      put_mid = env->GetMethodID(env->GetObjectClass(map), "put",
+                                 "(Ljava/lang/Object;Ljava/lang/Object;)"
+                                 "Ljava/lang/Object;");
       if (JNIUtil::isJavaExceptionThrown())
-        POP_AND_RETURN_NULL;
+        POP_AND_RETURN_NOTHING();
     }
 
-  static jmethodID add_mid = 0;
-  if (add_mid == 0)
+  struct body
+  {
+    void operator()(const char* key, const svn_string_t* val)
+      {
+        jstring jpropName = JNIUtil::makeJString(key);
+        if (JNIUtil::isJavaExceptionThrown())
+          return;
+
+        jbyteArray jpropVal = (val ? JNIUtil::makeJByteArray(val) : NULL);
+        if (JNIUtil::isJavaExceptionThrown())
+          return;
+
+        jobject ret = m_env->CallObjectMethod(m_map, m_put_mid,
+                                              jpropName, jpropVal);
+        if (JNIUtil::isJavaExceptionThrown())
+          return;
+
+        m_env->DeleteLocalRef(ret);
+        m_env->DeleteLocalRef(jpropVal);
+        m_env->DeleteLocalRef(jpropName);
+      }
+
+    JNIEnv*& m_env;
+    jmethodID& m_put_mid;
+    jobject& m_map;
+
+    body(JNIEnv*& xenv, jmethodID& xput_mid, jobject& xmap)
+      : m_env(xenv), m_put_mid(xput_mid), m_map(xmap)
+      {}
+  } loop_body(env, put_mid, map);
+
+  if (prop_hash)
     {
-      add_mid = env->GetMethodID(clazz, "add", "(Ljava/lang/Object;)Z");
-      if (JNIUtil::isJavaExceptionThrown())
-        POP_AND_RETURN_NULL;
-    }
+      if (!scratch_pool)
+        scratch_pool = apr_hash_pool_get(prop_hash);
 
-  jobject jranges = env->NewObject(clazz, init_mid);
+      apr_hash_index_t *hi;
+      for (hi = apr_hash_first(scratch_pool, prop_hash);
+           hi; hi = apr_hash_next(hi))
+        {
+          const char* key;
+          svn_string_t* val;
 
-  for (int i = 0; i < ranges->nelts; ++i)
-    {
-      // Convert svn_merge_range_t *'s to Java RevisionRange objects.
-      svn_merge_range_t *range =
-          APR_ARRAY_IDX(ranges, i, svn_merge_range_t *);
+          const void* v_key;
+          void* v_val;
 
-      jobject jrange = RevisionRange::makeJRevisionRange(range);
-      if (JNIUtil::isJavaExceptionThrown())
-        POP_AND_RETURN_NULL;
+          apr_hash_this(hi, &v_key, NULL, &v_val);
+          key = static_cast<const char*>(v_key);
+          val = static_cast<svn_string_t*>(v_val);
 
-      env->CallBooleanMethod(jranges, add_mid, jrange);
-      if (JNIUtil::isJavaExceptionThrown())
-        POP_AND_RETURN_NULL;
-
-      env->DeleteLocalRef(jrange);
+          loop_body(key, val);
+          if (JNIUtil::isJavaExceptionThrown())
+            POP_AND_RETURN_NOTHING();
+        }
     }
-
-  return env->PopLocalFrame(jranges);
-}
-
-jobject
-CreateJ::StringSet(apr_array_header_t *strings)
-{
-  std::vector<jobject> jstrs;
-
-  for (int i = 0; i < strings->nelts; ++i)
+  else
     {
-      const char *str = APR_ARRAY_IDX(strings, i, const char *);
-      jstring jstr = JNIUtil::makeJString(str);
-      if (JNIUtil::isJavaExceptionThrown())
-        return NULL;
-
-      jstrs.push_back(jstr);
+      for (int i = 0; i < prop_diffs->nelts; ++i)
+        {
+          svn_prop_t* prop = &APR_ARRAY_IDX(prop_diffs, i, svn_prop_t);
+          loop_body(prop->name, prop->value);
+          if (JNIUtil::isJavaExceptionThrown())
+            POP_AND_RETURN_NOTHING();
+        }
     }
-
-  return CreateJ::Set(jstrs);
+  POP_AND_RETURN_NOTHING();
 }
 
-jobject CreateJ::PropertyMap(apr_hash_t *prop_hash)
+jobject property_map(apr_hash_t *prop_hash, apr_array_header_t* prop_diffs,
+                     apr_pool_t* scratch_pool)
 {
-  JNIEnv *env = JNIUtil::getEnv();
+  SVN_ERR_ASSERT_NO_RETURN(!(prop_hash && prop_diffs));
 
-  if (prop_hash == NULL)
+  if (prop_hash == NULL && prop_diffs == NULL)
     return NULL;
 
+  JNIEnv *env = JNIUtil::getEnv();
+
   // Create a local frame for our references
   env->PushLocalFrame(LOCAL_FRAME_SIZE);
   if (JNIUtil::isJavaExceptionThrown())
@@ -1058,35 +1261,35 @@ jobject CreateJ::PropertyMap(apr_hash_t *prop_hash)
   if (JNIUtil::isJavaExceptionThrown())
     POP_AND_RETURN_NULL;
 
-  apr_hash_index_t *hi;
-  for (hi = apr_hash_first(apr_hash_pool_get(prop_hash), prop_hash);
-       hi; hi = apr_hash_next(hi))
-    {
-      const char *key;
-      svn_string_t *val;
-
-      apr_hash_this(hi,
-                    reinterpret_cast<const void **>(&key),
-                    NULL,
-                    reinterpret_cast<void **>(&val));
+  fill_property_map(map, prop_hash, prop_diffs, scratch_pool, put_mid);
+  if (JNIUtil::isJavaExceptionThrown())
+    POP_AND_RETURN_NULL;
 
-      jstring jpropName = JNIUtil::makeJString(key);
-      if (JNIUtil::isJavaExceptionThrown())
-        POP_AND_RETURN_NULL;
+  return env->PopLocalFrame(map);
+}
+} // anonymous namespace
 
-      jbyteArray jpropVal = JNIUtil::makeJByteArray(val);
-      if (JNIUtil::isJavaExceptionThrown())
-        POP_AND_RETURN_NULL;
+jobject CreateJ::PropertyMap(apr_hash_t *prop_hash, apr_pool_t* scratch_pool)
+{
+  return property_map(prop_hash, NULL, scratch_pool);
+}
 
-      env->CallObjectMethod(map, put_mid, jpropName, jpropVal);
-      if (JNIUtil::isJavaExceptionThrown())
-        POP_AND_RETURN_NULL;
+jobject CreateJ::PropertyMap(apr_array_header_t* prop_diffs,
+                             apr_pool_t* scratch_pool)
+{
+  return property_map(NULL, prop_diffs, scratch_pool);
+}
 
-      env->DeleteLocalRef(jpropName);
-      env->DeleteLocalRef(jpropVal);
-    }
+void CreateJ::FillPropertyMap(jobject map, apr_hash_t* prop_hash,
+                              apr_pool_t* scratch_pool, jmethodID put_mid)
+{
+  fill_property_map(map, prop_hash, NULL, scratch_pool, put_mid);
+}
 
-  return env->PopLocalFrame(map);
+void CreateJ::FillPropertyMap(jobject map, apr_array_header_t* prop_diffs,
+                              apr_pool_t* scratch_pool, jmethodID put_mid)
+{
+  fill_property_map(map, NULL, prop_diffs, scratch_pool, put_mid);
 }
 
 jobject CreateJ::InheritedProps(apr_array_header_t *iprops)
@@ -1123,7 +1326,7 @@ jobject CreateJ::InheritedProps(apr_array_header_t *iprops)
     }
 
   jclass item_cls = env->FindClass(
-      JAVA_PACKAGE"/callback/InheritedProplistCallback$InheritedItem");
+      JAVAHL_CLASS("/callback/InheritedProplistCallback$InheritedItem"));
   if (JNIUtil::isJavaExceptionThrown())
     POP_AND_RETURN_NULL;
 
@@ -1169,6 +1372,64 @@ jobject CreateJ::InheritedProps(apr_array_header_t *iprops)
   return env->PopLocalFrame(array);
 }
 
+jobject CreateJ::Mergeinfo(svn_mergeinfo_t mergeinfo, apr_pool_t* scratch_pool)
+{
+  if (mergeinfo == NULL)
+    return NULL;
+
+  // Transform mergeinfo into Java Mergeinfo object.
+  JNIEnv *env = JNIUtil::getEnv();
+  jclass clazz = env->FindClass(JAVAHL_CLASS("/types/Mergeinfo"));
+  if (JNIUtil::isJavaExceptionThrown())
+    return NULL;
+
+  static jmethodID ctor = 0;
+  if (ctor == 0)
+    {
+      ctor = env->GetMethodID(clazz, "<init>", "()V");
+      if (JNIUtil::isJavaExceptionThrown())
+        return NULL;
+    }
+
+  static jmethodID addRevisions = 0;
+  if (addRevisions == 0)
+    {
+      addRevisions = env->GetMethodID(clazz, "addRevisions",
+                                      "(Ljava/lang/String;"
+                                      "Ljava/util/List;)V");
+      if (JNIUtil::isJavaExceptionThrown())
+        return NULL;
+    }
+
+  jobject jmergeinfo = env->NewObject(clazz, ctor);
+  if (JNIUtil::isJavaExceptionThrown())
+    return NULL;
+
+  apr_hash_index_t *hi;
+  for (hi = apr_hash_first(scratch_pool, mergeinfo);
+       hi;
+       hi = apr_hash_next(hi))
+    {
+      const void *path;
+      void *val;
+      apr_hash_this(hi, &path, NULL, &val);
+
+      jstring jpath =
+        JNIUtil::makeJString(static_cast<const char*>(path));
+      jobject jranges =
+        RevisionRangeList(static_cast<svn_rangelist_t*>(val)).toList();
+
+      env->CallVoidMethod(jmergeinfo, addRevisions, jpath, jranges);
+
+      env->DeleteLocalRef(jranges);
+      env->DeleteLocalRef(jpath);
+    }
+
+  env->DeleteLocalRef(clazz);
+
+  return jmergeinfo;
+}
+
 
 jobject CreateJ::Set(std::vector<jobject> &objects)
 {
diff --git a/subversion/bindings/javahl/native/CreateJ.h b/subversion/bindings/javahl/native/CreateJ.h
index 7fe5363..8f4f36e 100644
--- a/subversion/bindings/javahl/native/CreateJ.h
+++ b/subversion/bindings/javahl/native/CreateJ.h
@@ -31,6 +31,7 @@
 #include "svn_wc.h"
 #include "svn_repos.h"
 #include "svn_client.h"
+#include "svn_mergeinfo.h"
 
 #include <vector>
 
@@ -49,12 +50,19 @@ class CreateJ
   Checksum(const svn_checksum_t *checksum);
 
   static jobject
+  DirEntry(const char *path, const char *absPath,
+           const svn_dirent_t *dirent);
+
+  static jobject
   Info(const char *path, const svn_client_info2_t *info);
 
   static jobject
   Lock(const svn_lock_t *lock);
 
   static jobject
+  LockMap(const apr_hash_t *locks, apr_pool_t *pool);
+
+  static jobject
   ChangedPath(const char *path, svn_log_changed_path2_t *log_item);
 
   static jobject
@@ -74,17 +82,30 @@ class CreateJ
   CommitInfo(const svn_commit_info_t *info);
 
   static jobject
-  RevisionRangeList(svn_rangelist_t *ranges);
+  StringSet(const apr_array_header_t *strings);
 
   static jobject
-  StringSet(apr_array_header_t *strings);
+  PropertyMap(apr_hash_t *prop_hash, apr_pool_t* scratch_pool = NULL);
 
   static jobject
-  PropertyMap(apr_hash_t *prop_hash);
+  PropertyMap(apr_array_header_t* prop_diffs, apr_pool_t* scratch_pool = NULL);
+
+  static void
+  FillPropertyMap(jobject map, apr_hash_t* prop_hash,
+                  apr_pool_t* scratch_pool,
+                  jmethodID put_method_id = 0);
+
+  static void
+  FillPropertyMap(jobject map, apr_array_header_t* prop_diffs,
+                  apr_pool_t* scratch_pool,
+                  jmethodID put_method_id = 0);
 
   static jobject
   InheritedProps(apr_array_header_t *inherited_props);
 
+  static jobject
+  Mergeinfo(svn_mergeinfo_t mergeinfo, apr_pool_t* scratch_pool);
+
   /* This creates a set of Objects.  It derefs the members of the vector
    * after putting them in the set, so they caller doesn't need to. */
   static jobject
diff --git a/subversion/bindings/javahl/native/Credential.cpp b/subversion/bindings/javahl/native/Credential.cpp
new file mode 100644
index 0000000..8791de3
--- /dev/null
+++ b/subversion/bindings/javahl/native/Credential.cpp
@@ -0,0 +1,85 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+#include "Credential.hpp"
+
+#include "JNIUtil.h"
+
+namespace JavaHL {
+
+// Class JavaHL::Credential
+const char* const Credential::m_class_name =
+  JAVAHL_CLASS("/SVNUtil$Credential");
+
+Credential::ClassImpl::ClassImpl(::Java::Env env, jclass cls)
+  : ::Java::Object::ClassImpl(env, cls),
+    m_mid_ctor(
+        env.GetMethodID(cls, "<init>",
+                        "(" JAVAHL_ARG("/SVNUtil$Credential$Kind;")
+                        "Ljava/lang/String;Ljava/lang/String;"
+                        "Ljava/lang/String;Ljava/lang/String;"
+                        JAVAHL_ARG("/callback/AuthnCallback$SSLServerCertInfo;")
+                        JAVAHL_ARG("/callback/AuthnCallback$SSLServerCertFailures;")
+                        "Ljava/lang/String;)V"))
+{}
+
+Credential::ClassImpl::~ClassImpl() {}
+
+Credential::Credential(::Java::Env env, jobject kind,
+                       const ::Java::String& realm,
+                       const ::Java::String& store,
+                       const ::Java::String& username,
+                       const ::Java::String& password,
+                       jobject info, jobject failures,
+                       const ::Java::String& passphrase)
+  : ::Java::Object(env, ::Java::ClassCache::get_credential(env))
+{
+  set_this(env.NewObject(get_class(), impl().m_mid_ctor,
+                         kind, realm.get(), store.get(),
+                         username.get(), password.get(),
+                         info, failures, passphrase.get()));
+}
+
+// Enum JavaHL::Credential::Kind
+const char* const Credential::Kind::m_class_name =
+  JAVAHL_CLASS("/SVNUtil$Credential$Kind");
+
+Credential::Kind::ClassImpl::ClassImpl(::Java::Env env, jclass cls)
+  : ::Java::Object::ClassImpl(env, cls),
+    m_static_mid_from_string(
+        env.GetStaticMethodID(cls, "fromString",
+                              "(Ljava/lang/String;)"
+                              JAVAHL_ARG("/SVNUtil$Credential$Kind;")))
+{}
+
+Credential::Kind::ClassImpl::~ClassImpl() {}
+
+Credential::Kind::Kind(::Java::Env env,
+                       const ::Java::String& value)
+  : ::Java::Object(env, ::Java::ClassCache::get_credential_kind(env))
+{
+  set_this(env.CallStaticObjectMethod(
+               get_class(), impl().m_static_mid_from_string, value.get()));
+}
+
+} // namespace JavaHL
diff --git a/subversion/bindings/javahl/native/Credential.hpp b/subversion/bindings/javahl/native/Credential.hpp
new file mode 100644
index 0000000..5c0c66d
--- /dev/null
+++ b/subversion/bindings/javahl/native/Credential.hpp
@@ -0,0 +1,126 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+#ifndef SVN_JAVAHL_CREDENTIAL_HPP
+#define SVN_JAVAHL_CREDENTIAL_HPP
+
+#include "jniwrapper/jni_object.hpp"
+#include "jniwrapper/jni_string.hpp"
+
+#include "AuthnCallback.hpp"
+
+namespace JavaHL {
+
+/**
+ * Object wrapper for @c org.apache.subversion.javahl.SVNUtil.Credential.
+ *
+ * @since New in 1.9.
+ */
+class Credential : public ::Java::Object
+{
+public:
+  /**
+   * Object wrapper for @c ...Credential$Kind.
+   */
+  class Kind : public ::Java::Object
+  {
+  public:
+    /**
+     * Constructs a and wraps a new Credential$Kind object.
+     */
+    explicit Kind(::Java::Env env, const ::Java::String& value);
+
+  private:
+    /**
+     * This object's implementation details.
+     */
+    class ClassImpl : public Object::ClassImpl
+    {
+      friend class ::Java::ClassCacheImpl;
+
+    protected:
+      explicit ClassImpl(::Java::Env env, jclass cls);
+
+    public:
+      virtual ~ClassImpl();
+
+      const ::Java::MethodID m_static_mid_from_string;
+    };
+
+    const ClassImpl& impl() const
+      {
+        return *dynamic_cast<const ClassImpl*>(m_impl);
+      }
+
+    friend class ::Java::ClassCacheImpl;
+    static const char* const m_class_name;
+  };
+
+  /**
+   * Constructs a wrapper around @a jthis.
+   * The constructor does not verify the class of the wrapped object.
+   */
+  explicit Credential(::Java::Env env, jobject jthis)
+    : ::Java::Object(env, ::Java::ClassCache::get_credential(env), jthis)
+    {}
+
+  /**
+   * Constructs and wraps a new Credential object
+   */
+  explicit Credential(::Java::Env env, jobject kind,
+                      const ::Java::String& realm,
+                      const ::Java::String& store,
+                      const ::Java::String& username,
+                      const ::Java::String& password,
+                      jobject info, jobject failures,
+                      const ::Java::String& passphrase);
+
+private:
+  /**
+   * This object's implementation details.
+   */
+  class ClassImpl : public Object::ClassImpl
+  {
+    friend class ::Java::ClassCacheImpl;
+
+  protected:
+    explicit ClassImpl(::Java::Env env, jclass cls);
+
+  public:
+    virtual ~ClassImpl();
+
+    const ::Java::MethodID m_mid_ctor;
+  };
+
+  const ClassImpl& impl() const
+    {
+      return *dynamic_cast<const ClassImpl*>(m_impl);
+    }
+
+  friend class ::Java::ClassCacheImpl;
+  static const char* const m_class_name;
+};
+
+} // namespace JavaHL
+
+#endif // SVN_JAVAHL_CREDENTIAL_HPP
diff --git a/subversion/bindings/javahl/native/DiffOptions.cpp b/subversion/bindings/javahl/native/DiffOptions.cpp
index 8d7a8eb..f666f3a 100644
--- a/subversion/bindings/javahl/native/DiffOptions.cpp
+++ b/subversion/bindings/javahl/native/DiffOptions.cpp
@@ -71,5 +71,29 @@ apr_array_header_t *DiffOptions::optionsArray(SVN::Pool &resultPool) const
   if (flags & SHOW_C_FUNCTION)
     APR_ARRAY_PUSH(opt, const char*) = "--show-c-function";
 
+  /* TODO: Support -U (context size) */
+
+  return opt;
+}
+
+svn_diff_file_options_t *DiffOptions::fileOptions(SVN::Pool &resultPool) const
+{
+  svn_diff_file_options_t *opt;
+
+  opt = svn_diff_file_options_create(resultPool.getPool());
+
+  if (flags & IGNORE_ALL_SPACE)
+    opt->ignore_space = svn_diff_file_ignore_space_all;
+  else if (flags & IGNORE_SPACE_CHANGE)
+    opt->ignore_eol_style = svn_diff_file_ignore_space_change;
+
+  if (flags & IGNORE_EOL_STYLE)
+    opt->ignore_eol_style = TRUE;
+
+  if (flags & SHOW_C_FUNCTION)
+    opt->show_c_function = TRUE;
+
+  /* TODO: Support context size */
+
   return opt;
 }
diff --git a/subversion/bindings/javahl/native/DiffOptions.h b/subversion/bindings/javahl/native/DiffOptions.h
index e59b2f9..0dc4d9a 100644
--- a/subversion/bindings/javahl/native/DiffOptions.h
+++ b/subversion/bindings/javahl/native/DiffOptions.h
@@ -29,6 +29,7 @@
 
 #include <apr_tables.h>
 #include "svn_types.h"
+#include "svn_diff.h"
 #include "Pool.h"
 #include "JNIUtil.h"
 
@@ -38,6 +39,7 @@ class DiffOptions
   DiffOptions(jobject joptions);
 
   apr_array_header_t *optionsArray(SVN::Pool &resultPool) const;
+  svn_diff_file_options_t *fileOptions(SVN::Pool &resultPool) const;
 
   svn_boolean_t useGitDiffFormat() const
   {
diff --git a/subversion/bindings/javahl/native/DiffSummaryReceiver.cpp b/subversion/bindings/javahl/native/DiffSummaryReceiver.cpp
index f4cf052..8ad3a91 100644
--- a/subversion/bindings/javahl/native/DiffSummaryReceiver.cpp
+++ b/subversion/bindings/javahl/native/DiffSummaryReceiver.cpp
@@ -69,12 +69,12 @@ DiffSummaryReceiver::onSummary(const svn_client_diff_summarize_t *diff,
   if (callback == 0)
     {
       // Initialize the method ID.
-      clazz = env->FindClass(JAVA_PACKAGE "/callback/DiffSummaryCallback");
+      clazz = env->FindClass(JAVAHL_CLASS("/callback/DiffSummaryCallback"));
       if (JNIUtil::isJavaExceptionThrown())
         POP_AND_RETURN(SVN_NO_ERROR);
 
       callback = env->GetMethodID(clazz, "onSummary",
-                                  "(L"JAVA_PACKAGE"/DiffSummary;)V");
+                                  "(" JAVAHL_ARG("/DiffSummary;") ")V");
       if (JNIUtil::isJavaExceptionThrown() || callback == 0)
         POP_AND_RETURN(SVN_NO_ERROR);
     }
@@ -82,7 +82,7 @@ DiffSummaryReceiver::onSummary(const svn_client_diff_summarize_t *diff,
   // Do some prep work for tranforming the DIFF parameter into a
   // Java equivalent.
   static jmethodID ctor = 0;
-  clazz = env->FindClass(JAVA_PACKAGE "/DiffSummary");
+  clazz = env->FindClass(JAVAHL_CLASS("/DiffSummary"));
   if (JNIUtil::isJavaExceptionThrown())
     POP_AND_RETURN(SVN_NO_ERROR);
 
@@ -90,8 +90,8 @@ DiffSummaryReceiver::onSummary(const svn_client_diff_summarize_t *diff,
     {
       ctor = env->GetMethodID(clazz, "<init>",
                               "(Ljava/lang/String;"
-                              "L"JAVA_PACKAGE"/DiffSummary$DiffKind;Z"
-                              "L"JAVA_PACKAGE"/types/NodeKind;)V");
+                              JAVAHL_ARG("/DiffSummary$DiffKind;") "Z"
+                              JAVAHL_ARG("/types/NodeKind;") ")V");
       if (JNIUtil::isJavaExceptionThrown() || ctor == 0)
         POP_AND_RETURN(SVN_NO_ERROR);
     }
@@ -117,8 +117,5 @@ DiffSummaryReceiver::onSummary(const svn_client_diff_summarize_t *diff,
 
   // Invoke the Java DiffSummaryReceiver callback.
   env->CallVoidMethod(m_receiver, callback, jDiffSummary);
-  // We return whether an exception was thrown or not.
-
-  env->PopLocalFrame(NULL);
-  return SVN_NO_ERROR;
+  POP_AND_RETURN_EXCEPTION_AS_SVNERROR();
 }
diff --git a/subversion/bindings/javahl/native/EditorCallbacks.cpp b/subversion/bindings/javahl/native/EditorCallbacks.cpp
new file mode 100644
index 0000000..703f6bd
--- /dev/null
+++ b/subversion/bindings/javahl/native/EditorCallbacks.cpp
@@ -0,0 +1,124 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+#include "EditorCallbacks.hpp"
+
+#include "jniwrapper/jni_stack.hpp"
+#include "jniwrapper/jni_string.hpp"
+#include "jniwrapper/jni_io_stream.hpp"
+
+#include "Utility.hpp"
+
+namespace JavaHL {
+
+// class JavaHL::ProvideBaseCallback
+
+const char* const ProvideBaseCallback::m_class_name =
+  JAVAHL_CLASS("/ISVNEditor$ProvideBaseCallback");
+
+ProvideBaseCallback::ClassImpl::ClassImpl(::Java::Env env, jclass cls)
+  : ::Java::Object::ClassImpl(env, cls),
+    m_mid_get_contents(
+        env.GetMethodID(
+            cls, "getContents",
+            "(Ljava/lang/String;)"
+            JAVAHL_ARG("/ISVNEditor$ProvideBaseCallback$ReturnValue;")))
+{}
+
+ProvideBaseCallback::ClassImpl::~ClassImpl() {}
+
+
+const char* const ProvideBaseCallback::ReturnValue::m_class_name =
+  JAVAHL_CLASS("/ISVNEditor$ProvideBaseCallback$ReturnValue");
+
+ProvideBaseCallback::ReturnValue::ClassImpl::ClassImpl(
+    ::Java::Env env, jclass cls)
+  : ::Java::Object::ClassImpl(env, cls),
+    m_fid_contents(env.GetFieldID(cls, "contents", "Ljava/io/InputStream;")),
+    m_fid_revision(env.GetFieldID(cls, "revision", "J"))
+{}
+
+ProvideBaseCallback::ReturnValue::ClassImpl::~ClassImpl() {}
+
+
+svn_stream_t*
+ProvideBaseCallback::ReturnValue::get_global_stream(apr_pool_t* pool) const
+{
+  jobject jstream = m_env.GetObjectField(m_jthis, impl().m_fid_contents);
+  return ::Java::InputStream::get_global_stream(m_env, jstream, pool);
+}
+
+
+// class JavaHL::ProvidePropsCallback
+
+const char* const ProvidePropsCallback::m_class_name =
+  JAVAHL_CLASS("/ISVNEditor$ProvidePropsCallback");
+
+ProvidePropsCallback::ClassImpl::ClassImpl(::Java::Env env, jclass cls)
+  : ::Java::Object::ClassImpl(env, cls),
+    m_mid_get_props(
+        env.GetMethodID(
+            cls, "getProperties",
+            "(Ljava/lang/String;)"
+            JAVAHL_ARG("/ISVNEditor$ProvidePropsCallback$ReturnValue;")))
+{}
+
+ProvidePropsCallback::ClassImpl::~ClassImpl() {}
+
+
+const char* const ProvidePropsCallback::ReturnValue::m_class_name =
+  JAVAHL_CLASS("/ISVNEditor$ProvidePropsCallback$ReturnValue");
+
+ProvidePropsCallback::ReturnValue::ClassImpl::ClassImpl(
+    ::Java::Env env, jclass cls)
+  : ::Java::Object::ClassImpl(env, cls),
+    m_fid_properties(env.GetFieldID(cls, "properties", "Ljava/util/Map;")),
+    m_fid_revision(env.GetFieldID(cls, "revision", "J"))
+{}
+
+ProvidePropsCallback::ReturnValue::ClassImpl::~ClassImpl() {}
+
+apr_hash_t*
+ProvidePropsCallback::ReturnValue::get_property_hash(apr_pool_t* pool) const
+{
+  jobject jproperties = m_env.GetObjectField(m_jthis, impl().m_fid_properties);
+  return Util::make_property_hash(m_env, jproperties, pool);
+}
+
+
+// class JavaHL::GetNodeKindCallback
+
+const char* const GetNodeKindCallback::m_class_name =
+  JAVAHL_CLASS("/ISVNEditor$GetNodeKindCallback");
+
+GetNodeKindCallback::ClassImpl::ClassImpl(::Java::Env env, jclass cls)
+  : ::Java::Object::ClassImpl(env, cls),
+    m_mid_get_kind(
+        env.GetMethodID(cls,
+                        "getKind",
+                        "(Ljava/lang/String;J)"
+                        JAVAHL_ARG("/types/NodeKind;")))
+{}
+
+GetNodeKindCallback::ClassImpl::~ClassImpl() {}
+} // namespace JavaHL
diff --git a/subversion/bindings/javahl/native/EditorCallbacks.hpp b/subversion/bindings/javahl/native/EditorCallbacks.hpp
new file mode 100644
index 0000000..8918ee3
--- /dev/null
+++ b/subversion/bindings/javahl/native/EditorCallbacks.hpp
@@ -0,0 +1,328 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+#ifndef SVN_JAVAHL_EDITOR_CALLBACKS_HPP
+#define SVN_JAVAHL_EDITOR_CALLBACKS_HPP
+
+#include "svn_io.h"
+
+#include "Pool.h"
+
+#include "jniwrapper/jni_object.hpp"
+
+namespace JavaHL {
+
+/**
+ * Object wrapper for the base contents callback interface in
+ * @c org.apache.subversion.javahl.ISVNEditor.
+ *
+ * @since New in 1.9.
+ */
+class ProvideBaseCallback : public ::Java::Object
+{
+public:
+  /**
+   * Constructs a wrapper around @a jthis.
+   * The constructor does not verify the class of the wrapped object.
+   */
+  explicit ProvideBaseCallback(::Java::Env env, jobject jthis)
+    : ::Java::Object(env,
+                     ::Java::ClassCache::get_editor_provide_base_cb(env),
+                     jthis)
+    {}
+
+  /**
+   * Invokes the callback.
+   */
+  jobject operator()(jstring relpath) const
+    {
+      return m_env.CallObjectMethod(m_jthis, impl().m_mid_get_contents,
+                                    relpath);
+    }
+
+  class ReturnValue : public ::Java::Object
+  {
+  public:
+    /**
+     * Constructs a wrapper around @a jthis.
+     * The constructor does not verify the class of the wrapped object.
+     */
+    explicit ReturnValue(::Java::Env env, jobject jthis)
+      : Java::Object(env,
+                     ::Java::ClassCache::get_editor_provide_base_cb_ret(env),
+                     jthis)
+      {}
+
+    /**
+     * Returns an @c svn_stream_t for the contents stream in the
+     * wrapped return value, allocated from @a pool. The wrapped Java
+     * stream will live as long as @a pool.
+     */
+    svn_stream_t* get_global_stream(apr_pool_t* pool) const;
+
+    /**
+     * Returns an @c svn_stream_t for the contents stream in the
+     * wrapped return value, allocated from @a pool. The wrapped Java
+     * stream will live as long as @a pool.
+     */
+    svn_stream_t* get_global_stream(const SVN::Pool& pool) const
+      {
+        return get_global_stream(pool.getPool());
+      }
+
+    /**
+     * Returns the revision in the wrapped return value.
+     */
+    jlong get_revision() const
+      {
+        return m_env.GetLongField(m_jthis, impl().m_fid_revision);
+      }
+
+  private:
+    /**
+     * This object's implementation details.
+     */
+    class ClassImpl : public Object::ClassImpl
+    {
+      friend class ::Java::ClassCacheImpl;
+
+    protected:
+      explicit ClassImpl(::Java::Env env, jclass cls);
+
+    public:
+      virtual ~ClassImpl();
+
+      const ::Java::FieldID m_fid_contents;
+      const ::Java::FieldID m_fid_revision;
+    };
+
+    const ClassImpl& impl() const
+      {
+        return *dynamic_cast<const ClassImpl*>(m_impl);
+      }
+
+    friend class ::Java::ClassCacheImpl;
+    static const char* const m_class_name;
+  };
+
+private:
+  /**
+   * This object's implementation details.
+   */
+  class ClassImpl : public Object::ClassImpl
+  {
+    friend class ::Java::ClassCacheImpl;
+
+  protected:
+    explicit ClassImpl(::Java::Env env, jclass cls);
+
+  public:
+    virtual ~ClassImpl();
+
+    const ::Java::MethodID m_mid_get_contents;
+  };
+
+  const ClassImpl& impl() const
+    {
+      return *dynamic_cast<const ClassImpl*>(m_impl);
+    }
+
+  friend class ::Java::ClassCacheImpl;
+  static const char* const m_class_name;
+};
+
+
+/**
+ * Object wrapper for the props callback interface in
+ * @c org.apache.subversion.javahl.ISVNEditor.
+ *
+ * @since New in 1.9.
+ */
+class ProvidePropsCallback : public ::Java::Object
+{
+public:
+  /**
+   * Constructs a wrapper around @a jthis.
+   * The constructor does not verify the class of the wrapped object.
+   */
+  explicit ProvidePropsCallback(::Java::Env env, jobject jthis)
+    : ::Java::Object(env,
+                     ::Java::ClassCache::get_editor_provide_props_cb(env),
+                     jthis)
+    {}
+
+  /**
+   * Invokes the callback.
+   */
+  jobject operator()(jstring relpath) const
+    {
+      return m_env.CallObjectMethod(m_jthis, impl().m_mid_get_props, relpath);
+    }
+
+  class ReturnValue : public ::Java::Object
+  {
+  public:
+    /**
+     * Constructs a wrapper around @a jthis.
+     * The constructor does not verify the class of the wrapped object.
+     */
+    explicit ReturnValue(::Java::Env env, jobject jthis)
+      : Java::Object(env,
+                     ::Java::ClassCache::get_editor_provide_props_cb_ret(env),
+                     jthis)
+      {}
+
+    /**
+     * Returns an @c apr_hash_t of the node properties in the wrapped
+     * return value, allocated from @a pool.
+     */
+    apr_hash_t* get_property_hash(apr_pool_t* pool) const;
+
+    /**
+     * Returns an @c apr_hash_t of the node properties in the wrapped
+     * return value, allocated from @a pool.
+     */
+    apr_hash_t* get_property_hash(const SVN::Pool& pool) const
+      {
+        return get_property_hash(pool.getPool());
+      }
+
+    /**
+     * Returns the revision in the wrapped return value.
+     */
+    jlong get_revision() const
+      {
+        return m_env.GetLongField(m_jthis, impl().m_fid_revision);
+      }
+
+  private:
+    /**
+     * This object's implementation details.
+     */
+    class ClassImpl : public Object::ClassImpl
+    {
+      friend class ::Java::ClassCacheImpl;
+
+    protected:
+      explicit ClassImpl(::Java::Env env, jclass cls);
+
+    public:
+      virtual ~ClassImpl();
+
+      const ::Java::FieldID m_fid_properties;
+      const ::Java::FieldID m_fid_revision;
+    };
+
+    const ClassImpl& impl() const
+      {
+        return *dynamic_cast<const ClassImpl*>(m_impl);
+      }
+
+    friend class ::Java::ClassCacheImpl;
+    static const char* const m_class_name;
+  };
+
+private:
+  /**
+   * This object's implementation details.
+   */
+  class ClassImpl : public Object::ClassImpl
+  {
+    friend class ::Java::ClassCacheImpl;
+
+  protected:
+    explicit ClassImpl(::Java::Env env, jclass cls);
+
+  public:
+    virtual ~ClassImpl();
+
+    const ::Java::MethodID m_mid_get_props;
+  };
+
+  const ClassImpl& impl() const
+    {
+      return *dynamic_cast<const ClassImpl*>(m_impl);
+    }
+
+  friend class ::Java::ClassCacheImpl;
+  static const char* const m_class_name;
+};
+
+
+/**
+ * Object wrapper for the kind callback interface in
+ * @c org.apache.subversion.javahl.ISVNEditor.
+ *
+ * @since New in 1.9.
+ */
+class GetNodeKindCallback : public ::Java::Object
+{
+public:
+  /**
+   * Constructs a wrapper around @a jthis.
+   * The constructor does not verify the class of the wrapped object.
+   */
+  explicit GetNodeKindCallback(::Java::Env env, jobject jthis)
+    : ::Java::Object(env,
+                     ::Java::ClassCache::get_editor_get_kind_cb(env),
+                     jthis)
+    {}
+
+  /**
+   * Invokes the callback.
+   */
+  jobject operator()(jstring relpath, jlong revision) const
+    {
+      return m_env.CallObjectMethod(m_jthis, impl().m_mid_get_kind,
+                                    relpath, revision);
+    }
+
+private:
+  /**
+   * This object's implementation details.
+   */
+  class ClassImpl : public Object::ClassImpl
+  {
+    friend class ::Java::ClassCacheImpl;
+
+  protected:
+    explicit ClassImpl(::Java::Env env, jclass cls);
+
+  public:
+    virtual ~ClassImpl();
+
+    const ::Java::MethodID m_mid_get_kind;
+  };
+
+  const ClassImpl& impl() const
+    {
+      return *dynamic_cast<const ClassImpl*>(m_impl);
+    }
+
+  friend class ::Java::ClassCacheImpl;
+  static const char* const m_class_name;
+};
+
+} // namespace JavaHL
+
+#endif // SVN_JAVAHL_EDITOR_CALLBACKS_HPP
diff --git a/subversion/bindings/javahl/native/EditorProxy.cpp b/subversion/bindings/javahl/native/EditorProxy.cpp
new file mode 100644
index 0000000..8d9d65e
--- /dev/null
+++ b/subversion/bindings/javahl/native/EditorProxy.cpp
@@ -0,0 +1,566 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ *
+ * @file EditorProxy.h
+ * @brief Interface of all editor proxy classes
+ */
+#include <apr_pools.h>
+
+#include "JNIUtil.h"
+#include "JNIStackElement.h"
+#include "EditorProxy.h"
+#include "CreateJ.h"
+#include "EnumMapper.h"
+
+// Newstyle: stream wrapper
+#include <memory>
+#include "NativeStream.hpp"
+#include "jniwrapper/jni_stack.hpp"
+
+#include "svn_error.h"
+#include "svn_private_config.h"
+
+EditorProxy::EditorProxy(jobject jeditor, apr_pool_t* edit_pool,
+                         const char* repos_root_url, const char* base_relpath,
+                         svn_cancel_func_t cancel_func, void* cancel_baton,
+                         const EditorProxyCallbacks& callbacks)
+  : m_valid(false),
+    m_jeditor(JNIUtil::getEnv()->NewGlobalRef(jeditor)),
+    m_edit_pool(edit_pool),
+    m_repos_root_url(NULL),
+    m_base_relpath(NULL),
+    m_found_paths(false),
+    m_editor(NULL),
+    m_delta_editor(NULL),
+    m_delta_baton(NULL),
+    m_proxy_callbacks(callbacks)
+{
+  //DEBUG:fprintf(stderr, "  (n) EditorProxy::EditorProxy(...)\n");
+
+  static const svn_editor_cb_many_t editor_many_cb = {
+    cb_add_directory, cb_add_file, cb_add_symlink, cb_add_absent,
+    cb_alter_directory, cb_alter_file, cb_alter_symlink,
+    cb_delete, cb_copy, cb_move,
+    cb_complete, cb_abort
+  };
+
+  SVN::Pool scratchPool(edit_pool);
+  apr_pool_t* scratch_pool = scratchPool.getPool();
+
+  svn_error_t* err = svn_editor_create(&m_editor, this,
+                                       cancel_func, cancel_baton,
+                                       edit_pool, scratch_pool);
+  if (!err)
+    err = svn_editor_setcb_many(m_editor, &editor_many_cb, scratch_pool);
+  if (!err)
+    {
+      m_repos_root_url =
+        static_cast<const char*>(apr_pstrdup(edit_pool, repos_root_url));
+      m_base_relpath =
+        static_cast<const char*>(apr_pstrdup(edit_pool, base_relpath));
+
+      svn_boolean_t found_paths;
+      err = svn_delta__delta_from_editor(&m_delta_editor,
+                                         &m_delta_baton,
+                                         m_editor,
+                                         m_proxy_callbacks.m_unlock_func,
+                                         m_proxy_callbacks.m_baton,
+                                         &found_paths,
+                                         repos_root_url, base_relpath,
+                                         m_proxy_callbacks.m_fetch_props_func,
+                                         m_proxy_callbacks.m_baton,
+                                         m_proxy_callbacks.m_fetch_base_func,
+                                         m_proxy_callbacks.m_baton,
+                                         &m_proxy_callbacks.m_extra_baton,
+                                         edit_pool);
+      m_found_paths = found_paths;
+    }
+
+  if (err)
+    JNIUtil::handleSVNError(err);
+  else
+    m_valid = true;
+}
+
+EditorProxy::~EditorProxy()
+{
+  //DEBUG:fprintf(stderr, "  (n) EditorProxy::~EditorProxy()\n");
+
+  if (m_jeditor)
+    JNIUtil::getEnv()->DeleteGlobalRef(m_jeditor);
+}
+
+namespace {
+inline svn_error_t* invalid_editor()
+{
+  return svn_error_create(SVN_ERR_RA_SVN_EDIT_ABORTED, NULL,
+                          _("The editor is not valid"));
+}
+
+svn_error_t*
+get_editor_method(jmethodID& mid, const char* name, const char* sig)
+{
+  if (0 != mid)
+    return SVN_NO_ERROR;        // Already known.
+
+  JNIEnv* env = JNIUtil::getEnv();
+  jclass cls = env->FindClass(JAVAHL_CLASS("/ISVNEditor"));
+  SVN_JNI_CATCH(,SVN_ERR_RA_SVN_EDIT_ABORTED);
+  SVN_JNI_CATCH(mid = env->GetMethodID(cls, name, sig),
+                 SVN_ERR_RA_SVN_EDIT_ABORTED);
+  return SVN_NO_ERROR;
+}
+
+jobject wrap_input_stream(svn_stream_t* stream)
+{
+  std::auto_ptr<JavaHL::NativeInputStream>
+    wrapped(new JavaHL::NativeInputStream());
+  apr_pool_t* const wrapped_pool = wrapped->get_pool().getPool();
+  wrapped->set_stream(svn_stream_disown(stream, wrapped_pool));
+  const jobject jstream = wrapped->create_java_wrapper();
+  wrapped.release();
+  return jstream;
+}
+} // anonymous namespace
+
+svn_error_t*
+EditorProxy::cb_add_directory(void *baton,
+                              const char *relpath,
+                              const apr_array_header_t *children,
+                              apr_hash_t *props,
+                              svn_revnum_t replaces_rev,
+                              apr_pool_t *scratch_pool)
+{
+  //DEBUG:fprintf(stderr, "  (n) EditorProxy::cb_add_directory('%s')\n", relpath);
+  const ::Java::Env env;
+  SVN_JAVAHL_CATCH(env, SVN_ERR_RA_SVN_EDIT_ABORTED,
+    {
+      ::Java::LocalFrame frame(env);
+
+      EditorProxy* const ep = static_cast<EditorProxy*>(baton);
+      if (!ep->m_valid)
+        return invalid_editor();
+
+      static jmethodID mid = 0;
+      SVN_ERR(get_editor_method(mid, "addDirectory",
+                                "(Ljava/lang/String;"
+                                "Ljava/lang/Iterable;"
+                                "Ljava/util/Map;J)V"));
+
+      jstring jrelpath = JNIUtil::makeJString(relpath);
+      SVN_JAVAHL_OLDSTYLE_EXCEPTION_CHECK(env);
+      jobject jchildren = (!children ? NULL : CreateJ::StringSet(children));
+      SVN_JAVAHL_OLDSTYLE_EXCEPTION_CHECK(env);
+      jobject jprops = CreateJ::PropertyMap(props, scratch_pool);
+      SVN_JAVAHL_OLDSTYLE_EXCEPTION_CHECK(env);
+
+      env.CallVoidMethod(ep->m_jeditor, mid,
+                         jrelpath, jchildren, jprops,
+                         jlong(replaces_rev));
+    });
+  return SVN_NO_ERROR;
+}
+
+svn_error_t*
+EditorProxy::cb_add_file(void *baton,
+                         const char *relpath,
+                         const svn_checksum_t *checksum,
+                         svn_stream_t *contents,
+                         apr_hash_t *props,
+                         svn_revnum_t replaces_rev,
+                         apr_pool_t *scratch_pool)
+{
+  //DEBUG:fprintf(stderr, "  (n) EditorProxy::cb_add_file('%s')\n", relpath);
+  const ::Java::Env env;
+  SVN_JAVAHL_CATCH(env, SVN_ERR_RA_SVN_EDIT_ABORTED,
+    {
+      ::Java::LocalFrame frame(env);
+
+      EditorProxy* const ep = static_cast<EditorProxy*>(baton);
+      if (!ep || !ep->m_valid)
+        return invalid_editor();
+
+      static jmethodID mid = 0;
+      SVN_ERR(get_editor_method(mid, "addFile",
+                                "(Ljava/lang/String;"
+                                JAVAHL_ARG("/types/Checksum;")
+                                "Ljava/io/InputStream;"
+                                "Ljava/util/Map;J)V"));
+
+      jstring jrelpath = JNIUtil::makeJString(relpath);
+      SVN_JAVAHL_OLDSTYLE_EXCEPTION_CHECK(env);
+      jobject jchecksum = CreateJ::Checksum(checksum);
+      SVN_JAVAHL_OLDSTYLE_EXCEPTION_CHECK(env);
+      jobject jprops = CreateJ::PropertyMap(props, scratch_pool);
+      SVN_JAVAHL_OLDSTYLE_EXCEPTION_CHECK(env);
+
+      jobject jcontents = NULL;
+      if (contents != NULL)
+        jcontents = wrap_input_stream(contents);
+
+      env.CallVoidMethod(ep->m_jeditor, mid,
+                         jrelpath, jchecksum, jcontents,
+                         jprops, jlong(replaces_rev));
+    });
+  return SVN_NO_ERROR;
+}
+
+svn_error_t*
+EditorProxy::cb_add_symlink(void *baton,
+                            const char *relpath,
+                            const char *target,
+                            apr_hash_t *props,
+                            svn_revnum_t replaces_rev,
+                            apr_pool_t *scratch_pool)
+{
+  //DEBUG:fprintf(stderr, "  (n) EditorProxy::cb_add_symlink('%s')\n", relpath);
+  const ::Java::Env env;
+  SVN_JAVAHL_CATCH(env, SVN_ERR_RA_SVN_EDIT_ABORTED,
+    {
+      ::Java::LocalFrame frame(env);
+
+      EditorProxy* const ep = static_cast<EditorProxy*>(baton);
+      if (!ep || !ep->m_valid)
+        return invalid_editor();
+
+      static jmethodID mid = 0;
+      SVN_ERR(get_editor_method(mid, "addSymlink",
+                                "(Ljava/lang/String;"
+                                "Ljava/lang/String;"
+                                "Ljava/util/Map;J)V"));
+
+      jstring jrelpath = JNIUtil::makeJString(relpath);
+      SVN_JAVAHL_OLDSTYLE_EXCEPTION_CHECK(env);
+      jstring jtarget = JNIUtil::makeJString(target);
+      SVN_JAVAHL_OLDSTYLE_EXCEPTION_CHECK(env);
+      jobject jprops = CreateJ::PropertyMap(props, scratch_pool);
+      SVN_JAVAHL_OLDSTYLE_EXCEPTION_CHECK(env);
+
+      env.CallVoidMethod(ep->m_jeditor, mid,
+                         jrelpath, jtarget, jprops,
+                         jlong(replaces_rev));
+    });
+  return SVN_NO_ERROR;
+}
+
+svn_error_t*
+EditorProxy::cb_add_absent(void *baton,
+                           const char *relpath,
+                           svn_node_kind_t kind,
+                           svn_revnum_t replaces_rev,
+                           apr_pool_t *scratch_pool)
+{
+  //DEBUG:fprintf(stderr, "  (n) EditorProxy::cb_add_absent('%s')\n", relpath);
+  const ::Java::Env env;
+  SVN_JAVAHL_CATCH(env, SVN_ERR_RA_SVN_EDIT_ABORTED,
+    {
+      ::Java::LocalFrame frame(env);
+
+      EditorProxy* const ep = static_cast<EditorProxy*>(baton);
+      if (!ep || !ep->m_valid)
+        return invalid_editor();
+
+      static jmethodID mid = 0;
+      SVN_ERR(get_editor_method(mid, "addAbsent",
+                                "(Ljava/lang/String;"
+                                JAVAHL_ARG("/types/NodeKind;")
+                                "J)V"));
+
+      jstring jrelpath = JNIUtil::makeJString(relpath);
+      SVN_JAVAHL_OLDSTYLE_EXCEPTION_CHECK(env);
+      jobject jkind = EnumMapper::mapNodeKind(kind);
+      SVN_JAVAHL_OLDSTYLE_EXCEPTION_CHECK(env);
+
+      env.CallVoidMethod(ep->m_jeditor, mid,
+                         jrelpath, jkind,
+                         jlong(replaces_rev));
+    });
+  return SVN_NO_ERROR;
+}
+
+svn_error_t*
+EditorProxy::cb_alter_directory(void *baton,
+                                const char *relpath,
+                                svn_revnum_t revision,
+                                const apr_array_header_t *children,
+                                apr_hash_t *props,
+                                apr_pool_t *scratch_pool)
+{
+  //DEBUG:fprintf(stderr, "  (n) EditorProxy::cb_alter_directory('%s', r%lld)\n",
+  //DEBUG:        relpath, static_cast<long long>(revision));
+  const ::Java::Env env;
+  SVN_JAVAHL_CATCH(env, SVN_ERR_RA_SVN_EDIT_ABORTED,
+    {
+      ::Java::LocalFrame frame(env);
+
+      EditorProxy* const ep = static_cast<EditorProxy*>(baton);
+      if (!ep || !ep->m_valid)
+        return invalid_editor();
+
+      static jmethodID mid = 0;
+      SVN_ERR(get_editor_method(mid, "alterDirectory",
+                                "(Ljava/lang/String;J"
+                                "Ljava/lang/Iterable;"
+                                "Ljava/util/Map;)V"));
+
+      jstring jrelpath = JNIUtil::makeJString(relpath);
+      SVN_JAVAHL_OLDSTYLE_EXCEPTION_CHECK(env);
+      jobject jchildren = (!children ? NULL : CreateJ::StringSet(children));
+      SVN_JAVAHL_OLDSTYLE_EXCEPTION_CHECK(env);
+      jobject jprops = CreateJ::PropertyMap(props, scratch_pool);
+      SVN_JAVAHL_OLDSTYLE_EXCEPTION_CHECK(env);
+
+      env.CallVoidMethod(ep->m_jeditor, mid,
+                         jrelpath, jlong(revision),
+                         jchildren, jprops);
+    });
+  return SVN_NO_ERROR;
+}
+
+svn_error_t*
+EditorProxy::cb_alter_file(void *baton,
+                           const char *relpath,
+                           svn_revnum_t revision,
+                           const svn_checksum_t *checksum,
+                           svn_stream_t *contents,
+                           apr_hash_t *props,
+                           apr_pool_t *scratch_pool)
+{
+  //DEBUG:fprintf(stderr, "  (n) EditorProxy::cb_alter_file('%s', r%lld)\n",
+  //DEBUG:        relpath, static_cast<long long>(revision));
+  const ::Java::Env env;
+  SVN_JAVAHL_CATCH(env, SVN_ERR_RA_SVN_EDIT_ABORTED,
+    {
+      ::Java::LocalFrame frame(env);
+
+      EditorProxy* const ep = static_cast<EditorProxy*>(baton);
+      if (!ep || !ep->m_valid)
+        return invalid_editor();
+
+      static jmethodID mid = 0;
+      SVN_ERR(get_editor_method(mid, "alterFile",
+                                "(Ljava/lang/String;J"
+                                JAVAHL_ARG("/types/Checksum;")
+                                "Ljava/io/InputStream;"
+                                "Ljava/util/Map;)V"));
+
+      jstring jrelpath = JNIUtil::makeJString(relpath);
+      SVN_JAVAHL_OLDSTYLE_EXCEPTION_CHECK(env);
+      jobject jchecksum = CreateJ::Checksum(checksum);
+      SVN_JAVAHL_OLDSTYLE_EXCEPTION_CHECK(env);
+      jobject jprops = CreateJ::PropertyMap(props, scratch_pool);
+      SVN_JAVAHL_OLDSTYLE_EXCEPTION_CHECK(env);
+
+      jobject jcontents = NULL;
+      if (contents != NULL)
+        jcontents = wrap_input_stream(contents);
+
+      env.CallVoidMethod(ep->m_jeditor, mid,
+                         jrelpath, jlong(revision),
+                         jchecksum, jcontents, jprops);
+    });
+  return SVN_NO_ERROR;
+}
+
+svn_error_t*
+EditorProxy::cb_alter_symlink(void *baton,
+                              const char *relpath,
+                              svn_revnum_t revision,
+                              const char *target,
+                              apr_hash_t *props,
+                              apr_pool_t *scratch_pool)
+{
+  //DEBUG:fprintf(stderr, "  (n) EditorProxy::cb_alter_symlink('%s', r%lld)\n",
+  //DEBUG:        relpath, static_cast<long long>(revision));
+  const ::Java::Env env;
+  SVN_JAVAHL_CATCH(env, SVN_ERR_RA_SVN_EDIT_ABORTED,
+    {
+      ::Java::LocalFrame frame(env);
+
+      EditorProxy* const ep = static_cast<EditorProxy*>(baton);
+      if (!ep || !ep->m_valid)
+        return invalid_editor();
+
+      static jmethodID mid = 0;
+      SVN_ERR(get_editor_method(mid, "alterSymlink",
+                                "(Ljava/lang/String;J"
+                                "Ljava/lang/String;"
+                                "Ljava/util/Map;)V"));
+
+      jstring jrelpath = JNIUtil::makeJString(relpath);
+      SVN_JAVAHL_OLDSTYLE_EXCEPTION_CHECK(env);
+      jstring jtarget = JNIUtil::makeJString(target);
+      SVN_JAVAHL_OLDSTYLE_EXCEPTION_CHECK(env);
+      jobject jprops = CreateJ::PropertyMap(props, scratch_pool);
+      SVN_JAVAHL_OLDSTYLE_EXCEPTION_CHECK(env);
+
+      env.CallVoidMethod(ep->m_jeditor, mid,
+                         jrelpath, jlong(revision),
+                         jtarget, jprops);
+    });
+  return SVN_NO_ERROR;
+}
+
+svn_error_t*
+EditorProxy::cb_delete(void *baton,
+                       const char *relpath,
+                       svn_revnum_t revision,
+                       apr_pool_t *scratch_pool)
+{
+  //DEBUG:fprintf(stderr, "  (n) EditorProxy::cb_delete('%s', r%lld)\n",
+  //DEBUG:        relpath, static_cast<long long>(revision));
+  const ::Java::Env env;
+  SVN_JAVAHL_CATCH(env, SVN_ERR_RA_SVN_EDIT_ABORTED,
+    {
+      ::Java::LocalFrame frame(env);
+
+      EditorProxy* const ep = static_cast<EditorProxy*>(baton);
+      if (!ep || !ep->m_valid)
+        return invalid_editor();
+
+      static jmethodID mid = 0;
+      SVN_ERR(get_editor_method(mid, "delete",
+                                "(Ljava/lang/String;J)V"));
+
+      jstring jrelpath = JNIUtil::makeJString(relpath);
+      SVN_JAVAHL_OLDSTYLE_EXCEPTION_CHECK(env);
+
+      env.CallVoidMethod(ep->m_jeditor, mid, jrelpath);
+    });
+  return SVN_NO_ERROR;
+}
+
+svn_error_t*
+EditorProxy::cb_copy(void *baton,
+                     const char *src_relpath,
+                     svn_revnum_t src_revision,
+                     const char *dst_relpath,
+                     svn_revnum_t replaces_rev,
+                     apr_pool_t *scratch_pool)
+{
+  //DEBUG:fprintf(stderr, "  (n) EditorProxy::cb_copy('%s', r%lld, '%s')\n",
+  //DEBUG:        src_relpath, static_cast<long long>(src_revision), dst_relpath);
+  const ::Java::Env env;
+  SVN_JAVAHL_CATCH(env, SVN_ERR_RA_SVN_EDIT_ABORTED,
+    {
+      ::Java::LocalFrame frame(env);
+
+      EditorProxy* const ep = static_cast<EditorProxy*>(baton);
+      if (!ep || !ep->m_valid)
+        return invalid_editor();
+
+      static jmethodID mid = 0;
+      SVN_ERR(get_editor_method(mid, "copy",
+                                "(Ljava/lang/String;J"
+                                "Ljava/lang/String;J)V"));
+
+      jstring jsrc_relpath = JNIUtil::makeJString(src_relpath);
+      SVN_JAVAHL_OLDSTYLE_EXCEPTION_CHECK(env);
+      jstring jdst_relpath = JNIUtil::makeJString(dst_relpath);
+      SVN_JAVAHL_OLDSTYLE_EXCEPTION_CHECK(env);
+
+      env.CallVoidMethod(ep->m_jeditor, mid,
+                         jsrc_relpath, jlong(src_revision),
+                         jdst_relpath, jlong(replaces_rev));
+    });
+  return SVN_NO_ERROR;
+}
+
+svn_error_t*
+EditorProxy::cb_move(void *baton,
+                     const char *src_relpath,
+                     svn_revnum_t src_revision,
+                     const char *dst_relpath,
+                     svn_revnum_t replaces_rev,
+                     apr_pool_t *scratch_pool)
+{
+  //DEBUG:fprintf(stderr, "  (n) EditorProxy::cb_move('%s', r%lld, '%s')\n",
+  //DEBUG:        src_relpath, static_cast<long long>(src_revision), dst_relpath);
+  const ::Java::Env env;
+  SVN_JAVAHL_CATCH(env, SVN_ERR_RA_SVN_EDIT_ABORTED,
+    {
+      ::Java::LocalFrame frame(env);
+
+      EditorProxy* const ep = static_cast<EditorProxy*>(baton);
+      if (!ep || !ep->m_valid)
+        return invalid_editor();
+
+      static jmethodID mid = 0;
+      SVN_ERR(get_editor_method(mid, "move",
+                                "(Ljava/lang/String;J"
+                                "Ljava/lang/String;J)V"));
+
+      jstring jsrc_relpath = JNIUtil::makeJString(src_relpath);
+      SVN_JAVAHL_OLDSTYLE_EXCEPTION_CHECK(env);
+      jstring jdst_relpath = JNIUtil::makeJString(dst_relpath);
+      SVN_JAVAHL_OLDSTYLE_EXCEPTION_CHECK(env);
+
+      env.CallVoidMethod(ep->m_jeditor, mid,
+                         jsrc_relpath, jlong(src_revision),
+                         jdst_relpath, jlong(replaces_rev));
+    });
+  return SVN_NO_ERROR;
+}
+
+svn_error_t*
+EditorProxy::cb_complete(void *baton, apr_pool_t *scratch_pool)
+{
+  //DEBUG:fprintf(stderr, "  (n) EditorProxy::cb_complete()\n");
+  const ::Java::Env env;
+  SVN_JAVAHL_CATCH(env, SVN_ERR_RA_SVN_EDIT_ABORTED,
+    {
+      ::Java::LocalFrame frame(env);
+
+      EditorProxy* const ep = static_cast<EditorProxy*>(baton);
+      if (!ep || !ep->m_valid)
+        return invalid_editor();
+      ep->m_valid = false;
+
+      static jmethodID mid = 0;
+      SVN_ERR(get_editor_method(mid, "complete", "()V"));
+
+      env.CallVoidMethod(ep->m_jeditor, mid);
+    });
+  return SVN_NO_ERROR;
+}
+
+svn_error_t*
+EditorProxy::cb_abort(void *baton, apr_pool_t *scratch_pool)
+{
+  //DEBUG:fprintf(stderr, "  (n) EditorProxy::cb_abort()\n");
+  const ::Java::Env env;
+  SVN_JAVAHL_CATCH(env, SVN_ERR_RA_SVN_EDIT_ABORTED,
+    {
+      ::Java::LocalFrame frame(env);
+
+      EditorProxy* const ep = static_cast<EditorProxy*>(baton);
+      if (!ep || !ep->m_valid)
+        return invalid_editor();
+      ep->m_valid = false;
+
+      static jmethodID mid = 0;
+      SVN_ERR(get_editor_method(mid, "abort", "()V"));
+
+      env.CallVoidMethod(ep->m_jeditor, mid);
+    });
+  return SVN_NO_ERROR;
+}
diff --git a/subversion/bindings/javahl/native/EditorProxy.h b/subversion/bindings/javahl/native/EditorProxy.h
new file mode 100644
index 0000000..3ca005c
--- /dev/null
+++ b/subversion/bindings/javahl/native/EditorProxy.h
@@ -0,0 +1,153 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ *
+ * @file EditorProxy.h
+ * @brief Interface of all editor proxy classes
+ */
+
+#ifndef JAVAHL_EDITOR_PROXY_H
+#define JAVAHL_EDITOR_PROXY_H
+
+#include "svn_delta.h"
+#include "private/svn_editor.h"
+#include "private/svn_delta_private.h"
+
+/**
+ * These callbacks are needed by the delta-to-Ev2 shims.
+ */
+struct EditorProxyCallbacks
+{
+  svn_delta__unlock_func_t m_unlock_func;
+  svn_delta_fetch_props_func_t m_fetch_props_func;
+  svn_delta_fetch_base_func_t m_fetch_base_func;
+  struct svn_delta__extra_baton m_extra_baton;
+  void* m_baton;
+};
+
+/**
+ * This is a proxy object that translates Ev2 operations (possibly
+ * implemented through shims) into calls to a Java editor
+ * implementation.
+ */
+class EditorProxy
+{
+public:
+  EditorProxy(jobject jeditor, apr_pool_t* edit_pool,
+              const char* repos_root_url, const char* base_relpath,
+              svn_cancel_func_t cancel_func, void* cancel_baton,
+              const EditorProxyCallbacks& callbacks);
+  ~EditorProxy();
+
+  const svn_delta_editor_t* delta_editor() const
+    {
+      return m_delta_editor;
+    }
+
+  void* delta_baton() const
+    {
+      return m_delta_baton;
+    }
+
+private:
+  EditorProxy(const EditorProxy&); // noncopyable
+
+  static svn_error_t* cb_add_directory(void *baton,
+                                       const char *relpath,
+                                       const apr_array_header_t *children,
+                                       apr_hash_t *props,
+                                       svn_revnum_t replaces_rev,
+                                       apr_pool_t *scratch_pool);
+  static svn_error_t* cb_add_file(void *baton,
+                                  const char *relpath,
+                                  const svn_checksum_t *checksum,
+                                  svn_stream_t *contents,
+                                  apr_hash_t *props,
+                                  svn_revnum_t replaces_rev,
+                                  apr_pool_t *scratch_pool);
+  static svn_error_t* cb_add_symlink(void *baton,
+                                     const char *relpath,
+                                     const char *target,
+                                     apr_hash_t *props,
+                                     svn_revnum_t replaces_rev,
+                                     apr_pool_t *scratch_pool);
+  static svn_error_t* cb_add_absent(void *baton,
+                                    const char *relpath,
+                                    svn_node_kind_t kind,
+                                    svn_revnum_t replaces_rev,
+                                    apr_pool_t *scratch_pool);
+  static svn_error_t* cb_alter_directory(void *baton,
+                                         const char *relpath,
+                                         svn_revnum_t revision,
+                                         const apr_array_header_t *children,
+                                         apr_hash_t *props,
+                                         apr_pool_t *scratch_pool);
+  static svn_error_t* cb_alter_file(void *baton,
+                                    const char *relpath,
+                                    svn_revnum_t revision,
+                                    const svn_checksum_t *checksum,
+                                    svn_stream_t *contents,
+                                    apr_hash_t *props,
+                                    apr_pool_t *scratch_pool);
+  static svn_error_t* cb_alter_symlink(void *baton,
+                                       const char *relpath,
+                                       svn_revnum_t revision,
+                                       const char *target,
+                                       apr_hash_t *props,
+                                       apr_pool_t *scratch_pool);
+  static svn_error_t* cb_delete(void *baton,
+                                const char *relpath,
+                                svn_revnum_t revision,
+                                apr_pool_t *scratch_pool);
+  static svn_error_t* cb_copy(void *baton,
+                              const char *src_relpath,
+                              svn_revnum_t src_revision,
+                              const char *dst_relpath,
+                              svn_revnum_t replaces_rev,
+                              apr_pool_t *scratch_pool);
+  static svn_error_t* cb_move(void *baton,
+                              const char *src_relpath,
+                              svn_revnum_t src_revision,
+                              const char *dst_relpath,
+                              svn_revnum_t replaces_rev,
+                              apr_pool_t *scratch_pool);
+  static svn_error_t* cb_complete(void *baton,
+                                  apr_pool_t *scratch_pool);
+  static svn_error_t* cb_abort(void *baton,
+                               apr_pool_t *scratch_pool);
+
+private:
+  bool m_valid;
+  jobject m_jeditor;            ///< Reference to Java editor implementation
+  apr_pool_t* m_edit_pool;
+
+  const char* m_repos_root_url; ///< The root of the repository
+  const char* m_base_relpath;   ///< The root of the session within the repo
+  bool m_found_paths;           ///< Returned paths are absolute
+
+  svn_editor_t* m_editor;
+  const svn_delta_editor_t* m_delta_editor;
+  void* m_delta_baton;
+  EditorProxyCallbacks m_proxy_callbacks;
+};
+
+
+#endif // JAVAHL_EDITOR_PROXY_H
diff --git a/subversion/bindings/javahl/native/EnumMapper.cpp b/subversion/bindings/javahl/native/EnumMapper.cpp
index 089ef6f..8e8ca50 100644
--- a/subversion/bindings/javahl/native/EnumMapper.cpp
+++ b/subversion/bindings/javahl/native/EnumMapper.cpp
@@ -32,44 +32,18 @@
 #include "JNIStringHolder.h"
 #include "../include/org_apache_subversion_javahl_CommitItemStateFlags.h"
 
-/**
- * Map a C commit state flag constant to the Java constant.
- * @param state     the C commit state flage constant
- * @returns the Java constant
- */
-jint EnumMapper::mapCommitMessageStateFlags(apr_byte_t flags)
-{
-  jint jstateFlags = 0;
-  if (flags & SVN_CLIENT_COMMIT_ITEM_ADD)
-    jstateFlags |=
-      org_apache_subversion_javahl_CommitItemStateFlags_Add;
-  if (flags & SVN_CLIENT_COMMIT_ITEM_DELETE)
-    jstateFlags |=
-      org_apache_subversion_javahl_CommitItemStateFlags_Delete;
-  if (flags & SVN_CLIENT_COMMIT_ITEM_TEXT_MODS)
-    jstateFlags |=
-      org_apache_subversion_javahl_CommitItemStateFlags_TextMods;
-  if (flags & SVN_CLIENT_COMMIT_ITEM_PROP_MODS)
-    jstateFlags |=
-      org_apache_subversion_javahl_CommitItemStateFlags_PropMods;
-  if (flags & SVN_CLIENT_COMMIT_ITEM_IS_COPY)
-    jstateFlags |=
-      org_apache_subversion_javahl_CommitItemStateFlags_IsCopy;
-  return jstateFlags;
-}
-
 jobject EnumMapper::mapChangePathAction(const char action)
 {
   switch (action)
     {
       case 'A':
-        return mapEnum(JAVA_PACKAGE"/types/ChangePath$Action", 0);
+        return mapEnum(JAVAHL_CLASS("/types/ChangePath$Action"), 0);
       case 'D':
-        return mapEnum(JAVA_PACKAGE"/types/ChangePath$Action", 1);
+        return mapEnum(JAVAHL_CLASS("/types/ChangePath$Action"), 1);
       case 'R':
-        return mapEnum(JAVA_PACKAGE"/types/ChangePath$Action", 2);
+        return mapEnum(JAVAHL_CLASS("/types/ChangePath$Action"), 2);
       case 'M':
-        return mapEnum(JAVA_PACKAGE"/types/ChangePath$Action", 3);
+        return mapEnum(JAVAHL_CLASS("/types/ChangePath$Action"), 3);
       default:
         return NULL;
     }
@@ -81,7 +55,7 @@ jobject EnumMapper::mapChangePathAction(const char action)
 jobject EnumMapper::mapNotifyState(svn_wc_notify_state_t state)
 {
   // We're assuming a valid value for the C enum above
-  return mapEnum(JAVA_PACKAGE"/ClientNotifyInformation$Status",
+  return mapEnum(JAVAHL_CLASS("/ClientNotifyInformation$Status"),
                  static_cast<int>(state));
 }
 
@@ -91,14 +65,14 @@ jobject EnumMapper::mapNotifyState(svn_wc_notify_state_t state)
 jobject EnumMapper::mapNotifyAction(svn_wc_notify_action_t action)
 {
   // We're assuming a valid value for the C enum above
-  return mapEnum(JAVA_PACKAGE"/ClientNotifyInformation$Action",
+  return mapEnum(JAVAHL_CLASS("/ClientNotifyInformation$Action"),
                  static_cast<int>(action));
 }
 
 jobject EnumMapper::mapReposNotifyNodeAction(svn_node_action action)
 {
   // We're assuming a valid value for the C enum above
-  return mapEnum(JAVA_PACKAGE"/ReposNotifyInformation$NodeAction",
+  return mapEnum(JAVAHL_CLASS("/ReposNotifyInformation$NodeAction"),
                  static_cast<int>(action));
 }
 
@@ -108,7 +82,7 @@ jobject EnumMapper::mapReposNotifyNodeAction(svn_node_action action)
 jobject EnumMapper::mapReposNotifyAction(svn_repos_notify_action_t action)
 {
   // We're assuming a valid value for the C enum above
-  return mapEnum(JAVA_PACKAGE"/ReposNotifyInformation$Action",
+  return mapEnum(JAVAHL_CLASS("/ReposNotifyInformation$Action"),
                  static_cast<int>(action));
 }
 
@@ -118,7 +92,7 @@ jobject EnumMapper::mapReposNotifyAction(svn_repos_notify_action_t action)
 jobject EnumMapper::mapNodeKind(svn_node_kind_t nodeKind)
 {
   // We're assuming a valid value for the C enum above
-  return mapEnum(JAVA_PACKAGE"/types/NodeKind",
+  return mapEnum(JAVAHL_CLASS("/types/NodeKind"),
                  static_cast<int>(nodeKind));
 }
 
@@ -128,7 +102,7 @@ jobject EnumMapper::mapNodeKind(svn_node_kind_t nodeKind)
 jobject EnumMapper::mapNotifyLockState(svn_wc_notify_lock_state_t state)
 {
   // We're assuming a valid value for the C enum above
-  return mapEnum(JAVA_PACKAGE"/ClientNotifyInformation$LockStatus",
+  return mapEnum(JAVAHL_CLASS("/ClientNotifyInformation$LockStatus"),
                  static_cast<int>(state));
 }
 
@@ -138,7 +112,7 @@ jobject EnumMapper::mapNotifyLockState(svn_wc_notify_lock_state_t state)
 jobject EnumMapper::mapScheduleKind(svn_wc_schedule_t schedule)
 {
   // We're assuming a valid value for the C enum above
-  return mapEnum(JAVA_PACKAGE"/types/Info$ScheduleKind",
+  return mapEnum(JAVAHL_CLASS("/types/Info$ScheduleKind"),
                  static_cast<int>(schedule));
 }
 
@@ -149,91 +123,121 @@ jobject EnumMapper::mapStatusKind(svn_wc_status_kind svnKind)
 {
   // We're assuming a valid value for the C enum above
   // The offset here is +1
-  return mapEnum(JAVA_PACKAGE"/types/Status$Kind",
+  return mapEnum(JAVAHL_CLASS("/types/Status$Kind"),
                  static_cast<int>(svnKind) - 1);
 }
 
 jobject EnumMapper::mapChecksumKind(svn_checksum_kind_t kind)
 {
   // We're assuming a valid value for the C enum above
-  return mapEnum(JAVA_PACKAGE"/types/Checksum$Kind",
+  return mapEnum(JAVAHL_CLASS("/types/Checksum$Kind"),
                  static_cast<int>(kind));
 }
 
 jobject EnumMapper::mapConflictKind(svn_wc_conflict_kind_t kind)
 {
   // We're assuming a valid value for the C enum above
-  return mapEnum(JAVA_PACKAGE"/ConflictDescriptor$Kind",
+  return mapEnum(JAVAHL_CLASS("/ConflictDescriptor$Kind"),
                  static_cast<int>(kind));
 }
 
 jobject EnumMapper::mapConflictAction(svn_wc_conflict_action_t action)
 {
   // We're assuming a valid value for the C enum above
-  return mapEnum(JAVA_PACKAGE"/ConflictDescriptor$Action",
+  return mapEnum(JAVAHL_CLASS("/ConflictDescriptor$Action"),
                  static_cast<int>(action));
 }
 
 jobject EnumMapper::mapConflictReason(svn_wc_conflict_reason_t reason)
 {
   // We're assuming a valid value for the C enum above
-  return mapEnum(JAVA_PACKAGE"/ConflictDescriptor$Reason",
+  return mapEnum(JAVAHL_CLASS("/ConflictDescriptor$Reason"),
                  static_cast<int>(reason));
 }
 
 int EnumMapper::toMergeinfoLogKind(jobject jLogKind)
 {
-  return getOrdinal(JAVA_PACKAGE"/types/Mergeinfo$LogKind", jLogKind);
+  return getOrdinal(JAVAHL_CLASS("/types/Mergeinfo$LogKind"), jLogKind);
 }
 
 int EnumMapper::toLogLevel(jobject jLogLevel)
 {
-  return getOrdinal(JAVA_PACKAGE"/SVNClient$ClientLogLevel", jLogLevel);
+  return getOrdinal(JAVAHL_CLASS("/SVNClient$ClientLogLevel"), jLogLevel);
+}
+
+svn_node_kind_t EnumMapper::toNodeKind(jobject jNodeKind)
+{
+  return svn_node_kind_t(
+      getOrdinal(JAVAHL_CLASS("/types/NodeKind"), jNodeKind));
+}
+
+svn_checksum_kind_t EnumMapper::toChecksumKind(jobject jChecksumKind)
+{
+  return svn_checksum_kind_t(
+      getOrdinal(JAVAHL_CLASS("/types/Checksum$Kind"), jChecksumKind));
+}
+
+svn_tristate_t EnumMapper::toTristate(jobject jTristate)
+{
+  switch (getOrdinal(JAVAHL_CLASS("/types/Tristate"), jTristate))
+    {
+    case 1: return svn_tristate_false;
+    case 2: return svn_tristate_true;
+    default: return svn_tristate_unknown;
+    }
 }
 
 svn_depth_t EnumMapper::toDepth(jobject jdepth)
 {
   // The offset for depths is -2
-  return static_cast<svn_depth_t>(getOrdinal(JAVA_PACKAGE"/types/Depth", jdepth) - 2);
+  return static_cast<svn_depth_t>(getOrdinal(JAVAHL_CLASS("/types/Depth"), jdepth) - 2);
 }
 
+svn_mergeinfo_inheritance_t
+EnumMapper::toMergeinfoInheritance(jobject jInheritance)
+{
+  return static_cast<svn_mergeinfo_inheritance_t>(
+      getOrdinal(JAVAHL_CLASS("/types/Mergeinfo$Inheritance"), jInheritance));
+}
+
+
 jobject EnumMapper::mapDepth(svn_depth_t depth)
 {
   // We're assuming a valid value for the C enum above
   // The offset for depths is -2
-  return mapEnum(JAVA_PACKAGE"/types/Depth", static_cast<int>(depth) + 2);
+  return mapEnum(JAVAHL_CLASS("/types/Depth"), static_cast<int>(depth) + 2);
 }
 
 jobject EnumMapper::mapOperation(svn_wc_operation_t operation)
 {
   // We're assuming a valid value for the C enum above
-  return mapEnum(JAVA_PACKAGE"/ConflictDescriptor$Operation",
+  return mapEnum(JAVAHL_CLASS("/ConflictDescriptor$Operation"),
                  static_cast<int>(operation));
 }
 
 jobject EnumMapper::mapTristate(svn_tristate_t tristate)
 {
   // We're assuming a valid value for the C enum above
-  return mapEnum(JAVA_PACKAGE"/types/Tristate",
+  return mapEnum(JAVAHL_CLASS("/types/Tristate"),
                  static_cast<int>(tristate - svn_tristate_false));
 }
 
 svn_wc_conflict_choice_t EnumMapper::toConflictChoice(jobject jchoice)
 {
   return static_cast<svn_wc_conflict_choice_t>
-             (getOrdinal(JAVA_PACKAGE"/ConflictResult$Choice", jchoice));
+             (getOrdinal(JAVAHL_CLASS("/ConflictResult$Choice"), jchoice));
 }
 
 svn_opt_revision_kind EnumMapper::toRevisionKind(jobject jkind)
 {
   return static_cast<svn_opt_revision_kind>
-             (getOrdinal(JAVA_PACKAGE"/types/Revision$Kind", jkind));
+             (getOrdinal(JAVAHL_CLASS("/types/Revision$Kind"), jkind));
 }
 
 jobject EnumMapper::mapSummarizeKind(svn_client_diff_summarize_kind_t sKind)
 {
   // We're assuming a valid value for the C enum above
-  return mapEnum(JAVA_PACKAGE"/DiffSummary$DiffKind",
+  return mapEnum(JAVAHL_CLASS("/DiffSummary$DiffKind"),
                  static_cast<int>(sKind));
 }
 
diff --git a/subversion/bindings/javahl/native/EnumMapper.h b/subversion/bindings/javahl/native/EnumMapper.h
index cb38bd9..3aa0423 100644
--- a/subversion/bindings/javahl/native/EnumMapper.h
+++ b/subversion/bindings/javahl/native/EnumMapper.h
@@ -48,9 +48,13 @@ class EnumMapper
   static svn_wc_conflict_choice_t toConflictChoice(jobject jchoice);
   static int toMergeinfoLogKind(jobject jLogKind);
   static int toLogLevel(jobject jLogLevel);
+  static svn_node_kind_t toNodeKind(jobject jNodeKind);
+  static svn_checksum_kind_t toChecksumKind(jobject jChecksumKind);
+  static svn_tristate_t toTristate(jobject jTristate);
+  static svn_mergeinfo_inheritance_t
+    toMergeinfoInheritance(jobject jInheritance);
 
   /* Converting from C enum's */
-  static jint mapCommitMessageStateFlags(apr_byte_t flags);
   static jobject mapChangePathAction(const char action);
   static jobject mapNotifyState(svn_wc_notify_state_t state);
   static jobject mapNotifyAction(svn_wc_notify_action_t action);
diff --git a/subversion/bindings/javahl/native/ExternalItem.cpp b/subversion/bindings/javahl/native/ExternalItem.cpp
new file mode 100644
index 0000000..acfa1fb
--- /dev/null
+++ b/subversion/bindings/javahl/native/ExternalItem.cpp
@@ -0,0 +1,176 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+#include "jniwrapper/jni_stack.hpp"
+
+#include "ExternalItem.hpp"
+#include "Revision.h"
+
+namespace JavaHL {
+
+const char* const ExternalItem::m_class_name =
+  JAVAHL_CLASS("/types/ExternalItem");
+
+ExternalItem::ClassImpl::ClassImpl(::Java::Env env, jclass cls)
+  : ::Java::Object::ClassImpl(env, cls),
+    m_mid_ctor(
+        env.GetMethodID(cls, "<init>",
+                        "(ZLjava/lang/String;Ljava/lang/String;"
+                        JAVAHL_ARG("/types/Revision;")
+                        JAVAHL_ARG("/types/Revision;")
+                        ")V")),
+    m_fid_target_dir(env.GetFieldID(cls, "targetDir", "Ljava/lang/String;")),
+    m_fid_url(env.GetFieldID(cls, "url", "Ljava/lang/String;")),
+    m_fid_revision(env.GetFieldID(cls, "revision",
+                                  JAVAHL_ARG("/types/Revision;"))),
+    m_fid_peg_revision(env.GetFieldID(cls, "pegRevision",
+                                      JAVAHL_ARG("/types/Revision;")))
+{}
+
+ExternalItem::ClassImpl::~ClassImpl() {}
+
+namespace {
+inline jstring
+get_string_field(::Java::Env env, jobject jthis,
+                 const ::Java::FieldID& fid)
+{
+  return jstring(env.GetObjectField(jthis, fid));
+}
+
+inline svn_opt_revision_t
+get_revision_field(::Java::Env env, jobject jthis,
+                   const ::Java::FieldID& fid)
+{
+  const jobject rev =  env.GetObjectField(jthis, fid);
+  return *Revision(rev).revision();
+}
+
+inline jobject
+make_external_item(::Java::Env env,
+                   jclass cls, const ::Java::MethodID& mid_ctor,
+                   const char* target_dir,
+                   const char* url,
+                   const svn_opt_revision_t* revision,
+                   const svn_opt_revision_t* peg_revision)
+{
+  return env.NewObject(cls, mid_ctor,
+                       JNI_FALSE,
+                       env.NewStringUTF(target_dir),
+                       env.NewStringUTF(url),
+                       Revision::makeJRevision(*revision),
+                       Revision::makeJRevision(*peg_revision));
+}
+} // anonymous namespace
+
+ExternalItem::ExternalItem(::Java::Env env, jobject jthis)
+  : Object(env, ::Java::ClassCache::get_external_item(env), jthis),
+    m_target_dir(env, get_string_field(env, jthis, impl().m_fid_target_dir)),
+    m_url(env, get_string_field(env, jthis, impl().m_fid_url)),
+    m_revision(get_revision_field(env, jthis, impl().m_fid_revision)),
+    m_peg_revision(get_revision_field(env, jthis, impl().m_fid_peg_revision))
+{}
+
+ExternalItem::ExternalItem(::Java::Env env,
+                           const char* target_dir,
+                           const char* url,
+                           const svn_opt_revision_t* revision,
+                           const svn_opt_revision_t* peg_revision)
+  : Object(env, ::Java::ClassCache::get_external_item(env)),
+    m_target_dir(env, target_dir),
+    m_url(env, url),
+    m_revision(*revision),
+    m_peg_revision(*peg_revision)
+{
+  set_this(make_external_item(env, get_class(), impl().m_mid_ctor,
+                              target_dir, url, revision, peg_revision));
+}
+
+svn_wc_external_item2_t*
+ExternalItem::get_external_item(SVN::Pool& svnpool) const
+{
+  svn_wc_external_item2_t* item;
+  apr_pool_t* const pool = svnpool.getPool();
+  SVN_JAVAHL_CHECK(m_env, svn_wc_external_item2_create(&item, pool));
+
+  item->target_dir = apr_pstrdup(
+      pool, Java::String::Contents(m_target_dir).c_str());
+  item->url = apr_pstrdup(
+      pool, Java::String::Contents(m_url).c_str());
+  item->revision = m_revision;
+  item->peg_revision = m_peg_revision;
+  return item;
+}
+
+} // namespace JavaHL
+
+
+// FIXME: Should be in another source file, but Revision.cpp is
+// old-style, so we'll put this implementation here for now.
+namespace {
+inline jobject get_static_revision(::Java::Env env, jclass cls,
+                                   const char* field_name)
+{
+  return env.GetStaticObjectField(
+      cls, env.GetStaticFieldID(cls, field_name,
+                                JAVAHL_ARG("/types/Revision;")));
+}
+} // anonymous namespace
+
+jobject Revision::makeJRevision(const svn_opt_revision_t& rev)
+{
+  if (rev.kind == svn_opt_revision_number)
+      return Revision::makeJRevision(rev.value.number);
+
+  const ::Java::Env env;
+
+  if (rev.kind == svn_opt_revision_date)
+    {
+      const jclass cls = env.FindClass(
+          JAVAHL_CLASS("/types/Revision$DateSpec"));
+      return env.NewObject(cls, env.GetMethodID(cls, "<init>", "(J)V"),
+                           jlong(rev.value.date / 1000));
+    }
+
+  const jclass cls = env.FindClass(JAVAHL_CLASS("/types/Revision"));
+  switch (rev.kind)
+    {
+    case svn_opt_revision_committed:
+      return get_static_revision(env, cls, "COMMITTED");
+
+    case svn_opt_revision_previous:
+      return get_static_revision(env, cls, "PREVIOUS");
+
+    case svn_opt_revision_base:
+      return get_static_revision(env, cls, "BASE");
+
+    case svn_opt_revision_working:
+      return get_static_revision(env, cls, "WORKING");
+
+    case svn_opt_revision_head:
+      return get_static_revision(env, cls, "HEAD");
+
+    case svn_opt_revision_unspecified:
+    default:
+      return get_static_revision(env, cls, "UNSPECIFIED");
+    }
+}
diff --git a/subversion/bindings/javahl/native/ExternalItem.hpp b/subversion/bindings/javahl/native/ExternalItem.hpp
new file mode 100644
index 0000000..75827ff
--- /dev/null
+++ b/subversion/bindings/javahl/native/ExternalItem.hpp
@@ -0,0 +1,139 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+#ifndef SVN_JAVAHL_EXTERNAL_ITEM_HPP
+#define SVN_JAVAHL_EXTERNAL_ITEM_HPP
+
+#include <string>
+
+#include "svn_opt.h"
+#include "svn_wc.h"
+
+#include "Pool.h"
+
+#include "jniwrapper/jni_object.hpp"
+#include "jniwrapper/jni_string.hpp"
+
+namespace JavaHL {
+
+/**
+ * Object wrapper for @c org.apache.subversion.javahl.types.ExternalItem.
+ *
+ * @since New in 1.9.
+ */
+class ExternalItem : public ::Java::Object
+{
+public:
+  /**
+   * Constructs a wrapper around @a jthis.
+   * The constructor does not verify the class of the wrapped object.
+   */
+  explicit ExternalItem(::Java::Env env, jobject jthis);
+
+  /**
+   * Constructs a new @c ExternalItem object and wrapper.
+   */
+  explicit ExternalItem(::Java::Env env,
+                        const char* target_dir,
+                        const char* url,
+                        const svn_opt_revision_t* revision,
+                        const svn_opt_revision_t* peg_revision);
+
+  /**
+   * Returns the value of the wrapped object's @c targetDir member.
+   */
+  std::string target_dir() const
+    {
+      const ::Java::String::Contents contents(m_target_dir);
+      return std::string(contents.c_str());
+    }
+
+  /**
+   * Returns the value of the wrapped object's @c url member.
+   */
+  std::string url() const
+    {
+      const ::Java::String::Contents contents(m_url);
+      return std::string(contents.c_str());
+    }
+
+  /**
+   * Returns the value of the wrapped object's @c revision member.
+   */
+  const svn_opt_revision_t* revision() const
+    {
+      return &m_revision;
+    }
+
+  /**
+   * Returns the value of the wrapped object's @c pegRevision member.
+   */
+  const svn_opt_revision_t* peg_revision() const
+    {
+      return &m_peg_revision;
+    }
+
+  /**
+   * Returns an @c svn_wc_external_item2_t allocated from @a pool and
+   * filled in with this object's values.
+   */
+  svn_wc_external_item2_t* get_external_item(SVN::Pool& pool) const;
+
+private:
+  /**
+   * This object's implementation details.
+   */
+  class ClassImpl : public Object::ClassImpl
+  {
+    friend class ::Java::ClassCacheImpl;
+
+  protected:
+    explicit ClassImpl(::Java::Env env, jclass cls);
+
+  public:
+    virtual ~ClassImpl();
+
+    const ::Java::MethodID m_mid_ctor;
+    const ::Java::FieldID m_fid_target_dir;
+    const ::Java::FieldID m_fid_url;
+    const ::Java::FieldID m_fid_revision;
+    const ::Java::FieldID m_fid_peg_revision;
+  };
+
+  const ClassImpl& impl() const
+    {
+      return *dynamic_cast<const ClassImpl*>(m_impl);
+    }
+
+  friend class ::Java::ClassCacheImpl;
+  static const char* const m_class_name;
+
+  ::Java::String m_target_dir;
+  ::Java::String m_url;
+  svn_opt_revision_t m_revision;
+  svn_opt_revision_t m_peg_revision;
+};
+
+} // namespace JavaHL
+
+#endif // SVN_JAVAHL_EXTERNAL_ITEM_HPP
diff --git a/subversion/bindings/javahl/native/GlobalConfig.h b/subversion/bindings/javahl/native/GlobalConfig.h
new file mode 100644
index 0000000..b7c561d
--- /dev/null
+++ b/subversion/bindings/javahl/native/GlobalConfig.h
@@ -0,0 +1,38 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ *
+ * @file GlobalConfig.h
+ * @brief Interface of the class GlobalConfig
+ */
+
+#ifndef JAVAHL_GLOBAL_CONFIG_H
+#define JAVAHL_GLOBAL_CONFIG_H
+
+#include "JNIUtil.h"
+
+class GlobalConfig
+{
+ public:
+  static bool useNativeCredentialsStore();
+};
+
+#endif  // JAVAHL_GLOBAL_CONFIG_H
diff --git a/subversion/bindings/javahl/native/ImportFilterCallback.cpp b/subversion/bindings/javahl/native/ImportFilterCallback.cpp
index 33d7e8b..3c4a4c5 100644
--- a/subversion/bindings/javahl/native/ImportFilterCallback.cpp
+++ b/subversion/bindings/javahl/native/ImportFilterCallback.cpp
@@ -83,13 +83,14 @@ ImportFilterCallback::doImportFilter(svn_boolean_t *filtered,
   static jmethodID mid = 0;
   if (mid == 0)
     {
-      jclass clazz = env->FindClass(JAVA_PACKAGE"/callback/ImportFilterCallback");
+      jclass clazz = env->FindClass(JAVAHL_CLASS("/callback/ImportFilterCallback"));
       if (JNIUtil::isJavaExceptionThrown())
         POP_AND_RETURN(SVN_NO_ERROR);
 
       mid = env->GetMethodID(clazz, "filter",
                              "(Ljava/lang/String;"
-                             "L"JAVA_PACKAGE"/types/NodeKind;Z)Z");
+                             JAVAHL_ARG("/types/NodeKind;")
+                             "Z)Z");
       if (JNIUtil::isJavaExceptionThrown() || mid == 0)
         POP_AND_RETURN(SVN_NO_ERROR);
     }
diff --git a/subversion/bindings/javahl/native/InfoCallback.cpp b/subversion/bindings/javahl/native/InfoCallback.cpp
index 8a9e375..ee8fb69 100644
--- a/subversion/bindings/javahl/native/InfoCallback.cpp
+++ b/subversion/bindings/javahl/native/InfoCallback.cpp
@@ -80,12 +80,12 @@ InfoCallback::singleInfo(const char *path,
   static jmethodID mid = 0;
   if (mid == 0)
     {
-      jclass clazz = env->FindClass(JAVA_PACKAGE"/callback/InfoCallback");
+      jclass clazz = env->FindClass(JAVAHL_CLASS("/callback/InfoCallback"));
       if (JNIUtil::isJavaExceptionThrown())
         POP_AND_RETURN(SVN_NO_ERROR);
 
       mid = env->GetMethodID(clazz, "singleInfo",
-                             "(L"JAVA_PACKAGE"/types/Info;)V");
+                             "(" JAVAHL_ARG("/types/Info;") ")V");
       if (JNIUtil::isJavaExceptionThrown() || mid == 0)
         POP_AND_RETURN(SVN_NO_ERROR);
     }
@@ -95,8 +95,6 @@ InfoCallback::singleInfo(const char *path,
     POP_AND_RETURN(SVN_NO_ERROR);
 
   env->CallVoidMethod(m_callback, mid, jinfo2);
-  // Return SVN_NO_ERROR here regardless of an exception or not.
 
-  env->PopLocalFrame(NULL);
-  return SVN_NO_ERROR;
+  POP_AND_RETURN_EXCEPTION_AS_SVNERROR();
 }
diff --git a/subversion/bindings/javahl/native/InfoCallback.h b/subversion/bindings/javahl/native/InfoCallback.h
index b65f203..a1975d2 100644
--- a/subversion/bindings/javahl/native/InfoCallback.h
+++ b/subversion/bindings/javahl/native/InfoCallback.h
@@ -30,8 +30,6 @@
 #include <jni.h>
 #include "svn_client.h"
 
-struct info_entry;
-
 /**
  * This class holds a Java callback object, which will receive every line of
  * the file for which the callback information is requested.
diff --git a/subversion/bindings/javahl/native/InputStream.cpp b/subversion/bindings/javahl/native/InputStream.cpp
index 1c73ba2..ac10f9e 100644
--- a/subversion/bindings/javahl/native/InputStream.cpp
+++ b/subversion/bindings/javahl/native/InputStream.cpp
@@ -54,7 +54,8 @@ svn_stream_t *InputStream::getStream(const SVN::Pool &pool)
   // Create a stream with this as the baton and set the read and
   // close functions.
   svn_stream_t *ret = svn_stream_create(this, pool.getPool());
-  svn_stream_set_read(ret, InputStream::read);
+  svn_stream_set_read2(ret, InputStream::read,
+                       NULL /* only partial read support */);
   svn_stream_set_close(ret, InputStream::close);
   return ret;
 }
@@ -68,6 +69,9 @@ svn_stream_t *InputStream::getStream(const SVN::Pool &pool)
  */
 svn_error_t *InputStream::read(void *baton, char *buffer, apr_size_t *len)
 {
+  if (0 == *len)
+    return SVN_NO_ERROR;
+
   JNIEnv *env = JNIUtil::getEnv();
   // An object of our class is passed in as the baton.
   InputStream *that = static_cast<InputStream *>(baton);
diff --git a/subversion/bindings/javahl/native/Iterator.cpp b/subversion/bindings/javahl/native/Iterator.cpp
new file mode 100644
index 0000000..bd8aee0
--- /dev/null
+++ b/subversion/bindings/javahl/native/Iterator.cpp
@@ -0,0 +1,115 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ *
+ * @file Iterator.cpp
+ * @brief Implementation of the class Iterator
+ */
+
+#include "Iterator.h"
+
+namespace {
+jobject init_iterator(jobject jiterable, bool persistent)
+{
+  // A null iterable is allowed, we'll leave the iterator null and
+  // nothing will happen in hasNext() and next().
+  if (!jiterable)
+    return NULL;
+
+  JNIEnv* env = JNIUtil::getEnv();
+
+  static jmethodID iterator_mid = 0;
+  if (0 == iterator_mid)
+    {
+      jclass cls = env->FindClass("java/lang/Iterable");
+      if (JNIUtil::isExceptionThrown())
+        return NULL;
+      iterator_mid = env->GetMethodID(cls, "iterator",
+                                      "()Ljava/util/Iterator;");
+      if (JNIUtil::isExceptionThrown())
+        return NULL;
+    }
+
+  jobject jiterator = env->CallObjectMethod(jiterable, iterator_mid);
+  if (JNIUtil::isExceptionThrown())
+    return NULL;
+  return (persistent ? env->NewGlobalRef(jiterator) : jiterator);
+}
+} // anonymous namespace
+
+
+Iterator::Iterator(jobject jiterable)
+  : m_persistent(false),
+    m_jiterator(init_iterator(jiterable, false))
+{}
+
+Iterator::Iterator(jobject jiterable, bool)
+  : m_persistent(true),
+    m_jiterator(init_iterator(jiterable, true))
+{}
+
+Iterator::~Iterator()
+{
+  if (m_persistent && m_jiterator)
+    JNIUtil::getEnv()->DeleteGlobalRef(m_jiterator);
+}
+
+bool Iterator::hasNext() const
+{
+  if (!m_jiterator)
+    return false;
+
+  JNIEnv* env = JNIUtil::getEnv();
+
+  static jmethodID hasNext_mid = 0;
+  if (0 == hasNext_mid)
+    {
+      jclass cls = env->FindClass("java/util/Iterator");
+      if (JNIUtil::isExceptionThrown())
+        return false;
+      hasNext_mid = env->GetMethodID(cls, "hasNext", "()Z");
+      if (JNIUtil::isExceptionThrown())
+        return false;
+    }
+
+  return bool(env->CallBooleanMethod(m_jiterator, hasNext_mid));
+}
+
+jobject Iterator::next() const
+{
+  if (!m_jiterator)
+    return NULL;
+
+  JNIEnv* env = JNIUtil::getEnv();
+
+  static jmethodID next_mid = 0;
+  if (0 == next_mid)
+    {
+      jclass cls = env->FindClass("java/util/Iterator");
+      if (JNIUtil::isExceptionThrown())
+        return NULL;
+      next_mid = env->GetMethodID(cls, "next", "()Ljava/lang/Object;");
+      if (JNIUtil::isExceptionThrown())
+        return NULL;
+    }
+
+  return env->CallObjectMethod(m_jiterator, next_mid);
+}
diff --git a/subversion/bindings/javahl/native/Iterator.h b/subversion/bindings/javahl/native/Iterator.h
new file mode 100644
index 0000000..c116ab3
--- /dev/null
+++ b/subversion/bindings/javahl/native/Iterator.h
@@ -0,0 +1,64 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ *
+ * @file Iterator.cpp
+ * @brief Interface of the class Iterator
+ */
+
+#ifndef JAVAHL_ITERATOR_H
+#define JAVAHL_ITERATOR_H
+
+#include "JNIUtil.h"
+
+/**
+ * Encapsulates an immutable java.lang.Iterator implementation.
+ */
+class Iterator
+{
+public:
+  Iterator(jobject jiterable);
+  ~Iterator();
+  bool hasNext() const;
+  jobject next() const;
+
+protected:
+  Iterator(jobject jiterable, bool);
+
+private:
+  bool m_persistent;
+  jobject m_jiterator;
+};
+
+
+/**
+ * Like Iterator, but the implementation will hold a global reference
+ * to the internal iterator object to protect it across JNI calls.
+ */
+class PersistentIterator : protected Iterator
+{
+public:
+  PersistentIterator(jobject jiterable) : Iterator(jiterable, true) {}
+  bool hasNext() const { return Iterator::hasNext(); }
+  jobject next() const { return Iterator::next(); }
+};
+
+#endif  // JAVAHL_ITERATOR_H
diff --git a/subversion/bindings/javahl/native/JNIByteArray.cpp b/subversion/bindings/javahl/native/JNIByteArray.cpp
index 34ce96c..cedb1bb 100644
--- a/subversion/bindings/javahl/native/JNIByteArray.cpp
+++ b/subversion/bindings/javahl/native/JNIByteArray.cpp
@@ -32,30 +32,24 @@
  * @param flag that the underlying byte array reference should be deleted at
  *        destruction
  */
-JNIByteArray::JNIByteArray(jbyteArray jba, bool deleteByteArray)
-{
-  m_array = jba;
-  m_deleteByteArray = deleteByteArray;
-  if (jba != NULL)
-    {
-      // Get the bytes.
-      JNIEnv *env = JNIUtil::getEnv();
-      m_data = env->GetByteArrayElements(jba, NULL);
-    }
-  else
-    {
-      m_data = NULL;
-    }
-}
+JNIByteArray::JNIByteArray(jbyteArray jba,
+                           bool deleteByteArray,
+                           bool abortOnRelease)
+  : m_array(jba),
+    m_data(!jba ? NULL
+           : JNIUtil::getEnv()->GetByteArrayElements(jba, NULL)),
+    m_deleteByteArray(deleteByteArray),
+    m_abortOnRelease(abortOnRelease)
+{}
 
 JNIByteArray::~JNIByteArray()
 {
   if (m_array != NULL)
     {
       // Release the bytes
-      JNIUtil::getEnv()->ReleaseByteArrayElements(m_array,
-                                                  m_data,
-                                                  JNI_ABORT);
+      JNIUtil::getEnv()->ReleaseByteArrayElements(
+          m_array, m_data,
+          (m_abortOnRelease ? JNI_ABORT: JNI_COMMIT));
       if (m_deleteByteArray)
         // And if needed the byte array.
         JNIUtil::getEnv()->DeleteLocalRef(m_array);
diff --git a/subversion/bindings/javahl/native/JNIByteArray.h b/subversion/bindings/javahl/native/JNIByteArray.h
index b43673b..e988bda 100644
--- a/subversion/bindings/javahl/native/JNIByteArray.h
+++ b/subversion/bindings/javahl/native/JNIByteArray.h
@@ -51,11 +51,18 @@ class JNIByteArray
    * at destruction.
    */
   bool m_deleteByteArray;
+
+  /**
+   * False if changes to the array should be committed to the Java VM.
+   */
+  bool m_abortOnRelease;
  public:
   bool isNull() const;
   const signed char *getBytes() const;
   int getLength();
-  JNIByteArray(jbyteArray jba, bool deleteByteArray = false);
+  JNIByteArray(jbyteArray jba,
+               bool deleteByteArray = false,
+               bool abortOnRelease = true);
   ~JNIByteArray();
 };
 
diff --git a/subversion/bindings/javahl/native/JNICriticalSection.h b/subversion/bindings/javahl/native/JNICriticalSection.h
index 685b049..d628c7e 100644
--- a/subversion/bindings/javahl/native/JNICriticalSection.h
+++ b/subversion/bindings/javahl/native/JNICriticalSection.h
@@ -32,7 +32,7 @@ class JNIMutex;
 /**
  * This class holds a mutex which will be locked during the constructor and
  * released during the destructor. If the object is created on the stack, this
- * garanties that the mutex will be released all the time if the block is left.
+ * guaranties that the mutex will be released all the time if the block is left.
  * Only one thread can enter all the critrical sections secured by the same
  * mutex.
  */
diff --git a/subversion/bindings/javahl/native/JNIStackElement.cpp b/subversion/bindings/javahl/native/JNIStackElement.cpp
index 2ca6c6e..df9163d 100644
--- a/subversion/bindings/javahl/native/JNIStackElement.cpp
+++ b/subversion/bindings/javahl/native/JNIStackElement.cpp
@@ -27,7 +27,6 @@
 #include "JNIStackElement.h"
 #include "JNIUtil.h"
 #include "JNIStringHolder.h"
-#include "JNIThreadData.h"
 #include <apr_strings.h>
 
 /**
@@ -74,7 +73,7 @@ JNIStackElement::JNIStackElement(JNIEnv *env, const char *clazz,
 
           // Copy the result to a buffer.
           JNIStringHolder name(reinterpret_cast<jstring>(oStr));
-          strncat(m_objectID, name, JNIUtil::formatBufferSize -1);
+          strncat(m_objectID, name, sizeof(m_objectID) - 1);
           env->DeleteLocalRef(oStr);
         }
 
@@ -86,8 +85,8 @@ JNIStackElement::JNIStackElement(JNIEnv *env, const char *clazz,
       m_method = method;
 
       // Generate the log message.
-      char *buffer = JNIUtil::getFormatBuffer();
-      apr_snprintf(buffer, JNIUtil::formatBufferSize,
+      char buffer[2048];
+      apr_snprintf(buffer, sizeof(buffer),
                    "entry class %s method %s object %s", m_clazz, m_method,
                    m_objectID);
       JNIUtil::logMessage(buffer);
@@ -110,11 +109,10 @@ JNIStackElement::~JNIStackElement()
   if (m_clazz != NULL)
     {
       // Generate a log message.
-      char *buffer = JNIUtil::getFormatBuffer();
-      apr_snprintf(buffer, JNIUtil::formatBufferSize,
+      char buffer[2048];
+      apr_snprintf(buffer, sizeof(buffer),
                    "exit class %s method %s object %s", m_clazz,
                    m_method, m_objectID);
       JNIUtil::logMessage(buffer);
     }
-  JNIThreadData::popThreadData();
 }
diff --git a/subversion/bindings/javahl/native/JNIStackElement.h b/subversion/bindings/javahl/native/JNIStackElement.h
index 99dab62..61708c3 100644
--- a/subversion/bindings/javahl/native/JNIStackElement.h
+++ b/subversion/bindings/javahl/native/JNIStackElement.h
@@ -73,7 +73,7 @@ class JNIStackElement
    * A buffer for the result for jthis.toString to identify the
    * object.
    */
-  char m_objectID[JNIUtil::formatBufferSize];
+  char m_objectID[2048];
 };
 
 #endif // JNISTACKELEMENT_H
diff --git a/subversion/bindings/javahl/native/JNIStringHolder.h b/subversion/bindings/javahl/native/JNIStringHolder.h
index 7d36bed..c1bbf72 100644
--- a/subversion/bindings/javahl/native/JNIStringHolder.h
+++ b/subversion/bindings/javahl/native/JNIStringHolder.h
@@ -36,6 +36,7 @@ class JNIStringHolder
   JNIStringHolder(jstring jtext);
   ~JNIStringHolder();
   operator const char *() { return m_str; }
+  const char* c_str() const { return m_str; }
   const char *pstrdup(apr_pool_t *pool);
 
  protected:
diff --git a/subversion/bindings/javahl/native/JNIThreadData.cpp b/subversion/bindings/javahl/native/JNIThreadData.cpp
deleted file mode 100644
index e3ce334..0000000
--- a/subversion/bindings/javahl/native/JNIThreadData.cpp
+++ /dev/null
@@ -1,169 +0,0 @@
-/**
- * @copyright
- * ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one
- *    or more contributor license agreements.  See the NOTICE file
- *    distributed with this work for additional information
- *    regarding copyright ownership.  The ASF licenses this file
- *    to you under the Apache License, Version 2.0 (the
- *    "License"); you may not use this file except in compliance
- *    with the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing,
- *    software distributed under the License is distributed on an
- *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *    KIND, either express or implied.  See the License for the
- *    specific language governing permissions and limitations
- *    under the License.
- * ====================================================================
- * @endcopyright
- *
- * @file JNIThreadData.cpp
- * @brief Implementation of the class JNIThreadData
- */
-
-#include "JNIThreadData.h"
-#include <apr_strings.h>
-#include <apr_tables.h>
-#include <apr_general.h>
-#include <apr_lib.h>
-#include <apr_thread_proc.h>
-#include "JNIUtil.h"
-
-apr_threadkey_t *JNIThreadData::g_key;
-
-/**
- * Create and initialize a new object.
- */
-JNIThreadData::JNIThreadData()
-{
-  m_env = NULL;
-  m_exceptionThrown = false;
-  m_previous = NULL;
-}
-
-JNIThreadData::~JNIThreadData()
-{
-}
-
-/**
- * Initialize the thread local storage.
- * @return success or failure
- */
-bool JNIThreadData::initThreadData()
-{
-  // If already initialized -> nothing to do.
-  if (g_key != NULL)
-    return false;
-
-  // Request a key for the thread local storage from the global pool
-  // and register a callback function called when the thread is
-  // deleted.
-  apr_status_t apr_err = apr_threadkey_private_create(&g_key,
-                                                      del,
-                                                      JNIUtil::getPool());
-  if (apr_err)
-    {
-      JNIUtil::handleAPRError(apr_err, "apr_threadkey_private_create");
-      return false;
-    }
-
-  return true;
-}
-
-/**
- * Get the thread local storage for this thread.
- * @return thread local storage
- */
-JNIThreadData *JNIThreadData::getThreadData()
-{
-  // We should never be called before initThreadData
-  if (g_key == NULL)
-    return NULL;
-
-  // Retrieve the thread local storage from APR.
-  JNIThreadData *data = NULL;
-  apr_status_t apr_err = apr_threadkey_private_get
-    (reinterpret_cast<void**>(&data), g_key);
-  if (apr_err)
-    {
-      JNIUtil::handleAPRError(apr_err, "apr_threadkey_private_get");
-      return NULL;
-    }
-
-  // Not already allocated.
-  if (data == NULL)
-    {
-      // Allocate and store to APR.
-      data = new JNIThreadData;
-      apr_err = apr_threadkey_private_set (data, g_key);
-      if (apr_err)
-        {
-          JNIUtil::handleAPRError(apr_err, "apr_threadkey_private_set");
-          return NULL;
-        }
-    }
-  return data;
-}
-
-/**
- * Allocate a new ThreadData for the current call from Java and push
- * it on the stack
- */
-void JNIThreadData::pushNewThreadData()
-{
-  JNIThreadData *data = NULL;
-  apr_status_t apr_err = apr_threadkey_private_get
-    (reinterpret_cast<void**>(&data), g_key);
-  if (apr_err)
-    {
-      JNIUtil::handleAPRError(apr_err, "apr_threadkey_private_get");
-      return;
-    }
-  JNIThreadData *newData = new JNIThreadData();
-  newData->m_previous =data;
-  apr_err = apr_threadkey_private_set(newData, g_key);
-  if (apr_err)
-    {
-      JNIUtil::handleAPRError(apr_err, "apr_threadkey_private_set");
-      return;
-    }
-}
-
-/**
- * Pop the current ThreadData from the stack, because the call
- * completed.
- */
-void JNIThreadData::popThreadData()
-{
-  JNIThreadData *data = NULL;
-  apr_status_t apr_err = apr_threadkey_private_get
-    (reinterpret_cast<void**>(&data), g_key);
-  if (apr_err)
-    {
-      JNIUtil::handleAPRError(apr_err, "apr_threadkey_private_get");
-      return;
-    }
-  if (data == NULL)
-    return;
-
-  JNIThreadData *oldData = data->m_previous;
-  delete data;
-  apr_err = apr_threadkey_private_set(oldData, g_key);
-  if (apr_err)
-    {
-      JNIUtil::handleAPRError(apr_err, "apr_threadkey_private_set");
-      return;
-    }
-}
-
-/**
- * Callback called by APR when the thread dies.  Deletes the thread
- * local storage.
- */
-void JNIThreadData::del(void *p)
-{
-  delete reinterpret_cast<JNIThreadData*>(p);
-}
diff --git a/subversion/bindings/javahl/native/JNIUtil.cpp b/subversion/bindings/javahl/native/JNIUtil.cpp
index e52e975..2adcf2f 100644
--- a/subversion/bindings/javahl/native/JNIUtil.cpp
+++ b/subversion/bindings/javahl/native/JNIUtil.cpp
@@ -24,6 +24,13 @@
  * @brief Implementation of the class JNIUtil
  */
 
+/* Include apr.h first, or INT64_C won't be defined properly on some C99
+   compilers, when other headers include <stdint.h> before defining some
+   macros.
+
+   See apr.h for the ugly details */
+#include <apr.h>
+
 #include "JNIUtil.h"
 #include "Array.h"
 
@@ -35,8 +42,11 @@
 #include <apr_tables.h>
 #include <apr_general.h>
 #include <apr_lib.h>
+#include <apr_file_info.h>
+#include <apr_time.h>
 
 #include "svn_pools.h"
+#include "svn_error.h"
 #include "svn_fs.h"
 #include "svn_ra.h"
 #include "svn_utf.h"
@@ -44,37 +54,43 @@
 #include "svn_dso.h"
 #include "svn_path.h"
 #include "svn_cache_config.h"
-#include <apr_file_info.h>
+#include "private/svn_atomic.h"
+#include "private/svn_utf_private.h"
 #include "svn_private_config.h"
-#ifdef WIN32
-/* FIXME: We're using an internal APR header here, which means we
-   have to build Subversion with APR sources. This being Win32-only,
-   that should be fine for now, but a better solution must be found in
-   combination with issue #850. */
-extern "C" {
-#include <arch/win32/apr_arch_utf8.h>
-};
-#endif
 
 #include "SVNBase.h"
 #include "JNIMutex.h"
 #include "JNICriticalSection.h"
-#include "JNIThreadData.h"
 #include "JNIStringHolder.h"
 #include "Pool.h"
 
+
+#include "jniwrapper/jni_env.hpp"
+
 // Static members of JNIUtil are allocated here.
 apr_pool_t *JNIUtil::g_pool = NULL;
 std::list<SVNBase*> JNIUtil::g_finalizedObjects;
 JNIMutex *JNIUtil::g_finalizedObjectsMutex = NULL;
 JNIMutex *JNIUtil::g_logMutex = NULL;
+JNIMutex *JNIUtil::g_configMutex = NULL;
 bool JNIUtil::g_initException;
-bool JNIUtil::g_inInit;
-JNIEnv *JNIUtil::g_initEnv;
-char JNIUtil::g_initFormatBuffer[formatBufferSize];
 int JNIUtil::g_logLevel = JNIUtil::noLog;
 std::ofstream JNIUtil::g_logStream;
 
+/* The error code we will use to signal a Java exception */
+static const apr_status_t
+SVN_ERR_JAVAHL_WRAPPED = SVN_ERR_MALFUNC_CATEGORY_START
+                         + SVN_ERR_CATEGORY_SIZE - 10;
+
+/**
+ * Return the JNI environment to use
+ * @return the JNI environment
+ */
+JNIEnv *JNIUtil::getEnv()
+{
+  return Java::Env().get();
+}
+
 /**
  * Initialize the environment for all requests.
  * @param env   the JNI environment for this request
@@ -84,9 +100,6 @@ bool JNIUtil::JNIInit(JNIEnv *env)
   // Clear all standing exceptions.
   env->ExceptionClear();
 
-  // Remember the env parameter for the remainder of the request.
-  setEnv(env);
-
   // Lock the list of finalized objects.
   JNICriticalSection cs(*g_finalizedObjectsMutex) ;
   if (isExceptionThrown())
@@ -104,49 +117,48 @@ bool JNIUtil::JNIInit(JNIEnv *env)
   return true;
 }
 
+/* Forwarder for calling JNIGlobalInit from JNI_OnLoad(). */
+bool initialize_jni_util(JNIEnv *env)
+{
+  return JNIUtil::JNIGlobalInit(env);
+}
+
+namespace {
+
+volatile svn_atomic_t *gentle_crash_write_loc = NULL;
+
+svn_error_t *
+gently_crash_the_jvm(svn_boolean_t can_return,
+                     const char *file, int line, const char *expr)
+{
+  if (!can_return)
+    {
+      // Try not to abort; aborting prevents the JVM from creating
+      // a crash log, which is oh so useful for debugging.
+      // We can't just raise a SEGV signal, either, because it will
+      // be not be caught in the context that we're interested in
+      // getting the stack trace from.
+
+      // Try reading from and writing to the zero page
+      const svn_atomic_t zeropage = svn_atomic_read(gentle_crash_write_loc);
+      svn_atomic_set(gentle_crash_write_loc, zeropage);
+    }
+
+  // Forward to the standard malfunction handler, which does call
+  // abort when !can_return; this will only happen if the write to the
+  // zero page did not cause a SEGV.
+  return svn_error_raise_on_malfunction(can_return, file, line, expr);
+}
+} // Anonymous namespace
+
 /**
  * Initialize the environment for all requests.
+ * This method must be called in a single-threaded context.
  * @param env   the JNI environment for this request
  */
 bool JNIUtil::JNIGlobalInit(JNIEnv *env)
 {
-  // This method has to be run only once during the run a program.
-  static bool run = false;
   svn_error_t *err;
-  if (run) // already run
-    return true;
-
-  run = true;
-
-  // Do not run this part more than one time.  This leaves a small
-  // time window when two threads create their first SVNClient and
-  // SVNAdmin at the same time, but I do not see a better option
-  // without APR already initialized
-  if (g_inInit)
-    return false;
-
-  g_inInit = true;
-  g_initEnv = env;
-
-  apr_status_t status;
-
-
-
-  /* Initialize the APR subsystem, and register an atexit() function
-   * to Uninitialize that subsystem at program exit. */
-  status = apr_initialize();
-  if (status)
-    {
-      if (stderr)
-        {
-          char buf[1024];
-          apr_strerror(status, buf, sizeof(buf) - 1);
-          fprintf(stderr,
-                  "%s: error: cannot initialize APR: %s\n",
-                  "svnjavahl", buf);
-        }
-      return FALSE;
-    }
 
   /* This has to happen before any pools are created. */
   if ((err = svn_dso_initialize2()))
@@ -158,16 +170,8 @@ bool JNIUtil::JNIGlobalInit(JNIEnv *env)
       return FALSE;
     }
 
-  if (0 > atexit(apr_terminate))
-    {
-      if (stderr)
-        fprintf(stderr,
-                "%s: error: atexit registration failed\n",
-                "svnjavahl");
-      return FALSE;
-    }
-
-  /* Create our top-level pool. */
+  /* Create our top-level pool.
+     N.B.: APR was initialized by JNI_OnLoad. */
   g_pool = svn_pool_create(NULL);
 
   apr_allocator_t* allocator = apr_pool_allocator_get(g_pool);
@@ -180,15 +184,25 @@ bool JNIUtil::JNIGlobalInit(JNIEnv *env)
     }
 
   svn_utf_initialize2(FALSE, g_pool); /* Optimize character conversions */
-  svn_fs_initialize(g_pool); /* Avoid some theoretical issues */
-  svn_ra_initialize(g_pool);
 
-  /* We shouldn't fill the JVMs memory with FS cache data unless explictly
-     requested. */
+  // Initialize the libraries we use
+  err = svn_fs_initialize(g_pool);
+  if (!err)
+    err = svn_ra_initialize(g_pool);
+  if (err)
+    {
+      if (stderr && err->message)
+        fprintf(stderr, "%s", err->message);
+
+      svn_error_clear(err);
+      return FALSE;
+    }
+
+  /* We shouldn't fill the JVMs memory with FS cache data unless
+     explicitly requested. And we don't either, because the caches get
+     allocated outside the JVM heap. Duh. */
   {
     svn_cache_config_t settings = *svn_cache_config_get();
-    settings.cache_size = 0;
-    settings.file_handle_count = 0;
     settings.single_threaded = FALSE;
     svn_cache_config_set(&settings);
   }
@@ -197,32 +211,24 @@ bool JNIUtil::JNIGlobalInit(JNIEnv *env)
 #ifdef WIN32
   {
     WCHAR ucs2_path[MAX_PATH];
-    char *utf8_path;
+    const char *utf8_path;
     const char *internal_path;
-    apr_pool_t *pool;
-    apr_status_t apr_err;
-    apr_size_t inwords, outbytes;
-    unsigned int outlength;
+    svn_error_t *err;
+    apr_pool_t *pool = svn_pool_create(g_pool);
 
-    pool = svn_pool_create(g_pool);
     /* get dll name - our locale info will be in '../share/locale' */
-    inwords = sizeof(ucs2_path) / sizeof(ucs2_path[0]);
     HINSTANCE moduleHandle = GetModuleHandle("libsvnjavahl-1");
-    GetModuleFileNameW(moduleHandle, ucs2_path, inwords);
-    inwords = lstrlenW(ucs2_path);
-    outbytes = outlength = 3 * (inwords + 1);
-    utf8_path = reinterpret_cast<char *>(apr_palloc(pool, outlength));
-    apr_err = apr_conv_ucs2_to_utf8((const apr_wchar_t *) ucs2_path,
-                                    &inwords, utf8_path, &outbytes);
-    if (!apr_err && (inwords > 0 || outbytes == 0))
-      apr_err = APR_INCOMPLETE;
-    if (apr_err)
+    GetModuleFileNameW(moduleHandle, ucs2_path,
+                       sizeof(ucs2_path) / sizeof(ucs2_path[0]));
+    err = svn_utf__win32_utf16_to_utf8(&utf8_path, ucs2_path, NULL, pool);
+    if (err)
       {
         if (stderr)
-          fprintf(stderr, "Can't convert module path to UTF-8");
-        return FALSE;
+          svn_handle_error2(err, stderr, false, "svn: ");
+        svn_error_clear(err);
+        return false;
       }
-    utf8_path[outlength - outbytes] = '\0';
+
     internal_path = svn_dirent_internal_style(utf8_path, pool);
     /* get base path name */
     internal_path = svn_dirent_dirname(internal_path, pool);
@@ -268,16 +274,14 @@ bool JNIUtil::JNIGlobalInit(JNIEnv *env)
   if (isExceptionThrown())
     return false;
 
-  // initialized the thread local storage
-  if (!JNIThreadData::initThreadData())
-    return false;
-
-  setEnv(env);
+  g_configMutex = new JNIMutex(g_pool);
   if (isExceptionThrown())
     return false;
 
-  g_initEnv = NULL;
-  g_inInit = false;
+  // Set a malfunction handler that tries not to call abort, because
+  // that would prevent the JVM from creating a crash and stack log file.
+  svn_error_set_malfunction_handler(gently_crash_the_jvm);
+
   return true;
 }
 
@@ -304,18 +308,6 @@ void JNIUtil::raiseThrowable(const char *name, const char *message)
     return;
 
   env->ThrowNew(clazz, message);
-  setExceptionThrown();
-  env->DeleteLocalRef(clazz);
-}
-
-jstring JNIUtil::makeSVNErrorMessage(svn_error_t *err)
-{
-  if (err == NULL)
-    return NULL;
-  std::string buffer;
-  assembleErrorMessage(err, 0, APR_SUCCESS, buffer);
-  jstring jmessage = makeJString(buffer.c_str());
-  return jmessage;
 }
 
 void
@@ -418,10 +410,174 @@ JNIUtil::putErrorsInTrace(svn_error_t *err,
   env->DeleteLocalRef(jfileName);
 }
 
-void JNIUtil::wrappedHandleSVNError(svn_error_t *err)
+namespace {
+struct MessageStackItem
 {
-  std::string msg;
-  assembleErrorMessage(svn_error_purge_tracing(err), 0, APR_SUCCESS, msg);
+  apr_status_t m_code;
+  std::string m_message;
+  bool m_generic;
+
+  MessageStackItem(apr_status_t code, const char* message,
+                   bool generic = false)
+    : m_code(code),
+      m_message(message),
+      m_generic(generic)
+    {}
+};
+typedef std::vector<MessageStackItem> ErrorMessageStack;
+
+/*
+ * Build the error message from the svn error into buffer.  This
+ * method iterates through all the chained errors
+ *
+ * @param err               the subversion error
+ * @param buffer            the buffer where the formated error message will
+ *                          be stored
+ * @return An array of error codes and messages
+ */
+ErrorMessageStack assemble_error_message(
+    svn_error_t *err, std::string &result)
+{
+  // buffer for a single error message
+  char errbuf[1024];
+  apr_status_t parent_apr_err = 0;
+  ErrorMessageStack message_stack;
+
+  /* Pretty-print the error */
+  /* Note: we can also log errors here someday. */
+
+  for (int depth = 0; err;
+       ++depth, parent_apr_err = err->apr_err, err = err->child)
+    {
+      /* When we're recursing, don't repeat the top-level message if its
+       * the same as before. */
+      if ((depth == 0 || err->apr_err != parent_apr_err)
+          && err->apr_err != SVN_ERR_JAVAHL_WRAPPED)
+        {
+          const char *message;
+          /* Is this a Subversion-specific error code? */
+          if ((err->apr_err > APR_OS_START_USEERR)
+              && (err->apr_err <= APR_OS_START_CANONERR))
+            message = svn_strerror(err->apr_err, errbuf, sizeof(errbuf));
+          /* Otherwise, this must be an APR error code. */
+          else
+            {
+              /* Messages coming from apr_strerror are in the native
+                 encoding, it's a good idea to convert them to UTF-8. */
+              apr_strerror(err->apr_err, errbuf, sizeof(errbuf));
+              svn_error_t* utf8_err =
+                svn_utf_cstring_to_utf8(&message, errbuf, err->pool);
+              if (utf8_err)
+                {
+                  /* Use fuzzy transliteration instead. */
+                  svn_error_clear(utf8_err);
+                  message = svn_utf_cstring_from_utf8_fuzzy(errbuf, err->pool);
+                }
+            }
+
+          message_stack.push_back(
+              MessageStackItem(err->apr_err, message, true));
+        }
+      if (err->message)
+        {
+          message_stack.push_back(
+              MessageStackItem(err->apr_err, err->message));
+        }
+    }
+
+  for (ErrorMessageStack::const_iterator it = message_stack.begin();
+       it != message_stack.end(); ++it)
+    {
+      if (!it->m_generic)
+        result += "svn: ";
+      result += it->m_message;
+      result += '\n';
+    }
+  return message_stack;
+}
+
+jobject construct_Jmessage_stack(const ErrorMessageStack& message_stack)
+{
+  JNIEnv *env = JNIUtil::getEnv();
+  env->PushLocalFrame(LOCAL_FRAME_SIZE);
+  if (JNIUtil::isJavaExceptionThrown())
+    return NULL;
+
+  jclass list_clazz = env->FindClass("java/util/ArrayList");
+  if (JNIUtil::isJavaExceptionThrown())
+    POP_AND_RETURN_NULL;
+  jmethodID mid = env->GetMethodID(list_clazz, "<init>", "(I)V");
+  if (JNIUtil::isJavaExceptionThrown())
+    POP_AND_RETURN_NULL;
+  jmethodID add_mid = env->GetMethodID(list_clazz, "add",
+                                       "(Ljava/lang/Object;)Z");
+  if (JNIUtil::isJavaExceptionThrown())
+    POP_AND_RETURN_NULL;
+  jobject jlist = env->NewObject(list_clazz, mid, jint(message_stack.size()));
+  if (JNIUtil::isJavaExceptionThrown())
+    POP_AND_RETURN_NULL;
+
+  jclass clazz = env->FindClass(JAVAHL_CLASS("/ClientException$ErrorMessage"));
+  if (JNIUtil::isJavaExceptionThrown())
+    POP_AND_RETURN_NULL;
+  mid = env->GetMethodID(clazz, "<init>",
+                         "(ILjava/lang/String;Z)V");
+  if (JNIUtil::isJavaExceptionThrown())
+    POP_AND_RETURN_NULL;
+
+  for (ErrorMessageStack::const_iterator it = message_stack.begin();
+       it != message_stack.end(); ++it)
+    {
+      jobject jmessage = JNIUtil::makeJString(it->m_message.c_str());
+      if (JNIUtil::isJavaExceptionThrown())
+        POP_AND_RETURN_NULL;
+      jobject jitem = env->NewObject(clazz, mid,
+                                     jint(it->m_code), jmessage,
+                                     jboolean(it->m_generic));
+      if (JNIUtil::isJavaExceptionThrown())
+        POP_AND_RETURN_NULL;
+      env->CallBooleanMethod(jlist, add_mid, jitem);
+      if (JNIUtil::isJavaExceptionThrown())
+        POP_AND_RETURN_NULL;
+
+      env->DeleteLocalRef(jmessage);
+      env->DeleteLocalRef(jitem);
+    }
+  return env->PopLocalFrame(jlist);
+}
+} // anonymous namespace
+
+std::string JNIUtil::makeSVNErrorMessage(svn_error_t *err,
+                                         jstring *jerror_message,
+                                         jobject *jmessage_stack)
+{
+  if (jerror_message)
+    *jerror_message = NULL;
+  if (jmessage_stack)
+    *jmessage_stack = NULL;
+
+  std::string buffer;
+  err = svn_error_purge_tracing(err);
+  if (err == NULL || err->apr_err == 0
+      || !(jerror_message || jmessage_stack))
+  return buffer;
+
+  ErrorMessageStack message_stack = assemble_error_message(err, buffer);
+  if (jerror_message)
+    *jerror_message = makeJString(buffer.c_str());
+  if (jmessage_stack)
+    *jmessage_stack = construct_Jmessage_stack(message_stack);
+  return buffer;
+}
+
+jthrowable JNIUtil::wrappedCreateClientException(svn_error_t *err, jthrowable jcause)
+{
+  jstring jmessage;
+  jobject jstack;
+  std::string msg = makeSVNErrorMessage(err, &jmessage, &jstack);
+  if (JNIUtil::isJavaExceptionThrown())
+    return NULL;
+
   const char *source = NULL;
 #ifdef SVN_DEBUG
 #ifndef SVN_ERR__TRACING
@@ -436,6 +592,9 @@ void JNIUtil::wrappedHandleSVNError(svn_error_t *err)
 #endif
 #endif
 
+  if (!jcause)
+    jcause = JNIUtil::unwrapJavaException(err);
+
   // Much of the following is stolen from throwNativeException().  As much as
   // we'd like to call that function, we need to do some manual stack
   // unrolling, so it isn't feasible.
@@ -445,11 +604,11 @@ void JNIUtil::wrappedHandleSVNError(svn_error_t *err)
   // Create a local frame for our references
   env->PushLocalFrame(LOCAL_FRAME_SIZE);
   if (JNIUtil::isJavaExceptionThrown())
-    return;
+    return NULL;
 
-  jclass clazz = env->FindClass(JAVA_PACKAGE "/ClientException");
+  jclass clazz = env->FindClass(JAVAHL_CLASS("/ClientException"));
   if (isJavaExceptionThrown())
-    POP_AND_RETURN_NOTHING();
+    POP_AND_RETURN_NULL;
 
   if (getLogLevel() >= exceptionLog)
     {
@@ -463,23 +622,24 @@ void JNIUtil::wrappedHandleSVNError(svn_error_t *err)
       g_logStream << std::endl;
     }
   if (isJavaExceptionThrown())
-    POP_AND_RETURN_NOTHING();
+    POP_AND_RETURN_NULL;
 
-  jstring jmessage = makeJString(msg.c_str());
-  if (isJavaExceptionThrown())
-    POP_AND_RETURN_NOTHING();
   jstring jsource = makeJString(source);
   if (isJavaExceptionThrown())
-    POP_AND_RETURN_NOTHING();
+    POP_AND_RETURN_NULL;
 
   jmethodID mid = env->GetMethodID(clazz, "<init>",
-                                   "(Ljava/lang/String;Ljava/lang/String;I)V");
+                                   "(Ljava/lang/String;"
+                                   "Ljava/lang/Throwable;"
+                                   "Ljava/lang/String;I"
+                                   "Ljava/util/List;)V");
   if (isJavaExceptionThrown())
-    POP_AND_RETURN_NOTHING();
-  jobject nativeException = env->NewObject(clazz, mid, jmessage, jsource,
-                                           static_cast<jint>(err->apr_err));
+    POP_AND_RETURN_NULL;
+  jobject nativeException = env->NewObject(clazz, mid, jmessage, jcause,
+                                           jsource, jint(err->apr_err),
+                                           jstack);
   if (isJavaExceptionThrown())
-    POP_AND_RETURN_NOTHING();
+    POP_AND_RETURN_NULL;
 
 #ifdef SVN_ERR__TRACING
   // Add all the C error stack trace information to the Java Exception
@@ -491,7 +651,7 @@ void JNIUtil::wrappedHandleSVNError(svn_error_t *err)
       mid_gst = env->GetMethodID(clazz, "getStackTrace",
                                  "()[Ljava/lang/StackTraceElement;");
       if (isJavaExceptionThrown())
-        POP_AND_RETURN_NOTHING();
+        POP_AND_RETURN_NULL;
     }
   Array stackTraceArray((jobjectArray) env->CallObjectMethod(nativeException,
                                                              mid_gst));
@@ -510,18 +670,18 @@ void JNIUtil::wrappedHandleSVNError(svn_error_t *err)
 
   jclass stClazz = env->FindClass("java/lang/StackTraceElement");
   if (isJavaExceptionThrown())
-    POP_AND_RETURN_NOTHING();
+    POP_AND_RETURN_NULL;
 
   const jsize stSize = static_cast<jsize>(newStackTrace.size());
-  if (stSize != newStackTrace.size())
+  if (stSize < 0 || stSize != newStackTrace.size())
     {
       env->ThrowNew(env->FindClass("java.lang.ArithmeticException"),
                     "Overflow converting C size_t to JNI jsize");
-      POP_AND_RETURN_NOTHING();
+      POP_AND_RETURN_NULL;
     }
   jobjectArray jStackTrace = env->NewObjectArray(stSize, stClazz, NULL);
   if (isJavaExceptionThrown())
-    POP_AND_RETURN_NOTHING();
+    POP_AND_RETURN_NULL;
 
   int i = 0;
   for (std::vector<jobject>::const_iterator it = newStackTrace.begin();
@@ -538,25 +698,34 @@ void JNIUtil::wrappedHandleSVNError(svn_error_t *err)
       mid_sst = env->GetMethodID(clazz, "setStackTrace",
                                  "([Ljava/lang/StackTraceElement;)V");
       if (isJavaExceptionThrown())
-        POP_AND_RETURN_NOTHING();
+        POP_AND_RETURN_NULL;
     }
   env->CallVoidMethod(nativeException, mid_sst, jStackTrace);
   if (isJavaExceptionThrown())
-    POP_AND_RETURN_NOTHING();
+    POP_AND_RETURN_NULL;
 #endif
 
-  env->Throw(static_cast<jthrowable>(env->PopLocalFrame(nativeException)));
+  return static_cast<jthrowable>(env->PopLocalFrame(nativeException));
 }
 
-void JNIUtil::handleSVNError(svn_error_t *err)
+jthrowable JNIUtil::createClientException(svn_error_t *err, jthrowable jcause)
 {
+  jthrowable jexc = NULL;
   try {
-    wrappedHandleSVNError(err);
+    jexc = wrappedCreateClientException(err, jcause);
   } catch (...) {
     svn_error_clear(err);
     throw;
   }
   svn_error_clear(err);
+  return jexc;
+}
+
+void JNIUtil::handleSVNError(svn_error_t *err, jthrowable jcause)
+{
+  jthrowable jexc = createClientException(err, jcause);
+  if (jexc)
+    getEnv()->Throw(jexc);
 }
 
 void JNIUtil::putFinalizedClient(SVNBase *object)
@@ -578,120 +747,82 @@ void JNIUtil::enqueueForDeletion(SVNBase *object)
  */
 void JNIUtil::handleAPRError(int error, const char *op)
 {
-  char *buffer = getFormatBuffer();
-  if (buffer == NULL)
-    return;
+  char buffer[2048];
 
-  apr_snprintf(buffer, formatBufferSize,
+  apr_snprintf(buffer, sizeof(buffer),
                _("an error occurred in function %s with return value %d"),
                op, error);
 
   throwError(buffer);
 }
 
-/**
- * Return if an exception has been detected.
- * @return a exception has been detected
- */
-bool JNIUtil::isExceptionThrown()
+namespace {
+const char* known_exception_to_cstring(apr_pool_t* pool)
 {
-  // During init -> look in the global member.
-  if (g_inInit)
-    return g_initException;
-
-  // Look in the thread local storage.
-  JNIThreadData *data = JNIThreadData::getThreadData();
-  return data == NULL || data->m_exceptionThrown;
-}
+  JNIEnv *env = JNIUtil::getEnv();
+  jthrowable t = env->ExceptionOccurred();
+  jclass cls = env->GetObjectClass(t);
 
-/**
- * Store the JNI environment for this request in the thread local
- * storage.
- * @param env   the JNI environment
- */
-void JNIUtil::setEnv(JNIEnv *env)
-{
-  JNIThreadData::pushNewThreadData();
-  JNIThreadData *data = JNIThreadData::getThreadData();
-  data->m_env = env;
-  data->m_exceptionThrown = false;
-}
+  jstring jclass_name;
+  {
+    jmethodID mid = env->GetMethodID(cls, "getClass", "()Ljava/lang/Class;");
+    jobject clsobj = env->CallObjectMethod(t, mid);
+    jclass basecls = env->GetObjectClass(clsobj);
+    mid = env->GetMethodID(basecls, "getName", "()Ljava/lang/String;");
+    jclass_name = (jstring) env->CallObjectMethod(clsobj, mid);
+  }
 
-/**
- * Return the JNI environment to use
- * @return the JNI environment
- */
-JNIEnv *JNIUtil::getEnv()
-{
-  // During init -> look into the global variable.
-  if (g_inInit)
-    return g_initEnv;
+  jstring jmessage;
+  {
+    jmethodID mid = env->GetMethodID(cls, "getMessage",
+                                     "()Ljava/lang/String;");
+    jmessage = (jstring) env->CallObjectMethod(t, mid);
+  }
 
-  // Look in the thread local storage.
-  JNIThreadData *data = JNIThreadData::getThreadData();
-  return data->m_env;
+  JNIStringHolder class_name(jclass_name);
+  if (jmessage)
+    {
+      JNIStringHolder message(jmessage);
+      return apr_pstrcat(pool, class_name.c_str(), ": ", message.c_str(), NULL);
+    }
+  else
+    return class_name.pstrdup(pool);
+  // ### Conditionally add t.printStackTrace() to msg?
 }
 
-/**
- * Check if a Java exception has been thrown.
- * @return is a Java exception has been thrown
- */
-bool JNIUtil::isJavaExceptionThrown()
+const char* exception_to_cstring(apr_pool_t* pool)
 {
-  JNIEnv *env = getEnv();
-  if (env->ExceptionCheck())
+  const char *msg;
+  if (JNIUtil::getEnv()->ExceptionCheck())
     {
-      // Retrieving the exception removes it so we rethrow it here.
-      jthrowable exp = env->ExceptionOccurred();
-      env->ExceptionDescribe();
-      env->Throw(exp);
-      env->DeleteLocalRef(exp);
-      setExceptionThrown();
-      return true;
+      msg = known_exception_to_cstring(pool);
     }
-  return false;
+  else
+    {
+      msg = NULL;
+    }
+  return msg;
 }
+} // anonymous namespace
 
 const char *
 JNIUtil::thrownExceptionToCString(SVN::Pool &in_pool)
 {
-  const char *msg = NULL;
-  JNIEnv *env = getEnv();
-  apr_pool_t *pool = in_pool.getPool();
-  if (env->ExceptionCheck())
-    {
-      jthrowable t = env->ExceptionOccurred();
-      jclass cls = env->GetObjectClass(t);
-
-      jstring jclass_name;
-      {
-        jmethodID mid = env->GetMethodID(cls, "getClass", "()Ljava/lang/Class;");
-        jobject clsobj = env->CallObjectMethod(t, mid);
-        jclass basecls = env->GetObjectClass(clsobj);
-        mid = env->GetMethodID(basecls, "getName", "()Ljava/lang/String;");
-        jclass_name = (jstring) env->CallObjectMethod(clsobj, mid);
-      }
-
-      jstring jmessage;
-      {
-        jmethodID mid = env->GetMethodID(cls, "getMessage",
-                                         "()Ljava/lang/String;");
-        jmessage = (jstring) env->CallObjectMethod(t, mid);
-      }
+  return exception_to_cstring(in_pool.getPool());
+}
 
-      JNIStringHolder class_name(jclass_name);
-      if (jmessage)
-        {
-          JNIStringHolder message(jmessage);
-          msg = apr_pstrcat(pool,
-                            static_cast<const char*>(class_name), ": ",
-                            static_cast<const char*>(message), NULL);
-        }
-      else
-        msg = class_name.pstrdup(pool);
-      // ### Conditionally add t.printStackTrace() to msg?
-    }
-  return msg;
+svn_error_t*
+JNIUtil::checkJavaException(apr_status_t errorcode)
+{
+  if (!getEnv()->ExceptionCheck())
+    return SVN_NO_ERROR;
+  svn_error_t* err = svn_error_create(errorcode, NULL, NULL);
+  const char* const msg = known_exception_to_cstring(err->pool);
+  if (msg)
+    err->message = apr_psprintf(err->pool, _("Java exception: %s"), msg);
+  else
+    err->message = _("Java exception");
+  return err;
 }
 
 /**
@@ -710,25 +841,6 @@ jstring JNIUtil::makeJString(const char *txt)
   return env->NewStringUTF(txt);
 }
 
-void
-JNIUtil::setExceptionThrown(bool flag)
-{
-  if (g_inInit)
-    {
-      // During global initialization, store any errors that occur
-      // in a global variable (since thread-local storage may not
-      // yet be available).
-      g_initException = flag;
-    }
-  else
-    {
-      // When global initialization is complete, thread-local
-      // storage should be available, so store the error there.
-      JNIThreadData *data = JNIThreadData::getThreadData();
-      data->m_exceptionThrown = flag;
-    }
-}
-
 /**
  * Initialite the log file.
  * @param level the log level
@@ -752,23 +864,6 @@ void JNIUtil::initLogFile(int level, jstring path)
 }
 
 /**
- * Returns a buffer to format error messages.
- * @return a buffer for formating error messages
- */
-char *JNIUtil::getFormatBuffer()
-{
-  if (g_inInit) // during init -> use the global buffer
-    return g_initFormatBuffer;
-
-  // use the buffer in the thread local storage
-  JNIThreadData *data = JNIThreadData::getThreadData();
-  if (data == NULL) // if that does not exists -> use the global buffer
-    return g_initFormatBuffer;
-
-  return data->m_formatBuffer;
-}
-
-/**
  * Returns the current log level.
  * @return the log level
  */
@@ -819,6 +914,31 @@ jobject JNIUtil::createDate(apr_time_t time)
   return ret;
 }
 
+apr_time_t
+JNIUtil::getDate(jobject jdate)
+{
+  JNIEnv *env = getEnv();
+  jclass clazz = env->FindClass("java/util/Date");
+  if (isJavaExceptionThrown())
+    return 0;
+
+  static jmethodID mid = 0;
+  if (mid == 0)
+    {
+      mid = env->GetMethodID(clazz, "getTime", "()J");
+      if (isJavaExceptionThrown())
+        return 0;
+    }
+
+  jlong jmillis = env->CallLongMethod(jdate, mid);
+  if (isJavaExceptionThrown())
+    return 0;
+
+  env->DeleteLocalRef(clazz);
+
+  return jmillis * 1000;
+}
+
 /**
  * Create a Java byte array from an array of characters.
  * @param data      the character array
@@ -826,11 +946,9 @@ jobject JNIUtil::createDate(apr_time_t time)
  */
 jbyteArray JNIUtil::makeJByteArray(const void *data, int length)
 {
-  if (data == NULL)
-    {
-      // a NULL will create no Java array
-      return NULL;
-    }
+  // a NULL will create no Java array
+  if (!data)
+    return NULL;
 
   JNIEnv *env = getEnv();
 
@@ -861,62 +979,11 @@ jbyteArray JNIUtil::makeJByteArray(const void *data, int length)
  */
 jbyteArray JNIUtil::makeJByteArray(const svn_string_t *str)
 {
-  return JNIUtil::makeJByteArray(str->data, static_cast<int>(str->len));
-}
-
-/**
- * Build the error message from the svn error into buffer.  This
- * method calls itselft recursively for all the chained errors
- *
- * @param err               the subversion error
- * @param depth             the depth of the call, used for formating
- * @param parent_apr_err    the apr of the previous level, used for formating
- * @param buffer            the buffer where the formated error message will
- *                          be stored
- */
-void JNIUtil::assembleErrorMessage(svn_error_t *err, int depth,
-                                   apr_status_t parent_apr_err,
-                                   std::string &buffer)
-{
-  // buffer for a single error message
-  char errbuf[256];
-
-  /* Pretty-print the error */
-  /* Note: we can also log errors here someday. */
-
-  /* When we're recursing, don't repeat the top-level message if its
-   * the same as before. */
-  if (depth == 0 || err->apr_err != parent_apr_err)
-    {
-      /* Is this a Subversion-specific error code? */
-      if ((err->apr_err > APR_OS_START_USEERR)
-          && (err->apr_err <= APR_OS_START_CANONERR))
-        buffer.append(svn_strerror(err->apr_err, errbuf, sizeof(errbuf)));
-      /* Otherwise, this must be an APR error code. */
-      else
-        {
-          /* Messages coming from apr_strerror are in the native
-             encoding, it's a good idea to convert them to UTF-8. */
-          const char* utf8_message;
-          apr_strerror(err->apr_err, errbuf, sizeof(errbuf));
-          svn_error_t* utf8_err = svn_utf_cstring_to_utf8(
-              &utf8_message, errbuf, err->pool);
-          if (utf8_err)
-            {
-              /* Use fuzzy transliteration instead. */
-              svn_error_clear(utf8_err);
-              utf8_message = svn_utf_cstring_from_utf8_fuzzy(errbuf, err->pool);
-            }
-          buffer.append(utf8_message);
-        }
-      buffer.append("\n");
-    }
-  if (err->message)
-    buffer.append(_("svn: ")).append(err->message).append("\n");
-
-  if (err->child)
-    assembleErrorMessage(err->child, depth + 1, err->apr_err, buffer);
+  // a NULL will create no Java array
+  if (!str)
+    return NULL;
 
+  return JNIUtil::makeJByteArray(str->data, static_cast<int>(str->len));
 }
 
 /**
@@ -936,8 +1003,6 @@ void JNIUtil::throwNullPointerException(const char *message)
     return;
 
   env->ThrowNew(clazz, message);
-  setExceptionThrown();
-  env->DeleteLocalRef(clazz);
 }
 
 svn_error_t *JNIUtil::preprocessPath(const char *&path, apr_pool_t *pool)
@@ -996,3 +1061,91 @@ svn_error_t *JNIUtil::preprocessPath(const char *&path, apr_pool_t *pool)
 
   return NULL;
 }
+
+/* Tag to use on the apr_pool_t to store a WrappedException reference */
+static const char *WrapExceptionTag = "org.apache.subversion.JavaHL.svnerror";
+
+class WrappedException
+{
+  JNIEnv *m_env;
+  jthrowable m_exception;
+#ifdef SVN_DEBUG
+  bool m_fetched;
+#endif
+public:
+  WrappedException(JNIEnv *env)
+  {
+    m_env = env;
+
+    // Fetch exception inside local frame
+    jthrowable exceptionObj = env->ExceptionOccurred();
+
+    // Now clear exception status
+    env->ExceptionClear();
+
+    // As adding a reference in exception state fails
+    m_exception = static_cast<jthrowable>(env->NewGlobalRef(exceptionObj));
+
+#ifdef SVN_DEBUG
+    m_fetched = false;
+#endif
+  }
+
+  static jthrowable get_exception(apr_pool_t *pool)
+  {
+      void *data;
+      if (! apr_pool_userdata_get(&data, WrapExceptionTag, pool))
+      {
+          WrappedException *we = reinterpret_cast<WrappedException *>(data);
+
+          if (we)
+          {
+#ifdef SVN_DEBUG
+              we->m_fetched = TRUE;
+#endif
+              // Create reference in local frame, as the pool will be cleared
+              return static_cast<jthrowable>(
+                            we->m_env->NewLocalRef(we->m_exception));
+          }
+      }
+      return NULL;
+  }
+
+private:
+  ~WrappedException()
+  {
+#ifdef SVN_DEBUG
+      if (!m_fetched)
+          SVN_DBG(("Cleared svn_error_t * before Java exception was fetched"));
+#endif
+      m_env->DeleteGlobalRef(m_exception);
+  }
+public:
+  static apr_status_t cleanup(void *data)
+  {
+    WrappedException *we = reinterpret_cast<WrappedException *>(data);
+
+    delete we;
+    return APR_SUCCESS;
+  }
+};
+
+svn_error_t* JNIUtil::wrapJavaException()
+{
+  if (!isExceptionThrown())
+    return SVN_NO_ERROR;
+
+  svn_error_t *err = svn_error_create(SVN_ERR_JAVAHL_WRAPPED, NULL,
+                                      "Wrapped Java Exception");
+  apr_pool_userdata_set(new WrappedException(getEnv()), WrapExceptionTag,
+                        WrappedException::cleanup, err->pool);
+  return err;
+}
+
+jthrowable JNIUtil::unwrapJavaException(const svn_error_t *err)
+{
+    if (!err)
+        return NULL;
+    return
+        WrappedException::get_exception(err->pool);
+}
diff --git a/subversion/bindings/javahl/native/JNIUtil.h b/subversion/bindings/javahl/native/JNIUtil.h
index d353984..e05d1ef 100644
--- a/subversion/bindings/javahl/native/JNIUtil.h
+++ b/subversion/bindings/javahl/native/JNIUtil.h
@@ -37,11 +37,29 @@ class SVNBase;
 #include <fstream>
 #include <apr_time.h>
 #include <string>
+#include <vector>
+
 struct svn_error_t;
+struct svn_string_t;
 
-#define JAVA_PACKAGE "org/apache/subversion/javahl"
+#include "svn_error.h"
+
+
+/**
+ * The name of the package in which the JavaHL classes are defined.
+ */
+#define JAVAHL_PACKAGE "org/apache/subversion/javahl"
+
+/**
+ * Construct a JavaHL class name for JNIEnv::FindClass.
+ */
+#define JAVAHL_CLASS(name) JAVAHL_PACKAGE name
+
+/**
+ * Construct a JavaHL class parameter name for JNIEnv::GetMethodID & co.
+ */
+#define JAVAHL_ARG(name) "L" JAVAHL_PACKAGE name
 
-struct svn_string_t;
 
 /**
  * Class to hold a number of JNI related utility methods.  No Objects
@@ -67,19 +85,24 @@ class JNIUtil
   static jbyteArray makeJByteArray(const void *data, int length);
   static jbyteArray makeJByteArray(const svn_string_t *str);
   static jobject createDate(apr_time_t time);
+  static apr_time_t getDate(jobject jdate);
   static void logMessage(const char *message);
   static int getLogLevel();
-  static char *getFormatBuffer();
   static void initLogFile(int level, jstring path);
   static jstring makeJString(const char *txt);
-  static bool isJavaExceptionThrown();
   static JNIEnv *getEnv();
-  static void setEnv(JNIEnv *);
 
   /**
    * @return Whether any Throwable has been raised.
    */
-  static bool isExceptionThrown();
+  static bool isExceptionThrown() { return isJavaExceptionThrown(); }
+  static bool isJavaExceptionThrown()
+    {
+      return getEnv()->ExceptionCheck();
+    }
+
+  static svn_error_t *wrapJavaException();
+  static jthrowable unwrapJavaException(const svn_error_t *err);
 
   static void handleAPRError(int error, const char *op);
 
@@ -107,12 +130,27 @@ class JNIUtil
   static const char *thrownExceptionToCString(SVN::Pool &in_pool);
 
   /**
+   * Check if a Java exception was thrown and convert it to a
+   * Subversion error, using @a errorcode as the generic error code.
+   */
+  static svn_error_t* checkJavaException(apr_status_t errorcode);
+
+  /**
+   * Create a Java exception corresponding to err, and run
+   * svn_error_clear() on err.
+   */
+  static jthrowable createClientException(svn_error_t *err,
+                                          jthrowable jcause = NULL);
+
+  /**
    * Throw a Java exception corresponding to err, and run
    * svn_error_clear() on err.
    */
-  static void handleSVNError(svn_error_t *err);
+  static void handleSVNError(svn_error_t *err, jthrowable jcause = NULL);
 
-  static jstring makeSVNErrorMessage(svn_error_t *err);
+  static std::string makeSVNErrorMessage(svn_error_t *err,
+                                         jstring *jerror_message,
+                                         jobject *jmessage_stack);
 
   /**
    * Create and throw a java.lang.Throwable instance.
@@ -130,28 +168,27 @@ class JNIUtil
    */
   static void throwError(const char *message)
     {
-      raiseThrowable(JAVA_PACKAGE"/JNIError", message);
+      raiseThrowable(JAVAHL_CLASS("/JNIError"), message);
     }
 
   static apr_pool_t *getPool();
-  static bool JNIGlobalInit(JNIEnv *env);
   static bool JNIInit(JNIEnv *env);
   static bool initializeJNIRuntime();
-  enum { formatBufferSize = 2048 };
   enum { noLog, errorLog, exceptionLog, entryLog } LogLevel;
 
+  /**
+   * Mutex that secures the global configuration object.
+   */
+  static JNIMutex *g_configMutex;
+
  private:
-  static void wrappedHandleSVNError(svn_error_t *err);
-  static void assembleErrorMessage(svn_error_t *err, int depth,
-                                   apr_status_t parent_apr_err,
-                                   std::string &buffer);
+  friend bool initialize_jni_util(JNIEnv *env);
+  static bool JNIGlobalInit(JNIEnv *env);
+
+  static jthrowable wrappedCreateClientException(svn_error_t *err,
+                                                 jthrowable jcause);
   static void putErrorsInTrace(svn_error_t *err,
                                std::vector<jobject> &stackTrace);
-  /**
-   * Set the appropriate global or thread-local flag that an exception
-   * has been thrown to @a flag.
-   */
-  static void setExceptionThrown(bool flag = true);
 
   /**
    * The log level of this module.
@@ -185,22 +222,6 @@ class JNIUtil
   static bool g_initException;
 
   /**
-   * Flag, that one thread is in the init code.  Cannot use mutex
-   * here since apr is not initialized yet.
-   */
-  static bool g_inInit;
-
-  /**
-   * The JNI environment used during initialization.
-   */
-  static JNIEnv *g_initEnv;
-
-  /**
-   * Fuffer the format error messages during initialization.
-   */
-  static char g_initFormatBuffer[formatBufferSize];
-
-  /**
    * The stream to write log messages to.
    */
   static std::ofstream g_logStream;
@@ -270,6 +291,16 @@ class JNIUtil
     }                                   \
   while (0)
 
+#define POP_AND_RETURN_EXCEPTION_AS_SVNERROR()                            \
+  do                                                                      \
+    {                                                                     \
+      svn_error_t *svn__err_for_exception = JNIUtil::wrapJavaException(); \
+                                                                          \
+      env->PopLocalFrame(NULL);                                           \
+      return svn__err_for_exception;                                      \
+    }                                                                     \
+  while (0)
+
 
 /**
  * A useful macro.
@@ -284,4 +315,19 @@ class JNIUtil
     }                                                   \
   } while (0)
 
+#define SVN_JNI_CATCH(statement, errorcode)             \
+  do {                                                  \
+    do { statement; } while(0);                         \
+    SVN_ERR(JNIUtil::checkJavaException((errorcode)));  \
+  } while(0)
+
+#define SVN_JNI_CATCH_VOID(statement)                   \
+  do {                                                  \
+    do { statement; } while(0);                         \
+    if (JNIUtil::getEnv()->ExceptionCheck()) {          \
+      JNIUtil::getEnv()->ExceptionClear();              \
+      return;                                           \
+    }                                                   \
+  } while(0)
+
 #endif  // JNIUTIL_H
diff --git a/subversion/bindings/javahl/native/ListCallback.cpp b/subversion/bindings/javahl/native/ListCallback.cpp
index 9759ff6..1cd089d 100644
--- a/subversion/bindings/javahl/native/ListCallback.cpp
+++ b/subversion/bindings/javahl/native/ListCallback.cpp
@@ -87,13 +87,13 @@ ListCallback::doList(const char *path,
   static jmethodID mid = 0;
   if (mid == 0)
     {
-      jclass clazz = env->FindClass(JAVA_PACKAGE"/callback/ListCallback");
+      jclass clazz = env->FindClass(JAVAHL_CLASS("/callback/ListCallback"));
       if (JNIUtil::isJavaExceptionThrown())
         POP_AND_RETURN(SVN_NO_ERROR);
 
       mid = env->GetMethodID(clazz, "doEntry",
-                             "(L"JAVA_PACKAGE"/types/DirEntry;"
-                             "L"JAVA_PACKAGE"/types/Lock;)V");
+                             "(" JAVAHL_ARG("/types/DirEntry;")
+                             JAVAHL_ARG("/types/Lock;") ")V");
       if (JNIUtil::isJavaExceptionThrown() || mid == 0)
         POP_AND_RETURN(SVN_NO_ERROR);
     }
@@ -113,10 +113,8 @@ ListCallback::doList(const char *path,
 
   // call the Java method
   env->CallVoidMethod(m_callback, mid, jdirentry, jlock);
-  // No need to check for exception here, because we'll just return anyway
 
-  env->PopLocalFrame(NULL);
-  return SVN_NO_ERROR;
+  POP_AND_RETURN_EXCEPTION_AS_SVNERROR();
 }
 
 /**
@@ -126,53 +124,5 @@ jobject
 ListCallback::createJavaDirEntry(const char *path, const char *absPath,
                                  const svn_dirent_t *dirent)
 {
-  JNIEnv *env = JNIUtil::getEnv();
-
-  // Create a local frame for our references
-  env->PushLocalFrame(LOCAL_FRAME_SIZE);
-  if (JNIUtil::isJavaExceptionThrown())
-    return SVN_NO_ERROR;
-
-  jclass clazz = env->FindClass(JAVA_PACKAGE"/types/DirEntry");
-  if (JNIUtil::isJavaExceptionThrown())
-    POP_AND_RETURN_NULL;
-
-  static jmethodID mid = 0;
-  if (mid == 0)
-    {
-      mid = env->GetMethodID(clazz, "<init>",
-                             "(Ljava/lang/String;Ljava/lang/String;"
-                             "L"JAVA_PACKAGE"/types/NodeKind;"
-                             "JZJJLjava/lang/String;)V");
-      if (JNIUtil::isJavaExceptionThrown())
-        POP_AND_RETURN_NULL;
-    }
-
-  jstring jPath = JNIUtil::makeJString(path);
-  if (JNIUtil::isJavaExceptionThrown())
-    POP_AND_RETURN_NULL;
-
-  jstring jAbsPath = JNIUtil::makeJString(absPath);
-  if (JNIUtil::isJavaExceptionThrown())
-    POP_AND_RETURN_NULL;
-
-  jobject jNodeKind = EnumMapper::mapNodeKind(dirent->kind);
-  if (JNIUtil::isJavaExceptionThrown())
-    POP_AND_RETURN_NULL;
-
-  jlong jSize = dirent->size;
-  jboolean jHasProps = (dirent->has_props? JNI_TRUE : JNI_FALSE);
-  jlong jLastChangedRevision = dirent->created_rev;
-  jlong jLastChanged = dirent->time;
-  jstring jLastAuthor = JNIUtil::makeJString(dirent->last_author);
-  if (JNIUtil::isJavaExceptionThrown())
-    POP_AND_RETURN_NULL;
-
-  jobject ret = env->NewObject(clazz, mid, jPath, jAbsPath, jNodeKind,
-                               jSize, jHasProps, jLastChangedRevision,
-                               jLastChanged, jLastAuthor);
-  if (JNIUtil::isJavaExceptionThrown())
-    POP_AND_RETURN_NULL;
-
-  return env->PopLocalFrame(ret);
+  return CreateJ::DirEntry(path, absPath, dirent);
 }
diff --git a/subversion/bindings/javahl/native/LockTokenTable.cpp b/subversion/bindings/javahl/native/LockTokenTable.cpp
new file mode 100644
index 0000000..ebf50da
--- /dev/null
+++ b/subversion/bindings/javahl/native/LockTokenTable.cpp
@@ -0,0 +1,114 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ *
+ * @file LockTokenTable.cpp
+ * @brief Implementation of the class LockTokenTable
+ */
+
+#include "LockTokenTable.h"
+#include "JNIUtil.h"
+#include "JNIStringHolder.h"
+#include "Array.h"
+#include <apr_hash.h>
+
+LockTokenTable::~LockTokenTable()
+{
+  if (m_jlock_tokens)
+    JNIUtil::getEnv()->DeleteLocalRef(m_jlock_tokens);
+}
+
+apr_hash_t*
+LockTokenTable::hash(const SVN::Pool &pool, bool null_if_empty)
+{
+  if (m_lock_tokens.size() == 0 && null_if_empty)
+    return NULL;
+
+  apr_pool_t* result_pool = pool.getPool();
+  apr_hash_t* lock_table = apr_hash_make(result_pool);
+
+  for (lock_tokens_t::const_iterator it = m_lock_tokens.begin();
+       it != m_lock_tokens.end(); ++it)
+    {
+      const char *path = apr_pstrdup(result_pool, it->first.c_str());
+      const char *token = apr_pstrdup(result_pool, it->second.c_str());
+      apr_hash_set(lock_table, path, APR_HASH_KEY_STRING, token);
+    }
+
+  return lock_table;
+}
+
+LockTokenTable::LockTokenTable(jobject jlock_tokens)
+  : m_jlock_tokens(jlock_tokens)
+{
+
+  if (jlock_tokens != NULL)
+    {
+      JNIEnv *env = JNIUtil::getEnv();
+
+      jclass lock_cls = env->FindClass(JAVAHL_CLASS("/types/Lock"));
+      if (JNIUtil::isExceptionThrown())
+        return;
+
+      static jmethodID getPath_mid = 0;
+      if (0 == getPath_mid)
+        {
+          getPath_mid = env->GetMethodID(lock_cls, "getPath",
+                                         "()Ljava/lang/String;");
+          if (JNIUtil::isExceptionThrown())
+            return;
+        }
+
+      static jmethodID getToken_mid = 0;
+      if (0 == getToken_mid)
+        {
+          getToken_mid = env->GetMethodID(lock_cls, "getToken",
+                                          "()Ljava/lang/String;");
+          if (JNIUtil::isExceptionThrown())
+            return;
+        }
+
+      std::vector<jobject> locks = Array(jlock_tokens).vector();
+      for (std::vector<jobject>::const_iterator it = locks.begin();
+           it != locks.end(); ++it)
+        {
+          jobject jpath = env->CallObjectMethod(*it, getPath_mid);
+          if (JNIUtil::isExceptionThrown())
+            return;
+          jobject jtoken = env->CallObjectMethod(*it, getToken_mid);
+          if (JNIUtil::isExceptionThrown())
+            return;
+
+          JNIStringHolder path((jstring)jpath);
+          if (JNIUtil::isExceptionThrown())
+            return;
+          JNIStringHolder token((jstring)jtoken);
+          if (JNIUtil::isExceptionThrown())
+            return;
+
+          m_lock_tokens[std::string(static_cast<const char *>(path))] =
+            std::string(static_cast<const char *>(token));
+
+          env->DeleteLocalRef(jpath);
+          env->DeleteLocalRef(jtoken);
+        }
+    }
+}
diff --git a/subversion/bindings/javahl/native/LockTokenTable.h b/subversion/bindings/javahl/native/LockTokenTable.h
new file mode 100644
index 0000000..af8b32a
--- /dev/null
+++ b/subversion/bindings/javahl/native/LockTokenTable.h
@@ -0,0 +1,50 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ *
+ * @file LockTokenTable.h
+ * @brief Interface of the class LockTokenTable
+ */
+
+#ifndef JAVAHL_LOCK_TOKEN_TABLE_H
+#define JAVAHL_LOCK_TOKEN_TABLE_H
+
+#include <jni.h>
+#include "Pool.h"
+
+struct apr_hash_t;
+
+#include <map>
+#include <string>
+
+class LockTokenTable
+{
+ private:
+  typedef std::map<std::string, std::string> lock_tokens_t;
+  lock_tokens_t m_lock_tokens;
+  jobject m_jlock_tokens;
+ public:
+  LockTokenTable(jobject jlock_tokens);
+  ~LockTokenTable();
+  apr_hash_t *hash(const SVN::Pool &pool, bool null_if_empty = true);
+};
+
+#endif // JAVAHL_LOCK_TOKEN_TABLE_H
diff --git a/subversion/bindings/javahl/native/LogMessageCallback.cpp b/subversion/bindings/javahl/native/LogMessageCallback.cpp
index 237aabf..ffda075 100644
--- a/subversion/bindings/javahl/native/LogMessageCallback.cpp
+++ b/subversion/bindings/javahl/native/LogMessageCallback.cpp
@@ -81,7 +81,7 @@ LogMessageCallback::singleMessage(svn_log_entry_t *log_entry, apr_pool_t *pool)
   static jmethodID sm_mid = 0;
   if (sm_mid == 0)
     {
-      jclass clazz = env->FindClass(JAVA_PACKAGE"/callback/LogMessageCallback");
+      jclass clazz = env->FindClass(JAVAHL_CLASS("/callback/LogMessageCallback"));
       if (JNIUtil::isJavaExceptionThrown())
         POP_AND_RETURN(SVN_NO_ERROR);
 
@@ -103,9 +103,9 @@ LogMessageCallback::singleMessage(svn_log_entry_t *log_entry, apr_pool_t *pool)
            hi = apr_hash_next(hi))
         {
           const char *path =
-            reinterpret_cast<const char *>(svn__apr_hash_index_key(hi));
+            reinterpret_cast<const char *>(apr_hash_this_key(hi));
           svn_log_changed_path2_t *log_item =
-            reinterpret_cast<svn_log_changed_path2_t *>(svn__apr_hash_index_val(hi));
+            reinterpret_cast<svn_log_changed_path2_t *>(apr_hash_this_val(hi));
 
           jobject cp = CreateJ::ChangedPath(path, log_item);
 
@@ -117,7 +117,7 @@ LogMessageCallback::singleMessage(svn_log_entry_t *log_entry, apr_pool_t *pool)
 
   jobject jrevprops = NULL;
   if (log_entry->revprops != NULL && apr_hash_count(log_entry->revprops) > 0)
-    jrevprops = CreateJ::PropertyMap(log_entry->revprops);
+    jrevprops = CreateJ::PropertyMap(log_entry->revprops, pool);
 
   env->CallVoidMethod(m_callback,
                       sm_mid,
@@ -125,8 +125,6 @@ LogMessageCallback::singleMessage(svn_log_entry_t *log_entry, apr_pool_t *pool)
                       (jlong)log_entry->revision,
                       jrevprops,
                       (jboolean)log_entry->has_children);
-  // No need to check for an exception here, because we return anyway.
 
-  env->PopLocalFrame(NULL);
-  return SVN_NO_ERROR;
+  POP_AND_RETURN_EXCEPTION_AS_SVNERROR();
 }
diff --git a/subversion/bindings/javahl/native/MessageReceiver.cpp b/subversion/bindings/javahl/native/MessageReceiver.cpp
index 18f695d..330c527 100644
--- a/subversion/bindings/javahl/native/MessageReceiver.cpp
+++ b/subversion/bindings/javahl/native/MessageReceiver.cpp
@@ -58,7 +58,7 @@ void MessageReceiver::receiveMessage(const char *message)
   static jmethodID mid = 0;
   if (mid == 0)
     {
-      jclass clazz = env->FindClass(JAVA_PACKAGE"/ISVNAdmin$MessageReceiver");
+      jclass clazz = env->FindClass(JAVAHL_CLASS("/ISVNAdmin$MessageReceiver"));
       if (JNIUtil::isJavaExceptionThrown())
         return;
 
diff --git a/subversion/bindings/javahl/native/NativeStream.cpp b/subversion/bindings/javahl/native/NativeStream.cpp
new file mode 100644
index 0000000..193c36f
--- /dev/null
+++ b/subversion/bindings/javahl/native/NativeStream.cpp
@@ -0,0 +1,381 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+#include "NativeStream.hpp"
+
+#include "jniwrapper/jni_stack.hpp"
+#include "jniwrapper/jni_exception.hpp"
+
+#include "svn_private_config.h"
+
+namespace JavaHL {
+
+// Class JavaHL::NativeInputStream
+
+const char* const NativeInputStream::m_class_name =
+    JAVAHL_CLASS("/types/NativeInputStream");
+
+NativeInputStream::~NativeInputStream() {}
+
+void NativeInputStream::set_stream(svn_stream_t* stream)
+{
+  if (m_stream)
+    throw std::logic_error(_("Native input stream is already bound"));
+  m_stream = stream;
+}
+
+NativeInputStream*
+NativeInputStream::get_self_unsafe(::Java::Env env, jobject jthis)
+{
+  jfieldID fid_cppaddr = NULL;
+  const jlong cppaddr =
+    findCppAddrForJObject(jthis, &fid_cppaddr, m_class_name);
+  return reinterpret_cast<NativeInputStream*>(cppaddr);
+}
+
+NativeInputStream*
+NativeInputStream::get_self(::Java::Env env, jobject jthis)
+{
+  NativeInputStream* self = get_self_unsafe(env, jthis);
+  if (!self)
+    ::Java::NullPointerException(env).raise(_("this [C++]"));
+  return self;
+}
+
+void NativeInputStream::close(::Java::Env env, jobject jthis)
+{
+  SVN_JAVAHL_CHECK(env, svn_stream_close(m_stream));
+  dispose(jthis);
+}
+
+bool NativeInputStream::mark_supported(::Java::Env env) const
+{
+  return svn_stream_supports_mark(m_stream);
+}
+
+void NativeInputStream::mark(::Java::Env env)
+{
+  if (!svn_stream_supports_mark(m_stream))
+    return;
+  SVN_JAVAHL_CHECK(env, svn_stream_mark(m_stream, &m_mark, pool.getPool()));
+}
+
+void NativeInputStream::reset(::Java::Env env)
+{
+  if (!svn_stream_supports_mark(m_stream))
+    return;
+  if (m_mark)
+    SVN_JAVAHL_CHECK(env, svn_stream_seek(m_stream, m_mark));
+  else
+    ::Java::IOException(env).raise(_("Invalid seek on native stream"));
+ }
+
+jint NativeInputStream::read(::Java::Env env)
+{
+  apr_size_t len = 1;
+  char byte;
+  SVN_JAVAHL_CHECK(env, svn_stream_read_full(m_stream, &byte, &len));
+  if (len == 0)
+    return -1;                  // EOF
+  if (len == 1)
+    return jint(byte & 0xff);
+  ::Java::IOException(env).raise(_("Read from native stream failed"));
+  return -1;
+}
+
+jint NativeInputStream::read(::Java::Env env,
+                             ::Java::ByteArray::MutableContents& dst,
+                             jint offset, jint length)
+{
+  if (offset < 0 || length < 0 || offset + length > dst.length())
+    ::Java::IndexOutOfBoundsException(env).raise();
+  if (!dst.data())
+    ::Java::NullPointerException(env).raise();
+
+  apr_size_t len = length;
+  if (svn_stream_supports_partial_read(m_stream))
+    SVN_JAVAHL_CHECK(env, svn_stream_read2(m_stream,
+                                           dst.data() + offset, &len));
+  else
+    SVN_JAVAHL_CHECK(env, svn_stream_read_full(m_stream,
+                                               dst.data() + offset, &len));
+  if (len == 0)
+    return -1;                  // EOF
+  if (len <= length)
+    return jint(len);
+  ::Java::IOException(env).raise(_("Read from native stream failed"));
+  return -1;
+}
+
+jlong NativeInputStream::skip(::Java::Env env, jlong count)
+{
+  const apr_size_t len = count;
+  SVN_JAVAHL_CHECK(env, svn_stream_skip(m_stream, len));
+  return count;
+}
+
+void NativeInputStream::dispose(jobject jthis)
+{
+  jfieldID fid_cppaddr = NULL;
+  SVNBase::dispose(jthis, &fid_cppaddr, m_class_name);
+}
+
+
+// Class JavaHL::NativeOutputStream
+
+const char* const NativeOutputStream::m_class_name =
+  JAVAHL_CLASS("/types/NativeOutputStream");
+
+NativeOutputStream::~NativeOutputStream() {}
+
+void NativeOutputStream::set_stream(svn_stream_t* stream)
+{
+  if (m_stream)
+    throw std::logic_error(_("Native output stream is already bound"));
+  m_stream = stream;
+}
+
+NativeOutputStream*
+NativeOutputStream::get_self_unsafe(::Java::Env env, jobject jthis)
+{
+  jfieldID fid_cppaddr = NULL;
+  const jlong cppaddr =
+    findCppAddrForJObject(jthis, &fid_cppaddr, m_class_name);
+  return reinterpret_cast<NativeOutputStream*>(cppaddr);
+}
+
+NativeOutputStream*
+NativeOutputStream::get_self(::Java::Env env, jobject jthis)
+{
+  NativeOutputStream* self = get_self_unsafe(env, jthis);
+  if (!self)
+    ::Java::NullPointerException(env).raise(_("this [C++]"));
+  return self;
+}
+
+void NativeOutputStream::close(::Java::Env env, jobject jthis)
+{
+  SVN_JAVAHL_CHECK(env, svn_stream_close(m_stream));
+  dispose(jthis);
+}
+
+void NativeOutputStream::write(::Java::Env env, jint byte)
+{
+  const char data = char(byte & 0xff);
+  apr_size_t len = 1;
+  SVN_JAVAHL_CHECK(env, svn_stream_write(m_stream, &data, &len));
+  if (len != 1)
+    ::Java::IOException(env).raise(_("Write to native stream failed"));
+}
+
+void NativeOutputStream::write(::Java::Env env,
+                               const ::Java::ByteArray::Contents& src,
+                               jint offset, jint length)
+{
+  if (offset < 0 || length < 0 || offset + length > src.length())
+    ::Java::IndexOutOfBoundsException(env).raise();
+  if (!src.data())
+    ::Java::NullPointerException(env).raise();
+
+  apr_size_t len = length;
+  SVN_JAVAHL_CHECK(env, svn_stream_write(m_stream, src.data() + offset, &len));
+  if (len != length)
+    ::Java::IOException(env).raise(_("Write to native stream failed"));
+}
+
+void NativeOutputStream::dispose(jobject jthis)
+{
+  jfieldID fid_cppaddr = NULL;
+  SVNBase::dispose(jthis, &fid_cppaddr, m_class_name);
+}
+
+} // namespace JavaHL
+
+
+// Class JavaHL::NativeInputStream native method implementation
+#include "../include/org_apache_subversion_javahl_types_NativeInputStream.h"
+
+JNIEXPORT void JNICALL
+Java_org_apache_subversion_javahl_types_NativeInputStream_close(
+    JNIEnv* jenv, jobject jthis)
+{
+  SVN_JAVAHL_JNI_TRY(NativeInputStream, close)
+    {
+      SVN_JAVAHL_GET_BOUND_OBJECT(JavaHL::NativeInputStream, self);
+      self->close(Java::Env(jenv), jthis);
+    }
+  SVN_JAVAHL_JNI_CATCH_TO_EXCEPTION(Java::IOException);
+}
+
+JNIEXPORT jboolean JNICALL
+Java_org_apache_subversion_javahl_types_NativeInputStream_markSupported(
+    JNIEnv* jenv, jobject jthis)
+{
+  SVN_JAVAHL_JNI_TRY(NativeInputStream, markSupported)
+    {
+      SVN_JAVAHL_GET_BOUND_OBJECT(JavaHL::NativeInputStream, self);
+      self->mark_supported(Java::Env(jenv));
+    }
+  SVN_JAVAHL_JNI_CATCH_TO_EXCEPTION(Java::IOException);
+  return false;
+}
+
+JNIEXPORT void JNICALL
+Java_org_apache_subversion_javahl_types_NativeInputStream_mark(
+    JNIEnv* jenv, jobject jthis, jint)
+{
+  SVN_JAVAHL_JNI_TRY(NativeInputStream, mark)
+    {
+      SVN_JAVAHL_GET_BOUND_OBJECT(JavaHL::NativeInputStream, self);
+      self->mark(Java::Env(jenv));
+    }
+  SVN_JAVAHL_JNI_CATCH_TO_EXCEPTION(Java::IOException);
+}
+
+JNIEXPORT void JNICALL
+Java_org_apache_subversion_javahl_types_NativeInputStream_reset(
+    JNIEnv* jenv, jobject jthis)
+{
+  SVN_JAVAHL_JNI_TRY(NativeInputStream, reset)
+    {
+      SVN_JAVAHL_GET_BOUND_OBJECT(JavaHL::NativeInputStream, self);
+      self->reset(Java::Env(jenv));
+    }
+  SVN_JAVAHL_JNI_CATCH_TO_EXCEPTION(Java::IOException);
+}
+
+JNIEXPORT jint JNICALL
+Java_org_apache_subversion_javahl_types_NativeInputStream_read__(
+    JNIEnv* jenv, jobject jthis)
+{
+  SVN_JAVAHL_JNI_TRY(NativeInputStream, read)
+    {
+      SVN_JAVAHL_GET_BOUND_OBJECT(JavaHL::NativeInputStream, self);
+      return self->read(Java::Env(jenv));
+    }
+  SVN_JAVAHL_JNI_CATCH_TO_EXCEPTION(Java::IOException);
+  return 0;
+}
+
+JNIEXPORT jint JNICALL
+Java_org_apache_subversion_javahl_types_NativeInputStream_read___3BII(
+    JNIEnv* jenv, jobject jthis, jbyteArray jdst, jint joffset, jint jlength)
+{
+  SVN_JAVAHL_JNI_TRY(NativeInputStream, read)
+    {
+      SVN_JAVAHL_GET_BOUND_OBJECT(JavaHL::NativeInputStream, self);
+
+      const Java::Env env(jenv);
+      Java::ByteArray dst(env, jdst);
+      Java::ByteArray::MutableContents dst_contents(dst);
+
+      return self->read(env, dst_contents, joffset, jlength);
+    }
+  SVN_JAVAHL_JNI_CATCH_TO_EXCEPTION(Java::IOException);
+  return 0;
+}
+
+JNIEXPORT jlong JNICALL
+Java_org_apache_subversion_javahl_types_NativeInputStream_skip(
+    JNIEnv* jenv, jobject jthis, jlong jcount)
+{
+  SVN_JAVAHL_JNI_TRY(NativeInputStream, skip)
+    {
+      SVN_JAVAHL_GET_BOUND_OBJECT(JavaHL::NativeInputStream, self);
+      return self->skip(Java::Env(jenv), jcount);
+    }
+  SVN_JAVAHL_JNI_CATCH_TO_EXCEPTION(Java::IOException);
+  return 0;
+}
+
+JNIEXPORT void JNICALL
+Java_org_apache_subversion_javahl_types_NativeInputStream_finalize(
+    JNIEnv* jenv, jobject jthis)
+{
+  SVN_JAVAHL_JNI_TRY(NativeInputStream, finalize)
+    {
+      JavaHL::NativeInputStream* native =
+        JavaHL::NativeInputStream::get_self_unsafe(Java::Env(jenv), jthis);
+      if (native != NULL)
+          native->finalize();
+    }
+  SVN_JAVAHL_JNI_CATCH;
+}
+
+
+// Class JavaHL::NativeOutputStream native method implementation
+#include "../include/org_apache_subversion_javahl_types_NativeOutputStream.h"
+
+JNIEXPORT void JNICALL
+Java_org_apache_subversion_javahl_types_NativeOutputStream_close(
+    JNIEnv* jenv, jobject jthis)
+{
+  SVN_JAVAHL_JNI_TRY(NativeOutputStream, close)
+    {
+      SVN_JAVAHL_GET_BOUND_OBJECT(JavaHL::NativeOutputStream, self);
+      self->close(Java::Env(jenv), jthis);
+    }
+  SVN_JAVAHL_JNI_CATCH_TO_EXCEPTION(Java::IOException);
+}
+
+JNIEXPORT void JNICALL
+Java_org_apache_subversion_javahl_types_NativeOutputStream_write__I(
+    JNIEnv* jenv, jobject jthis, jint byte)
+{
+  SVN_JAVAHL_JNI_TRY(NativeOutputStream, write)
+    {
+      SVN_JAVAHL_GET_BOUND_OBJECT(JavaHL::NativeOutputStream, self);
+      self->write(Java::Env(jenv), byte);
+    }
+  SVN_JAVAHL_JNI_CATCH_TO_EXCEPTION(Java::IOException);
+}
+
+JNIEXPORT void JNICALL
+Java_org_apache_subversion_javahl_types_NativeOutputStream_write___3BII(
+    JNIEnv* jenv, jobject jthis, jbyteArray jsrc, jint joffset, jint jlength)
+{
+  SVN_JAVAHL_JNI_TRY(NativeOutputStream, write)
+    {
+      SVN_JAVAHL_GET_BOUND_OBJECT(JavaHL::NativeOutputStream, self);
+
+      const Java::Env env(jenv);
+      const Java::ByteArray src(env, jsrc);
+
+      self->write(env, Java::ByteArray::Contents(src), joffset, jlength);
+    }
+  SVN_JAVAHL_JNI_CATCH_TO_EXCEPTION(Java::IOException);
+}
+
+JNIEXPORT void JNICALL
+Java_org_apache_subversion_javahl_types_NativeOutputStream_finalize(
+    JNIEnv* jenv, jobject jthis)
+{
+  SVN_JAVAHL_JNI_TRY(NativeOutputStream, finalize)
+    {
+      JavaHL::NativeOutputStream* native =
+        JavaHL::NativeOutputStream::get_self_unsafe(Java::Env(jenv), jthis);
+      if (native != NULL)
+          native->finalize();
+    }
+  SVN_JAVAHL_JNI_CATCH;
+}
diff --git a/subversion/bindings/javahl/native/NativeStream.hpp b/subversion/bindings/javahl/native/NativeStream.hpp
new file mode 100644
index 0000000..57fd137
--- /dev/null
+++ b/subversion/bindings/javahl/native/NativeStream.hpp
@@ -0,0 +1,211 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+#ifndef SVN_JAVAHL_NATIVE_STREAM_HPP
+#define SVN_JAVAHL_NATIVE_STREAM_HPP
+
+#include <stdexcept>
+
+#include "jniwrapper/jni_array.hpp"
+
+#include "SVNBase.h"
+
+#include "svn_io.h"
+
+namespace JavaHL {
+
+/**
+ * Object wrapper for @c org.apache.subversion.javahl.types.NativeInputStream.
+ *
+ * @since New in 1.9.
+ */
+class NativeInputStream : public ::SVNBase
+{
+public:
+  /**
+   * Construcs the native instance that will be wrapped in a Java obejct.
+   * If @a stream is @c NULL, you must call #set_stream before creating
+   * the Java wrapper.
+   */
+  explicit NativeInputStream(svn_stream_t* stream = NULL)
+    : m_stream(stream),
+      m_mark(NULL)
+    {}
+
+  ~NativeInputStream();
+
+  /**
+   * Returns a reference to the pool owned by this wrapped object.
+   */
+  const SVN::Pool& get_pool() const
+    {
+      return pool;
+    }
+
+  /**
+   * Sets the @a stream that this object will own.
+   * Do not call this function if a stream was passed to the constructor.
+   */
+  void set_stream(svn_stream_t* stream);
+
+  /**
+   * Create the Java object that binds to this native object.
+   */
+  jobject create_java_wrapper()
+    {
+      return createCppBoundObject(m_class_name);
+    }
+
+  /**
+   * Retrieve the address of the native object from the bound Java object.
+   */
+  static NativeInputStream* get_self(::Java::Env env, jobject jthis);
+
+  static NativeInputStream* get_self_unsafe(::Java::Env env, jobject jthis);
+
+public:
+  /**
+   * Implements @c InputStream.close().
+   * Also disposes the native object.
+   */
+  void close(::Java::Env env, jobject jthis);
+
+  /**
+   * Implements @c InputStream.markSupported().
+   */
+  bool mark_supported(::Java::Env env) const;
+
+  /**
+   * Implements @c InputStream.mark(int).
+   * The @c readlimit parameter of the Java method is ignored.
+   */
+  void mark(::Java::Env env);
+
+  /**
+   * Implements @c InputStream.reset().
+   */
+  void reset(::Java::Env env);
+
+  /**
+   * Implements @c InputStream.read().
+   */
+  jint read(::Java::Env env);
+
+  /**
+   * Implements @c InputStream.read(byte[],int,int).
+   */
+  jint read(::Java::Env env,
+            ::Java::ByteArray::MutableContents& dst,
+            jint offset, jint length);
+
+  /**
+   * Implements @c InputStream.skip(long).
+   */
+  jlong skip(::Java::Env env, jlong count);
+
+private:
+  virtual void dispose(jobject jthis);
+
+  static const char* const m_class_name;
+  svn_stream_t* m_stream;
+  svn_stream_mark_t* m_mark;
+};
+
+
+/**
+ * Object wrapper for @c org.apache.subversion.javahl.types.NativeOutputStream.
+ *
+ * @since New in 1.9.
+ */
+class NativeOutputStream : public ::SVNBase
+{
+public:
+  /**
+   * Construcs the native instance that will be wrapped in a Java obejct.
+   * If @a stream is @c NULL, you must call #set_stream before creating
+   * the Java wrapper.
+   */
+  explicit NativeOutputStream(svn_stream_t* stream = NULL)
+    : m_stream(stream)
+    {}
+
+  ~NativeOutputStream();
+
+  /**
+   * Returns a reference to the pool owned by this wrapped object.
+   */
+  const SVN::Pool& get_pool() const
+    {
+      return pool;
+    }
+
+  /**
+   * Sets the @a stream that this object will own.
+   * Do not call this function if a stream was passed to the constructor.
+   */
+  void set_stream(svn_stream_t* stream);
+
+  /**
+   * Create the Java object that binds to this native object.
+   */
+  jobject create_java_wrapper()
+    {
+      return createCppBoundObject(m_class_name);
+    }
+
+  /**
+   * Retrieve the address of the native object from the bound Java object.
+   */
+  static NativeOutputStream* get_self(::Java::Env env, jobject jthis);
+
+  static NativeOutputStream* get_self_unsafe(::Java::Env env, jobject jthis);
+
+public:
+  /**
+   * Implements @c OutputStream.close().
+   * Also disposes the native object.
+   */
+  void close(::Java::Env env, jobject jthis);
+
+  /**
+   * Implements @c OutputStream.write(int).
+   */
+  void write(::Java::Env env, jint byte);
+
+  /**
+   * Implements @c OutputStream.write(byte[],int,int).
+   */
+  void write(::Java::Env env,
+             const ::Java::ByteArray::Contents& src,
+             jint offset, jint length);
+
+private:
+  virtual void dispose(jobject jthis);
+
+  static const char* const m_class_name;
+  svn_stream_t* m_stream;
+};
+
+} // namespace JavaHL
+
+#endif // SVN_JAVAHL_NATIVE_STREAM_HPP
diff --git a/subversion/bindings/javahl/native/OperationContext.cpp b/subversion/bindings/javahl/native/OperationContext.cpp
new file mode 100644
index 0000000..b455c36
--- /dev/null
+++ b/subversion/bindings/javahl/native/OperationContext.cpp
@@ -0,0 +1,657 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ *
+ * @file OperationContext.cpp
+ * @brief Implementation of the class OperationContext
+ */
+
+#include <apr_file_io.h>
+
+#include "GlobalConfig.h"
+#include "OperationContext.h"
+#include "JNIUtil.h"
+#include "JNICriticalSection.h"
+
+#include "Prompter.h"
+#include "CreateJ.h"
+#include "EnumMapper.h"
+#include "CommitMessage.h"
+
+#include "svn_client.h"
+#include "private/svn_wc_private.h"
+#include "private/svn_dep_compat.h"
+#include "svn_private_config.h"
+
+OperationContext::OperationContext(SVN::Pool &pool)
+  : m_config(NULL),
+    m_prompter(NULL),
+    m_cancelOperation(0),
+    m_pool(&pool),
+    m_jctx(NULL),
+    m_jcfgcb(NULL),
+    m_jtunnelcb(NULL)
+{}
+
+void
+OperationContext::attachJavaObject(
+    jobject contextHolder, const char *contextClassType,
+    const char *contextFieldName, jfieldID * ctxFieldID)
+{
+  JNIEnv *env = JNIUtil::getEnv();
+
+  /* Grab a global reference to the Java object embedded in the parent
+     Java object. */
+  if ((*ctxFieldID) == 0)
+    {
+      jclass clazz = env->GetObjectClass(contextHolder);
+      if (JNIUtil::isJavaExceptionThrown())
+        return;
+
+      (*ctxFieldID) = env->GetFieldID(clazz, contextFieldName, contextClassType);
+      if (JNIUtil::isJavaExceptionThrown() || (*ctxFieldID) == 0)
+        return;
+
+      env->DeleteLocalRef(clazz);
+    }
+
+  jobject jctx = env->GetObjectField(contextHolder, (*ctxFieldID));
+  if (JNIUtil::isJavaExceptionThrown())
+    return;
+
+  m_jctx = env->NewGlobalRef(jctx);
+  if (JNIUtil::isJavaExceptionThrown())
+    return;
+
+  env->DeleteLocalRef(jctx);
+}
+
+OperationContext::~OperationContext()
+{
+  JNIEnv *env = JNIUtil::getEnv();
+  env->DeleteGlobalRef(m_jctx);
+  if (m_jcfgcb)
+    env->DeleteGlobalRef(m_jcfgcb);
+  if (m_jtunnelcb)
+    env->DeleteGlobalRef(m_jtunnelcb);
+}
+
+apr_hash_t *
+OperationContext::getConfigData()
+{
+  if(m_pool->getPool() == NULL)
+    {
+      JNIUtil::throwNullPointerException("pool is null");
+    }
+
+  if (m_config == NULL)
+    {
+      const char *configDir = m_configDir.c_str();
+      if (m_configDir.empty())
+        configDir = NULL;
+      SVN_JNI_ERR(
+          svn_config_get_config(&m_config, configDir, m_pool->getPool()), NULL);
+      notifyConfigLoad();
+    }
+
+  return m_config;
+}
+
+svn_auth_baton_t *
+OperationContext::getAuthBaton(SVN::Pool &in_pool)
+{
+  svn_auth_baton_t *ab;
+  apr_pool_t *pool = in_pool.getPool();
+
+  apr_hash_t * configData = getConfigData();
+
+  if (configData == NULL)
+    {
+      return NULL;
+    }
+
+  svn_config_t *config = static_cast<svn_config_t *>(apr_hash_get(configData,
+      SVN_CONFIG_CATEGORY_CONFIG, APR_HASH_KEY_STRING));
+
+  const bool use_native_store = GlobalConfig::useNativeCredentialsStore();
+
+  /* The whole list of registered providers */
+  apr_array_header_t *providers;
+  svn_auth_provider_object_t *provider;
+
+  if (use_native_store)
+    {
+      /* Populate the registered providers with the platform-specific providers */
+      SVN_JNI_ERR(
+          svn_auth_get_platform_specific_client_providers(
+              &providers, config, pool),
+          NULL);
+
+      /* Use the prompter (if available) to prompt for password and cert
+       * caching. */
+      svn_auth_plaintext_prompt_func_t plaintext_prompt_func;
+      void *plaintext_prompt_baton;
+      svn_auth_plaintext_passphrase_prompt_func_t plaintext_passphrase_prompt_func;
+      void *plaintext_passphrase_prompt_baton;
+
+      if (m_prompter.get())
+        {
+          plaintext_prompt_func = Prompter::plaintext_prompt;
+          plaintext_prompt_baton = m_prompter.get();
+          plaintext_passphrase_prompt_func = Prompter::plaintext_passphrase_prompt;
+          plaintext_passphrase_prompt_baton = m_prompter.get();
+        }
+      else
+        {
+          plaintext_prompt_func = NULL;
+          plaintext_prompt_baton = NULL;
+          plaintext_passphrase_prompt_func = NULL;
+          plaintext_passphrase_prompt_baton = NULL;
+        }
+
+      /* The main disk-caching auth providers, for both
+       * 'username/password' creds and 'username' creds.  */
+
+      svn_auth_get_simple_provider2(&provider, plaintext_prompt_func,
+                                    plaintext_prompt_baton, pool);
+      APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
+
+      svn_auth_get_username_provider(&provider, pool);
+      APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
+
+      svn_auth_get_ssl_server_trust_file_provider(&provider, pool);
+      APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
+      svn_auth_get_ssl_client_cert_file_provider(&provider, pool);
+      APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
+      svn_auth_get_ssl_client_cert_pw_file_provider2(
+          &provider,
+          plaintext_passphrase_prompt_func, plaintext_passphrase_prompt_baton,
+          pool);
+      APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
+    }
+  else
+    {
+      // Not using hte native credentials store, start with an empty
+      // providers array.
+      providers = apr_array_make(pool, 0, sizeof(svn_auth_provider_object_t *));
+    }
+
+  if (m_prompter.get())
+    {
+      /* Two basic prompt providers: username/password, and just username.*/
+      provider = m_prompter->get_provider_simple(in_pool);
+      APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
+
+      provider = m_prompter->get_provider_username(in_pool);
+      APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
+
+      /* Three ssl prompt providers, for server-certs, client-certs,
+       * and client-cert-passphrases.  */
+      provider = m_prompter->get_provider_server_ssl_trust(in_pool);
+      APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
+
+      provider = m_prompter->get_provider_client_ssl(in_pool);
+      APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
+
+      provider = m_prompter->get_provider_client_ssl_password(in_pool);
+      APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
+    }
+
+  /* Build an authentication baton to give to libsvn_client. */
+  svn_auth_open(&ab, providers, pool);
+
+  /* Place any default --username or --password credentials into the
+   * auth_baton's run-time parameter hash.  ### Same with --no-auth-cache? */
+  if (!m_userName.empty())
+    svn_auth_set_parameter(ab, SVN_AUTH_PARAM_DEFAULT_USERNAME,
+        apr_pstrdup(in_pool.getPool(), m_userName.c_str()));
+  if (!m_passWord.empty())
+    svn_auth_set_parameter(ab, SVN_AUTH_PARAM_DEFAULT_PASSWORD,
+        apr_pstrdup(in_pool.getPool(), m_passWord.c_str()));
+  /* Store where to retrieve authentication data? */
+  if (!m_configDir.empty())
+    svn_auth_set_parameter(ab, SVN_AUTH_PARAM_CONFIG_DIR,
+        apr_pstrdup(in_pool.getPool(), m_configDir.c_str()));
+  return ab;
+}
+
+jobject OperationContext::getSelf() const
+{
+  return m_jctx;
+}
+
+void
+OperationContext::username(const char *pi_username)
+{
+  m_userName = (pi_username == NULL ? "" : pi_username);
+}
+
+void
+OperationContext::password(const char *pi_password)
+{
+  m_passWord = (pi_password == NULL ? "" : pi_password);
+}
+
+void
+OperationContext::setPrompt(Prompter::UniquePtr prompter)
+{
+  m_prompter = prompter;
+}
+
+void
+OperationContext::setConfigDirectory(const char *configDir)
+{
+  // A change to the config directory may necessitate creation of
+  // the config templates.
+  SVN::Pool requestPool;
+  SVN_JNI_ERR(svn_config_ensure(configDir, requestPool.getPool()), );
+
+  m_configDir = (configDir == NULL ? "" : configDir);
+
+  m_config = NULL;
+}
+
+const char *
+OperationContext::getConfigDirectory() const
+{
+  return (m_configDir.empty() ? NULL : m_configDir.c_str());
+}
+
+void OperationContext::setConfigEventHandler(jobject jcfgcb)
+{
+  JNIEnv *env = JNIUtil::getEnv();
+  if (jcfgcb)
+    {
+      jcfgcb = env->NewGlobalRef(jcfgcb);
+      if (JNIUtil::isJavaExceptionThrown())
+        return;
+    }
+
+  if (m_jcfgcb)
+    env->DeleteGlobalRef(m_jcfgcb);
+  m_jcfgcb = jcfgcb;
+}
+
+jobject OperationContext::getConfigEventHandler() const
+{
+  return m_jcfgcb;
+}
+
+const char *
+OperationContext::getUsername() const
+{
+  return (m_userName.empty() ? NULL : m_userName.c_str());
+}
+
+const char *
+OperationContext::getPassword() const
+{
+  return (m_passWord.empty() ? NULL : m_passWord.c_str());
+}
+
+Prompter::UniquePtr OperationContext::clonePrompter() const
+{
+  if (m_prompter.get())
+    return m_prompter->clone();
+  return Prompter::UniquePtr(NULL);
+}
+
+void OperationContext::setTunnelCallback(jobject jtunnelcb)
+{
+  JNIEnv *env = JNIUtil::getEnv();
+  if (jtunnelcb)
+    {
+      jtunnelcb = env->NewGlobalRef(jtunnelcb);
+      if (JNIUtil::isJavaExceptionThrown())
+        return;
+    }
+
+  if (m_jtunnelcb)
+    env->DeleteGlobalRef(m_jtunnelcb);
+  m_jtunnelcb = jtunnelcb;
+}
+
+jobject OperationContext::getTunnelCallback() const
+{
+  return m_jtunnelcb;
+}
+
+void
+OperationContext::cancelOperation()
+{
+  svn_atomic_set(&m_cancelOperation, 1);
+}
+
+void
+OperationContext::resetCancelRequest()
+{
+  svn_atomic_set(&m_cancelOperation, 0);
+}
+
+bool
+OperationContext::isCancelledOperation()
+{
+  return bool(svn_atomic_read(&m_cancelOperation));
+}
+
+svn_error_t *
+OperationContext::checkCancel(void *cancelBaton)
+{
+  OperationContext *that = static_cast<OperationContext *>(cancelBaton);
+  if (that->isCancelledOperation())
+    return svn_error_create(SVN_ERR_CANCELLED, NULL, _("Operation cancelled"));
+  else if (JNIUtil::isJavaExceptionThrown())
+    return svn_error_create(SVN_ERR_CANCELLED, JNIUtil::wrapJavaException(),
+                            _("Operation cancelled"));
+  else
+    return SVN_NO_ERROR;
+}
+
+void
+OperationContext::progress(apr_off_t progressVal, apr_off_t total, void *baton,
+    apr_pool_t *pool)
+{
+  jobject jctx = (jobject) baton;
+  if (!jctx)
+    return;
+
+  JNIEnv *env = JNIUtil::getEnv();
+
+  // Create a local frame for our references
+  env->PushLocalFrame(LOCAL_FRAME_SIZE);
+  if (JNIUtil::isJavaExceptionThrown())
+    return;
+
+  static jmethodID mid = 0;
+  if (mid == 0)
+    {
+      jclass clazz = env->GetObjectClass(jctx);
+      if (JNIUtil::isJavaExceptionThrown())
+        POP_AND_RETURN_NOTHING();
+
+      mid = env->GetMethodID(clazz, "onProgress",
+                             "(" JAVAHL_ARG("/ProgressEvent;") ")V");
+      if (JNIUtil::isJavaExceptionThrown() || mid == 0)
+        POP_AND_RETURN_NOTHING();
+    }
+
+  static jmethodID midCT = 0;
+  jclass clazz = env->FindClass(JAVAHL_CLASS("/ProgressEvent"));
+  if (JNIUtil::isJavaExceptionThrown())
+    POP_AND_RETURN_NOTHING();
+
+  if (midCT == 0)
+    {
+      midCT = env->GetMethodID(clazz, "<init>", "(JJ)V");
+      if (JNIUtil::isJavaExceptionThrown() || midCT == 0)
+        POP_AND_RETURN_NOTHING();
+    }
+
+  // Call the Java method.
+  jobject jevent = env->NewObject(clazz, midCT, (jlong) progressVal,
+      (jlong) total);
+  if (JNIUtil::isJavaExceptionThrown())
+    POP_AND_RETURN_NOTHING();
+
+  env->CallVoidMethod(jctx, mid, jevent);
+
+  POP_AND_RETURN_NOTHING();
+}
+
+const char *
+OperationContext::getClientName() const
+{
+  return "javahl";
+}
+
+svn_error_t *
+OperationContext::clientName(void *baton, const char **name, apr_pool_t *pool)
+{
+  OperationContext *that = (OperationContext *) baton;
+
+  *name = that->getClientName();
+
+  return SVN_NO_ERROR;
+}
+
+void
+OperationContext::notifyConfigLoad()
+{
+  if (!m_jcfgcb)
+    return;
+
+  JNIEnv *env = JNIUtil::getEnv();
+
+  static jmethodID onload_mid = 0;
+  if (0 == onload_mid)
+    {
+      jclass cls = env->FindClass(JAVAHL_CLASS("/callback/ConfigEvent"));
+      if (JNIUtil::isJavaExceptionThrown())
+        return;
+      onload_mid = env->GetMethodID(cls, "onLoad",
+                                    "(" JAVAHL_ARG("/ISVNConfig;") ")V");
+      if (JNIUtil::isJavaExceptionThrown())
+        return;
+    }
+
+  jclass cfg_cls = env->FindClass(JAVAHL_CLASS("/util/ConfigImpl"));
+  if (JNIUtil::isJavaExceptionThrown())
+    return;
+
+  static jmethodID ctor_mid = 0;
+  if (0 == ctor_mid)
+    {
+      ctor_mid = env->GetMethodID(cfg_cls, "<init>", "(J)V");
+      if (JNIUtil::isJavaExceptionThrown())
+        return;
+    }
+
+  static jmethodID dispose_mid = 0;
+  if (0 == dispose_mid)
+    {
+      dispose_mid = env->GetMethodID(cfg_cls, "dispose", "()V");
+      if (JNIUtil::isJavaExceptionThrown())
+        return;
+    }
+
+  jobject jcbimpl = env->NewObject(cfg_cls, ctor_mid,
+                                   reinterpret_cast<jlong>(this));
+  if (JNIUtil::isJavaExceptionThrown())
+    return;
+  env->CallVoidMethod(m_jcfgcb, onload_mid, jcbimpl);
+  if (JNIUtil::isJavaExceptionThrown())
+    return;
+  env->CallVoidMethod(jcbimpl, dispose_mid);
+  env->DeleteLocalRef(jcbimpl);
+}
+
+namespace {
+class TunnelContext
+{
+public:
+  explicit TunnelContext(apr_pool_t *pool)
+    : request_in(NULL),
+      request_out(NULL),
+      response_in(NULL),
+      response_out(NULL),
+      jclosecb(NULL)
+    {
+      status = apr_file_pipe_create_ex(&request_in, &request_out,
+                                       APR_FULL_BLOCK, pool);
+      if (!status)
+        status = apr_file_pipe_create_ex(&response_in, &response_out,
+                                         APR_FULL_BLOCK, pool);
+    }
+
+  ~TunnelContext()
+    {
+      apr_file_close(request_out);
+      apr_file_close(response_in);
+    }
+
+  apr_file_t *request_in;
+  apr_file_t *request_out;
+  apr_file_t *response_in;
+  apr_file_t *response_out;
+  apr_status_t status;
+  jobject jclosecb;
+};
+
+jobject create_Channel(const char *class_name, JNIEnv *env, apr_file_t *fd)
+{
+  jclass cls = env->FindClass(class_name);
+  if (JNIUtil::isJavaExceptionThrown())
+    return NULL;
+  jmethodID ctor = env->GetMethodID(cls, "<init>", "(J)V");
+  if (JNIUtil::isJavaExceptionThrown())
+    return NULL;
+  return env->NewObject(cls, ctor, reinterpret_cast<jlong>(fd));
+}
+
+jobject create_RequestChannel(JNIEnv *env, apr_file_t *fd)
+{
+  return create_Channel(JAVAHL_CLASS("/util/RequestChannel"), env, fd);
+}
+jobject create_ResponseChannel(JNIEnv *env, apr_file_t *fd)
+{
+  return create_Channel(JAVAHL_CLASS("/util/ResponseChannel"), env, fd);
+}
+} // anonymous namespace
+
+svn_boolean_t
+OperationContext::checkTunnel(void *tunnel_baton, const char *tunnel_name)
+{
+  JNIEnv *env = JNIUtil::getEnv();
+
+  jstring jtunnel_name = JNIUtil::makeJString(tunnel_name);
+  if (JNIUtil::isJavaExceptionThrown())
+    return false;
+
+  static jmethodID mid = 0;
+  if (0 == mid)
+    {
+      jclass cls = env->FindClass(JAVAHL_CLASS("/callback/TunnelAgent"));
+      if (JNIUtil::isJavaExceptionThrown())
+        return false;
+      mid = env->GetMethodID(cls, "checkTunnel",
+                             "(Ljava/lang/String;)Z");
+        if (JNIUtil::isJavaExceptionThrown())
+          return false;
+    }
+
+  jobject jtunnelcb = jobject(tunnel_baton);
+  jboolean check = env->CallBooleanMethod(jtunnelcb, mid, jtunnel_name);
+  if (JNIUtil::isJavaExceptionThrown())
+    return false;
+
+  return svn_boolean_t(check);
+}
+
+svn_error_t *
+OperationContext::openTunnel(svn_stream_t **request, svn_stream_t **response,
+                             svn_ra_close_tunnel_func_t *close_func,
+                             void **close_baton,
+                             void *tunnel_baton,
+                             const char *tunnel_name, const char *user,
+                             const char *hostname, int port,
+                             svn_cancel_func_t cancel_func, void *cancel_baton,
+                             apr_pool_t *pool)
+{
+  TunnelContext *tc = new TunnelContext(pool);
+  if (tc->status)
+    {
+      delete tc;
+      return svn_error_trace(
+          svn_error_wrap_apr(tc->status, _("Could not open tunnel streams")));
+    }
+
+  *close_func = closeTunnel;
+  *close_baton = tc;
+  *request = svn_stream_from_aprfile2(tc->request_out, FALSE, pool);
+  *response = svn_stream_from_aprfile2(tc->response_in, FALSE, pool);
+
+  JNIEnv *env = JNIUtil::getEnv();
+
+  jobject jrequest = create_RequestChannel(env, tc->request_in);
+  SVN_JNI_CATCH(, SVN_ERR_BASE);
+
+  jobject jresponse = create_ResponseChannel(env, tc->response_out);
+  SVN_JNI_CATCH(, SVN_ERR_BASE);
+
+  jstring jtunnel_name = JNIUtil::makeJString(tunnel_name);
+  SVN_JNI_CATCH(, SVN_ERR_BASE);
+
+  jstring juser = JNIUtil::makeJString(user);
+  SVN_JNI_CATCH(, SVN_ERR_BASE);
+
+  jstring jhostname = JNIUtil::makeJString(hostname);
+  SVN_JNI_CATCH(, SVN_ERR_BASE);
+
+  static jmethodID mid = 0;
+  if (0 == mid)
+    {
+      jclass cls = env->FindClass(JAVAHL_CLASS("/callback/TunnelAgent"));
+      SVN_JNI_CATCH(, SVN_ERR_BASE);
+      SVN_JNI_CATCH(
+          mid = env->GetMethodID(
+              cls, "openTunnel",
+              "(Ljava/nio/channels/ReadableByteChannel;"
+              "Ljava/nio/channels/WritableByteChannel;"
+              "Ljava/lang/String;"
+              "Ljava/lang/String;"
+              "Ljava/lang/String;I)"
+              JAVAHL_ARG("/callback/TunnelAgent$CloseTunnelCallback;")),
+          SVN_ERR_BASE);
+    }
+
+  jobject jtunnelcb = jobject(tunnel_baton);
+  SVN_JNI_CATCH(
+      tc->jclosecb = env->CallObjectMethod(
+          jtunnelcb, mid, jrequest, jresponse,
+          jtunnel_name, juser, jhostname, jint(port)),
+      SVN_ERR_BASE);
+
+  return SVN_NO_ERROR;
+}
+
+void
+OperationContext::closeTunnel(void *tunnel_context, void *)
+{
+  TunnelContext* tc = static_cast<TunnelContext*>(tunnel_context);
+  jobject jclosecb = tc->jclosecb;
+  delete tc;
+
+  if (!jclosecb)
+    return;
+
+  JNIEnv *env = JNIUtil::getEnv();
+
+  static jmethodID mid = 0;
+  if (0 == mid)
+    {
+      jclass cls;
+      SVN_JNI_CATCH_VOID(
+          cls= env->FindClass(
+              JAVAHL_CLASS("/callback/TunnelAgent$CloseTunnelCallback")));
+      SVN_JNI_CATCH_VOID(mid = env->GetMethodID(cls, "closeTunnel", "()V"));
+    }
+  SVN_JNI_CATCH_VOID(env->CallVoidMethod(jclosecb, mid));
+}
diff --git a/subversion/bindings/javahl/native/OperationContext.h b/subversion/bindings/javahl/native/OperationContext.h
new file mode 100644
index 0000000..b0d82c2
--- /dev/null
+++ b/subversion/bindings/javahl/native/OperationContext.h
@@ -0,0 +1,128 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ *
+ * @file OperationContext.h
+ * @brief Interface of the class OperationContext
+ */
+
+#ifndef JAVAHL_OPERATION_CONTEXT_H
+#define JAVAHL_OPERATION_CONTEXT_H
+
+#include <string>
+#include <memory>
+
+#include "svn_types.h"
+#include "svn_client.h"
+#include "private/svn_atomic.h"
+
+#include <jni.h>
+#include "Pool.h"
+#include "JNIStringHolder.h"
+
+class Prompter;
+
+/**
+ * This class contains a Java objects implementing the interface RaSharedContext
+ */
+class OperationContext
+{
+ private:
+  std::string m_userName;
+  std::string m_passWord;
+  std::string m_configDir;
+
+  apr_hash_t * m_config;
+
+  std::auto_ptr<Prompter> m_prompter;
+  svn_atomic_t m_cancelOperation;
+
+ protected:
+  SVN::Pool *m_pool;
+
+  jobject m_jctx;
+  jobject m_jcfgcb;
+  jobject m_jtunnelcb;
+
+  static void progress(apr_off_t progressVal, apr_off_t total,
+                       void *baton, apr_pool_t *pool);
+  void notifyConfigLoad();
+
+  static svn_boolean_t checkTunnel(
+      void *tunnel_baton, const char *tunnel_name);
+
+  static svn_error_t *openTunnel(
+      svn_stream_t **request, svn_stream_t **response,
+      svn_ra_close_tunnel_func_t *close_func, void **close_baton,
+      void *tunnel_baton,
+      const char *tunnel_name, const char *user,
+      const char *hostname, int port,
+      svn_cancel_func_t cancel_func, void *cancel_baton,
+      apr_pool_t *pool);
+
+  static void closeTunnel(
+      void *tunnel_context, void *tunnel_baton);
+
+ public:
+  OperationContext(SVN::Pool &pool);
+  void attachJavaObject(jobject contextHolder, const char *contextClassType, const char *contextFieldName, jfieldID * ctxFieldID);
+  virtual ~OperationContext();
+
+  static svn_error_t *checkCancel(void *cancelBaton);
+
+  virtual void username(const char *pi_username);
+  virtual void password(const char *pi_password);
+  virtual void setPrompt(std::auto_ptr<Prompter> prompter);
+  svn_auth_baton_t *getAuthBaton(SVN::Pool &in_pool);
+
+  void cancelOperation();
+  void resetCancelRequest();
+  virtual bool isCancelledOperation();
+  jobject getSelf() const;
+  const char *getConfigDirectory() const;
+  const char *getUsername() const;
+  const char *getPassword() const;
+  std::auto_ptr<Prompter> clonePrompter() const;
+
+  /**
+   * Set the configuration directory, taking the usual steps to
+   * ensure that Subversion's config file templates exist in the
+   * specified location.
+   */
+  void setConfigDirectory(const char *configDir);
+
+  /**
+   * Return configuration data for the context.
+   * Read it from config directory if necessary
+   */
+  apr_hash_t *getConfigData();
+
+  void setConfigEventHandler(jobject jcfgcb);
+  jobject getConfigEventHandler() const;
+
+  static svn_error_t * clientName(void *baton, const char **name, apr_pool_t *pool);
+  virtual const char * getClientName() const;
+
+  virtual void setTunnelCallback(jobject jtunnelcb);
+  jobject getTunnelCallback() const;
+};
+
+#endif // JAVAHL_OPERATION_CONTEXT_H
diff --git a/subversion/bindings/javahl/native/PatchCallback.cpp b/subversion/bindings/javahl/native/PatchCallback.cpp
index 0cff577..ac1b3d4 100644
--- a/subversion/bindings/javahl/native/PatchCallback.cpp
+++ b/subversion/bindings/javahl/native/PatchCallback.cpp
@@ -80,7 +80,7 @@ PatchCallback::singlePatch(svn_boolean_t *filtered,
   static jmethodID mid = 0;
   if (mid == 0)
     {
-      jclass clazz = env->FindClass(JAVA_PACKAGE"/callback/PatchCallback");
+      jclass clazz = env->FindClass(JAVAHL_CLASS("/callback/PatchCallback"));
       if (JNIUtil::isJavaExceptionThrown())
         POP_AND_RETURN(SVN_NO_ERROR);
 
@@ -106,7 +106,7 @@ PatchCallback::singlePatch(svn_boolean_t *filtered,
   jboolean jfiltered = env->CallBooleanMethod(m_callback, mid, jcanonPath,
                                               jpatchAbsPath, jrejectAbsPath);
   if (JNIUtil::isJavaExceptionThrown())
-    POP_AND_RETURN(SVN_NO_ERROR);
+    POP_AND_RETURN_EXCEPTION_AS_SVNERROR();
 
   *filtered = (jfiltered ? TRUE : FALSE);
 
diff --git a/subversion/bindings/javahl/native/PatchCallback.h b/subversion/bindings/javahl/native/PatchCallback.h
index d10a309..61ec883 100644
--- a/subversion/bindings/javahl/native/PatchCallback.h
+++ b/subversion/bindings/javahl/native/PatchCallback.h
@@ -30,8 +30,6 @@
 #include <jni.h>
 #include "svn_client.h"
 
-struct info_entry;
-
 /**
  * This class holds a Java callback object, which will receive every line of
  * the file for which the callback information is requested.
diff --git a/subversion/bindings/javahl/native/Path.cpp b/subversion/bindings/javahl/native/Path.cpp
index b9c69ea..c1a1fec 100644
--- a/subversion/bindings/javahl/native/Path.cpp
+++ b/subversion/bindings/javahl/native/Path.cpp
@@ -27,18 +27,24 @@
 #include <jni.h>
 #include "Path.h"
 #include "svn_path.h"
+#include "svn_dirent_uri.h"
 #include "JNIUtil.h"
+#include "JNIStringHolder.h"
 #include "Pool.h"
+#include "svn_private_config.h"
 
 /**
  * Constructor
  *
- * @see Path::Path(const std::string &)
+ * @see PathBase::PathBase(const std::string &)
  * @param path Path string
  */
-Path::Path(const char *pi_path, SVN::Pool &in_pool)
+PathBase::PathBase(const char *pi_path,
+                   svn_error_t* initfunc(const char*&, SVN::Pool&),
+                   SVN::Pool &in_pool)
+  : m_error_occurred(NULL)
 {
-  init(pi_path, in_pool);
+  init(pi_path, initfunc, in_pool);
 }
 
 /**
@@ -48,19 +54,26 @@ Path::Path(const char *pi_path, SVN::Pool &in_pool)
  *
  * @param path Path string
  */
-Path::Path(const std::string &pi_path, SVN::Pool &in_pool)
+PathBase::PathBase(const std::string &pi_path,
+                   svn_error_t* initfunc(const char*&, SVN::Pool&),
+                   SVN::Pool &in_pool)
+  : m_error_occurred(NULL)
 {
-  init(pi_path.c_str(), in_pool);
+  init(pi_path.c_str(), initfunc, in_pool);
 }
 
 /**
- * Copy constructor
- *
- * @param path Path to be copied
+ * Constructor from a Java string.
  */
-Path::Path(const Path &pi_path, SVN::Pool &in_pool)
+PathBase::PathBase(jstring jpath,
+                   svn_error_t* initfunc(const char*&, SVN::Pool&),
+                   SVN::Pool &in_pool)
+  : m_error_occurred(NULL)
 {
-  init(pi_path.c_str(), in_pool);
+  JNIStringHolder path(jpath);
+  if (JNIUtil::isJavaExceptionThrown())
+    return;
+  init(path, initfunc, in_pool);
 }
 
 /**
@@ -69,17 +82,13 @@ Path::Path(const Path &pi_path, SVN::Pool &in_pool)
  * @param path Path string
  */
 void
-Path::init(const char *pi_path, SVN::Pool &in_pool)
+PathBase::init(const char *pi_path,
+               svn_error_t* initfunc(const char*&, SVN::Pool&),
+               SVN::Pool &in_pool)
 {
-  if (*pi_path == 0)
-    {
-      m_error_occurred = NULL;
-      m_path = "";
-    }
-  else
+  if (pi_path && *pi_path)
     {
-      m_error_occurred = JNIUtil::preprocessPath(pi_path, in_pool.getPool());
-
+      m_error_occurred = initfunc(pi_path, in_pool);
       m_path = pi_path;
     }
 }
@@ -88,7 +97,7 @@ Path::init(const char *pi_path, SVN::Pool &in_pool)
  * @return Path string
  */
 const std::string &
-Path::path() const
+PathBase::path() const
 {
   return m_path;
 }
@@ -97,7 +106,7 @@ Path::path() const
  * @return Path string as a C string
  */
 const char *
-Path::c_str() const
+PathBase::c_str() const
 {
   return m_path.c_str();
 }
@@ -105,8 +114,8 @@ Path::c_str() const
 /**
  * Assignment operator
  */
-Path&
-Path::operator=(const Path &pi_path)
+PathBase&
+PathBase::operator=(const PathBase &pi_path)
 {
   m_error_occurred = NULL;
   m_path = pi_path.m_path;
@@ -114,12 +123,12 @@ Path::operator=(const Path &pi_path)
   return *this;
 }
 
-  svn_error_t *Path::error_occurred() const
+svn_error_t *PathBase::error_occurred() const
 {
   return m_error_occurred;
 }
 
-jboolean Path::isValid(const char *p)
+jboolean PathBase::isValid(const char *p)
 {
   if (p == NULL)
     return JNI_FALSE;
@@ -136,3 +145,25 @@ jboolean Path::isValid(const char *p)
       return JNI_FALSE;
     }
 }
+
+svn_error_t*
+Path::initfunc(const char*& path, SVN::Pool& pool)
+{
+  return JNIUtil::preprocessPath(path, pool.getPool());
+}
+
+svn_error_t*
+URL::initfunc(const char*& path, SVN::Pool& pool)
+{
+  if (svn_path_is_url(path))
+    return JNIUtil::preprocessPath(path, pool.getPool());
+  return svn_error_createf(SVN_ERR_BAD_URL, NULL,
+                           _("Not an URL: %s"), path);
+}
+
+svn_error_t*
+Relpath::initfunc(const char*& path, SVN::Pool& pool)
+{
+  path = svn_relpath__internal_style(path, pool.getPool());
+  return SVN_NO_ERROR;
+}
diff --git a/subversion/bindings/javahl/native/Path.h b/subversion/bindings/javahl/native/Path.h
index d23261e..5684efb 100644
--- a/subversion/bindings/javahl/native/Path.h
+++ b/subversion/bindings/javahl/native/Path.h
@@ -24,18 +24,19 @@
  * @brief Interface of the C++ class Path.
  */
 
-#ifndef PATH_H
-#define PATH_H
+#ifndef JAVAHL_PATH_H
+#define JAVAHL_PATH_H
 
 #include <string>
 #include <jni.h>
 #include "Pool.h"
 struct svn_error_t;
 
+
 /**
  * Encapsulation for Subversion Path handling
  */
-class Path
+class PathBase
 {
  private:
   // The path to be stored.
@@ -48,9 +49,11 @@ class Path
    *
    * @param pi_path Path string
    */
-  void init(const char *pi_path, SVN::Pool &in_pool);
+  void init(const char *pi_path,
+            svn_error_t* initfunc(const char*&, SVN::Pool&),
+            SVN::Pool &in_pool);
 
- public:
+ protected:
   /**
    * Constructor that takes a string as parameter.
    * The string is converted to subversion internal
@@ -58,27 +61,31 @@ class Path
    *
    * @param pi_path Path string
    */
-  Path(const std::string &pi_path, SVN::Pool &in_pool);
+  PathBase(const std::string &pi_path,
+           svn_error_t* initfunc(const char*&, SVN::Pool&),
+           SVN::Pool &in_pool);
 
   /**
    * Constructor
    *
-   * @see Path::Path (const std::string &)
+   * @see PathBase::PathBase (const std::string &)
    * @param pi_path Path string
    */
-  Path(const char *pi_path, SVN::Pool &in_pool);
+  PathBase(const char *pi_path,
+           svn_error_t* initfunc(const char*&, SVN::Pool&),
+           SVN::Pool &in_pool);
 
   /**
-   * Copy constructor
-   *
-   * @param pi_path Path to be copied
+   * Constructor from a Java string.
    */
-  Path(const Path &pi_path, SVN::Pool &in_pool);
+  PathBase(jstring jpath,
+           svn_error_t* initfunc(const char*&, SVN::Pool&),
+           SVN::Pool &in_pool);
 
   /**
    * Assignment operator
    */
-  Path &operator=(const Path&);
+  PathBase &operator=(const PathBase&);
 
   /**
    * @return Path string
@@ -92,6 +99,7 @@ class Path
 
   svn_error_t *error_occurred() const;
 
+public:
   /**
    * Returns whether @a path is non-NULL and passes the @c
    * svn_path_check_valid() test.
@@ -101,4 +109,113 @@ class Path
   static jboolean isValid(const char *path);
 };
 
-#endif  // PATH_H
+
+/**
+ * Dirent or URI
+ */
+class Path : protected PathBase
+{
+ public:
+  Path(const std::string &pi_path, SVN::Pool &in_pool)
+    : PathBase(pi_path, initfunc, in_pool)
+    {}
+
+  Path(const char *pi_path, SVN::Pool &in_pool)
+    : PathBase(pi_path, initfunc, in_pool)
+    {}
+
+  Path(jstring jpath, SVN::Pool &in_pool)
+    : PathBase(jpath, initfunc, in_pool)
+    {}
+
+  Path& operator=(const Path& that)
+    {
+      PathBase::operator=(that);
+      return *this;
+    }
+
+  const std::string &path() const { return PathBase::path(); }
+  const char *c_str() const { return PathBase::c_str(); }
+
+  svn_error_t *error_occurred() const
+    {
+      return PathBase::error_occurred();
+    }
+
+ private:
+  static svn_error_t* initfunc(const char*&, SVN::Pool&);
+};
+
+/**
+ * URL
+ */
+class URL : protected PathBase
+{
+ public:
+  URL(const std::string &pi_path, SVN::Pool &in_pool)
+    : PathBase(pi_path, initfunc, in_pool)
+    {}
+
+  URL(const char *pi_path, SVN::Pool &in_pool)
+    : PathBase(pi_path, initfunc, in_pool)
+    {}
+
+  URL(jstring jpath, SVN::Pool &in_pool)
+    : PathBase(jpath, initfunc, in_pool)
+    {}
+
+  URL& operator=(const URL& that)
+    {
+      PathBase::operator=(that);
+      return *this;
+    }
+
+  const std::string &path() const { return PathBase::path(); }
+  const char *c_str() const { return PathBase::c_str(); }
+
+  svn_error_t *error_occurred() const
+    {
+      return PathBase::error_occurred();
+    }
+
+ private:
+  static svn_error_t* initfunc(const char*&, SVN::Pool&);
+};
+
+/**
+ * Relative path
+ */
+class Relpath : protected PathBase
+{
+ public:
+  Relpath(const std::string &pi_path, SVN::Pool &in_pool)
+    : PathBase(pi_path, initfunc, in_pool)
+    {}
+
+  Relpath(const char *pi_path, SVN::Pool &in_pool)
+    : PathBase(pi_path, initfunc, in_pool)
+    {}
+
+  Relpath(jstring jpath, SVN::Pool &in_pool)
+    : PathBase(jpath, initfunc, in_pool)
+    {}
+
+  Relpath& operator=(const Relpath& that)
+    {
+      PathBase::operator=(that);
+      return *this;
+    }
+
+  const std::string &path() const { return PathBase::path(); }
+  const char *c_str() const { return PathBase::c_str(); }
+
+  svn_error_t *error_occurred() const
+    {
+      return PathBase::error_occurred();
+    }
+
+ private:
+  static svn_error_t* initfunc(const char*&, SVN::Pool&);
+};
+
+#endif  // JAVAHL_PATH_H
diff --git a/subversion/bindings/javahl/native/Prompter.cpp b/subversion/bindings/javahl/native/Prompter.cpp
index 14bd312..bad7467 100644
--- a/subversion/bindings/javahl/native/Prompter.cpp
+++ b/subversion/bindings/javahl/native/Prompter.cpp
@@ -25,468 +25,532 @@
  */
 
 #include "Prompter.h"
-#include "Pool.h"
+#include "AuthnCallback.hpp"
+
 #include "JNIUtil.h"
 #include "JNIStringHolder.h"
 #include "../include/org_apache_subversion_javahl_callback_UserPasswordCallback.h"
+
 #include <apr_strings.h>
-#include "svn_auth.h"
 #include "svn_error.h"
 #include "svn_error_codes.h"
 #include "svn_private_config.h"
 
-/**
- * Constructor
- * @param jprompter     a global reference to the Java callback object
- */
-Prompter::Prompter(jobject jprompter)
-{
-  m_prompter = jprompter;
-}
 
-Prompter::~Prompter()
+#include "jniwrapper/jni_stack.hpp"
+#include "jniwrapper/jni_string.hpp"
+
+// Class Prompter
+
+Prompter::UniquePtr Prompter::create(jobject jprompter)
 {
-  if (m_prompter!= NULL)
+  if (!jprompter)
+    return UniquePtr(NULL);
+
+  // Make sure no C++ exceptions are propagated from here.
+  const ::Java::Env jenv;
+  try
     {
-      // Since the reference to the Java object is a global one, it
-      // has to be deleted.
-      JNIEnv *env = JNIUtil::getEnv();
-      env->DeleteGlobalRef(m_prompter);
+      const jclass cls = ::Java::ClassCache::get_authn_cb(jenv)->get_class();
+      if (!jenv.IsInstanceOf(jprompter, cls))
+        return UniquePtr(NULL);
+
+      return UniquePtr(new Prompter(jenv, jprompter));
     }
+  SVN_JAVAHL_JNI_CATCH;
+  return UniquePtr(NULL);
 }
 
-/**
- * Create a C++ peer object for the Java callback object
- *
- * @param jprompter     Java callback object
- * @return              C++ peer object
- */
-Prompter *Prompter::makeCPrompter(jobject jprompter)
+Prompter::UniquePtr Prompter::clone() const
 {
-  // If we have no Java object, we need no C++ object.
-  if (jprompter == NULL)
-    return NULL;
-
-  JNIEnv *env = JNIUtil::getEnv();
-
-  // Create a local frame for our references
-  env->PushLocalFrame(LOCAL_FRAME_SIZE);
-  if (JNIUtil::isJavaExceptionThrown())
-    return NULL;
+  return create(m_prompter.get());
+}
 
-  // Sanity check that the Java object implements UserPasswordCallback.
-  jclass clazz = env->FindClass(JAVA_PACKAGE"/callback/UserPasswordCallback");
-  if (JNIUtil::isJavaExceptionThrown())
-    POP_AND_RETURN_NULL;
+Prompter::Prompter(::Java::Env env, jobject jprompter)
+  : m_prompter(env, jprompter)
+{}
 
-  if (!env->IsInstanceOf(jprompter, clazz))
-    POP_AND_RETURN_NULL;
+Prompter::~Prompter() {}
 
-  // Create a new global ref for the Java object, because it is
-  // longer used that this call.
-  jobject myPrompt = env->NewGlobalRef(jprompter);
-  if (JNIUtil::isJavaExceptionThrown())
-    POP_AND_RETURN_NULL;
 
-  env->PopLocalFrame(NULL);
+svn_auth_provider_object_t *
+Prompter::get_provider_simple(SVN::Pool &in_pool)
+{
+  apr_pool_t *pool = in_pool.getPool();
+  svn_auth_provider_object_t *provider;
+  svn_auth_get_simple_prompt_provider(&provider,
+                                      simple_prompt,
+                                      this,
+                                      2, /* retry limit */
+                                      pool);
 
-  // Create the C++ peer.
-  return new Prompter(myPrompt);
+  return provider;
 }
 
-/**
- * Retrieve the username from the Java object
- * @return Java string for the username or NULL
- */
-jstring Prompter::username()
+svn_auth_provider_object_t *
+Prompter::get_provider_username(SVN::Pool &in_pool)
 {
-  JNIEnv *env = JNIUtil::getEnv();
-
-  // Create a local frame for our references
-  env->PushLocalFrame(LOCAL_FRAME_SIZE);
-  if (JNIUtil::isJavaExceptionThrown())
-    return NULL;
-
-  // The method id will not change during the time this library is
-  // loaded, so it can be cached.
-  static jmethodID mid = 0;
-
-  if (mid == 0)
-    {
-      jclass clazz = env->FindClass(JAVA_PACKAGE"/callback/UserPasswordCallback");
-      if (JNIUtil::isJavaExceptionThrown())
-        POP_AND_RETURN_NULL;
+  apr_pool_t *pool = in_pool.getPool();
+  svn_auth_provider_object_t *provider;
+  svn_auth_get_username_prompt_provider(&provider,
+                                        username_prompt,
+                                        this,
+                                        2, /* retry limit */
+                                        pool);
 
-      mid = env->GetMethodID(clazz, "getUsername", "()Ljava/lang/String;");
-      if (JNIUtil::isJavaExceptionThrown() || mid == 0)
-        POP_AND_RETURN_NULL;
-    }
+  return provider;
+}
 
-  jstring ret = static_cast<jstring>(env->CallObjectMethod(m_prompter, mid));
-  if (JNIUtil::isJavaExceptionThrown())
-    POP_AND_RETURN_NULL;
+svn_auth_provider_object_t *Prompter::
+get_provider_server_ssl_trust(SVN::Pool &in_pool)
+{
+  apr_pool_t *pool = in_pool.getPool();
+  svn_auth_provider_object_t *provider;
+  svn_auth_get_ssl_server_trust_prompt_provider
+    (&provider, ssl_server_trust_prompt, this, pool);
 
-  return (jstring) env->PopLocalFrame(ret);
+  return provider;
 }
 
-/**
- * Retrieve the password from the Java object
- * @return Java string for the password or NULL
- */
-jstring Prompter::password()
+svn_auth_provider_object_t *Prompter::
+get_provider_client_ssl(SVN::Pool &in_pool)
 {
-  JNIEnv *env = JNIUtil::getEnv();
+  apr_pool_t *pool = in_pool.getPool();
+  svn_auth_provider_object_t *provider;
+  svn_auth_get_ssl_client_cert_prompt_provider(&provider,
+                                               ssl_client_cert_prompt,
+                                               this,
+                                               2 /* retry limit */,
+                                               pool);
 
-  // Create a local frame for our references
-  env->PushLocalFrame(LOCAL_FRAME_SIZE);
-  if (JNIUtil::isJavaExceptionThrown())
-    return NULL;
+  return provider;
+}
 
-  // The method id will not change during the time this library is
-  // loaded, so it can be cached.
-  static jmethodID mid = 0;
+svn_auth_provider_object_t *
+Prompter::get_provider_client_ssl_password(SVN::Pool &in_pool)
+{
+  apr_pool_t *pool = in_pool.getPool();
+  svn_auth_provider_object_t *provider;
+  svn_auth_get_ssl_client_cert_pw_prompt_provider
+    (&provider, ssl_client_cert_pw_prompt, this, 2 /* retry limit */,
+     pool);
 
-  if (mid == 0)
-    {
-      jclass clazz = env->FindClass(JAVA_PACKAGE"/callback/UserPasswordCallback");
-      if (JNIUtil::isJavaExceptionThrown())
-        POP_AND_RETURN_NULL;
+  return provider;
+}
 
-      mid = env->GetMethodID(clazz, "getPassword", "()Ljava/lang/String;");
-      if (JNIUtil::isJavaExceptionThrown() || mid == 0)
-        POP_AND_RETURN_NULL;
-    }
+svn_error_t *Prompter::simple_prompt(
+    svn_auth_cred_simple_t **cred_p,
+    void *baton,
+    const char *realm,
+    const char *username,
+    svn_boolean_t may_save,
+    apr_pool_t *pool)
+{
+  const ::Java::Env env;
+  svn_error_t *err;
+  SVN_JAVAHL_CATCH(
+      env, SVN_ERR_RA_NOT_AUTHORIZED,
+      err = static_cast<Prompter*>(baton)->dispatch_simple_prompt(
+          env, cred_p, realm, username, may_save, pool));
+  return err;
+}
 
-  jstring ret = static_cast<jstring>(env->CallObjectMethod(m_prompter, mid));
-  if (JNIUtil::isJavaExceptionThrown())
-    return NULL;
+svn_error_t *Prompter::username_prompt(
+    svn_auth_cred_username_t **cred_p,
+    void *baton,
+    const char *realm,
+    svn_boolean_t may_save,
+    apr_pool_t *pool)
+{
+  const ::Java::Env env;
+  svn_error_t *err;
+  SVN_JAVAHL_CATCH(
+      env, SVN_ERR_RA_NOT_AUTHORIZED,
+      err = static_cast<Prompter*>(baton)->dispatch_username_prompt(
+          env, cred_p, realm, may_save, pool));
+  return err;
+}
 
-  return (jstring) env->PopLocalFrame(ret);
+svn_error_t *Prompter::ssl_server_trust_prompt(
+    svn_auth_cred_ssl_server_trust_t **cred_p,
+    void *baton,
+    const char *realm,
+    apr_uint32_t failures,
+    const svn_auth_ssl_server_cert_info_t *cert_info,
+    svn_boolean_t may_save,
+    apr_pool_t *pool)
+{
+  const ::Java::Env env;
+  svn_error_t *err;
+  SVN_JAVAHL_CATCH(
+      env, SVN_ERR_RA_NOT_AUTHORIZED,
+      err = static_cast<Prompter*>(baton)->dispatch_ssl_server_trust_prompt(
+          env, cred_p, realm, failures, cert_info, may_save, pool));
+  return err;
 }
-/**
- * Ask the user a question, which can be answered by yes/no.
- * @param realm         the server realm, for which this question is asked
- * @param question      the question to ask the user
- * @param yesIsDefault  flag if the yes-button should be the default button
- * @return flag who the user answered the question
- */
-bool Prompter::askYesNo(const char *realm, const char *question,
-                        bool yesIsDefault)
+
+svn_error_t *Prompter::ssl_client_cert_prompt(
+    svn_auth_cred_ssl_client_cert_t **cred_p,
+    void *baton,
+    const char *realm,
+    svn_boolean_t may_save,
+    apr_pool_t *pool)
 {
-  JNIEnv *env = JNIUtil::getEnv();
+  const ::Java::Env env;
+  svn_error_t *err;
+  SVN_JAVAHL_CATCH(
+      env, SVN_ERR_RA_NOT_AUTHORIZED,
+      err = static_cast<Prompter*>(baton)->dispatch_ssl_client_cert_prompt(
+          env, cred_p, realm, may_save, pool));
+  return err;
+}
 
-  // Create a local frame for our references
-  env->PushLocalFrame(LOCAL_FRAME_SIZE);
-  if (JNIUtil::isJavaExceptionThrown())
-    return false;
+svn_error_t *Prompter::ssl_client_cert_pw_prompt(
+    svn_auth_cred_ssl_client_cert_pw_t **cred_p,
+    void *baton,
+    const char *realm,
+    svn_boolean_t may_save,
+    apr_pool_t *pool)
+{
+  const ::Java::Env env;
+  svn_error_t *err;
+  SVN_JAVAHL_CATCH(
+      env, SVN_ERR_RA_NOT_AUTHORIZED,
+      err = static_cast<Prompter*>(baton)->dispatch_ssl_client_cert_pw_prompt(
+          env, cred_p, realm, may_save, pool));
+  return err;
+}
 
-  // The method id will not change during the time this library is
-  // loaded, so it can be cached.
-  static jmethodID mid = 0;
+svn_error_t *Prompter::plaintext_prompt(
+    svn_boolean_t *may_save_plaintext,
+    const char *realmstring,
+    void *baton,
+    apr_pool_t *pool)
+{
+  const ::Java::Env env;
+  svn_error_t *err;
+  SVN_JAVAHL_CATCH(
+      env, SVN_ERR_RA_NOT_AUTHORIZED,
+      err = static_cast<Prompter*>(baton)->dispatch_plaintext_prompt(
+          env, may_save_plaintext, realmstring, pool));
+  return err;
+}
 
-  if (mid == 0)
-    {
-      jclass clazz = env->FindClass(JAVA_PACKAGE"/callback/UserPasswordCallback");
-      if (JNIUtil::isJavaExceptionThrown())
-        POP_AND_RETURN(false);
-
-      mid = env->GetMethodID(clazz, "askYesNo",
-                             "(Ljava/lang/String;Ljava/lang/String;Z)Z");
-      if (JNIUtil::isJavaExceptionThrown() || mid == 0)
-        POP_AND_RETURN(false);
-    }
+svn_error_t *Prompter::plaintext_passphrase_prompt(
+    svn_boolean_t *may_save_plaintext,
+    const char *realmstring,
+    void *baton,
+    apr_pool_t *pool)
+{
+  const ::Java::Env env;
+  svn_error_t *err;
+  SVN_JAVAHL_CATCH(
+      env, SVN_ERR_RA_NOT_AUTHORIZED,
+      err = static_cast<Prompter*>(baton)->dispatch_plaintext_passphrase_prompt(
+          env, may_save_plaintext, realmstring, pool));
+  return err;
+}
 
-  // convert the texts to Java strings
-  jstring jrealm = JNIUtil::makeJString(realm);
-  if (JNIUtil::isJavaExceptionThrown())
-    POP_AND_RETURN(false);
 
-  jstring jquestion = JNIUtil::makeJString(question);
-  if (JNIUtil::isJavaExceptionThrown())
-    POP_AND_RETURN(false);
+svn_error_t *Prompter::dispatch_simple_prompt(
+    ::Java::Env env,
+    svn_auth_cred_simple_t **cred_p,
+    const char *realm,
+    const char *username,
+    svn_boolean_t may_save,
+    apr_pool_t *pool)
+{
+  ::JavaHL::AuthnCallback authn(env, m_prompter.get());
+
+  ::JavaHL::AuthnCallback::AuthnResult result(
+      env,
+      authn.user_password_prompt(::Java::String(env, realm),
+                                 ::Java::String(env, username),
+                                 may_save));
+  if (!result.get())
+    return svn_error_create(SVN_ERR_RA_NOT_AUTHORIZED, NULL,
+                            _("User canceled dialog"));
 
-  // execute the callback
-  jboolean ret = env->CallBooleanMethod(m_prompter, mid, jrealm, jquestion,
-                                        yesIsDefault ? JNI_TRUE : JNI_FALSE);
-  if (JNIUtil::isJavaExceptionThrown())
-    POP_AND_RETURN(false);
+  ::Java::String user(env, result.identity());
+  ::Java::String pass(env, result.secret());
+  svn_auth_cred_simple_t *cred =
+    static_cast<svn_auth_cred_simple_t*>(apr_pcalloc(pool, sizeof(*cred)));
+  cred->username = user.strdup(pool);
+  cred->password  = pass.strdup(pool);
+  cred->may_save = result.save();
+  *cred_p = cred;
 
-  env->PopLocalFrame(NULL);
-  return ret ? true:false;
+  return SVN_NO_ERROR;
 }
 
-const char *Prompter::askQuestion(const char *realm, const char *question,
-                                  bool showAnswer, bool maySave)
+svn_error_t *Prompter::dispatch_username_prompt(
+    ::Java::Env env,
+    svn_auth_cred_username_t **cred_p,
+    const char *realm,
+    svn_boolean_t may_save,
+    apr_pool_t *pool)
 {
-  JNIEnv *env = JNIUtil::getEnv();
-
-  // Create a local frame for our references
-  env->PushLocalFrame(LOCAL_FRAME_SIZE);
-  if (JNIUtil::isJavaExceptionThrown())
-    return NULL;
+  ::JavaHL::AuthnCallback authn(env, m_prompter.get());
 
-  static jmethodID mid = 0;
-  static jmethodID mid2 = 0;
-  if (mid == 0)
-    {
-      jclass clazz = env->FindClass(JAVA_PACKAGE"/callback/UserPasswordCallback");
-      if (JNIUtil::isJavaExceptionThrown())
-        POP_AND_RETURN_NULL;
-
-      mid = env->GetMethodID(clazz, "askQuestion",
-                             "(Ljava/lang/String;Ljava/lang/String;"
-                             "ZZ)Ljava/lang/String;");
-      if (JNIUtil::isJavaExceptionThrown() || mid == 0)
-        POP_AND_RETURN_NULL;
-
-      mid2 = env->GetMethodID(clazz, "userAllowedSave", "()Z");
-      if (JNIUtil::isJavaExceptionThrown() || mid == 0)
-        POP_AND_RETURN_NULL;
-    }
+  ::JavaHL::AuthnCallback::AuthnResult result(
+      env,
+      authn.username_prompt(::Java::String(env, realm), may_save));
+  if (!result.get())
+    return svn_error_create(SVN_ERR_RA_NOT_AUTHORIZED, NULL,
+                            _("User canceled dialog"));
 
-  jstring jrealm = JNIUtil::makeJString(realm);
-  if (JNIUtil::isJavaExceptionThrown())
-    POP_AND_RETURN_NULL;
+  ::Java::String user(env, result.identity());
+  svn_auth_cred_username_t *cred =
+    static_cast<svn_auth_cred_username_t*>(apr_pcalloc(pool, sizeof(*cred)));
+  cred->username = user.strdup(pool);
+  cred->may_save = result.save();
+  *cred_p = cred;
 
-  jstring jquestion = JNIUtil::makeJString(question);
-  if (JNIUtil::isJavaExceptionThrown())
-    POP_AND_RETURN_NULL;
+  return SVN_NO_ERROR;
+}
 
-  jstring janswer = static_cast<jstring>(
-                       env->CallObjectMethod(m_prompter, mid, jrealm,
-                                    jquestion,
-                                    showAnswer ? JNI_TRUE : JNI_FALSE,
-                                    maySave ? JNI_TRUE : JNI_FALSE));
-  if (JNIUtil::isJavaExceptionThrown())
-    POP_AND_RETURN_NULL;
+svn_error_t *Prompter::dispatch_ssl_server_trust_prompt(
+    ::Java::Env env,
+    svn_auth_cred_ssl_server_trust_t **cred_p,
+    const char *realm,
+    apr_uint32_t failures,
+    const svn_auth_ssl_server_cert_info_t *cert_info,
+    svn_boolean_t may_save,
+    apr_pool_t *pool)
+{
+  ::JavaHL::AuthnCallback authn(env, m_prompter.get());
+
+  ::JavaHL::AuthnCallback::AuthnResult result(
+      env,
+      authn.ssl_server_trust_prompt(
+          ::Java::String(env, realm),
+          ::JavaHL::AuthnCallback::SSLServerCertFailures(env, jint(failures)),
+          ::JavaHL::AuthnCallback::SSLServerCertInfo(env, cert_info->ascii_cert),
+          may_save));
+  if (!result.get())
+    return svn_error_create(SVN_ERR_RA_NOT_AUTHORIZED, NULL,
+                            _("User canceled dialog"));
 
-  JNIStringHolder answer(janswer);
-  if (answer != NULL)
-    {
-      m_answer = answer;
-      m_maySave = env->CallBooleanMethod(m_prompter, mid2) ? true: false;
-      if (JNIUtil::isJavaExceptionThrown())
-        POP_AND_RETURN_NULL;
-    }
-  else
+  const bool trust = result.trust();
+  if (!trust)
     {
-      m_answer = "";
-      m_maySave = false;
+      *cred_p = NULL;
+      return SVN_NO_ERROR;
     }
 
-  env->PopLocalFrame(NULL);
-  return m_answer.c_str();
-}
+  const bool save = result.save();
+  svn_auth_cred_ssl_server_trust_t *cred =
+    static_cast<svn_auth_cred_ssl_server_trust_t*>(apr_pcalloc(pool, sizeof(*cred)));
+  cred->may_save = save;
+  if (save)
+    cred->accepted_failures = failures;
+  *cred_p = cred;
 
-int Prompter::askTrust(const char *question, bool maySave)
-{
-   static jmethodID mid = 0;
-   JNIEnv *env = JNIUtil::getEnv();
-
-   // Create a local frame for our references
-   env->PushLocalFrame(LOCAL_FRAME_SIZE);
-   if (JNIUtil::isJavaExceptionThrown())
-     return -1;
-
-   if (mid == 0)
-     {
-       jclass clazz = env->FindClass(JAVA_PACKAGE"/callback/UserPasswordCallback");
-       if (JNIUtil::isJavaExceptionThrown())
-         POP_AND_RETURN(-1);
-
-       mid = env->GetMethodID(clazz, "askTrustSSLServer",
-                              "(Ljava/lang/String;Z)I");
-       if (JNIUtil::isJavaExceptionThrown() || mid == 0)
-         POP_AND_RETURN(-1);
-     }
-   jstring jquestion = JNIUtil::makeJString(question);
-   if (JNIUtil::isJavaExceptionThrown())
-     POP_AND_RETURN(-1);
-
-   jint ret = env->CallIntMethod(m_prompter, mid, jquestion,
-                                 maySave ? JNI_TRUE : JNI_FALSE);
-   if (JNIUtil::isJavaExceptionThrown())
-     POP_AND_RETURN(-1);
-
-   env->PopLocalFrame(NULL);
-   return ret;
+  return SVN_NO_ERROR;
 }
 
-bool Prompter::prompt(const char *realm, const char *pi_username, bool maySave)
+svn_error_t *Prompter::dispatch_ssl_client_cert_prompt(
+    ::Java::Env env,
+    svn_auth_cred_ssl_client_cert_t **cred_p,
+    const char *realm,
+    svn_boolean_t may_save,
+    apr_pool_t *pool)
 {
-  JNIEnv *env = JNIUtil::getEnv();
-  jboolean ret;
+  ::JavaHL::AuthnCallback authn(env, m_prompter.get());
 
-  // Create a local frame for our references
-  env->PushLocalFrame(LOCAL_FRAME_SIZE);
-  if (JNIUtil::isJavaExceptionThrown())
-    return false;
+  ::JavaHL::AuthnCallback::AuthnResult result(
+      env,
+      authn.ssl_client_cert_prompt(::Java::String(env, realm), may_save));
+  if (!result.get())
+    return svn_error_create(SVN_ERR_RA_NOT_AUTHORIZED, NULL,
+                            _("User canceled dialog"));
 
-  static jmethodID mid = 0;
-  static jmethodID mid2 = 0;
-  if (mid == 0)
-    {
-      jclass clazz = env->FindClass(JAVA_PACKAGE"/callback/UserPasswordCallback");
-      if (JNIUtil::isJavaExceptionThrown())
-        POP_AND_RETURN(false);
-
-      mid = env->GetMethodID(clazz, "prompt",
-                             "(Ljava/lang/String;Ljava/lang/String;Z)Z");
-      if (JNIUtil::isJavaExceptionThrown() || mid == 0)
-        POP_AND_RETURN(false);
-
-      mid2 = env->GetMethodID(clazz, "userAllowedSave", "()Z");
-      if (JNIUtil::isJavaExceptionThrown() || mid == 0)
-        POP_AND_RETURN(false);
-    }
+  ::Java::String path(env, result.identity());
+  svn_auth_cred_ssl_client_cert_t *cred =
+    static_cast<svn_auth_cred_ssl_client_cert_t*>(apr_pcalloc(pool, sizeof(*cred)));
+  cred->cert_file = path.strdup(pool);
+  cred->may_save = result.save();
+  *cred_p = cred;
 
-  jstring jrealm = JNIUtil::makeJString(realm);
-  if (JNIUtil::isJavaExceptionThrown())
-    POP_AND_RETURN(false);
+  return SVN_NO_ERROR;
+}
 
-  jstring jusername = JNIUtil::makeJString(pi_username);
-  if (JNIUtil::isJavaExceptionThrown())
-    POP_AND_RETURN(false);
+svn_error_t *Prompter::dispatch_ssl_client_cert_pw_prompt(
+    ::Java::Env env,
+    svn_auth_cred_ssl_client_cert_pw_t **cred_p,
+    const char *realm,
+    svn_boolean_t may_save,
+    apr_pool_t *pool)
+{
+  ::JavaHL::AuthnCallback authn(env, m_prompter.get());
 
-  ret = env->CallBooleanMethod(m_prompter, mid, jrealm, jusername,
-                               maySave ? JNI_TRUE: JNI_FALSE);
-  if (JNIUtil::isJavaExceptionThrown())
-    POP_AND_RETURN(false);
+  ::JavaHL::AuthnCallback::AuthnResult result(
+      env,
+      authn.ssl_client_cert_passphrase_prompt(
+          ::Java::String(env, realm), may_save));
+  if (!result.get())
+    return svn_error_create(SVN_ERR_RA_NOT_AUTHORIZED, NULL,
+                            _("User canceled dialog"));
 
-  m_maySave = env->CallBooleanMethod(m_prompter, mid2) ? true : false;
-  if (JNIUtil::isJavaExceptionThrown())
-    POP_AND_RETURN(false);
+  ::Java::String passphrase(env, result.secret());
+  svn_auth_cred_ssl_client_cert_pw_t *cred =
+    static_cast<svn_auth_cred_ssl_client_cert_pw_t*>(apr_pcalloc(pool, sizeof(*cred)));
+  cred->password = passphrase.strdup(pool);
+  cred->may_save = result.save();
+  *cred_p = cred;
 
-  env->PopLocalFrame(NULL);
-  return ret ? true:false;
+  return SVN_NO_ERROR;
 }
 
-svn_auth_provider_object_t *Prompter::getProviderSimple(SVN::Pool &in_pool)
+svn_error_t *Prompter::dispatch_plaintext_prompt(
+    ::Java::Env env,
+    svn_boolean_t *may_save_plaintext,
+    const char *realmstring,
+    apr_pool_t *pool)
 {
-  apr_pool_t *pool = in_pool.getPool();
-  svn_auth_provider_object_t *provider;
-  svn_auth_get_simple_prompt_provider(&provider,
-                                      simple_prompt,
-                                      this,
-                                      2, /* retry limit */
-                                      pool);
-
-  return provider;
+  ::JavaHL::AuthnCallback authn(env, m_prompter.get());
+  *may_save_plaintext =
+    authn.allow_store_plaintext_password(::Java::String(env, realmstring));
+  return SVN_NO_ERROR;
 }
 
-svn_auth_provider_object_t *Prompter::getProviderUsername(SVN::Pool &in_pool)
+svn_error_t *Prompter::dispatch_plaintext_passphrase_prompt(
+    ::Java::Env env,
+    svn_boolean_t *may_save_plaintext,
+    const char *realmstring,
+    apr_pool_t *pool)
 {
-  apr_pool_t *pool = in_pool.getPool();
-  svn_auth_provider_object_t *provider;
-  svn_auth_get_username_prompt_provider(&provider,
-                                        username_prompt,
-                                        this,
-                                        2, /* retry limit */
-                                        pool);
-
-  return provider;
+  ::JavaHL::AuthnCallback authn(env, m_prompter.get());
+  *may_save_plaintext =
+    authn.allow_store_plaintext_passphrase(::Java::String(env, realmstring));
+  return SVN_NO_ERROR;
 }
 
-svn_auth_provider_object_t *Prompter::getProviderServerSSLTrust(SVN::Pool &in_pool)
+
+// Class CompatPrompter
+
+Prompter::UniquePtr CompatPrompter::create(jobject jprompter)
 {
-  apr_pool_t *pool = in_pool.getPool();
-  svn_auth_provider_object_t *provider;
-  svn_auth_get_ssl_server_trust_prompt_provider
-    (&provider, ssl_server_trust_prompt, this, pool);
+  if (!jprompter)
+    return UniquePtr(NULL);
 
-  return provider;
+  // Make sure no C++ exceptions are propagated from here.
+  const ::Java::Env jenv;
+  try
+    {
+      const jclass cls =
+        ::Java::ClassCache::get_user_passwd_cb(jenv)->get_class();
+      if (!jenv.IsInstanceOf(jprompter, cls))
+        return UniquePtr(NULL);
+
+      return UniquePtr(new CompatPrompter(jenv, jprompter));
+    }
+  SVN_JAVAHL_JNI_CATCH;
+  return UniquePtr(NULL);
 }
 
-svn_auth_provider_object_t *Prompter::getProviderClientSSL(SVN::Pool &in_pool)
+Prompter::UniquePtr CompatPrompter::clone() const
 {
-  apr_pool_t *pool = in_pool.getPool();
-  svn_auth_provider_object_t *provider;
-  svn_auth_get_ssl_client_cert_prompt_provider(&provider,
-                                               ssl_client_cert_prompt,
-                                               this,
-                                               2 /* retry limit */,
-                                               pool);
-
-  return provider;
+  return create(m_prompter.get());
 }
 
-svn_auth_provider_object_t *Prompter::getProviderClientSSLPassword(SVN::Pool &in_pool)
+CompatPrompter::CompatPrompter(::Java::Env env, jobject jprompter)
+  : Prompter(env, jprompter)
+{}
+
+CompatPrompter::~CompatPrompter() {}
+
+namespace {
+jstring compat_ask_question(
+    bool& allowed_save,
+    ::Java::Env env,
+    ::JavaHL::UserPasswordCallback& authn,
+    const char *realm, const char *question,
+    bool show_answer, bool may_save)
 {
-  apr_pool_t *pool = in_pool.getPool();
-  svn_auth_provider_object_t *provider;
-  svn_auth_get_ssl_client_cert_pw_prompt_provider
-    (&provider, ssl_client_cert_pw_prompt, this, 2 /* retry limit */,
-     pool);
+  const jstring janswer =
+    authn.ask_question(::Java::String(env, realm),
+                       ::Java::String(env, question),
+                       show_answer, may_save);
 
-  return provider;
-}
+  if (janswer)
+    allowed_save = authn.user_allowed_save();
+  else
+    allowed_save = false;
 
-svn_error_t *Prompter::simple_prompt(svn_auth_cred_simple_t **cred_p,
-                                     void *baton,
-                                     const char *realm, const char *username,
-                                     svn_boolean_t may_save,
-                                     apr_pool_t *pool)
+  return janswer;
+}
+} // anonymous namespace
+
+svn_error_t *CompatPrompter::dispatch_simple_prompt(
+    ::Java::Env env,
+    svn_auth_cred_simple_t **cred_p,
+    const char *realm, const char *username,
+    svn_boolean_t may_save,
+    apr_pool_t *pool)
 {
-  Prompter *that = static_cast<Prompter *>(baton);
-  svn_auth_cred_simple_t *ret =
-    reinterpret_cast<svn_auth_cred_simple_t*>(apr_pcalloc(pool, sizeof(*ret)));
-  if (!that->prompt(realm, username, may_save ? true : false))
-    return svn_error_create(SVN_ERR_RA_NOT_AUTHORIZED, NULL,
-                            _("User canceled dialog"));
-  jstring juser = that->username();
-  JNIStringHolder user(juser);
-  if (user == NULL)
+  ::JavaHL::UserPasswordCallback authn(env, m_prompter.get());
+
+  if (!authn.prompt(::Java::String(env, realm),
+                    ::Java::String(env, username),
+                    may_save))
     return svn_error_create(SVN_ERR_RA_NOT_AUTHORIZED, NULL,
                             _("User canceled dialog"));
-  ret->username = apr_pstrdup(pool,user);
-  jstring jpass = that->password();
-  JNIStringHolder pass(jpass);
-  if (pass == NULL)
+  const ::Java::String user(env, authn.get_username());
+  const ::Java::String pass(env, authn.get_password());
+
+  if (!user.get() || !pass.get())
     return svn_error_create(SVN_ERR_RA_NOT_AUTHORIZED, NULL,
                             _("User canceled dialog"));
-  else
-    {
-      ret->password  = apr_pstrdup(pool, pass);
-      ret->may_save = that->m_maySave;
-    }
-  *cred_p = ret;
+
+  svn_auth_cred_simple_t *cred =
+    static_cast<svn_auth_cred_simple_t*>(apr_pcalloc(pool, sizeof(*cred)));
+  cred->username = user.strdup(pool);
+  cred->password  = pass.strdup(pool);
+  cred->may_save = authn.user_allowed_save();
+  *cred_p = cred;
 
   return SVN_NO_ERROR;
 }
 
-svn_error_t *Prompter::username_prompt(svn_auth_cred_username_t **cred_p,
-                                       void *baton,
-                                       const char *realm,
-                                       svn_boolean_t may_save,
-                                       apr_pool_t *pool)
+svn_error_t *CompatPrompter::dispatch_username_prompt(
+    ::Java::Env env,
+    svn_auth_cred_username_t **cred_p,
+    const char *realm,
+    svn_boolean_t may_save,
+    apr_pool_t *pool)
 {
-  Prompter *that = static_cast<Prompter *>(baton);
-  svn_auth_cred_username_t *ret =
-    reinterpret_cast<svn_auth_cred_username_t*>(apr_pcalloc(pool, sizeof(*ret)));
-  const char *user = that->askQuestion(realm, _("Username: "), true,
-                                       may_save ? true : false);
-  if (user == NULL)
+  ::JavaHL::UserPasswordCallback authn(env, m_prompter.get());
+
+  bool allowed_save;
+  const ::Java::String user(
+      env,
+      compat_ask_question(allowed_save, env, authn,
+                          realm, _("Username: "), true, may_save));
+  if (!user.get())
     return svn_error_create(SVN_ERR_RA_NOT_AUTHORIZED, NULL,
                             _("User canceled dialog"));
-  ret->username = apr_pstrdup(pool,user);
-  ret->may_save = that->m_maySave;
-  *cred_p = ret;
+
+  svn_auth_cred_username_t *cred =
+    static_cast<svn_auth_cred_username_t*>(apr_pcalloc(pool, sizeof(*cred)));
+  cred->username = user.strdup(pool);
+  cred->may_save = allowed_save;
+  *cred_p = cred;
 
   return SVN_NO_ERROR;
 }
 
 svn_error_t *
-Prompter::ssl_server_trust_prompt(svn_auth_cred_ssl_server_trust_t **cred_p,
-                                  void *baton,
-                                  const char *realm,
-                                  apr_uint32_t failures,
-                                  const svn_auth_ssl_server_cert_info_t *cert_info,
-                                  svn_boolean_t may_save,
-                                  apr_pool_t *pool)
+CompatPrompter::dispatch_ssl_server_trust_prompt(
+    ::Java::Env env,
+    svn_auth_cred_ssl_server_trust_t **cred_p,
+    const char *realm,
+    apr_uint32_t failures,
+    const svn_auth_ssl_server_cert_info_t *cert_info,
+    svn_boolean_t may_save,
+    apr_pool_t *pool)
 {
-  Prompter *that = static_cast<Prompter *>(baton);
-  svn_auth_cred_ssl_server_trust_t *ret =
-    reinterpret_cast<svn_auth_cred_ssl_server_trust_t*>(apr_pcalloc(pool, sizeof(*ret)));
+  ::JavaHL::UserPasswordCallback authn(env, m_prompter.get());
 
   std::string question = _("Error validating server certificate for ");
   question += realm;
@@ -526,16 +590,20 @@ Prompter::ssl_server_trust_prompt(svn_auth_cred_ssl_server_trust_t **cred_p,
       question += "\n";
     }
 
-  switch(that->askTrust(question.c_str(), may_save ? true : false))
+  svn_auth_cred_ssl_server_trust_t *cred =
+    static_cast<svn_auth_cred_ssl_server_trust_t*>(apr_pcalloc(pool, sizeof(*cred)));
+
+  switch (authn.ask_trust_ssl_server(::Java::String(env, question), may_save))
     {
     case org_apache_subversion_javahl_callback_UserPasswordCallback_AcceptTemporary:
-      *cred_p = ret;
-      ret->may_save = FALSE;
+      cred->may_save = FALSE;
+      cred->accepted_failures = failures;
+      *cred_p = cred;
       break;
     case org_apache_subversion_javahl_callback_UserPasswordCallback_AcceptPermanently:
-      *cred_p = ret;
-      ret->may_save = TRUE;
-      ret->accepted_failures = failures;
+      cred->may_save = TRUE;
+      cred->accepted_failures = failures;
+      *cred_p = cred;
       break;
     default:
       *cred_p = NULL;
@@ -544,79 +612,91 @@ Prompter::ssl_server_trust_prompt(svn_auth_cred_ssl_server_trust_t **cred_p,
 }
 
 svn_error_t *
-Prompter::ssl_client_cert_prompt(svn_auth_cred_ssl_client_cert_t **cred_p,
-                                 void *baton,
-                                 const char *realm,
-                                 svn_boolean_t may_save,
-                                 apr_pool_t *pool)
+CompatPrompter::dispatch_ssl_client_cert_prompt(
+    ::Java::Env env,
+    svn_auth_cred_ssl_client_cert_t **cred_p,
+    const char *realm,
+    svn_boolean_t may_save,
+    apr_pool_t *pool)
 {
-  Prompter *that = static_cast<Prompter *>(baton);
-  svn_auth_cred_ssl_client_cert_t *ret =
-    reinterpret_cast<svn_auth_cred_ssl_client_cert_t*>(apr_pcalloc(pool, sizeof(*ret)));
-  const char *cert_file =
-    that->askQuestion(realm, _("client certificate filename: "), true,
-                      may_save ? true : false);
-  if (cert_file == NULL)
+  ::JavaHL::UserPasswordCallback authn(env, m_prompter.get());
+
+  bool allowed_save;
+  const ::Java::String path(
+      env,
+      compat_ask_question(allowed_save, env, authn, realm,
+                          _("Client certificate filename: "),
+                          true, may_save));
+  if (!path.get())
     return svn_error_create(SVN_ERR_RA_NOT_AUTHORIZED, NULL,
                             _("User canceled dialog"));
-  ret->cert_file = apr_pstrdup(pool, cert_file);
-  ret->may_save = that->m_maySave;
-  *cred_p = ret;
+
+  svn_auth_cred_ssl_client_cert_t *cred =
+    static_cast<svn_auth_cred_ssl_client_cert_t*>(apr_pcalloc(pool, sizeof(*cred)));
+  cred->cert_file = path.strdup(pool);
+  cred->may_save = allowed_save;
+  *cred_p = cred;
   return SVN_NO_ERROR;
 }
 
 svn_error_t *
-Prompter::ssl_client_cert_pw_prompt(svn_auth_cred_ssl_client_cert_pw_t **cred_p,
-                                    void *baton,
-                                    const char *realm,
-                                    svn_boolean_t may_save,
-                                    apr_pool_t *pool)
+CompatPrompter::dispatch_ssl_client_cert_pw_prompt(
+    ::Java::Env env,
+    svn_auth_cred_ssl_client_cert_pw_t **cred_p,
+    const char *realm,
+    svn_boolean_t may_save,
+    apr_pool_t *pool)
 {
-  Prompter *that = static_cast<Prompter *>(baton);
-  svn_auth_cred_ssl_client_cert_pw_t *ret =
-    reinterpret_cast<svn_auth_cred_ssl_client_cert_pw_t*>(apr_pcalloc(pool, sizeof(*ret)));
-  const char *info = that->askQuestion(realm,
-                                       _("client certificate passphrase: "),
-                                       false, may_save ? true : false);
-  if (info == NULL)
+  ::JavaHL::UserPasswordCallback authn(env, m_prompter.get());
+
+  bool allowed_save;
+  const ::Java::String info(
+      env,
+      compat_ask_question(allowed_save, env, authn, realm,
+                          _("Client certificate passphrase: "),
+                          false, may_save));
+  if (!info.get())
     return svn_error_create(SVN_ERR_RA_NOT_AUTHORIZED, NULL,
                             _("User canceled dialog"));
-  ret->password = apr_pstrdup(pool, info);
-  ret->may_save = that->m_maySave;
-  *cred_p = ret;
+
+  svn_auth_cred_ssl_client_cert_pw_t *cred =
+    static_cast<svn_auth_cred_ssl_client_cert_pw_t*>(apr_pcalloc(pool, sizeof(*cred)));
+  cred->password = info.strdup(pool);
+  cred->may_save = allowed_save;
+  *cred_p = cred;
   return SVN_NO_ERROR;
 }
 
 svn_error_t *
-Prompter::plaintext_prompt(svn_boolean_t *may_save_plaintext,
-                           const char *realmstring,
-                           void *baton,
-                           apr_pool_t *pool)
+CompatPrompter::dispatch_plaintext_prompt(
+    ::Java::Env env,
+    svn_boolean_t *may_save_plaintext,
+    const char *realmstring,
+    apr_pool_t *pool)
 {
-  Prompter *that = static_cast<Prompter *>(baton);
+  ::JavaHL::UserPasswordCallback authn(env, m_prompter.get());
 
-  bool result = that->askYesNo(realmstring,
-                               _("Store password unencrypted?"),
-                               false);
-
-  *may_save_plaintext = (result ? TRUE : FALSE);
+  *may_save_plaintext = authn.ask_yes_no(
+      ::Java::String(env, realmstring),
+      ::Java::String(env, _("Store password unencrypted?")),
+      false);
 
   return SVN_NO_ERROR;
 }
 
 svn_error_t *
-Prompter::plaintext_passphrase_prompt(svn_boolean_t *may_save_plaintext,
-                                      const char *realmstring,
-                                      void *baton,
-                                      apr_pool_t *pool)
+CompatPrompter::dispatch_plaintext_passphrase_prompt(
+    ::Java::Env env,
+    svn_boolean_t *may_save_plaintext,
+    const char *realmstring,
+    apr_pool_t *pool)
 {
-  Prompter *that = static_cast<Prompter *>(baton);
-
-  bool result = that->askYesNo(realmstring,
-                               _("Store passphrase unencrypted?"),
-                               false);
+  ::JavaHL::UserPasswordCallback authn(env, m_prompter.get());
 
-  *may_save_plaintext = (result ? TRUE : FALSE);
+  *may_save_plaintext = authn.ask_yes_no(
+      ::Java::String(env, realmstring),
+      ::Java::String(env, _("Store passphrase unencrypted?")),
+      false);
 
   return SVN_NO_ERROR;
 }
diff --git a/subversion/bindings/javahl/native/Prompter.h b/subversion/bindings/javahl/native/Prompter.h
index 722abce..06a7f2d 100644
--- a/subversion/bindings/javahl/native/Prompter.h
+++ b/subversion/bindings/javahl/native/Prompter.h
@@ -24,93 +24,219 @@
  * @brief Interface of the class Prompter
  */
 
-#ifndef PROMPTER_H
-#define PROMPTER_H
+#ifndef SVN_JAVAHL_PROMPTER_H
+#define SVN_JAVAHL_PROMPTER_H
+
+#include <memory>
 
-#include <jni.h>
 #include "svn_auth.h"
-#include <string>
+
 #include "Pool.h"
-/**
- * This class requests username/password and informations about
- * ssl-certificates from the user.
- */
+
+#include "jniwrapper/jni_globalref.hpp"
+
 class Prompter
 {
- private:
+public:
+  typedef ::std::auto_ptr<Prompter> UniquePtr;
+
   /**
-   * The Java callback object.
+   * Factory method; @a prompter is a local reference to the Java
+   * callback object.
    */
-  jobject m_prompter;
+  static Prompter::UniquePtr create(jobject jprompter);
 
   /**
-   * Tntermediate storage for an answer.
+   * Return a clone of the current object, referring to the same Java
+   * prompter object.
    */
-  std::string m_answer;
+  virtual Prompter::UniquePtr clone() const;
+
+  virtual ~Prompter();
+
+  svn_auth_provider_object_t *get_provider_username(SVN::Pool &in_pool);
+  svn_auth_provider_object_t *get_provider_simple(SVN::Pool &in_pool);
+  svn_auth_provider_object_t *get_provider_server_ssl_trust(SVN::Pool &in_pool);
+  svn_auth_provider_object_t *get_provider_client_ssl(SVN::Pool &in_pool);
+  svn_auth_provider_object_t *get_provider_client_ssl_password(SVN::Pool &in_pool);
+
+protected:
+  explicit Prompter(::Java::Env env, jobject jprompter);
 
   /**
-   * Flag is the user allowed, that the last answer is stored in the
-   * configuration.
+   * The Java callback object.
    */
-  bool m_maySave;
-
-  Prompter(jobject jprompter);
-  bool prompt(const char *realm, const char *pi_username, bool maySave);
-  bool askYesNo(const char *realm, const char *question, bool yesIsDefault);
-  const char *askQuestion(const char *realm, const char *question,
-                          bool showAnswer, bool maySave);
-  int askTrust(const char *question, bool maySave);
-  jstring password();
-  jstring username();
-  static svn_error_t *simple_prompt(svn_auth_cred_simple_t **cred_p,
-                                    void *baton, const char *realm,
-                                    const char *username,
-                                    svn_boolean_t may_save,
-                                    apr_pool_t *pool);
-  static svn_error_t *username_prompt
-    (svn_auth_cred_username_t **cred_p,
-     void *baton,
-     const char *realm,
-     svn_boolean_t may_save,
-     apr_pool_t *pool);
-  static svn_error_t *ssl_server_trust_prompt
-    (svn_auth_cred_ssl_server_trust_t **cred_p,
-     void *baton,
-     const char *realm,
-     apr_uint32_t failures,
-     const svn_auth_ssl_server_cert_info_t *cert_info,
-     svn_boolean_t may_save,
-     apr_pool_t *pool);
-  static svn_error_t *ssl_client_cert_prompt
-    (svn_auth_cred_ssl_client_cert_t **cred_p,
-     void *baton,
-     const char *realm,
-     svn_boolean_t may_save,
-     apr_pool_t *pool);
-  static svn_error_t *ssl_client_cert_pw_prompt
-    (svn_auth_cred_ssl_client_cert_pw_t **cred_p,
-     void *baton,
-     const char *realm,
-     svn_boolean_t may_save,
-     apr_pool_t *pool);
- public:
-  static Prompter *makeCPrompter(jobject jprompter);
-  ~Prompter();
-  svn_auth_provider_object_t *getProviderUsername(SVN::Pool &in_pool);
-  svn_auth_provider_object_t *getProviderSimple(SVN::Pool &in_pool);
-  svn_auth_provider_object_t *getProviderServerSSLTrust(SVN::Pool &in_pool);
-  svn_auth_provider_object_t *getProviderClientSSL(SVN::Pool &in_pool);
-  svn_auth_provider_object_t *getProviderClientSSLPassword(SVN::Pool &in_pool);
-
-  static svn_error_t *plaintext_prompt(svn_boolean_t *may_save_plaintext,
-                                       const char *realmstring,
-                                       void *baton,
-                                       apr_pool_t *pool);
+  ::Java::GlobalObject m_prompter;
+
+  virtual svn_error_t *dispatch_simple_prompt(
+      ::Java::Env env,
+      svn_auth_cred_simple_t **cred_p,
+      const char *realm,
+      const char *username,
+      svn_boolean_t may_save,
+      apr_pool_t *pool);
+
+  static svn_error_t *simple_prompt(
+      svn_auth_cred_simple_t **cred_p,
+      void *baton,
+      const char *realm,
+      const char *username,
+      svn_boolean_t may_save,
+      apr_pool_t *pool);
+
+  virtual svn_error_t *dispatch_username_prompt(
+      ::Java::Env env,
+      svn_auth_cred_username_t **cred_p,
+      const char *realm,
+      svn_boolean_t may_save,
+      apr_pool_t *pool);
+
+  static svn_error_t *username_prompt(
+      svn_auth_cred_username_t **cred_p,
+      void *baton,
+      const char *realm,
+      svn_boolean_t may_save,
+      apr_pool_t *pool);
+
+  virtual svn_error_t *dispatch_ssl_server_trust_prompt(
+      ::Java::Env env,
+      svn_auth_cred_ssl_server_trust_t **cred_p,
+      const char *realm,
+      apr_uint32_t failures,
+      const svn_auth_ssl_server_cert_info_t *cert_info,
+      svn_boolean_t may_save,
+      apr_pool_t *pool);
+
+  static svn_error_t *ssl_server_trust_prompt(
+      svn_auth_cred_ssl_server_trust_t **cred_p,
+      void *baton,
+      const char *realm,
+      apr_uint32_t failures,
+      const svn_auth_ssl_server_cert_info_t *cert_info,
+      svn_boolean_t may_save,
+      apr_pool_t *pool);
+
+  virtual svn_error_t *dispatch_ssl_client_cert_prompt(
+      ::Java::Env env,
+      svn_auth_cred_ssl_client_cert_t **cred_p,
+      const char *realm,
+      svn_boolean_t may_save,
+      apr_pool_t *pool);
+
+  static svn_error_t *ssl_client_cert_prompt(
+      svn_auth_cred_ssl_client_cert_t **cred_p,
+      void *baton,
+      const char *realm,
+      svn_boolean_t may_save,
+      apr_pool_t *pool);
+
+  virtual svn_error_t *dispatch_ssl_client_cert_pw_prompt(
+      ::Java::Env env,
+      svn_auth_cred_ssl_client_cert_pw_t **cred_p,
+      const char *realm,
+      svn_boolean_t may_save,
+      apr_pool_t *pool);
+
+  static svn_error_t *ssl_client_cert_pw_prompt(
+      svn_auth_cred_ssl_client_cert_pw_t **cred_p,
+      void *baton,
+      const char *realm,
+      svn_boolean_t may_save,
+      apr_pool_t *pool);
+
+protected:
+  virtual svn_error_t *dispatch_plaintext_prompt(
+      ::Java::Env env,
+      svn_boolean_t *may_save_plaintext,
+      const char *realmstring,
+      apr_pool_t *pool);
+
+public:
+  static svn_error_t *plaintext_prompt(
+      svn_boolean_t *may_save_plaintext,
+      const char *realmstring,
+      void *baton,
+      apr_pool_t *pool);
+
+protected:
+  virtual svn_error_t *dispatch_plaintext_passphrase_prompt(
+      ::Java::Env env,
+      svn_boolean_t *may_save_plaintext,
+      const char *realmstring,
+      apr_pool_t *pool);
+
+public:
   static svn_error_t *plaintext_passphrase_prompt(
-                                      svn_boolean_t *may_save_plaintext,
-                                      const char *realmstring,
-                                      void *baton,
-                                      apr_pool_t *pool);
+      svn_boolean_t *may_save_plaintext,
+      const char *realmstring,
+      void *baton,
+      apr_pool_t *pool);
+};
+
+
+/**
+ * This class requests username/password and informations about
+ * ssl-certificates from the user.
+ */
+class CompatPrompter : public Prompter
+{
+public:
+  static Prompter::UniquePtr create(jobject jprompter);
+  virtual Prompter::UniquePtr clone() const;
+  virtual ~CompatPrompter();
+
+protected:
+  explicit CompatPrompter(::Java::Env env, jobject jprompter);
+
+  virtual svn_error_t *dispatch_simple_prompt(
+      ::Java::Env env,
+      svn_auth_cred_simple_t **cred_p,
+      const char *realm,
+      const char *username,
+      svn_boolean_t may_save,
+      apr_pool_t *pool);
+
+  virtual svn_error_t *dispatch_username_prompt(
+      ::Java::Env env,
+      svn_auth_cred_username_t **cred_p,
+      const char *realm,
+      svn_boolean_t may_save,
+      apr_pool_t *pool);
+
+  virtual svn_error_t *dispatch_ssl_server_trust_prompt(
+      ::Java::Env env,
+      svn_auth_cred_ssl_server_trust_t **cred_p,
+      const char *realm,
+      apr_uint32_t failures,
+      const svn_auth_ssl_server_cert_info_t *cert_info,
+      svn_boolean_t may_save,
+      apr_pool_t *pool);
+
+  virtual svn_error_t *dispatch_ssl_client_cert_prompt(
+      ::Java::Env env,
+      svn_auth_cred_ssl_client_cert_t **cred_p,
+      const char *realm,
+      svn_boolean_t may_save,
+      apr_pool_t *pool);
+
+  virtual svn_error_t *dispatch_ssl_client_cert_pw_prompt(
+      ::Java::Env env,
+      svn_auth_cred_ssl_client_cert_pw_t **cred_p,
+      const char *realm,
+      svn_boolean_t may_save,
+      apr_pool_t *pool);
+
+  virtual svn_error_t *dispatch_plaintext_prompt(
+      ::Java::Env env,
+      svn_boolean_t *may_save_plaintext,
+      const char *realmstring,
+      apr_pool_t *pool);
+
+  virtual svn_error_t *dispatch_plaintext_passphrase_prompt(
+      ::Java::Env env,
+      svn_boolean_t *may_save_plaintext,
+      const char *realmstring,
+      apr_pool_t *pool);
 };
 
-#endif // PROMPTER_H
+#endif // SVN_JAVAHL_PROMPTER_H
diff --git a/subversion/bindings/javahl/native/RevpropTable.cpp b/subversion/bindings/javahl/native/PropertyTable.cpp
index 5da74dd..0a44f0c 100644
--- a/subversion/bindings/javahl/native/RevpropTable.cpp
+++ b/subversion/bindings/javahl/native/PropertyTable.cpp
@@ -20,13 +20,14 @@
  * ====================================================================
  * @endcopyright
  *
- * @file RevpropTable.cpp
- * @brief Implementation of the class RevpropTable
+ * @file PropertyTable.cpp
+ * @brief Implementation of the class PropertyTable
  */
 
-#include "RevpropTable.h"
+#include "PropertyTable.h"
 #include "JNIUtil.h"
 #include "JNIStringHolder.h"
+#include "JNIByteArray.h"
 #include "Array.h"
 #include <apr_tables.h>
 #include <apr_strings.h>
@@ -35,15 +36,15 @@
 #include "svn_props.h"
 #include <iostream>
 
-RevpropTable::~RevpropTable()
+PropertyTable::~PropertyTable()
 {
   if (m_revpropTable != NULL)
     JNIUtil::getEnv()->DeleteLocalRef(m_revpropTable);
 }
 
-const apr_hash_t *RevpropTable::hash(const SVN::Pool &pool)
+apr_hash_t *PropertyTable::hash(const SVN::Pool &pool)
 {
-  if (m_revprops.size() == 0)
+  if (!m_revpropTable && !m_empty_if_null)
     return NULL;
 
   apr_hash_t *revprop_table = apr_hash_make(pool.getPool());
@@ -57,13 +58,14 @@ const apr_hash_t *RevpropTable::hash(const SVN::Pool &pool)
           const char *msg = apr_psprintf(pool.getPool(),
                                          "Invalid property name: '%s'",
                                          propname);
-          JNIUtil::throwNativeException(JAVA_PACKAGE "/ClientException", msg,
+          JNIUtil::throwNativeException(JAVAHL_CLASS("/ClientException"), msg,
                                         NULL, SVN_ERR_CLIENT_PROPERTY_NAME);
           return NULL;
         }
 
-      svn_string_t *propval = svn_string_create(it->second.c_str(),
-                                                pool.getPool());
+      svn_string_t *propval = svn_string_ncreate(it->second.c_str(),
+                                                 it->second.size(),
+                                                 pool.getPool());
 
       apr_hash_set(revprop_table, propname, APR_HASH_KEY_STRING, propval);
     }
@@ -71,7 +73,10 @@ const apr_hash_t *RevpropTable::hash(const SVN::Pool &pool)
   return revprop_table;
 }
 
-RevpropTable::RevpropTable(jobject jrevpropTable)
+PropertyTable::PropertyTable(jobject jrevpropTable, bool bytearray_values,
+                             bool empty_if_null)
+  : m_revpropTable(jrevpropTable),
+    m_empty_if_null(empty_if_null)
 {
   m_revpropTable = jrevpropTable;
 
@@ -116,12 +121,27 @@ RevpropTable::RevpropTable(jobject jrevpropTable)
           if (JNIUtil::isExceptionThrown())
             return;
 
-          JNIStringHolder propval((jstring)jpropval);
-          if (JNIUtil::isExceptionThrown())
-            return;
-
-          m_revprops[std::string(static_cast<const char *>(propname))]
-            = std::string(static_cast<const char *>(propval));
+          std::string pv;
+          if (bytearray_values)
+            {
+              JNIByteArray propval((jbyteArray)jpropval);
+              if (JNIUtil::isExceptionThrown())
+                return;
+              if (!propval.isNull())
+                pv = std::string(
+                    reinterpret_cast<const char*>(propval.getBytes()),
+                    propval.getLength());
+            }
+          else
+            {
+              JNIStringHolder propval((jstring)jpropval);
+              if (JNIUtil::isExceptionThrown())
+                return;
+              if (NULL != static_cast<const char *>(propval))
+                pv = static_cast<const char *>(propval);
+            }
+
+          m_revprops[std::string(static_cast<const char *>(propname))] = pv;
 
           JNIUtil::getEnv()->DeleteLocalRef(jpropval);
         }
diff --git a/subversion/bindings/javahl/native/RevpropTable.h b/subversion/bindings/javahl/native/PropertyTable.h
index ee5f14f..8a9a335 100644
--- a/subversion/bindings/javahl/native/RevpropTable.h
+++ b/subversion/bindings/javahl/native/PropertyTable.h
@@ -20,8 +20,8 @@
  * ====================================================================
  * @endcopyright
  *
- * @file RevpropTable.h
- * @brief Interface of the class RevpropTable
+ * @file PropertyTable.h
+ * @brief Interface of the class PropertyTable
  */
 
 #ifndef REVPROPTABLE_H
@@ -36,15 +36,18 @@ struct apr_hash_t;
 #include <map>
 #include <string>
 
-class RevpropTable
+class PropertyTable
 {
  private:
   std::map<std::string, std::string> m_revprops;
   jobject m_revpropTable;
+  bool m_empty_if_null;
  public:
-  RevpropTable(jobject jrevpropTable);
-  ~RevpropTable();
-  const apr_hash_t *hash(const SVN::Pool &pool);
+  PropertyTable(jobject jrevpropTable,
+                bool bytearray_values,
+                bool empty_if_null);
+  ~PropertyTable();
+  apr_hash_t *hash(const SVN::Pool &pool);
 };
 
 #endif // REVPROPTABLE_H
diff --git a/subversion/bindings/javahl/native/ProplistCallback.cpp b/subversion/bindings/javahl/native/ProplistCallback.cpp
index be46cf5..85d28c5 100644
--- a/subversion/bindings/javahl/native/ProplistCallback.cpp
+++ b/subversion/bindings/javahl/native/ProplistCallback.cpp
@@ -89,7 +89,7 @@ svn_error_t *ProplistCallback::singlePath(const char *path,
   static volatile jmethodID mid = 0;
   if (mid == 0)
     {
-      jclass clazz = env->FindClass(JAVA_PACKAGE"/callback/ProplistCallback");
+      jclass clazz = env->FindClass(JAVAHL_CLASS("/callback/ProplistCallback"));
       if (JNIUtil::isJavaExceptionThrown())
         return SVN_NO_ERROR;
 
@@ -104,7 +104,7 @@ svn_error_t *ProplistCallback::singlePath(const char *path,
   if (JNIUtil::isJavaExceptionThrown())
     POP_AND_RETURN(SVN_NO_ERROR);
 
-  jobject jmap = CreateJ::PropertyMap(prop_hash);
+  jobject jmap = CreateJ::PropertyMap(prop_hash, pool);
   if (JNIUtil::isJavaExceptionThrown())
     POP_AND_RETURN(SVN_NO_ERROR);
 
@@ -112,9 +112,7 @@ svn_error_t *ProplistCallback::singlePath(const char *path,
   env->CallVoidMethod(m_callback, mid, jpath, jmap);
   // We return whether an exception was thrown or not.
 
-  env->PopLocalFrame(NULL);
-
-  return SVN_NO_ERROR;
+  POP_AND_RETURN_EXCEPTION_AS_SVNERROR();
 }
 
 
@@ -144,7 +142,7 @@ svn_error_t *ProplistCallback::singlePath(
   static jmethodID mid = 0;
   if (mid == 0)
     {
-      jclass clazz = env->FindClass(JAVA_PACKAGE"/callback/InheritedProplistCallback");
+      jclass clazz = env->FindClass(JAVAHL_CLASS("/callback/InheritedProplistCallback"));
       if (JNIUtil::isJavaExceptionThrown())
         return SVN_NO_ERROR;
 
@@ -159,7 +157,7 @@ svn_error_t *ProplistCallback::singlePath(
   if (JNIUtil::isJavaExceptionThrown())
     POP_AND_RETURN(SVN_NO_ERROR);
 
-  jobject jmap = CreateJ::PropertyMap(prop_hash);
+  jobject jmap = CreateJ::PropertyMap(prop_hash, pool);
   if (JNIUtil::isJavaExceptionThrown())
     POP_AND_RETURN(SVN_NO_ERROR);
 
diff --git a/subversion/bindings/javahl/native/RemoteSession.cpp b/subversion/bindings/javahl/native/RemoteSession.cpp
new file mode 100644
index 0000000..42bfe75
--- /dev/null
+++ b/subversion/bindings/javahl/native/RemoteSession.cpp
@@ -0,0 +1,1322 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ *
+ * @file RemoteSession.cpp
+ * @brief Implementation of the class RemoteSession
+ */
+
+#include <cstring>
+#include <memory>
+#include <set>
+
+#include "JNIByteArray.h"
+#include "JNIStringHolder.h"
+#include "JNIUtil.h"
+#include "Path.h"
+
+#include "svn_ra.h"
+#include "svn_string.h"
+#include "svn_dirent_uri.h"
+#include "svn_delta.h"
+
+#include "CreateJ.h"
+#include "EnumMapper.h"
+#include "Iterator.h"
+#include "LogMessageCallback.h"
+#include "OutputStream.h"
+#include "Prompter.h"
+#include "Revision.h"
+#include "RemoteSession.h"
+#include "EditorProxy.h"
+#include "StateReporter.h"
+
+#include <apr_strings.h>
+#include "svn_private_config.h"
+
+#define JAVA_CLASS_REMOTE_SESSION JAVAHL_CLASS("/remote/RemoteSession")
+
+RemoteSession *
+RemoteSession::getCppObject(jobject jthis)
+{
+  static jfieldID fid = 0;
+  jlong cppAddr = SVNBase::findCppAddrForJObject(jthis, &fid,
+      JAVA_CLASS_REMOTE_SESSION);
+  return (cppAddr == 0 ? NULL : reinterpret_cast<RemoteSession *>(cppAddr));
+}
+
+jobject
+RemoteSession::open(jint jretryAttempts,
+                    jstring jurl, jstring juuid,
+                    jstring jconfigDirectory,
+                    jstring jusername, jstring jpassword,
+                    jobject jprompter, jobject jdeprecatedPrompter,
+                    jobject jprogress, jobject jcfgcb, jobject jtunnelcb)
+{
+  SVN_ERR_ASSERT_NO_RETURN(!(jprompter && jdeprecatedPrompter));
+
+  SVN::Pool requestPool;
+  URL url(jurl, requestPool);
+  if (JNIUtil::isExceptionThrown())
+    return NULL;
+  SVN_JNI_ERR(url.error_occurred(), NULL);
+
+  JNIStringHolder uuid(juuid);
+  if (JNIUtil::isExceptionThrown())
+    return NULL;
+
+  Path configDirectory(jconfigDirectory, requestPool);
+  if (JNIUtil::isExceptionThrown())
+    return NULL;
+  SVN_JNI_ERR(configDirectory.error_occurred(), NULL);
+
+  JNIStringHolder usernameStr(jusername);
+  if (JNIUtil::isExceptionThrown())
+    return NULL;
+
+  JNIStringHolder passwordStr(jpassword);
+  if (JNIUtil::isExceptionThrown())
+    return NULL;
+
+  Prompter::UniquePtr prompter(jprompter ? Prompter::create(jprompter)
+                               : CompatPrompter::create(jdeprecatedPrompter));
+  if (JNIUtil::isExceptionThrown())
+    return NULL;
+
+  jobject jremoteSession = open(
+      jretryAttempts, url.c_str(), uuid,
+      (jconfigDirectory ? configDirectory.c_str() : NULL),
+      usernameStr, passwordStr, prompter, jprogress, jcfgcb, jtunnelcb);
+  if (JNIUtil::isExceptionThrown() || !jremoteSession)
+    jremoteSession = NULL;
+  return jremoteSession;
+}
+
+jobject
+RemoteSession::open(jint jretryAttempts,
+                    const char* url, const char* uuid,
+                    const char* configDirectory,
+                    const char*  usernameStr, const char*  passwordStr,
+                    Prompter::UniquePtr prompter, jobject jprogress,
+                    jobject jcfgcb, jobject jtunnelcb)
+{
+  RemoteSession* session = new RemoteSession(
+      jretryAttempts, url, uuid, configDirectory,
+      usernameStr, passwordStr, prompter, jcfgcb, jtunnelcb);
+  if (JNIUtil::isJavaExceptionThrown() || !session)
+    {
+      delete session;
+      return NULL;
+    }
+
+  // Create java session object
+  JNIEnv *env = JNIUtil::getEnv();
+
+  jclass clazz = env->FindClass(JAVA_CLASS_REMOTE_SESSION);
+  if (JNIUtil::isJavaExceptionThrown())
+    {
+      delete session;
+      return NULL;
+    }
+
+  static jmethodID ctor = 0;
+  if (ctor == 0)
+    {
+      ctor = env->GetMethodID(clazz, "<init>", "(J)V");
+      if (JNIUtil::isJavaExceptionThrown())
+        {
+          delete session;
+          return NULL;
+        }
+    }
+
+  jobject jremoteSession = env->NewObject(clazz, ctor, session->getCppAddr());
+  if (JNIUtil::isJavaExceptionThrown())
+    {
+      delete session;
+      return NULL;
+    }
+
+  session->m_context->activate(jremoteSession, jprogress);
+  if (JNIUtil::isJavaExceptionThrown())
+    {
+      delete session;
+      jremoteSession = NULL;
+    }
+
+  return jremoteSession;
+}
+
+
+namespace{
+  struct compare_c_strings
+  {
+    bool operator()(const char* a, const char* b)
+      {
+        return (0 < std::strcmp(a, b));
+      }
+  };
+  typedef std::set<const char*, compare_c_strings> attempt_set;
+  typedef std::pair<attempt_set::iterator, bool> attempt_insert;
+} // anonymous namespace
+
+RemoteSession::RemoteSession(int retryAttempts,
+                             const char* url, const char* uuid,
+                             const char* configDirectory,
+                             const char*  username, const char*  password,
+                             Prompter::UniquePtr prompter,
+                             jobject jcfgcb, jobject jtunnelcb)
+  : m_session(NULL), m_context(NULL)
+{
+  m_context = new RemoteSessionContext(
+      pool, configDirectory, username, password, prompter, jcfgcb, jtunnelcb);
+  if (JNIUtil::isJavaExceptionThrown())
+    return;
+
+  const char* corrected_url = NULL;
+  bool cycle_detected = false;
+  attempt_set attempted;
+
+  while (retryAttempts-- >= 0)
+    {
+      SVN_JNI_ERR(
+          svn_ra_open4(&m_session, &corrected_url,
+                       url, uuid, m_context->getCallbacks(),
+                       m_context->getCallbackBaton(),
+                       m_context->getConfigData(),
+                       pool.getPool()),
+                  );
+
+      if (!corrected_url)
+        break;
+
+      attempt_insert result = attempted.insert(corrected_url);
+      if (!result.second)
+        {
+          cycle_detected = true;
+          break;
+        }
+
+      url = corrected_url;
+      corrected_url = NULL;
+    }
+
+  if (cycle_detected)
+    {
+      JNIEnv *env = JNIUtil::getEnv();
+
+      jstring exmsg = JNIUtil::makeJString(
+          apr_psprintf(pool.getPool(),
+                       _("Redirect cycle detected for URL '%s'"),
+                       corrected_url));
+
+      jclass excls = env->FindClass(
+          JAVAHL_CLASS("/SubversionException"));
+      if (JNIUtil::isJavaExceptionThrown())
+        return;
+
+      static jmethodID exctor = 0;
+      if (exctor == 0)
+        {
+          exctor = env->GetMethodID(excls, "<init>", "(Ljava/lang/String;)V");
+          if (JNIUtil::isJavaExceptionThrown())
+            return;
+        }
+
+      jobject ex = env->NewObject(excls, exctor, exmsg);
+      env->Throw(static_cast<jthrowable>(ex));
+      return;
+    }
+
+  if (corrected_url)
+    {
+      JNIEnv *env = JNIUtil::getEnv();
+
+      jstring exmsg = JNIUtil::makeJString(_("Too many redirects"));
+      if (JNIUtil::isJavaExceptionThrown())
+        return;
+
+      jstring exurl = JNIUtil::makeJString(corrected_url);
+      if (JNIUtil::isJavaExceptionThrown())
+        return;
+
+      jclass excls = env->FindClass(
+          JAVAHL_CLASS("/remote/RetryOpenSession"));
+      if (JNIUtil::isJavaExceptionThrown())
+        return;
+
+      static jmethodID exctor = 0;
+      if (exctor == 0)
+        {
+          exctor = env->GetMethodID(excls, "<init>", "(JJ)V");
+          if (JNIUtil::isJavaExceptionThrown())
+            return;
+        }
+
+      jobject ex = env->NewObject(excls, exctor, exmsg, exurl);
+      env->Throw(static_cast<jthrowable>(ex));
+      return;
+    }
+}
+
+RemoteSession::~RemoteSession()
+{
+  delete m_context;
+}
+
+void
+RemoteSession::dispose(jobject jthis)
+{
+  static jfieldID fid = 0;
+  SVNBase::dispose(jthis, &fid, JAVA_CLASS_REMOTE_SESSION);
+}
+
+void RemoteSession::reparent(jstring jurl)
+{
+  SVN::Pool subPool(pool);
+  URL url(jurl, subPool);
+  if (JNIUtil::isExceptionThrown())
+    return;
+  SVN_JNI_ERR(url.error_occurred(),);
+
+  SVN_JNI_ERR(svn_ra_reparent(m_session, url.c_str(), subPool.getPool()), );
+}
+
+jstring
+RemoteSession::getSessionUrl()
+{
+  SVN::Pool subPool(pool);
+  const char* url;
+  SVN_JNI_ERR(svn_ra_get_session_url(m_session, &url, subPool.getPool()), NULL);
+
+  jstring jurl = JNIUtil::makeJString(url);
+  if (JNIUtil::isJavaExceptionThrown())
+    return NULL;
+
+  return jurl;
+}
+
+jstring
+RemoteSession::getSessionRelativePath(jstring jurl)
+{
+  SVN::Pool subPool(pool);
+  URL url(jurl, subPool);
+  if (JNIUtil::isExceptionThrown())
+    return NULL;
+  SVN_JNI_ERR(url.error_occurred(), NULL);
+
+  const char* rel_path;
+  SVN_JNI_ERR(svn_ra_get_path_relative_to_session(
+                  m_session, &rel_path, url.c_str(), subPool.getPool()),
+              NULL);
+  jstring jrel_path = JNIUtil::makeJString(rel_path);
+  if (JNIUtil::isJavaExceptionThrown())
+    return NULL;
+
+  return jrel_path;
+}
+
+jstring
+RemoteSession::getReposRelativePath(jstring jurl)
+{
+  SVN::Pool subPool(pool);
+  URL url(jurl, subPool);
+  if (JNIUtil::isExceptionThrown())
+    return NULL;
+  SVN_JNI_ERR(url.error_occurred(), NULL);
+
+  const char* rel_path;
+  SVN_JNI_ERR(svn_ra_get_path_relative_to_root(m_session, &rel_path,
+                                               url.c_str(),
+                                               subPool.getPool()),
+              NULL);
+
+  jstring jrel_path = JNIUtil::makeJString(rel_path);
+  if (JNIUtil::isJavaExceptionThrown())
+    return NULL;
+
+  return jrel_path;
+}
+
+jstring
+RemoteSession::getReposUUID()
+{
+  SVN::Pool subPool(pool);
+  const char * uuid;
+  SVN_JNI_ERR(svn_ra_get_uuid2(m_session, &uuid, subPool.getPool()), NULL);
+
+  jstring juuid = JNIUtil::makeJString(uuid);
+  if (JNIUtil::isJavaExceptionThrown())
+    return NULL;
+
+  return juuid;
+}
+
+jstring
+RemoteSession::getReposRootUrl()
+{
+  SVN::Pool subPool(pool);
+  const char* url;
+  SVN_JNI_ERR(svn_ra_get_repos_root2(m_session, &url, subPool.getPool()),
+              NULL);
+
+  jstring jurl = JNIUtil::makeJString(url);
+  if (JNIUtil::isJavaExceptionThrown())
+    return NULL;
+
+  return jurl;
+}
+
+jlong
+RemoteSession::getLatestRevision()
+{
+  SVN::Pool subPool(pool);
+  svn_revnum_t rev;
+  SVN_JNI_ERR(svn_ra_get_latest_revnum(m_session, &rev, subPool.getPool()),
+              SVN_INVALID_REVNUM);
+  return rev;
+}
+
+jlong
+RemoteSession::getRevisionByTimestamp(jlong timestamp)
+{
+  SVN::Pool subPool(pool);
+  svn_revnum_t rev;
+  SVN_JNI_ERR(svn_ra_get_dated_revision(m_session, &rev,
+                                        apr_time_t(timestamp),
+                                        subPool.getPool()),
+              SVN_INVALID_REVNUM);
+  return rev;
+}
+
+namespace {
+svn_string_t*
+byte_array_to_svn_string(JNIByteArray& ary, SVN::Pool& scratch_pool)
+{
+  if (ary.isNull())
+    return NULL;
+  return svn_string_ncreate(reinterpret_cast<const char*>(ary.getBytes()),
+                            ary.getLength(), scratch_pool.getPool());
+}
+} // anonymous namespace
+
+void
+RemoteSession::changeRevisionProperty(
+    jlong jrevision, jstring jname,
+    jbyteArray jold_value, jbyteArray jvalue)
+{
+  JNIStringHolder name(jname);
+  if (JNIUtil::isExceptionThrown())
+    return;
+
+  JNIByteArray old_value(jold_value);
+  if (JNIUtil::isExceptionThrown())
+    return;
+
+  JNIByteArray value(jvalue);
+  if (JNIUtil::isExceptionThrown())
+    return;
+
+  SVN::Pool subPool(pool);
+  svn_string_t* const* p_old_value = NULL;
+  svn_string_t* const str_old_value =
+    byte_array_to_svn_string(old_value, subPool);
+  if (str_old_value)
+    p_old_value = &str_old_value;
+
+  SVN_JNI_ERR(svn_ra_change_rev_prop2(m_session,
+                                      svn_revnum_t(jrevision),
+                                      name, p_old_value,
+                                      byte_array_to_svn_string(value, subPool),
+                                      subPool.getPool()), );
+}
+
+jobject
+RemoteSession::getRevisionProperties(jlong jrevision)
+{
+  SVN::Pool subPool(pool);
+  apr_hash_t *props;
+  SVN_JNI_ERR(svn_ra_rev_proplist(m_session, svn_revnum_t(jrevision),
+                                  &props, subPool.getPool()),
+              NULL);
+
+  return CreateJ::PropertyMap(props, subPool.getPool());
+}
+
+jbyteArray
+RemoteSession::getRevisionProperty(jlong jrevision, jstring jname)
+{
+  JNIStringHolder name(jname);
+  if (JNIUtil::isExceptionThrown())
+    return NULL;
+
+  SVN::Pool subPool(pool);
+  svn_string_t *propval;
+  SVN_JNI_ERR(svn_ra_rev_prop(m_session, svn_revnum_t(jrevision),
+                              name, &propval, subPool.getPool()),
+              NULL);
+
+  return JNIUtil::makeJByteArray(propval);
+}
+
+jlong
+RemoteSession::getFile(jlong jrevision, jstring jpath,
+                       jobject jcontents, jobject jproperties)
+{
+  OutputStream contents_proxy(jcontents);
+  if (JNIUtil::isExceptionThrown())
+    return SVN_INVALID_REVNUM;
+
+  SVN::Pool subPool(pool);
+  Relpath path(jpath, subPool);
+  if (JNIUtil::isExceptionThrown())
+    return SVN_INVALID_REVNUM;
+  SVN_JNI_ERR(path.error_occurred(), SVN_INVALID_REVNUM);
+
+  apr_hash_t* props = NULL;
+  svn_revnum_t fetched_rev = svn_revnum_t(jrevision);
+  svn_stream_t* contents = (!jcontents ? NULL
+                            : contents_proxy.getStream(subPool));
+
+  SVN_JNI_ERR(svn_ra_get_file(m_session, path.c_str(), fetched_rev,
+                              contents, &fetched_rev,
+                              (jproperties ? &props : NULL),
+                              subPool.getPool()),
+              SVN_INVALID_REVNUM);
+
+  if (jproperties)
+    {
+      CreateJ::FillPropertyMap(jproperties, props, subPool.getPool());
+      if (JNIUtil::isExceptionThrown())
+        return SVN_INVALID_REVNUM;
+    }
+
+  return fetched_rev;
+}
+
+namespace {
+void fill_dirents(const char* base_url, const char* base_relpath,
+                  jobject jdirents, apr_hash_t* dirents,
+                  apr_pool_t* scratch_pool)
+{
+  if (!dirents)
+    return;
+
+  base_url = apr_pstrcat(scratch_pool, base_url, "/", base_relpath, NULL);
+  base_url = svn_uri_canonicalize(base_url, scratch_pool);
+  svn_stringbuf_t* abs_path = svn_stringbuf_create(base_url, scratch_pool);
+  svn_stringbuf_appendbyte(abs_path, '/');
+  const apr_size_t base_len = abs_path->len;
+
+  JNIEnv *env = JNIUtil::getEnv();
+
+  // Create a local frame for our references
+  env->PushLocalFrame(LOCAL_FRAME_SIZE);
+  if (JNIUtil::isJavaExceptionThrown())
+    return;
+
+  // We have no way of knowing the exact type of `dirents' in advance
+  // so we cannot remember the "put" method ID across calls.
+  jmethodID put_mid =
+    env->GetMethodID(env->GetObjectClass(jdirents), "put",
+                     "(Ljava/lang/Object;Ljava/lang/Object;)"
+                     "Ljava/lang/Object;");
+  if (JNIUtil::isJavaExceptionThrown())
+    POP_AND_RETURN_NOTHING();
+
+  static jfieldID path_fid = 0;
+  if (path_fid == 0)
+    {
+      jclass clazz = env->FindClass(JAVAHL_CLASS("/types/DirEntry"));
+      if (JNIUtil::isJavaExceptionThrown())
+        POP_AND_RETURN_NOTHING();
+
+      path_fid = env->GetFieldID(clazz, "path", "Ljava/lang/String;");
+      if (JNIUtil::isJavaExceptionThrown())
+        POP_AND_RETURN_NOTHING();
+    }
+
+  for (apr_hash_index_t* hi = apr_hash_first(scratch_pool, dirents);
+       hi; hi = apr_hash_next(hi))
+    {
+      const char* path;
+      svn_dirent_t* dirent;
+
+      const void *v_key;
+      void *v_val;
+
+      apr_hash_this(hi, &v_key, NULL, &v_val);
+      path = static_cast<const char*>(v_key);
+      dirent = static_cast<svn_dirent_t*>(v_val);
+      abs_path->len = base_len;
+      svn_stringbuf_appendcstr(abs_path, path);
+
+      jobject jdirent = CreateJ::DirEntry(path, abs_path->data, dirent);
+      if (JNIUtil::isJavaExceptionThrown())
+        POP_AND_RETURN_NOTHING();
+
+      // Use the existing DirEntry.path field as the key
+      jstring jpath = jstring(env->GetObjectField(jdirent, path_fid));
+      if (JNIUtil::isJavaExceptionThrown())
+        POP_AND_RETURN_NOTHING();
+
+      env->CallObjectMethod(jdirents, put_mid, jpath, jdirent);
+      if (JNIUtil::isJavaExceptionThrown())
+        POP_AND_RETURN_NOTHING();
+      env->DeleteLocalRef(jdirent);
+    }
+
+  POP_AND_RETURN_NOTHING();
+}
+} // anonymous namespace
+
+jlong
+RemoteSession::getDirectory(jlong jrevision, jstring jpath,
+                            jint jdirent_fields, jobject jdirents,
+                            jobject jproperties)
+{
+  SVN::Pool subPool(pool);
+  Relpath path(jpath, subPool);
+  if (JNIUtil::isExceptionThrown())
+    return SVN_INVALID_REVNUM;
+  SVN_JNI_ERR(path.error_occurred(), SVN_INVALID_REVNUM);
+
+  apr_hash_t* props = NULL;
+  apr_hash_t* dirents = NULL;
+  svn_revnum_t fetched_rev = svn_revnum_t(jrevision);
+
+  SVN_JNI_ERR(svn_ra_get_dir2(m_session, (jdirents ? &dirents : NULL),
+                              &fetched_rev, (jproperties ? &props : NULL),
+                              path.c_str(), fetched_rev,
+                              apr_uint32_t(jdirent_fields),
+                              subPool.getPool()),
+              SVN_INVALID_REVNUM);
+
+  if (jdirents)
+    {
+      // We will construct the absolute path in the DirEntry objects
+      // from the session URL and directory relpath.
+      const char* base_url;
+      SVN_JNI_ERR(svn_ra_get_session_url(m_session, &base_url,
+                                         subPool.getPool()),
+                  SVN_INVALID_REVNUM);
+      fill_dirents(base_url, path.c_str(), jdirents, dirents,
+                   subPool.getPool());
+      if (JNIUtil::isExceptionThrown())
+        return SVN_INVALID_REVNUM;
+    }
+
+  if (jproperties)
+    {
+      CreateJ::FillPropertyMap(jproperties, props, subPool.getPool());
+      if (JNIUtil::isExceptionThrown())
+        return SVN_INVALID_REVNUM;
+    }
+
+  return fetched_rev;
+}
+
+namespace {
+const apr_array_header_t*
+build_string_array(const Iterator& iter,
+                   bool contains_relpaths, SVN::Pool& pool)
+{
+  apr_pool_t* result_pool = pool.getPool();
+  apr_array_header_t* array = apr_array_make(
+      result_pool, 0, sizeof(const char*));
+  while (iter.hasNext())
+    {
+      const char* element;
+      jstring jitem = (jstring)iter.next();
+      if (contains_relpaths)
+        {
+          Relpath item(jitem, pool);
+          if (JNIUtil::isExceptionThrown())
+            return NULL;
+          SVN_JNI_ERR(item.error_occurred(), NULL);
+          element = apr_pstrdup(result_pool, item.c_str());
+        }
+      else
+        {
+          JNIStringHolder item(jitem);
+          if (JNIUtil::isJavaExceptionThrown())
+            return NULL;
+          element = item.pstrdup(result_pool);
+        }
+      APR_ARRAY_PUSH(array, const char*) = element;
+    }
+  return array;
+}
+}
+
+jobject
+RemoteSession::getMergeinfo(jobject jpaths, jlong jrevision, jobject jinherit,
+                            jboolean jinclude_descendants)
+{
+  Iterator paths_iter(jpaths);
+  if (JNIUtil::isExceptionThrown())
+    return NULL;
+
+  SVN::Pool subPool(pool);
+  const apr_array_header_t* paths =
+    build_string_array(paths_iter, true, subPool);
+  if (JNIUtil::isJavaExceptionThrown())
+    return NULL;
+
+  svn_mergeinfo_catalog_t catalog;
+  SVN_JNI_ERR(svn_ra_get_mergeinfo(
+                  m_session, &catalog, paths, svn_revnum_t(jrevision),
+                  EnumMapper::toMergeinfoInheritance(jinherit),
+                  bool(jinclude_descendants),
+                  subPool.getPool()),
+              NULL);
+  if (catalog == NULL)
+    return NULL;
+
+  JNIEnv* env = JNIUtil::getEnv();
+  jclass cls = env->FindClass("java/util/HashMap");
+  if (JNIUtil::isExceptionThrown())
+    return NULL;
+
+  static jmethodID ctor_mid = 0;
+  if (0 == ctor_mid)
+    {
+      ctor_mid = env->GetMethodID(cls, "<init>", "()V");
+      if (JNIUtil::isExceptionThrown())
+        return NULL;
+    }
+
+  static jmethodID put_mid = 0;
+  if (0 == put_mid)
+    {
+      put_mid = env->GetMethodID(cls, "put",
+                                 "(Ljava/lang/Object;"
+                                 "Ljava/lang/Object;)"
+                                 "Ljava/lang/Object;");
+      if (JNIUtil::isExceptionThrown())
+        return NULL;
+    }
+
+  jobject jcatalog = env->NewObject(cls, ctor_mid);
+  if (JNIUtil::isExceptionThrown())
+    return NULL;
+
+  for (apr_hash_index_t* hi = apr_hash_first(subPool.getPool(), catalog);
+       hi; hi = apr_hash_next(hi))
+    {
+      const void *v_key;
+      void *v_val;
+      apr_hash_this(hi, &v_key, NULL, &v_val);
+      const char* key = static_cast<const char*>(v_key);
+      svn_mergeinfo_t val = static_cast<svn_mergeinfo_t>(v_val);
+
+      jstring jpath = JNIUtil::makeJString(key);
+      if (JNIUtil::isExceptionThrown())
+        return NULL;
+      jobject jmergeinfo = CreateJ::Mergeinfo(val, subPool.getPool());
+      if (JNIUtil::isExceptionThrown())
+        return NULL;
+
+      env->CallObjectMethod(jcatalog, put_mid, jpath, jmergeinfo);
+      if (JNIUtil::isExceptionThrown())
+        return NULL;
+
+      env->DeleteLocalRef(jpath);
+      env->DeleteLocalRef(jmergeinfo);
+    }
+
+  return jcatalog;
+}
+
+// TODO: update
+// TODO: switch
+
+namespace {
+svn_error_t*
+status_unlock_func(void* baton, const char* path, apr_pool_t* scratch_pool)
+{
+  //DEBUG:fprintf(stderr, "  (n) status_unlock_func('%s')\n", path);
+  return SVN_NO_ERROR;
+}
+
+svn_error_t*
+status_fetch_props_func(apr_hash_t **props, void *baton,
+                        const char *path, svn_revnum_t base_revision,
+                        apr_pool_t *result_pool, apr_pool_t *scratch_pool)
+{
+  //DEBUG:fprintf(stderr, "  (n) status_fetch_props_func('%s', r%lld)\n",
+  //DEBUG:        path, static_cast<long long>(base_revision));
+  *props = apr_hash_make(result_pool);
+  return SVN_NO_ERROR;
+}
+
+svn_error_t*
+status_fetch_base_func(const char **filename, void *baton,
+                       const char *path, svn_revnum_t base_revision,
+                       apr_pool_t *result_pool, apr_pool_t *scratch_pool)
+{
+  //DEBUG:fprintf(stderr, "  (n) status_fetch_base_func('%s', r%lld)\n",
+  //DEBUG:        path, static_cast<long long>(base_revision));
+  *filename = NULL;
+  return SVN_NO_ERROR;
+}
+
+svn_error_t*
+status_start_edit_func(void* baton, svn_revnum_t start_revision)
+{
+  //DEBUG:fprintf(stderr, "  (n) status_start_edit_func(r%lld)\n",
+  //DEBUG:        static_cast<long long>(start_revision));
+  return SVN_NO_ERROR;
+}
+
+svn_error_t*
+status_target_revision_func(void* baton, svn_revnum_t target_revision,
+                            apr_pool_t* scratch_pool)
+{
+  //DEBUG:fprintf(stderr, "  (n) status_target_revision_func(r%lld)\n",
+  //DEBUG:        static_cast<long long>(target_revision));
+  *static_cast<svn_revnum_t*>(baton) = target_revision;
+  return SVN_NO_ERROR;
+}
+
+const EditorProxyCallbacks template_status_editor_callbacks = {
+  status_unlock_func,
+  status_fetch_props_func,
+  status_fetch_base_func,
+  { status_start_edit_func, status_target_revision_func, NULL },
+  NULL
+};
+} // anonymous namespace
+
+void
+RemoteSession::status(jobject jthis, jstring jstatus_target,
+                      jlong jrevision, jobject jdepth,
+                      jobject jstatus_editor, jobject jreporter)
+{
+  StateReporter *rp = StateReporter::getCppObject(jreporter);
+  CPPADDR_NULL_PTR(rp,);
+
+  SVN::Pool scratchPool(rp->get_report_pool());
+  Relpath status_target(jstatus_target, scratchPool);
+  if (JNIUtil::isExceptionThrown())
+    return;
+
+  apr_pool_t* scratch_pool = scratchPool.getPool();
+  const char* repos_root_url;
+  SVN_JNI_ERR(svn_ra_get_repos_root2(m_session, &repos_root_url,
+                                     scratch_pool),);
+  const char* session_root_url;
+  SVN_JNI_ERR(svn_ra_get_session_url(m_session, &session_root_url,
+                                     scratch_pool),);
+  const char* base_relpath;
+  SVN_JNI_ERR(svn_ra_get_path_relative_to_root(m_session, &base_relpath,
+                                               session_root_url,
+                                               scratch_pool),);
+
+  EditorProxyCallbacks proxy_callbacks =
+    template_status_editor_callbacks;
+  proxy_callbacks.m_extra_baton.baton = &rp->m_target_revision;
+
+  apr_pool_t* report_pool = rp->get_report_pool();
+  std::auto_ptr<EditorProxy> editor(
+      new EditorProxy(jstatus_editor, report_pool,
+                      repos_root_url, base_relpath,
+                      m_context->checkCancel, m_context,
+                      proxy_callbacks));
+  if (JNIUtil::isExceptionThrown())
+    return;
+
+  const svn_ra_reporter3_t* raw_reporter;
+  void* report_baton;
+  SVN_JNI_ERR(svn_ra_do_status2(m_session,
+                                &raw_reporter, &report_baton,
+                                status_target.c_str(),
+                                svn_revnum_t(jrevision),
+                                EnumMapper::toDepth(jdepth),
+                                editor->delta_editor(),
+                                editor->delta_baton(),
+                                report_pool),);
+  rp->set_reporter_data(raw_reporter, report_baton, editor.release());
+}
+
+// TODO: diff
+
+void
+RemoteSession::getLog(jobject jpaths,
+                      jlong jstartrev, jlong jendrev, jint jlimit,
+                      jboolean jstrict_node_history,
+                      jboolean jdiscover_changed_paths,
+                      jboolean jinclude_merged_revisions,
+                      jobject jrevprops, jobject jlog_callback)
+{
+  Iterator pathiter(jpaths);
+  if (JNIUtil::isJavaExceptionThrown())
+    return;
+  Iterator revpropiter(jrevprops);
+  if (JNIUtil::isJavaExceptionThrown())
+    return;
+  LogMessageCallback receiver(jlog_callback);
+
+  SVN::Pool subPool(pool);
+  const apr_array_header_t* paths = build_string_array(pathiter,
+                                                       true, subPool);
+  if (JNIUtil::isJavaExceptionThrown())
+    return;
+  const apr_array_header_t* revprops = (jrevprops != NULL)
+                                        ? build_string_array(revpropiter,
+                                                             false, subPool)
+                                        : NULL;
+  if (JNIUtil::isJavaExceptionThrown())
+    return;
+
+  SVN_JNI_ERR(svn_ra_get_log2(m_session, paths,
+                              svn_revnum_t(jstartrev), svn_revnum_t(jendrev),
+                              int(jlimit),
+                              bool(jdiscover_changed_paths),
+                              bool(jstrict_node_history),
+                              bool(jinclude_merged_revisions),
+                              revprops,
+                              receiver.callback, &receiver,
+                              subPool.getPool()),);
+}
+
+jobject
+RemoteSession::checkPath(jstring jpath, jlong jrevision)
+{
+  SVN::Pool subPool(pool);
+  Relpath path(jpath, subPool);
+  if (JNIUtil::isExceptionThrown())
+    return NULL;
+  SVN_JNI_ERR(path.error_occurred(), NULL);
+
+  svn_node_kind_t kind;
+  SVN_JNI_ERR(svn_ra_check_path(m_session, path.c_str(),
+                                svn_revnum_t(jrevision),
+                                &kind, subPool.getPool()),
+              NULL);
+
+  return EnumMapper::mapNodeKind(kind);
+}
+
+jobject
+RemoteSession::stat(jstring jpath, jlong jrevision)
+{
+  SVN::Pool subPool(pool);
+  Relpath path(jpath, subPool);
+  if (JNIUtil::isExceptionThrown())
+    return NULL;
+  SVN_JNI_ERR(path.error_occurred(), NULL);
+
+  svn_dirent_t* dirent;
+  SVN_JNI_ERR(svn_ra_stat(m_session, path.c_str(),
+                          svn_revnum_t(jrevision),
+                          &dirent, subPool.getPool()),
+              NULL);
+
+  if (dirent)
+    return CreateJ::DirEntry(path.c_str(), path.c_str(), dirent);
+  return NULL;
+}
+
+namespace {
+apr_array_header_t*
+long_iterable_to_revnum_array(jobject jlong_iterable, apr_pool_t* pool)
+{
+
+  JNIEnv* env = JNIUtil::getEnv();
+
+  jclass cls = env->FindClass("java/lang/Long");
+  if (JNIUtil::isExceptionThrown())
+    return NULL;
+
+  static jmethodID mid = 0;
+  if (0 == mid)
+    {
+      mid = env->GetMethodID(cls, "longValue", "()J");
+      if (JNIUtil::isExceptionThrown())
+        return NULL;
+    }
+
+  apr_array_header_t* array = apr_array_make(pool, 0, sizeof(svn_revnum_t));
+  Iterator iter(jlong_iterable);
+  while (iter.hasNext())
+    {
+      const jlong entry = env->CallLongMethod(iter.next(), mid);
+      if (JNIUtil::isExceptionThrown())
+        return NULL;
+      APR_ARRAY_PUSH(array, svn_revnum_t) = svn_revnum_t(entry);
+    }
+  return array;
+}
+
+jobject
+location_hash_to_map(apr_hash_t* locations, apr_pool_t* scratch_pool)
+{
+  JNIEnv* env = JNIUtil::getEnv();
+
+  jclass long_cls = env->FindClass("java/lang/Long");
+  if (JNIUtil::isExceptionThrown())
+    return NULL;
+
+  static jmethodID long_ctor = 0;
+  if (0 == long_ctor)
+    {
+      long_ctor = env->GetMethodID(long_cls, "<init>", "(J)V");
+      if (JNIUtil::isExceptionThrown())
+        return NULL;
+    }
+
+  jclass hash_cls = env->FindClass("java/util/HashMap");
+  if (JNIUtil::isExceptionThrown())
+    return NULL;
+
+  static jmethodID hash_ctor = 0;
+  if (0 == hash_ctor)
+    {
+      hash_ctor = env->GetMethodID(hash_cls, "<init>", "()V");
+      if (JNIUtil::isExceptionThrown())
+        return NULL;
+    }
+
+  static jmethodID hash_put = 0;
+  if (0 == hash_put)
+    {
+      hash_put = env->GetMethodID(hash_cls, "put",
+                                  "(Ljava/lang/Object;Ljava/lang/Object;"
+                                  ")Ljava/lang/Object;");
+      if (JNIUtil::isExceptionThrown())
+        return NULL;
+    }
+
+  jobject result = env->NewObject(hash_cls, hash_ctor);
+  if (JNIUtil::isExceptionThrown())
+    return NULL;
+
+  if (!locations)
+    return result;
+
+  for (apr_hash_index_t* hi = apr_hash_first(scratch_pool, locations);
+       hi; hi = apr_hash_next(hi))
+    {
+      const void* key;
+      void* val;
+
+      apr_hash_this(hi, &key, NULL, &val);
+
+      jobject jkey = env->NewObject(
+          long_cls, long_ctor, jlong(*static_cast<const svn_revnum_t*>(key)));
+      if (JNIUtil::isExceptionThrown())
+        return NULL;
+      jstring jval = JNIUtil::makeJString(static_cast<const char*>(val));
+      if (JNIUtil::isExceptionThrown())
+        return NULL;
+
+      env->CallObjectMethod(result, hash_put, jkey, jval);
+      if (JNIUtil::isExceptionThrown())
+        return NULL;
+
+      env->DeleteLocalRef(jkey);
+      env->DeleteLocalRef(jval);
+    }
+
+  return result;
+}
+} // anonymous namespace
+
+jobject
+RemoteSession::getLocations(jstring jpath, jlong jpeg_revision,
+                            jobject jlocation_revisions)
+{
+  if (!jpath || !jlocation_revisions)
+    return NULL;
+
+  SVN::Pool subPool(pool);
+  Relpath path(jpath, subPool);
+  if (JNIUtil::isExceptionThrown())
+    return NULL;
+  SVN_JNI_ERR(path.error_occurred(), NULL);
+
+  apr_array_header_t* location_revisions =
+    long_iterable_to_revnum_array(jlocation_revisions, subPool.getPool());
+  if (!location_revisions)
+    return NULL;
+
+  apr_hash_t* locations;
+  SVN_JNI_ERR(svn_ra_get_locations(m_session, &locations,
+                                   path.c_str(), svn_revnum_t(jpeg_revision),
+                                   location_revisions, subPool.getPool()),
+              NULL);
+  return location_hash_to_map(locations, subPool.getPool());
+}
+
+namespace {
+class LocationSegmentHandler
+{
+public:
+  static svn_error_t* callback(svn_location_segment_t* segment,
+                               void* baton, apr_pool_t*)
+    {
+      LocationSegmentHandler* const self =
+        static_cast<LocationSegmentHandler*>(baton);
+      SVN_ERR_ASSERT(self->m_jcallback != NULL);
+      self->call(segment);
+      SVN_ERR(JNIUtil::checkJavaException(SVN_ERR_BASE));
+      return SVN_NO_ERROR;
+    }
+
+  LocationSegmentHandler(jobject jcallback)
+    : m_jcallback(jcallback),
+      m_call_mid(0)
+    {
+      JNIEnv* env = JNIUtil::getEnv();
+      jclass cls = env->GetObjectClass(jcallback);
+      if (JNIUtil::isJavaExceptionThrown())
+        return;
+
+      m_call_mid = env->GetMethodID(
+          cls, "doSegment", "(" JAVAHL_ARG("/ISVNRemote$LocationSegment;") ")V");
+      if (JNIUtil::isJavaExceptionThrown())
+        return;
+    }
+
+private:
+  void call(svn_location_segment_t* segment)
+    {
+      JNIEnv* env = JNIUtil::getEnv();
+      jclass cls = env->FindClass(JAVAHL_CLASS("/ISVNRemote$LocationSegment"));
+      if (JNIUtil::isJavaExceptionThrown())
+        return;
+
+      static jmethodID mid = 0;
+      if (mid == 0)
+        {
+          mid = env->GetMethodID(cls, "<init>",
+                                 "(Ljava/lang/String;JJ)V");
+          if (JNIUtil::isJavaExceptionThrown())
+            return;
+        }
+
+      jstring jpath = JNIUtil::makeJString(segment->path);
+      if (JNIUtil::isJavaExceptionThrown())
+        return;
+
+      env->CallVoidMethod(m_jcallback, m_call_mid,
+                          env->NewObject(cls, mid, jpath,
+                                         jlong(segment->range_start),
+                                         jlong(segment->range_end)));
+      if (JNIUtil::isJavaExceptionThrown())
+        return;
+      env->DeleteLocalRef(jpath);
+    }
+
+  jobject m_jcallback;
+  jmethodID m_call_mid;
+};
+} // anonymous namespace
+
+void
+RemoteSession::getLocationSegments(jstring jpath, jlong jpeg_revision,
+                                   jlong jstart_revision, jlong jend_revision,
+                                   jobject jcallback)
+{
+  SVN::Pool subPool(pool);
+  Relpath path(jpath, subPool);
+  if (JNIUtil::isExceptionThrown())
+    return;
+  SVN_JNI_ERR(path.error_occurred(), );
+
+  LocationSegmentHandler handler(jcallback);
+  if (JNIUtil::isExceptionThrown())
+    return ;
+
+  SVN_JNI_ERR(svn_ra_get_location_segments(m_session, path.c_str(),
+                                           svn_revnum_t(jpeg_revision),
+                                           svn_revnum_t(jstart_revision),
+                                           svn_revnum_t(jend_revision),
+                                           handler.callback, &handler,
+                                           subPool.getPool()),);
+}
+
+namespace {
+class FileRevisionHandler
+{
+public:
+  static svn_error_t* callback(void* baton,
+                               const char* path, svn_revnum_t revision,
+                               apr_hash_t* revision_props,
+                               // We ignore the deltas as they're not
+                               // exposed in the JavaHL API.
+                               svn_boolean_t result_of_merge,
+                               svn_txdelta_window_handler_t* delta_handler,
+                               void** delta_handler_baton,
+                               apr_array_header_t* prop_diffs,
+                               apr_pool_t* scratch_pool)
+    {
+      if (delta_handler)
+        *delta_handler = svn_delta_noop_window_handler;
+      if (delta_handler_baton)
+        *delta_handler_baton = NULL;
+
+      FileRevisionHandler* const self =
+        static_cast<FileRevisionHandler*>(baton);
+      SVN_ERR_ASSERT(self->m_jcallback != NULL);
+      self->call(path, revision, revision_props,
+                result_of_merge, prop_diffs,
+                (delta_handler != NULL),
+                scratch_pool);
+      SVN_ERR(JNIUtil::checkJavaException(SVN_ERR_BASE));
+      return SVN_NO_ERROR;
+    }
+
+  FileRevisionHandler(jobject jcallback)
+    : m_jcallback(jcallback),
+      m_call_mid(0)
+    {
+      JNIEnv* env = JNIUtil::getEnv();
+      jclass cls = env->GetObjectClass(jcallback);
+      if (JNIUtil::isJavaExceptionThrown())
+        return;
+
+      m_call_mid = env->GetMethodID(
+          cls, "doRevision", "(" JAVAHL_ARG("/ISVNRemote$FileRevision;") ")V");
+      if (JNIUtil::isJavaExceptionThrown())
+        return;
+    }
+
+private:
+  void call(const char* path, svn_revnum_t revision,
+           apr_hash_t* revision_props,
+           svn_boolean_t result_of_merge,
+           apr_array_header_t* prop_diffs,
+           svn_boolean_t has_text_delta,
+           apr_pool_t* scratch_pool)
+    {
+      JNIEnv* env = JNIUtil::getEnv();
+      jclass cls = env->FindClass(JAVAHL_CLASS("/ISVNRemote$FileRevision"));
+      if (JNIUtil::isJavaExceptionThrown())
+        return;
+
+      static jmethodID mid = 0;
+      if (mid == 0)
+        {
+          mid = env->GetMethodID(cls, "<init>",
+                                 "(Ljava/lang/String;JZ"
+                                 "Ljava/util/Map;Ljava/util/Map;Z)V");
+          if (JNIUtil::isJavaExceptionThrown())
+            return;
+        }
+
+      jstring jpath = JNIUtil::makeJString(path);
+      if (JNIUtil::isJavaExceptionThrown())
+        return;
+      jobject jrevprops = CreateJ::PropertyMap(revision_props, scratch_pool);
+      if (JNIUtil::isJavaExceptionThrown())
+        return;
+      jobject jpropdelta = CreateJ::PropertyMap(prop_diffs, scratch_pool);
+      if (JNIUtil::isJavaExceptionThrown())
+        return;
+
+      env->CallVoidMethod(m_jcallback, m_call_mid,
+                          env->NewObject(cls, mid, jpath, jlong(revision),
+                                         jboolean(result_of_merge),
+                                         jrevprops, jpropdelta,
+                                         jboolean(has_text_delta)));
+      if (JNIUtil::isJavaExceptionThrown())
+        return;
+      env->DeleteLocalRef(jpath);
+      env->DeleteLocalRef(jrevprops);
+      env->DeleteLocalRef(jpropdelta);
+    }
+
+  jobject m_jcallback;
+  jmethodID m_call_mid;
+};
+} // anonymous namespace
+
+void
+RemoteSession::getFileRevisions(jstring jpath,
+                                jlong jstart_revision, jlong jend_revision,
+                                jboolean jinclude_merged_revisions,
+                                jobject jcallback)
+{
+  SVN::Pool subPool(pool);
+  Relpath path(jpath, subPool);
+  if (JNIUtil::isExceptionThrown())
+    return;
+  SVN_JNI_ERR(path.error_occurred(), );
+
+  FileRevisionHandler handler(jcallback);
+  if (JNIUtil::isExceptionThrown())
+    return;
+
+  SVN_JNI_ERR(svn_ra_get_file_revs2(m_session, path.c_str(),
+                                    svn_revnum_t(jstart_revision),
+                                    svn_revnum_t(jend_revision),
+                                    bool(jinclude_merged_revisions),
+                                    handler.callback, &handler,
+                                    subPool.getPool()),);
+}
+
+// TODO: lock
+// TODO: unlock
+// TODO: getLock
+
+jobject
+RemoteSession::getLocks(jstring jpath, jobject jdepth)
+{
+  svn_depth_t depth = EnumMapper::toDepth(jdepth);
+  if (JNIUtil::isExceptionThrown())
+    return NULL;
+
+  SVN::Pool subPool(pool);
+  Relpath path(jpath, subPool);
+  if (JNIUtil::isExceptionThrown())
+    return NULL;
+  SVN_JNI_ERR(path.error_occurred(), NULL);
+
+  apr_hash_t *locks;
+  SVN_JNI_ERR(svn_ra_get_locks2(m_session, &locks, path.c_str(), depth,
+                                subPool.getPool()),
+              NULL);
+
+  return CreateJ::LockMap(locks, subPool.getPool());
+}
+
+// TODO: replayRange
+// TODO: replay
+// TODO: getDeletedRevision
+// TODO: getInheritedProperties
+
+jboolean
+RemoteSession::hasCapability(jstring jcapability)
+{
+  JNIStringHolder capability(jcapability);
+  if (JNIUtil::isExceptionThrown())
+    return false;
+
+  SVN::Pool subPool(pool);
+  svn_boolean_t has;
+  SVN_JNI_ERR(svn_ra_has_capability(m_session, &has, capability,
+                                    subPool.getPool()),
+              false);
+
+  return jboolean(has);
+}
diff --git a/subversion/bindings/javahl/native/RemoteSession.h b/subversion/bindings/javahl/native/RemoteSession.h
new file mode 100644
index 0000000..26ca402
--- /dev/null
+++ b/subversion/bindings/javahl/native/RemoteSession.h
@@ -0,0 +1,128 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ *
+ * @file RemoteSession.h
+ * @brief Interface of the class RemoteSession
+ */
+
+#ifndef JAVAHL_REMOTE_SESSION_H
+#define JAVAHL_REMOTE_SESSION_H
+
+#include <jni.h>
+
+#include "svn_ra.h"
+
+#include "SVNBase.h"
+#include "RemoteSessionContext.h"
+#include "Prompter.h"
+
+class CommitEditor;
+
+/*
+ * This class wraps Ra based operations from svn_ra.h
+ */
+class RemoteSession : public SVNBase
+{
+  public:
+    static RemoteSession* getCppObject(jobject jthis);
+    static jobject open(jint jretryAttempts,
+                        jstring jurl, jstring juuid,
+                        jstring jconfigDirectory,
+                        jstring jusername, jstring jpassword,
+                        jobject jprompter, jobject jdeprecatedPrompter,
+                        jobject jprogress, jobject jcfgcb, jobject jtunnelcb);
+    static jobject open(jint jretryAttempts,
+                        const char* url, const char* uuid,
+                        const char* configDirectory,
+                        const char* username, const char* password,
+                        Prompter::UniquePtr prompter, jobject jprogress,
+                        jobject jcfgcb, jobject jtunnelcb);
+    ~RemoteSession();
+
+    void cancelOperation() const { m_context->cancelOperation(); }
+
+    virtual void dispose(jobject jthis);
+
+    void reparent(jstring jurl);
+    jstring getSessionUrl();
+    jstring getSessionRelativePath(jstring jurl);
+    jstring getReposRelativePath(jstring jurl);
+    jstring getReposUUID();
+    jstring getReposRootUrl();
+    jlong getLatestRevision();
+    jlong getRevisionByTimestamp(jlong jtimestamp);
+    void changeRevisionProperty(jlong jrevision, jstring jname,
+                                jbyteArray jold_value,
+                                jbyteArray jvalue);
+    jobject getRevisionProperties(jlong jrevision);
+    jbyteArray getRevisionProperty(jlong jrevision, jstring jname);
+    jlong getFile(jlong jrevision, jstring jpath,
+                  jobject jcontents, jobject jproperties);
+    jlong getDirectory(jlong jrevision, jstring jpath, jint jdirent_fields,
+                       jobject jdirents, jobject jproperties);
+    jobject getMergeinfo(jobject jpaths, jlong jrevision, jobject jinherit,
+                         jboolean jinclude_descendants);
+    // TODO: update
+    // TODO: switch
+    void status(jobject jthis, jstring jstatus_target,
+                jlong jrevision, jobject jdepth,
+                jobject jstatus_editor, jobject jreporter);
+    // TODO: diff
+    void getLog(jobject jpaths, jlong jstartrev, jlong jendrev, jint jlimit,
+                jboolean jstrict_node_history, jboolean jdiscover_changed_paths,
+                jboolean jinclude_merged_revisions,
+                jobject jrevprops, jobject jlog_callback);
+    jobject checkPath(jstring jpath, jlong jrevision);
+    jobject stat(jstring jpath, jlong jrevision);
+    jobject getLocations(jstring jpath, jlong jpeg_revision,
+                         jobject jlocation_revisions);
+    void getLocationSegments(jstring jpath, jlong jpeg_revision,
+                             jlong jstart_revision, jlong jend_revision,
+                             jobject jcallback);
+    void getFileRevisions(jstring jpath,
+                          jlong jstart_revision, jlong jend_revision,
+                          jboolean jinclude_merged_revisions,
+                          jobject jcallback);
+    // TODO: getFileRevisions
+    // TODO: lock
+    // TODO: unlock
+    // TODO: getLock
+    jobject getLocks(jstring jpath, jobject jdepth);
+    // TODO: replayRange
+    // TODO: replay
+    // TODO: getDeletedRevision
+    // TODO: getInheritedProperties
+    jboolean hasCapability(jstring capability);
+
+  private:
+    friend class CommitEditor;
+    RemoteSession(int retryAttempts,
+                  const char* url, const char* uuid,
+                  const char* configDirectory,
+                  const char* username, const char* password,
+                  Prompter::UniquePtr prompter, jobject jcfgcb, jobject jtunnelcb);
+
+    svn_ra_session_t* m_session;
+    RemoteSessionContext* m_context;
+};
+
+#endif // JAVAHL_REMOTE_SESSION_H
diff --git a/subversion/bindings/javahl/native/RemoteSessionContext.cpp b/subversion/bindings/javahl/native/RemoteSessionContext.cpp
new file mode 100644
index 0000000..e4b86e1
--- /dev/null
+++ b/subversion/bindings/javahl/native/RemoteSessionContext.cpp
@@ -0,0 +1,125 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ *
+ * @file RemoteSessionContext.cpp
+ * @brief Implementation of the class RemoteSessionContext
+ */
+
+
+#include "RemoteSessionContext.h"
+#include "JNIUtil.h"
+#include "Prompter.h"
+
+
+RemoteSessionContext::RemoteSessionContext(
+    SVN::Pool &pool, const char* configDirectory,
+    const char* usernameStr, const char* passwordStr,
+    Prompter::UniquePtr prompter, jobject jcfgcb, jobject jtunnelcb)
+  : OperationContext(pool), m_raCallbacks(NULL)
+{
+  setConfigDirectory(configDirectory);
+  if (usernameStr != NULL)
+    username(usernameStr);
+
+  if (passwordStr != NULL)
+    password(passwordStr);
+
+  setPrompt(prompter);
+  setConfigEventHandler(jcfgcb);
+  setTunnelCallback(jtunnelcb);
+
+  /*
+   * Setup callbacks
+   */
+  SVN_JNI_ERR(svn_ra_create_callbacks(&m_raCallbacks, m_pool->getPool()), );
+
+  m_raCallbacks->auth_baton = getAuthBaton(pool);
+  m_raCallbacks->cancel_func = checkCancel;
+  m_raCallbacks->get_client_string = clientName;
+  m_raCallbacks->progress_baton = NULL;
+  m_raCallbacks->progress_func = progress;
+
+  /*
+   * JNI RA layer does not work with WC so all WC callbacks are set to NULL
+   */
+  m_raCallbacks->get_wc_prop = NULL;
+  m_raCallbacks->invalidate_wc_props = NULL;
+  m_raCallbacks->push_wc_prop = NULL;
+  m_raCallbacks->set_wc_prop = NULL;
+
+  /*
+   * Don't set deprecated callback
+   */
+  m_raCallbacks->open_tmp_file = NULL;
+
+  if (m_jtunnelcb)
+    {
+      m_raCallbacks->check_tunnel_func = checkTunnel;
+      m_raCallbacks->open_tunnel_func = openTunnel;
+      m_raCallbacks->tunnel_baton = m_jtunnelcb;
+    }
+}
+
+RemoteSessionContext::~RemoteSessionContext()
+{
+}
+
+void RemoteSessionContext::activate(jobject jremoteSession, jobject jprogress)
+{
+  /*
+   * Attach session context java object
+   */
+  static jfieldID ctxFieldID = 0;
+  attachJavaObject(jremoteSession,
+      JAVAHL_ARG("/remote/RemoteSession$RemoteSessionContext;"),
+      "sessionContext", &ctxFieldID);
+
+  /*
+   * Set the progress callback
+   */
+  JNIEnv *env = JNIUtil::getEnv();
+
+  jclass clazz = env->GetObjectClass(m_jctx);
+  if (JNIUtil::isJavaExceptionThrown())
+    return;
+
+  jmethodID mid = env->GetMethodID(
+      clazz, "setProgressCallback",
+      "(" JAVAHL_ARG("/callback/ProgressCallback;") ")V");
+  if (JNIUtil::isJavaExceptionThrown() || mid == 0)
+    return;
+
+  env->CallVoidMethod(m_jctx, mid, jprogress);
+  m_raCallbacks->progress_baton = m_jctx;
+}
+
+void *
+RemoteSessionContext::getCallbackBaton()
+{
+  return this;
+}
+
+svn_ra_callbacks2_t *
+RemoteSessionContext::getCallbacks()
+{
+  return m_raCallbacks;
+}
diff --git a/subversion/bindings/javahl/native/RemoteSessionContext.h b/subversion/bindings/javahl/native/RemoteSessionContext.h
new file mode 100644
index 0000000..8c569a1
--- /dev/null
+++ b/subversion/bindings/javahl/native/RemoteSessionContext.h
@@ -0,0 +1,51 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ *
+ * @file RemoteSessionContext.h
+ * @brief Interface of the class RemoteSessionContext
+ */
+
+#ifndef JAVAHL_REMOTE_SESSION_CONTEXT_H
+#define JAVAHL_REMOTE_SESSION_CONTEXT_H
+
+#include "svn_ra.h"
+
+#include "OperationContext.h"
+
+class RemoteSessionContext : public OperationContext
+{
+  public:
+    RemoteSessionContext(SVN::Pool &pool,
+                         const char* jconfigDirectory,
+                         const char* jusername, const char* jpassword,
+                         std::auto_ptr<Prompter> prompter,
+                         jobject jcfgcb, jobject jtunnelcb);
+    virtual ~RemoteSessionContext();
+    void activate(jobject jremoteSession, jobject jprogress);
+    void * getCallbackBaton();
+    svn_ra_callbacks2_t* getCallbacks();
+
+  private:
+    svn_ra_callbacks2_t* m_raCallbacks;
+};
+
+#endif /* JAVAHL_REMOTE_SESSION_CONTEXT_H */
diff --git a/subversion/bindings/javahl/native/ReposFreezeAction.cpp b/subversion/bindings/javahl/native/ReposFreezeAction.cpp
index 8c1cb7e..78f307f 100644
--- a/subversion/bindings/javahl/native/ReposFreezeAction.cpp
+++ b/subversion/bindings/javahl/native/ReposFreezeAction.cpp
@@ -39,7 +39,7 @@ svn_error_t* ReposFreezeAction::invoke()
   static volatile jmethodID mid = 0;
   if (!mid)
     {
-      jclass cls = env->FindClass(JAVA_PACKAGE"/callback/ReposFreezeAction");
+      jclass cls = env->FindClass(JAVAHL_CLASS("/callback/ReposFreezeAction"));
       if (!JNIUtil::isJavaExceptionThrown())
         mid = env->GetMethodID(cls, "invoke", "()V");
     }
diff --git a/subversion/bindings/javahl/native/ReposNotifyCallback.cpp b/subversion/bindings/javahl/native/ReposNotifyCallback.cpp
index a716653..1237d13 100644
--- a/subversion/bindings/javahl/native/ReposNotifyCallback.cpp
+++ b/subversion/bindings/javahl/native/ReposNotifyCallback.cpp
@@ -69,12 +69,12 @@ ReposNotifyCallback::onNotify(const svn_repos_notify_t *wcNotify,
   static jmethodID mid = 0;
   if (mid == 0)
     {
-      jclass clazz = env->FindClass(JAVA_PACKAGE"/callback/ReposNotifyCallback");
+      jclass clazz = env->FindClass(JAVAHL_CLASS("/callback/ReposNotifyCallback"));
       if (JNIUtil::isJavaExceptionThrown())
         return;
 
       mid = env->GetMethodID(clazz, "onNotify",
-                             "(L"JAVA_PACKAGE"/ReposNotifyInformation;)V");
+                             "(" JAVAHL_ARG("/ReposNotifyInformation;") ")V");
       if (JNIUtil::isJavaExceptionThrown() || mid == 0)
         return;
 
diff --git a/subversion/bindings/javahl/native/ReposVerifyCallback.cpp b/subversion/bindings/javahl/native/ReposVerifyCallback.cpp
new file mode 100644
index 0000000..1fb6ecd
--- /dev/null
+++ b/subversion/bindings/javahl/native/ReposVerifyCallback.cpp
@@ -0,0 +1,88 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ *
+ * @file ReposVerifyCallback.cpp
+ * @brief Implementation of the class ReposVerifyCallback
+ */
+
+#include "ReposVerifyCallback.h"
+#include "JNIUtil.h"
+
+ReposVerifyCallback::ReposVerifyCallback(jobject jverify_cb)
+  : m_jverify_cb(jverify_cb)
+{}
+
+ReposVerifyCallback::~ReposVerifyCallback()
+{
+  // Don't need to destroy the reference, since it was given us by Java
+}
+
+svn_error_t *
+ReposVerifyCallback::callback(void *baton,
+                              svn_revnum_t revision,
+                              svn_error_t *verify_err,
+                              apr_pool_t *scratch_pool)
+{
+  if (!baton)
+    return SVN_NO_ERROR;
+
+  static_cast<ReposVerifyCallback*>(baton)
+    ->onVerifyError(revision, verify_err, scratch_pool);
+  if (JNIUtil::isJavaExceptionThrown())
+    return JNIUtil::wrapJavaException();
+  return SVN_NO_ERROR;
+}
+
+void
+ReposVerifyCallback::onVerifyError(svn_revnum_t revision,
+                                   svn_error_t *verify_err,
+                                   apr_pool_t *scratch_pool)
+{
+  JNIEnv *env = JNIUtil::getEnv();
+
+  // Java method id will not change during the time this library is
+  // loaded, so it can be cached.
+  static jmethodID mid = 0;
+  if (mid == 0)
+    {
+      jclass clazz = env->FindClass(JAVAHL_CLASS("/callback/ReposVerifyCallback"));
+      if (JNIUtil::isJavaExceptionThrown())
+        return;
+
+      mid = env->GetMethodID(clazz, "onVerifyError",
+                             "(J" JAVAHL_ARG("/ClientException;") ")V");
+      if (JNIUtil::isJavaExceptionThrown() || mid == 0)
+        return;
+
+      env->DeleteLocalRef(clazz);
+    }
+
+  jthrowable jverify_err = NULL;
+  if (verify_err)
+    jverify_err = JNIUtil::createClientException(svn_error_dup(verify_err), NULL);
+  if (JNIUtil::isJavaExceptionThrown())
+    return;
+
+  env->CallVoidMethod(m_jverify_cb, mid, jlong(revision), jverify_err);
+  if (verify_err)
+    env->DeleteLocalRef(jverify_err);
+}
diff --git a/subversion/bindings/javahl/native/ReposVerifyCallback.h b/subversion/bindings/javahl/native/ReposVerifyCallback.h
new file mode 100644
index 0000000..a89d204
--- /dev/null
+++ b/subversion/bindings/javahl/native/ReposVerifyCallback.h
@@ -0,0 +1,75 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ *
+ * @file ReposVerifyCallback.h
+ * @brief Interface of the class ReposVerifyCallback
+ */
+
+#ifndef SVN_JAVAHL_REPOS_VERIFY_CALLBACK_H
+#define SVN_JAVAHL_REPOS_VERIFY_CALLBACK_H
+
+#include <jni.h>
+#include "svn_repos.h"
+
+/**
+ * This class passes notification from subversion to a Java object
+ * (1.2 version).
+ */
+class ReposVerifyCallback
+{
+ private:
+  /**
+   * The local reference to the Java object.
+   */
+  jobject m_jverify_cb;
+
+ public:
+  /**
+   * Create a new object and store the Java object.
+   * @param verify_cb  global reference to the Java object
+   */
+  ReposVerifyCallback(jobject jverify_cb);
+
+  ~ReposVerifyCallback();
+
+  /**
+   * Implementation of the svn_repos_verify_callback_t API.
+   *
+   * @param baton Notification instance is passed using this parameter
+   * @param revision The revision that the error was emitted for
+   * @param verify_err The emitted error
+   * @param scratch_pool An APR pool from which to allocate memory.
+   */
+  static svn_error_t * callback(void *baton,
+                                svn_revnum_t revision,
+                                svn_error_t *verify_err,
+                                apr_pool_t *scratch_pool);
+
+  /**
+   * Handler for Subversion notifications.
+   */
+  void onVerifyError(svn_revnum_t revision,
+                     svn_error_t *verify_err,
+                     apr_pool_t *scratch_pool);
+};
+
+#endif  // SVN_JAVAHL_REPOS_VERIFY_CALLBACK_H
diff --git a/subversion/bindings/javahl/native/Revision.cpp b/subversion/bindings/javahl/native/Revision.cpp
index 7ba2094..d9e52f8 100644
--- a/subversion/bindings/javahl/native/Revision.cpp
+++ b/subversion/bindings/javahl/native/Revision.cpp
@@ -57,12 +57,12 @@ Revision::Revision(jobject jthis, bool headIfUnspecified,
       static jfieldID fid = 0;
       if (fid == 0)
         {
-          jclass clazz = env->FindClass(JAVA_PACKAGE"/types/Revision");
+          jclass clazz = env->FindClass(JAVAHL_CLASS("/types/Revision"));
           if (JNIUtil::isJavaExceptionThrown())
             POP_AND_RETURN_NOTHING();
 
           fid = env->GetFieldID(clazz, "revKind",
-                                "L"JAVA_PACKAGE"/types/Revision$Kind;");
+                                JAVAHL_ARG("/types/Revision$Kind;"));
           if (JNIUtil::isJavaExceptionThrown())
             POP_AND_RETURN_NOTHING();
         }
@@ -81,7 +81,7 @@ Revision::Revision(jobject jthis, bool headIfUnspecified,
             if (fidNum == 0)
               {
                 jclass clazz =
-                  env->FindClass(JAVA_PACKAGE"/types/Revision$Number");
+                  env->FindClass(JAVAHL_CLASS("/types/Revision$Number"));
                 if (JNIUtil::isJavaExceptionThrown())
                   POP_AND_RETURN_NOTHING();
 
@@ -99,7 +99,7 @@ Revision::Revision(jobject jthis, bool headIfUnspecified,
             if (fidDate == 0)
               {
                 jclass clazz =
-                  env->FindClass(JAVA_PACKAGE"/types/Revision$DateSpec");
+                  env->FindClass(JAVAHL_CLASS("/types/Revision$DateSpec"));
                 if (JNIUtil::isJavaExceptionThrown())
                   POP_AND_RETURN_NOTHING();
 
@@ -158,7 +158,7 @@ jobject
 Revision::makeJRevision(svn_revnum_t rev)
 {
   JNIEnv *env = JNIUtil::getEnv();
-  jclass clazz = env->FindClass(JAVA_PACKAGE "/types/Revision");
+  jclass clazz = env->FindClass(JAVAHL_CLASS("/types/Revision"));
   if (JNIUtil::isJavaExceptionThrown())
     return NULL;
 
@@ -166,7 +166,7 @@ Revision::makeJRevision(svn_revnum_t rev)
   if (getInstance == 0)
     {
       getInstance = env->GetStaticMethodID(clazz, "getInstance",
-                                           "(J)L" JAVA_PACKAGE "/types/Revision;");
+                                           "(J)" JAVAHL_ARG("/types/Revision;"));
       if (JNIUtil::isExceptionThrown())
         return NULL;
     }
diff --git a/subversion/bindings/javahl/native/Revision.h b/subversion/bindings/javahl/native/Revision.h
index bef87a9..d98a868 100644
--- a/subversion/bindings/javahl/native/Revision.h
+++ b/subversion/bindings/javahl/native/Revision.h
@@ -50,6 +50,7 @@ class Revision
    * Make a Revision Java object.
    */
   static jobject makeJRevision(svn_revnum_t rev);
+  static jobject makeJRevision(const svn_opt_revision_t& rev);
 };
 
 #endif // REVISION_H
diff --git a/subversion/bindings/javahl/native/RevisionRange.cpp b/subversion/bindings/javahl/native/RevisionRange.cpp
index 677c7d5..d1c8c64 100644
--- a/subversion/bindings/javahl/native/RevisionRange.cpp
+++ b/subversion/bindings/javahl/native/RevisionRange.cpp
@@ -44,60 +44,117 @@ RevisionRange::~RevisionRange()
     // explicitly destroyed.
 }
 
-const svn_opt_revision_range_t *RevisionRange::toRange(SVN::Pool &pool) const
+namespace {
+void get_range_info(jobject jrange,
+                    svn_opt_revision_t* range_start,
+                    svn_opt_revision_t* range_end,
+                    svn_boolean_t* range_inheritable)
 {
   JNIEnv *env = JNIUtil::getEnv();
 
-  jclass clazz = env->FindClass(JAVA_PACKAGE"/types/RevisionRange");
+  jclass clazz = env->FindClass(JAVAHL_CLASS("/types/RevisionRange"));
   if (JNIUtil::isExceptionThrown())
-    return NULL;
+    return;
 
-  static jmethodID fmid = 0;
-  if (fmid == 0)
+  if (range_start)
     {
-      fmid = env->GetMethodID(clazz, "getFromRevision",
-                              "()L"JAVA_PACKAGE"/types/Revision;");
-      if (JNIUtil::isJavaExceptionThrown())
-        return NULL;
+
+      static jmethodID fmid = 0;
+      if (fmid == 0)
+        {
+          fmid = env->GetMethodID(clazz, "getFromRevision",
+                                  "()" JAVAHL_ARG("/types/Revision;"));
+          if (JNIUtil::isJavaExceptionThrown())
+            return;
+        }
+
+      jobject jstartRevision = env->CallObjectMethod(jrange, fmid);
+      if (JNIUtil::isExceptionThrown())
+        return;
+
+      Revision startRevision(jstartRevision);
+      if (JNIUtil::isExceptionThrown())
+        return;
+
+      *range_start = *startRevision.revision();
+      if (JNIUtil::isExceptionThrown())
+        return;
     }
 
-  static jmethodID tmid = 0;
-  if (tmid == 0)
+  if (range_end)
     {
-      tmid = env->GetMethodID(clazz, "getToRevision",
-                              "()L"JAVA_PACKAGE"/types/Revision;");
-      if (JNIUtil::isJavaExceptionThrown())
-        return NULL;
+      static jmethodID tmid = 0;
+      if (tmid == 0)
+        {
+          tmid = env->GetMethodID(clazz, "getToRevision",
+                                  "()" JAVAHL_ARG("/types/Revision;"));
+          if (JNIUtil::isJavaExceptionThrown())
+            return;
+        }
+
+      jobject jendRevision = env->CallObjectMethod(jrange, tmid);
+      if (JNIUtil::isExceptionThrown())
+        return;
+
+      Revision endRevision(jendRevision);
+      if (JNIUtil::isExceptionThrown())
+        return;
+
+      *range_end = *endRevision.revision();
+      if (JNIUtil::isExceptionThrown())
+        return;
     }
 
-  jobject jstartRevision = env->CallObjectMethod(m_range, fmid);
-  if (JNIUtil::isExceptionThrown())
-    return NULL;
+  if (range_inheritable)
+    {
+      static jmethodID imid = 0;
+      if (imid == 0 && range_inheritable)
+        {
+          imid = env->GetMethodID(clazz, "isInheritable", "()Z");
+          if (JNIUtil::isJavaExceptionThrown())
+            return;
+        }
+
+      jboolean inheritable = env->CallBooleanMethod(jrange, imid);
+      if (JNIUtil::isExceptionThrown())
+        return;
+      *range_inheritable = inheritable;
+    }
+}
+} // anonymous namespace
 
-  Revision startRevision(jstartRevision);
+svn_merge_range_t* RevisionRange::toMergeRange(SVN::Pool &pool) const
+{
+  svn_opt_revision_t range_start, range_end;
+  svn_boolean_t range_inheritable;
+  get_range_info(m_range, &range_start, &range_end, &range_inheritable);
   if (JNIUtil::isExceptionThrown())
     return NULL;
 
-  jobject jendRevision = env->CallObjectMethod(m_range, tmid);
-  if (JNIUtil::isExceptionThrown())
-    return NULL;
+  if (range_start.kind != svn_opt_revision_number
+      || range_end.kind != svn_opt_revision_number)
+    JNIUtil::raiseThrowable("java.lang.InvalidStateException",
+                            "Revsision ranges must contain revision numbers");
 
-  Revision endRevision(jendRevision);
-  if (JNIUtil::isExceptionThrown())
-    return NULL;
+  svn_merge_range_t* range =
+    static_cast<svn_merge_range_t*>
+      (apr_palloc(pool.getPool(), sizeof(*range)));
+
+  range->start = range_start.value.number;
+  range->end = range_end.value.number;
+  range->inheritable = range_inheritable;
+  return range;
+}
 
+svn_opt_revision_range_t *RevisionRange::toRange(SVN::Pool &pool) const
+{
   svn_opt_revision_range_t *range =
-    reinterpret_cast<svn_opt_revision_range_t *>
+    static_cast<svn_opt_revision_range_t *>
       (apr_palloc(pool.getPool(), sizeof(*range)));
 
-  range->start = *startRevision.revision();
-  if (JNIUtil::isExceptionThrown())
-    return NULL;
-
-  range->end = *endRevision.revision();
+  get_range_info(m_range, &range->start, &range->end, NULL);
   if (JNIUtil::isExceptionThrown())
-    return NULL;
-
+    range = NULL;
   return range;
 }
 
@@ -106,19 +163,20 @@ RevisionRange::makeJRevisionRange(svn_merge_range_t *range)
 {
     JNIEnv *env = JNIUtil::getEnv();
 
-    jclass rangeClazz = env->FindClass(JAVA_PACKAGE "/types/RevisionRange");
+    jclass rangeClazz = env->FindClass(JAVAHL_CLASS("/types/RevisionRange"));
     if (JNIUtil::isJavaExceptionThrown())
         return NULL;
     static jmethodID rangeCtor = 0;
     if (rangeCtor == 0)
     {
-        rangeCtor = env->GetMethodID(rangeClazz, "<init>", "(JJ)V");
+        rangeCtor = env->GetMethodID(rangeClazz, "<init>", "(JJZ)V");
         if (JNIUtil::isJavaExceptionThrown())
             return NULL;
     }
     jobject jrange = env->NewObject(rangeClazz, rangeCtor,
-                                    (jlong) range->start,
-                                    (jlong) range->end);
+                                    jlong(range->start),
+                                    jlong(range->end),
+                                    jboolean(range->inheritable));
     if (JNIUtil::isJavaExceptionThrown())
         return NULL;
 
diff --git a/subversion/bindings/javahl/native/RevisionRange.h b/subversion/bindings/javahl/native/RevisionRange.h
index f932c1b..9934894 100644
--- a/subversion/bindings/javahl/native/RevisionRange.h
+++ b/subversion/bindings/javahl/native/RevisionRange.h
@@ -29,6 +29,7 @@
 
 #include <jni.h>
 #include "svn_types.h"
+#include "svn_opt.h"
 
 #include "Pool.h"
 
@@ -53,7 +54,12 @@ class RevisionRange
   /**
    * Return an svn_opt_revision_range_t.
    */
-  const svn_opt_revision_range_t *toRange(SVN::Pool &pool) const;
+  svn_opt_revision_range_t *toRange(SVN::Pool &pool) const;
+
+  /**
+   * Return an svn_merge_range_t.
+   */
+  svn_merge_range_t* toMergeRange(SVN::Pool &pool) const;
 
   /**
    * Make a (single) RevisionRange Java object.
diff --git a/subversion/bindings/javahl/native/RevisionRangeList.cpp b/subversion/bindings/javahl/native/RevisionRangeList.cpp
new file mode 100644
index 0000000..3759e5f
--- /dev/null
+++ b/subversion/bindings/javahl/native/RevisionRangeList.cpp
@@ -0,0 +1,128 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ *
+ * @file RevisionRangeList.cpp
+ * @brief Implementat of the class RevisionRangeList
+ */
+
+#include "JNIUtil.h"
+#include "Iterator.h"
+#include "RevisionRange.h"
+#include "RevisionRangeList.h"
+
+RevisionRangeList::RevisionRangeList(jobject jrangelist, SVN::Pool &pool)
+  : m_rangelist(NULL)
+{
+  if (!jrangelist)
+    return;
+
+  Iterator iter(jrangelist);
+  if (JNIUtil::isJavaExceptionThrown())
+    return;
+
+  m_rangelist = apr_array_make(pool.getPool(), 0, sizeof(svn_merge_range_t*));
+  while (iter.hasNext())
+    {
+      svn_merge_range_t* range = RevisionRange(iter.next()).toMergeRange(pool);
+      if (JNIUtil::isExceptionThrown())
+        return;
+      APR_ARRAY_PUSH(m_rangelist, svn_merge_range_t*) = range;
+    }
+}
+
+RevisionRangeList RevisionRangeList::create(jobject jthis, SVN::Pool &pool)
+{
+  jobject jrangelist = NULL;
+
+  if (jthis)
+    {
+      JNIEnv *env = JNIUtil::getEnv();
+
+      jmethodID mid = 0;
+      if (mid == 0)
+        {
+          jclass cls = env->FindClass(JAVAHL_CLASS("/types/RevisionRangeList"));
+          if (JNIUtil::isJavaExceptionThrown())
+            return RevisionRangeList(NULL, pool);
+
+          mid = env->GetMethodID(cls, "getRanges", "()Ljava/util/List;");
+          if (JNIUtil::isJavaExceptionThrown())
+            return RevisionRangeList(NULL, pool);
+        }
+
+      jrangelist = env->CallObjectMethod(jthis, mid);
+      if (JNIUtil::isJavaExceptionThrown())
+        return RevisionRangeList(NULL, pool);
+    }
+  return RevisionRangeList(jrangelist, pool);
+}
+
+jobject RevisionRangeList::toList() const
+{
+  JNIEnv *env = JNIUtil::getEnv();
+
+  // Create a local frame for our references
+  env->PushLocalFrame(LOCAL_FRAME_SIZE);
+  if (JNIUtil::isJavaExceptionThrown())
+    return NULL;
+
+  jclass clazz = env->FindClass("java/util/ArrayList");
+  if (JNIUtil::isJavaExceptionThrown())
+    POP_AND_RETURN_NULL;
+
+  static jmethodID init_mid = 0;
+  if (init_mid == 0)
+    {
+      init_mid = env->GetMethodID(clazz, "<init>", "()V");
+      if (JNIUtil::isJavaExceptionThrown())
+        POP_AND_RETURN_NULL;
+    }
+
+  static jmethodID add_mid = 0;
+  if (add_mid == 0)
+    {
+      add_mid = env->GetMethodID(clazz, "add", "(Ljava/lang/Object;)Z");
+      if (JNIUtil::isJavaExceptionThrown())
+        POP_AND_RETURN_NULL;
+    }
+
+  jobject jranges = env->NewObject(clazz, init_mid);
+
+  for (int i = 0; i < m_rangelist->nelts; ++i)
+    {
+      // Convert svn_merge_range_t *'s to Java RevisionRange objects.
+      svn_merge_range_t *range =
+        APR_ARRAY_IDX(m_rangelist, i, svn_merge_range_t *);
+
+      jobject jrange = RevisionRange::makeJRevisionRange(range);
+      if (JNIUtil::isJavaExceptionThrown())
+        POP_AND_RETURN_NULL;
+
+      env->CallBooleanMethod(jranges, add_mid, jrange);
+      if (JNIUtil::isJavaExceptionThrown())
+        POP_AND_RETURN_NULL;
+
+      env->DeleteLocalRef(jrange);
+    }
+
+  return env->PopLocalFrame(jranges);
+}
diff --git a/subversion/bindings/javahl/native/JNIThreadData.h b/subversion/bindings/javahl/native/RevisionRangeList.h
index 55d4141..116ff0d 100644
--- a/subversion/bindings/javahl/native/JNIThreadData.h
+++ b/subversion/bindings/javahl/native/RevisionRangeList.h
@@ -20,58 +20,53 @@
  * ====================================================================
  * @endcopyright
  *
- * @file JNIThreadData.h
- * @brief Interface of the class JNIThreadData
+ * @file RevisionRangeList.h
+ * @brief Interface of the class RevisionRangeList
  */
 
-#ifndef JNITHREADDATA_H
-#define JNITHREADDATA_H
+#ifndef REVISION_RANGE_LIST_H
+#define REVISION_RANGE_LIST_H
 
 #include <jni.h>
-#include "JNIUtil.h"
+#include "svn_mergeinfo.h"
 
-struct apr_threadkey_t;
+#include "Pool.h"
 
 /**
- * This class implements thread local storage for JNIUtil.
+ * A wrapper for svn_rangelist_t
  */
-class JNIThreadData
+class RevisionRangeList
 {
  public:
-  static void del(void *);
-  static JNIThreadData *getThreadData();
-  static bool initThreadData();
-  static void pushNewThreadData();
-  static void popThreadData();
-  JNIThreadData();
-  ~JNIThreadData();
-
   /**
-   * The current JNI environment.
+   * Create a RevisionRangeList object from a Java list of revision ranges.
    */
-  JNIEnv *m_env;
+  RevisionRangeList(jobject jrangelist, SVN::Pool &pool);
 
   /**
-   * Flag that a Java execption has been detected.
+   * Create a RevisionRangeList object from a Java RevisionRangeList.
    */
-  bool m_exceptionThrown;
+  static RevisionRangeList create(jobject jthis, SVN::Pool &pool);
 
   /**
-   * A buffer used for formating messages.
+   * Wrap an svn_rangelist_t.
    */
-  char m_formatBuffer[JNIUtil::formatBufferSize];
+  explicit RevisionRangeList(svn_rangelist_t* ranges)
+    : m_rangelist(ranges)
+  {}
 
- private:
   /**
-   * Pointer to previous thread information to enable reentrent
-   * calls.
+   * Return an svn_rangelist_t.
    */
-  JNIThreadData *m_previous;
+  const svn_rangelist_t* get() const { return m_rangelist; }
 
   /**
-   * The key to address this thread local storage.
+   * Make a Java list of reivison ranges.
    */
-  static apr_threadkey_t *g_key;
+  jobject toList() const;
+
+ private:
+  svn_rangelist_t* m_rangelist;
 };
 
-#endif  // JNITHREADDATA_H
+#endif  // REVISION_RANGE_LIST_H
diff --git a/subversion/bindings/javahl/native/SVNBase.cpp b/subversion/bindings/javahl/native/SVNBase.cpp
index bbabc11..5e20f93 100644
--- a/subversion/bindings/javahl/native/SVNBase.cpp
+++ b/subversion/bindings/javahl/native/SVNBase.cpp
@@ -97,3 +97,29 @@ inline void SVNBase::findCppAddrFieldID(jfieldID *fid, const char *className,
         }
     }
 }
+
+jobject SVNBase::createCppBoundObject(const char *clazzName)
+{
+  JNIEnv *env = JNIUtil::getEnv();
+
+  // Create java session object
+  jclass clazz = env->FindClass(clazzName);
+  if (JNIUtil::isJavaExceptionThrown())
+    return NULL;
+
+  static jmethodID ctor = 0;
+  if (ctor == 0)
+    {
+      ctor = env->GetMethodID(clazz, "<init>", "(J)V");
+      if (JNIUtil::isJavaExceptionThrown())
+        return NULL;
+    }
+
+  jlong cppAddr = this->getCppAddr();
+
+  jobject jself = env->NewObject(clazz, ctor, cppAddr);
+  if (JNIUtil::isJavaExceptionThrown())
+    return NULL;
+
+  return jself;
+}
diff --git a/subversion/bindings/javahl/native/SVNBase.h b/subversion/bindings/javahl/native/SVNBase.h
index f47e3c0..9b3d41a 100644
--- a/subversion/bindings/javahl/native/SVNBase.h
+++ b/subversion/bindings/javahl/native/SVNBase.h
@@ -82,6 +82,11 @@ class SVNBase
    */
   void dispose(jobject jthis, jfieldID *fid, const char *className);
 
+  /**
+   * Instantiates java object attached to this base object
+   */
+  jobject createCppBoundObject(const char *clazzName);
+
  private:
   /**
    * If the value pointed to by @a fid is zero, find the @c jfieldID
diff --git a/subversion/bindings/javahl/native/SVNClient.cpp b/subversion/bindings/javahl/native/SVNClient.cpp
index 4945cc7..5bae852 100644
--- a/subversion/bindings/javahl/native/SVNClient.cpp
+++ b/subversion/bindings/javahl/native/SVNClient.cpp
@@ -24,12 +24,18 @@
  * @brief: Implementation of the SVNClient class
  */
 
+#include <vector>
+#include <iostream>
+#include <sstream>
+#include <string>
+
 #include "SVNClient.h"
 #include "JNIUtil.h"
 #include "CopySources.h"
 #include "DiffSummaryReceiver.h"
 #include "ClientContext.h"
 #include "Prompter.h"
+#include "RemoteSession.h"
 #include "Pool.h"
 #include "Targets.h"
 #include "Revision.h"
@@ -50,9 +56,11 @@
 #include "CommitMessage.h"
 #include "EnumMapper.h"
 #include "StringArray.h"
-#include "RevpropTable.h"
+#include "PropertyTable.h"
 #include "DiffOptions.h"
 #include "CreateJ.h"
+#include "JNIStringHolder.h"
+
 #include "svn_auth.h"
 #include "svn_dso.h"
 #include "svn_types.h"
@@ -62,14 +70,17 @@
 #include "svn_diff.h"
 #include "svn_config.h"
 #include "svn_io.h"
+#include "svn_hash.h"
 #include "svn_dirent_uri.h"
 #include "svn_path.h"
 #include "svn_utf.h"
+#include "private/svn_subr_private.h"
 #include "svn_private_config.h"
-#include "JNIStringHolder.h"
-#include <vector>
-#include <iostream>
-#include <sstream>
+
+#include "ExternalItem.hpp"
+#include "jniwrapper/jni_list.hpp"
+#include "jniwrapper/jni_stack.hpp"
+#include "jniwrapper/jni_string_map.hpp"
 
 
 SVNClient::SVNClient(jobject jthis_in)
@@ -85,21 +96,21 @@ SVNClient *SVNClient::getCppObject(jobject jthis)
 {
     static jfieldID fid = 0;
     jlong cppAddr = SVNBase::findCppAddrForJObject(jthis, &fid,
-                                                   JAVA_PACKAGE"/SVNClient");
+                                                   JAVAHL_CLASS("/SVNClient"));
     return (cppAddr == 0 ? NULL : reinterpret_cast<SVNClient *>(cppAddr));
 }
 
 void SVNClient::dispose(jobject jthis)
 {
     static jfieldID fid = 0;
-    SVNBase::dispose(jthis, &fid, JAVA_PACKAGE"/SVNClient");
+    SVNBase::dispose(jthis, &fid, JAVAHL_CLASS("/SVNClient"));
 }
 
 jobject SVNClient::getVersionExtended(bool verbose)
 {
     JNIEnv *const env = JNIUtil::getEnv();
 
-    jclass clazz = env->FindClass(JAVA_PACKAGE"/types/VersionExtended");
+    jclass clazz = env->FindClass(JAVAHL_CLASS("/types/VersionExtended"));
     if (JNIUtil::isJavaExceptionThrown())
         return NULL;
 
@@ -184,8 +195,9 @@ void SVNClient::list(const char *url, Revision &revision,
 
 void
 SVNClient::status(const char *path, svn_depth_t depth,
-                  bool onServer, bool getAll, bool noIgnore,
-                  bool ignoreExternals, StringArray &changelists,
+                  bool onServer, bool onDisk, bool getAll,
+                  bool noIgnore, bool ignoreExternals,
+                  bool depthAsSticky, StringArray &changelists,
                   StatusCallback *callback)
 {
     SVN::Pool subPool(pool);
@@ -204,11 +216,10 @@ SVNClient::status(const char *path, svn_depth_t depth,
 
     rev.kind = svn_opt_revision_unspecified;
 
-    SVN_JNI_ERR(svn_client_status5(&youngest, ctx, checkedPath.c_str(),
-                                   &rev,
-                                   depth,
-                                   getAll, onServer, noIgnore, ignoreExternals,
-                                   FALSE,
+    SVN_JNI_ERR(svn_client_status6(&youngest, ctx, checkedPath.c_str(),
+                                   &rev, depth,
+                                   getAll, onServer, onDisk,
+                                   noIgnore, ignoreExternals, depthAsSticky,
                                    changelists.array(subPool),
                                    StatusCallback::callback, callback,
                                    subPool.getPool()), );
@@ -227,23 +238,23 @@ rev_range_vector_to_apr_array(std::vector<RevisionRange> &revRanges,
     std::vector<RevisionRange>::const_iterator it;
     for (it = revRanges.begin(); it != revRanges.end(); ++it)
     {
-        if (it->toRange(subPool)->start.kind
-            == svn_opt_revision_unspecified
-            && it->toRange(subPool)->end.kind
-            == svn_opt_revision_unspecified)
+        const svn_opt_revision_range_t *range = it->toRange(subPool);
+
+        if (range->start.kind == svn_opt_revision_unspecified
+            && range->end.kind == svn_opt_revision_unspecified)
         {
-            svn_opt_revision_range_t *range =
+            svn_opt_revision_range_t *full =
                 reinterpret_cast<svn_opt_revision_range_t *>
                     (apr_pcalloc(subPool.getPool(), sizeof(*range)));
-            range->start.kind = svn_opt_revision_number;
-            range->start.value.number = 1;
-            range->end.kind = svn_opt_revision_head;
-            APR_ARRAY_PUSH(ranges, const svn_opt_revision_range_t *) = range;
+            full->start.kind = svn_opt_revision_number;
+            full->start.value.number = 1;
+            full->end.kind = svn_opt_revision_head;
+            full->end.value.number = 0;
+            APR_ARRAY_PUSH(ranges, const svn_opt_revision_range_t *) = full;
         }
         else
         {
-            APR_ARRAY_PUSH(ranges, const svn_opt_revision_range_t *) =
-                it->toRange(subPool);
+            APR_ARRAY_PUSH(ranges, const svn_opt_revision_range_t *) = range;
         }
         if (JNIUtil::isExceptionThrown())
             return NULL;
@@ -255,7 +266,7 @@ void SVNClient::logMessages(const char *path, Revision &pegRevision,
                             std::vector<RevisionRange> &logRanges,
                             bool stopOnCopy, bool discoverPaths,
                             bool includeMergedRevisions, StringArray &revProps,
-                            long limit, LogMessageCallback *callback)
+                            int limit, LogMessageCallback *callback)
 {
     SVN::Pool subPool(pool);
 
@@ -317,7 +328,7 @@ jlong SVNClient::checkout(const char *moduleName, const char *destPath,
 }
 
 void SVNClient::remove(Targets &targets, CommitMessage *message, bool force,
-                       bool keep_local, RevpropTable &revprops,
+                       bool keep_local, PropertyTable &revprops,
                        CommitCallback *callback)
 {
     SVN::Pool subPool(pool);
@@ -334,23 +345,24 @@ void SVNClient::remove(Targets &targets, CommitMessage *message, bool force,
                                    ctx, subPool.getPool()), );
 }
 
-void SVNClient::revert(const char *path, svn_depth_t depth,
-                       StringArray &changelists)
+void SVNClient::revert(StringArray &paths, svn_depth_t depth,
+                       StringArray &changelists,
+                       bool clear_changelists,
+                       bool metadata_only)
 {
     SVN::Pool subPool(pool);
 
-    SVN_JNI_NULL_PTR_EX(path, "path", );
-
     svn_client_ctx_t *ctx = context.getContext(NULL, subPool);
     if (ctx == NULL)
         return;
 
-    Targets target(path, subPool);
-    const apr_array_header_t *targets = target.array(subPool);
-    SVN_JNI_ERR(target.error_occurred(), );
-    SVN_JNI_ERR(svn_client_revert2(targets, depth,
-                                   changelists.array(subPool), ctx,
-                                   subPool.getPool()), );
+    Targets targets(paths, subPool);
+    SVN_JNI_ERR(targets.error_occurred(), );
+    SVN_JNI_ERR(svn_client_revert3(targets.array(subPool), depth,
+                                   changelists.array(subPool),
+                                   clear_changelists,
+                                   metadata_only,
+                                   ctx, subPool.getPool()), );
 }
 
 void SVNClient::add(const char *path,
@@ -417,7 +429,7 @@ jlongArray SVNClient::update(Targets &targets, Revision &revision,
 
 void SVNClient::commit(Targets &targets, CommitMessage *message,
                        svn_depth_t depth, bool noUnlock, bool keepChangelist,
-                       StringArray &changelists, RevpropTable &revprops,
+                       StringArray &changelists, PropertyTable &revprops,
                        CommitCallback *callback)
 {
     SVN::Pool subPool(pool);
@@ -439,20 +451,82 @@ void SVNClient::commit(Targets &targets, CommitMessage *message,
                 );
 }
 
+
+namespace {
+typedef Java::ImmutableList<JavaHL::ExternalItem> PinList;
+typedef Java::ImmutableMap<PinList> PinMap;
+
+struct PinListFunctor
+{
+  explicit PinListFunctor(const Java::Env& env, SVN::Pool& pool, int refs_len)
+    : m_pool(pool),
+      m_refs(apr_array_make(pool.getPool(), refs_len,
+                            sizeof(svn_wc_external_item2_t*)))
+      {}
+
+  void operator()(const JavaHL::ExternalItem& item)
+    {
+      APR_ARRAY_PUSH(m_refs, svn_wc_external_item2_t*) =
+        item.get_external_item(m_pool);
+    }
+
+  SVN::Pool& m_pool;
+  apr_array_header_t *m_refs;
+};
+
+struct PinMapFunctor
+{
+  explicit PinMapFunctor(const Java::Env& env, SVN::Pool& pool)
+    : m_env(env),
+      m_pool(pool),
+      m_pin_set(svn_hash__make(pool.getPool()))
+    {}
+
+  void operator()(const std::string& path, const PinList& refs)
+    {
+      PinListFunctor lf(m_env, m_pool, refs.length());
+      refs.for_each(lf);
+      const char* key = static_cast<const char*>(
+          apr_pmemdup(m_pool.getPool(), path.c_str(), path.size() + 1));
+      svn_hash_sets(m_pin_set, key, lf.m_refs);
+    }
+
+  const Java::Env& m_env;
+  SVN::Pool& m_pool;
+  apr_hash_t *m_pin_set;
+};
+
+apr_hash_t *get_externals_to_pin(jobject jexternalsToPin, SVN::Pool& pool)
+{
+  if (!jexternalsToPin)
+    return NULL;
+
+  const Java::Env env;
+  JNIEnv *jenv = env.get();
+
+  try
+    {
+      PinMap pin_map(env, jexternalsToPin);
+      PinMapFunctor mf(env, pool);
+      pin_map.for_each(mf);
+      return mf.m_pin_set;
+    }
+  SVN_JAVAHL_JNI_CATCH;
+  return NULL;
+}
+} // anonymous namespace
+
 void SVNClient::copy(CopySources &copySources, const char *destPath,
                      CommitMessage *message, bool copyAsChild,
                      bool makeParents, bool ignoreExternals,
-                     RevpropTable &revprops, CommitCallback *callback)
+                     bool metadataOnly,
+                     bool pinExternals, jobject jexternalsToPin,
+                     PropertyTable &revprops, CommitCallback *callback)
 {
     SVN::Pool subPool(pool);
 
     apr_array_header_t *srcs = copySources.array(subPool);
-    if (srcs == NULL)
-    {
-        JNIUtil::throwNativeException(JAVA_PACKAGE "/ClientException",
-                                      "Invalid copy sources");
-        return;
-    }
+    SVN_JNI_NULL_PTR_EX(srcs, "sources", );
     SVN_JNI_NULL_PTR_EX(destPath, "destPath", );
     Path destinationPath(destPath, subPool);
     SVN_JNI_ERR(destinationPath.error_occurred(), );
@@ -461,17 +535,21 @@ void SVNClient::copy(CopySources &copySources, const char *destPath,
     if (ctx == NULL)
         return;
 
-    SVN_JNI_ERR(svn_client_copy6(srcs, destinationPath.c_str(),
-                                 copyAsChild, makeParents, ignoreExternals,
-                                 revprops.hash(subPool),
-                                 CommitCallback::callback, callback,
+    apr_hash_t *pin_set = get_externals_to_pin(jexternalsToPin, subPool);
+    if (!JNIUtil::isJavaExceptionThrown())
+      SVN_JNI_ERR(svn_client_copy7(srcs, destinationPath.c_str(),
+                                   copyAsChild, makeParents, ignoreExternals,
+                                   metadataOnly,
+                                   pinExternals, pin_set,
+                                   revprops.hash(subPool),
+                                   CommitCallback::callback, callback,
                                  ctx, subPool.getPool()), );
 }
 
 void SVNClient::move(Targets &srcPaths, const char *destPath,
                      CommitMessage *message, bool force, bool moveAsChild,
                      bool makeParents, bool metadataOnly, bool allowMixRev,
-                     RevpropTable &revprops, CommitCallback *callback)
+                     PropertyTable &revprops, CommitCallback *callback)
 {
     SVN::Pool subPool(pool);
 
@@ -496,7 +574,7 @@ void SVNClient::move(Targets &srcPaths, const char *destPath,
 }
 
 void SVNClient::mkdir(Targets &targets, CommitMessage *message,
-                      bool makeParents, RevpropTable &revprops,
+                      bool makeParents, PropertyTable &revprops,
                       CommitCallback *callback)
 {
     SVN::Pool subPool(pool);
@@ -513,7 +591,12 @@ void SVNClient::mkdir(Targets &targets, CommitMessage *message,
                                   ctx, subPool.getPool()), );
 }
 
-void SVNClient::cleanup(const char *path)
+void SVNClient::cleanup(const char *path,
+                        bool break_locks,
+                        bool fix_recorded_timestamps,
+                        bool clear_dav_cache,
+                        bool remove_unused_pristines,
+                        bool include_externals)
 {
     SVN::Pool subPool(pool);
     SVN_JNI_NULL_PTR_EX(path, "path", );
@@ -524,7 +607,13 @@ void SVNClient::cleanup(const char *path)
     if (ctx == NULL)
         return;
 
-    SVN_JNI_ERR(svn_client_cleanup(intPath.c_str(), ctx, subPool.getPool()),);
+    SVN_JNI_ERR(svn_client_cleanup2(intPath.c_str(),
+                                    break_locks,
+                                    fix_recorded_timestamps,
+                                    clear_dav_cache,
+                                    remove_unused_pristines,
+                                    include_externals,
+                                    ctx, subPool.getPool()),);
 }
 
 void SVNClient::resolve(const char *path, svn_depth_t depth,
@@ -545,6 +634,7 @@ void SVNClient::resolve(const char *path, svn_depth_t depth,
 jlong SVNClient::doExport(const char *srcPath, const char *destPath,
                           Revision &revision, Revision &pegRevision,
                           bool force, bool ignoreExternals,
+                          bool ignoreKeywords,
                           svn_depth_t depth, const char *nativeEOL)
 {
     SVN::Pool subPool(pool);
@@ -563,7 +653,7 @@ jlong SVNClient::doExport(const char *srcPath, const char *destPath,
                                    destinationPath.c_str(),
                                    pegRevision.revision(),
                                    revision.revision(), force,
-                                   ignoreExternals, FALSE,
+                                   ignoreExternals, ignoreKeywords,
                                    depth,
                                    nativeEOL, ctx,
                                    subPool.getPool()),
@@ -613,7 +703,7 @@ void SVNClient::doImport(const char *path, const char *url,
                          CommitMessage *message, svn_depth_t depth,
                          bool noIgnore, bool noAutoProps,
                          bool ignoreUnknownNodeTypes,
-                         RevpropTable &revprops,
+                         PropertyTable &revprops,
                          ImportFilterCallback *ifCallback,
                          CommitCallback *commitCallback)
 {
@@ -658,7 +748,7 @@ void SVNClient::merge(const char *path1, Revision &revision1,
                       const char *path2, Revision &revision2,
                       const char *localPath, bool forceDelete, svn_depth_t depth,
                       bool ignoreMergeinfo, bool diffIgnoreAncestry,
-                      bool dryRun, bool recordOnly)
+                      bool dryRun, bool allowMixedRev, bool recordOnly)
 {
     SVN::Pool subPool(pool);
     SVN_JNI_NULL_PTR_EX(path1, "path1", );
@@ -683,14 +773,15 @@ void SVNClient::merge(const char *path1, Revision &revision1,
                                   depth,
                                   ignoreMergeinfo, diffIgnoreAncestry,
                                   forceDelete, recordOnly, dryRun,
-                                  TRUE, NULL, ctx, subPool.getPool()), );
+                                  allowMixedRev, NULL, ctx,
+                                  subPool.getPool()), );
 }
 
 void SVNClient::merge(const char *path, Revision &pegRevision,
                       std::vector<RevisionRange> *rangesToMerge,
                       const char *localPath, bool forceDelete, svn_depth_t depth,
                       bool ignoreMergeinfo, bool diffIgnoreAncestry,
-                      bool dryRun, bool recordOnly)
+                      bool dryRun, bool allowMixedRev, bool recordOnly)
 {
     SVN::Pool subPool(pool);
     SVN_JNI_NULL_PTR_EX(path, "path", );
@@ -718,39 +809,16 @@ void SVNClient::merge(const char *path, Revision &pegRevision,
                                       depth,
                                       ignoreMergeinfo, diffIgnoreAncestry,
                                       forceDelete, recordOnly,
-                                      dryRun, TRUE, NULL, ctx,
+                                      dryRun, allowMixedRev, NULL, ctx,
                                       subPool.getPool()), );
 }
 
-void SVNClient::mergeReintegrate(const char *path, Revision &pegRevision,
-                                 const char *localPath, bool dryRun)
-{
-    SVN::Pool subPool(pool);
-    SVN_JNI_NULL_PTR_EX(path, "path", );
-    SVN_JNI_NULL_PTR_EX(localPath, "localPath", );
-    Path intLocalPath(localPath, subPool);
-    SVN_JNI_ERR(intLocalPath.error_occurred(), );
-
-    Path srcPath(path, subPool);
-    SVN_JNI_ERR(srcPath.error_occurred(), );
-
-    svn_client_ctx_t *ctx = context.getContext(NULL, subPool);
-    if (ctx == NULL)
-        return;
-
-    SVN_JNI_ERR(svn_client_merge_reintegrate(srcPath.c_str(),
-                                             pegRevision.revision(),
-                                             intLocalPath.c_str(),
-                                             dryRun, NULL, ctx,
-                                             subPool.getPool()), );
-}
+/* SVNClient::mergeReintegrate is implemented in deprecated.cpp. */
 
 jobject
 SVNClient::getMergeinfo(const char *target, Revision &pegRevision)
 {
     SVN::Pool subPool(pool);
-    JNIEnv *env = JNIUtil::getEnv();
-
     svn_client_ctx_t *ctx = context.getContext(NULL, subPool);
     if (ctx == NULL)
         return NULL;
@@ -765,57 +833,7 @@ SVNClient::getMergeinfo(const char *target, Revision &pegRevision)
                 NULL);
     if (mergeinfo == NULL)
         return NULL;
-
-    // Transform mergeinfo into Java Mergeinfo object.
-    jclass clazz = env->FindClass(JAVA_PACKAGE "/types/Mergeinfo");
-    if (JNIUtil::isJavaExceptionThrown())
-        return NULL;
-
-    static jmethodID ctor = 0;
-    if (ctor == 0)
-    {
-        ctor = env->GetMethodID(clazz, "<init>", "()V");
-        if (JNIUtil::isJavaExceptionThrown())
-            return NULL;
-    }
-
-    static jmethodID addRevisions = 0;
-    if (addRevisions == 0)
-    {
-        addRevisions = env->GetMethodID(clazz, "addRevisions",
-                                        "(Ljava/lang/String;"
-                                        "Ljava/util/List;)V");
-        if (JNIUtil::isJavaExceptionThrown())
-            return NULL;
-    }
-
-    jobject jmergeinfo = env->NewObject(clazz, ctor);
-    if (JNIUtil::isJavaExceptionThrown())
-        return NULL;
-
-    apr_hash_index_t *hi;
-    for (hi = apr_hash_first(subPool.getPool(), mergeinfo);
-         hi;
-         hi = apr_hash_next(hi))
-    {
-        const void *path;
-        void *val;
-        apr_hash_this(hi, &path, NULL, &val);
-
-        jstring jpath =
-            JNIUtil::makeJString(reinterpret_cast<const char *>(path));
-        jobject jranges =
-            CreateJ::RevisionRangeList(reinterpret_cast<svn_rangelist_t *>(val));
-
-        env->CallVoidMethod(jmergeinfo, addRevisions, jpath, jranges);
-
-        env->DeleteLocalRef(jranges);
-        env->DeleteLocalRef(jpath);
-    }
-
-    env->DeleteLocalRef(clazz);
-
-    return jmergeinfo;
+    return CreateJ::Mergeinfo(mergeinfo, subPool.getPool());
 }
 
 void SVNClient::getMergeinfoLog(int type, const char *pathOrURL,
@@ -954,7 +972,7 @@ void SVNClient::propertySetRemote(const char *path, long base_rev,
                                   const char *name,
                                   CommitMessage *message,
                                   JNIByteArray &value, bool force,
-                                  RevpropTable &revprops,
+                                  PropertyTable &revprops,
                                   CommitCallback *callback)
 {
     SVN::Pool subPool(pool);
@@ -1155,23 +1173,31 @@ SVNClient::diffSummarize(const char *target, Revision &pegRevision,
                                                subPool.getPool()), );
 }
 
-void SVNClient::streamFileContent(const char *path, Revision &revision,
-                                  Revision &pegRevision,
-                                  OutputStream &outputStream)
+apr_hash_t *SVNClient::streamFileContent(const char *path,
+                                         Revision &revision,
+                                         Revision &pegRevision,
+                                         bool expand_keywords,
+                                         bool return_props,
+                                         OutputStream &outputStream)
 {
     SVN::Pool subPool(pool);
-    SVN_JNI_NULL_PTR_EX(path, "path", );
+    SVN_JNI_NULL_PTR_EX(path, "path", NULL);
     Path intPath(path, subPool);
-    SVN_JNI_ERR(intPath.error_occurred(), );
+    SVN_JNI_ERR(intPath.error_occurred(), NULL);
 
     svn_client_ctx_t *ctx = context.getContext(NULL, subPool);
     if (ctx == NULL)
-        return;
+        return NULL;
 
-    SVN_JNI_ERR(svn_client_cat2(outputStream.getStream(subPool),
-                                intPath.c_str(), pegRevision.revision(),
-                                revision.revision(), ctx, subPool.getPool()),
-                );
+    apr_hash_t *props = NULL;
+    SVN_JNI_ERR(svn_client_cat3((return_props ? &props : NULL),
+                                outputStream.getStream(subPool),
+                                intPath.c_str(),
+                                pegRevision.revision(), revision.revision(),
+                                expand_keywords, ctx,
+                                subPool.getPool(), subPool.getPool()),
+        NULL);
+    return props;
 }
 
 jbyteArray SVNClient::revProperty(const char *path,
@@ -1239,7 +1265,7 @@ void SVNClient::relocate(const char *from, const char *to, const char *path,
 void SVNClient::blame(const char *path, Revision &pegRevision,
                       Revision &revisionStart, Revision &revisionEnd,
                       bool ignoreMimeType, bool includeMergedRevisions,
-                      BlameCallback *callback)
+                      BlameCallback *callback, DiffOptions const& options)
 {
     SVN::Pool subPool(pool);
     SVN_JNI_NULL_PTR_EX(path, "path", );
@@ -1253,7 +1279,7 @@ void SVNClient::blame(const char *path, Revision &pegRevision,
     SVN_JNI_ERR(svn_client_blame5(
           intPath.c_str(), pegRevision.revision(), revisionStart.revision(),
           revisionEnd.revision(),
-          svn_diff_file_options_create(subPool.getPool()), ignoreMimeType,
+          options.fileOptions(subPool), ignoreMimeType,
           includeMergedRevisions, BlameCallback::callback, callback, ctx,
           subPool.getPool()),
         );
@@ -1288,15 +1314,17 @@ void SVNClient::removeFromChangelists(Targets &srcPaths, svn_depth_t depth,
 }
 
 void SVNClient::getChangelists(const char *rootPath,
-                               StringArray &changelists,
+                               StringArray *changelists,
                                svn_depth_t depth,
                                ChangelistCallback *callback)
 {
     SVN::Pool subPool(pool);
     svn_client_ctx_t *ctx = context.getContext(NULL, subPool);
 
-    SVN_JNI_ERR(svn_client_get_changelists(rootPath,
-                                           changelists.array(subPool),
+    const apr_array_header_t *cl_array = (!changelists ? NULL
+                                          : changelists->array(subPool));
+
+    SVN_JNI_ERR(svn_client_get_changelists(rootPath, cl_array,
                                            depth, ChangelistCallback::callback,
                                            callback, ctx, subPool.getPool()),
                 );
@@ -1392,10 +1420,10 @@ jstring SVNClient::getVersionInfo(const char *path, const char *trailUrl,
         }
         else
         {
-            char *message = JNIUtil::getFormatBuffer();
-            apr_snprintf(message, JNIUtil::formatBufferSize,
+            char buffer[2048];
+            apr_snprintf(buffer, sizeof(buffer),
                          _("'%s' not versioned, and not exported\n"), path);
-            return JNIUtil::makeJString(message);
+            return JNIUtil::makeJString(buffer);
         }
     }
 
@@ -1465,19 +1493,15 @@ jobject SVNClient::revProperties(const char *path, Revision &revision)
                                         &set_rev, ctx, subPool.getPool()),
                 NULL);
 
-    return CreateJ::PropertyMap(props);
+    return CreateJ::PropertyMap(props, subPool.getPool());
 }
 
-struct info_baton
-{
-    std::vector<info_entry> infoVect;
-    apr_pool_t *pool;
-};
-
 void
-SVNClient::info2(const char *path, Revision &revision, Revision &pegRevision,
-                 svn_depth_t depth, StringArray &changelists,
-                 InfoCallback *callback)
+SVNClient::info(const char *path,
+                Revision &revision, Revision &pegRevision, svn_depth_t depth,
+                svn_boolean_t fetchExcluded, svn_boolean_t fetchActualOnly,
+                svn_boolean_t includeExternals,
+                 StringArray &changelists, InfoCallback *callback)
 {
     SVN_JNI_NULL_PTR_EX(path, "path", );
 
@@ -1489,10 +1513,11 @@ SVNClient::info2(const char *path, Revision &revision, Revision &pegRevision,
     Path checkedPath(path, subPool);
     SVN_JNI_ERR(checkedPath.error_occurred(), );
 
-    SVN_JNI_ERR(svn_client_info3(checkedPath.c_str(),
+    SVN_JNI_ERR(svn_client_info4(checkedPath.c_str(),
                                  pegRevision.revision(),
-                                 revision.revision(),
-                                 depth, FALSE, TRUE,
+                                 revision.revision(), depth,
+                                 fetchExcluded, fetchActualOnly,
+                                 includeExternals,
                                  changelists.array(subPool),
                                  InfoCallback::callback, callback,
                                  ctx, subPool.getPool()), );
@@ -1525,6 +1550,87 @@ SVNClient::patch(const char *patchPath, const char *targetPath, bool dryRun,
                                  ctx, subPool.getPool()), );
 }
 
+void SVNClient::vacuum(const char *path,
+                       bool remove_unversioned_items,
+                       bool remove_ignored_items,
+                       bool fix_recorded_timestamps,
+                       bool remove_unused_pristines,
+                       bool include_externals)
+{
+    SVN_JNI_NULL_PTR_EX(path, "path", );
+
+    SVN::Pool subPool(pool);
+    svn_client_ctx_t *ctx = context.getContext(NULL, subPool);
+    if (ctx == NULL)
+        return;
+
+    Path checkedPath(path, subPool);
+    SVN_JNI_ERR(checkedPath.error_occurred(),);
+
+    SVN_JNI_ERR(svn_client_vacuum(checkedPath.c_str(),
+                                  remove_unversioned_items,
+                                  remove_ignored_items,
+                                  fix_recorded_timestamps,
+                                  remove_unused_pristines,
+                                  include_externals,
+                                  ctx, subPool.getPool()), );
+}
+
+jobject
+SVNClient::openRemoteSession(const char* path, int retryAttempts)
+{
+    static const svn_opt_revision_t HEAD = { svn_opt_revision_head, {0}};
+    static const svn_opt_revision_t NONE = { svn_opt_revision_unspecified, {0}};
+
+    SVN_JNI_NULL_PTR_EX(path, "path", NULL);
+
+    SVN::Pool subPool(pool);
+    svn_client_ctx_t *ctx = context.getContext(NULL, subPool);
+    if (ctx == NULL)
+        return NULL;
+
+    Path checkedPath(path, subPool);
+    SVN_JNI_ERR(checkedPath.error_occurred(), NULL);
+
+    struct PathInfo
+    {
+        std::string url;
+        std::string uuid;
+        static svn_error_t *callback(void *baton,
+                                     const char *,
+                                     const svn_client_info2_t *info,
+                                     apr_pool_t *)
+          {
+              PathInfo* const pi = static_cast<PathInfo*>(baton);
+              pi->url = info->URL;
+              pi->uuid = info->repos_UUID;
+              return SVN_NO_ERROR;
+          }
+    } path_info;
+
+    SVN_JNI_ERR(svn_client_info4(
+                    checkedPath.c_str(), &NONE,
+                    (svn_path_is_url(checkedPath.c_str()) ? &HEAD : &NONE),
+                    svn_depth_empty, FALSE, TRUE, FALSE, NULL,
+                    PathInfo::callback, &path_info,
+                    ctx, subPool.getPool()),
+                NULL);
+
+    /* Decouple the RemoteSession's context from SVNClient's context
+       by creating a copy of the prompter here. */
+
+    jobject jremoteSession = RemoteSession::open(
+        retryAttempts, path_info.url.c_str(), path_info.uuid.c_str(),
+        context.getConfigDirectory(),
+        context.getUsername(), context.getPassword(),
+        context.clonePrompter(), context.getSelf(),
+        context.getConfigEventHandler(), context.getTunnelCallback());
+    if (JNIUtil::isJavaExceptionThrown())
+      jremoteSession = NULL;
+
+    return jremoteSession;
+}
+
 ClientContext &
 SVNClient::getClientContext()
 {
diff --git a/subversion/bindings/javahl/native/SVNClient.h b/subversion/bindings/javahl/native/SVNClient.h
index 8d85d9b..6661bae 100644
--- a/subversion/bindings/javahl/native/SVNClient.h
+++ b/subversion/bindings/javahl/native/SVNClient.h
@@ -53,7 +53,7 @@ class PatchCallback;
 class ChangelistCallback;
 class CommitMessage;
 class StringArray;
-class RevpropTable;
+class PropertyTable;
 class DiffOptions;
 #include "svn_types.h"
 #include "svn_client.h"
@@ -62,12 +62,19 @@ class DiffOptions;
 class SVNClient :public SVNBase
 {
  public:
+  jobject openRemoteSession(const char* path, int);
+  void vacuum(const char *path,
+              bool remove_unversioned_items, bool remove_ignored_items,
+              bool fix_recorded_timestamps, bool remove_unused_pristines,
+              bool include_externals);
   void patch(const char *patchPath, const char *targetPath, bool dryRun,
              int stripCount, bool reverse, bool ignoreWhitespace,
              bool removeTempfiles, PatchCallback *callback);
-  void info2(const char *path, Revision &revision, Revision &pegRevision,
-             svn_depth_t depth, StringArray &changelists,
-             InfoCallback *callback);
+  void info(const char *path,
+            Revision &revision, Revision &pegRevision, svn_depth_t depth,
+            svn_boolean_t fetchExcluded, svn_boolean_t fetchActualOnly,
+            svn_boolean_t includeExternals,
+            StringArray &changelists, InfoCallback *callback);
   void unlock(Targets &targets, bool force);
   void lock(Targets &targets, const char *comment, bool force);
   jobject revProperties(const char *path, Revision &revision);
@@ -75,18 +82,20 @@ class SVNClient :public SVNBase
   void blame(const char *path, Revision &pegRevision,
              Revision &revisionStart, Revision &revisionEnd,
              bool ignoreMimeType, bool includeMergedRevisions,
-             BlameCallback *callback);
+             BlameCallback *callback, DiffOptions const& options);
   void relocate(const char *from, const char *to, const char *path,
                 bool ignoreExternals);
-  void streamFileContent(const char *path, Revision &revision,
-                         Revision &pegRevision, OutputStream &outputStream);
+  apr_hash_t *streamFileContent(const char *path,
+                                Revision &revision, Revision &pegRevision,
+                                bool expand_keywords, bool return_props,
+                                OutputStream &outputStream);
   void propertySetLocal(Targets &targets, const char *name, JNIByteArray &value,
                         svn_depth_t depth, StringArray &changelists,
                         bool force);
   void propertySetRemote(const char *path, long base_rev, const char *name,
                          CommitMessage *message,
                          JNIByteArray &value, bool force,
-                         RevpropTable &revprops, CommitCallback *callback);
+                         PropertyTable &revprops, CommitCallback *callback);
   void properties(const char *path, Revision &revision,
                   Revision &pegRevision, svn_depth_t depth,
                   StringArray &changelists, ProplistCallback *callback);
@@ -103,18 +112,18 @@ class SVNClient :public SVNBase
              const char *path2, Revision &revision2,
              const char *localPath, bool forceDelete, svn_depth_t depth,
              bool ignoreMergeinfo, bool diffIgnoreAncestry,
-             bool dryRun, bool recordOnly);
+             bool dryRun, bool allowMixedRev, bool recordOnly);
   void merge(const char *path, Revision &pegRevision,
              std::vector<RevisionRange> *rangesToMerge,
              const char *localPath, bool forceDelete, svn_depth_t depth,
              bool ignoreMergeinfo, bool diffIgnoreAncestry,
-             bool dryRun, bool recordOnly);
+             bool dryRun, bool allowMixedRev, bool recordOnly);
   void mergeReintegrate(const char *path, Revision &pegRevision,
                         const char *localPath, bool dryRun);
   void doImport(const char *path, const char *url, CommitMessage *message,
                 svn_depth_t depth, bool noIgnore, bool noAutoProps,
                 bool ignoreUnknownNodeTypes,
-                RevpropTable &revprops, ImportFilterCallback *ifCallback,
+                PropertyTable &revprops, ImportFilterCallback *ifCallback,
                 CommitCallback *commitCallback);
   jlong doSwitch(const char *path, const char *url, Revision &revision,
                  Revision &pegRevision, svn_depth_t depth,
@@ -122,33 +131,40 @@ class SVNClient :public SVNBase
                  bool allowUnverObstructions, bool ignoreAncestry);
   jlong doExport(const char *srcPath, const char *destPath,
                  Revision &revision, Revision &pegRevision, bool force,
-                 bool ignoreExternals, svn_depth_t depth,
-                 const char *nativeEOL);
+                 bool ignoreExternals, bool ignoreKeywords,
+                 svn_depth_t depth, const char *nativeEOL);
   void resolve(const char *path, svn_depth_t depth,
                svn_wc_conflict_choice_t choice);
-  void cleanup(const char *path);
+  void cleanup(const char *path,
+               bool break_locks,
+               bool fix_recorded_timestamps,
+               bool clear_dav_cache,
+               bool remove_unused_pristines,
+               bool include_externals);
   void mkdir(Targets &targets, CommitMessage *message, bool makeParents,
-             RevpropTable &revprops, CommitCallback *callback);
+             PropertyTable &revprops, CommitCallback *callback);
   void move(Targets &srcPaths, const char *destPath,
             CommitMessage *message, bool force, bool moveAsChild,
             bool makeParents, bool metadataOnly, bool allowMixRev,
-            RevpropTable &revprops, CommitCallback *callback);
+            PropertyTable &revprops, CommitCallback *callback);
   void copy(CopySources &copySources, const char *destPath,
             CommitMessage *message, bool copyAsChild, bool makeParents,
-            bool ignoreExternals, RevpropTable &revprops,
-            CommitCallback *callback);
+            bool ignoreExternals, bool metaDataOnly, bool pinExternals,
+            jobject jexternalsToPin,
+            PropertyTable &revprops, CommitCallback *callback);
   void commit(Targets &targets, CommitMessage *message, svn_depth_t depth,
               bool noUnlock, bool keepChangelist,
-              StringArray &changelists, RevpropTable &revprops,
+              StringArray &changelists, PropertyTable &revprops,
               CommitCallback *callback);
   jlongArray update(Targets &targets, Revision &revision, svn_depth_t depth,
                     bool depthIsSticky, bool makeParents, bool ignoreExternals,
                     bool allowUnverObstructions);
   void add(const char *path, svn_depth_t depth, bool force,
            bool no_ignore, bool no_autoprops, bool add_parents);
-  void revert(const char *path, svn_depth_t depth, StringArray &changelists);
+  void revert(StringArray &paths, svn_depth_t depth, StringArray &changelists,
+              bool clear_changelists, bool metadata_only);
   void remove(Targets &targets, CommitMessage *message, bool force,
-              bool keep_local, RevpropTable &revprops,
+              bool keep_local, PropertyTable &revprops,
               CommitCallback *callback);
   jlong checkout(const char *moduleName, const char *destPath,
                  Revision &revision, Revision &pegRevsion, svn_depth_t depth,
@@ -157,7 +173,7 @@ class SVNClient :public SVNBase
                    std::vector<RevisionRange> &ranges, bool stopOnCopy,
                    bool discoverPaths, bool includeMergedRevisions,
                    StringArray &revProps,
-                   long limit, LogMessageCallback *callback);
+                   int limit, LogMessageCallback *callback);
   jobject getVersionExtended(bool verbose);
   jstring getAdminDirectoryName();
   jboolean isAdminDirectory(const char *name);
@@ -165,11 +181,13 @@ class SVNClient :public SVNBase
                        svn_depth_t depth, StringArray &changelists);
   void removeFromChangelists(Targets &srcPaths, svn_depth_t depth,
                              StringArray &changelists);
-  void getChangelists(const char *path, StringArray &changelists,
+  void getChangelists(const char *path, StringArray *changelists,
                       svn_depth_t depth, ChangelistCallback *callback);
-  void status(const char *path, svn_depth_t depth, bool onServer,
-              bool getAll, bool noIgnore, bool ignoreExternals,
-              StringArray &changelists, StatusCallback *callback);
+  void status(const char *path, svn_depth_t depth,
+              bool onServer, bool onDisk, bool getAll,
+              bool noIgnore, bool ignoreExternals,
+              bool depthAsSticky, StringArray &changelists,
+              StatusCallback *callback);
   void list(const char *url, Revision &revision, Revision &pegRevision,
             svn_depth_t depth, int direntFields, bool fetchLocks,
             ListCallback *callback);
diff --git a/subversion/bindings/javahl/native/SVNRepos.cpp b/subversion/bindings/javahl/native/SVNRepos.cpp
index 7fdf63c..0ee87e6 100644
--- a/subversion/bindings/javahl/native/SVNRepos.cpp
+++ b/subversion/bindings/javahl/native/SVNRepos.cpp
@@ -26,7 +26,6 @@
 
 #include "SVNRepos.h"
 #include "CreateJ.h"
-#include "ReposNotifyCallback.h"
 #include "JNIUtil.h"
 #include "svn_error_codes.h"
 #include "svn_repos.h"
@@ -50,14 +49,14 @@ SVNRepos *SVNRepos::getCppObject(jobject jthis)
 {
   static jfieldID fid = 0;
   jlong cppAddr = SVNBase::findCppAddrForJObject(jthis, &fid,
-                                                 JAVA_PACKAGE"/SVNRepos");
+                                                 JAVAHL_CLASS("/SVNRepos"));
   return (cppAddr == 0 ? NULL : reinterpret_cast<SVNRepos *>(cppAddr));
 }
 
 void SVNRepos::dispose(jobject jthis)
 {
   static jfieldID fid = 0;
-  SVNBase::dispose(jthis, &fid, JAVA_PACKAGE"/SVNRepos");
+  SVNBase::dispose(jthis, &fid, JAVAHL_CLASS("/SVNRepos"));
 }
 
 void SVNRepos::cancelOperation()
@@ -124,8 +123,10 @@ void SVNRepos::deltify(File &path, Revision &revStart, Revision &revEnd)
       return;
     }
 
-  SVN_JNI_ERR(svn_repos_open2(&repos, path.getInternalStyle(requestPool),
-                              NULL, requestPool.getPool()), );
+  SVN_JNI_ERR(svn_repos_open3(&repos,
+                              path.getInternalStyle(requestPool), NULL,
+                              requestPool.getPool(),
+                              requestPool.getPool()), );
   fs = svn_repos_fs(repos);
   SVN_JNI_ERR(svn_fs_youngest_rev(&youngest, fs, requestPool.getPool()), );
 
@@ -193,8 +194,9 @@ void SVNRepos::dump(File &path, OutputStream &dataOut,
       return;
     }
 
-  SVN_JNI_ERR(svn_repos_open2(&repos, path.getInternalStyle(requestPool),
-                              NULL, requestPool.getPool()), );
+  SVN_JNI_ERR(svn_repos_open3(&repos,
+                              path.getInternalStyle(requestPool), NULL,
+                              requestPool.getPool(), requestPool.getPool()), );
   fs = svn_repos_fs(repos);
   SVN_JNI_ERR(svn_fs_youngest_rev(&youngest, fs, requestPool.getPool()), );
 
@@ -248,7 +250,8 @@ void SVNRepos::dump(File &path, OutputStream &dataOut,
 }
 
 void SVNRepos::hotcopy(File &path, File &targetPath,
-                       bool cleanLogs, bool incremental)
+                       bool cleanLogs, bool incremental,
+                       ReposNotifyCallback *notifyCallback)
 {
   SVN::Pool requestPool;
 
@@ -264,9 +267,13 @@ void SVNRepos::hotcopy(File &path, File &targetPath,
       return;
     }
 
-  SVN_JNI_ERR(svn_repos_hotcopy2(path.getInternalStyle(requestPool),
+  SVN_JNI_ERR(svn_repos_hotcopy3(path.getInternalStyle(requestPool),
                                  targetPath.getInternalStyle(requestPool),
                                  cleanLogs, incremental,
+                                 notifyCallback != NULL
+                                    ? ReposNotifyCallback::notify
+                                    : NULL,
+                                 notifyCallback,
                                  checkCancel, this /* cancel callback/baton */,
                                  requestPool.getPool()),
              );
@@ -321,6 +328,8 @@ void SVNRepos::load(File &path,
                     bool forceUUID,
                     bool usePreCommitHook,
                     bool usePostCommitHook,
+                    bool validateProps,
+                    bool ignoreDates,
                     const char *relativePath,
                     ReposNotifyCallback *notifyCallback)
 {
@@ -353,13 +362,14 @@ void SVNRepos::load(File &path,
                    _("First revision cannot be higher than second")), );
     }
 
-  SVN_JNI_ERR(svn_repos_open2(&repos, path.getInternalStyle(requestPool),
-                              NULL, requestPool.getPool()), );
+  SVN_JNI_ERR(svn_repos_open3(&repos,
+                              path.getInternalStyle(requestPool), NULL,
+                              requestPool.getPool(), requestPool.getPool()), );
 
-  SVN_JNI_ERR(svn_repos_load_fs4(repos, dataIn.getStream(requestPool),
+  SVN_JNI_ERR(svn_repos_load_fs5(repos, dataIn.getStream(requestPool),
                                  lower, upper, uuid_action, relativePath,
                                  usePreCommitHook, usePostCommitHook,
-                                 FALSE,
+                                 validateProps, ignoreDates,
                                  notifyCallback != NULL
                                     ? ReposNotifyCallback::notify
                                     : NULL,
@@ -380,8 +390,9 @@ void SVNRepos::lstxns(File &path, MessageReceiver &messageReceiver)
       return;
     }
 
-  SVN_JNI_ERR(svn_repos_open2(&repos, path.getInternalStyle(requestPool),
-                              NULL, requestPool.getPool()), );
+  SVN_JNI_ERR(svn_repos_open3(&repos,
+                              path.getInternalStyle(requestPool), NULL,
+                              requestPool.getPool(), requestPool.getPool()), );
   fs = svn_repos_fs(repos);
   SVN_JNI_ERR(svn_fs_list_transactions(&txns, fs, requestPool.getPool()), );
 
@@ -417,8 +428,9 @@ jlong SVNRepos::recover(File &path, ReposNotifyCallback *notifyCallback)
   /* Since db transactions may have been replayed, it's nice to tell
    * people what the latest revision is.  It also proves that the
    * recovery actually worked. */
-  SVN_JNI_ERR(svn_repos_open2(&repos, path.getInternalStyle(requestPool),
-                              NULL, requestPool.getPool()), -1);
+  SVN_JNI_ERR(svn_repos_open3(&repos,
+                              path.getInternalStyle(requestPool), NULL,
+                              requestPool.getPool(), requestPool.getPool()), -1);
   SVN_JNI_ERR(svn_fs_youngest_rev(&youngest_rev, svn_repos_fs(repos),
                                   requestPool.getPool()),
               -1);
@@ -463,8 +475,9 @@ void SVNRepos::rmtxns(File &path, StringArray &transactions)
       return;
     }
 
-  SVN_JNI_ERR(svn_repos_open2(&repos, path.getInternalStyle(requestPool),
-                              NULL, requestPool.getPool()), );
+  SVN_JNI_ERR(svn_repos_open3(&repos,
+                              path.getInternalStyle(requestPool), NULL,
+                              requestPool.getPool(), requestPool.getPool()), );
   fs = svn_repos_fs(repos);
 
   args = transactions.array(requestPool);
@@ -520,8 +533,9 @@ void SVNRepos::setRevProp(File &path, Revision &revision,
 
   /* Open the filesystem. */
   svn_repos_t *repos;
-  SVN_JNI_ERR(svn_repos_open2(&repos, path.getInternalStyle(requestPool),
-                              NULL, requestPool.getPool()), );
+  SVN_JNI_ERR(svn_repos_open3(&repos,
+                              path.getInternalStyle(requestPool), NULL,
+                              requestPool.getPool(), requestPool.getPool()), );
 
   /* If we are bypassing the hooks system, we just hit the filesystem
    * directly. */
@@ -579,7 +593,9 @@ SVNRepos::getRevnum(svn_revnum_t *revnum, const svn_opt_revision_t *revision,
 
 void
 SVNRepos::verify(File &path, Revision &revisionStart, Revision &revisionEnd,
-                 ReposNotifyCallback *notifyCallback)
+                 bool checkNormalization, bool metadataOnly,
+                 ReposNotifyCallback *notifyCallback,
+                 ReposVerifyCallback *verifyCallback)
 {
   SVN::Pool requestPool;
   svn_repos_t *repos;
@@ -594,8 +610,9 @@ SVNRepos::verify(File &path, Revision &revisionStart, Revision &revisionEnd,
 
   /* This whole process is basically just a dump of the repository
    * with no interest in the output. */
-  SVN_JNI_ERR(svn_repos_open2(&repos, path.getInternalStyle(requestPool),
-                              NULL, requestPool.getPool()), );
+  SVN_JNI_ERR(svn_repos_open3(&repos,
+                              path.getInternalStyle(requestPool), NULL,
+                              requestPool.getPool(), requestPool.getPool()), );
   SVN_JNI_ERR(svn_fs_youngest_rev(&youngest, svn_repos_fs(repos),
                                   requestPool.getPool()), );
 
@@ -621,11 +638,15 @@ SVNRepos::verify(File &path, Revision &revisionStart, Revision &revisionEnd,
       (SVN_ERR_INCORRECT_PARAMS, NULL,
        _("Start revision cannot be higher than end revision")), );
 
-  SVN_JNI_ERR(svn_repos_verify_fs2(repos, lower, upper,
-                                   notifyCallback != NULL
-                                    ? ReposNotifyCallback::notify
-                                    : NULL,
+  SVN_JNI_ERR(svn_repos_verify_fs3(repos, lower, upper,
+                                   checkNormalization,
+                                   metadataOnly,
+                                   (!notifyCallback ? NULL
+                                    : ReposNotifyCallback::notify),
                                    notifyCallback,
+                                   (!verifyCallback ? NULL
+                                    : ReposVerifyCallback::callback),
+                                   verifyCallback,
                                    checkCancel, this /* cancel callback/baton */,
                                    requestPool.getPool()), );
 }
@@ -641,8 +662,9 @@ void SVNRepos::pack(File &path, ReposNotifyCallback *notifyCallback)
       return;
     }
 
-  SVN_JNI_ERR(svn_repos_open2(&repos, path.getInternalStyle(requestPool),
-                              NULL, requestPool.getPool()), );
+  SVN_JNI_ERR(svn_repos_open3(&repos,
+                              path.getInternalStyle(requestPool), NULL,
+                              requestPool.getPool(), requestPool.getPool()), );
 
   SVN_JNI_ERR(svn_repos_fs_pack2(repos,
                                  notifyCallback != NULL
@@ -686,15 +708,16 @@ jobject SVNRepos::lslocks(File &path, svn_depth_t depth)
       return NULL;
     }
 
-  SVN_JNI_ERR(svn_repos_open2(&repos, path.getInternalStyle(requestPool),
-                              NULL, requestPool.getPool()), NULL);
+  SVN_JNI_ERR(svn_repos_open3(&repos,
+                              path.getInternalStyle(requestPool), NULL,
+                              requestPool.getPool(), requestPool.getPool()), NULL);
   /* Fetch all locks on or below the root directory. */
   SVN_JNI_ERR(svn_repos_fs_get_locks2(&locks, repos, "/", depth, NULL, NULL,
                                       requestPool.getPool()),
               NULL);
 
   JNIEnv *env = JNIUtil::getEnv();
-  jclass clazz = env->FindClass(JAVA_PACKAGE"/types/Lock");
+  jclass clazz = env->FindClass(JAVAHL_CLASS("/types/Lock"));
   if (JNIUtil::isJavaExceptionThrown())
     return NULL;
 
@@ -730,8 +753,9 @@ void SVNRepos::rmlocks(File &path, StringArray &locks)
       return;
     }
 
-  SVN_JNI_ERR(svn_repos_open2(&repos, path.getInternalStyle(requestPool),
-                              NULL, requestPool.getPool()), );
+  SVN_JNI_ERR(svn_repos_open3(&repos,
+                              path.getInternalStyle(requestPool), NULL,
+                              requestPool.getPool(), requestPool.getPool()), );
   fs = svn_repos_fs(repos);
   const char *username = NULL;
 
diff --git a/subversion/bindings/javahl/native/SVNRepos.h b/subversion/bindings/javahl/native/SVNRepos.h
index b22a4c4..4fdc48d 100644
--- a/subversion/bindings/javahl/native/SVNRepos.h
+++ b/subversion/bindings/javahl/native/SVNRepos.h
@@ -35,6 +35,7 @@
 #include "InputStream.h"
 #include "MessageReceiver.h"
 #include "ReposNotifyCallback.h"
+#include "ReposVerifyCallback.h"
 #include "ReposFreezeAction.h"
 #include "StringArray.h"
 #include "File.h"
@@ -45,7 +46,9 @@ class SVNRepos : public SVNBase
   void rmlocks(File &path, StringArray &locks);
   jobject lslocks(File &path, svn_depth_t depth);
   void verify(File &path, Revision &revisionStart, Revision &revisionEnd,
-              ReposNotifyCallback *notifyCallback);
+              bool checkNormalization, bool metadataOnly,
+              ReposNotifyCallback *notifyCallback,
+              ReposVerifyCallback *verifyCallback);
   void setRevProp(File &path, Revision &revision,
                   const char *propName, const char *propValue,
                   bool usePreRevPropChangeHook,
@@ -58,11 +61,13 @@ class SVNRepos : public SVNBase
             Revision &revsionStart, Revision &revisionEnd,
             bool ignoreUUID, bool forceUUID,
             bool usePreCommitHook, bool usePostCommitHook,
+            bool validateProps, bool ignoreDates,
             const char *relativePath, ReposNotifyCallback *notifyCallback);
   void listUnusedDBLogs(File &path,
                         MessageReceiver &messageReceiver);
   void listDBLogs(File &path, MessageReceiver &messageReceiver);
-  void hotcopy(File &path, File &targetPath, bool cleanLogs, bool incremental);
+  void hotcopy(File &path, File &targetPath, bool cleanLogs, bool incremental,
+               ReposNotifyCallback *notifyCallback);
   void dump(File &path, OutputStream &dataOut, Revision &revsionStart,
             Revision &RevisionEnd, bool incremental, bool useDeltas,
             ReposNotifyCallback *notifyCallback);
diff --git a/subversion/bindings/javahl/native/StateReporter.cpp b/subversion/bindings/javahl/native/StateReporter.cpp
new file mode 100644
index 0000000..a0c05ed
--- /dev/null
+++ b/subversion/bindings/javahl/native/StateReporter.cpp
@@ -0,0 +1,191 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ *
+ * @file StateReporter.cpp
+ * @brief Implementation of the class StateReporter
+ */
+
+#include <jni.h>
+
+#include "JNIUtil.h"
+#include "JNIStringHolder.h"
+#include "StateReporter.h"
+#include "EnumMapper.h"
+#include "Path.h"
+
+#include "svn_private_config.h"
+
+StateReporter::StateReporter()
+  : m_valid(false),
+    m_raw_reporter(NULL),
+    m_report_baton(NULL),
+    m_editor(NULL),
+    m_target_revision(SVN_INVALID_REVNUM)
+{}
+
+StateReporter::~StateReporter()
+{
+  delete m_editor;
+}
+
+StateReporter*
+StateReporter::getCppObject(jobject jthis)
+{
+  static jfieldID fid = 0;
+  jlong cppAddr = SVNBase::findCppAddrForJObject(jthis, &fid,
+      JAVAHL_CLASS("/remote/StateReporter"));
+  return (cppAddr == 0 ? NULL : reinterpret_cast<StateReporter*>(cppAddr));
+}
+
+void
+StateReporter::dispose(jobject jthis)
+{
+  //DEBUG:fprintf(stderr, "  (n) StateReporter::dispose()\n");
+
+  if (m_valid)
+    abortReport();
+
+  static jfieldID fid = 0;
+  SVNBase::dispose(jthis, &fid, JAVAHL_CLASS("/remote/StateReporter"));
+}
+
+namespace {
+void throw_reporter_inactive()
+{
+  JNIUtil::raiseThrowable("java/lang/IllegalStateException",
+                          _("The reporter is not active"));
+}
+} // anonymous namespace
+
+void
+StateReporter::setPath(jstring jpath, jlong jrevision, jobject jdepth,
+                       jboolean jstart_empty, jstring jlock_token)
+{
+  //DEBUG:fprintf(stderr, "  (n) StateReporter::setPath()\n");
+
+  if (!m_valid) { throw_reporter_inactive(); return; }
+
+  JNIStringHolder lock_token(jlock_token);
+  if (JNIUtil::isJavaExceptionThrown())
+    return;
+
+  SVN::Pool subPool(pool);
+  Relpath path(jpath, subPool);
+  if (JNIUtil::isJavaExceptionThrown())
+    return;
+  svn_depth_t depth = EnumMapper::toDepth(jdepth);
+  if (JNIUtil::isJavaExceptionThrown())
+    return;
+
+  SVN_JNI_ERR(m_raw_reporter->set_path(m_report_baton, path.c_str(),
+                                       svn_revnum_t(jrevision), depth,
+                                       bool(jstart_empty), lock_token.c_str(),
+                                       subPool.getPool()),);
+}
+
+void
+StateReporter::deletePath(jstring jpath)
+{
+  //DEBUG:fprintf(stderr, "  (n) StateReporter::deletePath()\n");
+
+  if (!m_valid) { throw_reporter_inactive(); return; }
+
+  SVN::Pool subPool(pool);
+  Relpath path(jpath, subPool);
+  if (JNIUtil::isJavaExceptionThrown())
+    return;
+
+  SVN_JNI_ERR(m_raw_reporter->delete_path(m_report_baton, path.c_str(),
+                                          subPool.getPool()),);
+}
+
+void
+StateReporter::linkPath(jstring jurl, jstring jpath,
+                        jlong jrevision, jobject jdepth,
+                        jboolean jstart_empty, jstring jlock_token)
+{
+  //DEBUG:fprintf(stderr, "  (n) StateReporter::linkPath()\n");
+
+  if (!m_valid) { throw_reporter_inactive(); return; }
+
+  JNIStringHolder lock_token(jlock_token);
+  if (JNIUtil::isJavaExceptionThrown())
+    return;
+
+  SVN::Pool subPool(pool);
+  Relpath path(jpath, subPool);
+  if (JNIUtil::isJavaExceptionThrown())
+    return;
+  URL url(jurl, subPool);
+  if (JNIUtil::isJavaExceptionThrown())
+    return;
+  svn_depth_t depth = EnumMapper::toDepth(jdepth);
+  if (JNIUtil::isJavaExceptionThrown())
+    return;
+
+  SVN_JNI_ERR(m_raw_reporter->link_path(m_report_baton, path.c_str(),
+                                        url.c_str(), svn_revnum_t(jrevision),
+                                        depth, bool(jstart_empty),
+                                        lock_token.c_str(),
+                                        subPool.getPool()),);
+}
+
+jlong
+StateReporter::finishReport()
+{
+  //DEBUG:fprintf(stderr, "  (n) StateReporter::finishReport()\n");
+
+  if (!m_valid) { throw_reporter_inactive(); return SVN_INVALID_REVNUM; }
+
+  SVN::Pool subPool(pool);
+  SVN_JNI_ERR(m_raw_reporter->finish_report(m_report_baton,
+                                            subPool.getPool()),
+              SVN_INVALID_REVNUM);
+  m_valid = false;
+  return jlong(m_target_revision);
+}
+
+void
+StateReporter::abortReport()
+{
+  //DEBUG:fprintf(stderr, "  (n) StateReporter::abortReport()\n");
+
+  if (!m_valid) { throw_reporter_inactive(); return; }
+
+  SVN::Pool subPool(pool);
+  SVN_JNI_ERR(m_raw_reporter->abort_report(m_report_baton,
+                                           subPool.getPool()),);
+  m_valid = false;
+}
+
+void
+StateReporter::set_reporter_data(const svn_ra_reporter3_t* raw_reporter,
+                                   void* report_baton,
+                                   EditorProxy* editor)
+{
+  //DEBUG:fprintf(stderr, "  (n) StateReporter::set_reporter_data()\n");
+
+  m_editor = editor;
+  m_raw_reporter = raw_reporter;
+  m_report_baton = report_baton;
+  m_valid = true;
+}
diff --git a/subversion/bindings/javahl/native/StateReporter.h b/subversion/bindings/javahl/native/StateReporter.h
new file mode 100644
index 0000000..f16ddbf
--- /dev/null
+++ b/subversion/bindings/javahl/native/StateReporter.h
@@ -0,0 +1,74 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ *
+ * @file UpdateReporter.h
+ * @brief Interface of the class UpdateReporter
+ */
+
+#ifndef JAVAHL_UPDATE_REPORTER_H
+#define JAVAHL_UPDATE_REPORTER_H
+
+#include <jni.h>
+
+#include "svn_ra.h"
+#include "SVNBase.h"
+#include "EditorProxy.h"
+
+class RemoteSession;
+
+/*
+ * This class wraps the update/status/switch/diff reporter in svn_ra.h
+ */
+class StateReporter : public SVNBase
+{
+public:
+  StateReporter();
+  virtual ~StateReporter();
+
+  static StateReporter* getCppObject(jobject jreporter);
+
+  virtual void dispose(jobject jthis);
+
+  void setPath(jstring jpath, jlong jrevision, jobject jdepth,
+               jboolean jstart_empty, jstring jlock_token);
+  void deletePath(jstring jpath);
+  void linkPath(jstring jurl, jstring jpath, jlong jrevision, jobject jdepth,
+                jboolean jstart_empty, jstring jlock_token);
+  jlong finishReport();
+  void abortReport();
+
+private:
+
+  bool m_valid;
+  const svn_ra_reporter3_t* m_raw_reporter;
+  void* m_report_baton;
+  EditorProxy* m_editor;
+
+  friend class RemoteSession;
+  apr_pool_t* get_report_pool() const { return pool.getPool(); }
+  void set_reporter_data(const svn_ra_reporter3_t* raw_reporter,
+                         void* report_baton,
+                         EditorProxy* editor);
+  svn_revnum_t m_target_revision;
+};
+
+#endif // JAVAHL_UPDATE_REPORTER_H
diff --git a/subversion/bindings/javahl/native/StatusCallback.cpp b/subversion/bindings/javahl/native/StatusCallback.cpp
index cc0d67a..94ed676 100644
--- a/subversion/bindings/javahl/native/StatusCallback.cpp
+++ b/subversion/bindings/javahl/native/StatusCallback.cpp
@@ -81,13 +81,13 @@ StatusCallback::doStatus(const char *local_abspath,
   // it can be cached.
   if (mid == 0)
     {
-      jclass clazz = env->FindClass(JAVA_PACKAGE"/callback/StatusCallback");
+      jclass clazz = env->FindClass(JAVAHL_CLASS("/callback/StatusCallback"));
       if (JNIUtil::isJavaExceptionThrown())
         POP_AND_RETURN(SVN_NO_ERROR);
 
       mid = env->GetMethodID(clazz, "doStatus",
                              "(Ljava/lang/String;"
-                             "L"JAVA_PACKAGE"/types/Status;)V");
+                             JAVAHL_ARG("/types/Status;") ")V");
       if (JNIUtil::isJavaExceptionThrown() || mid == 0)
         POP_AND_RETURN(SVN_NO_ERROR);
     }
@@ -101,11 +101,8 @@ StatusCallback::doStatus(const char *local_abspath,
     POP_AND_RETURN(SVN_NO_ERROR);
 
   env->CallVoidMethod(m_callback, mid, jPath, jStatus);
-  // We return here regardless of whether an exception is thrown or not,
-  // so we do not need to explicitly check for one.
 
-  env->PopLocalFrame(NULL);
-  return SVN_NO_ERROR;
+  POP_AND_RETURN_EXCEPTION_AS_SVNERROR();
 }
 
 void
diff --git a/subversion/bindings/javahl/native/SubversionException.cpp b/subversion/bindings/javahl/native/SubversionException.cpp
new file mode 100644
index 0000000..b0b5286
--- /dev/null
+++ b/subversion/bindings/javahl/native/SubversionException.cpp
@@ -0,0 +1,32 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+#include "SubversionException.hpp"
+#include "JNIUtil.h"
+
+namespace JavaHL {
+
+const char* const SubversionException::m_class_name =
+  JAVAHL_CLASS("/SubversionException");
+
+} // namespace JavaHL
diff --git a/subversion/bindings/javahl/native/SubversionException.hpp b/subversion/bindings/javahl/native/SubversionException.hpp
new file mode 100644
index 0000000..5c71107
--- /dev/null
+++ b/subversion/bindings/javahl/native/SubversionException.hpp
@@ -0,0 +1,54 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+#ifndef SVN_JAVAHL_SUBVERSION_EXCEPTION_HPP
+#define SVN_JAVAHL_SUBVERSION_EXCEPTION_HPP
+
+#include "jniwrapper/jni_exception.hpp"
+
+namespace JavaHL {
+
+/**
+ * Generator class for exceptions of type
+ * @c org.apache.subversion.javahl.SubversionException.
+ *
+ * The associated JNI class reference is stored for the lifetime of
+ * the JVM in the global class cache.
+ *
+ * @since New in 1.9.
+ */
+class SubversionException : public ::Java::Exception
+{
+public:
+  explicit SubversionException(::Java::Env env)
+    : Java::Exception(env, ::Java::ClassCache::get_subversion_exception(env))
+    {}
+
+private:
+  friend class ::Java::ClassCacheImpl;
+  static const char* const m_class_name;
+};
+
+} // namespace JavaHL
+
+#endif // SVN_JAVAHL_SUBVERSION_EXCEPTION_HPP
diff --git a/subversion/bindings/javahl/native/Utility.cpp b/subversion/bindings/javahl/native/Utility.cpp
new file mode 100644
index 0000000..9e30386
--- /dev/null
+++ b/subversion/bindings/javahl/native/Utility.cpp
@@ -0,0 +1,96 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+#include <string>
+#include <apr_strings.h>
+
+#include "svn_string.h"
+
+#include "jniwrapper/jni_array.hpp"
+#include "jniwrapper/jni_string.hpp"
+#include "jniwrapper/jni_string_map.hpp"
+
+#include "Utility.hpp"
+
+
+namespace JavaHL {
+namespace Util {
+
+namespace {
+class MapToHashIteration
+{
+public:
+  explicit MapToHashIteration(const svn_string_t* default_value,
+                              apr_pool_t* pool)
+    : m_pool(pool),
+      m_hash(apr_hash_make(pool)),
+      m_default(default_value)
+    {}
+
+  void operator()(const std::string& key, const Java::ByteArray& value)
+    {
+      const char* const safe_key =
+        apr_pstrmemdup(m_pool, key.c_str(), key.size() + 1);
+      if (!value.get())
+        {
+          if (m_default != NULL)
+            apr_hash_set(m_hash, safe_key, key.size(), m_default);
+        }
+      else
+        {
+          Java::ByteArray::Contents val(value);
+          apr_hash_set(m_hash, safe_key, key.size(), val.get_string(m_pool));
+        }
+    }
+
+  apr_hash_t* get() const
+    {
+      return m_hash;
+    }
+
+private:
+  apr_pool_t* const m_pool;
+  apr_hash_t* const m_hash;
+  const svn_string_t* const m_default;
+};
+
+typedef ::Java::ImmutableMap< ::Java::ByteArray, jbyteArray> ImmutableByteArrayMap;
+} // anonymous namespace
+
+apr_hash_t*
+make_keyword_hash(::Java::Env env, jobject jkeywords, apr_pool_t* pool)
+{
+  const svn_string_t* const empty = svn_string_create_empty(pool);
+  const ImmutableByteArrayMap keywords(env, jkeywords);
+  return keywords.for_each(MapToHashIteration(empty, pool)).get();
+}
+
+apr_hash_t*
+make_property_hash(::Java::Env env, jobject jproperties, apr_pool_t* pool)
+{
+  const ImmutableByteArrayMap props(env, jproperties);
+  return props.for_each(MapToHashIteration(NULL, pool)).get();
+}
+
+} // namespace Util
+} // namespace JavaHL
diff --git a/subversion/bindings/javahl/native/Utility.hpp b/subversion/bindings/javahl/native/Utility.hpp
new file mode 100644
index 0000000..7d91c91
--- /dev/null
+++ b/subversion/bindings/javahl/native/Utility.hpp
@@ -0,0 +1,90 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+#ifndef SVN_JAVAHL_UTILITY_HPP
+#define SVN_JAVAHL_UTILITY_HPP
+
+#include <apr_hash.h>
+
+#include "Pool.h"
+
+namespace JavaHL {
+namespace Util {
+
+/**
+ * Converts keyword/valuue pairs in the the Java map @a jkeywords to
+ * an APR hash table allocated in @a pool. The keys in the resulting
+ * table are @c const @c char*, the values are @c svn_string_t*. Null
+ * values in the Java map are converted to empty strings.
+ *
+ * @since New in 1.9.
+ */
+apr_hash_t*
+make_keyword_hash(::Java::Env env, jobject jkeywords, apr_pool_t* pool);
+
+/**
+ * Converts keyword/valuue pairs in the the Java map @a jkeywords to
+ * an APR hash table allocated in @a pool. The keys in the resulting
+ * table are @c const @c char*, the values are @c svn_string_t*. Null
+ * values in the Java map are converted to empty strings.
+ *
+ * @since New in 1.9.
+ */
+inline apr_hash_t*
+make_keyword_hash(::Java::Env env, jobject jkeywords,
+                   const ::SVN::Pool& pool)
+{
+  return make_keyword_hash(env, jkeywords, pool.getPool());
+}
+
+
+/**
+ * Converts property/value pairs the Java map @a jproperties to an APR
+ * hash table allocated in @a pool. The keys in the resulting table
+ * are @c const @c char*, the values are @c svn_string_t*. Null values
+ * in the Java map will not appear in the converted map.
+ *
+ * @since New in 1.9.
+ */
+apr_hash_t*
+make_property_hash(::Java::Env env, jobject jproperties, apr_pool_t* pool);
+
+/**
+ * Converts property/value pairs the Java map @a jproperties to an APR
+ * hash table allocated in @a pool. The keys in the resulting table
+ * are @c const @c char*, the values are @c svn_string_t*. Null values
+ * in the Java map will not appear in the converted map.
+ *
+ * @since New in 1.9.
+ */
+inline apr_hash_t*
+make_property_hash(::Java::Env env, jobject jproperties,
+                   const ::SVN::Pool& pool)
+{
+  return make_property_hash(env, jproperties, pool.getPool());
+}
+
+} // namespace Util
+} // namespace JavaHL
+
+#endif // SVN_JAVAHL_JNI_UTILITY_HPP
diff --git a/subversion/bindings/javahl/native/VersionExtended.cpp b/subversion/bindings/javahl/native/VersionExtended.cpp
index 1dc47db..7202778 100644
--- a/subversion/bindings/javahl/native/VersionExtended.cpp
+++ b/subversion/bindings/javahl/native/VersionExtended.cpp
@@ -27,7 +27,7 @@
 #include "JNIUtil.h"
 #include "VersionExtended.h"
 
-const VersionExtended *
+VersionExtended *
 VersionExtended::getCppObject(jobject jthis)
 {
   if (!jthis)
@@ -35,7 +35,7 @@ VersionExtended::getCppObject(jobject jthis)
 
   static jfieldID fid = 0;
   jlong cppAddr = SVNBase::findCppAddrForJObject(
-      jthis, &fid, JAVA_PACKAGE"/types/VersionExtended");
+      jthis, &fid, JAVAHL_CLASS("/types/VersionExtended"));
   return (cppAddr == 0 ? NULL : reinterpret_cast<VersionExtended *>(cppAddr));
 }
 
@@ -46,7 +46,7 @@ static jobject getWrapperAddress(jobject jthat, volatile jfieldID *fid)
   if (!*fid)
     {
       *fid = env->GetFieldID(env->GetObjectClass(jthat), "wrapper",
-                             "L"JAVA_PACKAGE"/types/VersionExtended;");
+                             JAVAHL_ARG("/types/VersionExtended;"));
       if (JNIUtil::isJavaExceptionThrown())
         {
           *fid = 0;
@@ -94,5 +94,5 @@ VersionExtended::~VersionExtended() {}
 void VersionExtended::dispose(jobject jthis)
 {
   static jfieldID fid = 0;
-  SVNBase::dispose(jthis, &fid, JAVA_PACKAGE"/types/VersionExtended");
+  SVNBase::dispose(jthis, &fid, JAVAHL_CLASS("/types/VersionExtended"));
 }
diff --git a/subversion/bindings/javahl/native/VersionExtended.h b/subversion/bindings/javahl/native/VersionExtended.h
index 8df81f3..4b5ff48 100644
--- a/subversion/bindings/javahl/native/VersionExtended.h
+++ b/subversion/bindings/javahl/native/VersionExtended.h
@@ -33,7 +33,7 @@
 class VersionExtended : public SVNBase
 {
 public:
-  static const VersionExtended *getCppObject(jobject jthis);
+  static VersionExtended *getCppObject(jobject jthis);
   static const VersionExtended *getCppObjectFromLinkedLib(jobject jthat);
   static const VersionExtended *getCppObjectFromLoadedLib(jobject jthat);
   static const VersionExtended *getCppObjectFromLinkedLibIterator(jobject jthat);
diff --git a/subversion/bindings/javahl/native/deprecated.cpp b/subversion/bindings/javahl/native/deprecated.cpp
new file mode 100644
index 0000000..2ba5e10
--- /dev/null
+++ b/subversion/bindings/javahl/native/deprecated.cpp
@@ -0,0 +1,60 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ *
+ * @file deprecated.cpp
+ * @brief: Implementation of methods that intentionally use deprecated
+ *         Subversion APIs.
+ */
+
+/* We define this here to remove any further warnings about the usage of
+   deprecated functions in this file. */
+#define SVN_DEPRECATED
+
+#include "SVNClient.h"
+#include "JNIUtil.h"
+#include "Path.h"
+#include "Revision.h"
+
+#include "svn_client.h"
+
+void SVNClient::mergeReintegrate(const char *path, Revision &pegRevision,
+                                 const char *localPath, bool dryRun)
+{
+    SVN::Pool subPool(pool);
+    SVN_JNI_NULL_PTR_EX(path, "path", );
+    SVN_JNI_NULL_PTR_EX(localPath, "localPath", );
+    Path intLocalPath(localPath, subPool);
+    SVN_JNI_ERR(intLocalPath.error_occurred(), );
+
+    Path srcPath(path, subPool);
+    SVN_JNI_ERR(srcPath.error_occurred(), );
+
+    svn_client_ctx_t *ctx = context.getContext(NULL, subPool);
+    if (ctx == NULL)
+        return;
+
+    SVN_JNI_ERR(svn_client_merge_reintegrate(srcPath.c_str(),
+                                             pegRevision.revision(),
+                                             intLocalPath.c_str(),
+                                             dryRun, NULL, ctx,
+                                             subPool.getPool()), );
+}
diff --git a/subversion/bindings/javahl/native/jniwrapper/jni_array.hpp b/subversion/bindings/javahl/native/jniwrapper/jni_array.hpp
new file mode 100644
index 0000000..0c92e7a
--- /dev/null
+++ b/subversion/bindings/javahl/native/jniwrapper/jni_array.hpp
@@ -0,0 +1,267 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+#ifndef SVN_JAVAHL_JNIWRAPPER_ARRAY_HPP
+#define SVN_JAVAHL_JNIWRAPPER_ARRAY_HPP
+
+#include <cstring>
+#include <string>
+
+#include "svn_string.h"
+
+#include "jni_env.hpp"
+#include "../Pool.h"
+
+namespace Java {
+
+/**
+ * Wrapper class for Java byte arrays.
+ *
+ * @since New in 1.9.
+ */
+class ByteArray
+{
+public:
+  /**
+   * Constructs a wrapper around an existing @a array.
+   */
+  explicit ByteArray(Env env, jbyteArray array)
+    : m_env(env),
+      m_length(array ? m_env.GetArrayLength(array) : 0),
+      m_array(array)
+    {}
+
+  /**
+   * Constructs a new, uninitialized array of size @a length.
+   */
+  explicit ByteArray(Env env, jsize length)
+    : m_env(env),
+      m_length(length),
+      m_array(m_env.NewByteArray(m_length))
+    {}
+
+  /**
+   * Constructs a new array and wrapper from @a text.
+   */
+  explicit ByteArray(Env env, const char* text)
+    : m_env(env),
+      m_length(jsize(::std::strlen(text))),
+      m_array(m_env.NewByteArray(m_length))
+    {
+      ByteArray::MutableContents contents(*this);
+      ::memcpy(contents.data(), text, m_length);
+    }
+
+  /**
+   * Constructs a new array and wrapper of size @a length
+   * from @a data.
+   */
+  explicit ByteArray(Env env, const void* data, jsize length)
+    : m_env(env),
+      m_length(length),
+      m_array(m_env.NewByteArray(m_length))
+    {
+      ByteArray::MutableContents contents(*this);
+      ::memcpy(contents.data(), data, m_length);
+    }
+
+  /**
+   * Constructs a new array and wrapper from @a text.
+   */
+  explicit ByteArray(Env env, const std::string& text)
+    : m_env(env),
+      m_length(jsize(text.size())),
+      m_array(m_env.NewByteArray(m_length))
+    {
+      ByteArray::MutableContents contents(*this);
+      ::memcpy(contents.data(), text.c_str(), m_length);
+    }
+
+  /**
+   * Returns the wrapped native array reference.
+   */
+  jbyteArray get() const
+    {
+      return m_array;
+    }
+
+  /**
+   * Returns the size of the wrapped array.
+   */
+  jsize length() const
+    {
+      return m_length;
+    }
+
+  /**
+   * Accessor class for the contents of the byte array.
+   *
+   * Objects of this class should be created within the scope where
+   * the raw data stored in the array must be manipulated. They will
+   * create an immutable mirror of the array contents.
+   */
+  class Contents
+  {
+  public:
+    /**
+     * Constructs an immutable array contents accessor.
+     *
+     * Whilst the returned contents are themselves mutable, the
+     * destructor will discard any changes.
+     */
+    explicit Contents(const ByteArray& array)
+      : m_array(array),
+        m_data(!array.m_array ? NULL
+               : array.m_env.GetByteArrayElements(array.m_array, NULL))
+      {}
+
+    /**
+     * Releases the array contents.
+     */
+    ~Contents()
+      {
+        if (m_data)
+          {
+            const Env& env = m_array.m_env;
+            env.ReleaseByteArrayElements(m_array.m_array, m_data, JNI_ABORT);
+          }
+      }
+
+    /**
+     * Returns the address of the immutable array contents.
+     * @note The data will @b not be NUL-terminated!
+     */
+    const char* data() const
+      {
+        return reinterpret_cast<const char*>(m_data);
+      }
+
+    /**
+     * Returns the size of the array contents.
+     */
+    jsize length() const
+      {
+        return m_array.m_length;
+      }
+
+    /**
+     * Copies the array contents to a NUL-terminated string allocated
+     * from @a result_pool.
+     */
+    svn_string_t* get_string(apr_pool_t* result_pool) const
+      {
+        if (m_data)
+          return svn_string_ncreate(data(), m_array.m_length, result_pool);
+        return NULL;
+      }
+
+    /**
+     * Copies the array contents to a NUL-terminated string allocated
+     * from @a result_pool.
+     */
+    svn_string_t* get_string(const ::SVN::Pool& result_pool) const
+      {
+        return get_string(result_pool.getPool());
+      }
+
+  protected:
+    const ByteArray& m_array;
+    jbyte* m_data;
+  };
+
+  /**
+   * Accessor class for the contents of the byte array.
+   *
+   * Behaves like the #Contents class, but the mirrored contents are
+   * considered mutable and any changes made to them will be committed
+   * to the JVM.
+   */
+  class MutableContents : protected Contents
+  {
+  public:
+    /**
+     * Constructs a mutable array contents accessor.
+     */
+    explicit MutableContents(ByteArray& array)
+      : Contents(array)
+      {}
+
+    /**
+     * Releases the array contents, committing changes to the JVM.
+     */
+    ~MutableContents()
+      {
+        if (m_data)
+          {
+            // Prevent double-release by the Contents desctuctor
+            jbyte* const data = m_data;
+            m_data = NULL;
+            m_array.m_env.ReleaseByteArrayElements(m_array.m_array, data, 0);
+          }
+      }
+    /**
+     * Returns the mutable address of the array contents.
+     * @note The data will @b not be NUL-terminated!
+     */
+    char* data()
+      {
+        return const_cast<char*>(Contents::data());
+      }
+
+    /**
+     * Returns the size of the array contents.
+     */
+    jsize length() const
+      {
+        return Contents::length();
+      }
+
+    /**
+     * Copies the array contents to a NUL-terminated string allocated
+     * from @a result_pool.
+     */
+    svn_string_t* get_string(apr_pool_t* result_pool) const
+      {
+        return Contents::get_string(result_pool);
+      }
+
+    /**
+     * Copies the array contents to a NUL-terminated string allocated
+     * from @a result_pool.
+     */
+    svn_string_t* get_string(const ::SVN::Pool& result_pool) const
+      {
+        return Contents::get_string(result_pool.getPool());
+      }
+  };
+
+private:
+  friend class Contents;
+  const Env m_env;
+  const jsize m_length;
+  const jbyteArray m_array;
+};
+
+} // namespace Java
+
+#endif // SVN_JAVAHL_JNIWRAPPER_ARRAY_HPP
diff --git a/subversion/bindings/javahl/native/jniwrapper/jni_base.cpp b/subversion/bindings/javahl/native/jniwrapper/jni_base.cpp
new file mode 100644
index 0000000..e3671a2
--- /dev/null
+++ b/subversion/bindings/javahl/native/jniwrapper/jni_base.cpp
@@ -0,0 +1,382 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+#include <cstring>
+#include <memory>
+#include <apr.h>
+
+#include "jni_env.hpp"
+#include "jni_globalref.hpp"
+#include "jni_exception.hpp"
+#include "jni_object.hpp"
+#include "jni_string.hpp"
+#include "jni_array.hpp"
+#include "jni_stack.hpp"
+
+#include "../JNIUtil.h"
+bool initialize_jni_util(JNIEnv *env);
+
+#include "svn_private_config.h"
+
+
+// Global library initializaiton
+
+/**
+ * Initializer function, called just after the JVM loads the native
+ * library.  Stores the global JVM reference and creates the global
+ * class cache.
+ */
+JNIEXPORT jint JNICALL
+JNI_OnLoad(JavaVM* jvm, void*)
+{
+  ::Java::Env::static_init(jvm);
+  const ::Java::Env env;
+
+  const apr_status_t status = apr_initialize();
+  if (!status)
+    ::Java::ClassCache::create();
+  else
+    {
+      char buf[2048];
+      std::strcpy(buf, "Could not initialize APR: ");
+      const std::size_t offset = std::strlen(buf);
+      apr_strerror(status, buf + offset, sizeof(buf) - offset - 1);
+      env.ThrowNew(env.FindClass("java/lang/Error"), buf);
+    }
+
+  // Initialize the old-style JavaHL infrastructure.
+  if (!initialize_jni_util(env.get()) && !env.ExceptionCheck())
+    {
+      env.ThrowNew(env.FindClass("java/lang/LinkageError"),
+                   "Native library initialization failed");
+    }
+
+  return JNI_VERSION_1_2;
+}
+
+/**
+ * Cleanup function, called just before the JVM unloads the native
+ * library.  Destroys the global class cache.
+ */
+JNIEXPORT void JNICALL
+JNI_OnUnload(JavaVM*, void*)
+{
+  ::Java::ClassCache::destroy();
+  apr_terminate();
+}
+
+
+namespace Java {
+
+// class Java::Env
+
+::JavaVM* Env::m_jvm = NULL;
+void Env::static_init(::JavaVM* jvm)
+{
+  m_jvm = jvm;
+}
+
+const char* Env::error_create_global_reference() throw()
+{
+  return _("Could not create global reference");
+}
+
+const char* Env::error_get_contents_string() throw()
+{
+  return _("Could not get contents of Java String");
+}
+
+const char* Env::error_release_null_string() throw()
+{
+  return _("Could not release contents of a null String");
+}
+
+const char* Env::error_create_object_array() throw()
+{
+  return _("Could not create Object array");
+}
+
+namespace {
+// The typed array error messages are always fatal, so allocating
+// the buffer on the heap and never releasing it does not really
+// constitute a memory leak.
+const char* make_typed_error(const char* fmt, const char* type) throw()
+{
+  const apr_size_t bufsize = 512;
+  char *msg = new(std::nothrow) char[bufsize];
+  apr_snprintf(msg, bufsize, fmt, type);
+  return msg;
+}
+} // anonymous namespace
+
+const char* Env::error_create_array(const char* type) throw()
+{
+  return make_typed_error(_("Could not create %sArray"), type);
+}
+
+const char* Env::error_get_contents_array(const char* type) throw()
+{
+  return make_typed_error(_("Could not get %s array contents"), type);
+}
+
+const char* Env::error_release_null_array(const char* type) throw()
+{
+  return make_typed_error(
+      _("Could not release contents of a null %sArray"), type);
+}
+
+::JNIEnv* Env::env_from_jvm()
+{
+  if (m_jvm)
+    {
+      void *penv;
+      switch (m_jvm->GetEnv(&penv, JNI_VERSION_1_2))
+        {
+        case JNI_OK:
+          return static_cast<JNIEnv*>(penv);
+
+        case JNI_EDETACHED:
+          throw std::runtime_error(
+              _("Native thread is not attached to a Java VM"));
+
+        case JNI_EVERSION:
+          throw std::runtime_error(_("Unsupported JNI version"));
+
+        default:
+          throw std::runtime_error(_("Invalid JNI environment"));
+        }
+    }
+  throw std::logic_error(_("JavaVM instance was not initialized"));
+}
+
+void Env::throw_java_out_of_memory(const char* message) const
+{
+  OutOfMemoryError(*this).raise(message);
+}
+
+// class Java::LocalFrame
+
+const jint LocalFrame::DEFAULT_CAPACITY = 16;
+
+
+// class Java::GlobalObject
+
+GlobalObject& GlobalObject::operator=(jobject that)
+{
+  this->~GlobalObject();
+  return *new(this) GlobalObject(Env(), that);
+}
+
+GlobalObject::~GlobalObject()
+{
+  if (m_obj)
+    Env().DeleteGlobalRef(m_obj);
+}
+
+
+// class Java::GlobalClass
+
+GlobalClass& GlobalClass::operator=(jclass that)
+{
+  this->~GlobalClass();
+  return *new(this) GlobalClass(Env(), that);
+}
+
+
+// Class Java::Object
+
+const char* const Object::m_class_name = "java/lang/Object";
+Object::ClassImpl::~ClassImpl() {}
+
+
+// Class Java::Class
+
+const char* const Class::m_class_name = "java/lang/Class";
+Class::ClassImpl::~ClassImpl() {}
+
+MethodID Class::m_mid_get_class;
+MethodID Class::m_mid_get_name;
+
+void Class::static_init(Env env, jclass cls)
+{
+  m_mid_get_class = env.GetMethodID(
+      ClassCache::get_object(env)->get_class(),
+      "getClass", "()Ljava/lang/Class;");
+  m_mid_get_name = env.GetMethodID(
+      cls, "getName",  "()Ljava/lang/String;");
+}
+
+namespace{
+jobject get_class_of_object(Env env, jobject obj, jmethodID mid_get_class)
+{
+  if (!obj)
+    return NULL;
+  return env.CallObjectMethod(obj, mid_get_class);
+}
+} // anonymous namespace
+
+Class::Class(Env env, jobject obj)
+  : m_env(env),
+    m_jthis(get_class_of_object(env, obj, m_mid_get_class))
+{}
+
+Class::Class(const Object& obj)
+  : m_env(obj.get_env()),
+    m_jthis(get_class_of_object(obj.get_env(), obj.get(), m_mid_get_class))
+{}
+
+jstring Class::get_name() const
+{
+  if (!m_jthis)
+    return NULL;
+  return jstring(m_env.CallObjectMethod(m_jthis, m_mid_get_name));
+}
+
+
+// Class Java::String
+
+const char* const String::m_class_name = "java/lang/String";
+String::ClassImpl::~ClassImpl() {}
+
+const char* String::strdup(apr_pool_t* pool) const
+{
+  return apr_pstrdup(pool, String::Contents(*this).c_str());
+}
+
+void String::MutableContents::set_value(const char* new_text)
+{
+  if (!m_new_text)
+    throw std::invalid_argument(
+        _("Cannot set String contents to null"));
+  if (m_text)
+    {
+      m_new_text = new_text;
+      m_length = jsize(::std::strlen(new_text));
+    }
+  else
+    throw std::logic_error(
+        _("Cannot change the contents of a null String"));
+}
+
+// class Java::Exception
+
+void Exception::throw_java_exception() const
+{
+  if (instantiated()
+      ? m_env.Throw(m_jthis)
+      : m_env.ThrowNew(m_class, NULL))
+    throw std::runtime_error(_("Could not throw Java exception"));
+}
+
+void Exception::throw_java_exception(const char* message) const
+{
+  if (m_env.ThrowNew(m_class, message))
+    throw std::runtime_error(_("Could not throw Java exception"));
+}
+
+jstring Exception::get_message() const
+{
+  if (instantiated())
+    return jstring(m_env.CallObjectMethod(m_jthis, m_mid_get_message));
+  throw std::logic_error(_("Could not get exception message:"
+                           " Exception instance is not available"));
+}
+
+const char* const Exception::m_class_name = "java/lang/Throwable";
+Exception::ClassImpl::~ClassImpl() {}
+
+MethodID Exception::m_mid_get_message;
+void Exception::static_init(Env env, jclass cls)
+{
+  m_mid_get_message = env.GetMethodID(
+      cls, "getMessage", "()Ljava/lang/String;");
+}
+
+// Other exception class initializers
+
+const char* const RuntimeException::m_class_name =
+  "java/lang/RuntimeException";
+
+const char* const NullPointerException::m_class_name =
+  "java/lang/NullPointerException";
+
+const char* const OutOfMemoryError::m_class_name =
+  "java/lang/OutOfMemoryError";
+
+const char* const IndexOutOfBoundsException::m_class_name =
+  "java/lang/IndexOutOfBoundsException";
+IndexOutOfBoundsException::ClassImpl::~ClassImpl() {}
+
+const char* const IOException::m_class_name =
+  "java/io/IOException";
+
+const char* const IllegalArgumentException::m_class_name =
+  "java/lang/IllegalArgumentException";
+
+const char *const NoSuchElementException::m_class_name =
+  "java/util/NoSuchElementException";
+NoSuchElementException::ClassImpl::~ClassImpl() {}
+
+// Implementation of jni_stack.hpp
+
+void handle_svn_error(Env env, ::svn_error_t* err)
+{
+  jthrowable cause = NULL;
+
+  // If the exception being currently thrown was generated by the
+  // JavaHL bindings, then assume the error was propagated through
+  // native code and do not re-throw it.
+  if (env.ExceptionCheck())
+    {
+      cause = env.ExceptionOccurred();
+      if (env.IsInstanceOf(
+              cause, ClassCache::get_subversion_exception(env)->get_class()))
+        {
+          // XXX FIXME: Should really have a special error code
+          // specifically for propagating Java exceptions from
+          // callbacks through native code.
+          svn_error_clear(err);
+          throw SignalExceptionThrown();
+        }
+    }
+
+  // Make sure there's only a single exception in the environment.
+  if (cause)
+    env.ExceptionClear();
+
+  ::JNIUtil::handleSVNError(err, cause);
+  throw SignalExceptionThrown();
+}
+
+const char* unknown_cxx_exception_message() throw()
+{
+  return _("Caught unknown C++ exception");
+}
+
+svn_error_t* caught_java_exception_error(apr_status_t status) throw()
+{
+  return svn_error_create(status, JNIUtil::wrapJavaException(),
+                          _("Java exception"));
+}
+
+} // namespace Java
diff --git a/subversion/bindings/javahl/native/jniwrapper/jni_channel.cpp b/subversion/bindings/javahl/native/jniwrapper/jni_channel.cpp
new file mode 100644
index 0000000..a3d41b2
--- /dev/null
+++ b/subversion/bindings/javahl/native/jniwrapper/jni_channel.cpp
@@ -0,0 +1,257 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+#include <stdexcept>
+
+#include "jni_object.hpp"
+#include "jni_array.hpp"
+#include "jni_channel.hpp"
+
+#include "svn_private_config.h"
+
+namespace Java {
+
+namespace {
+// Get the ByteBuffer's internal array.
+jbyteArray get_array(Env env, jobject buffer,
+                     const MethodID& mid_has_array,
+                     const MethodID& mid_get_array)
+{
+  if (!env.CallBooleanMethod(buffer, mid_has_array))
+    return NULL;
+  return jbyteArray(env.CallObjectMethod(buffer, mid_get_array));
+}
+
+// Get the offset in the ByteBuffer's array. NEVER call this function
+// unless the buffer actually has an accessible array.
+jint get_array_offset(Env env, jobject buffer,
+                      const MethodID& mid_get_array_offset)
+{
+  return env.CallIntMethod(buffer, mid_get_array_offset);
+}
+
+// Get the remaining space in a ByteBuffer.
+jint get_remaining(Env env, jobject buffer,
+                   const MethodID& mid_get_remaining)
+{
+  return env.CallIntMethod(buffer, mid_get_remaining);
+}
+
+// Get the current position of a ByteBuffer.
+jint get_position(Env env, jobject buffer,
+                  const MethodID& mid_get_position)
+{
+  return env.CallIntMethod(buffer, mid_get_position);
+}
+
+// Set the new position of a ByteBuffer.
+void set_position(Env env, jobject buffer,
+                  const MethodID& mid_set_position,
+                  jint new_position)
+{
+  env.CallObjectMethod(buffer, mid_set_position, new_position);
+}
+
+// Get byte array contents from a ByteBuffer.
+void get_bytearray(Env env, jobject buffer,
+                   const MethodID& mid_get_bytearray,
+                   ByteArray& array, jint length = -1, jint offset = 0)
+{
+  env.CallObjectMethod(
+      buffer, mid_get_bytearray, array.get(), offset,
+      (length >= 0 ? length : (array.length() - offset)));
+}
+
+// Put byte array contents into a ByteBuffer.
+void put_bytearray(Env env, jobject buffer,
+                   const MethodID& mid_put_bytearray,
+                   ByteArray& array, jint length = -1, jint offset = 0)
+{
+  env.CallObjectMethod(buffer, mid_put_bytearray,
+                       array.get(), offset,
+                       (length >= 0 ? length : (array.length() - offset)));
+}
+
+struct BadReaderWriter : public ChannelReader, ChannelWriter
+{
+  BadReaderWriter() {}
+
+  virtual jint operator()(Env, void*, jint)
+    {
+      throw std::logic_error(_("Reading from write-only channel"));
+    }
+
+  virtual jint operator()(Env, const void*, jint)
+    {
+      throw std::logic_error(_("Writing to read-only channel"));
+    }
+} bad_reader_writer;
+
+} // anonymous namespace
+
+
+ChannelReader& ByteChannel::m_null_reader = bad_reader_writer;
+ChannelWriter& ByteChannel::m_null_writer = bad_reader_writer;
+
+const char* const ByteChannel::ByteBuffer::m_class_name =
+  "java/nio/ByteBuffer";
+
+ByteChannel::ByteBuffer::ClassImpl::ClassImpl(Env env, jclass cls)
+  : Object::ClassImpl(env, cls),
+    m_mid_has_array(env.GetMethodID(cls, "hasArray", "()Z")),
+    m_mid_get_array(env.GetMethodID(cls, "array", "()[B")),
+    m_mid_get_array_offset(env.GetMethodID(cls, "arrayOffset", "()I")),
+    m_mid_get_remaining(env.GetMethodID(cls, "remaining", "()I")),
+    m_mid_get_position(env.GetMethodID(cls, "position", "()I")),
+    m_mid_set_position(env.GetMethodID(cls,  "position",
+                                       "(I)Ljava/nio/Buffer;")),
+    m_mid_get_bytearray(env.GetMethodID(cls, "get",
+                                        "([BII)Ljava/nio/ByteBuffer;")),
+    m_mid_put_bytearray(env.GetMethodID(cls, "put",
+                                        "([BII)Ljava/nio/ByteBuffer;"))
+{}
+
+ByteChannel::ByteBuffer::ClassImpl::~ClassImpl() {}
+
+jint ByteChannel::read(jobject destination)
+{
+  const ByteBuffer::ClassImpl& bufimpl = ByteBuffer::impl(m_env);
+
+  const jint remaining = get_remaining(m_env, destination,
+                                       bufimpl.m_mid_get_remaining);
+  if (!remaining)
+    {
+      // No space in the buffer; don't try to read anything.
+      return 0;
+    }
+
+  const jint position = get_position(m_env, destination,
+                                     bufimpl.m_mid_get_position);
+
+  jint bytes_read = 0;
+  void* data = m_env.GetDirectBufferAddress(destination);
+  if (data)
+    {
+      data = static_cast<char*>(data) + position;
+      bytes_read = m_reader(m_env, data, remaining);
+    }
+  else
+    {
+      // It was not a direct buffer ... see if it has an array.
+      jbyteArray raw_array = get_array(m_env, destination,
+                                       bufimpl.m_mid_has_array,
+                                       bufimpl.m_mid_get_array);
+      if (raw_array)
+        {
+          const jint array_offset = get_array_offset(
+              m_env, destination,
+              bufimpl.m_mid_get_array_offset);
+          ByteArray array(m_env, raw_array);
+          ByteArray::MutableContents contents(array);
+          data = contents.data();
+          data = static_cast<char*>(data) + position + array_offset;
+          bytes_read = m_reader(m_env, data, remaining);
+        }
+    }
+  if (data)
+    {
+      if (bytes_read > 0)
+        set_position(m_env, destination,
+                     bufimpl.m_mid_set_position,
+                     position + bytes_read);
+      return bytes_read;
+    }
+
+  // No accessible array, either. Oh well. Create a byte array and
+  // push it into the buffer.
+  ByteArray array(m_env, remaining);
+  ByteArray::MutableContents contents(array);
+  bytes_read = m_reader(m_env, contents.data(), contents.length());
+  if (bytes_read > 0)
+    put_bytearray(m_env, destination,
+                  bufimpl.m_mid_put_bytearray,
+                  array, bytes_read);
+  return bytes_read;
+}
+
+jint ByteChannel::write(jobject source)
+{
+  const ByteBuffer::ClassImpl& bufimpl = ByteBuffer::impl(m_env);
+
+  const jint remaining = get_remaining(m_env, source,
+                                       bufimpl.m_mid_get_remaining);
+  if (!remaining)
+    {
+      // No data in the buffer; don't try to write anything.
+      return 0;
+    }
+
+  const jint position = get_position(m_env, source,
+                                     bufimpl.m_mid_get_position);
+
+  jint bytes_written = 0;
+  const void* data = m_env.GetDirectBufferAddress(source);
+  if (data)
+    {
+      data = static_cast<const char*>(data) + position;
+      bytes_written = m_writer(m_env, data, remaining);
+    }
+  else
+    {
+      // It was not a direct buffer ... see if it has an array.
+      jbyteArray raw_array = get_array(m_env, source,
+                                       bufimpl.m_mid_has_array,
+                                       bufimpl.m_mid_get_array);
+      if (raw_array)
+        {
+          const jint array_offset = get_array_offset(
+              m_env, source,
+              bufimpl.m_mid_get_array_offset);
+          const ByteArray array(m_env, raw_array);
+          ByteArray::Contents contents(array);
+          data = contents.data();
+          data = static_cast<const char*>(data) + position + array_offset;
+          bytes_written = m_writer(m_env, data, remaining);
+        }
+    }
+  if (data)
+    {
+      if (bytes_written > 0)
+        set_position(m_env, source,
+                     bufimpl.m_mid_set_position,
+                     position + bytes_written);
+      return bytes_written;
+    }
+
+  // No accessible array, either. Oh well. Get an array from the
+  // buffer and read data from that.
+  ByteArray array(m_env, remaining);
+  get_bytearray(m_env, source,
+                bufimpl.m_mid_get_bytearray,
+                array);
+  ByteArray::Contents contents(array);
+  bytes_written = m_writer(m_env, contents.data(), contents.length());
+  return bytes_written;
+}
+
+} // namespace Java
diff --git a/subversion/bindings/javahl/native/jniwrapper/jni_channel.hpp b/subversion/bindings/javahl/native/jniwrapper/jni_channel.hpp
new file mode 100644
index 0000000..7af5783
--- /dev/null
+++ b/subversion/bindings/javahl/native/jniwrapper/jni_channel.hpp
@@ -0,0 +1,223 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+#ifndef SVN_JAVAHL_JNIWRAPPER_CHANNEL_HPP
+#define SVN_JAVAHL_JNIWRAPPER_CHANNEL_HPP
+
+#include "jni_env.hpp"
+
+namespace Java {
+
+/**
+ * Abstract base class for implementing channel read method internals.
+ *
+ * @since New in 1.9.
+ */
+struct ChannelReader
+{
+  /**
+   * Reads at most @a length bytes into @a buffer, returning the
+   * number of bytes read (which may be zero) or -1 if at
+   * end-of-stream.
+   */
+  virtual jint operator()(Env env, void* buffer, jint length) = 0;
+};
+
+/**
+ * Abstract base class for implementing channel write method internals.
+ *
+ * @since New in 1.9.
+ */
+struct ChannelWriter
+{
+  /**
+   * Writes at exactly @a length bytes from @a buffer, returning the
+   * number of bytes written (which may be zero).
+   */
+  virtual jint operator()(Env env, const void* buffer, jint length) = 0;
+};
+
+
+/**
+ * Wrapper for @c java.nio.channels.ByteChannel. Unlike most wrappers,
+ * this one does not actually represent a ByteChannel object. The
+ * assumption is that the native implementation will want to implement
+ * the read and write methods, not invoke them.
+ *
+ * Also serves as the (protected) base of the Readable- and
+ * WritableByteChannel interfaces; this is for purposes of code
+ * sharing only. We're not interested in replicating Java's class
+ * hierarchy here.
+ *
+ * @since New in 1.9.
+ */
+class ByteChannel
+{
+public:
+  /**
+   * Constructs a wrapper for @a channel with @a reader and @a writer
+   * as the read and write method implementations.
+   */
+  explicit ByteChannel(Env env, ChannelReader& reader, ChannelWriter& writer)
+    : m_env(env),
+      m_reader(reader),
+      m_writer(writer)
+    {}
+
+  /**
+   * Reads bytes into @a destination, which must be a
+   * @c java.nio.ByteBuffer instance, from #m_reader.
+   * @return the number of bytes read, or -1 if at end-of-stream.
+   */
+  jint read(jobject destination);
+
+  /**
+   * Writes bytes from @a source, which must be a
+   * @c java.nio.ByteBuffer instance, to #m_writer.
+   * @return the number of bytes written.
+   */
+  jint write(jobject source);
+
+protected:
+  /**
+   * Constructor used by read-only subclasses.
+   */
+  explicit ByteChannel(Env env, ChannelReader& reader)
+    : m_env(env),
+      m_reader(reader),
+      m_writer(m_null_writer)
+    {}
+
+  /**
+   * Constructor used by write-only subclasses.
+   */
+  explicit ByteChannel(Env env, ChannelWriter& writer)
+    : m_env(env),
+      m_reader(m_null_reader),
+      m_writer(writer)
+    {}
+
+private:
+  Env m_env;
+  ChannelReader& m_reader;
+  ChannelWriter& m_writer;
+
+  static ChannelReader& m_null_reader;
+  static ChannelWriter& m_null_writer;
+
+  friend class ClassCacheImpl;
+
+  // Private references for the java.nio.ByteBuffer class.
+  struct ByteBuffer
+  {
+    /**
+     * This object's implementation details.
+     */
+    class ClassImpl : public Object::ClassImpl
+    {
+      friend class ClassCacheImpl;
+
+    protected:
+      explicit ClassImpl(Env env, jclass cls);
+
+    public:
+      virtual ~ClassImpl();
+
+      const MethodID m_mid_has_array;
+      const MethodID m_mid_get_array;
+      const MethodID m_mid_get_array_offset;
+      const MethodID m_mid_get_remaining;
+      const MethodID m_mid_get_position;
+      const MethodID m_mid_set_position;
+      const MethodID m_mid_get_bytearray;
+      const MethodID m_mid_put_bytearray;
+    };
+
+    static const char* const m_class_name;
+    static const ClassImpl& impl(Env env)
+      {
+        return *dynamic_cast<const ClassImpl*>(
+            ClassCache::get_byte_buffer(env));
+      }
+  };
+};
+
+
+/**
+ * Wrapper for @c java.nio.channels.ReadableByteChannel.
+ *
+ * @since New in 1.9.
+ */
+class ReadableByteChannel : protected ByteChannel
+{
+public:
+  /**
+   * Constructs a wrapper for @a channel with @a reader the read
+   * method implementation.
+   */
+  explicit ReadableByteChannel(Env env, ChannelReader& reader)
+    : ByteChannel(env, reader)
+    {}
+
+  /**
+   * Reads bytes into @a destination, which must be a
+   * @c java.nio.ByteBuffer instance, from #m_reader.
+   * @return the number of bytes read, or -1 if at end-of-stream.
+   */
+  jint read(jobject destination)
+    {
+      return ByteChannel::read(destination);
+    }
+};
+
+
+/**
+ * Wrapper @c java.nio.channels.WritableByteChannel.
+ *
+ * @since New in 1.9.
+ */
+class WritableByteChannel : protected ByteChannel
+{
+public:
+  /**
+   * Constructs a wrapper for @a channel with @a writer as the write
+   * method implementation.
+   */
+  explicit WritableByteChannel(Env env, ChannelWriter& writer)
+    : ByteChannel(env, writer)
+    {}
+
+  /**
+   * Writes bytes from @a source, which must be a
+   * @c java.nio.ByteBuffer instance, to #m_writer.
+   * @return the number of bytes written.
+   */
+  jint write(jobject source)
+    {
+      return ByteChannel::write(source);
+    }
+};
+
+} // namespace Java
+
+#endif // SVN_JAVAHL_JNIWRAPPER_CHANNEL_HPP
diff --git a/subversion/bindings/javahl/native/jniwrapper/jni_class_cache.cpp b/subversion/bindings/javahl/native/jniwrapper/jni_class_cache.cpp
new file mode 100644
index 0000000..9e533db
--- /dev/null
+++ b/subversion/bindings/javahl/native/jniwrapper/jni_class_cache.cpp
@@ -0,0 +1,326 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+#include <stdexcept>
+
+#include <apr_atomic.h>
+
+#define SVN_JAVAHL_JNIWRAPPER_LOG(expr)
+#include "jni_env.hpp"
+#include "jni_globalref.hpp"
+#include "jni_exception.hpp"
+#include "jni_object.hpp"
+#include "jni_string.hpp"
+
+#include "jni_channel.hpp"
+#include "jni_io_stream.hpp"
+#include "jni_list.hpp"
+#include "jni_string_map.hpp"
+
+#include "../SubversionException.hpp"
+#include "../AuthnCallback.hpp"
+#include "../Credential.hpp"
+#include "../ExternalItem.hpp"
+#include "../EditorCallbacks.hpp"
+
+namespace
+{
+/* This class behaves like a dumbed-down std:auto_ptr, but it
+   implements atomic access and modification of the wrapped
+   pointer. */
+class ClassImplPtr
+{
+  typedef ::Java::Object::ClassImpl ClassImpl;
+
+ public:
+  /* Default constructor; initializes the wrapped pointer to NULL */
+  explicit ClassImplPtr()
+    : m_ptr(NULL)
+  {}
+
+  /* Initializing constructor; sets the wrapped pointer to PTR */
+  explicit ClassImplPtr(ClassImpl* ptr)
+    : m_ptr(ptr)
+  {}
+
+  /* Destructor deletes the object and resets the wrapped pointer to NULL. */
+  ~ClassImplPtr()
+    {
+      delete static_cast<ClassImpl*>(
+          apr_atomic_casptr(&m_ptr, NULL, get()));
+    }
+
+  /* Sets the wrapped pointer to PTR iff it is NULL, and returns the
+     old value. */
+  ClassImpl* test_and_set(ClassImpl* ptr)
+    {
+      return static_cast<ClassImpl*>(
+          apr_atomic_casptr(&m_ptr, ptr, NULL));
+    }
+
+  /* Returns the current value of the the wrapped pointer. */
+  ClassImpl* get() const
+    {
+      return static_cast<ClassImpl*>(
+          apr_atomic_casptr(&m_ptr, NULL, NULL));
+    }
+
+private:
+  // Non-copyable
+  ClassImplPtr(const ClassImplPtr&);
+  ClassImplPtr& operator=(const ClassImplPtr&);
+
+  mutable volatile void* m_ptr;
+};
+} // anonymous namespace
+
+
+namespace Java {
+
+class ClassCacheImpl
+{
+
+  friend class ClassCache;
+
+  // We only statically initialize a few of the common class wrappers.
+  explicit ClassCacheImpl(Env env) :
+
+#define JNIWRAPPER_INIT_CACHED_CLASS(M, C)     \
+  m_impl_##M(new C::ClassImpl(env, env.FindClass(C::m_class_name)))
+
+      JNIWRAPPER_INIT_CACHED_CLASS(object, Object),
+      JNIWRAPPER_INIT_CACHED_CLASS(classtype, Class),
+      JNIWRAPPER_INIT_CACHED_CLASS(throwable, Exception),
+      JNIWRAPPER_INIT_CACHED_CLASS(string, String)
+#undef JNIWRAPPER_INIT_CACHED_CLASS
+    {}
+
+  // We can't do this in the constructor above, because the satic
+  // initializers will expect that ClassCache::m_impl is already set;
+  // that doesn't happen until the constructor returns.
+  void static_init(Env env)
+    {
+#define JNIWRAPPER_STATIC_CACHED_CLASS(M, C)            \
+      C::static_init(env, m_impl_##M->get_class())
+
+      // No-op JNIWRAPPER_STATIC_CACHED_CLASS(object, Object);
+      JNIWRAPPER_STATIC_CACHED_CLASS(classtype, Class);
+      JNIWRAPPER_STATIC_CACHED_CLASS(throwable, Exception);
+      // No-op JNIWRAPPER_STATIC_CACHED_CLASS(string, String);
+#undef JNIWRAPPER_STATIC_CACHED_CLASS
+    }
+
+  // The statically initialized calss wrappers are always defined and
+  // therefore do not need atomic access.
+#define JNIWRAPPER_DEFINE_CACHED_CLASS(M, C)            \
+  std::auto_ptr<Object::ClassImpl> m_impl_##M;          \
+  const Object::ClassImpl* get_##M(Env)                 \
+    {                                                   \
+      return m_impl_##M.get();                          \
+    }
+
+  JNIWRAPPER_DEFINE_CACHED_CLASS(object, Object)
+  JNIWRAPPER_DEFINE_CACHED_CLASS(classtype, Class)
+  JNIWRAPPER_DEFINE_CACHED_CLASS(throwable, Exception)
+  JNIWRAPPER_DEFINE_CACHED_CLASS(string, String)
+#undef JNIWRAPPER_DEFINE_CACHED_CLASS
+
+  // All other class wrappers must be atomically initialized
+#define JNIWRAPPER_DEFINE_CACHED_CLASS(M, C)                    \
+  ClassImplPtr m_impl_##M;                                      \
+  const Object::ClassImpl* get_##M(Env env)                     \
+    {                                                           \
+      Object::ClassImpl* pimpl = m_impl_##M.get();              \
+      if (!pimpl)                                               \
+        {                                                       \
+          std::auto_ptr<Object::ClassImpl> tmp(                 \
+              new C::ClassImpl(                                 \
+                  env, env.FindClass(C::m_class_name)));        \
+          pimpl = m_impl_##M.test_and_set(tmp.get());           \
+          if (!pimpl)                                           \
+            pimpl = tmp.release();                              \
+        }                                                       \
+      return pimpl;                                             \
+    }
+
+  JNIWRAPPER_DEFINE_CACHED_CLASS(exc_index_out_of_bounds,
+                                 IndexOutOfBoundsException);
+  JNIWRAPPER_DEFINE_CACHED_CLASS(exc_no_such_element,
+                                 NoSuchElementException);
+
+  JNIWRAPPER_DEFINE_CACHED_CLASS(iterator, BaseIterator);
+
+  JNIWRAPPER_DEFINE_CACHED_CLASS(list, BaseImmutableList);
+  JNIWRAPPER_DEFINE_CACHED_CLASS(array_list, BaseList);
+
+  JNIWRAPPER_DEFINE_CACHED_CLASS(map, BaseImmutableMap);
+  JNIWRAPPER_DEFINE_CACHED_CLASS(set, BaseImmutableMap::Set);
+  JNIWRAPPER_DEFINE_CACHED_CLASS(map_entry, BaseImmutableMap::Entry);
+  JNIWRAPPER_DEFINE_CACHED_CLASS(hash_map, BaseMap);
+
+  JNIWRAPPER_DEFINE_CACHED_CLASS(input_stream, InputStream);
+  JNIWRAPPER_DEFINE_CACHED_CLASS(output_stream, OutputStream);
+
+  JNIWRAPPER_DEFINE_CACHED_CLASS(byte_buffer,
+                                 ByteChannel::ByteBuffer);
+
+  JNIWRAPPER_DEFINE_CACHED_CLASS(subversion_exception,
+                                 ::JavaHL::SubversionException);
+
+  JNIWRAPPER_DEFINE_CACHED_CLASS(authn_cb,
+                                 ::JavaHL::AuthnCallback);
+  JNIWRAPPER_DEFINE_CACHED_CLASS(authn_result,
+                                 ::JavaHL::AuthnCallback::AuthnResult);
+  JNIWRAPPER_DEFINE_CACHED_CLASS(authn_ssl_server_cert_failures,
+                                 ::JavaHL::AuthnCallback::SSLServerCertFailures);
+  JNIWRAPPER_DEFINE_CACHED_CLASS(authn_ssl_server_cert_info,
+                                 ::JavaHL::AuthnCallback::SSLServerCertInfo);
+  JNIWRAPPER_DEFINE_CACHED_CLASS(user_passwd_cb,
+                                 ::JavaHL::UserPasswordCallback);
+
+  JNIWRAPPER_DEFINE_CACHED_CLASS(credential,
+                                 ::JavaHL::Credential);
+  JNIWRAPPER_DEFINE_CACHED_CLASS(credential_kind,
+                                 ::JavaHL::Credential::Kind);
+
+  JNIWRAPPER_DEFINE_CACHED_CLASS(external_item,
+                                 ::JavaHL::ExternalItem);
+
+  JNIWRAPPER_DEFINE_CACHED_CLASS(editor_provide_base_cb,
+                                 ::JavaHL::ProvideBaseCallback);
+  JNIWRAPPER_DEFINE_CACHED_CLASS(editor_provide_base_cb_ret,
+                                 ::JavaHL::ProvideBaseCallback::ReturnValue);
+  JNIWRAPPER_DEFINE_CACHED_CLASS(editor_provide_props_cb,
+                                 ::JavaHL::ProvidePropsCallback);
+  JNIWRAPPER_DEFINE_CACHED_CLASS(editor_provide_props_cb_ret,
+                                 ::JavaHL::ProvidePropsCallback::ReturnValue);
+  JNIWRAPPER_DEFINE_CACHED_CLASS(editor_get_kind_cb,
+                                 ::JavaHL::GetNodeKindCallback);
+#undef JNIWRAPPER_DEFINE_CACHED_CLASS
+};
+
+
+ClassCacheImpl* ClassCache::m_impl = NULL;
+
+void ClassCache::create()
+{
+  const char* exception_message = NULL;
+
+  try
+    {
+      const Env env;
+      m_impl = new ClassCacheImpl(env);
+      m_impl->static_init(env);
+    }
+  catch (const SignalExceptionThrown&)
+    {}
+  catch (const std::exception& ex)
+    {
+      exception_message = ex.what();
+    }
+  catch (...)
+    {
+      exception_message = "Caught unknown C++ exception";
+    }
+
+  // Do not throw any more exceptions from here, so use the raw environment.
+  ::JNIEnv* const jenv = Env().get();
+  if (exception_message || jenv->ExceptionCheck())
+    {
+      jobject cause = jenv->ExceptionOccurred();
+      if (cause)
+        jenv->ExceptionClear();
+
+      const jclass rtx = jenv->FindClass("java/lang/RuntimeException");
+      const jmethodID ctor = jenv->GetMethodID(rtx, "<init>",
+                                               "(Ljava/lang/String;"
+                                               "Ljava/lang/Throwable;)V");
+      if (!cause && exception_message)
+        {
+          const jstring msg = jenv->NewStringUTF(exception_message);
+          cause = jenv->NewObject(rtx, ctor, msg, jthrowable(0));
+        }
+      const jstring reason =
+        jenv->NewStringUTF("JavaHL native library initialization failed");
+      const jobject exception = jenv->NewObject(rtx, ctor, reason, cause);
+      jenv->Throw(jthrowable(exception));
+    }
+}
+
+void ClassCache::destroy()
+{
+  ClassCacheImpl* const pimpl = m_impl;
+  m_impl = NULL;
+  delete pimpl;
+}
+
+#define JNIWRAPPER_IMPL_CLASS_CACHE_ACCESSOR(M)         \
+const Object::ClassImpl* ClassCache::get_##M(Env env)   \
+{                                                       \
+  return m_impl->get_##M(env);                          \
+}
+
+JNIWRAPPER_IMPL_CLASS_CACHE_ACCESSOR(object);
+JNIWRAPPER_IMPL_CLASS_CACHE_ACCESSOR(classtype);
+JNIWRAPPER_IMPL_CLASS_CACHE_ACCESSOR(throwable);
+JNIWRAPPER_IMPL_CLASS_CACHE_ACCESSOR(string);
+
+JNIWRAPPER_IMPL_CLASS_CACHE_ACCESSOR(exc_index_out_of_bounds);
+JNIWRAPPER_IMPL_CLASS_CACHE_ACCESSOR(exc_no_such_element);
+
+JNIWRAPPER_IMPL_CLASS_CACHE_ACCESSOR(list);
+JNIWRAPPER_IMPL_CLASS_CACHE_ACCESSOR(array_list);
+
+JNIWRAPPER_IMPL_CLASS_CACHE_ACCESSOR(map);
+JNIWRAPPER_IMPL_CLASS_CACHE_ACCESSOR(set);
+JNIWRAPPER_IMPL_CLASS_CACHE_ACCESSOR(iterator);
+JNIWRAPPER_IMPL_CLASS_CACHE_ACCESSOR(map_entry);
+JNIWRAPPER_IMPL_CLASS_CACHE_ACCESSOR(hash_map);
+
+JNIWRAPPER_IMPL_CLASS_CACHE_ACCESSOR(input_stream);
+JNIWRAPPER_IMPL_CLASS_CACHE_ACCESSOR(output_stream);
+
+JNIWRAPPER_IMPL_CLASS_CACHE_ACCESSOR(byte_buffer);
+
+JNIWRAPPER_IMPL_CLASS_CACHE_ACCESSOR(subversion_exception);
+
+JNIWRAPPER_IMPL_CLASS_CACHE_ACCESSOR(authn_cb);
+JNIWRAPPER_IMPL_CLASS_CACHE_ACCESSOR(authn_result);
+JNIWRAPPER_IMPL_CLASS_CACHE_ACCESSOR(authn_ssl_server_cert_failures);
+JNIWRAPPER_IMPL_CLASS_CACHE_ACCESSOR(authn_ssl_server_cert_info);
+JNIWRAPPER_IMPL_CLASS_CACHE_ACCESSOR(user_passwd_cb);
+
+
+JNIWRAPPER_IMPL_CLASS_CACHE_ACCESSOR(credential);
+JNIWRAPPER_IMPL_CLASS_CACHE_ACCESSOR(credential_kind);
+
+JNIWRAPPER_IMPL_CLASS_CACHE_ACCESSOR(external_item);
+
+JNIWRAPPER_IMPL_CLASS_CACHE_ACCESSOR(editor_provide_base_cb);
+JNIWRAPPER_IMPL_CLASS_CACHE_ACCESSOR(editor_provide_base_cb_ret);
+JNIWRAPPER_IMPL_CLASS_CACHE_ACCESSOR(editor_provide_props_cb);
+JNIWRAPPER_IMPL_CLASS_CACHE_ACCESSOR(editor_provide_props_cb_ret);
+JNIWRAPPER_IMPL_CLASS_CACHE_ACCESSOR(editor_get_kind_cb);
+#undef JNIWRAPPER_IMPL_CLASS_CACHE_ACCESSOR
+
+} // namespace Java
diff --git a/subversion/bindings/javahl/native/jniwrapper/jni_env.hpp b/subversion/bindings/javahl/native/jniwrapper/jni_env.hpp
new file mode 100644
index 0000000..9d73653
--- /dev/null
+++ b/subversion/bindings/javahl/native/jniwrapper/jni_env.hpp
@@ -0,0 +1,682 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+#ifndef SVN_JAVAHL_JNIWRAPPER_ENV_HPP
+#define SVN_JAVAHL_JNIWRAPPER_ENV_HPP
+
+#include <jni.h>
+#include <cstdarg>
+#include <stdexcept>
+
+#ifdef SVN_JAVAHL_DEBUG
+#  ifndef SVN_JAVAHL_JNIWRAPPER_LOG
+#    include <iostream>
+#    define SVN_JAVAHL_JNIWRAPPER_LOG(expr)      \
+       (std::cerr << expr << std::endl)
+#  endif // SVN_JAVAHL_JNIWRAPPER_LOG
+#else
+#  define SVN_JAVAHL_JNIWRAPPER_LOG(expr)
+#endif // SVN_JAVAHL_DEBUG
+
+namespace Java {
+
+/**
+ * A C++ exception object for signalling that a Java exception has
+ * been thrown.
+ *
+ * Thrown to unwind the stack while avoiding code clutter when a Java
+ * exception is detected in the JNI environment.
+ *
+ * @since New in 1.9.
+ */
+class SignalExceptionThrown {};
+
+/**
+ * Auto-initializing proxy for the JNI method ID.
+ *
+ * Behaves like a @c jmethodID but automatically initializes to @c NULL.
+ *
+ * @since New in 1.9.
+ */
+class MethodID
+{
+public:
+  MethodID()
+    : m_mid(NULL)
+    {}
+
+  MethodID(jmethodID mid)
+    : m_mid(mid)
+    {}
+
+  MethodID(const MethodID& that)
+    : m_mid(that.m_mid)
+    {}
+
+  MethodID& operator=(jmethodID mid)
+    {
+      m_mid = mid;
+      return *this;
+    }
+
+  MethodID& operator=(const MethodID& that)
+    {
+      m_mid = that.m_mid;
+      return *this;
+    }
+
+  operator jmethodID() const
+    {
+      return m_mid;
+    }
+
+  operator bool() const
+    {
+      return (NULL != m_mid);
+    }
+
+private:
+  jmethodID m_mid;
+};
+
+
+/**
+ * Auto-initializing proxy for the JNI field ID.
+ *
+ * Behaves like a @c jfieldID but automatically initializes to @c NULL.
+ *
+ * @since New in 1.9.
+ */
+class FieldID
+{
+public:
+  FieldID()
+    : m_fid(NULL)
+    {}
+
+  FieldID(jfieldID mid)
+    : m_fid(mid)
+    {}
+
+  FieldID(const FieldID& that)
+    : m_fid(that.m_fid)
+    {}
+
+  FieldID& operator=(jfieldID fid)
+    {
+      m_fid = fid;
+      return *this;
+    }
+
+  FieldID& operator=(const FieldID& that)
+    {
+      m_fid = that.m_fid;
+      return *this;
+    }
+
+  operator jfieldID() const
+    {
+      return m_fid;
+    }
+
+  operator bool() const
+    {
+      return (NULL != m_fid);
+    }
+
+private:
+  jfieldID m_fid;
+};
+
+/**
+ * Encapsulation of a JNI environment reference.
+ *
+ * This class wraps all (relevant) JNI functions and checks for thrown
+ * exceptions, so that call sites don't have to be cluttered with KNI
+ * exception checks.
+ *
+ * @since New in 1.9.
+ */
+class Env
+{
+public:
+  /**
+   * Constructs an environment object, retrieving the JNI environment
+   * reference from the global JVM reference.
+   */
+  explicit Env()
+    : m_env(env_from_jvm())
+    {}
+
+  /**
+   * Given a JNI renvironment reference, constructs an environment object.
+   */
+  explicit Env(::JNIEnv* env)
+    : m_env(env)
+    {}
+
+  /**
+   * Returns the wrapped JNI environment reference.
+   *
+   * This method is present for compatibility with the old-style
+   * native implmentation that needs the raw pointer, and will be
+   * removed presently. Do not use it in new-style code.
+   */
+  ::JNIEnv* get() const
+    {
+      SVN_JAVAHL_JNIWRAPPER_LOG("Warning: Direct access to JNIEnv at "
+                                << __FILE__ << ":" << __LINE__);
+      return m_env;
+    }
+
+  /** Wrapped JNI function. */
+  jobject NewGlobalRef(jobject obj) const
+    {
+      jobject ret = m_env->NewGlobalRef(obj);
+      check_java_exception();
+      if (!ret)
+        throw_java_out_of_memory(error_create_global_reference());
+      return ret;
+    }
+
+  /** Wrapped JNI function. */
+  void DeleteGlobalRef(jobject obj) const throw()
+    {
+      m_env->DeleteGlobalRef(obj);
+    }
+
+  /** Wrapped JNI function. */
+  void PushLocalFrame(jint capacity) const
+    {
+      if (0 > m_env->PushLocalFrame(capacity))
+        throw_java_exception();
+    }
+
+  /** Wrapped JNI function. */
+  void PopLocalFrame() const throw()
+    {
+      m_env->PopLocalFrame(NULL);
+    }
+
+  /** Wrapped JNI function. */
+  jint Throw(jthrowable exc) const throw()
+    {
+      return m_env->Throw(exc);
+    }
+
+  /** Wrapped JNI function. */
+  jint ThrowNew(jclass cls, const char* message) const throw()
+    {
+      return m_env->ThrowNew(cls, message);
+    }
+
+  /** Wrapped JNI function. */
+  jboolean ExceptionCheck() const throw()
+    {
+      return m_env->ExceptionCheck();
+    }
+
+  /** Wrapped JNI function. */
+  jthrowable ExceptionOccurred() const throw()
+    {
+      return m_env->ExceptionOccurred();
+    }
+
+  /** Wrapped JNI function. */
+  void ExceptionClear() const throw()
+    {
+      m_env->ExceptionClear();
+    }
+
+  /** Wrapped JNI function. */
+  jclass FindClass(const char* name) const
+    {
+      jclass cls = m_env->FindClass(name);
+      check_java_exception();
+      return cls;
+    }
+
+  /** Wrapped JNI function. */
+  jobject NewObject(jclass cls, jmethodID ctor, ...) const
+    {
+      std::va_list args;
+      va_start(args, ctor);
+      jobject obj = m_env->NewObjectV(cls, ctor, args);
+      va_end(args);
+      check_java_exception();
+      return obj;
+    }
+
+  /** Wrapped JNI function. */
+  jclass GetObjectClass(jobject obj) const
+    {
+      jclass cls = m_env->GetObjectClass(obj);
+      check_java_exception();
+      return cls;
+    }
+
+  /** Wrapped JNI function. */
+  jboolean IsInstanceOf(jobject obj, jclass cls) const throw()
+    {
+      return m_env->IsInstanceOf(obj, cls);
+    }
+
+  /** Wrapped JNI function. */
+  jmethodID GetMethodID(jclass cls, const char* name, const char* sig) const
+    {
+      jmethodID mid = m_env->GetMethodID(cls, name, sig);
+      check_java_exception();
+      return mid;
+    }
+
+  /** Wrapped JNI function. */
+  jmethodID GetStaticMethodID(jclass cls, const char* name,
+                              const char* sig) const
+    {
+      jmethodID mid = m_env->GetStaticMethodID(cls, name, sig);
+      check_java_exception();
+      return mid;
+    }
+
+  /** Wrapped JNI function. */
+  jfieldID GetFieldID(jclass cls, const char* name, const char* sig) const
+    {
+      jfieldID fid = m_env->GetFieldID(cls, name, sig);
+      check_java_exception();
+      return fid;
+    }
+
+  /** Wrapped JNI function. */
+  jfieldID GetStaticFieldID(jclass cls, const char* name,
+                            const char* sig) const
+    {
+      jfieldID fid = m_env->GetStaticFieldID(cls, name, sig);
+      check_java_exception();
+      return fid;
+    }
+
+  /** Wrapped JNI function. */
+  jstring NewStringUTF(const char* text) const
+    {
+      if (!text)
+        return NULL;
+
+      jstring str = m_env->NewStringUTF(text);
+      check_java_exception();
+      return str;
+    }
+
+  /** Wrapped JNI function. */
+  jsize GetStringLength(jstring str) const
+    {
+      jsize len = m_env->GetStringLength(str);
+      check_java_exception();
+      return len;
+    }
+
+  /** Wrapped JNI function. */
+  jsize GetStringUTFLength(jstring str) const
+    {
+      jsize len = m_env->GetStringUTFLength(str);
+      check_java_exception();
+      return len;
+    }
+
+  /** Wrapped JNI function. */
+  const char* GetStringUTFChars(jstring str, jboolean* is_copy) const
+    {
+      if (!str)
+        return NULL;
+
+      const char* text = m_env->GetStringUTFChars(str, is_copy);
+      check_java_exception();
+      if (!text)
+        throw_java_out_of_memory(error_get_contents_string());
+      return text;
+    }
+
+  /** Wrapped JNI function. */
+  void ReleaseStringUTFChars(jstring str, const char* new_text) const
+    {
+      if (!str)
+        throw std::logic_error(error_release_null_string());
+      m_env->ReleaseStringUTFChars(str, new_text);
+    }
+
+  /** Wrapped JNI function. */
+  void CallVoidMethod(jobject obj, jmethodID mid, ...) const
+    {
+      std::va_list args;
+      va_start(args, mid);
+      m_env->CallObjectMethodV(obj, mid, args);
+      va_end(args);
+      check_java_exception();
+    }
+
+  /** Boilerplate generator for wrapped JNI functions. */
+#define SVN_JAVAHL_JNIWRAPPER_CALL_X_METHOD(T, N)               \
+  T Call##N##Method(jobject obj, jmethodID mid, ...) const      \
+    {                                                           \
+      std::va_list args;                                        \
+      va_start(args, mid);                                      \
+      T ret = m_env->Call##N##MethodV(obj, mid, args);          \
+      va_end(args);                                             \
+      check_java_exception();                                   \
+      return ret;                                               \
+    }
+  SVN_JAVAHL_JNIWRAPPER_CALL_X_METHOD(jobject, Object)
+  SVN_JAVAHL_JNIWRAPPER_CALL_X_METHOD(jboolean, Boolean)
+  SVN_JAVAHL_JNIWRAPPER_CALL_X_METHOD(jbyte, Byte)
+  SVN_JAVAHL_JNIWRAPPER_CALL_X_METHOD(jchar, Char)
+  SVN_JAVAHL_JNIWRAPPER_CALL_X_METHOD(jshort, Short)
+  SVN_JAVAHL_JNIWRAPPER_CALL_X_METHOD(jint, Int)
+  SVN_JAVAHL_JNIWRAPPER_CALL_X_METHOD(jlong, Long)
+  SVN_JAVAHL_JNIWRAPPER_CALL_X_METHOD(jfloat, Float)
+  SVN_JAVAHL_JNIWRAPPER_CALL_X_METHOD(jdouble, Double)
+#undef SVN_JAVAHL_JNIWRAPPER_CALL_X_METHOD
+
+  /** Boilerplate generator for wrapped JNI functions. */
+#define SVN_JAVAHL_JNIWRAPPER_CALL_STATIC_X_METHOD(T, N)                \
+  T CallStatic##N##Method(jclass obj, jmethodID mid, ...) const         \
+    {                                                                   \
+      std::va_list args;                                                \
+      va_start(args, mid);                                              \
+      T ret = m_env->CallStatic##N##MethodV(obj, mid, args);            \
+      va_end(args);                                                     \
+      check_java_exception();                                           \
+      return ret;                                                       \
+    }
+  SVN_JAVAHL_JNIWRAPPER_CALL_STATIC_X_METHOD(jobject, Object)
+  SVN_JAVAHL_JNIWRAPPER_CALL_STATIC_X_METHOD(jboolean, Boolean)
+  SVN_JAVAHL_JNIWRAPPER_CALL_STATIC_X_METHOD(jbyte, Byte)
+  SVN_JAVAHL_JNIWRAPPER_CALL_STATIC_X_METHOD(jchar, Char)
+  SVN_JAVAHL_JNIWRAPPER_CALL_STATIC_X_METHOD(jshort, Short)
+  SVN_JAVAHL_JNIWRAPPER_CALL_STATIC_X_METHOD(jint, Int)
+  SVN_JAVAHL_JNIWRAPPER_CALL_STATIC_X_METHOD(jlong, Long)
+  SVN_JAVAHL_JNIWRAPPER_CALL_STATIC_X_METHOD(jfloat, Float)
+  SVN_JAVAHL_JNIWRAPPER_CALL_STATIC_X_METHOD(jdouble, Double)
+#undef SVN_JAVAHL_JNIWRAPPER_CALL_STATIC_X_METHOD
+
+  /** Boilerplate generator for wrapped JNI functions. */
+#define SVN_JAVAHL_JNIWRAPPER_GET_X_FIELD(T, N)                 \
+  T Get##N##Field(jobject obj, jfieldID fid) const              \
+    {                                                           \
+      T ret = m_env->Get##N##Field(obj, fid);                   \
+      check_java_exception();                                   \
+      return ret;                                               \
+    }
+  SVN_JAVAHL_JNIWRAPPER_GET_X_FIELD(jobject, Object)
+  SVN_JAVAHL_JNIWRAPPER_GET_X_FIELD(jboolean, Boolean)
+  SVN_JAVAHL_JNIWRAPPER_GET_X_FIELD(jbyte, Byte)
+  SVN_JAVAHL_JNIWRAPPER_GET_X_FIELD(jchar, Char)
+  SVN_JAVAHL_JNIWRAPPER_GET_X_FIELD(jshort, Short)
+  SVN_JAVAHL_JNIWRAPPER_GET_X_FIELD(jint, Int)
+  SVN_JAVAHL_JNIWRAPPER_GET_X_FIELD(jlong, Long)
+  SVN_JAVAHL_JNIWRAPPER_GET_X_FIELD(jfloat, Float)
+  SVN_JAVAHL_JNIWRAPPER_GET_X_FIELD(jdouble, Double)
+#undef SVN_JAVAHL_JNIWRAPPER_GET_X_FIELD
+
+  /** Boilerplate generator for wrapped JNI functions. */
+#define SVN_JAVAHL_JNIWRAPPER_SET_X_FIELD(T, N)                 \
+  void Set##N##Field(jobject obj, jfieldID fid, T val) const    \
+    {                                                           \
+      m_env->Set##N##Field(obj, fid, val);                      \
+      check_java_exception();                                   \
+    }
+  SVN_JAVAHL_JNIWRAPPER_SET_X_FIELD(jobject, Object)
+  SVN_JAVAHL_JNIWRAPPER_SET_X_FIELD(jboolean, Boolean)
+  SVN_JAVAHL_JNIWRAPPER_SET_X_FIELD(jbyte, Byte)
+  SVN_JAVAHL_JNIWRAPPER_SET_X_FIELD(jchar, Char)
+  SVN_JAVAHL_JNIWRAPPER_SET_X_FIELD(jshort, Short)
+  SVN_JAVAHL_JNIWRAPPER_SET_X_FIELD(jint, Int)
+  SVN_JAVAHL_JNIWRAPPER_SET_X_FIELD(jlong, Long)
+  SVN_JAVAHL_JNIWRAPPER_SET_X_FIELD(jfloat, Float)
+  SVN_JAVAHL_JNIWRAPPER_SET_X_FIELD(jdouble, Double)
+#undef SVN_JAVAHL_JNIWRAPPER_SET_X_FIELD
+
+  /** Boilerplate generator for wrapped JNI functions. */
+#define SVN_JAVAHL_JNIWRAPPER_GET_STATIC_X_FIELD(T, N)          \
+  T GetStatic##N##Field(jclass cls, jfieldID fid) const         \
+    {                                                           \
+      T ret = m_env->GetStatic##N##Field(cls, fid);             \
+      check_java_exception();                                   \
+      return ret;                                               \
+    }
+  SVN_JAVAHL_JNIWRAPPER_GET_STATIC_X_FIELD(jobject, Object)
+  SVN_JAVAHL_JNIWRAPPER_GET_STATIC_X_FIELD(jboolean, Boolean)
+  SVN_JAVAHL_JNIWRAPPER_GET_STATIC_X_FIELD(jbyte, Byte)
+  SVN_JAVAHL_JNIWRAPPER_GET_STATIC_X_FIELD(jchar, Char)
+  SVN_JAVAHL_JNIWRAPPER_GET_STATIC_X_FIELD(jshort, Short)
+  SVN_JAVAHL_JNIWRAPPER_GET_STATIC_X_FIELD(jint, Int)
+  SVN_JAVAHL_JNIWRAPPER_GET_STATIC_X_FIELD(jlong, Long)
+  SVN_JAVAHL_JNIWRAPPER_GET_STATIC_X_FIELD(jfloat, Float)
+  SVN_JAVAHL_JNIWRAPPER_GET_STATIC_X_FIELD(jdouble, Double)
+#undef SVN_JAVAHL_JNIWRAPPER_GET_STATIC_X_FIELD
+
+  /** Boilerplate generator for wrapped JNI functions. */
+#define SVN_JAVAHL_JNIWRAPPER_SET_STATIC_X_FIELD(T, N)                  \
+  void SetStatic##N##Field(jclass cls, jfieldID fid, T val) const       \
+    {                                                                   \
+      m_env->SetStatic##N##Field(cls, fid, val);                        \
+      check_java_exception();                                           \
+    }
+  SVN_JAVAHL_JNIWRAPPER_SET_STATIC_X_FIELD(jobject, Object)
+  SVN_JAVAHL_JNIWRAPPER_SET_STATIC_X_FIELD(jboolean, Boolean)
+  SVN_JAVAHL_JNIWRAPPER_SET_STATIC_X_FIELD(jbyte, Byte)
+  SVN_JAVAHL_JNIWRAPPER_SET_STATIC_X_FIELD(jchar, Char)
+  SVN_JAVAHL_JNIWRAPPER_SET_STATIC_X_FIELD(jshort, Short)
+  SVN_JAVAHL_JNIWRAPPER_SET_STATIC_X_FIELD(jint, Int)
+  SVN_JAVAHL_JNIWRAPPER_SET_STATIC_X_FIELD(jlong, Long)
+  SVN_JAVAHL_JNIWRAPPER_SET_STATIC_X_FIELD(jfloat, Float)
+  SVN_JAVAHL_JNIWRAPPER_SET_STATIC_X_FIELD(jdouble, Double)
+#undef SVN_JAVAHL_JNIWRAPPER_SET_STATIC_X_FIELD
+
+  /** Wrapped JNI function. */
+  jsize GetArrayLength(jarray array) const
+    {
+      if (!array)
+        return 0;
+      return m_env->GetArrayLength(array);
+    }
+
+  /** Wrapped JNI function. */
+  jobjectArray NewObjectArray(jsize length, jclass cls, jobject init) const
+    {
+      jobjectArray array = m_env->NewObjectArray(length, cls, init);
+      if (!array)
+        throw_java_out_of_memory(error_create_object_array());
+      return array;
+    }
+
+  /** Wrapped JNI function. */
+  jobject GetObjectArrayElement(jobjectArray array, jsize index) const
+    {
+      jobject obj = m_env->GetObjectArrayElement(array, index);
+      check_java_exception();
+      return obj;
+    }
+
+  /** Wrapped JNI function. */
+  void SetObjectArrayElement(jobjectArray array,
+                             jsize index, jobject value) const
+    {
+      m_env->SetObjectArrayElement(array, index, value);
+      check_java_exception();
+    }
+
+  /** Boilerplate generator for wrapped JNI functions. */
+#define SVN_JAVAHL_JNIWRAPPER_PRIMITIVE_TYPE_ARRAY(T, N)                \
+  T##Array New##N##Array(jsize length) const                            \
+    {                                                                   \
+      T##Array array = m_env->New##N##Array(length);                    \
+      if (!array)                                                       \
+        throw_java_out_of_memory(error_create_array(#T));               \
+      return array;                                                     \
+    }                                                                   \
+  T* Get##N##ArrayElements(T##Array array, jboolean* is_copy) const     \
+    {                                                                   \
+      if (!array)                                                       \
+        return NULL;                                                    \
+                                                                        \
+      T* data = m_env->Get##N##ArrayElements(array, is_copy);           \
+      check_java_exception();                                           \
+      if (!data)                                                        \
+        throw_java_out_of_memory(error_get_contents_array(#N));         \
+      return data;                                                      \
+    }                                                                   \
+  void Release##N##ArrayElements(T##Array array, T* data, jint mode) const \
+    {                                                                   \
+      if (!array)                                                       \
+        throw std::logic_error(error_release_null_array(#T));           \
+      m_env->Release##N##ArrayElements(array, data, mode);              \
+    }
+
+  SVN_JAVAHL_JNIWRAPPER_PRIMITIVE_TYPE_ARRAY(jboolean, Boolean)
+  SVN_JAVAHL_JNIWRAPPER_PRIMITIVE_TYPE_ARRAY(jbyte, Byte)
+  SVN_JAVAHL_JNIWRAPPER_PRIMITIVE_TYPE_ARRAY(jchar, Char)
+  SVN_JAVAHL_JNIWRAPPER_PRIMITIVE_TYPE_ARRAY(jshort, Short)
+  SVN_JAVAHL_JNIWRAPPER_PRIMITIVE_TYPE_ARRAY(jint, Int)
+  SVN_JAVAHL_JNIWRAPPER_PRIMITIVE_TYPE_ARRAY(jlong, Long)
+  SVN_JAVAHL_JNIWRAPPER_PRIMITIVE_TYPE_ARRAY(jfloat, Float)
+  SVN_JAVAHL_JNIWRAPPER_PRIMITIVE_TYPE_ARRAY(jdouble, Double)
+#undef SVN_JAVAHL_JNIWRAPPER_PRIMITIVE_TYPE_ARRAY
+
+  /** Wrapped JNI function. */
+  void* GetDirectBufferAddress(jobject buffer) const
+    {
+      void* const addr = m_env->GetDirectBufferAddress(buffer);
+      check_java_exception();
+      return addr;
+    }
+
+private:
+  ::JNIEnv* m_env;
+  static ::JavaVM* m_jvm;
+  static ::JNIEnv* env_from_jvm();
+
+  void throw_java_exception() const
+    {
+      throw SignalExceptionThrown();
+    }
+
+  void check_java_exception() const
+    {
+      if (m_env->ExceptionCheck())
+        throw SignalExceptionThrown();
+    }
+
+  void throw_java_out_of_memory(const char* message) const;
+
+  // We cannont use svn_private_config.h in a header, so we move the
+  // actual message translations into the implementation file.
+  static const char* error_create_global_reference() throw();
+  static const char* error_get_contents_string() throw();
+  static const char* error_release_null_string() throw();
+
+  static const char* error_create_object_array() throw();
+  static const char* error_create_array(const char* type) throw();
+  static const char* error_get_contents_array(const char* type) throw();
+  static const char* error_release_null_array(const char* type) throw();
+
+public:
+  // This static initializer must only be called by JNI_OnLoad
+  static void static_init(::JavaVM*);
+};
+
+
+/**
+ * Encapsulation of a JNI local frame.
+ *
+ * Used within loop bodies to limit the proliferation of local
+ * references, or anywhere else where such references should be
+ * pre-emptively discarded.
+ *
+ * @since New in 1.9.
+ */
+class LocalFrame
+{
+  static const jint DEFAULT_CAPACITY;
+
+public:
+  /**
+   * Constructs a local frame, retrieving the JNI environment
+   * reference from the global JVM reference.
+   */
+  explicit LocalFrame()
+    : m_env(Env())
+    {
+      m_env.PushLocalFrame(DEFAULT_CAPACITY);
+    }
+
+  /**
+   * Given a JNI renvironment reference, constructs a local frame.
+   */
+  explicit LocalFrame(Env env)
+    : m_env(env)
+    {
+      m_env.PushLocalFrame(DEFAULT_CAPACITY);
+    }
+
+  /**
+   * Constructs a local frame with the given initial @a capacity,
+   * retrieving the JNI environment reference from the global JVM
+   * reference.
+   */
+  explicit LocalFrame(jint capacity)
+    : m_env(Env())
+    {
+      m_env.PushLocalFrame(capacity);
+    }
+
+  /**
+   * Given a JNI renvironment reference, constructs a local frame with
+   * the given initial @a capacity.
+   */
+  explicit LocalFrame(Env env, jint capacity)
+    : m_env(env)
+    {
+      m_env.PushLocalFrame(capacity);
+    }
+
+  ~LocalFrame()
+    {
+      m_env.PopLocalFrame();
+    }
+
+  /**
+   * Returns the stored enviromnent object.
+   */
+  Env get_env() const
+    {
+      return m_env;
+    }
+
+private:
+  const Env m_env;
+  LocalFrame(const LocalFrame&);
+  LocalFrame& operator=(const LocalFrame&);
+};
+
+} // namespace Java
+
+#endif // SVN_JAVAHL_JNIWRAPPER_ENV_HPP
diff --git a/subversion/bindings/javahl/native/jniwrapper/jni_exception.hpp b/subversion/bindings/javahl/native/jniwrapper/jni_exception.hpp
new file mode 100644
index 0000000..2062275
--- /dev/null
+++ b/subversion/bindings/javahl/native/jniwrapper/jni_exception.hpp
@@ -0,0 +1,364 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+
+#ifndef SVN_JAVAHL_JNIWRAPPER_EXCEPTION_HPP
+#define SVN_JAVAHL_JNIWRAPPER_EXCEPTION_HPP
+
+#include "jni_env.hpp"
+#include "jni_object.hpp"
+
+namespace Java {
+
+/**
+ * Base class for all exception generators, and generator class for
+ * exceptions of type @c java.lang.Throwable.
+ *
+ * The associated JNI class reference is stored for the lifetime of
+ * the JVM in the global class cache.
+ *
+ * @since New in 1.9.
+ */
+class Exception
+{
+public:
+  /**
+   * Constructs a wrapper for the @c jthrowable object @a exc.
+   */
+  explicit Exception(Env env, jthrowable exc)
+    : m_env(env),
+      m_jthis(exc),
+      m_class(env.GetObjectClass(exc))
+    {}
+
+  /**
+   * Raises a Java exception of the concrete class, and throws a
+   * native exception at the same time.
+   *
+   * It is an error to call this method if an existing @c jthrowable
+   * object was wrapped.
+   */
+  void raise() const
+    {
+      throw_java_exception();
+      throw SignalExceptionThrown();
+    }
+
+  /**
+   * Raises a Java exception of the concrete class with the givem
+   * @a message, and throws a native exception at the same time.
+   *
+   * It is an error to call this method if an existing @c jthrowable
+   * object was wrapped.
+   */
+  void raise(const char* message) const
+    {
+      throw_java_exception(message);
+      throw SignalExceptionThrown();
+    }
+
+  /**
+   * Raises a Java exception of the concrete class, but does not throw
+   * a native exception.
+   *
+   * It is an error to call this method if an existing @c jthrowable
+   * object was wrapped.
+   */
+  void throw_java_exception() const;
+
+  /**
+   * Raises a Java exception of the concrete class with the given
+   * @a message, but does not throw a native exception.
+   *
+   * It is an error to call this method if an existing @c jthrowable
+   * object was wrapped.
+   */
+  void throw_java_exception(const char* message) const;
+
+  /**
+   * Checks if an existing @c jthrowable object was wrapped.
+   */
+  bool instantiated() const
+    {
+      return (m_jthis != NULL);
+    }
+
+  /**
+   * Returns the wrapped @c jthrowable object.
+   */
+  jthrowable throwable() const
+    {
+      return m_jthis;
+    }
+
+  /**
+   * Wrapper for the Java method @c getMessage().
+   * Only valid if an existing @c jthrowable object was wrapped.
+   */
+  jstring get_message() const;
+
+
+  /**
+   * Returns the wrapped exception instance.
+   */
+  jobject get() const
+    {
+      return m_jthis;
+    }
+
+  /**
+   * Returns the wrapped exception class.
+   */
+  jclass get_class() const
+    {
+      return m_class;
+    }
+
+  /**
+   * Returns the wrapped enviromnment reference.
+   */
+  Env get_env() const
+    {
+      return m_env;
+    }
+
+protected:
+  /**
+   * Constructs an exception generator with the concrete class
+   * @a class_name.
+   */
+  explicit Exception(Env env, const char* class_name)
+    : m_env(env),
+      m_jthis(NULL),
+      m_class(env.FindClass(class_name))
+    {}
+
+  /**
+   * Constructs an exception generator with the concrete class @a cls.
+   */
+  explicit Exception(Env env, const Object::ClassImpl* impl)
+    : m_env(env),
+      m_jthis(NULL),
+      m_class(impl->get_class())
+    {}
+
+private:
+  /**
+   * This object's implementation details.
+   */
+  class ClassImpl : public Object::ClassImpl
+  {
+    friend class ClassCacheImpl;
+
+  protected:
+    explicit ClassImpl(Env env, jclass cls)
+      : Object::ClassImpl(env, cls)
+      {}
+
+  public:
+    virtual ~ClassImpl();
+  };
+
+  const Env m_env;
+  jthrowable m_jthis;
+  jclass m_class;
+
+  friend class ClassCacheImpl;
+  static void static_init(Env env, jclass cls);
+  static const char* const m_class_name;
+  static MethodID m_mid_get_message;
+};
+
+/**
+ * Generator class for exceptions of type @c java.lang.RuntimeException.
+ *
+ * @since New in 1.9.
+ */
+class RuntimeException : public Exception
+{
+public:
+  /**
+   * Constructs an exception generator object.
+   */
+  explicit RuntimeException(Env env)
+    : Exception(env, m_class_name)
+    {}
+
+private:
+  static const char* const m_class_name;
+};
+
+
+/**
+ * Generator class for exceptions of type @c java.lang.NullPointerException.
+ *
+ * @since New in 1.9.
+ */
+class NullPointerException : public Exception
+{
+public:
+  /**
+   * Constructs an exception generator object.
+   */
+  explicit NullPointerException(Env env)
+    : Exception(env, m_class_name)
+    {}
+
+private:
+  static const char* const m_class_name;
+};
+
+/**
+ * Generator class for exceptions of type @c java.lang.OutOfMemoryError.
+ *
+ * @since New in 1.9.
+ */
+class OutOfMemoryError : public Exception
+{
+public:
+  /**
+   * Constructs an exception generator object.
+   */
+  explicit OutOfMemoryError(Env env)
+    : Exception(env, m_class_name)
+    {}
+
+private:
+  static const char* const m_class_name;
+};
+
+/**
+ * Generator class for exceptions of type
+ * @c java.lang.IndexOutOfBoundsException.
+ *
+ * @since New in 1.9.
+ */
+class IndexOutOfBoundsException : public Exception
+{
+public:
+  /**
+   * Constructs an exception generator object.
+   */
+  explicit IndexOutOfBoundsException(Env env)
+    : Exception(env, m_class_name)
+    {}
+
+private:
+  /**
+   * This object's implementation details.
+   */
+  class ClassImpl : public Object::ClassImpl
+  {
+    friend class ClassCacheImpl;
+
+  protected:
+    explicit ClassImpl(Env env, jclass cls)
+      : Object::ClassImpl(env, cls)
+      {}
+
+  public:
+    virtual ~ClassImpl();
+  };
+
+  friend class ClassCacheImpl;
+  static const char* const m_class_name;
+};
+
+/**
+ * Generator class for exceptions of type @c java.io.IOException.
+ *
+ * @since New in 1.9.
+ */
+class IOException : public Exception
+{
+public:
+  /**
+   * Constructs an exception generator object.
+   */
+  explicit IOException(Env env)
+    : Exception(env, m_class_name)
+    {}
+
+private:
+  static const char* const m_class_name;
+};
+
+/**
+ * Generator class for exceptions of type @c java.lang.IllegalArgumentException.
+ *
+ * @since New in 1.9.
+ */
+class IllegalArgumentException : public Exception
+{
+public:
+  /**
+   * Constructs an exception generator object.
+   */
+  explicit IllegalArgumentException(Env env)
+    : Exception(env, m_class_name)
+    {}
+
+private:
+  static const char* const m_class_name;
+};
+
+/**
+ * Generator class for exceptions of type
+ * @c java.util.NoSuchElementException.
+ *
+ * @since New in 1.9.
+ */
+class NoSuchElementException : public Exception
+{
+public:
+  /**
+   * Constructs an exception generator object.
+   */
+  explicit NoSuchElementException(Env env)
+    : Exception(env, m_class_name)
+    {}
+
+private:
+  /**
+   * This object's implementation details.
+   */
+  class ClassImpl : public Object::ClassImpl
+  {
+    friend class ClassCacheImpl;
+
+  protected:
+    explicit ClassImpl(Env env, jclass cls)
+      : Object::ClassImpl(env, cls)
+      {}
+
+  public:
+    virtual ~ClassImpl();
+  };
+
+  friend class ClassCacheImpl;
+  static const char* const m_class_name;
+};
+
+} // namespace Java
+
+#endif // SVN_JAVAHL_JNIWRAPPER_EXCEPTION_HPP
diff --git a/subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp b/subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp
new file mode 100644
index 0000000..7fe88d0
--- /dev/null
+++ b/subversion/bindings/javahl/native/jniwrapper/jni_globalref.hpp
@@ -0,0 +1,90 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+#ifndef SVN_JAVAHL_JNIWRAPPER_GLOBALREF_HPP
+#define SVN_JAVAHL_JNIWRAPPER_GLOBALREF_HPP
+
+#include <jni.h>
+
+#include "jni_env.hpp"
+
+namespace Java {
+
+/**
+ * Wrapper for a global object reference. The reference is held until
+ * the wrapper goes out of scope (i.e., until the destructor is called).
+ *
+ * @since New in 1.9.
+ */
+class GlobalObject
+{
+public:
+  explicit GlobalObject(Env env, jobject obj)
+    : m_obj(obj ? env.NewGlobalRef(obj) : NULL)
+    {}
+
+  ~GlobalObject();
+
+  GlobalObject& operator=(jobject that);
+
+  jobject get() const
+    {
+      return m_obj;
+    }
+
+private:
+  GlobalObject(const GlobalObject&);
+  GlobalObject& operator=(const GlobalObject&);
+
+  jobject m_obj;
+};
+
+/**
+ * Wrapper for a global class reference. Behaves just like the object
+ * reference wrapper, but provides a more type-safe interface for
+ * class references.
+ *
+ * @since New in 1.9.
+ */
+class GlobalClass : protected GlobalObject
+{
+public:
+  explicit GlobalClass(Env env, jclass cls)
+    : GlobalObject(env, cls)
+    {}
+
+  GlobalClass& operator=(jclass that);
+
+  jclass get() const
+    {
+      return jclass(GlobalObject::get());
+    }
+
+private:
+  GlobalClass(const GlobalClass&);
+  GlobalClass& operator=(const GlobalClass&);
+};
+
+} // namespace Java
+
+#endif // SVN_JAVAHL_JNIWRAPPER_GLOBALREF_HPP
diff --git a/subversion/bindings/javahl/native/jniwrapper/jni_io_stream.cpp b/subversion/bindings/javahl/native/jniwrapper/jni_io_stream.cpp
new file mode 100644
index 0000000..3c055ca
--- /dev/null
+++ b/subversion/bindings/javahl/native/jniwrapper/jni_io_stream.cpp
@@ -0,0 +1,294 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+#include "jni_globalref.hpp"
+#include "jni_io_stream.hpp"
+#include "jni_stack.hpp"
+
+#include "svn_private_config.h"
+
+// Stream-wrapper-specific mark object type
+struct svn_stream_mark_t
+{
+  void* m_baton;
+};
+
+namespace Java {
+
+namespace {
+svn_error_t* stream_close_input(void* baton)
+{
+  InputStream* const self = static_cast<InputStream*>(baton);
+  SVN_JAVAHL_CATCH(self->get_env(), SVN_ERR_BASE, self->close());
+  return SVN_NO_ERROR;
+}
+
+svn_error_t* stream_mark(void* baton, svn_stream_mark_t** mark,
+                         apr_pool_t* result_pool)
+{
+  InputStream* const self = static_cast<InputStream*>(baton);
+  SVN_JAVAHL_CATCH(self->get_env(), SVN_ERR_STREAM_SEEK_NOT_SUPPORTED,
+                   self->mark(16384)); // FIXME: invent better readlimit
+
+  *mark = static_cast<svn_stream_mark_t*>(
+      apr_palloc(result_pool, sizeof(**mark)));
+  (*mark)->m_baton = baton;
+  return SVN_NO_ERROR;
+}
+
+svn_error_t* stream_seek(void* baton, const svn_stream_mark_t* mark)
+{
+  if (mark->m_baton != baton)
+    return svn_error_create(SVN_ERR_STREAM_SEEK_NOT_SUPPORTED,
+                            NULL, _("Invalid mark"));
+
+  InputStream* const self = static_cast<InputStream*>(baton);
+  SVN_JAVAHL_CATCH(self->get_env(), SVN_ERR_STREAM_SEEK_NOT_SUPPORTED,
+                   self->reset());
+  return SVN_NO_ERROR;
+}
+
+svn_error_t* stream_read(void* baton, char* buffer, apr_size_t* len)
+{
+  if (0 == *len)
+    return SVN_NO_ERROR;
+
+  jint length = jint(*len);
+  InputStream* const self = static_cast<InputStream*>(baton);
+  SVN_JAVAHL_CATCH(self->get_env(), SVN_ERR_BASE,
+                   length = self->read(buffer, length));
+  if (length < 0)
+    *len = 0;
+  else
+    *len = length;
+  return SVN_NO_ERROR;
+}
+
+svn_error_t* stream_skip(void* baton, apr_size_t len)
+{
+  InputStream* const self = static_cast<InputStream*>(baton);
+  SVN_JAVAHL_CATCH(self->get_env(),  SVN_ERR_BASE, self->skip(jlong(len)));
+  return SVN_NO_ERROR;
+}
+
+svn_error_t* stream_close_output(void* baton)
+{
+  OutputStream* const self = static_cast<OutputStream*>(baton);
+  SVN_JAVAHL_CATCH(self->get_env(), SVN_ERR_BASE, self->close());
+  return SVN_NO_ERROR;
+}
+
+svn_error_t* stream_write(void* baton, const char* data, apr_size_t* len)
+{
+  OutputStream* const self = static_cast<OutputStream*>(baton);
+  SVN_JAVAHL_CATCH(self->get_env(), SVN_ERR_BASE,
+                   self->write(data, jint(*len)));
+  return SVN_NO_ERROR;
+}
+
+
+svn_error_t*
+global_stream_close_input(void* baton)
+{
+  GlobalObject* ref = static_cast<GlobalObject*>(baton);
+  InputStream stream(Env(), ref->get());
+  return stream_close_input(&stream);
+}
+
+svn_error_t*
+global_stream_mark(void* baton, svn_stream_mark_t** mark,
+                   apr_pool_t* result_pool)
+{
+  GlobalObject* ref = static_cast<GlobalObject*>(baton);
+  InputStream stream(Env(), ref->get());
+  return stream_mark(&stream, mark, result_pool);
+}
+
+svn_error_t*
+global_stream_seek(void* baton, const svn_stream_mark_t* mark)
+{
+  GlobalObject* ref = static_cast<GlobalObject*>(baton);
+  InputStream stream(Env(), ref->get());
+  return stream_seek(&stream, mark);
+}
+
+svn_error_t*
+global_stream_read(void* baton, char* buffer, apr_size_t* len)
+{
+  GlobalObject* ref = static_cast<GlobalObject*>(baton);
+  InputStream stream(Env(), ref->get());
+  return stream_read(&stream, buffer, len);
+}
+
+svn_error_t*
+global_stream_skip(void* baton, apr_size_t len)
+{
+  GlobalObject* ref = static_cast<GlobalObject*>(baton);
+  InputStream stream(Env(), ref->get());
+  return stream_skip(&stream, len);
+}
+
+svn_error_t*
+global_stream_close_output(void* baton)
+{
+  GlobalObject* ref = static_cast<GlobalObject*>(baton);
+  OutputStream stream(Env(), ref->get());
+  return stream_close_output(&stream);
+}
+
+svn_error_t*
+global_stream_write(void* baton, const char* data, apr_size_t* len)
+{
+  GlobalObject* ref = static_cast<GlobalObject*>(baton);
+  OutputStream stream(Env(), ref->get());
+  return stream_write(&stream, data, len);
+}
+
+apr_status_t cleanup_global_object(void* baton)
+{
+  delete static_cast<GlobalObject*>(baton);
+  return APR_SUCCESS;
+}
+} // anonymous namespace
+
+
+// Class Java::InputStream
+
+const char* const InputStream::m_class_name = "java/io/InputStream";
+InputStream::ClassImpl::ClassImpl(Env env, jclass cls)
+  : Object::ClassImpl(env, cls),
+    m_mid_close(env.GetMethodID(cls, "close", "()V")),
+    m_mid_mark_supported(env.GetMethodID(cls, "markSupported", "()Z")),
+    m_mid_mark(env.GetMethodID(cls, "mark", "(I)V")),
+    m_mid_reset(env.GetMethodID(cls, "reset", "()V")),
+    m_mid_read_byte(env.GetMethodID(cls, "read", "()I")),
+    m_mid_read_bytearray(env.GetMethodID(cls, "read", "([BII)I")),
+    m_mid_skip(env.GetMethodID(cls, "skip", "(J)J"))
+{}
+
+InputStream::ClassImpl::~ClassImpl() {}
+
+svn_stream_t*
+InputStream::get_global_stream(Env env, jobject jstream,
+                               const SVN::Pool& pool)
+{
+  if (!jstream)
+    return NULL;
+
+  const bool has_mark = InputStream(env, jstream).mark_supported();
+
+  std::auto_ptr<GlobalObject> baton(new GlobalObject(env, jstream));
+
+  svn_stream_t* const stream = svn_stream_create(baton.get(), pool.getPool());
+  svn_stream_set_read2(stream, global_stream_read,
+                       NULL /* only partial read support */);
+  svn_stream_set_skip(stream, global_stream_skip);
+  svn_stream_set_close(stream, global_stream_close_input);
+  if (has_mark)
+    {
+      svn_stream_set_mark(stream, global_stream_mark);
+      svn_stream_set_seek(stream, global_stream_seek);
+    }
+
+  apr_pool_cleanup_register(pool.getPool(), baton.release(),
+                            cleanup_global_object,
+                            apr_pool_cleanup_null);
+  return stream;
+}
+
+svn_stream_t* InputStream::get_stream(const SVN::Pool& pool)
+{
+  if (!m_jthis)
+    return NULL;
+
+  const bool has_mark = mark_supported();
+
+  svn_stream_t* const stream = svn_stream_create(this, pool.getPool());
+  svn_stream_set_read2(stream, stream_read,
+                       NULL /* only partial read support */);
+  svn_stream_set_skip(stream, stream_skip);
+  svn_stream_set_close(stream, stream_close_input);
+  if (has_mark)
+    {
+      svn_stream_set_mark(stream, stream_mark);
+      svn_stream_set_seek(stream, stream_seek);
+    }
+  return stream;
+}
+
+jint InputStream::read(void* data, jint length)
+{
+  ByteArray array(m_env, length);
+  const jint size = read(array);
+  if (size > 0)
+    {
+      ByteArray::Contents contents(array);
+      ::memcpy(static_cast<char*>(data), contents.data(), size);
+    }
+  return size;
+}
+
+// Class Java::OutputStream
+
+const char* const OutputStream::m_class_name = "java/io/OutputStream";
+
+OutputStream::ClassImpl::ClassImpl(Env env, jclass cls)
+  : Object::ClassImpl(env, cls),
+    m_mid_close(env.GetMethodID(cls, "close", "()V")),
+    m_mid_write_byte(env.GetMethodID(cls, "write", "(I)V")),
+    m_mid_write_bytearray(env.GetMethodID(cls, "write", "([BII)V"))
+{}
+
+OutputStream::ClassImpl::~ClassImpl() {}
+
+svn_stream_t*
+OutputStream::get_global_stream(Env env, jobject jstream,
+                               const SVN::Pool& pool)
+{
+  if (!jstream)
+    return NULL;
+
+  std::auto_ptr<GlobalObject> baton(new GlobalObject(env, jstream));
+
+  svn_stream_t* const stream = svn_stream_create(baton.get(), pool.getPool());
+  svn_stream_set_write(stream, global_stream_write);
+  svn_stream_set_close(stream, global_stream_close_output);
+
+  apr_pool_cleanup_register(pool.getPool(), baton.release(),
+                            cleanup_global_object,
+                            apr_pool_cleanup_null);
+  return stream;
+}
+
+svn_stream_t* OutputStream::get_stream(const SVN::Pool& pool)
+{
+  if (!m_jthis)
+    return NULL;
+
+  svn_stream_t* const stream = svn_stream_create(this, pool.getPool());
+  svn_stream_set_write(stream, stream_write);
+  svn_stream_set_close(stream, stream_close_output);
+  return stream;
+}
+
+} // namespace Java
diff --git a/subversion/bindings/javahl/native/jniwrapper/jni_io_stream.hpp b/subversion/bindings/javahl/native/jniwrapper/jni_io_stream.hpp
new file mode 100644
index 0000000..c0ee022
--- /dev/null
+++ b/subversion/bindings/javahl/native/jniwrapper/jni_io_stream.hpp
@@ -0,0 +1,281 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+#ifndef SVN_JAVAHL_JNIWRAPPER_IO_STREAM_HPP
+#define SVN_JAVAHL_JNIWRAPPER_IO_STREAM_HPP
+
+#include <cstring>
+#include <string>
+#include <memory>
+
+#include "jni_object.hpp"
+#include "jni_array.hpp"
+
+#include "../Pool.h"
+
+#include "svn_io.h"
+
+namespace Java {
+
+/**
+ * Object wrapper for @c java.io.InputStream.
+ *
+ * @since New in 1.9.
+ */
+class InputStream : public Object
+{
+public:
+  /**
+   * Constructs a wrapper around an existing @c InputStream @a jstream.
+   */
+  explicit InputStream(Env env, jobject jstream)
+    : Object(env, ClassCache::get_input_stream(env), jstream)
+    {}
+
+  /**
+   * Creates a stand-alone @c svn_stream_t allocated from @a pool that
+   * contains a global reference to @a jstream. This stream can safely
+   * be used in long-lived bound objects.
+   */
+  static svn_stream_t*
+  get_global_stream(Env env, jobject jstream, const SVN::Pool& pool);
+
+  /**
+   * Creates an @c svn_stream_t allocated from @a pool.
+   * <b>Do not use the returned stream past the lifetime of the
+   * current JNI native frame.</b>
+   */
+  svn_stream_t* get_stream(const SVN::Pool& pool);
+
+public:
+  /**
+   * Implements @c InputStream.close()
+   */
+  void close()
+    {
+      m_env.CallVoidMethod(m_jthis, impl().m_mid_close);
+    }
+
+  /**
+   * Implements @c InputStream.markSupported()
+   */
+  bool mark_supported()
+    {
+      return m_env.CallBooleanMethod(m_jthis, impl().m_mid_mark_supported);
+    }
+
+  /**
+   * Implements @c InputStream.mark(int)
+   */
+  void mark(jint readlimit)
+    {
+      m_env.CallVoidMethod(m_jthis, impl().m_mid_mark, readlimit);
+    }
+
+  /**
+   * Implements @c InputStream.reset()
+   */
+  void reset()
+    {
+      m_env.CallVoidMethod(m_jthis, impl().m_mid_reset);
+    }
+
+  /**
+   * Implements @c InputStream.read()
+   */
+  jint read()
+    {
+      return m_env.CallIntMethod(m_jthis, impl().m_mid_read_byte);
+    }
+
+  /**
+   * Implements @c InputStream.read(byte[],int,int)
+   */
+  jint read(ByteArray& dst, jint length = -1, jint offset = 0)
+    {
+      return m_env.CallIntMethod(m_jthis, impl().m_mid_read_bytearray,
+                                 dst.get(), offset,
+                                 (length >= 0 ? length
+                                  : dst.length() - offset));
+    }
+
+  /**
+   * Helper method to read data into a native buffer.
+   */
+  jint read(void* data, jint length);
+
+  /**
+   * Implements @c InputStream.skip(long)
+   */
+  jlong skip(jlong count)
+    {
+      return m_env.CallLongMethod(m_jthis, impl().m_mid_skip, count);
+    }
+
+private:
+  /**
+   * This object's implementation details.
+   */
+  class ClassImpl : public Object::ClassImpl
+  {
+    friend class ClassCacheImpl;
+
+  protected:
+    explicit ClassImpl(Env env, jclass cls);
+
+  public:
+    virtual ~ClassImpl();
+
+    const MethodID m_mid_close;
+    const MethodID m_mid_mark_supported;
+    const MethodID m_mid_mark;
+    const MethodID m_mid_reset;
+    const MethodID m_mid_read_byte;
+    const MethodID m_mid_read_bytearray;
+    const MethodID m_mid_skip;
+  };
+
+  friend class ClassCacheImpl;
+  static const char* const m_class_name;
+
+  const ClassImpl& impl() const
+    {
+      return *dynamic_cast<const ClassImpl*>(m_impl);
+    }
+};
+
+
+/**
+ * Object wrapper for @c java.io.OutputStream.
+ *
+ * @since New in 1.9.
+ */
+class OutputStream : public Object
+{
+public:
+  /**
+   * Constructs a wrapper around an existing @c OutputStream @a jstream.
+   */
+  explicit OutputStream(Env env, jobject jstream)
+    : Object(env, ClassCache::get_output_stream(env), jstream)
+    {}
+
+  /**
+   * Creates a stand-alone @c svn_stream_t allocated from @a pool that
+   * contains a global reference to @a jstream. This stream can safely
+   * be used in long-lived bound objects.
+   */
+  static svn_stream_t*
+  get_global_stream(Env env, jobject jstream, const SVN::Pool& pool);
+
+  /**
+   * Creates an @c svn_stream_t allocated from @a pool.
+   * <b>Do not use the returned stream past the lifetime of the
+   * current JNI native frame.</b>
+   */
+  svn_stream_t* get_stream(const SVN::Pool& pool);
+
+public:
+  /**
+   * Implements @c OuptutStream.close()
+   */
+  void close()
+    {
+      m_env.CallVoidMethod(m_jthis, impl().m_mid_close);
+    }
+
+  /**
+   * Implements @c OuptutStream.write(int)
+   */
+  void write(jint byte)
+    {
+      m_env.CallVoidMethod(m_jthis, impl().m_mid_write_byte, byte);
+    }
+
+  /**
+   * Implements @c OuptutStream.write(byte[],int,int)
+   */
+  void write(const ByteArray& src, jint length = -1, jint offset = 0)
+    {
+      m_env.CallVoidMethod(m_jthis, impl().m_mid_write_bytearray,
+                           src.get(), offset,
+                           (length >= 0 ? length
+                            : src.length() - offset));
+    }
+
+  /**
+   * Helper method to write data from a native buffer.
+   */
+  void write(const void* data, jint length, jint offset = 0)
+    {
+      write(ByteArray(m_env, data, length));
+    }
+
+  /**
+   * Helper method to write a C string to the stream.
+   */
+  void write(const char* text)
+    {
+      write(ByteArray(m_env, text));
+    }
+
+  /**
+   * Helper method to write a C++ string to the stream.
+   */
+  void write(const std::string& text)
+    {
+      write(ByteArray(m_env, text));
+    }
+
+private:
+  /**
+   * This object's implementation details.
+   */
+  class ClassImpl : public Object::ClassImpl
+  {
+    friend class ClassCacheImpl;
+
+  protected:
+    explicit ClassImpl(Env env, jclass cls);
+
+  public:
+    virtual ~ClassImpl();
+
+    const MethodID m_mid_close;
+    const MethodID m_mid_write_byte;
+    const MethodID m_mid_write_bytearray;
+  };
+
+  friend class ClassCacheImpl;
+  static void static_init(Env env);
+  static const char* const m_class_name;
+
+  const ClassImpl& impl() const
+    {
+      return *dynamic_cast<const ClassImpl*>(m_impl);
+    }
+};
+
+} // namespace Java
+
+#endif // SVN_JAVAHL_JNIWRAPPER_IO_STREAM_HPP
diff --git a/subversion/bindings/javahl/native/jniwrapper/jni_iterator.cpp b/subversion/bindings/javahl/native/jniwrapper/jni_iterator.cpp
new file mode 100644
index 0000000..a6e3d1c
--- /dev/null
+++ b/subversion/bindings/javahl/native/jniwrapper/jni_iterator.cpp
@@ -0,0 +1,63 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+#include <stdexcept>
+
+#include "jni_iterator.hpp"
+
+#include "svn_private_config.h"
+
+namespace Java {
+
+// Class Java::BaseIterator
+
+const char* const BaseIterator::m_class_name = "java/util/Iterator";
+
+BaseIterator::ClassImpl::ClassImpl(Env env, jclass cls)
+  : Object::ClassImpl(env, cls),
+    m_mid_has_next(env.GetMethodID(cls, "hasNext", "()Z")),
+    m_mid_next(env.GetMethodID(cls, "next", "()Ljava/lang/Object;"))
+{}
+
+BaseIterator::ClassImpl::~ClassImpl() {}
+
+jobject BaseIterator::next()
+{
+  try
+    {
+      return m_env.CallObjectMethod(m_jthis, impl().m_mid_next);
+    }
+  catch (const SignalExceptionThrown&)
+    {
+      // Just rethrow if it's not a NoSuchElementException.
+      if (!m_env.IsInstanceOf(
+              m_env.ExceptionOccurred(),
+              ClassCache::get_exc_no_such_element(m_env)->get_class()))
+        throw;
+
+      m_env.ExceptionClear();
+      throw std::range_error(_("Iterator out of bounds"));
+    }
+}
+
+} // namespace Java
diff --git a/subversion/bindings/javahl/native/jniwrapper/jni_iterator.hpp b/subversion/bindings/javahl/native/jniwrapper/jni_iterator.hpp
new file mode 100644
index 0000000..19c7976
--- /dev/null
+++ b/subversion/bindings/javahl/native/jniwrapper/jni_iterator.hpp
@@ -0,0 +1,91 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+#ifndef SVN_JAVAHL_JNIWRAPPER_ITERATOR_HPP
+#define SVN_JAVAHL_JNIWRAPPER_ITERATOR_HPP
+
+#include "jni_env.hpp"
+#include "jni_object.hpp"
+
+namespace Java {
+
+/**
+ * Non-template base for a Java iterator.
+ *
+ * @since New in 1.9.
+ */
+class BaseIterator : public Object
+{
+protected:
+  /**
+   * Constructs the iterator wrapper.
+   */
+  explicit BaseIterator(Env env, jobject jiterator)
+    : Object(env, ClassCache::get_iterator(env), jiterator)
+    {}
+
+public:
+  /**
+   * Returns @c false at the end of the iteration.
+   */
+  bool has_next() const
+    {
+      return m_env.CallBooleanMethod(m_jthis, impl().m_mid_has_next);
+    }
+
+  /**
+   * Returns the next object in the iteration.
+   * @throw std::range_error if the next object is not available.
+   */
+  jobject next();
+
+private:
+  /**
+   * This object's implementation details.
+   */
+  class ClassImpl : public Object::ClassImpl
+  {
+    friend class ClassCacheImpl;
+
+  protected:
+    explicit ClassImpl(Env env, jclass cls);
+
+  public:
+    virtual ~ClassImpl();
+
+    const MethodID m_mid_has_next;
+    const MethodID m_mid_next;
+  };
+
+  const ClassImpl& impl() const
+    {
+      return *dynamic_cast<const ClassImpl*>(m_impl);
+    }
+
+  friend class ClassCacheImpl;
+  static const char* const m_class_name;
+};
+
+} // namespace Java
+
+#endif // SVN_JAVAHL_JNIWRAPPER_ITERATOR_HPP
diff --git a/subversion/bindings/javahl/native/jniwrapper/jni_list.cpp b/subversion/bindings/javahl/native/jniwrapper/jni_list.cpp
new file mode 100644
index 0000000..e7b8a41
--- /dev/null
+++ b/subversion/bindings/javahl/native/jniwrapper/jni_list.cpp
@@ -0,0 +1,85 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+#include <stdexcept>
+#include <string>
+
+#include "jni_list.hpp"
+
+#include "svn_private_config.h"
+
+namespace Java {
+
+// Class Java::BaseImmutableList
+
+const char* const BaseImmutableList::m_class_name = "java/util/List";
+
+BaseImmutableList::ClassImpl::ClassImpl(Env env, jclass cls)
+  : Object::ClassImpl(env, cls),
+    m_mid_size(env.GetMethodID(cls, "size", "()I")),
+    m_mid_get(env.GetMethodID(cls, "get", "(I)Ljava/lang/Object;")),
+    m_mid_add(env.GetMethodID(cls, "add", "(Ljava/lang/Object;)Z")),
+    m_mid_clear(env.GetMethodID(cls, "clear", "()V")),
+    m_mid_iter(env.GetMethodID(cls, "listIterator", "()Ljava/util/ListIterator;"))
+{}
+
+BaseImmutableList::ClassImpl::~ClassImpl() {}
+
+jobject BaseImmutableList::operator[](jint index) const
+{
+  try
+    {
+      return m_env.CallObjectMethod(m_jthis, impl().m_mid_get, index);
+    }
+  catch (const SignalExceptionThrown&)
+    {
+      // Just rethrow if it's not an IndexOutOfBoundsException.
+      if (!m_env.IsInstanceOf(
+              m_env.ExceptionOccurred(),
+              ClassCache::get_exc_index_out_of_bounds(m_env)->get_class()))
+        throw;
+
+      m_env.ExceptionClear();
+      std::string msg(_("List index out of bounds: "));
+      msg += index;
+      throw std::out_of_range(msg.c_str());
+    }
+}
+
+BaseImmutableList::Iterator BaseImmutableList::get_iterator() const
+{
+  return Iterator(m_env, m_env.CallObjectMethod(m_jthis, impl().m_mid_iter));
+}
+
+// Class Java::BaseList
+
+const char* const BaseList::m_class_name = "java/util/ArrayList";
+
+BaseList::ClassImpl::ClassImpl(Env env, jclass cls)
+  : BaseImmutableList::ClassImpl(env, cls),
+    m_mid_ctor(env.GetMethodID(cls, "<init>", "(I)V"))
+{}
+
+BaseList::ClassImpl::~ClassImpl() {}
+
+} // namespace Java
diff --git a/subversion/bindings/javahl/native/jniwrapper/jni_list.hpp b/subversion/bindings/javahl/native/jniwrapper/jni_list.hpp
new file mode 100644
index 0000000..9a11fc1
--- /dev/null
+++ b/subversion/bindings/javahl/native/jniwrapper/jni_list.hpp
@@ -0,0 +1,307 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+#ifndef SVN_JAVAHL_JNIWRAPPER_LIST_HPP
+#define SVN_JAVAHL_JNIWRAPPER_LIST_HPP
+
+#include "jni_env.hpp"
+#include "jni_object.hpp"
+#include "jni_iterator.hpp"
+
+namespace Java {
+
+/**
+ * Non-template base for an immutable type-safe Java list.
+ *
+ * @since New in 1.9.
+ */
+class BaseImmutableList : public Object
+{
+public:
+  /**
+   * Returns the number of elements in the list.
+   */
+  jint length() const
+    {
+      return m_env.CallIntMethod(m_jthis, impl().m_mid_size);
+    }
+
+  /**
+   * Checks if the list is empty.
+   */
+  bool is_empty() const
+    {
+      return (length() == 0);
+    }
+
+protected:
+  /**
+   * Constructs the list wrapper
+   */
+  explicit BaseImmutableList(Env env, jobject jlist)
+    : Object(env, ClassCache::get_list(env), jlist)
+    {}
+
+  /**
+   * Constructor used by BaseList
+   */
+  explicit BaseImmutableList(Env env, const Object::ClassImpl* pimpl)
+    : Object(env, pimpl)
+    {}
+
+  /**
+   * Clears the contents of the list.
+   */
+  void clear()
+    {
+      m_env.CallVoidMethod(m_jthis, impl().m_mid_clear);
+    }
+
+  /**
+   * Appends @a obj to the end of the list.
+   */
+  void add(jobject obj)
+    {
+      m_env.CallVoidMethod(m_jthis, impl().m_mid_add, obj);
+    }
+
+  /**
+   * Returns the object reference at @a index.
+   * @throw std::out_of_range if the index value is not valid.
+   */
+  jobject operator[](jint index) const;
+
+  /**
+   * Iterator used by subclasses.
+   */
+  class Iterator : public BaseIterator
+  {
+    friend class BaseImmutableList;
+    explicit Iterator(Env env, jobject jiterator)
+      : BaseIterator(env, jiterator)
+      {}
+  };
+
+  /**
+   * Returns an iterator instance.
+   */
+  Iterator get_iterator() const;
+
+  /**
+   * This object's implementation details.
+   */
+  class ClassImpl : public Object::ClassImpl
+  {
+    friend class ClassCacheImpl;
+
+  protected:
+    explicit ClassImpl(Env env, jclass cls);
+
+  public:
+    virtual ~ClassImpl();
+
+    const MethodID m_mid_size;
+    const MethodID m_mid_get;
+    const MethodID m_mid_add;
+    const MethodID m_mid_clear;
+    const MethodID m_mid_iter;
+  };
+
+private:
+  friend class Iterator;
+  friend class ClassCacheImpl;
+  static const char* const m_class_name;
+
+  const ClassImpl& impl() const
+    {
+      return *dynamic_cast<const ClassImpl*>(m_impl);
+    }
+};
+
+/**
+ * Template wrapper for an immutable type-safe Java list.
+ *
+ * @since New in 1.9.
+ */
+template <typename T, typename NativeT=jobject>
+class ImmutableList : public BaseImmutableList
+{
+public:
+  /**
+   * Constructs the list wrapper.
+   */
+  explicit ImmutableList(Env env, jobject jlist)
+    : BaseImmutableList(env, jlist)
+    {}
+
+  /**
+   * Returns a wrapper object for the object reference at @a index.
+   * @throw std::out_of_range if the index value is not valid.
+   */
+  T operator[](jint index) const
+    {
+      return T(m_env, NativeT(BaseImmutableList::operator[](index)));
+    }
+
+  /**
+   * Iterates over the items in the list, calling @a function for
+   * each item.
+   * @see std::for_each
+   */
+  template<typename F>
+  F for_each(F function) const
+    {
+      Iterator iter(get_iterator());
+      while (iter.has_next())
+        function(T(m_env, NativeT(iter.next())));
+      return function;
+    }
+};
+
+/**
+ * Non-template base for a mutable type-safe Java list.
+ *
+ * @since New in 1.9.
+ */
+class BaseList : public BaseImmutableList
+{
+public:
+  /**
+   * Clears the contents of the list.
+   */
+  void clear()
+    {
+      BaseImmutableList::clear();
+    }
+
+protected:
+  /**
+   * Constructs the list wrapper, treating @a jlist as a @c java.util.List.
+   */
+  explicit BaseList(Env env, jobject jlist)
+    : BaseImmutableList(env, jlist)
+    {}
+
+  /**
+   * Constructs and wraps an empty list of type @c java.util.ArrayList
+   * with initial allocation size @a length.
+   */
+  explicit BaseList(Env env, jint length)
+    : BaseImmutableList(env, ClassCache::get_array_list(env))
+    {
+      set_this(env.NewObject(get_class(), impl().m_mid_ctor, length));
+    }
+
+  /**
+   * Appends @a obj to the end of the list.
+   */
+  void add(jobject obj)
+    {
+      BaseImmutableList::add(obj);
+    }
+
+private:
+  /**
+   * This object's implementation details.
+   */
+  class ClassImpl : public BaseImmutableList::ClassImpl
+  {
+    friend class ClassCacheImpl;
+
+  protected:
+    explicit ClassImpl(Env env, jclass cls);
+
+  public:
+    virtual ~ClassImpl();
+
+    const MethodID m_mid_ctor;
+  };
+
+  friend class ClassCacheImpl;
+  static const char* const m_class_name;
+
+  const ClassImpl& impl() const
+    {
+      return *dynamic_cast<const ClassImpl*>(m_impl);
+    }
+};
+
+/**
+ * Template wrapper for a mutable type-safe Java list.
+ *
+ * @since New in 1.9.
+ */
+template <typename T, typename NativeT=jobject>
+class List : public BaseList
+{
+public:
+  /**
+   * Constructs the list wrapper, deriving the class from @a jlist.
+   */
+  explicit List(Env env, jobject jlist)
+    : BaseList(env, jlist)
+    {}
+
+  /**
+   * Constructs and wraps an empty list of type @c java.util.ArrayList
+   * with initial allocation size @a length.
+   */
+  explicit List(Env env, jint length_ = 0)
+    : BaseList(env, length_)
+    {}
+
+  /**
+   * Returns a wrapper object for the object reference at @a index.
+   * @throw std::out_of_range if the index value is not valid.
+   */
+  T operator[](jint index) const
+    {
+      return T(m_env, NativeT(BaseList::operator[](index)));
+    }
+
+  /**
+   * Appends @a obj to the end of the list.
+   */
+  void add(const T& obj)
+    {
+      BaseList::add(obj.get());
+    }
+
+  /**
+   * Iterates over the items in the list, calling @a function for
+   * each item.
+   * @see std::for_each
+   */
+  template<typename F>
+  F for_each(F function) const
+    {
+      Iterator iter(get_iterator());
+      while (iter.has_next())
+        function(T(m_env, NativeT(iter.next())));
+      return function;
+    }
+};
+
+} // namespace Java
+
+#endif // SVN_JAVAHL_JNIWRAPPER_LIST_HPP
diff --git a/subversion/bindings/javahl/native/jniwrapper/jni_object.hpp b/subversion/bindings/javahl/native/jniwrapper/jni_object.hpp
new file mode 100644
index 0000000..2e05a06
--- /dev/null
+++ b/subversion/bindings/javahl/native/jniwrapper/jni_object.hpp
@@ -0,0 +1,285 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+#ifndef SVN_JAVAHL_JNIWRAPPER_OBJECT_HPP
+#define SVN_JAVAHL_JNIWRAPPER_OBJECT_HPP
+
+#include "jni_env.hpp"
+#include "jni_globalref.hpp"
+
+namespace Java {
+
+/**
+ * An abstract wrapper for a @c java.lang.Object instance.
+ *
+ * This is the base class for all concrete object wrapper classes. It
+ * is self-contained in the sense that it heeps its own JVM
+ * environment, class and object reference; Java object methods are
+ * expected to be exposed as methods of derived classes.
+ *
+ * The associated JNI class reference is stored for the lifetime of
+ * the JVM in the global class cache.
+ *
+ * @since New in 1.9.
+ */
+class Object
+{
+public:
+  /**
+   * Returns the wrapped JNI object reference.
+   */
+  jobject get() const
+    {
+      return m_jthis;
+    }
+
+  /**
+   * Returns the wrapped JNI class reference.
+   */
+  jclass get_class() const
+    {
+      return m_impl->get_class();
+    }
+
+  /**
+   * Returns the wrapped enviromnment reference.
+   */
+  Env get_env() const
+    {
+      return m_env;
+    }
+
+  /**
+   * This object's implementation details.
+   */
+  class ClassImpl
+  {
+  public:
+    jclass get_class() const
+      {
+        return m_class.get();
+      }
+
+    virtual ~ClassImpl();
+
+  protected:
+    explicit ClassImpl(Env env, jclass cls)
+      : m_class(env, cls)
+      {}
+
+  private:
+    friend class ClassCacheImpl;
+
+    GlobalClass m_class;  ///< Class reference for this object wrapper
+
+    // Non-copyable
+    ClassImpl(const ClassImpl&);
+    ClassImpl& operator=(const ClassImpl&);
+  };
+
+protected:
+  /**
+   * constructs an object wrapper given the class @a impl and an
+   * object reference @a jthis.
+   */
+  Object(Env env, const ClassImpl* impl, jobject jthis = NULL)
+    : m_env(env),
+      m_impl(impl),
+      m_jthis(jthis)
+    {}
+
+  const Env m_env;               ///< JVM environment wrapper
+  const ClassImpl* const m_impl; ///< Class implementation details
+  const jobject m_jthis;         ///< @c this object reference
+
+  /**
+   * Certain subclasses need a fully constructed base Object before
+   * they can create the wrapped JNI object. They can use this
+   * function to oveerride the constness of @c m_jthis, but only if
+   * they're changing a @c NULL @c m_jthis to a concrete value.
+   */
+  void set_this(jobject jthis)
+    {
+      if (!m_jthis && jthis)
+        *const_cast<jobject*>(&m_jthis) = jthis;
+    }
+
+private:
+  friend class ClassCacheImpl;
+  static const char* const m_class_name;
+};
+
+// Forward declaration
+class ClassCacheImpl;
+
+/**
+ * A singleton cache for global class references.
+ *
+ * The instance is created when the native library is loaded by the
+ * JVM, and destroyed when it is unloaded. It creates global
+ * references for a number of classes and calls said classes'
+ * single-threded static initializers, which usually find and store
+ * method and field IDs (which are usually only valid until the
+ * associated class is garbage-collected).
+ *
+ * Be aware that as long as the global references exist, these classes
+ * cannot be garbage-collected. The number of classes stored in this
+ * cache should therefore be kept to a reasonable minimum.
+ *
+ * @since New in 1.9.
+ */
+class ClassCache
+{
+  // Cannot create instances of this type.
+  ClassCache();
+  ~ClassCache();
+
+  static ClassCacheImpl* m_impl;
+
+public:
+  /* This static initializer must only be called by JNI_OnLoad */
+  static void create();
+
+  /* This static finalizer must only be called by JNI_OnUnload */
+  static void destroy();
+
+#define JNIWRAPPER_DECLARE_CACHED_CLASS_ACCESSOR(M)     \
+  static const Object::ClassImpl* get_##M(Env env);
+
+  JNIWRAPPER_DECLARE_CACHED_CLASS_ACCESSOR(object);
+  JNIWRAPPER_DECLARE_CACHED_CLASS_ACCESSOR(classtype);
+  JNIWRAPPER_DECLARE_CACHED_CLASS_ACCESSOR(throwable);
+  JNIWRAPPER_DECLARE_CACHED_CLASS_ACCESSOR(string);
+
+  JNIWRAPPER_DECLARE_CACHED_CLASS_ACCESSOR(exc_index_out_of_bounds);
+  JNIWRAPPER_DECLARE_CACHED_CLASS_ACCESSOR(exc_no_such_element);
+
+  JNIWRAPPER_DECLARE_CACHED_CLASS_ACCESSOR(list);
+  JNIWRAPPER_DECLARE_CACHED_CLASS_ACCESSOR(array_list);
+
+  JNIWRAPPER_DECLARE_CACHED_CLASS_ACCESSOR(map);
+  JNIWRAPPER_DECLARE_CACHED_CLASS_ACCESSOR(set);
+  JNIWRAPPER_DECLARE_CACHED_CLASS_ACCESSOR(iterator);
+  JNIWRAPPER_DECLARE_CACHED_CLASS_ACCESSOR(map_entry);
+  JNIWRAPPER_DECLARE_CACHED_CLASS_ACCESSOR(hash_map);
+
+  JNIWRAPPER_DECLARE_CACHED_CLASS_ACCESSOR(input_stream);
+  JNIWRAPPER_DECLARE_CACHED_CLASS_ACCESSOR(output_stream);
+
+  JNIWRAPPER_DECLARE_CACHED_CLASS_ACCESSOR(byte_buffer);
+
+  JNIWRAPPER_DECLARE_CACHED_CLASS_ACCESSOR(subversion_exception);
+
+  JNIWRAPPER_DECLARE_CACHED_CLASS_ACCESSOR(authn_cb);
+  JNIWRAPPER_DECLARE_CACHED_CLASS_ACCESSOR(authn_result);
+  JNIWRAPPER_DECLARE_CACHED_CLASS_ACCESSOR(authn_ssl_server_cert_failures);
+  JNIWRAPPER_DECLARE_CACHED_CLASS_ACCESSOR(authn_ssl_server_cert_info);
+  JNIWRAPPER_DECLARE_CACHED_CLASS_ACCESSOR(user_passwd_cb);
+
+  JNIWRAPPER_DECLARE_CACHED_CLASS_ACCESSOR(credential);
+  JNIWRAPPER_DECLARE_CACHED_CLASS_ACCESSOR(credential_kind);
+
+  JNIWRAPPER_DECLARE_CACHED_CLASS_ACCESSOR(external_item);
+
+  JNIWRAPPER_DECLARE_CACHED_CLASS_ACCESSOR(editor_provide_base_cb);
+  JNIWRAPPER_DECLARE_CACHED_CLASS_ACCESSOR(editor_provide_base_cb_ret);
+  JNIWRAPPER_DECLARE_CACHED_CLASS_ACCESSOR(editor_provide_props_cb);
+  JNIWRAPPER_DECLARE_CACHED_CLASS_ACCESSOR(editor_provide_props_cb_ret);
+  JNIWRAPPER_DECLARE_CACHED_CLASS_ACCESSOR(editor_get_kind_cb);
+#undef JNIWRAPPER_DECLARE_CACHED_CLASS
+};
+
+
+/**
+ * Object wrapper for @c java.lang.Class.
+ *
+ * The associated JNI class reference is stored for the lifetime of
+ * the JVM in the global class cache.
+ *
+ * @since New in 1.9.
+ */
+class Class
+{
+public:
+  /**
+   * Constructs class instance wrapper for @a obj.
+   */
+  explicit Class(Env env, jobject obj);
+
+  /**
+   * Constructs class instance wrapper for @a obj.
+   */
+  explicit Class(const Object& obj);
+
+  /**
+   * Wrapper for the Java @c getName() method.
+   */
+  jstring get_name() const;
+
+  /**
+   * Returns the wrapped class instance.
+   */
+  jobject get() const
+    {
+      return m_jthis;
+    }
+
+  /**
+   * Returns the wrapped enviromnment reference.
+   */
+  Env get_env() const
+    {
+      return m_env;
+    }
+
+private:
+  /**
+   * This object's implementation details.
+   */
+  class ClassImpl : public Object::ClassImpl
+  {
+    friend class ClassCacheImpl;
+
+  protected:
+    explicit ClassImpl(Env env, jclass cls)
+      : Object::ClassImpl(env, cls)
+      {}
+
+  public:
+    virtual ~ClassImpl();
+  };
+
+  const Env m_env;        ///< JVM environment wrapper
+  const jobject m_jthis;  ///< Class instance
+
+  friend class ClassCacheImpl;
+  static const char* const m_class_name;
+  static void static_init(Env env, jclass class_type);
+
+  static MethodID m_mid_get_class;
+  static MethodID m_mid_get_name;
+};
+
+} // namespace Java
+
+#endif // SVN_JAVAHL_JNIWRAPPER_OBJECT_HPP
diff --git a/subversion/bindings/javahl/native/jniwrapper/jni_stack.hpp b/subversion/bindings/javahl/native/jniwrapper/jni_stack.hpp
new file mode 100644
index 0000000..13e35e3
--- /dev/null
+++ b/subversion/bindings/javahl/native/jniwrapper/jni_stack.hpp
@@ -0,0 +1,220 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+#ifndef SVN_JAVAHL_JNIWRAPPER_STACK_HPP
+#define SVN_JAVAHL_JNIWRAPPER_STACK_HPP
+
+#ifdef SVN_JAVAHL_DEBUG
+#  ifndef SVN_JAVAHL_ASSERT_EXCEPTION_THROWN
+#    include <cassert>
+#    define SVN_JAVAHL_ASSERT_EXCEPTION_THROWN(E) \
+       assert((E).ExceptionCheck())
+#  endif // SVN_JAVAHL_ASSERT_EXCEPTION_THROWN
+#else
+#  define SVN_JAVAHL_ASSERT_EXCEPTION_THROWN(E)
+# endif // SVN_JAVAHL_DEBUG
+
+#include "../JNIStackElement.h"
+#include "jni_env.hpp"
+#include "jni_exception.hpp"
+
+#include "svn_error.h"
+
+/**
+ * Boilerplate for the native method implementation entry point.
+ *
+ * Every native method implementation should start by invoking this
+ * macro to initialize the logging stack element and begin the
+ * try/catch block of the function body.
+ *
+ * @param C The name of the Java class that declares this method.
+ * @param M The (Java) name of the method.
+ *
+ * This macro expects two additional parameters to be available
+ * (either as function arguments or local variables):
+ * @c JNIEnv* @a jenv and @c jobject @a jthis.
+ *
+ * @since New in 1.9.
+ */
+#define SVN_JAVAHL_JNI_TRY(C, M)                                \
+  ::JNIStackElement st_ac_ke_le_me_nt_(jenv, #C, #M, jthis);    \
+  try
+
+/**
+ * Boilerplate for the native method implementation entry point.
+ *
+ * Initializes local variable named @a V as a pointer to an instance
+ * of the native-bound class @a C.
+ *
+ * @since New in 1.9.
+ */
+#define SVN_JAVAHL_GET_BOUND_OBJECT(C, V)               \
+  C* const V = C::get_self(::Java::Env(jenv), jthis)
+
+/**
+ * Boilerplate for the native method implementation entry point.
+ *
+ * Like #SVN_JAVAHL_JNI_TRY, but for static methods where the @c jthis
+ * argument is not available.
+ *
+ * This macro expects two additional parameters to be available
+ * (either as function arguments or local variables):
+ * @c JNIEnv* @a jenv and @c jclass @a jclazz.
+ *
+ * @since New in 1.9.
+ */
+#define SVN_JAVAHL_JNI_TRY_STATIC(C, M)                         \
+  ::JNIStackElement st_ac_ke_le_me_nt_(jenv, #C, #M, jclazz);   \
+  try
+
+
+/**
+ * Boilerplate for the native method implementation exit point.
+ *
+ * Every native method implementation should end by invoking this
+ * macro to close the try/catch block of the function body and handle
+ * any exceptions thrown by the method implementation.
+ *
+ * This boilerplate variant converts C++ exceptions to the Java
+ * exception type @a X, but retains exceptions that are already in
+ * progress.
+ *
+ * @since New in 1.9.
+ */
+#define SVN_JAVAHL_JNI_CATCH_TO_EXCEPTION(X)                            \
+  catch (const ::Java::SignalExceptionThrown&)                          \
+    {                                                                   \
+      SVN_JAVAHL_ASSERT_EXCEPTION_THROWN(::Java::Env(jenv));            \
+    }                                                                   \
+  catch (const ::std::exception& ex)                                    \
+    {                                                                   \
+      X(::Java::Env(jenv)).throw_java_exception(ex.what());             \
+    }                                                                   \
+  catch (...)                                                           \
+    {                                                                   \
+      const char* const msg = Java::unknown_cxx_exception_message();    \
+      X(::Java::Env(jenv)).throw_java_exception(msg);                   \
+    }
+
+/**
+ * Boilerplate for the native method implementation exit point.
+ *
+ * Invokes #SVN_JAVAHL_JNI_CATCH_TO_EXCEPTION to throw a
+ * @c RuntimeException.
+ *
+ * @since New in 1.9.
+ */
+#define SVN_JAVAHL_JNI_CATCH                                            \
+  SVN_JAVAHL_JNI_CATCH_TO_EXCEPTION(::Java::RuntimeException)
+
+/**
+ * Invocation wrapper for functions that return an @c svn_error_t *.
+ *
+ * @param E A wrapped environment (@c Java::Env) instance.
+ * @param S The statement to execute in the checked context.
+ *
+ * @since New in 1.9.
+ */
+#define SVN_JAVAHL_CHECK(E, S)                                          \
+  do {                                                                  \
+    svn_error_t* const ja_va_hl_err_te_mp_ = (S);                       \
+    if (ja_va_hl_err_te_mp_)                                            \
+      ::Java::handle_svn_error((E), ja_va_hl_err_te_mp_);               \
+  } while(0)
+
+/**
+ * Invocation wrapper for calling Java methods that may throw an
+ * exception from within a native callback that is expected to return
+ * an @c svn_error_t*.
+ *
+ * @param E A wrapped environment (@c Java::Env) instance.
+ * @param C A Subversion or APR error code.
+ * @param S The statement to execute in the checked context.
+ *
+ * @since New in 1.9.
+ */
+#define SVN_JAVAHL_CATCH(E, C, S)                                       \
+  try                                                                   \
+    {                                                                   \
+      S;                                                                \
+    }                                                                   \
+  catch (const ::Java::SignalExceptionThrown&)                          \
+    {                                                                   \
+      SVN_JAVAHL_ASSERT_EXCEPTION_THROWN((E));                          \
+      return Java::caught_java_exception_error((C));                    \
+    }                                                                   \
+  catch (const ::std::exception& ex)                                    \
+    {                                                                   \
+      const char* const msg = ex.what();                                \
+      ::Java::RuntimeException((E)).throw_java_exception(msg);          \
+      return svn_error_create((C), NULL, msg);                          \
+    }                                                                   \
+  catch (...)                                                           \
+    {                                                                   \
+      const char* const msg = Java::unknown_cxx_exception_message();    \
+      ::Java::RuntimeException((E)).throw_java_exception(msg);          \
+      return svn_error_create((C), NULL, msg);                          \
+    }
+
+/**
+ * Exception checker for the oldstyle implementation that does not use
+ * the @c Java::Env environment wrapper.
+ *
+ * @param E A wrapped environment (@c Java::Env) instance.
+ *
+ * @since New in 1.9.
+ */
+#define SVN_JAVAHL_OLDSTYLE_EXCEPTION_CHECK(E)  \
+  do {                                          \
+    if ((E).ExceptionCheck())                   \
+      throw ::Java::SignalExceptionThrown();    \
+  } while(0)
+
+
+namespace Java {
+
+/**
+ * Handle an error @a err returned from a native function and throws
+ * an appropriate Java exception.
+ *
+ * @since New in 1.9.
+ */
+void handle_svn_error(Env env, svn_error_t* err);
+
+/**
+ * Return a localized error string for an unknown C++ exception.
+ *
+ * @since New in 1.9.
+ */
+const char* unknown_cxx_exception_message() throw();
+
+/**
+ * Create an svn_error_t for a caught Java exception.
+ *
+ * @since New in 1.9.
+ */
+svn_error_t* caught_java_exception_error(apr_status_t status) throw();
+
+} // namespace Java
+
+#endif // SVN_JAVAHL_JNIWRAPPER_STACK_HPP
diff --git a/subversion/bindings/javahl/native/jniwrapper/jni_string.hpp b/subversion/bindings/javahl/native/jniwrapper/jni_string.hpp
new file mode 100644
index 0000000..7b874d0
--- /dev/null
+++ b/subversion/bindings/javahl/native/jniwrapper/jni_string.hpp
@@ -0,0 +1,251 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+#ifndef SVN_JAVAHL_JNIWRAPPER_STRING_HPP
+#define SVN_JAVAHL_JNIWRAPPER_STRING_HPP
+
+#include <cstring>
+#include <string>
+
+#include <apr_pools.h>
+
+#include "jni_object.hpp"
+
+namespace Java {
+
+/**
+ * Object wrapper for @c java.lang.String.
+ *
+ * The associated JNI class reference is stored for the lifetime of
+ * the JVM in the global class cache.
+ *
+ * @since New in 1.9.
+ */
+class String
+{
+public:
+  /**
+   * Constructs a wrapper around an existing string @a str.
+   */
+  explicit String(Env env, jstring str)
+    : m_env(env),
+      m_jthis(str)
+    {}
+
+  /**
+   * Constructs a new string and wrapper from @a text.
+   */
+  explicit String(Env env, const char* text)
+    : m_env(env),
+      m_jthis(env.NewStringUTF(text))
+    {}
+
+  /**
+   * Constructs a new string and wrapper from @a text.
+   */
+  explicit String(Env env, const std::string& text)
+    : m_env(env),
+      m_jthis(env.NewStringUTF(text.c_str()))
+    {}
+
+  /**
+   * Returns the wrapped JNI object reference.
+   */
+  jstring get() const
+    {
+      return m_jthis;
+    }
+
+  /**
+   * Returns the wrapped enviromnment reference.
+   */
+  Env get_env() const
+    {
+      return m_env;
+    }
+
+  /**
+   * Returns the number of Unicode characters in the string.
+   */
+  jsize length() const
+    {
+      return m_env.GetStringLength(get());
+    }
+
+  /**
+   * Returns the length of the modified UTF-8 representation of the
+   * string.
+   */
+  jsize utf8_length() const
+    {
+      return m_env.GetStringUTFLength(get());
+    }
+
+  /**
+   * Copies the contents of the modified UTF-8 representation of the
+   * string into @a pool.
+   */
+  const char* strdup(apr_pool_t* pool) const;
+
+  /**
+   * Accessor class for the contents of the string.
+   *
+   * Objects of this class should be created within the scope where
+   * the raw C string is required. They will create an immutable
+   * modified UTF-8 representation of the string contents. The data
+   * will be released by the destructor.
+   */
+  class Contents
+  {
+  public:
+    /**
+     * Constructs an immutable string contents accessor.
+     */
+    explicit Contents(const String& str)
+      : m_str(str),
+        m_text(!str.get() ? NULL
+               : str.m_env.GetStringUTFChars(str.get(), NULL)),
+        m_length(m_text ? jsize(::std::strlen(m_text)) : 0)
+      {}
+
+    /**
+     * Releases the string contents, possibly committing changes to the JVM.
+     */
+    ~Contents()
+      {
+        if (m_text)
+          m_str.m_env.ReleaseStringUTFChars(m_str.get(), NULL);
+      }
+
+    /**
+     * Returns the C representation of the string contents.
+     */
+    const char* c_str() const
+      {
+        return m_text;
+      }
+
+    /**
+     * Returns the length of the C representation of the string.
+     */
+    jsize utf8_length() const
+      {
+        return m_length;
+      }
+
+  protected:
+    const String& m_str;
+    const char* m_text;
+    jsize m_length;
+  };
+
+  /**
+   * Accessor class for the contents of the string.
+   *
+   * Behaves like the #Contents class, but the representation is
+   * considered mutable and can be assigned a new value, which will be
+   * subsequently committed to the JVM.
+   */
+  class MutableContents : protected Contents
+  {
+  public:
+    /**
+     * Constructs a mutable string contents accessor.
+     */
+    explicit MutableContents(String& str)
+      : Contents(str),
+        m_new_text(NULL)
+      {}
+
+    /**
+     * Releases the string contents, possibly committing changes to the JVM.
+     */
+    ~MutableContents()
+      {
+        if (m_new_text)
+          {
+            // Prevent double-release by the Contents destructor.
+            m_text = NULL;
+            m_str.m_env.ReleaseStringUTFChars(m_str.get(), m_new_text);
+          }
+      }
+
+    /**
+     * Returns the C representation of the string contents.
+     */
+    const char* c_str() const
+      {
+        if (m_new_text)
+          return m_new_text;
+        return Contents::c_str();
+      }
+
+    /**
+     * Returns the length of the C representation of the string.
+     */
+    jsize utf8_length() const
+      {
+        return Contents::utf8_length();
+      }
+
+    /**
+     * Sets a new value for the string, to be committed to the JVM
+     * when the accessor object is destroyed.
+     * @throw std::invalid_argument if the @a new_text is @c null
+     * @throw std::logic_error if this is a @c null or immutable string
+     */
+    void set_value(const char* new_text);
+
+  private:
+    const char* m_new_text;
+  };
+
+private:
+  const Env m_env;
+  const jstring m_jthis;
+
+  /**
+   * This object's implementation details.
+   */
+  class ClassImpl : public Object::ClassImpl
+  {
+    friend class ClassCacheImpl;
+
+  protected:
+    explicit ClassImpl(Env env, jclass cls)
+      : Object::ClassImpl(env, cls)
+      {}
+
+  public:
+    virtual ~ClassImpl();
+  };
+
+  friend class Contents;
+  friend class MutableContents;
+  friend class ClassCacheImpl;
+  static const char* const m_class_name;
+};
+
+} // namespace Java
+
+#endif // SVN_JAVAHL_JNIWRAPPER_STRING_HPP
diff --git a/subversion/bindings/javahl/native/jniwrapper/jni_string_map.cpp b/subversion/bindings/javahl/native/jniwrapper/jni_string_map.cpp
new file mode 100644
index 0000000..369d956
--- /dev/null
+++ b/subversion/bindings/javahl/native/jniwrapper/jni_string_map.cpp
@@ -0,0 +1,110 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+#include <stdexcept>
+
+#include "jni_string.hpp"
+#include "jni_string_map.hpp"
+
+#include "svn_private_config.h"
+
+namespace Java {
+
+// Class Java::BaseImmutableMap
+
+const char* const BaseImmutableMap::m_class_name = "java/util/Map";
+
+BaseImmutableMap::ClassImpl::ClassImpl(Env env, jclass cls)
+  : Object::ClassImpl(env, cls),
+    m_mid_put(env.GetMethodID(cls, "put",
+                              "(Ljava/lang/Object;Ljava/lang/Object;)"
+                              "Ljava/lang/Object;")),
+    m_mid_clear(env.GetMethodID(cls, "clear", "()V")),
+    m_mid_has_key(env.GetMethodID(cls, "containsKey",
+                                  "(Ljava/lang/Object;)Z")),
+    m_mid_get(env.GetMethodID(cls, "get",
+                              "(Ljava/lang/Object;)Ljava/lang/Object;")),
+    m_mid_size(env.GetMethodID(cls, "size", "()I")),
+    m_mid_entry_set(env.GetMethodID(cls, "entrySet", "()Ljava/util/Set;"))
+{}
+
+BaseImmutableMap::ClassImpl::~ClassImpl() {}
+
+jobject BaseImmutableMap::operator[](const std::string& index) const
+{
+  const String key(m_env, index);
+  if (!m_env.CallBooleanMethod(m_jthis, impl().m_mid_has_key, key.get()))
+    {
+      std::string msg(_("Map does not contain key: "));
+      msg += index;
+      throw std::out_of_range(msg.c_str());
+    }
+  return m_env.CallObjectMethod(m_jthis, impl().m_mid_get, key.get());
+}
+
+BaseImmutableMap::Iterator BaseImmutableMap::get_iterator() const
+{
+  const jobject jentry_set =
+    m_env.CallObjectMethod(m_jthis, impl().m_mid_entry_set);
+  const jobject jiterator =
+    m_env.CallObjectMethod(jentry_set, Set::impl(m_env).m_mid_iterator);
+  return Iterator(m_env, jiterator);
+}
+
+// Class Java::BaseImmutableMap::Entry
+
+const char* const BaseImmutableMap::Entry::m_class_name = "java/util/Map$Entry";
+
+BaseImmutableMap::Entry::ClassImpl::ClassImpl(Env env, jclass cls)
+  : Object::ClassImpl(env, cls),
+    m_mid_get_key(env.GetMethodID(cls, "getKey", "()Ljava/lang/Object;")),
+    m_mid_get_value(env.GetMethodID(cls, "getValue", "()Ljava/lang/Object;"))
+{}
+
+BaseImmutableMap::Entry::ClassImpl::~ClassImpl() {}
+
+// Class Java::BaseImmutableMap::Set
+
+const char* const BaseImmutableMap::Set::m_class_name = "java/util/Set";
+
+BaseImmutableMap::Set::ClassImpl::ClassImpl(Env env, jclass cls)
+  : Object::ClassImpl(env, cls),
+    m_mid_iterator(env.GetMethodID(cls, "iterator",
+                                   "()Ljava/util/Iterator;"))
+{}
+
+BaseImmutableMap::Set::ClassImpl::~ClassImpl() {}
+
+
+// Class Java::BaseMap
+
+const char* const BaseMap::m_class_name = "java/util/HashMap";
+
+BaseMap::ClassImpl::ClassImpl(Env env, jclass cls)
+  : BaseImmutableMap::ClassImpl(env, cls),
+    m_mid_ctor(env.GetMethodID(cls, "<init>", "(I)V"))
+{}
+
+BaseMap::ClassImpl::~ClassImpl() {}
+
+} // namespace Java
diff --git a/subversion/bindings/javahl/native/jniwrapper/jni_string_map.hpp b/subversion/bindings/javahl/native/jniwrapper/jni_string_map.hpp
new file mode 100644
index 0000000..db05e28
--- /dev/null
+++ b/subversion/bindings/javahl/native/jniwrapper/jni_string_map.hpp
@@ -0,0 +1,384 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+#ifndef SVN_JAVAHL_JNIWRAPPER_STRING_MAP_HPP
+#define SVN_JAVAHL_JNIWRAPPER_STRING_MAP_HPP
+
+#include <string>
+
+#include "jni_env.hpp"
+#include "jni_object.hpp"
+#include "jni_iterator.hpp"
+
+namespace Java {
+
+/**
+ * Non-template base for an immutable type-safe Java map with String keys.
+ *
+ * @since New in 1.9.
+ */
+class BaseImmutableMap : public Object
+{
+public:
+  /**
+   * Returns the number of elements in the map.
+   */
+  jint length() const
+    {
+      return m_env.CallIntMethod(m_jthis, impl().m_mid_size);
+    }
+
+  /**
+   * Checks if the map is empty.
+   */
+  bool is_empty() const
+    {
+      return (length() == 0);
+    }
+
+protected:
+  /**
+   * Constructs the map wrapper.
+   */
+  explicit BaseImmutableMap(Env env, jobject jmap)
+    : Object(env, ClassCache::get_map(env), jmap)
+    {}
+
+  /**
+   * Constructor used by BaseMap.
+   */
+  explicit BaseImmutableMap(Env env, const Object::ClassImpl* pimpl)
+    : Object(env, pimpl)
+    {}
+
+  /**
+   * Clears the contents of the map.
+   */
+  void clear()
+    {
+      m_env.CallVoidMethod(m_jthis, impl().m_mid_clear);
+    }
+
+  /**
+   * Inserts @a obj identified by @a key into the map.
+   */
+  void put(const std::string& key, jobject obj)
+    {
+      m_env.CallObjectMethod(m_jthis, impl().m_mid_put,
+                             String(m_env, key).get(), obj);
+    }
+
+  /**
+   * Returns the object reference identified by @a index.
+   * @throw std::out_of_range if there is no such element.
+   */
+  jobject operator[](const std::string& index) const;
+
+  /**
+   * This object's implementation details.
+   */
+  class ClassImpl : public Object::ClassImpl
+  {
+    friend class ClassCacheImpl;
+
+  protected:
+    explicit ClassImpl(Env env, jclass cls);
+
+  public:
+    virtual ~ClassImpl();
+
+    const MethodID m_mid_put;
+    const MethodID m_mid_clear;
+    const MethodID m_mid_has_key;
+    const MethodID m_mid_get;
+    const MethodID m_mid_size;
+    const MethodID m_mid_entry_set;
+  };
+
+  const ClassImpl& impl() const
+    {
+      return *dynamic_cast<const ClassImpl*>(m_impl);
+    }
+
+  friend class ClassCacheImpl;
+  static const char* const m_class_name;
+
+  class Iterator : public BaseIterator
+  {
+    friend class BaseImmutableMap;
+    explicit Iterator(Env env, jobject jiterator)
+      : BaseIterator(env, jiterator)
+      {}
+  };
+
+  Iterator get_iterator() const;
+
+  class Entry : public Object
+  {
+  public:
+    explicit Entry(Env env, jobject jentry)
+    : Object(env, ClassCache::get_map_entry(env), jentry)
+    {}
+
+    const std::string key() const
+      {
+        const jstring jkey =
+          jstring(m_env.CallObjectMethod(m_jthis, impl().m_mid_get_key));
+        const String::Contents key(String(m_env, jkey));
+        return std::string(key.c_str());
+      }
+
+    jobject value() const
+      {
+        return m_env.CallObjectMethod(m_jthis, impl().m_mid_get_value);
+      }
+
+  private:
+    /**
+     * This object's implementation details.
+     */
+    class ClassImpl : public Object::ClassImpl
+    {
+      friend class ClassCacheImpl;
+
+    protected:
+      explicit ClassImpl(Env env, jclass cls);
+
+    public:
+      virtual ~ClassImpl();
+
+      const MethodID m_mid_get_key;
+      const MethodID m_mid_get_value;
+    };
+
+    friend class ClassCacheImpl;
+    static const char* const m_class_name;
+    const ClassImpl& impl() const
+      {
+        return *dynamic_cast<const ClassImpl*>(m_impl);
+      }
+  };
+
+private:
+  struct Set
+  {
+    /**
+     * This object's implementation details.
+     */
+    class ClassImpl : public Object::ClassImpl
+    {
+      friend class ClassCacheImpl;
+
+    protected:
+      explicit ClassImpl(Env env, jclass cls);
+
+    public:
+      virtual ~ClassImpl();
+
+      const MethodID m_mid_iterator;
+    };
+
+    static const char* const m_class_name;
+    static const ClassImpl& impl(Env env)
+      {
+        return *dynamic_cast<const ClassImpl*>(ClassCache::get_set(env));
+      }
+  };
+};
+
+/**
+ * Template wrapper for an immutable type-safe Java map.
+ *
+ * @since New in 1.9.
+ */
+template <typename T, typename NativeT=jobject>
+class ImmutableMap : public BaseImmutableMap
+{
+public:
+  /**
+   * Constructs the map wrapper, converting the contents to an
+   * @c std::map.
+   */
+  explicit ImmutableMap(Env env, jobject jmap)
+    : BaseImmutableMap(env, jmap)
+    {}
+
+  /**
+   * Returns a wrapper object for the object reference identified by @a index.
+   * @throw std::out_of_range if there is no such element.
+   */
+  T operator[](const std::string& index) const
+    {
+      return T(m_env, NativeT(BaseImmutableMap::operator[](index)));
+    }
+
+  /**
+   * Iterates over the items in the map, calling @a function for
+   * each item.
+   * @see std::for_each
+   * @note Unlike std::for_each, which invokes the functor with a
+   *       single @c value_type argument, this iterator calls
+   *       @a function with separate @c const references to the key
+   *       and value.
+   */
+  template<typename F>
+  F for_each(F function) const
+    {
+      Iterator iter(get_iterator());
+      while (iter.has_next())
+        {
+          Entry entry(m_env, iter.next());
+          const std::string& key(entry.key());
+          function(key, T(m_env, NativeT(entry.value())));
+        }
+      return function;
+    }
+};
+
+/**
+ * Non-template base for a mutable type-safe Java map with String keys.
+ *
+ * @since New in 1.9.
+ */
+class BaseMap : public BaseImmutableMap
+{
+public:
+  /**
+   * Clears the contents of the map.
+   */
+  void clear()
+    {
+      BaseImmutableMap::clear();
+    }
+
+protected:
+  /**
+   * Constructs the map wrapper, treating @a jmap as a @c java.util.Map.
+   */
+  explicit BaseMap(Env env, jobject jmap)
+    : BaseImmutableMap(env, jmap)
+    {}
+
+  /**
+   * Constructs and wraps an empty map of type @c java.util.HashMap
+   * with initial allocation size @a length.
+   */
+  explicit BaseMap(Env env, jint length)
+    : BaseImmutableMap(env, ClassCache::get_hash_map(env))
+    {
+      set_this(env.NewObject(get_class(), impl().m_mid_ctor, length));
+    }
+
+private:
+  /**
+   * This object's implementation details.
+   */
+  class ClassImpl : public BaseImmutableMap::ClassImpl
+  {
+    friend class ClassCacheImpl;
+
+  protected:
+    explicit ClassImpl(Env env, jclass cls);
+
+  public:
+    virtual ~ClassImpl();
+
+    const MethodID m_mid_ctor;
+  };
+
+  const ClassImpl& impl() const
+    {
+      return *dynamic_cast<const ClassImpl*>(m_impl);
+    }
+
+  friend class ClassCacheImpl;
+  static const char* const m_class_name;
+};
+
+/**
+ * Template wrapper for a mutable type-safe Java map.
+ *
+ * @since New in 1.9.
+ */
+template <typename T, typename NativeT=jobject>
+class Map : public BaseMap
+{
+public:
+  /**
+   * Constructs the map wrapper, deriving the class from @a jmap.
+   */
+  explicit Map(Env env, jobject jmap)
+    : BaseMap(env, jmap)
+    {}
+
+  /**
+   * Constructs and wraps an empty map of type @c java.util.HashMap
+   * with initial allocation size @a length.
+   */
+  explicit Map(Env env, jint length = 0)
+    : BaseMap(env, length)
+    {}
+
+  /**
+   * Inserts @a obj identified by @a key into the map.
+   */
+  void put(const std::string& key, const T& obj)
+    {
+      BaseMap::put(key, obj.get());
+    }
+
+  /**
+   * Returns a wrapper object for the object reference identified by @a index.
+   * @throw std::out_of_range if there is no such element.
+   */
+  T operator[](const std::string& index) const
+    {
+      return T(m_env, NativeT(BaseMap::operator[](index)));
+    }
+
+  /**
+   * Iterates over the items in the map, calling @a function for
+   * each item.
+   * @see std::for_each
+   * @note Unlike std::for_each, which invokes the functor with a
+   *       single @c value_type argument, this iterator calls
+   *       @a function with separate @c const references to the key
+   *       and value.
+   */
+  template<typename F>
+  F for_each(F function) const
+    {
+      Iterator iter(get_iterator());
+      while (iter.has_next())
+        {
+          Entry entry(m_env, iter.next());
+          const std::string& key(entry.key());
+          function(key, T(m_env, NativeT(entry.value())));
+        }
+      return function;
+    }
+};
+
+} // namespace Java
+
+#endif // SVN_JAVAHL_JNIWRAPPER_STRING_MAP_HPP
diff --git a/subversion/bindings/javahl/native/org_apache_subversion_javahl_NativeResources.cpp b/subversion/bindings/javahl/native/org_apache_subversion_javahl_NativeResources.cpp
index 9705304..a6be60f 100644
--- a/subversion/bindings/javahl/native/org_apache_subversion_javahl_NativeResources.cpp
+++ b/subversion/bindings/javahl/native/org_apache_subversion_javahl_NativeResources.cpp
@@ -25,14 +25,11 @@
  * NativeResources.
  */
 
-#include "JNIUtil.h"
 #include "../include/org_apache_subversion_javahl_NativeResources.h"
 
 JNIEXPORT void JNICALL
 Java_org_apache_subversion_javahl_NativeResources_initNativeLibrary
 (JNIEnv *env, jclass jclazz)
 {
-  // No usual JNIEntry here, as the prerequisite native library
-  // initialization is performed here.
-  JNIUtil::JNIGlobalInit(env);
+  // No-op; see comment in NativeResources.java
 }
diff --git a/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp b/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
index e4fdd76..5f70a5a 100644
--- a/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
+++ b/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
@@ -50,7 +50,8 @@
 #include "ImportFilterCallback.h"
 #include "ChangelistCallback.h"
 #include "StringArray.h"
-#include "RevpropTable.h"
+#include "PropertyTable.h"
+#include "CreateJ.h"
 #include "VersionExtended.h"
 #include "DiffOptions.h"
 #include "svn_version.h"
@@ -184,8 +185,9 @@ Java_org_apache_subversion_javahl_SVNClient_list
 JNIEXPORT void JNICALL
 Java_org_apache_subversion_javahl_SVNClient_status
 (JNIEnv *env, jobject jthis, jstring jpath, jobject jdepth,
- jboolean jonServer, jboolean jgetAll, jboolean jnoIgnore,
- jboolean jignoreExternals, jobject jchangelists,
+ jboolean jonServer, jboolean jonDisk, jboolean jgetAll,
+ jboolean jnoIgnore, jboolean jignoreExternals,
+ jboolean jdepthAsSticky, jobject jchangelists,
  jobject jstatusCallback)
 {
   JNIEntry(SVNClient, status);
@@ -203,9 +205,9 @@ Java_org_apache_subversion_javahl_SVNClient_status
 
   StatusCallback callback(jstatusCallback);
   cl->status(path, EnumMapper::toDepth(jdepth),
-             jonServer ? true:false,
-             jgetAll ? true:false, jnoIgnore ? true:false,
-             jignoreExternals ? true:false, changelists, &callback);
+             bool(jonServer), bool(jonDisk), bool(jgetAll),
+             bool(jnoIgnore), bool(jignoreExternals),
+             bool(jdepthAsSticky), changelists, &callback);
 }
 
 JNIEXPORT void JNICALL
@@ -257,7 +259,7 @@ Java_org_apache_subversion_javahl_SVNClient_password
 }
 
 JNIEXPORT void JNICALL
-Java_org_apache_subversion_javahl_SVNClient_setPrompt
+Java_org_apache_subversion_javahl_SVNClient_setPrompt__Lorg_apache_subversion_javahl_callback_AuthnCallback_2
 (JNIEnv *env, jobject jthis, jobject jprompter)
 {
   JNIEntry(SVNClient, setPrompt);
@@ -267,7 +269,7 @@ Java_org_apache_subversion_javahl_SVNClient_setPrompt
       JNIUtil::throwError(_("bad C++ this"));
       return;
     }
-  Prompter *prompter = Prompter::makeCPrompter(jprompter);
+  Prompter::UniquePtr prompter(Prompter::create(jprompter));
   if (JNIUtil::isExceptionThrown())
     return;
 
@@ -275,6 +277,39 @@ Java_org_apache_subversion_javahl_SVNClient_setPrompt
 }
 
 JNIEXPORT void JNICALL
+Java_org_apache_subversion_javahl_SVNClient_setPrompt__Lorg_apache_subversion_javahl_callback_UserPasswordCallback_2
+(JNIEnv *env, jobject jthis, jobject jprompter)
+{
+  JNIEntry(SVNClient, setPrompt);
+  SVNClient *cl = SVNClient::getCppObject(jthis);
+  if (cl == NULL)
+    {
+      JNIUtil::throwError(_("bad C++ this"));
+      return;
+    }
+  Prompter::UniquePtr prompter(CompatPrompter::create(jprompter));
+  if (JNIUtil::isExceptionThrown())
+    return;
+
+  cl->getClientContext().setPrompt(prompter);
+}
+
+JNIEXPORT void JNICALL
+Java_org_apache_subversion_javahl_SVNClient_setTunnelAgent
+(JNIEnv *env, jobject jthis, jobject jtunnelcb)
+{
+  JNIEntry(SVNClient, setPrompt);
+  SVNClient *cl = SVNClient::getCppObject(jthis);
+  if (cl == NULL)
+    {
+      JNIUtil::throwError(_("bad C++ this"));
+      return;
+    }
+
+  cl->getClientContext().setTunnelCallback(jtunnelcb);
+}
+
+JNIEXPORT void JNICALL
 Java_org_apache_subversion_javahl_SVNClient_logMessages
 (JNIEnv *env, jobject jthis, jstring jpath, jobject jpegRevision,
  jobject jranges, jboolean jstopOnCopy, jboolean jdisoverPaths,
@@ -282,6 +317,14 @@ Java_org_apache_subversion_javahl_SVNClient_logMessages
  jobject jlogMessageCallback)
 {
   JNIEntry(SVNClient, logMessages);
+
+  if (jlong(int(jlimit)) != jlimit)
+    {
+      JNIUtil::raiseThrowable("java/lang/IllegalArgumentException",
+                              "The value of 'limit' is too large");
+      return;
+    }
+
   SVNClient *cl = SVNClient::getCppObject(jthis);
   if (cl == NULL)
     {
@@ -323,7 +366,7 @@ Java_org_apache_subversion_javahl_SVNClient_logMessages
   cl->logMessages(path, pegRevision, revisionRanges,
                   jstopOnCopy ? true: false, jdisoverPaths ? true : false,
                   jincludeMergedRevisions ? true : false,
-                  revProps, static_cast<long>(jlimit), &callback);
+                  revProps, int(jlimit), &callback);
 }
 
 JNIEXPORT jlong JNICALL
@@ -384,7 +427,7 @@ Java_org_apache_subversion_javahl_SVNClient_remove
   if (JNIUtil::isExceptionThrown())
     return;
 
-  RevpropTable revprops(jrevpropTable);
+  PropertyTable revprops(jrevpropTable, false, false);
   if (JNIUtil::isExceptionThrown())
     return;
 
@@ -395,8 +438,8 @@ Java_org_apache_subversion_javahl_SVNClient_remove
 
 JNIEXPORT void JNICALL
 Java_org_apache_subversion_javahl_SVNClient_revert
-(JNIEnv *env, jobject jthis, jstring jpath, jobject jdepth,
- jobject jchangelists)
+(JNIEnv *env, jobject jthis, jobject jpaths, jobject jdepth,
+ jobject jchangelists, jboolean jclear_changelists, jboolean jmetadata_only)
 {
   JNIEntry(SVNClient, revert);
   SVNClient *cl = SVNClient::getCppObject(jthis);
@@ -405,7 +448,9 @@ Java_org_apache_subversion_javahl_SVNClient_revert
       JNIUtil::throwError(_("bad C++ this"));
       return;
     }
-  JNIStringHolder path(jpath);
+
+  SVN_JNI_NULL_PTR_EX(jpaths, "paths", );
+  StringArray paths(jpaths);
   if (JNIUtil::isExceptionThrown())
     return;
 
@@ -413,7 +458,8 @@ Java_org_apache_subversion_javahl_SVNClient_revert
   if (JNIUtil::isExceptionThrown())
     return;
 
-  cl->revert(path, EnumMapper::toDepth(jdepth), changelists);
+  cl->revert(paths, EnumMapper::toDepth(jdepth),
+             changelists, bool(jclear_changelists), bool(jmetadata_only));
 }
 
 JNIEXPORT void JNICALL
@@ -498,7 +544,7 @@ Java_org_apache_subversion_javahl_SVNClient_commit
   if (JNIUtil::isExceptionThrown())
     return;
 
-  RevpropTable revprops(jrevpropTable);
+  PropertyTable revprops(jrevpropTable, false, false);
   if (JNIUtil::isExceptionThrown())
     return;
 
@@ -513,6 +559,7 @@ JNIEXPORT void JNICALL
 Java_org_apache_subversion_javahl_SVNClient_copy
 (JNIEnv *env, jobject jthis, jobject jcopySources, jstring jdestPath,
  jboolean jcopyAsChild, jboolean jmakeParents, jboolean jignoreExternals,
+ jboolean jmetadataOnly, jboolean jpinExternals, jobject jexternalsToPin,
  jobject jrevpropTable, jobject jmessage, jobject jcallback)
 {
   JNIEntry(SVNClient, copy);
@@ -539,13 +586,15 @@ Java_org_apache_subversion_javahl_SVNClient_copy
   if (JNIUtil::isExceptionThrown())
     return;
 
-  RevpropTable revprops(jrevpropTable);
+  PropertyTable revprops(jrevpropTable, false, false);
   if (JNIUtil::isExceptionThrown())
     return;
 
   CommitCallback callback(jcallback);
-  cl->copy(copySources, destPath, &message, jcopyAsChild ? true : false,
-           jmakeParents ? true : false, jignoreExternals ? true : false,
+  cl->copy(copySources, destPath, &message,
+           bool(jcopyAsChild), bool(jmakeParents),
+           bool(jignoreExternals), bool(jmetadataOnly),
+           bool(jpinExternals), jexternalsToPin,
            revprops, jcallback ? &callback : NULL);
 }
 
@@ -577,7 +626,7 @@ Java_org_apache_subversion_javahl_SVNClient_move
   if (JNIUtil::isExceptionThrown())
     return;
 
-  RevpropTable revprops(jrevpropTable);
+  PropertyTable revprops(jrevpropTable, false, false);
   if (JNIUtil::isExceptionThrown())
     return;
 
@@ -610,7 +659,7 @@ Java_org_apache_subversion_javahl_SVNClient_mkdir
   if (JNIUtil::isExceptionThrown())
     return;
 
-  RevpropTable revprops(jrevpropTable);
+  PropertyTable revprops(jrevpropTable, false, false);
   if (JNIUtil::isExceptionThrown())
     return;
 
@@ -621,7 +670,10 @@ Java_org_apache_subversion_javahl_SVNClient_mkdir
 
 JNIEXPORT void JNICALL
 Java_org_apache_subversion_javahl_SVNClient_cleanup
-(JNIEnv *env, jobject jthis, jstring jpath)
+(JNIEnv *env, jobject jthis, jstring jpath,
+ jboolean jbreakLocks, jboolean jfixRecordedTimestamps,
+ jboolean jclearDavCache, jboolean jremoveUnusedPristines,
+ jboolean jincludeExternals)
 {
   JNIEntry(SVNClient, cleanup);
   SVNClient *cl = SVNClient::getCppObject(jthis);
@@ -634,7 +686,9 @@ Java_org_apache_subversion_javahl_SVNClient_cleanup
   if (JNIUtil::isExceptionThrown())
     return;
 
-  cl->cleanup(path);
+  cl->cleanup(path, jbreakLocks, jfixRecordedTimestamps,
+              jclearDavCache, jremoveUnusedPristines,
+              jincludeExternals);
 }
 
 JNIEXPORT void JNICALL
@@ -660,7 +714,8 @@ JNIEXPORT jlong JNICALL
 Java_org_apache_subversion_javahl_SVNClient_doExport
 (JNIEnv *env, jobject jthis, jstring jsrcPath, jstring jdestPath,
  jobject jrevision, jobject jpegRevision, jboolean jforce,
- jboolean jignoreExternals, jobject jdepth, jstring jnativeEOL)
+ jboolean jignoreExternals, jboolean jignoreKeywords,
+ jobject jdepth, jstring jnativeEOL)
 {
   JNIEntry(SVNClient, doExport);
   SVNClient *cl = SVNClient::getCppObject(jthis);
@@ -690,7 +745,9 @@ Java_org_apache_subversion_javahl_SVNClient_doExport
     return -1;
 
   return cl->doExport(srcPath, destPath, revision, pegRevision,
-                      jforce ? true : false, jignoreExternals ? true : false,
+                      jforce ? true : false,
+                      jignoreExternals ? true : false,
+                      jignoreKeywords ? true : false,
                       EnumMapper::toDepth(jdepth), nativeEOL);
 }
 
@@ -758,7 +815,7 @@ Java_org_apache_subversion_javahl_SVNClient_doImport
   if (JNIUtil::isExceptionThrown())
     return;
 
-  RevpropTable revprops(jrevpropTable);
+  PropertyTable revprops(jrevpropTable, false, false);
   if (JNIUtil::isExceptionThrown())
     return;
 
@@ -796,11 +853,11 @@ Java_org_apache_subversion_javahl_SVNClient_suggestMergeSources
 }
 
 JNIEXPORT void JNICALL
-Java_org_apache_subversion_javahl_SVNClient_merge__Ljava_lang_String_2Lorg_apache_subversion_javahl_types_Revision_2Ljava_lang_String_2Lorg_apache_subversion_javahl_types_Revision_2Ljava_lang_String_2ZLorg_apache_subversion_javahl_types_Depth_2ZZZZ
+Java_org_apache_subversion_javahl_SVNClient_merge__Ljava_lang_String_2Lorg_apache_subversion_javahl_types_Revision_2Ljava_lang_String_2Lorg_apache_subversion_javahl_types_Revision_2Ljava_lang_String_2ZLorg_apache_subversion_javahl_types_Depth_2ZZZZZ
 (JNIEnv *env, jobject jthis, jstring jpath1, jobject jrevision1,
  jstring jpath2, jobject jrevision2, jstring jlocalPath, jboolean jforceDelete,
  jobject jdepth, jboolean jignoreMergeinfo, jboolean jdiffIgnoreAncestry,
- jboolean jdryRun, jboolean jrecordOnly)
+ jboolean jdryRun, jboolean jallowMixedRev, jboolean jrecordOnly)
 {
   JNIEntry(SVNClient, merge);
   SVNClient *cl = SVNClient::getCppObject(jthis);
@@ -835,15 +892,16 @@ Java_org_apache_subversion_javahl_SVNClient_merge__Ljava_lang_String_2Lorg_apach
             jignoreMergeinfo ? true:false,
             jdiffIgnoreAncestry ? true:false,
             jdryRun ? true:false,
+            jallowMixedRev ? true:false,
             jrecordOnly ? true:false);
 }
 
 JNIEXPORT void JNICALL
-Java_org_apache_subversion_javahl_SVNClient_merge__Ljava_lang_String_2Lorg_apache_subversion_javahl_types_Revision_2Ljava_util_List_2Ljava_lang_String_2ZLorg_apache_subversion_javahl_types_Depth_2ZZZZ
+Java_org_apache_subversion_javahl_SVNClient_merge__Ljava_lang_String_2Lorg_apache_subversion_javahl_types_Revision_2Ljava_util_List_2Ljava_lang_String_2ZLorg_apache_subversion_javahl_types_Depth_2ZZZZZ
 (JNIEnv *env, jobject jthis, jstring jpath, jobject jpegRevision,
  jobject jranges, jstring jlocalPath, jboolean jforceDelete, jobject jdepth,
  jboolean jignoreMergeinfo, jboolean jdiffIgnoreAncestry,
- jboolean jdryRun, jboolean jrecordOnly)
+ jboolean jdryRun, jboolean jallowMixedRev, jboolean jrecordOnly)
 {
   JNIEntry(SVNClient, merge);
   SVNClient *cl = SVNClient::getCppObject(jthis);
@@ -894,6 +952,7 @@ Java_org_apache_subversion_javahl_SVNClient_merge__Ljava_lang_String_2Lorg_apach
             jignoreMergeinfo ? true:false,
             jdiffIgnoreAncestry ? true:false,
             jdryRun ? true:false,
+            jallowMixedRev ? true:false,
             jrecordOnly ? true:false);
 }
 
@@ -1009,7 +1068,7 @@ Java_org_apache_subversion_javahl_SVNClient_propertySetRemote
   if (JNIUtil::isExceptionThrown())
     return;
 
-  RevpropTable revprops(jrevpropTable);
+  PropertyTable revprops(jrevpropTable, false, false);
   if (JNIUtil::isExceptionThrown())
     return;
 
@@ -1439,35 +1498,44 @@ Java_org_apache_subversion_javahl_SVNClient_diffSummarize__Ljava_lang_String_2Lo
                     jignoreAncestry ? true : false, receiver);
 }
 
-JNIEXPORT void JNICALL
+JNIEXPORT jobject JNICALL
 Java_org_apache_subversion_javahl_SVNClient_streamFileContent
-(JNIEnv *env, jobject jthis, jstring jpath, jobject jrevision,
- jobject jpegRevision, jobject jstream)
+(JNIEnv *env, jobject jthis, jstring jpath,
+ jobject jrevision, jobject jpegRevision,
+ jboolean jexpand_keywords, jboolean jreturn_props,
+ jobject jstream)
 {
   JNIEntry(SVNClient, streamFileContent);
   SVNClient *cl = SVNClient::getCppObject(jthis);
   if (cl == NULL)
     {
       JNIUtil::throwError(_("bad C++ this"));
-      return;
+      return NULL;
     }
   JNIStringHolder path(jpath);
   if (JNIUtil::isExceptionThrown())
-    return;
+    return NULL;
 
   Revision revision(jrevision);
   if (JNIUtil::isExceptionThrown())
-    return;
+    return NULL;
 
   Revision pegRevision(jpegRevision);
   if (JNIUtil::isExceptionThrown())
-    return;
+    return NULL;
 
   OutputStream dataOut(jstream);
   if (JNIUtil::isExceptionThrown())
-    return;
+    return NULL;
 
-  cl->streamFileContent(path, revision, pegRevision, dataOut);
+  apr_hash_t* props =
+    cl->streamFileContent(path, revision, pegRevision,
+                          bool(jexpand_keywords), bool(jreturn_props),
+                          dataOut);
+  if (!jreturn_props || JNIUtil::isExceptionThrown())
+    return NULL;
+
+  return CreateJ::PropertyMap(props, SVN::Pool().getPool());
 }
 
 JNIEXPORT jstring JNICALL
@@ -1581,7 +1649,8 @@ JNIEXPORT void JNICALL
 Java_org_apache_subversion_javahl_SVNClient_blame
 (JNIEnv *env, jobject jthis, jstring jpath, jobject jpegRevision,
  jobject jrevisionStart, jobject jrevisionEnd, jboolean jignoreMimeType,
- jboolean jincludeMergedRevisions, jobject jblameCallback)
+ jboolean jincludeMergedRevisions, jobject jblameCallback,
+ jobject jdiffOptions)
 {
   JNIEntry(SVNClient, blame);
   SVNClient *cl = SVNClient::getCppObject(jthis);
@@ -1606,10 +1675,15 @@ Java_org_apache_subversion_javahl_SVNClient_blame
   if (JNIUtil::isExceptionThrown())
     return;
 
+  DiffOptions options(jdiffOptions);
+  if (JNIUtil::isExceptionThrown())
+    return;
+
   BlameCallback callback(jblameCallback);
   cl->blame(path, pegRevision, revisionStart, revisionEnd,
             jignoreMimeType ? true : false,
-            jincludeMergedRevisions ? true : false, &callback);
+            jincludeMergedRevisions ? true : false, &callback,
+            options);
 }
 
 JNIEXPORT void JNICALL
@@ -1648,6 +1722,36 @@ Java_org_apache_subversion_javahl_SVNClient_getConfigDirectory
 }
 
 JNIEXPORT void JNICALL
+Java_org_apache_subversion_javahl_SVNClient_setConfigEventHandler(
+    JNIEnv* env, jobject jthis, jobject jcallback)
+{
+  JNIEntry(SVNClient, setConfigEventHandler);
+  SVNClient *cl = SVNClient::getCppObject(jthis);
+  if (cl == NULL)
+    {
+      JNIUtil::throwError(_("bad C++ this"));
+      return;
+    }
+
+  cl->getClientContext().setConfigEventHandler(jcallback);
+}
+
+JNIEXPORT jobject JNICALL
+Java_org_apache_subversion_javahl_SVNClient_getConfigEventHandler(
+    JNIEnv* env, jobject jthis)
+{
+  JNIEntry(SVNClient, getConfigEventHandler);
+  SVNClient *cl = SVNClient::getCppObject(jthis);
+  if (cl == NULL)
+    {
+      JNIUtil::throwError(_("bad C++ this"));
+      return NULL;
+    }
+
+  return cl->getClientContext().getConfigEventHandler();
+}
+
+JNIEXPORT void JNICALL
 Java_org_apache_subversion_javahl_SVNClient_cancelOperation
 (JNIEnv *env, jobject jthis)
 {
@@ -1738,8 +1842,9 @@ Java_org_apache_subversion_javahl_SVNClient_getChangelists
     return;
 
   ChangelistCallback callback(jchangelistCallback);
-  cl->getChangelists(root_path, changelists, EnumMapper::toDepth(jdepth),
-                     &callback);
+  cl->getChangelists(root_path,
+                     (jchangelists ? &changelists : NULL),
+                     EnumMapper::toDepth(jdepth), &callback);
 }
 
 JNIEXPORT void JNICALL
@@ -1790,12 +1895,14 @@ Java_org_apache_subversion_javahl_SVNClient_unlock
 }
 
 JNIEXPORT void JNICALL
-Java_org_apache_subversion_javahl_SVNClient_info2
+Java_org_apache_subversion_javahl_SVNClient_info
 (JNIEnv *env, jobject jthis, jstring jpath, jobject jrevision,
- jobject jpegRevision, jobject jdepth, jobject jchangelists,
- jobject jinfoCallback)
+ jobject jpegRevision, jobject jdepth,
+ jboolean jfetchExcluded, jboolean jfetchActualOnly,
+ jboolean jincludeExternals,
+ jobject jchangelists, jobject jinfoCallback)
 {
-  JNIEntry(SVNClient, info2);
+  JNIEntry(SVNClient, info);
   SVNClient *cl = SVNClient::getCppObject(jthis);
   if (cl == NULL)
     {
@@ -1819,8 +1926,10 @@ Java_org_apache_subversion_javahl_SVNClient_info2
     return;
 
   InfoCallback callback(jinfoCallback);
-  cl->info2(path, revision, pegRevision, EnumMapper::toDepth(jdepth),
-            changelists, &callback);
+  cl->info(path, revision, pegRevision, EnumMapper::toDepth(jdepth),
+           svn_boolean_t(jfetchExcluded), svn_boolean_t(jfetchActualOnly),
+           svn_boolean_t(jincludeExternals),
+           changelists, &callback);
 }
 
 JNIEXPORT void JNICALL
@@ -1851,3 +1960,44 @@ Java_org_apache_subversion_javahl_SVNClient_patch
             jreverse ? true : false, jignoreWhitespace ? true : false,
             jremoveTempfiles ? true : false, &callback);
 }
+
+JNIEXPORT void JNICALL
+Java_org_apache_subversion_javahl_SVNClient_vacuum
+(JNIEnv *env, jobject jthis, jstring jpath,
+ jboolean jremoveUnversionedItems, jboolean jremoveIgnoredItems,
+ jboolean jfixRecordedTimestamps, jboolean jremoveUnusedPristines,
+ jboolean jincludeExternals)
+{
+  JNIEntry(SVNClient, patch);
+  SVNClient *cl = SVNClient::getCppObject(jthis);
+  if (cl == NULL)
+    {
+      JNIUtil::throwError("bad C++ this");
+      return;
+    }
+
+  JNIStringHolder path(jpath);
+  cl->vacuum(path,
+             jremoveUnversionedItems, jremoveIgnoredItems,
+             jfixRecordedTimestamps, jremoveUnusedPristines,
+             jincludeExternals);
+}
+
+JNIEXPORT jobject JNICALL
+Java_org_apache_subversion_javahl_SVNClient_nativeOpenRemoteSession
+(JNIEnv *env, jobject jthis, jstring jpath, jint jretryAttempts)
+{
+  JNIEntry(SVNClient, openRemoteSession);
+  SVNClient *cl = SVNClient::getCppObject(jthis);
+  if (cl == NULL)
+    {
+      JNIUtil::throwError("bad C++ this");
+      return NULL;
+    }
+
+  JNIStringHolder path(jpath);
+  if (JNIUtil::isJavaExceptionThrown())
+    return NULL;
+
+  return cl->openRemoteSession(path, jretryAttempts);
+}
diff --git a/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.cpp b/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.cpp
index ee1c7c1..ae41bb3 100644
--- a/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.cpp
+++ b/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.cpp
@@ -170,7 +170,7 @@ Java_org_apache_subversion_javahl_SVNRepos_dump
 JNIEXPORT void JNICALL
 Java_org_apache_subversion_javahl_SVNRepos_hotcopy
 (JNIEnv *env, jobject jthis, jobject jpath, jobject jtargetPath,
- jboolean jcleanLogs, jboolean jincremental)
+ jboolean jcleanLogs, jboolean jincremental, jobject jnotifyCallback)
 {
   JNIEntry(SVNRepos, hotcopy);
   SVNRepos *cl = SVNRepos::getCppObject(jthis);
@@ -188,8 +188,11 @@ Java_org_apache_subversion_javahl_SVNRepos_hotcopy
   if (JNIUtil::isExceptionThrown())
     return;
 
+  ReposNotifyCallback notifyCallback(jnotifyCallback);
+
   cl->hotcopy(path, targetPath, jcleanLogs ? true : false,
-              jincremental ? true : false);
+              jincremental ? true : false,
+              jnotifyCallback != NULL ? &notifyCallback : NULL);
 }
 
 JNIEXPORT void JNICALL
@@ -239,11 +242,13 @@ Java_org_apache_subversion_javahl_SVNRepos_listUnusedDBLogs
 }
 
 JNIEXPORT void JNICALL
-Java_org_apache_subversion_javahl_SVNRepos_load
-(JNIEnv *env, jobject jthis, jobject jpath, jobject jinputData,
- jobject jrevisionStart, jobject jrevisionEnd,
- jboolean jignoreUUID, jboolean jforceUUID, jboolean jusePreCommitHook,
- jboolean jusePostCommitHook, jstring jrelativePath, jobject jnotifyCallback)
+Java_org_apache_subversion_javahl_SVNRepos_load(
+    JNIEnv *env, jobject jthis, jobject jpath, jobject jinputData,
+    jobject jrevisionStart, jobject jrevisionEnd,
+    jboolean jignoreUUID, jboolean jforceUUID,
+    jboolean jusePreCommitHook, jboolean jusePostCommitHook,
+    jboolean jvalidateProps, jboolean jignoreDates,
+    jstring jrelativePath, jobject jnotifyCallback)
 {
   JNIEntry(SVNRepos, load);
   SVNRepos *cl = SVNRepos::getCppObject(jthis);
@@ -280,6 +285,8 @@ Java_org_apache_subversion_javahl_SVNRepos_load
            jforceUUID ? true : false,
            jusePreCommitHook ? true : false,
            jusePostCommitHook ? true : false,
+           jvalidateProps ? true : false,
+           jignoreDates ? true : false,
            relativePath,
            (jnotifyCallback != NULL ? &notifyCallback : NULL));
 }
@@ -409,9 +416,11 @@ Java_org_apache_subversion_javahl_SVNRepos_setRevProp
 }
 
 JNIEXPORT void JNICALL
-Java_org_apache_subversion_javahl_SVNRepos_verify
-(JNIEnv *env, jobject jthis, jobject jpath, jobject jrevisionStart,
- jobject jrevisionEnd, jobject jcallback)
+Java_org_apache_subversion_javahl_SVNRepos_verify(
+    JNIEnv *env, jobject jthis, jobject jpath,
+    jobject jrevisionStart, jobject jrevisionEnd,
+    jboolean jcheckNormalization, jboolean jmetadataOnly,
+    jobject jnotifyCallback, jobject jverifyCallback)
 {
   JNIEntry(SVNRepos, verify);
   SVNRepos *cl = SVNRepos::getCppObject(jthis);
@@ -433,12 +442,18 @@ Java_org_apache_subversion_javahl_SVNRepos_verify
   if (JNIUtil::isExceptionThrown())
     return;
 
-  ReposNotifyCallback callback(jcallback);
+  ReposNotifyCallback notify_cb(jnotifyCallback);
+  if (JNIUtil::isExceptionThrown())
+    return;
+
+  ReposVerifyCallback verify_cb(jverifyCallback);
   if (JNIUtil::isExceptionThrown())
     return;
 
   cl->verify(path, revisionStart, revisionEnd,
-             jcallback != NULL ? &callback : NULL);
+             jcheckNormalization, jmetadataOnly,
+             jnotifyCallback != NULL ? &notify_cb : NULL,
+             jverifyCallback != NULL ? &verify_cb : NULL);
 }
 
 JNIEXPORT jobject JNICALL
diff --git a/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_CommitEditor.cpp b/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_CommitEditor.cpp
new file mode 100644
index 0000000..e871b0c
--- /dev/null
+++ b/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_CommitEditor.cpp
@@ -0,0 +1,205 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ *
+ * @file org_apache_subversion_javahl_remote_CommitEditor.cpp
+ * @brief Implementation of the native methods in the Java class CommitEditor
+ */
+
+#include "../include/org_apache_subversion_javahl_remote_CommitEditor.h"
+
+#include "JNIStackElement.h"
+#include "JNIUtil.h"
+#include "CommitEditor.h"
+
+#include "svn_private_config.h"
+
+
+JNIEXPORT void JNICALL
+Java_org_apache_subversion_javahl_remote_CommitEditor_finalize(
+    JNIEnv *env, jobject jthis)
+{
+  JNIEntry(CommitEditor, finalize);
+  CommitEditor *editor = CommitEditor::getCppObject(jthis);
+  if (editor != NULL)
+    editor->finalize();
+}
+
+JNIEXPORT void JNICALL
+Java_org_apache_subversion_javahl_remote_CommitEditor_nativeDispose(
+    JNIEnv *env, jobject jthis)
+{
+  JNIEntry(CommitEditor, nativeDispose);
+  CommitEditor *editor = CommitEditor::getCppObject(jthis);
+  if (editor != NULL)
+    editor->dispose(jthis);
+}
+
+JNIEXPORT jlong JNICALL
+Java_org_apache_subversion_javahl_remote_CommitEditor_nativeCreateInstance(
+    JNIEnv *env, jclass thisclass, jobject jsession, jobject jrevprops,
+    jobject jcommit_callback, jobject jlock_tokens, jboolean jkeep_locks,
+    jobject jget_base_cb, jobject jget_props_cb, jobject jget_kind_cb)
+{
+  jobject jthis = NULL;         // Placeholder -- this is a static method
+  JNIEntry(CommitEditor, nativeCreateInstance);
+
+  return CommitEditor::createInstance(
+      jsession, jrevprops, jcommit_callback, jlock_tokens, jkeep_locks,
+      jget_base_cb, jget_props_cb, jget_kind_cb);
+}
+
+JNIEXPORT void JNICALL
+Java_org_apache_subversion_javahl_remote_CommitEditor_addDirectory(
+    JNIEnv* env, jobject jthis,
+    jstring jrelpath, jobject jchildren, jobject jproperties,
+    jlong jreplaces_revision)
+{
+  JNIEntry(CommitEditor, addDirectory);
+  CommitEditor *editor = CommitEditor::getCppObject(jthis);
+  CPPADDR_NULL_PTR(editor,);
+  editor->addDirectory(jrelpath, jchildren, jproperties, jreplaces_revision);
+}
+
+JNIEXPORT void JNICALL
+Java_org_apache_subversion_javahl_remote_CommitEditor_addFile(
+    JNIEnv* env, jobject jthis,
+    jstring jrelpath, jobject jchecksum, jobject jcontents,
+    jobject jproperties, jlong jreplaces_revision)
+{
+  JNIEntry(CommitEditor, addFile);
+  CommitEditor *editor = CommitEditor::getCppObject(jthis);
+  CPPADDR_NULL_PTR(editor,);
+  editor->addFile(jrelpath, jchecksum, jcontents, jproperties,
+                  jreplaces_revision);
+}
+
+JNIEXPORT void JNICALL
+Java_org_apache_subversion_javahl_remote_CommitEditor_addSymlink(
+    JNIEnv* env, jobject jthis,
+    jstring jrelpath, jstring jtarget, jobject jproperties,
+    jlong jreplaces_revision)
+{
+  JNIEntry(CommitEditor, addSymlink);
+  CommitEditor *editor = CommitEditor::getCppObject(jthis);
+  CPPADDR_NULL_PTR(editor,);
+  editor->addSymlink(jrelpath, jtarget, jproperties, jreplaces_revision);
+}
+
+JNIEXPORT void JNICALL
+Java_org_apache_subversion_javahl_remote_CommitEditor_addAbsent(
+    JNIEnv* env, jobject jthis,
+    jstring jrelpath, jobject jkind, jlong jreplaces_revision)
+{
+  JNIEntry(CommitEditor, addAbsent);
+  CommitEditor *editor = CommitEditor::getCppObject(jthis);
+  CPPADDR_NULL_PTR(editor,);
+  editor->addAbsent(jrelpath, jkind, jreplaces_revision);
+}
+
+JNIEXPORT void JNICALL
+Java_org_apache_subversion_javahl_remote_CommitEditor_alterDirectory(
+    JNIEnv* env, jobject jthis,
+    jstring jrelpath, jlong jrevision, jobject jchildren, jobject jproperties)
+{
+  JNIEntry(CommitEditor, alterDirectory);
+  CommitEditor *editor = CommitEditor::getCppObject(jthis);
+  CPPADDR_NULL_PTR(editor,);
+  editor->alterDirectory(jrelpath, jrevision, jchildren, jproperties);
+}
+
+JNIEXPORT void JNICALL
+Java_org_apache_subversion_javahl_remote_CommitEditor_alterFile(
+    JNIEnv* env, jobject jthis,
+    jstring jrelpath, jlong jrevision, jobject jchecksum, jobject jcontents,
+    jobject jproperties)
+{
+  JNIEntry(CommitEditor, alterFile);
+  CommitEditor *editor = CommitEditor::getCppObject(jthis);
+  CPPADDR_NULL_PTR(editor,);
+  editor->alterFile(jrelpath, jrevision, jchecksum, jcontents, jproperties);
+}
+
+JNIEXPORT void JNICALL
+Java_org_apache_subversion_javahl_remote_CommitEditor_alterSymlink(
+    JNIEnv* env, jobject jthis,
+    jstring jrelpath, jlong jrevision, jstring jtarget, jobject jproperties)
+{
+  JNIEntry(CommitEditor, alterSymlink);
+  CommitEditor *editor = CommitEditor::getCppObject(jthis);
+  CPPADDR_NULL_PTR(editor,);
+  editor->alterSymlink(jrelpath, jrevision, jtarget, jproperties);
+}
+
+JNIEXPORT void JNICALL
+Java_org_apache_subversion_javahl_remote_CommitEditor_delete(
+    JNIEnv* env, jobject jthis,
+    jstring jrelpath, jlong jrevision)
+{
+  JNIEntry(CommitEditor, delete);
+  CommitEditor *editor = CommitEditor::getCppObject(jthis);
+  CPPADDR_NULL_PTR(editor,);
+  editor->remove(jrelpath, jrevision);
+}
+
+JNIEXPORT void JNICALL
+Java_org_apache_subversion_javahl_remote_CommitEditor_copy(
+    JNIEnv* env, jobject jthis,
+    jstring jsrc_relpath, jlong jsrc_revision, jstring jdst_relpath,
+    jlong jreplaces_revision)
+{
+  JNIEntry(CommitEditor, copy);
+  CommitEditor *editor = CommitEditor::getCppObject(jthis);
+  CPPADDR_NULL_PTR(editor,);
+  editor->copy(jsrc_relpath, jsrc_revision, jdst_relpath, jreplaces_revision);
+}
+
+JNIEXPORT void JNICALL
+Java_org_apache_subversion_javahl_remote_CommitEditor_move(
+    JNIEnv* env, jobject jthis,
+    jstring jsrc_relpath, jlong jsrc_revision, jstring jdst_relpath,
+    jlong jreplaces_revision)
+{
+  JNIEntry(CommitEditor, move);
+  CommitEditor *editor = CommitEditor::getCppObject(jthis);
+  CPPADDR_NULL_PTR(editor,);
+  editor->move(jsrc_relpath, jsrc_revision, jdst_relpath, jreplaces_revision);
+}
+
+JNIEXPORT void JNICALL
+Java_org_apache_subversion_javahl_remote_CommitEditor_complete(
+    JNIEnv* env, jobject jthis)
+{
+  JNIEntry(CommitEditor, complete);
+  CommitEditor *editor = CommitEditor::getCppObject(jthis);
+  CPPADDR_NULL_PTR(editor,);
+  editor->complete();
+}
+
+JNIEXPORT void JNICALL
+Java_org_apache_subversion_javahl_remote_CommitEditor_abort(
+    JNIEnv* env, jobject jthis, jobject jsession)
+{
+  JNIEntry(CommitEditor, abort);
+  CommitEditor *editor = CommitEditor::getCppObject(jthis);
+  CPPADDR_NULL_PTR(editor,);
+  editor->abort();
+}
diff --git a/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_RemoteFactory.cpp b/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_RemoteFactory.cpp
new file mode 100644
index 0000000..80c0c42
--- /dev/null
+++ b/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_RemoteFactory.cpp
@@ -0,0 +1,61 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ *
+ * @file org_apache_subversion_javahl_remote_RemoteFactory.cpp
+ * @brief Implementation of the native methods in the Java class RemoteFactory
+ */
+
+#include "../include/org_apache_subversion_javahl_remote_RemoteFactory.h"
+
+#include "JNIStackElement.h"
+#include "JNIUtil.h"
+#include "JNIStringHolder.h"
+
+#include "RemoteSession.h"
+
+#include "svn_private_config.h"
+
+JNIEXPORT jobject JNICALL
+Java_org_apache_subversion_javahl_remote_RemoteFactory_open(
+    JNIEnv *env, jclass jclazz, jint jretryAttempts,
+    jstring jurl, jstring juuid,
+    jstring jconfigDirectory,
+    jstring jusername, jstring jpassword,
+    jobject jprompter, jobject jdeprecatedPrompter,
+    jobject jprogress, jobject jcfgcb, jobject jtunnelcb)
+{
+  //JNI macros need jthis but this is a static call
+  JNIEntryStatic(RemoteFactory, open);
+
+  /*
+   * Create RemoteSession C++ object and return its java wrapper to the caller
+   */
+  jobject jremoteSession = RemoteSession::open(
+      jretryAttempts, jurl, juuid,
+      jconfigDirectory, jusername, jpassword,
+      jprompter, jdeprecatedPrompter,
+      jprogress, jcfgcb, jtunnelcb);
+  if (JNIUtil::isJavaExceptionThrown())
+    return NULL;
+
+  return jremoteSession;
+}
diff --git a/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_RemoteSession.cpp b/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_RemoteSession.cpp
new file mode 100644
index 0000000..03079b6
--- /dev/null
+++ b/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_RemoteSession.cpp
@@ -0,0 +1,359 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ *
+ * @file org_apache_subversion_javahl_remote_RemoteSession.cpp
+ * @brief Implementation of the native methods in the Java class RemoteSession
+ */
+
+#include "../include/org_apache_subversion_javahl_remote_RemoteSession.h"
+
+#include "JNIStackElement.h"
+#include "JNIUtil.h"
+#include "Prompter.h"
+#include "RemoteSession.h"
+#include "Revision.h"
+#include "EnumMapper.h"
+
+#include "svn_private_config.h"
+
+JNIEXPORT void JNICALL
+Java_org_apache_subversion_javahl_remote_RemoteSession_finalize(
+    JNIEnv *env, jobject jthis)
+{
+  JNIEntry(RemoteSession, finalize);
+  RemoteSession *ras = RemoteSession::getCppObject(jthis);
+  if (ras != NULL)
+    ras->finalize();
+}
+
+JNIEXPORT void JNICALL
+Java_org_apache_subversion_javahl_remote_RemoteSession_nativeDispose(
+    JNIEnv *env, jobject jthis)
+{
+  JNIEntry(RemoteSession, nativeDispose);
+  RemoteSession *ras = RemoteSession::getCppObject(jthis);
+  if (ras != NULL)
+    ras->dispose(jthis);
+}
+
+JNIEXPORT void JNICALL
+Java_org_apache_subversion_javahl_remote_RemoteSession_cancelOperation(
+    JNIEnv *env, jobject jthis)
+{
+  JNIEntry(RemoteSession, cancelOperation);
+  RemoteSession *ras = RemoteSession::getCppObject(jthis);
+  CPPADDR_NULL_PTR(ras, );
+
+  ras->cancelOperation();
+}
+
+JNIEXPORT void JNICALL
+Java_org_apache_subversion_javahl_remote_RemoteSession_reparent(
+    JNIEnv *env, jobject jthis, jstring jurl)
+{
+  JNIEntry(RemoteSession, getSessionUrl);
+  RemoteSession *ras = RemoteSession::getCppObject(jthis);
+  CPPADDR_NULL_PTR(ras, );
+
+  ras->reparent(jurl);
+}
+
+JNIEXPORT jstring JNICALL
+Java_org_apache_subversion_javahl_remote_RemoteSession_getSessionRelativePath(
+    JNIEnv *env, jobject jthis, jstring jurl)
+{
+  JNIEntry(RemoteSession, getSessionUrl);
+  RemoteSession *ras = RemoteSession::getCppObject(jthis);
+  CPPADDR_NULL_PTR(ras, NULL);
+
+  return ras->getSessionRelativePath(jurl);
+}
+
+JNIEXPORT jstring JNICALL
+Java_org_apache_subversion_javahl_remote_RemoteSession_getReposRelativePath(
+    JNIEnv *env, jobject jthis, jstring jurl)
+{
+  JNIEntry(RemoteSession, getSessionUrl);
+  RemoteSession *ras = RemoteSession::getCppObject(jthis);
+  CPPADDR_NULL_PTR(ras, NULL);
+
+  return ras->getReposRelativePath(jurl);
+}
+
+JNIEXPORT jstring JNICALL
+Java_org_apache_subversion_javahl_remote_RemoteSession_getSessionUrl(
+    JNIEnv *env, jobject jthis)
+{
+  JNIEntry(RemoteSession, getSessionUrl);
+  RemoteSession *ras = RemoteSession::getCppObject(jthis);
+  CPPADDR_NULL_PTR(ras, NULL);
+
+  return ras->getSessionUrl();
+}
+
+JNIEXPORT jstring JNICALL
+Java_org_apache_subversion_javahl_remote_RemoteSession_getReposUUID(
+    JNIEnv *env, jobject jthis)
+{
+  JNIEntry(RemoteSession, geRepostUUID);
+  RemoteSession *ras = RemoteSession::getCppObject(jthis);
+  CPPADDR_NULL_PTR(ras, NULL);
+
+  return ras->getReposUUID();
+}
+
+JNIEXPORT jstring JNICALL
+Java_org_apache_subversion_javahl_remote_RemoteSession_getReposRootUrl(
+    JNIEnv *env, jobject jthis)
+{
+  JNIEntry(RemoteSession, geRepostUUID);
+  RemoteSession *ras = RemoteSession::getCppObject(jthis);
+  CPPADDR_NULL_PTR(ras, NULL);
+
+  return ras->getReposRootUrl();
+}
+
+JNIEXPORT jlong JNICALL
+Java_org_apache_subversion_javahl_remote_RemoteSession_getLatestRevision(
+    JNIEnv *env, jobject jthis)
+{
+  JNIEntry(RemoteSession, getLatestRevision);
+  RemoteSession *ras = RemoteSession::getCppObject(jthis);
+  CPPADDR_NULL_PTR(ras, SVN_INVALID_REVNUM);
+
+  return ras->getLatestRevision();
+}
+
+JNIEXPORT jlong JNICALL
+Java_org_apache_subversion_javahl_remote_RemoteSession_getRevisionByTimestamp(
+    JNIEnv *env, jobject jthis, jlong timestamp)
+{
+  JNIEntry(RemoteSession, getDatedRevision);
+  RemoteSession *ras = RemoteSession::getCppObject(jthis);
+  CPPADDR_NULL_PTR(ras, SVN_INVALID_REVNUM);
+
+  return ras->getRevisionByTimestamp(timestamp);
+}
+
+JNIEXPORT void JNICALL
+Java_org_apache_subversion_javahl_remote_RemoteSession_nativeChangeRevisionProperty(
+    JNIEnv *env, jobject jthis, jlong jrevision, jstring jname,
+    jbyteArray jold_value, jbyteArray jvalue)
+{
+  JNIEntry(RemoteSession, nativeChangeRevisionProperty);
+  RemoteSession *ras = RemoteSession::getCppObject(jthis);
+  CPPADDR_NULL_PTR(ras, );
+
+  return ras->changeRevisionProperty(jrevision, jname, jold_value, jvalue);
+}
+
+JNIEXPORT jobject JNICALL
+Java_org_apache_subversion_javahl_remote_RemoteSession_getRevisionProperties(
+    JNIEnv *env, jobject jthis, jlong jrevision)
+{
+  JNIEntry(SVNReposAccess, getRevisionProperties);
+  RemoteSession *ras = RemoteSession::getCppObject(jthis);
+  CPPADDR_NULL_PTR(ras, NULL);
+
+  return ras->getRevisionProperties(jrevision);
+}
+
+JNIEXPORT jbyteArray JNICALL
+Java_org_apache_subversion_javahl_remote_RemoteSession_getRevisionProperty(
+    JNIEnv *env, jobject jthis, jlong jrevision, jstring jname)
+{
+  JNIEntry(SVNReposAccess, getRevisionProperty);
+  RemoteSession *ras = RemoteSession::getCppObject(jthis);
+  CPPADDR_NULL_PTR(ras, NULL);
+
+  return ras->getRevisionProperty(jrevision, jname);
+}
+
+JNIEXPORT jlong JNICALL
+Java_org_apache_subversion_javahl_remote_RemoteSession_nativeGetFile(
+    JNIEnv *env, jobject jthis, jlong jrevision, jstring jpath,
+    jobject jcontents, jobject jproperties)
+{
+  JNIEntry(SVNReposAccess, nativeGetFile);
+  RemoteSession *ras = RemoteSession::getCppObject(jthis);
+  CPPADDR_NULL_PTR(ras, SVN_INVALID_REVNUM);
+
+  return ras->getFile(jrevision, jpath, jcontents, jproperties);
+}
+
+JNIEXPORT jlong JNICALL
+Java_org_apache_subversion_javahl_remote_RemoteSession_nativeGetDirectory(
+    JNIEnv *env, jobject jthis, jlong jrevision, jstring jpath,
+    jint jdirent_fields, jobject jdirents, jobject jproperties)
+{
+  JNIEntry(SVNReposAccess, nativeGetDirectory);
+  RemoteSession *ras = RemoteSession::getCppObject(jthis);
+  CPPADDR_NULL_PTR(ras, SVN_INVALID_REVNUM);
+
+  return ras->getDirectory(jrevision, jpath,
+                           jdirent_fields, jdirents, jproperties);
+}
+
+JNIEXPORT jobject JNICALL
+Java_org_apache_subversion_javahl_remote_RemoteSession_getMergeinfo(
+    JNIEnv *env, jobject jthis, jobject jpaths, jlong jrevision,
+    jobject jinherit, jboolean jinclude_descendants)
+{
+  JNIEntry(SVNReposAccess, getMergeinfo);
+  RemoteSession *ras = RemoteSession::getCppObject(jthis);
+  CPPADDR_NULL_PTR(ras, NULL);
+
+  return ras->getMergeinfo(jpaths, jrevision, jinherit, jinclude_descendants);
+}
+
+// TODO: update
+// TODO: switch
+
+JNIEXPORT void JNICALL
+Java_org_apache_subversion_javahl_remote_RemoteSession_nativeStatus(
+    JNIEnv *env, jobject jthis, jstring jstatus_target, jlong jrevision,
+    jobject jdepth, jobject jstatus_editor, jobject jreporter)
+{
+  JNIEntry(SVNReposAccess, nativeStatus);
+  RemoteSession *ras = RemoteSession::getCppObject(jthis);
+  CPPADDR_NULL_PTR(ras,);
+
+  ras->status(jthis, jstatus_target, jrevision, jdepth,
+              jstatus_editor, jreporter);
+}
+
+// TODO: diff
+
+JNIEXPORT void JNICALL
+Java_org_apache_subversion_javahl_remote_RemoteSession_getLog(
+    JNIEnv *env, jobject jthis, jobject jpaths,
+    jlong jstartrev, jlong jendrev, jint jlimit,
+    jboolean jstrict_node_history, jboolean jdiscover_changed_paths,
+    jboolean jinclude_merged_revisions,
+    jobject jrevprops, jobject jlog_callback)
+{
+  JNIEntry(SVNReposAccess, getLog);
+  RemoteSession *ras = RemoteSession::getCppObject(jthis);
+  CPPADDR_NULL_PTR(ras,);
+
+  ras->getLog(jpaths, jstartrev, jendrev, jlimit,
+              jstrict_node_history, jdiscover_changed_paths,
+              jinclude_merged_revisions,
+              jrevprops, jlog_callback);
+}
+
+JNIEXPORT jobject JNICALL
+Java_org_apache_subversion_javahl_remote_RemoteSession_checkPath(
+    JNIEnv *env, jobject jthis, jstring jpath, jlong jrevision)
+{
+  JNIEntry(SVNReposAccess, checkPath);
+  RemoteSession *ras = RemoteSession::getCppObject(jthis);
+  CPPADDR_NULL_PTR(ras, NULL);
+
+  return ras->checkPath(jpath, jrevision);
+}
+
+JNIEXPORT jobject JNICALL
+Java_org_apache_subversion_javahl_remote_RemoteSession_stat(
+    JNIEnv *env, jobject jthis, jstring jpath, jlong jrevision)
+{
+  JNIEntry(SVNReposAccess, stat);
+  RemoteSession *ras = RemoteSession::getCppObject(jthis);
+  CPPADDR_NULL_PTR(ras, NULL);
+
+  return ras->stat(jpath, jrevision);
+}
+
+JNIEXPORT jobject JNICALL
+Java_org_apache_subversion_javahl_remote_RemoteSession_getLocations(
+    JNIEnv *env, jobject jthis, jstring jpath, jlong jpeg_revision,
+    jobject jlocation_revisions)
+{
+  JNIEntry(SVNReposAccess, getLocations);
+  RemoteSession *ras = RemoteSession::getCppObject(jthis);
+  CPPADDR_NULL_PTR(ras, NULL);
+
+  return ras->getLocations(jpath, jpeg_revision, jlocation_revisions);
+}
+
+JNIEXPORT void JNICALL
+Java_org_apache_subversion_javahl_remote_RemoteSession_getLocationSegments(
+    JNIEnv *env, jobject jthis, jstring jpath, jlong jpeg_revision,
+    jlong jstart_revision, jlong jend_revision, jobject jcallback)
+{
+  JNIEntry(SVNReposAccess, getLocationSegments);
+  RemoteSession *ras = RemoteSession::getCppObject(jthis);
+  CPPADDR_NULL_PTR(ras, );
+
+  if (jcallback == NULL)
+    JNIUtil::throwNullPointerException("handler");
+  ras->getLocationSegments(jpath, jpeg_revision,
+                           jstart_revision, jend_revision,
+                           jcallback);
+}
+
+JNIEXPORT void JNICALL
+Java_org_apache_subversion_javahl_remote_RemoteSession_getFileRevisions(
+    JNIEnv *env, jobject jthis, jstring jpath,
+    jlong jstart_revision, jlong jend_revision,
+    jboolean jinclude_merged_revisions, jobject jcallback)
+{
+  JNIEntry(SVNReposAccess, getFileRevisions);
+  RemoteSession *ras = RemoteSession::getCppObject(jthis);
+  CPPADDR_NULL_PTR(ras, );
+
+  if (jcallback == NULL)
+    JNIUtil::throwNullPointerException("handler");
+  ras->getFileRevisions(jpath, jstart_revision, jend_revision,
+                        jinclude_merged_revisions, jcallback);
+}
+
+// TODO: lock
+// TODO: unlock
+// TODO: getLock
+
+JNIEXPORT jobject JNICALL
+Java_org_apache_subversion_javahl_remote_RemoteSession_getLocks(
+    JNIEnv *env, jobject jthis, jstring jpath, jobject jdepth)
+{
+  JNIEntry(RemoteSession, getLocks);
+  RemoteSession *ras = RemoteSession::getCppObject(jthis);
+  CPPADDR_NULL_PTR(ras, NULL);
+
+  return ras->getLocks(jpath, jdepth);
+}
+
+// TODO: replayRange
+// TODO: replay
+// TODO: getDeletedRevision
+// TODO: getInheritedProperties
+
+JNIEXPORT jboolean JNICALL
+Java_org_apache_subversion_javahl_remote_RemoteSession_nativeHasCapability(
+    JNIEnv *env, jobject jthis, jstring jcapability)
+{
+  JNIEntry(RemoteSession, nativeHasCapability);
+  RemoteSession *ras = RemoteSession::getCppObject(jthis);
+  CPPADDR_NULL_PTR(ras, false);
+
+  return ras->hasCapability(jcapability);
+}
diff --git a/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_StateReporter.cpp b/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_StateReporter.cpp
new file mode 100644
index 0000000..f5c291b
--- /dev/null
+++ b/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_StateReporter.cpp
@@ -0,0 +1,117 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ *
+ * @file org_apache_subversion_javahl_remote_StateReporter.cpp
+ * @brief Implementation of the native methods in the Java class StateReporter
+ */
+
+#include "../include/org_apache_subversion_javahl_remote_StateReporter.h"
+
+#include <jni.h>
+#include "JNIStackElement.h"
+#include "JNIUtil.h"
+#include "StateReporter.h"
+
+#include "svn_private_config.h"
+
+JNIEXPORT void JNICALL
+Java_org_apache_subversion_javahl_remote_StateReporter_finalize(
+    JNIEnv *env, jobject jthis)
+{
+  JNIEntry(StateReporter, finalize);
+  StateReporter *reporter = StateReporter::getCppObject(jthis);
+  if (reporter != NULL)
+    reporter->finalize();
+}
+
+JNIEXPORT void JNICALL
+Java_org_apache_subversion_javahl_remote_StateReporter_nativeDispose(
+    JNIEnv* env, jobject jthis)
+{
+  JNIEntry(StateReporter, nativeCreateInstance);
+  StateReporter* reporter = StateReporter::getCppObject(jthis);
+  CPPADDR_NULL_PTR(reporter,);
+  reporter->dispose(jthis);
+}
+
+JNIEXPORT void JNICALL
+Java_org_apache_subversion_javahl_remote_StateReporter_setPath(
+    JNIEnv* env, jobject jthis,
+    jstring jpath, jlong jrevision, jobject jdepth,
+    jboolean jstart_empty, jstring jlock_token)
+{
+  JNIEntry(StateReporter, setPath);
+  StateReporter* reporter = StateReporter::getCppObject(jthis);
+  CPPADDR_NULL_PTR(reporter,);
+  reporter->setPath(jpath, jrevision, jdepth, jstart_empty, jlock_token);
+}
+
+JNIEXPORT void JNICALL
+Java_org_apache_subversion_javahl_remote_StateReporter_deletePath(
+    JNIEnv* env, jobject jthis, jstring jpath)
+{
+  JNIEntry(StateReporter, deletePath);
+  StateReporter* reporter = StateReporter::getCppObject(jthis);
+  CPPADDR_NULL_PTR(reporter,);
+  reporter->deletePath(jpath);
+}
+
+JNIEXPORT void JNICALL
+Java_org_apache_subversion_javahl_remote_StateReporter_linkPath(
+    JNIEnv* env, jobject jthis,
+    jstring jurl, jstring jpath, jlong jrevision, jobject jdepth,
+    jboolean jstart_empty, jstring jlock_token)
+{
+  JNIEntry(StateReporter, linkPath);
+  StateReporter* reporter = StateReporter::getCppObject(jthis);
+  CPPADDR_NULL_PTR(reporter,);
+  reporter->linkPath(jurl, jpath, jrevision, jdepth, jstart_empty, jlock_token);
+}
+
+JNIEXPORT jlong JNICALL
+Java_org_apache_subversion_javahl_remote_StateReporter_finishReport(
+    JNIEnv* env, jobject jthis)
+{
+  JNIEntry(StateReporter, finishReport);
+  StateReporter* reporter = StateReporter::getCppObject(jthis);
+  CPPADDR_NULL_PTR(reporter, SVN_INVALID_REVNUM);
+  return reporter->finishReport();
+}
+
+JNIEXPORT void JNICALL
+Java_org_apache_subversion_javahl_remote_StateReporter_abortReport(
+    JNIEnv* env, jobject jthis)
+{
+  JNIEntry(StateReporter, abortReport);
+  StateReporter* reporter = StateReporter::getCppObject(jthis);
+  CPPADDR_NULL_PTR(reporter,);
+  reporter->abortReport();
+}
+
+JNIEXPORT jlong JNICALL
+Java_org_apache_subversion_javahl_remote_StateReporter_nativeCreateInstance(
+    JNIEnv* env, jclass clazz)
+{
+  jobject jthis = NULL;
+  JNIEntry(StateReporter, nativeCreateInstance);
+  return reinterpret_cast<jlong>(new StateReporter);
+}
diff --git a/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_RevisionRangeList.cpp b/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_RevisionRangeList.cpp
new file mode 100644
index 0000000..4c54118
--- /dev/null
+++ b/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_RevisionRangeList.cpp
@@ -0,0 +1,58 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ *
+ * @file org_apache_subversion_javahl_types_RevisionRangeList.cpp
+ * @brief Implementation of the native methods in the Java class
+ * RevisionRangeList.
+ */
+
+
+#include "../include/org_apache_subversion_javahl_types_RevisionRangeList.h"
+#include "JNIStackElement.h"
+#include "RevisionRangeList.h"
+#include "Pool.h"
+
+#include "svn_mergeinfo.h"
+#include "svn_private_config.h"
+
+JNIEXPORT jobject JNICALL
+Java_org_apache_subversion_javahl_types_RevisionRangeList_remove(
+    JNIEnv* env, jobject jthis, jobject jeraser,
+    jboolean jconsider_inheritance)
+{
+  JNIEntry(RevisionRangeList, remove);
+
+  SVN::Pool request_pool;
+
+  RevisionRangeList rangelist = RevisionRangeList::create(jthis, request_pool);
+  CPPADDR_NULL_PTR(rangelist.get(), NULL);
+
+  RevisionRangeList eraser(jeraser, request_pool);
+  CPPADDR_NULL_PTR(eraser.get(), NULL);
+
+  svn_rangelist_t *output;
+  SVN_JNI_ERR(svn_rangelist_remove(&output, eraser.get(), rangelist.get(),
+                                   bool(jconsider_inheritance),
+                                   request_pool.getPool()),
+              NULL);
+  return RevisionRangeList(output).toList();
+}
diff --git a/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_RuntimeVersion.cpp b/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_RuntimeVersion.cpp
new file mode 100644
index 0000000..ed43fb7
--- /dev/null
+++ b/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_RuntimeVersion.cpp
@@ -0,0 +1,69 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ *
+ * @file org_apache_subversion_javahl_types_RuntimeVersion.cpp
+ * @brief Implementation of the native methods in the Java class RuntimeVersion.
+ */
+
+#include "../include/org_apache_subversion_javahl_types_RuntimeVersion.h"
+#include "svn_client.h"
+#include "svn_version.h"
+
+#include "jniwrapper/jni_stack.hpp"
+#include "jniwrapper/jni_string.hpp"
+
+JNIEXPORT jint JNICALL
+Java_org_apache_subversion_javahl_types_RuntimeVersion_getMajor(
+    JNIEnv* jenv, jobject jthis)
+{
+  const svn_version_t* const version = svn_client_version();
+  return jint(version->major);
+}
+
+JNIEXPORT jint JNICALL
+Java_org_apache_subversion_javahl_types_RuntimeVersion_getMinor(
+    JNIEnv* jenv, jobject jthis)
+{
+  const svn_version_t* const version = svn_client_version();
+  return jint(version->minor);
+}
+
+JNIEXPORT jint JNICALL
+Java_org_apache_subversion_javahl_types_RuntimeVersion_getPatch(
+    JNIEnv* jenv, jobject jthis)
+{
+  const svn_version_t* const version = svn_client_version();
+  return jint(version->patch);
+}
+
+JNIEXPORT jstring JNICALL
+Java_org_apache_subversion_javahl_types_RuntimeVersion_getNumberTag(
+    JNIEnv* jenv, jobject jthis)
+{
+  SVN_JAVAHL_JNI_TRY(RuntimeVersion, getNumberTag)
+    {
+      const svn_version_t* const version = svn_client_version();
+      return Java::String(Java::Env(jenv), version->tag).get();
+    }
+  SVN_JAVAHL_JNI_CATCH;
+  return NULL;
+}
diff --git a/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_Version.cpp b/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_Version.cpp
index 8fd8aee..72d52a3 100644
--- a/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_Version.cpp
+++ b/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_Version.cpp
@@ -28,12 +28,19 @@
 #include "JNIStackElement.h"
 #include "svn_version.h"
 
+namespace {
+const svn_version_t* javahl_version()
+{
+  SVN_VERSION_BODY;
+}
+} //anonymous namespace
+
 JNIEXPORT jint JNICALL
 Java_org_apache_subversion_javahl_types_Version_getMajor(JNIEnv *env,
  jobject jthis)
 {
   JNIEntry(Version, getMajor);
-  return SVN_VER_MAJOR;
+  return javahl_version()->major;
 }
 
 JNIEXPORT jint JNICALL
@@ -41,7 +48,7 @@ Java_org_apache_subversion_javahl_types_Version_getMinor(JNIEnv *env,
  jobject jthis)
 {
   JNIEntry(Version, getMinor);
-  return SVN_VER_MINOR;
+  return javahl_version()->minor;
 }
 
 JNIEXPORT jint JNICALL
@@ -49,7 +56,7 @@ Java_org_apache_subversion_javahl_types_Version_getPatch(JNIEnv *env,
  jobject jthis)
 {
   JNIEntry(Version, getPatch);
-  return SVN_VER_PATCH;
+  return javahl_version()->patch;
 }
 
 JNIEXPORT jstring JNICALL
diff --git a/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_VersionExtended.cpp b/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_VersionExtended.cpp
index e24801a..b1ecd72 100644
--- a/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_VersionExtended.cpp
+++ b/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_VersionExtended.cpp
@@ -33,8 +33,24 @@
 #include "JNIStackElement.h"
 #include <string>
 
+#include "svn_private_config.h"
+
 // VersionExtended native methods
 
+JNIEXPORT void JNICALL
+Java_org_apache_subversion_javahl_types_VersionExtended_dispose(
+    JNIEnv *env, jobject jthis)
+{
+  JNIEntry(VersionExtended, dispose);
+  VersionExtended *const vx = VersionExtended::getCppObject(jthis);
+  if (vx == NULL)
+    {
+      JNIUtil::throwError(_("bad C++ this"));
+      return;
+    }
+  vx->dispose(jthis);
+}
+
 JNIEXPORT jstring JNICALL
 Java_org_apache_subversion_javahl_types_VersionExtended_getBuildDate(
     JNIEnv *env, jobject jthis)
diff --git a/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp b/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp
new file mode 100644
index 0000000..5fa5c89
--- /dev/null
+++ b/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp
@@ -0,0 +1,314 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ *
+ * @file org_apache_subversion_javahl_util_ConfigImpl_Category.cpp
+ * @brief Implementation of the native methods in the Java class
+ *        util.ConfigImpl.Category.
+ */
+
+#include <string>
+#include <vector>
+
+#include "../include/org_apache_subversion_javahl_util_ConfigImpl_Category.h"
+#include "JNIUtil.h"
+#include "JNIStackElement.h"
+#include "JNIStringHolder.h"
+#include "OperationContext.h"
+#include "CreateJ.h"
+#include "EnumMapper.h"
+
+#include "svn_config.h"
+#include "svn_hash.h"
+#include "svn_private_config.h"
+
+namespace {
+struct ImplContext
+{
+  ImplContext(JNIEnv* env, jobject jthis,
+              jstring jcategory, jlong jcontext,
+              jstring jsection, jstring joption) : m_config(NULL)
+    {
+      OperationContext* const context(
+          reinterpret_cast<OperationContext*>(jcontext));
+      CPPADDR_NULL_PTR(context,);
+
+      JNIStringHolder category(jcategory);
+      if (JNIUtil::isJavaExceptionThrown())
+        return;
+      if (category.c_str())
+        {
+          apr_hash_t* cfgdata = context->getConfigData();
+          if (cfgdata)
+            m_config = static_cast<svn_config_t*>(
+                svn_hash_gets(cfgdata, category.c_str()));
+          else
+            JNIUtil::throwNullPointerException("getConfigData");
+        }
+      if (!m_config)
+        JNIUtil::throwNullPointerException("category");
+
+      JNIStringHolder section(jsection);
+      if (JNIUtil::isJavaExceptionThrown())
+        return;
+      if (section.c_str())
+        m_section = section.c_str();
+
+      JNIStringHolder option(joption);
+      if (JNIUtil::isJavaExceptionThrown())
+        return;
+      if (option.c_str())
+        m_option = option.c_str();
+    }
+
+  svn_config_t* m_config;
+  std::string m_section;
+  std::string m_option;
+};
+} // anonymous namespace
+
+
+
+JNIEXPORT jstring JNICALL
+Java_org_apache_subversion_javahl_util_ConfigImpl_00024Category_get_1str(
+    JNIEnv* env, jobject jthis, jstring jcategory, jlong jcontext,
+    jstring jsection, jstring joption, jstring jdefault_value)
+{
+  JNIEntry(ConfigImpl$Category, get_str);
+  const ImplContext ctx(env, jthis, jcategory, jcontext, jsection, joption);
+
+  JNIStringHolder default_value(jdefault_value);
+  if (JNIUtil::isJavaExceptionThrown())
+    return NULL;
+
+  const char* value;
+  svn_config_get(ctx.m_config, &value,
+                 ctx.m_section.c_str(), ctx.m_option.c_str(),
+                 default_value.c_str());
+  return JNIUtil::makeJString(value);
+}
+
+JNIEXPORT jboolean JNICALL
+Java_org_apache_subversion_javahl_util_ConfigImpl_00024Category_get_1bool(
+    JNIEnv* env, jobject jthis, jstring jcategory, jlong jcontext,
+    jstring jsection, jstring joption, jboolean jdefault_value)
+{
+  JNIEntry(ConfigImpl$Category, get_bool);
+  const ImplContext ctx(env, jthis, jcategory, jcontext, jsection, joption);
+
+  svn_boolean_t value;
+  SVN_JNI_ERR(svn_config_get_bool(ctx.m_config, &value,
+                                  ctx.m_section.c_str(), ctx.m_option.c_str(),
+                                  bool(jdefault_value)),
+              jdefault_value);
+  return jboolean(value);
+}
+
+JNIEXPORT jlong JNICALL
+Java_org_apache_subversion_javahl_util_ConfigImpl_00024Category_get_1long(
+    JNIEnv* env, jobject jthis, jstring jcategory, jlong jcontext,
+    jstring jsection, jstring joption, jlong jdefault_value)
+{
+  JNIEntry(ConfigImpl$Category, get_long);
+  const ImplContext ctx(env, jthis, jcategory, jcontext, jsection, joption);
+
+  apr_int64_t value;
+  SVN_JNI_ERR(svn_config_get_int64(ctx.m_config, &value,
+                                   ctx.m_section.c_str(), ctx.m_option.c_str(),
+                                   apr_int64_t(jdefault_value)),
+              jdefault_value);
+  return jlong(value);
+}
+
+JNIEXPORT jobject JNICALL
+Java_org_apache_subversion_javahl_util_ConfigImpl_00024Category_get_1tri(
+    JNIEnv* env, jobject jthis, jstring jcategory, jlong jcontext,
+    jstring jsection, jstring joption,
+    jstring junknown, jobject jdefault_value)
+{
+  JNIEntry(ConfigImpl$Category, get_tri);
+  const ImplContext ctx(env, jthis, jcategory, jcontext, jsection, joption);
+
+  JNIStringHolder unknown(junknown);
+  if (JNIUtil::isJavaExceptionThrown())
+    return NULL;
+
+  svn_tristate_t value;
+  SVN_JNI_ERR(svn_config_get_tristate(ctx.m_config, &value,
+                                      ctx.m_section.c_str(),
+                                      ctx.m_option.c_str(),
+                                      unknown.c_str(),
+                                      EnumMapper::toTristate(jdefault_value)),
+              NULL);
+  return EnumMapper::mapTristate(value);
+}
+
+JNIEXPORT jstring JNICALL
+Java_org_apache_subversion_javahl_util_ConfigImpl_00024Category_get_1yna(
+    JNIEnv* env, jobject jthis, jstring jcategory, jlong jcontext,
+    jstring jsection, jstring joption, jstring jdefault_value)
+{
+  JNIEntry(ConfigImpl$Category, get_yna);
+  const ImplContext ctx(env, jthis, jcategory, jcontext, jsection, joption);
+
+  JNIStringHolder default_value(jdefault_value);
+  if (JNIUtil::isJavaExceptionThrown())
+    return NULL;
+
+  const char* value;
+  SVN_JNI_ERR(svn_config_get_yes_no_ask(
+                  ctx.m_config, &value,
+                  ctx.m_section.c_str(), ctx.m_option.c_str(),
+                  default_value.c_str()),
+              NULL);
+  return JNIUtil::makeJString(value);
+}
+
+JNIEXPORT void JNICALL
+Java_org_apache_subversion_javahl_util_ConfigImpl_00024Category_set_1str(
+    JNIEnv* env, jobject jthis, jstring jcategory, jlong jcontext,
+    jstring jsection, jstring joption, jstring jvalue)
+{
+  JNIEntry(ConfigImpl$Category, set_str);
+  const ImplContext ctx(env, jthis, jcategory, jcontext, jsection, joption);
+
+  JNIStringHolder value(jvalue);
+  if (JNIUtil::isJavaExceptionThrown())
+    return;
+
+  svn_config_set(ctx.m_config,
+                 ctx.m_section.c_str(), ctx.m_option.c_str(),
+                 value.c_str());
+}
+
+JNIEXPORT void JNICALL
+Java_org_apache_subversion_javahl_util_ConfigImpl_00024Category_set_1bool(
+    JNIEnv* env, jobject jthis, jstring jcategory, jlong jcontext,
+    jstring jsection, jstring joption, jboolean jvalue)
+{
+  JNIEntry(ConfigImpl$Category, set_bool);
+  const ImplContext ctx(env, jthis, jcategory, jcontext, jsection, joption);
+
+  svn_config_set_bool(ctx.m_config,
+                      ctx.m_section.c_str(), ctx.m_option.c_str(),
+                      bool(jvalue));
+}
+
+JNIEXPORT void JNICALL
+Java_org_apache_subversion_javahl_util_ConfigImpl_00024Category_set_1long(
+    JNIEnv* env, jobject jthis, jstring jcategory, jlong jcontext,
+    jstring jsection, jstring joption, jlong jvalue)
+{
+  JNIEntry(ConfigImpl$Category, set_long);
+  const ImplContext ctx(env, jthis, jcategory, jcontext, jsection, joption);
+
+  svn_config_set_int64(ctx.m_config,
+                       ctx.m_section.c_str(), ctx.m_option.c_str(),
+                       apr_int64_t(jvalue));
+}
+
+JNIEXPORT jobject JNICALL
+Java_org_apache_subversion_javahl_util_ConfigImpl_00024Category_sections(
+    JNIEnv* env, jobject jthis, jstring jcategory, jlong jcontext)
+{
+  JNIEntry(ConfigImpl$Category, sections);
+  const ImplContext ctx(env, jthis, jcategory, jcontext, NULL, NULL);
+
+  struct enumerator_t
+  {
+    static svn_boolean_t process(const char* name, void* baton,
+                                 apr_pool_t *pool)
+      {
+        jstring jname = JNIUtil::makeJString(name);
+        if (JNIUtil::isJavaExceptionThrown())
+          return false;
+        static_cast<enumerator_t*>(baton)
+          ->m_sections.push_back(jobject(jname));
+        return true;
+      }
+    std::vector<jobject> m_sections;
+  } enumerator;
+
+  SVN::Pool requestPool;
+  svn_config_enumerate_sections2(ctx.m_config, enumerator.process, &enumerator,
+                                 requestPool.getPool());
+  if (JNIUtil::isJavaExceptionThrown())
+    return NULL;
+  return CreateJ::Set(enumerator.m_sections);
+}
+
+JNIEXPORT void JNICALL
+Java_org_apache_subversion_javahl_util_ConfigImpl_00024Category_enumerate(
+    JNIEnv* env, jobject jthis, jstring jcategory, jlong jcontext,
+    jstring jsection, jobject jhandler)
+{
+  JNIEntry(ConfigImpl$Category, sections);
+  const ImplContext ctx(env, jthis, jcategory, jcontext, jsection, NULL);
+
+  struct enumerator_t
+  {
+    static svn_boolean_t process(const char* name, const char* value,
+                                 void* baton, apr_pool_t *pool)
+      {
+        enumerator_t* enmr = static_cast<enumerator_t*>(baton);
+        JNIEnv* const e = enmr->m_env;
+        const jobject jh = enmr->m_jhandler;;
+
+        static jmethodID mid = 0;
+        if (0 == mid)
+          {
+            jclass cls = e->FindClass(JAVAHL_CLASS("/ISVNConfig$Enumerator"));
+            if (JNIUtil::isJavaExceptionThrown())
+              return false;
+            mid = e->GetMethodID(cls, "option",
+                                   "(Ljava/lang/String;Ljava/lang/String;)V");
+            if (JNIUtil::isJavaExceptionThrown())
+              return false;
+          }
+
+        jstring jname = JNIUtil::makeJString(name);
+        if (JNIUtil::isJavaExceptionThrown())
+          return false;
+        jstring jvalue = JNIUtil::makeJString(value);
+        if (JNIUtil::isJavaExceptionThrown())
+          return false;
+
+        e->CallVoidMethod(jh, mid, jname, jvalue);
+        if (JNIUtil::isJavaExceptionThrown())
+          return false;
+
+        e->DeleteLocalRef(jname);
+        e->DeleteLocalRef(jvalue);
+        return true;
+      }
+
+    JNIEnv* m_env;
+    jobject m_jhandler;
+  } enumerator;
+
+  enumerator.m_env = env;
+  enumerator.m_jhandler = jhandler;
+
+  SVN::Pool requestPool;
+  svn_config_enumerate2(ctx.m_config, ctx.m_section.c_str(),
+                        enumerator.process, &enumerator,
+                        requestPool.getPool());
+}
diff --git a/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigLib.cpp b/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigLib.cpp
new file mode 100644
index 0000000..0630098
--- /dev/null
+++ b/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigLib.cpp
@@ -0,0 +1,492 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ *
+ * @file org_apache_subversion_javahl_util_ConfigLib.cpp
+ * @brief Implementation of the native methods in the Java class ConfigLib
+ */
+
+#include "../include/org_apache_subversion_javahl_util_ConfigLib.h"
+
+#include <apr_fnmatch.h>
+#include <apr_strings.h>
+
+#include "jniwrapper/jni_list.hpp"
+#include "jniwrapper/jni_stack.hpp"
+
+#include "AuthnCallback.hpp"
+#include "Credential.hpp"
+#include "SubversionException.hpp"
+
+#include "GlobalConfig.h"
+#include "JNIUtil.h"
+#include "JNICriticalSection.h"
+
+#include "svn_auth.h"
+#include "svn_base64.h"
+#include "svn_config.h"
+#include "svn_hash.h"
+#include "svn_x509.h"
+
+#include "svn_private_config.h"
+
+namespace {
+bool g_ignore_native_credentials = false;
+} // anonymous namespace
+
+bool GlobalConfig::useNativeCredentialsStore()
+{
+  JNICriticalSection lock(*JNIUtil::g_configMutex);
+  return !g_ignore_native_credentials;
+}
+
+JNIEXPORT void JNICALL
+Java_org_apache_subversion_javahl_util_ConfigLib_enableNativeCredentialsStore(
+    JNIEnv* jenv, jobject jthis)
+{
+  SVN_JAVAHL_JNI_TRY(ConfigLib, enableNativeCredentialsStore)
+    {
+      JNICriticalSection lock(*JNIUtil::g_configMutex);
+      g_ignore_native_credentials = false;
+    }
+  SVN_JAVAHL_JNI_CATCH;
+}
+
+JNIEXPORT void JNICALL
+Java_org_apache_subversion_javahl_util_ConfigLib_disableNativeCredentialsStore(
+    JNIEnv* jenv, jobject jthis)
+{
+  SVN_JAVAHL_JNI_TRY(ConfigLib, disableNativeCredentialsStore)
+    {
+      JNICriticalSection lock(*JNIUtil::g_configMutex);
+      g_ignore_native_credentials = true;
+    }
+  SVN_JAVAHL_JNI_CATCH;
+}
+
+JNIEXPORT jboolean JNICALL
+Java_org_apache_subversion_javahl_util_ConfigLib_isNativeCredentialsStoreEnabled(
+    JNIEnv* jenv, jobject jthis)
+{
+  SVN_JAVAHL_JNI_TRY(ConfigLib, isNativeCredentialsStoreEnabled)
+    {
+      return jboolean(GlobalConfig::useNativeCredentialsStore());
+    }
+  SVN_JAVAHL_JNI_CATCH;
+  return JNI_FALSE;
+}
+
+
+namespace {
+jobject build_credential(Java::Env env, apr_hash_t* cred,
+                         const char* cred_kind, const char* realm,
+                         apr_pool_t* scratch_pool)
+{
+  svn_string_t* entry = static_cast<svn_string_t*>(
+      svn_hash_gets(cred, SVN_CONFIG_REALMSTRING_KEY));
+  if (!entry || !realm || 0 != strcmp(realm, entry->data))
+    {
+      JavaHL::SubversionException(env).throw_java_exception(
+          apr_psprintf(scratch_pool,
+                       "Unexpected realm; got: [%s], expected: [%s]",
+                       (entry ? entry->data : "(null)"),
+                       (realm ? realm : "(null)")));
+    }
+
+  entry = static_cast<svn_string_t*>(
+      svn_hash_gets(cred, SVN_CONFIG_AUTHN_PASSTYPE_KEY));
+
+  const char* store = (entry ? entry->data : NULL);
+  const char* username = NULL;
+  const char* password = NULL;
+  jobject info = NULL;
+  jobject failures = NULL;
+  const char* passphrase = NULL;
+
+  if (0 == strcmp(cred_kind, SVN_AUTH_CRED_USERNAME))
+    {
+      entry = static_cast<svn_string_t*>(
+          svn_hash_gets(cred, SVN_CONFIG_AUTHN_USERNAME_KEY));
+      if (entry)
+        username = entry->data;
+    }
+  else if (0 == strcmp(cred_kind, SVN_AUTH_CRED_SIMPLE))
+    {
+      entry = static_cast<svn_string_t*>(
+          svn_hash_gets(cred, SVN_CONFIG_AUTHN_USERNAME_KEY));
+      if (entry)
+        username = entry->data;
+      entry = static_cast<svn_string_t*>(
+          svn_hash_gets(cred, SVN_CONFIG_AUTHN_PASSWORD_KEY));
+      if (entry)
+        password = entry->data;
+    }
+  else if (0 == strcmp(cred_kind, SVN_AUTH_CRED_SSL_SERVER_TRUST))
+    {
+      entry = static_cast<svn_string_t*>(
+          svn_hash_gets(cred, SVN_CONFIG_AUTHN_ASCII_CERT_KEY));
+      const char* ascii_cert = (entry ? entry->data : NULL);
+
+      entry = static_cast<svn_string_t*>(
+          svn_hash_gets(cred, SVN_CONFIG_AUTHN_FAILURES_KEY));
+      jint failflags = (!entry ? 0 : jint(apr_atoi64(entry->data)));
+
+      info = JavaHL::AuthnCallback::SSLServerCertInfo(env, ascii_cert).get();
+      failures = JavaHL::AuthnCallback
+        ::SSLServerCertFailures(env, failflags).get();
+    }
+  else if (0 == strcmp(cred_kind, SVN_AUTH_CRED_SSL_CLIENT_CERT_PW))
+    {
+      entry = static_cast<svn_string_t*>(
+          svn_hash_gets(cred, SVN_CONFIG_AUTHN_PASSPHRASE_KEY));
+      if (entry)
+        passphrase = entry->data;
+    }
+  else
+    {
+      JavaHL::SubversionException(env).throw_java_exception(
+          apr_psprintf(scratch_pool,
+                       "Invalid credential type: [%s]",
+                       cred_kind));
+    }
+
+  return JavaHL::Credential(
+      env,
+      JavaHL::Credential::Kind(env, Java::String(env, cred_kind)).get(),
+      Java::String(env, realm), Java::String(env, store),
+      Java::String(env, username), Java::String(env, password),
+      info, failures, Java::String(env, passphrase)).get();
+}
+
+class WalkCredentialsCallback
+{
+public:
+  static svn_error_t* walk_func(svn_boolean_t *delete_cred,
+                                void *walk_baton,
+                                const char *cred_kind,
+                                const char *realmstring,
+                                apr_hash_t *cred,
+                                apr_pool_t *scratch_pool)
+    {
+      WalkCredentialsCallback& self =
+        *static_cast<WalkCredentialsCallback*>(walk_baton);
+      return self(delete_cred, cred_kind, realmstring, cred, scratch_pool);
+    }
+
+  virtual svn_error_t* operator()(svn_boolean_t *delete_cred,
+                                  const char *cred_kind,
+                                  const char *realmstring,
+                                  apr_hash_t *cred_hash,
+                                  apr_pool_t *scratch_pool) = 0;
+};
+
+class SimpleSearchCallback : public WalkCredentialsCallback
+{
+  const ::Java::Env m_env;
+  const char* const m_cred_kind;
+  const char* const m_realm;
+  const bool m_delete_when_found;
+  jobject m_credential;
+
+public:
+  explicit SimpleSearchCallback(::Java::Env env,
+                                const char* cred_kind, const char* realm,
+                                bool delete_when_found)
+    : m_env(env),
+      m_cred_kind(cred_kind),
+      m_realm(realm),
+      m_delete_when_found(delete_when_found),
+      m_credential(NULL)
+    {}
+
+  jobject credential() const { return m_credential; }
+
+  virtual svn_error_t* operator()(svn_boolean_t *delete_cred,
+                                  const char *cred_kind,
+                                  const char *realmstring,
+                                  apr_hash_t *cred_hash,
+                                  apr_pool_t *scratch_pool)
+    {
+      if (0 == strcmp(cred_kind, m_cred_kind)
+          && 0 == strcmp(realmstring, m_realm))
+        {
+          m_credential = build_credential(m_env, cred_hash,
+                                          cred_kind, realmstring,
+                                          scratch_pool);
+          *delete_cred = m_delete_when_found;
+          return svn_error_create(SVN_ERR_CEASE_INVOCATION, NULL, "");
+        }
+
+      *delete_cred = false;
+      return SVN_NO_ERROR;
+    }
+};
+} // anonymous namespace
+
+
+JNIEXPORT jobject JNICALL
+Java_org_apache_subversion_javahl_util_ConfigLib_nativeGetCredential(
+    JNIEnv* jenv, jobject jthis,
+    jstring jconfig_dir, jstring jcred_kind, jstring jrealm)
+{
+  SVN_JAVAHL_JNI_TRY(ConfigLib, nativeGetCredential)
+    {
+      if (!GlobalConfig::useNativeCredentialsStore())
+        return NULL;
+
+      const Java::Env env(jenv);
+      const Java::String config_dir(env, jconfig_dir);
+      const Java::String cred_kind(env, jcred_kind);
+      const Java::String realm(env, jrealm);
+
+      // Using a "global" request pool since we don't keep a context
+      // with its own pool around for these functions.
+      SVN::Pool pool;
+
+      SimpleSearchCallback cb(env,
+                              cred_kind.strdup(pool.getPool()),
+                              realm.strdup(pool.getPool()),
+                              false);
+
+      SVN_JAVAHL_CHECK(env,
+                       svn_config_walk_auth_data(
+                           Java::String::Contents(config_dir).c_str(),
+                           cb.walk_func, &cb, pool.getPool()));
+      return cb.credential();
+    }
+  SVN_JAVAHL_JNI_CATCH;
+  return NULL;
+}
+
+JNIEXPORT jobject JNICALL
+Java_org_apache_subversion_javahl_util_ConfigLib_nativeRemoveCredential(
+    JNIEnv* jenv, jobject jthis,
+    jstring jconfig_dir, jstring jcred_kind, jstring jrealm)
+{
+  SVN_JAVAHL_JNI_TRY(ConfigLib, nativeRemoveCredential)
+    {
+      if (!GlobalConfig::useNativeCredentialsStore())
+        return NULL;
+
+      const Java::Env env(jenv);
+      const Java::String config_dir(env, jconfig_dir);
+      const Java::String cred_kind(env, jcred_kind);
+      const Java::String realm(env, jrealm);
+
+      // Using a "global" request pool since we don't keep a context
+      // with its own pool around for these functions.
+      SVN::Pool pool;
+
+      SimpleSearchCallback cb(env,
+                              cred_kind.strdup(pool.getPool()),
+                              realm.strdup(pool.getPool()),
+                              true);
+
+      SVN_JAVAHL_CHECK(env,
+                       svn_config_walk_auth_data(
+                           Java::String::Contents(config_dir).c_str(),
+                           cb.walk_func, &cb, pool.getPool()));
+      return cb.credential();
+    }
+  SVN_JAVAHL_JNI_CATCH;
+  return NULL;
+}
+
+JNIEXPORT jobject JNICALL
+Java_org_apache_subversion_javahl_util_ConfigLib_nativeSearchCredentials(
+    JNIEnv* jenv, jobject jthis,
+    jstring jconfig_dir, jstring jcred_kind,
+    jstring jrealm_pattern, jstring jusername_pattern,
+    jstring jhostname_pattern, jstring jtext_pattern)
+{
+  SVN_JAVAHL_JNI_TRY(ConfigLib, iterateCredentials)
+    {
+      if (!GlobalConfig::useNativeCredentialsStore())
+        return NULL;
+
+      const Java::Env env(jenv);
+      const Java::String config_dir(env, jconfig_dir);
+      const Java::String cred_kind(env, jcred_kind);
+      const Java::String realm_pattern(env, jrealm_pattern);
+      const Java::String username_pattern(env, jusername_pattern);
+      const Java::String hostname_pattern(env, jhostname_pattern);
+      const Java::String text_pattern(env, jtext_pattern);
+
+      // Using a "global" request pool since we don't keep a context
+      // with its own pool around for these functions.
+      SVN::Pool pool;
+
+      class Callback : public WalkCredentialsCallback
+      {
+        const char* const m_cred_kind;
+        const char* const m_realm_pattern;
+        const char* const m_username_pattern;
+        const char* const m_hostname_pattern;
+        const char* const m_text_pattern;
+
+        const ::Java::Env m_env;
+        ::Java::List<JavaHL::Credential> m_credentials;
+
+        bool match_array(const char* pattern,
+                         const apr_array_header_t* hostnames)
+          {
+            for (int i = 0; i < hostnames->nelts; ++i)
+              {
+                const char* const hostname =
+                  APR_ARRAY_IDX(hostnames, i, const char*);
+                if (!apr_fnmatch(pattern, hostname, 0))
+                  return true;
+              }
+            return false;
+          }
+
+      public:
+        explicit Callback(::Java::Env ctor_env,
+                          const char* ctor_cred_kind,
+                          const char* ctor_realm_pattern,
+                          const char* ctor_username_pattern,
+                          const char* ctor_hostname_pattern,
+                          const char* ctor_text_pattern)
+          : m_cred_kind(ctor_cred_kind),
+            m_realm_pattern(ctor_realm_pattern),
+            m_username_pattern(ctor_username_pattern),
+            m_hostname_pattern(ctor_hostname_pattern),
+            m_text_pattern(ctor_text_pattern),
+            m_env(ctor_env),
+            m_credentials(ctor_env)
+          {}
+
+        jobject credentials() const
+          {
+            if (m_credentials.is_empty())
+              return NULL;
+            return m_credentials.get();
+          }
+
+        virtual svn_error_t* operator()(svn_boolean_t *delete_cred,
+                                        const char *cb_cred_kind,
+                                        const char *cb_realmstring,
+                                        apr_hash_t *cb_cred_hash,
+                                        apr_pool_t *cb_scratch_pool)
+          {
+            *delete_cred = false;
+            if (m_cred_kind && 0 != strcmp(cb_cred_kind, m_cred_kind))
+              return SVN_NO_ERROR;
+
+            svn_string_t* entry = static_cast<svn_string_t*>(
+                svn_hash_gets(cb_cred_hash, SVN_CONFIG_AUTHN_USERNAME_KEY));
+            const char* const username = (entry ? entry->data : NULL);
+
+            entry = static_cast<svn_string_t*>(
+                svn_hash_gets(cb_cred_hash, SVN_CONFIG_AUTHN_PASSTYPE_KEY));
+            const char* const store = (entry ? entry->data : NULL);
+
+            const svn_string_t* ascii_cert = static_cast<svn_string_t*>(
+                svn_hash_gets(cb_cred_hash, SVN_CONFIG_AUTHN_ASCII_CERT_KEY));
+
+            /* Parsed certificate data. */
+            const char* subject = NULL;
+            const char* issuer = NULL;
+            const char* fingerprint = NULL;
+            const apr_array_header_t* hostnames = NULL;
+
+            if (ascii_cert)
+              {
+                const svn_string_t* const der =
+                  svn_base64_decode_string(ascii_cert, cb_scratch_pool);
+                svn_x509_certinfo_t* certinfo;
+                svn_error_t* err = svn_x509_parse_cert(
+                    &certinfo, der->data, der->len,
+                    cb_scratch_pool, cb_scratch_pool);
+                if (err)
+                  {
+                    // Ignore credentials that can't be parsed.
+                    svn_error_clear(err);
+                    return SVN_NO_ERROR;
+                  }
+                else
+                  {
+                    subject = svn_x509_certinfo_get_subject(
+                        certinfo, cb_scratch_pool);
+                    issuer = svn_x509_certinfo_get_issuer(
+                        certinfo, cb_scratch_pool);
+                    fingerprint = svn_checksum_to_cstring_display(
+                        svn_x509_certinfo_get_digest(certinfo),
+                        cb_scratch_pool);
+                    hostnames = svn_x509_certinfo_get_hostnames(certinfo);
+                  }
+              }
+
+            bool match = (m_realm_pattern
+                          && !apr_fnmatch(m_realm_pattern, cb_realmstring, 0));
+
+            if (!match && m_username_pattern)
+              match = (match
+                       || (username
+                           && !apr_fnmatch(m_username_pattern, username, 0)));
+
+            if (!match && m_hostname_pattern)
+              match = (match
+                       || (hostnames
+                           &&  match_array(m_hostname_pattern, hostnames)));
+
+            if (!match && m_text_pattern)
+              match = (match
+                       || (username
+                           && !apr_fnmatch(m_text_pattern, username, 0))
+                       || (store
+                           && !apr_fnmatch(m_text_pattern, store, 0))
+                       || (subject
+                           && !apr_fnmatch(m_text_pattern, subject, 0))
+                       || (issuer
+                           && !apr_fnmatch(m_text_pattern, issuer, 0))
+                       || (fingerprint
+                           && !apr_fnmatch(m_text_pattern, fingerprint, 0))
+                       || (hostnames
+                           && match_array(m_text_pattern, hostnames)));
+
+            if (match)
+              m_credentials.add(
+                  ::JavaHL::Credential(m_env,
+                                       build_credential(m_env,
+                                                        cb_cred_hash,
+                                                        cb_cred_kind,
+                                                        cb_realmstring,
+                                                        cb_scratch_pool)));
+
+            return SVN_NO_ERROR;
+          }
+      } cb(env,
+           cred_kind.strdup(pool.getPool()),
+           realm_pattern.strdup(pool.getPool()),
+           username_pattern.strdup(pool.getPool()),
+           hostname_pattern.strdup(pool.getPool()),
+           text_pattern.strdup(pool.getPool()));
+
+      SVN_JAVAHL_CHECK(env,
+                       svn_config_walk_auth_data(
+                           Java::String::Contents(config_dir).c_str(),
+                           cb.walk_func, &cb, pool.getPool()));
+      return cb.credentials();
+    }
+  SVN_JAVAHL_JNI_CATCH;
+  return NULL;
+}
diff --git a/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_DiffLib.cpp b/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_DiffLib.cpp
new file mode 100644
index 0000000..c6d3d6e
--- /dev/null
+++ b/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_DiffLib.cpp
@@ -0,0 +1,206 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ *
+ * @file org_apache_subversion_javahl_util_DiffLib.cpp
+ * @brief Implementation of the native methods in the Java class DiffLib
+ */
+
+#include "../include/org_apache_subversion_javahl_util_DiffLib.h"
+
+#include "JNIStackElement.h"
+#include "JNIStringHolder.h"
+#include "JNIUtil.h"
+#include "OutputStream.h"
+#include "Path.h"
+#include "Pool.h"
+
+#include "svn_diff.h"
+
+JNIEXPORT jboolean JNICALL
+Java_org_apache_subversion_javahl_util_DiffLib_nativeFileDiff(
+    JNIEnv* env, jobject jthis,
+    jstring joriginal_file,
+    jstring jmodified_file,
+
+    jint jignore_space_ordinal,
+    jboolean jignore_eol_style,
+    jboolean jshow_c_function,
+    jint jcontext_size,
+
+    jstring joriginal_header,
+    jstring jmodified_header,
+    jstring jheader_encoding,
+    jstring jrelative_to_dir,
+
+    jobject jresult_stream)
+{
+  JNIEntry(DiffLib, nativeFileDiff);
+
+  // Using a "global" request pool since we don't keep a context with
+  // its own pool around for these functions.
+  SVN::Pool pool;
+
+  Path original(joriginal_file, pool);
+  if (JNIUtil::isJavaExceptionThrown())
+    return false;
+  SVN_JNI_ERR(original.error_occurred(), false);
+
+  Path modified(jmodified_file, pool);
+  if (JNIUtil::isJavaExceptionThrown())
+    return false;
+  SVN_JNI_ERR(modified.error_occurred(), false);
+
+  svn_diff_t* diff;
+  svn_diff_file_options_t* diff_options =
+    svn_diff_file_options_create(pool.getPool());
+  diff_options->ignore_space =
+    svn_diff_file_ignore_space_t(jignore_space_ordinal);
+  diff_options->ignore_eol_style = svn_boolean_t(jignore_eol_style);
+  diff_options->show_c_function = svn_boolean_t(jshow_c_function);
+  SVN_JNI_ERR(svn_diff_file_diff_2(&diff,
+                                   original.c_str(),
+                                   modified.c_str(),
+                                   diff_options,
+                                   pool.getPool()),
+              false);
+
+  const jboolean diffs = svn_diff_contains_diffs(diff);
+
+  JNIStringHolder original_header(joriginal_header);
+  if (JNIUtil::isJavaExceptionThrown())
+    return false;
+
+  JNIStringHolder modified_header(jmodified_header);
+  if (JNIUtil::isJavaExceptionThrown())
+    return false;
+
+  JNIStringHolder header_encoding(jheader_encoding);
+  if (JNIUtil::isJavaExceptionThrown())
+    return false;
+
+  JNIStringHolder relative_to_dir(jrelative_to_dir);
+  if (JNIUtil::isJavaExceptionThrown())
+    return false;
+
+  OutputStream result_stream(jresult_stream);
+
+  SVN_JNI_ERR(svn_diff_file_output_unified4(
+                  result_stream.getStream(pool), diff,
+                  original.c_str(), modified.c_str(),
+                  original_header.c_str(), modified_header.c_str(),
+                  header_encoding.c_str(), relative_to_dir.c_str(),
+                  diff_options->show_c_function, int(jcontext_size),
+                  NULL, NULL, pool.getPool()),
+              false);
+
+  return diffs;
+}
+
+JNIEXPORT jboolean JNICALL
+Java_org_apache_subversion_javahl_util_DiffLib_nativeFileMerge(
+    JNIEnv* env, jobject jthis,
+    jstring joriginal_file,
+    jstring jmodified_file,
+    jstring jlatest_file,
+
+    jint jignore_space_ordinal,
+    jboolean jignore_eol_style,
+    jboolean jshow_c_function,
+
+    jstring jconflict_original,
+    jstring jconflict_modified,
+    jstring jconflict_latest,
+    jstring jconflict_separator,
+    jint jconflict_style_ordinal,
+
+    jobject jresult_stream)
+{
+  JNIEntry(DiffLib, nativeFileMerge);
+
+  // Using a "global" request pool since we don't keep a context with
+  // its own pool around for these functions.
+  SVN::Pool pool;
+
+  Path original(joriginal_file, pool);
+  if (JNIUtil::isJavaExceptionThrown())
+    return false;
+  SVN_JNI_ERR(original.error_occurred(), false);
+
+  Path modified(jmodified_file, pool);
+  if (JNIUtil::isJavaExceptionThrown())
+    return false;
+  SVN_JNI_ERR(modified.error_occurred(), false);
+
+  Path latest(jlatest_file, pool);
+  if (JNIUtil::isJavaExceptionThrown())
+    return false;
+  SVN_JNI_ERR(latest.error_occurred(), false);
+
+  svn_diff_t* diff;
+  svn_diff_file_options_t* diff_options =
+    svn_diff_file_options_create(pool.getPool());
+  diff_options->ignore_space =
+    svn_diff_file_ignore_space_t(jignore_space_ordinal);
+  diff_options->ignore_eol_style = svn_boolean_t(jignore_eol_style);
+  diff_options->show_c_function = svn_boolean_t(jshow_c_function);
+  SVN_JNI_ERR(svn_diff_file_diff3_2(&diff,
+                                    original.c_str(),
+                                    modified.c_str(),
+                                    latest.c_str(),
+                                    diff_options,
+                                    pool.getPool()),
+              false);
+
+  const jboolean conflicts = svn_diff_contains_conflicts(diff);
+
+  JNIStringHolder conflict_original(jconflict_original);
+  if (JNIUtil::isJavaExceptionThrown())
+    return false;
+
+  JNIStringHolder conflict_modified(jconflict_modified);
+  if (JNIUtil::isJavaExceptionThrown())
+    return false;
+
+  JNIStringHolder conflict_latest(jconflict_latest);
+  if (JNIUtil::isJavaExceptionThrown())
+    return false;
+
+  JNIStringHolder conflict_separator(jconflict_separator);
+  if (JNIUtil::isJavaExceptionThrown())
+    return false;
+
+  OutputStream result_stream(jresult_stream);
+
+  SVN_JNI_ERR(svn_diff_file_output_merge3(
+                  result_stream.getStream(pool), diff,
+                  original.c_str(), modified.c_str(), latest.c_str(),
+                  conflict_original.c_str(),
+                  conflict_modified.c_str(),
+                  conflict_latest.c_str(),
+                  conflict_separator.c_str(),
+                  svn_diff_conflict_display_style_t(jconflict_style_ordinal),
+                  NULL, NULL,
+                  pool.getPool()),
+              false);
+
+  return conflicts;
+}
diff --git a/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_PropLib.cpp b/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_PropLib.cpp
new file mode 100644
index 0000000..3456dea
--- /dev/null
+++ b/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_PropLib.cpp
@@ -0,0 +1,381 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ *
+ * @file org_apache_subversion_javahl_util_PropLib.cpp
+ * @brief Implementation of the native methods in the Java class PropLib
+ */
+
+#include <iostream>
+#include <sstream>
+
+#include "../include/org_apache_subversion_javahl_util_PropLib.h"
+
+#include "jniwrapper/jni_stack.hpp"
+#include "jniwrapper/jni_array.hpp"
+#include "jniwrapper/jni_list.hpp"
+#include "jniwrapper/jni_string.hpp"
+#include "jniwrapper/jni_io_stream.hpp"
+#include "ExternalItem.hpp"
+#include "SubversionException.hpp"
+
+#include "EnumMapper.h"
+#include "Pool.h"
+
+#include "svn_props.h"
+#include "svn_time.h"
+#include "svn_wc.h"
+
+#include "private/svn_wc_private.h"
+#include "svn_private_config.h"
+
+
+namespace {
+class PropGetter
+{
+public:
+  PropGetter(const char* mime_type, svn_stream_t* contents)
+    : m_mime_type(mime_type),
+      m_contents(contents)
+    {}
+
+  static svn_error_t* callback(const svn_string_t** mime_type,
+                               svn_stream_t* stream, void* baton,
+                               apr_pool_t* pool)
+    {
+      PropGetter* self = static_cast<PropGetter*>(baton);
+      if (mime_type)
+        {
+          if (self->m_mime_type)
+            *mime_type = svn_string_create(self->m_mime_type, pool);
+          else
+            *mime_type = svn_string_create_empty(pool);
+        }
+
+      if (stream && self->m_contents)
+        {
+          SVN_ERR(svn_stream_copy3(self->m_contents,
+                                   svn_stream_disown(stream, pool),
+                                   NULL, NULL, pool));
+        }
+
+      return SVN_NO_ERROR;
+    }
+
+private:
+  const char* m_mime_type;
+  svn_stream_t* m_contents;
+};
+
+struct FormatRevision
+{
+  explicit FormatRevision(const svn_opt_revision_t* const& revarg,
+                          const SVN::Pool& poolarg)
+    : rev(revarg), pool(poolarg)
+    {}
+
+  const svn_opt_revision_t* const& rev;
+  const SVN::Pool& pool;
+};
+
+std::ostream& operator<<(std::ostream& os, const FormatRevision& pr)
+{
+  switch (pr.rev->kind)
+    {
+    case svn_opt_revision_number:
+      os << pr.rev->value.number;
+      break;
+    case svn_opt_revision_date:
+      os << '{'
+         << svn_time_to_cstring(pr.rev->value.date, pr.pool.getPool())
+         << '}';
+      break;
+    default:
+      throw std::logic_error(
+          _("Invalid revision tag; must be a number or a date"));
+    }
+  return os;
+}
+
+bool operator==(const svn_opt_revision_t& a,
+                const svn_opt_revision_t& b)
+{
+  if (a.kind != b.kind)
+    return false;
+  if (a.kind == svn_opt_revision_number
+      && a.value.number != b.value.number)
+    return false;
+  if (a.kind == svn_opt_revision_date
+      && a.value.date != b.value.date)
+    return false;
+  return true;
+}
+
+inline bool operator!=(const svn_opt_revision_t& a,
+                       const svn_opt_revision_t& b)
+{
+  return !(a == b);
+}
+
+class UnparseFunctor
+{
+public:
+  explicit UnparseFunctor(std::ostringstream& buffer, bool old_format,
+                          SVN::Pool& iterpool)
+    : m_buffer(buffer),
+      m_old_format(old_format),
+      m_iterpool(iterpool)
+    {}
+
+  void operator()(const JavaHL::ExternalItem& item)
+    {
+      m_iterpool.clear();
+
+      const Java::Env env(item.get_env());
+      const Java::LocalFrame frame(env);
+
+      if (!m_old_format)
+        {
+          if (item.revision()->kind != svn_opt_revision_head
+              && *item.revision() != *item.peg_revision())
+            {
+              m_buffer << "-r"
+                       << FormatRevision(item.revision(), m_iterpool)
+                       << ' ';
+            }
+          if (item.peg_revision()->kind == svn_opt_revision_head)
+            m_buffer << item.url() << ' ';
+          else
+            {
+              m_buffer << item.url() << '@'
+                       << FormatRevision(item.peg_revision(), m_iterpool)
+                       << ' ';
+            }
+          m_buffer << item.target_dir() << '\n';
+        }
+      else
+        {
+          // Sanity check: old format does not support peg revisions
+          if (item.peg_revision()->kind != svn_opt_revision_head
+              && *item.revision() != *item.peg_revision())
+            {
+              JavaHL::SubversionException(env)
+                .raise(_("Clients older than Subversion 1.5"
+                         " do not support peg revision syntax"
+                         " in the svn:externals property"));
+            }
+
+          // Sanity check: old format does not support relative URLs
+          const std::string url = item.url();
+          if (   (url.size() >= 1 && (url[0] == '.' || url[0] == '/'))
+                 || (url.size() >= 2 && (url[0] == '^' && url[1] == '/')))
+            {
+              JavaHL::SubversionException(env)
+                .raise(_("Clients older than Subversion 1.5"
+                         " do not support relative URLs"
+                         " in the svn:externals property"));
+            }
+
+          m_buffer << item.target_dir() << ' ';
+          if (item.revision()->kind != svn_opt_revision_head)
+            {
+              m_buffer << "-r"
+                       << FormatRevision(item.revision(), m_iterpool)
+                       << ' ';
+            }
+          m_buffer << url << '\n';
+        }
+    }
+
+private:
+  std::ostringstream& m_buffer;
+  const bool m_old_format;
+  SVN::Pool& m_iterpool;
+};
+} // anoymous namespace
+
+
+JNIEXPORT jbyteArray JNICALL
+Java_org_apache_subversion_javahl_util_PropLib_checkNodeProp(
+    JNIEnv* jenv, jobject jthis,
+    jstring jname, jbyteArray jvalue, jstring jpath, jobject jkind,
+    jstring jmime_type, jobject jfile_contents,
+    jboolean jskip_some_checks)
+{
+  SVN_JAVAHL_JNI_TRY(PropLib, checkLocalProp)
+    {
+      const Java::Env env(jenv);
+
+      const svn_node_kind_t kind = EnumMapper::toNodeKind(jkind);
+      SVN_JAVAHL_OLDSTYLE_EXCEPTION_CHECK(env);
+
+      const Java::String name_str(env, jname);
+      const Java::ByteArray value(env, jvalue);
+      const Java::String path_str(env, jpath);
+      const Java::String mime_type_str(env, jmime_type);
+      Java::InputStream file_contents(env, jfile_contents);
+
+      // Using a "global" request pool since we don't keep a context
+      // with its own pool around for these functions.
+      SVN::Pool pool;
+
+      const Java::String::Contents name(name_str);
+      const Java::String::Contents path(path_str);
+      const Java::String::Contents mime_type(mime_type_str);
+      PropGetter getter(mime_type.c_str(), file_contents.get_stream(pool));
+
+      const svn_string_t* canonval;
+      SVN_JAVAHL_CHECK(env,
+                       svn_wc_canonicalize_svn_prop(
+                           &canonval, name.c_str(),
+                           Java::ByteArray::Contents(value).get_string(pool),
+                           path.c_str(), kind,
+                           svn_boolean_t(jskip_some_checks),
+                           PropGetter::callback, &getter,
+                           pool.getPool()));
+      return Java::ByteArray(env, canonval->data, jint(canonval->len)).get();
+    }
+  SVN_JAVAHL_JNI_CATCH;
+  return NULL;
+}
+
+
+JNIEXPORT jobject JNICALL
+Java_org_apache_subversion_javahl_util_PropLib_parseExternals(
+    JNIEnv* jenv, jobject jthis,
+    jbyteArray jdescription, jstring jparent_dir, jboolean jcanonicalize_url)
+{
+  SVN_JAVAHL_JNI_TRY(PropLib, parseExternals)
+    {
+      const Java::Env env(jenv);
+
+      const Java::ByteArray description(env, jdescription);
+      const Java::String parent_dir(env, jparent_dir);
+
+      // Using a "global" request pool since we don't keep a context
+      // with its own pool around for these functions.
+      SVN::Pool pool;
+
+      apr_array_header_t* externals;
+      {
+        // There is no guarantee that the description contents are
+        // null-terminated. Copy them to an svn_string_t to make sure
+        // that they are.
+        svn_string_t* const description_contents =
+          Java::ByteArray::Contents(description).get_string(pool);
+
+        SVN_JAVAHL_CHECK(env,
+                         svn_wc_parse_externals_description3(
+                             &externals,
+                             Java::String::Contents(parent_dir).c_str(),
+                             description_contents->data,
+                             svn_boolean_t(jcanonicalize_url),
+                             pool.getPool()));
+      }
+
+      Java::List<JavaHL::ExternalItem> items(env, externals->nelts);
+      for (jint i = 0; i < externals->nelts; ++i)
+        {
+          // References to the newly created external items are stored
+          // in the list, so make sure the local reference in this
+          // frame get cleared on each iteration.
+          Java::LocalFrame frame;
+
+          const svn_wc_external_item2_t* const item =
+            APR_ARRAY_IDX(externals, i, svn_wc_external_item2_t*);
+          items.add(JavaHL::ExternalItem(env,
+                                         item->target_dir,
+                                         item->url,
+                                         &item->revision,
+                                         &item->peg_revision));
+        }
+      return items.get();
+    }
+  SVN_JAVAHL_JNI_CATCH;
+  return NULL;
+}
+
+
+JNIEXPORT jbyteArray JNICALL
+Java_org_apache_subversion_javahl_util_PropLib_unparseExternals(
+    JNIEnv* jenv, jobject jthis,
+    jobject jitems, jstring jparent_dir, jboolean jold_format)
+{
+  SVN_JAVAHL_JNI_TRY(PropLib, unparseExternals)
+    {
+      const Java::Env env(jenv);
+
+      const Java::ImmutableList<JavaHL::ExternalItem> items(env, jitems);
+      const Java::String parent_dir(env, jparent_dir);
+
+      // Using a "global" iteration pool since we don't keep a context
+      // with its own pool around for these functions.
+      SVN::Pool iterpool;
+
+      std::ostringstream buffer;
+      items.for_each(UnparseFunctor(buffer, jold_format, iterpool));
+      const std::string description(buffer.str());
+
+      // Validate the result. Even though we generated the string
+      // ourselves, we did not validate the input paths and URLs.
+      SVN_JAVAHL_CHECK(env,
+                       svn_wc_parse_externals_description3(
+                           NULL,
+                           Java::String::Contents(parent_dir).c_str(),
+                           description.c_str(),
+                           false, iterpool.getPool()));
+      return Java::ByteArray(env, description).get();
+    }
+  SVN_JAVAHL_JNI_CATCH;
+  return NULL;
+}
+
+
+JNIEXPORT jstring JNICALL
+Java_org_apache_subversion_javahl_util_PropLib_resolveExternalsUrl(
+    JNIEnv* jenv, jobject jthis,
+    jobject jitem, jstring jrepos_root_url, jstring jparent_dir_url)
+{
+  SVN_JAVAHL_JNI_TRY(PropLib, unparseExternals)
+    {
+      const Java::Env env(jenv);
+
+      const Java::String repos_root_url(env, jrepos_root_url);
+      const Java::String parent_dir_url(env, jparent_dir_url);
+      const JavaHL::ExternalItem item(env, jitem);
+
+      // Using a "global" request pool since we don't keep a context
+      // with its own pool around for these functions.
+      SVN::Pool pool;
+
+      const char* resolved_url;
+      SVN_JAVAHL_CHECK(env,
+                       svn_wc__resolve_relative_external_url(
+                           &resolved_url,
+                           item.get_external_item(pool),
+                           Java::String::Contents(repos_root_url).c_str(),
+                           Java::String::Contents(parent_dir_url).c_str(),
+                           pool.getPool(), pool.getPool()));
+      return Java::String(env, resolved_url).get();
+    }
+  SVN_JAVAHL_JNI_CATCH;
+  return NULL;
+}
diff --git a/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_SubstLib.cpp b/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_SubstLib.cpp
new file mode 100644
index 0000000..ce507e5
--- /dev/null
+++ b/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_SubstLib.cpp
@@ -0,0 +1,219 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ *
+ * @file org_apache_subversion_javahl_util_SubstLib.cpp
+ * @brief Implementation of the native methods in the Java class SubstLib
+ */
+
+#include <memory>
+
+#include "../include/org_apache_subversion_javahl_util_SubstLib.h"
+
+#include "jniwrapper/jni_stack.hpp"
+#include "jniwrapper/jni_array.hpp"
+#include "jniwrapper/jni_string.hpp"
+#include "jniwrapper/jni_string_map.hpp"
+#include "jniwrapper/jni_io_stream.hpp"
+
+#include "JNIUtil.h"
+#include "NativeStream.hpp"
+#include "Utility.hpp"
+
+#include <apr_hash.h>
+
+#include "svn_subst.h"
+
+#include "svn_private_config.h"
+
+
+namespace {
+apr_hash_t*
+build_keywords_common(Java::Env env, const SVN::Pool& pool,
+                      jbyteArray jkeywords_value, jlong jrevision,
+                      jstring jurl, jstring jrepos_root_url,
+                      jobject jdate, jstring jauthor)
+{
+  const Java::ByteArray keywords_value(env, jkeywords_value);
+  const Java::String url(env, jurl);
+  const Java::String repos_root_url(env, jrepos_root_url);
+  const Java::String author(env, jauthor);
+
+  const Java::ByteArray::Contents keywords_contents(keywords_value);
+  svn_string_t* keywords_string = keywords_contents.get_string(pool);
+  const char* revision = (jrevision < 0 ? NULL
+                          : apr_psprintf(pool.getPool(),
+                                         "%" APR_UINT64_T_FMT,
+                                         apr_uint64_t(jrevision)));
+  const Java::String::Contents url_contents(url);
+  const Java::String::Contents root_url_contents(repos_root_url);
+  const Java::String::Contents author_contents(author);
+
+  apr_hash_t* kw = NULL;
+  SVN_JAVAHL_CHECK(env,
+                   svn_subst_build_keywords3(
+                       &kw,
+                       keywords_string->data,
+                       revision,
+                       url_contents.c_str(),
+                       root_url_contents.c_str(),
+                       (jdate ? JNIUtil::getDate(jdate) : 0),
+                       author_contents.c_str(),
+                       pool.getPool()));
+  return kw;
+}
+
+svn_stream_t*
+translate_stream_common(Java::Env env, const SVN::Pool& pool,
+                        svn_stream_t* stream,
+                        jbyteArray jeol_marker, jboolean jrepair_eol,
+                        jobject jkeywords, jboolean juse_keywords,
+                        jboolean jexpand_keywords,
+                        jbyteArray jkeywords_value, jlong jrevision,
+                        jstring jurl, jstring jrepos_root_url,
+                        jobject jdate, jstring jauthor)
+{
+  apr_hash_t* const keywords =
+    (juse_keywords
+     ? JavaHL::Util::make_keyword_hash(env, jkeywords, pool)
+     : build_keywords_common(
+         env, pool, jkeywords_value, jrevision,
+         jurl, jrepos_root_url, jdate, jauthor));
+
+  const Java::ByteArray eol_marker(env, jeol_marker);
+  svn_string_t* const eol_str =
+    Java::ByteArray::Contents(eol_marker).get_string(pool);
+  return svn_subst_stream_translated(stream,
+                                     eol_str->data,
+                                     svn_boolean_t(jrepair_eol),
+                                     keywords,
+                                     svn_boolean_t(jexpand_keywords),
+                                     pool.getPool());
+}
+} // anoymous namespace
+
+
+JNIEXPORT jobject JNICALL
+Java_org_apache_subversion_javahl_util_SubstLib_buildKeywords(
+    JNIEnv* jenv, jobject jthis,
+    jbyteArray jkeywords_value, jlong jrevision,
+    jstring jurl, jstring jrepos_root_url,
+    jobject jdate, jstring jauthor)
+{
+  typedef Java::Map<Java::ByteArray, jbyteArray> ByteArrayMap;
+
+  SVN_JAVAHL_JNI_TRY(SubstLib, buildKeywords)
+    {
+      const Java::Env env(jenv);
+
+      // Using a "global" request pool since we don't keep a context with
+      // its own pool around for these functions.
+      SVN::Pool pool;
+
+      apr_hash_t* const kw = build_keywords_common(
+          env, pool, jkeywords_value, jrevision,
+          jurl, jrepos_root_url, jdate, jauthor);
+
+      ByteArrayMap keywords(env, jint(apr_hash_count(kw)));
+      for (apr_hash_index_t* hi = apr_hash_first(pool.getPool(), kw);
+           hi; hi = apr_hash_next(hi))
+        {
+          const void* rkey;
+          void* rval;
+          apr_hash_this(hi, &rkey, NULL, &rval);
+
+          svn_string_t* const val = static_cast<svn_string_t*>(rval);
+          keywords.put(static_cast<const char*>(rkey),
+                       Java::ByteArray(env, val->data, jsize(val->len)));
+        }
+      return keywords.get();
+    }
+  SVN_JAVAHL_JNI_CATCH;
+  return NULL;
+}
+
+
+JNIEXPORT jobject JNICALL
+Java_org_apache_subversion_javahl_util_SubstLib_translateInputStream(
+    JNIEnv* jenv, jobject jthis,
+    jobject jsource, jbyteArray jeol_marker, jboolean jrepair_eol,
+    jobject jkeywords, jboolean juse_keywords, jboolean jexpand_keywords,
+    jbyteArray jkeywords_value, jlong jrevision,
+    jstring jurl, jstring jrepos_root_url,
+    jobject jdate, jstring jauthor)
+{
+  SVN_JAVAHL_JNI_TRY(SubstLib, translateInputStream)
+    {
+      const Java::Env env(jenv);
+
+      // We'll allocate the stream in the bound object's pool.
+      std::auto_ptr<JavaHL::NativeInputStream>
+        translated(new JavaHL::NativeInputStream());
+      svn_stream_t* source = Java::InputStream::get_global_stream(
+          env, jsource, translated->get_pool());
+
+      translated->set_stream(translate_stream_common(
+                                 env, translated->get_pool(), source,
+                                 jeol_marker, jrepair_eol,
+                                 jkeywords, juse_keywords, jexpand_keywords,
+                                 jkeywords_value, jrevision,
+                                 jurl, jrepos_root_url, jdate, jauthor));
+      const jobject jtranslated = translated->create_java_wrapper();
+      translated.release();
+      return jtranslated;
+    }
+  SVN_JAVAHL_JNI_CATCH;
+  return NULL;
+}
+
+
+JNIEXPORT jobject JNICALL
+Java_org_apache_subversion_javahl_util_SubstLib_translateOutputStream(
+    JNIEnv* jenv, jobject jthis,
+    jobject jdestination, jbyteArray jeol_marker, jboolean jrepair_eol,
+    jobject jkeywords, jboolean juse_keywords, jboolean jexpand_keywords,
+    jbyteArray jkeywords_value, jlong jrevision,
+    jstring jurl, jstring jrepos_root_url,
+    jobject jdate, jstring jauthor)
+{
+  SVN_JAVAHL_JNI_TRY(SubstLib, translateInputStream)
+    {
+      const Java::Env env(jenv);
+
+      // We'll allocate the stream in the bound object's pool.
+      std::auto_ptr<JavaHL::NativeOutputStream>
+        translated(new JavaHL::NativeOutputStream());
+      svn_stream_t* destination = Java::OutputStream::get_global_stream(
+          env, jdestination, translated->get_pool());
+
+      translated->set_stream(translate_stream_common(
+                                 env, translated->get_pool(), destination,
+                                 jeol_marker, jrepair_eol,
+                                 jkeywords, juse_keywords, jexpand_keywords,
+                                 jkeywords_value, jrevision,
+                                 jurl, jrepos_root_url, jdate, jauthor));
+      const jobject jtranslated = translated->create_java_wrapper();
+      translated.release();
+      return jtranslated;
+    }
+  SVN_JAVAHL_JNI_CATCH;
+  return NULL;
+}
diff --git a/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_TunnelChannel.cpp b/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_TunnelChannel.cpp
new file mode 100644
index 0000000..b18f3fc
--- /dev/null
+++ b/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_TunnelChannel.cpp
@@ -0,0 +1,174 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ *
+ * @file org_apache_subversion_javahl_util_TunnelChannel.cpp
+ * @brief Implementation of the native methods in the Java classes
+ *        TunnelChannel, RequestChannel and ResponseChannel
+ */
+
+#include <string>
+
+#include <apr_file_io.h>
+
+#include "../include/org_apache_subversion_javahl_util_TunnelChannel.h"
+#include "../include/org_apache_subversion_javahl_util_RequestChannel.h"
+#include "../include/org_apache_subversion_javahl_util_ResponseChannel.h"
+
+#include "jniwrapper/jni_exception.hpp"
+#include "jniwrapper/jni_channel.hpp"
+#include "jniwrapper/jni_stack.hpp"
+
+#include "svn_private_config.h"
+
+namespace {
+apr_file_t* get_file_descriptor(Java::Env env, jlong jfd)
+{
+  apr_file_t* fd = reinterpret_cast<apr_file_t*>(jfd);
+  if (!fd)
+    Java::NullPointerException(env).raise("nativeChannel");
+  return fd;
+}
+
+void throw_IOException(Java::Env env, const char* message,
+                       apr_status_t status)
+{
+  char buf[1024];
+  std::string msg(message);
+  apr_strerror(status, buf, sizeof(buf) - 1);
+  msg += buf;
+  Java::IOException(env).raise(msg.c_str());
+}
+
+class TunnelReader : public Java::ChannelReader
+{
+public:
+  explicit TunnelReader(Java::Env env, jlong jnative_channel)
+    : m_fd(get_file_descriptor(env, jnative_channel))
+    {}
+
+  virtual jint operator()(Java::Env env, void* buffer, jint length)
+    {
+      if (!length)
+        return 0;
+
+      apr_size_t bytes_read = length;
+      const apr_status_t status = apr_file_read(m_fd, buffer, &bytes_read);
+      if (status && !APR_STATUS_IS_EOF(status))
+        {
+          throw_IOException(
+              env, _("Error reading from native file handle: "),
+              status);
+          return -1;
+        }
+      if (APR_STATUS_IS_EOF(status))
+        return -1;
+      return jint(bytes_read);
+    }
+
+private:
+  apr_file_t* const m_fd;
+};
+
+class TunnelWriter : public Java::ChannelWriter
+{
+public:
+  explicit TunnelWriter(Java::Env env, jlong jnative_channel)
+    : m_fd(get_file_descriptor(env, jnative_channel))
+    {}
+
+  virtual jint operator()(Java::Env env, const void* buffer, jint length)
+    {
+      if (!length)
+        return 0;
+
+      apr_size_t bytes_written;
+      const apr_status_t status =
+        apr_file_write_full(m_fd, buffer, length, &bytes_written);
+      if (status)
+        {
+          throw_IOException(
+              env, _("Error writing to native file handle: "),
+              status);
+          return -1;
+        }
+      return jint(bytes_written);
+    }
+
+private:
+  apr_file_t* const m_fd;
+};
+
+} // anonymous namespace
+
+
+JNIEXPORT void JNICALL
+Java_org_apache_subversion_javahl_util_TunnelChannel_nativeClose(
+    JNIEnv* jenv, jclass jclazz, jlong jnative_channel)
+{
+  SVN_JAVAHL_JNI_TRY_STATIC(TunnelChannel, close)
+    {
+      const Java::Env env(jenv);
+
+      apr_file_t* const fd = get_file_descriptor(env, jnative_channel);
+      if (!fd)
+        return;
+
+      const apr_status_t status = apr_file_close(fd);
+      if (status)
+        throw_IOException(
+            env, _("Error closing native file handle: "),
+            status);
+    }
+  SVN_JAVAHL_JNI_CATCH;
+}
+
+JNIEXPORT jint JNICALL
+Java_org_apache_subversion_javahl_util_RequestChannel_nativeRead(
+    JNIEnv* jenv, jclass jclazz, jlong jnative_channel, jobject jdst_buffer)
+{
+  SVN_JAVAHL_JNI_TRY_STATIC(RequestChannel, read)
+    {
+      const Java::Env env(jenv);
+
+      TunnelReader reader(env, jnative_channel);
+      Java::ReadableByteChannel channel(env, reader);
+      return channel.read(jdst_buffer);
+    }
+  SVN_JAVAHL_JNI_CATCH;
+  return -1;
+}
+
+JNIEXPORT jint JNICALL
+Java_org_apache_subversion_javahl_util_ResponseChannel_nativeWrite(
+    JNIEnv* jenv, jclass jclazz, jlong jnative_channel, jobject jsrc_buffer)
+{
+  SVN_JAVAHL_JNI_TRY_STATIC(ResponseChannel, write)
+    {
+      const Java::Env env(jenv);
+
+      TunnelWriter writer(env, jnative_channel);
+      Java::WritableByteChannel channel(env, writer);
+      return channel.write(jsrc_buffer);
+    }
+  SVN_JAVAHL_JNI_CATCH;
+  return -1;
+}
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientException.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientException.java
index e523d5f..627da07 100644
--- a/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientException.java
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientException.java
@@ -22,6 +22,7 @@
  */
 
 package org.apache.subversion.javahl;
+import java.util.List;
 
 /**
  * This exception is thrown whenever something goes wrong in the
@@ -29,14 +30,57 @@ package org.apache.subversion.javahl;
  */
 public class ClientException extends NativeException
 {
-    // Update the serialVersionUID when there is a incompatible change
-    // made to this class.  See any of the following, depending upon
-    // the Java release.
-    // http://java.sun.com/j2se/1.3/docs/guide/serialization/spec/version.doc7.html
-    // http://java.sun.com/j2se/1.4/pdf/serial-spec.pdf
-    // http://java.sun.com/j2se/1.5.0/docs/guide/serialization/spec/version.html#6678
-    // http://java.sun.com/javase/6/docs/platform/serialization/spec/version.html#6678
-    private static final long serialVersionUID = 1L;
+    // Update the serialVersionUID when there is a incompatible change made to
+    // this class.  See the java documentation for when a change is incompatible.
+    // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
+    private static final long serialVersionUID = 2L;
+
+    /**
+     * Describes a single error message in a stack of messages
+     * associated with this exception.
+     * @since 1.9
+     */
+    public static final class ErrorMessage
+    {
+        ErrorMessage(int code, String message, boolean generic)
+        {
+            this.code = code;
+            this.message = message;
+            this.generic = generic;
+        }
+
+        /** @return The APR error code associated with the message. */
+        public final int getCode() { return code; }
+
+        /** @return The error message text. */
+        public final String getMessage() { return message; }
+
+        /** @return A flag indicating whether this is a generic
+            message for the APR error code, or a more specific message
+            generated by the native libraries. */
+        public final boolean isGeneric() { return generic; }
+
+        private final int code;
+        private final String message;
+        private final boolean generic;
+    };
+
+    /**
+     * This constructor is only used by the native library.
+     *
+     * @param message A description of the problem.
+     * @param source The error's source.
+     * @param aprError Any associated APR error code for a wrapped
+     *        <code>svn_error_t</code>.
+     * @param messageStack The whole stack of error messages
+     * @since 1.9
+     */
+    ClientException(String message, Throwable cause, String source,
+                    int aprError, List<ErrorMessage> messageStack)
+    {
+        super(message, source, cause, aprError);
+        this.messageStack = messageStack;
+    }
 
     /**
      * This constructor is only used by the native library.
@@ -48,7 +92,12 @@ public class ClientException extends NativeException
      */
     ClientException(String message, String source, int aprError)
     {
-        super(message, source, aprError);
+        this(message, null, source, aprError, null);
+    }
+
+    public List<ErrorMessage> getAllMessages()
+    {
+        return messageStack;
     }
 
     /**
@@ -68,4 +117,6 @@ public class ClientException extends NativeException
             return new ClientException(t.getMessage(), null, -1);
         }
     }
+
+    private final List<ErrorMessage> messageStack;
 }
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java
index 8a59e4d..bd2792f 100644
--- a/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java
@@ -23,10 +23,12 @@
 
 package org.apache.subversion.javahl;
 
+import org.apache.subversion.javahl.types.*;
+import org.apache.subversion.javahl.callback.ClientNotifyCallback;
+
+import java.util.List;
 import java.util.Map;
 import java.util.EventObject;
-import org.apache.subversion.javahl.callback.ClientNotifyCallback;
-import org.apache.subversion.javahl.types.*;
 
 /**
  * The event passed to the {@link ClientNotifyCallback#onNotify}
@@ -34,14 +36,18 @@ import org.apache.subversion.javahl.types.*;
  */
 public class ClientNotifyInformation extends EventObject
 {
-    // Update the serialVersionUID when there is a incompatible change
-    // made to this class.  See any of the following, depending upon
-    // the Java release.
-    // http://java.sun.com/j2se/1.3/docs/guide/serialization/spec/version.doc7.html
-    // http://java.sun.com/j2se/1.4/pdf/serial-spec.pdf
-    // http://java.sun.com/j2se/1.5.0/docs/guide/serialization/spec/version.html#6678
-    // http://java.sun.com/javase/6/docs/platform/serialization/spec/version.html#6678
-    private static final long serialVersionUID = 1L;
+    // Update the serialVersionUID when there is a incompatible change made to
+    // this class.  See the java documentation for when a change is incompatible.
+    // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
+    private static final long serialVersionUID = 2L;
+
+    /**
+     * Path, either absolute or relative to the current working
+     * directory (i.e., not relative to an anchor). <code>path</code>
+     * is <code>null</vode> when the real target is an URL that is
+     * available in {@link #url}.
+     */
+    private String path;
 
     /**
      * The {@link Action} which triggered this event.
@@ -69,6 +75,12 @@ public class ClientNotifyInformation extends EventObject
     private String errMsg;
 
     /**
+     * A detailed stack of error messages for the item.
+     * @see ClientException
+     */
+    private List<ClientException.ErrorMessage> errMsgStack;
+
+    /**
      * The {@link Status} of the content of the item.
      */
     private Status contentState;
@@ -99,6 +111,12 @@ public class ClientNotifyInformation extends EventObject
     private RevisionRange mergeRange;
 
     /**
+     * Similar to {@link #path}, but when not <code>null</code>, the
+     * notification is about a UR>.
+     */
+    private String url;
+
+    /**
      * A common absolute path prefix that can be subtracted from .path.
      */
     private String pathPrefix;
@@ -139,30 +157,35 @@ public class ClientNotifyInformation extends EventObject
      * @param changelistName The name of the changelist.
      * @param mergeRange The range of the merge just beginning to occur.
      * @param pathPrefix A common path prefix.
+     * @since 1.9
      */
     public ClientNotifyInformation(String path, Action action, NodeKind kind,
                              String mimeType, Lock lock, String errMsg,
+                             List<ClientException.ErrorMessage> errMsgStack,
                              Status contentState, Status propState,
                              LockStatus lockState, long revision,
                              String changelistName, RevisionRange mergeRange,
-                             String pathPrefix, String propName,
+                             String url, String pathPrefix, String propName,
                              Map<String, String> revProps, long oldRevision,
                              long hunkOriginalStart, long hunkOriginalLength,
                              long hunkModifiedStart, long hunkModifiedLength,
                              long hunkMatchedLine, int hunkFuzz)
     {
-        super(path == null ? "" : path);
+        super(path != null ? path : (url != null ? url : ""));
+        this.path = path;
         this.action = action;
         this.kind = kind;
         this.mimeType = mimeType;
         this.lock = lock;
         this.errMsg = errMsg;
+        this.errMsgStack = errMsgStack;
         this.contentState = contentState;
         this.propState = propState;
         this.lockState = lockState;
         this.revision = revision;
         this.changelistName = changelistName;
         this.mergeRange = mergeRange;
+        this.url = url;
         this.pathPrefix = pathPrefix;
         this.propName = propName;
         this.revProps = revProps;
@@ -176,7 +199,33 @@ public class ClientNotifyInformation extends EventObject
     }
 
     /**
+     * @deprecated Constructor compatible with teh 1.8 API; uses
+     * <code>null</code> URL and errMsgStack values.
+     */
+    @Deprecated
+    public ClientNotifyInformation(String path, Action action, NodeKind kind,
+                             String mimeType, Lock lock, String errMsg,
+                             Status contentState, Status propState,
+                             LockStatus lockState, long revision,
+                             String changelistName, RevisionRange mergeRange,
+                             String pathPrefix, String propName,
+                             Map<String, String> revProps, long oldRevision,
+                             long hunkOriginalStart, long hunkOriginalLength,
+                             long hunkModifiedStart, long hunkModifiedLength,
+                             long hunkMatchedLine, int hunkFuzz)
+    {
+        this(path, action, kind, mimeType, lock, errMsg, null,
+             contentState, propState, lockState, revision,
+             changelistName, mergeRange, null, pathPrefix,
+             propName, revProps, oldRevision,
+             hunkOriginalStart, hunkOriginalLength,
+             hunkModifiedStart, hunkModifiedLength,
+             hunkMatchedLine, hunkFuzz);
+    }
+
+    /**
      * @return The path of the item, which is the source of the event.
+     *         This may actually be a URL.
      */
     public String getPath()
     {
@@ -184,6 +233,15 @@ public class ClientNotifyInformation extends EventObject
     }
 
     /**
+     * @return {@link #path}, which may be <code>null</code>.
+     * @since 1.9
+     */
+    public String getNotifiedPath()
+    {
+        return this.path;
+    }
+
+    /**
      * @return The {@link Action} which triggered this event.
      */
     public Action getAction()
@@ -224,6 +282,14 @@ public class ClientNotifyInformation extends EventObject
     }
 
     /**
+     * @return Details about the error message for the item.
+     */
+    public List<ClientException.ErrorMessage> getErrMsgDetails()
+    {
+        return errMsgStack;
+    }
+
+    /**
      * @return The {@link Status} of the content of the item.
      */
     public Status getContentState()
@@ -272,6 +338,15 @@ public class ClientNotifyInformation extends EventObject
     }
 
     /**
+     * @return {@link #url}, which may be <code>null</code>
+     * @since 1.9
+     */
+    public String getUrl()
+    {
+        return this.url;
+    }
+
+    /**
      * @return The common absolute path prefix.
      */
     public String getPathPrefix()
@@ -567,7 +642,24 @@ public class ClientNotifyInformation extends EventObject
 
         /** A move in the working copy has been broken
          * @since New in 1.8. */
-        move_broken ("move broken");
+        move_broken ("move broken"),
+
+        /** Running cleanup on an external module.
+         * @since New in 1.9. */
+        cleanup_external ("cleanup external"),
+
+        /** The operation failed because the operation (E.g. commit)
+         * is only valid if the operation includes this path.
+         * @since New in 1.9. */
+        failed_requires_target ("failed requires target"),
+
+        /** Running info on an external module.
+         * @since New in 1.9. */
+        info_external ("info external"),
+
+        /** Finalizing commit.
+         * @since New in 1.9. */
+        commit_finalizing ("commit finalizing");
 
         /**
          * The description of the action.
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitInfo.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitInfo.java
index 1053ca6..49b21be 100644
--- a/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitInfo.java
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitInfo.java
@@ -32,13 +32,9 @@ import org.apache.subversion.javahl.types.LogDate;
  */
 public class CommitInfo implements java.io.Serializable
 {
-    // Update the serialVersionUID when there is a incompatible change
-    // made to this class.  See any of the following, depending upon
-    // the Java release.
-    // http://java.sun.com/j2se/1.3/docs/guide/serialization/spec/version.doc7.html
-    // http://java.sun.com/j2se/1.4/pdf/serial-spec.pdf
-    // http://java.sun.com/j2se/1.5.0/docs/guide/serialization/spec/version.html#6678
-    // http://java.sun.com/javase/6/docs/platform/serialization/spec/version.html#6678
+    // Update the serialVersionUID when there is a incompatible change made to
+    // this class.  See the java documentation for when a change is incompatible.
+    // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
     private static final long serialVersionUID = 1L;
 
     /** the revision committed */
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItem.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItem.java
index 986faf6..d4a2fff 100644
--- a/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItem.java
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItem.java
@@ -30,13 +30,9 @@ import org.apache.subversion.javahl.types.NodeKind;
  */
 public class CommitItem implements java.io.Serializable
 {
-    // Update the serialVersionUID when there is a incompatible change
-    // made to this class.  See any of the following, depending upon
-    // the Java release.
-    // http://java.sun.com/j2se/1.3/docs/guide/serialization/spec/version.doc7.html
-    // http://java.sun.com/j2se/1.4/pdf/serial-spec.pdf
-    // http://java.sun.com/j2se/1.5.0/docs/guide/serialization/spec/version.html#6678
-    // http://java.sun.com/javase/6/docs/platform/serialization/spec/version.html#6678
+    // Update the serialVersionUID when there is a incompatible change made to
+    // this class.  See the java documentation for when a change is incompatible.
+    // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
     private static final long serialVersionUID = 1L;
 
     /**
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java
index f538c63..d211957 100644
--- a/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java
@@ -71,13 +71,26 @@ public class ConflictDescriptor
      */
     private ConflictVersion srcRightVersion;
 
-    /** This constructor should only be called from JNI code. */
-    public ConflictDescriptor(String path, Kind conflictKind, NodeKind nodeKind,
+    // Information about property conflicts. New in 1.9
+    private String propRejectAbspath;
+    private byte[] propValueBase;
+    private byte[] propValueWorking;
+    private byte[] propValueIncomingOld;
+    private byte[] propValueIncomingNew;
+
+
+    // Private constructor, only called from the JNI code.
+    private ConflictDescriptor(String path, Kind conflictKind, NodeKind nodeKind,
                        String propertyName, boolean isBinary, String mimeType,
                        Action action, Reason reason, Operation operation,
                        String basePath, String theirPath,
                        String myPath, String mergedPath,
-                       ConflictVersion srcLeft, ConflictVersion srcRight)
+                       ConflictVersion srcLeft, ConflictVersion srcRight,
+                       String propRejectAbspath, byte[] propValueBase,
+                       byte[] propValueWorking,
+                       byte[] propValueIncomingOld,
+                       byte[] propValueIncomingNew)
+
     {
         this.path = path;
         this.conflictKind = conflictKind;
@@ -94,6 +107,28 @@ public class ConflictDescriptor
         this.operation = operation;
         this.srcLeftVersion = srcLeft;
         this.srcRightVersion = srcRight;
+        this.propRejectAbspath = propRejectAbspath;
+        this.propValueBase = propValueBase;
+        this.propValueWorking = propValueWorking;
+        this.propValueIncomingOld = propValueIncomingOld;
+        this.propValueIncomingNew = propValueIncomingNew;
+    }
+
+    /**
+     * This constructor should only be called from JNI code.
+     * @deprecated
+     */
+    @Deprecated
+    public ConflictDescriptor(String path, Kind conflictKind, NodeKind nodeKind,
+                       String propertyName, boolean isBinary, String mimeType,
+                       Action action, Reason reason, Operation operation,
+                       String basePath, String theirPath,
+                       String myPath, String mergedPath,
+                       ConflictVersion srcLeft, ConflictVersion srcRight)
+    {
+        this(path, conflictKind, nodeKind, propertyName, isBinary, mimeType,
+             action, reason, operation, basePath, theirPath, myPath, mergedPath,
+             srcLeft, srcRight, null, null, null, null, null);
     }
 
     public String getPath()
@@ -171,6 +206,32 @@ public class ConflictDescriptor
         return srcRightVersion;
     }
 
+    public String getPropRejectAbspath()
+    {
+        return propRejectAbspath;
+    }
+
+    public byte[] getPropValueBase()
+    {
+        return propValueBase;
+    }
+
+    public byte[] getPropValueWorking()
+    {
+        return propValueWorking;
+    }
+
+    public byte[] getPropValueIncomingOld()
+    {
+        return propValueIncomingOld;
+    }
+
+    public byte[] getPropValueIncomingNew()
+    {
+        return propValueIncomingNew;
+    }
+
+
     /**
      * Rich man's enum for <code>svn_wc_conflict_kind_t</code>.
      */
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictResult.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictResult.java
index c992d49..5e3c9d0 100644
--- a/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictResult.java
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictResult.java
@@ -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)
     {
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/DiffSummary.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/DiffSummary.java
index e767f2f..657368d 100644
--- a/subversion/bindings/javahl/src/org/apache/subversion/javahl/DiffSummary.java
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/DiffSummary.java
@@ -33,13 +33,9 @@ import org.apache.subversion.javahl.types.NodeKind;
  */
 public class DiffSummary extends EventObject
 {
-    // Update the serialVersionUID when there is a incompatible change
-    // made to this class.  See any of the following, depending upon
-    // the Java release.
-    // http://java.sun.com/j2se/1.3/docs/guide/serialization/spec/version.doc7.html
-    // http://java.sun.com/j2se/1.4/pdf/serial-spec.pdf
-    // http://java.sun.com/j2se/1.5.0/docs/guide/serialization/spec/version.html#6678
-    // http://java.sun.com/javase/6/docs/platform/serialization/spec/version.html#6678
+    // Update the serialVersionUID when there is a incompatible change made to
+    // this class.  See the java documentation for when a change is incompatible.
+    // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
     private static final long serialVersionUID = 1L;
 
     private DiffKind diffKind;
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
index 2ffe446..c1cebc8 100644
--- a/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
@@ -51,6 +51,11 @@ public interface ISVNClient
     public Version getVersion();
 
     /**
+     * @return Runtime version information about the loaded libsvn_client.
+     */
+    public RuntimeVersion getRuntimeVersion();
+
+    /**
      * @return Extended version information about the underlying
      * native libraries and operating system.
      */
@@ -74,16 +79,40 @@ public interface ISVNClient
     public boolean isAdminDirectory(String name);
 
     /**
-     * List a directory or file of the working copy.
+     * Return the status of the working copy and maybe repository.
      *
      * @param path        Path to explore.
      * @param depth       How deep to recurse into subdirectories.
      * @param onServer    Request status information from server.
+     * @param onDisk      Check the working copy for local modifications.
+     *                    A value of <code>false</code> only
+     *                    has effect when <code>onServer</code> is
+     *                    <code>true</code>.
      * @param getAll      get status for uninteresting (unchanged) files.
      * @param noIgnore    get status for normaly ignored files and directories.
      * @param ignoreExternals if externals are ignored during status
+     * @param depthAsSticky When set, interpret <code>depth</code> as
+     *                      the ambient depth of the working copy.
      * @param changelists changelists to filter by
+     * @since 1.9
      */
+    void status(String path, Depth depth,
+                boolean onServer, boolean ignoreLocal,
+                boolean getAll, boolean noIgnore,
+                boolean ignoreExternals, boolean depthAsSticky,
+                Collection<String> changelists, StatusCallback callback)
+            throws ClientException;
+
+    /**
+     * Return information about the status of the working copy and
+     * maybe repository.
+     * <p>
+     * Behaves like the 1.9 version with
+     *     <code>onDisk = true</code> and
+     *     <code>depthAsSticky = false</code>.
+     * @deprecated
+     */
+    @Deprecated
     void status(String path, Depth depth, boolean onServer,
                 boolean getAll, boolean noIgnore, boolean ignoreExternals,
                 Collection<String> changelists, StatusCallback callback)
@@ -131,9 +160,25 @@ public interface ISVNClient
      * accepted by the command-line client.
      * @param prompt the callback interface
      */
+    void setPrompt(AuthnCallback prompt);
+
+    /**
+     * Register callback interface to supply username and password on demand.
+     * This callback can also be used to provide theequivalent of the
+     * <code>--no-auth-cache</code> and <code>--non-interactive</code> arguments
+     * accepted by the command-line client.
+     * @param prompt the callback interface
+     */
+    @SuppressWarnings("deprecation")
     void setPrompt(UserPasswordCallback prompt);
 
     /**
+     * Set callbacks for ra_svn tunnel handling.
+     * @since 1.9
+     */
+    void setTunnelAgent(TunnelAgent tunnelAgent);
+
+    /**
      * Retrieve the log messages for an item.
      * @param path          path or url to get the log message for.
      * @param pegRevision   revision to interpret path
@@ -210,6 +255,35 @@ public interface ISVNClient
             throws ClientException;
 
     /**
+     * Reverts set of files or directories to a pristine state.
+     * @param path      A set of paths to revert.
+     * @param depth     the depth to recurse into subdirectories
+     * @param changelists changelists to filter by
+     * @param clearChangelists If set, will clear changelist association
+     *                         from the reverted paths.
+     * @param metadataOnly Revert just the metadata (including conflict data)
+     *                     and not the working files/dirs
+     * @throws ClientException
+     * @since 1.9
+     */
+    void revert(Set<String> paths, Depth depth,
+                Collection<String> changelists,
+                boolean clearChangelists,
+                boolean metadataOnly)
+            throws ClientException;
+
+    /**
+     * Reverts set of files or directories to a pristine state.
+     * <p>
+     * Behaves like the 1.9 version with <code>clearChangelists</code>
+     * set to <code>false</code>;
+     */
+    void revert(Set<String> paths, Depth depth,
+                Collection<String> changelists)
+            throws ClientException;
+
+
+    /**
      * Reverts a file to a pristine state.
      * @param path      path of the file.
      * @param depth     the depth to recurse into subdirectories
@@ -221,6 +295,10 @@ public interface ISVNClient
 
     /**
      * Adds a file to the repository.
+     * <p>
+     * <b>Note:</b> Behaves like the 1.8 version with
+     * <code>noAutoProps</code> set to <code>false</code>.
+     *
      * @param path      path to be added.
      * @param depth     the depth to recurse into subdirectories
      * @param force     if adding a directory and recurse true and path is a
@@ -229,7 +307,6 @@ public interface ISVNClient
      *                  ignore patterns
      * @param addParents add any intermediate parents to the working copy
      * @throws ClientException
-     * @note this method behaves like the 1.8 version with noAutoProps=false
      */
     void add(String path, Depth depth, boolean force, boolean noIgnores,
              boolean addParents)
@@ -299,12 +376,46 @@ public interface ISVNClient
      * @param makeParents Whether to create intermediate parents
      * @param ignoreExternals Whether or not to process external definitions
      *                        as part of this operation.
+     * @param metadataOnly Copy just the metadata and not the working files/dirs
+     * @param pinExternals Whether or not to pin external definitions as part
+     *                     of this operation.
+     * @param externalsToPin The set of externals to pin.
+     *            Keys are either local absolute paths (when the source of the
+     *            copy is the working copy) or URLs within the repository
+     *            (when the source is the repository) where an
+     *            <code>svn:externals</code> property is defined.
+     *            Values are lists of parsed {@link ExternalItem}
+     *            objects from each external definitions.
+     *            If <code>pinExternals</code> is <code>true</code>, only
+     *            the externals in this set will be pinned; if this parameter
+     *            is <code>null</code>, all externals will be pinned.
+     *            If <code>pinExternals</code> is <code>false</code>,
+     *            this parameter will be ignored.
      * @param revpropTable A string-to-string mapping of revision properties
      *                     to values which will be set if this operation
      *                     results in a commit.
      * @param handler   the commit message callback, may be <code>null</code>
      *                  if <code>destPath</code> is not a URL
      * @throws ClientException If the copy operation fails.
+     * @throws NullPointerException if the <code>sources</code> list is empty.
+     * @since 1.9
+     */
+    void copy(List<CopySource> sources, String destPath,
+              boolean copyAsChild, boolean makeParents,
+              boolean ignoreExternals, boolean metadataOnly,
+              boolean pinExternals,
+              Map<String, List<ExternalItem>> externalsToPin,
+              Map<String, String> revpropTable,
+              CommitMessageCallback handler, CommitCallback callback)
+            throws ClientException;
+
+    /**
+     * Copy versioned paths with the history preserved.
+     * <p>
+     * Behaves like the 1.9 version with
+     *     <code>pinExternals</code> set to <code>false</code> and
+     *     <code>externalsToPin</code> set to <code>null</code> and
+     *     <code>metadataOnly</code> set to <code>false</code>.
      */
     void copy(List<CopySource> sources, String destPath,
               boolean copyAsChild, boolean makeParents,
@@ -344,6 +455,7 @@ public interface ISVNClient
      * @deprecated Provided for backward compatibility with 1.7. Passes
      *             metadataOnly false and allowMixRev true.
      */
+    @Deprecated
     void move(Set<String> srcPaths, String destPath, boolean force,
               boolean moveAsChild, boolean makeParents,
               Map<String, String> revpropTable,
@@ -370,6 +482,30 @@ public interface ISVNClient
      * Recursively cleans up a local directory, finishing any
      * incomplete operations, removing lockfiles, etc.
      * @param path a local directory.
+     * @param breakLocks ### FIXME: Missing docstring in svn_client.h
+     * @param clearDavCache ### FIXME: Missing docstring in svn_client.h
+     * @param removeUnusedPristines ### FIXME: Missing docstring in svn_client.h
+     * @param includeExternals Recurse into externals working copies
+     *        and clean them up, too.
+     * @throws ClientException
+     * @since 1.9
+     */
+    void cleanup(String path,
+                 boolean breakLocks,
+                 boolean fixRecordedTimestamps,
+                 boolean clearDavCache,
+                 boolean removeUnusedPristines,
+                 boolean includeExternals)
+        throws ClientException;
+
+    /**
+     * Recursively cleans up a local directory, finishing any
+     * incomplete operations, removing lockfiles, etc.
+     * <p>
+     * Behaves like the 1.9 version with <code>includeExternals</code>
+     * set to <code>false<code>, and the other flags to
+     * <code>true</code>.
+     * @param path a local directory.
      * @throws ClientException
      */
     void cleanup(String path) throws ClientException;
@@ -399,6 +535,31 @@ public interface ISVNClient
      * @param depth           how deep to recurse in subdirectories
      * @param nativeEOL       which EOL characters to use during export
      * @throws ClientException
+     * @since 1.9
+     */
+    long doExport(String srcPath, String destPath, Revision revision,
+                  Revision pegRevision, boolean force,
+                  boolean ignoreExternals, boolean ignoreKeywords,
+                  Depth depth, String nativeEOL)
+            throws ClientException;
+
+    /**
+     * Exports the contents of either a subversion repository into a
+     * 'clean' directory (meaning a directory with no administrative
+     * directories).
+     * <p>
+     * <b>Note:</b> Behaves like the 1.9 version with
+     * ignoreKeywords set to false.
+     *
+     * @param srcPath         the url of the repository path to be exported
+     * @param destPath        a destination path that must not already exist.
+     * @param revision        the revsion to be exported
+     * @param pegRevision     the revision to interpret srcPath
+     * @param force           set if it is ok to overwrite local files
+     * @param ignoreExternals ignore external during export
+     * @param depth           how deep to recurse in subdirectories
+     * @param nativeEOL       which EOL characters to use during export
+     * @throws ClientException
      */
     long doExport(String srcPath, String destPath, Revision revision,
                   Revision pegRevision, boolean force, boolean ignoreExternals,
@@ -457,6 +618,10 @@ public interface ISVNClient
     /**
      * Import a file or directory into a repository directory  at
      * head.
+     * <p>
+     * <b>Note:</b> Behaves like the 1.8 version with noAutoProps
+     * set to false and without the filtering option.
+     *
      * @param path      the local path
      * @param url       the target url
      * @param depth     depth to traverse into subdirectories
@@ -469,8 +634,6 @@ public interface ISVNClient
      * @param handler   the commit message callback
      * @param callback  the commit status callback
      * @throws ClientException
-     * @note this method behaves like the 1.8 version with noAutoProps=false
-     *       and without the filtering option.
      */
     void doImport(String path, String url, Depth depth,
                   boolean noIgnore, boolean ignoreUnknownNodeTypes,
@@ -501,6 +664,33 @@ public interface ISVNClient
      * @param ignoreMergeinfo ignore merge history, treat sources as unrelated
      * @param diffIgnoreAncestry always treat source files as related
      * @param dryRun         do not change anything
+     * @param allowMixedRev  allow merging into a mixed-revision working copy
+     * @param recordOnly     record mergeinfo but do not run merge
+     * @throws ClientException
+     * @since 1.9
+     */
+    void merge(String path1, Revision revision1, String path2,
+               Revision revision2, String localPath, boolean force, Depth depth,
+               boolean ignoreMergeinfo, boolean diffIgnoreAncestry,
+               boolean dryRun, boolean allowMixedRev, boolean recordOnly)
+            throws ClientException;
+
+    /**
+     * Merge changes from two paths into a new local path.
+     * <p>
+     * <b>Note:</b> Behaves like the 1.9 version with allowMixedRev
+     *              always set to <code>true</code>.
+     *
+     * @param path1          first path or url
+     * @param revision1      first revision
+     * @param path2          second path or url
+     * @param revision2      second revision
+     * @param localPath      target local path
+     * @param force          overwrite local changes
+     * @param depth          how deep to traverse into subdirectories
+     * @param ignoreMergeinfo ignore merge history, treat sources as unrelated
+     * @param diffIgnoreAncestry always treat source files as related
+     * @param dryRun         do not change anything
      * @param recordOnly     record mergeinfo but do not run merge
      * @throws ClientException
      * @since 1.8
@@ -513,6 +703,9 @@ public interface ISVNClient
 
     /**
      * Merge changes from two paths into a new local path.
+     * <p>
+     * <b>Note:</b> Behaves like the 1.8 version where ignoreAncestry
+     * maps to both ignoreMergeinfo and diffIgnoreAncestry
      *
      * @param path1          first path or url
      * @param revision1      first revision
@@ -525,8 +718,6 @@ public interface ISVNClient
      * @param dryRun         do not change anything
      * @param recordOnly     record mergeinfo but do not run merge
      * @throws ClientException
-     * @note Behaves like the 1.8 where ignoreAncestry maps to
-     *       both ignoreMergeinfo and diffIgnoreAncestry
      */
     void merge(String path1, Revision revision1, String path2,
                Revision revision2, String localPath, boolean force, Depth depth,
@@ -545,6 +736,33 @@ public interface ISVNClient
      * @param ignoreMergeinfo ignore merge history, treat sources as unrelated
      * @param diffIgnoreAncestry always treat source files as related
      * @param dryRun        do not change anything
+     * @param allowMixedRev  allow merging into a mixed-revision working copy
+     * @param recordOnly    record mergeinfo but do not run merge
+     * @throws ClientException
+     * @since 1.9
+     */
+    void merge(String path, Revision pegRevision, List<RevisionRange> revisions,
+               String localPath, boolean force, Depth depth,
+               boolean ignoreMergeinfo, boolean diffIgnoreAncestry,
+               boolean dryRun, boolean allowMixedRev, boolean recordOnly)
+             throws ClientException;
+
+    /**
+     * Merge set of revisions into a new local path.
+     * <p>
+     * <b>Note:</b> Behaves like the 1.9 version with allowMixedRev
+     *              always set to <code>true</code>.
+     *
+     * @param path          path or url
+     * @param pegRevision   revision to interpret path
+     * @param revisions     revisions to merge; may be null, indicating that
+     *                      the optimal range should be determined automatcially
+     * @param localPath     target local path
+     * @param force         overwrite local changes
+     * @param depth         how deep to traverse into subdirectories
+     * @param ignoreMergeinfo ignore merge history, treat sources as unrelated
+     * @param diffIgnoreAncestry always treat source files as related
+     * @param dryRun        do not change anything
      * @param recordOnly    record mergeinfo but do not run merge
      * @throws ClientException
      * @since 1.8
@@ -557,6 +775,10 @@ public interface ISVNClient
 
     /**
      * Merge set of revisions into a new local path.
+     * <p>
+     * <b>Note:</b> Behaves like the 1.8 version where ignoreAncestry
+     * maps to both ignoreMergeinfo and diffIgnoreAncestry.
+     *
      * @param path          path or url
      * @param pegRevision   revision to interpret path
      * @param revisions     revisions to merge;
@@ -569,8 +791,6 @@ public interface ISVNClient
      * @param dryRun        do not change anything
      * @param recordOnly    record mergeinfo but do not run merge
      * @throws ClientException
-     * @note Behaves like the 1.8 where ignoreAncestry maps to
-     *       both ignoreMergeinfo and diffIgnoreAncestry
      */
     void merge(String path, Revision pegRevision, List<RevisionRange> revisions,
                String localPath, boolean force, Depth depth,
@@ -594,6 +814,7 @@ public interface ISVNClient
      * @throws ClientException
      * @deprecated Will be removed in a future release
      */
+    @Deprecated
     void mergeReintegrate(String path, Revision pegRevision,
                           String localPath, boolean dryRun)
              throws ClientException;
@@ -616,7 +837,7 @@ public interface ISVNClient
      * @param pegRevision            peg rev for pathOrUrl
      * @param mergeSourceUrl         the source of the merge
      * @param srcPegRevision         peg rev for mergeSourceUrl
-     * @param srcStartRevieion       lower bound of the source revision range
+     * @param srcStartRevision       lower bound of the source revision range
      * @param srcEndRevision         upper bound of the source revision range
      * @param discoverChangedPaths   return paths of changed items
      * @param depth                  the depth to recurse to
@@ -635,6 +856,10 @@ public interface ISVNClient
 
     /**
      * Retrieve either merged or eligible-to-be-merged revisions.
+     * <p>
+     * <b>Note:</b> Behaves like the 1.8 version, with unspecified
+     * revision range.
+     *
      * @param kind                   kind of revisions to receive
      * @param pathOrUrl              target of merge
      * @param pegRevision            peg rev for pathOrUrl
@@ -644,7 +869,6 @@ public interface ISVNClient
      * @param depth                  the depth to recurse to
      * @param revProps               the revprops to retrieve
      * @param callback               the object to receive the log messages
-     * @note Behaves like the 1.8 version, with unspecified revision range.
      */
     void getMergeinfoLog(Mergeinfo.LogKind kind, String pathOrUrl,
                          Revision pegRevision, String mergeSourceUrl,
@@ -660,7 +884,7 @@ public interface ISVNClient
      * @param target2       second path or url
      * @param revision2     second revision
      * @param relativeToDir index path is relative to this path
-     * @param outFileName   file name where difference are written
+     * @param outStream     the stream to which difference are written
      * @param depth         how deep to traverse into subdirectories
      * @param ignoreAncestry ignore if files are not related
      * @param noDiffDeleted no output on deleted files
@@ -681,6 +905,26 @@ public interface ISVNClient
               DiffOptions options)
             throws ClientException;
 
+    /**
+     * Display the differences between two paths
+     * @param target1       first path or url
+     * @param revision1     first revision
+     * @param target2       second path or url
+     * @param revision2     second revision
+     * @param relativeToDir index path is relative to this path
+     * @param outFileName   file name where difference are written
+     * @param depth         how deep to traverse into subdirectories
+     * @param ignoreAncestry ignore if files are not related
+     * @param noDiffDeleted no output on deleted files
+     * @param force         diff even on binary files
+     * @param copiesAsAdds  if set, copied files will be shown in their
+     *                      entirety, not as diffs from their sources
+     * @param ignoreProps   don't show property diffs
+     * @param propsOnly     show property changes only
+     * @param options       additional options for controlling the output
+     * @throws ClientException
+     * @since 1.8
+     */
     void diff(String target1, Revision revision1, String target2,
               Revision revision2, String relativeToDir, String outFileName,
               Depth depth, Collection<String> changelists,
@@ -696,7 +940,7 @@ public interface ISVNClient
      * @param target2       second path or url
      * @param revision2     second revision
      * @param relativeToDir index path is relative to this path
-     * @param outFileName   file name where difference are written
+     * @param outStream     the stream to which difference are written
      * @param depth         how deep to traverse into subdirectories
      * @param ignoreAncestry ignore if files are not related
      * @param noDiffDeleted no output on deleted files
@@ -714,6 +958,24 @@ public interface ISVNClient
               boolean copiesAsAdds, boolean ignoreProps, boolean propsOnly)
             throws ClientException;
 
+    /**
+     * Display the differences between two paths
+     * @param target1       first path or url
+     * @param revision1     first revision
+     * @param target2       second path or url
+     * @param revision2     second revision
+     * @param relativeToDir index path is relative to this path
+     * @param outFileName   file name where difference are written
+     * @param depth         how deep to traverse into subdirectories
+     * @param ignoreAncestry ignore if files are not related
+     * @param noDiffDeleted no output on deleted files
+     * @param force         diff even on binary files
+     * @param copiesAsAdds  if set, copied files will be shown in their
+     *                      entirety, not as diffs from their sources
+     * @param ignoreProps   don't show property diffs
+     * @param propsOnly     show property changes only
+     * @throws ClientException
+     */
     void diff(String target1, Revision revision1, String target2,
               Revision revision2, String relativeToDir, String outFileName,
               Depth depth, Collection<String> changelists,
@@ -728,7 +990,7 @@ public interface ISVNClient
      * @param startRevision first Revision to compare
      * @param endRevision   second Revision to compare
      * @param relativeToDir index path is relative to this path
-     * @param outFileName   file name where difference are written
+     * @param outStream     the stream to which difference are written
      * @param depth         how deep to traverse into subdirectories
      * @param changelists  if non-null, filter paths using changelists
      * @param ignoreAncestry ignore if files are not related
@@ -750,6 +1012,27 @@ public interface ISVNClient
               DiffOptions options)
             throws ClientException;
 
+    /**
+     * Display the differences between two paths.
+     * @param target        path or url
+     * @param pegRevision   revision tointerpret target
+     * @param startRevision first Revision to compare
+     * @param endRevision   second Revision to compare
+     * @param relativeToDir index path is relative to this path
+     * @param outFileName   file name where difference are written
+     * @param depth         how deep to traverse into subdirectories
+     * @param changelists  if non-null, filter paths using changelists
+     * @param ignoreAncestry ignore if files are not related
+     * @param noDiffDeleted no output on deleted files
+     * @param force         diff even on binary files
+     * @param copiesAsAdds  if set, copied files will be shown in their
+     *                      entirety, not as diffs from their sources
+     * @param ignoreProps   don't show property diffs
+     * @param propsOnly     show property changes only
+     * @param options       additional options for controlling the output
+     * @throws ClientException
+     * @since 1.8
+     */
     void diff(String target, Revision pegRevision, Revision startRevision,
               Revision endRevision, String relativeToDir, String outFileName,
               Depth depth, Collection<String> changelists,
@@ -765,7 +1048,7 @@ public interface ISVNClient
      * @param startRevision first Revision to compare
      * @param endRevision   second Revision to compare
      * @param relativeToDir index path is relative to this path
-     * @param outFileName   file name where difference are written
+     * @param outStream     the stream to which difference are written
      * @param depth         how deep to traverse into subdirectories
      * @param changelists  if non-null, filter paths using changelists
      * @param ignoreAncestry ignore if files are not related
@@ -785,6 +1068,25 @@ public interface ISVNClient
               boolean copiesAsAdds, boolean ignoreProps, boolean propsOnly)
             throws ClientException;
 
+    /**
+     * Display the differences between two paths.
+     * @param target        path or url
+     * @param pegRevision   revision tointerpret target
+     * @param startRevision first Revision to compare
+     * @param endRevision   second Revision to compare
+     * @param relativeToDir index path is relative to this path
+     * @param outFileName   file name where difference are written
+     * @param depth         how deep to traverse into subdirectories
+     * @param changelists  if non-null, filter paths using changelists
+     * @param ignoreAncestry ignore if files are not related
+     * @param noDiffDeleted no output on deleted files
+     * @param force         diff even on binary files
+     * @param copiesAsAdds  if set, copied files will be shown in their
+     *                      entirety, not as diffs from their sources
+     * @param ignoreProps   don't show property diffs
+     * @param propsOnly     show property changes only
+     * @throws ClientException
+     */
     void diff(String target, Revision pegRevision, Revision startRevision,
               Revision endRevision, String relativeToDir, String outFileName,
               Depth depth, Collection<String> changelists,
@@ -824,14 +1126,14 @@ public interface ISVNClient
      *
      * @param target Path or URL.
      * @param pegRevision Revision at which to interpret
-     * <code>target</code>.  If {@link Revision.Kind#unspecified} or
+     * <code>target</code>.  If {@link Revision#UNSPECIFIED} or
      * <code>null</code>, behave identically to {@link
      * #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
@@ -889,14 +1191,11 @@ public interface ISVNClient
      *
      * @param paths   paths of the items
      * @param name    name of the property
-     * @param value   new value of the property. Set value to <code>
-     * null</code> to delete a property
+     * @param value   new value of the property. Set value to
+     * <code>null</code> to delete a property
      * @param depth   the depth to recurse into subdirectories
      * @param changelists changelists to filter by
      * @param force   do not check if the value is valid
-     * @param revpropTable A string-to-string mapping of revision properties
-     *                     to values which will be set if this operation
-     *                     results in a commit.
      * @throws ClientException
      */
     void propertySetLocal(Set<String> paths, String name, byte[] value,
@@ -904,6 +1203,21 @@ public interface ISVNClient
                           boolean force)
             throws ClientException;
 
+    /**
+     * Sets one property of an item with a String value
+     *
+     * @param paths   paths of the items
+     * @param name    name of the property
+     * @param value   new value of the property. Set value to <code>
+     * null</code> to delete a property
+     * @param depth   the depth to recurse into subdirectories
+     * @param changelists changelists to filter by
+     * @param force   do not check if the value is valid
+     * @param revpropTable A string-to-string mapping of revision properties
+     *                     to values which will be set if this operation
+     *                     results in a commit.
+     * @throws ClientException
+     */
     void propertySetRemote(String path, long baseRev, String name,
                            byte[] value, CommitMessageCallback handler,
                            boolean force, Map<String, String> revpropTable,
@@ -964,6 +1278,9 @@ public interface ISVNClient
 
     /**
      * Retrieve the content of a file
+     *
+     * Always expands keywords and never returns properties.
+     *
      * @param path      the path of the file
      * @param revision  the revision to retrieve
      * @param pegRevision the revision to interpret path
@@ -982,11 +1299,40 @@ public interface ISVNClient
      * @param revision    the revision to retrieve
      * @param pegRevision the revision at which to interpret the path
      * @param stream      the stream to write the file's content to
+     * @param returnProps whether to return the file's own (not inherited)
+     *                    properties dalong with the contents
+     * @return The file's properties if <code>returnProps</code> is
+     *         set (which may yield an empty map), otherwise
+     *         <code>null</code>.
+     * @throws ClientException
+     * @see java.io.PipedOutputStream
+     * @see java.io.PipedInputStream
+     * @since 1.9
+     */
+    Map<String, byte[]>
+        streamFileContent(String path,
+                          Revision revision, Revision pegRevision,
+                          boolean expandKeywords, boolean returnProps,
+                          OutputStream stream)
+        throws ClientException;
+
+    /**
+     * Write the file's content to the specified output stream.  If
+     * you need an InputStream, use a
+     * PipedInputStream/PipedOutputStream combination.
+     *
+     * Always expands keywords and never returns properties.
+     *
+     * @param path        the path of the file
+     * @param revision    the revision to retrieve
+     * @param pegRevision the revision at which to interpret the path
+     * @param stream      the stream to write the file's content to
      * @throws ClientException
      * @see java.io.PipedOutputStream
      * @see java.io.PipedInputStream
      */
-    void streamFileContent(String path, Revision revision, Revision pegRevision,
+    void streamFileContent(String path,
+                           Revision revision, Revision pegRevision,
                            OutputStream stream)
         throws ClientException;
 
@@ -1013,12 +1359,28 @@ public interface ISVNClient
      *                      information
      * @param callback      callback to receive the file content and the other
      *                      information
+     * @param options       additional options for controlling the output
      * @throws ClientException
+     * @since 1.9
      */
     void blame(String path, Revision pegRevision, Revision revisionStart,
                Revision revisionEnd, boolean ignoreMimeType,
                boolean includeMergedRevisions,
-               BlameCallback callback) throws ClientException;
+               BlameCallback callback, DiffOptions options)
+            throws ClientException;
+
+    /**
+     * Retrieve the content together with the author, the revision and the date
+     * of the last change of each line
+     * <p>
+     * Behaves like the 1.9 version with <code>options</code> set to
+     * their default values.
+     */
+    void blame(String path, Revision pegRevision, Revision revisionStart,
+               Revision revisionEnd, boolean ignoreMimeType,
+               boolean includeMergedRevisions,
+               BlameCallback callback)
+            throws ClientException;
 
     /**
      * Set directory for the configuration information, taking the
@@ -1040,6 +1402,19 @@ public interface ISVNClient
     String getConfigDirectory() throws ClientException;
 
     /**
+     * Set an event handler that will be called every time the
+     * configuration is loaded by this client object.
+     */
+    void setConfigEventHandler(ConfigEvent configHandler)
+            throws ClientException;
+
+    /**
+     * Return a reference to the installed configuration event
+     * handler. The returned value may be <code>null</code>.
+     */
+    ConfigEvent getConfigEventHandler() throws ClientException;
+
+    /**
      * cancel the active operation
      * @throws ClientException
      */
@@ -1069,7 +1444,8 @@ public interface ISVNClient
     /**
      * Recursively get the paths which belong to a changelist
      * @param rootPath    the wc path under which to check
-     * @param changelists the changelists to look under
+     * @param changelists the changelists to look under;
+     *     if <code>null</code>, all changelists will be considered.
      * @param depth       the depth to recurse
      * @param callback    the callback to return the changelists through
      */
@@ -1097,13 +1473,59 @@ public interface ISVNClient
             throws ClientException;
 
     /**
-     * Retrieve information about repository or working copy items.
+     * Invoke <code>callback</code> to return information
+     * <code>pathOrUrl</code> in <code>revision</code>.  The
+     * information returned is system-generated metadata, not the sort
+     * of "property" metadata created by users.
+     * <p>
+     * If both revision arguments are either <code>null</code> or
+     * {@link Revision#START}, then information will be pulled solely
+     * from the working copy; no network connections will be made.
+     * <p>
+     * Otherwise, information will be pulled from a repository.  The
+     * actual node revision selected is determined by the
+     * <code>pathOrUrl</code> as it exists in
+     * <code>pegRevision</code>.  If <code>pegRevision</code> is
+     * {@link Revision#START}, then it defaults to {@link
+     * Revision#HEAD} for URLs or {@link Revision#WORKING} for WC
+     * targets.
+     * <p>
+     * If <code>pathOrUrl</code> is not a local path, then if
+     * <code>revision</code> is {@link Revision#PREVIOUS} (or some
+     * other kind that requires a local path), an error will be
+     * returned, because the desired revision cannot be determined.
+     * <p>
+     * If <code>pathOrUrl</code> is a file, just invoke the callback on it.  If it
+     * is a directory, then descend according to <code>depth</code>.
+     * <p>
      * @param pathOrUrl     the path or the url of the item
      * @param revision      the revision of the item to return
      * @param pegRevision   the revision to interpret pathOrUrl
      * @param depth         the depth to recurse
+     * @param fetchExcluded when <code>true</code>, retrieve
+     * information about nodes that are excluded from the working copy
+     * @param fetchActualOnly when <code>true</code>, retrieve
+     * information about node that are not versioned, but are still
+     * tree conflicted.
+     * @param includeExternals Recurs into externals directories
      * @param changelists   if non-null, filter paths using changelists
      * @param callback      a callback to receive the infos retrieved
+     * @since 1.9
+     */
+    void info(String pathOrUrl,
+              Revision revision, Revision pegRevision, Depth depth,
+              boolean fetchExcluded, boolean fetchActualOnly,
+              boolean includeExternals,
+              Collection<String> changelists, InfoCallback callback)
+        throws ClientException;
+
+    /**
+     * Retrieve information about repository or working copy items.
+     * <p>
+     * Behaves like the 1.9 version, with <code>fetchExcluded</code>
+     * set to <code>false</code>, <code>fetchActualOnly</code> set to
+     * <code>true</code> anf <code>includeExternals</code> set to
+     * <code>false</code>.
      */
     void info2(String pathOrUrl, Revision revision, Revision pegRevision,
                Depth depth, Collection<String> changelists,
@@ -1145,4 +1567,71 @@ public interface ISVNClient
                int stripCount, boolean reverse, boolean ignoreWhitespace,
                boolean removeTempfiles, PatchCallback callback)
             throws ClientException;
+
+    /**
+     * Recursively vacuum a working copy, removing unnecessary data.
+     * <p>
+     * This method will report an error when
+     * <code>removeUnversionedItems</code> or
+     * <code>removeIgnoredItems</code> are set, and the working copy
+     * is already locked. This prevents accidental corruption of the
+     * working copy if this method is invoked while another client is
+     * performing some other operation on the working copy.
+     * @param path The path of the working copy directory.
+     * @param removeUnversionedItems Remove unversioned items from the
+     *        working copy after it has been successfully cleaned up.
+     * @param removeIgnoredItems Remove unversioned items that are
+     *        ignored by Subversion, after the working copy has been
+     *        successfully cleaned up.
+     * @param fixRecordedTimestamps Update timestamps recorded in the
+     *        working copy database to their actual on-disk values.
+     * @param removeUnusedPristines Remove pristine files that are not
+     *        referenced by the working copy.
+     * @param includeExternals Recurse into externals working copies
+     *        and vacuum them, too.
+     * @since 1.9
+     */
+    void vacuum(String path,
+                boolean removeUnversionedItems,
+                boolean removeIgnoredItems,
+                boolean fixRecordedTimestamps,
+                boolean removeUnusedPristines,
+                boolean includeExternals)
+            throws ClientException;
+
+    /**
+     * Open a persistent session to a repository.
+     * <p>
+     * <b>Note:</b> The session object inherits the progress callback,
+     * configuration directory and authentication info.
+     *
+     * @param pathOrUrl A path in a working copy from which the
+     *        session URL is derived, or the URL itself.
+     * @throws remote.RetryOpenSession If the session URL was redirected
+     * @throws SubversionException If an URL redirect cycle was detected
+     * @throws ClientException
+     * @since 1.9
+     */
+    ISVNRemote openRemoteSession(String pathOrUrl)
+            throws ClientException, SubversionException;
+
+    /**
+     * Open a persistent session to a repository.
+     * <p>
+     * <b>Note:</b> The session object inherits the progress callback,
+     * configuration directory and authentication info.
+     *
+     * @param pathOrUrl A path in a working copy from which the
+     *        session URL is derived, or the URL itself.
+     * @param retryAttempts The number of times to retry the operation
+     *        if the given URL is redirected.
+     * @throws IllegalArgumentException If <code>retryAttempts</code>
+     *         is not positive
+     * @throws remote.RetryOpenSession If the session URL was redirected
+     * @throws SubversionException If an URL redirect cycle was detected
+     * @throws ClientException
+     * @since 1.9
+     */
+    ISVNRemote openRemoteSession(String pathOrUrl, int retryAttempts)
+            throws ClientException, SubversionException;
 }
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNConfig.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNConfig.java
new file mode 100644
index 0000000..eb4e82f
--- /dev/null
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNConfig.java
@@ -0,0 +1,248 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+package org.apache.subversion.javahl;
+
+import org.apache.subversion.javahl.types.Tristate;
+
+/**
+ * Interface for manipulating the in-memory configuration info.
+ * @since 1.9
+ */
+public interface ISVNConfig
+{
+    /**
+     * Returns a reference to the "config" configuration category.
+     */
+    Category config();
+
+    /*
+     * The following constants are section and option names from the
+     * "config" configuration file.
+     */
+    public static final String SECTION_AUTH          = "auth";
+    public static final String PASSWORD_STORES           = "password-stores";
+    public static final String KWALLET_WALLET            = "kwallet-wallet";
+    public static final String KWALLET_SVN_APPLICATION_NAME_WITH_PID = "kwallet-svn-application-name-with-pid";
+    public static final String SSL_CLIENT_CERT_FILE_PROMPT = "ssl-client-cert-file-prompt";
+
+    public static final String SECTION_HELPERS       = "helpers";
+    public static final String EDITOR_CMD                = "editor-cmd";
+    public static final String DIFF_CMD                  = "diff-cmd";
+    public static final String DIFF_EXTENSIONS           = "diff-extensions";
+    public static final String DIFF3_CMD                 = "diff3-cmd";
+    public static final String DIFF3_HAS_PROGRAM_ARG     = "diff3-has-program-arg";
+    public static final String MERGE_TOOL_CMD            = "merge-tool-cmd";
+
+    public static final String SECTION_MISCELLANY    = "miscellany";
+    public static final String GLOBAL_IGNORES            = "global-ignores";
+    public static final String LOG_ENCODING              = "log-encoding";
+    public static final String USE_COMMIT_TIMES          = "use-commit-times";
+    public static final String ENABLE_AUTO_PROPS         = "enable-auto-props";
+    public static final String ENABLE_MAGIC_FILE         = "enable-magic-file";
+    public static final String NO_UNLOCK                 = "no-unlock";
+    public static final String MIMETYPES_FILE            = "mime-types-file";
+    public static final String PRESERVED_CF_EXTS         = "preserved-conflict-file-exts";
+    public static final String INTERACTIVE_CONFLICTS     = "interactive-conflicts";
+    public static final String MEMORY_CACHE_SIZE         = "memory-cache-size";
+    public static final String DIFF_IGNORE_CONTENT_TYPE  = "diff-ignore-content-type";
+
+    public static final String SECTION_TUNNELS       = "tunnels";
+
+    public static final String SECTION_AUTO_PROPS    = "auto-props";
+
+    public static final String SECTION_WORKING_COPY  = "working-copy";
+    public static final String SQLITE_EXCLUSIVE          = "exclusive-locking";
+    public static final String SQLITE_EXCLUSIVE_CLIENTS  = "exclusive-locking-clients";
+    public static final String SQLITE_BUSY_TIMEOUT       = "busy-timeout";
+
+    /**
+     * Returns a reference to the "servers" configuration category.
+     */
+    Category servers();
+
+    /*
+     * The following constants are section and option names from the
+     * "servers" configuration file.
+     */
+    public static final String SECTION_GROUPS        = "groups";
+    public static final String SECTION_GLOBAL        = "global";
+
+    public static final String HTTP_PROXY_HOST           = "http-proxy-host";
+    public static final String HTTP_PROXY_PORT           = "http-proxy-port";
+    public static final String HTTP_PROXY_USERNAME       = "http-proxy-username";
+    public static final String HTTP_PROXY_PASSWORD       = "http-proxy-password";
+    public static final String HTTP_PROXY_EXCEPTIONS     = "http-proxy-exceptions";
+    public static final String HTTP_TIMEOUT              = "http-timeout";
+    public static final String HTTP_COMPRESSION          = "http-compression";
+    public static final String NEON_DEBUG_MASK           = "neon-debug-mask";
+    public static final String HTTP_AUTH_TYPES           = "http-auth-types";
+    public static final String SSL_AUTHORITY_FILES       = "ssl-authority-files";
+    public static final String SSL_TRUST_DEFAULT_CA      = "ssl-trust-default-ca";
+    public static final String SSL_CLIENT_CERT_FILE      = "ssl-client-cert-file";
+    public static final String SSL_CLIENT_CERT_PASSWORD  = "ssl-client-cert-password";
+    public static final String SSL_PKCS11_PROVIDER       = "ssl-pkcs11-provider";
+    public static final String HTTP_LIBRARY              = "http-library";
+    public static final String STORE_PASSWORDS           = "store-passwords";
+    public static final String STORE_PLAINTEXT_PASSWORDS = "store-plaintext-passwords";
+    public static final String STORE_AUTH_CREDS          = "store-auth-creds";
+    public static final String STORE_SSL_CLIENT_CERT_PP  = "store-ssl-client-cert-pp";
+    public static final String STORE_SSL_CLIENT_CERT_PP_PLAINTEXT = "store-ssl-client-cert-pp-plaintext";
+    public static final String USERNAME                  = "username";
+    public static final String HTTP_BULK_UPDATES         = "http-bulk-updates";
+    public static final String HTTP_MAX_CONNECTIONS      = "http-max-connections";
+    public static final String HTTP_CHUNKED_REQUESTS     = "http-chunked-requests";
+    public static final String SERF_LOG_COMPONENTS       = "serf-log-components";
+    public static final String SERF_LOG_LEVEL            = "serf-log-level";
+
+    /**
+     * "true" value in configuration. One of the values returned by
+     * {@link Category#getYesNoAsk}.
+     */
+    public static final String TRUE = "TRUE";
+
+    /**
+     * "false" value in configuration. One of the values returned by
+     * {@link Category#getYesNoAsk}.
+     */
+    public static final String FALSE = "FALSE";
+
+    /**
+     * "ask" value in configuration. One of the values returned by
+     * {@link Category#getYesNoAsk}.
+     */
+    public static final String ASK = "ASK";
+
+    /**
+     * Interface for reading and modifying configuration
+     * categories. Returned by {@link #config()} and
+     * {@link #servers()}.
+     */
+    public interface Category
+    {
+        /**
+         * Returns the value of a configuration option.
+         * @param section      The section name
+         * @param option       The option name
+         * @param defaultValue Return this if the option was not found.
+         */
+        String get(String section,
+                   String option,
+                   String defaultValue);
+
+        /**
+         * Returns the boolean value of a configuration option. The
+         * recognized representations are 'true'/'false', 'yes'/'no',
+         * 'on'/'off', '1'/'0'; case does not matter.
+         * @throws ClientException if the value cannot be parsed.
+         * @see #get(String,String,String)
+         */
+        boolean get(String section,
+                    String option,
+                    boolean defaultValue)
+            throws ClientException;
+
+        /**
+         * Returns the long integer value of a configuration option.
+         * @see #get(String,String,boolean)
+         */
+        long get(String section,
+                 String option,
+                 long defaultValue)
+            throws ClientException;
+
+        /**
+         * Returns the {@link Tristate} value of a configuration option.
+         * @param unknown The value used for {@link Tristate#Unknown}.
+         * @see #get(String,String,boolean)
+         */
+        Tristate get(String section,
+                     String option,
+                     String unknown,
+                     Tristate defaultValue)
+            throws ClientException;
+
+        /**
+         * Check that the configuration option's value is true, false
+         * or "ask". The boolean representations are the same as those
+         * understood by {@link #get(String,String,boolean)}. If the
+         * option is not found, the default value will be parsed
+         * instead.
+         * @return {@link ISVNConfig#TRUE}, {@link ISVNConfig#FALSE}
+         *         or {@link ISVNConfig#ASK}
+         * @throws ClientException if the either the value or the
+         *         default cannot be parsed.
+         */
+        String getYesNoAsk(String section,
+                           String option,
+                           String defaultValue)
+            throws ClientException;
+
+        /**
+         * Set the value of a configuration option.
+         * @param section  The section name
+         * @param option   The option name
+         * @param value    The value to set the option to; passing
+         *                 <code>null</code> will delete the option.
+         */
+        void set(String section,
+                 String option,
+                 String value);
+
+        /**
+         * Set the value of a configuration option to represent a boolean.
+         * @see #set(String,String,String)
+         */
+        void set(String section,
+                 String option,
+                 boolean value);
+
+        /**
+         * Set the value of a configuration option to represent a long integer.
+         * @see #set(String,String,String)
+         */
+        void set(String section,
+                 String option,
+                 long value);
+
+        /**
+         * @return the names of all the sections in the
+         * configuration category.
+         */
+        Iterable<String> sections();
+
+        /**
+         * Call <code>handler</code> once for each option in the
+         * configuration category.
+         */
+        void enumerate(String section, Enumerator handler);
+    }
+
+    /**
+     * Interface for {@link Category#enumerate} callback handlers.
+     */
+    public interface Enumerator
+    {
+        void option(String name, String value);
+    }
+}
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNEditor.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNEditor.java
new file mode 100644
index 0000000..f1daa83
--- /dev/null
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNEditor.java
@@ -0,0 +1,386 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+package org.apache.subversion.javahl;
+
+import org.apache.subversion.javahl.types.*;
+import org.apache.subversion.javahl.callback.*;
+
+import java.io.InputStream;
+import java.util.Map;
+
+/**
+ * Commit/update/status editor interface.
+ * <p>
+ * <b>This interface is EXPERIMENTAL.
+ * It may change or be removed in a future version of JavaHL</b>
+ * @see <a href="http://svn.apache.org/repos/asf/subversion/trunk/subversion/include/private/svn_editor.h">svn_editor.h</a>
+ *      for all restrictions on driving an editor.
+ * @since 1.9
+ */
+public interface ISVNEditor
+{
+    /**
+     * Release the native peer (should not depend on finalize),
+     * and abort the edit if it has not been completed yet.
+     */
+    void dispose();
+
+    /**
+     * Create a new directory at <code>relativePath</code>.
+     * The immediate parent of <code>relativePath</code> is expected to exist.
+     * <p>
+     * For descriptions of <code>properties</code> and
+     * <code>replacesRevision</code>, see #addFile().
+     * <p>
+     * A complete listing of the immediate children of
+     * <code>relativePath</code> that will be added subsequently is
+     * given in <code>children</code>. <code>children</code> is a
+     * collection of const strings, each giving the basename of an
+     * immediate child. It is an error to pass <code>null</code> for
+     * <code>children</code>; use an empty collection to indicate that
+     * the new directory will have no children.
+     *
+     * @throws ClientException
+     */
+    void addDirectory(String relativePath,
+                      Iterable<String> children,
+                      Map<String, byte[]> properties,
+                      long replacesRevision)
+            throws ClientException;
+
+    /**
+     * Create a new file at <code>relativePath</code>.
+     * The immediate parent of <code>relativePath</code> is expected to exist.
+     * <p>
+     * The file's contents are specified in <code>contents</code>
+     * which has a checksum matching <code>checksum</code>. Both
+     * values must be non-<code>null</code>.
+     * <p>
+     * Set the properties of the new file to
+     * <code>properties</code>. If no properties are being set on the
+     * new file, <code>properties</code> must be empty. It is an error
+     * to pass <code>null</code> for <code>properties</code>.
+     * <p>
+     * If this add is expected to replace a previously existing file,
+     * symlink or directory at <code>relativePath</code>, the revision
+     * number of the node to be replaced must be given in
+     * <code>replacesRevision</code>. Otherwise,
+     * <code>replacesRevision</code> must be
+     * Revision.SVN_INVALID_REVNUM.
+     * <p>
+     * <b>Note:</b> It is not allowed to call a "delete" followed by
+     * an "add" on the same path. Instead, an "add" with
+     * <code>replacesRevision</code> set accordingly <em>must</em> be used.
+     * <p>
+     * <b>Note:</b> The <code>contents</code> stream's lifetime must not
+     *      extend beyond the scope of this function. An
+     *      implementation <b>must</b> close the stream after
+     *      consuming its contents.
+     *
+     * @throws ClientException
+     */
+    void addFile(String relativePath,
+                 Checksum checksum,
+                 InputStream contents,
+                 Map<String, byte[]> properties,
+                 long replacesRevision)
+            throws ClientException;
+
+    /**
+     * Create a new symbolic link at <code>relativePath</code>, with a
+     * link target of <code>target</code>. The immediate parent of
+     * <code>relativePath</code> is expected to exist.
+     *
+     * For descriptions of <code>properties</code> and
+     * <code>replacesRevision</code>, see #addFile().
+     *
+     * @throws ClientException
+     */
+    void addSymlink(String relativePath,
+                    String target,
+                    Map<String, byte[]> properties,
+                    long replacesRevision)
+            throws ClientException;
+
+    /**
+     * Create an "absent" node of kind <code>kind</code> at
+     * <code>relativePath</code>. The immediate parent of
+     * <code>relativePath</code> is expected to exist.
+     *
+     * For a description of <code>replacesRevision</code>, see #addFile().
+     *
+     * @throws ClientException
+     */
+    void addAbsent(String relativePath,
+                   NodeKind kind,
+                   long replacesRevision)
+            throws ClientException;
+
+    /**
+     * Alter the properties of the directory at <code>relativePath</code>.
+     * <p>
+     * <code>revision</code> specifies the revision at which the
+     * receiver should expect to find this node. That is,
+     * <code>relativePath</code> at the start of the whole edit and
+     * <code>relativePath</code> at <code>revision</code> must lie
+     * within the same node-rev (aka location history segment). This
+     * information may be used to catch an attempt to alter and
+     * out-of-date directory. If the directory does not have a
+     * corresponding revision in the repository (e.g. it has not yet
+     * been committed), then <code>revision</code> should be
+     * Revision.SVN_INVALID_REVNUM.
+     * <p>
+     * If any changes to the set of children will be made in the
+     * future of the edit drive, then <code>children</code>
+     * <em>must</em> specify the resulting set of children. See
+     * #addDirectory() for the format of <code>children</code>.  If
+     * not changes will be made, then NULL may be specified.
+     * <p>
+     * For a description of <code>properties</code>, see
+     * #addFile(). If no changes to the properties will be made
+     * (ie. only future changes to the set of children), then
+     * <code>properties</code> may be <code>null</code>.
+     *
+     * @throws ClientException
+     */
+    void alterDirectory(String relativePath,
+                        long revision,
+                        Iterable<String> children,
+                        Map<String, byte[]> properties)
+            throws ClientException;
+
+    /**
+     * Alter the contents and/or the properties of the file at
+     * <code>relativePath</code> with <code>revision</code> as its
+     * expected revision. See #alterDirectory() for more information
+     * about <code>revision</code>.
+     * <p>
+     * If <code>contents</code> is non-<code>null</code>, then the
+     * stream will be copied to the file, and its checksum must match
+     * <code>checksum</code> (which must also be
+     * non-<code>null</code>). If <code>contents</code> is
+     * <code>null</code>, then <code>checksum</code> must also be
+     * <code>null</code>, and no change will be applied to the file's
+     * contents.
+     * <p>
+     * If <code>properties</code> is non-<code>null</code>, then the
+     * properties will be applied.
+     * <p>
+     * For a description of <code>checksum</code> and
+     * <code>contents</code>, see #addFile().
+     * <p>
+     * This function allows <code>properties</code> to be
+     * <code>null</code>, but the parameter is otherwise described by
+     * #addFile().
+     * <p>
+     * <b>Note:</b> The <code>contents</code> stream's lifetime must not
+     *      extend beyond the scope of this function. An
+     *      implementation <b>must</b> close the stream after
+     *      consuming its contents.
+     *
+     * @throws ClientException
+     */
+    void alterFile(String relativePath,
+                   long revision,
+                   Checksum checksum,
+                   InputStream contents,
+                   Map<String, byte[]> properties)
+            throws ClientException;
+
+    /**
+     * Alter the target and/or the properties of the symlink at
+     * <code>relativePath</code> with <code>revision</code> as its
+     * expected revision. See #alterDirectory() for more information
+     * about <code>revision</code>.
+     * <p>
+     * If <code>target</code> is non-<code>null</code>, then the
+     * symlink's target will be updated.
+     * <p>
+     * If <code>properties</code> is non-<code>null</code>, then the
+     * properties will be applied.
+     * <p>
+     * The target and/or the properties must be changed. It is an
+     * error to pass <code>null</code> for both <code>target</code>
+     * and <code>properties</code>.
+     * <p>
+     * This function allows <code>properties</code> to be
+     * <code>null</code>, but the parameter is otherwise described by
+     * #addFile().
+     *
+     * @throws ClientException
+     */
+    void alterSymlink(String relativePath,
+                      long revision,
+                      String target,
+                      Map<String, byte[]> properties)
+            throws ClientException;
+
+    /**
+     * Delete the existing node at <code>relativePath</code>, expected
+     * to be identical to revision <code>revision</code> of that path.
+     *
+     * @throws ClientException
+     */
+    void delete(String relativePath,
+                long revision)
+            throws ClientException;
+
+    /**
+     * Move the node at <code>sourceRelativePath</code> to
+     * <code>destinationRelativePath</code>.
+     * <p>
+     * For a description of <code>replacesRevision</code>, see #addFile().
+     * <p>
+     * <b>Note:</b> See the general instructions on paths for this API.
+     * Sice the <code>sourceRelativePath</code> argument must generally be
+     * able to reference any node in the repository, the implication
+     * is that the editor's root must be the repository root.
+     *
+     * @throws ClientException
+     */
+    void copy(String sourceRelativePath,
+              long sourceRevision,
+              String destinationRelativePath,
+              long replacesRevision)
+            throws ClientException;
+
+    /**
+     * Move the node at <code>sourceRelativePath</code> to
+     * <code>destinationRelativePath</code>.
+     * <p>
+     * <code>sourceRevision</code> specifies the revision at which the
+     * receiver should expect to find this node.  That is,
+     * <code>sourceRelativePath</code> at the start of the whole edit
+     * and<code>sourceRelativePath</code> at
+     * <code>sourceRevision</code> must lie within the same node-rev
+     * (aka history-segment).  This is just like the #delete().
+     * <p>
+     * For a description of <code>replacesRevision</code>, see #addFile().
+     *
+     * @throws ClientException
+     */
+    void move(String sourceRelativePath,
+              long sourceRevision,
+              String destinationRelativePath,
+              long replacesRevision)
+            throws ClientException;
+
+    /**
+     * Signal that the edit has been completed successfully.
+     * After this method is called, the editor is considered closed.
+     *
+     * @throws ClientException
+     */
+    void complete() throws ClientException;
+
+    /**
+     * Signal that the edit transmission was not successful.
+     * After this method is called, the editor is considered closed.
+     *
+     * @throws ClientException
+     */
+    void abort() throws ClientException;
+
+
+    /**
+     * Callback interface for providing the base contents of a file
+     * that is being modified.
+     * @see ISVNRemote.getCommitEditor(Map,CommitCallback,Set,boolean,ISVNEditor.ProvideBaseCallback,ISVNEditor.ProvidePropsCallback,ISVNEditor.GetNodeKindCallback)
+     */
+    public interface ProvideBaseCallback
+    {
+        public static class ReturnValue
+        {
+            /**
+             * @param contents The base ({@link Revision#BASE}) contents
+             *         of the file.
+             * @param revision The base revision number.
+             */
+            public ReturnValue(InputStream contents, long revision)
+            {
+                this.contents = contents;
+                this.revision = revision;
+            }
+
+            final InputStream contents;
+            final long revision;
+        }
+
+        /**
+         * Returns the base contents and revision number of the file.
+         * @param reposRelpath The repository path of the file,
+         *        relative to the session base URL.
+         */
+        ReturnValue getContents(String reposRelpath);
+    }
+
+    /**
+     * Callback interface for providing the base properties of a file
+     * or directory that is being modified.
+     * @see ISVNRemote.getCommitEditor(Map,CommitCallback,Set,boolean,ISVNEditor.ProvideBaseCallback,ISVNEditor.ProvidePropsCallback,ISVNEditor.GetNodeKindCallback)
+     */
+    public interface ProvidePropsCallback
+    {
+        public static class ReturnValue
+        {
+            /**
+             * @param properties The base ({@link Revision#BASE}) properties
+             *         of the file or directory.
+             * @param revision The base revision number.
+             */
+            public ReturnValue(Map<String, byte[]> properties, long revision)
+            {
+                this.properties = properties;
+                this.revision = revision;
+            }
+
+            final Map<String, byte[]> properties;
+            final long revision;
+        }
+
+        /**
+         * Returns the base properties and revision number of the file
+         * or directory.
+         * @param reposRelpath The repository path of the file or directory,
+         *        relative to the session base URL.
+         */
+        ReturnValue getProperties(String reposRelpath);
+    }
+
+    /**
+     * Callback interface for providing the kind of the node that was
+     * the source of a copy.
+     * @see ISVNRemote.getCommitEditor(Map,CommitCallback,Set,boolean,ISVNEditor.ProvideBaseCallback,ISVNEditor.ProvidePropsCallback,ISVNEditor.GetNodeKindCallback)
+     */
+    public interface GetNodeKindCallback
+    {
+        /**
+         * Returns the kind of the node that was the source of a copy.
+         * @param reposRelpath The repository path of the node,
+         *        relative to the session base URL.
+         * @param revision The copy-from revision.
+         */
+        NodeKind getKind(String reposRelpath, long revision);
+    }
+}
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRemote.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRemote.java
new file mode 100644
index 0000000..69f8bd4
--- /dev/null
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRemote.java
@@ -0,0 +1,836 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+package org.apache.subversion.javahl;
+
+import org.apache.subversion.javahl.types.*;
+import org.apache.subversion.javahl.callback.*;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.io.OutputStream;
+
+/**
+ * Encapsulates an RA session object and related operations.
+ * @see <a href="http://svn.apache.org/repos/asf/subversion/trunk/subversion/include/svn_ra.h">svn_ra.h</a>,
+ *      the documentation of the <code>svn_ra_open</code> function.
+ * @since 1.9
+ */
+public interface ISVNRemote
+{
+    /**
+     * Release the native peer (should not depend on finalize).
+     * Also invalidates any existing editors related to this session.
+     */
+    void dispose();
+
+    /**
+     * Cancel the active operation, including any ongoing edits.
+     * @throws ClientException
+     */
+    void cancelOperation() throws ClientException;
+
+    /** Change the URL of the session to point to a new path in the
+     * same repository.
+     *<p>
+     * <b>Note:</b> The operation fails if the URL has a different
+     * repository root than the current session URL.
+     *<p>
+     * @throws ClientException
+     */
+    void reparent(String url) throws ClientException;
+
+    /**
+     * Get the current session URL.
+     * @throws ClientException
+     */
+    String getSessionUrl() throws ClientException;
+
+    /**
+     * Return a path relative to the current session URL.
+     * @param url Must be a child of the current session URL.
+     * @throws ClientException
+     */
+    String getSessionRelativePath(String url) throws ClientException;
+
+    /**
+     * Return a path relative to the repository root URL associated with
+     * current session URL.
+     * @param url Must be a child of the repository root URL.
+     * @throws ClientException
+     */
+    String getReposRelativePath(String url) throws ClientException;
+
+    /**
+     * Get the UUID of the session's repository.
+     * @throws ClientException
+     */
+    String getReposUUID() throws ClientException;
+
+    /**
+     * Get the root URL of the session's repository.
+     * @throws ClientException
+     */
+    String getReposRootUrl() throws ClientException;
+
+    /**
+     * Get the latest revision number from the session's repository.
+     * @throws ClientException
+     */
+    long getLatestRevision() throws ClientException;
+
+    /**
+     * Get the latest revision number at the given time
+     * from the session's repository.
+     * @throws ClientException
+     */
+    long getRevisionByDate(Date date) throws ClientException;
+
+    /**
+     * Get the latest revision number at the given time, expressed as
+     * the number of microseconds since the epoch, from the session's
+     * repository.
+     * @throws ClientException
+     */
+    long getRevisionByTimestamp(long timestamp) throws ClientException;
+
+    /**
+     * Change the value of an unversioned property.
+     *<p>
+     * <b>Note:</b> If the server has Capability.atomic_revprops and
+     * <code>oldValue</code> is not <code>null</code>, and the present
+     * value of the propery is not <code>oldValue</code> (e.g., if
+     * another client changed the property), then the operation will
+     * fail.
+     *<p>
+     * <b>Note:</b> If the server does not adveritse
+     * Capability.atomic_revprops, then <code>oldValue</code>
+     * <em>must</em> be <code>null</code>.
+     *<p>
+     * @param revision The revision to which the propery is attached
+     * @param propertyName The name of the propery
+     * @param oldValue The previous value of the property (see note below)
+     * @param newValue The new value of the property. If <code>newValue</code>
+     *        is <code>null</code>, the property will be deleted.
+     * @throws IllegalArgumentException if <code>oldValue</code> is not
+     *         <code>null</code> and the server does not advertise the
+     *         atomic_revprops capability.
+     * @throws ClientException
+     */
+    void changeRevisionProperty(long revision,
+                                String propertyName,
+                                byte[] oldValue,
+                                byte[] newValue)
+            throws ClientException;
+
+    /**
+     * Return the set of unversioned properties set on <code>revision</code>
+     * in the session's repository.
+     * @throws ClientException
+     */
+    Map<String, byte[]> getRevisionProperties(long revision)
+            throws ClientException;
+
+    /**
+     * Return the value of unversioned property <code>propertyName</code>
+     * in <code>revision</code> in the session's repository.
+     * Returns <code>null</code> if the property does not exist.
+     * @throws ClientException
+     */
+    byte[] getRevisionProperty(long revision, String propertyName)
+            throws ClientException;
+
+    /**
+     * Return an editor for committing changes to the session's
+     * repository, setting the revision properties from
+     * <code>revisionProperties</code>. The revisions being committed
+     * against are passed to the editor functions. The root of the commit
+     * is the session's URL.
+     * <p>
+     * <code>revisionProperties</code> is a hash mapping property names to
+     * property values. The commit log message is expected to be in the
+     * {@link Property#REV_LOG} element.  <code>revisionProperties</code>
+     * can not contain either of {@link Property#REV_DATE} or
+     * {@link Property#REV_AUTHOR}.
+     * <p>
+     * Before {@link ISVNEditor#complete()} returns, but after the commit
+     * has succeeded, it will invoke <code>commitCallback</code> (if not
+     * <code>null</code>) with filled-in {@link CommitInfo}.  If
+     * <code>commitCallback</code> returns an error, that error will be
+     * returned from {@link ISVNEditor#complete()}, otherwise
+     * {@link ISVNEditor#complete()} will return successfully (unless it
+     * encountered an error before invoking <code>commitCallback</code>).
+     * The callback will not be called if the commit was a no-op
+     * (i.e., nothing was committed).
+     * <p>
+     * <code>lockTokens</code>, if not <code>null</code>, is a hash
+     * mapping paths (relative to the session's URL) to lock tokens.  The
+     * server checks that the correct token is provided for each
+     * committed, locked path.  <code>lockTokens</code> must live during
+     * the whole commit operation.
+     * <p>
+     * If <cpde>keepLocks</code> is <cpde>true</code>, then do not release
+     * locks on committed objects.  Else, automatically release such
+     * locks.
+     * <p>
+     * The callbacks <code>getBase</code>, <code>getProps</code> and
+     * <code>getCopyfromKind</code> are invoked by the editor to fetch
+     * the contents, preoprties and copyfrom kind of an entry during
+     * the commit drive. They may be <code>null</code>; in that case,
+     * the commit may be less efficient because the client will not be
+     * able to delta-compress the data sent to the server, and more
+     * server connections may have to be opened.
+     * <p>
+     * The caller may not perform any remote operations using this session
+     * before finishing the edit.
+     * @throws ClientException
+     */
+    ISVNEditor getCommitEditor(Map<String, byte[]> revisionProperties,
+                               CommitCallback commitCallback,
+                               Set<Lock> lockTokens, boolean keepLocks,
+                               ISVNEditor.ProvideBaseCallback getBase,
+                               ISVNEditor.ProvidePropsCallback getProps,
+                               ISVNEditor.GetNodeKindCallback getCopyfromKind)
+            throws ClientException;
+
+    /**
+     * Like {@link #getCommitEditor(Map,CommitCallback<Set,boolean,
+     * ISVNEditor.ProvideBaseCallback,ISVNEditor.ProvidePropsCallback,
+     * ISVNEditor.GetNodeKindCallback)}, but with all callbacks set to
+     * <code>null</code>.
+     */
+    ISVNEditor getCommitEditor(Map<String, byte[]> revisionProperties,
+                               CommitCallback commitCallback,
+                               Set<Lock> lockTokens, boolean keepLocks)
+            throws ClientException;
+
+    /**
+     * Fetch the contents and properties of file <code>path</code> at
+     * <code>revision</code>.  <code>revision</code> may be
+     * {@link org.apache.subversion.javahl.types.Revision#SVN_INVALID_REVNUM}
+     * indicating that the HEAD revision should be
+     * used. <code>path</code> is interpreted relative to the
+     * session's URL.
+     * <p>
+
+     * If <code>revision</code> is
+     * {@link org.apache.subversion.javahl.types.Revision#SVN_INVALID_REVNUM}.
+     * returns the actual revision that was retrieved; otherwise
+     * returns <code>revision</code>.
+     * <p>
+     * If <code>contents</code> is not <code>null</code>, push the
+     * contents of the file into the stream.
+     * <p>
+     * If <code>properties</code> is not <code>null</code>, set
+     * <code>properties</code> to contain the properties of the file. This
+     * means <em>all</em> properties: not just ones controlled by the
+     * user and stored in the repository, but immutable ones generated
+     * by the SCM system itself (e.g. 'wcprops', 'entryprops',
+     * etc.). Any existing contents of the <code>properties</code> map
+     * will be discarded by calling {@link java.util.Map#clear()}, if the
+     * map implementation supports that operation.
+     * <p>
+     * The implementations of <code>contents</code> and
+     * <code>properties</code> may not perform any ISVNRemote
+     * operations using this session.
+     * @return The revision of the file that was retrieved.
+     * @throws ClientException
+     */
+    long getFile(long revision, String path,
+                 OutputStream contents,
+                 Map<String, byte[]> properties)
+            throws ClientException;
+
+    /**
+     * Fetch the contents and properties of directory <code>path</code>
+     * at <code>revision</code>.  <code>revision</code> may be
+     * {@link org.apache.subversion.javahl.types.Revision#SVN_INVALID_REVNUM},
+     * indicating that the HEAD revision should be
+     * used. <code>path</code> is interpreted relative to the
+     * session's URL.
+     * <p>
+     * If <code>dirents</code> is not <code>null</code>, it will
+     * contain all the entries of the directory; the keys will be the
+     * entry basenames.  Any existing contente of the
+     * <code>dirents</code> collection will be discarded by calling
+     * {@link java.util.Map#clear()}, if the collection implementation
+     * supports that operation.
+     * <p>
+     * <code>direntFields</code> controls which portions of the DirEntry
+     * objects are filled in. To have them completely filled in, just pass
+     * DirEntry.Fields.all, othewise pass a bitwise OR of any of the
+     * DirEntry.Fields flags you would like to have.
+     * <p>
+     * If <code>properties</code> is not <code>null</code>, set
+     * <code>properties</code> to contain the properties of the directory.
+     * This means <em>all</em> properties: not just ones controlled by the
+     * user and stored in the repository, but immutable ones generated
+     * by the SCM system itself (e.g. 'wcprops', 'entryprops',
+     * etc.). Any existing contents of the <code>properties</code> map
+     * will be discarded by calling {@link java.util.Map#clear()}, if the
+     * map implementation supports that operation.
+     * <p>
+     * The implementations of <code>dirents</code> and
+     * <code>properties</code> may not perform any ISVNRemote
+     * operations using this session.
+     * @return The revision of the directory that was retrieved.
+     * @throws ClientException
+     */
+    long getDirectory(long revision, String path,
+                      int direntFields,
+                      Map<String, DirEntry> dirents,
+                      Map<String, byte[]> properties)
+            throws ClientException;
+
+    /**
+     * Retrieve the merginfo for <code>paths</code>, whose elements
+     * are relative to the session's URL. The request will fail if any
+     * one of <code>paths</code> does not exist in the given
+     * <code>revision</code>.
+     * <p>
+     * <b>Note:</b> If the server doesn't support retrieval of
+     * mergeinfo (which can happen even for file:// URLs, if the
+     * repository itself hasn't been upgraded), an unsupported feature
+     * exception is thrown in preference to any other error that might
+     * otherwise be returned.
+     *
+     * @param revision The revision to look for <code>paths</code>
+     *                 in. Defaults to the youngest revision when
+     *                 {@link Revision#SVN_INVALID_REVNUM}.
+     * @param inherit Indicates whether explicit, explicit or
+     *                inherited, or only inherited mergeinfo for
+     *                <code>paths</code> is retrieved.
+     * @param includeDescendants When <code>true</code>, additionally
+     *        return the mergeinfo for any descendant of any element
+     *        of <code>paths</code> which has the mergeinfo explicitly
+     *        set on it.  (Note that inheritance is only taken into
+     *        account for the elements in <code>paths</code>;
+     *        descendants of the elements in <code>paths</code> which
+     *        get their mergeinfo via inheritance are not included.)
+     *
+     * @return A dictionary of {@link Mergeinfo} objects for the given
+     *         <code>paths</code>, or <code>null</code> if no
+     *         mergeinfo is available..
+     * @throws ClientException
+     */
+    Map<String, Mergeinfo> getMergeinfo(Iterable<String> paths, long revision,
+                                        Mergeinfo.Inheritance inherit,
+                                        boolean includeDescendants)
+            throws ClientException;
+
+    // TODO: update
+    // TODO: switch
+
+    /**
+     * Ask for a description of the status of a working copy with
+     * respect to <code>revision</code> of the session's repository,
+     * or the HEAD revision if <code>revision</code> is
+     * {@link org.apache.subversion.javahl.types.Revision#SVN_INVALID_REVNUM}.
+     * <p>
+     * The client begins by providing a <code>receiver</code> to
+     * the remote session; this object must contain knowledge of where
+     * the change will begin in the working copy.
+     * <p>
+     * In return, the client receives an {@link ISVNReporter}
+     * instance, which it uses to describe its working copy by making
+     * calls to its methods.
+     * <p>
+     * When finished, the client calls {@link ISVNReporter#finishReport}.
+     * This results in <code>receiver</code> being called once for
+     * every path in the working copy that is different from the
+     * repository. <code>statusTarget</code> is an optional single
+     * path component that restricts the scope of the status report to
+     * an entry in the directory represented by the session's URL, or
+     * empty if the entire directory is meant to be examined.
+     * <p>
+     * Get status as deeply as <code>depth</code> indicates.  If
+     * <code>depth</code> is
+     * {@link org.apache.subversion.javahl.types.Depth#unknown},
+     * get the status down to the ambient depth of the working
+     * copy. If <code>depth</code> is deeper than the working copy,
+     * include changes that would be needed to populate the working
+     * copy to that depth.
+     * <p>
+     * The caller may not perform any operations using this session
+     * before finishing the report, and may not perform any operations
+     * using this session from within the implementation of
+     * <code>receiver</code>.
+     * <p>
+     * <b>Note:</b> The reporter provided by this function does
+     * <em>not</em> supply copy-from information to the editor
+     * methods.
+     * <p>
+     * <b>Note:</b> In order to prevent pre-1.5 servers from doing
+     * more work than needed, and sending too much data back, a
+     * pre-1.5 'recurse' directive may be sent to the server, based on
+     * <code>depth</code>.
+     * @throws ClientException
+     */
+    ISVNReporter status(String statusTarget,
+                        long revision, Depth depth,
+                        RemoteStatus receiver)
+            throws ClientException;
+
+    // TODO: diff
+
+    /**
+     * Invoke <code>callback</code> for each log message from
+     * <code>startRevision</code> to <code>endRevision</code>.
+     * <code>startRevision</code> may be greater or less than
+     * <code>endRevision</code>; this just controls whether the log
+     * messages are processed in descending or ascending revision
+     * number order.
+     * <p>
+     * If <code>startRevision</code> or <code>endRevision</code> is
+     * {@link org.apache.subversion.javahl.types.Revision#SVN_INVALID_REVNUM},
+     * the HEAD revision is uses for that argument. If eiter is an
+     * invaild non-existent revision, an error will be returned.
+     * <p>
+     * If <code>paths</code> is not <code>null</code> and has one or
+     * more elements, then only show revisions in which at least one
+     * of <code>paths</code> was changed (i.e., if file, text or props
+     * changed; if dir, props changed or an entry was added or
+     * deleted).
+     * <p>
+     * If <code>limit</code> is non-zero only invoke @a receiver on
+     * the first code>limit</code> logs.
+     * <p>
+     * If <code>discoverPath</code> is set, then each call to
+     * <code>callback</code> contains the list of changed paths in that
+     * revision.
+     * <p>
+     * If <code>strictNodeHistory</code> is set, copy history will not be
+     * traversed (if any exists) when harvesting the revision logs for
+     * each path.
+     * <p>
+     * If <code>includeMergedRevisions</code> is set, log information
+     * for revisions which have been merged to @a targets will also be
+     * returned.
+     * <p>
+     * If <code>revisionProperties</code> is <code>null</code>,
+     * retrieve all revision properties; otherwise, retrieve only the
+     * revision properties contained in the set (i.e. retrieve none if
+     * the set is empty).
+     * <p>
+     * The implementation of <code>callback</code> may not perform any
+     * operations using this session. If the invocation of
+     * <code>callback</code> throws an exception, the operation will
+     * stop.
+     * <p>
+     * <b>Note:</b> If <code>paths</code> is <code>null</code> or
+     * empty, the result depends on the server.  Pre-1.5 servers will
+     * send nothing; 1.5 servers will effectively perform the log
+     * operation on the root of the repository.  This behavior may be
+     * changed in the future to ensure consistency across all
+     * pedigrees of server.
+     * <p>
+     * <b>Note:</b> Pre-1.5 servers do not support custom revprop
+     * retrieval; <code>revisionProperties</code> is <code>null</code>
+     * or contains a revprop other than svn:author, svn:date, or
+     * svn:log, an not-implemented error is returned.
+     *
+     * @throws ClientException
+     */
+    void getLog(Iterable<String> paths,
+                long startRevision, long endRevision, int limit,
+                boolean strictNodeHistory, boolean discoverPath,
+                boolean includeMergedRevisions,
+                Iterable<String> revisionProperties,
+                LogMessageCallback callback)
+            throws ClientException;
+
+    /**
+     * Return the kind of the node in <code>path</code> at
+     * <code>revision</code>.
+     * @param path A path relative to the sessionn URL
+     * @throws ClientException
+     */
+    NodeKind checkPath(String path, long revision)
+            throws ClientException;
+
+    /**
+     * Return the directory entry object for <code>path</code> at
+     * <code>revision</code>.
+     * @param path A path relative to the sessionn URL
+     * @return A directory entry obeject, or <code>null</code> if
+     * <code>path</code> at <code>revision</code> does not exist.
+     * @throws ClientException
+     */
+    DirEntry stat(String path, long revision)
+            throws ClientException;
+
+    /**
+     * Find the locations of the object identified by
+     * <code>path</code> and <code>pegRevision</code> in the
+     * repository at the given revisions. If the object does not exist
+     * in a given revision, that revision will be ignored.
+     * <p>
+     * <b>Note:</b> None of the parameters may be NULL.
+     * @param path A path relative to the session URL
+     * @param pegRevision The peg revision to use for locating the object
+     * @param locationRevisions The set of revisions to find locations for
+     * @throws ClientException
+     */
+    Map<Long, String> getLocations(String path, long pegRevision,
+                                   Iterable<Long> locationRevisions)
+            throws ClientException;
+
+    /**
+     * The object returned from {@link #getLocationSegments}.
+     */
+    public static class LocationSegment implements java.io.Serializable
+    {
+        // Update the serialVersionUID when there is a incompatible change
+        // made to this class.
+        private static final long serialVersionUID = 1L;
+
+        /**
+         * Private constructor called by the native implementation.
+         */
+        private LocationSegment(String path,
+                                long startRevision,
+                                long endRevision)
+        {
+            this.path = path;
+            this.startRevision = startRevision;
+            this.endRevision = endRevision;
+        }
+
+        /**
+         * @return The repository-relative path of the obejct in this
+         * history segment.
+         */
+        public String getPath() { return path; }
+
+        /**
+         * @return The start revision of the history segment.
+         */
+        public long getStartRevision() { return startRevision; }
+
+        /**
+         * @return The end revision of the history segment.
+         */
+        public long getEndRevision() { return endRevision; }
+
+        private String path;
+        private long startRevision;
+        private long endRevision;
+    }
+
+    /**
+     * Call <code>handler</code> for every segment in the location
+     * history of <code>path</code> at <code>pegRevision</code>,
+     * working backwards in time from <code>startRevision</code> to
+     * <code>endRevision</code>.
+     *
+     * @param path A session-relative path.
+     * @param pegRevision The peg revision to find <code>path</code> in.
+     * @param startRevision The upper bound of the revision range. Use
+     * {@link org.apache.subversion.javahl.types.Revision#SVN_INVALID_REVNUM}
+     *        to indicate HEAD.
+     * @param endRevision The lower bound of the revision range. Use
+     * {@link org.apache.subversion.javahl.types.Revision#SVN_INVALID_REVNUM}
+     *        to trace the history of the object to its origin.
+     * @param handler The callback handler.
+     * @throws ClientException
+     */
+    void getLocationSegments(String path,
+                             long pegRevision,
+                             long startRevision,
+                             long endRevision,
+                             RemoteLocationSegmentsCallback handler)
+            throws ClientException;
+
+    /**
+     * Return a list of segments in the location history of <code>path</code>
+     * at <code>pegRevision</code>, working backwards in time from
+     * <code>startRevision</code> to <code>endRevision</code>.
+     *
+     * @param path A session-relative path.
+     * @param pegRevision The peg revision to find <code>path</code> in.
+     * @param startRevision The upper bound of the revision range. Use
+     * {@link org.apache.subversion.javahl.types.Revision#SVN_INVALID_REVNUM}
+     *        to indicate HEAD.
+     * @param endRevision The lower bound of the revision range. Use
+     * {@link org.apache.subversion.javahl.types.Revision#SVN_INVALID_REVNUM}
+     *        to trace the history of the object to its origin.
+     * @throws ClientException
+     */
+    List<LocationSegment> getLocationSegments(String path,
+                                              long pegRevision,
+                                              long startRevision,
+                                              long endRevision)
+            throws ClientException;
+
+    /**
+     * The object returned by {@link #getFileRevisions}.
+     */
+    public final class FileRevision  implements java.io.Serializable
+    {
+        // Update the serialVersionUID when there is a incompatible change
+        // made to this class.
+        private static final long serialVersionUID = 1L;
+
+        /**
+         * Private constructor called by the native implementation.
+         */
+        private FileRevision(String path, long revision,
+                             boolean resultOfMerge,
+                             Map<String, byte[]> revisionProperties,
+                             Map<String, byte[]> propertiesDelta,
+                             boolean textDelta)
+        {
+            this.path = path;
+            this.revision = revision;
+            this.resultOfMerge = resultOfMerge;
+            this.revisionProperties = revisionProperties;
+            this.propertiesDelta = propertiesDelta;
+            this.textDelta = textDelta;
+        }
+
+        /**
+         * @return The path of the file in this revision.
+         */
+        public String getPath() { return path; }
+
+        /**
+         * @return The revision associated with the path.
+         */
+        public long getRevision() { return revision; }
+
+        /**
+         * @return A flag indicating that this revision was the result
+         * of a merge.
+         */
+        public boolean isResultOfMerge() { return resultOfMerge; }
+
+        /**
+         * @return The list of revision properties.
+         */
+        public Map<String, byte[]> getRevisionProperties()
+        {
+            return revisionProperties;
+        }
+
+        /**
+         * @return The changes that were made to the file's properties
+         * in this revision. This map will contain only added,
+         * modified and deleted properties. Deleted properties will
+         * have <code>null</code> values.
+         */
+        public Map<String, byte[]> getPropertiesDelta()
+        {
+            return propertiesDelta;
+        }
+
+        /**
+         * @return A flag indicating that this revision has a text delta.
+         */
+        public boolean hasTextDelta() { return textDelta; }
+
+        private String path;
+        private long revision;
+        private boolean resultOfMerge;
+        private Map<String, byte[]> revisionProperties;
+        private Map<String, byte[]> propertiesDelta;
+        private boolean textDelta;
+    }
+
+    /**
+     * Call <code>handler</code> for each of a subset of the
+     * interesting revisions of a file <code>path</code> as seen in
+     * revision <code>endRevision</code>.
+     * <p>
+     * If there is an interesting revision of the file that is less
+     * than or equal to <code>startRevision</code>, the iteration will
+     * begin at that revision.  Otherwise the iteration will begin at
+     * the first revision of the file in the repository, which has to
+     * be less than or equal to <code>endRevision</code>.  Note that
+     * if the function succeeds, <code>handler</code> will be called
+     * at least once.
+     * <p>
+     * <b>Note:</b> This functionality is not available in pre-1.1
+     * servers.  If the server doesn't implement it, an alternative
+     * (but much slower) implementation based on {@link #getLog} is
+     * used.
+     * <p>
+     * <b>Note:</b> With Subversion 1.8 and newer servers this
+     * function supports reversion of the revision range for when
+     * <code>includeMergedRevisions</code> is <code>false</code>.
+     *
+     * @param path A path relative to the session URL.
+     * @param startRevision The lower bound of the revision interval.
+     * @param endRevision the upper bound of the revision interval.
+     * @param includeMergedRevisions When <code>true</code>, revisions that
+     *    contributed to a merge are included in the result.
+     * @throws ClientException
+     */
+    void getFileRevisions(String path,
+                          long startRevision, long endRevision,
+                          boolean includeMergedRevisions,
+                          RemoteFileRevisionsCallback handler)
+            throws ClientException;
+
+    /**
+     * Retrieve a subset of the interesting revisions of a file
+     * <code>path</code> as seen in revision <code>endRevision</code>.
+     * <p>
+     * If there is an interesting revision of the file that is less
+     * than or equal to <code>startRevision</code>, the iteration will
+     * begin at that revision.  Otherwise the iteration will begin at
+     * the first revision of the file in the repository, which has to
+     * be less than or equal to <code>endRevision</code>.  Note that
+     * if the function succeeds, the returned list will contain at
+     * least one element.
+     * <p>
+     * <b>Note:</b> This functionality is not available in pre-1.1
+     * servers.  If the server doesn't implement it, an alternative
+     * (but much slower) implementation based on {@link #getLog} is
+     * used.
+     * <p>
+     * <b>Note:</b> With Subversion 1.8 and newer servers this
+     * function supports reversion of the revision range for when
+     * <code>includeMergedRevisions</code> is <code>false</code>.
+     *
+     * @param path A path relative to the session URL.
+     * @param startRevision The lower bound of the revision interval.
+     * @param endRevision the upper bound of the revision interval.
+     * @param includeMergedRevisions When <code>true</code>, revisions that
+     *    contributed to a merge are included in the result.
+     * @throws ClientException
+     */
+    List<FileRevision> getFileRevisions(String path,
+                                        long startRevision, long endRevision,
+                                        boolean includeMergedRevisions)
+            throws ClientException;
+
+
+    // TODO: lock
+    // TODO: unlock
+    // TODO: getLock
+
+    /**
+     * Return a dictionary containing all locks on or below the given path.
+     * <p>
+     * <b>Note:</b> It is not considered an error if <code>path</code> does
+     * not exist in HEAD. Such a search will simply return no locks.
+     * <p>
+     * <b>Note:</b>This functionality is not available in pre-1.2 servers.
+     * @param path A path relative to the sessionn URL
+     * @param depth The recursion depth
+     * @throws ClientException
+     */
+    Map<String, Lock> getLocks(String path, Depth depth)
+            throws ClientException;
+
+    // TODO: replayRange
+    // TODO: replay
+    // TODO: getDeletedRevision
+    // TODO: getInheritedProperties
+
+    /**
+     * Check if the server associated with this session has
+     * the given <code>capability</code>.
+     * @throws ClientException
+     */
+    boolean hasCapability(Capability capability) throws ClientException;
+
+    /**
+     * Enumeration of known capabilities of the repository and server.
+     */
+    public enum Capability
+    {
+        /**
+         * The capability of understanding operation depth.
+         * @since 1.5
+         */
+        depth ("depth"),
+
+        /**
+         * The capability of doing the right thing with merge-tracking
+         * information.
+         * @since 1.5
+         */
+        mergeinfo ("mergeinfo"),
+
+        /**
+         * The capability of retrieving arbitrary revprops in #getLog().
+         * @since 1.5
+         */
+        log_revprops ("log-revprops"),
+
+        /**
+         * The capability of replaying a directory in the
+         * repository (partial replay).
+         * @since 1.5
+         */
+        partial_replay ("partial-replay"),
+
+        /**
+         * The capability of including revision properties in a commit.
+         * @since 1.5
+         */
+        commit_revprops ("commit-revprops"),
+
+        /**
+         * The capability of specifying (and atomically verifying) expected
+         * preexisting values when modifying revprops.
+         * @since 1.7
+         */
+        atomic_revprops ("atomic-revprops"),
+
+        /**
+         * The capability to get inherited properties.
+         * @since 1.8
+         */
+        inherited_props ("inherited-props"),
+
+        /**
+         * The capability of a server to automatically ephemeral
+         * transaction properties.
+         * @since 1.8
+         */
+        ephemeral_txnprops ("ephemeral-txnprops"),
+
+        /**
+         * The capability of a server to walk revisions backwards in
+         * #getFileRevisions().
+         * @since 1.8
+         */
+        get_file_revs_reversed ("get-file-revs-reversed");
+
+        private Capability(String token)
+        {
+            this.token = token;
+        }
+
+        public String toString()
+        {
+            return token;
+        }
+
+        private String token;
+    }
+}
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNReporter.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNReporter.java
new file mode 100644
index 0000000..533a8fe
--- /dev/null
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNReporter.java
@@ -0,0 +1,162 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+package org.apache.subversion.javahl;
+
+import org.apache.subversion.javahl.types.*;
+import org.apache.subversion.javahl.callback.*;
+
+/**
+ * The update Reporter.
+ * <p>
+ * An interface which allows a working copy to describe a subset (or
+ * possibly all) of its working-copy to a remote session, for the
+ * purposes of an update, switch, status, or diff operation.
+ * <p>
+ * Paths for report calls are relative to the target (not the anchor)
+ * of the operation.  Report calls must be made in depth-first order:
+ * parents before children, all children of a parent before any
+ * siblings of the parent.  The first report call must be a setPath
+ * with an empty <code>path</code> argument and a valid revision.  (If
+ * the target of the operation is locally deleted or missing, use the
+ * anchor's revision.)  If the target of the operation is deleted or
+ * switched relative to the anchor, follow up the initial setPath call
+ * with a linkPath or deletePath call with an empty <code>path</code>
+ * argument to indicate that.  In no other case may there be two
+ * report descriptions for the same path.  If the target of the
+ * operation is a locally added file or directory (which previously
+ * did not exist), it may be reported as having revision 0 or as
+ * having the parent directory's revision.
+ *
+ * @since 1.9
+ */
+public interface ISVNReporter
+{
+    /**
+     * Release the native peer (should not depend on finalize),
+     * and abort the report if it has not been completed yet.
+     */
+    void dispose();
+
+    /**
+     * Describe a working copy <code>path</code> as being at a
+     * particular <code>revision</code> and having the given
+     * <code>depth</code>.
+     * <p>
+     * <code>revision</code> may be
+     * {@link org.apache.subversion.javahl.types.Revision#SVN_INVALID_REVNUM}
+     * if (for example) <code>path</code> represents a locally-added
+     * path with no revision number, or <code>depth</code> is
+     * {@link org.apache.subversion.javahl.types.Depth#exclude}.
+     * <p>
+     * <code>path</code> may not be underneath a path on which
+     * setPath() was previously called with
+     * {@link org.apache.subversion.javahl.types.Depth#exclude}
+     * in this report.
+     * <p>
+     * If <code>startEmpty</code> is set and <code>path</code> is a
+     * directory, the implementor should assume the directory has no
+     * entries or properties.
+     * <p>
+     * This will <em>override</em> any previous setPath() calls made
+     * on parent paths. <code>path</code> is relative to the URL of
+     * the remote session that created this reporter instance.
+     * <p>
+     * If <code>lockToken</code> is not <code>null</code>, it is the
+     * lock token for <code>path</code> in the working copy.
+     * @throws ClientException
+     */
+    void setPath(String path,
+                 long revision,
+                 Depth depth,
+                 boolean startEmpty,
+                 String lockToken)
+            throws ClientException;
+
+    /**
+     * Describe a working copy <code>path</code> as missing.
+     * <p>
+     * <code>path</code> may not be underneath a path on which
+     * setPath() was previously called with
+     * {@link org.apache.subversion.javahl.types.Depth#exclude}
+     * in this report.
+     * @throws ClientException
+     */
+    void deletePath(String path) throws ClientException;
+
+    /**
+     * Like {@link #setPath setPath()},
+     * but differs in that <code>path</code> in the working copy
+     * (relative to the root of the report driver) isn't a reflection
+     * of <code>path</code> in the repository (relative to the URL
+     * specified when opening the remote session), but is instead a
+     * reflection of a different repository <code>url</code> at
+     * <code>revision</code>, and has depth <code>depth</code>.
+     * <p>
+     * <code>path</code> may not be underneath a path on which
+     * setPath() was previously called with
+     * {@link org.apache.subversion.javahl.types.Depth#exclude}
+     * in this report.
+     * <p>
+     * If <code>startEmpty</code> is set and <code>path</code> is a
+     * directory, the implementor should assume the directory has no
+     * entries or properties.
+     * <p>
+     * If <code>lockToken</code> is not <code>null</code>, it is the
+     * lock token for <code>path</code> in the working copy.
+     * @throws ClientException
+     */
+    void linkPath(String url,
+                  String path,
+                  long revision,
+                  Depth depth,
+                  boolean startEmpty,
+                  String lockToken)
+            throws ClientException;
+
+    /**
+     * The report driver calls this when the state report is finished.
+     * Any directories or files not explicitly "set" are assumed to be
+     * at the baseline revision originally passed into do_update(). No
+     * other reporting functions, including {@link abortReport()},
+     * should be called after calling this function.
+     *
+     * @return The target revision of the resulting editor drive. In
+     *         the case of {@link ISVNRemote#status}, this is the
+     *         revision against which the status call was performed;
+     *         in the case of {@link ISVNRemote#update}, it is the
+     *         revision updated to.
+     *
+     * @throws ClientException
+     */
+    long finishReport() throws ClientException;
+
+    /**
+     * If an error occurs during a report, this routine should cause
+     * the filesystem transaction to be aborted and cleaned up.  No
+     * other reporting functions should be called after calling this
+     * function.
+     * @throws ClientException
+     */
+    void abortReport() throws ClientException;
+}
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java
index 2fc28c2..80c5a33 100644
--- a/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java
@@ -29,133 +29,175 @@ import java.io.InputStream;
 import java.io.File;
 
 import org.apache.subversion.javahl.callback.ReposNotifyCallback;
+import org.apache.subversion.javahl.callback.ReposVerifyCallback;
 import org.apache.subversion.javahl.callback.ReposFreezeAction;
 import org.apache.subversion.javahl.types.*;
 
 public interface ISVNRepos {
 
-	/**
-	 * interface to receive the messages
-	 */
-	public static interface MessageReceiver
-	{
-	    /**
-	     * receive one message line
-	     * @param message   one line of message
-	     */
-	    public void receiveMessageLine(String message);
-	}
-
-	/**
-	 * release the native peer (should not depend on finalize)
-	 */
-	public abstract void dispose();
-
-	/**
-	 * Filesystem in a Berkeley DB
-	 */
-	public static final String BDB = "bdb";
-	/**
-	 * Filesystem in the filesystem
-	 */
-	public static final String FSFS = "fsfs";
-
-	/**
-	 * @return Version information about the underlying native libraries.
-	 */
-	public abstract Version getVersion();
-
-	/**
-	 * create a subversion repository.
-	 * @param path                  the path where the repository will been
-	 *                              created.
-	 * @param disableFsyncCommit    disable to fsync at the commit (BDB).
-	 * @param keepLog               keep the log files (BDB).
-	 * @param configPath            optional path for user configuration files.
-	 * @param fstype                the type of the filesystem (BDB or FSFS)
-	 * @throws ClientException  throw in case of problem
-	 */
-	public abstract void create(File path, boolean disableFsyncCommit,
-			boolean keepLog, File configPath, String fstype)
-			throws ClientException;
-
-	/**
-	 * deltify the revisions in the repository
-	 * @param path              the path to the repository
-	 * @param start             start revision
-	 * @param end               end revision
-	 * @throws ClientException  throw in case of problem
-	 */
-	public abstract void deltify(File path, Revision start, Revision end)
-			throws ClientException;
-
-	/**
-	 * dump the data in a repository
-	 * @param path              the path to the repository
-	 * @param dataOut           the data will be outputed here
-	 * @param start             the first revision to be dumped
-	 * @param end               the last revision to be dumped
-	 * @param incremental       the dump will be incremantal
-	 * @param useDeltas         the dump will contain deltas between nodes
-     * @param callback          the callback to recieve notifications
-	 * @throws ClientException  throw in case of problem
-	 */
-	public abstract void dump(File path, OutputStream dataOut,
+    /**
+     * interface to receive the messages
+     */
+    public static interface MessageReceiver
+    {
+        /**
+         * receive one message line
+         * @param message   one line of message
+         */
+        public void receiveMessageLine(String message);
+    }
+
+    /**
+     * release the native peer (should not depend on finalize)
+     */
+    public abstract void dispose();
+
+    /**
+     * Filesystem in a Berkeley DB
+     */
+    public static final String BDB = "bdb";
+    /**
+     * Filesystem in the filesystem
+     */
+    public static final String FSFS = "fsfs";
+
+    /**
+     * @return Version information about the underlying native libraries.
+     */
+    public abstract Version getVersion();
+
+    /**
+     * create a subversion repository.
+     * @param path                  the path where the repository will been
+     *                              created.
+     * @param disableFsyncCommit    disable to fsync at the commit (BDB).
+     * @param keepLog               keep the log files (BDB).
+     * @param configPath            optional path for user configuration files.
+     * @param fstype                the type of the filesystem (BDB or FSFS)
+     * @throws ClientException  throw in case of problem
+     */
+    public abstract void create(File path, boolean disableFsyncCommit,
+            boolean keepLog, File configPath, String fstype)
+            throws ClientException;
+
+    /**
+     * deltify the revisions in the repository
+     * @param path              the path to the repository
+     * @param start             start revision
+     * @param end               end revision
+     * @throws ClientException  throw in case of problem
+     */
+    public abstract void deltify(File path, Revision start, Revision end)
+            throws ClientException;
+
+    /**
+     * dump the data in a repository
+     * @param path              the path to the repository
+     * @param dataOut           the data will be outputed here
+     * @param start             the first revision to be dumped
+     * @param end               the last revision to be dumped
+     * @param incremental       the dump will be incremantal
+     * @param useDeltas         the dump will contain deltas between nodes
+         * @param callback          the callback to receive notifications
+     * @throws ClientException  throw in case of problem
+     */
+    public abstract void dump(File path, OutputStream dataOut,
                 Revision start, Revision end, boolean incremental,
                 boolean useDeltas, ReposNotifyCallback callback)
-			throws ClientException;
-
-	/**
-	 * make a hot copy of the repository
-	 * @param path              the path to the source repository
-	 * @param targetPath        the path to the target repository
-	 * @param cleanLogs         clean the unused log files in the source
-	 *                          repository
-	 * @throws ClientException  throw in case of problem
-	 */
-	public abstract void hotcopy(File path, File targetPath,
-			boolean cleanLogs, boolean incremental) throws ClientException;
-
-	public abstract void hotcopy(File path, File targetPath,
-			boolean cleanLogs) throws ClientException;
-
-	/**
-	 * list all logfiles (BDB) in use or not)
-	 * @param path              the path to the repository
-	 * @param receiver          interface to receive the logfile names
-	 * @throws ClientException  throw in case of problem
-	 */
-	public abstract void listDBLogs(File path, MessageReceiver receiver)
-			throws ClientException;
-
-	/**
-	 * list unused logfiles
-	 * @param path              the path to the repository
-	 * @param receiver          interface to receive the logfile names
-	 * @throws ClientException  throw in case of problem
-	 */
-	public abstract void listUnusedDBLogs(File path, MessageReceiver receiver)
-			throws ClientException;
-
-
-	/**
-	 * load the data of a dump into a repository
-	 * @param path              the path to the repository
-	 * @param dataInput         the data input source
+            throws ClientException;
+
+    /**
+     * make a hot copy of the repository
+     * @param path              the path to the source repository
+     * @param targetPath        the path to the target repository
+     * @param cleanLogs         clean the unused log files in the source
+     *                          repository
+         * @param callback          the callback to receive notifications
+     * @throws ClientException  throw in case of problem
+         * @since 1.9
+     */
+    public abstract void hotcopy(File path, File targetPath,
+                        boolean cleanLogs, boolean incremental,
+                        ReposNotifyCallback callback)
+                        throws ClientException;
+
+    public abstract void hotcopy(File path, File targetPath,
+            boolean cleanLogs, boolean incremental)
+                        throws ClientException;
+
+    public abstract void hotcopy(File path, File targetPath,
+            boolean cleanLogs) throws ClientException;
+
+    /**
+     * list all logfiles (BDB) in use or not)
+     * @param path              the path to the repository
+     * @param receiver          interface to receive the logfile names
+     * @throws ClientException  throw in case of problem
+     */
+    public abstract void listDBLogs(File path, MessageReceiver receiver)
+            throws ClientException;
+
+    /**
+     * list unused logfiles
+     * @param path              the path to the repository
+     * @param receiver          interface to receive the logfile names
+     * @throws ClientException  throw in case of problem
+     */
+    public abstract void listUnusedDBLogs(File path, MessageReceiver receiver)
+            throws ClientException;
+
+
+    /**
+     * load the data of a dump into a repository
+     * @param path              the path to the repository
+     * @param dataInput         the data input source
          * @param start             the first revision to load
          * @param end               the last revision to load
-	 * @param ignoreUUID        ignore any UUID found in the input stream
-	 * @param forceUUID         set the repository UUID to any found in the
-	 *                          stream
-	 * @param usePreCommitHook  use the pre-commit hook when processing commits
-	 * @param usePostCommitHook use the post-commit hook when processing commits
-	 * @param relativePath      the directory in the repository, where the data
-	 *                          in put optional.
-	 * @param callback          the target for processing messages
-	 * @throws ClientException  throw in case of problem
+     * @param ignoreUUID        ignore any UUID found in the input stream
+     * @param forceUUID         set the repository UUID to any found in the
+     *                          stream
+     * @param usePreCommitHook  use the pre-commit hook when processing commits
+     * @param usePostCommitHook use the post-commit hook when processing commits
+         * @param validateProps     validate "svn:" revision and node properties
+         * @param ignoreDates       ignore revision datestamps in the dump stream
+     * @param relativePath      the directory in the repository, where the data
+     *                          in put optional.
+     * @param callback          the target for processing messages
+     * @throws ClientException  throw in case of problem
+         * @since 1.9
+     */
+    public abstract void load(File path, InputStream dataInput,
+                                  Revision start, Revision end,
+                                  boolean ignoreUUID, boolean forceUUID,
+                                  boolean usePreCommitHook,
+                                  boolean usePostCommitHook,
+                                  boolean validateProps,
+                                  boolean ignoreDates,
+                                  String relativePath,
+                                  ReposNotifyCallback callback)
+        throws ClientException;
+
+    /**
+     * Load the data of a dump into a repository.  Sets
+         * <code>validateProps</code> and <code>ignoreDates</code> to
+         * <code>false</code>.
+         *
+     * @param path              the path to the repository
+     * @param dataInput         the data input source
+         * @param start             the first revision to load
+         * @param end               the last revision to load
+     * @param ignoreUUID        ignore any UUID found in the input stream
+     * @param forceUUID         set the repository UUID to any found in the
+     *                          stream
+     * @param usePreCommitHook  use the pre-commit hook when processing commits
+     * @param usePostCommitHook use the post-commit hook when processing commits
+     * @param relativePath      the directory in the repository, where the data
+     *                          in put optional.
+     * @param callback          the target for processing messages
+     * @throws ClientException  throw in case of problem
          * @since 1.8
-	 */
-	public abstract void load(File path, InputStream dataInput,
+     */
+    public abstract void load(File path, InputStream dataInput,
                                   Revision start, Revision end,
                                   boolean ignoreUUID, boolean forceUUID,
                                   boolean usePreCommitHook,
@@ -164,142 +206,175 @@ public interface ISVNRepos {
                                   ReposNotifyCallback callback)
         throws ClientException;
 
-	/**
-	 * load the data of a dump into a repository
-	 * @param path              the path to the repository
-	 * @param dataInput         the data input source
-	 * @param ignoreUUID        ignore any UUID found in the input stream
-	 * @param forceUUID         set the repository UUID to any found in the
-	 *                          stream
-	 * @param usePreCommitHook  use the pre-commit hook when processing commits
-	 * @param usePostCommitHook use the post-commit hook when processing commits
-	 * @param relativePath      the directory in the repository, where the data
-	 *                          in put optional.
-	 * @param callback          the target for processing messages
-	 * @throws ClientException  throw in case of problem
+    /**
+     * load the data of a dump into a repository
+     * @param path              the path to the repository
+     * @param dataInput         the data input source
+     * @param ignoreUUID        ignore any UUID found in the input stream
+     * @param forceUUID         set the repository UUID to any found in the
+     *                          stream
+     * @param usePreCommitHook  use the pre-commit hook when processing commits
+     * @param usePostCommitHook use the post-commit hook when processing commits
+     * @param relativePath      the directory in the repository, where the data
+     *                          in put optional.
+     * @param callback          the target for processing messages
+     * @throws ClientException  throw in case of problem
          * @note behaves like the 1.8 vesion with the revision
          *       parameters set to Revision.START and Revision.HEAD.
-	 */
-	public abstract void load(File path, InputStream dataInput,
-			boolean ignoreUUID, boolean forceUUID, boolean usePreCommitHook,
+     */
+    public abstract void load(File path, InputStream dataInput,
+            boolean ignoreUUID, boolean forceUUID, boolean usePreCommitHook,
             boolean usePostCommitHook, String relativePath,
             ReposNotifyCallback callback)
         throws ClientException;
 
-	/**
-	 * list all open transactions in a repository
-	 * @param path              the path to the repository
-	 * @param receiver          receives one transaction name per call
-	 * @throws ClientException  throw in case of problem
-	 */
-	public abstract void lstxns(File path, MessageReceiver receiver)
-			throws ClientException;
-
-	/**
-	 * recover the filesystem backend of a repository
-	 * @param path              the path to the repository
+    /**
+     * list all open transactions in a repository
+     * @param path              the path to the repository
+     * @param receiver          receives one transaction name per call
+     * @throws ClientException  throw in case of problem
+     */
+    public abstract void lstxns(File path, MessageReceiver receiver)
+            throws ClientException;
+
+    /**
+     * recover the filesystem backend of a repository
+     * @param path              the path to the repository
          * @return youngest revision
-	 * @throws ClientException  throw in case of problem
-	 */
-	public abstract long recover(File path, ReposNotifyCallback callback)
+     * @throws ClientException  throw in case of problem
+     */
+    public abstract long recover(File path, ReposNotifyCallback callback)
             throws ClientException;
 
-	/**
-	 * Take an exclusive lock on each of the listed repositories
-	 * to prevent commits; then, while holding all the locks, call
-	 * the action.invoke().
-	 *
-	 * The repositories may or may not be readable by Subversion
-	 * while frozen, depending on implementation details of the
-	 * repository's filesystem backend.
-	 *
-	 * Repositories are locked in the listed order.
-	 * @param action     describes the action to perform
-	 * @param paths	     the set of repository paths
-	 * @throws ClientException
+    /**
+     * Take an exclusive lock on each of the listed repositories
+     * to prevent commits; then, while holding all the locks, call
+     * the action.invoke().
+     *
+     * The repositories may or may not be readable by Subversion
+     * while frozen, depending on implementation details of the
+     * repository's filesystem backend.
+     *
+     * Repositories are locked in the listed order.
+     * @param action     describes the action to perform
+     * @param paths	     the set of repository paths
+     * @throws ClientException
          * @since 1.8
-	 */
-	public abstract void freeze(ReposFreezeAction action,
-				    File... paths)
-	    throws ClientException;
-
-	/**
-	 * remove open transaction in a repository
-	 * @param path              the path to the repository
-	 * @param transactions      the transactions to be removed
-	 * @throws ClientException  throw in case of problem
-	 */
-	public abstract void rmtxns(File path, String[] transactions)
-			throws ClientException;
-
-	/**
-	 * Change the value of the revision property <code>propName</code>
-	 * to <code>propValue</code>.  By default, does not run
-	 * pre-/post-revprop-change hook scripts.
-	 *
-	 * @param path The path to the repository.
-	 * @param rev The revision for which to change a property value.
-	 * @param propName The name of the property to change.
-	 * @param propValue The new value to set for the property.
-	 * @param usePreRevPropChangeHook Whether to run the
-	 * <i>pre-revprop-change</i> hook script.
-	 * @param usePostRevPropChangeHook Whether to run the
-	 * <i>post-revprop-change</i> hook script.
-	 * @throws SubversionException If a problem occurs.
-	 */
-	public abstract void setRevProp(File path, Revision rev, String propName,
-			String propValue, boolean usePreRevPropChangeHook,
-			boolean usePostRevPropChangeHook) throws SubversionException;
-
-	/**
-	 * Verify the repository at <code>path</code> between revisions
-	 * <code>start</code> and <code>end</code>.
-	 *
-	 * @param path              the path to the repository
-	 * @param start             the first revision
-	 * @param end               the last revision
-     * @param callback          the callback to recieve notifications
-	 * @throws ClientException If an error occurred.
-	 */
-	public abstract void verify(File path, Revision start, Revision end,
+     */
+    public abstract void freeze(ReposFreezeAction action,
+                    File... paths)
+        throws ClientException;
+
+    /**
+     * remove open transaction in a repository
+     * @param path              the path to the repository
+     * @param transactions      the transactions to be removed
+     * @throws ClientException  throw in case of problem
+     */
+    public abstract void rmtxns(File path, String[] transactions)
+            throws ClientException;
+
+    /**
+     * Change the value of the revision property <code>propName</code>
+     * to <code>propValue</code>.  By default, does not run
+     * pre-/post-revprop-change hook scripts.
+     *
+     * @param path The path to the repository.
+     * @param rev The revision for which to change a property value.
+     * @param propName The name of the property to change.
+     * @param propValue The new value to set for the property.
+     * @param usePreRevPropChangeHook Whether to run the
+     * <i>pre-revprop-change</i> hook script.
+     * @param usePostRevPropChangeHook Whether to run the
+     * <i>post-revprop-change</i> hook script.
+     * @throws SubversionException If a problem occurs.
+     */
+    public abstract void setRevProp(File path, Revision rev, String propName,
+            String propValue, boolean usePreRevPropChangeHook,
+            boolean usePostRevPropChangeHook) throws SubversionException;
+
+    /**
+     * Verify the repository at <code>path</code> between revisions
+     * <code>start</code> and <code>end</code>.
+     *<p>
+     * If <code>verifyCallback</code> is <code>null</code>, verification
+     * will stop at the first encountered error. Otherwise, the verification
+     * process may continue, depending on the value returned from the
+     * invocation of <code>verifyCallback</code>.
+     *
+     * @param path              the path to the repository
+     * @param start             the first revision
+     * @param end               the last revision
+     * @param checkNormalization report directory entry and mergeinfo name collisions
+     *                           caused by denormalized Unicode representations
+     * @param metadataOnly      check only metadata, not file contents
+     * @param notifyCallback    the callback to receive notifications
+     * @param verifyCallback    the callback to receive verification status
+     * @throws ClientException If an error occurred.
+     * @since 1.9
+     */
+    public abstract void verify(File path, Revision start, Revision end,
+                boolean checkNormalization,
+                boolean metadataOnly,
+                ReposNotifyCallback notifyCallback,
+                ReposVerifyCallback verifyCallback)
+            throws ClientException;
+
+    /**
+     * Verify the repository at <code>path</code> between revisions
+     * <code>start</code> and <code>end</code>.
+     *<p>
+     *<b>Note:</b> Behaves like the 1.9 version with
+     *             <code>checkNormailzation</code> and
+     *             <code>metadataOnly</code> set to <code>false</code>
+     *             and <code>verifyCallback</code> set to
+     *             <code>null</code>.
+     *
+     * @param path              the path to the repository
+     * @param start             the first revision
+     * @param end               the last revision
+     * @param callback          the callback to receive notifications
+     * @throws ClientException If an error occurred.
+     */
+    public abstract void verify(File path, Revision start, Revision end,
                 ReposNotifyCallback callback)
             throws ClientException;
 
-	/**
-	 * list all locks in the repository
-	 * @param path              the path to the repository
+    /**
+     * list all locks in the repository
+     * @param path              the path to the repository
      * @param depth             the depth to recurse
-	 * @throws ClientException  throw in case of problem
-	 */
-	public abstract Set<Lock> lslocks(File path, Depth depth)
+     * @throws ClientException  throw in case of problem
+     */
+    public abstract Set<Lock> lslocks(File path, Depth depth)
             throws ClientException;
 
-	/**
-	 * remove multiple locks from the repository
-	 * @param path              the path to the repository
-	 * @param locks             the name of the locked items
-	 * @throws ClientException  throw in case of problem
-	 */
-	public abstract void rmlocks(File path, String[] locks)
-			throws ClientException;
+    /**
+     * remove multiple locks from the repository
+     * @param path              the path to the repository
+     * @param locks             the name of the locked items
+     * @throws ClientException  throw in case of problem
+     */
+    public abstract void rmlocks(File path, String[] locks)
+            throws ClientException;
 
     /**
      * upgrade the repository format
      * @param path              the path to the repository
      * @param callback          for notification
-	 * @throws ClientException  throw in case of problem
+     * @throws ClientException  throw in case of problem
      */
     public abstract void upgrade(File path, ReposNotifyCallback callback)
-			throws ClientException;
+            throws ClientException;
 
     /**
      * pack the repository
      * @param path              the path to the repository
      * @param callback          for notification
-	 * @throws ClientException  throw in case of problem
+     * @throws ClientException  throw in case of problem
      */
     public abstract void pack(File path, ReposNotifyCallback callback)
-			throws ClientException;
+            throws ClientException;
 
     /**
      * cancel the active operation
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/JNIError.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/JNIError.java
index f00b47f..90991c4 100644
--- a/subversion/bindings/javahl/src/org/apache/subversion/javahl/JNIError.java
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/JNIError.java
@@ -28,13 +28,9 @@ package org.apache.subversion.javahl;
  */
 public class JNIError extends Error
 {
-    // Update the serialVersionUID when there is a incompatible change
-    // made to this class.  See any of the following, depending upon
-    // the Java release.
-    // http://java.sun.com/j2se/1.3/docs/guide/serialization/spec/version.doc7.html
-    // http://java.sun.com/j2se/1.4/pdf/serial-spec.pdf
-    // http://java.sun.com/j2se/1.5.0/docs/guide/serialization/spec/version.html#6678
-    // http://java.sun.com/javase/6/docs/platform/serialization/spec/version.html#6678
+    // Update the serialVersionUID when there is a incompatible change made to
+    // this class.  See the java documentation for when a change is incompatible.
+    // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
     private static final long serialVersionUID = 1L;
 
     /**
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/JNIObject.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/JNIObject.java
new file mode 100644
index 0000000..7c55510
--- /dev/null
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/JNIObject.java
@@ -0,0 +1,42 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+package org.apache.subversion.javahl;
+
+/**
+ * This class is used internally by the JavaHL implementation and not considered
+ * part part of the public API.
+ */
+public abstract class JNIObject
+{
+    /**
+     * slot for the address of the native peer. The JNI code controls this
+     * field. If it is set to 0 then underlying JNI object has been freed
+     */
+    protected final long cppAddr;
+
+    protected JNIObject(long cppAddr)
+    {
+        this.cppAddr = cppAddr;
+    }
+}
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeException.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeException.java
index 7f693ae..1744438 100644
--- a/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeException.java
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeException.java
@@ -29,13 +29,9 @@ package org.apache.subversion.javahl;
  */
 class NativeException extends SubversionException
 {
-    // Update the serialVersionUID when there is a incompatible change
-    // made to this class.  See any of the following, depending upon
-    // the Java release.
-    // http://java.sun.com/j2se/1.3/docs/guide/serialization/spec/version.doc7.html
-    // http://java.sun.com/j2se/1.4/pdf/serial-spec.pdf
-    // http://java.sun.com/j2se/1.5.0/docs/guide/serialization/spec/version.html#6678
-    // http://java.sun.com/javase/6/docs/platform/serialization/spec/version.html#6678
+    // Update the serialVersionUID when there is a incompatible change made to
+    // this class.  See the java documentation for when a change is incompatible.
+    // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
     private static final long serialVersionUID = 1L;
 
     /**
@@ -58,9 +54,10 @@ class NativeException extends SubversionException
      * @param aprError Any associated APR error code for a wrapped
      * <code>svn_error_t</code>.
      */
-    NativeException(String message, String source, int aprError)
+    NativeException(String message, String source, Throwable cause,
+                    int aprError)
     {
-        super(message);
+        super(message, cause);
         this.source = source;
         this.aprError = aprError;
     }
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java
index c140fd1..ca71e4a 100644
--- a/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java
@@ -24,6 +24,7 @@
 package org.apache.subversion.javahl;
 
 import org.apache.subversion.javahl.types.Version;
+import org.apache.subversion.javahl.types.RuntimeVersion;
 
 /**
  * Handles activities related to management of native resouces
@@ -35,21 +36,32 @@ import org.apache.subversion.javahl.types.Version;
 public class NativeResources
 {
     /**
-     * @return Version information about the underlying native libraries.
+     * Version information about the underlying native libraries.
      */
     private static Version version;
 
     /**
-     * Returns version information about the underlying native libraries.
-     *
-     * @return version
-     *
+     * Runtime version information about the loaded libsvn_client.
+     */
+    private static RuntimeVersion runtimeVersion;
+
+    /**
+     * @return Version information about the underlying native libraries.
      */
-    public static Version getVersion() {
+    public static Version getVersion()
+    {
         return version;
     }
 
     /**
+     * @return Runtime version information about the loaded libsvn_client.
+     */
+    public static RuntimeVersion getRuntimeVersion()
+    {
+        return runtimeVersion;
+    }
+
+    /**
      * Load the required native library whose path is specified by the
      * system property <code>subversion.native.library</code> (which
      * can be passed to the JVM on start-up using an argument like
@@ -131,15 +143,27 @@ public class NativeResources
     {
         initNativeLibrary();
         version = new Version();
-        if (!version.isAtLeast(1, 8, 0))
+        if (!version.isAtLeast(1, 9, 0))
         {
             throw new LinkageError("Native library version must be at least " +
-                                   "1.8.0, but is only " + version);
+                                   "1.9.0, but is only " + version);
+        }
+
+        runtimeVersion = new RuntimeVersion();
+        if (runtimeVersion.getMajor() < version.getMajor()
+            || (runtimeVersion.getMajor() == version.getMajor()
+                && runtimeVersion.getMinor() < version.getMinor()))
+        {
+            throw new LinkageError(
+                "Compile-time Native library version is " + version +
+                " but the run-time version is " + runtimeVersion);
         }
     }
 
     /**
      * Initialize the native library layer.
+     * @note This is a no-op in 1.9+, but we need it for ABI
+     *       compatibility with older versions of the native library.
      */
     private static native void initNativeLibrary();
 }
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/OperationContext.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/OperationContext.java
new file mode 100644
index 0000000..ad56e12
--- /dev/null
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/OperationContext.java
@@ -0,0 +1,46 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+package org.apache.subversion.javahl;
+
+import org.apache.subversion.javahl.callback.ProgressCallback;
+
+/**
+ * A private class to hold the contextual information required to
+ * persist in this object, such as notification handlers.
+ */
+public class OperationContext implements ProgressCallback
+{
+    private ProgressCallback progress = null;
+
+    public void onProgress(ProgressEvent event)
+    {
+        if (progress != null)
+            progress.onProgress(event);
+    }
+
+    public void setProgressCallback(ProgressCallback progress)
+    {
+        this.progress = progress;
+    }
+}
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/ProgressEvent.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/ProgressEvent.java
index 7b46544..5d39515 100644
--- a/subversion/bindings/javahl/src/org/apache/subversion/javahl/ProgressEvent.java
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/ProgressEvent.java
@@ -31,13 +31,9 @@ import org.apache.subversion.javahl.callback.ProgressCallback;
  */
 public class ProgressEvent implements java.io.Serializable
 {
-    // Update the serialVersionUID when there is a incompatible change
-    // made to this class.  See any of the following, depending upon
-    // the Java release.
-    // http://java.sun.com/j2se/1.3/docs/guide/serialization/spec/version.doc7.html
-    // http://java.sun.com/j2se/1.4/pdf/serial-spec.pdf
-    // http://java.sun.com/j2se/1.5.0/docs/guide/serialization/spec/version.html#6678
-    // http://java.sun.com/javase/6/docs/platform/serialization/spec/version.html#6678
+    // Update the serialVersionUID when there is a incompatible change made to
+    // this class.  See the java documentation for when a change is incompatible.
+    // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
     private static final long serialVersionUID = 1L;
 
     /**
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/ReposNotifyInformation.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/ReposNotifyInformation.java
index 7594d6c..9970052 100644
--- a/subversion/bindings/javahl/src/org/apache/subversion/javahl/ReposNotifyInformation.java
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/ReposNotifyInformation.java
@@ -32,14 +32,10 @@ import org.apache.subversion.javahl.callback.ReposNotifyCallback;
  */
 public class ReposNotifyInformation extends EventObject
 {
-    // Update the serialVersionUID when there is a incompatible change
-    // made to this class.  See any of the following, depending upon
-    // the Java release.
-    // http://java.sun.com/j2se/1.3/docs/guide/serialization/spec/version.doc7.html
-    // http://java.sun.com/j2se/1.4/pdf/serial-spec.pdf
-    // http://java.sun.com/j2se/1.5.0/docs/guide/serialization/spec/version.html#6678
-    // http://java.sun.com/javase/6/docs/platform/serialization/spec/version.html#6678
-    private static final long serialVersionUID = 1L;
+    // Update the serialVersionUID when there is a incompatible change made to
+    // this class.  See the java documentation for when a change is incompatible.
+    // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
+    private static final long serialVersionUID = 2L;
 
     /**
      * The {@link Action} which triggered this event.
@@ -200,7 +196,31 @@ public class ReposNotifyInformation extends EventObject
          * The structure of a revision is being verified.
          * @since 1.8
          */
-        verify_rev_structure;
+        verify_rev_structure,
+
+        /**
+         * A revprop shard got packed. @
+         * @since 1.9
+         */
+        pack_revprops,
+
+        /**
+         * A non-packed revprop shard got removed.
+         * @since 1.9
+         */
+        cleanup_revprops,
+
+        /**
+         * The repository format got bumped.
+         * @since 1.9
+         */
+        format_bumped,
+
+        /**
+         * A revision range was copied.
+         * @since 1.9
+         */
+        hotcopy_rev_range;
     }
 
     public enum NodeAction
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
index 1af9102..4a11889 100644
--- a/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
@@ -32,6 +32,7 @@ import java.io.FileNotFoundException;
 import java.io.ByteArrayOutputStream;
 
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Set;
 import java.util.List;
 import java.util.Map;
@@ -52,7 +53,7 @@ public class SVNClient implements ISVNClient
     }
 
     /**
-     * Standard empty contructor, builds just the native peer.
+     * Standard empty constructor, builds just the native peer.
      */
     public SVNClient()
     {
@@ -103,6 +104,11 @@ public class SVNClient implements ISVNClient
         return NativeResources.getVersion();
     }
 
+    public RuntimeVersion getRuntimeVersion()
+    {
+        return NativeResources.getRuntimeVersion();
+    }
+
     public native VersionExtended getVersionExtended(boolean verbose);
 
     public native String getAdminDirectoryName();
@@ -112,15 +118,29 @@ public class SVNClient implements ISVNClient
     /**
       * @deprecated
       */
+    @Deprecated
     public native String getLastPath();
 
-    public native void status(String path, Depth depth, boolean onServer,
+    public native void status(String path, Depth depth,
+                              boolean onServer, boolean onDisk,
                               boolean getAll, boolean noIgnore,
-                              boolean ignoreExternals,
+                              boolean ignoreExternals, boolean depthAsSticky,
                               Collection<String> changelists,
                               StatusCallback callback)
             throws ClientException;
 
+    @Deprecated
+    public void status(String path, Depth depth, boolean onServer,
+                       boolean getAll, boolean noIgnore,
+                       boolean ignoreExternals,
+                       Collection<String> changelists,
+                       StatusCallback callback)
+            throws ClientException
+    {
+        status(path, depth, onServer, true, getAll, noIgnore,
+               ignoreExternals, false, changelists, callback);
+    }
+
     public native void list(String url, Revision revision,
                             Revision pegRevision, Depth depth, int direntFields,
                             boolean fetchLocks, ListCallback callback)
@@ -130,8 +150,13 @@ public class SVNClient implements ISVNClient
 
     public native void password(String password);
 
+    public native void setPrompt(AuthnCallback prompt);
+
+    @SuppressWarnings("deprecation")
     public native void setPrompt(UserPasswordCallback prompt);
 
+    public native void setTunnelAgent(TunnelAgent tunnelAgent);
+
     public native void logMessages(String path, Revision pegRevision,
                                    List<RevisionRange> revisionRanges,
                                    boolean stopOnCopy, boolean discoverPath,
@@ -151,14 +176,14 @@ public class SVNClient implements ISVNClient
         clientContext.notify = notify;
     }
 
-    public void setConflictResolver(ConflictResolverCallback listener)
+    public void setConflictResolver(ConflictResolverCallback resolver)
     {
-        clientContext.resolver = listener;
+        clientContext.resolver = resolver;
     }
 
-    public void setProgressCallback(ProgressCallback listener)
+    public void setProgressCallback(ProgressCallback progress)
     {
-        clientContext.listener = listener;
+        clientContext.setProgressCallback(progress);
     }
 
     public native void remove(Set<String> paths, boolean force,
@@ -167,10 +192,26 @@ public class SVNClient implements ISVNClient
                               CommitMessageCallback handler, CommitCallback callback)
             throws ClientException;
 
-    public native void revert(String path, Depth depth,
-                              Collection<String> changelists)
+    public native void revert(Set<String> paths, Depth depth,
+                              Collection<String> changelists,
+                              boolean clearChangelists,
+                              boolean metadataOnly)
             throws ClientException;
 
+    public void revert(Set<String> paths, Depth depth,
+                       Collection<String> changelists)
+            throws ClientException
+    {
+        revert(paths, depth, changelists, false, false);
+    }
+
+    public void revert(String path, Depth depth,
+                       Collection<String> changelists)
+            throws ClientException
+    {
+        revert(Collections.singleton(path), depth, changelists, false, false);
+    }
+
     public native void add(String path, Depth depth, boolean force,
                            boolean noIgnores, boolean noAutoProps,
                            boolean addParents)
@@ -199,11 +240,24 @@ public class SVNClient implements ISVNClient
 
     public native void copy(List<CopySource> sources, String destPath,
                             boolean copyAsChild, boolean makeParents,
-                            boolean ignoreExternals,
+                            boolean ignoreExternals, boolean metadataOnly,
+                            boolean pinExternals,
+                            Map<String, List<ExternalItem>> externalsToPin,
                             Map<String, String> revpropTable,
                             CommitMessageCallback handler, CommitCallback callback)
             throws ClientException;
 
+    public void copy(List<CopySource> sources, String destPath,
+                     boolean copyAsChild, boolean makeParents,
+                     boolean ignoreExternals,
+                     Map<String, String> revpropTable,
+                     CommitMessageCallback handler, CommitCallback callback)
+            throws ClientException
+    {
+        copy(sources, destPath, copyAsChild, makeParents, ignoreExternals,
+             false, false, null, revpropTable, handler, callback);
+    }
+
     public native void move(Set<String> srcPaths, String destPath,
                             boolean force, boolean moveAsChild,
                             boolean makeParents, boolean metadataOnly,
@@ -213,6 +267,7 @@ public class SVNClient implements ISVNClient
             throws ClientException;
 
     /** @deprecated */
+    @Deprecated
     public void move(Set<String> srcPaths, String destPath,
                      boolean force, boolean moveAsChild,
                      boolean makeParents,
@@ -229,8 +284,18 @@ public class SVNClient implements ISVNClient
                              CommitMessageCallback handler, CommitCallback callback)
             throws ClientException;
 
-    public native void cleanup(String path)
-            throws ClientException;
+    public native void cleanup(String path,
+                               boolean breakLocks,
+                               boolean fixRecordedTimestamps,
+                               boolean clearDavCache,
+                               boolean removeUnusedPristines,
+                               boolean includeExternals)
+        throws ClientException;
+
+    public void cleanup(String path) throws ClientException
+    {
+        cleanup(path, true, true, true, true, false);
+    }
 
     public native void resolve(String path, Depth depth,
                                ConflictResult.Choice conflictResult)
@@ -239,9 +304,20 @@ public class SVNClient implements ISVNClient
     public native long doExport(String srcPath, String destPath,
                                 Revision revision, Revision pegRevision,
                                 boolean force, boolean ignoreExternals,
+                                boolean ignorKeywords,
                                 Depth depth, String nativeEOL)
             throws ClientException;
 
+    public long doExport(String srcPath, String destPath,
+                                Revision revision, Revision pegRevision,
+                                boolean force, boolean ignoreExternals,
+                                Depth depth, String nativeEOL)
+            throws ClientException
+    {
+        return doExport(srcPath, destPath, revision, pegRevision,
+                        force, ignoreExternals, false, depth, nativeEOL);
+    }
+
     public native long doSwitch(String path, String url, Revision revision,
                                 Revision pegRevision, Depth depth,
                                 boolean depthIsSticky, boolean ignoreExternals,
@@ -276,11 +352,24 @@ public class SVNClient implements ISVNClient
     public native void merge(String path1, Revision revision1, String path2,
                              Revision revision2, String localPath,
                              boolean force, Depth depth,
-                             boolean ignoreMergeinfo, boolean diffIgnoreAncestry,
-                             boolean dryRun, boolean recordOnly)
+                             boolean ignoreMergeinfo,
+                             boolean diffIgnoreAncestry,
+                             boolean dryRun, boolean allowMixedRev,
+                             boolean recordOnly)
             throws ClientException;
 
     public void merge(String path1, Revision revision1, String path2,
+                      Revision revision2, String localPath,
+                      boolean force, Depth depth,
+                      boolean ignoreMergeinfo, boolean diffIgnoreAncestry,
+                      boolean dryRun, boolean recordOnly)
+            throws ClientException
+    {
+        merge(path1, revision1, path2, revision2, localPath, force, depth,
+              ignoreMergeinfo, diffIgnoreAncestry, dryRun, true, recordOnly);
+    }
+
+    public void merge(String path1, Revision revision1, String path2,
                              Revision revision2, String localPath,
                              boolean force, Depth depth,
                              boolean ignoreAncestry, boolean dryRun,
@@ -294,12 +383,25 @@ public class SVNClient implements ISVNClient
     public native void merge(String path, Revision pegRevision,
                              List<RevisionRange> revisions, String localPath,
                              boolean force, Depth depth,
-                             boolean ignoreMergeinfo, boolean diffIgnoreAncestry,
-                             boolean dryRun, boolean recordOnly)
+                             boolean ignoreMergeinfo,
+                             boolean diffIgnoreAncestry,
+                             boolean dryRun, boolean allowMixedRev,
+                             boolean recordOnly)
             throws ClientException;
 
     public void merge(String path, Revision pegRevision,
                       List<RevisionRange> revisions, String localPath,
+                      boolean force, Depth depth,
+                      boolean ignoreMergeinfo, boolean diffIgnoreAncestry,
+                      boolean dryRun, boolean recordOnly)
+            throws ClientException
+    {
+        merge(path, pegRevision, revisions, localPath, force, depth,
+              ignoreMergeinfo, diffIgnoreAncestry, dryRun, true, recordOnly);
+    }
+
+    public void merge(String path, Revision pegRevision,
+                      List<RevisionRange> revisions, String localPath,
                       boolean force, Depth depth, boolean ignoreAncestry,
                       boolean dryRun, boolean recordOnly)
             throws ClientException
@@ -310,6 +412,7 @@ public class SVNClient implements ISVNClient
 
 
     /** @deprecated */
+    @Deprecated
     public native void mergeReintegrate(String path, Revision pegRevision,
                                         String localPath, boolean dryRun)
             throws ClientException;
@@ -539,24 +642,46 @@ public class SVNClient implements ISVNClient
     {
         ByteArrayOutputStream stream = new ByteArrayOutputStream();
 
-        streamFileContent(path, revision, pegRevision, stream);
+        streamFileContent(path, revision, pegRevision, true, false, stream);
         return stream.toByteArray();
     }
 
-    public native void streamFileContent(String path, Revision revision,
-                                         Revision pegRevision,
-                                         OutputStream stream)
+    public native Map<String, byte[]>
+        streamFileContent(String path,
+                          Revision revision, Revision pegRevision,
+                          boolean expandKeywords, boolean returnProps,
+                          OutputStream stream)
             throws ClientException;
 
+    public void streamFileContent(String path, Revision revision,
+                                  Revision pegRevision,
+                                  OutputStream stream)
+        throws ClientException
+    {
+        streamFileContent(path, revision, pegRevision, true, false, stream);
+    }
+
     public native void relocate(String from, String to, String path,
                                 boolean ignoreExternals)
             throws ClientException;
 
+    public void blame(String path, Revision pegRevision,
+                      Revision revisionStart,
+                      Revision revisionEnd, boolean ignoreMimeType,
+                      boolean includeMergedRevisions,
+                      BlameCallback callback)
+            throws ClientException
+    {
+        blame(path, pegRevision, revisionStart, revisionEnd, ignoreMimeType,
+              includeMergedRevisions, callback, null);
+    }
+
     public native void blame(String path, Revision pegRevision,
                              Revision revisionStart,
                              Revision revisionEnd, boolean ignoreMimeType,
                              boolean includeMergedRevisions,
-                             BlameCallback callback)
+                             BlameCallback callback,
+                             DiffOptions options)
             throws ClientException;
 
     public native void setConfigDirectory(String configDir)
@@ -565,6 +690,12 @@ public class SVNClient implements ISVNClient
     public native String getConfigDirectory()
             throws ClientException;
 
+    public native void setConfigEventHandler(ConfigEvent configHandler)
+            throws ClientException;
+
+    public native ConfigEvent getConfigEventHandler()
+            throws ClientException;
+
     public native void cancelOperation()
             throws ClientException;
 
@@ -649,28 +780,65 @@ public class SVNClient implements ISVNClient
     public native void unlock(Set<String> paths, boolean force)
             throws ClientException;
 
-    public native void info2(String pathOrUrl, Revision revision,
-                             Revision pegRevision, Depth depth,
-                             Collection<String> changelists,
-                             InfoCallback callback)
+    public native void info(String pathOrUrl, Revision revision,
+                            Revision pegRevision, Depth depth,
+                            boolean fetchExcluded, boolean fetchActualOnly,
+                            boolean includeExternals,
+                            Collection<String> changelists,
+                            InfoCallback callback)
             throws ClientException;
 
+    public void info2(String pathOrUrl, Revision revision,
+                      Revision pegRevision, Depth depth,
+                      Collection<String> changelists,
+                      InfoCallback callback)
+            throws ClientException
+    {
+        info(pathOrUrl, revision, pegRevision, depth,
+             false, true, false, changelists, callback);
+    }
+
     public native void patch(String patchPath, String targetPath,
                              boolean dryRun, int stripCount, boolean reverse,
                              boolean ignoreWhitespace, boolean removeTempfiles,
                              PatchCallback callback)
             throws ClientException;
 
+    public native void vacuum(String wcPath,
+                              boolean removeUnversionedItems,
+                              boolean removeIgnoredItems,
+                              boolean fixRecordedTimestamps,
+                              boolean removeUnusedPristines,
+                              boolean includeExternals)
+            throws ClientException;
+
+    public ISVNRemote openRemoteSession(String pathOrUrl)
+            throws ClientException, SubversionException
+    {
+        return nativeOpenRemoteSession(pathOrUrl, 1);
+    }
+
+    public ISVNRemote openRemoteSession(String pathOrUrl, int retryAttempts)
+            throws ClientException, SubversionException
+    {
+        if (retryAttempts <= 0)
+            throw new IllegalArgumentException(
+                "retryAttempts must be positive");
+        return nativeOpenRemoteSession(pathOrUrl, retryAttempts);
+    }
+
+    private native ISVNRemote nativeOpenRemoteSession(
+        String pathOrUrl, int retryAttempts)
+            throws ClientException, SubversionException;
+
     /**
      * A private class to hold the contextual information required to
      * persist in this object, such as notification handlers.
      */
-    private class ClientContext
-        implements ClientNotifyCallback, ProgressCallback,
-            ConflictResolverCallback
+    private class ClientContext extends OperationContext
+        implements ClientNotifyCallback, ConflictResolverCallback
     {
         public ClientNotifyCallback notify = null;
-        public ProgressCallback listener = null;
         public ConflictResolverCallback resolver = null;
 
         public void onNotify(ClientNotifyInformation notifyInfo)
@@ -679,12 +847,6 @@ public class SVNClient implements ISVNClient
                 notify.onNotify(notifyInfo);
         }
 
-        public void onProgress(ProgressEvent event)
-        {
-            if (listener != null)
-                listener.onProgress(event);
-        }
-
         public ConflictResult resolve(ConflictDescriptor conflict)
             throws SubversionException
         {
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java
index 7d967bf..f115c9a 100644
--- a/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java
@@ -29,6 +29,7 @@ import java.io.InputStream;
 import java.io.File;
 
 import org.apache.subversion.javahl.callback.ReposNotifyCallback;
+import org.apache.subversion.javahl.callback.ReposVerifyCallback;
 import org.apache.subversion.javahl.callback.ReposFreezeAction;
 import org.apache.subversion.javahl.types.*;
 
@@ -47,7 +48,7 @@ public class SVNRepos implements ISVNRepos
     }
 
     /**
-     * Standard empty contructor, builds just the native peer.
+     * Standard empty constructor, builds just the native peer.
      */
     public SVNRepos()
     {
@@ -122,22 +123,22 @@ public class SVNRepos implements ISVNRepos
                             boolean useDeltas, ReposNotifyCallback callback)
             throws ClientException;
 
-    /**
-     * make a hot copy of the repository
-     * @param path              the path to the source repository
-     * @param targetPath        the path to the target repository
-     * @param cleanLogs         clean the unused log files in the source
-     *                          repository
-     * @throws ClientException  throw in case of problem
-     */
     public native void hotcopy(File path, File targetPath,
-                               boolean cleanLogs, boolean incremental)
+                               boolean cleanLogs, boolean incremental,
+                               ReposNotifyCallback callback)
             throws ClientException;
 
     public void hotcopy(File path, File targetPath,
+                        boolean cleanLogs, boolean incremental)
+            throws ClientException
+    {
+        hotcopy(path, targetPath, cleanLogs, incremental, null);
+    }
+
+    public void hotcopy(File path, File targetPath,
                         boolean cleanLogs) throws ClientException
     {
-        hotcopy(path, targetPath, cleanLogs, false);
+        hotcopy(path, targetPath, cleanLogs, false, null);
     }
 
     /**
@@ -159,6 +160,18 @@ public class SVNRepos implements ISVNRepos
             throws ClientException;
 
     public void load(File path, InputStream dataInput,
+                     Revision start, Revision end,
+                     boolean ignoreUUID, boolean forceUUID,
+                     boolean usePreCommitHook, boolean usePostCommitHook,
+                     String relativePath, ReposNotifyCallback callback)
+            throws ClientException
+    {
+        load(path, dataInput, start, end,
+             ignoreUUID, forceUUID, usePreCommitHook, usePostCommitHook,
+             false, false, relativePath, callback);
+    }
+
+    public void load(File path, InputStream dataInput,
                      boolean ignoreUUID, boolean forceUUID,
                      boolean usePreCommitHook, boolean usePostCommitHook,
                      String relativePath, ReposNotifyCallback callback)
@@ -166,13 +179,14 @@ public class SVNRepos implements ISVNRepos
     {
         load(path, dataInput, Revision.START, Revision.HEAD,
              ignoreUUID, forceUUID, usePreCommitHook, usePostCommitHook,
-             relativePath, callback);
+             false, false, relativePath, callback);
     }
 
     public native void load(File path, InputStream dataInput,
                             Revision start, Revision end,
                             boolean ignoreUUID, boolean forceUUID,
                             boolean usePreCommitHook, boolean usePostCommitHook,
+                            boolean validateProps, boolean ignoreDates,
                             String relativePath, ReposNotifyCallback callback)
             throws ClientException;
 
@@ -221,8 +235,18 @@ public class SVNRepos implements ISVNRepos
                                   boolean usePostRevPropChangeHook)
             throws SubversionException;
 
+    public void verify(File path, Revision start, Revision end,
+                       ReposNotifyCallback callback)
+            throws ClientException
+    {
+        verify(path, start, end, false, false, callback, null);
+    }
+
     public native void verify(File path, Revision start, Revision end,
-                              ReposNotifyCallback callback)
+                       boolean checkNormalization,
+                       boolean metadataOnly,
+                       ReposNotifyCallback notifyCallback,
+                       ReposVerifyCallback verifyCallback)
             throws ClientException;
 
     /**
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNUtil.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNUtil.java
new file mode 100644
index 0000000..9dd684d
--- /dev/null
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNUtil.java
@@ -0,0 +1,1077 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+package org.apache.subversion.javahl;
+
+import org.apache.subversion.javahl.callback.*;
+import org.apache.subversion.javahl.types.*;
+import org.apache.subversion.javahl.util.*;
+
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+public class SVNUtil
+{
+    //
+    // Global configuration
+    //
+    private static final ConfigLib configLib = new ConfigLib();
+
+    /**
+     * Enable storing authentication credentials in Subversion's
+     * standard credentials store in the configuration directory and
+     * system-specific secure locations.
+     * <p>
+     * The standard credentials store is enabled by default.
+     * <p>
+     * This setting will be inherited by all ISVNClient and ISVNRemote
+     * objects. Changing the setting will not affect existing such
+     * objects.
+     * @throws ClientException
+     */
+    public static void enableNativeCredentialsStore()
+        throws ClientException
+      {
+          configLib.enableNativeCredentialsStore();
+      }
+
+    /**
+     * Disable storing authentication credentials in Subversion's
+     * standard credentials store in the configuration directory and
+     * system-specific secure locations. In this mode, the
+     * authentication (see {@link ISVNClient#setPrompt} and {@link
+     * remote.RemoteFactory#setPrompt}) will be called every time the
+     * underlying library needs access to the credentials.
+     * <p>
+     * This mode is intented to support client implementations that
+     * use their own credentials store.
+     * <p>
+     * The standard credentials store is enabled by default.
+     * <p>
+     * This setting will be inherited by all ISVNClient and ISVNRemote
+     * objects. Changing the setting will not affect existing such
+     * objects.
+     * @throws ClientException
+     */
+    public static void disableNativeCredentialsStore()
+        throws ClientException
+      {
+          configLib.disableNativeCredentialsStore();
+      }
+
+    /**
+     * Find out if the standard credentials store is enabled.
+     */
+    public static boolean isNativeCredentialsStoreEnabled()
+        throws ClientException
+      {
+          return configLib.isNativeCredentialsStoreEnabled();
+      }
+
+    //
+    // Credentials management
+    //
+
+    /**
+     * Exception used by calling the wrong accessor on Credential for
+     * the given credential type.
+     */
+    public static class CredentialTypeMismatch extends SubversionException
+    {
+        // Update the serialVersionUID when there is a incompatible change made to
+        // this class.  See the java documentation for when a change is incompatible.
+        // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
+        private static final long serialVersionUID = 1L;
+
+        public CredentialTypeMismatch(Credential.Kind kind, String attribute)
+        {
+            super("Credential type '" + kind.toString()
+                  + "'  does not have the attribute '" + attribute + "'");
+        }
+    }
+
+    /**
+     * Generic credential description. Provides default accessors for
+     * concrete implementations.
+     */
+    public static class Credential implements java.io.Serializable
+    {
+        // Update the serialVersionUID when there is a incompatible change made to
+        // this class.  See the java documentation for when a change is incompatible.
+        // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
+        private static final long serialVersionUID = 1L;
+
+        /**
+         * Describes the kind of the credential.
+         */
+        public static enum Kind
+        {
+            /** The username for a realm. */
+            username            ("svn.username"),
+
+            /** The username and password for a realm. */
+            simple              ("svn.simple"),
+
+            /** The trusted SSL server certificate for a realm. */
+            sslServer           ("svn.ssl.server"),
+
+            /** The client certificate passphrase for a realm. */
+            sslClientPassphrase ("svn.ssl.client-passphrase");
+
+            private String token;
+
+            Kind(String token)
+            {
+                this.token = token;
+            }
+
+            /** @return the string representation of the enumeration. */
+            public String toString()
+            {
+                return this.token;
+            }
+
+            /* Factory used by the native implementation */
+            private static Kind fromString(String stringrep)
+            {
+                for (Kind kind : Kind.values()) {
+                    if (kind.toString().equals(stringrep))
+                        return kind;
+                }
+                return null;
+            }
+        }
+
+        /** @return the kind of the credential. */
+        public Kind getKind()
+        {
+            return kind;
+        }
+
+        /** @return the realm that the credential is valid for. */
+        public String getRealm()
+        {
+            return realm;
+        }
+
+        /**
+         * @return the type of the secure store used for the secret
+         * parts of this credential; may be <code>null</code> if the
+         * credential does not contain any secrets bits.
+         */
+        public String getSecureStore()
+            throws CredentialTypeMismatch
+        {
+            if (kind != Kind.simple && kind != Kind.sslClientPassphrase)
+                throw new CredentialTypeMismatch(kind, "secure store");
+
+            return store;
+        }
+
+        /**
+         * @return the username associated with the credential, or
+         * <code>null</code>, if there is no username in the concrete
+         * credential type.
+         */
+        public String getUsername()
+            throws CredentialTypeMismatch
+        {
+            if (kind != Kind.username && kind != Kind.simple)
+                throw new CredentialTypeMismatch(kind, "username");
+
+            return username;
+        }
+
+        /**
+         * @return the password associated with the credential, or
+         * <code>null</code>, if there is no password in the concrete
+         * credential type.
+         */
+        public String getPassword()
+            throws CredentialTypeMismatch
+        {
+            if (kind != Kind.simple && kind != Kind.sslClientPassphrase)
+                throw new CredentialTypeMismatch(kind, "password");
+
+            return password;
+        }
+
+        /**
+         * @return the server certificate info associated with the
+         * credential, or <code>null</code>, if there is no server
+         * certificate in the concrete credential type.
+         */
+        public AuthnCallback.SSLServerCertInfo getServerCertInfo()
+            throws CredentialTypeMismatch
+        {
+            if (kind != Kind.sslServer)
+                throw new CredentialTypeMismatch(kind, "server cert info");
+
+            return info;
+        }
+
+        /**
+         * @return the accepted server certificate failures associated
+         * with the credential, or <code>null</code>, if there is no
+         * server certificate in the concrete credential type.
+         */
+        public AuthnCallback.SSLServerCertFailures getServerCertFailures()
+            throws CredentialTypeMismatch
+        {
+            if (kind != Kind.sslServer)
+                throw new CredentialTypeMismatch(kind, "server cert failures");
+
+            return failures;
+        }
+
+        /**
+         * @return the client certificate passphrase associated with
+         * the credential, or <code>null</code>, if there is no client
+         * certificate in the concrete credential type.
+         */
+        public String getClientCertPassphrase()
+            throws CredentialTypeMismatch
+        {
+            if (kind != Kind.sslClientPassphrase)
+                throw new CredentialTypeMismatch(kind, "passphrase");
+
+            return passphrase;
+        }
+
+        // ### TODO: There are currently no proper APIs in Subversion
+        //           for adding credentials. These factory methods are
+        //           placeholders.
+        //
+        ///**
+        // * Creates an "svn.username" credential.
+        // * @param realm The realm string.
+        // * @param username The username for <code>realm</code>.
+        // */
+        //public static Credential
+        //    createUsername(String realm, String username)
+        //{
+        //    return new Credential(Kind.username, realm, null,
+        //                          username, null, null, null, null);
+        //}
+        //
+        ///**
+        // * Creates an "svn.simple" credential.
+        // * @param realm The realm string.
+        // * @param username The username for <code>realm</code>.
+        // * @param password The password for <code>username</code>.
+        // */
+        //public static Credential
+        //    createSimple(String realm, String username, String password)
+        //{
+        //    return new Credential(Kind.simple, realm, null,
+        //                          username, password, null, null, null);
+        //}
+        //
+        ///** Creates an "svn.ssl.server" credential. */
+        //public static Credential
+        //    createSSLServerCertTrust(String realm,
+        //                             AuthnCallback.SSLServerCertInfo info,
+        //                             AuthnCallback.SSLServerCertFailures failures)
+        //{
+        //    return new Credential(Kind.sslServer, realm, null,
+        //                          null, null, info, failures, null);
+        //}
+        //
+        ///**
+        // * Creates an "svn.ssl.client-passphrase" credential.
+        // * @param realm The realm string.
+        // * @param passphrase The passphrase for for the client certificate
+        // *        used for <code>realm</code>.
+        // */
+        //public static Credential
+        //    createSSLClientCertPassphrase(String realm, String passphrase)
+        //{
+        //    return new Credential(Kind.simple, realm, null,
+        //                          null, null, null, null, passphrase);
+        //}
+
+        private Credential(Kind kind, String realm, String store,
+                           String username, String password,
+                           AuthnCallback.SSLServerCertInfo info,
+                           AuthnCallback.SSLServerCertFailures failures,
+                           String passphrase)
+        {
+            assert(kind != null && realm != null);
+            switch (kind) {
+            case username:
+                assert(username != null && password == null
+                       && info == null && failures == null
+                       && passphrase == null);
+                break;
+            case simple:
+                assert(username != null && password != null
+                       && info == null && failures == null
+                       && passphrase == null);
+                break;
+            case sslServer:
+                assert(username == null && password == null
+                       && info != null && failures != null
+                       && passphrase == null);
+                break;
+            case sslClientPassphrase:
+                assert(username == null && password == null
+                       && info == null && failures == null
+                       && passphrase != null);
+                break;
+            default:
+                assert(kind == Kind.username
+                       || kind == Kind.simple
+                       || kind == Kind.sslServer
+                       || kind == Kind.sslClientPassphrase);
+            }
+
+            this.kind = kind;
+            this.realm = realm;
+            this.store = store;
+            this.username = username;
+            this.password = password;
+            this.info = info;
+            this.failures = failures;
+            this.passphrase = passphrase;
+        }
+
+        private Kind kind;
+        private String realm;
+        private String store;
+        private String username;
+        private String password;
+        private AuthnCallback.SSLServerCertInfo info;
+        private AuthnCallback.SSLServerCertFailures failures;
+        private String passphrase;
+    }
+
+    /**
+     * Find a stored credential.
+     * Unlike {@link #searchCredentials}, the the realm name is not
+     * a glob pattern.
+     * <p>
+     * <b>Note:</b> If the native credentials store is disabled, this
+     *              method will always return <code>null</code>.
+     *
+     * @param configDir The path to the configuration directory; if
+     *        <code>null</code>, the default (system-specific) user
+     *        configuration path will be used.
+     * @param kind The kind of the credential; may not be <code>null</code>.
+     * @param realm The realm name; may not be <code>null</code>.
+     * @return the matching credential, or <code>null</code> if not found.
+     */
+    public static Credential getCredential(String configDir,
+                                           Credential.Kind kind,
+                                           String realm)
+        throws ClientException, SubversionException
+    {
+        return configLib.getCredential(configDir, kind, realm);
+    }
+
+    /**
+     * Remove a stored credential.
+     * Unlike {@link #deleteCredentials}, the the realm name is not
+     * a glob pattern.
+     * <p>
+     * <b>Note:</b> If the native credentials store is disabled, this
+     *              method will always return <code>null</code>.
+     *
+     * @param configDir The path to the configuration directory; if
+     *        <code>null</code>, the default (system-specific) user
+     *        configuration path will be used.
+     * @param kind The kind of the credential; may not be <code>null</code>.
+     * @param realm The realm name; may not be <code>null</code>.
+     * @return the deleted credential, or <code>null</code> if not found.
+     */
+    public static Credential removeCredential(String configDir,
+                                              Credential.Kind kind,
+                                              String realm)
+        throws ClientException, SubversionException
+    {
+        return configLib.removeCredential(configDir, kind, realm);
+    }
+
+    // ### TODO: There are currently no proper APIs in Subversion for
+    //           adding credentials. This method is a placeholder.
+    //
+    ///**
+    // * Store a new credential, or replace an existing credential.
+    // * <p>
+    // * <b>Note:</b> If the native credentials store is disabled, this
+    // *              method will always return <code>null</code>.
+    // *
+    // * @param configDir The path to the configuration directory; if
+    // *        <code>null</code>, the default (system-specific) user
+    // *        configuration path will be used.
+    // * @param credential The credential to store.
+    // * @param replace If <code>true</code>, any existing matching
+    // *        credential will be replaced.
+    // *
+    // * @return the stored credential. If <code>replace</code> was
+    // * <code>false</code>, and a credential with the same kind and
+    // * for the same realm exists, it will be returned. If the given
+    // * credential was successfully added, the same object reference
+    // * will be returned (the calling code can compare reference values
+    // * to determine this). Will return <code>null</code> if the
+    // * credential could not be stored for any reason.
+    // */
+    //public static Credential addCredential(String configDir,
+    //                                       Credential credential,
+    //                                       boolean replace)
+    //    throws ClientException, SubversionException
+    //{
+    //    return configLib.addCredential(configDir, credential, replace);
+    //}
+
+    /**
+     * Find stored credentials that match the given search criteria.
+     * <p>
+     * <b>Note:</b> If the native credentials store is disabled, this
+     *              method will always return <code>null</code>.
+     *
+     * @param configDir The path to the configuration directory; if
+     *        <code>null</code>, the default (system-specific) user
+     *        configuration path will be used.
+     * @param kind The kind of the credential; if <code>null</code>,
+     *             all matching credential types will be returned.
+     * @param realmPattern A glob pattern for the realm string;
+     *             if <code>null</code>, all realms will be considered;
+     *             otherwise, only those credentials whose realm matches
+     *             the pattern will be returned.
+     * @param usernamePattern A glob pattern for the username;
+     *             if <code>null</code>, all credentials will be considered;
+     *             otherwise, only those credentials that have a username,
+     *             and where the username matches the pattern, will be
+     *             returned.
+     * @param hostnamePattern A glob pattern for the hostnames of a
+     *             server certificate; if <code>null</code>, all
+     *             credntials will be considered; otherwise, only
+     *             those credentials that have a server certificate
+     *             with a hostname that matches the pattern will be
+     *             returned.
+     * @param textPattern A glob pattern that must match any textual
+     *             information in a credential, for example, a realm,
+     *             username, certificate details, etc; passwords, passphrases
+     *             and other info considered secret will not be matched;
+     * @return the list of matching credentials.
+     */
+    public static List<Credential>
+        searchCredentials(String configDir,
+                          Credential.Kind kind,
+                          String realmPattern,
+                          String usernamePattern,
+                          String hostnamePattern,
+                          String textPattern)
+        throws ClientException, SubversionException
+    {
+        return configLib.searchCredentials(configDir, kind, realmPattern,
+                                           usernamePattern, hostnamePattern,
+                                           textPattern);
+    }
+
+    //
+    // Diff and Merge
+    //
+    private static final DiffLib diffLib = new DiffLib();
+
+    /**
+     * Options to control the behaviour of the file diff routines.
+     */
+    public static class DiffOptions
+    {
+        /**
+         * To what extent whitespace should be ignored when comparing lines.
+         */
+        public enum IgnoreSpace
+        {
+            /** Do not ignore whitespace */
+            none,
+
+            /**
+             * Ignore changes in sequences of whitespace characters,
+             * treating each sequence of whitespace characters as a
+             * single space.
+             */
+            change,
+
+            /** Ignore all whitespace characters. */
+            all
+        }
+
+        /**
+         * @param ignoreSpace Whether and how to ignore space differences
+         *        in the files. The default is {@link IgnoreSpace#none}.
+         * @param ignoreEolStyle Whether to treat all end-of-line
+         *        markers the same when comparing lines.  The default
+         *        is <code>false</code>.
+         * @param showCFunction Whether the "@@" lines of the unified
+         *        diff output should include a prefix of the nearest
+         *        preceding line that starts with a character that
+         *        might be the initial character of a C language
+         *        identifier. The default is <code>false</code>.
+         */
+        public DiffOptions(IgnoreSpace ignoreSpace,
+                           boolean ignoreEolStyle,
+                           boolean showCFunction)
+        {
+            this.ignoreSpace = ignoreSpace;
+            this.ignoreEolStyle = ignoreEolStyle;
+            this.showCFunction = showCFunction;
+            this.contextSize = -1;
+        }
+
+        /**
+         * Like the {@see #DiffOptions(IgnoreSpace,boolean,boolean)},
+         * but with an additional parameter.
+         * @param contextSize If this is greater than 0, then this
+         * number of context lines will be used in the generated diff
+         * output. Otherwise the legacy compile time default will be
+         * used.
+         */
+        public DiffOptions(IgnoreSpace ignoreSpace,
+                           boolean ignoreEolStyle,
+                           boolean showCFunction,
+                           int contextSize)
+        {
+            this.ignoreSpace = ignoreSpace;
+            this.ignoreEolStyle = ignoreEolStyle;
+            this.showCFunction = showCFunction;
+            this.contextSize = contextSize;
+        }
+
+        public final IgnoreSpace ignoreSpace;
+        public final boolean ignoreEolStyle;
+        public final boolean showCFunction;
+        public final int contextSize;
+    }
+
+    /** Style for displaying conflicts in merge output. */
+    public enum ConflictDisplayStyle
+    {
+        /** Display modified and latest, with conflict markers. */
+        modified_latest,
+
+        /**
+         * Like <code>modified_latest</code>, but with an extra effort
+         * to identify common sequences between modified and latest.
+         */
+        resolved_modified_latest,
+
+        /** Display modified, original, and latest, with conflict markers. */
+        modified_original_latest,
+
+        /** Just display modified, with no markers. */
+        modified,
+
+        /** Just display latest, with no markers. */
+        latest,
+
+        /**
+         * Like <code>modified_original_latest</code>, but
+         * <em>only<em> showing conflicts.
+         */
+        only_conflicts
+    }
+
+    /**
+     * Given two versions of a file, base (<code>originalFile</code>)
+     * and current (<code>modifiedFile</code>), show differences between
+     * them in unified diff format.
+     *
+     * @param originalFile The base file version (unmodified)
+     * @param modifiedFile The incoming file version (locally modified)
+     * @param diffOptions Options controlling how files are compared.
+     *        May be <code>null</code>.
+     * @param originalHeader The header to display for the base file
+     *        in the unidiff index block. If it is <code>null</code>,
+     *        the <code>originalFile</code> path and its modification
+     *        time will be used instead.
+     * @param modifiedHeader The header to display for the current
+     *        file in the unidiff index block. If it is <code>null</code>,
+     *        the <code>currentFile</code> path and its modification
+     *        time will be used instead.
+     * @param headerEncoding The character encoding of the unidiff headers.
+     * @param relativeToDir If this parameter is not <null>, it must
+     *        be the path of a (possibly non-immediate) parent of both
+     *        <code>originalFile</code> and <code>modifiedFile</code>.
+     *        This path will be stripped from the beginning of those
+     *        file names if they are used in the unidiff index header.
+     * @param resultStream The stream that receives the merged output.
+     * @return <code>true</code> if there were differences between the files.
+     * @throws ClientException
+     */
+    public static boolean fileDiff(String originalFile,
+                                   String modifiedFile,
+                                   SVNUtil.DiffOptions diffOptions,
+
+                                   String originalHeader,
+                                   String modifiedHeader,
+                                   String headerEncoding,
+                                   String relativeToDir,
+
+                                   OutputStream resultStream)
+        throws ClientException
+    {
+        // ### TODO: Support cancellation as in svn_diff_file_output_unified3.
+        return diffLib.fileDiff(originalFile, modifiedFile, diffOptions,
+                                originalHeader, modifiedHeader,
+                                headerEncoding,
+                                relativeToDir, resultStream);
+    }
+
+
+    /**
+     * Given three versions of a file, base (<code>originalFile</code>),
+     * incoming (<code>modifiedFile</code>) and current
+     * (<code>latestFile</code>, produce a merged result, possibly
+     * displaying conflict markers.
+     *
+     * @param originalFile The base file version (common ancestor)
+     * @param modifiedFile The incoming file version (modified elsewhere)
+     * @param latestFile The current file version (locally modified)
+     * @param diffOptions Options controlling how files are compared.
+     *        May be <code>null</code>.
+     * @param conflictOriginal Optional custom conflict marker for
+     *        the <code>originalFile</code> contents.
+     * @param conflictModified Optional custom conflict marker for
+     *        the <code>modifiedFile</code> contents.
+     * @param conflictLatest Optional custom conflict marker for
+     *        the <code>latestFile</code> contents.
+     * @param conflictSeparator Optional custom conflict separator.
+     * @param conflictStyle Determines how conflicts are displayed.
+     * @param resultStream The stream that receives the merged output.
+     * @return <code>true</code> if there were any conflicts.
+     * @throws ClientException
+     */
+    public static boolean fileMerge(String originalFile,
+                                    String modifiedFile,
+                                    String latestFile,
+                                    DiffOptions diffOptions,
+
+                                    String conflictOriginal,
+                                    String conflictModified,
+                                    String conflictLatest,
+                                    String conflictSeparator,
+                                    ConflictDisplayStyle conflictStyle,
+
+                                    OutputStream resultStream)
+        throws ClientException
+    {
+        return diffLib.fileMerge(originalFile, modifiedFile, latestFile,
+                                 diffOptions,
+                                 conflictOriginal, conflictModified,
+                                 conflictLatest, conflictSeparator,
+                                 conflictStyle, resultStream);
+    }
+
+    //
+    // Property validation and parsing
+    //
+    private static final PropLib propLib = new PropLib();
+
+    /**
+     * Validate the value of an <code>svn:</code> property on file or
+     * directory and return a canonical representation of its value.
+     * @param name The name of the property (must be a valid svn: property)
+     * @param value The property's value
+     * @param path The path or URL of the file or directory that
+     *        owns the property; only used for error messages
+     * @param kind The node kind of the file or dir that owns the property
+     * @param mimeType If <code>kind</code> is {@link NodeKind.file}, this is
+     *        tye file's mime-type, used for extra validation for the
+     *        <code>svn:eol-style</code> property. If it is <code>null</code>,
+     *        the extra validation will be skipped.
+     * @return a canonicalized representation of the property value
+     * @see http://subversion.apache.org/docs/api/latest/group__svn__wc__properties.html#ga83296313ec59cc825176224ac8282ec2
+     */
+    public static byte[] canonicalizeNodeProperty(
+        String name, byte[] value, String path, NodeKind kind,
+        String mimeType)
+        throws ClientException
+    {
+        return propLib.canonicalizeNodeProperty(
+            name, value, path, kind, mimeType, null);
+    }
+
+    /**
+     * Validate the value of an <code>svn:</code> property on file or
+     * directory and return a canonical representation of its value.
+     * @param name The name of the property (must be a valid svn: property)
+     * @param value The property's value
+     * @param path The path or URL of the file or directory that
+     *        owns the property; only used for error messages
+     * @param kind The node kind of the file or dir that owns the property
+     * @param mimeType If <code>kind</code> is {@link NodeKind.file}, this is
+     *        tye file's mime-type, used for extra validation for the
+     *        <code>svn:eol-style</code> property. If it is <code>null</code>,
+     *        the extra validation will be skipped.
+     * @param fileContents A stream with the file's contents. Only used
+     *        to check for line-ending consistency when validating the
+     *        <code>svn:eol-style</code> property, and only when
+     *        <code>kind</code> is {@link NodeKind.file} and
+     *        <code>mimeType</code> is not <code>null</code>.
+     * @return a canonicalized representation of the property value
+     * @see http://subversion.apache.org/docs/api/latest/group__svn__wc__properties.html#ga83296313ec59cc825176224ac8282ec2
+     */
+    public static byte[] canonicalizeNodeProperty(
+        String name, byte[] value, String path, NodeKind kind,
+        String mimeType, InputStream fileContents)
+        throws ClientException
+    {
+        return propLib.canonicalizeNodeProperty(
+            name, value, path, kind, mimeType, fileContents);
+    }
+
+    /**
+     * Parse <code>description</code>, assuming it is an externals
+     * specification in the format required for the
+     * <code>svn:externals</code> property, and return a list of
+     * parsed external items.
+     * @param description The externals description.
+     * @param parentDirectory Used to construct error messages.
+     * @param canonicalizeUrl Whe <code>true</code>, canonicalize the
+     *     <code>url</code> member of the returned objects. If the
+     *     <code>url</code> member refers to an absolute URL, it will
+     *     be canonicalized as URL consistent with the way URLs are
+     *     canonicalized throughout the Subversion API. If, however,
+     *     the <code>url</code> member makes use of the recognized
+     *     (SVN-specific) relative URL syntax for
+     *     <code>svn:externals</code>, "canonicalization" is an
+     *     ill-defined concept which may even result in munging the
+     *     relative URL syntax beyond recognition. You've been warned.
+     * @return a list of {@link ExternalItem}s
+     */
+    public static List<ExternalItem> parseExternals(byte[] description,
+                                                    String parentDirectory,
+                                                    boolean canonicalizeUrl)
+        throws ClientException
+    {
+        return propLib.parseExternals(description, parentDirectory,
+                                      canonicalizeUrl);
+    }
+
+    /**
+     * Unparse and list of external items into a format suitable for
+     * the value of the <code>svn:externals</code> property and
+     * validate the result.
+     * @param items The list of {@link ExternalItem}s
+     * @param parentDirectory Used to construct error messages.
+     * @param compatibleWithSvn1_5 When <code>true</code>, the format
+     *     of the returned property value will be compatible with
+     *     clients older than Subversion 1.5.
+     */
+    public static byte[] unparseExternals(List<ExternalItem> items,
+                                          String parentDirectory)
+        throws SubversionException
+    {
+        return propLib.unparseExternals(items, parentDirectory, false);
+    }
+
+    /**
+     * Unparse and list of external items into a format suitable for
+     * the value of the <code>svn:externals</code> property compatible
+     * with Subversion clients older than release 1.5, and validate
+     * the result.
+     * @param items The list of {@link ExternalItem}s
+     * @param parentDirectory Used to construct error messages.
+     */
+    public static byte[] unparseExternalsForAncientUnsupportedClients(
+        List<ExternalItem> items, String parentDirectory)
+        throws SubversionException
+    {
+        return propLib.unparseExternals(items, parentDirectory, true);
+    }
+
+    /**
+     * If the URL in <code>external</code> is relative, resolve it to
+     * an absolute URL, using <code>reposRootUrl</code> and
+     * <code>parentDirUrl</code> to provide contest.
+     *<p>
+     * Regardless if the URL is absolute or not, if there are no
+     * errors, the returned URL will be canonicalized.
+     *<p>
+     * The following relative URL formats are supported:
+     * <dl>
+     *  <dt><code>../</code></dt>
+     *  <dd>relative to the parent directory of the external</dd>
+     *  <dt><code>^/</code></dt>
+     *  <dd>relative to the repository root</dd>
+     *  <dt><code>//</code></dt>
+     *  <dd>relative to the scheme</dd>
+     *  <dt><code>/</code></dt>
+     *  <dd>relative to the server's hostname</dd>
+     * </dl>
+     *<p>
+     * The <code>../<code> and ^/ relative URLs may use <code>..</code>
+     * to remove path elements up to the server root.
+     *<p>
+     * The external URL should not be canonicalized before calling
+     * this function, as otherwise the scheme relative URL
+     * '<code>//host/some/path</code>' would have been canonicalized
+     * to '<code>/host/some/path</code>' and we would not be able to
+     * match on the leading '<code>//</code>'.
+    */
+    public static String resolveExternalsUrl(ExternalItem external,
+                                             String reposRootUrl,
+                                             String parentDirUrl)
+        throws ClientException
+    {
+        return propLib.resolveExternalsUrl(
+                   external, reposRootUrl, parentDirUrl);
+    }
+
+    //
+    // Newline translation and keyword expansion
+    //
+    private static final SubstLib substLib = new SubstLib();
+
+    /**
+     * Use the linefeed code point ('<code>\x0a</code>')
+     * for the newline separator.
+     * @see translateStream
+     * @see untranslateStream
+     */
+    public static final byte[] EOL_LF = SubstLib.EOL_LF;
+
+    /**
+     * Use the carraige-return code point ('<code>\x0d</code>')
+     * for the newline separator.
+     * @see translateStream
+     * @see untranslateStream
+     */
+    public static final byte[] EOL_CR = SubstLib.EOL_CR;
+
+    /**
+     * Use carriage-return/linefeed sequence ('<code>\x0d\x0a</code>')
+     * for the newline separator.
+     * @see translateStream
+     * @see untranslateStream
+     */
+    public static final byte[] EOL_CRLF = SubstLib.EOL_CRLF;
+
+
+    /**
+     * Build a dictionary of expanded keyword values, given the
+     * contents of a file's <code>svn:keywords</code> property, its
+     * revision, URL, the date it was committed on, the author of the
+     * commit and teh URL of the repository root.
+     *<p>
+     * Custom keywords defined in <code>svn:keywords</code> properties
+     * are expanded using the provided parameters and in accordance
+     * with the following format substitutions in the
+     * <code>keywordsValue</code>:
+     * <dl>
+     *   <dt><code>%a</dt></code>
+     * <dd>The author.</dd>
+     *   <dt><code>%b</dt></code>
+     * <dd>The basename of the URL.</dd>
+     *   <dt><code>%d</dt></code>
+     * <dd>Short format of the date.</dd>
+     *   <dt><code>%D</dt></code>
+     * <dd>Long format of the date.</dd>
+     *   <dt><code>%P</dt></code>
+     * <dd>The file's path, relative to the repository root URL.</dd>
+     *   <dt><code>%r</dt></code>
+     * <dd>The revision.</dd>
+     *   <dt><code>%R</dt></code>
+     * <dd>The URL to the root of the repository.</dd>
+     *   <dt><code>%u</dt></code>
+     * <dd>The URL of the file.</dd>
+     *   <dt><code>%_</dt></code>
+     * <dd>A space (keyword definitions cannot contain a literal space).</dd>
+     *   <dt><code>%%</dt></code>
+     * <dd>A literal '%'.</dd>
+     *   <dt><code>%H</dt></code>
+     * <dd>Equivalent to <code>%P%_%r%_%d%_%a</code>.</dd>
+     *   <dt><code>%I</dt></code>
+     * <dd>Equivalent to <code>%b%_%r%_%d%_%a</code>.</dd>
+     * </dl>
+     *<p>
+     * Custom keywords are defined by appending '=' to the keyword
+     * name, followed by a string containing any combination of the
+     * format substitutions.
+     *<p>
+     * Any of the <code>revision</code>, <code>url</code>,
+     * <code>reposRootUrl</code>, <code>date</code> and
+     * <code>author</code> parameters may be <code>null</code>, or
+     * {@link Revision#SVN_INVALID_REVNUM} for <code>revision</code>,
+     * to indicate that the information is not present. Each piece of
+     * information that is not present expands to the empty string
+     * wherever it appears in an expanded keyword value.  (This can
+     * result in multiple adjacent spaces in the expansion of a
+     * multi-valued keyword such as "<code>Id</code>".)
+     */
+    public static Map<String, byte[]> buildKeywords(byte[] keywordsValue,
+                                                    long revision,
+                                                    String url,
+                                                    String reposRootUrl,
+                                                    Date date,
+                                                    String author)
+        throws SubversionException, ClientException
+    {
+        return substLib.buildKeywords(keywordsValue, revision,
+                                      url, reposRootUrl, date, author);
+    }
+
+    /**
+     * Return a stream which performs end-of-line translation and
+     * keyword expansion when read from.
+     *<p>
+     * <b>Important:</b> Make sure you close the returned stream to
+     * ensure all data are flushed and cleaned up (this will also
+     * close the provided stream and dispose the related netive
+     * object).
+     *<p>
+     * If <code>eolMarker</code> is not <code>null</code>, replace
+     * whatever any end-of-line sequences in the input with
+     * <code>eolMarker</code>.  If the input has an inconsistent line
+     * ending style, then:
+     * <ul>
+     *   <li>if <code>repairEol</code> is <code>false</code>, then a
+     *       subsequent read or other operation on the stream will
+     *       generate an error when the inconsistency is detected;</li>
+     *   <li>if <code>repaorEol</code> is <code>true</code>, convert any
+     *       line ending to <code>eolMarker</code>.<br/>
+     *       Recognized line endings are: "<code>\n</code>",
+     *       "<code>\r</code>", and "<code>\r\n</code>".</li>
+     * </ul>
+     *<p>
+     * Expand or contract keywords using the contents of
+     * <code>keywords</code> as the new values.  If
+     * <code>expandKeywords</code> is <code>true</code>, expand
+     * contracted keywords and re-expand expanded keywords; otherwise,
+     * contract expanded keywords and ignore contracted ones.
+     * Keywords not found in the dictionary are ignored (not
+     * contracted or expanded).  If the <code>keywords</code> itself
+     * is <code>null</code>, keyword substitution will be altogether
+     * ignored.
+     *<p>
+     * Detect only keywords that are no longer than
+     * <code>SVN_KEYWORD_MAX_LEN</code> bytes (currently: 255),
+     * including the delimiters and the keyword itself.
+     *<p>
+     * Recommendation: if <code>expandKeywords</code> is
+     * <code>false</code>, then you don't care about the keyword
+     * values, so just put <code>null</code> values into the
+     * <code>keywords</code> dictionary.
+     *<p>
+     * If the inner stream implements marking and seeking via
+     * {@link InputStream#mark} and {@link InputStream#reset}, the
+     * translated stream will too.
+     *
+     * @param source the source (untranslated) stream.
+     * @param eolMarker the byte sequence to use as the end-of-line marker;
+     *     must be one of {@link #EOL_LF}, {@link #EOL_CR}
+     *     or {@link #EOL_CRLF}.
+     * @param repairEol flag to repair end-of-lines; see above
+     * @param keywords the keyword dictionary; see {@link buildKeywords}
+     * @param expandKeywords flag to expand keywords
+     */
+    public static InputStream translateStream(InputStream source,
+                                              byte[] eolMarker,
+                                              boolean repairEol,
+                                              Map<String, byte[]> keywords,
+                                              boolean expandKeywords)
+        throws SubversionException, ClientException
+    {
+        return substLib.translateInputStream(
+                    source, eolMarker, repairEol,
+                    keywords, true, expandKeywords,
+                    null, Revision.SVN_INVALID_REVNUM,
+                    null, null, null, null);
+    }
+
+    /**
+     * Expand keywords and return a stream which performs end-of-line
+     * translation and keyword expansion when read from.
+     * @see buildKeywords
+     * @see translateStream(InputStream,byte[],boolean,Map,boolean)
+     */
+    public static InputStream translateStream(InputStream source,
+                                              byte[] eolMarker,
+                                              boolean repairEol,
+                                              boolean expandKeywords,
+                                              byte[] keywordsValue,
+                                              long revision,
+                                              String url,
+                                              String reposRootUrl,
+                                              Date date,
+                                              String author)
+        throws SubversionException, ClientException
+    {
+        return substLib.translateInputStream(
+                    source, eolMarker, repairEol,
+                    null, false, expandKeywords,
+                    keywordsValue, revision,
+                    url, reposRootUrl, date, author);
+    }
+
+    /**
+     * Return a stream which performs end-of-line translation and
+     * keyword expansion when written to. Behaves like
+     * {@link #translateStream(InputStream,byte[],boolean,Map,boolean)},
+     * except that it translates an <code>OutputStream</code> and never
+     * supports marking and seeking.
+     */
+    public static OutputStream translateStream(OutputStream destination,
+                                               byte[] eolMarker,
+                                               boolean repairEol,
+                                               Map<String, byte[]> keywords,
+                                               boolean expandKeywords)
+        throws SubversionException, ClientException
+    {
+        return substLib.translateOutputStream(
+                    destination, eolMarker, repairEol,
+                    keywords, true, expandKeywords,
+                    null, Revision.SVN_INVALID_REVNUM,
+                    null, null, null, null);
+    }
+
+    /**
+     * Expand keywords and return a stream which performs end-of-line
+     * translation and keyword expansion when written to.
+     * @see buildKeywords
+     * @see translateStream(OutputStream,byte[],boolean,Map,boolean)
+     */
+    public static OutputStream translateStream(OutputStream destination,
+                                               byte[] eolMarker,
+                                               boolean repairEol,
+                                               boolean expandKeywords,
+                                               byte[] keywordsValue,
+                                               long revision,
+                                               String url,
+                                               String reposRootUrl,
+                                               Date date,
+                                               String author)
+        throws SubversionException, ClientException
+    {
+        return substLib.translateOutputStream(
+                    destination, eolMarker, repairEol,
+                    null, false, expandKeywords,
+                    keywordsValue, revision,
+                    url, reposRootUrl, date, author);
+    }
+}
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/SubversionException.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/SubversionException.java
index 9eba3b0..c0436fd 100644
--- a/subversion/bindings/javahl/src/org/apache/subversion/javahl/SubversionException.java
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/SubversionException.java
@@ -47,4 +47,16 @@ public class SubversionException extends Exception
     {
         super(message);
     }
+
+    /**
+     * This constructor is only used by sub-classes and the native
+     * implementation.
+     *
+     * @param message A description of the problem.
+     * @param cause The root cause of the exception.
+     */
+    protected SubversionException(String message, Throwable cause)
+    {
+        super(message, cause);
+    }
 }
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/AuthnCallback.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/AuthnCallback.java
new file mode 100644
index 0000000..d4a4f4e
--- /dev/null
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/AuthnCallback.java
@@ -0,0 +1,495 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+package org.apache.subversion.javahl.callback;
+
+import java.util.Date;
+import java.util.List;
+import java.util.logging.Logger;
+
+/**
+ * <p>The interface for requesting authentication credentials from the
+ * user.  Should the javahl bindings need the matching information,
+ * these methodes will be called.</p>
+ *
+ * <p>This callback can also be used to provide the equivalent of the
+ * <code>--no-auth-cache</code> and <code>--non-interactive</code>
+ * arguments accepted by the command-line client.</p>
+ *
+ * @since 1.9
+ */
+public interface AuthnCallback
+{
+    /**
+     * Abstract base class for callback results.
+     */
+    public abstract class AuthnResult
+    {
+        protected boolean save = false;   // Allow saving the credentials
+        protected boolean trust = false;  // SSL server cert trust
+        protected String identity = null; // Username or client cert filename
+        protected String secret = null;   // Password or client cert passphrase
+    }
+
+    /**
+     * The result type used by {@see #usernamePrompt}.
+     */
+    public static final class UsernameResult
+        extends AuthnResult
+        implements java.io.Serializable
+    {
+        // Update the serialVersionUID when there is a incompatible change made to
+        // this class.  See the java documentation for when a change is incompatible.
+        // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
+        private static final long serialVersionUID = 1L;
+
+        /**
+         * Set the username in the result.
+         * Assumes the result may not be stored permanently.
+         * @param username The username.
+         */
+        public UsernameResult(String username)
+        {
+            identity = username;
+        }
+
+        /**
+         * Set the username in the result.
+         * @param username The username.
+         * @param maySave Set if the result may be stored permanently.
+         */
+        public UsernameResult(String username, boolean maySave)
+        {
+            save = maySave;
+            identity = username;
+        }
+    }
+
+    /**
+     * Ask for a username.
+     * @param realm    The realm from which the question originates.
+     * @param maySave  Indiceates whether saving credentials is allowed;
+     *                 if <code>false</code>, the <code>maySave</code> flag
+     *                 in the return value will be ignored.
+     * @return The result, or <code>null</code> if cancelled.
+     */
+    public UsernameResult usernamePrompt(String realm, boolean maySave);
+
+
+    /**
+     * The result type used by {@see #userPasswordPrompt}.
+     */
+    public static final class UserPasswordResult
+        extends AuthnResult
+        implements java.io.Serializable
+    {
+        // Update the serialVersionUID when there is a incompatible change made to
+        // this class.  See the java documentation for when a change is incompatible.
+        // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
+        private static final long serialVersionUID = 1L;
+
+        /**
+         * Set the username and password in the result.
+         * Assumes the result may not be stored permanently.
+         * @param username The username.
+         * @param password The password.
+         */
+        public UserPasswordResult(String username, String password)
+        {
+            identity = username;
+            secret = password;
+        }
+
+        /**
+         * Set the username and password in the result.
+         * @param username The user name.
+         * @param password The password.
+         * @param maySave Set if the result may be stored permanently.
+         */
+        public UserPasswordResult(String username, String password,
+                                  boolean maySave)
+        {
+            save = maySave;
+            identity = username;
+            secret = password;
+        }
+    }
+
+    /**
+     * Ask for a username and password.
+     * @param realm    The realm from which the question originates.
+     * @param username The username for the realm, if known; may be <code>null</code>.
+     * @param maySave  Indiceates whether saving credentials is allowed;
+     *                 if <code>false</code>, the <code>maySave</code> flag
+     *                 in the return value will be ignored.
+     * @return The result, or <code>null</code> if cancelled.
+     */
+    public UserPasswordResult userPasswordPrompt(String realm, String username,
+                                                 boolean maySave);
+
+
+    /**
+     * Information about why parsing a server SSL certificate failed.
+     */
+    public static class SSLServerCertFailures implements java.io.Serializable
+    {
+        // Update the serialVersionUID when there is a incompatible change made to
+        // this class.  See the java documentation for when a change is incompatible.
+        // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
+        private static final long serialVersionUID = 1L;
+
+        /**
+         * The certificate is not yet valid.
+         */
+        public boolean notYetValid()
+        {
+            return ((failures & NOT_YET_VALID) != 0);
+        }
+
+        /**
+         * The certificate has expired.
+         */
+        public boolean expired()
+        {
+            return ((failures & EXPIRED) != 0);
+        }
+
+        /**
+         * Certificate's CN (hostname) does not match the remote hostname.
+         */
+        public boolean cnMismatch()
+        {
+            return ((failures & CN_MISMATCH) != 0);
+        }
+
+        /**
+         * Certificate authority is unknown (i.e., not trusted).
+         */
+        public boolean unknownCA()
+        {
+            return ((failures & UNKNOWN_CA) != 0);
+        }
+
+        /**
+         * Other failure. This can happen if an unknown failure occurs
+         * that we do not handle yet.
+         */
+        public boolean other()
+        {
+            return ((failures & OTHER) != 0 || (failures & ~ALL_KNOWN) != 0);
+        }
+
+        /** @return the internal bitfield representation of the failures. */
+        public int getFailures()
+        {
+            return failures;
+        }
+
+        private static final int NOT_YET_VALID = 0x00000001;
+        private static final int EXPIRED       = 0x00000002;
+        private static final int CN_MISMATCH   = 0x00000004;
+        private static final int UNKNOWN_CA    = 0x00000008;
+        private static final int OTHER         = 0x40000000;
+
+        private static final int ALL_KNOWN     = (NOT_YET_VALID | EXPIRED
+                                                  | CN_MISMATCH | UNKNOWN_CA
+                                                  | OTHER);
+
+        /* This private constructor is used by the native implementation. */
+        private SSLServerCertFailures(int failures)
+        {
+            /* Double-check that we did not forget to map any of the
+               failure flags, and flag an "other" failure. */
+            final int missing = (failures & ~ALL_KNOWN);
+
+            if (missing != 0) {
+                Logger log = Logger.getLogger("org.apache.subversion.javahl");
+                log.warning(String.format("Unknown SSL certificate parsing "
+                                          + "failure flags: %1$x", missing));
+            }
+
+            this.failures = failures;
+        }
+
+        private int failures;
+    }
+
+    /**
+     * Detailed information about the parsed server SSL certificate.
+     */
+    public static class SSLServerCertInfo implements java.io.Serializable
+    {
+        // Update the serialVersionUID when there is a incompatible change made to
+        // this class.  See the java documentation for when a change is incompatible.
+        // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
+        private static final long serialVersionUID = 1L;
+
+        /**
+         * @return The subject of the certificate.
+         */
+        public String getSubject()
+        {
+            return subject;
+        }
+
+        /**
+         * @return The certificate issuer.
+         */
+        public String getIssuer()
+        {
+            return issuer;
+        }
+
+        /**
+         * @return The from which the certificate is valid.
+         */
+        public Date getValidFrom()
+        {
+            return validFrom;
+        }
+
+        /**
+         * @return The date after which the certificate is no longer valid.
+         */
+        public Date getValidTo()
+        {
+            return validTo;
+        }
+
+        /**
+         * @return The certificate fingerprint.
+         */
+        public byte[] getFingerprint()
+        {
+            return fingerprint;
+        }
+
+        /**
+         * @return A list of host names that the certificate represents.
+         */
+        public List<String> getHostnames()
+        {
+            return hostnames;
+        }
+
+        /**
+         * @return the Base64-encoded raw certificate data.
+         */
+        public String getCert()
+        {
+            return asciiCert;
+        }
+
+        /* This private constructor is used by the native implementation. */
+        private SSLServerCertInfo(String subject, String issuer,
+                                  long validFrom, long validTo,
+                                  byte[] fingerprint,
+                                  List<String> hostnames,
+                                  String asciiCert)
+        {
+            this.subject = subject;
+            this.issuer = issuer;
+            this.validFrom = new Date(validFrom);
+            this.validTo = new Date(validTo);
+            this.fingerprint = fingerprint;
+            this.hostnames = hostnames;
+            this.asciiCert = asciiCert;
+        }
+
+        private String subject;
+        private String issuer;
+        private Date validFrom;
+        private Date validTo;
+        private byte[] fingerprint;
+        private List<String> hostnames;
+        private String asciiCert;
+    }
+
+    /**
+     * The result type used by {@see #sslServerTrustPrompt}.
+     */
+    public static final class SSLServerTrustResult
+        extends AuthnResult
+        implements java.io.Serializable
+    {
+        // Update the serialVersionUID when there is a incompatible change made to
+        // this class.  See the java documentation for when a change is incompatible.
+        // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
+        private static final long serialVersionUID = 1L;
+
+        /**
+         * Create a result that rejects the certificate.
+         */
+        public static SSLServerTrustResult reject()
+        {
+            return new SSLServerTrustResult(false, false);
+        }
+
+        /**
+         * Create a result that temporarily accepts the certificate,
+         * for the duration of the current connection.
+         */
+        public static SSLServerTrustResult acceptTemporarily()
+        {
+            return new SSLServerTrustResult(true, false);
+        }
+
+        /**
+         * Create a result that permanently accepts the certificate.
+         */
+        public static SSLServerTrustResult acceptPermanently()
+        {
+            return new SSLServerTrustResult(true, true);
+        }
+
+        private SSLServerTrustResult(boolean accept, boolean maySave)
+        {
+            save = maySave;
+            trust = accept;
+        }
+    }
+
+    /**
+     * Ask if we trust the server certificate.
+     * @param realm    The realm from which the question originates.
+     * @param failures The result of parsing the certificate;
+     *                 if <code>null</code>, there were no failures.
+     * @param info     Information extracted from the certificate.
+     * @param maySave  Indiceates whether saving credentials is allowed;
+     *                 if <code>false</code>, the <code>maySave</code> flag
+     *                 in the return value will be ignored.
+     * @return The result, or <code>null</code> if cancelled.
+     */
+    public SSLServerTrustResult
+        sslServerTrustPrompt(String realm,
+                             SSLServerCertFailures failures,
+                             SSLServerCertInfo info,
+                             boolean maySave);
+
+
+    /**
+     * The result type used by {@see #sslClientCertPrompt}.
+     */
+    public static final class SSLClientCertResult
+        extends AuthnResult
+        implements java.io.Serializable
+    {
+        // Update the serialVersionUID when there is a incompatible change made to
+        // this class.  See the java documentation for when a change is incompatible.
+        // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
+        private static final long serialVersionUID = 1L;
+
+        /**
+         * Set the absolute path of the cerfiticate file in the result.
+         * Assumes the result may not be stored permanently.
+         * @param path The absolute path of the certificate.
+         */
+        public SSLClientCertResult(String path)
+        {
+            identity = path;
+        }
+
+        /**
+         * Set the absolute path of the cerfiticate file in the result.
+         * @param path The absolute path of the certificate.
+         * @param maySave Set if the result may be stored permanently.
+         */
+        public SSLClientCertResult(String path, boolean maySave)
+        {
+            save = maySave;
+            identity = path;
+        }
+    }
+
+    /**
+     * Ask for the (local) file name of a client SSL certificate.
+     * @param realm    The realm from which the question originates.
+     * @param maySave  Indiceates whether saving credentials is allowed;
+     *                 if <code>false</code>, the <code>maySave</code> flag
+     *                 in the return value will be ignored.
+     * @return The result, or <code>null</code> if cancelled.
+     */
+    public SSLClientCertResult
+        sslClientCertPrompt(String realm, boolean maySave);
+
+
+    /**
+     * The result type used by {@see #sslClientCertPassphrasePrompt}.
+     */
+    public static final class SSLClientCertPassphraseResult
+        extends AuthnResult
+        implements java.io.Serializable
+    {
+        // Update the serialVersionUID when there is a incompatible change made to
+        // this class.  See the java documentation for when a change is incompatible.
+        // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
+        private static final long serialVersionUID = 1L;
+
+        /**
+         * Set the cerfiticate passphrase in the result.
+         * Assumes the result may not be stored permanently.
+         * @param passphrase The passphrase for decrypting the certificate.
+         */
+        public SSLClientCertPassphraseResult(String passphrase)
+        {
+            secret = passphrase;
+        }
+
+        /**
+         * Set the cerfiticate passphrase in the result.
+         * @param passphrase The passphrase for decrypting the certificate.
+         * @param maySave Set if the result may be stored permanently.
+         */
+        public SSLClientCertPassphraseResult(String passphrase, boolean maySave)
+        {
+            save = maySave;
+            secret = passphrase;
+        }
+    }
+
+    /**
+     * Ask for passphrase for decrypting a client SSL certificate.
+     * @param realm    The realm from which the question originates.
+     * @param maySave  Indiceates whether saving credentials is allowed;
+     *                 if <code>false</code>, the <code>maySave</code> flag
+     *                 in the return value will be ignored.
+     * @return The result, or <code>null</code> if cancelled.
+     */
+    public SSLClientCertPassphraseResult
+        sslClientCertPassphrasePrompt(String realm, boolean maySave);
+
+
+    /**
+     * Ask if a password may be stored on disk in plaintext.
+     * @param realm    The realm from which the question originates.
+     * @return <code>true</code> if the password may be stored in plaintext.
+     */
+    public boolean allowStorePlaintextPassword(String realm);
+
+    /**
+     * Ask if a certificate passphrase may be stored on disk in plaintext.
+     * @param realm    The realm from which the question originates.
+     * @return <code>true</code> if the passphrase may be stored in plaintext.
+     */
+    public boolean allowStorePlaintextPassphrase(String realm);
+}
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ConfigEvent.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ConfigEvent.java
new file mode 100644
index 0000000..6901714
--- /dev/null
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ConfigEvent.java
@@ -0,0 +1,42 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+package org.apache.subversion.javahl.callback;
+
+import org.apache.subversion.javahl.ISVNConfig;
+
+/**
+ * Interface for configuration-change hooks.
+ * @since 1.9
+ */
+public interface ConfigEvent
+{
+    /**
+     * Called by the native configuration loader every time the
+     * configuration is parsed into memory.
+     * @params configuration A reference to the in-memory configuration
+     *                       data. This object is only valid during the
+     *                       call and must not be accessed otherwise.
+     */
+    void onLoad(ISVNConfig configuration);
+}
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/RemoteFileRevisionsCallback.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/RemoteFileRevisionsCallback.java
new file mode 100644
index 0000000..accebca
--- /dev/null
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/RemoteFileRevisionsCallback.java
@@ -0,0 +1,36 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+package org.apache.subversion.javahl.callback;
+
+import org.apache.subversion.javahl.ISVNRemote;
+
+/**
+ * Called for each location segment returned from
+ * {@link ISVNRemote#getFileRevisions}.
+ */
+
+public interface RemoteFileRevisionsCallback
+{
+    void doRevision(ISVNRemote.FileRevision fileRevision);
+}
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/RemoteLocationSegmentsCallback.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/RemoteLocationSegmentsCallback.java
new file mode 100644
index 0000000..7430a69
--- /dev/null
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/RemoteLocationSegmentsCallback.java
@@ -0,0 +1,36 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+package org.apache.subversion.javahl.callback;
+
+import org.apache.subversion.javahl.ISVNRemote;
+
+/**
+ * Called for each location segment returned from
+ * {@link ISVNRemote#getLocationSegments}.
+ */
+
+public interface RemoteLocationSegmentsCallback
+{
+    void doSegment(ISVNRemote.LocationSegment locationSegment);
+}
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/RemoteStatus.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/RemoteStatus.java
new file mode 100644
index 0000000..60b956d
--- /dev/null
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/RemoteStatus.java
@@ -0,0 +1,187 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+package org.apache.subversion.javahl.callback;
+
+import org.apache.subversion.javahl.ISVNRemote;
+
+/**
+ * Called for each affected element in a remote status driave.
+ * <p>
+ * <b>Note:</b> All paths sent to the callback methods are relative to
+ * the {@link ISVNRemtoe} session's URL.
+ * @see ISVNRemote#status
+ * @since 1.9
+ */
+public interface RemoteStatus
+{
+    /**
+     * A directory was added.
+     * @param relativePath The session-relative path of the new directory.
+     */
+    void addedDirectory(String relativePath);
+
+    /**
+     * A file was added.
+     * @param relativePath The session-relative path of the new file.
+     */
+    void addedFile(String relativePath);
+
+    /**
+     * A symbolic link was added.
+     * @param relativePath The session-relative path of the new symbolic link.
+     */
+    void addedSymlink(String relativePath);
+
+    /**
+     * A directory was modified.
+     * @param relativePath The session-relative path of the directory.
+     * @param childrenModified The directory contents changed.
+     * @param propsModified The directory's properties changed.
+     * @param nodeInfo Additional information about the modified directory.
+     */
+    void modifiedDirectory(String relativePath,
+                           boolean childrenModified,
+                           boolean propsModified,
+                           Entry nodeInfo);
+
+    /**
+     * A file was modified.
+     * @param relativePath The session-relative path of the directory.
+     * @param textModified The file contents changed.
+     * @param propsModified The file's properties changed.
+     * @param nodeInfo Additional information about the modified file.
+     */
+    void modifiedFile(String relativePath,
+                      boolean textModified,
+                      boolean propsModified,
+                      Entry nodeInfo);
+
+    /**
+     * A symbolic link was modified.
+     * @param relativePath The session-relative path of the symlink.
+     * @param textModified The link target changed.
+     * @param propsModified The symlink's properties changed.
+     * @param nodeInfo Additional information about the modified symlink.
+     */
+    void modifiedSymlink(String relativePath,
+                         boolean targetModified,
+                         boolean propsModified,
+                         Entry nodeInfo);
+
+
+    /**
+     * An entry was deleted.
+     * @param relativePath The session-relative path of the entry.
+     */
+    void deleted(String relativePath);
+
+
+    /**
+     * Contains additional information related to a modification or
+     * deletion event.
+     */
+    public static class Entry
+        implements Comparable<Entry>, java.io.Serializable
+    {
+        // Update the serialVersionUID when there is a incompatible
+        // change made to this class.
+        private static final long serialVersionUID = 1L;
+
+        private String uuid;    // The UUID of the repository
+        private String author;  // The author of the last change
+        private long revision;  // Committed revision number
+        private long timestamp; // Commit timestamp (milliseconds from epoch)
+
+        public Entry(String uuid, String author, long revision, long timestamp)
+        {
+            this.uuid = uuid;
+            this.author = author;
+            this.revision = revision;
+            this.timestamp = timestamp;
+        }
+
+        /** @return The UUID of the repository that the node belongs to. */
+        public String getUuid() { return uuid; }
+
+        /** @return The author (committer) of the change. */
+        public String getLastAuthor() { return author; }
+
+        /** @return The revision number in with the change was committed. */
+        public long getCommittedRevision() { return revision; }
+
+        /**
+         * @return The timestamp, in milliseconds from the epoch, of
+         * the committed revision.
+         */
+        public long getCommittedTimestamp() { return timestamp; }
+
+        /** Implementation of interface {@link java.lang.Comparable}. */
+        public int compareTo(Entry that)
+        {
+            if (this == that)
+                return 0;
+
+            int cmp = uuid.compareTo(that.uuid);
+            if (cmp == 0) {
+                cmp = author.compareTo(that.author);
+                if (cmp == 0) {
+                    cmp = (revision < that.revision ? 1
+                           : (revision > that.revision ? -1 : 0));
+                    if (cmp == 0)
+                        cmp = (timestamp < that.timestamp ? 1
+                               : (timestamp > that.timestamp ? -1 : 0));
+                }
+            }
+            return cmp;
+        }
+
+        @Override
+        public boolean equals(Object entry)
+        {
+            if (this == entry)
+                return true;
+            if (!super.equals(entry) || getClass() != entry.getClass())
+                return false;
+
+            final Entry that = (Entry)entry;
+            return (this.uuid == that.uuid
+                    && this.author == that.author
+                    && this.revision == that.revision
+                    && this.timestamp == that.timestamp);
+        }
+
+        @Override
+        public int hashCode()
+        {
+            final int factor = 33;
+            int hash = ((uuid == null) ? 0 : uuid.hashCode());
+            hash = factor * hash + ((author == null) ? 0 : author.hashCode());
+            hash = factor * hash + (int)(revision >> 32) & 0xffffffff;
+            hash = factor * hash + (int)revision & 0xffffffff;
+            hash = factor * hash + (int)(timestamp >> 32) & 0xffffffff;
+            hash = factor * hash + (int)timestamp & 0xffffffff;
+            return hash;
+        }
+    }
+}
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ReposVerifyCallback.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ReposVerifyCallback.java
new file mode 100644
index 0000000..4d47b80
--- /dev/null
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ReposVerifyCallback.java
@@ -0,0 +1,60 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+package org.apache.subversion.javahl.callback;
+
+import org.apache.subversion.javahl.ClientException;
+import org.apache.subversion.javahl.types.Revision;
+import org.apache.subversion.javahl.callback.ReposNotifyCallback;
+import org.apache.subversion.javahl.callback.ReposVerifyCallback;
+
+import java.util.EventListener;
+
+/**
+ * Error notifications from
+ * {@link ISVNRepos#verify(File,Revision,Revision,boolean,boolean,ReposNotifyCallback,ReposVerifyCallback)}.
+ *
+ * @since 1.9
+ */
+public interface ReposVerifyCallback extends EventListener
+{
+    /**
+     * This callback method is invoked every time {@link ISVNRepos#verify}
+     * encounters an error.
+     *<p>
+     * The implementation can either consume <code>verifyError</code>
+     * and return normally to continue verifying the repository after
+     * an error, or throw <code>verifyError</code> (or some other
+     * exception) to indicate that verification should stop. In the
+     * second case, the thrown exception will propagate to the caller
+     * of {@link ISVNRepos#verify}.
+     *
+     * @param revision The revision that caused the error.
+     *          If <code>revision</code> is {@link Revision#SVN_INVALID_REVNUM},
+     *          the error occurred during metadata verification.
+     * @param verifyError The verification error.
+     * @throws ClientException
+     */
+    void onVerifyError(long revision, ClientException verifyError)
+        throws ClientException;
+}
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/TunnelAgent.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/TunnelAgent.java
new file mode 100644
index 0000000..b23161d
--- /dev/null
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/TunnelAgent.java
@@ -0,0 +1,94 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+package org.apache.subversion.javahl.callback;
+
+import java.nio.channels.ReadableByteChannel;
+import java.nio.channels.WritableByteChannel;
+
+/**
+ * Callback interface for creating and managing tunnels for ra_svn
+ * connections.
+ *
+ * Note that tunnel agent implementations should run in a separate
+ * thread of control than the one that invokes an ISVNClient or
+ * RemoteSession method that requires a tunnel, otherwise the method
+ * will deadlock.
+ *
+ * @since 1.9
+ */
+public interface TunnelAgent
+{
+    /**
+     * This callback method is called before a tunnel is created, to
+     * determine whether to use this tunnel implementation, or revert
+     * to the default (native) tunnel implementation.
+     * @param name the name of the tunnel, as in
+     *     <tt>svn+</tt><em>name</em><tt>://...</tt>
+     * @return <code>false</code> to defer to the default implementation.
+     */
+    boolean checkTunnel(String name);
+
+    /**
+     * Callback interface returned from {@link #openTunnel()}.
+     */
+    public static interface CloseTunnelCallback
+    {
+        /**
+         * This callback method is called when a tunnel needs to be closed
+         * and the request and response streams detached from it.
+         * <p>
+         * <b>Note:</b> Errors on connection-close are not propagated
+         * to the implementation, therefore this method cannot throw
+         * any exceptions.
+         */
+        void closeTunnel();
+    }
+
+    /**
+     * This callback method is called when a tunnel needs to be
+     * created and the request and response streams attached to it.
+     * @param request The request stream of the tunnel. The tunnel
+     *     agent implementation will read requests from this channel
+     *     and send them to the tunnel process.
+     * @param response The request stream of the tunnel. The tunnel
+     *     agent implementation will read requests from this channel
+     *     and send them to the tunnel process.
+     * @param name the name of the tunnel, as in
+     *     <tt>svn+</tt><em>name</em><tt>://...</tt>
+     * @param user the tunnel username
+     * @param hostname the host part of the svn+tunnel:// URL
+     * @param port the port part of the svn+tunnel:// URL
+     *
+     * @return an instance od {@link CloseTunnelCallback}, which will
+     *         be invoked when the connection is closed, or
+     *         <code>null</code>.
+     *
+     * @throws any exception will abort the connection
+     */
+    CloseTunnelCallback openTunnel(ReadableByteChannel request,
+                                   WritableByteChannel response,
+                                   String name, String user,
+                                   String hostname, int port)
+        throws Throwable;
+}
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/UserPasswordCallback.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/UserPasswordCallback.java
index f8e3775..a89f219 100644
--- a/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/UserPasswordCallback.java
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/UserPasswordCallback.java
@@ -31,7 +31,10 @@ package org.apache.subversion.javahl.callback;
  * <p>This callback can also be used to provide the equivalent of the
  * <code>--no-auth-cache</code> and <code>--non-interactive</code>
  * arguments accepted by the command-line client.</p>
+ *
+ * @deprecated Use {@see AuthnCallback}.
  */
+@Deprecated
 public interface UserPasswordCallback
 {
     /**
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/CommitEditor.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/CommitEditor.java
new file mode 100644
index 0000000..a6f8638
--- /dev/null
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/CommitEditor.java
@@ -0,0 +1,174 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+package org.apache.subversion.javahl.remote;
+
+import org.apache.subversion.javahl.types.*;
+import org.apache.subversion.javahl.callback.*;
+
+import org.apache.subversion.javahl.ISVNEditor;
+import org.apache.subversion.javahl.JNIObject;
+import org.apache.subversion.javahl.ClientException;
+import org.apache.subversion.javahl.NativeResources;
+
+import java.io.InputStream;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Implementation of ISVNEditor that drives commits.
+ * @since 1.9
+ */
+public class CommitEditor extends JNIObject implements ISVNEditor
+{
+    /**
+     * Load the required native library.
+     */
+    static
+    {
+        NativeResources.loadNativeLibrary();
+    }
+
+    public void dispose()
+    {
+        session.disposeEditor(this);
+        nativeDispose();
+    }
+
+    public native void addDirectory(String relativePath,
+                                    Iterable<String> children,
+                                    Map<String, byte[]> properties,
+                                    long replacesRevision)
+            throws ClientException;
+
+    public native void addFile(String relativePath,
+                               Checksum checksum,
+                               InputStream contents,
+                               Map<String, byte[]> properties,
+                               long replacesRevision)
+            throws ClientException;
+
+    /**
+     * <b>Note:</b> Not implemented.
+     */
+    public native void addSymlink(String relativePath,
+                                  String target,
+                                  Map<String, byte[]> properties,
+                                  long replacesRevision)
+            throws ClientException;
+
+    public native void addAbsent(String relativePath,
+                                 NodeKind kind,
+                                 long replacesRevision)
+            throws ClientException;
+
+    public native void alterDirectory(String relativePath,
+                                      long revision,
+                                      Iterable<String> children,
+                                      Map<String, byte[]> properties)
+            throws ClientException;
+
+    public native void alterFile(String relativePath,
+                                 long revision,
+                                 Checksum checksum,
+                                 InputStream contents,
+                                 Map<String, byte[]> properties)
+            throws ClientException;
+
+    /**
+     * <b>Note:</b> Not implemented.
+     */
+    public native void alterSymlink(String relativePath,
+                                    long revision,
+                                    String target,
+                                    Map<String, byte[]> properties)
+            throws ClientException;
+
+    public native void delete(String relativePath,
+                              long revision)
+            throws ClientException;
+
+    public native void copy(String sourceRelativePath,
+                            long sourceRevision,
+                            String destinationRelativePath,
+                            long replacesRevision)
+            throws ClientException;
+
+    public native void move(String sourceRelativePath,
+                            long sourceRevision,
+                            String destinationRelativePath,
+                            long replacesRevision)
+            throws ClientException;
+
+    public native void complete() throws ClientException;
+
+    public native void abort() throws ClientException;
+
+    /**
+     * This factory method called from RemoteSession.getCommitEditor.
+     */
+    static final
+        CommitEditor createInstance(RemoteSession session,
+                                    Map<String, byte[]> revisionProperties,
+                                    CommitCallback commitCallback,
+                                    Set<Lock> lockTokens, boolean keepLocks,
+                                    ISVNEditor.ProvideBaseCallback baseCB,
+                                    ISVNEditor.ProvidePropsCallback propsCB,
+                                    ISVNEditor.GetNodeKindCallback kindCB)
+            throws ClientException
+    {
+        long cppAddr = nativeCreateInstance(
+            session, revisionProperties, commitCallback,
+            lockTokens, keepLocks, baseCB, propsCB, kindCB);
+        return new CommitEditor(cppAddr, session);
+    }
+
+    /**
+     * This constructor is called from the factory to get an instance.
+     */
+    protected CommitEditor(long cppAddr, RemoteSession session)
+    {
+        super(cppAddr);
+        this.session = session;
+    }
+
+    /** Stores a reference to the session that created this editor. */
+    protected RemoteSession session;
+
+    @Override
+    public native void finalize() throws Throwable;
+
+    /*
+     * Wrapped private native implementation declarations.
+     */
+    private native void nativeDispose();
+    private static final native
+        long nativeCreateInstance(RemoteSession session,
+                                  Map<String, byte[]> revisionProperties,
+                                  CommitCallback commitCallback,
+                                  Set<Lock> lockTokens, boolean keepLocks,
+                                  ISVNEditor.ProvideBaseCallback baseCB,
+                                  ISVNEditor.ProvidePropsCallback propsCB,
+                                  ISVNEditor.GetNodeKindCallback kindCB)
+            throws ClientException;
+}
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/RemoteFactory.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/RemoteFactory.java
new file mode 100644
index 0000000..16b4cd7
--- /dev/null
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/RemoteFactory.java
@@ -0,0 +1,318 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+package org.apache.subversion.javahl.remote;
+
+import org.apache.subversion.javahl.callback.*;
+import org.apache.subversion.javahl.types.*;
+
+import org.apache.subversion.javahl.ISVNRemote;
+import org.apache.subversion.javahl.NativeResources;
+import org.apache.subversion.javahl.ClientException;
+import org.apache.subversion.javahl.SubversionException;
+
+import java.util.HashSet;
+
+
+/**
+ * Factory class for creating ISVNRemote instances.
+ * @since 1.9
+ */
+public class RemoteFactory
+{
+    /**
+     * Load the required native library.
+     */
+    static
+    {
+        NativeResources.loadNativeLibrary();
+    }
+
+    /**
+     * Default constructor.
+     */
+    public RemoteFactory() {}
+
+    /**
+     * Initializing constructor. Any or all of its arguments may be null.
+     */
+    public RemoteFactory(String configDirectory,
+                         String username, String password,
+                         AuthnCallback prompt,
+                         ProgressCallback progress,
+                         ConfigEvent configHandler,
+                         TunnelAgent tunnelAgent)
+    {
+        setConfigDirectory(configDirectory);
+        setUsername(username);
+        setPassword(password);
+        setPrompt(prompt);
+        setProgressCallback(progress);
+        setConfigEventHandler(configHandler);
+        setTunnelAgent(tunnelAgent);
+    }
+
+    /**
+     * Initializing constructor. Any or all of its arguments may be null.
+     */
+    @SuppressWarnings("deprecation")
+    public RemoteFactory(String configDirectory,
+                         String username, String password,
+                         UserPasswordCallback prompt,
+                         ProgressCallback progress,
+                         ConfigEvent configHandler,
+                         TunnelAgent tunnelAgent)
+    {
+        setConfigDirectory(configDirectory);
+        setUsername(username);
+        setPassword(password);
+        setPrompt(prompt);
+        setProgressCallback(progress);
+        setConfigEventHandler(configHandler);
+        setTunnelAgent(tunnelAgent);
+    }
+
+    /**
+     * Sets the username used for authentication.
+     * @param username The username; Set to the <code>null</code> to clear it.
+     * @throws IllegalArgumentException If <code>username</code> is empty.
+     * @see #password(String)
+     */
+    public void setUsername(String username)
+    {
+        if (username != null && username.isEmpty())
+            throw new IllegalArgumentException("username must not be empty");
+        this.username = username;
+    }
+
+    /**
+     * Sets the password used for authentication.
+     * @param password The passwordp Set <code>null</code> to clear it.
+     * @throws IllegalArgumentException If <code>password</code> is empty.
+     * @see #username(String)
+     */
+    public void setPassword(String password)
+    {
+        if (password != null && password.isEmpty())
+            throw new IllegalArgumentException("password must not be empty");
+        this.password = password;
+    }
+
+    /**
+     * Register callback interface to supply username and password on demand.
+     * This callback can also be used to provide theequivalent of the
+     * <code>--no-auth-cache</code> and <code>--non-interactive</code>
+     * arguments accepted by the command-line client.
+     * @param prompt the callback interface
+     */
+    public void setPrompt(AuthnCallback prompt)
+    {
+        assert(this.deprecatedPrompt == null);
+        this.prompt = prompt;
+    }
+
+    /**
+     * Register callback interface to supply username and password on demand.
+     * This callback can also be used to provide theequivalent of the
+     * <code>--no-auth-cache</code> and <code>--non-interactive</code>
+     * arguments accepted by the command-line client.
+     * @param prompt the callback interface
+     */
+    @SuppressWarnings("deprecation")
+    public void setPrompt(UserPasswordCallback prompt)
+    {
+        assert(this.prompt == null);
+        this.deprecatedPrompt = prompt;
+    }
+
+    /**
+     * Set the progress callback for new sessions.
+     *
+     * @param progress The progress callback.
+     */
+    public void setProgressCallback(ProgressCallback progress)
+    {
+        this.progress = progress;
+    }
+
+    /**
+     * Set directory for the configuration information.
+     */
+    public void setConfigDirectory(String configDirectory)
+    {
+        this.configDirectory = configDirectory;
+    }
+
+    /**
+     * Set an event handler that will be called every time the
+     * configuration is loaded by the ISVNRemote objects created by
+     * this factory.
+     */
+    public void setConfigEventHandler(ConfigEvent configHandler)
+    {
+        this.configHandler = configHandler;
+    }
+
+    /**
+     * Set callbacks for ra_svn tunnel handling.
+     */
+    public void setTunnelAgent(TunnelAgent tunnelAgent)
+    {
+        this.tunnelAgent = tunnelAgent;
+    }
+
+    /**
+     * Open a persistent session to a repository.
+     * <p>
+     * <b>Note:</b> The URL can point to a subtree of the repository.
+     * <p>
+     * <b>Note:</b> The session object inherits the progress callback,
+     * configuration directory and authentication info.
+     *
+     * @param url The initial session root URL.
+     * @throws RetryOpenSession If the session URL was redirected
+     * @throws SubversionException If an URL redirect cycle was detected
+     * @throws ClientException
+     */
+    public ISVNRemote openRemoteSession(String url)
+            throws ClientException, SubversionException
+    {
+        return open(1, url, null, configDirectory,
+                    username, password, prompt, deprecatedPrompt, progress,
+                    configHandler, tunnelAgent);
+    }
+
+    /**
+     * Open a persistent session to a repository.
+     * <p>
+     * <b>Note:</b> The URL can point to a subtree of the repository.
+     * <p>
+     * <b>Note:</b> The session object inherits the progress callback,
+     * configuration directory and authentication info.
+     *
+     * @param url The initial session root URL.
+     * @param retryAttempts The number of times to retry the operation
+     *        if the given URL is redirected.
+     * @throws IllegalArgumentException If <code>retryAttempts</code>
+     *         is not positive
+     * @throws RetryOpenSession If the session URL was redirected
+     * @throws SubversionException If an URL redirect cycle was detected
+     * @throws ClientException
+     */
+    public ISVNRemote openRemoteSession(String url, int retryAttempts)
+            throws ClientException, SubversionException
+    {
+        if (retryAttempts <= 0)
+            throw new IllegalArgumentException(
+                "retryAttempts must be positive");
+        return open(retryAttempts, url, null, configDirectory,
+                    username, password, prompt, deprecatedPrompt, progress,
+                    configHandler, tunnelAgent);
+    }
+
+    /**
+     * Open a persistent session to a repository.
+     * <p>
+     * <b>Note:</b> The URL can point to a subtree of the repository.
+     * <p>
+     * <b>Note:</b> If the UUID does not match the repository,
+     * this function fails.
+     * <p>
+     * <b>Note:</b> The session object inherits the progress callback,
+     * configuration directory and authentication info.
+     *
+     * @param url The initial session root URL.
+     * @param reposUUID The expected repository UUID; may not be null..
+     * @throws IllegalArgumentException If <code>reposUUID</code> is null.
+     * @throws RetryOpenSession If the session URL was redirected
+     * @throws SubversionException If an URL redirect cycle was detected
+     * @throws ClientException
+     */
+    public ISVNRemote openRemoteSession(String url, String reposUUID)
+            throws ClientException, SubversionException
+    {
+        if (reposUUID == null)
+            throw new IllegalArgumentException("reposUUID may not be null");
+        return open(1, url, reposUUID, configDirectory,
+                    username, password, prompt, deprecatedPrompt, progress,
+                    configHandler, tunnelAgent);
+    }
+
+    /**
+     * Open a persistent session to a repository.
+     * <p>
+     * <b>Note:</b> The URL can point to a subtree of the repository.
+     * <p>
+     * <b>Note:</b> If the UUID does not match the repository,
+     * this function fails.
+     * <p>
+     * <b>Note:</b> The session object inherits the progress callback,
+     * configuration directory and authentication info.
+     *
+     * @param url The initial session root URL.
+     * @param reposUUID The expected repository UUID; may not be null..
+     * @param retryAttempts The number of times to retry the operation
+     *        if the given URL is redirected.
+     * @throws IllegalArgumentException If <code>reposUUID</code> is null
+     *         or <code>retryAttempts</code> is not positive
+     * @throws RetryOpenSession If the session URL was redirected
+     * @throws SubversionException If an URL redirect cycle was detected
+     * @throws ClientException
+     */
+    public ISVNRemote openRemoteSession(String url, String reposUUID,
+                                        int retryAttempts)
+            throws ClientException, SubversionException
+    {
+        if (reposUUID == null)
+            throw new IllegalArgumentException("reposUUID may not be null");
+        if (retryAttempts <= 0)
+            throw new IllegalArgumentException(
+                "retryAttempts must be positive");
+        return open(retryAttempts, url, reposUUID, configDirectory,
+                    username, password, prompt, deprecatedPrompt, progress,
+                    configHandler, tunnelAgent);
+    }
+
+    private String configDirectory;
+    private String username;
+    private String password;
+    private AuthnCallback prompt;
+    @SuppressWarnings("deprecation")
+    private UserPasswordCallback deprecatedPrompt;
+    private ProgressCallback progress;
+    private ConfigEvent configHandler;
+    private TunnelAgent tunnelAgent;
+
+    /* Native factory implementation. */
+    @SuppressWarnings("deprecation")
+    private static native ISVNRemote open(int retryAttempts,
+                                          String url, String reposUUID,
+                                          String configDirectory,
+                                          String username, String password,
+                                          AuthnCallback prompt,
+                                          UserPasswordCallback deprecatedPompt,
+                                          ProgressCallback progress,
+                                          ConfigEvent configHandler,
+                                          TunnelAgent tunnelAgent)
+            throws ClientException, SubversionException;
+}
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/RemoteSession.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/RemoteSession.java
new file mode 100644
index 0000000..f921e79
--- /dev/null
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/RemoteSession.java
@@ -0,0 +1,427 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+package org.apache.subversion.javahl.remote;
+
+import org.apache.subversion.javahl.types.*;
+import org.apache.subversion.javahl.callback.*;
+
+import org.apache.subversion.javahl.ISVNRemote;
+import org.apache.subversion.javahl.ISVNEditor;
+import org.apache.subversion.javahl.ISVNReporter;
+import org.apache.subversion.javahl.JNIObject;
+import org.apache.subversion.javahl.OperationContext;
+import org.apache.subversion.javahl.ClientException;
+import org.apache.subversion.javahl.NativeResources;
+
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.io.OutputStream;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.MICROSECONDS;
+
+public class RemoteSession extends JNIObject implements ISVNRemote
+{
+    /**
+     * Load the required native library.
+     */
+    static
+    {
+        NativeResources.loadNativeLibrary();
+    }
+
+    public void dispose()
+    {
+        if (editorReference != null)
+        {
+            // Deactivate the open editor
+            ISVNEditor ed = editorReference.get();
+            if (ed != null)
+            {
+                ed.dispose();
+                editorReference.clear();
+            }
+            editorReference = null;
+        }
+        if (reporterReference != null)
+        {
+            // Deactivate the open reporter
+            ISVNReporter rp = reporterReference.get();
+            if (rp != null)
+            {
+                rp.dispose();
+                reporterReference.clear();
+            }
+            reporterReference = null;
+        }
+        nativeDispose();
+    }
+
+    public native void cancelOperation() throws ClientException;
+
+    public native void reparent(String url) throws ClientException;
+
+    public native String getSessionUrl() throws ClientException;
+
+    public native String getSessionRelativePath(String url)
+            throws ClientException;
+
+    public native String getReposRelativePath(String url)
+            throws ClientException;
+
+    public native String getReposUUID() throws ClientException;
+
+    public native String getReposRootUrl() throws ClientException;
+
+    public native long getLatestRevision() throws ClientException;
+
+    public long getRevisionByDate(Date date) throws ClientException
+    {
+        long timestamp = MICROSECONDS.convert(date.getTime(), MILLISECONDS);
+        return getRevisionByTimestamp(timestamp);
+    }
+
+    public native long getRevisionByTimestamp(long timestamp)
+            throws ClientException;
+
+    public void changeRevisionProperty(long revision,
+                                       String propertyName,
+                                       byte[] oldValue,
+                                       byte[] newValue)
+            throws ClientException
+    {
+        if (oldValue != null && !hasCapability(Capability.atomic_revprops))
+            throw new IllegalArgumentException(
+                "oldValue must be null;\n" +
+                "The server does not support" +
+                " atomic revision property changes");
+        nativeChangeRevisionProperty(revision, propertyName,
+                                     oldValue, newValue);
+    }
+
+    public native Map<String, byte[]> getRevisionProperties(long revision)
+            throws ClientException;
+
+    public native byte[] getRevisionProperty(long revision, String propertyName)
+            throws ClientException;
+
+    public ISVNEditor getCommitEditor(Map<String, byte[]> revisionProperties,
+                                      CommitCallback commitCallback,
+                                      Set<Lock> lockTokens, boolean keepLocks,
+                                      ISVNEditor.ProvideBaseCallback getBase,
+                                      ISVNEditor.ProvidePropsCallback getProps,
+                                      ISVNEditor.GetNodeKindCallback getCopyfromKind)
+            throws ClientException
+    {
+        check_inactive(editorReference, reporterReference);
+        ISVNEditor ed =
+            CommitEditor.createInstance(this, revisionProperties,
+                                        commitCallback, lockTokens, keepLocks,
+                                        getBase, getProps, getCopyfromKind);
+        if (editorReference != null)
+            editorReference.clear();
+        editorReference = new WeakReference<ISVNEditor>(ed);
+        return ed;
+    }
+
+    public ISVNEditor getCommitEditor(Map<String, byte[]> revisionProperties,
+                                      CommitCallback commitCallback,
+                                      Set<Lock> lockTokens, boolean keepLocks)
+            throws ClientException
+    {
+        return getCommitEditor(revisionProperties, commitCallback,
+                               lockTokens, keepLocks, null, null, null);
+    }
+
+    public long getFile(long revision, String path,
+                        OutputStream contents,
+                        Map<String, byte[]> properties)
+            throws ClientException
+    {
+        maybe_clear(properties);
+        return nativeGetFile(revision, path, contents, properties);
+    }
+
+    public long getDirectory(long revision, String path,
+                             int direntFields,
+                             Map<String, DirEntry> dirents,
+                             Map<String, byte[]> properties)
+            throws ClientException
+    {
+        maybe_clear(dirents);
+        maybe_clear(properties);
+        return nativeGetDirectory(revision, path,
+                                  direntFields, dirents, properties);
+    }
+
+    public native Map<String, Mergeinfo>
+        getMergeinfo(Iterable<String> paths, long revision,
+                     Mergeinfo.Inheritance inherit,
+                     boolean includeDescendants)
+            throws ClientException;
+
+    // TODO: update
+    // TODO: switch
+
+    public ISVNReporter status(String statusTarget,
+                               long revision, Depth depth,
+                               RemoteStatus receiver)
+            throws ClientException
+    {
+        check_inactive(editorReference, reporterReference);
+        StateReporter rp = StateReporter.createInstance(this);
+
+        // At this point, the reporter is not active/valid.
+        StatusEditor editor = new StatusEditor(receiver);
+        nativeStatus(statusTarget, revision, depth, editor, rp);
+        // Now it should be valid.
+
+        if (reporterReference != null)
+            reporterReference.clear();
+        reporterReference = new WeakReference<ISVNReporter>(rp);
+        return rp;
+    }
+
+    // TODO: diff
+
+    public native void getLog(Iterable<String> paths,
+                              long startRevision, long endRevision, int limit,
+                              boolean strictNodeHistory, boolean discoverPath,
+                              boolean includeMergedRevisions,
+                              Iterable<String> revisionProperties,
+                              LogMessageCallback callback)
+            throws ClientException;
+
+    public native NodeKind checkPath(String path, long revision)
+            throws ClientException;
+
+    public native DirEntry stat(String path, long revision)
+            throws ClientException;
+
+    public native Map<Long, String>
+        getLocations(String path, long pegRevision,
+                     Iterable<Long> locationRevisions)
+            throws ClientException;
+
+    public native
+        void getLocationSegments(String path,
+                                 long pegRevision,
+                                 long startRevision,
+                                 long endRevision,
+                                 RemoteLocationSegmentsCallback handler)
+            throws ClientException;
+
+    private static class GetLocationSegmentsHandler
+        implements RemoteLocationSegmentsCallback
+    {
+        public List<LocationSegment> locationSegments = null;
+        public void doSegment(LocationSegment locationSegment)
+        {
+            if (locationSegments == null)
+                locationSegments = new ArrayList<LocationSegment>();
+            locationSegments.add(locationSegment);
+        }
+    }
+
+    public List<LocationSegment> getLocationSegments(String path,
+                                                     long pegRevision,
+                                                     long startRevision,
+                                                     long endRevision)
+            throws ClientException
+    {
+        final GetLocationSegmentsHandler handler = new GetLocationSegmentsHandler();
+        getLocationSegments(path, pegRevision, startRevision, endRevision, handler);
+        return handler.locationSegments;
+    }
+
+    public native
+        void getFileRevisions(String path,
+                              long startRevision,
+                              long endRevision,
+                              boolean includeMergedRevisions,
+                              RemoteFileRevisionsCallback handler)
+            throws ClientException;
+
+    private static class GetFileRevisionsHandler
+        implements RemoteFileRevisionsCallback
+    {
+        public List<FileRevision> fileRevisions = null;
+        public void doRevision(FileRevision fileRevision)
+        {
+            if (fileRevisions == null)
+                fileRevisions = new ArrayList<FileRevision>();
+            fileRevisions.add(fileRevision);
+        }
+    }
+
+    public List<FileRevision> getFileRevisions(String path,
+                                               long startRevision,
+                                               long endRevision,
+                                               boolean includeMergedRevisions)
+            throws ClientException
+    {
+        final GetFileRevisionsHandler handler = new GetFileRevisionsHandler();
+        getFileRevisions(path, startRevision, endRevision,
+                         includeMergedRevisions, handler);
+        return handler.fileRevisions;
+    }
+
+    // TODO: lock
+    // TODO: unlock
+    // TODO: getLock
+
+    public native Map<String, Lock> getLocks(String path, Depth depth)
+            throws ClientException;
+
+    // TODO: replayRange
+    // TODO: replay
+    // TODO: getDeletedRevision
+    // TODO: getInheritedProperties
+
+    public boolean hasCapability(Capability capability)
+            throws ClientException
+    {
+        return nativeHasCapability(capability.toString());
+    }
+
+    @Override
+    public native void finalize() throws Throwable;
+
+    /**
+     * This constructor is called from JNI to get an instance.
+     */
+    protected RemoteSession(long cppAddr)
+    {
+        super(cppAddr);
+    }
+
+    /*
+     * Wrapped private native implementation declarations.
+     */
+    private native void nativeDispose();
+    private native void nativeChangeRevisionProperty(long revision,
+                                                     String propertyName,
+                                                     byte[] oldValue,
+                                                     byte[] newValue)
+            throws ClientException;
+    private native long nativeGetFile(long revision, String path,
+                                      OutputStream contents,
+                                      Map<String, byte[]> properties)
+            throws ClientException;
+    private native long nativeGetDirectory(long revision, String path,
+                                           int direntFields,
+                                           Map<String, DirEntry> dirents,
+                                           Map<String, byte[]> properties)
+            throws ClientException;
+    private native void nativeStatus(String statusTarget,
+                                     long revision, Depth depth,
+                                     ISVNEditor statusEditor,
+                                     ISVNReporter reporter)
+            throws ClientException;
+    private native boolean nativeHasCapability(String capability)
+            throws ClientException;
+
+    /*
+     * NOTE: This field is accessed from native code for callbacks.
+     */
+    private RemoteSessionContext sessionContext = new RemoteSessionContext();
+    private class RemoteSessionContext extends OperationContext {}
+
+    /*
+     * A reference to the current active editor. We need this in order
+     * to dispose/abort the editor when the session is disposed. And
+     * furthermore, there can be only one editor or reporter active at
+     * any time.
+     */
+    private WeakReference<ISVNEditor> editorReference;
+
+    /*
+     * The commit editor calls this when disposed to clear the
+     * reference. Note that this function will be called during our
+     * dispose, so make sure they don't step on each others' toes.
+     */
+    void disposeEditor(ISVNEditor editor)
+    {
+        if (editorReference == null)
+            return;
+        ISVNEditor ed = editorReference.get();
+        if (ed == null)
+            return;
+        if (ed != editor)
+            throw new IllegalStateException("Disposing unknown editor");
+        editorReference.clear();
+    }
+
+    /*
+     * A reference to the current active reporter. We need this in
+     * order to dispose/abort the report when the session is
+     * disposed. And furthermore, there can be only one reporter or
+     * editor active at any time.
+     */
+    private WeakReference<ISVNReporter> reporterReference;
+
+    /*
+     * The update reporter calls this when disposed to clear the
+     * reference. Note that this function will be called during our
+     * dispose, so make sure they don't step on each others' toes.
+     */
+    void disposeReporter(ISVNReporter reporter)
+    {
+        if (reporterReference == null)
+            return;
+        ISVNReporter rp = reporterReference.get();
+        if (rp == null)
+            return;
+        if (rp != reporter)
+            throw new IllegalStateException("Disposing unknown reporter");
+        reporterReference.clear();
+    }
+
+    /*
+     * Private helper methods.
+     */
+    private final static<K,V> void maybe_clear(Map<K,V> clearable)
+    {
+        if (clearable != null && !clearable.isEmpty())
+            try {
+                clearable.clear();
+            } catch (UnsupportedOperationException ex) {
+                // ignored
+            }
+    }
+
+    private final static
+        void check_inactive(WeakReference<ISVNEditor> editorReference,
+                            WeakReference<ISVNReporter> reporterReference)
+    {
+        if (editorReference != null && editorReference.get() != null)
+            throw new IllegalStateException("An editor is already active");
+        if (reporterReference != null && reporterReference.get() != null)
+            throw new IllegalStateException("A reporter is already active");
+    }
+}
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/RetryOpenSession.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/RetryOpenSession.java
new file mode 100644
index 0000000..cc23256
--- /dev/null
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/RetryOpenSession.java
@@ -0,0 +1,57 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+package org.apache.subversion.javahl.remote;
+
+import org.apache.subversion.javahl.SubversionException;
+
+/**
+ * This checked exception is thrown only from ISVNClient.openRemoteSession
+ * or RemoteFactory.openRemoteSession if a session could not be opened
+ * due to a redirect.
+ */
+public class RetryOpenSession extends SubversionException
+{
+    // Update the serialVersionUID when there is a incompatible change
+    // made to this class.
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This constructor is only called from native code.
+     */
+    protected RetryOpenSession(String message, String correctedUrl)
+    {
+        super(message);
+        this.correctedUrl = correctedUrl;
+    }
+
+    /**
+     * @return the corrected URL for the session.
+     */
+    public String getCorrectedUrl()
+    {
+        return correctedUrl;
+    }
+
+    private final String correctedUrl;
+}
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/StateReporter.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/StateReporter.java
new file mode 100644
index 0000000..e83e4fa
--- /dev/null
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/StateReporter.java
@@ -0,0 +1,107 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+package org.apache.subversion.javahl.remote;
+
+import org.apache.subversion.javahl.types.*;
+import org.apache.subversion.javahl.callback.*;
+
+import org.apache.subversion.javahl.JNIObject;
+import org.apache.subversion.javahl.ISVNReporter;
+import org.apache.subversion.javahl.ClientException;
+import org.apache.subversion.javahl.NativeResources;
+
+/**
+ * Implementation of ISVNReporter.
+ * @since 1.9
+ */
+public class StateReporter extends JNIObject implements ISVNReporter
+{
+    /**
+     * Load the required native library.
+     */
+    static
+    {
+        NativeResources.loadNativeLibrary();
+    }
+
+    public void dispose()
+    {
+        session.disposeReporter(this);
+        nativeDispose();
+    }
+
+    public native void setPath(String path,
+                               long revision,
+                               Depth depth,
+                               boolean startEmpty,
+                               String lockToken)
+        throws ClientException;
+
+    public native void deletePath(String path) throws ClientException;
+
+    public native void linkPath(String url,
+                                String path,
+                                long revision,
+                                Depth depth,
+                                boolean startEmpty,
+                                String lockToken)
+        throws ClientException;
+
+    public native long finishReport() throws ClientException;
+
+    public native void abortReport() throws ClientException;
+
+    /**
+     * This factory method called from RemoteSession.status and friends.
+     */
+    static final
+        StateReporter createInstance(RemoteSession session)
+            throws ClientException
+    {
+        long cppAddr = nativeCreateInstance();
+        return new StateReporter(cppAddr, session);
+    }
+
+    @Override
+    public native void finalize() throws Throwable;
+
+    /*
+     * Wrapped private native implementation declarations.
+     */
+    private native void nativeDispose();
+    private static final native long nativeCreateInstance()
+        throws ClientException;
+
+    /**
+     * This constructor is called from the factory method.
+     */
+    protected StateReporter(long cppAddr, RemoteSession session)
+    {
+        super(cppAddr);
+        this.session = session;
+    }
+
+    /** Stores a reference to the session that created this reporter. */
+    protected RemoteSession session;
+}
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/StatusEditor.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/StatusEditor.java
new file mode 100644
index 0000000..00632f0
--- /dev/null
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/StatusEditor.java
@@ -0,0 +1,265 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+package org.apache.subversion.javahl.remote;
+
+import org.apache.subversion.javahl.types.*;
+import org.apache.subversion.javahl.callback.*;
+
+import org.apache.subversion.javahl.ISVNEditor;
+
+import java.util.Map;
+import java.util.GregorianCalendar;
+import java.util.Locale;
+import java.util.SimpleTimeZone;
+import java.io.InputStream;
+import java.io.IOException;
+import java.nio.charset.Charset;
+
+/**
+ * Package-private editor implementation that converts an editor drive
+ * to {@link RemoteStatus} callbacks.
+ * @since 1.9
+ */
+class StatusEditor implements ISVNEditor
+{
+    StatusEditor(RemoteStatus receiver)
+    {
+        this.receiver = receiver;
+    }
+    protected RemoteStatus receiver = null;
+
+    protected void checkState()
+    {
+        if (receiver == null)
+            throw new IllegalStateException("Status editor is not active");
+    }
+
+    public void dispose()
+    {
+        //DEBUG:System.err.println("  [J] StatusEditor.dispose");
+        if (this.receiver != null)
+            abort();
+    }
+
+    public void addDirectory(String relativePath,
+                             Iterable<String> children,
+                             Map<String, byte[]> properties,
+                             long replacesRevision)
+    {
+        //DEBUG:System.err.println("  [J] StatusEditor.addDirectory");
+        checkState();
+        receiver.addedDirectory(relativePath);
+    }
+
+    public void addFile(String relativePath,
+                        Checksum checksum,
+                        InputStream contents,
+                        Map<String, byte[]> properties,
+                        long replacesRevision)
+    {
+        //DEBUG:System.err.println("  [J] StatusEditor.addFile");
+        if (contents != null) {
+            try {
+                contents.close();
+            } catch (IOException ex) {
+                throw new RuntimeException(ex);
+            }
+        }
+
+        checkState();
+        receiver.addedFile(relativePath);
+    }
+
+    public void addSymlink(String relativePath,
+                           String target,
+                           Map<String, byte[]> properties,
+                           long replacesRevision)
+    {
+        //DEBUG:System.err.println("  [J] StatusEditor.addSymlink");
+        checkState();
+        receiver.addedSymlink(relativePath);
+    }
+
+    public void addAbsent(String relativePath,
+                          NodeKind kind,
+                          long replacesRevision)
+    {
+        //DEBUG:System.err.println("  [J] StatusEditor.addAbsent");
+        checkState();
+        // ignore this callback, as svn status -u does
+    }
+
+    public void alterDirectory(String relativePath,
+                               long revision,
+                               Iterable<String> children,
+                               Map<String, byte[]> properties)
+    {
+        //DEBUG:System.err.println("  [J] StatusEditor.alterDirectory");
+        checkState();
+        receiver.modifiedDirectory(relativePath, (children != null),
+                                   props_changed(properties),
+                                   make_entry(properties));
+    }
+
+    public void alterFile(String relativePath,
+                          long revision,
+                          Checksum checksum,
+                          InputStream contents,
+                          Map<String, byte[]> properties)
+    {
+        //DEBUG:System.err.println("  [J] StatusEditor.alterFile");
+        if (contents != null) {
+            try {
+                contents.close();
+            } catch (IOException ex) {
+                throw new RuntimeException(ex);
+            }
+        }
+
+        checkState();
+        receiver.modifiedFile(relativePath,
+                              (checksum != null && contents != null),
+                              props_changed(properties),
+                              make_entry(properties));
+    }
+
+    public void alterSymlink(String relativePath,
+                             long revision,
+                             String target,
+                             Map<String, byte[]> properties)
+    {
+        //DEBUG:System.err.println("  [J] StatusEditor.alterSymlink");
+        checkState();
+        receiver.modifiedSymlink(relativePath, (target != null),
+                                 props_changed(properties),
+                                 make_entry(properties));
+    }
+
+    public void delete(String relativePath, long revision)
+    {
+        //DEBUG:System.err.println("  [J] StatusEditor.delete");
+        checkState();
+        receiver.deleted(relativePath);
+    }
+
+    public void copy(String sourceRelativePath,
+                     long sourceRevision,
+                     String destinationRelativePath,
+                     long replacesRevision)
+    {
+        //DEBUG:System.err.println("  [J] StatusEditor.copy");
+        checkState();
+        throw new RuntimeException("Not implemented: StatusEditor.copy");
+    }
+
+    public void move(String sourceRelativePath,
+                     long sourceRevision,
+                     String destinationRelativePath,
+                     long replacesRevision)
+    {
+        //DEBUG:System.err.println("  [J] StatusEditor.move");
+        checkState();
+        throw new RuntimeException("Not implemented: StatusEditor.move");
+    }
+
+    public void complete()
+    {
+        //DEBUG:System.err.println("  [J] StatusEditor.complete");
+        abort();
+    }
+
+    public void abort()
+    {
+        //DEBUG:System.err.println("  [J] StatusEditor.abort");
+        checkState();
+        receiver = null;
+    }
+
+    /*
+     * Construct a RemoteStatus.Entry record from the given properties.
+     */
+    private static final Charset UTF8 = Charset.forName("UTF-8");
+    private static final SimpleTimeZone UTC =
+        new SimpleTimeZone(SimpleTimeZone.UTC_TIME, "UTC");
+    private static final String entryprop_uuid = "svn:entry:uuid";
+    private static final String entryprop_author = "svn:entry:last-author";
+    private static final String entryprop_revision = "svn:entry:committed-rev";
+    private static final String entryprop_timestamp = "svn:entry:committed-date";
+    private final GregorianCalendar entry_calendar =
+        new GregorianCalendar(UTC, Locale.ROOT);
+
+    // FIXME: Room for improvement here. There are likely to be a lot
+    // of duplicate entries and we should be able to avoid parsing the
+    // duplicates all over again. Need a map <raw data> -> Entry to
+    // just look up the entries instead of parsing them.
+    private final RemoteStatus.Entry make_entry(Map<String, byte[]> properties)
+    {
+        final byte[] raw_uuid = properties.get(entryprop_uuid);
+        final byte[] raw_author = properties.get(entryprop_author);
+        final byte[] raw_revision = properties.get(entryprop_revision);
+        final byte[] raw_timestamp = properties.get(entryprop_timestamp);
+
+        long parsed_timestamp = -1;
+        if (raw_timestamp != null)
+        {
+            // Parse: 2013-07-04T23:17:59.128366Z
+            final String isodate = new String(raw_timestamp, UTF8);
+
+            final int year = Integer.valueOf(isodate.substring(0,4), 10);
+            final int month = Integer.valueOf(isodate.substring(5,7), 10);
+            final int day = Integer.valueOf(isodate.substring(8,10), 10);
+            final int hour = Integer.valueOf(isodate.substring(11,13), 10);
+            final int minute = Integer.valueOf(isodate.substring(14,16), 10);
+            final int second = Integer.valueOf(isodate.substring(17,19), 10);
+            final int micro = Integer.valueOf(isodate.substring(20,26), 10);
+            entry_calendar.set(year, month, day, hour, minute, second);
+
+             // Use integer rounding to add milliseconds
+            parsed_timestamp =
+                (1000 * entry_calendar.getTimeInMillis() + micro + 500) / 1000;
+        }
+
+        return new RemoteStatus.Entry(
+            (raw_uuid == null ? null : new String(raw_uuid, UTF8)),
+            (raw_author == null ? null : new String(raw_author, UTF8)),
+            (raw_revision == null ? Revision.SVN_INVALID_REVNUM
+             : Long.valueOf(new String(raw_revision, UTF8), 10)),
+            parsed_timestamp);
+    }
+
+    /*
+     * Filter entry props from the incoming properties
+     */
+    private static final String wcprop_prefix = "svn:wc:";
+    private static final String entryprop_prefix = "svn:entry:";
+    private static final boolean props_changed(Map<String, byte[]> properties)
+    {
+        if (properties != null)
+            for (String name : properties.keySet())
+                if (!name.startsWith(wcprop_prefix)
+                    && !name.startsWith(entryprop_prefix))
+                    return true;
+        return false;
+    }
+}
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/ChangePath.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/ChangePath.java
index 50374d4..6047e1e 100644
--- a/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/ChangePath.java
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/ChangePath.java
@@ -25,13 +25,9 @@ package org.apache.subversion.javahl.types;
 
 public class ChangePath implements java.io.Serializable
 {
-    // Update the serialVersionUID when there is a incompatible change
-    // made to this class.  See any of the following, depending upon
-    // the Java release.
-    // http://java.sun.com/j2se/1.3/docs/guide/serialization/spec/version.doc7.html
-    // http://java.sun.com/j2se/1.4/pdf/serial-spec.pdf
-    // http://java.sun.com/j2se/1.5.0/docs/guide/serialization/spec/version.html#6678
-    // http://java.sun.com/javase/6/docs/platform/serialization/spec/version.html#6678
+    // Update the serialVersionUID when there is a incompatible change made to
+    // this class.  See the java documentation for when a change is incompatible.
+    // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
     private static final long serialVersionUID = 2L;
 
     /**
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Checksum.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Checksum.java
index 512cbf7..7aeb10a 100644
--- a/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Checksum.java
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Checksum.java
@@ -25,13 +25,9 @@ package org.apache.subversion.javahl.types;
 
 public class Checksum implements java.io.Serializable
 {
-    // Update the serialVersionUID when there is a incompatible change
-    // made to this class.  See any of the following, depending upon
-    // the Java release.
-    // http://java.sun.com/j2se/1.3/docs/guide/serialization/spec/version.doc7.html
-    // http://java.sun.com/j2se/1.4/pdf/serial-spec.pdf
-    // http://java.sun.com/j2se/1.5.0/docs/guide/serialization/spec/version.html#6678
-    // http://java.sun.com/javase/6/docs/platform/serialization/spec/version.html#6678
+    // Update the serialVersionUID when there is a incompatible change made to
+    // this class.  See the java documentation for when a change is incompatible.
+    // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
     private static final long serialVersionUID = 1L;
 
     /**
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/CopySource.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/CopySource.java
index fc46ab8..6f3658f 100644
--- a/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/CopySource.java
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/CopySource.java
@@ -29,13 +29,9 @@ package org.apache.subversion.javahl.types;
  */
 public class CopySource implements java.io.Serializable
 {
-    // Update the serialVersionUID when there is a incompatible change
-    // made to this class.  See any of the following, depending upon
-    // the Java release.
-    // http://java.sun.com/j2se/1.3/docs/guide/serialization/spec/version.doc7.html
-    // http://java.sun.com/j2se/1.4/pdf/serial-spec.pdf
-    // http://java.sun.com/j2se/1.5.0/docs/guide/serialization/spec/version.html#6678
-    // http://java.sun.com/javase/6/docs/platform/serialization/spec/version.html#6678
+    // Update the serialVersionUID when there is a incompatible change made to
+    // this class.  See the java documentation for when a change is incompatible.
+    // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
     private static final long serialVersionUID = 1L;
 
     /**
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/DirEntry.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/DirEntry.java
index c006ab7..1debc29 100644
--- a/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/DirEntry.java
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/DirEntry.java
@@ -32,13 +32,9 @@ import org.apache.subversion.javahl.ISVNClient;
  */
 public class DirEntry implements java.io.Serializable
 {
-    // Update the serialVersionUID when there is a incompatible change
-    // made to this class.  See any of the following, depending upon
-    // the Java release.
-    // http://java.sun.com/j2se/1.3/docs/guide/serialization/spec/version.doc7.html
-    // http://java.sun.com/j2se/1.4/pdf/serial-spec.pdf
-    // http://java.sun.com/j2se/1.5.0/docs/guide/serialization/spec/version.html#6678
-    // http://java.sun.com/javase/6/docs/platform/serialization/spec/version.html#6678
+    // Update the serialVersionUID when there is a incompatible change made to
+    // this class.  See the java documentation for when a change is incompatible.
+    // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
     private static final long serialVersionUID = 1L;
 
     /**
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/ExternalItem.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/ExternalItem.java
new file mode 100644
index 0000000..eed7db2
--- /dev/null
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/ExternalItem.java
@@ -0,0 +1,174 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+package org.apache.subversion.javahl.types;
+
+import org.apache.subversion.javahl.SubversionException;
+
+/**
+ * Describes one external item declaration
+ * @since 1.9
+ */
+public class ExternalItem implements java.io.Serializable
+{
+    // Update the serialVersionUID when there is a incompatible change made to
+    // this class.  See the java documentation for when a change is incompatible.
+    // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Create a new external item declaration.
+     * <p>
+     * <b>Note:</b> If both <code>revision</code> and
+     * <code>pegRevision</code> are <code>null</code>, they will be
+     * interpreted as {@link Revision#HEAD}. If only one of them is
+     * <code>null</code>, it will get the same value as the other
+     * revision.
+     *
+     * @param targetDir See {@link #getTargetDir}
+     * @param url See {@link #getUrl}
+     * @param revision See {@link #getRevision};
+     *     <code>null</code> will be interpreted as <code>pegRevision</code>
+     * @param pegRevision See {@link #getPegRevision};
+     *     <code>null</code> will be interpreted as {@link Revision#HEAD}
+     */
+    public ExternalItem(String targetDir, String url,
+                        Revision revision, Revision pegRevision)
+        throws SubversionException
+    {
+        this(false, targetDir, url, revision, pegRevision);
+        validateRevision(revision, "revision");
+        validateRevision(pegRevision, "pegRevision");
+    }
+
+    /* This constructor is called directly by the native implementation */
+    private ExternalItem(boolean dummy_parameter_to_discriminate_constructors,
+                         String targetDir, String url,
+                         Revision revision, Revision pegRevision)
+    {
+        this.targetDir = targetDir;
+        this.url = url;
+        this.pegRevision = (pegRevision != null ? pegRevision : Revision.HEAD);
+        this.revision = (revision != null ? revision : this.pegRevision);
+    }
+
+    /**
+     * The name of the subdirectory into which this external should be
+     * checked out.  This is relative to the parent directory that
+     * holds this external item.
+     */
+    public String getTargetDir()
+    {
+        return targetDir;
+    }
+
+    /**
+     * Where to check out from. This is possibly a relative external
+     * URL, as allowed in externals definitions, but without the peg
+     * revision.
+     */
+    public String getUrl()
+    {
+        return url;
+    }
+
+    /**
+     * What revision to check out. The only valid kinds for this are a
+     * numered revision {@link Revision.Number}, a date
+     * {@link Revision.DateSpec}, or {@link Revision#HEAD}.
+     */
+    public Revision getRevision()
+    {
+        return revision;
+    }
+
+    /**
+     * The peg revision to use when checking out. The only valid kinds
+     * for this are a numered revision {@link Revision.Number}, a date
+     * {@link Revision.DateSpec}, or {@link Revision#HEAD}.
+     */
+    public Revision getPegRevision()
+    {
+        return pegRevision;
+    }
+
+    /**
+     * Compare to another external item.
+     */
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (!(obj instanceof ExternalItem))
+            return false;
+
+        final ExternalItem that = (ExternalItem)obj;
+        return (this.targetDir.equals(that.targetDir)
+                && this.url.equals(that.url)
+                && this.revision.equals(that.revision)
+                && this.pegRevision.equals(that.pegRevision));
+    }
+
+    /**
+     * Return a hash code for this object.
+     */
+    public int hashCode()
+    {
+        int hash = 17;
+        hash = hash * 33 + (null != targetDir ? targetDir.hashCode() : 0);
+        hash = hash * 33 + (null != url ? url.hashCode() : 0);
+        hash = hash * 33 + (null != revision ? revision.hashCode() : 0);
+        hash = hash * 33 + (null != pegRevision ? pegRevision.hashCode() : 0);
+        return hash;
+    }
+
+    /* Exception class for failed revision kind validation. */
+    private static class BadRevisionKindException extends SubversionException
+    {
+        // Update the serialVersionUID when there is a incompatible change made to
+        // this class.  See the java documentation for when a change is incompatible.
+        // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
+        private static final long serialVersionUID = 1L;
+
+        public BadRevisionKindException(String param)
+        {
+            super("the '" + param + "' constructor argument" +
+                  " must be a date, a number, or Revision.HEAD");
+        }
+    }
+
+    /* Validates the revision and pegRevision parameters of the ctor. */
+    private static void validateRevision(Revision revision, String param)
+        throws SubversionException
+    {
+        if (revision != null
+            && revision.getKind() != Revision.Kind.number
+            && revision.getKind() != Revision.Kind.date
+            && revision.getKind() != Revision.Kind.head)
+            throw new BadRevisionKindException(param);
+    }
+
+    private String targetDir;
+    private String url;
+    private Revision revision;
+    private Revision pegRevision;
+}
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Info.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Info.java
index f2e5893..c1752ea 100644
--- a/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Info.java
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Info.java
@@ -35,13 +35,9 @@ import org.apache.subversion.javahl.ISVNClient;
  */
 public class Info implements java.io.Serializable
 {
-    // Update the serialVersionUID when there is a incompatible change
-    // made to this class.  See any of the following, depending upon
-    // the Java release.
-    // http://java.sun.com/j2se/1.3/docs/guide/serialization/spec/version.doc7.html
-    // http://java.sun.com/j2se/1.4/pdf/serial-spec.pdf
-    // http://java.sun.com/j2se/1.5.0/docs/guide/serialization/spec/version.html#6678
-    // http://java.sun.com/javase/6/docs/platform/serialization/spec/version.html#6678
+    // Update the serialVersionUID when there is a incompatible change made to
+    // this class.  See the java documentation for when a change is incompatible.
+    // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
     private static final long serialVersionUID = 1L;
 
     /**
@@ -290,6 +286,16 @@ public class Info implements java.io.Serializable
     }
 
     /**
+     * Returns the last date the item was changed measured in the
+     * number of microseconds since 00:00:00 January 1, 1970 UTC.
+     * @return the last time the item was changed.
+     */
+    public long getLastChangedDateMicros()
+    {
+        return lastChangedDate;
+    }
+
+    /**
      * return the author of the last change
      */
     public String getLastChangedAuthor()
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Lock.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Lock.java
index 1040d51..0492556 100644
--- a/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Lock.java
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Lock.java
@@ -31,13 +31,9 @@ import java.util.Date;
  */
 public class Lock implements java.io.Serializable
 {
-    // Update the serialVersionUID when there is a incompatible change
-    // made to this class.  See any of the following, depending upon
-    // the Java release.
-    // http://java.sun.com/j2se/1.3/docs/guide/serialization/spec/version.doc7.html
-    // http://java.sun.com/j2se/1.4/pdf/serial-spec.pdf
-    // http://java.sun.com/j2se/1.5.0/docs/guide/serialization/spec/version.html#6678
-    // http://java.sun.com/javase/6/docs/platform/serialization/spec/version.html#6678
+    // Update the serialVersionUID when there is a incompatible change made to
+    // this class.  See the java documentation for when a change is incompatible.
+    // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
     private static final long serialVersionUID = 1L;
 
     /**
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Mergeinfo.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Mergeinfo.java
index 70af3d0..e2eb268 100644
--- a/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Mergeinfo.java
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Mergeinfo.java
@@ -37,13 +37,9 @@ import org.apache.subversion.javahl.SubversionException;
  */
 public class Mergeinfo implements java.io.Serializable
 {
-    // Update the serialVersionUID when there is a incompatible change
-    // made to this class.  See any of the following, depending upon
-    // the Java release.
-    // http://java.sun.com/j2se/1.3/docs/guide/serialization/spec/version.doc7.html
-    // http://java.sun.com/j2se/1.4/pdf/serial-spec.pdf
-    // http://java.sun.com/j2se/1.5.0/docs/guide/serialization/spec/version.html#6678
-    // http://java.sun.com/javase/6/docs/platform/serialization/spec/version.html#6678
+    // Update the serialVersionUID when there is a incompatible change made to
+    // this class.  See the java documentation for when a change is incompatible.
+    // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
     private static final long serialVersionUID = 1L;
 
     /**
@@ -69,6 +65,31 @@ public class Mergeinfo implements java.io.Serializable
     }
 
     /**
+     * The three ways to request mergeinfo affecting a given path
+     * in {@link org.apache.subversion.javahl.ISVNRemote#getMergeinfo}.
+     * @since 1.9
+     */
+    public static enum Inheritance
+    {
+        /** Explicit mergeinfo only. */
+        explicit,
+
+        /**
+         * Explicit mergeinfo, or if that doesn't exist, the inherited
+         * mergeinfo from a target's nearest (path-wise, not history-wise)
+         * ancestor.
+         */
+        inherited,
+
+        /**
+         * Mergeinfo inherited from a target's nearest (path-wise,
+         * not history-wise) ancestor, regardless of whether target
+         * has explicit mergeinfo.
+         */
+        nearest_ancestor;
+    }
+
+    /**
      * Add one or more RevisionRange objects to merge info. If the
      * merge source is already stored, the list of revisions is
      * replaced.
@@ -83,6 +104,11 @@ public class Mergeinfo implements java.io.Serializable
             addRevisionRange(mergeSrc, range);
     }
 
+    public void addRevisions(String mergeSrc, RevisionRangeList ranges)
+    {
+        addRevisions(mergeSrc, ranges.getRanges());
+    }
+
     /**
      * Add a revision range to the merged revisions for a path.  If
      * the merge source already has associated revision ranges, add
@@ -131,6 +157,14 @@ public class Mergeinfo implements java.io.Serializable
     }
 
     /**
+     * Like {@link #getReivsionRange}, but returns a {@link RevisionRangeList}.
+     */
+    public RevisionRangeList getRevisionRangeList(String mergeSrc)
+    {
+        return new RevisionRangeList(getRevisionRange(mergeSrc));
+    }
+
+    /**
      * Parse the <code>svn:mergeinfo</code> property to populate the
      * merge source URLs and revision ranges of this instance.
      * @param mergeinfo <code>svn:mergeinfo</code> property value.
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/NativeInputStream.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/NativeInputStream.java
new file mode 100644
index 0000000..b81cc0c
--- /dev/null
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/NativeInputStream.java
@@ -0,0 +1,108 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+package org.apache.subversion.javahl.types;
+
+import org.apache.subversion.javahl.NativeResources;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * Implementation class for {@link InputStream} objects returned from
+ * JavaHL methods.
+ *
+ * @since 1.9
+ */
+public class NativeInputStream extends InputStream
+{
+    /**
+     * Load the required native library.
+     */
+    static
+    {
+        NativeResources.loadNativeLibrary();
+    }
+
+    /**
+     * Flushes buffers, closes the underlying native stream, and
+     * releases the native object.
+     * @see InputStream.close()
+     */
+    @Override
+    public native void close() throws IOException;
+
+    /**
+     * @see InputStream.markSupported()
+     */
+    @Override
+    public native boolean markSupported();
+
+    /**
+     * @see InputStream.mark(int)
+     */
+    @Override
+    public native void mark(int readlimit);
+
+    /**
+     * @see InputStream.reset()
+     */
+    @Override
+    public native void reset() throws IOException;
+
+    /**
+     * Reads a single byte from the underyling native stream.
+     * @see InputStream.read()
+     */
+    @Override
+    public native int read() throws IOException;
+
+    /**
+     * Reads <code>len</code> bytes to offset <code>off</code> in
+     * <code>b</code> from the underyling native stream.
+     * @see InputStream.read(byte[],int,int)
+     */
+    @Override
+    public native int read(byte[] b, int off, int len) throws IOException;
+
+    /**
+     * @see InputStream.skip(long)
+     */
+    @Override
+    public native long skip(long count) throws IOException;
+
+
+    private long cppAddr;
+
+    private NativeInputStream(long cppAddr)
+    {
+        this.cppAddr = cppAddr;
+    }
+
+    private long getCppAddr()
+    {
+        return cppAddr;
+    }
+
+    public native void finalize();
+}
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/NativeOutputStream.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/NativeOutputStream.java
new file mode 100644
index 0000000..3dafaf6
--- /dev/null
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/NativeOutputStream.java
@@ -0,0 +1,84 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+package org.apache.subversion.javahl.types;
+
+import org.apache.subversion.javahl.NativeResources;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+/**
+ * Implementation class for {@link OutputStream} objects returned from
+ * JavaHL methods.
+ *
+ * @since 1.9
+ */
+public class NativeOutputStream extends OutputStream
+{
+    /**
+     * Load the required native library.
+     */
+    static
+    {
+        NativeResources.loadNativeLibrary();
+    }
+
+    /**
+     * Flushes buffers, closes the underlying native stream, and
+     * releases the native object.
+     * @see OutputStream.close()
+     */
+    @Override
+    public native void close() throws IOException;
+
+    /**
+     * Writes a single byte to the underyling native stream.
+     * @see OutputStream.write(int)
+     */
+    @Override
+    public native void write(int b) throws IOException;
+
+    /**
+     * Writes <code>len</code> bytes at offset <code>off</code> from
+     * <code>b</code> to the underyling native stream.
+     * @see OutputStream.write(byte[],int,int)
+     */
+    @Override
+    public native void write(byte[] b, int off, int len) throws IOException;
+
+
+    private long cppAddr;
+
+    private NativeOutputStream(long cppAddr)
+    {
+        this.cppAddr = cppAddr;
+    }
+
+    private long getCppAddr()
+    {
+        return cppAddr;
+    }
+
+    public native void finalize();
+}
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Property.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Property.java
index a3d63fa..a7ac7f5 100644
--- a/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Property.java
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Property.java
@@ -92,4 +92,14 @@ public class Property
      * flag property if a lock is needed to modify this node
      */
     public static final String NEEDS_LOCK = "svn:needs-lock";
+
+    /**
+     * server-side inherited configuration for auto-props
+     */
+    public static final String INHERITABLE_AUTO_PROPS = "svn:auto-props";
+
+    /**
+     * server-side inherited configuration for global ignore patterns
+     */
+    public static final String INHERITABLE_IGNORES = "svn:global-ignores";
 }
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Revision.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Revision.java
index b07e39e..675737d 100644
--- a/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Revision.java
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Revision.java
@@ -32,13 +32,9 @@ import java.util.Locale;
  */
 public class Revision implements java.io.Serializable
 {
-    // Update the serialVersionUID when there is a incompatible change
-    // made to this class.  See any of the following, depending upon
-    // the Java release.
-    // http://java.sun.com/j2se/1.3/docs/guide/serialization/spec/version.doc7.html
-    // http://java.sun.com/j2se/1.4/pdf/serial-spec.pdf
-    // http://java.sun.com/j2se/1.5.0/docs/guide/serialization/spec/version.html#6678
-    // http://java.sun.com/javase/6/docs/platform/serialization/spec/version.html#6678
+    // Update the serialVersionUID when there is a incompatible change made to
+    // this class.  See the java documentation for when a change is incompatible.
+    // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
     private static final long serialVersionUID = 1L;
 
     /**
@@ -81,6 +77,7 @@ public class Revision implements java.io.Serializable
             case head : return "HEAD";
             case previous : return "PREV";
             case working : return "WORKING";
+            case unspecified: return "UNSPECIFIED";
         }
         return super.toString();
     }
@@ -155,6 +152,11 @@ public class Revision implements java.io.Serializable
     public static final Revision START = new Revision(Kind.unspecified);
 
     /**
+     * unspecified revision
+     */
+    public static final Revision UNSPECIFIED = START;
+
+    /**
      * last committed revision, needs working copy
      */
     public static final Revision COMMITTED = new Revision(Kind.committed);
@@ -271,6 +273,16 @@ public class Revision implements java.io.Serializable
                 throw new IllegalArgumentException("a date must be specified");
             revDate = date;
         }
+
+        /**
+         * Create a revision from a timestamp in milliseconds.
+         * Used by the native implementaiton.
+         */
+        private DateSpec(long milliseconds)
+        {
+            this(new Date(milliseconds));
+        }
+
         /**
          * Returns the date of the revision
          * @return the date
@@ -310,7 +322,6 @@ public class Revision implements java.io.Serializable
         {
             return revDate.hashCode();
         }
-
     }
 
     /**
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/RevisionRange.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/RevisionRange.java
index d906008..ae9ecd1 100644
--- a/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/RevisionRange.java
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/RevisionRange.java
@@ -29,32 +29,38 @@ package org.apache.subversion.javahl.types;
  */
 public class RevisionRange implements Comparable<RevisionRange>, java.io.Serializable
 {
-    // Update the serialVersionUID when there is a incompatible change
-    // made to this class.  See any of the following, depending upon
-    // the Java release.
-    // http://java.sun.com/j2se/1.3/docs/guide/serialization/spec/version.doc7.html
-    // http://java.sun.com/j2se/1.4/pdf/serial-spec.pdf
-    // http://java.sun.com/j2se/1.5.0/docs/guide/serialization/spec/version.html#6678
-    // http://java.sun.com/javase/6/docs/platform/serialization/spec/version.html#6678
-    private static final long serialVersionUID = 1L;
+    // Update the serialVersionUID when there is a incompatible change made to
+    // this class.  See the java documentation for when a change is incompatible.
+    // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
+    private static final long serialVersionUID = 2L;
 
     private Revision from;
     private Revision to;
+    private boolean inheritable;
 
     /**
      * Creates a new instance.  Called by native library.
      */
-    @SuppressWarnings("unused")
-    private RevisionRange(long from, long to)
+    protected RevisionRange(long from, long to, boolean inheritable)
     {
         this.from = Revision.getInstance(from);
         this.to = Revision.getInstance(to);
+        this.inheritable = inheritable;
+    }
+
+    /** @since 1.9 */
+    public RevisionRange(Revision from, Revision to, boolean inheritable)
+    {
+        this.from = from;
+        this.to = to;
+        this.inheritable = inheritable;
     }
 
     public RevisionRange(Revision from, Revision to)
     {
         this.from = from;
         this.to = to;
+        this.inheritable = true;
     }
 
     /**
@@ -70,6 +76,11 @@ public class RevisionRange implements Comparable<RevisionRange>, java.io.Seriali
             return;
         }
 
+        this.inheritable = !revisionElement.endsWith("*");
+        if (!this.inheritable)
+            revisionElement =
+                revisionElement.substring(0, revisionElement.length() - 1);
+
         int hyphen = revisionElement.indexOf('-');
         if (hyphen > 0)
         {
@@ -93,8 +104,10 @@ public class RevisionRange implements Comparable<RevisionRange>, java.io.Seriali
             try
             {
                 long revNum = Long.parseLong(revisionElement.trim());
-                this.from = new Revision.Number(revNum);
-                this.to = this.from;
+                if (revNum <= 0)
+                    return;
+                this.to = new Revision.Number(revNum);
+                this.from = new Revision.Number(revNum - 1);
             }
             catch (NumberFormatException e)
             {
@@ -113,14 +126,29 @@ public class RevisionRange implements Comparable<RevisionRange>, java.io.Seriali
         return to;
     }
 
+    public boolean isInheritable()
+    {
+        return inheritable;
+    }
+
     public String toString()
     {
         if (from != null && to != null)
         {
-            if (from.equals(to))
-                return from.toString();
+            String rep;
+
+            if (from.getKind() == Revision.Kind.number
+                && to.getKind() == Revision.Kind.number
+                && (((Revision.Number)from).getNumber() + 1
+                    == ((Revision.Number)to).getNumber()))
+                rep = to.toString();
+            else if (from.equals(to)) // Such ranges should never happen
+                rep = from.toString();
             else
-                return from.toString() + '-' + to.toString();
+                rep = from.toString() + '-' + to.toString();
+            if (!inheritable)
+                return rep + '*';
+            return rep;
         }
         return super.toString();
     }
@@ -138,7 +166,7 @@ public class RevisionRange implements Comparable<RevisionRange>, java.io.Seriali
     public int hashCode()
     {
         final int prime = 31;
-        int result = 1;
+        int result = (inheritable ? 1 : 2);
         result = prime * result + ((from == null) ? 0 : from.hashCode());
         result = prime * result + ((to == null) ? 0 : to.hashCode());
         return result;
@@ -178,10 +206,12 @@ public class RevisionRange implements Comparable<RevisionRange>, java.io.Seriali
             return false;
         }
 
-        return true;
+        return (inheritable == other.inheritable);
     }
 
     /**
+     * <b>Note:</b> Explicitly ignores inheritable state.
+     *
      * @param range The RevisionRange to compare this object to.
      */
     public int compareTo(RevisionRange range)
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/RevisionRangeList.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/RevisionRangeList.java
new file mode 100644
index 0000000..8b4a3af
--- /dev/null
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/RevisionRangeList.java
@@ -0,0 +1,98 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+package org.apache.subversion.javahl.types;
+
+import org.apache.subversion.javahl.ClientException;
+import org.apache.subversion.javahl.NativeResources;
+
+import java.util.List;
+
+/**
+ * Object that describes a revision range list, including operations on it.
+ * Returned from new accessors in {@link Mergeinfo}.
+ * @since 1.9
+ */
+public class RevisionRangeList implements java.io.Serializable
+{
+    // Update the serialVersionUID when there is a incompatible change
+    // made to this class.  See any of the following, depending upon
+    // the Java release.
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Load the required native library.
+     */
+    static
+    {
+        NativeResources.loadNativeLibrary();
+    }
+
+    private List<RevisionRange> ranges;
+
+    /**
+     * Wrap a list of revision ranges.
+     */
+    public RevisionRangeList(List<RevisionRange> ranges)
+    {
+        this.ranges = ranges;
+    }
+
+    /**
+     * @return The wrapped list of revision ranges.
+     */
+    public List<RevisionRange> getRanges()
+    {
+        return ranges;
+    }
+
+    /**
+     * Remove revisions in <code>eraser</code> from the current object
+     * and return the resulting difference.
+     * @param eraser The list of revisions to remoove.
+     * @param considerInheritance Determines how to account for the
+     *   {@link RevisionRange#isInherited} property when comparing
+     *   revision ranges for equality.
+     */
+    public native List<RevisionRange> remove(List<RevisionRange> eraser,
+                                             boolean considerInheritance)
+        throws ClientException;
+
+    /**
+     * Remove revisions in <code>eraser</code> from the current object
+     * and return the resulting difference.
+     * @param eraser The list of revisions to remoove.
+     * @param considerInheritance Determines how to account for the
+     *   {@link RevisionRange#isInherited} property when comparing
+     *   revision ranges for equality.
+     */
+    public RevisionRangeList remove(RevisionRangeList eraser,
+                                    boolean considerInheritance)
+        throws ClientException
+    {
+        return new RevisionRangeList
+            (remove(eraser.ranges, considerInheritance));
+    }
+
+    // TODO: More svn_rangelist_t operations
+}
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/RuntimeVersion.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/RuntimeVersion.java
new file mode 100644
index 0000000..818aa06
--- /dev/null
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/RuntimeVersion.java
@@ -0,0 +1,73 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+package org.apache.subversion.javahl.types;
+
+/**
+ * Encapsulates the run-time version of the
+ * <code>libsvn_clinent</code> library that was loaded by the current
+ * process. The result may be different from that provided by {@link
+ * Version}, because the latter returns compile-time, not run-time
+ * information.
+ */
+public class RuntimeVersion extends Version
+{
+    /**
+     * @return The full version string for the loaded library,
+     * as defined by <code>MAJOR.MINOR.PATCH-NUMTAG</code>.
+     */
+    public String toString()
+    {
+        StringBuffer version = new StringBuffer();
+        version.append(getMajor())
+            .append('.').append(getMinor())
+            .append('.').append(getPatch())
+            .append(getNumberTag());
+        return version.toString();
+    }
+
+    /**
+     * @return The major version number for the loaded JavaHL library.
+     */
+    @Override
+    public native int getMajor();
+
+    /**
+     * @return The minor version number for the loaded JavaHL library.
+     */
+    @Override
+    public native int getMinor();
+
+    /**
+     * @return The patch-level version number for the loaded JavaHL
+     * library.
+     */
+    @Override
+    public native int getPatch();
+
+    /**
+     * @return Some text further describing the library version
+     * (e.g. "r1234", "Alpha 1", "dev build", etc.).
+     */
+    private native String getNumberTag();
+}
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Status.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Status.java
index 4e628c1..0a42fac 100644
--- a/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Status.java
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Status.java
@@ -35,14 +35,10 @@ import org.apache.subversion.javahl.ConflictDescriptor;
  */
 public class Status implements java.io.Serializable
 {
-    // Update the serialVersionUID when there is a incompatible change
-    // made to this class.  See any of the following, depending upon
-    // the Java release.
-    // http://java.sun.com/j2se/1.3/docs/guide/serialization/spec/version.doc7.html
-    // http://java.sun.com/j2se/1.4/pdf/serial-spec.pdf
-    // http://java.sun.com/j2se/1.5.0/docs/guide/serialization/spec/version.html#6678
-    // http://java.sun.com/javase/6/docs/platform/serialization/spec/version.html#6678
-    private static final long serialVersionUID = 2L;
+    // Update the serialVersionUID when there is a incompatible change made to
+    // this class.  See the java documentation for when a change is incompatible.
+    // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
+    private static final long serialVersionUID = 3L;
 
     /**
      * the url for accessing the item
@@ -81,12 +77,19 @@ public class Status implements java.io.Serializable
     private String lastCommitAuthor;
 
     /**
-     * the file or directory status (See StatusKind)
+     * The status of the node, based on restructuring changes; if the node
+     * has no restructuring changes, it's based on textStatus and propStatus.
+     * @since 1.9
+     */
+    private Kind nodeStatus;
+
+    /**
+     * The file or directory status, not including restructuring changes.
      */
     private Kind textStatus;
 
     /**
-     * the status of the properties (See StatusKind)
+     * The status of the properties.
      */
     private Kind propStatus;
 
@@ -112,11 +115,24 @@ public class Status implements java.io.Serializable
     private boolean fileExternal;
 
     /**
+     * The depth of the node as recorded in the working copy.
+     * @since 1.9
+     */
+    private Depth depth;
+
+    /**
      * is this item in a conflicted state
      */
     private boolean isConflicted;
 
     /**
+     * The status of the node, based on text and property status, unless the
+     * node has restructuring changes.
+     * @since 1.9
+     */
+    private Kind repositoryNodeStatus;
+
+    /**
      * the file or directory status of base (See StatusKind)
      */
     private Kind repositoryTextStatus;
@@ -168,7 +184,6 @@ public class Status implements java.io.Serializable
     private String movedFromAbspath;
 
     private String movedToAbspath;
-
     /**
      * this constructor should only called from JNI code
      * @param path                  the file system path of item
@@ -178,22 +193,17 @@ public class Status implements java.io.Serializable
      * @param lastChangedRevision   the last revision this item was changed
      * @param lastChangedDate       the last date this item was changed
      * @param lastCommitAuthor      the author of the last change
-     * @param textStatus            the file or directory status (See
-     *                              StatusKind)
-     * @param propStatus            the property status (See StatusKind)
-     * @param repositoryTextStatus  the file or directory status of the base
+     * @param nodeStatus            the status of the node
+     * @param textStatus            the file or directory contents status
+     * @param propStatus            the property status
+     * @param repositoryNodeStatus  the status of the base node
+     * @param repositoryTextStatus  the file or directory contents status of the base
      * @param repositoryPropStatus  the property status of the base
      * @param locked                if the item is locked (running or aborted
      *                              operation)
      * @param copied                if the item is copy
+     * @param depth                 the inherent depth of the node in the working copy
      * @param isConflicted          if the item is part of a conflict
-     * @param conflictDescriptor    the description of the tree conflict
-     * @param conflictOld           in case of conflict, the file name of the
-     *                              the common base version
-     * @param conflictNew           in case of conflict, the file name of new
-     *                              repository version
-     * @param conflictWorking       in case of conflict, the file name of the
-     *                              former working copy version
      * @param switched              flag if the node has been switched in the
      *                              path
      * @param fileExternal          flag if the node is a file external
@@ -209,12 +219,16 @@ public class Status implements java.io.Serializable
      * @param changelist            the changelist the item is a member of
      * @param movedFromAbspath      path moved from
      * @param movedToAbspath        path moved from
+     * @since 1.9
      */
     public Status(String path, String url, NodeKind nodeKind, long revision,
                   long lastChangedRevision, long lastChangedDate,
-                  String lastCommitAuthor, Kind textStatus, Kind propStatus,
+                  String lastCommitAuthor,
+                  Kind nodeStatus, Kind textStatus, Kind propStatus,
+                  Kind repositoryNodeStatus,
                   Kind repositoryTextStatus, Kind repositoryPropStatus,
-                  boolean locked, boolean copied, boolean isConflicted,
+                  boolean locked, boolean copied, Depth depth,
+                  boolean isConflicted,
                   boolean switched, boolean fileExternal, Lock localLock,
                   Lock reposLock, long reposLastCmtRevision,
                   long reposLastCmtDate, NodeKind reposKind,
@@ -228,13 +242,16 @@ public class Status implements java.io.Serializable
         this.lastChangedRevision = lastChangedRevision;
         this.lastChangedDate = lastChangedDate;
         this.lastCommitAuthor = lastCommitAuthor;
+        this.nodeStatus = nodeStatus;
         this.textStatus = textStatus;
         this.propStatus = propStatus;
+        this.repositoryNodeStatus = repositoryNodeStatus;
+        this.repositoryTextStatus = repositoryTextStatus;
+        this.repositoryPropStatus = repositoryPropStatus;
         this.locked = locked;
         this.copied = copied;
+        this.depth = depth;
         this.isConflicted = isConflicted;
-        this.repositoryTextStatus = repositoryTextStatus;
-        this.repositoryPropStatus = repositoryPropStatus;
         this.switched = switched;
         this.fileExternal = fileExternal;
         this.localLock = localLock;
@@ -249,6 +266,64 @@ public class Status implements java.io.Serializable
     }
 
     /**
+     * this constructor should only called from JNI code
+     * @param path                  the file system path of item
+     * @param url                   the url of the item
+     * @param nodeKind              kind of item (directory, file or unknown
+     * @param revision              the revision number of the base
+     * @param lastChangedRevision   the last revision this item was changed
+     * @param lastChangedDate       the last date this item was changed
+     * @param lastCommitAuthor      the author of the last change
+     * @param textStatus            the file or directory status (See
+     *                              StatusKind)
+     * @param propStatus            the property status (See StatusKind)
+     * @param repositoryTextStatus  the file or directory status of the base
+     * @param repositoryPropStatus  the property status of the base
+     * @param locked                if the item is locked (running or aborted
+     *                              operation)
+     * @param copied                if the item is copy
+     * @param isConflicted          if the item is part of a conflict
+     * @param switched              flag if the node has been switched in the
+     *                              path
+     * @param fileExternal          flag if the node is a file external
+     * @param localLock             the current lock
+     * @param reposLock             the lock as stored in the repository if
+     *                              any
+     * @param reposLastCmtRevision  the youngest revision, if out of date
+     * @param reposLastCmtDate      the last commit date, if out of date
+     * @param reposKind             the kind of the youngest revision, if
+     *                              out of date
+     * @param reposLastCmtAuthor    the author of the last commit, if out of
+     *                              date
+     * @param changelist            the changelist the item is a member of
+     * @param movedFromAbspath      path moved from
+     * @param movedToAbspath        path moved from
+     * @deprecated
+     */
+    @Deprecated
+    public Status(String path, String url, NodeKind nodeKind, long revision,
+                  long lastChangedRevision, long lastChangedDate,
+                  String lastCommitAuthor, Kind textStatus, Kind propStatus,
+                  Kind repositoryTextStatus, Kind repositoryPropStatus,
+                  boolean locked, boolean copied, boolean isConflicted,
+                  boolean switched, boolean fileExternal, Lock localLock,
+                  Lock reposLock, long reposLastCmtRevision,
+                  long reposLastCmtDate, NodeKind reposKind,
+                  String reposLastCmtAuthor, String changelist,
+                  String movedFromAbspath, String movedToAbspath)
+    {
+        this(path, url, nodeKind, revision,
+             lastChangedRevision, lastChangedDate, lastCommitAuthor,
+             Kind.none, textStatus, propStatus,
+             Kind.none, repositoryTextStatus, repositoryPropStatus,
+             locked, copied, Depth.unknown, isConflicted,
+             switched, fileExternal, localLock, reposLock,
+             reposLastCmtRevision, reposLastCmtDate, reposKind,
+             reposLastCmtAuthor, changelist,
+             movedFromAbspath, movedToAbspath);
+    }
+
+    /**
      * Returns the file system path of the item
      * @return path of status entry
      */
@@ -305,25 +380,64 @@ public class Status implements java.io.Serializable
     }
 
     /**
-     * Returns the status of the item (See StatusKind)
+     * Returns the status of the node.
+     * @since 1.9
+     */
+    public Kind getNodeStatus()
+    {
+        return nodeStatus;
+    }
+
+    /**
+     * Returns the status of the node as text.
+     * @since 1.9
+     */
+    public String getNodeStatusDescription()
+    {
+        return nodeStatus.toString();
+    }
+
+    /**
+     * Returns the real status of the item's contents.
+     * @since 1.9
+     */
+    public Kind getRawTextStatus()
+    {
+        return textStatus;
+    }
+
+    /**
+     * Returns the real status of the item's contents as a string.
+     * @since 1.9
+     */
+    public String getRawTextStatusDescription()
+    {
+        return textStatus.toString();
+    }
+
+    /**
+     * Returns the adjusted status of the item's contents, as
+     * compatible with JavaHL 1.8 and older verions.
      * @return file status property enum of the "textual" component.
      */
     public Kind getTextStatus()
     {
-        return textStatus;
+        if (nodeStatus == Kind.modified || nodeStatus == Kind.conflicted)
+            return textStatus;
+        return nodeStatus;
     }
 
     /**
-     * Returns the status of the item as text.
+     * Returns the adjusted status of the item's contents as text.
      * @return english text
      */
     public String getTextStatusDescription()
     {
-        return textStatus.toString();
+        return getTextStatus().toString();
     }
 
     /**
-     * Returns the status of the properties (See Status Kind)
+     * Returns the status of the properties.
      * @return file status property enum of the "property" component.
      */
     public Kind getPropStatus()
@@ -341,17 +455,39 @@ public class Status implements java.io.Serializable
     }
 
     /**
-     * Returns the status of the item in the repository (See StatusKind)
+     * Returns the status of the node in the repository.
+     * @since 1.9
+     */
+    public Kind getRepositoryNodeStatus()
+    {
+        return repositoryNodeStatus;
+    }
+
+    /**
+     * Returns the real status of the item's contents in the repository.
+     * @since 1.9
+     */
+    public Kind getRawRepositoryTextStatus()
+    {
+        return repositoryTextStatus;
+    }
+
+    /**
+     * Returns the adjusted status of the item's contents in the
+     * repository, as compatible with JavaHL 1.8 and older verions.
      * @return file status property enum of the "textual" component in the
      * repository.
      */
     public Kind getRepositoryTextStatus()
     {
-        return repositoryTextStatus;
+        if (repositoryNodeStatus == Kind.modified
+            || repositoryNodeStatus == Kind.conflicted)
+            return repositoryTextStatus;
+        return repositoryNodeStatus;
     }
 
     /**
-     * Returns test status of the properties in the repository (See StatusKind)
+     * Returns test status of the properties in the repository.
      * @return file status property enum of the "property" component im the
      * repository.
      */
@@ -444,7 +580,7 @@ public class Status implements java.io.Serializable
      */
     public boolean isManaged()
     {
-        Kind status = getTextStatus();
+        Kind status = getNodeStatus();
         return (status != Status.Kind.unversioned &&
                 status != Status.Kind.none &&
                 status != Status.Kind.ignored);
@@ -456,7 +592,7 @@ public class Status implements java.io.Serializable
      */
     public boolean hasRemote()
     {
-        return (isManaged() && getTextStatus() != Status.Kind.added);
+        return (isManaged() && !isAdded());
     }
 
     /**
@@ -465,7 +601,7 @@ public class Status implements java.io.Serializable
      */
     public boolean isAdded()
     {
-        return getTextStatus() == Status.Kind.added;
+        return getNodeStatus() == Status.Kind.added;
     }
 
     /**
@@ -474,7 +610,7 @@ public class Status implements java.io.Serializable
      */
     public boolean isDeleted()
     {
-        return getTextStatus() == Status.Kind.deleted;
+        return getNodeStatus() == Status.Kind.deleted;
     }
 
     /**
@@ -483,7 +619,7 @@ public class Status implements java.io.Serializable
      */
     public boolean isMerged()
     {
-        return getTextStatus() == Status.Kind.merged;
+        return getNodeStatus() == Status.Kind.merged;
     }
 
     /**
@@ -493,7 +629,7 @@ public class Status implements java.io.Serializable
      */
     public boolean isIgnored()
     {
-        return getTextStatus() == Status.Kind.ignored;
+        return getNodeStatus() == Status.Kind.ignored;
     }
 
     /**
@@ -605,6 +741,15 @@ public class Status implements java.io.Serializable
     }
 
     /**
+     * Returns the inherent depth of the node, as recorded in the working copy.
+     * @since 1.9
+     */
+    public Depth getDepth()
+    {
+        return depth;
+    }
+
+    /**
      * Converts microseconds since the epoch to a Date object.
      *
      * @param micros Microseconds since the epoch.
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Version.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Version.java
index c142c81..7793582 100644
--- a/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Version.java
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Version.java
@@ -23,6 +23,8 @@
 
 package org.apache.subversion.javahl.types;
 
+import org.apache.subversion.javahl.NativeResources;
+
 /**
  * Encapsulates version information about the underlying native
  * libraries.  Basically a wrapper for <a
@@ -31,6 +33,14 @@ package org.apache.subversion.javahl.types;
 public class Version
 {
     /**
+     * Load the required native library.
+     */
+    static
+    {
+        NativeResources.loadNativeLibrary();
+    }
+
+    /**
      * @return The full version string for the loaded JavaHL library,
      * as defined by <code>MAJOR.MINOR.PATCH INFO</code>.
      */
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/VersionExtended.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/VersionExtended.java
index 06d0976..6cd7e80 100644
--- a/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/VersionExtended.java
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/VersionExtended.java
@@ -23,6 +23,8 @@
 
 package org.apache.subversion.javahl.types;
 
+import org.apache.subversion.javahl.NativeResources;
+
 /**
  * Encapsulates information about the compile-time and run-time
  * properties of the Subversion libraries.
@@ -31,6 +33,29 @@ package org.apache.subversion.javahl.types;
 public class VersionExtended
 {
     /**
+     * Load the required native library.
+     */
+    static
+    {
+        NativeResources.loadNativeLibrary();
+    }
+
+    /**
+     * Release the native peer. This method must be called to release
+     * the native resources held by this object.
+     * <p>
+     * Once this method is called, all object references obtained from
+     * the iterators returned by {@link #getLinkedLibs()} and
+     * {@link #getLoadedLibs()} become invalid and should no longer be used.
+     */
+    public native void dispose();
+
+    /**
+     * release the native peer (should use dispose instead)
+     */
+    public native void finalize();
+
+    /**
      * @return The date when the libsvn_subr library was compiled, in
      * the format defined by the C standard macro #__DATE__.
      */
@@ -45,9 +70,9 @@ public class VersionExtended
     /**
      * @return The canonical host triplet (arch-vendor-osname) of the
      * system where libsvn_subr was compiled.
-     *
-     * @note On Unix-like systems (includng Mac OS X), this string is
-     * the same as the output of the config.guess script for the
+     * <p>
+     * <b>Note:</b> On Unix-like systems (includng Mac OS X), this string
+     * is the same as the output of the config.guess script for the
      * underlying Subversion libraries.
      */
     public native String getBuildHost();
@@ -60,8 +85,8 @@ public class VersionExtended
     /**
      * @return The canonical host triplet (arch-vendor-osname) of the
      * system where the current process is running.
-     *
-     * @note This string may not be the same as the output of
+     * <p>
+     * <b>Note:</b> This string may not be the same as the output of
      * config.guess on the same system.
      */
     public native String getRuntimeHost();
@@ -139,8 +164,8 @@ public class VersionExtended
     /**
      * @return Iterator for an immutable internal list of #LoadedLib
      * describing loaded shared libraries.  The the list may be empty.
-     *
-     * @note On Mac OS X, the loaded frameworks, private frameworks
+     * <p>
+     * <b>Note:</b> On Mac OS X, the loaded frameworks, private frameworks
      * and system libraries will not be listed.
      */
     public java.util.Iterator<LoadedLib> getLoadedLibs()
@@ -178,7 +203,8 @@ public class VersionExtended
 
         /**
          * Implementation of java.util.Iterator#remove().
-         * @note Not implemented, all sequences are immutable.
+         * <p>
+         * <b>Note:</b> Not implemented, all sequences are immutable.
          */
         public void remove()
         {
@@ -219,7 +245,8 @@ public class VersionExtended
 
         /**
          * Implementation of java.util.Iterator#remove().
-         * @note Not implemented, all sequences are immutable.
+         * <p>
+         * <b>Note:</b> Not implemented, all sequences are immutable.
          */
         public void remove()
         {
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/ConfigImpl.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/ConfigImpl.java
new file mode 100644
index 0000000..b50acc9
--- /dev/null
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/ConfigImpl.java
@@ -0,0 +1,175 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+package org.apache.subversion.javahl.util;
+
+import org.apache.subversion.javahl.ISVNConfig;
+import org.apache.subversion.javahl.ClientException;
+import org.apache.subversion.javahl.NativeResources;
+
+import org.apache.subversion.javahl.types.*;
+import org.apache.subversion.javahl.callback.*;
+
+
+/**
+ * Implementation of ISVNConfig.
+ */
+class ConfigImpl implements ISVNConfig
+{
+    /**
+     * Load the required native library.
+     */
+    static
+    {
+        NativeResources.loadNativeLibrary();
+    }
+
+    public Category config() { return this.configref; }
+    public Category servers() { return this.serversref; }
+
+    protected ConfigImpl(long context)
+    {
+        this.configref = new Category("config", context);
+        this.serversref = new Category("servers", context);
+    }
+    protected Category configref;
+    protected Category serversref;
+
+    /** Called from JNI when the object is no longer live. */
+    void dispose()
+    {
+        configref.dispose();
+        configref = null;
+        serversref.dispose();
+        serversref = null;
+    }
+
+    static class Category implements ISVNConfig.Category
+    {
+        public String get(String section, String option, String defaultValue)
+        {
+            return get_str(category, context, section, option, defaultValue);
+        }
+
+        public boolean get(String section, String option, boolean defaultValue)
+            throws ClientException
+        {
+            return get_bool(category, context, section, option, defaultValue);
+        }
+
+        public long get(String section, String option, long defaultValue)
+            throws ClientException
+        {
+            return get_long(category, context, section, option, defaultValue);
+        }
+
+        public Tristate get(String section, String option,
+                            String unknown, Tristate defaultValue)
+            throws ClientException
+        {
+            return get_tri(category, context, section, option,
+                           unknown, defaultValue);
+        }
+
+        public String getYesNoAsk(String section, String option,
+                                  String defaultValue)
+            throws ClientException
+        {
+            return get_yna(category, context, section, option, defaultValue);
+        }
+
+        public void set(String section, String option, String value)
+        {
+            set_str(category, context, section, option, value);
+        }
+
+        public void set(String section, String option, boolean value)
+        {
+            set_bool(category, context, section, option, value);
+        }
+
+        public void set(String section, String option, long value)
+        {
+            set_long(category, context, section, option, value);
+        }
+
+        public Iterable<String> sections()
+        {
+            return sections(category, context);
+        }
+
+        public void enumerate(String section, Enumerator handler)
+        {
+            enumerate(category, context, section, handler);
+        }
+
+        Category(String category, long context)
+        {
+            this.category = category;
+            this.context = context;
+        }
+        protected String category;
+        protected long context;
+
+        /** Called when the object is no longer live. */
+        void dispose()
+        {
+            category = null;
+            context = 0;
+        }
+
+        private native String get_str(String category, long context,
+                                      String secton, String option,
+                                      String defaultValue);
+        private native boolean get_bool(String category, long context,
+                                        String secton, String option,
+                                        boolean defaultValue)
+            throws ClientException;
+        private native long get_long(String category, long context,
+                                     String secton, String option,
+                                     long defaultValue)
+            throws ClientException;
+        private native Tristate get_tri(String category, long context,
+                                        String secton, String option,
+                                        String unknown, Tristate defaultValue)
+            throws ClientException;
+        private native String get_yna(String category, long context,
+                                      String secton, String option,
+                                      String defaultValue)
+            throws ClientException;
+        private native void set_str(String category, long context,
+                                    String section, String option,
+                                    String value);
+        private native void set_bool(String category, long context,
+                                     String section, String option,
+                                     boolean value);
+        private native void set_long(String category, long context,
+                                     String section, String option,
+                                     long value);
+        private native Iterable<String> sections(String category,
+                                                 long context);
+        private native void enumerate(String category, long context,
+                                      String section, Enumerator handler);
+
+    }
+}
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/ConfigLib.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/ConfigLib.java
new file mode 100644
index 0000000..c54533b
--- /dev/null
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/ConfigLib.java
@@ -0,0 +1,121 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+package org.apache.subversion.javahl.util;
+
+import org.apache.subversion.javahl.callback.*;
+
+import org.apache.subversion.javahl.SVNUtil;
+import org.apache.subversion.javahl.ClientException;
+import org.apache.subversion.javahl.NativeResources;
+import org.apache.subversion.javahl.SubversionException;
+
+import java.util.List;
+
+/**
+ * Provides global configuration knobs and
+ * Encapsulates utility functions for authentication credentials management.
+ * @since 1.9
+ */
+public class ConfigLib
+{
+    /**
+     * Load the required native library.
+     */
+    static
+    {
+        NativeResources.loadNativeLibrary();
+    }
+
+    /** @see SVNUtil.enableNativeCredentialsStore */
+    public native void enableNativeCredentialsStore()
+        throws ClientException;
+
+    /** @see SVNUtil.disableNativeCredentialsStore */
+    public native void disableNativeCredentialsStore()
+        throws ClientException;
+
+    /** @see SVNUtil.isNativeCredentialsStoreEnabled */
+    public native boolean isNativeCredentialsStoreEnabled()
+        throws ClientException;
+
+    //
+    // Credentials management
+    //
+
+    /** @see SVNUtil.getCredential */
+    public SVNUtil.Credential getCredential(String configDir,
+                                            SVNUtil.Credential.Kind kind,
+                                            String realm)
+        throws ClientException, SubversionException
+    {
+        return nativeGetCredential(configDir, kind.toString(), realm);
+    }
+
+    /** @see SVNUtil.removeCredential */
+    public SVNUtil.Credential removeCredential(String configDir,
+                                               SVNUtil.Credential.Kind kind,
+                                               String realm)
+        throws ClientException, SubversionException
+    {
+        return nativeRemoveCredential(configDir, kind.toString(), realm);
+    }
+
+    /** @see SVNUtil.searchCredentials */
+    public List<SVNUtil.Credential>
+        searchCredentials(String configDir,
+                          SVNUtil.Credential.Kind kind,
+                          String realmPattern,
+                          String usernamePattern,
+                          String hostnamePattern,
+                          String textPattern)
+        throws ClientException, SubversionException
+    {
+        return nativeSearchCredentials(
+            configDir,
+            (kind != null ? kind.toString() : null),
+            realmPattern, usernamePattern, hostnamePattern, textPattern);
+    }
+
+    private native SVNUtil.Credential
+        nativeGetCredential(String configDir,
+                               String kind,
+                               String realm)
+        throws ClientException, SubversionException;
+
+    private native SVNUtil.Credential
+        nativeRemoveCredential(String configDir,
+                               String kind,
+                               String realm)
+        throws ClientException, SubversionException;
+
+    private native List<SVNUtil.Credential>
+        nativeSearchCredentials(String configDir,
+                                String kind,
+                                String realmPattern,
+                                String usernamePattern,
+                                String hostnamePattern,
+                                String textPattern)
+        throws ClientException, SubversionException;
+}
+
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/DiffLib.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/DiffLib.java
new file mode 100644
index 0000000..36912dd
--- /dev/null
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/DiffLib.java
@@ -0,0 +1,149 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+package org.apache.subversion.javahl.util;
+
+import org.apache.subversion.javahl.SVNUtil;
+import org.apache.subversion.javahl.ClientException;
+import org.apache.subversion.javahl.NativeResources;
+
+import java.io.OutputStream;
+
+/**
+ * Encapsulates utility functions provided by libsvn_diff.
+ * @since 1.9
+ */
+public class DiffLib
+{
+    /**
+     * Load the required native library.
+     */
+    static
+    {
+        NativeResources.loadNativeLibrary();
+    }
+
+    /** @see SVNUtil.fileDiff */
+    public boolean fileDiff(String originalFile,
+                            String modifiedFile,
+                            SVNUtil.DiffOptions diffOptions,
+
+                            String originalHeader,
+                            String modifiedHeader,
+                            String headerEncoding,
+                            String relativeToDir,
+
+                            OutputStream resultStream)
+        throws ClientException
+    {
+        return nativeFileDiff(originalFile, modifiedFile,
+
+                              // Interpret the diff options
+                              (diffOptions == null
+                               ? SVNUtil.DiffOptions.IgnoreSpace.none.ordinal()
+                               : diffOptions.ignoreSpace.ordinal()),
+                              (diffOptions == null ? false
+                               : diffOptions.ignoreEolStyle),
+                              (diffOptions == null ? false
+                               : diffOptions.showCFunction),
+                              (diffOptions == null ? -1
+                               : diffOptions.contextSize),
+
+                              originalHeader, modifiedHeader, headerEncoding,
+                              relativeToDir, resultStream);
+    }
+
+    private native
+        boolean nativeFileDiff(String originalFile,
+                               String modifiedFile,
+
+                               // Interpreted diff options
+                               int ignoreSpace,
+                               boolean ignoreEolStyle,
+                               boolean showCFunction,
+                               int contextSize,
+
+                               String originalHeader,
+                               String modifiedHeader,
+                               String headerEncoding,
+                               String relativeToDir,
+
+                               OutputStream resultStream)
+        throws ClientException;
+
+    /** @see SVNUtil.fileMerge */
+    public boolean fileMerge(String originalFile,
+                             String modifiedFile,
+                             String latestFile,
+                             SVNUtil.DiffOptions diffOptions,
+
+                             String conflictOriginal,
+                             String conflictModified,
+                             String conflictLatest,
+                             String conflistSeparator,
+                             SVNUtil.ConflictDisplayStyle conflictStyle,
+
+                             OutputStream resultStream)
+        throws ClientException
+    {
+        return nativeFileMerge(originalFile, modifiedFile, latestFile,
+
+                               // Interpret the diff options
+                               (diffOptions == null
+                                ? SVNUtil.DiffOptions.IgnoreSpace.none.ordinal()
+                                : diffOptions.ignoreSpace.ordinal()),
+                               (diffOptions == null ? false
+                                : diffOptions.ignoreEolStyle),
+                               (diffOptions == null ? false
+                                : diffOptions.showCFunction),
+
+                               conflictOriginal, conflictModified,
+                               conflictLatest, conflistSeparator,
+
+                               // Interpret the conflict style
+                               conflictStyle.ordinal(),
+
+                               resultStream);
+    }
+
+    private native
+        boolean nativeFileMerge(String originalFile,
+                                String modifiedFile,
+                                String latestFile,
+
+                                // Interpreted diff options
+                                int ignoreSpace,
+                                boolean ignoreEolStyle,
+                                boolean showCFunction,
+
+                                String conflictOriginal,
+                                String conflictModified,
+                                String conflictLatest,
+                                String conflistSeparator,
+
+                                // Interpreted conflict display style
+                                int conflictStyle,
+
+                                OutputStream resultStream)
+        throws ClientException;
+}
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/PropLib.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/PropLib.java
new file mode 100644
index 0000000..44d1302
--- /dev/null
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/PropLib.java
@@ -0,0 +1,90 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+package org.apache.subversion.javahl.util;
+
+import org.apache.subversion.javahl.SVNUtil;
+import org.apache.subversion.javahl.ClientException;
+import org.apache.subversion.javahl.SubversionException;
+import org.apache.subversion.javahl.NativeResources;
+import org.apache.subversion.javahl.types.ExternalItem;
+import org.apache.subversion.javahl.types.NodeKind;
+import org.apache.subversion.javahl.types.Revision;
+
+import java.util.List;
+import java.io.InputStream;
+
+/**
+ * Encapsulates utility functions for properties provided by libsvn_wc.
+ * @since 1.9
+ */
+public class PropLib
+{
+    /**
+     * Load the required native library.
+     */
+    static
+    {
+        NativeResources.loadNativeLibrary();
+    }
+
+    /** @see SVNUtil#canonicalizeSvnProperty */
+    public byte[] canonicalizeNodeProperty(String name, byte[] value,
+                                           String path, NodeKind kind,
+                                           String mimeType,
+                                           InputStream fileContents)
+        throws ClientException
+    {
+        if (!name.startsWith("svn:"))
+            throw new IllegalArgumentException("Property name: " + name);
+        return checkNodeProp(name, value, path, kind, mimeType, fileContents,
+                             (kind != NodeKind.file || mimeType == null));
+    }
+
+    private native byte[] checkNodeProp(String name, byte[] value,
+                                        String path, NodeKind kind,
+                                        String mimeType,
+                                        InputStream fileContents,
+                                        boolean skipSomeChecks)
+        throws ClientException;
+
+
+    /** @see SVNUtil.parseExternals */
+    public native List<ExternalItem> parseExternals(byte[] description,
+                                                    String parentDirectory,
+                                                    boolean canonicalizeUrl)
+        throws ClientException;
+
+    /** @see SVNUtil#unparseExternals */
+    public native byte[] unparseExternals(List<ExternalItem> items,
+                                          String parentDirectory,
+                                          boolean old_format)
+        throws SubversionException;
+
+
+    /** @see SVNUtil#resolveExternalsUrl */
+    public native String resolveExternalsUrl(ExternalItem external,
+                                             String reposRootUrl,
+                                             String parentDirUrl)
+        throws ClientException;
+}
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/RequestChannel.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/RequestChannel.java
new file mode 100644
index 0000000..3040536
--- /dev/null
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/RequestChannel.java
@@ -0,0 +1,58 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+package org.apache.subversion.javahl.util;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.ReadableByteChannel;
+import java.nio.channels.ClosedChannelException;
+
+/* The following channel subclasses are used by the native
+   implementation of the tunnel management code. */
+
+class RequestChannel
+    extends TunnelChannel
+    implements ReadableByteChannel
+{
+    private RequestChannel(long nativeChannel)
+    {
+        super(nativeChannel);
+    }
+
+    public int read(ByteBuffer dst) throws IOException
+    {
+        long channel = nativeChannel.get();
+        if (channel != 0)
+            try {
+                return nativeRead(channel, dst);
+            } catch (IOException ex) {
+                nativeChannel.set(0); // Close the channel
+                throw ex;
+            }
+        throw new ClosedChannelException();
+    }
+
+    private static native int nativeRead(long nativeChannel, ByteBuffer dst)
+        throws IOException;
+}
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/ResponseChannel.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/ResponseChannel.java
new file mode 100644
index 0000000..5a94842
--- /dev/null
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/ResponseChannel.java
@@ -0,0 +1,58 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+package org.apache.subversion.javahl.util;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.WritableByteChannel;
+import java.nio.channels.ClosedChannelException;
+
+/* The following channel subclasses are used by the native
+   implementation of the tunnel management code. */
+
+class ResponseChannel
+    extends TunnelChannel
+    implements WritableByteChannel
+{
+    private ResponseChannel(long nativeChannel)
+    {
+        super(nativeChannel);
+    }
+
+    public int write(ByteBuffer src) throws IOException
+    {
+        long channel = this.nativeChannel.get();
+        if (channel != 0)
+            try {
+                return nativeWrite(channel, src);
+            } catch (IOException ex) {
+                nativeChannel.set(0); // Close the channel
+                throw ex;
+            }
+        throw new ClosedChannelException();
+    }
+
+    private static native int nativeWrite(long nativeChannel, ByteBuffer src)
+        throws IOException;
+}
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/SubstLib.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/SubstLib.java
new file mode 100644
index 0000000..723a525
--- /dev/null
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/SubstLib.java
@@ -0,0 +1,113 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+package org.apache.subversion.javahl.util;
+
+import org.apache.subversion.javahl.SVNUtil;
+import org.apache.subversion.javahl.ClientException;
+import org.apache.subversion.javahl.SubversionException;
+import org.apache.subversion.javahl.NativeResources;
+
+import java.util.Date;
+import java.util.Map;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+/**
+ * Encapsulates utility functions for substitution and translation
+ * provided by the <code>svn_subst</code> module of
+ * <code>libsvn_subr</code>.
+ * @since 1.9
+ */
+public class SubstLib
+{
+    /**
+     * Load the required native library.
+     */
+    static
+    {
+        NativeResources.loadNativeLibrary();
+    }
+
+    /**
+     * @see SVNUtil.EOL_LF
+     */
+    public static final byte[] EOL_LF = new byte[]{ (byte)10 };
+
+    /**
+     * @see SVNUtil.EOL_CR
+     */
+    public static final byte[] EOL_CR = new byte[]{ (byte)13 };
+
+    /**
+     * @see SVNUtil.EOL_CRLF
+     */
+    public static final byte[] EOL_CRLF = new byte[]{ EOL_CR[0], EOL_LF[0] };
+
+    /**
+     * @see SVNUtil.buildKeywords
+     */
+    public native Map<String, byte[]> buildKeywords(byte[] keywordsValue,
+                                                    long revision,
+                                                    String url,
+                                                    String reposRootUrl,
+                                                    Date date,
+                                                    String author)
+        throws SubversionException, ClientException;
+
+    /**
+     * @see SVNUtil.translateStream
+     */
+    public native InputStream translateInputStream(
+                                  InputStream source,
+                                  byte[] eolMarker,
+                                  boolean repairEol,
+                                  Map<String, byte[]> keywords,
+                                  boolean useKeywordsMap,
+                                  boolean expandKeywords,
+                                  byte[] keywordsValue,
+                                  long revision,
+                                  String url,
+                                  String reposRootUrl,
+                                  Date date,
+                                  String author)
+        throws SubversionException, ClientException;
+
+    /**
+     * @see SVNUtil.translateStream
+     */
+    public native OutputStream translateOutputStream(
+                                   OutputStream destination,
+                                   byte[] eolMarker,
+                                   boolean repairEol,
+                                   Map<String, byte[]> keywords,
+                                   boolean useKeywordsMap,
+                                   boolean expandKeywords,
+                                   byte[] keywordsValue,
+                                   long revision,
+                                   String url,
+                                   String reposRootUrl,
+                                   Date date,
+                                   String author)
+        throws SubversionException, ClientException;
+}
diff --git a/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/TunnelChannel.java b/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/TunnelChannel.java
new file mode 100644
index 0000000..933d883
--- /dev/null
+++ b/subversion/bindings/javahl/src/org/apache/subversion/javahl/util/TunnelChannel.java
@@ -0,0 +1,57 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+package org.apache.subversion.javahl.util;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.Channel;
+import java.util.concurrent.atomic.AtomicLong;
+
+/* The following channel subclasses are used by the native
+   implementation of the tunnel management code. */
+
+abstract class TunnelChannel implements Channel
+{
+    protected TunnelChannel(long nativeChannel)
+    {
+        this.nativeChannel = new AtomicLong(nativeChannel);
+    }
+
+    public boolean isOpen()
+    {
+        return (nativeChannel.get() != 0);
+    }
+
+    public void close() throws IOException
+    {
+        long channel = nativeChannel.getAndSet(0);
+        if (channel != 0)
+            nativeClose(channel);
+    }
+
+    private native static void nativeClose(long nativeChannel)
+        throws IOException;
+
+    protected AtomicLong nativeChannel;
+}
diff --git a/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictResult.java b/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictResult.java
index 07fd64d..07fa469 100644
--- a/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictResult.java
+++ b/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictResult.java
@@ -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)
     {
diff --git a/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Path.java b/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Path.java
index 3ad9eba..8e335f9 100644
--- a/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Path.java
+++ b/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Path.java
@@ -31,14 +31,6 @@ package org.tigris.subversion.javahl;
 public class Path
 {
     /**
-     * Load the required native library.
-     */
-    static
-    {
-        org.apache.subversion.javahl.NativeResources.loadNativeLibrary();
-    }
-
-    /**
      * A valid path is a UTF-8 string without any control characters.
      *
      * @return Whether Subversion can store the path in a repository.
diff --git a/subversion/bindings/javahl/src/org/tigris/subversion/javahl/PropertyData.java b/subversion/bindings/javahl/src/org/tigris/subversion/javahl/PropertyData.java
index 68bf797..eb50a2a 100644
--- a/subversion/bindings/javahl/src/org/tigris/subversion/javahl/PropertyData.java
+++ b/subversion/bindings/javahl/src/org/tigris/subversion/javahl/PropertyData.java
@@ -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
diff --git a/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java b/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java
index 02122a4..337fee0 100644
--- a/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java
+++ b/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java
@@ -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()
     {
diff --git a/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java b/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
index b8582c5..36c37e5 100644
--- a/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
+++ b/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
@@ -47,7 +47,7 @@ public class SVNClient implements SVNClientInterface
     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()
     {
@@ -377,7 +377,10 @@ public class SVNClient implements SVNClientInterface
 
         public boolean userAllowedSave()
         {
-            return false;
+            if (oldPrompt3 != null)
+                return oldPrompt3.userAllowedSave();
+            else
+                return false;
         }
 
         public String askQuestion(String realm, String question,
@@ -756,14 +759,14 @@ public class SVNClient implements SVNClientInterface
             }
 
             public String getLogMessage(
-                Set<org.apache.subversion.javahl.CommitItem> elementsToBeCommited)
+                Set<org.apache.subversion.javahl.CommitItem> elementsToBeCommitted)
             {
                 CommitItem[] aElements =
-                        new CommitItem[elementsToBeCommited.size()];
+                        new CommitItem[elementsToBeCommitted.size()];
 
                 int i = 0;
                 for (org.apache.subversion.javahl.CommitItem item
-                                                        : elementsToBeCommited)
+                                                        : elementsToBeCommitted)
                 {
                     aElements[i] = new CommitItem(item);
                     i++;
@@ -2415,18 +2418,18 @@ public class SVNClient implements SVNClientInterface
     {
         try
         {
-        	final List<org.apache.subversion.javahl.types.Info> infos =
-        		new ArrayList<org.apache.subversion.javahl.types.Info>();
-        	aSVNClient.info2(path,
-        					org.apache.subversion.javahl.types.Revision.HEAD,
-        					org.apache.subversion.javahl.types.Revision.HEAD,
-        					org.apache.subversion.javahl.types.Depth.empty,
-        				    null, new org.apache.subversion.javahl.callback.InfoCallback()
-        	{
-				public void singleInfo(org.apache.subversion.javahl.types.Info info) {
-					infos.add(info);
-				}
-        	});
+            final List<org.apache.subversion.javahl.types.Info> infos =
+                new ArrayList<org.apache.subversion.javahl.types.Info>();
+            aSVNClient.info2(path,
+                            org.apache.subversion.javahl.types.Revision.HEAD,
+                            org.apache.subversion.javahl.types.Revision.HEAD,
+                            org.apache.subversion.javahl.types.Depth.empty,
+                            null, new org.apache.subversion.javahl.callback.InfoCallback()
+            {
+                public void singleInfo(org.apache.subversion.javahl.types.Info info) {
+                    infos.add(info);
+                }
+            });
             return new Info(infos.get(0));
         }
         catch (org.apache.subversion.javahl.ClientException ex)
diff --git a/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java b/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java
index 2584079..830713c 100644
--- a/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java
+++ b/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java
@@ -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
diff --git a/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java b/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
index 5ed2229..8ca2b1f 100644
--- a/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
+++ b/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
@@ -33,6 +33,9 @@ import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.ByteArrayOutputStream;
 import java.io.UnsupportedEncodingException;
+import java.nio.ByteBuffer;
+import java.nio.channels.ReadableByteChannel;
+import java.nio.channels.WritableByteChannel;
 import java.text.ParseException;
 import java.util.Collection;
 import java.util.Arrays;
@@ -136,9 +139,10 @@ public class BasicTests extends SVNTests
      */
     public void testVersionExtendedQuiet() throws Throwable
     {
+        VersionExtended vx = null;
         try
         {
-            VersionExtended vx = client.getVersionExtended(false);
+            vx = client.getVersionExtended(false);
             String result = vx.getBuildDate();
             if (result == null || result.trim().length() == 0)
                 throw new Exception("Build date empty");
@@ -157,6 +161,11 @@ public class BasicTests extends SVNTests
             fail("VersionExtended should always be available unless the " +
                  "native libraries failed to initialize: " + e);
         }
+        finally
+        {
+            if (vx != null)
+                vx.dispose();
+        }
     }
 
     /**
@@ -165,9 +174,10 @@ public class BasicTests extends SVNTests
      */
     public void testVersionExtendedVerbose() throws Throwable
     {
+        VersionExtended vx = null;
         try
         {
-            VersionExtended vx = client.getVersionExtended(true);
+            vx = client.getVersionExtended(true);
             String result = vx.getRuntimeHost();
             if (result == null || result.trim().length() == 0)
                 throw new Exception("Runtime host empty");
@@ -213,6 +223,38 @@ public class BasicTests extends SVNTests
             fail("VersionExtended should always be available unless the " +
                  "native libraries failed to initialize: " + e);
         }
+        finally
+        {
+            if (vx != null)
+                vx.dispose();
+        }
+    }
+
+    /**
+     * Test RuntimeVersion
+     */
+    public void testRuntimeVersion() throws Throwable
+    {
+        try
+        {
+            RuntimeVersion runtimeVersion = client.getRuntimeVersion();
+            String versionString = runtimeVersion.toString();
+            if (versionString == null || versionString.trim().length() == 0)
+            {
+                throw new Exception("Version string empty");
+            }
+        }
+        catch (Exception e)
+        {
+            fail("RuntimeVersion should always be available unless the " +
+                 "native libraries failed to initialize: " + e);
+        }
+
+        RuntimeVersion runtimeVersion = client.getRuntimeVersion();
+        Version version = client.getVersion();
+        assertTrue(runtimeVersion.getMajor() > version.getMajor()
+                   || (runtimeVersion.getMajor() == version.getMajor()
+                       && runtimeVersion.getMinor() >= version.getMinor()));
     }
 
     /**
@@ -229,7 +271,7 @@ public class BasicTests extends SVNTests
         tempclient.dispose();
 
         // create Y and Y/Z directories in the repository
-        addExpectedCommitItem(null, thisTest.getUrl().toString(), "Y", NodeKind.none,
+        addExpectedCommitItem(null, thisTest.getUrl().toString(), "Y", NodeKind.dir,
                               CommitItemStateFlags.Add);
         Set<String> urls = new HashSet<String>(1);
         urls.add(thisTest.getUrl() + "/Y");
@@ -239,7 +281,7 @@ public class BasicTests extends SVNTests
         }
         catch(JNIError e)
         {
-	        return; // Test passes!
+            return; // Test passes!
         }
         fail("A JNIError should have been thrown here.");
     }
@@ -251,16 +293,17 @@ public class BasicTests extends SVNTests
     public void testMergeinfoParser() throws Throwable
     {
         String mergeInfoPropertyValue =
-            "/trunk:1-300,305,307,400-405\n/branches/branch:308-400";
+            "/trunk:1-300,305*,307,400-405*\n" +
+            "/branches/branch:308-400";
         Mergeinfo info = new Mergeinfo(mergeInfoPropertyValue);
         Set<String> paths = info.getPaths();
         assertEquals(2, paths.size());
         List<RevisionRange> trunkRange = info.getRevisionRange("/trunk");
         assertEquals(4, trunkRange.size());
         assertEquals("1-300", trunkRange.get(0).toString());
-        assertEquals("305", trunkRange.get(1).toString());
+        assertEquals("305*", trunkRange.get(1).toString());
         assertEquals("307", trunkRange.get(2).toString());
-        assertEquals("400-405", trunkRange.get(3).toString());
+        assertEquals("400-405*", trunkRange.get(3).toString());
         List<RevisionRange> branchRange =
             info.getRevisionRange("/branches/branch");
         assertEquals(1, branchRange.size());
@@ -276,17 +319,31 @@ public class BasicTests extends SVNTests
         OneTest thisTest = new OneTest();
 
         // check the status of the working copy
+        thisTest.getWc().setItemDepth("", Depth.infinity);
+        thisTest.getWc().setItemDepth("iota", Depth.unknown);
         thisTest.checkStatus();
 
         // Test status of non-existent file
         File fileC = new File(thisTest.getWorkingCopy() + "/A", "foo.c");
 
         MyStatusCallback statusCallback = new MyStatusCallback();
-        client.status(fileToSVNPath(fileC, false), Depth.unknown, false, true,
-                    false, false, null, statusCallback);
-        if (statusCallback.getStatusArray().length > 0)
-            fail("File foo.c should not return a status.");
+        client.status(fileToSVNPath(fileC, false), Depth.unknown,
+                      false, true, true, false, false, false,
+                      null, statusCallback);
 
+        final int statusCount = statusCallback.getStatusArray().length;
+        if (statusCount == 1)
+        {
+            Status st = statusCallback.getStatusArray()[0];
+            if (st.isConflicted()
+                || st.getNodeStatus() != Status.Kind.none
+                || st.getRepositoryNodeStatus() != Status.Kind.none)
+                fail("File foo.c should return empty status.");
+        }
+        else if (statusCount > 1)
+            fail("File foo.c should not return more than one status.");
+        else
+            fail("File foo.c should return exactly one empty status.");
     }
 
     /**
@@ -357,7 +414,8 @@ public class BasicTests extends SVNTests
 
         statusCallback = new MyStatusCallback();
         client.status(thisTest.getWCPath() + "/A/D/G/rho", Depth.immediates,
-                        false, true, false, false, null, statusCallback);
+                      false, true, true, false, false, false,
+                      null, statusCallback);
         status = statusCallback.getStatusArray()[0];
         long rhoCommitDate = status.getLastChangedDate().getTime();
         long rhoCommitRev = rev;
@@ -394,7 +452,8 @@ public class BasicTests extends SVNTests
                 + "modification to tau");
         statusCallback = new MyStatusCallback();
         client.status(thisTest.getWCPath() + "/A/D/G/tau", Depth.immediates,
-                      false, true, false, false, null, statusCallback);
+                      false, true, true, false, false, false,
+                      null, statusCallback);
         status = statusCallback.getStatusArray()[0];
         long tauCommitDate = status.getLastChangedDate().getTime();
         long tauCommitRev = rev;
@@ -423,7 +482,8 @@ public class BasicTests extends SVNTests
         thisTest.getWc().addItem("A/B/I", null);
         statusCallback = new MyStatusCallback();
         client.status(thisTest.getWCPath() + "/A/B/I", Depth.immediates,
-                    false, true, false, false, null, statusCallback);
+                      false, true, true, false, false, false,
+                      null, statusCallback);
         status = statusCallback.getStatusArray()[0];
         long ICommitDate = status.getLastChangedDate().getTime();
         long ICommitRev = rev;
@@ -458,7 +518,8 @@ public class BasicTests extends SVNTests
         thisTest.getWc().addItem("A/D/H/nu", "This is the file 'nu'.");
         statusCallback = new MyStatusCallback();
         client.status(thisTest.getWCPath() + "/A/D/H/nu", Depth.immediates,
-                    false, true, false, false, null, statusCallback);
+                      false, true, true, false, false, false,
+                      null, statusCallback);
         status = statusCallback.getStatusArray()[0];
         long nuCommitDate = status.getLastChangedDate().getTime();
         long nuCommitRev = rev;
@@ -475,7 +536,8 @@ public class BasicTests extends SVNTests
         thisTest.getWc().setItemWorkingCopyRevision("A/B/F", rev);
         statusCallback = new MyStatusCallback();
         client.status(thisTest.getWCPath() + "/A/B/F", Depth.immediates,
-                    false, true, false, false, null, statusCallback);
+                      false, true, true, false, false, false,
+                      null, statusCallback);
         status = statusCallback.getStatusArray()[0];
         long FCommitDate = status.getLastChangedDate().getTime();
         long FCommitRev = rev;
@@ -506,7 +568,8 @@ public class BasicTests extends SVNTests
                                  "This is the replacement file 'chi'.");
         statusCallback = new MyStatusCallback();
         client.status(thisTest.getWCPath() + "/A/D/H/chi", Depth.immediates,
-                    false, true, false, false, null, statusCallback);
+                      false, true, true, false, false, false,
+                      null, statusCallback);
         status = statusCallback.getStatusArray()[0];
         long chiCommitDate = status.getLastChangedDate().getTime();
         long chiCommitRev = rev;
@@ -557,7 +620,8 @@ public class BasicTests extends SVNTests
         assertEquals("wrong revision number from commit", rev, expectedRev++);
         statusCallback = new MyStatusCallback();
         client.status(thisTest.getWCPath() + "/A/D/H/psi", Depth.immediates,
-                      false, true, false, false, null, statusCallback);
+                      false, true, true, false, false, false,
+                      null, statusCallback);
         status = statusCallback.getStatusArray()[0];
         long psiCommitDate = status.getLastChangedDate().getTime();
         long psiCommitRev = rev;
@@ -649,6 +713,47 @@ public class BasicTests extends SVNTests
     }
 
     /**
+     * Test SVNClient.status on externals.
+     * @throws Throwable
+     */
+    public void testExternalStatus() throws Throwable
+    {
+        // build the test setup
+        OneTest thisTest = new OneTest();
+
+
+        // Add an externals reference to the working copy.
+        client.propertySetLocal(thisTest.getWCPathSet(), "svn:externals",
+                                "^/A/D/H ADHext".getBytes(),
+                                Depth.empty, null, false);
+
+        // Update the working copy to bring in the external subtree.
+        client.update(thisTest.getWCPathSet(), Revision.HEAD,
+                      Depth.unknown, false, false, false, false);
+
+        // Test status of an external file
+        File psi = new File(thisTest.getWorkingCopy() + "/ADHext", "psi");
+
+        MyStatusCallback statusCallback = new MyStatusCallback();
+        client.status(fileToSVNPath(psi, false), Depth.unknown,
+                      false, true, true, false, false, false,
+                      null, statusCallback);
+
+        final int statusCount = statusCallback.getStatusArray().length;
+        if (statusCount == 1)
+        {
+            Status st = statusCallback.getStatusArray()[0];
+            assertFalse(st.isConflicted());
+            assertEquals(Status.Kind.normal, st.getNodeStatus());
+            assertEquals(NodeKind.file, st.getNodeKind());
+        }
+        else if (statusCount > 1)
+            fail("File psi should not return more than one status.");
+        else
+            fail("File psi should return exactly one status.");
+    }
+
+    /**
      * Test the basic SVNClient.checkout functionality.
      * @throws Throwable
      */
@@ -911,9 +1016,9 @@ public class BasicTests extends SVNTests
         OneTest thisTest = new OneTest();
 
         // create Y and Y/Z directories in the repository
-        addExpectedCommitItem(null, thisTest.getUrl().toString(), "Y", NodeKind.none,
+        addExpectedCommitItem(null, thisTest.getUrl().toString(), "Y", NodeKind.dir,
                               CommitItemStateFlags.Add);
-        addExpectedCommitItem(null, thisTest.getUrl().toString(), "Y/Z", NodeKind.none,
+        addExpectedCommitItem(null, thisTest.getUrl().toString(), "Y/Z", NodeKind.dir,
                               CommitItemStateFlags.Add);
         Set<String> urls = new HashSet<String>(2);
         urls.add(thisTest.getUrl() + "/Y");
@@ -967,7 +1072,7 @@ public class BasicTests extends SVNTests
         }
         client.copy(sources,
                     new File(thisTest.getWorkingCopy(), "A/B/F").getPath(),
-                    true, false, false, null, null, null);
+                    true, false, false, false, false, null, null, null, null);
 
         // Commit the changes, and check the state of the WC.
         checkCommitRevision(thisTest,
@@ -984,7 +1089,7 @@ public class BasicTests extends SVNTests
                                         "A/B").getPath(), Revision.WORKING,
                                     Revision.WORKING));
         client.copy(wcSource, thisTest.getUrl() + "/parent/A/B",
-                    true, true, false, null,
+                    true, true, false, false, false, null, null,
                     new ConstMsg("Copy WC to URL"), null);
 
         // update the WC to get new folder and confirm the copy
@@ -992,6 +1097,221 @@ public class BasicTests extends SVNTests
                      update(thisTest), 3);
     }
 
+
+    // Set up externals references in the working copy for the
+    // pin-externals tests.
+    private void setupPinExternalsTest(OneTest thisTest) throws Throwable
+    {
+        byte[] extref = ("^/A/D/H ADHext\n" +
+                         "^/A/D/H ADHext2\n" +
+                         "^/A/D/H@1 peggedADHext\n" +
+                         "-r1 ^/A/D/H revvedADHext\n").getBytes();
+        Set<String> paths = new HashSet<String>();
+        paths.add(thisTest.getWCPath() + "/A/B");
+
+        // Add an externals reference to the working copy.
+        client.propertySetLocal(paths, "svn:externals", extref,
+                                Depth.empty, null, false);
+
+        // Commit the externals definition
+        client.commit(thisTest.getWCPathSet(), Depth.infinity,
+                      false, false, null, null,
+                      new ConstMsg("Set svn:externals"), null);
+
+        // Update the working copy to bring in the external subtree.
+        client.update(thisTest.getWCPathSet(), Revision.HEAD,
+                      Depth.unknown, false, false, false, false);
+    }
+
+    /**
+     * Test WC-to-WC copy with implicit pinned externals
+     * @throws Throwable
+     */
+    public void testCopyPinExternals_wc2wc() throws Throwable
+    {
+        // build the test setup
+        OneTest thisTest = new OneTest();
+        setupPinExternalsTest(thisTest);
+
+        List<CopySource> sources = new ArrayList<CopySource>(1);
+        sources.add(new CopySource(thisTest.getWCPath() + "/A/B", null, null));
+        String target = thisTest.getWCPath() + "/A/Bcopy";
+        client.copy(sources, target, true, false, false, false,
+                    true,       // pinExternals
+                    null,       // externalsToPin
+                    null, null, null);
+
+        // Verification
+        String expected = ("^/A/D/H@2 ADHext\n" +
+                           "^/A/D/H@2 ADHext2\n" +
+                           "^/A/D/H@1 peggedADHext\n" +
+                           "-r1 ^/A/D/H@2 revvedADHext\n");
+        String actual =
+            new String(client.propertyGet(target, "svn:externals", null, null));
+
+        assertEquals(expected, actual);
+    }
+
+    /**
+     * Test WC-to-REPO copy with implicit pinned externals
+     * @throws Throwable
+     */
+    public void testCopyPinExternals_wc2repo() throws Throwable
+    {
+        // build the test setup
+        OneTest thisTest = new OneTest();
+        setupPinExternalsTest(thisTest);
+
+        List<CopySource> sources = new ArrayList<CopySource>(1);
+        sources.add(new CopySource(thisTest.getWCPath() + "/A/B", null, null));
+        String target = thisTest.getUrl() + "/A/Bcopy";
+        client.copy(sources, target, true, false, false, false,
+                    true,       // pinExternals
+                    null,       // externalsToPin
+                    null, new ConstMsg("Copy WC to REPO"), null);
+
+        // Verification
+        String expected = ("^/A/D/H@2 ADHext\n" +
+                           "^/A/D/H@2 ADHext2\n" +
+                           "^/A/D/H@1 peggedADHext\n" +
+                           "-r1 ^/A/D/H@2 revvedADHext\n");
+        String actual =
+            new String(client.propertyGet(target, "svn:externals", null, null));
+
+        assertEquals(expected, actual);
+    }
+
+    /**
+     * Test REPO-to-WC copy with implicit pinned externals
+     * @throws Throwable
+     */
+    public void testCopyPinExternals_repo2wc() throws Throwable
+    {
+        // build the test setup
+        OneTest thisTest = new OneTest();
+        setupPinExternalsTest(thisTest);
+
+        List<CopySource> sources = new ArrayList<CopySource>(1);
+        sources.add(new CopySource(thisTest.getUrl() + "/A/B", null, null));
+        String target = thisTest.getWCPath() + "/A/Bcopy";
+        client.copy(sources, target, true, false, false, false,
+                    true,       // pinExternals
+                    null,       // externalsToPin
+                    null, null, null);
+
+        // Verification
+        String expected = ("^/A/D/H@2 ADHext\n" +
+                           "^/A/D/H@2 ADHext2\n" +
+                           "^/A/D/H@1 peggedADHext\n" +
+                           "-r1 ^/A/D/H@2 revvedADHext\n");
+        String actual =
+            new String(client.propertyGet(target, "svn:externals", null, null));
+
+        assertEquals(expected, actual);
+    }
+
+    /**
+     * Test REPO-to-REPO copy with implicit pinned externals
+     * @throws Throwable
+     */
+    public void testCopyPinExternals_repo2repo() throws Throwable
+    {
+        // build the test setup
+        OneTest thisTest = new OneTest();
+        setupPinExternalsTest(thisTest);
+
+        List<CopySource> sources = new ArrayList<CopySource>(1);
+        sources.add(new CopySource(thisTest.getUrl() + "/A/B", null, null));
+        String target = thisTest.getUrl() + "/A/Bcopy";
+        client.copy(sources, target, true, false, false, false,
+                    true,       // pinExternals
+                    null,       // externalsToPin
+                    null, new ConstMsg("Copy WC to REPO"), null);
+
+        // Verification
+        String expected = ("^/A/D/H@2 ADHext\n" +
+                           "^/A/D/H@2 ADHext2\n" +
+                           "^/A/D/H@1 peggedADHext\n" +
+                           "-r1 ^/A/D/H@2 revvedADHext\n");
+        String actual =
+            new String(client.propertyGet(target, "svn:externals", null, null));
+
+        assertEquals(expected, actual);
+    }
+
+    /**
+     * Test REPO-to-REPO copy with eplicit pinned externals
+     * @throws Throwable
+     */
+    public void testCopyPinExternals_repo2repo_explicit() throws Throwable
+    {
+        // build the test setup
+        OneTest thisTest = new OneTest();
+        setupPinExternalsTest(thisTest);
+
+        String sourceUrl = thisTest.getUrl() + "/A/B";
+        Map<String, List<ExternalItem>> externalsToPin =
+            new HashMap<String, List<ExternalItem>>();
+        List<ExternalItem> items = new ArrayList<ExternalItem>(1);
+        items.add(new ExternalItem("ADHext", "^/A/D/H", null, null));
+        externalsToPin.put(sourceUrl, items);
+
+        List<CopySource> sources = new ArrayList<CopySource>(1);
+        sources.add(new CopySource(sourceUrl, null, null));
+        String target = thisTest.getUrl() + "/A/Bcopy";
+        client.copy(sources, target, true, false, false, false,
+                    true,       // pinExternals
+                    externalsToPin,
+                    null, new ConstMsg("Copy WC to REPO"), null);
+
+        // Verification
+        String expected = ("^/A/D/H@2 ADHext\n" +
+                           "^/A/D/H ADHext2\n" +
+                           "^/A/D/H@1 peggedADHext\n" +
+                           "-r1 ^/A/D/H revvedADHext\n");
+        String actual =
+            new String(client.propertyGet(target, "svn:externals", null, null));
+
+        assertEquals(expected, actual);
+    }
+
+    /**
+     * Test REPO-to-REPO copy with explicit pinned externals that
+     * don't correspond to actual externals
+     * @throws Throwable
+     */
+    public void testCopyPinExternals_repo2repo_corkscrew() throws Throwable
+    {
+        // build the test setup
+        OneTest thisTest = new OneTest();
+        setupPinExternalsTest(thisTest);
+
+        String sourceUrl = thisTest.getUrl() + "/A/B";
+        Map<String, List<ExternalItem>> externalsToPin =
+            new HashMap<String, List<ExternalItem>>();
+        List<ExternalItem> items = new ArrayList<ExternalItem>(1);
+        items.add(new ExternalItem("ADHext", "^/A/D/H", null, null));
+        externalsToPin.put(sourceUrl + "/A", items);
+
+        List<CopySource> sources = new ArrayList<CopySource>(1);
+        sources.add(new CopySource(sourceUrl, null, null));
+        String target = thisTest.getUrl() + "/A/Bcopy";
+        client.copy(sources, target, true, false, false, false,
+                    true,       // pinExternals
+                    externalsToPin,
+                    null, new ConstMsg("Copy WC to REPO"), null);
+
+        // Verification
+        String expected = ("^/A/D/H ADHext\n" +
+                           "^/A/D/H ADHext2\n" +
+                           "^/A/D/H@1 peggedADHext\n" +
+                           "-r1 ^/A/D/H revvedADHext\n");
+        String actual =
+            new String(client.propertyGet(target, "svn:externals", null, null));
+
+        assertEquals(expected, actual);
+    }
+
     /**
      * Test the {@link SVNClientInterface.move()} API.
      * @since 1.5
@@ -1031,7 +1351,8 @@ public class BasicTests extends SVNTests
 
         MyStatusCallback statusCallback = new MyStatusCallback();
         String statusPath = fileToSVNPath(new File(thisTest.getWCPath() + "/A/B"), true);
-        client.status(statusPath, Depth.infinity, false, false, false, true,
+        client.status(statusPath, Depth.infinity,
+                      false, true, false, false, true, false,
                       null, statusCallback);
         Status[] statusList = statusCallback.getStatusArray();
         assertEquals(statusPath + "/F/alpha",
@@ -1054,6 +1375,37 @@ public class BasicTests extends SVNTests
     }
 
     /**
+     * Check that half a move cannot be committed.
+     * @since 1.9
+     */
+    public void testCommitPartialMove() throws Throwable
+    {
+        OneTest thisTest = new OneTest();
+        String root = thisTest.getWorkingCopy().getAbsolutePath();
+        ClientException caught = null;
+
+        Set<String> srcPaths = new HashSet<String>(1);
+        srcPaths.add(root + "/A/B/E/alpha");
+        client.move(srcPaths, root + "/moved-alpha",
+                    false, false, false, false, false, null, null, null);
+
+        try {
+            client.commit(srcPaths, Depth.infinity, false, false, null, null,
+                          new ConstMsg("Commit half of a move"), null);
+        } catch (ClientException ex) {
+            caught = ex;
+        }
+
+        assertNotNull("Commit of partial move did not fail", caught);
+
+        List<ClientException.ErrorMessage> msgs = caught.getAllMessages();
+        assertTrue(msgs.size() >= 3);
+        assertTrue(msgs.get(0).getMessage().startsWith("Illegal target"));
+        assertTrue(msgs.get(1).getMessage().startsWith("Commit failed"));
+        assertTrue(msgs.get(2).getMessage().startsWith("Cannot commit"));
+    }
+
+    /**
      * Assert that the first merge source suggested for
      * <code>destPath</code> at {@link Revision#WORKING} and {@link
      * Revision#HEAD} is equivalent to <code>expectedSrc</code>.
@@ -1368,7 +1720,7 @@ public class BasicTests extends SVNTests
     /**
      * Test the basic SVNClient.cleanup functionality.
      * Without a way to force a lock, this test just verifies
-     * the method can be called succesfully.
+     * the method can be called successfully.
      * @throws Throwable
      */
     public void testBasicCleanup() throws Throwable
@@ -1770,7 +2122,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",
@@ -1798,7 +2150,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);
@@ -2194,7 +2546,7 @@ public class BasicTests extends SVNTests
     }
 
     /**
-     * Test the basic SVNClient.info2 functionality.
+     * Test the basic SVNClient.info functionality.
      * @throws Throwable
      * @since 1.2
      */
@@ -2270,8 +2622,9 @@ public class BasicTests extends SVNTests
         assertTrue(changelists.equals(cl));
         // Does status report this changelist?
         MyStatusCallback statusCallback = new MyStatusCallback();
-        client.status(path, Depth.immediates, false, false, false, false,
-                    null, statusCallback);
+        client.status(path, Depth.immediates,
+                      false, true, false, false, false, false,
+                      null, statusCallback);
         Status[] status = statusCallback.getStatusArray();
         assertEquals(status[0].getChangelist(), changelistName);
 
@@ -2284,6 +2637,33 @@ public class BasicTests extends SVNTests
         assertTrue(clCallback.isEmpty());
     }
 
+    public void testGetAllChangelists() throws Throwable
+    {
+        OneTest thisTest = new OneTest();
+        final String cl1 = "changelist_one";
+        final String cl2 = "changelist_too";
+        MyChangelistCallback clCallback = new MyChangelistCallback();
+
+        String path = fileToSVNPath(new File(thisTest.getWCPath(), "iota"),
+                                    true);
+        Set<String> paths = new HashSet<String>(1);
+        paths.add(path);
+        client.addToChangelist(paths, cl1, Depth.infinity, null);
+        paths.remove(path);
+
+        path = fileToSVNPath(new File(thisTest.getWCPath(), "A/B/lambda"),
+                             true);
+        paths.add(path);
+        client.addToChangelist(paths, cl2, Depth.infinity, null);
+
+        client.getChangelists(thisTest.getWCPath(), null,
+                              Depth.infinity, clCallback);
+        Collection<String> changelists = clCallback.getChangelists();
+        assertEquals(2, changelists.size());
+        assertTrue("Contains " + cl1, changelists.contains(cl1));
+        assertTrue("Contains " + cl2, changelists.contains(cl2));
+    }
+
     /**
      * Helper method for testing mergeinfo retrieval.  Assumes
      * that <code>targetPath</code> has both merge history and
@@ -2315,7 +2695,7 @@ public class BasicTests extends SVNTests
         List<RevisionRange> ranges = mergeInfo.getRevisions(mergeSrc);
         assertTrue("Missing merge info for source '" + mergeSrc + "' on '" +
                    targetPath + '\'', ranges != null && !ranges.isEmpty());
-        RevisionRange range = (RevisionRange) ranges.get(0);
+        RevisionRange range = ranges.get(0);
         String expectedMergedRevs = expectedMergeStart + "-" + expectedMergeEnd;
         assertEquals("Unexpected first merged revision range for '" +
                      mergeSrc + "' on '" + targetPath + '\'',
@@ -2578,6 +2958,7 @@ public class BasicTests extends SVNTests
      * @throws Throwable
      * @since 1.5
      */
+    @SuppressWarnings("deprecation")
     public void testMergeReintegrate() throws Throwable
     {
         OneTest thisTest = setupAndPerformMerge();
@@ -2649,6 +3030,74 @@ public class BasicTests extends SVNTests
 
     }
 
+
+    /**
+     * Test reintegrating a branch with trunk, using automatic reintegrate.
+     */
+    public void testMergeAutoReintegrate() throws Throwable
+    {
+        OneTest thisTest = setupAndPerformMerge();
+
+        // Test that getMergeinfo() returns null.
+        assertNull(client.getMergeinfo(new File(thisTest.getWCPath(), "A")
+                                       .toString(), Revision.HEAD));
+
+        // Merge and commit some changes to main (r4).
+        appendText(thisTest, "A/mu", "xxx", 4);
+        checkCommitRevision(thisTest,
+                            "wrong revision number from main commit", 4,
+                            thisTest.getWCPathSet(), "log msg", Depth.infinity,
+                            false, false, null, null);
+        // Merge and commit some changes to branch (r5).
+        appendText(thisTest, "branches/A/D/G/rho", "yyy", -1);
+        checkCommitRevision(thisTest,
+                            "wrong revision number from branch commit", 5,
+                            thisTest.getWCPathSet(), "log msg", Depth.infinity,
+                            false, false, null, null);
+
+        // update the branch WC (to r5) before merge
+        update(thisTest, "/branches");
+
+        String branchPath = thisTest.getWCPath() + "/branches/A";
+        String modUrl = thisTest.getUrl() + "/A";
+        Revision unspec = new Revision(Revision.Kind.unspecified);
+        List<RevisionRange> ranges = new ArrayList<RevisionRange>(1);
+        ranges.add(new RevisionRange(unspec, unspec));
+        client.merge(modUrl, Revision.HEAD, ranges,
+                     branchPath, true, Depth.infinity, false, false, false);
+
+        // commit the changes so that we can verify merge
+        addExpectedCommitItem(thisTest.getWCPath(), thisTest.getUrl().toString(),
+                              "branches/A", NodeKind.dir,
+                              CommitItemStateFlags.PropMods);
+        addExpectedCommitItem(thisTest.getWCPath(), thisTest.getUrl().toString(),
+                              "branches/A/mu", NodeKind.file,
+                              CommitItemStateFlags.TextMods);
+        checkCommitRevision(thisTest, "wrong revision number from commit", 6,
+                            thisTest.getWCPathSet(), "log msg", Depth.infinity,
+                            false, false, null, null);
+
+        // now we reintegrate the branch with main
+        String branchUrl = thisTest.getUrl() + "/branches/A";
+        client.merge(branchUrl, Revision.HEAD, null,
+                     thisTest.getWCPath() + "/A", false,
+                     Depth.unknown, false, false, false, false);
+
+        // make the working copy up-to-date, so that mergeinfo can be committed
+        update(thisTest);
+        // commit the changes so that we can verify merge
+        addExpectedCommitItem(thisTest.getWCPath(),
+                             thisTest.getUrl().toString(), "A", NodeKind.dir,
+                              CommitItemStateFlags.PropMods);
+        addExpectedCommitItem(thisTest.getWCPath(),
+                             thisTest.getUrl().toString(), "A/D/G/rho",
+                             NodeKind.file, CommitItemStateFlags.TextMods);
+        checkCommitRevision(thisTest, "wrong revision number from commit", 7,
+                            thisTest.getWCPathSet(), "log msg", Depth.infinity,
+                            false, false, null, null);
+
+    }
+
     /**
      * Test automatic merge conflict resolution.
      * @throws Throwable
@@ -2781,7 +3230,7 @@ public class BasicTests extends SVNTests
         srcs.add(new CopySource(thisTest.getUrl() + "/A", Revision.HEAD,
                                 Revision.HEAD));
         client.copy(srcs, thisTest.getUrl() + "/branches/A",
-                    true, false, false, null,
+                    true, false, false, false, false, null, null,
                     new ConstMsg("create A branch"), null);
 
         // update the WC (to r3) so that it has the branches folder
@@ -2824,7 +3273,7 @@ public class BasicTests extends SVNTests
                              // Do nothing, right now.
                             return false;
                          }
-    	});
+        });
     }
 
     /**
@@ -2885,7 +3334,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)
@@ -3234,7 +3683,7 @@ public class BasicTests extends SVNTests
 
         // Rigorously inspect one of our DiffSummary notifications.
         final String BETA_PATH = "A/B/E/beta";
-        DiffSummary betaDiff = (DiffSummary) summaries.get(BETA_PATH);
+        DiffSummary betaDiff = summaries.get(BETA_PATH);
         assertNotNull("No diff summary for " + BETA_PATH, betaDiff);
         assertEquals("Incorrect path for " + BETA_PATH, BETA_PATH,
                      betaDiff.getPath());
@@ -3299,6 +3748,16 @@ public class BasicTests extends SVNTests
         }
     }
 
+    private static class CountingProgressListener implements ProgressCallback
+    {
+        public void onProgress(ProgressEvent event)
+        {
+            // TODO: Examine the byte counts from "event".
+            gotProgress = true;
+        }
+        public boolean gotProgress = false;
+    }
+
     public void testDataTransferProgressReport() throws Throwable
     {
         // ### FIXME: This isn't working over ra_local, because
@@ -3308,25 +3767,13 @@ public class BasicTests extends SVNTests
 
         // build the test setup
         OneTest thisTest = new OneTest();
-        ProgressCallback listener = new ProgressCallback()
-        {
-            public void onProgress(ProgressEvent event)
-            {
-                // TODO: Examine the byte counts from "event".
-                throw new RuntimeException("Progress reported as expected");
-            }
-        };
+        CountingProgressListener listener = new CountingProgressListener();
         client.setProgressCallback(listener);
 
         // Perform an update to exercise the progress notification.
-        try
-        {
-            update(thisTest);
+        update(thisTest);
+        if (!listener.gotProgress)
             fail("No progress reported");
-        }
-        catch (RuntimeException progressReported)
-        {
-        }
     }
 
     /**
@@ -3665,11 +4112,46 @@ public class BasicTests extends SVNTests
                      false, false, callback);
         assertEquals(1, callback.numberOfLines());
         BlameCallbackImpl.BlameLine line = callback.getBlameLine(0);
-        if (line != null)
-        {
-            assertEquals(1, line.getRevision());
-            assertEquals("jrandom", line.getAuthor());
+        assertNotNull(line);
+        assertEquals(1, line.getRevision());
+        assertEquals("jrandom", line.getAuthor());
+        assertEquals("This is the file 'iota'.", line.getLine());
+    }
+
+    /**
+     * Test blame with diff options.
+     * @since 1.9
+     */
+    public void testBlameWithDiffOptions() throws Throwable
+    {
+        OneTest thisTest = new OneTest();
+        // Modify the file iota, making only whitespace changes.
+        File iota = new File(thisTest.getWorkingCopy(), "iota");
+        FileOutputStream stream = new FileOutputStream(iota, false);
+        stream.write("This   is   the   file   'iota'.\t".getBytes());
+        stream.close();
+        Set<String> srcPaths = new HashSet<String>(1);
+        srcPaths.add(thisTest.getWCPath());
+        try {
+            client.username("rayjandom");
+            client.commit(srcPaths, Depth.infinity, false, false, null, null,
+                          new ConstMsg("Whitespace-only change in /iota"), null);
+        } finally {
+            client.username("jrandom");
         }
+
+        // Run blame on the result
+        BlameCallbackImpl callback = new BlameCallbackImpl();
+        client.blame(thisTest.getWCPath() + "/iota", Revision.HEAD,
+                     Revision.getInstance(1), Revision.HEAD,
+                     false, false, callback,
+                     new DiffOptions(DiffOptions.Flag.IgnoreWhitespace));
+        assertEquals(1, callback.numberOfLines());
+        BlameCallbackImpl.BlameLine line = callback.getBlameLine(0);
+        assertNotNull(line);
+        assertEquals(1, line.getRevision());
+        assertEquals("jrandom", line.getAuthor());
+        assertEquals("This   is   the   file   'iota'.\t", line.getLine());
     }
 
     /**
@@ -3745,6 +4227,149 @@ public class BasicTests extends SVNTests
     }
 
     /**
+     * Test RevisionRangeList.remove
+     */
+    public void testRevisionRangeListRemove() throws Throwable
+    {
+        RevisionRangeList ranges =
+            new RevisionRangeList(new ArrayList<RevisionRange>());
+        ranges.getRanges()
+            .add(new RevisionRange(Revision.getInstance(1),
+                                   Revision.getInstance(5),
+                                   true));
+        ranges.getRanges()
+            .add(new RevisionRange(Revision.getInstance(7),
+                                   Revision.getInstance(9),
+                                   false));
+        RevisionRangeList eraser =
+            new RevisionRangeList(new ArrayList<RevisionRange>());
+        eraser.getRanges()
+            .add(new RevisionRange(Revision.getInstance(7),
+                                   Revision.getInstance(9),
+                                   true));
+
+        List<RevisionRange> result = ranges.remove(eraser, true).getRanges();
+        assertEquals(2, ranges.getRanges().size());
+        assertEquals(1, eraser.getRanges().size());
+        assertEquals(2, result.size());
+
+        result = ranges.remove(eraser.getRanges(), false);
+        assertEquals(2, ranges.getRanges().size());
+        assertEquals(1, eraser.getRanges().size());
+        assertEquals(1, result.size());
+    }
+
+    private class Tunnel extends Thread
+        implements TunnelAgent, TunnelAgent.CloseTunnelCallback
+    {
+        public boolean checkTunnel(String name)
+        {
+            return name.equals("test");
+        }
+
+        public TunnelAgent.CloseTunnelCallback
+            openTunnel(ReadableByteChannel request,
+                       WritableByteChannel response,
+                       String name, String user,
+                       String hostname, int port)
+        {
+            this.request = request;
+            this.response = response;
+            start();
+            return this;
+        }
+
+        public void closeTunnel()
+        {
+            Throwable t = null;
+            try {
+                request.close();
+                join();
+                response.close();
+            } catch (Throwable ex) {
+                t = ex;
+            }
+            assertEquals("No exception thrown", null, t);
+        }
+
+        private ReadableByteChannel request;
+        private WritableByteChannel response;
+
+        public void run()
+        {
+
+            int index = 0;
+            byte[] raw_data = new byte[1024];
+            ByteBuffer data = ByteBuffer.wrap(raw_data);
+            while(index < commands.length && request.isOpen()) {
+                try {
+                    byte[] command = commands[index++];
+                    response.write(ByteBuffer.wrap(command));
+                } catch (IOException ex) {
+                    break;
+                }
+
+                try {
+                    data.clear();
+                    request.read(data);
+                } catch (Throwable ex) {}
+            }
+
+            try {
+                response.close();
+                request.close();
+            } catch (Throwable t) {}
+        }
+
+        private final byte[][] commands = new byte[][]{
+            // Initial capabilities negotiation
+            ("( success ( 2 2 ( ) " +
+             "( edit-pipeline svndiff1 absent-entries commit-revprops " +
+             "depth log-revprops atomic-revprops partial-replay " +
+             "inherited-props ephemeral-txnprops file-revs-reverse " +
+             ") ) ) ").getBytes(),
+
+            // Response for successful connection
+            ("( success ( ( ANONYMOUS EXTERNAL ) " +
+             "36:e3c8c113-03ba-4ec5-a8e6-8fc555e57b91 ) ) ").getBytes(),
+
+            // Response to authentication request
+            ("( success ( ) ) ( success ( " +
+             "36:e3c8c113-03ba-4ec5-a8e6-8fc555e57b91 " +
+             "24:svn+test://localhost/foo ( mergeinfo ) ) ) ").getBytes(),
+
+            // Response to revprop request
+            ("( success ( ( ) 0: ) ) ( success ( ( 4:fake ) ) ) ").getBytes()
+        };
+    }
+
+    /**
+     * Test tunnel handling.
+     */
+    public void testTunnelAgent() throws Throwable
+    {
+        byte[] revprop;
+        SVNClient cl = new SVNClient();
+        try {
+            cl.notification2(new MyNotifier());
+            if (DefaultAuthn.useDeprecated())
+                cl.setPrompt(DefaultAuthn.getDeprecated());
+            else
+                cl.setPrompt(DefaultAuthn.getDefault());
+            cl.username(USERNAME);
+            cl.setProgressCallback(new DefaultProgressListener());
+            cl.setConfigDirectory(conf.getAbsolutePath());
+
+            cl.setTunnelAgent(new Tunnel());
+            revprop = cl.revProperty("svn+test://localhost/foo", "svn:log",
+                                     Revision.getInstance(0L));
+        } finally {
+            cl.dispose();
+        }
+        assertEquals("fake", new String(revprop));
+    }
+
+    /**
      * @return <code>file</code> converted into a -- possibly
      * <code>canonical</code>-ized -- Subversion-internal path
      * representation.
@@ -3797,8 +4422,16 @@ public class BasicTests extends SVNTests
         extends HashMap<String, Collection<String>>
         implements ChangelistCallback
     {
+        private static final long serialVersionUID = 1L;
+
+        private HashSet<String> allChangelists = new HashSet<String>();
+
         public void doChangelist(String path, String changelist)
         {
+            if (changelist != null)
+                allChangelists.add(changelist);
+
+            path = fileToSVNPath(new File(path), true);
             if (super.containsKey(path))
             {
                 // Append the changelist to the existing list
@@ -3818,6 +4451,11 @@ public class BasicTests extends SVNTests
         {
             return super.get(path);
         }
+
+        public Collection<String> getChangelists()
+        {
+            return allChangelists;
+        }
     }
 
     private class MyInfoCallback implements InfoCallback {
@@ -3970,8 +4608,9 @@ public class BasicTests extends SVNTests
     {
        final List<Info> infos = new ArrayList<Info>();
 
-        client.info2(pathOrUrl, revision, pegRevision, depth, changelists,
-                     new InfoCallback () {
+       client.info(pathOrUrl, revision, pegRevision, depth,
+                   true, true, false,
+                   changelists, new InfoCallback () {
             public void singleInfo(Info info)
             { infos.add(info); }
         });
diff --git a/subversion/bindings/javahl/tests/org/apache/subversion/javahl/ExceptionTests.java b/subversion/bindings/javahl/tests/org/apache/subversion/javahl/ExceptionTests.java
new file mode 100644
index 0000000..d1ccf35
--- /dev/null
+++ b/subversion/bindings/javahl/tests/org/apache/subversion/javahl/ExceptionTests.java
@@ -0,0 +1,354 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+package org.apache.subversion.javahl;
+
+import org.apache.subversion.javahl.callback.*;
+import org.apache.subversion.javahl.types.*;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.ByteArrayOutputStream;
+import java.io.UnsupportedEncodingException;
+import java.nio.ByteBuffer;
+import java.nio.channels.ReadableByteChannel;
+import java.nio.channels.WritableByteChannel;
+import java.text.ParseException;
+import java.util.Collection;
+import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.Map;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+
+
+/**
+ * Tests the basic functionality of javahl binding (inspired by the
+ * tests in subversion/tests/cmdline/basic_tests.py).
+ */
+public class ExceptionTests extends SVNTests
+{
+    /**
+     * Base name of all our tests.
+     */
+    public final static String testName = "exception_test";
+
+    public ExceptionTests()
+    {
+        init();
+    }
+
+    public ExceptionTests(String name)
+    {
+        super(name);
+        init();
+    }
+
+    /**
+     * Initialize the testBaseName and the testCounter, if this is the
+     * first test of this class.
+     */
+    private void init()
+    {
+        if (!testName.equals(testBaseName))
+        {
+            testCounter = 0;
+            testBaseName = testName;
+        }
+    }
+
+    /**
+     * Specific exception class to verify if the marshalling of errors
+     * through Subversion is handled properly.
+     */
+    final class TestException extends RuntimeException
+    {
+        private static final long serialVersionUID = 1L;
+
+        public TestException(String message)
+        {
+            super(message);
+        }
+
+        public TestException(String message, Throwable cause)
+        {
+            super(message, cause);
+        }
+    }
+
+    public void testStatusCallback() throws Exception
+    {
+        // build the test setup
+        OneTest thisTest = new OneTest();
+
+        final TestException theException = new TestException("The Exception");
+        boolean handled = false;
+        // Test status of non-existent file
+        try
+        {
+            client.status(thisTest.getWorkingCopy() + "/A", Depth.immediates,
+                          false, true, true, false, false, false, null,
+                          new StatusCallback()
+                          {
+                            public void doStatus(String path, Status status)
+                            {
+                                throw new TestException("inner", theException);
+                            }
+                          });
+        }
+        catch (ClientException e)
+        {
+            if (VerifyCause(e, theException))
+                handled = true;
+            else
+                throw e;
+        }
+        assertTrue(handled);
+    }
+
+    public void testInfoCallback() throws Exception
+    {
+        // build the test setup
+        OneTest thisTest = new OneTest();
+
+        final TestException theException = new TestException("The Exception");
+        boolean handled = false;
+        // Test status of non-existent file
+        try
+        {
+            client.info(thisTest.getWorkingCopy() + "/A", null, null, Depth.immediates,
+                        true, true, false, null,
+                          new InfoCallback()
+                          {
+                            public void singleInfo(Info info)
+                            {
+                                throw new TestException("inner", theException);
+                            }
+                          });
+        }
+        catch (ClientException e)
+        {
+            if (VerifyCause(e, theException))
+                handled = true;
+            else
+                throw e;
+        }
+        assertTrue(handled);
+    }
+
+    public void testListCallback() throws Exception
+    {
+        // build the test setup
+        OneTest thisTest = new OneTest();
+
+        final TestException theException = new TestException("The Exception");
+        boolean handled = false;
+        // Test status of non-existent file
+        try
+        {
+            client.list(thisTest.getWorkingCopy() + "/A", null, null, Depth.immediates,
+                        7, false,
+                        new ListCallback()
+                          {
+                            public void doEntry(DirEntry dirent, Lock lock)
+                            {
+                                throw new TestException("inner", theException);
+                            }
+                          });
+        }
+        catch (ClientException e)
+        {
+            if (VerifyCause(e, theException))
+                handled = true;
+            else
+                throw e;
+        }
+        assertTrue(handled);
+    }
+
+    public void testBlameCallback() throws Exception
+    {
+        // build the test setup
+        OneTest thisTest = new OneTest();
+
+        final TestException theException = new TestException("The Exception");
+        boolean handled = false;
+        // Test status of non-existent file
+        try
+        {
+            client.blame(thisTest.getWorkingCopy() + "/iota",
+                         Revision.getInstance(1), Revision.getInstance(1),
+                         Revision.getInstance(1), false, false,
+                         new BlameCallback()
+                          {
+                            public void singleLine(long lineNum, long revision,
+                                                   Map<String, byte[]> revProps, long mergedRevision,
+                                                   Map<String, byte[]> mergedRevProps,
+                                                   String mergedPath, String line,
+                                                   boolean localChange)
+                            {
+                                throw new TestException("inner", theException);
+                            }
+                          });
+        }
+        catch (ClientException e)
+        {
+            if (VerifyCause(e, theException))
+                handled = true;
+            else
+                throw e;
+        }
+        assertTrue(handled);
+    }
+
+    public void testLogMessageCallback() throws Exception
+    {
+        // build the test setup
+        OneTest thisTest = new OneTest();
+
+        final TestException theException = new TestException("The Exception");
+        boolean handled = false;
+        // Test status of non-existent file
+        try
+        {
+            List<RevisionRange> ranges = new ArrayList<RevisionRange>(1);
+            ranges.add(new RevisionRange(null, null));
+            client.logMessages(thisTest.getWorkingCopy() + "/iota",
+                               Revision.getInstance(1), ranges,
+                               false, false, false,
+                               null, 2,
+                               new LogMessageCallback()
+                               {
+                                    public void singleMessage(
+                                                  Set<ChangePath> changedPaths,
+                                                  long revision,
+                                                  Map<String, byte[]> revprops,
+                                                  boolean hasChildren)
+                                    {
+                                        throw new TestException("inner",
+                                                                theException);
+                                    }
+                               });
+        }
+        catch (ClientException e)
+        {
+            if (VerifyCause(e, theException))
+                handled = true;
+            else
+                throw e;
+        }
+        assertTrue(handled);
+    }
+
+    public void testDiffSummaryReceiver() throws Exception
+    {
+        // build the test setup
+        OneTest thisTest = new OneTest();
+
+        final TestException theException = new TestException("The Exception");
+        boolean handled = false;
+        // Test status of non-existent file
+        try
+        {
+            List<RevisionRange> ranges = new ArrayList<RevisionRange>(1);
+            ranges.add(new RevisionRange(null, null));
+            client.diffSummarize(thisTest.getUrl() + "/A",
+                                 Revision.getInstance(1),
+                                 thisTest.getUrl() + "/A",
+                                 Revision.getInstance(0),
+                                 Depth.infinity, null, true,
+                                 new DiffSummaryCallback()
+                                 {
+                                    public void onSummary(
+                                                  DiffSummary descriptor)
+                                    {
+                                        throw new TestException("inner",
+                                                                theException);
+                                    }
+                               });
+        }
+        catch (ClientException e)
+        {
+            if (VerifyCause(e, theException))
+                handled = true;
+            else
+                throw e;
+        }
+        assertTrue(handled);
+    }
+
+    public void testNotify() throws Exception
+    {
+        // build the test setup
+        OneTest thisTest = new OneTest();
+
+        final TestException theException = new TestException("The Exception");
+        boolean handled = false;
+        // Test status of non-existent file
+        try
+        {
+            client.notification2(new ClientNotifyCallback()
+                                 {
+                                    public void onNotify(ClientNotifyInformation info)
+                                    {
+                                        throw new TestException("inner",
+                                                                theException);
+                                    }
+                                });
+
+            client.remove(thisTest.getWCPathSet("/A"), false, false,
+                          null, null, null);
+        }
+        catch (ClientException e)
+        {
+            if (VerifyCause(e, theException))
+                handled = true;
+            else
+                throw e;
+        }
+        assertTrue(handled);
+    }
+
+    /**
+     * Verifies if a specific throwable instance is recorded in the exception chain
+     */
+    private boolean VerifyCause(Throwable caught, Throwable needle)
+    {
+        if (caught == needle)
+            return true;
+
+        Throwable cause = caught.getCause();
+        if (cause == null)
+            return false;
+
+        return VerifyCause(cause, needle);
+    }
+}
diff --git a/subversion/bindings/javahl/tests/org/apache/subversion/javahl/RunTests.java b/subversion/bindings/javahl/tests/org/apache/subversion/javahl/RunTests.java
index 7779a60..ba7e228 100644
--- a/subversion/bindings/javahl/tests/org/apache/subversion/javahl/RunTests.java
+++ b/subversion/bindings/javahl/tests/org/apache/subversion/javahl/RunTests.java
@@ -71,7 +71,7 @@ public class RunTests
                     try
                     {
                         Class<?> clazz = Class.forName(className);
-                        final Class<?>[] argTypes = new Class[] { String.class };
+                        final Class<?>[] argTypes = new Class<?>[] { String.class };
                         Constructor<?> ctor =
                             clazz.getDeclaredConstructor(argTypes);
                         methodName = methodName.substring(i + 1);
@@ -91,8 +91,11 @@ public class RunTests
             if (testCases == null || testCases.length == 0)
             {
                 // Add default test suites.
-                suite.addTestSuite(SVNReposTests.class);
                 suite.addTestSuite(BasicTests.class);
+                suite.addTestSuite(UtilTests.class);
+                suite.addTestSuite(SVNRemoteTests.class);
+                suite.addTestSuite(SVNReposTests.class);
+                suite.addTestSuite(ExceptionTests.class);
             }
             else
             {
diff --git a/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java b/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java
new file mode 100644
index 0000000..b557416
--- /dev/null
+++ b/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java
@@ -0,0 +1,1444 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+package org.apache.subversion.javahl;
+
+import org.apache.subversion.javahl.*;
+import org.apache.subversion.javahl.remote.*;
+import org.apache.subversion.javahl.callback.*;
+import org.apache.subversion.javahl.types.*;
+
+import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+/**
+ * This class is used for testing the SVNReposAccess class
+ *
+ * More methodes for testing are still needed
+ */
+public class SVNRemoteTests extends SVNTests
+{
+    protected OneTest thisTest;
+
+    public SVNRemoteTests()
+    {
+    }
+
+    public SVNRemoteTests(String name)
+    {
+        super(name);
+    }
+
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+
+        thisTest = new OneTest();
+    }
+
+    public static ISVNRemote getSession(String url, String configDirectory)
+    {
+        try
+        {
+            RemoteFactory factory = new RemoteFactory();
+            factory.setConfigDirectory(configDirectory);
+            factory.setUsername(USERNAME);
+            // Do not set default password, exercise prompter instead.
+            if (DefaultAuthn.useDeprecated())
+                factory.setPrompt(DefaultAuthn.getDeprecated());
+            else
+                factory.setPrompt(DefaultAuthn.getDefault());
+
+            ISVNRemote raSession = factory.openRemoteSession(url);
+            assertNotNull("Null session was returned by factory", raSession);
+            return raSession;
+        }
+        catch (Exception ex)
+        {
+            throw new RuntimeException(ex);
+        }
+    }
+
+    private ISVNRemote getSession()
+    {
+        return getSession(getTestRepoUrl(), super.conf.getAbsolutePath());
+    }
+
+    /**
+     * Test the basic SVNAdmin.create functionality
+     * @throws SubversionException
+     */
+    public void testCreate()
+        throws SubversionException, IOException
+    {
+        assertTrue("repository exists", thisTest.getRepository().exists());
+    }
+
+    public void testGetSession_ConfigConstructor() throws Exception
+    {
+        ISVNRemote session;
+        try
+        {
+            if (DefaultAuthn.useDeprecated())
+                session = new RemoteFactory(
+                    super.conf.getAbsolutePath(),
+                    USERNAME, null, // Do not set default password.
+                    DefaultAuthn.getDeprecated(),
+                    null, null, null)
+                    .openRemoteSession(getTestRepoUrl());
+            else
+                session = new RemoteFactory(
+                    super.conf.getAbsolutePath(),
+                    USERNAME, null, // Do not set default password.
+                    DefaultAuthn.getDefault(),
+                    null, null, null)
+                    .openRemoteSession(getTestRepoUrl());
+        }
+        catch (ClientException ex)
+        {
+            throw new RuntimeException(ex);
+        }
+        assertNotNull("Null session was returned by factory", session);
+        assertEquals(getTestRepoUrl(), session.getSessionUrl());
+    }
+
+    public void testDispose() throws Exception
+    {
+        ISVNRemote session = getSession();
+        session.dispose();
+    }
+
+    public void testSessionGC() throws Exception
+    {
+        int svnErrorCode = 0;
+        try {
+            try {
+                String prefix = getTestRepoUrl().substring(
+                    0, 1 + getTestRepoUrl().lastIndexOf("/"));
+
+            if (DefaultAuthn.useDeprecated())
+                new RemoteFactory(
+                    super.conf.getAbsolutePath(),
+                    USERNAME, null, // Do not set default password.
+                    DefaultAuthn.getDeprecated(),
+                    null, null, null)
+                    .openRemoteSession(prefix + "repositorydoesnotexisthere");
+            else
+                new RemoteFactory(
+                    super.conf.getAbsolutePath(),
+                    USERNAME, null, // Do not set default password.
+                    DefaultAuthn.getDefault(),
+                    null, null, null)
+                    .openRemoteSession(prefix + "repositorydoesnotexisthere");
+            }
+            finally
+            {
+                for(int i = 0; i < 100; i++)
+                {
+                    Runtime.getRuntime().gc(); // GC should run finalize
+
+                    // Do something
+                    byte[] memEater = new byte[1024 * 1024];
+                    Arrays.fill(memEater, (byte) i);
+
+                    // Do some more javahl activity (this url is OK)
+                    final ISVNRemote session = getSession();
+                    session.getLatestRevision();
+                    session.dispose();
+                }
+            }
+        }
+        catch (ClientException ex)
+        {
+            List<ClientException.ErrorMessage> msgs = ex.getAllMessages();
+            svnErrorCode = msgs.get(msgs.size() - 1).getCode();
+        }
+
+        assertTrue(svnErrorCode == 180001    // file:
+                   || svnErrorCode == 210005 // svn:
+                   || svnErrorCode == 2);    // http:
+    }
+
+    public void testDatedRev() throws Exception
+    {
+        ISVNRemote session = getSession();
+
+        long revision = session.getRevisionByDate(new Date());
+        assertEquals(revision, 1);
+    }
+
+    public void testGetLocks() throws Exception
+    {
+        ISVNRemote session = getSession();
+
+        Set<String> iotaPathSet = new HashSet<String>(1);
+        String iotaPath = thisTest.getWCPath() + "/iota";
+        iotaPathSet.add(iotaPath);
+
+        client.lock(iotaPathSet, "foo", false);
+
+        Map<String, Lock> locks = session.getLocks("iota", Depth.infinity);
+
+        assertEquals(locks.size(), 1);
+        Lock lock = locks.get("/iota");
+        assertNotNull(lock);
+        assertEquals(lock.getOwner(), "jrandom");
+    }
+
+    public void testCheckPath() throws Exception
+    {
+        ISVNRemote session = getSession();
+
+        NodeKind kind = session.checkPath("iota", 1);
+        assertEquals(NodeKind.file, kind);
+
+        kind = session.checkPath("iota", 0);
+        assertEquals(NodeKind.none, kind);
+
+        kind = session.checkPath("A", 1);
+        assertEquals(NodeKind.dir, kind);
+    }
+
+    public void testStat() throws Exception
+    {
+        ISVNRemote session = getSession();
+
+        DirEntry dirent = session.stat("iota", 1);
+        assertEquals(NodeKind.file, dirent.getNodeKind());
+
+        dirent = session.stat("iota", 0);
+        assertNull(dirent);
+
+        dirent = session.stat("A", 1);
+        assertEquals(NodeKind.dir, dirent.getNodeKind());
+    }
+
+    private String getTestRepoUrl()
+    {
+        return thisTest.getUrl().toASCIIString();
+    }
+
+    public void testGetLatestRevision() throws Exception
+    {
+        ISVNRemote session = getSession();
+        long revision = session.getLatestRevision();
+        assertEquals(revision, 1);
+    }
+
+    public void testGetUUID() throws Exception
+    {
+        ISVNRemote session = getSession();
+
+        /*
+         * Test UUID
+         * TODO: Test for actual UUID once test dump file has
+         * fixed UUID
+         */
+        assertNotNull(session.getReposUUID());
+    }
+
+    public void testGetUrl() throws Exception
+    {
+        ISVNRemote session = getSession();
+
+        assertEquals(getTestRepoUrl(), session.getSessionUrl());
+    }
+
+    public void testGetRootUrl() throws Exception
+    {
+        ISVNRemote session = getSession();
+        session.reparent(session.getSessionUrl() + "/A/B/E");
+        assertEquals(getTestRepoUrl(), session.getReposRootUrl());
+    }
+
+    public void testGetUrl_viaSVNClient() throws Exception
+    {
+        ISVNRemote session = client.openRemoteSession(getTestRepoUrl());
+
+        assertEquals(getTestRepoUrl(), session.getSessionUrl());
+    }
+
+    public void testGetUrl_viaSVNClientWorkingCopy() throws Exception
+    {
+        ISVNRemote session = client.openRemoteSession(thisTest.getWCPath());
+
+        assertEquals(getTestRepoUrl(), session.getSessionUrl());
+    }
+
+    public void testReparent() throws Exception
+    {
+        ISVNRemote session = getSession();
+        String newUrl = session.getSessionUrl() + "/A/B/E";
+        session.reparent(newUrl);
+        assertEquals(newUrl, session.getSessionUrl());
+    }
+
+    public void testGetRelativePath() throws Exception
+    {
+        ISVNRemote session = getSession();
+        String baseUrl = session.getSessionUrl() + "/A/B/E";
+        session.reparent(baseUrl);
+
+        String relPath = session.getSessionRelativePath(baseUrl + "/alpha");
+        assertEquals("alpha", relPath);
+
+        relPath = session.getReposRelativePath(baseUrl + "/beta");
+        assertEquals("A/B/E/beta", relPath);
+    }
+
+    public void testGetCommitEditor() throws Exception
+    {
+        ISVNRemote session = getSession();
+        session.getCommitEditor(null, null, null, false);
+    }
+
+    public void testDisposeCommitEditor() throws Exception
+    {
+        ISVNRemote session = getSession();
+        session.getCommitEditor(null, null, null, false);
+        session.dispose();
+    }
+
+    public void testHasCapability() throws Exception
+    {
+        ISVNRemote session = getSession();
+        assert(session.hasCapability(ISVNRemote.Capability.depth));
+    }
+
+    public void testChangeRevpropNoAtomic() throws Exception
+    {
+        Charset UTF8 = Charset.forName("UTF-8");
+        ISVNRemote session = getSession();
+
+        boolean atomic =
+            session.hasCapability(ISVNRemote.Capability.atomic_revprops);
+
+        if (atomic)
+            return;
+
+        boolean exceptioned = false;
+        try
+        {
+            byte[] oldValue = "bumble".getBytes(UTF8);
+            byte[] newValue = "bee".getBytes(UTF8);
+            session.changeRevisionProperty(1, "svn:author",
+                                           oldValue, newValue);
+        }
+        catch (IllegalArgumentException ex)
+        {
+            exceptioned = true;
+        }
+        assert(exceptioned);
+    }
+
+    public void testChangeRevpropAtomic() throws Exception
+    {
+        Charset UTF8 = Charset.forName("UTF-8");
+        ISVNRemote session = getSession();
+
+        boolean atomic =
+            session.hasCapability(ISVNRemote.Capability.atomic_revprops);
+
+        if (!atomic)
+            return;
+
+        byte[] oldValue = client.revProperty(getTestRepoUrl(), "svn:author",
+                                             Revision.getInstance(1));
+        byte[] newValue = "rayjandom".getBytes(UTF8);
+        try
+        {
+            session.changeRevisionProperty(1, "svn:author",
+                                           oldValue, newValue);
+        }
+        catch (ClientException ex)
+        {
+            ClientException.ErrorMessage error = null;
+            for (ClientException.ErrorMessage m : ex.getAllMessages())
+                if (!m.isGeneric()) {
+                    error = m;
+                    break;
+                }
+
+            if (error == null)
+                fail("Failed with no error message");
+
+            if (error.getCode() != 175002 && // SVN_ERR_RA_DAV_REQUEST_FAILED
+                error.getCode() != 165006)   // SVN_ERR_REPOS_DISABLED_FEATURE
+                fail(error.getMessage());
+
+            return;
+        }
+
+        byte[] check = client.revProperty(getTestRepoUrl(), "svn:author",
+                                          Revision.getInstance(1));
+        assertTrue(Arrays.equals(check, newValue));
+    }
+
+    public void testGetRevpropList() throws Exception
+    {
+        Charset UTF8 = Charset.forName("UTF-8");
+        ISVNRemote session = getSession();
+
+        Map<String, byte[]> proplist = session.getRevisionProperties(1);
+        assertTrue(Arrays.equals(proplist.get("svn:author"),
+                                 USERNAME.getBytes(UTF8)));
+    }
+
+    public void testGetRevprop() throws Exception
+    {
+        Charset UTF8 = Charset.forName("UTF-8");
+        ISVNRemote session = getSession();
+
+        byte[] propval = session.getRevisionProperty(1, "svn:author");
+        assertTrue(Arrays.equals(propval, USERNAME.getBytes(UTF8)));
+    }
+
+    public void testGetFile() throws Exception
+    {
+        Charset UTF8 = Charset.forName("UTF-8");
+        ISVNRemote session = getSession();
+
+        ByteArrayOutputStream contents = new ByteArrayOutputStream();
+        HashMap<String, byte[]> properties = new HashMap<String, byte[]>();
+        properties.put("fakename", "fakecontents".getBytes(UTF8));
+        long fetched_rev =
+            session.getFile(Revision.SVN_INVALID_REVNUM, "A/B/lambda",
+                            contents, properties);
+        assertEquals(fetched_rev, 1);
+        assertEquals(contents.toString("UTF-8"),
+                     "This is the file 'lambda'.");
+        for (Map.Entry<String, byte[]> e : properties.entrySet()) {
+            final String key = e.getKey();
+            assertTrue(key.startsWith("svn:entry:")
+                       || key.startsWith("svn:wc:"));
+        }
+    }
+
+    public void testGetDirectory() throws Exception
+    {
+        Charset UTF8 = Charset.forName("UTF-8");
+        ISVNRemote session = getSession();
+
+        HashMap<String, DirEntry> dirents = new HashMap<String, DirEntry>();
+        dirents.put("E", null);
+        dirents.put("F", null);
+        dirents.put("lambda", null);
+        HashMap<String, byte[]> properties = new HashMap<String, byte[]>();
+        properties.put("fakename", "fakecontents".getBytes(UTF8));
+        long fetched_rev =
+            session.getDirectory(Revision.SVN_INVALID_REVNUM, "A/B",
+                                 DirEntry.Fields.all, dirents, properties);
+        assertEquals(fetched_rev, 1);
+        assertEquals(dirents.get("E").getPath(), "E");
+        assertEquals(dirents.get("F").getPath(), "F");
+        assertEquals(dirents.get("lambda").getPath(), "lambda");
+        for (Map.Entry<String, byte[]> e : properties.entrySet()) {
+            final String key = e.getKey();
+            assertTrue(key.startsWith("svn:entry:")
+                       || key.startsWith("svn:wc:"));
+        }
+    }
+
+    private static final class CommitContext implements CommitCallback
+    {
+        public final ISVNEditor editor;
+        public CommitContext(ISVNRemote session, String logstr,
+                             ISVNEditor.ProvideBaseCallback getBase,
+                             ISVNEditor.ProvidePropsCallback getProps,
+                             ISVNEditor.GetNodeKindCallback getKind)
+            throws ClientException
+        {
+            Charset UTF8 = Charset.forName("UTF-8");
+            byte[] log = (logstr == null
+                          ? new byte[0]
+                          : logstr.getBytes(UTF8));
+            HashMap<String, byte[]> revprops = new HashMap<String, byte[]>();
+            revprops.put("svn:log", log);
+
+            // Run the getCommitEditor overloads through their paces, too.
+            if (getBase == null && getProps == null && getKind == null)
+                editor = session.getCommitEditor(revprops, this, null, false);
+            else
+                editor = session.getCommitEditor(revprops, this, null, false,
+                                                 getBase, getProps, getKind);
+        }
+
+        public CommitContext(ISVNRemote session, String logstr)
+            throws ClientException
+        {
+            this(session, logstr, null, null, null);
+        }
+
+        public void commitInfo(CommitInfo info) { this.info = info; }
+        public long getRevision() { return info.getRevision(); }
+
+        private CommitInfo info;
+    }
+
+    private static final class EditorCallbacks
+    {
+        private final String wcpath;
+        private final long revision;
+        private final Map<String, byte[]> props;
+        private final NodeKind kind;
+
+        public EditorCallbacks(String wcpath, long revision,
+                               Map<String, byte[]> props,
+                               NodeKind kind)
+        {
+            this.wcpath = wcpath;
+            this.revision = revision;
+            this.props = props;
+            this.kind = kind;
+        }
+
+        public final ISVNEditor.ProvideBaseCallback getBase =
+            new ISVNEditor.ProvideBaseCallback()
+            {
+                public ISVNEditor.ProvideBaseCallback.ReturnValue
+                getContents(String relpath)
+                {
+                    try {
+                        return new ISVNEditor.ProvideBaseCallback.ReturnValue(
+                            new FileInputStream(wcpath + relpath), revision);
+                    } catch (java.io.FileNotFoundException e) {
+                        throw new RuntimeException(e);
+                    }
+                }
+            };
+
+        public final ISVNEditor.ProvidePropsCallback getProps =
+            new ISVNEditor.ProvidePropsCallback()
+            {
+                public ISVNEditor.ProvidePropsCallback.ReturnValue
+                getProperties(String relpath)
+                {
+                    return new ISVNEditor.ProvidePropsCallback.ReturnValue(
+                        props, revision);
+                }
+            };
+
+        public final ISVNEditor.GetNodeKindCallback getKind =
+            new ISVNEditor.GetNodeKindCallback()
+            {
+                public NodeKind getKind(String relpath, long revision)
+                {
+                    return kind;
+                }
+            };
+    };
+
+    private void testEditorCopy(EditorCallbacks cb) throws Exception
+    {
+        ISVNRemote session = getSession();
+        CommitContext cc =
+            (cb != null
+             ? new CommitContext(session, "Copy A/B/lambda -> A/B/omega",
+                                 cb.getBase, cb.getProps, cb.getKind)
+             : new CommitContext(session, "Copy A/B/lambda -> A/B/omega"));
+
+        try {
+            // FIXME: alter dir A/B first
+            cc.editor.copy("A/B/lambda", 1, "A/B/omega",
+                           Revision.SVN_INVALID_REVNUM);
+            cc.editor.complete();
+        } finally {
+            cc.editor.dispose();
+        }
+
+        assertEquals(2, cc.getRevision());
+        assertEquals(2, session.getLatestRevision());
+        assertEquals(NodeKind.file,
+                     session.checkPath("A/B/lambda",
+                                       Revision.SVN_INVALID_REVNUM));
+        assertEquals(NodeKind.file,
+                     session.checkPath("A/B/omega",
+                                       Revision.SVN_INVALID_REVNUM));
+    }
+
+    public void testEditorCopy() throws Exception
+    {
+        testEditorCopy(null);
+    }
+
+    public void testEditorCopy_WithCallbacks() throws Exception
+    {
+        testEditorCopy(new EditorCallbacks(thisTest.getWCPath(), 1L,
+                                           new HashMap<String, byte[]>(),
+                                           NodeKind.file));
+    }
+
+    public void testEditorMove() throws Exception
+    {
+        ISVNRemote session = getSession();
+        CommitContext cc =
+            new CommitContext(session, "Move A/B/lambda -> A/B/omega");
+
+        try {
+            // FIXME: alter dir A/B first
+            cc.editor.move("A/B/lambda", 1, "A/B/omega",
+                           Revision.SVN_INVALID_REVNUM);
+            cc.editor.complete();
+        } finally {
+            cc.editor.dispose();
+        }
+
+        assertEquals(2, cc.getRevision());
+        assertEquals(2, session.getLatestRevision());
+        assertEquals(NodeKind.none,
+                     session.checkPath("A/B/lambda",
+                                       Revision.SVN_INVALID_REVNUM));
+        assertEquals(NodeKind.file,
+                     session.checkPath("A/B/omega",
+                                       Revision.SVN_INVALID_REVNUM));
+    }
+
+    public void testEditorDelete() throws Exception
+    {
+        ISVNRemote session = getSession();
+        CommitContext cc =
+            new CommitContext(session, "Delete all greek files");
+
+        String[] filePaths = { "iota",
+                               "A/mu",
+                               "A/B/lambda",
+                               "A/B/E/alpha",
+                               "A/B/E/beta",
+                               "A/D/gamma",
+                               "A/D/G/pi",
+                               "A/D/G/rho",
+                               "A/D/G/tau",
+                               "A/D/H/chi",
+                               "A/D/H/omega",
+                               "A/D/H/psi" };
+
+        try {
+            // FIXME: alter a bunch of dirs first
+            for (String path : filePaths)
+                cc.editor.delete(path, 1);
+            cc.editor.complete();
+        } finally {
+            cc.editor.dispose();
+        }
+
+        assertEquals(2, cc.getRevision());
+        assertEquals(2, session.getLatestRevision());
+        for (String path : filePaths)
+            assertEquals(NodeKind.none,
+                         session.checkPath(path, Revision.SVN_INVALID_REVNUM));
+    }
+
+    public void testEditorMkdir() throws Exception
+    {
+        ISVNRemote session = getSession();
+        CommitContext cc = new CommitContext(session, "Make hebrew dir");
+
+        try {
+            // FIXME: alter dir . first
+            cc.editor.addDirectory("ALEPH",
+                                   new ArrayList<String>(),
+                                   new HashMap<String, byte[]>(),
+                                   Revision.SVN_INVALID_REVNUM);
+            cc.editor.complete();
+        } finally {
+            cc.editor.dispose();
+        }
+
+        assertEquals(2, cc.getRevision());
+        assertEquals(2, session.getLatestRevision());
+        assertEquals(NodeKind.dir,
+                     session.checkPath("ALEPH",
+                                       Revision.SVN_INVALID_REVNUM));
+    }
+
+    private void testEditorSetDirProps(EditorCallbacks cb) throws Exception
+    {
+        Charset UTF8 = Charset.forName("UTF-8");
+        ISVNRemote session = getSession();
+
+        byte[] ignoreval = "*.pyc\n.gitignore\n".getBytes(UTF8);
+        byte[] binaryval = new byte[]{(byte)0, (byte)13, (byte)255, (byte)8,
+                                      (byte)127, (byte)128, (byte)129};
+        HashMap<String, byte[]> props = new HashMap<String, byte[]>();
+        props.put("svn:ignore", ignoreval);
+        props.put("binaryprop", binaryval);
+
+        CommitContext cc =
+            (cb != null
+             ? new CommitContext(session, "Add svn:ignore and binaryprop",
+                                 cb.getBase, cb.getProps, cb.getKind)
+             : new CommitContext(session, "Add svn:ignore and binaryprop"));
+        try {
+            cc.editor.alterDirectory("", 1, null, props);
+            cc.editor.complete();
+        } finally {
+            cc.editor.dispose();
+        }
+
+        assertEquals(2, cc.getRevision());
+        assertEquals(2, session.getLatestRevision());
+        assertTrue(Arrays.equals(ignoreval,
+                                 client.propertyGet(session.getSessionUrl(),
+                                                    "svn:ignore",
+                                                    Revision.HEAD,
+                                                    Revision.HEAD)));
+        assertTrue(Arrays.equals(binaryval,
+                                 client.propertyGet(session.getSessionUrl(),
+                                                    "binaryprop",
+                                                    Revision.HEAD,
+                                                    Revision.HEAD)));
+    }
+
+    public void testEditorSetDirProps() throws Exception
+    {
+        testEditorSetDirProps(null);
+    }
+
+    public void testEditorSetDirProps_WithCallbacks() throws Exception
+    {
+        testEditorSetDirProps(new EditorCallbacks(thisTest.getWCPath(), 1L,
+                                                  new HashMap<String, byte[]>(),
+                                                  NodeKind.dir));
+    }
+
+    private static byte[] SHA1(byte[] text) throws NoSuchAlgorithmException
+    {
+        MessageDigest md = MessageDigest.getInstance("SHA-1");
+        return md.digest(text);
+    }
+
+    public void testEditorAddFile() throws Exception
+    {
+        Charset UTF8 = Charset.forName("UTF-8");
+        ISVNRemote session = getSession();
+
+        byte[] eolstyle = "native".getBytes(UTF8);
+        HashMap<String, byte[]> props = new HashMap<String, byte[]>();
+        props.put("svn:eol-style", eolstyle);
+
+        byte[] contents = "This is file 'xi'.".getBytes(UTF8);
+        Checksum hash = new Checksum(SHA1(contents), Checksum.Kind.SHA1);
+        ByteArrayInputStream stream = new ByteArrayInputStream(contents);
+
+        CommitContext cc = new CommitContext(session, "Add A/xi");
+        try {
+            // FIXME: alter dir A first
+            cc.editor.addFile("A/xi", hash, stream, props,
+                              Revision.SVN_INVALID_REVNUM);
+            cc.editor.complete();
+        } finally {
+            cc.editor.dispose();
+        }
+
+        assertEquals(2, cc.getRevision());
+        assertEquals(2, session.getLatestRevision());
+        assertEquals(NodeKind.file,
+                     session.checkPath("A/xi",
+                                       Revision.SVN_INVALID_REVNUM));
+
+        byte[] propval = client.propertyGet(session.getSessionUrl() + "/A/xi",
+                                            "svn:eol-style",
+                                            Revision.HEAD,
+                                            Revision.HEAD);
+        assertTrue(Arrays.equals(eolstyle, propval));
+    }
+
+    public void testEditorDeleteFileProps() throws Exception
+    {
+        Charset UTF8 = Charset.forName("UTF-8");
+        client.propertySetRemote(
+             thisTest.getUrl() + "/iota", 1L,
+             "name", "value".getBytes(UTF8),
+             new CommitMessageCallback() {
+                 public String getLogMessage(Set<CommitItem> elements) {
+                     return "Set property 'name' to 'value'";
+                 }
+             }, false, null, null);
+
+        ISVNRemote session = getSession();
+        HashMap<String, byte[]> props = new HashMap<String, byte[]>();
+        assertEquals(2L, session.getFile(Revision.SVN_INVALID_REVNUM, "iota",
+                                         null, props));
+
+        int propcount = 0;
+        for (Map.Entry<String, byte[]> e : props.entrySet()) {
+            final String key = e.getKey();
+            if (key.startsWith("svn:entry:") || key.startsWith("svn:wc:"))
+                continue;
+            ++propcount;
+        }
+        assertEquals(1, propcount);
+
+        CommitContext cc = new CommitContext(session, "Remove all props");
+        try {
+            props.clear();
+            cc.editor.alterFile("iota", 2L, null, null, props);
+            cc.editor.complete();
+        } finally {
+            cc.editor.dispose();
+        }
+
+        assertEquals(3L, session.getFile(Revision.SVN_INVALID_REVNUM, "iota",
+                                         null, props));
+        propcount = 0;
+        for (Map.Entry<String, byte[]> e : props.entrySet()) {
+            final String key = e.getKey();
+            if (key.startsWith("svn:entry:") || key.startsWith("svn:wc:"))
+                continue;
+            ++propcount;
+        }
+        assertEquals(0, propcount);
+    }
+
+    private void testEditorSetFileContents(EditorCallbacks cb) throws Exception
+    {
+        Charset UTF8 = Charset.forName("UTF-8");
+        ISVNRemote session = getSession();
+
+        byte[] contents = "This is modified file 'alpha'.".getBytes(UTF8);
+        Checksum hash = new Checksum(SHA1(contents), Checksum.Kind.SHA1);
+        ByteArrayInputStream stream = new ByteArrayInputStream(contents);
+
+        CommitContext cc =
+            (cb != null
+             ? new CommitContext(session, "Change contents of A/B/E/alpha",
+                                 cb.getBase, cb.getProps, cb.getKind)
+             : new CommitContext(session, "Change contents of A/B/E/alpha"));
+        try {
+            cc.editor.alterFile("A/B/E/alpha", 1, hash, stream, null);
+            cc.editor.complete();
+        } finally {
+            cc.editor.dispose();
+        }
+
+        assertEquals(2, cc.getRevision());
+        assertEquals(2, session.getLatestRevision());
+        ByteArrayOutputStream checkcontents = new ByteArrayOutputStream();
+        client.streamFileContent(session.getSessionUrl() + "/A/B/E/alpha",
+                                 Revision.HEAD, Revision.HEAD, checkcontents);
+        assertTrue(Arrays.equals(contents, checkcontents.toByteArray()));
+    }
+
+    public void testEditorSetFileContents() throws Exception
+    {
+        testEditorSetFileContents(null);
+    }
+
+    public void testEditorSetFileContents_WithCallbacks() throws Exception
+    {
+        testEditorSetFileContents(new EditorCallbacks(thisTest.getWCPath(), 1L,
+                                                      new HashMap<String, byte[]>(),
+                                                      NodeKind.file));
+    }
+
+    // Sanity check so that we don't forget about unimplemented methods.
+    public void testEditorNotImplemented() throws Exception
+    {
+        ISVNRemote session = getSession();
+
+        HashMap<String, byte[]> props = new HashMap<String, byte[]>();
+        // ArrayList<ISVNEditor.RotatePair> rotation =
+        //     new ArrayList<ISVNEditor.RotatePair>();
+
+        CommitContext cc = new CommitContext(session, "not implemented");
+        try {
+            String exmsg;
+
+            try {
+                exmsg = "";
+                cc.editor.addSymlink("", "", props, 1);
+            } catch (RuntimeException ex) {
+                exmsg = ex.getMessage();
+            }
+            assertEquals("Not implemented: CommitEditor.addSymlink", exmsg);
+
+            try {
+                exmsg = "";
+                cc.editor.alterSymlink("", 1, "", null);
+            } catch (RuntimeException ex) {
+                exmsg = ex.getMessage();
+            }
+            assertEquals("Not implemented: CommitEditor.alterSymlink", exmsg);
+
+        } finally {
+            cc.editor.dispose();
+        }
+    }
+
+    private static final class LogMsg
+    {
+        public Set<ChangePath> changedPaths;
+        public long revision;
+        public Map<String, byte[]> revprops;
+        public boolean hasChildren;
+    }
+
+    private static final class LogReceiver implements LogMessageCallback
+    {
+        public final ArrayList<LogMsg> logs = new ArrayList<LogMsg>();
+
+        public void singleMessage(Set<ChangePath> changedPaths,
+                                  long revision,
+                                  Map<String, byte[]> revprops,
+                                  boolean hasChildren)
+        {
+            LogMsg msg = new LogMsg();
+            msg.changedPaths = changedPaths;
+            msg.revision = revision;
+            msg.revprops = revprops;
+            msg.hasChildren = hasChildren;
+            logs.add(msg);
+        }
+    }
+
+    public void testGetLog() throws Exception
+    {
+        ISVNRemote session = getSession();
+        LogReceiver receiver = new LogReceiver();
+
+        session.getLog(null,
+                       Revision.SVN_INVALID_REVNUM,
+                       Revision.SVN_INVALID_REVNUM,
+                       0, false, false, false, null,
+                       receiver);
+        assertEquals(1, receiver.logs.size());
+        assertTrue(receiver.logs.get(0).revprops.size() > 0);
+
+        receiver.logs.clear();
+        session.reparent(getTestRepoUrl() + "/A");
+        session.getLog(null,
+                       Revision.SVN_INVALID_REVNUM,
+                       0, 0, false, false, false, null,
+                       receiver);
+        assertEquals(2, receiver.logs.size());
+        assertTrue(receiver.logs.get(0).revprops.size() > 0);
+    }
+
+    public void testGetLogMissing() throws Exception
+    {
+        ISVNRemote session = getSession();
+        LogReceiver receiver = new LogReceiver();
+
+        ArrayList<String> paths = new ArrayList<String>(1);
+        paths.add("X");
+
+        boolean exception = false;
+        try {
+            session.getLog(paths,
+                           Revision.SVN_INVALID_REVNUM,
+                           Revision.SVN_INVALID_REVNUM,
+                           0, false, false, false, null,
+                           receiver);
+        } catch (ClientException ex) {
+            assertEquals("Filesystem has no item",
+                         ex.getAllMessages().get(0).getMessage());
+            exception = true;
+        }
+
+        assertEquals(0, receiver.logs.size());
+        assertTrue(exception);
+    }
+
+    public void testConfigHandler() throws Exception
+    {
+        ConfigEvent handler = new ConfigEvent()
+            {
+                public void onLoad(ISVNConfig cfg)
+                {
+                    //System.out.println("config:");
+                    onecat(cfg.config());
+                    //System.out.println("servers:");
+                    onecat(cfg.servers());
+                }
+
+                private void onecat(ISVNConfig.Category cat)
+                {
+                    for (String sec : cat.sections()) {
+                        //System.out.println("  [" + sec + "]");
+                        ISVNConfig.Enumerator en = new ISVNConfig.Enumerator()
+                            {
+                                public void option(String name, String value)
+                                {
+                                    //System.out.println("    " + name
+                                    //                   + " = " + value);
+                                }
+                            };
+                        cat.enumerate(sec, en);
+                    }
+                }
+
+            };
+
+        ISVNRemote session;
+        try
+        {
+            if (DefaultAuthn.useDeprecated())
+                session = new RemoteFactory(
+                    super.conf.getAbsolutePath(),
+                    USERNAME, null, // Do not set default password.
+                    DefaultAuthn.getDeprecated(),
+                    null, handler, null)
+                    .openRemoteSession(getTestRepoUrl());
+            else
+                session = new RemoteFactory(
+                    super.conf.getAbsolutePath(),
+                    USERNAME, null, // Do not set default password.
+                    DefaultAuthn.getDefault(),
+                    null, handler, null)
+                    .openRemoteSession(getTestRepoUrl());
+        }
+        catch (ClientException ex)
+        {
+            throw new RuntimeException(ex);
+        }
+        session.getLatestRevision();
+    }
+
+    private static class RemoteStatusReceiver implements RemoteStatus
+    {
+        static class StatInfo implements Comparable<StatInfo>
+        {
+            public String relpath = null;
+            public char kind = ' '; // F, D, L
+            public boolean textChanged = false;
+            public boolean propsChanged = false;
+            public boolean deleted = false;
+            public Entry info = null;
+
+            StatInfo(String relpath, char kind, boolean added)
+            {
+                this.relpath = relpath;
+                this.kind = kind;
+                this.deleted = !added;
+            }
+
+            StatInfo(String relpath, char kind,
+                     boolean textChanged, boolean propsChanged,
+                     Entry info)
+            {
+                this.relpath = relpath;
+                this.kind = kind;
+                this.textChanged = textChanged;
+                this.propsChanged = propsChanged;
+                this.info = info;
+            }
+
+            @Override
+            public boolean equals(Object statinfo)
+            {
+                final StatInfo that = (StatInfo)statinfo;
+                return this.relpath.equals(that.relpath);
+            }
+
+            @Override
+            public int hashCode()
+            {
+                return this.relpath.hashCode();
+            }
+
+            @Override
+            public int compareTo(StatInfo that)
+            {
+                return this.relpath.compareTo(that.relpath);
+            }
+        }
+
+        private boolean debug;
+
+        public RemoteStatusReceiver()
+        {
+            this.debug = false;
+        }
+
+        public RemoteStatusReceiver(boolean debug)
+        {
+            this.debug = debug;
+        }
+
+        public ArrayList<StatInfo> status = new ArrayList<StatInfo>();
+
+        public void addedDirectory(String relativePath)
+        {
+            if (debug)
+                System.err.println("RemoteStatus:  A   (dir)  " +
+                                   relativePath);
+            status.add(new StatInfo(relativePath, 'D', true));
+        }
+
+        public void addedFile(String relativePath)
+        {
+            if (debug)
+                System.err.println("RemoteStatus:  A   (file) "
+                                   + relativePath);
+            status.add(new StatInfo(relativePath, 'F', true));
+        }
+
+        public void addedSymlink(String relativePath)
+        {
+            if (debug)
+                System.err.println("RemoteStatus:  A   (link) "
+                                   + relativePath);
+            status.add(new StatInfo(relativePath, 'L', true));
+        }
+
+        public void modifiedDirectory(String relativePath,
+                                      boolean childrenModified,
+                                      boolean propsModified,
+                                      Entry nodeInfo)
+        {
+            if (debug)
+                System.err.println("RemoteStatus:  " +
+                                   (childrenModified ? 'M' : '_') +
+                                   (propsModified ? 'M' : '_') +
+                                   "  (dir)  " + relativePath);
+            status.add(new StatInfo(relativePath, 'D',
+                                    childrenModified, propsModified,
+                                    nodeInfo));
+        }
+
+        public void modifiedFile(String relativePath,
+                                 boolean textModified,
+                                 boolean propsModified,
+                                 Entry nodeInfo)
+        {
+            if (debug)
+                System.err.println("RemoteStatus:  " +
+                                   (textModified ? 'M' : '_') +
+                                   (propsModified ? 'M' : '_') +
+                                   "  (file) " + relativePath);
+            status.add(new StatInfo(relativePath, 'F',
+                                    textModified, propsModified,
+                                    nodeInfo));
+        }
+
+        public void modifiedSymlink(String relativePath,
+                                    boolean targetModified,
+                                    boolean propsModified,
+                                    Entry nodeInfo)
+        {
+            if (debug)
+                System.err.println("RemoteStatus:  " +
+                                   (targetModified ? 'M' : '_') +
+                                   (propsModified ? 'M' : '_') +
+                                   "  (link) " + relativePath);
+            status.add(new StatInfo(relativePath, 'L',
+                                    targetModified, propsModified,
+                                    nodeInfo));
+
+        }
+
+        public void deleted(String relativePath)
+        {
+            if (debug)
+                System.err.println("RemoteStatus:  D          "
+                                   + relativePath);
+            status.add(new StatInfo(relativePath, ' ', false));
+        }
+    }
+
+    public void testSimpleStatus() throws Exception
+    {
+        ISVNRemote session = getSession();
+
+        RemoteStatusReceiver receiver = new RemoteStatusReceiver();
+        ISVNReporter rp = session.status(null, Revision.SVN_INVALID_REVNUM,
+                                         Depth.infinity, receiver);
+        try {
+            rp.setPath("", 0, Depth.infinity, true, null);
+            assertEquals(1, rp.finishReport());
+        } finally {
+            rp.dispose();
+        }
+        assertEquals(21, receiver.status.size());
+        session.checkPath("", Revision.SVN_INVALID_REVNUM);
+    }
+
+    public void testTextchangeStatus() throws Exception
+    {
+        ISVNRemote session = getSession();
+
+        CommitMessageCallback cmcb = new CommitMessageCallback() {
+                public String getLogMessage(Set<CommitItem> x) {
+                    return "Content change on A/B/E/alpha";
+                }
+            };
+
+        File alpha = new File(thisTest.getWorkingCopy(), "A/B/E/alpha");
+        FileOutputStream writer = new FileOutputStream(alpha);
+        writer.write("changed alpha text".getBytes());
+        writer.close();
+        client.commit(thisTest.getWCPathSet(), Depth.infinity, false, false,
+                      null, null, cmcb, null);
+
+        RemoteStatusReceiver receiver = new RemoteStatusReceiver();
+        ISVNReporter rp = session.status(null, Revision.SVN_INVALID_REVNUM,
+                                         Depth.infinity, receiver);
+        try {
+            rp.setPath("", 1, Depth.infinity, false, null);
+            assertEquals(2, rp.finishReport());
+        } finally {
+            rp.dispose();
+        }
+
+        assertEquals(5, receiver.status.size());
+
+        // ra_serf returns the entries in inverted order compared to ra_local.
+        Collections.sort(receiver.status);
+        RemoteStatusReceiver.StatInfo mod = receiver.status.get(4);
+        assertEquals("A/B/E/alpha", mod.relpath);
+        assertEquals('F', mod.kind);
+        assertEquals("Text Changed", true, mod.textChanged);
+        assertEquals("Props Changed", false, mod.propsChanged);
+        assertEquals("Node Deleted", false, mod.deleted);
+        assertEquals(2, mod.info.getCommittedRevision());
+    }
+
+    public void testPropchangeStatus() throws Exception
+    {
+        ISVNRemote session = getSession();
+
+        CommitMessageCallback cmcb = new CommitMessageCallback() {
+                public String getLogMessage(Set<CommitItem> x) {
+                    return "Property change on A/D/gamma";
+                }
+            };
+        client.propertySetRemote(getTestRepoUrl() + "/A/D/gamma",
+                                 1L, "foo", "bar".getBytes(), cmcb,
+                                 false, null, null);
+
+        RemoteStatusReceiver receiver = new RemoteStatusReceiver();
+        ISVNReporter rp = session.status(null, Revision.SVN_INVALID_REVNUM,
+                                         Depth.infinity, receiver);
+        try {
+            rp.setPath("", 1, Depth.infinity, false, null);
+            assertEquals(2, rp.finishReport());
+        } finally {
+            rp.dispose();
+        }
+
+        assertEquals(4, receiver.status.size());
+
+        // ra_serf returns the entries in inverted order compared to ra_local.
+        Collections.sort(receiver.status);
+        RemoteStatusReceiver.StatInfo mod = receiver.status.get(3);
+        assertEquals("A/D/gamma", mod.relpath);
+        assertEquals('F', mod.kind);
+        assertEquals("TextChanged", false, mod.textChanged);
+        assertEquals("Props Changed", true, mod.propsChanged);
+        assertEquals("Node Deleted", false, mod.deleted);
+        assertEquals(2, mod.info.getCommittedRevision());
+    }
+
+    public void testDeletedStatus() throws Exception
+    {
+        ISVNRemote session = getSession();
+
+        CommitMessageCallback cmcb = new CommitMessageCallback() {
+                public String getLogMessage(Set<CommitItem> x) {
+                    return "Delete A/mu";
+                }
+            };
+        HashSet<String> paths = new HashSet<String>(1);
+        paths.add(getTestRepoUrl() + "/A/mu");
+        client.remove(paths, false, false, null, cmcb, null);
+
+        RemoteStatusReceiver receiver = new RemoteStatusReceiver();
+        ISVNReporter rp = session.status(null, Revision.SVN_INVALID_REVNUM,
+                                         Depth.infinity, receiver);
+        try {
+            rp.setPath("", 1, Depth.infinity, false, null);
+            assertEquals(2, rp.finishReport());
+        } finally {
+            rp.dispose();
+        }
+        assertEquals(3, receiver.status.size());
+
+        // ra_serf returns the entries in inverted order compared to ra_local.
+        Collections.sort(receiver.status);
+        RemoteStatusReceiver.StatInfo mod = receiver.status.get(2);
+        assertEquals("A/mu", mod.relpath);
+        assertEquals(' ', mod.kind);
+        assertEquals(false, mod.textChanged);
+        assertEquals(false, mod.propsChanged);
+        assertEquals(true, mod.deleted);
+    }
+
+    public void testTrivialMergeinfo() throws Exception
+    {
+        ISVNRemote session = getSession();
+        ArrayList<String> paths = new ArrayList<String>(1);
+        paths.add("");
+
+        Map<String, Mergeinfo> catalog =
+            session.getMergeinfo(paths, 1L, Mergeinfo.Inheritance.explicit,
+                                 false);
+        assertEquals(null, catalog);
+    }
+
+    public void testBranchMergeinfo() throws Exception
+    {
+        CommitMessageCallback cmcb = new CommitMessageCallback() {
+                public String getLogMessage(Set<CommitItem> x) {
+                    return "testBranchMergeinfo";
+                }
+            };
+
+        ISVNRemote session = getSession();
+
+        // Create a branch
+        ArrayList<CopySource> dirA = new ArrayList<CopySource>(1);
+        dirA.add(new CopySource(getTestRepoUrl() + "/A",
+                                Revision.HEAD, Revision.HEAD));
+        client.copy(dirA, getTestRepoUrl() + "/Abranch",
+                    false, false, true, null, cmcb, null);
+
+        // Check mergeinfo on new branch
+        ArrayList<String> paths = new ArrayList<String>(1);
+        paths.add("Abranch");
+        Map<String, Mergeinfo> catalog =
+            session.getMergeinfo(paths, 2L, Mergeinfo.Inheritance.explicit,
+                                 false);
+        assertEquals(null, catalog);
+
+        // Modify source and merge to branch
+        client.propertySetRemote(getTestRepoUrl() + "/A/D/gamma",
+                                 2L, "foo", "bar".getBytes(), cmcb,
+                                 false, null, null);
+        client.update(thisTest.getWCPathSet(), Revision.HEAD, Depth.infinity,
+                      false, false, true, false);
+        client.merge(getTestRepoUrl() + "/A", Revision.HEAD, null,
+                     thisTest.getWCPath() + "/Abranch", false, Depth.infinity,
+                     false, false, false, false);
+        client.commit(thisTest.getWCPathSet(), Depth.infinity, false, false,
+                      null, null, cmcb, null);
+
+        // Check inherited mergeinfo on updated branch
+        paths.set(0, "Abranch/mu");
+        catalog = session.getMergeinfo(paths, 4L,
+                                       Mergeinfo.Inheritance.nearest_ancestor,
+                                       false);
+        assertEquals(1, catalog.size());
+        List<RevisionRange> ranges =
+            catalog.get("Abranch/mu").getRevisions("/A/mu");
+        assertEquals(1, ranges.size());
+        assertEquals("1-3", ranges.get(0).toString());
+    }
+
+    public void testGetLocations() throws Exception
+    {
+        ISVNRemote session = getSession();
+
+        Long expected = new Long(1L);
+        ArrayList<Long> revs = new ArrayList<Long>(3);
+        revs.add(new Long(0L));
+        revs.add(expected);
+
+        Map<Long, String> locs = session.getLocations("A", 1, revs);
+
+        assertEquals(1, locs.size());
+        assertTrue(locs.containsKey(expected));
+        assertEquals("/A", locs.get(expected));
+    }
+
+    public void testGetLocationSegments() throws Exception
+    {
+        ISVNRemote session = getSession();
+
+        List<ISVNRemote.LocationSegment> result =
+            session.getLocationSegments("A", 1,
+                                        Revision.SVN_INVALID_REVNUM,
+                                        Revision.SVN_INVALID_REVNUM);
+        assertEquals(1, result.size());
+        ISVNRemote.LocationSegment seg = result.get(0);
+        assertEquals("A", seg.getPath());
+        assertEquals(1, seg.getStartRevision());
+        assertEquals(1, seg.getEndRevision());
+    }
+
+    public void testGetFileRevisions() throws Exception
+    {
+        ISVNRemote session = getSession();
+
+        List<ISVNRemote.FileRevision> result =
+            session.getFileRevisions("iota", 0, 1, true);
+        assertEquals(1, result.size());
+        ISVNRemote.FileRevision rev = result.get(0);
+        assertEquals("/iota", rev.getPath());
+        assertFalse(rev.isResultOfMerge());
+        assertTrue(rev.hasTextDelta());
+    }
+
+    // This test is a result of a threading bug that was identified in
+    // serf-1.3.2 and earlier. The net result was that opening two RA
+    // sessions to an https:// URL in two parallel threads would cause
+    // a crash in serf, due to the OpenSSL library not being
+    // initialized in a single-threaded context.
+    //
+    // The problem does not appear to exist with other RA methods, but
+    // the test is here just in case someone is actually pedantic
+    // enough to test JavaHL with an HTTPS setup.
+    public void testParallelOpen() throws Exception
+    {
+        final Runnable runnable = new Runnable() {
+                @Override
+                public void run() {
+                    ISVNRemote session = null;
+                    try {
+                        session = getSession();
+                        assertEquals(1, session.getLatestRevision());
+                    }
+                    catch (ClientException ex) {
+                        throw new RuntimeException(ex);
+                    }
+                    finally {
+                        if (session != null)
+                            session.dispose();
+                    }
+                }
+            };
+
+        Thread thread1 = new Thread(runnable);
+        Thread thread2 = new Thread(runnable);
+
+        thread1.start();
+        thread2.start();
+
+        thread1.join();
+        thread2.join();
+    }
+}
diff --git a/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNReposTests.java b/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNReposTests.java
index 5171218..dcee0ff 100644
--- a/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNReposTests.java
+++ b/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNReposTests.java
@@ -26,6 +26,7 @@ import org.apache.subversion.javahl.callback.*;
 import org.apache.subversion.javahl.types.*;
 
 import java.io.File;
+import java.io.FileWriter;
 import java.io.FileInputStream;
 import java.io.OutputStream;
 import java.io.InputStream;
@@ -79,12 +80,107 @@ public class SVNReposTests extends SVNTests
     public void testVerify()
         throws SubversionException, IOException
     {
-        OneTest thisTest = new OneTest(false);
+        OneTest thisTest = new OneTest(false, true);
         admin.verify(thisTest.getRepository(), Revision.getInstance(0),
                      Revision.HEAD, null);
     }
 
-    /* This test only tests the call down to the C++ layer. */
+    private class VerifyCallback implements ReposVerifyCallback
+    {
+        public int mderr = 0;
+        public int reverr = 0;
+        public boolean keepGoing = false;
+
+        public void onVerifyError(long revision, ClientException verifyError)
+            throws ClientException
+        {
+            if (revision == Revision.SVN_INVALID_REVNUM) {
+                ++mderr;
+            }
+            else {
+                ++reverr;
+            }
+            if (keepGoing) {
+                return;
+            }
+            else {
+                throw verifyError;
+            }
+        }
+
+    }
+
+    private boolean tryToBreakRepo(OneTest test) throws IOException
+    {
+        File repo = test.getRepository();
+
+        // Check for a sharded repo first
+        File rev1 = new File(repo, "db/revs/0/1");
+        if (!rev1.exists() || !rev1.setWritable(true))
+        {
+            // Try non-sharded
+            rev1 = new File(repo, "db/revs/1");
+        }
+        if (!rev1.exists() || !rev1.setWritable(true))
+            return false;
+
+        FileWriter fd = new FileWriter(rev1);
+        fd.write("inserting junk to corrupt the rev");
+        fd.close();
+        return true;
+    }
+
+    public void testVerifyBrokenRepo() throws Throwable
+    {
+        OneTest thisTest = new OneTest(false, true);
+
+        if (!tryToBreakRepo(thisTest)) {
+            // We don't support the repos format
+            System.err.print("Cannot break repository for verify test.");
+            return;
+        }
+
+        VerifyCallback cb = new VerifyCallback();
+        cb.keepGoing = false;
+
+        try {
+            admin.verify(thisTest.getRepository(),
+                         Revision.getInstance(0),
+                         Revision.HEAD,
+                         false, false, null, cb);
+        }
+        catch(ClientException ex) {
+            assertEquals(cb.mderr, 1);
+            assertEquals(cb.reverr, 0);
+            return;
+        }
+
+        assert("Verify did not catch repository corruption." == "");
+    }
+
+    public void testVerifyBrokenRepo_KeepGoing() throws Throwable
+    {
+        OneTest thisTest = new OneTest(false, true);
+
+        if (!tryToBreakRepo(thisTest)) {
+            // We don't support the repos format
+            System.err.print("Cannot break repository for verify test.");
+            return;
+        }
+
+        VerifyCallback cb = new VerifyCallback();
+        cb.keepGoing = true;
+
+        admin.verify(thisTest.getRepository(),
+                     Revision.getInstance(0),
+                     Revision.HEAD,
+                     false, false, null, cb);
+
+        assertEquals(cb.mderr, 1);
+        assertEquals(cb.reverr, 1);
+    }
+
+    /* this test only tests the call down to the C++ layer. */
     public void testUpgrade()
         throws SubversionException, IOException
     {
diff --git a/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java b/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java
index dd79925..885c6c5 100644
--- a/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java
+++ b/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java
@@ -173,7 +173,18 @@ class SVNTests extends TestCase
 
     private void init()
     {
-        // if not already set, get a usefull value for rootDir
+        String disableCredStore = System.getProperty("test.disablecredstore");
+        if (disableCredStore != null)
+        {
+            try {
+                SVNUtil.disableNativeCredentialsStore();
+            } catch(Throwable ex) {
+                System.err.println("*** ERROR: Could not disable" +
+                                   " the native credentials store");
+            }
+        }
+
+        // if not already set, get a useful value for rootDir
         if (rootDirectoryName == null)
             rootDirectoryName = System.getProperty("test.rootdir");
         if (rootDirectoryName == null)
@@ -246,10 +257,11 @@ class SVNTests extends TestCase
         greekRepos = new File(localTmp, "repos");
         greekDump = new File(localTmp, "greek_dump");
         admin.create(greekRepos, true,false, null, this.fsType);
-        addExpectedCommitItem(greekFiles.getAbsolutePath(), null, null,
-                              NodeKind.none, CommitItemStateFlags.Add);
+        addExpectedCommitItem(greekFiles.getAbsolutePath(),
+                              makeReposUrl(greekRepos).toString(), null,
+                              NodeKind.dir, CommitItemStateFlags.Add);
         client.doImport(greekFiles.getAbsolutePath(),
-                       makeReposUrl(greekRepos).toString(),
+                        makeReposUrl(greekRepos).toString(),
                         Depth.infinity, false, false, null,
                         new MyCommitMessage(), null);
         admin.dump(greekRepos, new FileOutputStream(greekDump),
@@ -285,66 +297,140 @@ class SVNTests extends TestCase
     {
         this.client = new SVNClient();
         this.client.notification2(new MyNotifier());
-        this.client.setPrompt(new DefaultPromptUserPassword());
+        if (DefaultAuthn.useDeprecated())
+            this.client.setPrompt(DefaultAuthn.getDeprecated());
+        else
+            this.client.setPrompt(DefaultAuthn.getDefault());
         this.client.username(USERNAME);
         this.client.setProgressCallback(new DefaultProgressListener());
         this.client.setConfigDirectory(this.conf.getAbsolutePath());
         this.expectedCommitItems = new HashMap<String, MyCommitItem>();
     }
     /**
-     * the default prompt : never prompts the user, provides defaults answers
+     * the default prompts : never prompt the user, provide default answers
      */
-    protected static class DefaultPromptUserPassword implements UserPasswordCallback
+    protected static class DefaultAuthn
     {
-
-        public int askTrustSSLServer(String info, boolean allowPermanently)
+        public static boolean useDeprecated()
         {
-            return UserPasswordCallback.AcceptTemporary;
+            String prop = System.getProperty("test.authn.deprecated");
+            return (prop != null && !prop.isEmpty());
         }
 
-        public String askQuestion(String realm, String question, boolean showAnswer)
+        public static AuthnCallback getDefault()
         {
-            return "";
+            return new DefaultAuthnCallback();
         }
 
-        public boolean askYesNo(String realm, String question, boolean yesIsDefault)
+        @SuppressWarnings("deprecation")
+        public static UserPasswordCallback getDeprecated()
         {
-            return yesIsDefault;
+            return new DeprecatedAuthnCallback();
         }
 
-        public String getPassword()
+        private static class DefaultAuthnCallback
+            implements AuthnCallback
         {
-            return PASSWORD;
-        }
+            public UsernameResult
+                usernamePrompt(String realm, boolean maySave)
+            {
+                return new UsernameResult(USERNAME);
+            }
 
-        public String getUsername()
-        {
-            return USERNAME;
-        }
+            public UserPasswordResult
+                userPasswordPrompt(String realm, String username,
+                                   boolean maySave)
+            {
+                return new UserPasswordResult(USERNAME, PASSWORD);
+            }
 
-        public boolean prompt(String realm, String username)
-        {
-            return false;
-        }
+            public SSLServerTrustResult
+                sslServerTrustPrompt(String realm,
+                                     SSLServerCertFailures failures,
+                                     SSLServerCertInfo info,
+                                     boolean maySave)
+            {
+                return SSLServerTrustResult.acceptTemporarily();
+            }
 
-        public boolean prompt(String realm, String username, boolean maySave)
-        {
-            return false;
-        }
+            public SSLClientCertResult
+                sslClientCertPrompt(String realm, boolean maySave)
+            {
+                return null;
+            }
 
-        public String askQuestion(String realm, String question,
-                boolean showAnswer, boolean maySave)
-        {
-            return "";
+            public SSLClientCertPassphraseResult
+                sslClientCertPassphrasePrompt(String realm, boolean maySave)
+            {
+                return null;
+            }
+
+            public boolean allowStorePlaintextPassword(String realm)
+            {
+                return false;
+            }
+
+            public boolean allowStorePlaintextPassphrase(String realm)
+            {
+                return false;
+            }
         }
 
-        public boolean userAllowedSave()
+        @SuppressWarnings("deprecation")
+        private static class DeprecatedAuthnCallback
+            implements UserPasswordCallback
         {
-            return false;
+            public int askTrustSSLServer(String info, boolean allowPermanently)
+            {
+                return UserPasswordCallback.AcceptTemporary;
+            }
+
+            public String askQuestion(String realm, String question,
+                                      boolean showAnswer)
+            {
+                return "";
+            }
+
+            public boolean askYesNo(String realm, String question,
+                                    boolean yesIsDefault)
+            {
+                return yesIsDefault;
+            }
+
+            public String getPassword()
+            {
+                return PASSWORD;
+            }
+
+            public String getUsername()
+            {
+                return USERNAME;
+            }
+
+            public boolean prompt(String realm, String username)
+            {
+                return true;
+            }
+
+            public boolean prompt(String realm, String username, boolean maySave)
+            {
+                return true;
+            }
+
+            public String askQuestion(String realm, String question,
+                                      boolean showAnswer, boolean maySave)
+            {
+                return "";
+            }
+
+            public boolean userAllowedSave()
+            {
+                return false;
+            }
         }
     }
 
-    private static class DefaultProgressListener implements ProgressCallback
+    protected static class DefaultProgressListener implements ProgressCallback
     {
 
         public void onProgress(ProgressEvent event)
@@ -782,7 +868,8 @@ class SVNTests extends TestCase
         {
             MyStatusCallback statusCallback = new MyStatusCallback();
             client.status(workingCopy.getAbsolutePath(), Depth.unknown,
-                          checkRepos, true, true, false, null, statusCallback);
+                          checkRepos, false, true, true, false, false,
+                          null, statusCallback);
             wc.check(statusCallback.getStatusArray(),
                     workingCopy.getAbsolutePath(), checkRepos);
         }
@@ -916,7 +1003,7 @@ class SVNTests extends TestCase
 
         public Status[] getStatusArray()
         {
-            return (Status[]) statuses.toArray(new Status[statuses.size()]);
+            return statuses.toArray(new Status[statuses.size()]);
         }
     }
 }
diff --git a/subversion/bindings/javahl/tests/org/apache/subversion/javahl/UtilTests.java b/subversion/bindings/javahl/tests/org/apache/subversion/javahl/UtilTests.java
new file mode 100644
index 0000000..6ddba91
--- /dev/null
+++ b/subversion/bindings/javahl/tests/org/apache/subversion/javahl/UtilTests.java
@@ -0,0 +1,807 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one
+ *    or more contributor license agreements.  See the NOTICE file
+ *    distributed with this work for additional information
+ *    regarding copyright ownership.  The ASF licenses this file
+ *    to you under the Apache License, Version 2.0 (the
+ *    "License"); you may not use this file except in compliance
+ *    with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing,
+ *    software distributed under the License is distributed on an
+ *    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *    KIND, either express or implied.  See the License for the
+ *    specific language governing permissions and limitations
+ *    under the License.
+ * ====================================================================
+ * @endcopyright
+ */
+
+package org.apache.subversion.javahl;
+
+import org.apache.subversion.javahl.types.ExternalItem;
+import org.apache.subversion.javahl.types.NodeKind;
+import org.apache.subversion.javahl.types.Revision;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+
+/**
+ * Tests the JavaHL SVNUtil APIs.
+ */
+public class UtilTests extends SVNTests
+{
+    private final static String NL = System.getProperty("line.separator");
+
+    /**
+     * Base name of all our tests.
+     */
+    public final static String testName = "util_test";
+
+    public UtilTests()
+    {
+        init();
+    }
+
+    public UtilTests(String name)
+    {
+        super(name);
+        init();
+    }
+
+    /**
+     * Initialize the testBaseName and the testCounter, if this is the
+     * first test of this class.
+     */
+    private void init()
+    {
+        if (!testName.equals(testBaseName))
+        {
+            testCounter = 0;
+            testBaseName = testName;
+        }
+    }
+
+    private final byte[] fileContentsPrefix = "1\n2\n3\n4\n".getBytes();
+    private final byte[] fileContentsSuffix = "N-3\nN-2\nN-1\nN\n".getBytes();
+
+    private void writeFileContents(File file, String contents) throws Throwable
+    {
+        FileOutputStream out = new FileOutputStream(file);
+        out.write(fileContentsPrefix);
+        out.write(contents.getBytes());
+        out.write(fileContentsSuffix);
+        out.close();
+    }
+
+    public void testFileDiff() throws Throwable
+    {
+        File original = File.createTempFile("merge", ".original", localTmp);
+        File modified = File.createTempFile("merge", ".modified", localTmp);
+
+        writeFileContents(original, "\noriginal\n\n");
+        writeFileContents(modified, "\nmodified\n\n");
+
+        ByteArrayOutputStream result = new ByteArrayOutputStream();
+        boolean diffs =  SVNUtil.fileDiff(original.getAbsolutePath(),
+                                          modified.getAbsolutePath(),
+                                          null, "original", "modified", "UTF-8",
+                                          null, result);
+        assertTrue(diffs);
+
+        final byte[] expected = ("--- original" + NL +
+                                 "+++ modified" + NL +
+                                 "@@ -3,7 +3,7 @@" + NL +
+                                 " 3\n 4\n \n" +
+                                 "-original\n" +
+                                 "+modified\n" +
+                                 " \n N-3\n N-2\n").getBytes();
+        assertTrue(Arrays.equals(expected, result.toByteArray()));
+    }
+
+    public void testFileMerge() throws Throwable
+    {
+        File original = File.createTempFile("merge", ".original", localTmp);
+        File modified = File.createTempFile("merge", ".modified", localTmp);
+        File latest = File.createTempFile("merge", ".latest", localTmp);
+
+        writeFileContents(original, "\noriginal\n\n");
+        writeFileContents(modified, "\nmodified\n\n");
+        writeFileContents(latest, "\nlatest\n\n");
+
+        ByteArrayOutputStream result = new ByteArrayOutputStream();
+        boolean conflicts = SVNUtil.fileMerge(original.getAbsolutePath(),
+                                              modified.getAbsolutePath(),
+                                              latest.getAbsolutePath(),
+                                              null,
+                                              "||||||| base",
+                                              "<<<<<<< branch",
+                                              ">>>>>>> local",
+                                              "=======",
+                                              SVNUtil.ConflictDisplayStyle.modified_original_latest,
+                                              result);
+        assertTrue(conflicts);
+
+        final byte[] expected = ("1\n2\n3\n4\n\n" +
+                                 "<<<<<<< branch\n" +
+                                 "modified\n" +
+                                 "||||||| base\n" +
+                                 "original\n" +
+                                 "=======\n" +
+                                 "latest\n" +
+                                 ">>>>>>> local\n" +
+                                 "\nN-3\nN-2\nN-1\nN\n").getBytes();
+        assertTrue(Arrays.equals(expected, result.toByteArray()));
+    }
+
+    public void testValidateProp() throws Throwable
+    {
+        File temp = File.createTempFile("propcheck", ".file", localTmp);
+        FileOutputStream out = new FileOutputStream(temp);
+        out.write("normal text\n".getBytes());
+        out.close();
+
+        byte[] prop = SVNUtil.canonicalizeNodeProperty(
+                           "svn:eol-style", "  native".getBytes(),
+                           "propcheck.file", NodeKind.file,
+                           "text/plain");
+        assertEquals("native", new String(prop));
+
+        prop = SVNUtil.canonicalizeNodeProperty(
+                    "svn:eol-style", " native  ".getBytes(),
+                    "propcheck.file", NodeKind.file,
+                    "text/plain", new FileInputStream(temp));
+        assertEquals("native", new String(prop));
+
+        boolean caught_exception = false;
+        try {
+            prop = SVNUtil.canonicalizeNodeProperty(
+                        "svn:eol-style", " weird  ".getBytes(),
+                        "propcheck.file", NodeKind.file,
+                        "text/plain");
+        } catch (ClientException ex) {
+            assertEquals("Unrecognized line ending style",
+                         ex.getAllMessages().get(0).getMessage());
+            caught_exception = true;
+        }
+        assertTrue(caught_exception);
+
+        out = new FileOutputStream(temp);
+        out.write("inconsistent\r\ntext\n".getBytes());
+        out.close();
+
+        caught_exception = false;
+        try {
+            prop = SVNUtil.canonicalizeNodeProperty(
+                        "svn:eol-style", " native  ".getBytes(),
+                        "propcheck.file", NodeKind.file,
+                        "text/plain", new FileInputStream(temp));
+        } catch (ClientException ex) {
+            assertEquals("Inconsistent line ending style",
+                         ex.getAllMessages().get(2).getMessage());
+            caught_exception = true;
+        }
+        assertTrue(caught_exception);
+    }
+
+
+    private static List<ExternalItem> externals = null;
+    static {
+        try {
+            externals = new ArrayList<ExternalItem>(25);
+            externals.add(new ExternalItem("a", "http://server/repo/path",
+                                           null, null));
+            externals.add(new ExternalItem("b", "//server/repo/path",
+                                           null, null));
+            externals.add(new ExternalItem("c", "/repo/path",
+                                           null, null));
+            externals.add(new ExternalItem("d", "^/path",
+                                           null, null));
+            externals.add(new ExternalItem("e", "^/../oper/path",
+                                           null, null));
+
+            externals.add(new ExternalItem("f", "http://server/repo/path",
+                                           Revision.getInstance(42), null));
+            externals.add(new ExternalItem("g", "//server/repo/path",
+                                           Revision.getInstance(42), null));
+            externals.add(new ExternalItem("h", "/repo/path",
+                                           Revision.getInstance(42), null));
+            externals.add(new ExternalItem("j", "^/path",
+                                           Revision.getInstance(42), null));
+            externals.add(new ExternalItem("j", "^/../oper/path",
+                                           Revision.getInstance(42), null));
+
+            externals.add(new ExternalItem("k", "http://server/repo/path",
+                                           null, Revision.getInstance(42)));
+            externals.add(new ExternalItem("l", "//server/repo/path",
+                                           null, Revision.getInstance(42)));
+            externals.add(new ExternalItem("m", "/repo/path",
+                                           null, Revision.getInstance(42)));
+            externals.add(new ExternalItem("n", "^/path",
+                                           null, Revision.getInstance(42)));
+            externals.add(new ExternalItem("o", "^/../oper/path",
+                                           null, Revision.getInstance(42)));
+
+            externals.add(new ExternalItem("p", "http://server/repo/path",
+                                           Revision.getInstance(69),
+                                           Revision.getInstance(71)));
+            externals.add(new ExternalItem("q", "//server/repo/path",
+                                           Revision.getInstance(69),
+                                           Revision.getInstance(71)));
+            externals.add(new ExternalItem("r", "/repo/path",
+                                           Revision.getInstance(69),
+                                           Revision.getInstance(71)));
+            externals.add(new ExternalItem("s", "^/path",
+                                           Revision.getInstance(69),
+                                           Revision.getInstance(71)));
+            externals.add(new ExternalItem("t", "^/../oper/path",
+                                           Revision.getInstance(69),
+                                           Revision.getInstance(71)));
+
+            externals.add(new ExternalItem("u", "http://server/repo/path",
+                                           Revision.getInstance(42),
+                                           Revision.getInstance(42)));
+            externals.add(new ExternalItem("v", "//server/repo/path",
+                                           Revision.getInstance(42),
+                                           Revision.getInstance(42)));
+            externals.add(new ExternalItem("w", "/repo/path",
+                                           Revision.getInstance(42),
+                                           Revision.getInstance(42)));
+            externals.add(new ExternalItem("x", "^/path",
+                                           Revision.getInstance(42),
+                                           Revision.getInstance(42)));
+            externals.add(new ExternalItem("y", "^/../oper/path",
+                                           Revision.getInstance(42),
+                                           Revision.getInstance(42)));
+        } catch (SubversionException ex) {
+            externals = null;
+            throw new RuntimeException(ex);
+        }
+    }
+
+    private static final byte[] externals_propval =
+        ("http://server/repo/path a\n" +
+         "//server/repo/path b\n" +
+         "/repo/path c\n" +
+         "^/path d\n" +
+         "^/../oper/path e\n" +
+         "-r42 http://server/repo/path f\n" +
+         "-r42 //server/repo/path g\n" +
+         "-r42 /repo/path h\n" +
+         "-r42 ^/path j\n" +
+         "-r42 ^/../oper/path j\n" +
+         "http://server/repo/path@42 k\n" +
+         "//server/repo/path@42 l\n" +
+         "/repo/path@42 m\n" +
+         "^/path@42 n\n" +
+         "^/../oper/path@42 o\n" +
+         "-r69 http://server/repo/path@71 p\n" +
+         "-r69 //server/repo/path@71 q\n" +
+         "-r69 /repo/path@71 r\n" +
+         "-r69 ^/path@71 s\n" +
+         "-r69 ^/../oper/path@71 t\n" +
+         "http://server/repo/path@42 u\n" +
+         "//server/repo/path@42 v\n" +
+         "/repo/path@42 w\n" +
+         "^/path@42 x\n" +
+         "^/../oper/path@42 y\n").getBytes();
+
+    private static List<ExternalItem> old_externals = null;
+    static {
+        try {
+            old_externals = new ArrayList<ExternalItem>(3);
+            old_externals.add(new ExternalItem("X", "http://server/repo/path",
+                                               null, null));
+            old_externals.add(new ExternalItem("Y", "http://server/repo/path",
+                                               null, Revision.getInstance(42)));
+
+            old_externals.add(new ExternalItem("Z", "http://server/repo/path",
+                                               null, Revision.getInstance(new Date(0L))));
+        } catch (SubversionException ex) {
+            old_externals = null;
+            throw new RuntimeException(ex);
+        }
+    }
+
+    private static final byte[] old_externals_propval =
+        ("X http://server/repo/path\n" +
+         "Y -r42 http://server/repo/path\n" +
+         "Z -r{1970-01-01T00:00:00.000000Z} http://server/repo/path\n").getBytes();
+
+    private static void compare_item_lists(List<ExternalItem> a,
+                                           List<ExternalItem> b,
+                                           String list_name)
+    {
+        final int length = a.size();
+        assertEquals(length, b.size());
+        for (int i = 0; i < length; ++i)
+            assertTrue("Items in " + list_name + " at index " + i + " differ",
+                       a.get(i).equals(b.get(i)));
+    }
+
+    public void testParseExternals() throws Throwable
+    {
+        List<ExternalItem> items;
+
+        items = SVNUtil.parseExternals(externals_propval, "dirname", false);
+        compare_item_lists(items, externals, "externals");
+
+        items = SVNUtil.parseExternals(old_externals_propval, "dirname", false);
+        compare_item_lists(items, old_externals, "old_externals");
+    }
+
+    public void testUnparseExternals() throws Throwable
+    {
+        byte[] props = SVNUtil.unparseExternals(externals, "dirname");
+        assertTrue(Arrays.equals(externals_propval, props));
+    }
+
+    public void testUnparseExternalsOldstyle() throws Throwable
+    {
+        byte[] props;
+
+        props = SVNUtil.unparseExternalsForAncientUnsupportedClients(
+                     old_externals, "dirname");
+        assertTrue(Arrays.equals(old_externals_propval, props));
+
+        // The fancy new features are not supported in the old format
+        boolean caught_exception = false;
+        try {
+            props = SVNUtil.unparseExternalsForAncientUnsupportedClients(
+                         externals, "dirname");
+        } catch (SubversionException ex) {
+            caught_exception = true;
+        }
+        assertTrue(caught_exception);
+    }
+
+    public void testResolveExternalsUrl() throws Throwable
+    {
+        assertEquals("http://a/b/c",
+                     SVNUtil.resolveExternalsUrl(
+                         new ExternalItem("x", "http://a/b/c/", null, null),
+                         "http://a", "http://a/b"));
+
+        assertEquals("http://a/b/c",
+                     SVNUtil.resolveExternalsUrl(
+                         new ExternalItem("x", "^/b/c", null, null),
+                         "http://a", "http://a/b"));
+
+        assertEquals("http://a/b/c",
+                     SVNUtil.resolveExternalsUrl(
+                         new ExternalItem("x", "../b/c", null, null),
+                         "http://a", "http://a/b"));
+
+        assertEquals("http://a/b/c",
+                     SVNUtil.resolveExternalsUrl(
+                         new ExternalItem("x", "/b/c", null, null),
+                         "http://a", "http://a/b"));
+
+        assertEquals("http://a/b/c",
+                     SVNUtil.resolveExternalsUrl(
+                         new ExternalItem("x", "//a/b/c", null, null),
+                         "http://a", "http://a/b"));
+    }
+
+    public void testBuildKeywords() throws Throwable
+    {
+        final byte[] kwval = "Id TEST=%H%_%b%_%u".getBytes();
+
+        Map<String, byte[]> result;
+
+        result = SVNUtil.buildKeywords(kwval, Revision.SVN_INVALID_REVNUM,
+                                       null, null, null, null);
+        assertEquals("   ", new String(result.get("Id")));
+        assertEquals("     ", new String(result.get("TEST")));
+
+        result = SVNUtil.buildKeywords(kwval, 42, "http://a/b/c",
+                                       "http://a", new Date(1), "X");
+        assertEquals("c 42 1970-01-01 00:00:00Z X",
+                     new String(result.get("Id")));
+        assertEquals("b/c 42 1970-01-01 00:00:00Z X c http://a/b/c",
+                     new String(result.get("TEST")));
+    }
+
+    public void testTranslateStream() throws Throwable
+    {
+        final byte[] keywordsValue = "Id TEST=%H%_%b%_%u".getBytes();
+        final byte[] contentsContracted = "$Id$\n$TEST$\n".getBytes();
+        final byte[] contentsExpanded =
+            ("$Id: c 42 1970-01-01 00:00:00Z X $\r" +
+             "$TEST: b/c 42 1970-01-01 00:00:00Z X c http://a/b/c $\r"
+             ) .getBytes();
+        final Map<String, byte[]> keywords =
+            SVNUtil.buildKeywords(keywordsValue, 42, "http://a/b/c",
+                                  "http://a", new Date(1), "X");
+        final Map<String, byte[]> null_keywords = new HashMap<String, byte[]>();
+        byte[] buffer = new byte[1024];
+
+        for (Map.Entry<String, byte[]> e : keywords.entrySet())
+            null_keywords.put(e.getKey(), null);
+
+        // InputStream; expand
+        InputStream testin = null;
+        try {
+            testin = SVNUtil.translateStream(
+                         new ByteArrayInputStream(contentsContracted),
+                         SVNUtil.EOL_CR, true, keywords, true);
+            final int size = testin.read(buffer);
+            testin.close();
+            testin = null;
+
+            assertEquals("expand InputStream with concrete keywords",
+                         new String(contentsExpanded),
+                         new String(buffer, 0, size));
+        } finally {
+            if (testin != null) {
+                testin.close();
+                testin = null;
+            }
+        }
+
+        try {
+            testin = SVNUtil.translateStream(
+                         new ByteArrayInputStream(contentsContracted),
+                         SVNUtil.EOL_CR, true, true,
+                         keywordsValue, 42, "http://a/b/c",
+                         "http://a", new Date(1), "X");
+            final int size = testin.read(buffer);
+            testin.close();
+            testin = null;
+
+            assertEquals("expand InputStream with implied keywords",
+                         new String(contentsExpanded),
+                         new String(buffer, 0, size));
+        } finally {
+            if (testin != null) {
+                testin.close();
+                testin = null;
+            }
+        }
+
+        // InputStream; contract
+        try {
+            testin = SVNUtil.translateStream(
+                         new ByteArrayInputStream(contentsExpanded),
+                         SVNUtil.EOL_LF, true, null_keywords, false);
+            final int size = testin.read(buffer);
+            testin.close();
+            testin = null;
+
+            assertEquals("contract InputStream with concrete keywords",
+                         new String(contentsContracted),
+                         new String(buffer, 0, size));
+        } finally {
+            if (testin != null) {
+                testin.close();
+                testin = null;
+            }
+        }
+
+        try {
+            testin = SVNUtil.translateStream(
+                         new ByteArrayInputStream(contentsExpanded),
+                         SVNUtil.EOL_LF, true, false,
+                         keywordsValue, 0, "", "", new Date(1), "");
+            final int size = testin.read(buffer);
+            testin.close();
+            testin = null;
+
+            assertEquals("contract InputStream with implied keywords",
+                         new String(contentsContracted),
+                         new String(buffer, 0, size));
+        } finally {
+            if (testin != null) {
+                testin.close();
+                testin = null;
+            }
+        }
+
+
+        // OutputStream; expand
+        OutputStream testout = null;
+        try {
+            ByteArrayOutputStream result = new ByteArrayOutputStream();
+            testout = SVNUtil.translateStream(
+                         result, SVNUtil.EOL_CR, true, keywords, true);
+            testout.write(contentsContracted);
+            testout.close();
+            testout = null;
+
+            assertEquals("expand OutputStream with concrete keywords",
+                         new String(contentsExpanded), result.toString());
+        } finally {
+            if (testout != null) {
+                testout.close();
+                testout = null;
+            }
+        }
+
+        try {
+            ByteArrayOutputStream result = new ByteArrayOutputStream();
+            testout = SVNUtil.translateStream(
+                         result, SVNUtil.EOL_CR, true, true,
+                         keywordsValue, 42, "http://a/b/c",
+                         "http://a", new Date(1), "X");
+            testout.write(contentsContracted);
+            testout.close();
+            testout = null;
+
+            assertEquals("expand OutputStream with implied keywords",
+                         new String(contentsExpanded), result.toString());
+        } finally {
+            if (testout != null) {
+                testout.close();
+                testout = null;
+            }
+        }
+
+        // OutputStream; contract
+        try {
+            ByteArrayOutputStream result = new ByteArrayOutputStream();
+            testout = SVNUtil.translateStream(
+                         result, SVNUtil.EOL_LF, true, null_keywords, false);
+            testout.write(contentsExpanded);
+            testout.close();
+            testout = null;
+
+            assertEquals("contract OutputStream with concrete keywords",
+                         new String(contentsContracted), result.toString());
+        } finally {
+            if (testout != null) {
+                testout.close();
+                testout = null;
+            }
+        }
+
+        try {
+            ByteArrayOutputStream result = new ByteArrayOutputStream();
+            testout = SVNUtil.translateStream(
+                         result, SVNUtil.EOL_LF, true, false,
+                         keywordsValue, 0, "", "", new Date(1), "");
+            testout.write(contentsExpanded);
+            testout.close();
+            testout = null;
+
+            assertEquals("contract OutputStream with implied keywords",
+                         new String(contentsContracted), result.toString());
+        } finally {
+            if (testout != null) {
+                testout.close();
+                testout = null;
+            }
+        }
+    }
+
+
+    // Credentials definitions for testing the credentials utilities
+    private static final String util_cred_hash =
+        "4d7de6b1e103fbfc5e61565223ca23be";
+
+    private static final String util_cred_username =
+        "K 8\n" +
+        "username\n" +
+        "V 5\n" +
+        "mungo\n" +
+        "K 15\n" +
+        "svn:realmstring\n" +
+        "V 27\n" +
+        "https://svn.example.com:443\n" +
+        "END\n";
+
+    private static final String util_cred_simple =
+        "K 8\n" +
+        "passtype\n" +
+        "V 10\n" +
+        "javahltest\n" +
+        "K 8\n" +
+        "username\n" +
+        "V 5\n" +
+        "mungo\n" +
+        "K 8\n" +
+        "password\n" +
+        "V 6\n" +
+        "secret\n" +
+        "K 15\n" +
+        "svn:realmstring\n" +
+        "V 27\n" +
+        "https://svn.example.com:443\n" +
+        "END\n";
+
+    private static final String util_cred_ssl_server =
+        "K 10\n" +
+        "ascii_cert\n" +
+        "V 1616\n" +
+        "MIIEtzCCA5+gAwIBAgIQWGBOrapkezd+BWVsAtmtmTANBgkqhkiG9w0BAQsFADA8" +
+        "MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMVGhhd3RlLCBJbmMuMRYwFAYDVQQDEw1U" +
+        "aGF3dGUgU1NMIENBMB4XDTE0MDQxMTAwMDAwMFoXDTE2MDQwNzIzNTk1OVowgYsx" +
+        "CzAJBgNVBAYTAlVTMREwDwYDVQQIEwhNYXJ5bGFuZDEUMBIGA1UEBxQLRm9yZXN0" +
+        "IEhpbGwxIzAhBgNVBAoUGkFwYWNoZSBTb2Z0d2FyZSBGb3VuZGF0aW9uMRcwFQYD" +
+        "VQQLFA5JbmZyYXN0cnVjdHVyZTEVMBMGA1UEAxQMKi5hcGFjaGUub3JnMIIBIjAN" +
+        "BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+Tq4mH+stRoxe4xth8tUCgLt+P4L" +
+        "D/JWZz4a2IecaaAk57vIlTxEyP16fUShUfxVJnD0KV11zv2qaEUXNaA6hKd4H/oB" +
+        "u2OyGev+quRM+aFCjWqASkXt7fLGsIkHAwP3XwBVBpARbcXJeCjCBxqaYrQqS8LT" +
+        "wfPUD9eYncGlQ+ixb3Bosy7TmkWKeLsRdS90cAO/rdgQ8OI7kLT/1tr5GpF9RmXo" +
+        "RnVqMP+U0zGd/BNNSneg7emb7TxLzxeMKZ7QbF4MZi8RRN11spvx8/f92CiYrGGu" +
+        "y67VdOGPaomYc+VZ2syLwduHGK40ADrEK3+MQpsRFB0dM08j9bhpr5A44wIDAQAB" +
+        "o4IBYzCCAV8wFwYDVR0RBBAwDoIMKi5hcGFjaGUub3JnMAkGA1UdEwQCMAAwQgYD" +
+        "VR0gBDswOTA3BgpghkgBhvhFAQc2MCkwJwYIKwYBBQUHAgEWG2h0dHBzOi8vd3d3" +
+        "LnRoYXd0ZS5jb20vY3BzLzAOBgNVHQ8BAf8EBAMCBaAwHwYDVR0jBBgwFoAUp6KD" +
+        "uzRFQD381TBPErk+oQGf9tswOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL3N2ci1v" +
+        "di1jcmwudGhhd3RlLmNvbS9UaGF3dGVPVi5jcmwwHQYDVR0lBBYwFAYIKwYBBQUH" +
+        "AwEGCCsGAQUFBwMCMGkGCCsGAQUFBwEBBF0wWzAiBggrBgEFBQcwAYYWaHR0cDov" +
+        "L29jc3AudGhhd3RlLmNvbTA1BggrBgEFBQcwAoYpaHR0cDovL3N2ci1vdi1haWEu" +
+        "dGhhd3RlLmNvbS9UaGF3dGVPVi5jZXIwDQYJKoZIhvcNAQELBQADggEBAF52BLvl" +
+        "x5or9/aO7+cPhxuPxwiNRgbvHdCakD7n8vzjNyct9fKp6/XxB6GQiTZ0nZPJOyIu" +
+        "Pi1QDLKOXvaPeLKDBilL/+mrn/ev3s/aRQSrUsieKDoQnqtmlxEHc/T3+Ni/RZob" +
+        "PD4GzPuNKpK3BIc0fk/95T8R1DjBSQ5/clvkzOKtcl3VffAwnHiE9TZx9js7kZwO" +
+        "b9nOKX8DFao3EpQcS7qn63Ibzbq5A6ry8ZNRQSIJK/xlCAWoyUd1uxnqGFnus8wb" +
+        "9RVZJQe8YvyytBjgbE3QjnfPOxoEJA3twupnPmH+OCTM6V3TZqpRZj/sZ5rtIQ++" +
+        "hI5FdJWUWVSgnSw=\n" +
+        "K 8\n" +
+        "failures\n" +
+        "V 1\n" +
+        "8\n" +
+        "K 15\n" +
+        "svn:realmstring\n" +
+        "V 26\n" +
+        "https://svn.apache.org:443\n" +
+        "END\n";
+
+    private static final String util_cred_ssl_client_passphrase =
+        "K 8\n" +
+        "passtype\n" +
+        "V 10\n" +
+        "javahltest\n" +
+        "K 10\n" +
+        "passphrase\n" +
+        "V 24\n" +
+        "secret with spaces in it\n" +
+        "K 15\n" +
+        "svn:realmstring\n" +
+        "V 27\n" +
+        "https://svn.example.com:443\n" +
+        "END\n";
+
+    // Initialize credentials used for testing credentials utilities
+    private void initCredentials() throws Throwable
+    {
+        File auth = new File(this.conf, "auth");
+        if (auth.exists())
+            removeDirOrFile(auth);
+        auth.mkdirs();
+
+        File store = new File(auth, "svn.username");
+        store.mkdir();
+        FileWriter cred = new FileWriter(new File(store, util_cred_hash));
+        cred.write(util_cred_username);
+        cred.close();
+
+        store = new File(auth, "svn.simple");
+        store.mkdir();
+        cred = new FileWriter(new File(store, util_cred_hash));
+        cred.write(util_cred_simple);
+        cred.close();
+
+        store = new File(auth, "svn.ssl.server");
+        store.mkdir();
+        cred = new FileWriter(new File(store, util_cred_hash));
+        cred.write(util_cred_ssl_server);
+        cred.close();
+
+        store = new File(auth, "svn.ssl.client-passphrase");
+        store.mkdir();
+        cred = new FileWriter(new File(store, util_cred_hash));
+        cred.write(util_cred_ssl_client_passphrase);
+        cred.close();
+    }
+
+    /**
+     * Test credentials search.
+     */
+    public void testCredentials() throws Throwable
+    {
+        initCredentials();
+
+        final String configDir = this.conf.getAbsolutePath();
+        SVNUtil.Credential cred;
+        List<SVNUtil.Credential> creds;
+
+        /* one username credential */
+        cred = SVNUtil.getCredential(configDir,
+                                     SVNUtil.Credential.Kind.username,
+                                     "https://svn.example.com:443");
+        assertNotNull(cred);
+        assertEquals(cred.getUsername(), "mungo");
+
+        /* one simple credential */
+        cred = SVNUtil.getCredential(configDir,
+                                     SVNUtil.Credential.Kind.simple,
+                                     "https://svn.example.com:443");
+        assertNotNull(cred);
+        assertEquals(cred.getUsername(), "mungo");
+        assertEquals(cred.getPassword(), "secret");
+        assertEquals(cred.getSecureStore(), "javahltest");
+
+        /* one SSL server trust credential */
+        cred = SVNUtil.getCredential(configDir,
+                                     SVNUtil.Credential.Kind.sslServer,
+                                     "https://svn.apache.org:443");
+        assertNotNull(cred);
+        assertEquals(cred.getServerCertInfo().getSubject(),
+                     "C=US, ST=Maryland, L=Forest Hill, " +
+                     "O=Apache Software Foundation, OU=Infrastructure, " +
+                     "CN=*.apache.org");
+
+        /* one SSL client passphrase credential */
+        cred = SVNUtil.getCredential(configDir,
+                                     SVNUtil.Credential.Kind.sslClientPassphrase,
+                                     "https://svn.example.com:443");
+        assertNotNull(cred);
+        assertEquals(cred.getClientCertPassphrase(), "secret with spaces in it");
+        assertEquals(cred.getSecureStore(), "javahltest");
+
+        /* search with no parameters (empty return) */
+        creds = SVNUtil.searchCredentials(configDir, null,
+                                          null, null, null, null);
+        assertNull(creds);
+
+        /* search with unmatched parameters */
+        creds = SVNUtil.searchCredentials(configDir,
+                                          SVNUtil.Credential.Kind.sslServer,
+                                          null, null, null, "*java*");
+        assertNull(creds);
+
+        /* search with unmatched parameters */
+        creds = SVNUtil.searchCredentials(configDir, null,
+                                          null, "*java*", null, null);
+        assertNull(creds);
+
+        /* search with match on kind */
+        creds = SVNUtil.searchCredentials(configDir,
+                                          SVNUtil.Credential.Kind.sslServer,
+                                          "*", null, null, null);
+        assertNotNull(creds);
+        assertEquals(creds.size(), 1);
+
+        /* search with match on passtype */
+        creds = SVNUtil.searchCredentials(configDir, null,
+                                          null, null, null, "*java*");
+        assertNotNull(creds);
+        assertEquals(creds.size(), 2);
+
+        /* search with match on username */
+        creds = SVNUtil.searchCredentials(configDir, null,
+                                          null, "mungo", null, null);
+        assertNotNull(creds);
+        assertEquals(creds.size(), 2);
+
+        /* search with match on subvject */
+        creds = SVNUtil.searchCredentials(configDir, null,
+                                          null, null, "\\*.apache.org", null);
+        assertNotNull(creds);
+        assertEquals(creds.size(), 1);
+
+        /* search with match on realm */
+        creds = SVNUtil.searchCredentials(configDir, null,
+                                          "*example*", null, null, null);
+        assertNotNull(creds);
+        assertEquals(creds.size(), 3);
+    }
+}
diff --git a/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java b/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java
index 8190616..20f38f3 100644
--- a/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java
+++ b/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java
@@ -34,11 +34,12 @@ import java.util.Date;
 
 import org.apache.subversion.javahl.types.*;
 
-import junit.framework.Assert;
+import junit.framework.TestCase;
+
 /**
  * This class describe the expected state of the working copy
  */
-public class WC
+public class WC extends TestCase
 {
     /**
      * the map of the items of the working copy. The relative path is the key
@@ -127,6 +128,16 @@ public class WC
     }
 
     /**
+     * Set the depth of the item at a path
+     * @param path      the path, where the status is set
+     * @param depth     the new depth
+     */
+    public void setItemDepth(String path, Depth depth)
+    {
+        items.get(path).depth = depth;
+    }
+
+    /**
      * Set the revision number of the item at a path
      * @param path      the path, where the revision number is set
      * @param revision  the new revision number
@@ -169,9 +180,9 @@ public class WC
         // since having no content signals a directory, changes of removing the
         // content or setting a former not set content is not allowed. That
         // would change the type of the item.
-        Assert.assertNotNull("cannot unset content", content);
+        assertNotNull("cannot unset content", content);
         Item i = items.get(path);
-        Assert.assertNotNull("cannot set content on directory", i.myContent);
+        assertNotNull("cannot set content on directory", i.myContent);
         i.myContent = content;
     }
 
@@ -304,13 +315,13 @@ public class WC
      */
     void check(DirEntry[] tested, String singleFilePath)
     {
-        Assert.assertEquals("not a single dir entry", 1, tested.length);
+        assertEquals("not a single dir entry", 1, tested.length);
         Item item = items.get(singleFilePath);
-        Assert.assertNotNull("not found in working copy", item);
-        Assert.assertNotNull("not a file", item.myContent);
-        Assert.assertEquals("state says file, working copy not",
-                tested[0].getNodeKind(),
-                item.nodeKind == null ? NodeKind.file : item.nodeKind);
+        assertNotNull("not found in working copy", item);
+        assertNotNull("not a file", item.myContent);
+        assertEquals("state says file, working copy not",
+                     tested[0].getNodeKind(),
+                     item.nodeKind == null ? NodeKind.file : item.nodeKind);
     }
 
     /**
@@ -342,19 +353,18 @@ public class WC
         {
             String name = basePath + entry.getPath();
             Item item = items.get(name);
-            Assert.assertNotNull("null paths won't be found in working copy",
-                                 item);
+            assertNotNull("null paths won't be found in working copy", item);
             if (item.myContent != null)
             {
-                Assert.assertEquals("Expected '" + entry + "' to be file",
-                        entry.getNodeKind(),
-                        item.nodeKind == null ? NodeKind.file : item.nodeKind);
+                assertEquals("Expected '" + entry + "' to be file",
+                             entry.getNodeKind(),
+                             item.nodeKind == null ? NodeKind.file : item.nodeKind);
             }
             else
             {
-                Assert.assertEquals("Expected '" + entry + "' to be dir",
-                        entry.getNodeKind(),
-                        item.nodeKind == null ? NodeKind.dir : item.nodeKind);
+                assertEquals("Expected '" + entry + "' to be dir",
+                             entry.getNodeKind(),
+                             item.nodeKind == null ? NodeKind.dir : item.nodeKind);
             }
             item.touched = true;
         }
@@ -369,9 +379,9 @@ public class WC
                         !item.myPath.equals(basePath))
                 {
                     // Non-recursive checks will fail here.
-                    Assert.assertFalse("Expected path '" + item.myPath +
-                                       "' not found in dir entries",
-                                       recursive);
+                    assertFalse("Expected path '" + item.myPath +
+                                "' not found in dir entries",
+                                recursive);
 
                     // Look deeper under the tree.
                     boolean found = false;
@@ -387,8 +397,8 @@ public class WC
                             }
                         }
                     }
-                    Assert.assertTrue("Expected path '" + item.myPath +
-                                       "' not found in dir entries", found);
+                    assertTrue("Expected path '" + item.myPath +
+                               "' not found in dir entries", found);
                 }
             }
         }
@@ -436,14 +446,14 @@ public class WC
         for (Status status : tested)
         {
             String path = status.getPath();
-            Assert.assertTrue("status path starts not with working copy path",
-                    path.startsWith(normalizeWCPath));
+            assertTrue("status path starts not with working copy path",
+                       path.startsWith(normalizeWCPath));
 
             // we calculate the relative path to the working copy root
             if (path.length() > workingCopyPath.length() + 1)
             {
-                Assert.assertEquals("missing '/' in status path",
-                        path.charAt(workingCopyPath.length()), '/');
+                assertEquals("missing '/' in status path",
+                             path.charAt(workingCopyPath.length()), '/');
                 path = path.substring(workingCopyPath.length() + 1);
             }
             else
@@ -451,25 +461,26 @@ public class WC
                 path = "";
 
             Item item = items.get(path);
-            Assert.assertNotNull("status not found in working copy: " + path,
-                    item);
-            Assert.assertEquals("wrong text status in working copy: " + path,
-                    item.textStatus, status.getTextStatus());
+            assertNotNull("status not found in working copy: " + path, item);
+            assertEquals("wrong text status in working copy: " + path,
+                         item.textStatus, status.getTextStatus());
             if (item.workingCopyRev != -1)
-                Assert.assertEquals("wrong revision number in working copy: "
-                            + path,
-                        item.workingCopyRev, status.getRevisionNumber());
-            Assert.assertEquals("lock status wrong: " + path,
-                    item.isLocked, status.isLocked());
-            Assert.assertEquals("switch status wrong: " + path,
-                    item.isSwitched, status.isSwitched());
-            Assert.assertEquals("wrong prop status in working copy: " + path,
-                    item.propStatus, status.getPropStatus());
+                assertEquals("wrong revision number in working copy: " + path,
+                             item.workingCopyRev, status.getRevisionNumber());
+            assertEquals("lock status wrong: " + path,
+                         item.isLocked, status.isLocked());
+            assertEquals("switch status wrong: " + path,
+                         item.isSwitched, status.isSwitched());
+            assertEquals("wrong prop status in working copy: " + path,
+                         item.propStatus, status.getPropStatus());
+            if (item.depth != null)
+                assertEquals("wrong ambient depth in working copy: " + path,
+                             item.depth, status.getDepth());
             if (item.myContent != null)
             {
-                Assert.assertEquals("state says file, working copy not: " + path,
-                        status.getNodeKind(),
-                        item.nodeKind == null ? NodeKind.file : item.nodeKind);
+                assertEquals("state says file, working copy not: " + path,
+                             status.getNodeKind(),
+                             item.nodeKind == null ? NodeKind.file : item.nodeKind);
                 if (status.getTextStatus() == Status.Kind.normal ||
                         item.checkContent)
                 {
@@ -483,26 +494,26 @@ public class WC
                         buffer.append((char) ch);
                     }
                     rd.close();
-                    Assert.assertEquals("content mismatch: " + path,
-                            buffer.toString(), item.myContent);
+                    assertEquals("content mismatch: " + path,
+                                 buffer.toString(), item.myContent);
                 }
             }
             else
             {
-                Assert.assertEquals("state says dir, working copy not: " + path,
-                        status.getNodeKind(),
-                        item.nodeKind == null ? NodeKind.dir : item.nodeKind);
+                assertEquals("state says dir, working copy not: " + path,
+                             status.getNodeKind(),
+                             item.nodeKind == null ? NodeKind.dir : item.nodeKind);
             }
 
             if (checkRepos)
             {
-                Assert.assertEquals("Last commit revisions for OOD path '"
-                                    + item.myPath + "' don't match:",
-                                    item.reposLastCmtRevision,
-                                    status.getReposLastCmtRevisionNumber());
-                Assert.assertEquals("Last commit kinds for OOD path '"
-                                    + item.myPath + "' don't match:",
-                                    item.reposKind, status.getReposKind());
+                assertEquals("Last commit revisions for OOD path '"
+                             + item.myPath + "' don't match:",
+                             item.reposLastCmtRevision,
+                             status.getReposLastCmtRevisionNumber());
+                assertEquals("Last commit kinds for OOD path '"
+                             + item.myPath + "' don't match:",
+                             item.reposKind, status.getReposKind());
 
                 // Only the last committed rev and kind is available for
                 // paths deleted in the repos.
@@ -511,17 +522,17 @@ public class WC
                     long lastCmtTime =
                         (status.getReposLastCmtDate() == null ?
                          0 : status.getReposLastCmtDate().getTime());
-                    Assert.assertEquals("Last commit dates for OOD path '" +
-                                        item.myPath + "' don't match:",
-                                        new Date(item.reposLastCmtDate),
-                                        new Date(lastCmtTime));
-                    Assert.assertEquals("Last commit authors for OOD path '"
-                                        + item.myPath + "' don't match:",
-                                        item.reposLastCmtAuthor,
-                                        status.getReposLastCmtAuthor());
-                    Assert.assertNotNull("URL for path " + item.myPath
-                                         + " should not be null",
-                                         status.getUrl());
+                    assertEquals("Last commit dates for OOD path '" +
+                                 item.myPath + "' don't match:",
+                                 new Date(item.reposLastCmtDate),
+                                 new Date(lastCmtTime));
+                    assertEquals("Last commit authors for OOD path '"
+                                 + item.myPath + "' don't match:",
+                                 item.reposLastCmtAuthor,
+                                 status.getReposLastCmtAuthor());
+                    assertNotNull("URL for path " + item.myPath
+                                  + " should not be null",
+                                  status.getUrl());
                 }
             }
             item.touched = true;
@@ -531,9 +542,9 @@ public class WC
         // result array
         for (Item item : items.values())
         {
-            Assert.assertTrue("item '" + item.myPath +
-                              "' in working copy not found in status",
-                    item.touched);
+            assertTrue("item '" + item.myPath +
+                       "' in working copy not found in status",
+                       item.touched);
         }
     }
 
@@ -563,6 +574,11 @@ public class WC
         Status.Kind propStatus = Status.Kind.none;
 
         /**
+         * the ambient depth of the item.
+         */
+        Depth depth = null;
+
+        /**
          * the expected revision number. -1 means do not check.
          */
         long workingCopyRev = -1;
@@ -635,6 +651,7 @@ public class WC
             myContent = source.myContent;
             textStatus = source.textStatus;
             propStatus = source.propStatus;
+            depth = source.depth;
             owner.items.put(myPath, this);
         }
 
diff --git a/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java b/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
index 3407b96..5d5e022 100644
--- a/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
+++ b/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
@@ -213,7 +213,16 @@ public class BasicTests extends SVNTests
 
         Status s = client.singleStatus(fileToSVNPath(fileC, false), false);
         if (s != null)
-            fail("File foo.c should not return a status.");
+        {
+            if (s.hasTreeConflict()
+                || s.getTextStatus() != Status.Kind.none
+                || s.getPropStatus() != Status.Kind.none
+                || s.getRepositoryTextStatus() != Status.Kind.none
+                || s.getRepositoryPropStatus() != Status.Kind.none)
+            {
+                fail("File foo.c should not return a status.");
+            }
+        }
 
     }
 
@@ -1250,7 +1259,7 @@ public class BasicTests extends SVNTests
     /**
      * Test the basic SVNClient.cleanup functionality.
      * Without a way to force a lock, this test just verifies
-     * the method can be called succesfully.
+     * the method can be called successfully.
      * @throws Throwable
      */
     public void testBasicCleanup() throws Throwable
@@ -1630,7 +1639,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 +1665,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 +2653,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)
@@ -2929,6 +2938,16 @@ public class BasicTests extends SVNTests
         }
     }
 
+    private static class CountingProgressListener implements ProgressListener
+    {
+        public void onProgress(ProgressEvent event)
+        {
+            // TODO: Examine the byte counts from "event".
+            gotProgress = true;
+        }
+        public boolean gotProgress = false;
+    }
+
     public void testDataTransferProgressReport() throws Throwable
     {
         // ### FIXME: This isn't working over ra_local, because
@@ -2938,25 +2957,13 @@ public class BasicTests extends SVNTests
 
         // build the test setup
         OneTest thisTest = new OneTest();
-        ProgressListener listener = new ProgressListener()
-        {
-            public void onProgress(ProgressEvent event)
-            {
-                // TODO: Examine the byte counts from "event".
-                throw new RuntimeException("Progress reported as expected");
-            }
-        };
+        CountingProgressListener listener = new CountingProgressListener();
         client.setProgressListener(listener);
 
         // Perform an update to exercise the progress notification.
-        try
-        {
-            client.update(thisTest.getWCPath(), null, true);
+        client.update(thisTest.getWCPath(), null, true);
+        if (!listener.gotProgress)
             fail("No progress reported");
-        }
-        catch (RuntimeException progressReported)
-        {
-        }
     }
 
     /**
@@ -3360,9 +3367,12 @@ public class BasicTests extends SVNTests
     private class MyChangelistCallback extends HashMap
         implements ChangelistCallback
     {
+        private static final long serialVersionUID = 1L;
+
         @SuppressWarnings("unchecked")
         public void doChangelist(String path, String changelist)
         {
+            path = fileToSVNPath(new File(path), true);
             if (super.containsKey(path))
             {
                 // Append the changelist to the existing list
diff --git a/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/SVNTests.java b/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/SVNTests.java
index 1e858c8..2cc4234 100644
--- a/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/SVNTests.java
+++ b/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/SVNTests.java
@@ -158,7 +158,7 @@ class SVNTests extends TestCase
 
     private void init()
     {
-        // if not already set, get a usefull value for rootDir
+        // if not already set, get a useful value for rootDir
         if (rootDirectoryName == null)
             rootDirectoryName = System.getProperty("test.rootdir");
         if (rootDirectoryName == null)
@@ -232,8 +232,9 @@ class SVNTests extends TestCase
         greekDump = new File(localTmp, "greek_dump");
         admin.create(greekRepos.getAbsolutePath(), true,false, null,
                      this.fsType);
-        addExpectedCommitItem(greekFiles.getAbsolutePath(), null, null,
-                              NodeKind.none, CommitItemStateFlags.Add);
+        addExpectedCommitItem(greekFiles.getAbsolutePath(),
+                              makeReposUrl(greekRepos).toString(), null,
+                              NodeKind.dir, CommitItemStateFlags.Add);
         client.doImport(greekFiles.getAbsolutePath(), makeReposUrl(greekRepos),
                         null, true );
         admin.dump(greekRepos.getAbsolutePath(), new FileOutputer(greekDump),
@@ -309,12 +310,12 @@ class SVNTests extends TestCase
 
         public boolean prompt(String realm, String username)
         {
-            return false;
+            return true;
         }
 
         public boolean prompt(String realm, String username, boolean maySave)
         {
-            return false;
+            return true;
         }
 
         public String askQuestion(String realm, String question,
diff --git a/subversion/bindings/swig/INSTALL b/subversion/bindings/swig/INSTALL
index 0a66105..751a5c4 100644
--- a/subversion/bindings/swig/INSTALL
+++ b/subversion/bindings/swig/INSTALL
@@ -80,7 +80,7 @@ Step 1:  Install a suitable version of SWIG (which is
 
              --with-python=/path/to/correct/python/binary
 
-        to the configure script.  You need Python 2.5 or above.
+        to the configure script.  You need Python 2.7 or above.
 
         If you plan to build the Perl bindings, and have a system
         with more than one version of perl installed, you may need
@@ -109,7 +109,7 @@ Step 2:  Build and Install Subversion.
   python executable you used to configure SWIG as above.  If it does not then
   you can specify the correct path by adding PYTHON=/path/to/python or
   PERL=/path/to/perl onto the command line for configure.  For example:
-       ./configure PYTHON=/usr/bin/python2.5 PERL=/usr/bin/perl5.8.0
+       ./configure PYTHON=/usr/bin/python2.7 PERL=/usr/bin/perl5.8.0
 
   If Subversion's ./configure finds a SWIG that it's happy with, then
   it will build special glue libraries to link svn to the swig bindings:
@@ -232,35 +232,15 @@ BUILDING SWIG BINDINGS FOR SVN ON WINDOWS
              compile in Release mode.  (This is due to pyconfig.h using the
             _DEBUG flag too and setting a #pragma comment(lib) value.)
 
-       For Perl support, you also need to add the paths into Visual Studio.
-
-       In Visual C++ 6, go to Tools -> Options -> Directories.
-
-       In Visual C++ .NET, go to Tools -> Options -> Projects
-       -> VC++ Directories.
-
-       Add the following paths:
-
-           Executable Directories:
-
-               For Perl, path to perl.exe
-               (for example, C:\Program Files\Perl\bin)
-
-           Library Directories:
-
-               For Perl, path to perl##.lib
-               (for example, C:\Program Files\Perl\lib\CORE)
-
-           Include Directories:
-
-               For Perl, path to perl.h
-               (for example, C:\Program Files\Perl\lib\CORE)
+       Our project generator detects Perl, Ruby and Python installs and will
+       generate the swig projects for these languages if both swig and the
+       language is found.
 
    3.  Create the Visual Studio project files via gen-make.py, adding in
        the --with-swig parameter to the installed location for SWIG.
        Example:
 
-        > gen-make.py -t vcproj --with-swig="C:\Program Files\SWIG-2.0.2"
+        > gen-make.py <other options> --with-swig="C:\Program Files\SWIG-2.0.2"
 
    4.  If you haven't already built Subversion, you should do so now.
        Instructions are in the main INSTALL file.
@@ -271,6 +251,7 @@ BUILDING SWIG BINDINGS FOR SVN ON WINDOWS
 
            __SWIG_PYTHON__
            __SWIG_PERL__
+           __SWIG_RUBY__
 
    6. Install the bindings. The procedure varies depending on the language.
 
diff --git a/subversion/bindings/swig/core.i b/subversion/bindings/swig/core.i
index 64a3d05..a0a4267 100644
--- a/subversion/bindings/swig/core.i
+++ b/subversion/bindings/swig/core.i
@@ -379,21 +379,21 @@
 #ifdef SWIGPYTHON
 %typemap(in) (char *buffer, apr_size_t *len) ($*2_type temp) {
     if (PyLong_Check($input)) {
-        temp = PyLong_AsLong($input);
+        temp = PyLong_AsUnsignedLong($input);
     }
     else if (PyInt_Check($input)) {
-        temp = PyInt_AsLong($input);
+        /* wish there was a PyInt_AsUnsignedLong but there isn't
+           the mask version doesn't do bounds checking for us.
+           I can't see a good way to do the bounds checking ourselves
+           so just stick our head in the sand.  With Python3 this
+           problem goes away because PyInt is gone anyway. */
+        temp = PyInt_AsUnsignedLongMask($input);
     }
     else {
         PyErr_SetString(PyExc_TypeError,
                         "expecting an integer for the buffer size");
         SWIG_fail;
     }
-    if (temp < 0) {
-        PyErr_SetString(PyExc_ValueError,
-                        "buffer size must be a positive integer");
-        SWIG_fail;
-    }
     $1 = malloc(temp);
     $2 = ($2_ltype)&temp;
 }
@@ -514,7 +514,8 @@
     else if ($input == Py_None) {
         $1 = NULL;
     }
-    else if (svn_swig_ConvertPtr($input, (void **)&$1, $descriptor(svn_auth_ssl_server_cert_info_t *)) == 0) {
+    else if (svn_swig_py_convert_ptr($input, (void **)&$1,
+                                     $descriptor(svn_auth_ssl_server_cert_info_t *)) == 0) {
     }
     else {
         PyErr_SetString(PyExc_TypeError, "not a known type");
@@ -523,6 +524,26 @@
 }
 #endif
 
+#ifdef SWIGPERL
+%typemap(in) const void *value 
+  (apr_pool_t *_global_pool = NULL)
+{
+    if (!SvOK($input) || $input == &PL_sv_undef) {
+        $1 = NULL;
+    }
+    else if (SvPOK($input)) {
+        if (_global_pool == NULL) {
+            _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+            SPAGAIN;
+        }
+        $1 = apr_pstrdup(_global_pool, SvPV_nolen($input));
+    }
+    else {
+        croak("Value is not a string (or undef)");
+    }
+}
+#endif
+
 /*
   - all values are converted to char*
   - assume the first argument is Ruby object for svn_auth_baton_t*
@@ -644,28 +665,20 @@ typedef int apr_status_t;
 #ifdef SWIGPERL
 apr_pool_t *current_pool;
 
-#if SWIG_VERSION <= 0x010324
-%{
-#define SVN_SWIGEXPORT(t) SWIGEXPORT(t)
-%}
-#else
-%{
-#define SVN_SWIGEXPORT(t) SWIGEXPORT t
-%}
-#endif
-
 %{
 
+/* ### Eventually this should go away. This is not thread safe and a very
+   ### good example on HOW NOT TO USE pools */
 static apr_pool_t *current_pool = 0;
 
-SVN_SWIGEXPORT(apr_pool_t *)
-svn_swig_pl_get_current_pool (void)
+static apr_pool_t *
+core_get_current_pool (void)
 {
   return current_pool;
 }
 
-SVN_SWIGEXPORT(void)
-svn_swig_pl_set_current_pool (apr_pool_t *pool)
+static void
+core_set_current_pool (apr_pool_t *pool)
 {
   current_pool = pool;
 }
@@ -789,10 +802,11 @@ svn_swig_pl_set_current_pool (apr_pool_t *pool)
 #endif
 
 #ifdef SWIGPYTHON
-# The auth baton depends on the providers, so we preserve a
-# reference to them inside the wrapper. This way, if all external
-# references to the providers are gone, they will still be alive,
-# keeping the baton valid.
+/* The auth baton depends on the providers, so we preserve a
+   reference to them inside the wrapper. This way, if all external
+   references to the providers are gone, they will still be alive,
+   keeping the baton valid.
+ */
 %feature("pythonappend") svn_auth_open %{
   val.__dict__["_deps"] = list(args[0])
 %}
@@ -867,10 +881,8 @@ static void svn_auth_set_gnome_keyring_unlock_prompt_func(svn_auth_baton_t *ab,
 #include "svn_private_config.h"
 %}
 %init %{
-#if defined(SVN_AVOID_CIRCULAR_LINKAGE_AT_ALL_COSTS_HACK)
-  svn_swig_pl_bind_current_pool_fns (&svn_swig_pl_get_current_pool,
-                                     &svn_swig_pl_set_current_pool);
-#endif
+  svn_swig_pl__bind_current_pool_fns(&core_get_current_pool,
+                                     &core_set_current_pool);
 %}
 #endif
 
diff --git a/subversion/bindings/swig/include/apr.swg b/subversion/bindings/swig/include/apr.swg
index 282483c..3eeece4 100644
--- a/subversion/bindings/swig/include/apr.swg
+++ b/subversion/bindings/swig/include/apr.swg
@@ -31,23 +31,21 @@
 */
 #ifdef SWIGPERL
 %typemap(out) long long {
-    char temp[256];
+    char temp[30];
     sprintf(temp, "%" APR_INT64_T_FMT, (apr_int64_t) $1);
-    ST(argvi) = sv_newmortal();
-    sv_setpv((SV*)ST(argvi++), temp);
+    %append_output(sv_2mortal(newSVpv(temp, 0)));
 }
 
 %typemap(out) unsigned long long {
-    char temp[256];
+    char temp[30];
     sprintf(temp, "%" APR_UINT64_T_FMT, (apr_uint64_t) $1);
-    ST(argvi) = sv_newmortal();
-    sv_setpv((SV*)ST(argvi++), temp);
+    %append_output(sv_2mortal(newSVpv(temp, 0)));
 }
 
 %typemap(in, numinputs=0) long long *OUTPUT (apr_int64_t temp)
     "$1 = &temp;";
 %typemap(argout) long long *OUTPUT {
-  char temp[256];
+  char temp[30];
   sprintf(temp, "%" APR_INT64_T_FMT, (apr_int64_t)*($1));
   %append_output(sv_2mortal(newSVpv(temp, 0)));
 }
@@ -55,7 +53,7 @@
 %typemap(in, numinputs=0) unsigned long long *OUTPUT (apr_uint64_t temp)
     "$1 = &temp;";
 %typemap(argout) unsigned long long *OUTPUT {
-  char temp[256];
+  char temp[30];
   sprintf(temp, "%" APR_UINT64_T_FMT, (apr_uint64_t)*($1));
   %append_output(sv_2mortal(newSVpv(temp, 0)));
 }
diff --git a/subversion/bindings/swig/include/proxy.py b/subversion/bindings/swig/include/proxy.py
new file mode 100644
index 0000000..ca4a64d
--- /dev/null
+++ b/subversion/bindings/swig/include/proxy.py
@@ -0,0 +1,41 @@
+  def set_parent_pool(self, parent_pool=None):
+    """Create a new proxy object for TYPE"""
+    import libsvn.core, weakref
+    self.__dict__["_parent_pool"] = \
+      parent_pool or libsvn.core.application_pool;
+    if self.__dict__["_parent_pool"]:
+      self.__dict__["_is_valid"] = weakref.ref(
+        self.__dict__["_parent_pool"]._is_valid)
+
+  def assert_valid(self):
+    """Assert that this object is using valid pool memory"""
+    if "_is_valid" in self.__dict__:
+      assert self.__dict__["_is_valid"](), "Variable has already been deleted"
+
+  def __getattr__(self, name):
+    """Get an attribute from this object"""
+    self.assert_valid()
+
+    value = _swig_getattr(self, self.__class__, name)
+
+    # If we got back a different object than we have, we need to copy all our
+    # metadata into it, so that it looks identical
+    members = self.__dict__.get("_members")
+    if members is not None:
+      _copy_metadata_deep(value, members.get(name))
+
+    # Verify that the new object is good
+    _assert_valid_deep(value)
+
+    return value
+
+  def __setattr__(self, name, value):
+    """Set an attribute on this object"""
+    self.assert_valid()
+
+    # Save a copy of the object, so that the garbage
+    # collector won't kill the object while it's in
+    # SWIG-land
+    self.__dict__.setdefault("_members",{})[name] = value
+
+    return _swig_setattr(self, self.__class__, name, value)
diff --git a/subversion/bindings/swig/include/proxy.swg b/subversion/bindings/swig/include/proxy.swg
index d16afc2..701ba77 100644
--- a/subversion/bindings/swig/include/proxy.swg
+++ b/subversion/bindings/swig/include/proxy.swg
@@ -60,51 +60,11 @@
         value.assert_valid()
 %}
 
-/* Default code for all wrapped proxy classes in Python */
+/* Default code for all wrapped proxy classes in Python.
+ * Inline the code from a separate file to avoid issues with
+ * SWIG mis-parsing the comments as preprocessor directives. */
 %define %proxy_pythoncode(TYPE)
-%pythoncode {
-  def set_parent_pool(self, parent_pool=None):
-    """Create a new proxy object for TYPE"""
-    import libsvn.core, weakref
-    self.__dict__["_parent_pool"] = \
-      parent_pool or libsvn.core.application_pool;
-    if self.__dict__["_parent_pool"]:
-      self.__dict__["_is_valid"] = weakref.ref(
-        self.__dict__["_parent_pool"]._is_valid)
-
-  def assert_valid(self):
-    """Assert that this object is using valid pool memory"""
-    if "_is_valid" in self.__dict__:
-      assert self.__dict__["_is_valid"](), "Variable has already been deleted"
-
-  def __getattr__(self, name):
-    """Get an attribute from this object"""
-    self.assert_valid()
-
-    value = _swig_getattr(self, self.__class__, name)
-
-    # If we got back a different object than we have, we need to copy all our
-    # metadata into it, so that it looks identical
-    members = self.__dict__.get("_members")
-    if members is not None:
-      _copy_metadata_deep(value, members.get(name))
-        
-    # Verify that the new object is good
-    _assert_valid_deep(value)
-
-    return value
-
-  def __setattr__(self, name, value):
-    """Set an attribute on this object"""
-    self.assert_valid()
-
-    # Save a copy of the object, so that the garbage
-    # collector won't kill the object while it's in
-    # SWIG-land
-    self.__dict__.setdefault("_members",{})[name] = value
-
-    return _swig_setattr(self, self.__class__, name, value)
-}
+%pythoncode "proxy.py"
 %enddef
 
 /* Define a proxy for wrapping an existing struct */
diff --git a/subversion/bindings/swig/include/proxy_apr.swg b/subversion/bindings/swig/include/proxy_apr.swg
index 2fa77a8..60a8523 100644
--- a/subversion/bindings/swig/include/proxy_apr.swg
+++ b/subversion/bindings/swig/include/proxy_apr.swg
@@ -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)
 
diff --git a/subversion/bindings/swig/include/svn_containers.swg b/subversion/bindings/swig/include/svn_containers.swg
index b783fdf..e2eeaa9 100644
--- a/subversion/bindings/swig/include/svn_containers.swg
+++ b/subversion/bindings/swig/include/svn_containers.swg
@@ -269,8 +269,10 @@
 %typemap(in) apr_hash_t *PROPHASH
   (apr_pool_t *_global_pool = NULL)
 {
-  if (_global_pool == NULL)
+  if (_global_pool == NULL) {
     _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+    SPAGAIN;
+  }
   $1 = svn_swig_pl_hash_to_prophash($input, _global_pool);  
 }
 %typemap(out) apr_hash_t *PROPHASH
@@ -426,6 +428,25 @@
 {
   $1 = svn_swig_py_path_revs_hash_from_dict($input, _global_pool);
 }
+%typemap(in) apr_hash_t *unlock_targets
+{
+  $1 = svn_swig_py_stringhash_from_dict($input, _global_pool);
+}
+%typemap(in) apr_hash_t *lock_targets
+  (apr_pool_t *_global_pool, PyObject *_global_pool = NULL)
+{
+  if (_global_pool == NULL)
+  {
+    if (svn_swig_py_get_parent_pool(args, $descriptor(apr_pool_t *),
+                                    &_global_py_pool, &_global_pool))
+      SWIG_fail;
+  }
+  $1 = svn_swig_py_struct_ptr_hash_from_dict($input,
+     $descriptor(svn_fs_lock_target_t *), _global_pool);
+  if (PyErr_Occurred()) {
+    SWIG_fail;
+  }
+}
 #endif
 
 #ifdef SWIGPERL
@@ -600,11 +621,11 @@
 #endif
 #ifdef SWIGPERL
 %typemap(in) const apr_array_header_t *STRINGLIST {
-    $1 = (apr_array_header_t *) svn_swig_pl_strings_to_array($input,
+    $1 = svn_swig_pl_strings_to_array($input,
                                                              _global_pool);
 }
 %typemap(in) const apr_array_header_t *STRINGLIST_MAY_BE_NULL {
-    $1 = SvOK($input) ? (apr_array_header_t *) svn_swig_pl_strings_to_array(
+    $1 = SvOK($input) ? svn_swig_pl_strings_to_array(
         $input, _global_pool) : NULL;
 }
 #endif
@@ -646,7 +667,7 @@
 */
 #ifdef SWIGPERL
 %typemap(in) apr_array_header_t *providers {
-    $1 = (apr_array_header_t *) svn_swig_pl_objs_to_array($input,
+    $1 = svn_swig_pl_objs_to_array($input,
       $descriptor(svn_auth_provider_object_t *), _global_pool);
 }
 #endif
@@ -801,7 +822,16 @@
    apr_hash_t * <const char *, apr_array_header_t * <svn_merge_range_t *>>
 */
 #ifdef SWIGPYTHON
-%typemap(in) apr_hash_t *MERGEINFO {
+%typemap(in) apr_hash_t *MERGEINFO
+  (apr_pool_t *_global_pool = NULL, PyObject *_global_py_pool = NULL)
+{
+  if (_global_pool == NULL)
+  {
+    if (svn_swig_py_get_parent_pool(args, $descriptor(apr_pool_t *),
+                                    &_global_py_pool, &_global_pool))
+      SWIG_fail;
+  }
+
   $1 = svn_swig_py_mergeinfo_from_dict($input, _global_pool);
   if (PyErr_Occurred()) {
     SWIG_fail;
@@ -954,3 +984,16 @@
   %append_output(svn_swig_rb_apr_array_to_array_auth_provider_object(*$1));
 }
 #endif
+
+/* -----------------------------------------------------------------------
+   Output of apr_array_header_t * <svn_diff_hunk_t *>
+*/
+#ifdef SWIGPYTHON
+%typemap(out) apr_array_header_t *hunks {
+  %append_output(svn_swig_py_pointerlist_to_list($1, $descriptor(svn_diff_hunk_t *),
+                                                 _global_py_pool));
+  if (PyErr_Occurred()) {
+    SWIG_fail;
+  }
+}
+#endif
diff --git a/subversion/bindings/swig/include/svn_string.swg b/subversion/bindings/swig/include/svn_string.swg
index 2a04672..9fb2dac 100644
--- a/subversion/bindings/swig/include/svn_string.swg
+++ b/subversion/bindings/swig/include/svn_string.swg
@@ -90,6 +90,7 @@ typedef struct svn_string_t svn_string_t;
 %typemap(in) svn_stringbuf_t * {
     apr_size_t len;
     char *buf;
+    apr_pool_t *pool;
 
     if (!SvOK($input)) {
         $1 = NULL;
@@ -97,8 +98,9 @@ typedef struct svn_string_t svn_string_t;
         buf = SvPV($input, len);
         /* Another case of ugly pool handling, this should use the current
            default pool, or make a new one if it doesn't exist yet */
-        $1 = svn_stringbuf_ncreate(buf,len,
-                                   svn_swig_pl_make_pool ((SV *)NULL));
+        pool = svn_swig_pl_make_pool ((SV *)NULL);
+        SPAGAIN;
+        $1 = svn_stringbuf_ncreate(buf,len, pool);
     } else {
         croak("Not a string");
     }
@@ -208,11 +210,6 @@ typedef struct svn_string_t svn_string_t;
 
 /* when storing an svn_string_t* into a structure, we must allocate the
    svn_string_t structure on the heap. */
-#ifdef SWIGPYTHON
-%typemap(memberin) const svn_string_t * {
-    $1 = svn_string_dup($input, _global_pool);
-}
-#endif
 #ifdef SWIGPERL
 %typemap(memberin) const svn_string_t * {
     $1 = svn_string_dup($input, _global_pool);
diff --git a/subversion/bindings/swig/include/svn_types.swg b/subversion/bindings/swig/include/svn_types.swg
index b2c7fb5..e6f5bb1 100644
--- a/subversion/bindings/swig/include/svn_types.swg
+++ b/subversion/bindings/swig/include/svn_types.swg
@@ -71,8 +71,8 @@
 
 #ifdef SWIGPYTHON
 %typemap(argout) SWIGTYPE **OUTPARAM {
-  %append_output(svn_swig_NewPointerObj(*$1, $*1_descriptor,
-                                        _global_py_pool, args));
+  %append_output(svn_swig_py_new_pointer_obj(*$1, $*1_descriptor,
+                                             _global_py_pool, args));
 }
 #else
 %typemap(argout) SWIGTYPE **OUTPARAM {
@@ -146,7 +146,8 @@
   /* svn_repos */
   svn_authz_t **,
   svn_repos_t **,
-  const svn_repos_parse_fns2_t **,
+  const svn_repos_parse_fns3_t **,
+  const svn_repos_parser_fns2_t **,
   const svn_repos_parser_fns_t **,
   void **parse_baton,
   void **revision_baton,
@@ -262,7 +263,7 @@ svn_ ## TYPE ## _swig_rb_closed(VALUE self)
 %define %callback_typemap(CallbackFunction, CallbackBaton,
                           PythonThunk, PerlThunk, RubyThunk)
 %typemap(in) (CallbackFunction, CallbackBaton) {
-  $1 = PythonThunk;
+  $1 = ($1_ltype) PythonThunk;
   $2 = $input;
 }
 %enddef
@@ -270,7 +271,7 @@ svn_ ## TYPE ## _swig_rb_closed(VALUE self)
                                     PythonThunk, PerlThunk, RubyThunk)
 %typemap(in) (CallbackFunction, CallbackBaton) {
   /* FIXME: Handle the NULL case. */
-  $1 = PythonThunk;
+  $1 = ($1_ltype) PythonThunk;
   $2 = $input;
 }
 %enddef
@@ -280,7 +281,7 @@ svn_ ## TYPE ## _swig_rb_closed(VALUE self)
 %define %callback_typemap(CallbackFunction, CallbackBaton,
                           PythonThunk, PerlThunk, RubyThunk)
 %typemap(in) (CallbackFunction, CallbackBaton) {
-  $1 = PerlThunk;
+  $1 = ($1_ltype) PerlThunk;
   $2 = $input;
 }
 %enddef
@@ -288,10 +289,10 @@ svn_ ## TYPE ## _swig_rb_closed(VALUE self)
                                     PythonThunk, PerlThunk, RubyThunk)
 %typemap(in) (CallbackFunction, CallbackBaton) {
   if (SvOK($input)) {
-    $1 = PerlThunk;
+    $1 = ($1_ltype) PerlThunk;
     $2 = $input;
   } else {
-    $1 = NULL;
+    $1 = ($1_ltype) NULL;
     $2 = NULL;
   }
 }
@@ -302,7 +303,7 @@ svn_ ## TYPE ## _swig_rb_closed(VALUE self)
 %define %callback_typemap(CallbackFunction, CallbackBaton,
                           PythonThunk, PerlThunk, RubyThunk)
 %typemap(in) (CallbackFunction, CallbackBaton) {
-  $1 = RubyThunk;
+  $1 = ($1_ltype) RubyThunk;
   $2 = (void *)svn_swig_rb_make_baton($input, _global_svn_swig_rb_pool);
 }
 %enddef
@@ -310,10 +311,10 @@ svn_ ## TYPE ## _swig_rb_closed(VALUE self)
                                     PythonThunk, PerlThunk, RubyThunk)
 %typemap(in) (CallbackFunction, CallbackBaton) {
   if (NIL_P($input)) {
-    $1 = NULL;
+    $1 = ($1_ltype) NULL;
     $2 = NULL;
   } else {
-    $1 = RubyThunk;
+    $1 = ($1_ltype) RubyThunk;
     $2 = (void *)svn_swig_rb_make_baton($input, _global_svn_swig_rb_pool);
   }
 }
@@ -508,15 +509,15 @@ svn_ ## TYPE ## _swig_rb_closed(VALUE self)
 
 %typemap(in) POINTER_TYPES
 {
-  $1 = ($1_ltype)svn_swig_MustGetPtr($input, $descriptor, $svn_argnum);
+  $1 = ($1_ltype)svn_swig_py_must_get_ptr($input, $descriptor, $svn_argnum);
   if (PyErr_Occurred()) {
     SWIG_fail;
   }
 }
 
 %typemap(out) POINTER_TYPES
-    "$result = svn_swig_NewPointerObj((void*)($1), $descriptor,
-                                      _global_py_pool, args);";
+    "$result = svn_swig_py_new_pointer_obj((void*)($1), $descriptor,
+                                           _global_py_pool, args);";
 
 %apply POINTER_TYPES { void *, SWIGTYPE *, SWIGTYPE [] };
 
@@ -547,6 +548,7 @@ svn_ ## TYPE ## _swig_rb_closed(VALUE self)
 %typemap(in) apr_pool_t *pool "";
 %typemap(default) apr_pool_t *pool(apr_pool_t *_global_pool) {
     _global_pool = $1 = svn_swig_pl_make_pool (ST(items-1));
+    SPAGAIN;
 }
 #endif
 #ifdef SWIGRUBY
@@ -635,8 +637,8 @@ svn_ ## TYPE ## _swig_rb_closed(VALUE self)
  */
 
 %typemap(argout) CALLABLE_CALLBACK * {
-  %append_output(svn_swig_NewPointerObj($1, $descriptor,
-                                        _global_py_pool, args));
+  %append_output(svn_swig_py_new_pointer_obj($1, $descriptor,
+                                             _global_py_pool, args));
 }
 
 /* Convert the pointer to a function pointer back into a regular
@@ -645,7 +647,7 @@ svn_ ## TYPE ## _swig_rb_closed(VALUE self)
 
 %typemap(in) CALLABLE_CALLBACK {
   $&ltype tmp =
-    svn_swig_MustGetPtr($input, $&descriptor, $svn_argnum);
+    svn_swig_py_must_get_ptr($input, $&descriptor, $svn_argnum);
   if (tmp == NULL || PyErr_Occurred()) {
     SWIG_fail;
   }
@@ -675,8 +677,8 @@ svn_ ## TYPE ## _swig_rb_closed(VALUE self)
       SWIG_fail;
     }
     *tmp = ($ltype) $1;
-    $result = svn_swig_NewPointerObj(tmp, $&1_descriptor,
-                                     py_pool, args);
+    $result = svn_swig_py_new_pointer_obj(tmp, $&1_descriptor,
+                                          py_pool, args);
   }
 }
 
@@ -694,7 +696,7 @@ svn_ ## TYPE ## _swig_rb_closed(VALUE self)
   *tmp = ($ltype) $value;
 
   %set_constant("$symname",
-    svn_swig_NewPointerObj(tmp, $&descriptor, NULL, NULL)
+    svn_swig_py_new_pointer_obj(tmp, $&descriptor, NULL, NULL)
   );
 
 }
@@ -806,20 +808,12 @@ svn_ ## TYPE ## _swig_rb_closed(VALUE self)
    Callback: svn_cancel_func_t
 */
 
-#ifdef SWIGPYTHON
-%typemap(in) (svn_cancel_func_t cancel_func, void *cancel_baton) {
-  $1 = svn_swig_py_cancel_func;
-  $2 = $input; /* our function is the baton. */
-}
-#endif
+%callback_typemap(svn_cancel_func_t cancel_func, void *cancel_baton,
+                  svn_swig_py_cancel_func,
+                  svn_swig_pl_cancel_func,
+                  svn_swig_rb_cancel_func)
 
 #ifdef SWIGRUBY
-%typemap(in) (svn_cancel_func_t cancel_func, void *cancel_baton)
-{
-  $1 = svn_swig_rb_cancel_func;
-  $2 = (void *)svn_swig_rb_make_baton($input, _global_svn_swig_rb_pool);
-}
-
 %typemap(argout) (svn_cancel_func_t cancel_func, void *cancel_baton)
 {
   svn_swig_rb_set_baton($result, (VALUE)$2);
@@ -942,15 +936,24 @@ svn_ ## TYPE ## _swig_rb_closed(VALUE self)
 #ifdef SWIGPERL
 %typemap(in) svn_stream_t * {
     svn_swig_pl_make_stream (&$1, $input);
+    SPAGAIN;
 }
 
 %typemap(out) svn_stream_t * {
-    $result = svn_swig_pl_from_stream ($1);
+    SV* tmp;
+    PUTBACK;
+    tmp = svn_swig_pl_from_stream ($1);
+    SPAGAIN;
+    $result = tmp;
     argvi++;
 }
 
 %typemap(argout) svn_stream_t ** {
-  %append_output(svn_swig_pl_from_stream(*$1));
+    SV *tmp;
+    PUTBACK;
+    tmp = svn_swig_pl_from_stream(*$1);
+    SPAGAIN;
+    %append_output(tmp);
 }
 #endif
 
@@ -1003,8 +1006,8 @@ svn_ ## TYPE ## _swig_rb_closed(VALUE self)
       /* We don't know the type of this reference, so we'll have to
        * treat it as an opaque void pointer.
        */
-      $result = svn_swig_NewPointerObj($1, $descriptor,
-        _global_py_pool, args);
+      $result = svn_swig_py_new_pointer_obj($1, $descriptor,
+                                            _global_py_pool, args);
     }
   }
 
@@ -1123,11 +1126,11 @@ svn_ ## TYPE ## _swig_rb_closed(VALUE self)
 }
 
 %typemap(argout) unsigned char *result_digest {
-  /* FIXME: This code is clearly buggy. The return value of sv_newmortal()
-     is immediately overwritten by the return value
-     of svn_swig_pl_from_md5(). */
-    ST(argvi) = sv_newmortal();
-    ST(argvi++) = svn_swig_pl_from_md5($1);
+    SV *tmp;
+    PUTBACK;
+    tmp = svn_swig_pl_from_md5($1);
+    SPAGAIN;
+    %append_output(tmp);
 }
 #endif
 
@@ -1147,6 +1150,7 @@ svn_ ## TYPE ## _swig_rb_closed(VALUE self)
 #endif
 
 #ifdef SWIGPYTHON
+/* ### Verify if this should use '[]' like perl and ruby */
 %typemap(in) const unsigned char *digest {
     if ($input == Py_None) {
         $1 = NULL;
@@ -1158,7 +1162,7 @@ svn_ ## TYPE ## _swig_rb_closed(VALUE self)
 #endif
 
 #ifdef SWIGRUBY
-%typemap(in) const unsigned char *digest
+%typemap(in) const unsigned char digest[]
 {
   if (NIL_P($input)) {
     $1 = NULL;
@@ -1178,8 +1182,14 @@ svn_ ## TYPE ## _swig_rb_closed(VALUE self)
   useful convertors for svn_opt_revision_t
 */
 #ifdef SWIGPERL
-%typemap(in) svn_opt_revision_t * (svn_opt_revision_t rev) {
-  $1 = svn_swig_pl_set_revision(&rev, $input, TRUE);
+%typemap(in) svn_opt_revision_t * 
+  (svn_opt_revision_t rev, apr_pool_t *_global_pool = NULL)
+{
+  if (_global_pool == NULL) {
+    _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+    SPAGAIN;
+  }
+  $1 = svn_swig_pl_set_revision(&rev, $input, TRUE, _global_pool);
 }
 #endif
 
diff --git a/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c b/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c
index 609fc9f..69b7754 100644
--- a/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c
+++ b/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c
@@ -25,6 +25,9 @@
 #include <apr_general.h>
 #include <apr_portable.h>
 
+/* Windows hack: Allow overriding some <perl.h> defaults */
+#include "swigutil_pl__pre_perl.h"
+
 #include <EXTERN.h>
 #include <perl.h>
 #include <XSUB.h>
@@ -54,7 +57,7 @@ static HV *type_cache = NULL;
 #define _SWIG_TYPE(name) _swig_perl_type_query(name, 0)
 #define POOLINFO         _SWIG_TYPE("apr_pool_t *")
 
-static swig_type_info *_swig_perl_type_query(const char *typename, U32 klen)
+static swig_type_info *_swig_perl_type_query(const char *type_name, U32 klen)
 {
     SV **type_info;
     swig_type_info *tinfo;
@@ -63,13 +66,13 @@ static swig_type_info *_swig_perl_type_query(const char *typename, U32 klen)
       type_cache = newHV();
 
     if (klen == 0)
-      klen = strlen(typename);
+      klen = strlen(type_name);
 
-    if ((type_info = hv_fetch(type_cache, typename, klen, 0)))
+    if ((type_info = hv_fetch(type_cache, type_name, klen, 0)))
       return (swig_type_info *) (SvIV(*type_info));
 
-    tinfo = SWIG_TypeQuery(typename);
-    hv_store(type_cache, typename, klen, newSViv((IV)tinfo), 0);
+    tinfo = SWIG_TypeQuery(type_name);
+    hv_store(type_cache, type_name, klen, newSViv((IV)tinfo), 0);
 
     return tinfo;
 }
@@ -127,11 +130,11 @@ static void *convert_pl_revision_range(SV *value, void *ctx, apr_pool_t *pool)
         /* this will assign to range */
         SWIG_ConvertPtr(value, (void **)&range, _SWIG_TYPE("svn_opt_revision_range_t *"), 0);
         return range;
-    } 
+    }
 
-    if (SvROK(value) 
+    if (SvROK(value)
         && SvTYPE(SvRV(value)) == SVt_PVAV
-        && av_len((AV *)SvRV(value)) == 1) {    
+        && av_len((AV *)SvRV(value)) == 1) {
         /* value is a two-element ARRAY */
         AV* array = (AV *)SvRV(value);
         svn_opt_revision_t temp_start, temp_end;
@@ -140,16 +143,18 @@ static void *convert_pl_revision_range(SV *value, void *ctx, apr_pool_t *pool)
 
         /* Note: Due to how svn_swig_pl_set_revision works,
          * either the passed in svn_opt_revision_t is modified
-         * (and the original pointer returned) or a different pointer 
+         * (and the original pointer returned) or a different pointer
          * is returned. svn_swig_pl_set_revision may return NULL
          * only if croak_on_error is FALSE.
          */
-        start = svn_swig_pl_set_revision(&temp_start, 
-                                         *av_fetch(array, 0, 0), croak_on_error);
+        start = svn_swig_pl_set_revision(&temp_start,
+                                         *av_fetch(array, 0, 0),
+                                         croak_on_error, pool);
         if (start == NULL)
             return NULL;
-        end = svn_swig_pl_set_revision(&temp_end, 
-                                       *av_fetch(array, 1, 0), croak_on_error);
+        end = svn_swig_pl_set_revision(&temp_end,
+                                       *av_fetch(array, 1, 0),
+                                       croak_on_error, pool);
         if (end == NULL)
             return NULL;
 
@@ -158,7 +163,7 @@ static void *convert_pl_revision_range(SV *value, void *ctx, apr_pool_t *pool)
         range->start = *start;
         range->end = *end;
         return range;
-    } 
+    }
 
     if (croak_on_error)
         croak("unknown revision range: "
@@ -178,7 +183,7 @@ static apr_hash_t *svn_swig_pl_to_hash(SV *source,
     I32 cnt, retlen;
 
     if (!(source && SvROK(source) && SvTYPE(SvRV(source)) == SVt_PVHV)) {
-	return NULL;
+        return NULL;
     }
 
     hash = apr_hash_make(pool);
@@ -231,10 +236,9 @@ apr_hash_t *svn_swig_pl_hash_to_prophash(SV *source, apr_pool_t *pool)
 }
 
 /* perl -> c array convertors */
-static const
-apr_array_header_t *svn_swig_pl_to_array(SV *source,
-                                         pl_element_converter_t cv,
-                                         void *ctx, apr_pool_t *pool)
+static apr_array_header_t *svn_swig_pl_to_array(SV *source,
+                                                pl_element_converter_t cv,
+                                                void *ctx, apr_pool_t *pool)
 {
     int targlen;
     apr_array_header_t *temp;
@@ -263,15 +267,15 @@ apr_array_header_t *svn_swig_pl_to_array(SV *source,
     return temp;
 }
 
-const apr_array_header_t *svn_swig_pl_strings_to_array(SV *source,
+apr_array_header_t *svn_swig_pl_strings_to_array(SV *source,
                                                        apr_pool_t *pool)
 {
   return svn_swig_pl_to_array(source, convert_pl_string, NULL, pool);
 }
 
-const apr_array_header_t *svn_swig_pl_objs_to_array(SV *source,
-						    swig_type_info *tinfo,
-						    apr_pool_t *pool)
+apr_array_header_t *svn_swig_pl_objs_to_array(SV *source,
+                                              swig_type_info *tinfo,
+                                              apr_pool_t *pool)
 {
   return svn_swig_pl_to_array(source,
                               (pl_element_converter_t)convert_pl_obj,
@@ -279,21 +283,21 @@ const apr_array_header_t *svn_swig_pl_objs_to_array(SV *source,
 }
 
 /* Convert a single revision range or an array of revisions ranges
- * Note: We can't simply use svn_swig_pl_to_array() as is, since 
+ * Note: We can't simply use svn_swig_pl_to_array() as is, since
  * it immediatley checks whether source is an array reference and then
  * proceeds to treat this as the "array of ..." case. But a revision range
  * may be specified as a (two-element) array. Hence we first try to
  * convert source as a single revision range. Failing that and if it's
  * an array we then call svn_swig_pl_to_array(). Otherwise we croak().
  */
-const apr_array_header_t *svn_swig_pl_array_to_apr_array_revision_range(
+apr_array_header_t *svn_swig_pl_array_to_apr_array_revision_range(
         SV *source, apr_pool_t *pool)
 {
     svn_boolean_t croak_on_error = FALSE;
     svn_opt_revision_range_t *range;
 
-    if (range = convert_pl_revision_range(source, &croak_on_error, pool)) {
-        apr_array_header_t *temp = apr_array_make(pool, 1, 
+    if ((range = convert_pl_revision_range(source, &croak_on_error, pool))) {
+        apr_array_header_t *temp = apr_array_make(pool, 1,
                                                   sizeof(svn_opt_revision_range_t *));
         temp->nelts = 1;
         APR_ARRAY_IDX(temp, 0, svn_opt_revision_range_t *) = range;
@@ -302,7 +306,7 @@ const apr_array_header_t *svn_swig_pl_array_to_apr_array_revision_range(
 
     if (SvROK(source) && SvTYPE(SvRV(source)) == SVt_PVAV) {
         croak_on_error = TRUE;
-        return svn_swig_pl_to_array(source, convert_pl_revision_range, 
+        return svn_swig_pl_to_array(source, convert_pl_revision_range,
                                     &croak_on_error, pool);
     }
 
@@ -310,7 +314,7 @@ const apr_array_header_t *svn_swig_pl_array_to_apr_array_revision_range(
 
     /* This return is actually unreachable because of the croak above,
      * however, Visual Studio's compiler doesn't like if all paths don't have
-     * a return and errors out otherwise. */ 
+     * a return and errors out otherwise. */
     return NULL;
 }
 
@@ -356,17 +360,17 @@ static SV *convert_hash(apr_hash_t *hash, element_converter_t converter_func,
 
     hv = newHV();
     for (hi = apr_hash_first(NULL, hash); hi; hi = apr_hash_next(hi)) {
-	const char *key;
-	void *val;
-	int klen;
-	SV *obj;
+        const char *key;
+        void *val;
+        int klen;
+        SV *obj;
 
-	apr_hash_this(hi, (void *)&key, NULL, &val);
-	klen = strlen(key);
+        apr_hash_this(hi, (void *)&key, NULL, &val);
+        klen = strlen(key);
 
-	obj = converter_func(val, ctx);
-	hv_store(hv, (const char *)key, klen, obj, 0);
-	SvREFCNT_inc(obj);
+        obj = converter_func(val, ctx);
+        hv_store(hv, (const char *)key, klen, obj, 0);
+        SvREFCNT_inc(obj);
     }
 
     return sv_2mortal(newRV_noinc((SV*)hv));
@@ -386,16 +390,16 @@ SV *svn_swig_pl_convert_hash(apr_hash_t *hash, swig_type_info *tinfo)
 
 /* c -> perl array convertors */
 static SV *convert_array(const apr_array_header_t *array,
-		  element_converter_t converter_func, void *ctx)
+                  element_converter_t converter_func, void *ctx)
 {
     AV *list = newAV();
     int i;
 
     for (i = 0; i < array->nelts; ++i) {
-	void *element = APR_ARRAY_IDX(array, i, void *);
-	SV *item = converter_func(element, ctx);
-	av_push(list, item);
-	SvREFCNT_inc(item);
+        void *element = APR_ARRAY_IDX(array, i, void *);
+        SV *item = converter_func(element, ctx);
+        av_push(list, item);
+        SvREFCNT_inc(item);
     }
     return sv_2mortal(newRV_noinc((SV*)list));
 }
@@ -426,9 +430,10 @@ SV *svn_swig_pl_revnums_to_list(const apr_array_header_t *array)
 }
 
 /* perl -> c svn_opt_revision_t conversion */
-svn_opt_revision_t *svn_swig_pl_set_revision(svn_opt_revision_t *rev, 
-                                             SV *source, 
-                                             svn_boolean_t croak_on_error)
+svn_opt_revision_t *svn_swig_pl_set_revision(svn_opt_revision_t *rev,
+                                             SV *source,
+                                             svn_boolean_t croak_on_error,
+                                             apr_pool_t *pool)
 {
 #define maybe_croak(argv) do { if (croak_on_error) croak argv; \
                                else return NULL; } while (0)
@@ -462,20 +467,23 @@ svn_opt_revision_t *svn_swig_pl_set_revision(svn_opt_revision_t *rev,
             svn_error_t *err;
 
             char *end = strchr(input,'}');
+            char saved_end;
             if (!end)
                 maybe_croak(("unknown opt_revision_t string \"%s\": "
                              "missing closing brace for \"{DATE}\"", input));
+            saved_end = *end;
             *end = '\0';
-            err = svn_parse_date (&matched, &tm, input + 1, apr_time_now(),
-                                  svn_swig_pl_make_pool ((SV *)NULL));
+            err = svn_parse_date (&matched, &tm,
+                                  input + 1, apr_time_now(), pool);
+            *end = saved_end;
             if (err) {
                 svn_error_clear (err);
-                maybe_croak(("unknown opt_revision_t string \"{%s}\": "
-                             "internal svn_parse_date error", input + 1));
+                maybe_croak(("unknown opt_revision_t string \"%s\": "
+                             "internal svn_parse_date error", input));
             }
             if (!matched)
-                maybe_croak(("unknown opt_revision_t string \"{%s}\": "
-                             "svn_parse_date failed to parse it", input + 1));
+                maybe_croak(("unknown opt_revision_t string \"%s\": "
+                             "svn_parse_date failed to parse it", input));
 
             rev->kind = svn_opt_revision_date;
             rev->value.date = tm;
@@ -533,85 +541,85 @@ svn_error_t *svn_swig_pl_callback_thunk(perl_func_invoker_t caller_func,
 
     va_start(ap, fmt);
     while (*fp) {
-	char *c;
-	void *o;
-	SV *obj;
-	swig_type_info *t;
-	svn_string_t *str;
-
-	switch (*fp++) {
-	case 'O':
+        char *c;
+        void *o;
+        SV *obj;
+        swig_type_info *t;
+        svn_string_t *str;
+
+        switch (*fp++) {
+        case 'O':
           XPUSHs(va_arg(ap, SV *));
-	    break;
-	case 'S': /* swig object */
+            break;
+        case 'S': /* swig object */
           o = va_arg(ap, void *);
           t = va_arg(ap, swig_type_info *);
 
           obj = sv_newmortal();
           SWIG_MakePtr(obj, o, t, 0);
-	    XPUSHs(obj);
-	    break;
+            XPUSHs(obj);
+            break;
 
-	case 's': /* string */
+        case 's': /* string */
           c = va_arg(ap, char *);
-	    XPUSHs(c ? sv_2mortal(newSVpv(c, 0)) : &PL_sv_undef);
-	    break;
+            XPUSHs(c ? sv_2mortal(newSVpv(c, 0)) : &PL_sv_undef);
+            break;
 
-	case 'i': /* apr_int32_t */
-	    XPUSHs(sv_2mortal(newSViv(va_arg(ap, apr_int32_t))));
-	    break;
+        case 'i': /* apr_int32_t */
+            XPUSHs(sv_2mortal(newSViv(va_arg(ap, apr_int32_t))));
+            break;
 
-	case 'u': /* apr_uint32_t */
+        case 'u': /* apr_uint32_t */
             XPUSHs(sv_2mortal(newSViv(va_arg(ap, apr_uint32_t))));
-	    break;
-
-	case 'r': /* svn_revnum_t */
-	    XPUSHs(sv_2mortal(newSViv(va_arg(ap, svn_revnum_t))));
-	    break;
-
-	case 'b': /* svn_boolean_t */
-	    XPUSHs(sv_2mortal(newSViv(va_arg(ap, svn_boolean_t))));
-	    break;
-
-	case 't': /* svn_string_t */
-	    str = va_arg(ap, svn_string_t *);
-	    XPUSHs(str ? sv_2mortal(newSVpv(str->data, str->len))
-	           : &PL_sv_undef);
-	    break;
-
-	case 'L': /* apr_int64_t */
-	    /* Pass into perl as a string because some implementations may
-	     * not be able to handle a 64-bit int.  If it's too long to
-	     * fit in Perl's interal IV size then perl will only make
-	     * it available as a string.  If not then perl will convert
-	     * it to an IV for us.  So this handles the problem gracefully */
-	    c = malloc(30);
-	    snprintf(c,30,"%" APR_INT64_T_FMT,va_arg(ap, apr_int64_t));
-	    XPUSHs(sv_2mortal(newSVpv(c, 0)));
-	    free(c);
-	    break;
-
-	case 'U': /* apr_uint64_t */
-	    c = malloc(30);
-	    snprintf(c,30,"%" APR_UINT64_T_FMT,va_arg(ap, apr_uint64_t));
-	    XPUSHs(sv_2mortal(newSVpv(c, 0)));
-	    free(c);
-	    break;
-
-	case 'z': /* apr_size_t */
-	    if (sizeof(apr_size_t) >= 8)
-	      {
-	        c = malloc(30);
-	        snprintf(c,30,"%" APR_SIZE_T_FMT,va_arg(ap, apr_size_t));
-	        XPUSHs(sv_2mortal(newSVpv(c, 0)));
-	        free(c);
-	      }
-	    else
-	      {
-	        XPUSHs(sv_2mortal(newSViv(va_arg(ap, apr_size_t))));
-	      }
-	     break;
-	}
+            break;
+
+        case 'r': /* svn_revnum_t */
+            XPUSHs(sv_2mortal(newSViv(va_arg(ap, svn_revnum_t))));
+            break;
+
+        case 'b': /* svn_boolean_t */
+            XPUSHs(sv_2mortal(newSViv(va_arg(ap, svn_boolean_t))));
+            break;
+
+        case 't': /* svn_string_t */
+            str = va_arg(ap, svn_string_t *);
+            XPUSHs(str ? sv_2mortal(newSVpv(str->data, str->len))
+                   : &PL_sv_undef);
+            break;
+
+        case 'L': /* apr_int64_t */
+            /* Pass into perl as a string because some implementations may
+             * not be able to handle a 64-bit int.  If it's too long to
+             * fit in Perl's interal IV size then perl will only make
+             * it available as a string.  If not then perl will convert
+             * it to an IV for us.  So this handles the problem gracefully */
+            c = malloc(30);
+            snprintf(c,30,"%" APR_INT64_T_FMT,va_arg(ap, apr_int64_t));
+            XPUSHs(sv_2mortal(newSVpv(c, 0)));
+            free(c);
+            break;
+
+        case 'U': /* apr_uint64_t */
+            c = malloc(30);
+            snprintf(c,30,"%" APR_UINT64_T_FMT,va_arg(ap, apr_uint64_t));
+            XPUSHs(sv_2mortal(newSVpv(c, 0)));
+            free(c);
+            break;
+
+        case 'z': /* apr_size_t */
+            if (sizeof(apr_size_t) >= 8)
+              {
+                c = malloc(30);
+                snprintf(c,30,"%" APR_SIZE_T_FMT,va_arg(ap, apr_size_t));
+                XPUSHs(sv_2mortal(newSVpv(c, 0)));
+                free(c);
+              }
+            else
+              {
+                XPUSHs(sv_2mortal(newSViv(va_arg(ap, apr_size_t))));
+              }
+             break;
+        }
     }
 
     va_end(ap);
@@ -620,23 +628,23 @@ svn_error_t *svn_swig_pl_callback_thunk(perl_func_invoker_t caller_func,
     switch (caller_func) {
     case CALL_SV:
       count = call_sv(func, call_flags );
-	break;
+        break;
     case CALL_METHOD:
       count = call_method(func, call_flags );
-	break;
+        break;
     default:
       croak("unkonwn calling type");
-	break;
+        break;
     }
     SPAGAIN ;
 
     if (((call_flags & G_SCALAR) && count != 1) ||
-	((call_flags & G_VOID) && count != 0))
+        ((call_flags & G_VOID) && count != 0))
       croak("Wrong number of returns");
 
     if (result) {
-	*result = POPs;
-	SvREFCNT_inc(*result);
+        *result = POPs;
+        SvREFCNT_inc(*result);
     }
 
     PUTBACK;
@@ -789,8 +797,8 @@ static svn_error_t * thunk_close_directory(void *dir_baton,
 }
 
 static svn_error_t * thunk_absent_directory(const char *path,
-					    void *parent_baton,
-					    apr_pool_t *pool)
+                                            void *parent_baton,
+                                            apr_pool_t *pool)
 {
     item_baton *ib = parent_baton;
 
@@ -852,8 +860,8 @@ static svn_error_t * thunk_window_handler(svn_txdelta_window_t *window,
         SvREFCNT_dec(handler);
     }
     else {
-	swig_type_info *tinfo = _SWIG_TYPE("svn_txdelta_window_t *");
-	SVN_ERR(svn_swig_pl_callback_thunk(CALL_SV, handler,
+        swig_type_info *tinfo = _SWIG_TYPE("svn_txdelta_window_t *");
+        SVN_ERR(svn_swig_pl_callback_thunk(CALL_SV, handler,
                                            NULL, "S", window, tinfo));
     }
 
@@ -875,30 +883,30 @@ thunk_apply_textdelta(void *file_baton,
                                        "OOsS", ib->editor, ib->baton,
                                        base_checksum, pool, POOLINFO));
     if (SvOK(result)) {
-	if (SvROK(result) && SvTYPE(SvRV(result)) == SVt_PVAV) {
-	    swig_type_info *handler_info =
+        if (SvROK(result) && SvTYPE(SvRV(result)) == SVt_PVAV) {
+            swig_type_info *handler_info =
               _SWIG_TYPE("svn_txdelta_window_handler_t");
             swig_type_info *void_info = _SWIG_TYPE("void *");
-	    AV *array = (AV *)SvRV(result);
-
-	    if (SWIG_ConvertPtr(*av_fetch(array, 0, 0),
-				(void **)handler, handler_info,0) < 0) {
-		croak("Unable to convert from SWIG Type");
-	    }
-	    if (SWIG_ConvertPtr(*av_fetch(array, 1, 0),
-				h_baton, void_info,0) < 0) {
-		croak("Unable to convert from SWIG Type ");
-	    }
+            AV *array = (AV *)SvRV(result);
+
+            if (SWIG_ConvertPtr(*av_fetch(array, 0, 0),
+                                (void **)handler, handler_info,0) < 0) {
+                croak("Unable to convert from SWIG Type");
+            }
+            if (SWIG_ConvertPtr(*av_fetch(array, 1, 0),
+                                h_baton, void_info,0) < 0) {
+                croak("Unable to convert from SWIG Type ");
+            }
             SvREFCNT_dec(result);
-	}
-	else {
-	    *handler = thunk_window_handler;
-	    *h_baton = result;
-	}
+        }
+        else {
+            *handler = thunk_window_handler;
+            *h_baton = result;
+        }
     }
     else {
-	*handler = svn_delta_noop_window_handler;
-	*h_baton = NULL;
+        *handler = svn_delta_noop_window_handler;
+        *h_baton = NULL;
     }
 
     return SVN_NO_ERROR;
@@ -936,8 +944,8 @@ static svn_error_t * thunk_close_file(void *file_baton,
 }
 
 static svn_error_t * thunk_absent_file(const char *path,
-				       void *parent_baton,
-				       apr_pool_t *pool)
+                                       void *parent_baton,
+                                       apr_pool_t *pool)
 {
     item_baton *ib = parent_baton;
 
@@ -963,10 +971,10 @@ static svn_error_t * thunk_abort_edit(void *edit_baton,
 
 
 void
-svn_delta_wrap_window_handler(svn_txdelta_window_handler_t *handler,
-                              void **h_baton,
-                              SV *callback,
-                              apr_pool_t *pool)
+svn_swig_pl_wrap_window_handler(svn_txdelta_window_handler_t *handler,
+                                void **h_baton,
+                                SV *callback,
+                                apr_pool_t *pool)
 {
     *handler = thunk_window_handler;
     *h_baton = callback;
@@ -974,10 +982,10 @@ svn_delta_wrap_window_handler(svn_txdelta_window_handler_t *handler,
     svn_swig_pl_hold_ref_in_pool(pool, callback);
 }
 
-void svn_delta_make_editor(svn_delta_editor_t **editor,
-			   void **edit_baton,
-			   SV *perl_editor,
-			   apr_pool_t *pool)
+void svn_swig_pl_make_editor(svn_delta_editor_t **editor,
+                             void **edit_baton,
+                             SV *perl_editor,
+                             apr_pool_t *pool)
 {
   svn_delta_editor_t *thunk_editor = svn_delta_default_editor(pool);
 
@@ -1004,18 +1012,18 @@ void svn_delta_make_editor(svn_delta_editor_t **editor,
 }
 
 svn_error_t *svn_swig_pl_thunk_log_receiver(void *baton,
-					    apr_hash_t *changed_paths,
-					    svn_revnum_t rev,
-					    const char *author,
-					    const char *date,
-					    const char *msg,
-					    apr_pool_t *pool)
+                                            apr_hash_t *changed_paths,
+                                            svn_revnum_t rev,
+                                            const char *author,
+                                            const char *date,
+                                            const char *msg,
+                                            apr_pool_t *pool)
 {
     SV *receiver = baton;
     swig_type_info *tinfo = _SWIG_TYPE("svn_log_changed_path_t *");
 
     if (!SvOK(receiver))
-	return SVN_NO_ERROR;
+        return SVN_NO_ERROR;
 
     svn_swig_pl_callback_thunk(CALL_SV,
                                receiver, NULL,
@@ -1034,11 +1042,11 @@ svn_error_t *svn_swig_pl_thunk_log_entry_receiver(void *baton,
     SV *receiver = baton;
 
     if (!SvOK(receiver))
-	return SVN_NO_ERROR;
+        return SVN_NO_ERROR;
 
     svn_swig_pl_callback_thunk(CALL_SV,
                                receiver, NULL,
-                               "SS", 
+                               "SS",
                                log_entry, _SWIG_TYPE("svn_log_entry_t *"),
                                pool, POOLINFO);
 
@@ -1072,7 +1080,7 @@ svn_error_t *svn_swig_pl_thunk_history_func(void *baton,
     SV *func = baton;
 
     if (!SvOK(func))
-	return SVN_NO_ERROR;
+        return SVN_NO_ERROR;
 
     svn_swig_pl_callback_thunk(CALL_SV,
                                func, NULL,
@@ -1090,7 +1098,7 @@ svn_error_t *svn_swig_pl_thunk_authz_func(svn_boolean_t *allowed,
     SV *func = baton, *result;
 
     if (!SvOK(func))
-	return SVN_NO_ERROR;
+        return SVN_NO_ERROR;
 
     svn_swig_pl_callback_thunk(CALL_SV,
                                func, &result,
@@ -1104,12 +1112,12 @@ svn_error_t *svn_swig_pl_thunk_authz_func(svn_boolean_t *allowed,
 }
 
 svn_error_t *svn_swig_pl_thunk_commit_callback(svn_revnum_t new_revision,
-					       const char *date,
-					       const char *author,
-					       void *baton)
+                                               const char *date,
+                                               const char *author,
+                                               void *baton)
 {
     if (!SvOK((SV *)baton))
-	return SVN_NO_ERROR;
+        return SVN_NO_ERROR;
 
     svn_swig_pl_callback_thunk(CALL_SV, baton, NULL,
                                "rss", new_revision, date, author);
@@ -1136,8 +1144,8 @@ svn_error_t *svn_swig_pl_thunk_commit_callback2(const svn_commit_info_t *commit_
 /* Wrap RA */
 
 static svn_error_t * thunk_open_tmp_file(apr_file_t **fp,
-					 void *callback_baton,
-					 apr_pool_t *pool)
+                                         void *callback_baton,
+                                         apr_pool_t *pool)
 {
     SV *result;
     swig_type_info *tinfo = _SWIG_TYPE("apr_file_t *");
@@ -1146,7 +1154,7 @@ static svn_error_t * thunk_open_tmp_file(apr_file_t **fp,
                                &result, "OS", callback_baton, pool, POOLINFO);
 
     if (SWIG_ConvertPtr(result, (void *)fp, tinfo,0) < 0) {
-	croak("Unable to convert from SWIG Type");
+        croak("Unable to convert from SWIG Type");
     }
 
     SvREFCNT_dec(result);
@@ -1169,15 +1177,15 @@ svn_error_t *thunk_get_wc_prop(void *baton,
 
     /* this is svn_string_t * typemap in */
     if (!SvOK(result) || result == &PL_sv_undef) {
-	*value = NULL;
+        *value = NULL;
     }
     else if (SvPOK(result)) {
         data = SvPV(result, len);
         *value = svn_string_ncreate(data, len, pool);
     }
     else {
-	SvREFCNT_dec(result);
-	croak("not a string");
+        SvREFCNT_dec(result);
+        croak("not a string");
     }
 
     SvREFCNT_dec(result);
@@ -1185,10 +1193,10 @@ svn_error_t *thunk_get_wc_prop(void *baton,
 }
 
 
-svn_error_t *svn_ra_make_callbacks(svn_ra_callbacks_t **cb,
-				   void **c_baton,
-				   SV *perl_callbacks,
-				   apr_pool_t *pool)
+svn_error_t *svn_swig_pl_make_callbacks(svn_ra_callbacks_t **cb,
+                                        void **c_baton,
+                                        SV *perl_callbacks,
+                                        apr_pool_t *pool)
 {
     SV *auth_baton;
 
@@ -1203,7 +1211,7 @@ svn_error_t *svn_ra_make_callbacks(svn_ra_callbacks_t **cb,
 
     if (SWIG_ConvertPtr(auth_baton,
                         (void **)&(*cb)->auth_baton, _SWIG_TYPE("svn_auth_baton_t *"),0) < 0) {
-	croak("Unable to convert from SWIG Type");
+        croak("Unable to convert from SWIG Type");
     }
     *c_baton = perl_callbacks;
     svn_swig_pl_hold_ref_in_pool(pool, perl_callbacks);
@@ -1357,13 +1365,13 @@ svn_error_t *svn_swig_pl_thunk_ssl_client_cert_pw_prompt(
 
 /* Thunked version of svn_wc_notify_func_t callback type */
 void svn_swig_pl_notify_func(void * baton,
-		             const char *path,
-			     svn_wc_notify_action_t action,
-			     svn_node_kind_t kind,
-			     const char *mime_type,
-			     svn_wc_notify_state_t content_state,
-			     svn_wc_notify_state_t prop_state,
-			     svn_revnum_t revision)
+                             const char *path,
+                             svn_wc_notify_action_t action,
+                             svn_node_kind_t kind,
+                             const char *mime_type,
+                             svn_wc_notify_state_t content_state,
+                             svn_wc_notify_state_t prop_state,
+                             svn_revnum_t revision)
 {
     if (!SvOK((SV *)baton)) {
         return;
@@ -1392,7 +1400,7 @@ svn_error_t *svn_swig_pl_get_commit_log_func(const char **log_msg,
 
     if (!SvOK((SV *)baton)) {
       *log_msg = apr_pstrdup(pool, "");
-	*tmp_file = NULL;
+        *tmp_file = NULL;
         return SVN_NO_ERROR;
     }
 
@@ -1410,17 +1418,17 @@ svn_error_t *svn_swig_pl_get_commit_log_func(const char **log_msg,
         /* client returned undef to us */
         *log_msg = NULL;
     } else if (SvPOK(SvRV(log_msg_sv))) {
-	/* client returned string so get the string and then duplicate
-	 * it using pool memory */
+        /* client returned string so get the string and then duplicate
+         * it using pool memory */
         *log_msg = apr_pstrdup(pool, SvPV_nolen(SvRV(log_msg_sv)));
     } else {
         croak("Invalid value in log_msg reference, must be undef or a string");
     }
 
     if (!SvOK(SvRV(tmp_file_sv))) {
-	*tmp_file = NULL;
+        *tmp_file = NULL;
     } else if (SvPOK(SvRV(tmp_file_sv))) {
-	*tmp_file = apr_pstrdup(pool, SvPV_nolen(SvRV(tmp_file_sv)));
+        *tmp_file = apr_pstrdup(pool, SvPV_nolen(SvRV(tmp_file_sv)));
     } else {
         croak("Invalid value in tmp_file reference, "
               "must be undef or a string");
@@ -1428,9 +1436,9 @@ svn_error_t *svn_swig_pl_get_commit_log_func(const char **log_msg,
 
     if (sv_derived_from(result, "_p_svn_error_t")) {
         swig_type_info *errorinfo = _SWIG_TYPE("svn_error_t *");
-	if (SWIG_ConvertPtr(result, (void *)&ret_val, errorinfo, 0) < 0) {
+        if (SWIG_ConvertPtr(result, (void *)&ret_val, errorinfo, 0) < 0) {
             SvREFCNT_dec(result);
-	    croak("Unable to convert from SWIG Type");
+            croak("Unable to convert from SWIG Type");
         }
     }
 
@@ -1481,10 +1489,10 @@ svn_error_t *svn_swig_pl_cancel_func(void *cancel_baton) {
 
     if (sv_derived_from(result,"_p_svn_error_t")) {
         swig_type_info *errorinfo = _SWIG_TYPE("svn_error_t *");
-	if (SWIG_ConvertPtr(result, (void *)&ret_val, errorinfo, 0) < 0) {
-	    SvREFCNT_dec(result);
-	    croak("Unable to convert from SWIG Type");
-	}
+        if (SWIG_ConvertPtr(result, (void *)&ret_val, errorinfo, 0) < 0) {
+            SvREFCNT_dec(result);
+            croak("Unable to convert from SWIG Type");
+        }
     } else if (SvIOK(result) && SvIV(result)) {
         ret_val = svn_error_create(SVN_ERR_CANCELLED, NULL,
                                    "By cancel callback");
@@ -1580,9 +1588,9 @@ svn_error_t *svn_swig_pl_blame_func(void *baton,
 
     if (sv_derived_from(result, "_p_svn_error_t")) {
         swig_type_info *errorinfo = _SWIG_TYPE("svn_error_t *");
-	if (SWIG_ConvertPtr(result, (void *)&ret_val, errorinfo, 0) < 0) {
+        if (SWIG_ConvertPtr(result, (void *)&ret_val, errorinfo, 0) < 0) {
             SvREFCNT_dec(result);
-	    croak("Unable to convert from SWIG Type");
+            croak("Unable to convert from SWIG Type");
         }
     }
 
@@ -1595,7 +1603,7 @@ svn_boolean_t svn_swig_pl_thunk_config_enumerator(const char *name, const char *
 {
     SV *result;
     if (!SvOK((SV *)baton))
-	return 0;
+        return 0;
 
     svn_swig_pl_callback_thunk(CALL_SV, baton, &result,
                                "ss", name, value);
@@ -1606,21 +1614,33 @@ svn_boolean_t svn_swig_pl_thunk_config_enumerator(const char *name, const char *
 
 /* default pool support */
 
-#if defined(SVN_AVOID_CIRCULAR_LINKAGE_AT_ALL_COSTS_HACK)
-static svn_swig_pl_get_current_pool_t svn_swig_pl_get_current_pool = NULL;
-static svn_swig_pl_set_current_pool_t svn_swig_pl_set_current_pool = NULL;
+static svn_swig_pl_get_current_pool_func_t get_current_pool_cb = NULL;
+static svn_swig_pl_set_current_pool_func_t set_current_pool_cb = NULL;
 
-void svn_swig_pl_bind_current_pool_fns(svn_swig_pl_get_current_pool_t get,
-                                       svn_swig_pl_set_current_pool_t set)
+void
+svn_swig_pl__bind_current_pool_fns(svn_swig_pl_get_current_pool_func_t get,
+                                   svn_swig_pl_set_current_pool_func_t set)
 {
-  svn_swig_pl_get_current_pool = get;
-  svn_swig_pl_set_current_pool = set;
+  /* This function should only be called ONCE, otherwise there are two
+     global variables CURRENT_POOL */
+  SVN_ERR_ASSERT_NO_RETURN(get_current_pool_cb == NULL
+                           && set_current_pool_cb == NULL);
+
+  get_current_pool_cb = get;
+  set_current_pool_cb = set;
 }
-#else
-apr_pool_t *svn_swig_pl_get_current_pool(void);
-void svn_swig_pl_set_current_pool(apr_pool_t *pool);
-#endif
 
+apr_pool_t * svn_swig_pl_get_current_pool()
+{
+  SVN_ERR_ASSERT_NO_RETURN(get_current_pool_cb != NULL);
+  return get_current_pool_cb();
+}
+
+void svn_swig_pl_set_current_pool(apr_pool_t *pool)
+{
+  SVN_ERR_ASSERT_NO_RETURN(set_current_pool_cb != NULL);
+  set_current_pool_cb(pool);
+}
 
 apr_pool_t *svn_swig_pl_make_pool(SV *obj)
 {
@@ -1628,12 +1648,12 @@ apr_pool_t *svn_swig_pl_make_pool(SV *obj)
 
     if (obj && sv_isobject(obj)) {
       if (sv_derived_from(obj, "SVN::Pool")) {
-	    obj = SvRV(obj);
-	}
-	if (sv_derived_from(obj, "_p_apr_pool_t")) {
-	    SWIG_ConvertPtr(obj, (void **)&pool, POOLINFO, 0);
-	    return pool;
-	}
+            obj = SvRV(obj);
+        }
+        if (sv_derived_from(obj, "_p_apr_pool_t")) {
+            SWIG_ConvertPtr(obj, (void **)&pool, POOLINFO, 0);
+            return pool;
+        }
     }
 
     if (!svn_swig_pl_get_current_pool())
@@ -1658,15 +1678,15 @@ static svn_error_t *io_handle_read(void *baton,
     MAGIC *mg;
 
     if ((mg = SvTIED_mg((SV*)io->io, PERL_MAGIC_tiedscalar))) {
-	SV *ret;
-	SV *buf = sv_newmortal();
+        SV *ret;
+        SV *buf = sv_newmortal();
 
-	svn_swig_pl_callback_thunk(CALL_METHOD, (void *)"READ", &ret, "OOz",
+        svn_swig_pl_callback_thunk(CALL_METHOD, (void *)"READ", &ret, "OOz",
                                    SvTIED_obj((SV*)io->io, mg),
                                    buf, *len);
-	*len = SvIV(ret);
-	SvREFCNT_dec(ret);
-	memmove(buffer, SvPV_nolen(buf), *len);
+        *len = SvIV(ret);
+        SvREFCNT_dec(ret);
+        memmove(buffer, SvPV_nolen(buf), *len);
     }
     else
       *len = PerlIO_read(IoIFP(io->io), buffer, *len);
@@ -1681,12 +1701,12 @@ static svn_error_t *io_handle_write(void *baton,
     MAGIC *mg;
 
     if ((mg = SvTIED_mg((SV*)io->io, PERL_MAGIC_tiedscalar))) {
-	SV *ret, *pv;
+        SV *ret, *pv;
         pv = sv_2mortal(newSVpvn(data, *len));
-	svn_swig_pl_callback_thunk(CALL_METHOD, (void *)"WRITE", &ret, "OOz",
+        svn_swig_pl_callback_thunk(CALL_METHOD, (void *)"WRITE", &ret, "OOz",
                                    SvTIED_obj((SV*)io->io, mg), pv, *len);
-	*len = SvIV(ret);
-	SvREFCNT_dec(ret);
+        *len = SvIV(ret);
+        SvREFCNT_dec(ret);
     }
     else
       *len = PerlIO_write(IoIFP(io->io), data, *len);
@@ -1730,7 +1750,7 @@ svn_error_t *svn_swig_pl_make_stream(svn_stream_t **stream, SV *obj)
       if (sv_derived_from(obj, "SVN::Stream"))
         svn_swig_pl_callback_thunk(CALL_METHOD, (void *)"svn_stream",
                                    &obj, "O", obj);
-	else if (!sv_derived_from(obj, "_p_svn_stream_t"))
+        else if (!sv_derived_from(obj, "_p_svn_stream_t"))
             simple_type = 0;
 
         if (simple_type) {
@@ -1740,17 +1760,18 @@ svn_error_t *svn_swig_pl_make_stream(svn_stream_t **stream, SV *obj)
     }
 
     if (obj && SvROK(obj) && SvTYPE(SvRV(obj)) == SVt_PVGV &&
-	(io = GvIO(SvRV(obj)))) {
-	apr_pool_t *pool = svn_swig_pl_get_current_pool();
-	io_baton_t *iob = apr_palloc(pool, sizeof(io_baton_t));
-	SvREFCNT_inc(obj);
-	iob->obj = obj;
-	iob->io = io;
-	*stream = svn_stream_create(iob, pool);
-	svn_stream_set_read(*stream, io_handle_read);
-	svn_stream_set_write(*stream, io_handle_write);
-	svn_stream_set_close(*stream, io_handle_close);
-	apr_pool_cleanup_register(pool, iob, io_handle_cleanup,
+        (io = GvIO(SvRV(obj)))) {
+        apr_pool_t *pool = svn_swig_pl_get_current_pool();
+        io_baton_t *iob = apr_palloc(pool, sizeof(io_baton_t));
+        SvREFCNT_inc(obj);
+        iob->obj = obj;
+        iob->io = io;
+        *stream = svn_stream_create(iob, pool);
+        svn_stream_set_read2(*stream, NULL /* only full read support */,
+                             io_handle_read);
+        svn_stream_set_write(*stream, io_handle_write);
+        svn_stream_set_close(*stream, io_handle_close);
+        apr_pool_cleanup_register(pool, iob, io_handle_cleanup,
                                   io_handle_cleanup);
 
     }
@@ -1794,7 +1815,7 @@ apr_file_t *svn_swig_pl_make_file(SV *file, apr_pool_t *pool)
     apr_file_t *apr_file = NULL;
 
     if (!SvOK(file) || file == &PL_sv_undef)
-	return NULL;
+        return NULL;
 
     if (SvPOKp(file)) {
       apr_file_open(&apr_file, SvPV_nolen(file),
diff --git a/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h b/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h
index 3eae82e..f6db304 100644
--- a/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h
+++ b/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h
@@ -59,14 +59,14 @@ extern "C" {
 #endif
 
 
+typedef apr_pool_t *(*svn_swig_pl_get_current_pool_func_t)(void);
+typedef void (*svn_swig_pl_set_current_pool_func_t)(apr_pool_t *pool);
 
-#if defined(SVN_AVOID_CIRCULAR_LINKAGE_AT_ALL_COSTS_HACK)
-typedef apr_pool_t *(*svn_swig_pl_get_current_pool_t)(void);
-typedef void (*svn_swig_pl_set_current_pool_t)(apr_pool_t *pool);
+void svn_swig_pl__bind_current_pool_fns(svn_swig_pl_get_current_pool_func_t get,
+                                       svn_swig_pl_set_current_pool_func_t set);
 
-void svn_swig_pl_bind_current_pool_fns(svn_swig_pl_get_current_pool_t get,
-                                       svn_swig_pl_set_current_pool_t set);
-#endif
+apr_pool_t * svn_swig_pl_get_current_pool();
+void svn_swig_pl_set_current_pool(apr_pool_t *pool);
 
 apr_pool_t *svn_swig_pl_make_pool(SV *obj);
 
@@ -83,9 +83,7 @@ svn_error_t *svn_swig_pl_callback_thunk(perl_func_invoker_t caller_func,
 SV *svn_swig_pl_prophash_to_hash(apr_hash_t *hash);
 SV *svn_swig_pl_convert_hash(apr_hash_t *hash, swig_type_info *tinfo);
 
-SV *svn_swig_pl_convert_hash_of_revnum_t(apr_hash_t *hash);
-
-const apr_array_header_t *svn_swig_pl_strings_to_array(SV *source,
+apr_array_header_t *svn_swig_pl_strings_to_array(SV *source,
                                                        apr_pool_t *pool);
 
 apr_hash_t *svn_swig_pl_strings_to_hash(SV *source,
@@ -98,24 +96,22 @@ apr_hash_t *svn_swig_pl_objs_to_hash_by_name(SV *source,
 apr_hash_t *svn_swig_pl_objs_to_hash_of_revnum_t(SV *source,
                                                  apr_pool_t *pool);
 apr_hash_t *svn_swig_pl_hash_to_prophash(SV *source, apr_pool_t *pool);
-const apr_array_header_t *svn_swig_pl_objs_to_array(SV *source,
+apr_array_header_t *svn_swig_pl_objs_to_array(SV *source,
                                                     swig_type_info *tinfo,
                                                     apr_pool_t *pool);
-const apr_array_header_t *svn_swig_pl_array_to_apr_array_revision_range(
+apr_array_header_t *svn_swig_pl_array_to_apr_array_revision_range(
         SV *source, apr_pool_t *pool);
 
 SV *svn_swig_pl_array_to_list(const apr_array_header_t *array);
-/* Formerly used by pre-1.0 APIs. Now unused
-SV *svn_swig_pl_ints_to_list(const apr_array_header_t *array);
-*/
 SV *svn_swig_pl_convert_array(const apr_array_header_t *array,
                               swig_type_info *tinfo);
 
 SV *svn_swig_pl_revnums_to_list(const apr_array_header_t *array);
 
-svn_opt_revision_t *svn_swig_pl_set_revision(svn_opt_revision_t *rev, 
+svn_opt_revision_t *svn_swig_pl_set_revision(svn_opt_revision_t *rev,
                                              SV *source,
-                                             svn_boolean_t croak_on_error);
+                                             svn_boolean_t croak_on_error,
+                                             apr_pool_t *pool);
 
 /* thunked log_message receiver function.  */
 svn_error_t * svn_swig_pl_thunk_log_receiver(void *baton,
@@ -139,9 +135,9 @@ svn_error_t * svn_swig_pl_thunk_client_diff_summarize_func(
 
 /* thunked commit editor callback. */
 svn_error_t *svn_swig_pl_thunk_commit_callback(svn_revnum_t new_revision,
-					       const char *date,
-					       const char *author,
-					       void *baton);
+                                               const char *date,
+                                               const char *author,
+                                               void *baton);
 
 /* thunked commit editor callback2. */
 svn_error_t *svn_swig_pl_thunk_commit_callback2(const svn_commit_info_t *commit_info,
@@ -162,10 +158,10 @@ svn_error_t *svn_swig_pl_thunk_authz_func(svn_boolean_t *allowed,
                                           apr_pool_t *pool);
 
 /* ra callbacks. */
-svn_error_t *svn_ra_make_callbacks(svn_ra_callbacks_t **cb,
-				   void **c_baton,
-				   SV *perl_callbacks,
-				   apr_pool_t *pool);
+svn_error_t *svn_swig_pl_make_callbacks(svn_ra_callbacks_t **cb,
+                                        void **c_baton,
+                                        SV *perl_callbacks,
+                                        apr_pool_t *pool);
 
 /* thunked gnome_keyring_unlock_prompt callback function */
 svn_error_t *svn_swig_pl_thunk_gnome_keyring_unlock_prompt(char **keyring_password,
@@ -223,12 +219,12 @@ svn_error_t *thunk_get_wc_prop(void *baton,
 /* Thunked version of svn_wc_notify_func_t callback type */
 void svn_swig_pl_notify_func(void * baton,
                              const char *path,
-		             svn_wc_notify_action_t action,
-			     svn_node_kind_t kind,
-			     const char *mime_type,
-			     svn_wc_notify_state_t content_state,
-			     svn_wc_notify_state_t prop_state,
-			     svn_revnum_t revision);
+                             svn_wc_notify_action_t action,
+                             svn_node_kind_t kind,
+                             const char *mime_type,
+                             svn_wc_notify_state_t content_state,
+                             svn_wc_notify_state_t prop_state,
+                             svn_revnum_t revision);
 
 
 /* Thunked version of svn_client_get_commit_log3_t callback type. */
@@ -277,15 +273,15 @@ svn_error_t *svn_swig_pl_blame_func(void *baton,
 svn_boolean_t svn_swig_pl_thunk_config_enumerator(const char *name, const char *value, void *baton);
 
 /* helper for making the editor */
-void svn_delta_make_editor(svn_delta_editor_t **editor,
-                           void **edit_baton,
-                           SV *perl_editor,
-                           apr_pool_t *pool);
-
-void svn_delta_wrap_window_handler(svn_txdelta_window_handler_t *handler,
-                                   void **h_baton,
-                                   SV *callback,
-                                   apr_pool_t *pool);
+void svn_swig_pl_make_editor(svn_delta_editor_t **editor,
+                             void **edit_baton,
+                             SV *perl_editor,
+                             apr_pool_t *pool);
+
+void svn_swig_pl_wrap_window_handler(svn_txdelta_window_handler_t *handler,
+                                     void **h_baton,
+                                     SV *callback,
+                                     apr_pool_t *pool);
 
 /* svn_stream_t helpers */
 svn_error_t *svn_swig_pl_make_stream(svn_stream_t **stream, SV *obj);
diff --git a/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl__pre_perl.h b/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl__pre_perl.h
new file mode 100644
index 0000000..fadf490
--- /dev/null
+++ b/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl__pre_perl.h
@@ -0,0 +1,33 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+#ifndef SVN_SWIG_SWIGUTIL_PL__PRE_PERL_H
+#define SVN_SWIG_SWIGUTIL_PL__PRE_PERL_H
+
+/* Ruby 5.8 somehow expects Visual C++ to be gcc compatible for __inline__.
+   Add a #define to make the default headers happy and avoid an insane
+   number of warnings */
+
+#ifdef _MSC_VER
+#define __inline__ __inline
+#endif
+
+#endif
diff --git a/subversion/bindings/swig/perl/native/Client.pm b/subversion/bindings/swig/perl/native/Client.pm
index 10da064..f4b1f06 100644
--- a/subversion/bindings/swig/perl/native/Client.pm
+++ b/subversion/bindings/swig/perl/native/Client.pm
@@ -41,30 +41,35 @@ SVN::Client - Subversion client functions
 =head1 SYNOPSIS
 
     use SVN::Client;
-    my $client = new SVN::Client(
-      auth => [
-          SVN::Client::get_simple_provider(),
-          SVN::Client::get_simple_prompt_provider(\&simple_prompt,2),
-          SVN::Client::get_username_provider()
-      ]);
-
-    $client->cat(\*STDOUT, 
-              'http://svn.apache.org/repos/asf/subversion/trunk/README', 'HEAD');
-
-    sub simple_prompt {
-      my ($cred, $realm, $default_username, $may_save, $pool) = @_;
-
-      print "Enter authentication info for realm: $realm\n";
-      print "Username: ";
-      my $username = <>;
-      chomp($username);
-      $cred->username($username);
-      print "Password: ";
-      my $password = <>;
-      chomp($password);
-      $cred->password($password);
+    my $client = new SVN::Client();
+
+    # setup to handle authentication the same as the command line client
+    my $config_dir = undef; # use default location
+    my $config = SVN:Core::config_get_config($config_dir);
+    my $config_category = $cfg->{SVN::Core::CONFIG_CATEGORY_CONFIG};
+    $client->auth(
+      SVN::Core::cmdline_create_auth_baton(0,           #non_interactive
+                                           undef,       #username
+                                           undef,       #password
+                                           $config_dir,
+                                           0,           #no_auth_cache
+                                           0,           #trust_server_cert
+                                           $config_category,
+                                           undef)       #cancel_callback
+    );
+
+    # Use first argument as target and canonicalize it before using
+    my $target;
+    if (SVN::Core::path_is_url($ARGV[0])) {
+      $target = SVN::Core::uri_canonicalize($ARGV[0]);
+    } else {
+      $target = SVN::Core::dirent_canonicalize($ARGV[0]);
     }
 
+    # fetch the head revision of the target
+    $client->cat(\*STDOUT, $target, 'HEAD');
+
+
 =head1 DESCRIPTION
 
 SVN::Client wraps the highest level of functions provided by
@@ -111,18 +116,24 @@ This is a URL to a subversion repository.
 
 =item $path
 
-This is a path to a file or directory on the local file system.
+This is a path to a file or directory on the local file system.  Paths need
+to be canonicalized before being passed into the Subversion APIs.  Paths on
+the local file system are called dirents and can be canonicalized by calling
+C<SVN::Core::dirent_canonicalize>.
 
 =item $paths
 
-This argument can either be a single path to a file or directory on the local
-file system, or it can be a reference to an array of files or directories on
-the local file system.
+This argument can either be a single $path (as defined above) or a reference
+to an array of them.
 
 =item $target
 
 This is a path to a file or directory in a working copy or a URL to a file or
-directory in a subversion repository.
+directory in a subversion repository.  Both paths and URLs need to be
+canonicalized before being passed into the Subversion APIs.  Paths on the local
+file system are called dirents and can be canonicalized by calling 
+C<SVN::Core::dirent_canonicalize>.  URLs can be canonicalized by calling
+C<SVN::Core::uri_canonicalize>.
 
 =item $targets
 
@@ -748,7 +759,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
@@ -958,10 +969,10 @@ $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 propogate an error up.
+SVN::Error::create in order to propagate an error up.
 
 =item $client-E<gt>switch($path, $url, $revision, $recursive, $pool);
 
@@ -1274,24 +1285,8 @@ sub log_msg {
 =item $client-E<gt>cancel(\&cancel)
 
 Sets the cancellation callback for the client context to a code reference that you
-pass.  It always returns the current codereference set.
-
-The subroutine pointed to by this value will be called to see if the operation
-should be canceled.  If the operation should be canceled, the function may
-return one of the following values:
-
-An svn_error_t object made with SVN::Error::create.
-
-Any true value, in which case the bindings will generate an svn_error_t object
-for you with the error code of SVN_ERR_CANCELLED and the string set to "By
-cancel callback".
-
-A string, in which case the bindings will generate an svn_error_t object for you
-with the error code of SVN_ERR_CANCELLED and the string set to the string you
-returned.
-
-Any other value will be interpreted as wanting to continue the operation.
-Generally, it's best to return 0 to continue the operation.
+pass. See L<"CANCELLATION CALLBACK"> below for details.
+It always returns the current codereference set.
 
 =cut
 
@@ -1477,6 +1472,25 @@ may_save.
 
 =back
 
+=head1 CANCELLATION CALLBACK
+
+This callback will be called periodically to see if the operation
+should be canceled.  If the operation should be canceled, the function may
+return one of the following values:
+
+An svn_error_t object made with SVN::Error::create.
+
+Any true value, in which case the bindings will generate an svn_error_t object
+for you with the error code of SVN_ERR_CANCELLED and the string set to "By
+cancel callback".
+
+A string, in which case the bindings will generate an svn_error_t object for you
+with the error code of SVN_ERR_CANCELLED and the string set to the string you
+returned.
+
+Any other value will be interpreted as wanting to continue the operation.
+Generally, it's best to return 0 to continue the operation.
+
 =head1 OBJECTS
 
 These are some of the object types that are returned from the methods
diff --git a/subversion/bindings/swig/perl/native/Makefile.PL.in b/subversion/bindings/swig/perl/native/Makefile.PL.in
index a60430b..a303d30 100644
--- a/subversion/bindings/swig/perl/native/Makefile.PL.in
+++ b/subversion/bindings/swig/perl/native/Makefile.PL.in
@@ -40,7 +40,7 @@ my @modules = qw/client delta fs ra repos wc/;
 my @ldpaths = (abs_path($swig_builddir) . "/perl/libsvn_swig_perl/.libs",
                map { abs_path($svnlib_builddir) . "/libsvn_$_/.libs" }
                    @modules, qw/diff subr ra_local ra_svn ra_serf
-                                fs_base fs_util fs_fs/);
+                                fs_base fs_util fs_fs fs_x/);
 
 my @ldmodules = map {"-lsvn_$_-1"} (@modules, qw/diff subr/);
 
diff --git a/subversion/bindings/swig/perl/native/Repos.pm b/subversion/bindings/swig/perl/native/Repos.pm
index 02d37fc..bd6d7bc 100644
--- a/subversion/bindings/swig/perl/native/Repos.pm
+++ b/subversion/bindings/swig/perl/native/Repos.pm
@@ -42,9 +42,9 @@ object.
 
 =over
 
-=item $repos-E<gt>dump_fs($dump_fh, $feedback_fh, $start_rev, $end_rev, $incremental, $cancel_func, $cancel_baton)
+=item $repos-E<gt>dump_fs($dump_fh, $feedback_fh, $start_rev, $end_rev, $incremental, $cancel_callback)
 
-=item $repos-E<gt>dump_fs2($dump_fh, $feedback_fh, $start_rev, $end_rev, $incremental, $deltify, $cancel_func, $cancel_baton)
+=item $repos-E<gt>dump_fs2($dump_fh, $feedback_fh, $start_rev, $end_rev, $incremental, $deltify, $cancel_callback)
 
 Create a dump file of the repository from revision C<$start_rev> to C<$end_rev>
 , store it into the filehandle C<$dump_fh>, and write feedback on the progress
@@ -61,10 +61,9 @@ this flag is set, the first revision of a non-incremental dump will
 be done with full plain text.  A dump with @a use_deltas set cannot
 be loaded by Subversion 1.0.x.
 
-According to svn_repos.h, the C<$cancel_func> is a function that is called
-periodically and given C<$cancel_baton> as a parameter to determine whether
-the client wishes to cancel the dump.  You must supply C<undef> at the very
-least.
+If C<$cancel_callback> is not C<undef>, it must be a code reference
+that is called periodically to determine whether the client wishes 
+to cancel the dump.  See L<SVN::Client/"CANCELLATION CALLBACK"> for details.
 
 Example:
 
@@ -83,13 +82,13 @@ Example:
     $repos->dump_fs2($fh, \*STDOUT,          # Dump file => $fh, Feedback => STDOUT
                      $start_rev, $end_rev,   # Revision Range
                      $incremental, $deltify, # Options
-                     undef, undef);          # Cancel Function
+                     undef);                 # Cancel Callback
 
     close $fh;
 
-=item $repos-E<gt>load_fs($dumpfile_fh, $feedback_fh, $uuid_action, $parent_dir, $cancel_func, $cancel_baton);
+=item $repos-E<gt>load_fs($dumpfile_fh, $feedback_fh, $uuid_action, $parent_dir, $cancel_callback);
 
-=item $repos-E<gt>load_fs2($dumpfile_fh, $feedback_fh, $uuid_action, $parent_dir, $use_pre_commit_hook, $use_post_commit_hook, $cancel_func, $cancel_baton);
+=item $repos-E<gt>load_fs2($dumpfile_fh, $feedback_fh, $uuid_action, $parent_dir, $use_pre_commit_hook, $use_post_commit_hook, $cancel_callback);
 
 Loads a dumpfile specified by the C<$dumpfile_fh> filehandle into the repository.
 If the dumpstream contains copy history that is unavailable in the repository,
@@ -113,11 +112,11 @@ hook before committing each loaded revision.
 If C<$use_post_commit_hook> is set, call the repository's
 post-commit hook after committing each loaded revision.
 
-If C<$cancel_func> is not NULL, it is called periodically with
-C<$cancel_baton> as argument to see if the client wishes to cancel
-the load.
+If C<$cancel_callback> is not C<undef>, it must be a code reference 
+that is called periodically to determine whether the client wishes
+to cancel the load.  See L<SVN::Client/"CANCELLATION CALLBACK"> for details.
 
-You must at least provide undef for these parameters for the method call
+You must at least provide C<undef> for these parameters for the method call
 to work.
 
 Example:
diff --git a/subversion/bindings/swig/perl/native/core.c b/subversion/bindings/swig/perl/native/core.c
index 5078f5c..96304a2 100644
--- a/subversion/bindings/swig/perl/native/core.c
+++ b/subversion/bindings/swig/perl/native/core.c
@@ -1,11 +1,11 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
- * 
- * This file is not intended to be easily readable and contains a number of 
+ * Version 2.0.12
+ *
+ * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
- * changes to this file unless you know what you are doing--modify the SWIG 
- * interface file instead. 
+ * changes to this file unless you know what you are doing--modify the SWIG
+ * interface file instead.
  * ----------------------------------------------------------------------------- */
 
 #define SWIGPERL
@@ -42,28 +42,28 @@
 #ifndef SWIGUNUSED
 # if defined(__GNUC__)
 #   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__)) 
+#     define SWIGUNUSED __attribute__ ((__unused__))
 #   else
 #     define SWIGUNUSED
 #   endif
 # elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__)) 
+#   define SWIGUNUSED __attribute__ ((__unused__))
 # else
-#   define SWIGUNUSED 
+#   define SWIGUNUSED
 # endif
 #endif
 
 #ifndef SWIG_MSC_UNSUPPRESS_4505
 # if defined(_MSC_VER)
 #   pragma warning(disable : 4505) /* unreferenced local function has been removed */
-# endif 
+# endif
 #endif
 
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
 # else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
 # endif
 #endif
 
@@ -106,7 +106,7 @@
 #   define SWIGSTDCALL __stdcall
 # else
 #   define SWIGSTDCALL
-# endif 
+# endif
 #endif
 
 /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
@@ -144,7 +144,7 @@
   You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for
   creating a static or dynamic library from the SWIG runtime code.
   In 99.9% of the cases, SWIG just needs to declare them as 'static'.
-  
+
   But only do this if strictly necessary, ie, if you have problems
   with your compiler or suchlike.
 */
@@ -170,16 +170,16 @@
 #define SWIG_POINTER_OWN           0x1
 
 
-/* 
+/*
    Flags/methods for returning states.
-   
-   The SWIG conversion methods, as ConvertPtr, return an integer 
+
+   The SWIG conversion methods, as ConvertPtr, return an integer
    that tells if the conversion was successful or not. And if not,
    an error code can be returned (see swigerrors.swg for the codes).
-   
+
    Use the following macros/flags to set or process the returning
    states.
-   
+
    In old versions of SWIG, code such as the following was usually written:
 
      if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) {
@@ -212,23 +212,23 @@
     } else {
       // fail code
     }
-    
+
    I.e., now SWIG_ConvertPtr can return new objects and you can
    identify the case and take care of the deallocation. Of course that
    also requires SWIG_ConvertPtr to return new result values, such as
 
-      int SWIG_ConvertPtr(obj, ptr,...) {         
-        if (<obj is ok>) {			       
-          if (<need new object>) {		       
-            *ptr = <ptr to new allocated object>; 
-            return SWIG_NEWOBJ;		       
-          } else {				       
-            *ptr = <ptr to old object>;	       
-            return SWIG_OLDOBJ;		       
-          } 				       
-        } else {				       
-          return SWIG_BADOBJ;		       
-        }					       
+      int SWIG_ConvertPtr(obj, ptr,...) {
+        if (<obj is ok>) {
+          if (<need new object>) {
+            *ptr = <ptr to new allocated object>;
+            return SWIG_NEWOBJ;
+          } else {
+            *ptr = <ptr to old object>;
+            return SWIG_OLDOBJ;
+          }
+        } else {
+          return SWIG_BADOBJ;
+        }
       }
 
    Of course, returning the plain '0(success)/-1(fail)' still works, but you can be
@@ -242,17 +242,17 @@
        int fooi(int);
 
    and you call
- 
+
       food(1)   // cast rank '1'  (1 -> 1.0)
       fooi(1)   // cast rank '0'
 
    just use the SWIG_AddCast()/SWIG_CheckState()
 */
 
-#define SWIG_OK                    (0) 
+#define SWIG_OK                    (0)
 #define SWIG_ERROR                 (-1)
 #define SWIG_IsOK(r)               (r >= 0)
-#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)  
+#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)
 
 /* The CastRankLimit says how many bits are used for the cast rank */
 #define SWIG_CASTRANKLIMIT         (1 << 8)
@@ -283,14 +283,14 @@
 #  endif
 #  define SWIG_CASTRANKMASK          ((SWIG_CASTRANKLIMIT) -1)
 #  define SWIG_CastRank(r)           (r & SWIG_CASTRANKMASK)
-SWIGINTERNINLINE int SWIG_AddCast(int r) { 
+SWIGINTERNINLINE int SWIG_AddCast(int r) {
   return SWIG_IsOK(r) ? ((SWIG_CastRank(r) < SWIG_MAXCASTRANK) ? (r + 1) : SWIG_ERROR) : r;
 }
-SWIGINTERNINLINE int SWIG_CheckState(int r) { 
-  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0; 
+SWIGINTERNINLINE int SWIG_CheckState(int r) {
+  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0;
 }
 #else /* no cast-rank mode */
-#  define SWIG_AddCast
+#  define SWIG_AddCast(r) (r)
 #  define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0)
 #endif
 
@@ -334,7 +334,7 @@ typedef struct swig_module_info {
   void                    *clientdata;		/* Language specific module data */
 } swig_module_info;
 
-/* 
+/*
   Compare two type names skipping the space characters, therefore
   "char*" == "char *" and "Class<int>" == "Class<int >", etc.
 
@@ -354,18 +354,18 @@ SWIG_TypeNameComp(const char *f1, const char *l1,
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if not equal, 1 if equal
+  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
 */
 SWIGRUNTIME int
-SWIG_TypeEquiv(const char *nb, const char *tb) {
-  int equiv = 0;
+SWIG_TypeCmp(const char *nb, const char *tb) {
+  int equiv = 1;
   const char* te = tb + strlen(tb);
   const char* ne = nb;
-  while (!equiv && *ne) {
+  while (equiv != 0 && *ne) {
     for (nb = ne; *ne; ++ne) {
       if (*ne == '|') break;
     }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
+    equiv = SWIG_TypeNameComp(nb, ne, tb, te);
     if (*ne) ++ne;
   }
   return equiv;
@@ -373,24 +373,13 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
+  Return 0 if not equal, 1 if equal
 */
 SWIGRUNTIME int
-SWIG_TypeCompare(const char *nb, const char *tb) {
-  int equiv = 0;
-  const char* te = tb + strlen(tb);
-  const char* ne = nb;
-  while (!equiv && *ne) {
-    for (nb = ne; *ne; ++ne) {
-      if (*ne == '|') break;
-    }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
-    if (*ne) ++ne;
-  }
-  return equiv;
+SWIG_TypeEquiv(const char *nb, const char *tb) {
+  return SWIG_TypeCmp(nb, tb) == 0 ? 1 : 0;
 }
 
-
 /*
   Check the typename
 */
@@ -418,7 +407,7 @@ SWIG_TypeCheck(const char *c, swig_type_info *ty) {
   return 0;
 }
 
-/* 
+/*
   Identical to SWIG_TypeCheck, except strcmp is replaced with a pointer comparison
 */
 SWIGRUNTIME swig_cast_info *
@@ -453,7 +442,7 @@ SWIG_TypeCast(swig_cast_info *ty, void *ptr, int *newmemory) {
   return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr, newmemory);
 }
 
-/* 
+/*
    Dynamic pointer casting. Down an inheritance hierarchy
 */
 SWIGRUNTIME swig_type_info *
@@ -497,7 +486,7 @@ SWIG_TypePrettyName(const swig_type_info *type) {
     return type->name;
 }
 
-/* 
+/*
    Set the clientdata field for a type
 */
 SWIGRUNTIME void
@@ -505,14 +494,14 @@ SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
   swig_cast_info *cast = ti->cast;
   /* if (ti->clientdata == clientdata) return; */
   ti->clientdata = clientdata;
-  
+
   while (cast) {
     if (!cast->converter) {
       swig_type_info *tc = cast->type;
       if (!tc->clientdata) {
 	SWIG_TypeClientData(tc, clientdata);
       }
-    }    
+    }
     cast = cast->next;
   }
 }
@@ -521,18 +510,18 @@ SWIG_TypeNewClientData(swig_type_info *ti, void *clientdata) {
   SWIG_TypeClientData(ti, clientdata);
   ti->owndata = 1;
 }
-  
+
 /*
   Search for a swig_type_info structure only by mangled name
   Search is a O(log #types)
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_MangledTypeQueryModule(swig_module_info *start, 
-                            swig_module_info *end, 
+SWIG_MangledTypeQueryModule(swig_module_info *start,
+                            swig_module_info *end,
 		            const char *name) {
   swig_module_info *iter = start;
   do {
@@ -541,11 +530,11 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
       register size_t r = iter->size - 1;
       do {
 	/* since l+r >= 0, we can (>> 1) instead (/ 2) */
-	register size_t i = (l + r) >> 1; 
+	register size_t i = (l + r) >> 1;
 	const char *iname = iter->types[i]->name;
 	if (iname) {
 	  register int compare = strcmp(name, iname);
-	  if (compare == 0) {	    
+	  if (compare == 0) {
 	    return iter->types[i];
 	  } else if (compare < 0) {
 	    if (i) {
@@ -570,14 +559,14 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
   Search for a swig_type_info structure for either a mangled name or a human readable name.
   It first searches the mangled names of the types, which is a O(log #types)
   If a type is not found it then searches the human readable names, which is O(#types).
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_TypeQueryModule(swig_module_info *start, 
-                     swig_module_info *end, 
+SWIG_TypeQueryModule(swig_module_info *start,
+                     swig_module_info *end,
 		     const char *name) {
   /* STEP 1: Search the name field using binary search */
   swig_type_info *ret = SWIG_MangledTypeQueryModule(start, end, name);
@@ -596,12 +585,12 @@ SWIG_TypeQueryModule(swig_module_info *start,
       iter = iter->next;
     } while (iter != end);
   }
-  
+
   /* neither found a match */
   return 0;
 }
 
-/* 
+/*
    Pack binary data into a string
 */
 SWIGRUNTIME char *
@@ -617,7 +606,7 @@ SWIG_PackData(char *c, void *ptr, size_t sz) {
   return c;
 }
 
-/* 
+/*
    Unpack binary data from a string
 */
 SWIGRUNTIME const char *
@@ -631,21 +620,21 @@ SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
       uu = ((d - '0') << 4);
     else if ((d >= 'a') && (d <= 'f'))
       uu = ((d - ('a'-10)) << 4);
-    else 
+    else
       return (char *) 0;
     d = *(c++);
     if ((d >= '0') && (d <= '9'))
       uu |= (d - '0');
     else if ((d >= 'a') && (d <= 'f'))
       uu |= (d - ('a'-10));
-    else 
+    else
       return (char *) 0;
     *u = uu;
   }
   return c;
 }
 
-/* 
+/*
    Pack 'void *' into a string buffer.
 */
 SWIGRUNTIME char *
@@ -705,18 +694,18 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 #endif
 
 /*  Errors in SWIG */
-#define  SWIG_UnknownError    	   -1 
-#define  SWIG_IOError        	   -2 
-#define  SWIG_RuntimeError   	   -3 
-#define  SWIG_IndexError     	   -4 
-#define  SWIG_TypeError      	   -5 
-#define  SWIG_DivisionByZero 	   -6 
-#define  SWIG_OverflowError  	   -7 
-#define  SWIG_SyntaxError    	   -8 
-#define  SWIG_ValueError     	   -9 
+#define  SWIG_UnknownError    	   -1
+#define  SWIG_IOError        	   -2
+#define  SWIG_RuntimeError   	   -3
+#define  SWIG_IndexError     	   -4
+#define  SWIG_TypeError      	   -5
+#define  SWIG_DivisionByZero 	   -6
+#define  SWIG_OverflowError  	   -7
+#define  SWIG_SyntaxError    	   -8
+#define  SWIG_ValueError     	   -9
 #define  SWIG_SystemError    	   -10
 #define  SWIG_AttributeError 	   -11
-#define  SWIG_MemoryError    	   -12 
+#define  SWIG_MemoryError    	   -12
 #define  SWIG_NullReferenceError   -13
 
 
@@ -1501,32 +1490,32 @@ SWIG_Perl_SetModule(swig_module_info *module) {
 #define SWIGTYPE_p_apr_finfo_t swig_types[5]
 #define SWIGTYPE_p_apr_getopt_option_t swig_types[6]
 #define SWIGTYPE_p_apr_getopt_t swig_types[7]
-#define SWIGTYPE_p_apr_hash_index_t swig_types[8]
-#define SWIGTYPE_p_apr_hash_t swig_types[9]
-#define SWIGTYPE_p_apr_int32_t swig_types[10]
-#define SWIGTYPE_p_apr_int64_t swig_types[11]
-#define SWIGTYPE_p_apr_off_t swig_types[12]
-#define SWIGTYPE_p_apr_pool_t swig_types[13]
-#define SWIGTYPE_p_apr_proc_t swig_types[14]
-#define SWIGTYPE_p_apr_size_t swig_types[15]
-#define SWIGTYPE_p_apr_uint32_t swig_types[16]
-#define SWIGTYPE_p_char swig_types[17]
-#define SWIGTYPE_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[18]
-#define SWIGTYPE_p_f_p_apr_uint32_t_p_p_void_p_void_svn_diff_datasource_e__p_svn_error_t swig_types[19]
-#define SWIGTYPE_p_f_p_p_char_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t swig_types[20]
-#define SWIGTYPE_p_f_p_p_struct_svn_auth_provider_object_t_p_apr_pool_t__void swig_types[21]
-#define SWIGTYPE_p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[22]
-#define SWIGTYPE_p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[23]
-#define SWIGTYPE_p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[24]
-#define SWIGTYPE_p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[25]
-#define SWIGTYPE_p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[26]
-#define SWIGTYPE_p_f_p_p_svn_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t swig_types[27]
-#define SWIGTYPE_p_f_p_p_void_p_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[28]
-#define SWIGTYPE_p_f_p_p_void_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[29]
-#define SWIGTYPE_p_f_p_q_const__char_p_q_const__char_p_void__int swig_types[30]
-#define SWIGTYPE_p_f_p_q_const__char_p_q_const__char_p_void_p_apr_pool_t__int swig_types[31]
-#define SWIGTYPE_p_f_p_q_const__char_p_void__int swig_types[32]
-#define SWIGTYPE_p_f_p_q_const__char_p_void_p_apr_pool_t__int swig_types[33]
+#define SWIGTYPE_p_apr_hash_t swig_types[8]
+#define SWIGTYPE_p_apr_int32_t swig_types[9]
+#define SWIGTYPE_p_apr_int64_t swig_types[10]
+#define SWIGTYPE_p_apr_off_t swig_types[11]
+#define SWIGTYPE_p_apr_pool_t swig_types[12]
+#define SWIGTYPE_p_apr_proc_t swig_types[13]
+#define SWIGTYPE_p_apr_size_t swig_types[14]
+#define SWIGTYPE_p_apr_uint32_t swig_types[15]
+#define SWIGTYPE_p_char swig_types[16]
+#define SWIGTYPE_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[17]
+#define SWIGTYPE_p_f_p_apr_uint32_t_p_p_void_p_void_svn_diff_datasource_e__p_svn_error_t swig_types[18]
+#define SWIGTYPE_p_f_p_p_char_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t swig_types[19]
+#define SWIGTYPE_p_f_p_p_struct_svn_auth_provider_object_t_p_apr_pool_t__void swig_types[20]
+#define SWIGTYPE_p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[21]
+#define SWIGTYPE_p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[22]
+#define SWIGTYPE_p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[23]
+#define SWIGTYPE_p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[24]
+#define SWIGTYPE_p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[25]
+#define SWIGTYPE_p_f_p_p_svn_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t swig_types[26]
+#define SWIGTYPE_p_f_p_p_void_p_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[27]
+#define SWIGTYPE_p_f_p_p_void_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[28]
+#define SWIGTYPE_p_f_p_q_const__char_p_q_const__char_p_void__int swig_types[29]
+#define SWIGTYPE_p_f_p_q_const__char_p_q_const__char_p_void_p_apr_pool_t__int swig_types[30]
+#define SWIGTYPE_p_f_p_q_const__char_p_void__int swig_types[31]
+#define SWIGTYPE_p_f_p_q_const__char_p_void_p_apr_pool_t__int swig_types[32]
+#define SWIGTYPE_p_f_p_q_const__struct_svn_version_t_p_q_const__struct_svn_version_t__int swig_types[33]
 #define SWIGTYPE_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[34]
 #define SWIGTYPE_p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t swig_types[35]
 #define SWIGTYPE_p_f_p_svn_boolean_t_p_void_p_q_const__char_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[36]
@@ -1544,106 +1533,107 @@ SWIG_Perl_SetModule(swig_module_info *module) {
 #define SWIGTYPE_p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t swig_types[48]
 #define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t swig_types[49]
 #define SWIGTYPE_p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t swig_types[50]
-#define SWIGTYPE_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t swig_types[51]
-#define SWIGTYPE_p_f_p_void_p_void__void swig_types[52]
-#define SWIGTYPE_p_f_p_void_p_void_p_void_p_int__p_svn_error_t swig_types[53]
-#define SWIGTYPE_p_f_p_void_svn_diff_datasource_e__p_svn_error_t swig_types[54]
-#define SWIGTYPE_p_f_svn_boolean_t_p_q_const__char_int_p_q_const__char__p_svn_error_t swig_types[55]
-#define SWIGTYPE_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t swig_types[56]
-#define SWIGTYPE_p_f_void__p_svn_version_t swig_types[57]
-#define SWIGTYPE_p_int swig_types[58]
-#define SWIGTYPE_p_long swig_types[59]
-#define SWIGTYPE_p_p_apr_array_header_t swig_types[60]
-#define SWIGTYPE_p_p_apr_file_t swig_types[61]
-#define SWIGTYPE_p_p_apr_hash_t swig_types[62]
-#define SWIGTYPE_p_p_char swig_types[63]
-#define SWIGTYPE_p_p_svn_auth_baton_t swig_types[64]
-#define SWIGTYPE_p_p_svn_auth_cred_simple_t swig_types[65]
-#define SWIGTYPE_p_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[66]
-#define SWIGTYPE_p_p_svn_auth_cred_ssl_client_cert_t swig_types[67]
-#define SWIGTYPE_p_p_svn_auth_cred_ssl_server_trust_t swig_types[68]
-#define SWIGTYPE_p_p_svn_auth_cred_username_t swig_types[69]
-#define SWIGTYPE_p_p_svn_auth_iterstate_t swig_types[70]
-#define SWIGTYPE_p_p_svn_auth_provider_object_t swig_types[71]
-#define SWIGTYPE_p_p_svn_checksum_t swig_types[72]
-#define SWIGTYPE_p_p_svn_config_t swig_types[73]
-#define SWIGTYPE_p_p_svn_diff_t swig_types[74]
-#define SWIGTYPE_p_p_svn_io_dirent2_t swig_types[75]
-#define SWIGTYPE_p_p_svn_patch_file_t swig_types[76]
-#define SWIGTYPE_p_p_svn_patch_t swig_types[77]
-#define SWIGTYPE_p_p_svn_stream_mark_t swig_types[78]
-#define SWIGTYPE_p_p_svn_stream_t swig_types[79]
-#define SWIGTYPE_p_p_svn_string_t swig_types[80]
-#define SWIGTYPE_p_p_svn_stringbuf_t swig_types[81]
-#define SWIGTYPE_p_p_void swig_types[82]
-#define SWIGTYPE_p_svn_auth_baton_t swig_types[83]
-#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[84]
-#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[85]
-#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[86]
-#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[87]
-#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[88]
-#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[89]
-#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[90]
-#define SWIGTYPE_p_svn_auth_provider_t swig_types[91]
-#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[92]
-#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[93]
-#define SWIGTYPE_p_svn_checksum_kind_t swig_types[94]
-#define SWIGTYPE_p_svn_checksum_t swig_types[95]
-#define SWIGTYPE_p_svn_commit_info_t swig_types[96]
-#define SWIGTYPE_p_svn_config_t swig_types[97]
-#define SWIGTYPE_p_svn_depth_t swig_types[98]
-#define SWIGTYPE_p_svn_diff_conflict_display_style_t swig_types[99]
-#define SWIGTYPE_p_svn_diff_datasource_e swig_types[100]
-#define SWIGTYPE_p_svn_diff_file_ignore_space_t swig_types[101]
-#define SWIGTYPE_p_svn_diff_file_options_t swig_types[102]
-#define SWIGTYPE_p_svn_diff_fns2_t swig_types[103]
-#define SWIGTYPE_p_svn_diff_fns_t swig_types[104]
-#define SWIGTYPE_p_svn_diff_hunk_t swig_types[105]
-#define SWIGTYPE_p_svn_diff_operation_kind_e swig_types[106]
-#define SWIGTYPE_p_svn_diff_output_fns_t swig_types[107]
-#define SWIGTYPE_p_svn_diff_t swig_types[108]
-#define SWIGTYPE_p_svn_dirent_t swig_types[109]
-#define SWIGTYPE_p_svn_errno_t swig_types[110]
-#define SWIGTYPE_p_svn_error_t swig_types[111]
-#define SWIGTYPE_p_svn_io_dirent2_t swig_types[112]
-#define SWIGTYPE_p_svn_io_dirent_t swig_types[113]
-#define SWIGTYPE_p_svn_io_file_del_t swig_types[114]
-#define SWIGTYPE_p_svn_location_segment_t swig_types[115]
-#define SWIGTYPE_p_svn_lock_t swig_types[116]
-#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[117]
-#define SWIGTYPE_p_svn_log_changed_path_t swig_types[118]
-#define SWIGTYPE_p_svn_log_entry_t swig_types[119]
-#define SWIGTYPE_p_svn_merge_range_t swig_types[120]
-#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[121]
-#define SWIGTYPE_p_svn_node_kind_t swig_types[122]
-#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[123]
-#define SWIGTYPE_p_svn_opt_revision_t swig_types[124]
-#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[125]
-#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[126]
-#define SWIGTYPE_p_svn_opt_subcommand_desc2_t_desc_overrides swig_types[127]
-#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[128]
-#define SWIGTYPE_p_svn_patch_file_t swig_types[129]
-#define SWIGTYPE_p_svn_patch_t swig_types[130]
-#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[131]
-#define SWIGTYPE_p_svn_prop_kind swig_types[132]
-#define SWIGTYPE_p_svn_prop_patch_t swig_types[133]
-#define SWIGTYPE_p_svn_prop_t swig_types[134]
-#define SWIGTYPE_p_svn_stream_mark_t swig_types[135]
-#define SWIGTYPE_p_svn_stream_t swig_types[136]
-#define SWIGTYPE_p_svn_string_t swig_types[137]
-#define SWIGTYPE_p_svn_stringbuf_t swig_types[138]
-#define SWIGTYPE_p_svn_tristate_t swig_types[139]
-#define SWIGTYPE_p_svn_version_checklist_t swig_types[140]
-#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[141]
-#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[142]
-#define SWIGTYPE_p_svn_version_extended_t swig_types[143]
-#define SWIGTYPE_p_svn_version_t swig_types[144]
-#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[145]
-#define SWIGTYPE_p_unsigned_char swig_types[146]
-#define SWIGTYPE_p_unsigned_long swig_types[147]
-#define SWIGTYPE_p_void swig_types[148]
-static swig_type_info *swig_types[150];
-static swig_module_info swig_module = {swig_types, 149, 0, 0, 0, 0};
+#define SWIGTYPE_p_f_p_void_p_svn_boolean_t__p_svn_error_t swig_types[51]
+#define SWIGTYPE_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t swig_types[52]
+#define SWIGTYPE_p_f_p_void_p_void__void swig_types[53]
+#define SWIGTYPE_p_f_p_void_p_void_p_void_p_int__p_svn_error_t swig_types[54]
+#define SWIGTYPE_p_f_p_void_svn_diff_datasource_e__p_svn_error_t swig_types[55]
+#define SWIGTYPE_p_f_svn_boolean_t_p_q_const__char_int_p_q_const__char__p_svn_error_t swig_types[56]
+#define SWIGTYPE_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t swig_types[57]
+#define SWIGTYPE_p_f_void__p_svn_version_t swig_types[58]
+#define SWIGTYPE_p_int swig_types[59]
+#define SWIGTYPE_p_long swig_types[60]
+#define SWIGTYPE_p_p_apr_array_header_t swig_types[61]
+#define SWIGTYPE_p_p_apr_file_t swig_types[62]
+#define SWIGTYPE_p_p_apr_hash_t swig_types[63]
+#define SWIGTYPE_p_p_char swig_types[64]
+#define SWIGTYPE_p_p_svn_auth_baton_t swig_types[65]
+#define SWIGTYPE_p_p_svn_auth_cred_simple_t swig_types[66]
+#define SWIGTYPE_p_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[67]
+#define SWIGTYPE_p_p_svn_auth_cred_ssl_client_cert_t swig_types[68]
+#define SWIGTYPE_p_p_svn_auth_cred_ssl_server_trust_t swig_types[69]
+#define SWIGTYPE_p_p_svn_auth_cred_username_t swig_types[70]
+#define SWIGTYPE_p_p_svn_auth_iterstate_t swig_types[71]
+#define SWIGTYPE_p_p_svn_auth_provider_object_t swig_types[72]
+#define SWIGTYPE_p_p_svn_checksum_t swig_types[73]
+#define SWIGTYPE_p_p_svn_config_t swig_types[74]
+#define SWIGTYPE_p_p_svn_diff_t swig_types[75]
+#define SWIGTYPE_p_p_svn_io_dirent2_t swig_types[76]
+#define SWIGTYPE_p_p_svn_patch_file_t swig_types[77]
+#define SWIGTYPE_p_p_svn_patch_t swig_types[78]
+#define SWIGTYPE_p_p_svn_stream_mark_t swig_types[79]
+#define SWIGTYPE_p_p_svn_stream_t swig_types[80]
+#define SWIGTYPE_p_p_svn_string_t swig_types[81]
+#define SWIGTYPE_p_p_svn_stringbuf_t swig_types[82]
+#define SWIGTYPE_p_p_void swig_types[83]
+#define SWIGTYPE_p_svn_auth_baton_t swig_types[84]
+#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[85]
+#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[86]
+#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[87]
+#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[88]
+#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[89]
+#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[90]
+#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[91]
+#define SWIGTYPE_p_svn_auth_provider_t swig_types[92]
+#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[93]
+#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[94]
+#define SWIGTYPE_p_svn_checksum_kind_t swig_types[95]
+#define SWIGTYPE_p_svn_checksum_t swig_types[96]
+#define SWIGTYPE_p_svn_commit_info_t swig_types[97]
+#define SWIGTYPE_p_svn_config_t swig_types[98]
+#define SWIGTYPE_p_svn_depth_t swig_types[99]
+#define SWIGTYPE_p_svn_diff_conflict_display_style_t swig_types[100]
+#define SWIGTYPE_p_svn_diff_datasource_e swig_types[101]
+#define SWIGTYPE_p_svn_diff_file_ignore_space_t swig_types[102]
+#define SWIGTYPE_p_svn_diff_file_options_t swig_types[103]
+#define SWIGTYPE_p_svn_diff_fns2_t swig_types[104]
+#define SWIGTYPE_p_svn_diff_fns_t swig_types[105]
+#define SWIGTYPE_p_svn_diff_hunk_t swig_types[106]
+#define SWIGTYPE_p_svn_diff_operation_kind_e swig_types[107]
+#define SWIGTYPE_p_svn_diff_output_fns_t swig_types[108]
+#define SWIGTYPE_p_svn_diff_t swig_types[109]
+#define SWIGTYPE_p_svn_dirent_t swig_types[110]
+#define SWIGTYPE_p_svn_errno_t swig_types[111]
+#define SWIGTYPE_p_svn_error_t swig_types[112]
+#define SWIGTYPE_p_svn_io_dirent2_t swig_types[113]
+#define SWIGTYPE_p_svn_io_dirent_t swig_types[114]
+#define SWIGTYPE_p_svn_io_file_del_t swig_types[115]
+#define SWIGTYPE_p_svn_location_segment_t swig_types[116]
+#define SWIGTYPE_p_svn_lock_t swig_types[117]
+#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[118]
+#define SWIGTYPE_p_svn_log_changed_path_t swig_types[119]
+#define SWIGTYPE_p_svn_log_entry_t swig_types[120]
+#define SWIGTYPE_p_svn_merge_range_t swig_types[121]
+#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[122]
+#define SWIGTYPE_p_svn_node_kind_t swig_types[123]
+#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[124]
+#define SWIGTYPE_p_svn_opt_revision_t swig_types[125]
+#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[126]
+#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[127]
+#define SWIGTYPE_p_svn_opt_subcommand_desc2_t_desc_overrides swig_types[128]
+#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[129]
+#define SWIGTYPE_p_svn_patch_file_t swig_types[130]
+#define SWIGTYPE_p_svn_patch_t swig_types[131]
+#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[132]
+#define SWIGTYPE_p_svn_prop_kind swig_types[133]
+#define SWIGTYPE_p_svn_prop_patch_t swig_types[134]
+#define SWIGTYPE_p_svn_prop_t swig_types[135]
+#define SWIGTYPE_p_svn_stream_mark_t swig_types[136]
+#define SWIGTYPE_p_svn_stream_t swig_types[137]
+#define SWIGTYPE_p_svn_string_t swig_types[138]
+#define SWIGTYPE_p_svn_stringbuf_t swig_types[139]
+#define SWIGTYPE_p_svn_tristate_t swig_types[140]
+#define SWIGTYPE_p_svn_version_checklist_t swig_types[141]
+#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[142]
+#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[143]
+#define SWIGTYPE_p_svn_version_extended_t swig_types[144]
+#define SWIGTYPE_p_svn_version_t swig_types[145]
+#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[146]
+#define SWIGTYPE_p_unsigned_char swig_types[147]
+#define SWIGTYPE_p_unsigned_long swig_types[148]
+#define SWIGTYPE_p_void swig_types[149]
+static swig_type_info *swig_types[151];
+static swig_module_info swig_module = {swig_types, 150, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
@@ -1654,7 +1644,7 @@ static swig_module_info swig_module = {swig_types, 149, 0, 0, 0, 0};
 #define SWIG_name   "SVN::_Core::boot_SVN___Core"
 #define SWIG_prefix "SVN::_Core::"
 
-#define SWIGVERSION 0x020009 
+#define SWIGVERSION 0x020012 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -1825,20 +1815,19 @@ SWIG_AsVal_long SWIG_PERL_DECL_ARGS_2(SV *obj, long* val)
 }
 
 
-#define SVN_SWIGEXPORT(t) SWIGEXPORT t
-
-
 
+/* ### Eventually this should go away. This is not thread safe and a very
+   ### good example on HOW NOT TO USE pools */
 static apr_pool_t *current_pool = 0;
 
-SVN_SWIGEXPORT(apr_pool_t *)
-svn_swig_pl_get_current_pool (void)
+static apr_pool_t *
+core_get_current_pool (void)
 {
   return current_pool;
 }
 
-SVN_SWIGEXPORT(void)
-svn_swig_pl_set_current_pool (apr_pool_t *pool)
+static void
+core_set_current_pool (apr_pool_t *pool)
 {
   current_pool = pool;
 }
@@ -2293,8 +2282,8 @@ static svn_boolean_t svn_config_invoke_enumerator2(
 }
 
 static svn_error_t * svn_config_invoke_auth_walk_func(
-  svn_config_auth_walk_func_t _obj, svn_boolean_t *delete_cred, void *cleanup_baton, const char *cred_kind, const char *realmstring, apr_hash_t *hash, apr_pool_t *scratch_pool) {
-  return _obj(delete_cred, cleanup_baton, cred_kind, realmstring, hash, scratch_pool);
+  svn_config_auth_walk_func_t _obj, svn_boolean_t *delete_cred, void *walk_baton, const char *cred_kind, const char *realmstring, apr_hash_t *hash, apr_pool_t *scratch_pool) {
+  return _obj(delete_cred, walk_baton, cred_kind, realmstring, hash, scratch_pool);
 }
 
 
@@ -2357,6 +2346,11 @@ static svn_error_t * svn_stream_invoke_seek_fn(
   return _obj(baton, mark);
 }
 
+static svn_error_t * svn_stream_invoke_data_available_fn(
+  svn_stream_data_available_fn_t _obj, void *baton, svn_boolean_t *data_available) {
+  return _obj(baton, data_available);
+}
+
 static svn_error_t * svn_stream_invoke_lazyopen_func(
   svn_stream_lazyopen_func_t _obj, svn_stream_t **stream, void *baton, apr_pool_t *result_pool, apr_pool_t *scratch_pool) {
   return _obj(stream, baton, result_pool, scratch_pool);
@@ -2628,7 +2622,7 @@ XS(_wrap_apr_time_ansi_put) {
     }
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
     {
-      char temp[256];
+      char temp[30];
       sprintf(temp, "%" APR_INT64_T_FMT, (apr_int64_t)*(arg1));
       if (argvi >= items) EXTEND(sp,1);  ST(argvi) = sv_2mortal(newSVpv(temp, 0)); argvi++  ;
     }
@@ -2719,6 +2713,7 @@ XS(_wrap_apr_file_open_stdout) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 0) || (items > 1)) {
@@ -2760,6 +2755,7 @@ XS(_wrap_apr_file_open_stderr) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 0) || (items > 1)) {
@@ -2802,6 +2798,7 @@ XS(_wrap_svn_time_to_cstring) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_time_to_cstring(when,pool);");
@@ -2848,6 +2845,7 @@ XS(_wrap_svn_time_from_cstring) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 2)) {
@@ -2884,7 +2882,7 @@ XS(_wrap_svn_time_from_cstring) {
       }
     }
     {
-      char temp[256];
+      char temp[30];
       sprintf(temp, "%" APR_INT64_T_FMT, (apr_int64_t)*(arg1));
       if (argvi >= items) EXTEND(sp,1);  ST(argvi) = sv_2mortal(newSVpv(temp, 0)); argvi++  ;
     }
@@ -2914,6 +2912,7 @@ XS(_wrap_svn_time_to_human_cstring) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_time_to_human_cstring(when,pool);");
@@ -2966,6 +2965,7 @@ XS(_wrap_svn_parse_date) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
@@ -3014,7 +3014,7 @@ XS(_wrap_svn_parse_date) {
       if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj((void*)(arg1), SWIGTYPE_p_int, new_flags); argvi++  ;
     }
     {
-      char temp[256];
+      char temp[30];
       sprintf(temp, "%" APR_INT64_T_FMT, (apr_int64_t)*(arg2));
       if (argvi >= items) EXTEND(sp,1);  ST(argvi) = sv_2mortal(newSVpv(temp, 0)); argvi++  ;
     }
@@ -3227,6 +3227,7 @@ XS(_wrap_svn_error_t_pool_set) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_error_t_pool_set(self,pool);");
@@ -3428,105 +3429,6 @@ XS(_wrap_delete_svn_error_t) {
 }
 
 
-XS(_wrap_svn__apr_hash_index_key) {
-  {
-    apr_hash_index_t *arg1 = (apr_hash_index_t *) 0 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int argvi = 0;
-    void *result = 0 ;
-    dXSARGS;
-    
-    if ((items < 1) || (items > 1)) {
-      SWIG_croak("Usage: svn__apr_hash_index_key(hi);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_apr_hash_index_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn__apr_hash_index_key" "', argument " "1"" of type '" "apr_hash_index_t const *""'"); 
-    }
-    arg1 = (apr_hash_index_t *)(argp1);
-    {
-      result = (void *)svn__apr_hash_index_key((apr_hash_index_t const *)arg1);
-      
-      
-      
-    }
-    ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 | 0); argvi++ ;
-    
-    XSRETURN(argvi);
-  fail:
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn__apr_hash_index_klen) {
-  {
-    apr_hash_index_t *arg1 = (apr_hash_index_t *) 0 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int argvi = 0;
-    apr_ssize_t result;
-    dXSARGS;
-    
-    if ((items < 1) || (items > 1)) {
-      SWIG_croak("Usage: svn__apr_hash_index_klen(hi);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_apr_hash_index_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn__apr_hash_index_klen" "', argument " "1"" of type '" "apr_hash_index_t const *""'"); 
-    }
-    arg1 = (apr_hash_index_t *)(argp1);
-    {
-      result = svn__apr_hash_index_klen((apr_hash_index_t const *)arg1);
-      
-      
-      
-    }
-    ST(argvi) = SWIG_From_long  SWIG_PERL_CALL_ARGS_1((long)(result)); argvi++ ;
-    
-    XSRETURN(argvi);
-  fail:
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn__apr_hash_index_val) {
-  {
-    apr_hash_index_t *arg1 = (apr_hash_index_t *) 0 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int argvi = 0;
-    void *result = 0 ;
-    dXSARGS;
-    
-    if ((items < 1) || (items > 1)) {
-      SWIG_croak("Usage: svn__apr_hash_index_val(hi);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_apr_hash_index_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn__apr_hash_index_val" "', argument " "1"" of type '" "apr_hash_index_t const *""'"); 
-    }
-    arg1 = (apr_hash_index_t *)(argp1);
-    {
-      result = (void *)svn__apr_hash_index_val((apr_hash_index_t const *)arg1);
-      
-      
-      
-    }
-    ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 | 0); argvi++ ;
-    
-    XSRETURN(argvi);
-  fail:
-    
-    SWIG_croak_null();
-  }
-}
-
-
 XS(_wrap_svn_node_kind_to_word) {
   {
     svn_node_kind_t arg1 ;
@@ -3922,10 +3824,9 @@ XS(_wrap_svn_dirent_t_size_get) {
     arg1 = (struct svn_dirent_t *)(argp1);
     result =  ((arg1)->size);
     {
-      char temp[256];
+      char temp[30];
       sprintf(temp, "%" APR_INT64_T_FMT, (apr_int64_t) result);
-      ST(argvi) = sv_newmortal();
-      sv_setpv((SV*)ST(argvi++), temp);
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = sv_2mortal(newSVpv(temp, 0)); argvi++  ;
     }
     
     XSRETURN(argvi);
@@ -4122,10 +4023,9 @@ XS(_wrap_svn_dirent_t_time_get) {
     arg1 = (struct svn_dirent_t *)(argp1);
     result =  ((arg1)->time);
     {
-      char temp[256];
+      char temp[30];
       sprintf(temp, "%" APR_INT64_T_FMT, (apr_int64_t) result);
-      ST(argvi) = sv_newmortal();
-      sv_setpv((SV*)ST(argvi++), temp);
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = sv_2mortal(newSVpv(temp, 0)); argvi++  ;
     }
     
     XSRETURN(argvi);
@@ -4232,6 +4132,7 @@ XS(_wrap_svn_dirent_dup) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_dirent_dup(dirent,pool);");
@@ -4272,6 +4173,7 @@ XS(_wrap_svn_dirent_create) {
     
     {
       _global_pool = arg1 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 0) || (items > 1)) {
       SWIG_croak("Usage: svn_dirent_create(result_pool);");
@@ -4717,6 +4619,7 @@ XS(_wrap_svn_create_commit_info) {
     
     {
       _global_pool = arg1 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 0) || (items > 1)) {
       SWIG_croak("Usage: svn_create_commit_info(pool);");
@@ -4753,6 +4656,7 @@ XS(_wrap_svn_commit_info_dup) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_commit_info_dup(src_commit_info,pool);");
@@ -5246,6 +5150,7 @@ XS(_wrap_svn_log_changed_path2_create) {
     
     {
       _global_pool = arg1 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 0) || (items > 1)) {
       SWIG_croak("Usage: svn_log_changed_path2_create(pool);");
@@ -5282,6 +5187,7 @@ XS(_wrap_svn_log_changed_path2_dup) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_log_changed_path2_dup(changed_path,pool);");
@@ -5538,6 +5444,7 @@ XS(_wrap_svn_log_changed_path_dup) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_log_changed_path_dup(changed_path,pool);");
@@ -5717,8 +5624,10 @@ XS(_wrap_svn_log_entry_t_revprops_set) {
     }
     arg1 = (struct svn_log_entry_t *)(argp1);
     {
-      if (_global_pool == NULL)
-      _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
       arg2 = svn_swig_pl_hash_to_prophash(ST(1), _global_pool);  
     }
     if (arg1) (arg1)->revprops = arg2;
@@ -5885,7 +5794,7 @@ XS(_wrap_svn_log_entry_t_changed_paths2_get) {
     arg1 = (struct svn_log_entry_t *)(argp1);
     result = (apr_hash_t *) ((arg1)->changed_paths2);
     {
-      /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = (result) ? svn_swig_pl_convert_hash(result, SWIGTYPE_p_svn_log_changed_path2_t)
+      /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = (result) ? svn_swig_pl_convert_hash(result, SWIGTYPE_p_svn_log_changed_path2_t)
       :&PL_sv_undef; argvi++ /*@SWIG@*/
       /*@SWIG@*/
       
@@ -6095,6 +6004,7 @@ XS(_wrap_svn_log_entry_create) {
     
     {
       _global_pool = arg1 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 0) || (items > 1)) {
       SWIG_croak("Usage: svn_log_entry_create(pool);");
@@ -6131,6 +6041,7 @@ XS(_wrap_svn_log_entry_dup) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_log_entry_dup(log_entry,pool);");
@@ -6175,6 +6086,7 @@ XS(_wrap_svn_mime_type_validate) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_mime_type_validate(mime_type,pool);");
@@ -6667,10 +6579,9 @@ XS(_wrap_svn_lock_t_creation_date_get) {
     arg1 = (struct svn_lock_t *)(argp1);
     result =  ((arg1)->creation_date);
     {
-      char temp[256];
+      char temp[30];
       sprintf(temp, "%" APR_INT64_T_FMT, (apr_int64_t) result);
-      ST(argvi) = sv_newmortal();
-      sv_setpv((SV*)ST(argvi++), temp);
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = sv_2mortal(newSVpv(temp, 0)); argvi++  ;
     }
     
     XSRETURN(argvi);
@@ -6737,10 +6648,9 @@ XS(_wrap_svn_lock_t_expiration_date_get) {
     arg1 = (struct svn_lock_t *)(argp1);
     result =  ((arg1)->expiration_date);
     {
-      char temp[256];
+      char temp[30];
       sprintf(temp, "%" APR_INT64_T_FMT, (apr_int64_t) result);
-      ST(argvi) = sv_newmortal();
-      sv_setpv((SV*)ST(argvi++), temp);
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = sv_2mortal(newSVpv(temp, 0)); argvi++  ;
     }
     
     XSRETURN(argvi);
@@ -6816,6 +6726,7 @@ XS(_wrap_svn_lock_create) {
     
     {
       _global_pool = arg1 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 0) || (items > 1)) {
       SWIG_croak("Usage: svn_lock_create(pool);");
@@ -6852,6 +6763,7 @@ XS(_wrap_svn_lock_dup) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_lock_dup(lock,pool);");
@@ -6892,6 +6804,7 @@ XS(_wrap_svn_uuid_generate) {
     
     {
       _global_pool = arg1 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 0) || (items > 1)) {
       SWIG_croak("Usage: svn_uuid_generate(pool);");
@@ -7178,6 +7091,7 @@ XS(_wrap_svn_merge_range_dup) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_merge_range_dup(range,pool);");
@@ -7522,6 +7436,7 @@ XS(_wrap_svn_location_segment_dup) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_location_segment_dup(segment,pool);");
@@ -7568,6 +7483,7 @@ XS(_wrap_svn_log_invoke_entry_receiver) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_log_invoke_entry_receiver(_obj,baton,log_entry,pool);");
@@ -7658,6 +7574,7 @@ XS(_wrap_svn_log_invoke_message_receiver) {
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 7) || (items > 8)) {
       SWIG_croak("Usage: svn_log_invoke_message_receiver(_obj,baton,changed_paths,revision,author,date,message,pool);");
@@ -7761,6 +7678,7 @@ XS(_wrap_svn_commit_invoke_callback2) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_commit_invoke_callback2(_obj,commit_info,baton,pool);");
@@ -7978,6 +7896,7 @@ XS(_wrap_svn_location_invoke_segment_receiver) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_location_invoke_segment_receiver(_obj,segment,baton,pool);");
@@ -8719,6 +8638,73 @@ XS(_wrap_delete_svn_version_checklist_t) {
 }
 
 
+XS(_wrap_svn_ver_check_list2) {
+  {
+    svn_version_t *arg1 = (svn_version_t *) 0 ;
+    svn_version_checklist_t *arg2 = (svn_version_checklist_t *) 0 ;
+    svn_boolean_t (*arg3)(svn_version_t const *,svn_version_t const *) = (svn_boolean_t (*)(svn_version_t const *,svn_version_t const *)) 0 ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    void *argp2 = 0 ;
+    int res2 = 0 ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    if ((items < 3) || (items > 3)) {
+      SWIG_croak("Usage: svn_ver_check_list2(my_version,checklist,comparator);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_version_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_ver_check_list2" "', argument " "1"" of type '" "svn_version_t const *""'"); 
+    }
+    arg1 = (svn_version_t *)(argp1);
+    res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_svn_version_checklist_t, 0 |  0 );
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_ver_check_list2" "', argument " "2"" of type '" "svn_version_checklist_t const *""'"); 
+    }
+    arg2 = (svn_version_checklist_t *)(argp2);
+    {
+      int res = SWIG_ConvertFunctionPtr(ST(2), (void**)(&arg3), SWIGTYPE_p_f_p_q_const__struct_svn_version_t_p_q_const__struct_svn_version_t__int);
+      if (!SWIG_IsOK(res)) {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_ver_check_list2" "', argument " "3"" of type '" "svn_boolean_t (*)(svn_version_t const *,svn_version_t const *)""'"); 
+      }
+    }
+    {
+      result = (svn_error_t *)svn_ver_check_list2((struct svn_version_t const *)arg1,(struct svn_version_checklist_t const *)arg2,arg3);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_svn_ver_check_list) {
   {
     svn_version_t *arg1 = (svn_version_t *) 0 ;
@@ -8813,6 +8799,7 @@ XS(_wrap_svn_version_extended) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_version_extended(verbose,pool);");
@@ -9660,6 +9647,7 @@ XS(_wrap_svn_prop_dup) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_prop_dup(prop,pool);");
@@ -9703,6 +9691,7 @@ XS(_wrap_svn_prop_array_dup) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_prop_array_dup(array,pool);");
@@ -9937,13 +9926,16 @@ XS(_wrap_svn_prop_hash_to_array) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_prop_hash_to_array(hash,pool);");
     }
     {
-      if (_global_pool == NULL)
-      _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
       arg1 = svn_swig_pl_hash_to_prophash(ST(0), _global_pool);  
     }
     if (items > 1) {
@@ -10021,13 +10013,16 @@ XS(_wrap_svn_prop_hash_dup) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_prop_hash_dup(hash,pool);");
     }
     {
-      if (_global_pool == NULL)
-      _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
       arg1 = svn_swig_pl_hash_to_prophash(ST(0), _global_pool);  
     }
     if (items > 1) {
@@ -10220,13 +10215,16 @@ XS(_wrap_svn_prop_has_svn_prop) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_prop_has_svn_prop(props,pool);");
     }
     {
-      if (_global_pool == NULL)
-      _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
       arg1 = svn_swig_pl_hash_to_prophash(ST(0), _global_pool);  
     }
     if (items > 1) {
@@ -10473,6 +10471,7 @@ XS(_wrap_svn_categorize_props) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     arg3 = &temp3;
@@ -10568,19 +10567,24 @@ XS(_wrap_svn_prop_diffs) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_prop_diffs(target_props,source_props,pool);");
     }
     {
-      if (_global_pool == NULL)
-      _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
       arg2 = svn_swig_pl_hash_to_prophash(ST(0), _global_pool);  
     }
     {
-      if (_global_pool == NULL)
-      _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
       arg3 = svn_swig_pl_hash_to_prophash(ST(1), _global_pool);  
     }
     if (items > 2) {
@@ -11812,6 +11816,7 @@ XS(_wrap_svn_opt_get_option_from_code2) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_opt_get_option_from_code2(code,option_table,command,pool);");
@@ -12064,6 +12069,7 @@ XS(_wrap_svn_opt_print_generic_help2) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 4) || (items > 6)) {
       SWIG_croak("Usage: svn_opt_print_generic_help2(header,cmd_table,opt_table,footer,pool,stream);");
@@ -12139,6 +12145,7 @@ XS(_wrap_svn_opt_format_option) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -12208,6 +12215,7 @@ XS(_wrap_svn_opt_subcommand_help3) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg4 = &temp4;
     if ((items < 3) || (items > 4)) {
@@ -12280,6 +12288,7 @@ XS(_wrap_svn_opt_subcommand_help2) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_opt_subcommand_help2(subcommand,table,options_table,pool);");
@@ -12343,6 +12352,7 @@ XS(_wrap_svn_opt_subcommand_help) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_opt_subcommand_help(subcommand,table,options_table,pool);");
@@ -12508,10 +12518,9 @@ XS(_wrap_svn_opt_revision_value_t_date_get) {
     arg1 = (union svn_opt_revision_value_t *)(argp1);
     result =  ((arg1)->date);
     {
-      char temp[256];
+      char temp[30];
       sprintf(temp, "%" APR_INT64_T_FMT, (apr_int64_t) result);
-      ST(argvi) = sv_newmortal();
-      sv_setpv((SV*)ST(argvi++), temp);
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = sv_2mortal(newSVpv(temp, 0)); argvi++  ;
     }
     
     XSRETURN(argvi);
@@ -12769,6 +12778,7 @@ XS(_wrap_svn_opt_revision_range_t_start_set) {
     void *argp1 = 0 ;
     int res1 = 0 ;
     svn_opt_revision_t rev2 ;
+    apr_pool_t *_global_pool = NULL ;
     int argvi = 0;
     dXSARGS;
     
@@ -12781,7 +12791,11 @@ XS(_wrap_svn_opt_revision_range_t_start_set) {
     }
     arg1 = (struct svn_opt_revision_range_t *)(argp1);
     {
-      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE, _global_pool);
     }
     if (arg1) (arg1)->start = *arg2;
     ST(argvi) = sv_newmortal();
@@ -12831,6 +12845,7 @@ XS(_wrap_svn_opt_revision_range_t_end_set) {
     void *argp1 = 0 ;
     int res1 = 0 ;
     svn_opt_revision_t rev2 ;
+    apr_pool_t *_global_pool = NULL ;
     int argvi = 0;
     dXSARGS;
     
@@ -12843,7 +12858,11 @@ XS(_wrap_svn_opt_revision_range_t_end_set) {
     }
     arg1 = (struct svn_opt_revision_range_t *)(argp1);
     {
-      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE, _global_pool);
     }
     if (arg1) (arg1)->end = *arg2;
     ST(argvi) = sv_newmortal();
@@ -12959,15 +12978,24 @@ XS(_wrap_svn_opt_parse_revision) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_opt_parse_revision(start_revision,end_revision,arg,pool);");
     }
     {
-      arg1 = svn_swig_pl_set_revision(&rev1, ST(0), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg1 = svn_swig_pl_set_revision(&rev1, ST(0), TRUE, _global_pool);
     }
     {
-      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE, _global_pool);
     }
     res3 = SWIG_AsCharPtrAndSize(ST(2), &buf3, NULL, &alloc3);
     if (!SWIG_IsOK(res3)) {
@@ -13016,6 +13044,7 @@ XS(_wrap_svn_opt_parse_revision_to_range) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_opt_parse_revision_to_range(opt_ranges,arg,pool);");
@@ -13073,15 +13102,24 @@ XS(_wrap_svn_opt_resolve_revisions) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_opt_resolve_revisions(peg_rev,op_rev,is_url,notice_local_mods,pool);");
     }
     {
-      arg1 = svn_swig_pl_set_revision(&rev1, ST(0), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg1 = svn_swig_pl_set_revision(&rev1, ST(0), TRUE, _global_pool);
     }
     {
-      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE, _global_pool);
     }
     ecode3 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(2), &val3);
     if (!SWIG_IsOK(ecode3)) {
@@ -13153,6 +13191,7 @@ XS(_wrap_svn_opt_args_to_target_array3) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -13229,6 +13268,7 @@ XS(_wrap_svn_opt_args_to_target_array2) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -13303,6 +13343,7 @@ XS(_wrap_svn_opt_parse_revprop) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 2)) {
@@ -13366,6 +13407,7 @@ XS(_wrap_svn_opt_push_implicit_dot_target) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_opt_push_implicit_dot_target(targets,pool);");
@@ -13414,6 +13456,7 @@ XS(_wrap_svn_opt_parse_num_args) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -13487,6 +13530,7 @@ XS(_wrap_svn_opt_parse_all_args) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 2)) {
@@ -13556,13 +13600,18 @@ XS(_wrap_svn_opt_parse_path) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_opt_parse_path(rev,path,pool);");
     }
     {
-      arg1 = svn_swig_pl_set_revision(&rev1, ST(0), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg1 = svn_swig_pl_set_revision(&rev1, ST(0), TRUE, _global_pool);
     }
     res3 = SWIG_AsCharPtrAndSize(ST(1), &buf3, NULL, &alloc3);
     if (!SWIG_IsOK(res3)) {
@@ -13663,6 +13712,7 @@ XS(_wrap_svn_opt_print_help4) {
     
     {
       _global_pool = arg12 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg10 = &temp10;
     if ((items < 10) || (items > 11)) {
@@ -13824,6 +13874,7 @@ XS(_wrap_svn_opt_print_help3) {
     
     {
       _global_pool = arg11 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg9 = &temp9;
     if ((items < 9) || (items > 10)) {
@@ -13975,6 +14026,7 @@ XS(_wrap_svn_opt_print_help2) {
     
     {
       _global_pool = arg10 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 9) || (items > 10)) {
       SWIG_croak("Usage: svn_opt_print_help2(os,pgm_name,print_version,quiet,version_footer,header,cmd_table,option_table,footer,pool);");
@@ -14117,6 +14169,7 @@ XS(_wrap_svn_opt_print_help) {
     
     {
       _global_pool = arg10 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 9) || (items > 10)) {
       SWIG_croak("Usage: svn_opt_print_help(os,pgm_name,print_version,quiet,version_footer,header,cmd_table,option_table,footer,pool);");
@@ -14258,6 +14311,182 @@ XS(_wrap_svn_cmdline_init) {
 }
 
 
+XS(_wrap_svn_cmdline_create_auth_baton2) {
+  {
+    svn_auth_baton_t **arg1 = (svn_auth_baton_t **) 0 ;
+    svn_boolean_t arg2 ;
+    char *arg3 = (char *) 0 ;
+    char *arg4 = (char *) 0 ;
+    char *arg5 = (char *) 0 ;
+    svn_boolean_t arg6 ;
+    svn_boolean_t arg7 ;
+    svn_boolean_t arg8 ;
+    svn_boolean_t arg9 ;
+    svn_boolean_t arg10 ;
+    svn_boolean_t arg11 ;
+    svn_config_t *arg12 = (svn_config_t *) 0 ;
+    svn_cancel_func_t arg13 = (svn_cancel_func_t) 0 ;
+    void *arg14 = (void *) 0 ;
+    apr_pool_t *arg15 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    svn_auth_baton_t *temp1 ;
+    int val2 ;
+    int ecode2 = 0 ;
+    int res3 ;
+    char *buf3 = 0 ;
+    int alloc3 = 0 ;
+    int res4 ;
+    char *buf4 = 0 ;
+    int alloc4 = 0 ;
+    int res5 ;
+    char *buf5 = 0 ;
+    int alloc5 = 0 ;
+    int val6 ;
+    int ecode6 = 0 ;
+    int val7 ;
+    int ecode7 = 0 ;
+    int val8 ;
+    int ecode8 = 0 ;
+    int val9 ;
+    int ecode9 = 0 ;
+    int val10 ;
+    int ecode10 = 0 ;
+    int val11 ;
+    int ecode11 = 0 ;
+    void *argp12 = 0 ;
+    int res12 = 0 ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg15 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    arg1 = &temp1;
+    if ((items < 12) || (items > 13)) {
+      SWIG_croak("Usage: svn_cmdline_create_auth_baton2(non_interactive,username,password,config_dir,no_auth_cache,trust_server_cert_unknown_ca,trust_server_cert_cn_mismatch,trust_server_cert_expired,trust_server_cert_not_yet_valid,trust_server_cert_other_failure,cfg,cancel_func,cancel_baton,pool);");
+    }
+    ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(0), &val2);
+    if (!SWIG_IsOK(ecode2)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "svn_cmdline_create_auth_baton2" "', argument " "2"" of type '" "svn_boolean_t""'");
+    } 
+    arg2 = (svn_boolean_t)(val2);
+    res3 = SWIG_AsCharPtrAndSize(ST(1), &buf3, NULL, &alloc3);
+    if (!SWIG_IsOK(res3)) {
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_cmdline_create_auth_baton2" "', argument " "3"" of type '" "char const *""'");
+    }
+    arg3 = (char *)(buf3);
+    res4 = SWIG_AsCharPtrAndSize(ST(2), &buf4, NULL, &alloc4);
+    if (!SWIG_IsOK(res4)) {
+      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "svn_cmdline_create_auth_baton2" "', argument " "4"" of type '" "char const *""'");
+    }
+    arg4 = (char *)(buf4);
+    res5 = SWIG_AsCharPtrAndSize(ST(3), &buf5, NULL, &alloc5);
+    if (!SWIG_IsOK(res5)) {
+      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "svn_cmdline_create_auth_baton2" "', argument " "5"" of type '" "char const *""'");
+    }
+    arg5 = (char *)(buf5);
+    ecode6 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(4), &val6);
+    if (!SWIG_IsOK(ecode6)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "svn_cmdline_create_auth_baton2" "', argument " "6"" of type '" "svn_boolean_t""'");
+    } 
+    arg6 = (svn_boolean_t)(val6);
+    ecode7 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(5), &val7);
+    if (!SWIG_IsOK(ecode7)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "svn_cmdline_create_auth_baton2" "', argument " "7"" of type '" "svn_boolean_t""'");
+    } 
+    arg7 = (svn_boolean_t)(val7);
+    ecode8 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(6), &val8);
+    if (!SWIG_IsOK(ecode8)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode8), "in method '" "svn_cmdline_create_auth_baton2" "', argument " "8"" of type '" "svn_boolean_t""'");
+    } 
+    arg8 = (svn_boolean_t)(val8);
+    ecode9 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(7), &val9);
+    if (!SWIG_IsOK(ecode9)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode9), "in method '" "svn_cmdline_create_auth_baton2" "', argument " "9"" of type '" "svn_boolean_t""'");
+    } 
+    arg9 = (svn_boolean_t)(val9);
+    ecode10 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(8), &val10);
+    if (!SWIG_IsOK(ecode10)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode10), "in method '" "svn_cmdline_create_auth_baton2" "', argument " "10"" of type '" "svn_boolean_t""'");
+    } 
+    arg10 = (svn_boolean_t)(val10);
+    ecode11 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(9), &val11);
+    if (!SWIG_IsOK(ecode11)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode11), "in method '" "svn_cmdline_create_auth_baton2" "', argument " "11"" of type '" "svn_boolean_t""'");
+    } 
+    arg11 = (svn_boolean_t)(val11);
+    res12 = SWIG_ConvertPtr(ST(10), &argp12,SWIGTYPE_p_svn_config_t, 0 |  0 );
+    if (!SWIG_IsOK(res12)) {
+      SWIG_exception_fail(SWIG_ArgError(res12), "in method '" "svn_cmdline_create_auth_baton2" "', argument " "12"" of type '" "svn_config_t *""'"); 
+    }
+    arg12 = (svn_config_t *)(argp12);
+    {
+      arg13 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg14 = ST(11);
+    }
+    if (items > 12) {
+      
+    }
+    {
+      result = (svn_error_t *)svn_cmdline_create_auth_baton2(arg1,arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12,arg13,arg14,arg15);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    {
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg1, SWIGTYPE_p_svn_auth_baton_t, 0); argvi++  ;
+    }
+    
+    
+    if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+    if (alloc4 == SWIG_NEWOBJ) free((char*)buf4);
+    if (alloc5 == SWIG_NEWOBJ) free((char*)buf5);
+    
+    
+    
+    
+    
+    
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+    if (alloc4 == SWIG_NEWOBJ) free((char*)buf4);
+    if (alloc5 == SWIG_NEWOBJ) free((char*)buf5);
+    
+    
+    
+    
+    
+    
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_svn_cmdline_create_auth_baton) {
   {
     svn_auth_baton_t **arg1 = (svn_auth_baton_t **) 0 ;
@@ -14290,16 +14519,16 @@ XS(_wrap_svn_cmdline_create_auth_baton) {
     int ecode7 = 0 ;
     void *argp8 = 0 ;
     int res8 = 0 ;
-    int res10 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
     dXSARGS;
     
     {
       _global_pool = arg11 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
-    if ((items < 9) || (items > 10)) {
+    if ((items < 8) || (items > 9)) {
       SWIG_croak("Usage: svn_cmdline_create_auth_baton(non_interactive,username,password,config_dir,no_auth_cache,trust_server_cert,cfg,cancel_func,cancel_baton,pool);");
     }
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(0), &val2);
@@ -14338,16 +14567,10 @@ XS(_wrap_svn_cmdline_create_auth_baton) {
     }
     arg8 = (svn_config_t *)(argp8);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(7), (void**)(&arg9), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_cmdline_create_auth_baton" "', argument " "9"" of type '" "svn_cancel_func_t""'"); 
-      }
+      arg9 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg10 = ST(7);
     }
-    res10 = SWIG_ConvertPtr(ST(8),SWIG_as_voidptrptr(&arg10), 0, 0);
-    if (!SWIG_IsOK(res10)) {
-      SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "svn_cmdline_create_auth_baton" "', argument " "10"" of type '" "void *""'"); 
-    }
-    if (items > 9) {
+    if (items > 8) {
       
     }
     {
@@ -14384,8 +14607,6 @@ XS(_wrap_svn_cmdline_create_auth_baton) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
@@ -14397,8 +14618,6 @@ XS(_wrap_svn_cmdline_create_auth_baton) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -16250,6 +16469,7 @@ XS(_wrap_svn_auth_ssl_server_cert_info_dup) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_auth_ssl_server_cert_info_dup(info,pool);");
@@ -16477,13 +16697,14 @@ XS(_wrap_svn_auth_open) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_auth_open(providers,pool);");
     }
     {
-      arg2 = (apr_array_header_t *) svn_swig_pl_objs_to_array(ST(0),
+      arg2 = svn_swig_pl_objs_to_array(ST(0),
         SWIGTYPE_p_svn_auth_provider_object_t, _global_pool);
     }
     if (items > 1) {
@@ -16522,7 +16743,7 @@ XS(_wrap_svn_auth_set_parameter) {
     int res2 ;
     char *buf2 = 0 ;
     int alloc2 = 0 ;
-    int res3 ;
+    apr_pool_t *_global_pool = NULL ;
     int argvi = 0;
     dXSARGS;
     
@@ -16539,9 +16760,20 @@ XS(_wrap_svn_auth_set_parameter) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_auth_set_parameter" "', argument " "2"" of type '" "char const *""'");
     }
     arg2 = (char *)(buf2);
-    res3 = SWIG_ConvertPtr(ST(2),SWIG_as_voidptrptr(&arg3), 0, 0);
-    if (!SWIG_IsOK(res3)) {
-      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_auth_set_parameter" "', argument " "3"" of type '" "void const *""'"); 
+    {
+      if (!SvOK(ST(2)) || ST(2) == &PL_sv_undef) {
+        arg3 = NULL;
+      }
+      else if (SvPOK(ST(2))) {
+        if (_global_pool == NULL) {
+          _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+          SPAGAIN;
+        }
+        arg3 = apr_pstrdup(_global_pool, SvPV_nolen(ST(2)));
+      }
+      else {
+        croak("Value is not a string (or undef)");
+      }
     }
     {
       svn_auth_set_parameter(arg1,(char const *)arg2,(void const *)arg3);
@@ -16588,6 +16820,7 @@ XS(_wrap_svn_auth_first_credentials) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
@@ -16674,6 +16907,7 @@ XS(_wrap_svn_auth_next_credentials) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 2)) {
@@ -16738,6 +16972,7 @@ XS(_wrap_svn_auth_save_credentials) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_auth_save_credentials(state,pool);");
@@ -16804,6 +17039,7 @@ XS(_wrap_svn_auth_forget_credentials) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_auth_forget_credentials(auth_baton,cred_kind,realmstring,pool);");
@@ -16880,6 +17116,7 @@ XS(_wrap_svn_auth_get_simple_prompt_provider) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -16942,6 +17179,7 @@ XS(_wrap_svn_auth_get_username_prompt_provider) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -17002,6 +17240,7 @@ XS(_wrap_svn_auth_get_simple_provider2) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -17061,6 +17300,7 @@ XS(_wrap_svn_auth_get_simple_provider) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 0) || (items > 1)) {
@@ -17110,6 +17350,7 @@ XS(_wrap_svn_auth_get_platform_specific_provider) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -17183,6 +17424,7 @@ XS(_wrap_svn_auth_get_platform_specific_client_providers) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 2)) {
@@ -17219,7 +17461,7 @@ XS(_wrap_svn_auth_get_platform_specific_client_providers) {
       }
     }
     {
-      /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = svn_swig_pl_convert_array(*arg1,
+      /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = svn_swig_pl_convert_array(*arg1,
         SWIGTYPE_p_svn_auth_provider_object_t); argvi++ /*@SWIG@*/
       /*@SWIG@*/
       ;
@@ -17248,6 +17490,7 @@ XS(_wrap_svn_auth_get_username_provider) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 0) || (items > 1)) {
@@ -17288,6 +17531,7 @@ XS(_wrap_svn_auth_get_ssl_server_trust_file_provider) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 0) || (items > 1)) {
@@ -17328,6 +17572,7 @@ XS(_wrap_svn_auth_get_ssl_client_cert_file_provider) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 0) || (items > 1)) {
@@ -17372,6 +17617,7 @@ XS(_wrap_svn_auth_get_ssl_client_cert_pw_file_provider2) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -17431,6 +17677,7 @@ XS(_wrap_svn_auth_get_ssl_client_cert_pw_file_provider) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 0) || (items > 1)) {
@@ -17474,6 +17721,7 @@ XS(_wrap_svn_auth_get_ssl_server_trust_prompt_provider) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 2)) {
@@ -17529,6 +17777,7 @@ XS(_wrap_svn_auth_get_ssl_client_cert_prompt_provider) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -17591,6 +17840,7 @@ XS(_wrap_svn_auth_get_ssl_client_cert_pw_prompt_provider) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -17662,6 +17912,7 @@ XS(_wrap_svn_auth_provider_invoke_first_credentials) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     arg3 = &temp3;
@@ -17765,6 +18016,7 @@ XS(_wrap_svn_auth_provider_invoke_next_credentials) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     if ((items < 5) || (items > 6)) {
@@ -17869,6 +18121,7 @@ XS(_wrap_svn_auth_provider_invoke_save_credentials) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     if ((items < 5) || (items > 6)) {
@@ -17961,6 +18214,7 @@ XS(_wrap_svn_auth_invoke_simple_provider_func) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     if ((items < 1) || (items > 2)) {
@@ -18010,6 +18264,7 @@ XS(_wrap_svn_auth_invoke_ssl_client_cert_pw_provider_func) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     if ((items < 1) || (items > 2)) {
@@ -18073,6 +18328,7 @@ XS(_wrap_svn_auth_invoke_simple_prompt_func) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     if ((items < 5) || (items > 6)) {
@@ -18174,6 +18430,7 @@ XS(_wrap_svn_auth_invoke_username_prompt_func) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     if ((items < 4) || (items > 5)) {
@@ -18274,6 +18531,7 @@ XS(_wrap_svn_auth_invoke_ssl_server_trust_prompt_func) {
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     if ((items < 6) || (items > 7)) {
@@ -18382,6 +18640,7 @@ XS(_wrap_svn_auth_invoke_ssl_client_cert_prompt_func) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     if ((items < 4) || (items > 5)) {
@@ -18476,6 +18735,7 @@ XS(_wrap_svn_auth_invoke_ssl_client_cert_pw_prompt_func) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     if ((items < 4) || (items > 5)) {
@@ -18568,6 +18828,7 @@ XS(_wrap_svn_auth_invoke_plaintext_prompt_func) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     if ((items < 3) || (items > 4)) {
@@ -18656,6 +18917,7 @@ XS(_wrap_svn_auth_invoke_plaintext_passphrase_prompt_func) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     if ((items < 3) || (items > 4)) {
@@ -18740,6 +19002,7 @@ XS(_wrap_svn_config_get_config) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 2)) {
@@ -18809,6 +19072,7 @@ XS(_wrap_svn_config_create2) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -18882,6 +19146,7 @@ XS(_wrap_svn_config_create) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 2)) {
@@ -18958,6 +19223,7 @@ XS(_wrap_svn_config_read3) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 4) || (items > 5)) {
@@ -19052,6 +19318,7 @@ XS(_wrap_svn_config_read2) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 3) || (items > 4)) {
@@ -19136,6 +19403,7 @@ XS(_wrap_svn_config_read) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -19213,6 +19481,7 @@ XS(_wrap_svn_config_parse) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 3) || (items > 4)) {
@@ -19220,6 +19489,7 @@ XS(_wrap_svn_config_parse) {
     }
     {
       svn_swig_pl_make_stream (&arg2, ST(0));
+      SPAGAIN;
     }
     ecode3 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val3);
     if (!SWIG_IsOK(ecode3)) {
@@ -19712,7 +19982,7 @@ XS(_wrap_svn_config_get_int64) {
       }
     }
     {
-      char temp[256];
+      char temp[30];
       sprintf(temp, "%" APR_INT64_T_FMT, (apr_int64_t)*(arg2));
       if (argvi >= items) EXTEND(sp,1);  ST(argvi) = sv_2mortal(newSVpv(temp, 0)); argvi++  ;
     }
@@ -20057,6 +20327,7 @@ XS(_wrap_svn_config_enumerate_sections2) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_config_enumerate_sections2(cfg,callback,baton,pool);");
@@ -20130,7 +20401,7 @@ XS(_wrap_svn_config_enumerate) {
     }
     arg2 = (char *)(buf2);
     {
-      arg3 = svn_swig_pl_thunk_config_enumerator;
+      arg3 = (svn_config_enumerator_t) svn_swig_pl_thunk_config_enumerator;
       arg4 = ST(2);
     }
     {
@@ -20171,6 +20442,7 @@ XS(_wrap_svn_config_enumerate2) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_config_enumerate2(cfg,section,callback,baton,pool);");
@@ -20287,6 +20559,7 @@ XS(_wrap_svn_config_find_group) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_config_find_group(cfg,key,master_section,pool);");
@@ -20423,6 +20696,7 @@ XS(_wrap_svn_config_get_server_setting_int) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg5 = &temp5;
     if ((items < 4) || (items > 5)) {
@@ -20474,7 +20748,7 @@ XS(_wrap_svn_config_get_server_setting_int) {
       }
     }
     {
-      char temp[256];
+      char temp[30];
       sprintf(temp, "%" APR_INT64_T_FMT, (apr_int64_t)*(arg5));
       if (argvi >= items) EXTEND(sp,1);  ST(argvi) = sv_2mortal(newSVpv(temp, 0)); argvi++  ;
     }
@@ -20603,6 +20877,7 @@ XS(_wrap_svn_config_ensure) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_config_ensure(config_dir,pool);");
@@ -20672,6 +20947,7 @@ XS(_wrap_svn_config_read_auth_data) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 3) || (items > 4)) {
@@ -20760,13 +21036,16 @@ XS(_wrap_svn_config_write_auth_data) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_config_write_auth_data(hash,cred_kind,realmstring,config_dir,pool);");
     }
     {
-      if (_global_pool == NULL)
-      _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
       arg1 = svn_swig_pl_hash_to_prophash(ST(0), _global_pool);  
     }
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
@@ -20843,6 +21122,7 @@ XS(_wrap_svn_config_walk_auth_data) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_config_walk_auth_data(config_dir,walk_func,walk_baton,scratch_pool);");
@@ -20922,6 +21202,7 @@ XS(_wrap_svn_config_get_user_config_path) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -20999,6 +21280,7 @@ XS(_wrap_svn_config_dup) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 2)) {
@@ -21006,14 +21288,14 @@ XS(_wrap_svn_config_dup) {
     }
     res2 = SWIG_ConvertPtr(ST(0), &argp2,SWIGTYPE_p_svn_config_t, 0 |  0 );
     if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_config_dup" "', argument " "2"" of type '" "svn_config_t *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_config_dup" "', argument " "2"" of type '" "svn_config_t const *""'"); 
     }
     arg2 = (svn_config_t *)(argp2);
     if (items > 1) {
       
     }
     {
-      result = (svn_error_t *)svn_config_dup(arg1,arg2,arg3);
+      result = (svn_error_t *)svn_config_dup(arg1,(struct svn_config_t const *)arg2,arg3);
       
       
       
@@ -21065,6 +21347,7 @@ XS(_wrap_svn_config_copy_config) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 2)) {
@@ -21184,6 +21467,7 @@ XS(_wrap_svn_config_invoke_section_enumerator2) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_config_invoke_section_enumerator2(_obj,name,baton,pool);");
@@ -21311,6 +21595,7 @@ XS(_wrap_svn_config_invoke_enumerator2) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_config_invoke_enumerator2(_obj,name,value,baton,pool);");
@@ -21387,10 +21672,11 @@ XS(_wrap_svn_config_invoke_auth_walk_func) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     if ((items < 5) || (items > 6)) {
-      SWIG_croak("Usage: svn_config_invoke_auth_walk_func(_obj,cleanup_baton,cred_kind,realmstring,hash,scratch_pool);");
+      SWIG_croak("Usage: svn_config_invoke_auth_walk_func(_obj,walk_baton,cred_kind,realmstring,hash,scratch_pool);");
     }
     {
       int res = SWIG_ConvertFunctionPtr(ST(0), (void**)(&arg1), SWIGTYPE_p_f_p_svn_boolean_t_p_void_p_q_const__char_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t);
@@ -21413,8 +21699,10 @@ XS(_wrap_svn_config_invoke_auth_walk_func) {
     }
     arg5 = (char *)(buf5);
     {
-      if (_global_pool == NULL)
-      _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
       arg6 = svn_swig_pl_hash_to_prophash(ST(4), _global_pool);  
     }
     if (items > 5) {
@@ -21481,6 +21769,7 @@ XS(_wrap_svn_utf_initialize2) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_utf_initialize2(assume_native_utf8,pool);");
@@ -21520,6 +21809,7 @@ XS(_wrap_svn_utf_initialize) {
     
     {
       _global_pool = arg1 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 0) || (items > 1)) {
       SWIG_croak("Usage: svn_utf_initialize(pool);");
@@ -21556,6 +21846,7 @@ XS(_wrap_svn_utf_stringbuf_to_utf8) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 2)) {
@@ -21564,6 +21855,7 @@ XS(_wrap_svn_utf_stringbuf_to_utf8) {
     {
       apr_size_t len;
       char *buf;
+      apr_pool_t *pool;
       
       if (!SvOK(ST(0))) {
         arg2 = NULL;
@@ -21571,8 +21863,9 @@ XS(_wrap_svn_utf_stringbuf_to_utf8) {
         buf = SvPV(ST(0), len);
         /* Another case of ugly pool handling, this should use the current
                    default pool, or make a new one if it doesn't exist yet */
-        arg2 = svn_stringbuf_ncreate(buf,len,
-          svn_swig_pl_make_pool ((SV *)NULL));
+        pool = svn_swig_pl_make_pool ((SV *)NULL);
+        SPAGAIN;
+        arg2 = svn_stringbuf_ncreate(buf,len, pool);
       } else {
         croak("Not a string");
       }
@@ -21636,6 +21929,7 @@ XS(_wrap_svn_utf_string_to_utf8) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 2)) {
@@ -21711,6 +22005,7 @@ XS(_wrap_svn_utf_cstring_to_utf8) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 2)) {
@@ -21786,6 +22081,7 @@ XS(_wrap_svn_utf_cstring_to_utf8_ex2) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -21872,6 +22168,7 @@ XS(_wrap_svn_utf_cstring_to_utf8_ex) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 3) || (items > 4)) {
@@ -21954,6 +22251,7 @@ XS(_wrap_svn_utf_stringbuf_from_utf8) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 2)) {
@@ -21962,6 +22260,7 @@ XS(_wrap_svn_utf_stringbuf_from_utf8) {
     {
       apr_size_t len;
       char *buf;
+      apr_pool_t *pool;
       
       if (!SvOK(ST(0))) {
         arg2 = NULL;
@@ -21969,8 +22268,9 @@ XS(_wrap_svn_utf_stringbuf_from_utf8) {
         buf = SvPV(ST(0), len);
         /* Another case of ugly pool handling, this should use the current
                    default pool, or make a new one if it doesn't exist yet */
-        arg2 = svn_stringbuf_ncreate(buf,len,
-          svn_swig_pl_make_pool ((SV *)NULL));
+        pool = svn_swig_pl_make_pool ((SV *)NULL);
+        SPAGAIN;
+        arg2 = svn_stringbuf_ncreate(buf,len, pool);
       } else {
         croak("Not a string");
       }
@@ -22034,6 +22334,7 @@ XS(_wrap_svn_utf_string_from_utf8) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 2)) {
@@ -22109,6 +22410,7 @@ XS(_wrap_svn_utf_cstring_from_utf8) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 2)) {
@@ -22184,6 +22486,7 @@ XS(_wrap_svn_utf_cstring_from_utf8_ex2) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -22270,6 +22573,7 @@ XS(_wrap_svn_utf_cstring_from_utf8_ex) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 3) || (items > 4)) {
@@ -22353,6 +22657,7 @@ XS(_wrap_svn_utf_cstring_from_utf8_fuzzy) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_utf_cstring_from_utf8_fuzzy(src,pool);");
@@ -22396,6 +22701,7 @@ XS(_wrap_svn_utf_cstring_from_utf8_stringbuf) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 2)) {
@@ -22404,6 +22710,7 @@ XS(_wrap_svn_utf_cstring_from_utf8_stringbuf) {
     {
       apr_size_t len;
       char *buf;
+      apr_pool_t *pool;
       
       if (!SvOK(ST(0))) {
         arg2 = NULL;
@@ -22411,8 +22718,9 @@ XS(_wrap_svn_utf_cstring_from_utf8_stringbuf) {
         buf = SvPV(ST(0), len);
         /* Another case of ugly pool handling, this should use the current
                    default pool, or make a new one if it doesn't exist yet */
-        arg2 = svn_stringbuf_ncreate(buf,len,
-          svn_swig_pl_make_pool ((SV *)NULL));
+        pool = svn_swig_pl_make_pool ((SV *)NULL);
+        SPAGAIN;
+        arg2 = svn_stringbuf_ncreate(buf,len, pool);
       } else {
         croak("Not a string");
       }
@@ -22476,6 +22784,7 @@ XS(_wrap_svn_utf_cstring_from_utf8_string) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 2)) {
@@ -22621,6 +22930,7 @@ XS(_wrap_svn_path_internal_style) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_path_internal_style(path,pool);");
@@ -22665,6 +22975,7 @@ XS(_wrap_svn_path_local_style) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_path_local_style(path,pool);");
@@ -22712,6 +23023,7 @@ XS(_wrap_svn_path_splitext) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
@@ -22854,6 +23166,7 @@ XS(_wrap_svn_path_canonicalize) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_path_canonicalize(path,pool);");
@@ -22898,6 +23211,7 @@ XS(_wrap_svn_path_is_canonical) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_path_is_canonical(path,pool);");
@@ -22991,6 +23305,7 @@ XS(_wrap_svn_path_get_longest_ancestor) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_path_get_longest_ancestor(path1,path2,pool);");
@@ -23148,6 +23463,7 @@ XS(_wrap_svn_path_url_add_component2) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_path_url_add_component2(url,component,pool);");
@@ -23239,6 +23555,7 @@ XS(_wrap_svn_path_resolve_repos_relative_url) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -23315,6 +23632,7 @@ XS(_wrap_svn_path_illegal_path_escape) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_path_illegal_path_escape(path,pool);");
@@ -23359,6 +23677,7 @@ XS(_wrap_svn_dirent_internal_style) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_dirent_internal_style(dirent,result_pool);");
@@ -23403,6 +23722,7 @@ XS(_wrap_svn_dirent_local_style) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_dirent_local_style(dirent,result_pool);");
@@ -23447,6 +23767,7 @@ XS(_wrap_svn_relpath__internal_style) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_relpath__internal_style(relpath,result_pool);");
@@ -23495,6 +23816,7 @@ XS(_wrap_svn_dirent_join) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_dirent_join(base,component,result_pool);");
@@ -23550,6 +23872,7 @@ XS(_wrap_svn_relpath_join) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_relpath_join(base,component,result_pool);");
@@ -23601,6 +23924,7 @@ XS(_wrap_svn_dirent_basename) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_dirent_basename(dirent,result_pool);");
@@ -23645,6 +23969,7 @@ XS(_wrap_svn_dirent_dirname) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_dirent_dirname(dirent,result_pool);");
@@ -23692,6 +24017,7 @@ XS(_wrap_svn_dirent_split) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
@@ -23759,6 +24085,7 @@ XS(_wrap_svn_relpath_split) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
@@ -23823,6 +24150,7 @@ XS(_wrap_svn_relpath_basename) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_relpath_basename(relpath,result_pool);");
@@ -23867,6 +24195,7 @@ XS(_wrap_svn_relpath_dirname) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_relpath_dirname(relpath,result_pool);");
@@ -23897,6 +24226,61 @@ XS(_wrap_svn_relpath_dirname) {
 }
 
 
+XS(_wrap_svn_relpath_prefix) {
+  {
+    char *arg1 = (char *) 0 ;
+    int arg2 ;
+    apr_pool_t *arg3 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    int res1 ;
+    char *buf1 = 0 ;
+    int alloc1 = 0 ;
+    int val2 ;
+    int ecode2 = 0 ;
+    int argvi = 0;
+    char *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    if ((items < 2) || (items > 3)) {
+      SWIG_croak("Usage: svn_relpath_prefix(relpath,max_components,result_pool);");
+    }
+    res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1);
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_relpath_prefix" "', argument " "1"" of type '" "char const *""'");
+    }
+    arg1 = (char *)(buf1);
+    ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
+    if (!SWIG_IsOK(ecode2)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "svn_relpath_prefix" "', argument " "2"" of type '" "int""'");
+    } 
+    arg2 = (int)(val2);
+    if (items > 2) {
+      
+    }
+    {
+      result = (char *)svn_relpath_prefix((char const *)arg1,arg2,arg3);
+      
+      
+      
+    }
+    ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
+    if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+    
+    
+    XSRETURN(argvi);
+  fail:
+    if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_svn_uri_split) {
   {
     char **arg1 = (char **) 0 ;
@@ -23914,6 +24298,7 @@ XS(_wrap_svn_uri_split) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
@@ -23978,6 +24363,7 @@ XS(_wrap_svn_uri_basename) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_uri_basename(uri,result_pool);");
@@ -24022,6 +24408,7 @@ XS(_wrap_svn_uri_dirname) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_uri_dirname(uri,result_pool);");
@@ -24144,6 +24531,7 @@ XS(_wrap_svn_dirent_canonicalize) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_dirent_canonicalize(dirent,result_pool);");
@@ -24188,6 +24576,7 @@ XS(_wrap_svn_relpath_canonicalize) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_relpath_canonicalize(relpath,result_pool);");
@@ -24232,6 +24621,7 @@ XS(_wrap_svn_uri_canonicalize) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_uri_canonicalize(uri,result_pool);");
@@ -24276,6 +24666,7 @@ XS(_wrap_svn_dirent_is_canonical) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_dirent_is_canonical(dirent,scratch_pool);");
@@ -24354,6 +24745,7 @@ XS(_wrap_svn_uri_is_canonical) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_uri_is_canonical(uri,scratch_pool);");
@@ -24402,6 +24794,7 @@ XS(_wrap_svn_dirent_get_longest_ancestor) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_dirent_get_longest_ancestor(dirent1,dirent2,result_pool);");
@@ -24457,6 +24850,7 @@ XS(_wrap_svn_relpath_get_longest_ancestor) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_relpath_get_longest_ancestor(relpath1,relpath2,result_pool);");
@@ -24512,6 +24906,7 @@ XS(_wrap_svn_uri_get_longest_ancestor) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_uri_get_longest_ancestor(uri1,uri2,result_pool);");
@@ -24565,6 +24960,7 @@ XS(_wrap_svn_dirent_get_absolute) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 2)) {
@@ -24638,6 +25034,7 @@ XS(_wrap_svn_dirent_is_child) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_dirent_is_child(parent_dirent,child_dirent,result_pool);");
@@ -24873,6 +25270,7 @@ XS(_wrap_svn_uri_skip_ancestor) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_uri_skip_ancestor(parent_uri,child_uri,result_pool);");
@@ -24926,6 +25324,7 @@ XS(_wrap_svn_uri_get_dirent_from_file_url) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 2)) {
@@ -24997,6 +25396,7 @@ XS(_wrap_svn_uri_get_file_url_from_dirent) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 2)) {
@@ -25068,6 +25468,7 @@ XS(_wrap_svn_mergeinfo_parse) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 2)) {
@@ -25149,9 +25550,11 @@ XS(_wrap_svn_mergeinfo_diff2) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
@@ -25263,6 +25666,7 @@ XS(_wrap_svn_mergeinfo_diff) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
@@ -25363,9 +25767,11 @@ XS(_wrap_svn_mergeinfo_merge2) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 4)) {
       SWIG_croak("Usage: svn_mergeinfo_merge2(mergeinfo,changes,result_pool,scratch_pool);");
@@ -25440,9 +25846,11 @@ XS(_wrap_svn_mergeinfo_catalog_merge) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 4)) {
       SWIG_croak("Usage: svn_mergeinfo_catalog_merge(mergeinfo_catalog,changes_catalog,result_pool,scratch_pool);");
@@ -25518,6 +25926,7 @@ XS(_wrap_svn_mergeinfo_remove) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -25604,9 +26013,11 @@ XS(_wrap_svn_mergeinfo_remove2) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 3) || (items > 5)) {
@@ -25706,6 +26117,7 @@ XS(_wrap_svn_rangelist_diff) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
@@ -25806,9 +26218,11 @@ XS(_wrap_svn_rangelist_merge2) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 4)) {
       SWIG_croak("Usage: svn_rangelist_merge2(rangelist,changes,result_pool,scratch_pool);");
@@ -25887,6 +26301,7 @@ XS(_wrap_svn_rangelist_remove) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 3) || (items > 4)) {
@@ -25980,9 +26395,11 @@ XS(_wrap_svn_mergeinfo_intersect2) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 3) || (items > 5)) {
@@ -26077,6 +26494,7 @@ XS(_wrap_svn_mergeinfo_intersect) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -26162,6 +26580,7 @@ XS(_wrap_svn_rangelist_intersect) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 3) || (items > 4)) {
@@ -26248,6 +26667,7 @@ XS(_wrap_svn_rangelist_to_string) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 2)) {
@@ -26328,9 +26748,11 @@ XS(_wrap_svn_rangelist_inheritable2) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 4) || (items > 6)) {
@@ -26435,6 +26857,7 @@ XS(_wrap_svn_rangelist_inheritable) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 3) || (items > 4)) {
@@ -26535,9 +26958,11 @@ XS(_wrap_svn_mergeinfo_inheritable2) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 5) || (items > 7)) {
@@ -26653,6 +27078,7 @@ XS(_wrap_svn_mergeinfo_inheritable) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 4) || (items > 5)) {
@@ -26746,6 +27172,7 @@ XS(_wrap_svn_mergeinfo_to_string) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 2)) {
@@ -26814,6 +27241,7 @@ XS(_wrap_svn_mergeinfo_catalog_dup) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_mergeinfo_catalog_dup(mergeinfo_catalog,pool);");
@@ -26857,6 +27285,7 @@ XS(_wrap_svn_mergeinfo_dup) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_mergeinfo_dup(mergeinfo,pool);");
@@ -26900,6 +27329,7 @@ XS(_wrap_svn_rangelist_dup) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_rangelist_dup(rangelist,pool);");
@@ -27183,10 +27613,9 @@ XS(_wrap_svn_io_dirent2_t_filesize_get) {
     arg1 = (struct svn_io_dirent2_t *)(argp1);
     result =  ((arg1)->filesize);
     {
-      char temp[256];
+      char temp[30];
       sprintf(temp, "%" APR_INT64_T_FMT, (apr_int64_t) result);
-      ST(argvi) = sv_newmortal();
-      sv_setpv((SV*)ST(argvi++), temp);
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = sv_2mortal(newSVpv(temp, 0)); argvi++  ;
     }
     
     XSRETURN(argvi);
@@ -27253,10 +27682,9 @@ XS(_wrap_svn_io_dirent2_t_mtime_get) {
     arg1 = (struct svn_io_dirent2_t *)(argp1);
     result =  ((arg1)->mtime);
     {
-      char temp[256];
+      char temp[30];
       sprintf(temp, "%" APR_INT64_T_FMT, (apr_int64_t) result);
-      ST(argvi) = sv_newmortal();
-      sv_setpv((SV*)ST(argvi++), temp);
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = sv_2mortal(newSVpv(temp, 0)); argvi++  ;
     }
     
     XSRETURN(argvi);
@@ -27332,6 +27760,7 @@ XS(_wrap_svn_io_dirent2_create) {
     
     {
       _global_pool = arg1 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 0) || (items > 1)) {
       SWIG_croak("Usage: svn_io_dirent2_create(result_pool);");
@@ -27368,6 +27797,7 @@ XS(_wrap_svn_io_dirent2_dup) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_io_dirent2_dup(item,result_pool);");
@@ -27613,9 +28043,11 @@ XS(_wrap_svn_io_open_uniquely_named) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
@@ -27725,9 +28157,11 @@ XS(_wrap_svn_io_open_unique_file3) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
@@ -27826,6 +28260,7 @@ XS(_wrap_svn_io_open_unique_file2) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
@@ -27926,6 +28361,7 @@ XS(_wrap_svn_io_open_unique_file) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
@@ -28019,6 +28455,7 @@ XS(_wrap_svn_io_copy_perms) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_io_copy_perms(src,dst,pool);");
@@ -28084,6 +28521,7 @@ XS(_wrap_svn_io_sleep_for_timestamps) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_io_sleep_for_timestamps(path,pool);");
@@ -28145,6 +28583,7 @@ XS(_wrap_svn_io_filesizes_three_different_p) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
@@ -28250,6 +28689,7 @@ XS(_wrap_svn_io_file_checksum2) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -28330,6 +28770,7 @@ XS(_wrap_svn_io_file_checksum) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = temp1;
     if ((items < 1) || (items > 2)) {
@@ -28366,7 +28807,7 @@ XS(_wrap_svn_io_file_checksum) {
       }
     }
     {
-      /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = sv_2mortal(newSVpv(svn_md5_digest_to_cstring(arg1,
+      /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = sv_2mortal(newSVpv(svn_md5_digest_to_cstring(arg1,
             _global_pool),
           0)); argvi++ /*@SWIG@*/
       
@@ -28408,6 +28849,7 @@ XS(_wrap_svn_io_files_contents_same_p) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -28500,6 +28942,7 @@ XS(_wrap_svn_io_files_contents_three_same_p) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
@@ -28586,6 +29029,144 @@ XS(_wrap_svn_io_files_contents_three_same_p) {
 }
 
 
+XS(_wrap_svn_io_file_create_bytes) {
+  {
+    char *arg1 = (char *) 0 ;
+    void *arg2 = (void *) 0 ;
+    apr_size_t arg3 ;
+    apr_pool_t *arg4 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    int res1 ;
+    char *buf1 = 0 ;
+    int alloc1 = 0 ;
+    int res2 ;
+    unsigned long val3 ;
+    int ecode3 = 0 ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    if ((items < 3) || (items > 4)) {
+      SWIG_croak("Usage: svn_io_file_create_bytes(file,contents,length,scratch_pool);");
+    }
+    res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1);
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_io_file_create_bytes" "', argument " "1"" of type '" "char const *""'");
+    }
+    arg1 = (char *)(buf1);
+    res2 = SWIG_ConvertPtr(ST(1),SWIG_as_voidptrptr(&arg2), 0, 0);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_io_file_create_bytes" "', argument " "2"" of type '" "void const *""'"); 
+    }
+    ecode3 = SWIG_AsVal_unsigned_SS_long SWIG_PERL_CALL_ARGS_2(ST(2), &val3);
+    if (!SWIG_IsOK(ecode3)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "svn_io_file_create_bytes" "', argument " "3"" of type '" "apr_size_t""'");
+    } 
+    arg3 = (apr_size_t)(val3);
+    if (items > 3) {
+      
+    }
+    {
+      result = (svn_error_t *)svn_io_file_create_bytes((char const *)arg1,(void const *)arg2,arg3,arg4);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+    
+    
+    
+    XSRETURN(argvi);
+  fail:
+    if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+    
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_svn_io_file_create_empty) {
+  {
+    char *arg1 = (char *) 0 ;
+    apr_pool_t *arg2 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    int res1 ;
+    char *buf1 = 0 ;
+    int alloc1 = 0 ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    if ((items < 1) || (items > 2)) {
+      SWIG_croak("Usage: svn_io_file_create_empty(file,scratch_pool);");
+    }
+    res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1);
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_io_file_create_empty" "', argument " "1"" of type '" "char const *""'");
+    }
+    arg1 = (char *)(buf1);
+    if (items > 1) {
+      
+    }
+    {
+      result = (svn_error_t *)svn_io_file_create_empty((char const *)arg1,arg2);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+    
+    XSRETURN(argvi);
+  fail:
+    if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_svn_io_lock_open_file) {
   {
     apr_file_t *arg1 = (apr_file_t *) 0 ;
@@ -28603,6 +29184,7 @@ XS(_wrap_svn_io_lock_open_file) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_io_lock_open_file(lockfile_handle,exclusive,nonblocking,pool);");
@@ -28671,6 +29253,7 @@ XS(_wrap_svn_io_unlock_open_file) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_io_unlock_open_file(lockfile_handle,pool);");
@@ -28714,6 +29297,53 @@ XS(_wrap_svn_io_unlock_open_file) {
 }
 
 
+XS(_wrap_svn_stream_set_read2) {
+  {
+    svn_stream_t *arg1 = (svn_stream_t *) 0 ;
+    svn_read_fn_t arg2 = (svn_read_fn_t) 0 ;
+    svn_read_fn_t arg3 = (svn_read_fn_t) 0 ;
+    int argvi = 0;
+    dXSARGS;
+    
+    if ((items < 3) || (items > 3)) {
+      SWIG_croak("Usage: svn_stream_set_read2(stream,read_fn,read_full_fn);");
+    }
+    {
+      svn_swig_pl_make_stream (&arg1, ST(0));
+      SPAGAIN;
+    }
+    {
+      int res = SWIG_ConvertFunctionPtr(ST(1), (void**)(&arg2), SWIGTYPE_p_f_p_void_p_char_p_apr_size_t__p_svn_error_t);
+      if (!SWIG_IsOK(res)) {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_stream_set_read2" "', argument " "2"" of type '" "svn_read_fn_t""'"); 
+      }
+    }
+    {
+      int res = SWIG_ConvertFunctionPtr(ST(2), (void**)(&arg3), SWIGTYPE_p_f_p_void_p_char_p_apr_size_t__p_svn_error_t);
+      if (!SWIG_IsOK(res)) {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_stream_set_read2" "', argument " "3"" of type '" "svn_read_fn_t""'"); 
+      }
+    }
+    {
+      svn_stream_set_read2(arg1,arg2,arg3);
+      
+      
+      
+    }
+    ST(argvi) = sv_newmortal();
+    
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_svn_stream_set_skip) {
   {
     svn_stream_t *arg1 = (svn_stream_t *) 0 ;
@@ -28726,6 +29356,7 @@ XS(_wrap_svn_stream_set_skip) {
     }
     {
       svn_swig_pl_make_stream (&arg1, ST(0));
+      SPAGAIN;
     }
     {
       int res = SWIG_ConvertFunctionPtr(ST(1), (void**)(&arg2), SWIGTYPE_p_f_p_void_apr_size_t__p_svn_error_t);
@@ -28763,6 +29394,7 @@ XS(_wrap_svn_stream_set_mark) {
     }
     {
       svn_swig_pl_make_stream (&arg1, ST(0));
+      SPAGAIN;
     }
     {
       int res = SWIG_ConvertFunctionPtr(ST(1), (void**)(&arg2), SWIGTYPE_p_f_p_void_p_p_svn_stream_mark_t_p_apr_pool_t__p_svn_error_t);
@@ -28800,6 +29432,7 @@ XS(_wrap_svn_stream_set_seek) {
     }
     {
       svn_swig_pl_make_stream (&arg1, ST(0));
+      SPAGAIN;
     }
     {
       int res = SWIG_ConvertFunctionPtr(ST(1), (void**)(&arg2), SWIGTYPE_p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t);
@@ -28825,6 +29458,44 @@ XS(_wrap_svn_stream_set_seek) {
 }
 
 
+XS(_wrap_svn_stream_set_data_available) {
+  {
+    svn_stream_t *arg1 = (svn_stream_t *) 0 ;
+    svn_stream_data_available_fn_t arg2 = (svn_stream_data_available_fn_t) 0 ;
+    int argvi = 0;
+    dXSARGS;
+    
+    if ((items < 2) || (items > 2)) {
+      SWIG_croak("Usage: svn_stream_set_data_available(stream,data_available);");
+    }
+    {
+      svn_swig_pl_make_stream (&arg1, ST(0));
+      SPAGAIN;
+    }
+    {
+      int res = SWIG_ConvertFunctionPtr(ST(1), (void**)(&arg2), SWIGTYPE_p_f_p_void_p_svn_boolean_t__p_svn_error_t);
+      if (!SWIG_IsOK(res)) {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_stream_set_data_available" "', argument " "2"" of type '" "svn_stream_data_available_fn_t""'"); 
+      }
+    }
+    {
+      svn_stream_set_data_available(arg1,arg2);
+      
+      
+      
+    }
+    ST(argvi) = sv_newmortal();
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_svn_stream_empty) {
   {
     apr_pool_t *arg1 = (apr_pool_t *) 0 ;
@@ -28835,6 +29506,7 @@ XS(_wrap_svn_stream_empty) {
     
     {
       _global_pool = arg1 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 0) || (items > 1)) {
       SWIG_croak("Usage: svn_stream_empty(pool);");
@@ -28849,7 +29521,11 @@ XS(_wrap_svn_stream_empty) {
       
     }
     {
-      ST(argvi) = svn_swig_pl_from_stream (result);
+      SV* tmp;
+      PUTBACK;
+      tmp = svn_swig_pl_from_stream (result);
+      SPAGAIN;
+      ST(argvi) = tmp;
       argvi++;
     }
     
@@ -28872,12 +29548,14 @@ XS(_wrap_svn_stream_disown) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_stream_disown(stream,pool);");
     }
     {
       svn_swig_pl_make_stream (&arg1, ST(0));
+      SPAGAIN;
     }
     if (items > 1) {
       
@@ -28889,7 +29567,11 @@ XS(_wrap_svn_stream_disown) {
       
     }
     {
-      ST(argvi) = svn_swig_pl_from_stream (result);
+      SV* tmp;
+      PUTBACK;
+      tmp = svn_swig_pl_from_stream (result);
+      SPAGAIN;
+      ST(argvi) = tmp;
       argvi++;
     }
     
@@ -28920,9 +29602,11 @@ XS(_wrap_svn_stream_open_readonly) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 3)) {
@@ -28962,7 +29646,11 @@ XS(_wrap_svn_stream_open_readonly) {
       }
     }
     {
-      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = svn_swig_pl_from_stream(*arg1); argvi++  ;
+      SV *tmp;
+      PUTBACK;
+      tmp = svn_swig_pl_from_stream(*arg1);
+      SPAGAIN;
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = tmp; argvi++  ;
     }
     
     if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
@@ -28996,9 +29684,11 @@ XS(_wrap_svn_stream_open_writable) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 3)) {
@@ -29038,7 +29728,11 @@ XS(_wrap_svn_stream_open_writable) {
       }
     }
     {
-      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = svn_swig_pl_from_stream(*arg1); argvi++  ;
+      SV *tmp;
+      PUTBACK;
+      tmp = svn_swig_pl_from_stream(*arg1);
+      SPAGAIN;
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = tmp; argvi++  ;
     }
     
     if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
@@ -29077,9 +29771,11 @@ XS(_wrap_svn_stream_open_unique) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
@@ -29125,7 +29821,11 @@ XS(_wrap_svn_stream_open_unique) {
       }
     }
     {
-      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = svn_swig_pl_from_stream(*arg1); argvi++  ;
+      SV *tmp;
+      PUTBACK;
+      tmp = svn_swig_pl_from_stream(*arg1);
+      SPAGAIN;
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = tmp; argvi++  ;
     }
     {
       if (*arg2 == NULL) {
@@ -29167,6 +29867,7 @@ XS(_wrap_svn_stream_from_aprfile2) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_stream_from_aprfile2(file,disown,pool);");
@@ -29189,7 +29890,11 @@ XS(_wrap_svn_stream_from_aprfile2) {
       
     }
     {
-      ST(argvi) = svn_swig_pl_from_stream (result);
+      SV* tmp;
+      PUTBACK;
+      tmp = svn_swig_pl_from_stream (result);
+      SPAGAIN;
+      ST(argvi) = tmp;
       argvi++;
     }
     
@@ -29216,6 +29921,7 @@ XS(_wrap_svn_stream_from_aprfile) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_stream_from_aprfile(file,pool);");
@@ -29233,7 +29939,11 @@ XS(_wrap_svn_stream_from_aprfile) {
       
     }
     {
-      ST(argvi) = svn_swig_pl_from_stream (result);
+      SV* tmp;
+      PUTBACK;
+      tmp = svn_swig_pl_from_stream (result);
+      SPAGAIN;
+      ST(argvi) = tmp;
       argvi++;
     }
     
@@ -29259,6 +29969,7 @@ XS(_wrap_svn_stream_for_stdin) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 0) || (items > 1)) {
@@ -29290,7 +30001,11 @@ XS(_wrap_svn_stream_for_stdin) {
       }
     }
     {
-      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = svn_swig_pl_from_stream(*arg1); argvi++  ;
+      SV *tmp;
+      PUTBACK;
+      tmp = svn_swig_pl_from_stream(*arg1);
+      SPAGAIN;
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = tmp; argvi++  ;
     }
     
     
@@ -29315,6 +30030,7 @@ XS(_wrap_svn_stream_for_stderr) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 0) || (items > 1)) {
@@ -29346,7 +30062,11 @@ XS(_wrap_svn_stream_for_stderr) {
       }
     }
     {
-      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = svn_swig_pl_from_stream(*arg1); argvi++  ;
+      SV *tmp;
+      PUTBACK;
+      tmp = svn_swig_pl_from_stream(*arg1);
+      SPAGAIN;
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = tmp; argvi++  ;
     }
     
     
@@ -29371,6 +30091,7 @@ XS(_wrap_svn_stream_for_stdout) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 0) || (items > 1)) {
@@ -29402,14 +30123,96 @@ XS(_wrap_svn_stream_for_stdout) {
       }
     }
     {
-      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = svn_swig_pl_from_stream(*arg1); argvi++  ;
+      SV *tmp;
+      PUTBACK;
+      tmp = svn_swig_pl_from_stream(*arg1);
+      SPAGAIN;
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = tmp; argvi++  ;
+    }
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_svn_stringbuf_from_stream) {
+  {
+    svn_stringbuf_t **arg1 = (svn_stringbuf_t **) 0 ;
+    svn_stream_t *arg2 = (svn_stream_t *) 0 ;
+    apr_size_t arg3 ;
+    apr_pool_t *arg4 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    svn_stringbuf_t *temp1 ;
+    unsigned long val3 ;
+    int ecode3 = 0 ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    arg1 = &temp1;
+    if ((items < 2) || (items > 3)) {
+      SWIG_croak("Usage: svn_stringbuf_from_stream(stream,len_hint,result_pool);");
+    }
+    {
+      svn_swig_pl_make_stream (&arg2, ST(0));
+      SPAGAIN;
+    }
+    ecode3 = SWIG_AsVal_unsigned_SS_long SWIG_PERL_CALL_ARGS_2(ST(1), &val3);
+    if (!SWIG_IsOK(ecode3)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "svn_stringbuf_from_stream" "', argument " "3"" of type '" "apr_size_t""'");
+    } 
+    arg3 = (apr_size_t)(val3);
+    if (items > 2) {
+      
+    }
+    {
+      result = (svn_error_t *)svn_stringbuf_from_stream(arg1,arg2,arg3,arg4);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    {
+      if (*arg1) {
+        if (argvi >= items) EXTEND(sp,1);  ST(argvi) = sv_2mortal(newSVpvn((*arg1)->data, (*arg1)->len)); argvi++  ;
+      } else {
+        if (argvi >= items) EXTEND(sp,1);  ST(argvi) = &PL_sv_undef; argvi++  ;
+      }
     }
     
     
+    
+    
     XSRETURN(argvi);
   fail:
     
     
+    
+    
     SWIG_croak_null();
   }
 }
@@ -29426,6 +30229,7 @@ XS(_wrap_svn_stream_from_stringbuf) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_stream_from_stringbuf(str,pool);");
@@ -29433,6 +30237,7 @@ XS(_wrap_svn_stream_from_stringbuf) {
     {
       apr_size_t len;
       char *buf;
+      apr_pool_t *pool;
       
       if (!SvOK(ST(0))) {
         arg1 = NULL;
@@ -29440,8 +30245,9 @@ XS(_wrap_svn_stream_from_stringbuf) {
         buf = SvPV(ST(0), len);
         /* Another case of ugly pool handling, this should use the current
                    default pool, or make a new one if it doesn't exist yet */
-        arg1 = svn_stringbuf_ncreate(buf,len,
-          svn_swig_pl_make_pool ((SV *)NULL));
+        pool = svn_swig_pl_make_pool ((SV *)NULL);
+        SPAGAIN;
+        arg1 = svn_stringbuf_ncreate(buf,len, pool);
       } else {
         croak("Not a string");
       }
@@ -29456,7 +30262,11 @@ XS(_wrap_svn_stream_from_stringbuf) {
       
     }
     {
-      ST(argvi) = svn_swig_pl_from_stream (result);
+      SV* tmp;
+      PUTBACK;
+      tmp = svn_swig_pl_from_stream (result);
+      SPAGAIN;
+      ST(argvi) = tmp;
       argvi++;
     }
     
@@ -29482,6 +30292,7 @@ XS(_wrap_svn_stream_from_string) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_stream_from_string(str,pool);");
@@ -29505,7 +30316,11 @@ XS(_wrap_svn_stream_from_string) {
       
     }
     {
-      ST(argvi) = svn_swig_pl_from_stream (result);
+      SV* tmp;
+      PUTBACK;
+      tmp = svn_swig_pl_from_stream (result);
+      SPAGAIN;
+      ST(argvi) = tmp;
       argvi++;
     }
     
@@ -29529,6 +30344,7 @@ XS(_wrap_svn_stream_buffered) {
     
     {
       _global_pool = arg1 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 0) || (items > 1)) {
       SWIG_croak("Usage: svn_stream_buffered(result_pool);");
@@ -29543,7 +30359,11 @@ XS(_wrap_svn_stream_buffered) {
       
     }
     {
-      ST(argvi) = svn_swig_pl_from_stream (result);
+      SV* tmp;
+      PUTBACK;
+      tmp = svn_swig_pl_from_stream (result);
+      SPAGAIN;
+      ST(argvi) = tmp;
       argvi++;
     }
     
@@ -29566,12 +30386,14 @@ XS(_wrap_svn_stream_compressed) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_stream_compressed(stream,pool);");
     }
     {
       svn_swig_pl_make_stream (&arg1, ST(0));
+      SPAGAIN;
     }
     if (items > 1) {
       
@@ -29583,7 +30405,11 @@ XS(_wrap_svn_stream_compressed) {
       
     }
     {
-      ST(argvi) = svn_swig_pl_from_stream (result);
+      SV* tmp;
+      PUTBACK;
+      tmp = svn_swig_pl_from_stream (result);
+      SPAGAIN;
+      ST(argvi) = tmp;
       argvi++;
     }
     
@@ -29618,6 +30444,7 @@ XS(_wrap_svn_stream_checksummed2) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     arg3 = &temp3;
@@ -29626,6 +30453,7 @@ XS(_wrap_svn_stream_checksummed2) {
     }
     {
       svn_swig_pl_make_stream (&arg1, ST(0));
+      SPAGAIN;
     }
     ecode4 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val4);
     if (!SWIG_IsOK(ecode4)) {
@@ -29647,7 +30475,11 @@ XS(_wrap_svn_stream_checksummed2) {
       
     }
     {
-      ST(argvi) = svn_swig_pl_from_stream (result);
+      SV* tmp;
+      PUTBACK;
+      tmp = svn_swig_pl_from_stream (result);
+      SPAGAIN;
+      ST(argvi) = tmp;
       argvi++;
     }
     {
@@ -29687,6 +30519,158 @@ XS(_wrap_svn_stream_checksummed2) {
 }
 
 
+XS(_wrap_svn_stream_read_full) {
+  {
+    svn_stream_t *arg1 = (svn_stream_t *) 0 ;
+    char *arg2 = (char *) 0 ;
+    apr_size_t *arg3 = (apr_size_t *) 0 ;
+    apr_size_t temp2 ;
+    int argvi = 0;
+    SV * _saved[1] ;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    if ((items < 2) || (items > 2)) {
+      SWIG_croak("Usage: svn_stream_read_full(stream,buffer,len);");
+    }
+    {
+      svn_swig_pl_make_stream (&arg1, ST(0));
+      SPAGAIN;
+    }
+    {
+      temp2 = SvIV(ST(1));
+      arg2 = malloc(temp2);
+      arg3 = (apr_size_t *)&temp2;
+    }
+    _saved[0] = ST(1);
+    {
+      result = (svn_error_t *)svn_stream_read_full(arg1,arg2,arg3);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    {
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = sv_2mortal(newSVpvn(arg2, *arg3)); argvi++  ;
+      free(arg2);
+    }
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_svn_stream_supports_partial_read) {
+  {
+    svn_stream_t *arg1 = (svn_stream_t *) 0 ;
+    int argvi = 0;
+    svn_boolean_t result;
+    dXSARGS;
+    
+    if ((items < 1) || (items > 1)) {
+      SWIG_croak("Usage: svn_stream_supports_partial_read(stream);");
+    }
+    {
+      svn_swig_pl_make_stream (&arg1, ST(0));
+      SPAGAIN;
+    }
+    {
+      result = (svn_boolean_t)svn_stream_supports_partial_read(arg1);
+      
+      
+      
+    }
+    ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
+    
+    XSRETURN(argvi);
+  fail:
+    
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_svn_stream_read2) {
+  {
+    svn_stream_t *arg1 = (svn_stream_t *) 0 ;
+    char *arg2 = (char *) 0 ;
+    apr_size_t *arg3 = (apr_size_t *) 0 ;
+    apr_size_t temp2 ;
+    int argvi = 0;
+    SV * _saved[1] ;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    if ((items < 2) || (items > 2)) {
+      SWIG_croak("Usage: svn_stream_read2(stream,buffer,len);");
+    }
+    {
+      svn_swig_pl_make_stream (&arg1, ST(0));
+      SPAGAIN;
+    }
+    {
+      temp2 = SvIV(ST(1));
+      arg2 = malloc(temp2);
+      arg3 = (apr_size_t *)&temp2;
+    }
+    _saved[0] = ST(1);
+    {
+      result = (svn_error_t *)svn_stream_read2(arg1,arg2,arg3);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    {
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = sv_2mortal(newSVpvn(arg2, *arg3)); argvi++  ;
+      free(arg2);
+    }
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_svn_stream_read) {
   {
     svn_stream_t *arg1 = (svn_stream_t *) 0 ;
@@ -29703,6 +30687,7 @@ XS(_wrap_svn_stream_read) {
     }
     {
       svn_swig_pl_make_stream (&arg1, ST(0));
+      SPAGAIN;
     }
     {
       temp2 = SvIV(ST(1));
@@ -29762,6 +30747,7 @@ XS(_wrap_svn_stream_skip) {
     }
     {
       svn_swig_pl_make_stream (&arg1, ST(0));
+      SPAGAIN;
     }
     ecode2 = SWIG_AsVal_unsigned_SS_long SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
     if (!SWIG_IsOK(ecode2)) {
@@ -29817,6 +30803,7 @@ XS(_wrap_svn_stream_write) {
     }
     {
       svn_swig_pl_make_stream (&arg1, ST(0));
+      SPAGAIN;
     }
     {
       arg2 = SvPV(ST(1), temp2);
@@ -29871,6 +30858,7 @@ XS(_wrap_svn_stream_close) {
     }
     {
       svn_swig_pl_make_stream (&arg1, ST(0));
+      SPAGAIN;
     }
     {
       result = (svn_error_t *)svn_stream_close(arg1);
@@ -29915,6 +30903,7 @@ XS(_wrap_svn_stream_reset) {
     }
     {
       svn_swig_pl_make_stream (&arg1, ST(0));
+      SPAGAIN;
     }
     {
       result = (svn_error_t *)svn_stream_reset(arg1);
@@ -29959,6 +30948,7 @@ XS(_wrap_svn_stream_supports_mark) {
     }
     {
       svn_swig_pl_make_stream (&arg1, ST(0));
+      SPAGAIN;
     }
     {
       result = (svn_boolean_t)svn_stream_supports_mark(arg1);
@@ -29989,6 +30979,7 @@ XS(_wrap_svn_stream_mark) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     if ((items < 1) || (items > 2)) {
@@ -29996,6 +30987,7 @@ XS(_wrap_svn_stream_mark) {
     }
     {
       svn_swig_pl_make_stream (&arg1, ST(0));
+      SPAGAIN;
     }
     if (items > 1) {
       
@@ -30059,6 +31051,7 @@ XS(_wrap_svn_stream_seek) {
     }
     {
       svn_swig_pl_make_stream (&arg1, ST(0));
+      SPAGAIN;
     }
     res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_svn_stream_mark_t, 0 |  0 );
     if (!SWIG_IsOK(res2)) {
@@ -30098,6 +31091,63 @@ XS(_wrap_svn_stream_seek) {
 }
 
 
+XS(_wrap_svn_stream_data_available) {
+  {
+    svn_stream_t *arg1 = (svn_stream_t *) 0 ;
+    svn_boolean_t *arg2 = (svn_boolean_t *) 0 ;
+    svn_boolean_t temp2 ;
+    int res2 = SWIG_TMPOBJ ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    arg2 = &temp2;
+    if ((items < 1) || (items > 1)) {
+      SWIG_croak("Usage: svn_stream_data_available(stream);");
+    }
+    {
+      svn_swig_pl_make_stream (&arg1, ST(0));
+      SPAGAIN;
+    }
+    {
+      result = (svn_error_t *)svn_stream_data_available(arg1,arg2);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    if (SWIG_IsTmpObj(res2)) {
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((*arg2)); argvi++  ;
+    } else {
+      int new_flags = SWIG_IsNewObj(res2) ? (SWIG_POINTER_OWN | 0) : 0;
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, new_flags); argvi++  ;
+    }
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_svn_stream_tee) {
   {
     svn_stream_t *arg1 = (svn_stream_t *) 0 ;
@@ -30110,15 +31160,18 @@ XS(_wrap_svn_stream_tee) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_stream_tee(out1,out2,pool);");
     }
     {
       svn_swig_pl_make_stream (&arg1, ST(0));
+      SPAGAIN;
     }
     {
       svn_swig_pl_make_stream (&arg2, ST(1));
+      SPAGAIN;
     }
     if (items > 2) {
       
@@ -30130,7 +31183,11 @@ XS(_wrap_svn_stream_tee) {
       
     }
     {
-      ST(argvi) = svn_swig_pl_from_stream (result);
+      SV* tmp;
+      PUTBACK;
+      tmp = svn_swig_pl_from_stream (result);
+      SPAGAIN;
+      ST(argvi) = tmp;
       argvi++;
     }
     
@@ -30162,6 +31219,7 @@ XS(_wrap_svn_stream_puts) {
     }
     {
       svn_swig_pl_make_stream (&arg1, ST(0));
+      SPAGAIN;
     }
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
@@ -30221,6 +31279,7 @@ XS(_wrap_svn_stream_readline) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     arg4 = &temp4;
@@ -30229,6 +31288,7 @@ XS(_wrap_svn_stream_readline) {
     }
     {
       svn_swig_pl_make_stream (&arg1, ST(0));
+      SPAGAIN;
     }
     res3 = SWIG_AsCharPtrAndSize(ST(1), &buf3, NULL, &alloc3);
     if (!SWIG_IsOK(res3)) {
@@ -30298,34 +31358,30 @@ XS(_wrap_svn_stream_copy3) {
     void *arg4 = (void *) 0 ;
     apr_pool_t *arg5 = (apr_pool_t *) 0 ;
     apr_pool_t *_global_pool ;
-    int res4 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
     dXSARGS;
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 4) || (items > 5)) {
+    if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_stream_copy3(from,to,cancel_func,cancel_baton,pool);");
     }
     {
       svn_swig_pl_make_stream (&arg1, ST(0));
+      SPAGAIN;
     }
     {
       svn_swig_pl_make_stream (&arg2, ST(1));
+      SPAGAIN;
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(2), (void**)(&arg3), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_stream_copy3" "', argument " "3"" of type '" "svn_cancel_func_t""'"); 
-      }
-    }
-    res4 = SWIG_ConvertPtr(ST(3),SWIG_as_voidptrptr(&arg4), 0, 0);
-    if (!SWIG_IsOK(res4)) {
-      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "svn_stream_copy3" "', argument " "4"" of type '" "void *""'"); 
+      arg3 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg4 = ST(2);
     }
-    if (items > 4) {
+    if (items > 3) {
       
     }
     {
@@ -30353,15 +31409,11 @@ XS(_wrap_svn_stream_copy3) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -30375,34 +31427,30 @@ XS(_wrap_svn_stream_copy2) {
     void *arg4 = (void *) 0 ;
     apr_pool_t *arg5 = (apr_pool_t *) 0 ;
     apr_pool_t *_global_pool ;
-    int res4 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
     dXSARGS;
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 4) || (items > 5)) {
+    if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_stream_copy2(from,to,cancel_func,cancel_baton,pool);");
     }
     {
       svn_swig_pl_make_stream (&arg1, ST(0));
+      SPAGAIN;
     }
     {
       svn_swig_pl_make_stream (&arg2, ST(1));
+      SPAGAIN;
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(2), (void**)(&arg3), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_stream_copy2" "', argument " "3"" of type '" "svn_cancel_func_t""'"); 
-      }
-    }
-    res4 = SWIG_ConvertPtr(ST(3),SWIG_as_voidptrptr(&arg4), 0, 0);
-    if (!SWIG_IsOK(res4)) {
-      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "svn_stream_copy2" "', argument " "4"" of type '" "void *""'"); 
+      arg3 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg4 = ST(2);
     }
-    if (items > 4) {
+    if (items > 3) {
       
     }
     {
@@ -30430,15 +31478,11 @@ XS(_wrap_svn_stream_copy2) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -30456,15 +31500,18 @@ XS(_wrap_svn_stream_copy) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_stream_copy(from,to,pool);");
     }
     {
       svn_swig_pl_make_stream (&arg1, ST(0));
+      SPAGAIN;
     }
     {
       svn_swig_pl_make_stream (&arg2, ST(1));
+      SPAGAIN;
     }
     if (items > 2) {
       
@@ -30519,6 +31566,7 @@ XS(_wrap_svn_stream_contents_same2) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -30526,9 +31574,11 @@ XS(_wrap_svn_stream_contents_same2) {
     }
     {
       svn_swig_pl_make_stream (&arg2, ST(0));
+      SPAGAIN;
     }
     {
       svn_swig_pl_make_stream (&arg3, ST(1));
+      SPAGAIN;
     }
     if (items > 2) {
       
@@ -30591,6 +31641,7 @@ XS(_wrap_svn_stream_contents_same) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -30598,9 +31649,11 @@ XS(_wrap_svn_stream_contents_same) {
     }
     {
       svn_swig_pl_make_stream (&arg2, ST(0));
+      SPAGAIN;
     }
     {
       svn_swig_pl_make_stream (&arg3, ST(1));
+      SPAGAIN;
     }
     if (items > 2) {
       
@@ -30662,9 +31715,11 @@ XS(_wrap_svn_string_from_stream) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 3)) {
@@ -30672,6 +31727,7 @@ XS(_wrap_svn_string_from_stream) {
     }
     {
       svn_swig_pl_make_stream (&arg2, ST(0));
+      SPAGAIN;
     }
     if (items > 1) {
       
@@ -30739,6 +31795,7 @@ XS(_wrap_svn_stream_lazyopen_create) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_stream_lazyopen_create(open_func,open_baton,open_on_close,result_pool);");
@@ -30768,7 +31825,11 @@ XS(_wrap_svn_stream_lazyopen_create) {
       
     }
     {
-      ST(argvi) = svn_swig_pl_from_stream (result);
+      SV* tmp;
+      PUTBACK;
+      tmp = svn_swig_pl_from_stream (result);
+      SPAGAIN;
+      ST(argvi) = tmp;
       argvi++;
     }
     
@@ -30802,6 +31863,7 @@ XS(_wrap_svn_stringbuf_from_file2) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 2)) {
@@ -30873,6 +31935,7 @@ XS(_wrap_svn_stringbuf_from_file) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 2)) {
@@ -30941,6 +32004,7 @@ XS(_wrap_svn_stringbuf_from_aprfile) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 2)) {
@@ -31011,6 +32075,7 @@ XS(_wrap_svn_io_remove_file2) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_io_remove_file2(path,ignore_enoent,scratch_pool);");
@@ -31076,15 +32141,15 @@ XS(_wrap_svn_io_remove_dir2) {
     int alloc1 = 0 ;
     int val2 ;
     int ecode2 = 0 ;
-    int res4 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
     dXSARGS;
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 4) || (items > 5)) {
+    if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_io_remove_dir2(path,ignore_enoent,cancel_func,cancel_baton,pool);");
     }
     res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1);
@@ -31098,16 +32163,10 @@ XS(_wrap_svn_io_remove_dir2) {
     } 
     arg2 = (svn_boolean_t)(val2);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(2), (void**)(&arg3), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_io_remove_dir2" "', argument " "3"" of type '" "svn_cancel_func_t""'"); 
-      }
-    }
-    res4 = SWIG_ConvertPtr(ST(3),SWIG_as_voidptrptr(&arg4), 0, 0);
-    if (!SWIG_IsOK(res4)) {
-      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "svn_io_remove_dir2" "', argument " "4"" of type '" "void *""'"); 
+      arg3 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg4 = ST(2);
     }
-    if (items > 4) {
+    if (items > 3) {
       
     }
     {
@@ -31135,15 +32194,11 @@ XS(_wrap_svn_io_remove_dir2) {
     if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -31169,9 +32224,11 @@ XS(_wrap_svn_io_get_dirents3) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 4)) {
@@ -31258,9 +32315,11 @@ XS(_wrap_svn_io_stat_dirent2) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 3) || (items > 5)) {
@@ -31357,9 +32416,11 @@ XS(_wrap_svn_io_stat_dirent) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 4)) {
@@ -31449,6 +32510,7 @@ XS(_wrap_svn_io_dir_walk2) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_io_dir_walk2(dirname,wanted,walk_func,walk_baton,pool);");
@@ -31557,6 +32619,7 @@ XS(_wrap_svn_io_start_cmd3) {
     
     {
       _global_pool = arg13 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 12) || (items > 13)) {
       SWIG_croak("Usage: svn_io_start_cmd3(cmd_proc,path,cmd,args,env,inherit,infile_pipe,infile,outfile_pipe,outfile,errfile_pipe,errfile,pool);");
@@ -31712,6 +32775,7 @@ XS(_wrap_svn_io_start_cmd2) {
     
     {
       _global_pool = arg12 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 11) || (items > 12)) {
       SWIG_croak("Usage: svn_io_start_cmd2(cmd_proc,path,cmd,args,inherit,infile_pipe,infile,outfile_pipe,outfile,errfile_pipe,errfile,pool);");
@@ -31866,6 +32930,7 @@ XS(_wrap_svn_io_run_diff2) {
     
     {
       _global_pool = arg12 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg8 = &temp8;
     if ((items < 10) || (items > 11)) {
@@ -32028,6 +33093,7 @@ XS(_wrap_svn_io_run_diff3_3) {
     
     {
       _global_pool = arg12 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 10) || (items > 11)) {
@@ -32159,6 +33225,7 @@ XS(_wrap_svn_io_parse_mimetypes_file) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 2)) {
@@ -32233,6 +33300,7 @@ XS(_wrap_svn_io_detect_mimetype2) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -32309,6 +33377,7 @@ XS(_wrap_svn_io_detect_mimetype) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 2)) {
@@ -32419,6 +33488,7 @@ XS(_wrap_svn_io_file_putc) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_io_file_putc(ch,file,pool);");
@@ -32491,6 +33561,7 @@ XS(_wrap_svn_io_file_read_full2) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg4 = &temp4;
     arg5 = &temp5;
@@ -32565,6 +33636,235 @@ XS(_wrap_svn_io_file_read_full2) {
 }
 
 
+XS(_wrap_svn_io_file_aligned_seek) {
+  {
+    apr_file_t *arg1 = (apr_file_t *) 0 ;
+    apr_off_t arg2 ;
+    apr_off_t *arg3 = (apr_off_t *) 0 ;
+    apr_off_t arg4 ;
+    apr_pool_t *arg5 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    long long val2 ;
+    int ecode2 = 0 ;
+    void *argp3 = 0 ;
+    int res3 = 0 ;
+    long long val4 ;
+    int ecode4 = 0 ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    if ((items < 4) || (items > 5)) {
+      SWIG_croak("Usage: svn_io_file_aligned_seek(file,block_size,buffer_start,offset,scratch_pool);");
+    }
+    {
+      arg1 = svn_swig_pl_make_file(ST(0), _global_pool);
+    }
+    ecode2 = SWIG_AsVal_long_SS_long SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
+    if (!SWIG_IsOK(ecode2)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "svn_io_file_aligned_seek" "', argument " "2"" of type '" "apr_off_t""'");
+    } 
+    arg2 = (apr_off_t)(val2);
+    res3 = SWIG_ConvertPtr(ST(2), &argp3,SWIGTYPE_p_apr_off_t, 0 |  0 );
+    if (!SWIG_IsOK(res3)) {
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_io_file_aligned_seek" "', argument " "3"" of type '" "apr_off_t *""'"); 
+    }
+    arg3 = (apr_off_t *)(argp3);
+    ecode4 = SWIG_AsVal_long_SS_long SWIG_PERL_CALL_ARGS_2(ST(3), &val4);
+    if (!SWIG_IsOK(ecode4)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "svn_io_file_aligned_seek" "', argument " "4"" of type '" "apr_off_t""'");
+    } 
+    arg4 = (apr_off_t)(val4);
+    if (items > 4) {
+      
+    }
+    {
+      result = (svn_error_t *)svn_io_file_aligned_seek(arg1,arg2,arg3,arg4,arg5);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    
+    
+    
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_svn_io_file_flush) {
+  {
+    apr_file_t *arg1 = (apr_file_t *) 0 ;
+    apr_pool_t *arg2 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    if ((items < 1) || (items > 2)) {
+      SWIG_croak("Usage: svn_io_file_flush(file,scratch_pool);");
+    }
+    {
+      arg1 = svn_swig_pl_make_file(ST(0), _global_pool);
+    }
+    if (items > 1) {
+      
+    }
+    {
+      result = (svn_error_t *)svn_io_file_flush(arg1,arg2);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_svn_io_write_atomic) {
+  {
+    char *arg1 = (char *) 0 ;
+    void *arg2 = (void *) 0 ;
+    apr_size_t arg3 ;
+    char *arg4 = (char *) 0 ;
+    apr_pool_t *arg5 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    int res1 ;
+    char *buf1 = 0 ;
+    int alloc1 = 0 ;
+    int res2 ;
+    unsigned long val3 ;
+    int ecode3 = 0 ;
+    int res4 ;
+    char *buf4 = 0 ;
+    int alloc4 = 0 ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    if ((items < 4) || (items > 5)) {
+      SWIG_croak("Usage: svn_io_write_atomic(final_path,buf,nbytes,copy_perms_path,scratch_pool);");
+    }
+    res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1);
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_io_write_atomic" "', argument " "1"" of type '" "char const *""'");
+    }
+    arg1 = (char *)(buf1);
+    res2 = SWIG_ConvertPtr(ST(1),SWIG_as_voidptrptr(&arg2), 0, 0);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_io_write_atomic" "', argument " "2"" of type '" "void const *""'"); 
+    }
+    ecode3 = SWIG_AsVal_unsigned_SS_long SWIG_PERL_CALL_ARGS_2(ST(2), &val3);
+    if (!SWIG_IsOK(ecode3)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "svn_io_write_atomic" "', argument " "3"" of type '" "apr_size_t""'");
+    } 
+    arg3 = (apr_size_t)(val3);
+    res4 = SWIG_AsCharPtrAndSize(ST(3), &buf4, NULL, &alloc4);
+    if (!SWIG_IsOK(res4)) {
+      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "svn_io_write_atomic" "', argument " "4"" of type '" "char const *""'");
+    }
+    arg4 = (char *)(buf4);
+    if (items > 4) {
+      
+    }
+    {
+      result = (svn_error_t *)svn_io_write_atomic((char const *)arg1,(void const *)arg2,arg3,(char const *)arg4,arg5);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+    
+    
+    if (alloc4 == SWIG_NEWOBJ) free((char*)buf4);
+    
+    XSRETURN(argvi);
+  fail:
+    if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+    
+    
+    if (alloc4 == SWIG_NEWOBJ) free((char*)buf4);
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_svn_io_write_unique) {
   {
     char **arg1 = (char **) 0 ;
@@ -32589,6 +33889,7 @@ XS(_wrap_svn_io_write_unique) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 4) || (items > 5)) {
@@ -32678,6 +33979,7 @@ XS(_wrap_svn_io_file_trunc) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_io_file_trunc(file,offset,pool);");
@@ -32789,6 +34091,7 @@ XS(_wrap_svn_io_file_name_get) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 2)) {
@@ -32864,9 +34167,11 @@ XS(_wrap_svn_io_file_readline) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     arg3 = &temp3;
@@ -33226,6 +34531,7 @@ XS(_wrap_svn_stream_invoke_mark_fn) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg3 = &temp3;
     if ((items < 2) || (items > 3)) {
@@ -33355,6 +34661,73 @@ XS(_wrap_svn_stream_invoke_seek_fn) {
 }
 
 
+XS(_wrap_svn_stream_invoke_data_available_fn) {
+  {
+    svn_stream_data_available_fn_t arg1 = (svn_stream_data_available_fn_t) 0 ;
+    void *arg2 = (void *) 0 ;
+    svn_boolean_t *arg3 = (svn_boolean_t *) 0 ;
+    int res2 ;
+    svn_boolean_t temp3 ;
+    int res3 = SWIG_TMPOBJ ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    arg3 = &temp3;
+    if ((items < 2) || (items > 2)) {
+      SWIG_croak("Usage: svn_stream_invoke_data_available_fn(_obj,baton);");
+    }
+    {
+      int res = SWIG_ConvertFunctionPtr(ST(0), (void**)(&arg1), SWIGTYPE_p_f_p_void_p_svn_boolean_t__p_svn_error_t);
+      if (!SWIG_IsOK(res)) {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_stream_invoke_data_available_fn" "', argument " "1"" of type '" "svn_stream_data_available_fn_t""'"); 
+      }
+    }
+    res2 = SWIG_ConvertPtr(ST(1),SWIG_as_voidptrptr(&arg2), 0, 0);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_stream_invoke_data_available_fn" "', argument " "2"" of type '" "void *""'"); 
+    }
+    {
+      result = (svn_error_t *)svn_stream_invoke_data_available_fn(arg1,arg2,arg3);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    if (SWIG_IsTmpObj(res3)) {
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((*arg3)); argvi++  ;
+    } else {
+      int new_flags = SWIG_IsNewObj(res3) ? (SWIG_POINTER_OWN | 0) : 0;
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, new_flags); argvi++  ;
+    }
+    
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_svn_stream_invoke_lazyopen_func) {
   {
     svn_stream_lazyopen_func_t arg1 = (svn_stream_lazyopen_func_t) 0 ;
@@ -33371,9 +34744,11 @@ XS(_wrap_svn_stream_invoke_lazyopen_func) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     if ((items < 2) || (items > 4)) {
@@ -33418,7 +34793,11 @@ XS(_wrap_svn_stream_invoke_lazyopen_func) {
       }
     }
     {
-      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = svn_swig_pl_from_stream(*arg2); argvi++  ;
+      SV *tmp;
+      PUTBACK;
+      tmp = svn_swig_pl_from_stream(*arg2);
+      SPAGAIN;
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = tmp; argvi++  ;
     }
     
     
@@ -33457,6 +34836,7 @@ XS(_wrap_svn_io_invoke_walk_func) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_io_invoke_walk_func(_obj,baton,path,finfo,pool);");
@@ -33718,6 +35098,7 @@ XS(_wrap_svn_checksum_create) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_checksum_create(kind,pool);");
@@ -33852,6 +35233,7 @@ XS(_wrap_svn_checksum_dup) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_checksum_dup(checksum,pool);");
@@ -33895,6 +35277,7 @@ XS(_wrap_svn_checksum_to_cstring_display) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_checksum_to_cstring_display(checksum,pool);");
@@ -33938,6 +35321,7 @@ XS(_wrap_svn_checksum_to_cstring) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_checksum_to_cstring(checksum,pool);");
@@ -33982,9 +35366,11 @@ XS(_wrap_svn_checksum_serialize) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 3)) {
       SWIG_croak("Usage: svn_checksum_serialize(checksum,result_pool,scratch_pool);");
@@ -34037,9 +35423,11 @@ XS(_wrap_svn_checksum_deserialize) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 3)) {
@@ -34121,6 +35509,7 @@ XS(_wrap_svn_checksum_parse_hex) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -34205,6 +35594,7 @@ XS(_wrap_svn_checksum) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 3) || (items > 4)) {
@@ -34288,6 +35678,7 @@ XS(_wrap_svn_checksum_empty_checksum) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_checksum_empty_checksum(kind,pool);");
@@ -34331,6 +35722,7 @@ XS(_wrap_svn_checksum_ctx_create) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_checksum_ctx_create(kind,pool);");
@@ -34442,6 +35834,7 @@ XS(_wrap_svn_checksum_final) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 2)) {
@@ -34586,6 +35979,7 @@ XS(_wrap_svn_checksum_mismatch_err) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if (items < 2) {
       SWIG_croak("Usage: svn_checksum_mismatch_err(expected,actual,scratch_pool,fmt,...);");
@@ -34726,6 +36120,7 @@ XS(_wrap_svn_md5_digest_to_cstring_display) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_md5_digest_to_cstring_display(digest,pool);");
@@ -34768,6 +36163,7 @@ XS(_wrap_svn_md5_digest_to_cstring) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_md5_digest_to_cstring(digest,pool);");
@@ -35759,6 +37155,7 @@ XS(_wrap_svn_diff_diff_2) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -35833,6 +37230,7 @@ XS(_wrap_svn_diff_diff) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -35907,6 +37305,7 @@ XS(_wrap_svn_diff_diff3_2) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -35981,6 +37380,7 @@ XS(_wrap_svn_diff_diff3) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -36055,6 +37455,7 @@ XS(_wrap_svn_diff_diff4_2) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -36129,6 +37530,7 @@ XS(_wrap_svn_diff_diff4) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -36627,6 +38029,78 @@ XS(_wrap_delete_svn_diff_output_fns_t) {
 }
 
 
+XS(_wrap_svn_diff_output2) {
+  {
+    svn_diff_t *arg1 = (svn_diff_t *) 0 ;
+    void *arg2 = (void *) 0 ;
+    svn_diff_output_fns_t *arg3 = (svn_diff_output_fns_t *) 0 ;
+    svn_cancel_func_t arg4 = (svn_cancel_func_t) 0 ;
+    void *arg5 = (void *) 0 ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    int res2 ;
+    void *argp3 = 0 ;
+    int res3 = 0 ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    if ((items < 4) || (items > 4)) {
+      SWIG_croak("Usage: svn_diff_output2(diff,output_baton,output_fns,cancel_func,cancel_baton);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_diff_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_diff_output2" "', argument " "1"" of type '" "svn_diff_t *""'"); 
+    }
+    arg1 = (svn_diff_t *)(argp1);
+    res2 = SWIG_ConvertPtr(ST(1),SWIG_as_voidptrptr(&arg2), 0, 0);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_diff_output2" "', argument " "2"" of type '" "void *""'"); 
+    }
+    res3 = SWIG_ConvertPtr(ST(2), &argp3,SWIGTYPE_p_svn_diff_output_fns_t, 0 |  0 );
+    if (!SWIG_IsOK(res3)) {
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_diff_output2" "', argument " "3"" of type '" "svn_diff_output_fns_t const *""'"); 
+    }
+    arg3 = (svn_diff_output_fns_t *)(argp3);
+    {
+      arg4 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg5 = ST(3);
+    }
+    {
+      result = (svn_error_t *)svn_diff_output2(arg1,arg2,(struct svn_diff_output_fns_t const *)arg3,arg4,arg5);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_svn_diff_output) {
   {
     svn_diff_t *arg1 = (svn_diff_t *) 0 ;
@@ -36888,6 +38362,71 @@ XS(_wrap_svn_diff_file_options_t_show_c_function_get) {
 }
 
 
+XS(_wrap_svn_diff_file_options_t_context_size_set) {
+  {
+    struct svn_diff_file_options_t *arg1 = (struct svn_diff_file_options_t *) 0 ;
+    int arg2 ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    int val2 ;
+    int ecode2 = 0 ;
+    int argvi = 0;
+    dXSARGS;
+    
+    if ((items < 2) || (items > 2)) {
+      SWIG_croak("Usage: svn_diff_file_options_t_context_size_set(self,context_size);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_diff_file_options_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_diff_file_options_t_context_size_set" "', argument " "1"" of type '" "struct svn_diff_file_options_t *""'"); 
+    }
+    arg1 = (struct svn_diff_file_options_t *)(argp1);
+    ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
+    if (!SWIG_IsOK(ecode2)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "svn_diff_file_options_t_context_size_set" "', argument " "2"" of type '" "int""'");
+    } 
+    arg2 = (int)(val2);
+    if (arg1) (arg1)->context_size = arg2;
+    ST(argvi) = sv_newmortal();
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_svn_diff_file_options_t_context_size_get) {
+  {
+    struct svn_diff_file_options_t *arg1 = (struct svn_diff_file_options_t *) 0 ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    int argvi = 0;
+    int result;
+    dXSARGS;
+    
+    if ((items < 1) || (items > 1)) {
+      SWIG_croak("Usage: svn_diff_file_options_t_context_size_get(self);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_diff_file_options_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_diff_file_options_t_context_size_get" "', argument " "1"" of type '" "struct svn_diff_file_options_t *""'"); 
+    }
+    arg1 = (struct svn_diff_file_options_t *)(argp1);
+    result = (int) ((arg1)->context_size);
+    ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
+    
+    XSRETURN(argvi);
+  fail:
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_new_svn_diff_file_options_t) {
   {
     int argvi = 0;
@@ -36953,6 +38492,7 @@ XS(_wrap_svn_diff_file_options_create) {
     
     {
       _global_pool = arg1 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 0) || (items > 1)) {
       SWIG_croak("Usage: svn_diff_file_options_create(pool);");
@@ -36990,6 +38530,7 @@ XS(_wrap_svn_diff_file_options_parse) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_diff_file_options_parse(options,args,pool);");
@@ -37000,7 +38541,7 @@ XS(_wrap_svn_diff_file_options_parse) {
     }
     arg1 = (svn_diff_file_options_t *)(argp1);
     {
-      arg2 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(1),
+      arg2 = svn_swig_pl_strings_to_array(ST(1),
         _global_pool);
     }
     if (items > 2) {
@@ -37064,6 +38605,7 @@ XS(_wrap_svn_diff_file_diff_2) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 3) || (items > 4)) {
@@ -37149,6 +38691,7 @@ XS(_wrap_svn_diff_file_diff) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -37234,6 +38777,7 @@ XS(_wrap_svn_diff_file_diff3_2) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 4) || (items > 5)) {
@@ -37330,6 +38874,7 @@ XS(_wrap_svn_diff_file_diff3) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 3) || (items > 4)) {
@@ -37426,6 +38971,7 @@ XS(_wrap_svn_diff_file_diff4_2) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 5) || (items > 6)) {
@@ -37533,6 +39079,7 @@ XS(_wrap_svn_diff_file_diff4) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 4) || (items > 5)) {
@@ -37605,6 +39152,164 @@ XS(_wrap_svn_diff_file_diff4) {
 }
 
 
+XS(_wrap_svn_diff_file_output_unified4) {
+  {
+    svn_stream_t *arg1 = (svn_stream_t *) 0 ;
+    svn_diff_t *arg2 = (svn_diff_t *) 0 ;
+    char *arg3 = (char *) 0 ;
+    char *arg4 = (char *) 0 ;
+    char *arg5 = (char *) 0 ;
+    char *arg6 = (char *) 0 ;
+    char *arg7 = (char *) 0 ;
+    char *arg8 = (char *) 0 ;
+    svn_boolean_t arg9 ;
+    int arg10 ;
+    svn_cancel_func_t arg11 = (svn_cancel_func_t) 0 ;
+    void *arg12 = (void *) 0 ;
+    apr_pool_t *arg13 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    void *argp2 = 0 ;
+    int res2 = 0 ;
+    int res3 ;
+    char *buf3 = 0 ;
+    int alloc3 = 0 ;
+    int res4 ;
+    char *buf4 = 0 ;
+    int alloc4 = 0 ;
+    int res5 ;
+    char *buf5 = 0 ;
+    int alloc5 = 0 ;
+    int res6 ;
+    char *buf6 = 0 ;
+    int alloc6 = 0 ;
+    int res7 ;
+    char *buf7 = 0 ;
+    int alloc7 = 0 ;
+    int res8 ;
+    char *buf8 = 0 ;
+    int alloc8 = 0 ;
+    int val9 ;
+    int ecode9 = 0 ;
+    int val10 ;
+    int ecode10 = 0 ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg13 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    if ((items < 11) || (items > 12)) {
+      SWIG_croak("Usage: svn_diff_file_output_unified4(output_stream,diff,original_path,modified_path,original_header,modified_header,header_encoding,relative_to_dir,show_c_function,context_size,cancel_func,cancel_baton,scratch_pool);");
+    }
+    {
+      svn_swig_pl_make_stream (&arg1, ST(0));
+      SPAGAIN;
+    }
+    res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_svn_diff_t, 0 |  0 );
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_diff_file_output_unified4" "', argument " "2"" of type '" "svn_diff_t *""'"); 
+    }
+    arg2 = (svn_diff_t *)(argp2);
+    res3 = SWIG_AsCharPtrAndSize(ST(2), &buf3, NULL, &alloc3);
+    if (!SWIG_IsOK(res3)) {
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_diff_file_output_unified4" "', argument " "3"" of type '" "char const *""'");
+    }
+    arg3 = (char *)(buf3);
+    res4 = SWIG_AsCharPtrAndSize(ST(3), &buf4, NULL, &alloc4);
+    if (!SWIG_IsOK(res4)) {
+      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "svn_diff_file_output_unified4" "', argument " "4"" of type '" "char const *""'");
+    }
+    arg4 = (char *)(buf4);
+    res5 = SWIG_AsCharPtrAndSize(ST(4), &buf5, NULL, &alloc5);
+    if (!SWIG_IsOK(res5)) {
+      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "svn_diff_file_output_unified4" "', argument " "5"" of type '" "char const *""'");
+    }
+    arg5 = (char *)(buf5);
+    res6 = SWIG_AsCharPtrAndSize(ST(5), &buf6, NULL, &alloc6);
+    if (!SWIG_IsOK(res6)) {
+      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "svn_diff_file_output_unified4" "', argument " "6"" of type '" "char const *""'");
+    }
+    arg6 = (char *)(buf6);
+    res7 = SWIG_AsCharPtrAndSize(ST(6), &buf7, NULL, &alloc7);
+    if (!SWIG_IsOK(res7)) {
+      SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "svn_diff_file_output_unified4" "', argument " "7"" of type '" "char const *""'");
+    }
+    arg7 = (char *)(buf7);
+    res8 = SWIG_AsCharPtrAndSize(ST(7), &buf8, NULL, &alloc8);
+    if (!SWIG_IsOK(res8)) {
+      SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "svn_diff_file_output_unified4" "', argument " "8"" of type '" "char const *""'");
+    }
+    arg8 = (char *)(buf8);
+    ecode9 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(8), &val9);
+    if (!SWIG_IsOK(ecode9)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode9), "in method '" "svn_diff_file_output_unified4" "', argument " "9"" of type '" "svn_boolean_t""'");
+    } 
+    arg9 = (svn_boolean_t)(val9);
+    ecode10 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(9), &val10);
+    if (!SWIG_IsOK(ecode10)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode10), "in method '" "svn_diff_file_output_unified4" "', argument " "10"" of type '" "int""'");
+    } 
+    arg10 = (int)(val10);
+    {
+      arg11 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg12 = ST(10);
+    }
+    if (items > 11) {
+      
+    }
+    {
+      result = (svn_error_t *)svn_diff_file_output_unified4(arg1,arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,arg9,arg10,arg11,arg12,arg13);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    
+    
+    if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+    if (alloc4 == SWIG_NEWOBJ) free((char*)buf4);
+    if (alloc5 == SWIG_NEWOBJ) free((char*)buf5);
+    if (alloc6 == SWIG_NEWOBJ) free((char*)buf6);
+    if (alloc7 == SWIG_NEWOBJ) free((char*)buf7);
+    if (alloc8 == SWIG_NEWOBJ) free((char*)buf8);
+    
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+    if (alloc4 == SWIG_NEWOBJ) free((char*)buf4);
+    if (alloc5 == SWIG_NEWOBJ) free((char*)buf5);
+    if (alloc6 == SWIG_NEWOBJ) free((char*)buf6);
+    if (alloc7 == SWIG_NEWOBJ) free((char*)buf7);
+    if (alloc8 == SWIG_NEWOBJ) free((char*)buf8);
+    
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_svn_diff_file_output_unified3) {
   {
     svn_stream_t *arg1 = (svn_stream_t *) 0 ;
@@ -37646,12 +39351,14 @@ XS(_wrap_svn_diff_file_output_unified3) {
     
     {
       _global_pool = arg10 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 9) || (items > 10)) {
       SWIG_croak("Usage: svn_diff_file_output_unified3(output_stream,diff,original_path,modified_path,original_header,modified_header,header_encoding,relative_to_dir,show_c_function,pool);");
     }
     {
       svn_swig_pl_make_stream (&arg1, ST(0));
+      SPAGAIN;
     }
     res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_svn_diff_t, 0 |  0 );
     if (!SWIG_IsOK(res2)) {
@@ -37779,12 +39486,14 @@ XS(_wrap_svn_diff_file_output_unified2) {
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 7) || (items > 8)) {
       SWIG_croak("Usage: svn_diff_file_output_unified2(output_stream,diff,original_path,modified_path,original_header,modified_header,header_encoding,pool);");
     }
     {
       svn_swig_pl_make_stream (&arg1, ST(0));
+      SPAGAIN;
     }
     res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_svn_diff_t, 0 |  0 );
     if (!SWIG_IsOK(res2)) {
@@ -37894,12 +39603,14 @@ XS(_wrap_svn_diff_file_output_unified) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 6) || (items > 7)) {
       SWIG_croak("Usage: svn_diff_file_output_unified(output_stream,diff,original_path,modified_path,original_header,modified_header,pool);");
     }
     {
       svn_swig_pl_make_stream (&arg1, ST(0));
+      SPAGAIN;
     }
     res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_svn_diff_t, 0 |  0 );
     if (!SWIG_IsOK(res2)) {
@@ -37972,6 +39683,165 @@ XS(_wrap_svn_diff_file_output_unified) {
 }
 
 
+XS(_wrap_svn_diff_file_output_merge3) {
+  {
+    svn_stream_t *arg1 = (svn_stream_t *) 0 ;
+    svn_diff_t *arg2 = (svn_diff_t *) 0 ;
+    char *arg3 = (char *) 0 ;
+    char *arg4 = (char *) 0 ;
+    char *arg5 = (char *) 0 ;
+    char *arg6 = (char *) 0 ;
+    char *arg7 = (char *) 0 ;
+    char *arg8 = (char *) 0 ;
+    char *arg9 = (char *) 0 ;
+    svn_diff_conflict_display_style_t arg10 ;
+    svn_cancel_func_t arg11 = (svn_cancel_func_t) 0 ;
+    void *arg12 = (void *) 0 ;
+    apr_pool_t *arg13 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    void *argp2 = 0 ;
+    int res2 = 0 ;
+    int res3 ;
+    char *buf3 = 0 ;
+    int alloc3 = 0 ;
+    int res4 ;
+    char *buf4 = 0 ;
+    int alloc4 = 0 ;
+    int res5 ;
+    char *buf5 = 0 ;
+    int alloc5 = 0 ;
+    int res6 ;
+    char *buf6 = 0 ;
+    int alloc6 = 0 ;
+    int res7 ;
+    char *buf7 = 0 ;
+    int alloc7 = 0 ;
+    int res8 ;
+    char *buf8 = 0 ;
+    int alloc8 = 0 ;
+    int res9 ;
+    char *buf9 = 0 ;
+    int alloc9 = 0 ;
+    int val10 ;
+    int ecode10 = 0 ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg13 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    if ((items < 11) || (items > 12)) {
+      SWIG_croak("Usage: svn_diff_file_output_merge3(output_stream,diff,original_path,modified_path,latest_path,conflict_original,conflict_modified,conflict_latest,conflict_separator,conflict_style,cancel_func,cancel_baton,scratch_pool);");
+    }
+    {
+      svn_swig_pl_make_stream (&arg1, ST(0));
+      SPAGAIN;
+    }
+    res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_svn_diff_t, 0 |  0 );
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_diff_file_output_merge3" "', argument " "2"" of type '" "svn_diff_t *""'"); 
+    }
+    arg2 = (svn_diff_t *)(argp2);
+    res3 = SWIG_AsCharPtrAndSize(ST(2), &buf3, NULL, &alloc3);
+    if (!SWIG_IsOK(res3)) {
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_diff_file_output_merge3" "', argument " "3"" of type '" "char const *""'");
+    }
+    arg3 = (char *)(buf3);
+    res4 = SWIG_AsCharPtrAndSize(ST(3), &buf4, NULL, &alloc4);
+    if (!SWIG_IsOK(res4)) {
+      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "svn_diff_file_output_merge3" "', argument " "4"" of type '" "char const *""'");
+    }
+    arg4 = (char *)(buf4);
+    res5 = SWIG_AsCharPtrAndSize(ST(4), &buf5, NULL, &alloc5);
+    if (!SWIG_IsOK(res5)) {
+      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "svn_diff_file_output_merge3" "', argument " "5"" of type '" "char const *""'");
+    }
+    arg5 = (char *)(buf5);
+    res6 = SWIG_AsCharPtrAndSize(ST(5), &buf6, NULL, &alloc6);
+    if (!SWIG_IsOK(res6)) {
+      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "svn_diff_file_output_merge3" "', argument " "6"" of type '" "char const *""'");
+    }
+    arg6 = (char *)(buf6);
+    res7 = SWIG_AsCharPtrAndSize(ST(6), &buf7, NULL, &alloc7);
+    if (!SWIG_IsOK(res7)) {
+      SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "svn_diff_file_output_merge3" "', argument " "7"" of type '" "char const *""'");
+    }
+    arg7 = (char *)(buf7);
+    res8 = SWIG_AsCharPtrAndSize(ST(7), &buf8, NULL, &alloc8);
+    if (!SWIG_IsOK(res8)) {
+      SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "svn_diff_file_output_merge3" "', argument " "8"" of type '" "char const *""'");
+    }
+    arg8 = (char *)(buf8);
+    res9 = SWIG_AsCharPtrAndSize(ST(8), &buf9, NULL, &alloc9);
+    if (!SWIG_IsOK(res9)) {
+      SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "svn_diff_file_output_merge3" "', argument " "9"" of type '" "char const *""'");
+    }
+    arg9 = (char *)(buf9);
+    ecode10 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(9), &val10);
+    if (!SWIG_IsOK(ecode10)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode10), "in method '" "svn_diff_file_output_merge3" "', argument " "10"" of type '" "svn_diff_conflict_display_style_t""'");
+    } 
+    arg10 = (svn_diff_conflict_display_style_t)(val10);
+    {
+      arg11 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg12 = ST(10);
+    }
+    if (items > 11) {
+      
+    }
+    {
+      result = (svn_error_t *)svn_diff_file_output_merge3(arg1,arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,(char const *)arg9,arg10,arg11,arg12,arg13);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    
+    
+    if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+    if (alloc4 == SWIG_NEWOBJ) free((char*)buf4);
+    if (alloc5 == SWIG_NEWOBJ) free((char*)buf5);
+    if (alloc6 == SWIG_NEWOBJ) free((char*)buf6);
+    if (alloc7 == SWIG_NEWOBJ) free((char*)buf7);
+    if (alloc8 == SWIG_NEWOBJ) free((char*)buf8);
+    if (alloc9 == SWIG_NEWOBJ) free((char*)buf9);
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+    if (alloc4 == SWIG_NEWOBJ) free((char*)buf4);
+    if (alloc5 == SWIG_NEWOBJ) free((char*)buf5);
+    if (alloc6 == SWIG_NEWOBJ) free((char*)buf6);
+    if (alloc7 == SWIG_NEWOBJ) free((char*)buf7);
+    if (alloc8 == SWIG_NEWOBJ) free((char*)buf8);
+    if (alloc9 == SWIG_NEWOBJ) free((char*)buf9);
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_svn_diff_file_output_merge2) {
   {
     svn_stream_t *arg1 = (svn_stream_t *) 0 ;
@@ -38017,12 +39887,14 @@ XS(_wrap_svn_diff_file_output_merge2) {
     
     {
       _global_pool = arg11 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 10) || (items > 11)) {
       SWIG_croak("Usage: svn_diff_file_output_merge2(output_stream,diff,original_path,modified_path,latest_path,conflict_original,conflict_modified,conflict_latest,conflict_separator,conflict_style,pool);");
     }
     {
       svn_swig_pl_make_stream (&arg1, ST(0));
+      SPAGAIN;
     }
     res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_svn_diff_t, 0 |  0 );
     if (!SWIG_IsOK(res2)) {
@@ -38171,12 +40043,14 @@ XS(_wrap_svn_diff_file_output_merge) {
     
     {
       _global_pool = arg12 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 11) || (items > 12)) {
       SWIG_croak("Usage: svn_diff_file_output_merge(output_stream,diff,original_path,modified_path,latest_path,conflict_original,conflict_modified,conflict_latest,conflict_separator,display_original_in_conflict,display_resolved_conflicts,pool);");
     }
     {
       svn_swig_pl_make_stream (&arg1, ST(0));
+      SPAGAIN;
     }
     res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_svn_diff_t, 0 |  0 );
     if (!SWIG_IsOK(res2)) {
@@ -38284,6 +40158,82 @@ XS(_wrap_svn_diff_file_output_merge) {
 }
 
 
+XS(_wrap_svn_diff_output_binary) {
+  {
+    svn_stream_t *arg1 = (svn_stream_t *) 0 ;
+    svn_stream_t *arg2 = (svn_stream_t *) 0 ;
+    svn_stream_t *arg3 = (svn_stream_t *) 0 ;
+    svn_cancel_func_t arg4 = (svn_cancel_func_t) 0 ;
+    void *arg5 = (void *) 0 ;
+    apr_pool_t *arg6 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    if ((items < 4) || (items > 5)) {
+      SWIG_croak("Usage: svn_diff_output_binary(output_stream,original,latest,cancel_func,cancel_baton,scratch_pool);");
+    }
+    {
+      svn_swig_pl_make_stream (&arg1, ST(0));
+      SPAGAIN;
+    }
+    {
+      svn_swig_pl_make_stream (&arg2, ST(1));
+      SPAGAIN;
+    }
+    {
+      svn_swig_pl_make_stream (&arg3, ST(2));
+      SPAGAIN;
+    }
+    {
+      arg4 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg5 = ST(3);
+    }
+    if (items > 4) {
+      
+    }
+    {
+      result = (svn_error_t *)svn_diff_output_binary(arg1,arg2,arg3,arg4,arg5,arg6);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    
+    
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_svn_diff_mem_string_diff) {
   {
     svn_diff_t **arg1 = (svn_diff_t **) 0 ;
@@ -38303,6 +40253,7 @@ XS(_wrap_svn_diff_mem_string_diff) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 3) || (items > 4)) {
@@ -38397,6 +40348,7 @@ XS(_wrap_svn_diff_mem_string_diff3) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 4) || (items > 5)) {
@@ -38504,6 +40456,7 @@ XS(_wrap_svn_diff_mem_string_diff4) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 5) || (items > 6)) {
@@ -38599,6 +40552,168 @@ XS(_wrap_svn_diff_mem_string_diff4) {
 }
 
 
+XS(_wrap_svn_diff_mem_string_output_unified3) {
+  {
+    svn_stream_t *arg1 = (svn_stream_t *) 0 ;
+    svn_diff_t *arg2 = (svn_diff_t *) 0 ;
+    svn_boolean_t arg3 ;
+    char *arg4 = (char *) 0 ;
+    char *arg5 = (char *) 0 ;
+    char *arg6 = (char *) 0 ;
+    char *arg7 = (char *) 0 ;
+    svn_string_t *arg8 = (svn_string_t *) 0 ;
+    svn_string_t *arg9 = (svn_string_t *) 0 ;
+    int arg10 ;
+    svn_cancel_func_t arg11 = (svn_cancel_func_t) 0 ;
+    void *arg12 = (void *) 0 ;
+    apr_pool_t *arg13 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    void *argp2 = 0 ;
+    int res2 = 0 ;
+    int val3 ;
+    int ecode3 = 0 ;
+    int res4 ;
+    char *buf4 = 0 ;
+    int alloc4 = 0 ;
+    int res5 ;
+    char *buf5 = 0 ;
+    int alloc5 = 0 ;
+    int res6 ;
+    char *buf6 = 0 ;
+    int alloc6 = 0 ;
+    int res7 ;
+    char *buf7 = 0 ;
+    int alloc7 = 0 ;
+    svn_string_t value8 ;
+    svn_string_t value9 ;
+    int val10 ;
+    int ecode10 = 0 ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg13 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    if ((items < 11) || (items > 12)) {
+      SWIG_croak("Usage: svn_diff_mem_string_output_unified3(output_stream,diff,with_diff_header,hunk_delimiter,original_header,modified_header,header_encoding,original,modified,context_size,cancel_func,cancel_baton,scratch_pool);");
+    }
+    {
+      svn_swig_pl_make_stream (&arg1, ST(0));
+      SPAGAIN;
+    }
+    res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_svn_diff_t, 0 |  0 );
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_diff_mem_string_output_unified3" "', argument " "2"" of type '" "svn_diff_t *""'"); 
+    }
+    arg2 = (svn_diff_t *)(argp2);
+    ecode3 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(2), &val3);
+    if (!SWIG_IsOK(ecode3)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "svn_diff_mem_string_output_unified3" "', argument " "3"" of type '" "svn_boolean_t""'");
+    } 
+    arg3 = (svn_boolean_t)(val3);
+    res4 = SWIG_AsCharPtrAndSize(ST(3), &buf4, NULL, &alloc4);
+    if (!SWIG_IsOK(res4)) {
+      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "svn_diff_mem_string_output_unified3" "', argument " "4"" of type '" "char const *""'");
+    }
+    arg4 = (char *)(buf4);
+    res5 = SWIG_AsCharPtrAndSize(ST(4), &buf5, NULL, &alloc5);
+    if (!SWIG_IsOK(res5)) {
+      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "svn_diff_mem_string_output_unified3" "', argument " "5"" of type '" "char const *""'");
+    }
+    arg5 = (char *)(buf5);
+    res6 = SWIG_AsCharPtrAndSize(ST(5), &buf6, NULL, &alloc6);
+    if (!SWIG_IsOK(res6)) {
+      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "svn_diff_mem_string_output_unified3" "', argument " "6"" of type '" "char const *""'");
+    }
+    arg6 = (char *)(buf6);
+    res7 = SWIG_AsCharPtrAndSize(ST(6), &buf7, NULL, &alloc7);
+    if (!SWIG_IsOK(res7)) {
+      SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "svn_diff_mem_string_output_unified3" "', argument " "7"" of type '" "char const *""'");
+    }
+    arg7 = (char *)(buf7);
+    {
+      if (SvOK(ST(7))) {
+        value8.data = SvPV(ST(7), value8.len);
+        arg8 = &value8;
+      }
+      else {
+        arg8 = NULL;
+      }
+    }
+    {
+      if (SvOK(ST(8))) {
+        value9.data = SvPV(ST(8), value9.len);
+        arg9 = &value9;
+      }
+      else {
+        arg9 = NULL;
+      }
+    }
+    ecode10 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(9), &val10);
+    if (!SWIG_IsOK(ecode10)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode10), "in method '" "svn_diff_mem_string_output_unified3" "', argument " "10"" of type '" "int""'");
+    } 
+    arg10 = (int)(val10);
+    {
+      arg11 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg12 = ST(10);
+    }
+    if (items > 11) {
+      
+    }
+    {
+      result = (svn_error_t *)svn_diff_mem_string_output_unified3(arg1,arg2,arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(struct svn_string_t const *)arg8,(struct svn_string_t const *)arg9,arg10,arg11,arg12,arg13);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    
+    
+    
+    if (alloc4 == SWIG_NEWOBJ) free((char*)buf4);
+    if (alloc5 == SWIG_NEWOBJ) free((char*)buf5);
+    if (alloc6 == SWIG_NEWOBJ) free((char*)buf6);
+    if (alloc7 == SWIG_NEWOBJ) free((char*)buf7);
+    
+    
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    
+    if (alloc4 == SWIG_NEWOBJ) free((char*)buf4);
+    if (alloc5 == SWIG_NEWOBJ) free((char*)buf5);
+    if (alloc6 == SWIG_NEWOBJ) free((char*)buf6);
+    if (alloc7 == SWIG_NEWOBJ) free((char*)buf7);
+    
+    
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_svn_diff_mem_string_output_unified2) {
   {
     svn_stream_t *arg1 = (svn_stream_t *) 0 ;
@@ -38636,12 +40751,14 @@ XS(_wrap_svn_diff_mem_string_output_unified2) {
     
     {
       _global_pool = arg10 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 9) || (items > 10)) {
       SWIG_croak("Usage: svn_diff_mem_string_output_unified2(output_stream,diff,with_diff_header,hunk_delimiter,original_header,modified_header,header_encoding,original,modified,pool);");
     }
     {
       svn_swig_pl_make_stream (&arg1, ST(0));
+      SPAGAIN;
     }
     res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_svn_diff_t, 0 |  0 );
     if (!SWIG_IsOK(res2)) {
@@ -38773,12 +40890,14 @@ XS(_wrap_svn_diff_mem_string_output_unified) {
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 7) || (items > 8)) {
       SWIG_croak("Usage: svn_diff_mem_string_output_unified(output_stream,diff,original_header,modified_header,header_encoding,original,modified,pool);");
     }
     {
       svn_swig_pl_make_stream (&arg1, ST(0));
+      SPAGAIN;
     }
     res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_svn_diff_t, 0 |  0 );
     if (!SWIG_IsOK(res2)) {
@@ -38866,6 +40985,171 @@ XS(_wrap_svn_diff_mem_string_output_unified) {
 }
 
 
+XS(_wrap_svn_diff_mem_string_output_merge3) {
+  {
+    svn_stream_t *arg1 = (svn_stream_t *) 0 ;
+    svn_diff_t *arg2 = (svn_diff_t *) 0 ;
+    svn_string_t *arg3 = (svn_string_t *) 0 ;
+    svn_string_t *arg4 = (svn_string_t *) 0 ;
+    svn_string_t *arg5 = (svn_string_t *) 0 ;
+    char *arg6 = (char *) 0 ;
+    char *arg7 = (char *) 0 ;
+    char *arg8 = (char *) 0 ;
+    char *arg9 = (char *) 0 ;
+    svn_diff_conflict_display_style_t arg10 ;
+    svn_cancel_func_t arg11 = (svn_cancel_func_t) 0 ;
+    void *arg12 = (void *) 0 ;
+    apr_pool_t *arg13 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    void *argp2 = 0 ;
+    int res2 = 0 ;
+    svn_string_t value3 ;
+    svn_string_t value4 ;
+    svn_string_t value5 ;
+    int res6 ;
+    char *buf6 = 0 ;
+    int alloc6 = 0 ;
+    int res7 ;
+    char *buf7 = 0 ;
+    int alloc7 = 0 ;
+    int res8 ;
+    char *buf8 = 0 ;
+    int alloc8 = 0 ;
+    int res9 ;
+    char *buf9 = 0 ;
+    int alloc9 = 0 ;
+    int val10 ;
+    int ecode10 = 0 ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg13 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    if ((items < 11) || (items > 12)) {
+      SWIG_croak("Usage: svn_diff_mem_string_output_merge3(output_stream,diff,original,modified,latest,conflict_original,conflict_modified,conflict_latest,conflict_separator,style,cancel_func,cancel_baton,scratch_pool);");
+    }
+    {
+      svn_swig_pl_make_stream (&arg1, ST(0));
+      SPAGAIN;
+    }
+    res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_svn_diff_t, 0 |  0 );
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_diff_mem_string_output_merge3" "', argument " "2"" of type '" "svn_diff_t *""'"); 
+    }
+    arg2 = (svn_diff_t *)(argp2);
+    {
+      if (SvOK(ST(2))) {
+        value3.data = SvPV(ST(2), value3.len);
+        arg3 = &value3;
+      }
+      else {
+        arg3 = NULL;
+      }
+    }
+    {
+      if (SvOK(ST(3))) {
+        value4.data = SvPV(ST(3), value4.len);
+        arg4 = &value4;
+      }
+      else {
+        arg4 = NULL;
+      }
+    }
+    {
+      if (SvOK(ST(4))) {
+        value5.data = SvPV(ST(4), value5.len);
+        arg5 = &value5;
+      }
+      else {
+        arg5 = NULL;
+      }
+    }
+    res6 = SWIG_AsCharPtrAndSize(ST(5), &buf6, NULL, &alloc6);
+    if (!SWIG_IsOK(res6)) {
+      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "svn_diff_mem_string_output_merge3" "', argument " "6"" of type '" "char const *""'");
+    }
+    arg6 = (char *)(buf6);
+    res7 = SWIG_AsCharPtrAndSize(ST(6), &buf7, NULL, &alloc7);
+    if (!SWIG_IsOK(res7)) {
+      SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "svn_diff_mem_string_output_merge3" "', argument " "7"" of type '" "char const *""'");
+    }
+    arg7 = (char *)(buf7);
+    res8 = SWIG_AsCharPtrAndSize(ST(7), &buf8, NULL, &alloc8);
+    if (!SWIG_IsOK(res8)) {
+      SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "svn_diff_mem_string_output_merge3" "', argument " "8"" of type '" "char const *""'");
+    }
+    arg8 = (char *)(buf8);
+    res9 = SWIG_AsCharPtrAndSize(ST(8), &buf9, NULL, &alloc9);
+    if (!SWIG_IsOK(res9)) {
+      SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "svn_diff_mem_string_output_merge3" "', argument " "9"" of type '" "char const *""'");
+    }
+    arg9 = (char *)(buf9);
+    ecode10 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(9), &val10);
+    if (!SWIG_IsOK(ecode10)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode10), "in method '" "svn_diff_mem_string_output_merge3" "', argument " "10"" of type '" "svn_diff_conflict_display_style_t""'");
+    } 
+    arg10 = (svn_diff_conflict_display_style_t)(val10);
+    {
+      arg11 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg12 = ST(10);
+    }
+    if (items > 11) {
+      
+    }
+    {
+      result = (svn_error_t *)svn_diff_mem_string_output_merge3(arg1,arg2,(struct svn_string_t const *)arg3,(struct svn_string_t const *)arg4,(struct svn_string_t const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,(char const *)arg9,arg10,arg11,arg12,arg13);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    
+    
+    
+    
+    
+    if (alloc6 == SWIG_NEWOBJ) free((char*)buf6);
+    if (alloc7 == SWIG_NEWOBJ) free((char*)buf7);
+    if (alloc8 == SWIG_NEWOBJ) free((char*)buf8);
+    if (alloc9 == SWIG_NEWOBJ) free((char*)buf9);
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    
+    
+    
+    if (alloc6 == SWIG_NEWOBJ) free((char*)buf6);
+    if (alloc7 == SWIG_NEWOBJ) free((char*)buf7);
+    if (alloc8 == SWIG_NEWOBJ) free((char*)buf8);
+    if (alloc9 == SWIG_NEWOBJ) free((char*)buf9);
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_svn_diff_mem_string_output_merge2) {
   {
     svn_stream_t *arg1 = (svn_stream_t *) 0 ;
@@ -38905,12 +41189,14 @@ XS(_wrap_svn_diff_mem_string_output_merge2) {
     
     {
       _global_pool = arg11 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 10) || (items > 11)) {
       SWIG_croak("Usage: svn_diff_mem_string_output_merge2(output_stream,diff,original,modified,latest,conflict_original,conflict_modified,conflict_latest,conflict_separator,style,pool);");
     }
     {
       svn_swig_pl_make_stream (&arg1, ST(0));
+      SPAGAIN;
     }
     res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_svn_diff_t, 0 |  0 );
     if (!SWIG_IsOK(res2)) {
@@ -39065,12 +41351,14 @@ XS(_wrap_svn_diff_mem_string_output_merge) {
     
     {
       _global_pool = arg12 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 11) || (items > 12)) {
       SWIG_croak("Usage: svn_diff_mem_string_output_merge(output_stream,diff,original,modified,latest,conflict_original,conflict_modified,conflict_latest,conflict_separator,display_original_in_conflict,display_resolved_conflicts,pool);");
     }
     {
       svn_swig_pl_make_stream (&arg1, ST(0));
+      SPAGAIN;
     }
     res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_svn_diff_t, 0 |  0 );
     if (!SWIG_IsOK(res2)) {
@@ -39211,9 +41499,11 @@ XS(_wrap_svn_diff_hunk_readline_diff_text) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     arg3 = &temp3;
@@ -39314,9 +41604,11 @@ XS(_wrap_svn_diff_hunk_readline_original_text) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     arg3 = &temp3;
@@ -39417,9 +41709,11 @@ XS(_wrap_svn_diff_hunk_readline_modified_text) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     arg3 = &temp3;
@@ -40457,6 +42751,136 @@ XS(_wrap_svn_patch_t_reverse_get) {
 }
 
 
+XS(_wrap_svn_patch_t_mergeinfo_set) {
+  {
+    struct svn_patch_t *arg1 = (struct svn_patch_t *) 0 ;
+    svn_mergeinfo_t arg2 = (svn_mergeinfo_t) 0 ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    void *argp2 = 0 ;
+    int res2 = 0 ;
+    int argvi = 0;
+    dXSARGS;
+    
+    if ((items < 2) || (items > 2)) {
+      SWIG_croak("Usage: svn_patch_t_mergeinfo_set(self,mergeinfo);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_patch_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_patch_t_mergeinfo_set" "', argument " "1"" of type '" "struct svn_patch_t *""'"); 
+    }
+    arg1 = (struct svn_patch_t *)(argp1);
+    res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_apr_hash_t, SWIG_POINTER_DISOWN |  0 );
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_patch_t_mergeinfo_set" "', argument " "2"" of type '" "svn_mergeinfo_t""'"); 
+    }
+    arg2 = (svn_mergeinfo_t)(argp2);
+    if (arg1) (arg1)->mergeinfo = arg2;
+    ST(argvi) = sv_newmortal();
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_svn_patch_t_mergeinfo_get) {
+  {
+    struct svn_patch_t *arg1 = (struct svn_patch_t *) 0 ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    int argvi = 0;
+    svn_mergeinfo_t result;
+    dXSARGS;
+    
+    if ((items < 1) || (items > 1)) {
+      SWIG_croak("Usage: svn_patch_t_mergeinfo_get(self);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_patch_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_patch_t_mergeinfo_get" "', argument " "1"" of type '" "struct svn_patch_t *""'"); 
+    }
+    arg1 = (struct svn_patch_t *)(argp1);
+    result = (svn_mergeinfo_t) ((arg1)->mergeinfo);
+    ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_apr_hash_t, 0 | 0); argvi++ ;
+    
+    XSRETURN(argvi);
+  fail:
+    
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_svn_patch_t_reverse_mergeinfo_set) {
+  {
+    struct svn_patch_t *arg1 = (struct svn_patch_t *) 0 ;
+    svn_mergeinfo_t arg2 = (svn_mergeinfo_t) 0 ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    void *argp2 = 0 ;
+    int res2 = 0 ;
+    int argvi = 0;
+    dXSARGS;
+    
+    if ((items < 2) || (items > 2)) {
+      SWIG_croak("Usage: svn_patch_t_reverse_mergeinfo_set(self,reverse_mergeinfo);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_patch_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_patch_t_reverse_mergeinfo_set" "', argument " "1"" of type '" "struct svn_patch_t *""'"); 
+    }
+    arg1 = (struct svn_patch_t *)(argp1);
+    res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_apr_hash_t, SWIG_POINTER_DISOWN |  0 );
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_patch_t_reverse_mergeinfo_set" "', argument " "2"" of type '" "svn_mergeinfo_t""'"); 
+    }
+    arg2 = (svn_mergeinfo_t)(argp2);
+    if (arg1) (arg1)->reverse_mergeinfo = arg2;
+    ST(argvi) = sv_newmortal();
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_svn_patch_t_reverse_mergeinfo_get) {
+  {
+    struct svn_patch_t *arg1 = (struct svn_patch_t *) 0 ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    int argvi = 0;
+    svn_mergeinfo_t result;
+    dXSARGS;
+    
+    if ((items < 1) || (items > 1)) {
+      SWIG_croak("Usage: svn_patch_t_reverse_mergeinfo_get(self);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_patch_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_patch_t_reverse_mergeinfo_get" "', argument " "1"" of type '" "struct svn_patch_t *""'"); 
+    }
+    arg1 = (struct svn_patch_t *)(argp1);
+    result = (svn_mergeinfo_t) ((arg1)->reverse_mergeinfo);
+    ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_apr_hash_t, 0 | 0); argvi++ ;
+    
+    XSRETURN(argvi);
+  fail:
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_new_svn_patch_t) {
   {
     int argvi = 0;
@@ -40528,6 +42952,7 @@ XS(_wrap_svn_diff_open_patch_file) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 2)) {
@@ -40601,9 +43026,11 @@ XS(_wrap_svn_diff_parse_next_patch) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 3) || (items > 5)) {
@@ -40687,6 +43114,7 @@ XS(_wrap_svn_diff_close_patch_file) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_diff_close_patch_file(patch_file,scratch_pool);");
@@ -42230,11 +44658,11 @@ XS(_wrap_svn_err_best_message) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_error_t, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_err_best_message" "', argument " "1"" of type '" "svn_error_t *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_err_best_message" "', argument " "1"" of type '" "svn_error_t const *""'"); 
     }
     arg1 = (svn_error_t *)(argp1);
     {
-      result = (char *)svn_err_best_message(arg1,arg2,arg3);
+      result = (char *)svn_err_best_message((struct svn_error_t const *)arg1,arg2,arg3);
       
       
       
@@ -42509,6 +44937,66 @@ XS(_wrap_svn_error_quick_wrap) {
 }
 
 
+XS(_wrap_svn_error_quick_wrapf) {
+  {
+    svn_error_t *arg1 = (svn_error_t *) 0 ;
+    char *arg2 = (char *) 0 ;
+    void *arg3 = 0 ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    int res2 ;
+    char *buf2 = 0 ;
+    int alloc2 = 0 ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    if (items < 2) {
+      SWIG_croak("Usage: svn_error_quick_wrapf(child,fmt,...);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_error_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_error_quick_wrapf" "', argument " "1"" of type '" "svn_error_t *""'"); 
+    }
+    arg1 = (svn_error_t *)(argp1);
+    res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_error_quick_wrapf" "', argument " "2"" of type '" "char const *""'");
+    }
+    arg2 = (char *)(buf2);
+    {
+      result = (svn_error_t *)svn_error_quick_wrapf(arg1,(char const *)arg2,arg3);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    
+    if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+    XSRETURN(argvi);
+  fail:
+    
+    if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_svn_error_compose_create) {
   {
     svn_error_t *arg1 = (svn_error_t *) 0 ;
@@ -42729,11 +45217,11 @@ XS(_wrap_svn_error_dup) {
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_error_t, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_error_dup" "', argument " "1"" of type '" "svn_error_t *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_error_dup" "', argument " "1"" of type '" "svn_error_t const *""'"); 
     }
     arg1 = (svn_error_t *)(argp1);
     {
-      result = (svn_error_t *)svn_error_dup(arg1);
+      result = (svn_error_t *)svn_error_dup((struct svn_error_t const *)arg1);
       
       
       
@@ -42923,7 +45411,7 @@ XS(_wrap_svn_handle_warning2) {
     }
     res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_svn_error_t, 0 |  0 );
     if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_handle_warning2" "', argument " "2"" of type '" "svn_error_t *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_handle_warning2" "', argument " "2"" of type '" "svn_error_t const *""'"); 
     }
     arg2 = (svn_error_t *)(argp2);
     res3 = SWIG_AsCharPtrAndSize(ST(2), &buf3, NULL, &alloc3);
@@ -42932,7 +45420,7 @@ XS(_wrap_svn_handle_warning2) {
     }
     arg3 = (char *)(buf3);
     {
-      svn_handle_warning2(arg1,arg2,(char const *)arg3);
+      svn_handle_warning2(arg1,(struct svn_error_t const *)arg2,(char const *)arg3);
       
       
       
@@ -43149,6 +45637,29 @@ XS(_wrap_svn_error_set_malfunction_handler) {
 }
 
 
+XS(_wrap_svn_error_get_malfunction_handler) {
+  {
+    int argvi = 0;
+    svn_error_malfunction_handler_t result;
+    dXSARGS;
+    
+    if ((items < 0) || (items > 0)) {
+      SWIG_croak("Usage: svn_error_get_malfunction_handler();");
+    }
+    {
+      result = (svn_error_malfunction_handler_t)svn_error_get_malfunction_handler();
+      
+      
+      
+    }
+    ST(argvi) = SWIG_NewFunctionPtrObj((void *)(result), SWIGTYPE_p_f_svn_boolean_t_p_q_const__char_int_p_q_const__char__p_svn_error_t); argvi++ ;
+    XSRETURN(argvi);
+  fail:
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_svn_error_raise_on_malfunction) {
   {
     svn_boolean_t arg1 ;
@@ -43409,7 +45920,6 @@ static swig_type_info _swigt__p_apr_file_t = {"_p_apr_file_t", "apr_file_t *", 0
 static swig_type_info _swigt__p_apr_finfo_t = {"_p_apr_finfo_t", "apr_finfo_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_apr_getopt_option_t = {"_p_apr_getopt_option_t", "apr_getopt_option_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_apr_getopt_t = {"_p_apr_getopt_t", "apr_getopt_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_apr_hash_index_t = {"_p_apr_hash_index_t", "apr_hash_index_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_apr_hash_t = {"_p_apr_hash_t", "svn_mergeinfo_catalog_t|svn_mergeinfo_t|apr_hash_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_apr_int32_t = {"_p_apr_int32_t", "apr_int32_t *|time_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_apr_int64_t = {"_p_apr_int64_t", "apr_int64_t *|svn_filesize_t *|apr_time_t *", 0, 0, (void*)0, 0};
@@ -43435,6 +45945,7 @@ static swig_type_info _swigt__p_f_p_q_const__char_p_q_const__char_p_void__int =
 static swig_type_info _swigt__p_f_p_q_const__char_p_q_const__char_p_void_p_apr_pool_t__int = {"_p_f_p_q_const__char_p_q_const__char_p_void_p_apr_pool_t__int", "svn_config_enumerator2_t|int (*)(char const *,char const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_q_const__char_p_void__int = {"_p_f_p_q_const__char_p_void__int", "svn_config_section_enumerator_t|int (*)(char const *,void *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_q_const__char_p_void_p_apr_pool_t__int = {"_p_f_p_q_const__char_p_void_p_apr_pool_t__int", "int (*)(char const *,void *,apr_pool_t *)|svn_config_section_enumerator2_t", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_f_p_q_const__struct_svn_version_t_p_q_const__struct_svn_version_t__int = {"_p_f_p_q_const__struct_svn_version_t_p_q_const__struct_svn_version_t__int", "svn_boolean_t (*)(svn_version_t const *,svn_version_t const *)|int (*)(struct svn_version_t const *,struct svn_version_t const *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_commit_callback2_t|struct svn_error_t *(*)(svn_commit_info_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_boolean_t *,char const *,void *,apr_pool_t *)|svn_auth_plaintext_prompt_func_t|svn_auth_plaintext_passphrase_prompt_func_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_svn_boolean_t_p_void_p_q_const__char_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_boolean_t_p_void_p_q_const__char_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_boolean_t *,void *,char const *,char const *,apr_hash_t *,apr_pool_t *)|svn_config_auth_walk_func_t", 0, 0, (void*)0, 0};
@@ -43452,6 +45963,7 @@ static swig_type_info _swigt__p_f_p_void_p_p_svn_stream_mark_t_p_apr_pool_t__p_s
 static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,apr_size_t *)|svn_write_fn_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,apr_finfo_t const *,apr_pool_t *)|svn_io_walk_func_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t = {"_p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t", "svn_stream_seek_fn_t|struct svn_error_t *(*)(void *,svn_stream_mark_t const *)", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_f_p_void_p_svn_boolean_t__p_svn_error_t = {"_p_f_p_void_p_svn_boolean_t__p_svn_error_t", "svn_stream_data_available_fn_t|struct svn_error_t *(*)(void *,svn_boolean_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_log_entry_t *,apr_pool_t *)|svn_log_entry_receiver_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_void__void = {"_p_f_p_void_p_void__void", "void (*)(void *,void *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_void_p_void_p_int__p_svn_error_t = {"_p_f_p_void_p_void_p_void_p_int__p_svn_error_t", "svn_error_t *(*)(void *,void *,void *,int *)|struct svn_error_t *(*)(void *,void *,void *,int *)", 0, 0, (void*)0, 0};
@@ -43560,7 +46072,6 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_apr_finfo_t,
   &_swigt__p_apr_getopt_option_t,
   &_swigt__p_apr_getopt_t,
-  &_swigt__p_apr_hash_index_t,
   &_swigt__p_apr_hash_t,
   &_swigt__p_apr_int32_t,
   &_swigt__p_apr_int64_t,
@@ -43586,6 +46097,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_f_p_q_const__char_p_q_const__char_p_void_p_apr_pool_t__int,
   &_swigt__p_f_p_q_const__char_p_void__int,
   &_swigt__p_f_p_q_const__char_p_void_p_apr_pool_t__int,
+  &_swigt__p_f_p_q_const__struct_svn_version_t_p_q_const__struct_svn_version_t__int,
   &_swigt__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_svn_boolean_t_p_void_p_q_const__char_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t,
@@ -43603,6 +46115,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t,
+  &_swigt__p_f_p_void_p_svn_boolean_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_void__void,
   &_swigt__p_f_p_void_p_void_p_void_p_int__p_svn_error_t,
@@ -43711,7 +46224,6 @@ static swig_cast_info _swigc__p_apr_file_t[] = {  {&_swigt__p_apr_file_t, 0, 0,
 static swig_cast_info _swigc__p_apr_finfo_t[] = {  {&_swigt__p_apr_finfo_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_apr_getopt_option_t[] = {  {&_swigt__p_apr_getopt_option_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_apr_getopt_t[] = {  {&_swigt__p_apr_getopt_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_apr_hash_index_t[] = {  {&_swigt__p_apr_hash_index_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_apr_hash_t[] = {  {&_swigt__p_apr_hash_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_apr_int32_t[] = {  {&_swigt__p_apr_int32_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_apr_int64_t[] = {  {&_swigt__p_apr_int64_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -43737,6 +46249,7 @@ static swig_cast_info _swigc__p_f_p_q_const__char_p_q_const__char_p_void__int[]
 static swig_cast_info _swigc__p_f_p_q_const__char_p_q_const__char_p_void_p_apr_pool_t__int[] = {  {&_swigt__p_f_p_q_const__char_p_q_const__char_p_void_p_apr_pool_t__int, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_q_const__char_p_void__int[] = {  {&_swigt__p_f_p_q_const__char_p_void__int, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_q_const__char_p_void_p_apr_pool_t__int[] = {  {&_swigt__p_f_p_q_const__char_p_void_p_apr_pool_t__int, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_f_p_q_const__struct_svn_version_t_p_q_const__struct_svn_version_t__int[] = {  {&_swigt__p_f_p_q_const__struct_svn_version_t_p_q_const__struct_svn_version_t__int, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_svn_boolean_t_p_void_p_q_const__char_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_svn_boolean_t_p_void_p_q_const__char_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -43754,6 +46267,7 @@ static swig_cast_info _swigc__p_f_p_void_p_p_svn_stream_mark_t_p_apr_pool_t__p_s
 static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_f_p_void_p_svn_boolean_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_svn_boolean_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_void__void[] = {  {&_swigt__p_f_p_void_p_void__void, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_void_p_void_p_int__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_void_p_void_p_int__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -43862,7 +46376,6 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_apr_finfo_t,
   _swigc__p_apr_getopt_option_t,
   _swigc__p_apr_getopt_t,
-  _swigc__p_apr_hash_index_t,
   _swigc__p_apr_hash_t,
   _swigc__p_apr_int32_t,
   _swigc__p_apr_int64_t,
@@ -43888,6 +46401,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_f_p_q_const__char_p_q_const__char_p_void_p_apr_pool_t__int,
   _swigc__p_f_p_q_const__char_p_void__int,
   _swigc__p_f_p_q_const__char_p_void_p_apr_pool_t__int,
+  _swigc__p_f_p_q_const__struct_svn_version_t_p_q_const__struct_svn_version_t__int,
   _swigc__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_svn_boolean_t_p_void_p_q_const__char_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t,
@@ -43905,6 +46419,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t,
   _swigc__p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t,
+  _swigc__p_f_p_void_p_svn_boolean_t__p_svn_error_t,
   _swigc__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_p_void__void,
   _swigc__p_f_p_void_p_void_p_void_p_int__p_svn_error_t,
@@ -44043,9 +46558,6 @@ static swig_command_info swig_commands[] = {
 {"SVN::_Core::svn_error_t_line_get", _wrap_svn_error_t_line_get},
 {"SVN::_Core::new_svn_error_t", _wrap_new_svn_error_t},
 {"SVN::_Core::delete_svn_error_t", _wrap_delete_svn_error_t},
-{"SVN::_Core::svn__apr_hash_index_key", _wrap_svn__apr_hash_index_key},
-{"SVN::_Core::svn__apr_hash_index_klen", _wrap_svn__apr_hash_index_klen},
-{"SVN::_Core::svn__apr_hash_index_val", _wrap_svn__apr_hash_index_val},
 {"SVN::_Core::svn_node_kind_to_word", _wrap_svn_node_kind_to_word},
 {"SVN::_Core::svn_node_kind_from_word", _wrap_svn_node_kind_from_word},
 {"SVN::_Core::svn_tristate__to_word", _wrap_svn_tristate__to_word},
@@ -44190,6 +46702,7 @@ static swig_command_info swig_commands[] = {
 {"SVN::_Core::svn_version_checklist_t_version_query_get", _wrap_svn_version_checklist_t_version_query_get},
 {"SVN::_Core::new_svn_version_checklist_t", _wrap_new_svn_version_checklist_t},
 {"SVN::_Core::delete_svn_version_checklist_t", _wrap_delete_svn_version_checklist_t},
+{"SVN::_Core::svn_ver_check_list2", _wrap_svn_ver_check_list2},
 {"SVN::_Core::svn_ver_check_list", _wrap_svn_ver_check_list},
 {"SVN::_Core::svn_subr_version", _wrap_svn_subr_version},
 {"SVN::_Core::svn_version_extended", _wrap_svn_version_extended},
@@ -44318,6 +46831,7 @@ static swig_command_info swig_commands[] = {
 {"SVN::_Core::svn_opt_print_help2", _wrap_svn_opt_print_help2},
 {"SVN::_Core::svn_opt_print_help", _wrap_svn_opt_print_help},
 {"SVN::_Core::svn_cmdline_init", _wrap_svn_cmdline_init},
+{"SVN::_Core::svn_cmdline_create_auth_baton2", _wrap_svn_cmdline_create_auth_baton2},
 {"SVN::_Core::svn_cmdline_create_auth_baton", _wrap_svn_cmdline_create_auth_baton},
 {"SVN::_Core::svn_auth_provider_t_cred_kind_set", _wrap_svn_auth_provider_t_cred_kind_set},
 {"SVN::_Core::svn_auth_provider_t_cred_kind_get", _wrap_svn_auth_provider_t_cred_kind_get},
@@ -44495,6 +47009,7 @@ static swig_command_info swig_commands[] = {
 {"SVN::_Core::svn_relpath_split", _wrap_svn_relpath_split},
 {"SVN::_Core::svn_relpath_basename", _wrap_svn_relpath_basename},
 {"SVN::_Core::svn_relpath_dirname", _wrap_svn_relpath_dirname},
+{"SVN::_Core::svn_relpath_prefix", _wrap_svn_relpath_prefix},
 {"SVN::_Core::svn_uri_split", _wrap_svn_uri_split},
 {"SVN::_Core::svn_uri_basename", _wrap_svn_uri_basename},
 {"SVN::_Core::svn_uri_dirname", _wrap_svn_uri_dirname},
@@ -44571,11 +47086,15 @@ static swig_command_info swig_commands[] = {
 {"SVN::_Core::svn_io_file_checksum", _wrap_svn_io_file_checksum},
 {"SVN::_Core::svn_io_files_contents_same_p", _wrap_svn_io_files_contents_same_p},
 {"SVN::_Core::svn_io_files_contents_three_same_p", _wrap_svn_io_files_contents_three_same_p},
+{"SVN::_Core::svn_io_file_create_bytes", _wrap_svn_io_file_create_bytes},
+{"SVN::_Core::svn_io_file_create_empty", _wrap_svn_io_file_create_empty},
 {"SVN::_Core::svn_io_lock_open_file", _wrap_svn_io_lock_open_file},
 {"SVN::_Core::svn_io_unlock_open_file", _wrap_svn_io_unlock_open_file},
+{"SVN::_Core::svn_stream_set_read2", _wrap_svn_stream_set_read2},
 {"SVN::_Core::svn_stream_set_skip", _wrap_svn_stream_set_skip},
 {"SVN::_Core::svn_stream_set_mark", _wrap_svn_stream_set_mark},
 {"SVN::_Core::svn_stream_set_seek", _wrap_svn_stream_set_seek},
+{"SVN::_Core::svn_stream_set_data_available", _wrap_svn_stream_set_data_available},
 {"SVN::_Core::svn_stream_empty", _wrap_svn_stream_empty},
 {"SVN::_Core::svn_stream_disown", _wrap_svn_stream_disown},
 {"SVN::_Core::svn_stream_open_readonly", _wrap_svn_stream_open_readonly},
@@ -44586,11 +47105,15 @@ static swig_command_info swig_commands[] = {
 {"SVN::_Core::svn_stream_for_stdin", _wrap_svn_stream_for_stdin},
 {"SVN::_Core::svn_stream_for_stderr", _wrap_svn_stream_for_stderr},
 {"SVN::_Core::svn_stream_for_stdout", _wrap_svn_stream_for_stdout},
+{"SVN::_Core::svn_stringbuf_from_stream", _wrap_svn_stringbuf_from_stream},
 {"SVN::_Core::svn_stream_from_stringbuf", _wrap_svn_stream_from_stringbuf},
 {"SVN::_Core::svn_stream_from_string", _wrap_svn_stream_from_string},
 {"SVN::_Core::svn_stream_buffered", _wrap_svn_stream_buffered},
 {"SVN::_Core::svn_stream_compressed", _wrap_svn_stream_compressed},
 {"SVN::_Core::svn_stream_checksummed2", _wrap_svn_stream_checksummed2},
+{"SVN::_Core::svn_stream_read_full", _wrap_svn_stream_read_full},
+{"SVN::_Core::svn_stream_supports_partial_read", _wrap_svn_stream_supports_partial_read},
+{"SVN::_Core::svn_stream_read2", _wrap_svn_stream_read2},
 {"SVN::_Core::svn_stream_read", _wrap_svn_stream_read},
 {"SVN::_Core::svn_stream_skip", _wrap_svn_stream_skip},
 {"SVN::_Core::svn_stream_write", _wrap_svn_stream_write},
@@ -44599,6 +47122,7 @@ static swig_command_info swig_commands[] = {
 {"SVN::_Core::svn_stream_supports_mark", _wrap_svn_stream_supports_mark},
 {"SVN::_Core::svn_stream_mark", _wrap_svn_stream_mark},
 {"SVN::_Core::svn_stream_seek", _wrap_svn_stream_seek},
+{"SVN::_Core::svn_stream_data_available", _wrap_svn_stream_data_available},
 {"SVN::_Core::svn_stream_tee", _wrap_svn_stream_tee},
 {"SVN::_Core::svn_stream_puts", _wrap_svn_stream_puts},
 {"SVN::_Core::svn_stream_readline", _wrap_svn_stream_readline},
@@ -44628,6 +47152,9 @@ static swig_command_info swig_commands[] = {
 {"SVN::_Core::svn_io_is_binary_data", _wrap_svn_io_is_binary_data},
 {"SVN::_Core::svn_io_file_putc", _wrap_svn_io_file_putc},
 {"SVN::_Core::svn_io_file_read_full2", _wrap_svn_io_file_read_full2},
+{"SVN::_Core::svn_io_file_aligned_seek", _wrap_svn_io_file_aligned_seek},
+{"SVN::_Core::svn_io_file_flush", _wrap_svn_io_file_flush},
+{"SVN::_Core::svn_io_write_atomic", _wrap_svn_io_write_atomic},
 {"SVN::_Core::svn_io_write_unique", _wrap_svn_io_write_unique},
 {"SVN::_Core::svn_io_file_trunc", _wrap_svn_io_file_trunc},
 {"SVN::_Core::svn_io_dir_close", _wrap_svn_io_dir_close},
@@ -44639,6 +47166,7 @@ static swig_command_info swig_commands[] = {
 {"SVN::_Core::svn_close_invoke_fn", _wrap_svn_close_invoke_fn},
 {"SVN::_Core::svn_stream_invoke_mark_fn", _wrap_svn_stream_invoke_mark_fn},
 {"SVN::_Core::svn_stream_invoke_seek_fn", _wrap_svn_stream_invoke_seek_fn},
+{"SVN::_Core::svn_stream_invoke_data_available_fn", _wrap_svn_stream_invoke_data_available_fn},
 {"SVN::_Core::svn_stream_invoke_lazyopen_func", _wrap_svn_stream_invoke_lazyopen_func},
 {"SVN::_Core::svn_io_invoke_walk_func", _wrap_svn_io_invoke_walk_func},
 {"SVN::_Core::svn_checksum_t_digest_set", _wrap_svn_checksum_t_digest_set},
@@ -44718,6 +47246,7 @@ static swig_command_info swig_commands[] = {
 {"SVN::_Core::svn_diff_output_fns_t_output_conflict_get", _wrap_svn_diff_output_fns_t_output_conflict_get},
 {"SVN::_Core::new_svn_diff_output_fns_t", _wrap_new_svn_diff_output_fns_t},
 {"SVN::_Core::delete_svn_diff_output_fns_t", _wrap_delete_svn_diff_output_fns_t},
+{"SVN::_Core::svn_diff_output2", _wrap_svn_diff_output2},
 {"SVN::_Core::svn_diff_output", _wrap_svn_diff_output},
 {"SVN::_Core::svn_diff_file_options_t_ignore_space_set", _wrap_svn_diff_file_options_t_ignore_space_set},
 {"SVN::_Core::svn_diff_file_options_t_ignore_space_get", _wrap_svn_diff_file_options_t_ignore_space_get},
@@ -44725,6 +47254,8 @@ static swig_command_info swig_commands[] = {
 {"SVN::_Core::svn_diff_file_options_t_ignore_eol_style_get", _wrap_svn_diff_file_options_t_ignore_eol_style_get},
 {"SVN::_Core::svn_diff_file_options_t_show_c_function_set", _wrap_svn_diff_file_options_t_show_c_function_set},
 {"SVN::_Core::svn_diff_file_options_t_show_c_function_get", _wrap_svn_diff_file_options_t_show_c_function_get},
+{"SVN::_Core::svn_diff_file_options_t_context_size_set", _wrap_svn_diff_file_options_t_context_size_set},
+{"SVN::_Core::svn_diff_file_options_t_context_size_get", _wrap_svn_diff_file_options_t_context_size_get},
 {"SVN::_Core::new_svn_diff_file_options_t", _wrap_new_svn_diff_file_options_t},
 {"SVN::_Core::delete_svn_diff_file_options_t", _wrap_delete_svn_diff_file_options_t},
 {"SVN::_Core::svn_diff_file_options_create", _wrap_svn_diff_file_options_create},
@@ -44735,16 +47266,21 @@ static swig_command_info swig_commands[] = {
 {"SVN::_Core::svn_diff_file_diff3", _wrap_svn_diff_file_diff3},
 {"SVN::_Core::svn_diff_file_diff4_2", _wrap_svn_diff_file_diff4_2},
 {"SVN::_Core::svn_diff_file_diff4", _wrap_svn_diff_file_diff4},
+{"SVN::_Core::svn_diff_file_output_unified4", _wrap_svn_diff_file_output_unified4},
 {"SVN::_Core::svn_diff_file_output_unified3", _wrap_svn_diff_file_output_unified3},
 {"SVN::_Core::svn_diff_file_output_unified2", _wrap_svn_diff_file_output_unified2},
 {"SVN::_Core::svn_diff_file_output_unified", _wrap_svn_diff_file_output_unified},
+{"SVN::_Core::svn_diff_file_output_merge3", _wrap_svn_diff_file_output_merge3},
 {"SVN::_Core::svn_diff_file_output_merge2", _wrap_svn_diff_file_output_merge2},
 {"SVN::_Core::svn_diff_file_output_merge", _wrap_svn_diff_file_output_merge},
+{"SVN::_Core::svn_diff_output_binary", _wrap_svn_diff_output_binary},
 {"SVN::_Core::svn_diff_mem_string_diff", _wrap_svn_diff_mem_string_diff},
 {"SVN::_Core::svn_diff_mem_string_diff3", _wrap_svn_diff_mem_string_diff3},
 {"SVN::_Core::svn_diff_mem_string_diff4", _wrap_svn_diff_mem_string_diff4},
+{"SVN::_Core::svn_diff_mem_string_output_unified3", _wrap_svn_diff_mem_string_output_unified3},
 {"SVN::_Core::svn_diff_mem_string_output_unified2", _wrap_svn_diff_mem_string_output_unified2},
 {"SVN::_Core::svn_diff_mem_string_output_unified", _wrap_svn_diff_mem_string_output_unified},
+{"SVN::_Core::svn_diff_mem_string_output_merge3", _wrap_svn_diff_mem_string_output_merge3},
 {"SVN::_Core::svn_diff_mem_string_output_merge2", _wrap_svn_diff_mem_string_output_merge2},
 {"SVN::_Core::svn_diff_mem_string_output_merge", _wrap_svn_diff_mem_string_output_merge},
 {"SVN::_Core::svn_diff_hunk_readline_diff_text", _wrap_svn_diff_hunk_readline_diff_text},
@@ -44779,6 +47315,10 @@ static swig_command_info swig_commands[] = {
 {"SVN::_Core::svn_patch_t_operation_get", _wrap_svn_patch_t_operation_get},
 {"SVN::_Core::svn_patch_t_reverse_set", _wrap_svn_patch_t_reverse_set},
 {"SVN::_Core::svn_patch_t_reverse_get", _wrap_svn_patch_t_reverse_get},
+{"SVN::_Core::svn_patch_t_mergeinfo_set", _wrap_svn_patch_t_mergeinfo_set},
+{"SVN::_Core::svn_patch_t_mergeinfo_get", _wrap_svn_patch_t_mergeinfo_get},
+{"SVN::_Core::svn_patch_t_reverse_mergeinfo_set", _wrap_svn_patch_t_reverse_mergeinfo_set},
+{"SVN::_Core::svn_patch_t_reverse_mergeinfo_get", _wrap_svn_patch_t_reverse_mergeinfo_get},
 {"SVN::_Core::new_svn_patch_t", _wrap_new_svn_patch_t},
 {"SVN::_Core::delete_svn_patch_t", _wrap_delete_svn_patch_t},
 {"SVN::_Core::svn_diff_open_patch_file", _wrap_svn_diff_open_patch_file},
@@ -44808,6 +47348,7 @@ static swig_command_info swig_commands[] = {
 {"SVN::_Core::svn_error_createf", _wrap_svn_error_createf},
 {"SVN::_Core::svn_error_wrap_apr", _wrap_svn_error_wrap_apr},
 {"SVN::_Core::svn_error_quick_wrap", _wrap_svn_error_quick_wrap},
+{"SVN::_Core::svn_error_quick_wrapf", _wrap_svn_error_quick_wrapf},
 {"SVN::_Core::svn_error_compose_create", _wrap_svn_error_compose_create},
 {"SVN::_Core::svn_error_compose", _wrap_svn_error_compose},
 {"SVN::_Core::svn_error_root_cause", _wrap_svn_error_root_cause},
@@ -44821,6 +47362,7 @@ static swig_command_info swig_commands[] = {
 {"SVN::_Core::svn_error_purge_tracing", _wrap_svn_error_purge_tracing},
 {"SVN::_Core::svn_error__malfunction", _wrap_svn_error__malfunction},
 {"SVN::_Core::svn_error_set_malfunction_handler", _wrap_svn_error_set_malfunction_handler},
+{"SVN::_Core::svn_error_get_malfunction_handler", _wrap_svn_error_get_malfunction_handler},
 {"SVN::_Core::svn_error_raise_on_malfunction", _wrap_svn_error_raise_on_malfunction},
 {"SVN::_Core::svn_error_abort_on_malfunction", _wrap_svn_error_abort_on_malfunction},
 {"SVN::_Core::svn_error_invoke_malfunction_handler", _wrap_svn_error_invoke_malfunction_handler},
@@ -44828,18 +47370,18 @@ static swig_command_info swig_commands[] = {
 };
 /* -----------------------------------------------------------------------------
  * Type initialization:
- * This problem is tough by the requirement that no dynamic 
- * memory is used. Also, since swig_type_info structures store pointers to 
+ * This problem is tough by the requirement that no dynamic
+ * memory is used. Also, since swig_type_info structures store pointers to
  * swig_cast_info structures and swig_cast_info structures store pointers back
- * to swig_type_info structures, we need some lookup code at initialization. 
- * The idea is that swig generates all the structures that are needed. 
- * The runtime then collects these partially filled structures. 
- * The SWIG_InitializeModule function takes these initial arrays out of 
+ * to swig_type_info structures, we need some lookup code at initialization.
+ * The idea is that swig generates all the structures that are needed.
+ * The runtime then collects these partially filled structures.
+ * The SWIG_InitializeModule function takes these initial arrays out of
  * swig_module, and does all the lookup, filling in the swig_module.types
  * array with the correct data and linking the correct swig_cast_info
  * structures together.
  *
- * The generated swig_type_info structures are assigned staticly to an initial 
+ * The generated swig_type_info structures are assigned staticly to an initial
  * array. We just loop through that array, and handle each type individually.
  * First we lookup if this type has been already loaded, and if so, use the
  * loaded structure instead of the generated one. Then we have to fill in the
@@ -44849,17 +47391,17 @@ static swig_command_info swig_commands[] = {
  * a column is one of the swig_cast_info structures for that type.
  * The cast_initial array is actually an array of arrays, because each row has
  * a variable number of columns. So to actually build the cast linked list,
- * we find the array of casts associated with the type, and loop through it 
+ * we find the array of casts associated with the type, and loop through it
  * adding the casts to the list. The one last trick we need to do is making
  * sure the type pointer in the swig_cast_info struct is correct.
  *
- * First off, we lookup the cast->type name to see if it is already loaded. 
+ * First off, we lookup the cast->type name to see if it is already loaded.
  * There are three cases to handle:
  *  1) If the cast->type has already been loaded AND the type we are adding
  *     casting info to has not been loaded (it is in this module), THEN we
  *     replace the cast->type pointer with the type pointer that has already
  *     been loaded.
- *  2) If BOTH types (the one we are adding casting info to, and the 
+ *  2) If BOTH types (the one we are adding casting info to, and the
  *     cast->type) are loaded, THEN the cast info has already been loaded by
  *     the previous module so we just ignore it.
  *  3) Finally, if cast->type has not already been loaded, then we add that
@@ -44922,7 +47464,7 @@ SWIG_InitializeModule(void *clientdata) {
     module_head->next = &swig_module;
   }
   
-  /* When multiple interpeters are used, a module could have already been initialized in
+  /* When multiple interpreters are used, a module could have already been initialized in
        a different interpreter, but not yet have a pointer in this interpreter.
        In this case, we do not want to continue adding types... everything should be
        set up already */
@@ -45121,2721 +47663,3004 @@ XS(SWIG_init) {
     SvREADONLY_on(sv);
   }
   
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SWIG_SVN_INVALID_REVNUM", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_long  SWIG_PERL_CALL_ARGS_1((long)(-1)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SWIG_SVN_IGNORED_REVNUM", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_long  SWIG_PERL_CALL_ARGS_1((long)(-1)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CATEGORY_SIZE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(5000)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_WARNING", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_WARNING)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BAD_CONTAINING_POOL", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BAD_CONTAINING_POOL)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BAD_FILENAME", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BAD_FILENAME)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BAD_URL", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BAD_URL)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BAD_DATE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BAD_DATE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BAD_MIME_TYPE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BAD_MIME_TYPE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BAD_PROPERTY_VALUE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BAD_PROPERTY_VALUE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BAD_VERSION_FILE_FORMAT", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BAD_VERSION_FILE_FORMAT)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BAD_RELATIVE_PATH", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BAD_RELATIVE_PATH)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BAD_UUID", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BAD_UUID)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BAD_CONFIG_VALUE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BAD_CONFIG_VALUE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BAD_SERVER_SPECIFICATION", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BAD_SERVER_SPECIFICATION)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BAD_CHECKSUM_KIND", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BAD_CHECKSUM_KIND)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BAD_CHECKSUM_PARSE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BAD_CHECKSUM_PARSE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BAD_TOKEN", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BAD_TOKEN)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BAD_CHANGELIST_NAME", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BAD_CHANGELIST_NAME)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BAD_ATOMIC", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BAD_ATOMIC)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BAD_COMPRESSION_METHOD", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BAD_COMPRESSION_METHOD)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_XML_ATTRIB_NOT_FOUND", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_XML_ATTRIB_NOT_FOUND)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_XML_MISSING_ANCESTRY", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_XML_MISSING_ANCESTRY)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_XML_UNKNOWN_ENCODING", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_XML_UNKNOWN_ENCODING)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_XML_MALFORMED", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_XML_MALFORMED)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_XML_UNESCAPABLE_DATA", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_XML_UNESCAPABLE_DATA)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_XML_UNEXPECTED_ELEMENT", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_XML_UNEXPECTED_ELEMENT)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_IO_INCONSISTENT_EOL", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_IO_INCONSISTENT_EOL)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_IO_UNKNOWN_EOL", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_IO_UNKNOWN_EOL)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_IO_CORRUPT_EOL", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_IO_CORRUPT_EOL)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_IO_UNIQUE_NAMES_EXHAUSTED", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_IO_UNIQUE_NAMES_EXHAUSTED)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_IO_PIPE_FRAME_ERROR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_IO_PIPE_FRAME_ERROR)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_IO_PIPE_READ_ERROR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_IO_PIPE_READ_ERROR)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_IO_WRITE_ERROR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_IO_WRITE_ERROR)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_IO_PIPE_WRITE_ERROR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_IO_PIPE_WRITE_ERROR)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_STREAM_UNEXPECTED_EOF", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_STREAM_UNEXPECTED_EOF)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_STREAM_MALFORMED_DATA", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_STREAM_MALFORMED_DATA)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_STREAM_UNRECOGNIZED_DATA", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_STREAM_UNRECOGNIZED_DATA)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_STREAM_SEEK_NOT_SUPPORTED", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_STREAM_SEEK_NOT_SUPPORTED)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_STREAM_NOT_SUPPORTED", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_STREAM_NOT_SUPPORTED)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_NODE_UNKNOWN_KIND", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_NODE_UNKNOWN_KIND)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_NODE_UNEXPECTED_KIND", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_NODE_UNEXPECTED_KIND)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_ENTRY_NOT_FOUND", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_ENTRY_NOT_FOUND)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_ENTRY_EXISTS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_ENTRY_EXISTS)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_ENTRY_MISSING_REVISION", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_ENTRY_MISSING_REVISION)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_ENTRY_MISSING_URL", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_ENTRY_MISSING_URL)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_ENTRY_ATTRIBUTE_INVALID", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_ENTRY_ATTRIBUTE_INVALID)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_ENTRY_FORBIDDEN", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_ENTRY_FORBIDDEN)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_OBSTRUCTED_UPDATE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_OBSTRUCTED_UPDATE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_UNWIND_MISMATCH", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_UNWIND_MISMATCH)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_UNWIND_EMPTY", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_UNWIND_EMPTY)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_UNWIND_NOT_EMPTY", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_UNWIND_NOT_EMPTY)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_LOCKED", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_LOCKED)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_NOT_LOCKED", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_NOT_LOCKED)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_INVALID_LOCK", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_INVALID_LOCK)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_NOT_WORKING_COPY", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_NOT_WORKING_COPY)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_NOT_DIRECTORY", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_NOT_DIRECTORY)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_NOT_FILE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_NOT_FILE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_BAD_ADM_LOG", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_BAD_ADM_LOG)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_PATH_NOT_FOUND", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_PATH_NOT_FOUND)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_NOT_UP_TO_DATE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_NOT_UP_TO_DATE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_LEFT_LOCAL_MOD", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_LEFT_LOCAL_MOD)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_SCHEDULE_CONFLICT", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_SCHEDULE_CONFLICT)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_PATH_FOUND", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_PATH_FOUND)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_FOUND_CONFLICT", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_FOUND_CONFLICT)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_CORRUPT", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_CORRUPT)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_CORRUPT_TEXT_BASE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_CORRUPT_TEXT_BASE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_NODE_KIND_CHANGE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_NODE_KIND_CHANGE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_INVALID_OP_ON_CWD", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_INVALID_OP_ON_CWD)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_BAD_ADM_LOG_START", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_BAD_ADM_LOG_START)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_UNSUPPORTED_FORMAT", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_UNSUPPORTED_FORMAT)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_BAD_PATH", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_BAD_PATH)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_INVALID_SCHEDULE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_INVALID_SCHEDULE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_INVALID_RELOCATION", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_INVALID_RELOCATION)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_INVALID_SWITCH", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_INVALID_SWITCH)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_MISMATCHED_CHANGELIST", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_MISMATCHED_CHANGELIST)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_COPYFROM_PATH_NOT_FOUND", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_COPYFROM_PATH_NOT_FOUND)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_CHANGELIST_MOVE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_CHANGELIST_MOVE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_CANNOT_DELETE_FILE_EXTERNAL", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_CANNOT_DELETE_FILE_EXTERNAL)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_CANNOT_MOVE_FILE_EXTERNAL", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_CANNOT_MOVE_FILE_EXTERNAL)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_DB_ERROR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_DB_ERROR)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_MISSING", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_MISSING)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_NOT_SYMLINK", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_NOT_SYMLINK)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_PATH_UNEXPECTED_STATUS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_PATH_UNEXPECTED_STATUS)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_UPGRADE_REQUIRED", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_UPGRADE_REQUIRED)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_CLEANUP_REQUIRED", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_CLEANUP_REQUIRED)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_INVALID_OPERATION_DEPTH", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_INVALID_OPERATION_DEPTH)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_PATH_ACCESS_DENIED", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_PATH_ACCESS_DENIED)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_MIXED_REVISIONS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_MIXED_REVISIONS)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_DUPLICATE_EXTERNALS_TARGET", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_DUPLICATE_EXTERNALS_TARGET)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_GENERAL", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_GENERAL)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_CLEANUP", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_CLEANUP)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_ALREADY_OPEN", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_ALREADY_OPEN)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NOT_OPEN", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NOT_OPEN)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_CORRUPT", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_CORRUPT)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_PATH_SYNTAX", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_PATH_SYNTAX)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NO_SUCH_REVISION", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NO_SUCH_REVISION)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NO_SUCH_TRANSACTION", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NO_SUCH_TRANSACTION)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NO_SUCH_ENTRY", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NO_SUCH_ENTRY)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NO_SUCH_REPRESENTATION", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NO_SUCH_REPRESENTATION)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NO_SUCH_STRING", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NO_SUCH_STRING)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NO_SUCH_COPY", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NO_SUCH_COPY)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_TRANSACTION_NOT_MUTABLE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_TRANSACTION_NOT_MUTABLE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NOT_FOUND", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NOT_FOUND)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_ID_NOT_FOUND", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_ID_NOT_FOUND)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NOT_ID", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NOT_ID)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NOT_DIRECTORY", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NOT_DIRECTORY)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NOT_FILE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NOT_FILE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NOT_SINGLE_PATH_COMPONENT", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NOT_SINGLE_PATH_COMPONENT)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NOT_MUTABLE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NOT_MUTABLE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_ALREADY_EXISTS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_ALREADY_EXISTS)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_ROOT_DIR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_ROOT_DIR)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NOT_TXN_ROOT", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NOT_TXN_ROOT)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NOT_REVISION_ROOT", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NOT_REVISION_ROOT)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_CONFLICT", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_CONFLICT)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_REP_CHANGED", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_REP_CHANGED)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_REP_NOT_MUTABLE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_REP_NOT_MUTABLE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_MALFORMED_SKEL", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_MALFORMED_SKEL)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_TXN_OUT_OF_DATE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_TXN_OUT_OF_DATE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_BERKELEY_DB", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_BERKELEY_DB)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_BERKELEY_DB_DEADLOCK", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_BERKELEY_DB_DEADLOCK)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_TRANSACTION_DEAD", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_TRANSACTION_DEAD)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_TRANSACTION_NOT_DEAD", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_TRANSACTION_NOT_DEAD)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_UNKNOWN_FS_TYPE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_UNKNOWN_FS_TYPE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NO_USER", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NO_USER)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_PATH_ALREADY_LOCKED", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_PATH_ALREADY_LOCKED)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_PATH_NOT_LOCKED", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_PATH_NOT_LOCKED)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_BAD_LOCK_TOKEN", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_BAD_LOCK_TOKEN)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NO_LOCK_TOKEN", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NO_LOCK_TOKEN)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_LOCK_OWNER_MISMATCH", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_LOCK_OWNER_MISMATCH)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NO_SUCH_LOCK", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NO_SUCH_LOCK)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_LOCK_EXPIRED", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_LOCK_EXPIRED)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_OUT_OF_DATE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_OUT_OF_DATE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_UNSUPPORTED_FORMAT", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_UNSUPPORTED_FORMAT)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_REP_BEING_WRITTEN", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_REP_BEING_WRITTEN)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_TXN_NAME_TOO_LONG", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_TXN_NAME_TOO_LONG)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NO_SUCH_NODE_ORIGIN", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NO_SUCH_NODE_ORIGIN)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_UNSUPPORTED_UPGRADE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_UNSUPPORTED_UPGRADE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NO_SUCH_CHECKSUM_REP", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NO_SUCH_CHECKSUM_REP)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_PROP_BASEVALUE_MISMATCH", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_PROP_BASEVALUE_MISMATCH)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_INCORRECT_EDITOR_COMPLETION", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_INCORRECT_EDITOR_COMPLETION)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_PACKED_REVPROP_READ_FAILURE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_PACKED_REVPROP_READ_FAILURE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_REVPROP_CACHE_INIT_FAILURE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_REVPROP_CACHE_INIT_FAILURE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_MALFORMED_TXN_ID", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_MALFORMED_TXN_ID)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_INDEX_CORRUPTION", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_INDEX_CORRUPTION)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_INDEX_REVISION", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_INDEX_REVISION)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_INDEX_OVERFLOW", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_INDEX_OVERFLOW)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_CONTAINER_INDEX", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_CONTAINER_INDEX)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_INDEX_INCONSISTENT", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_INDEX_INCONSISTENT)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_LOCK_OPERATION_FAILED", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_LOCK_OPERATION_FAILED)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_UNSUPPORTED_TYPE", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_UNSUPPORTED_TYPE)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_CONTAINER_SIZE", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_CONTAINER_SIZE)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_MALFORMED_NODEREV_ID", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_MALFORMED_NODEREV_ID)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_INVALID_GENERATION", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_INVALID_GENERATION)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_REPOS_LOCKED", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_REPOS_LOCKED)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_REPOS_HOOK_FAILURE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_REPOS_HOOK_FAILURE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_REPOS_BAD_ARGS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_REPOS_BAD_ARGS)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_REPOS_NO_DATA_FOR_REPORT", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_REPOS_NO_DATA_FOR_REPORT)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_REPOS_BAD_REVISION_REPORT", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_REPOS_BAD_REVISION_REPORT)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_REPOS_UNSUPPORTED_VERSION", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_REPOS_UNSUPPORTED_VERSION)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_REPOS_DISABLED_FEATURE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_REPOS_DISABLED_FEATURE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_REPOS_POST_COMMIT_HOOK_FAILED", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_REPOS_POST_COMMIT_HOOK_FAILED)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_REPOS_POST_LOCK_HOOK_FAILED", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_REPOS_POST_LOCK_HOOK_FAILED)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_REPOS_POST_UNLOCK_HOOK_FAILED", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_REPOS_POST_UNLOCK_HOOK_FAILED)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_REPOS_UNSUPPORTED_UPGRADE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_REPOS_UNSUPPORTED_UPGRADE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_ILLEGAL_URL", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_ILLEGAL_URL)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_NOT_AUTHORIZED", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_NOT_AUTHORIZED)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_UNKNOWN_AUTH", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_UNKNOWN_AUTH)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_NOT_IMPLEMENTED", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_NOT_IMPLEMENTED)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_OUT_OF_DATE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_OUT_OF_DATE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_NO_REPOS_UUID", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_NO_REPOS_UUID)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_UNSUPPORTED_ABI_VERSION", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_UNSUPPORTED_ABI_VERSION)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_NOT_LOCKED", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_NOT_LOCKED)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_PARTIAL_REPLAY_NOT_SUPPORTED", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_PARTIAL_REPLAY_NOT_SUPPORTED)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_UUID_MISMATCH", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_UUID_MISMATCH)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_REPOS_ROOT_URL_MISMATCH", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_REPOS_ROOT_URL_MISMATCH)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_SESSION_URL_MISMATCH", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_SESSION_URL_MISMATCH)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_CANNOT_CREATE_TUNNEL", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_CANNOT_CREATE_TUNNEL)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_CANNOT_CREATE_SESSION", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_CANNOT_CREATE_SESSION)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_DAV_SOCK_INIT", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_DAV_SOCK_INIT)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_DAV_CREATING_REQUEST", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_DAV_CREATING_REQUEST)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_DAV_REQUEST_FAILED", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_DAV_REQUEST_FAILED)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_DAV_OPTIONS_REQ_FAILED", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_DAV_OPTIONS_REQ_FAILED)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_DAV_PROPS_NOT_FOUND", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_DAV_PROPS_NOT_FOUND)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_DAV_ALREADY_EXISTS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_DAV_ALREADY_EXISTS)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_DAV_INVALID_CONFIG_VALUE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_DAV_INVALID_CONFIG_VALUE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_DAV_PATH_NOT_FOUND", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_DAV_PATH_NOT_FOUND)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_DAV_PROPPATCH_FAILED", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_DAV_PROPPATCH_FAILED)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_DAV_MALFORMED_DATA", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_DAV_MALFORMED_DATA)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_DAV_RESPONSE_HEADER_BADNESS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_DAV_RESPONSE_HEADER_BADNESS)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_DAV_RELOCATED", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_DAV_RELOCATED)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_DAV_CONN_TIMEOUT", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_DAV_CONN_TIMEOUT)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_DAV_FORBIDDEN", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_DAV_FORBIDDEN)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_DAV_PRECONDITION_FAILED", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_DAV_PRECONDITION_FAILED)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_DAV_METHOD_NOT_ALLOWED", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_DAV_METHOD_NOT_ALLOWED)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_LOCAL_REPOS_NOT_FOUND", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_LOCAL_REPOS_NOT_FOUND)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_LOCAL_REPOS_OPEN_FAILED", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_LOCAL_REPOS_OPEN_FAILED)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_SVNDIFF_INVALID_HEADER", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_SVNDIFF_INVALID_HEADER)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_SVNDIFF_CORRUPT_WINDOW", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_SVNDIFF_CORRUPT_WINDOW)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_SVNDIFF_BACKWARD_VIEW", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_SVNDIFF_BACKWARD_VIEW)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_SVNDIFF_INVALID_OPS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_SVNDIFF_INVALID_OPS)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_SVNDIFF_UNEXPECTED_END", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_SVNDIFF_UNEXPECTED_END)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_SVNDIFF_INVALID_COMPRESSED_DATA", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_SVNDIFF_INVALID_COMPRESSED_DATA)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_APMOD_MISSING_PATH_TO_FS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_APMOD_MISSING_PATH_TO_FS)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_APMOD_MALFORMED_URI", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_APMOD_MALFORMED_URI)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_APMOD_ACTIVITY_NOT_FOUND", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_APMOD_ACTIVITY_NOT_FOUND)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_APMOD_BAD_BASELINE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_APMOD_BAD_BASELINE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_APMOD_CONNECTION_ABORTED", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_APMOD_CONNECTION_ABORTED)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_VERSIONED_PATH_REQUIRED", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_VERSIONED_PATH_REQUIRED)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_RA_ACCESS_REQUIRED", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_RA_ACCESS_REQUIRED)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_BAD_REVISION", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_BAD_REVISION)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_DUPLICATE_COMMIT_URL", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_DUPLICATE_COMMIT_URL)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_IS_BINARY_FILE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_IS_BINARY_FILE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_INVALID_EXTERNALS_DESCRIPTION", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_INVALID_EXTERNALS_DESCRIPTION)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_MODIFIED", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_MODIFIED)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_IS_DIRECTORY", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_IS_DIRECTORY)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_REVISION_RANGE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_REVISION_RANGE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_INVALID_RELOCATION", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_INVALID_RELOCATION)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_REVISION_AUTHOR_CONTAINS_NEWLINE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_REVISION_AUTHOR_CONTAINS_NEWLINE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_PROPERTY_NAME", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_PROPERTY_NAME)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_UNRELATED_RESOURCES", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_UNRELATED_RESOURCES)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_MISSING_LOCK_TOKEN", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_MISSING_LOCK_TOKEN)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_MULTIPLE_SOURCES_DISALLOWED", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_MULTIPLE_SOURCES_DISALLOWED)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_NO_VERSIONED_PARENT", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_NO_VERSIONED_PARENT)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_NOT_READY_TO_MERGE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_NOT_READY_TO_MERGE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_FILE_EXTERNAL_OVERWRITE_VERSIONED", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_FILE_EXTERNAL_OVERWRITE_VERSIONED)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_PATCH_BAD_STRIP_COUNT", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_PATCH_BAD_STRIP_COUNT)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_CYCLE_DETECTED", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_CYCLE_DETECTED)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_MERGE_UPDATE_REQUIRED", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_MERGE_UPDATE_REQUIRED)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_INVALID_MERGEINFO_NO_MERGETRACKING", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_INVALID_MERGEINFO_NO_MERGETRACKING)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_NO_LOCK_TOKEN", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_NO_LOCK_TOKEN)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_FORBIDDEN_BY_SERVER", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_FORBIDDEN_BY_SERVER)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BASE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BASE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_PLUGIN_LOAD_FAILURE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_PLUGIN_LOAD_FAILURE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_MALFORMED_FILE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_MALFORMED_FILE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_INCOMPLETE_DATA", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_INCOMPLETE_DATA)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_INCORRECT_PARAMS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_INCORRECT_PARAMS)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_UNVERSIONED_RESOURCE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_UNVERSIONED_RESOURCE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_TEST_FAILED", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_TEST_FAILED)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_UNSUPPORTED_FEATURE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_UNSUPPORTED_FEATURE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BAD_PROP_KIND", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BAD_PROP_KIND)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_ILLEGAL_TARGET", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_ILLEGAL_TARGET)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_DELTA_MD5_CHECKSUM_ABSENT", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_DELTA_MD5_CHECKSUM_ABSENT)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_DIR_NOT_EMPTY", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_DIR_NOT_EMPTY)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_EXTERNAL_PROGRAM", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_EXTERNAL_PROGRAM)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_SWIG_PY_EXCEPTION_SET", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_SWIG_PY_EXCEPTION_SET)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CHECKSUM_MISMATCH", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CHECKSUM_MISMATCH)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CANCELLED", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CANCELLED)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_INVALID_DIFF_OPTION", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_INVALID_DIFF_OPTION)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_PROPERTY_NOT_FOUND", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_PROPERTY_NOT_FOUND)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_NO_AUTH_FILE_PATH", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_NO_AUTH_FILE_PATH)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_VERSION_MISMATCH", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_VERSION_MISMATCH)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_MERGEINFO_PARSE_ERROR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_MERGEINFO_PARSE_ERROR)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CEASE_INVOCATION", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CEASE_INVOCATION)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_REVNUM_PARSE_FAILURE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_REVNUM_PARSE_FAILURE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_ITER_BREAK", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_ITER_BREAK)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_UNKNOWN_CHANGELIST", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_UNKNOWN_CHANGELIST)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RESERVED_FILENAME_SPECIFIED", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RESERVED_FILENAME_SPECIFIED)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_UNKNOWN_CAPABILITY", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_UNKNOWN_CAPABILITY)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_TEST_SKIPPED", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_TEST_SKIPPED)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_NO_APR_MEMCACHE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_NO_APR_MEMCACHE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_ATOMIC_INIT_FAILURE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_ATOMIC_INIT_FAILURE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_SQLITE_ERROR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_SQLITE_ERROR)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_SQLITE_READONLY", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_SQLITE_READONLY)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_SQLITE_UNSUPPORTED_SCHEMA", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_SQLITE_UNSUPPORTED_SCHEMA)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_SQLITE_BUSY", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_SQLITE_BUSY)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_SQLITE_RESETTING_FOR_ROLLBACK", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_SQLITE_RESETTING_FOR_ROLLBACK)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_SQLITE_CONSTRAINT", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_SQLITE_CONSTRAINT)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_TOO_MANY_MEMCACHED_SERVERS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_TOO_MANY_MEMCACHED_SERVERS)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_MALFORMED_VERSION_STRING", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_MALFORMED_VERSION_STRING)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CORRUPTED_ATOMIC_STORAGE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CORRUPTED_ATOMIC_STORAGE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_UTF8PROC_ERROR", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_UTF8PROC_ERROR)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_UTF8_GLOB", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_UTF8_GLOB)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CORRUPT_PACKED_DATA", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CORRUPT_PACKED_DATA)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_COMPOSED_ERROR", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_COMPOSED_ERROR)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_INVALID_INPUT", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_INVALID_INPUT)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CL_ARG_PARSING_ERROR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CL_ARG_PARSING_ERROR)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CL_INSUFFICIENT_ARGS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CL_INSUFFICIENT_ARGS)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CL_MUTUALLY_EXCLUSIVE_ARGS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CL_MUTUALLY_EXCLUSIVE_ARGS)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CL_ADM_DIR_RESERVED", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CL_ADM_DIR_RESERVED)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CL_LOG_MESSAGE_IS_VERSIONED_FILE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CL_LOG_MESSAGE_IS_VERSIONED_FILE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CL_LOG_MESSAGE_IS_PATHNAME", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CL_LOG_MESSAGE_IS_PATHNAME)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CL_COMMIT_IN_ADDED_DIR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CL_COMMIT_IN_ADDED_DIR)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CL_NO_EXTERNAL_EDITOR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CL_NO_EXTERNAL_EDITOR)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CL_BAD_LOG_MESSAGE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CL_BAD_LOG_MESSAGE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CL_UNNECESSARY_LOG_MESSAGE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CL_UNNECESSARY_LOG_MESSAGE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CL_NO_EXTERNAL_MERGE_TOOL", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CL_NO_EXTERNAL_MERGE_TOOL)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CL_ERROR_PROCESSING_EXTERNALS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CL_ERROR_PROCESSING_EXTERNALS)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CL_REPOS_VERIFY_FAILED", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CL_REPOS_VERIFY_FAILED)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_SVN_CMD_ERR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_SVN_CMD_ERR)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_SVN_UNKNOWN_CMD", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_SVN_UNKNOWN_CMD)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_SVN_CONNECTION_CLOSED", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_SVN_CONNECTION_CLOSED)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_SVN_IO_ERROR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_SVN_IO_ERROR)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_SVN_MALFORMED_DATA", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_SVN_MALFORMED_DATA)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_SVN_REPOS_NOT_FOUND", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_SVN_REPOS_NOT_FOUND)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_SVN_BAD_VERSION", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_SVN_BAD_VERSION)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_SVN_NO_MECHANISMS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_SVN_NO_MECHANISMS)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_SVN_EDIT_ABORTED", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_SVN_EDIT_ABORTED)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_AUTHN_CREDS_UNAVAILABLE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_AUTHN_CREDS_UNAVAILABLE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_AUTHN_NO_PROVIDER", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_AUTHN_NO_PROVIDER)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_AUTHN_PROVIDERS_EXHAUSTED", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_AUTHN_PROVIDERS_EXHAUSTED)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_AUTHN_CREDS_NOT_SAVED", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_AUTHN_CREDS_NOT_SAVED)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_AUTHN_FAILED", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_AUTHN_FAILED)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_AUTHZ_ROOT_UNREADABLE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_AUTHZ_ROOT_UNREADABLE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_AUTHZ_UNREADABLE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_AUTHZ_UNREADABLE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_AUTHZ_PARTIALLY_READABLE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_AUTHZ_PARTIALLY_READABLE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_AUTHZ_INVALID_CONFIG", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_AUTHZ_INVALID_CONFIG)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_AUTHZ_UNWRITABLE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_AUTHZ_UNWRITABLE)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_DIFF_DATASOURCE_MODIFIED", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_DIFF_DATASOURCE_MODIFIED)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_SERF_SSPI_INITIALISATION_FAILED", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_SERF_SSPI_INITIALISATION_FAILED)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_SERF_SSL_CERT_UNTRUSTED", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_SERF_SSL_CERT_UNTRUSTED)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_SERF_GSSAPI_INITIALISATION_FAILED", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_SERF_GSSAPI_INITIALISATION_FAILED)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_SERF_WRAPPED_ERROR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_SERF_WRAPPED_ERROR)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_ASSERTION_FAIL", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_ASSERTION_FAIL)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_ASSERTION_ONLY_TRACING_LINKS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_ASSERTION_ONLY_TRACING_LINKS)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_ASN1_OUT_OF_DATA", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_ASN1_OUT_OF_DATA)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_ASN1_UNEXPECTED_TAG", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_ASN1_UNEXPECTED_TAG)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_ASN1_INVALID_LENGTH", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_ASN1_INVALID_LENGTH)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_ASN1_LENGTH_MISMATCH", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_ASN1_LENGTH_MISMATCH)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_ASN1_INVALID_DATA", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_ASN1_INVALID_DATA)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_X509_FEATURE_UNAVAILABLE", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_X509_FEATURE_UNAVAILABLE)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_X509_CERT_INVALID_PEM", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_X509_CERT_INVALID_PEM)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_X509_CERT_INVALID_FORMAT", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_X509_CERT_INVALID_FORMAT)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_X509_CERT_INVALID_VERSION", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_X509_CERT_INVALID_VERSION)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_X509_CERT_INVALID_SERIAL", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_X509_CERT_INVALID_SERIAL)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_X509_CERT_INVALID_ALG", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_X509_CERT_INVALID_ALG)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_X509_CERT_INVALID_NAME", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_X509_CERT_INVALID_NAME)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_X509_CERT_INVALID_DATE", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_X509_CERT_INVALID_DATE)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_X509_CERT_INVALID_PUBKEY", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_X509_CERT_INVALID_PUBKEY)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_X509_CERT_INVALID_SIGNATURE", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_X509_CERT_INVALID_SIGNATURE)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_X509_CERT_INVALID_EXTENSIONS", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_X509_CERT_INVALID_EXTENSIONS)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_X509_CERT_UNKNOWN_VERSION", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_X509_CERT_UNKNOWN_VERSION)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_X509_CERT_UNKNOWN_PK_ALG", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_X509_CERT_UNKNOWN_PK_ALG)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_X509_CERT_SIG_MISMATCH", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_X509_CERT_SIG_MISMATCH)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_X509_CERT_VERIFY_FAILED", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_X509_CERT_VERIFY_FAILED)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_LAST", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_LAST)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_UNALIGNED_ACCESS_IS_OK", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(0)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "TRUE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(1)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "FALSE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(0)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_node_none", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_node_none)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_node_file", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_node_file)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_node_dir", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_node_dir)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_node_unknown", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_node_unknown)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_node_symlink", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_node_symlink)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_tristate_false", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_tristate_false)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_tristate_true", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_tristate_true)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_tristate_unknown", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_tristate_unknown)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_REVNUM_T_FMT", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("ld"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_nonrecursive", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_nonrecursive)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_recursive", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_recursive)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_depth_unknown", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_depth_unknown)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_depth_exclude", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_depth_exclude)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_depth_empty", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_depth_empty)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_depth_files", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_depth_files)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_depth_immediates", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_depth_immediates)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_depth_infinity", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_depth_infinity)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_DIRENT_KIND", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(0x00001)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_DIRENT_SIZE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(0x00002)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_DIRENT_HAS_PROPS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(0x00004)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_DIRENT_CREATED_REV", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(0x00008)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_DIRENT_TIME", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(0x00010)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_DIRENT_LAST_AUTHOR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(0x00020)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_KEYWORD_MAX_LEN", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(255)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_KEYWORD_REVISION_LONG", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("LastChangedRevision"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_KEYWORD_REVISION_SHORT", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("Rev"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_KEYWORD_REVISION_MEDIUM", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("Revision"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_KEYWORD_DATE_LONG", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("LastChangedDate"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_KEYWORD_DATE_SHORT", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("Date"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_KEYWORD_AUTHOR_LONG", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("LastChangedBy"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_KEYWORD_AUTHOR_SHORT", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("Author"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_KEYWORD_URL_LONG", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("HeadURL"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_KEYWORD_URL_SHORT", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("URL"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_KEYWORD_ID", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("Id"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_KEYWORD_HEADER", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("Header"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_STREAM_CHUNK_SIZE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(102400)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN__STREAM_CHUNK_SIZE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(16384)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_ALLOCATOR_RECOMMENDED_MAX_FREE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)((4096*1024))));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_VER_MAJOR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(1)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_VER_MINOR", TRUE | 0x2 | GV_ADDMULTI);
-    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(8)));
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(9)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_VER_PATCH", TRUE | 0x2 | GV_ADDMULTI);
-    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(13)));
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(7)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_VER_MICRO", TRUE | 0x2 | GV_ADDMULTI);
-    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(13)));
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(7)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_VER_LIBRARY", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(1)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_VER_TAG", TRUE | 0x2 | GV_ADDMULTI);
-    sv_setsv(sv, SWIG_FromCharPtr(" (r1667537)"));
+    sv_setsv(sv, SWIG_FromCharPtr(" (r1800392)"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_VER_NUMTAG", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr(""));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_VER_REVISION", TRUE | 0x2 | GV_ADDMULTI);
-    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(1667537)));
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(1800392)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_VER_NUM", TRUE | 0x2 | GV_ADDMULTI);
-    sv_setsv(sv, SWIG_FromCharPtr("1.8.13"));
+    sv_setsv(sv, SWIG_FromCharPtr("1.9.7"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_VER_NUMBER", TRUE | 0x2 | GV_ADDMULTI);
-    sv_setsv(sv, SWIG_FromCharPtr("1.8.13"));
+    sv_setsv(sv, SWIG_FromCharPtr("1.9.7"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_VERSION", TRUE | 0x2 | GV_ADDMULTI);
-    sv_setsv(sv, SWIG_FromCharPtr("1.8.13 (r1667537)"));
+    sv_setsv(sv, SWIG_FromCharPtr("1.9.7 (r1800392)"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_prop_entry_kind", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_prop_entry_kind)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_prop_wc_kind", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_prop_wc_kind)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_prop_regular_kind", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_prop_regular_kind)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_PREFIX", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_BOOLEAN_TRUE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("*"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_MIME_TYPE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:mime-type"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_IGNORE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:ignore"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_EOL_STYLE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:eol-style"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_KEYWORDS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:keywords"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_EXECUTABLE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:executable"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_EXECUTABLE_VALUE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("*"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_NEEDS_LOCK", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:needs-lock"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_NEEDS_LOCK_VALUE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("*"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_SPECIAL", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:special"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_SPECIAL_VALUE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("*"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_EXTERNALS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:externals"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_MERGEINFO", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:mergeinfo"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_INHERITABLE_AUTO_PROPS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:auto-props"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_INHERITABLE_IGNORES", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:global-ignores"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_TEXT_TIME", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:text-time"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_OWNER", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:owner"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_GROUP", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:group"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_UNIX_MODE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:unix-mode"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_WC_PREFIX", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:wc:"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_ENTRY_PREFIX", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:entry:"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_ENTRY_COMMITTED_REV", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:entry:committed-rev"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_ENTRY_COMMITTED_DATE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:entry:committed-date"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_ENTRY_LAST_AUTHOR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:entry:last-author"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_ENTRY_UUID", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:entry:uuid"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_ENTRY_LOCK_TOKEN", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:entry:lock-token"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_CUSTOM_PREFIX", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:custom:"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_REVISION_AUTHOR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:author"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_REVISION_LOG", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:log"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_REVISION_DATE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:date"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_REVISION_ORIG_DATE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:original-date"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_REVISION_AUTOVERSIONED", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:autoversioned"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVNSYNC_PROP_PREFIX", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:sync-"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVNSYNC_PROP_LOCK", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:sync-lock"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVNSYNC_PROP_FROM_URL", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:sync-from-url"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVNSYNC_PROP_FROM_UUID", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:sync-from-uuid"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVNSYNC_PROP_LAST_MERGED_REV", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:sync-last-merged-rev"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVNSYNC_PROP_CURRENTLY_COPYING", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:sync-currently-copying"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_TXN_PREFIX", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:txn-"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_TXN_CLIENT_COMPAT_VERSION", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:txn-client-compat-version"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_TXN_USER_AGENT", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:txn-user-agent"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_REVISION_PREFIX", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:revision-"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_OPT_MAX_ALIASES", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(3)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_OPT_MAX_OPTIONS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(50)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_OPT_FIRST_LONGOPT_ID", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(256)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_opt_revision_unspecified", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_opt_revision_unspecified)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_opt_revision_number", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_opt_revision_number)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_opt_revision_date", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_opt_revision_date)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_opt_revision_committed", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_opt_revision_committed)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_opt_revision_previous", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_opt_revision_previous)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_opt_revision_base", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_opt_revision_base)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_opt_revision_working", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_opt_revision_working)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_opt_revision_head", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_opt_revision_head)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_CRED_SIMPLE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn.simple"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_CRED_USERNAME", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn.username"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_CRED_SSL_CLIENT_CERT", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn.ssl.client-cert"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_CRED_SSL_CLIENT_CERT_PW", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn.ssl.client-passphrase"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_CRED_SSL_SERVER_TRUST", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn.ssl.server"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_SSL_NOTYETVALID", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(0x00000001)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_SSL_EXPIRED", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(0x00000002)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_SSL_CNMISMATCH", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(0x00000004)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_SSL_UNKNOWNCA", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(0x00000008)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_SSL_OTHER", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(0x40000000)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_PARAM_PREFIX", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:auth:"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_PARAM_DEFAULT_USERNAME", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:auth:username"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_PARAM_DEFAULT_PASSWORD", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:auth:password"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_PARAM_NON_INTERACTIVE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:auth:non-interactive"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_PARAM_DONT_STORE_PASSWORDS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:auth:dont-store-passwords"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_PARAM_STORE_PLAINTEXT_PASSWORDS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:auth:store-plaintext-passwords"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_PARAM_DONT_STORE_SSL_CLIENT_CERT_PP", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:auth:dont-store-ssl-client-cert-pp"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_PARAM_STORE_SSL_CLIENT_CERT_PP_PLAINTEXT", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:auth:store-ssl-client-cert-pp-plaintext"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_PARAM_NO_AUTH_CACHE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:auth:no-auth-cache"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_PARAM_SSL_SERVER_FAILURES", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:auth:ssl:failures"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_PARAM_SSL_SERVER_CERT_INFO", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:auth:ssl:cert-info"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_PARAM_CONFIG_CATEGORY_CONFIG", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:auth:config-category-config"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_PARAM_CONFIG_CATEGORY_SERVERS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:auth:config-category-servers"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_PARAM_CONFIG", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:auth:config-category-servers"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_PARAM_SERVER_GROUP", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:auth:server-group"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_PARAM_CONFIG_DIR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:auth:config-dir"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_PARAM_GNOME_KEYRING_UNLOCK_PROMPT_FUNC", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("gnome-keyring-unlock-prompt-func"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_PARAM_GNOME_KEYRING_UNLOCK_PROMPT_BATON", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("gnome-keyring-unlock-prompt-baton"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_CATEGORY_SERVERS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("servers"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_SECTION_GROUPS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("groups"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_SECTION_GLOBAL", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("global"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_HTTP_PROXY_HOST", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("http-proxy-host"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_HTTP_PROXY_PORT", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("http-proxy-port"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_HTTP_PROXY_USERNAME", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("http-proxy-username"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_HTTP_PROXY_PASSWORD", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("http-proxy-password"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_HTTP_PROXY_EXCEPTIONS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("http-proxy-exceptions"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_HTTP_TIMEOUT", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("http-timeout"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_HTTP_COMPRESSION", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("http-compression"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_NEON_DEBUG_MASK", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("neon-debug-mask"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_HTTP_AUTH_TYPES", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("http-auth-types"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_SSL_AUTHORITY_FILES", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("ssl-authority-files"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_SSL_TRUST_DEFAULT_CA", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("ssl-trust-default-ca"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_SSL_CLIENT_CERT_FILE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("ssl-client-cert-file"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_SSL_CLIENT_CERT_PASSWORD", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("ssl-client-cert-password"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_SSL_PKCS11_PROVIDER", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("ssl-pkcs11-provider"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_HTTP_LIBRARY", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("http-library"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_STORE_PASSWORDS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("store-passwords"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_STORE_PLAINTEXT_PASSWORDS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("store-plaintext-passwords"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_STORE_AUTH_CREDS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("store-auth-creds"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_STORE_SSL_CLIENT_CERT_PP", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("store-ssl-client-cert-pp"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_STORE_SSL_CLIENT_CERT_PP_PLAINTEXT", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("store-ssl-client-cert-pp-plaintext"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_USERNAME", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("username"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_HTTP_BULK_UPDATES", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("http-bulk-updates"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_HTTP_MAX_CONNECTIONS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("http-max-connections"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_HTTP_CHUNKED_REQUESTS", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_FromCharPtr("http-chunked-requests"));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_SERF_LOG_COMPONENTS", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_FromCharPtr("serf-log-components"));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_SERF_LOG_LEVEL", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_FromCharPtr("serf-log-level"));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_CATEGORY_CONFIG", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("config"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_SECTION_AUTH", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("auth"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_PASSWORD_STORES", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("password-stores"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_KWALLET_WALLET", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("kwallet-wallet"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_KWALLET_SVN_APPLICATION_NAME_WITH_PID", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("kwallet-svn-application-name-with-pid"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_SSL_CLIENT_CERT_FILE_PROMPT", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("ssl-client-cert-file-prompt"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_SECTION_HELPERS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("helpers"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_EDITOR_CMD", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("editor-cmd"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_DIFF_CMD", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("diff-cmd"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_DIFF_EXTENSIONS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("diff-extensions"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_DIFF3_CMD", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("diff3-cmd"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_DIFF3_HAS_PROGRAM_ARG", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("diff3-has-program-arg"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_MERGE_TOOL_CMD", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("merge-tool-cmd"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_SECTION_MISCELLANY", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("miscellany"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_GLOBAL_IGNORES", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("global-ignores"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_LOG_ENCODING", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("log-encoding"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_USE_COMMIT_TIMES", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("use-commit-times"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_TEMPLATE_ROOT", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("template-root"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_ENABLE_AUTO_PROPS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("enable-auto-props"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_ENABLE_MAGIC_FILE", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_FromCharPtr("enable-magic-file"));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_NO_UNLOCK", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("no-unlock"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_MIMETYPES_FILE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("mime-types-file"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_PRESERVED_CF_EXTS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("preserved-conflict-file-exts"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_INTERACTIVE_CONFLICTS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("interactive-conflicts"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_MEMORY_CACHE_SIZE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("memory-cache-size"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_DIFF_IGNORE_CONTENT_TYPE", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_FromCharPtr("diff-ignore-content-type"));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_SECTION_TUNNELS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("tunnels"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_SECTION_AUTO_PROPS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("auto-props"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_SECTION_WORKING_COPY", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("working-copy"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_SQLITE_EXCLUSIVE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("exclusive-locking"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_SQLITE_EXCLUSIVE_CLIENTS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("exclusive-locking-clients"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_SQLITE_BUSY_TIMEOUT", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_FromCharPtr("busy-timeout"));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_SECTION_GENERAL", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("general"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_ANON_ACCESS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("anon-access"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_AUTH_ACCESS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("auth-access"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_PASSWORD_DB", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("password-db"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_REALM", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("realm"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_AUTHZ_DB", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("authz-db"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_GROUPS_DB", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("groups-db"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_FORCE_USERNAME_CASE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("force-username-case"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_HOOKS_ENV", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("hooks-env"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_SECTION_SASL", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("sasl"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_USE_SASL", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("use-sasl"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_MIN_SSF", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("min-encryption"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_MAX_SSF", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("max-encryption"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_SECTION_USERS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("users"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG__DEFAULT_GLOBAL_IGNORES_LINE_1", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("*.o *.lo *.la *.al .libs *.so *.so.[0-9]* *.a *.pyc *.pyo __pycache__"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG__DEFAULT_GLOBAL_IGNORES_LINE_2", TRUE | 0x2 | GV_ADDMULTI);
-    sv_setsv(sv, SWIG_FromCharPtr("*.rej *~ #*# .#* .*.swp .DS_Store"));
+    sv_setsv(sv, SWIG_FromCharPtr("*.rej *~ #*# .#* .*.swp .DS_Store [Tt]humbs.db"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_DEFAULT_GLOBAL_IGNORES", TRUE | 0x2 | GV_ADDMULTI);
-    sv_setsv(sv, SWIG_FromCharPtr("*.o *.lo *.la *.al .libs *.so *.so.[0-9]* *.a *.pyc *.pyo __pycache__ *.rej *~ #*# .#* .*.swp .DS_Store"));
+    sv_setsv(sv, SWIG_FromCharPtr("*.o *.lo *.la *.al .libs *.so *.so.[0-9]* *.a *.pyc *.pyo __pycache__ *.rej *~ #*# .#* .*.swp .DS_Store [Tt]humbs.db"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_TRUE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("TRUE"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_FALSE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("FALSE"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_ASK", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("ASK"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_DEFAULT_OPTION_STORE_PASSWORDS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(1)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_DEFAULT_OPTION_STORE_PLAINTEXT_PASSWORDS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("ASK"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_DEFAULT_OPTION_STORE_AUTH_CREDS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(1)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_DEFAULT_OPTION_STORE_SSL_CLIENT_CERT_PP", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(1)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_DEFAULT_OPTION_STORE_SSL_CLIENT_CERT_PP_PLAINTEXT", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("ASK"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_DEFAULT_OPTION_HTTP_MAX_CONNECTIONS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(4)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_REALMSTRING_KEY", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("svn:realmstring"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_AUTHN_USERNAME_KEY", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_FromCharPtr("username"));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_AUTHN_PASSWORD_KEY", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_FromCharPtr("password"));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_AUTHN_PASSPHRASE_KEY", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_FromCharPtr("passphrase"));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_AUTHN_PASSTYPE_KEY", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_FromCharPtr("passtype"));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_AUTHN_ASCII_CERT_KEY", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_FromCharPtr("ascii_cert"));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_AUTHN_FAILURES_KEY", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_FromCharPtr("failures"));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_MERGEINFO_NONINHERITABLE_STR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("*"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_mergeinfo_explicit", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_mergeinfo_explicit)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_mergeinfo_inherited", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_mergeinfo_inherited)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_mergeinfo_nearest_ancestor", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_mergeinfo_nearest_ancestor)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_io_file_del_none", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_io_file_del_none)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_io_file_del_on_close", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_io_file_del_on_close)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_io_file_del_on_pool_cleanup", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_io_file_del_on_pool_cleanup)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_checksum_md5", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_checksum_md5)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_checksum_sha1", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_checksum_sha1)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "svn_checksum_fnv1a_32", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_checksum_fnv1a_32)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "svn_checksum_fnv1a_32x4", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_checksum_fnv1a_32x4)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_diff_datasource_original", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_diff_datasource_original)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_diff_datasource_modified", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_diff_datasource_modified)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_diff_datasource_latest", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_diff_datasource_latest)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_diff_datasource_ancestor", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_diff_datasource_ancestor)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_diff_conflict_display_modified_latest", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_diff_conflict_display_modified_latest)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_diff_conflict_display_resolved_modified_latest", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_diff_conflict_display_resolved_modified_latest)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_diff_conflict_display_modified_original_latest", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_diff_conflict_display_modified_original_latest)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_diff_conflict_display_modified", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_diff_conflict_display_modified)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_diff_conflict_display_latest", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_diff_conflict_display_latest)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_diff_conflict_display_only_conflicts", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_diff_conflict_display_only_conflicts)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_diff_file_ignore_space_none", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_diff_file_ignore_space_none)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_diff_file_ignore_space_change", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_diff_file_ignore_space_change)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_diff_file_ignore_space_all", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_diff_file_ignore_space_all)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_diff_op_unchanged", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_diff_op_unchanged)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_diff_op_added", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_diff_op_added)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_diff_op_deleted", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_diff_op_deleted)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_diff_op_copied", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_diff_op_copied)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_diff_op_moved", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_diff_op_moved)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_diff_op_modified", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_diff_op_modified)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_NO_ERROR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(0)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
   
-#if defined(SVN_AVOID_CIRCULAR_LINKAGE_AT_ALL_COSTS_HACK)
-  svn_swig_pl_bind_current_pool_fns (&svn_swig_pl_get_current_pool,
-    &svn_swig_pl_set_current_pool);
-#endif
+  svn_swig_pl__bind_current_pool_fns(&core_get_current_pool,
+    &core_set_current_pool);
   
   ST(0) = &PL_sv_yes;
   XSRETURN(1);
diff --git a/subversion/bindings/swig/perl/native/svn_client.c b/subversion/bindings/swig/perl/native/svn_client.c
index 69d3b7a..4e4dbd0 100644
--- a/subversion/bindings/swig/perl/native/svn_client.c
+++ b/subversion/bindings/swig/perl/native/svn_client.c
@@ -1,11 +1,11 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
- * 
- * This file is not intended to be easily readable and contains a number of 
+ * Version 2.0.12
+ *
+ * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
- * changes to this file unless you know what you are doing--modify the SWIG 
- * interface file instead. 
+ * changes to this file unless you know what you are doing--modify the SWIG
+ * interface file instead.
  * ----------------------------------------------------------------------------- */
 
 #define SWIGPERL
@@ -42,28 +42,28 @@
 #ifndef SWIGUNUSED
 # if defined(__GNUC__)
 #   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__)) 
+#     define SWIGUNUSED __attribute__ ((__unused__))
 #   else
 #     define SWIGUNUSED
 #   endif
 # elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__)) 
+#   define SWIGUNUSED __attribute__ ((__unused__))
 # else
-#   define SWIGUNUSED 
+#   define SWIGUNUSED
 # endif
 #endif
 
 #ifndef SWIG_MSC_UNSUPPRESS_4505
 # if defined(_MSC_VER)
 #   pragma warning(disable : 4505) /* unreferenced local function has been removed */
-# endif 
+# endif
 #endif
 
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
 # else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
 # endif
 #endif
 
@@ -106,7 +106,7 @@
 #   define SWIGSTDCALL __stdcall
 # else
 #   define SWIGSTDCALL
-# endif 
+# endif
 #endif
 
 /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
@@ -144,7 +144,7 @@
   You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for
   creating a static or dynamic library from the SWIG runtime code.
   In 99.9% of the cases, SWIG just needs to declare them as 'static'.
-  
+
   But only do this if strictly necessary, ie, if you have problems
   with your compiler or suchlike.
 */
@@ -170,16 +170,16 @@
 #define SWIG_POINTER_OWN           0x1
 
 
-/* 
+/*
    Flags/methods for returning states.
-   
-   The SWIG conversion methods, as ConvertPtr, return an integer 
+
+   The SWIG conversion methods, as ConvertPtr, return an integer
    that tells if the conversion was successful or not. And if not,
    an error code can be returned (see swigerrors.swg for the codes).
-   
+
    Use the following macros/flags to set or process the returning
    states.
-   
+
    In old versions of SWIG, code such as the following was usually written:
 
      if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) {
@@ -212,23 +212,23 @@
     } else {
       // fail code
     }
-    
+
    I.e., now SWIG_ConvertPtr can return new objects and you can
    identify the case and take care of the deallocation. Of course that
    also requires SWIG_ConvertPtr to return new result values, such as
 
-      int SWIG_ConvertPtr(obj, ptr,...) {         
-        if (<obj is ok>) {			       
-          if (<need new object>) {		       
-            *ptr = <ptr to new allocated object>; 
-            return SWIG_NEWOBJ;		       
-          } else {				       
-            *ptr = <ptr to old object>;	       
-            return SWIG_OLDOBJ;		       
-          } 				       
-        } else {				       
-          return SWIG_BADOBJ;		       
-        }					       
+      int SWIG_ConvertPtr(obj, ptr,...) {
+        if (<obj is ok>) {
+          if (<need new object>) {
+            *ptr = <ptr to new allocated object>;
+            return SWIG_NEWOBJ;
+          } else {
+            *ptr = <ptr to old object>;
+            return SWIG_OLDOBJ;
+          }
+        } else {
+          return SWIG_BADOBJ;
+        }
       }
 
    Of course, returning the plain '0(success)/-1(fail)' still works, but you can be
@@ -242,17 +242,17 @@
        int fooi(int);
 
    and you call
- 
+
       food(1)   // cast rank '1'  (1 -> 1.0)
       fooi(1)   // cast rank '0'
 
    just use the SWIG_AddCast()/SWIG_CheckState()
 */
 
-#define SWIG_OK                    (0) 
+#define SWIG_OK                    (0)
 #define SWIG_ERROR                 (-1)
 #define SWIG_IsOK(r)               (r >= 0)
-#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)  
+#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)
 
 /* The CastRankLimit says how many bits are used for the cast rank */
 #define SWIG_CASTRANKLIMIT         (1 << 8)
@@ -283,14 +283,14 @@
 #  endif
 #  define SWIG_CASTRANKMASK          ((SWIG_CASTRANKLIMIT) -1)
 #  define SWIG_CastRank(r)           (r & SWIG_CASTRANKMASK)
-SWIGINTERNINLINE int SWIG_AddCast(int r) { 
+SWIGINTERNINLINE int SWIG_AddCast(int r) {
   return SWIG_IsOK(r) ? ((SWIG_CastRank(r) < SWIG_MAXCASTRANK) ? (r + 1) : SWIG_ERROR) : r;
 }
-SWIGINTERNINLINE int SWIG_CheckState(int r) { 
-  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0; 
+SWIGINTERNINLINE int SWIG_CheckState(int r) {
+  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0;
 }
 #else /* no cast-rank mode */
-#  define SWIG_AddCast
+#  define SWIG_AddCast(r) (r)
 #  define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0)
 #endif
 
@@ -334,7 +334,7 @@ typedef struct swig_module_info {
   void                    *clientdata;		/* Language specific module data */
 } swig_module_info;
 
-/* 
+/*
   Compare two type names skipping the space characters, therefore
   "char*" == "char *" and "Class<int>" == "Class<int >", etc.
 
@@ -354,18 +354,18 @@ SWIG_TypeNameComp(const char *f1, const char *l1,
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if not equal, 1 if equal
+  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
 */
 SWIGRUNTIME int
-SWIG_TypeEquiv(const char *nb, const char *tb) {
-  int equiv = 0;
+SWIG_TypeCmp(const char *nb, const char *tb) {
+  int equiv = 1;
   const char* te = tb + strlen(tb);
   const char* ne = nb;
-  while (!equiv && *ne) {
+  while (equiv != 0 && *ne) {
     for (nb = ne; *ne; ++ne) {
       if (*ne == '|') break;
     }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
+    equiv = SWIG_TypeNameComp(nb, ne, tb, te);
     if (*ne) ++ne;
   }
   return equiv;
@@ -373,24 +373,13 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
+  Return 0 if not equal, 1 if equal
 */
 SWIGRUNTIME int
-SWIG_TypeCompare(const char *nb, const char *tb) {
-  int equiv = 0;
-  const char* te = tb + strlen(tb);
-  const char* ne = nb;
-  while (!equiv && *ne) {
-    for (nb = ne; *ne; ++ne) {
-      if (*ne == '|') break;
-    }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
-    if (*ne) ++ne;
-  }
-  return equiv;
+SWIG_TypeEquiv(const char *nb, const char *tb) {
+  return SWIG_TypeCmp(nb, tb) == 0 ? 1 : 0;
 }
 
-
 /*
   Check the typename
 */
@@ -418,7 +407,7 @@ SWIG_TypeCheck(const char *c, swig_type_info *ty) {
   return 0;
 }
 
-/* 
+/*
   Identical to SWIG_TypeCheck, except strcmp is replaced with a pointer comparison
 */
 SWIGRUNTIME swig_cast_info *
@@ -453,7 +442,7 @@ SWIG_TypeCast(swig_cast_info *ty, void *ptr, int *newmemory) {
   return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr, newmemory);
 }
 
-/* 
+/*
    Dynamic pointer casting. Down an inheritance hierarchy
 */
 SWIGRUNTIME swig_type_info *
@@ -497,7 +486,7 @@ SWIG_TypePrettyName(const swig_type_info *type) {
     return type->name;
 }
 
-/* 
+/*
    Set the clientdata field for a type
 */
 SWIGRUNTIME void
@@ -505,14 +494,14 @@ SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
   swig_cast_info *cast = ti->cast;
   /* if (ti->clientdata == clientdata) return; */
   ti->clientdata = clientdata;
-  
+
   while (cast) {
     if (!cast->converter) {
       swig_type_info *tc = cast->type;
       if (!tc->clientdata) {
 	SWIG_TypeClientData(tc, clientdata);
       }
-    }    
+    }
     cast = cast->next;
   }
 }
@@ -521,18 +510,18 @@ SWIG_TypeNewClientData(swig_type_info *ti, void *clientdata) {
   SWIG_TypeClientData(ti, clientdata);
   ti->owndata = 1;
 }
-  
+
 /*
   Search for a swig_type_info structure only by mangled name
   Search is a O(log #types)
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_MangledTypeQueryModule(swig_module_info *start, 
-                            swig_module_info *end, 
+SWIG_MangledTypeQueryModule(swig_module_info *start,
+                            swig_module_info *end,
 		            const char *name) {
   swig_module_info *iter = start;
   do {
@@ -541,11 +530,11 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
       register size_t r = iter->size - 1;
       do {
 	/* since l+r >= 0, we can (>> 1) instead (/ 2) */
-	register size_t i = (l + r) >> 1; 
+	register size_t i = (l + r) >> 1;
 	const char *iname = iter->types[i]->name;
 	if (iname) {
 	  register int compare = strcmp(name, iname);
-	  if (compare == 0) {	    
+	  if (compare == 0) {
 	    return iter->types[i];
 	  } else if (compare < 0) {
 	    if (i) {
@@ -570,14 +559,14 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
   Search for a swig_type_info structure for either a mangled name or a human readable name.
   It first searches the mangled names of the types, which is a O(log #types)
   If a type is not found it then searches the human readable names, which is O(#types).
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_TypeQueryModule(swig_module_info *start, 
-                     swig_module_info *end, 
+SWIG_TypeQueryModule(swig_module_info *start,
+                     swig_module_info *end,
 		     const char *name) {
   /* STEP 1: Search the name field using binary search */
   swig_type_info *ret = SWIG_MangledTypeQueryModule(start, end, name);
@@ -596,12 +585,12 @@ SWIG_TypeQueryModule(swig_module_info *start,
       iter = iter->next;
     } while (iter != end);
   }
-  
+
   /* neither found a match */
   return 0;
 }
 
-/* 
+/*
    Pack binary data into a string
 */
 SWIGRUNTIME char *
@@ -617,7 +606,7 @@ SWIG_PackData(char *c, void *ptr, size_t sz) {
   return c;
 }
 
-/* 
+/*
    Unpack binary data from a string
 */
 SWIGRUNTIME const char *
@@ -631,21 +620,21 @@ SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
       uu = ((d - '0') << 4);
     else if ((d >= 'a') && (d <= 'f'))
       uu = ((d - ('a'-10)) << 4);
-    else 
+    else
       return (char *) 0;
     d = *(c++);
     if ((d >= '0') && (d <= '9'))
       uu |= (d - '0');
     else if ((d >= 'a') && (d <= 'f'))
       uu |= (d - ('a'-10));
-    else 
+    else
       return (char *) 0;
     *u = uu;
   }
   return c;
 }
 
-/* 
+/*
    Pack 'void *' into a string buffer.
 */
 SWIGRUNTIME char *
@@ -705,18 +694,18 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 #endif
 
 /*  Errors in SWIG */
-#define  SWIG_UnknownError    	   -1 
-#define  SWIG_IOError        	   -2 
-#define  SWIG_RuntimeError   	   -3 
-#define  SWIG_IndexError     	   -4 
-#define  SWIG_TypeError      	   -5 
-#define  SWIG_DivisionByZero 	   -6 
-#define  SWIG_OverflowError  	   -7 
-#define  SWIG_SyntaxError    	   -8 
-#define  SWIG_ValueError     	   -9 
+#define  SWIG_UnknownError    	   -1
+#define  SWIG_IOError        	   -2
+#define  SWIG_RuntimeError   	   -3
+#define  SWIG_IndexError     	   -4
+#define  SWIG_TypeError      	   -5
+#define  SWIG_DivisionByZero 	   -6
+#define  SWIG_OverflowError  	   -7
+#define  SWIG_SyntaxError    	   -8
+#define  SWIG_ValueError     	   -9
 #define  SWIG_SystemError    	   -10
 #define  SWIG_AttributeError 	   -11
-#define  SWIG_MemoryError    	   -12 
+#define  SWIG_MemoryError    	   -12
 #define  SWIG_NullReferenceError   -13
 
 
@@ -1510,136 +1499,136 @@ SWIG_Perl_SetModule(swig_module_info *module) {
 #define SWIGTYPE_p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[14]
 #define SWIGTYPE_p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[15]
 #define SWIGTYPE_p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[16]
-#define SWIGTYPE_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t swig_types[17]
-#define SWIGTYPE_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[18]
-#define SWIGTYPE_p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[19]
-#define SWIGTYPE_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[20]
-#define SWIGTYPE_p_f_p_void__p_svn_error_t swig_types[21]
-#define SWIGTYPE_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[22]
-#define SWIGTYPE_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[23]
-#define SWIGTYPE_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[24]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void swig_types[25]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[26]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[27]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[28]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_client_info2_t_p_apr_pool_t__p_svn_error_t swig_types[29]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t swig_types[30]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[31]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[32]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t swig_types[33]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void swig_types[34]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void swig_types[35]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t swig_types[36]
-#define SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void swig_types[37]
-#define SWIGTYPE_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[38]
-#define SWIGTYPE_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__svn_io_dirent2_t_p_apr_pool_t__p_svn_error_t swig_types[39]
-#define SWIGTYPE_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t swig_types[40]
-#define SWIGTYPE_p_f_p_void_svn_revnum_t_svn_revnum_t_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[41]
-#define SWIGTYPE_p_int swig_types[42]
-#define SWIGTYPE_p_long swig_types[43]
-#define SWIGTYPE_p_p_apr_array_header_t swig_types[44]
-#define SWIGTYPE_p_p_apr_hash_t swig_types[45]
-#define SWIGTYPE_p_p_char swig_types[46]
-#define SWIGTYPE_p_p_svn_auth_provider_object_t swig_types[47]
-#define SWIGTYPE_p_p_svn_client_commit_info_t swig_types[48]
-#define SWIGTYPE_p_p_svn_client_commit_item3_t swig_types[49]
-#define SWIGTYPE_p_p_svn_client_ctx_t swig_types[50]
-#define SWIGTYPE_p_p_svn_commit_info_t swig_types[51]
-#define SWIGTYPE_p_p_svn_ra_session_t swig_types[52]
-#define SWIGTYPE_p_p_svn_string_t swig_types[53]
-#define SWIGTYPE_p_svn_auth_baton_t swig_types[54]
-#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[55]
-#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[56]
-#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[57]
-#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[58]
-#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[59]
-#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[60]
-#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[61]
-#define SWIGTYPE_p_svn_auth_provider_t swig_types[62]
-#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[63]
-#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[64]
-#define SWIGTYPE_p_svn_checksum_kind_t swig_types[65]
-#define SWIGTYPE_p_svn_checksum_t swig_types[66]
-#define SWIGTYPE_p_svn_client_commit_info_t swig_types[67]
-#define SWIGTYPE_p_svn_client_commit_item2_t swig_types[68]
-#define SWIGTYPE_p_svn_client_commit_item3_t swig_types[69]
-#define SWIGTYPE_p_svn_client_commit_item_t swig_types[70]
-#define SWIGTYPE_p_svn_client_copy_source_t swig_types[71]
-#define SWIGTYPE_p_svn_client_ctx_t swig_types[72]
-#define SWIGTYPE_p_svn_client_diff_summarize_kind_t swig_types[73]
-#define SWIGTYPE_p_svn_client_diff_summarize_t swig_types[74]
-#define SWIGTYPE_p_svn_client_info2_t swig_types[75]
-#define SWIGTYPE_p_svn_client_proplist_item_t swig_types[76]
-#define SWIGTYPE_p_svn_client_status_t swig_types[77]
-#define SWIGTYPE_p_svn_commit_info_t swig_types[78]
-#define SWIGTYPE_p_svn_config_t swig_types[79]
-#define SWIGTYPE_p_svn_delta_editor_t swig_types[80]
-#define SWIGTYPE_p_svn_depth_t swig_types[81]
-#define SWIGTYPE_p_svn_diff_conflict_display_style_t swig_types[82]
-#define SWIGTYPE_p_svn_diff_datasource_e swig_types[83]
-#define SWIGTYPE_p_svn_diff_file_ignore_space_t swig_types[84]
-#define SWIGTYPE_p_svn_diff_file_options_t swig_types[85]
-#define SWIGTYPE_p_svn_diff_fns2_t swig_types[86]
-#define SWIGTYPE_p_svn_diff_fns_t swig_types[87]
-#define SWIGTYPE_p_svn_diff_hunk_t swig_types[88]
-#define SWIGTYPE_p_svn_diff_operation_kind_e swig_types[89]
-#define SWIGTYPE_p_svn_diff_output_fns_t swig_types[90]
-#define SWIGTYPE_p_svn_diff_t swig_types[91]
-#define SWIGTYPE_p_svn_dirent_t swig_types[92]
-#define SWIGTYPE_p_svn_errno_t swig_types[93]
-#define SWIGTYPE_p_svn_error_t swig_types[94]
-#define SWIGTYPE_p_svn_info_t swig_types[95]
-#define SWIGTYPE_p_svn_io_dirent2_t swig_types[96]
-#define SWIGTYPE_p_svn_io_dirent_t swig_types[97]
-#define SWIGTYPE_p_svn_io_file_del_t swig_types[98]
-#define SWIGTYPE_p_svn_location_segment_t swig_types[99]
-#define SWIGTYPE_p_svn_lock_t swig_types[100]
-#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[101]
-#define SWIGTYPE_p_svn_log_changed_path_t swig_types[102]
-#define SWIGTYPE_p_svn_log_entry_t swig_types[103]
-#define SWIGTYPE_p_svn_merge_range_t swig_types[104]
-#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[105]
-#define SWIGTYPE_p_svn_node_kind_t swig_types[106]
-#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[107]
-#define SWIGTYPE_p_svn_opt_revision_t swig_types[108]
-#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[109]
-#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[110]
-#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[111]
-#define SWIGTYPE_p_svn_patch_file_t swig_types[112]
-#define SWIGTYPE_p_svn_patch_t swig_types[113]
-#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[114]
-#define SWIGTYPE_p_svn_prop_kind swig_types[115]
-#define SWIGTYPE_p_svn_prop_patch_t swig_types[116]
-#define SWIGTYPE_p_svn_prop_t swig_types[117]
-#define SWIGTYPE_p_svn_ra_callbacks2_t swig_types[118]
-#define SWIGTYPE_p_svn_ra_callbacks_t swig_types[119]
-#define SWIGTYPE_p_svn_ra_plugin_t swig_types[120]
-#define SWIGTYPE_p_svn_ra_reporter2_t swig_types[121]
-#define SWIGTYPE_p_svn_ra_reporter3_t swig_types[122]
-#define SWIGTYPE_p_svn_ra_reporter_t swig_types[123]
-#define SWIGTYPE_p_svn_ra_session_t swig_types[124]
-#define SWIGTYPE_p_svn_stream_mark_t swig_types[125]
-#define SWIGTYPE_p_svn_stream_t swig_types[126]
-#define SWIGTYPE_p_svn_string_t swig_types[127]
-#define SWIGTYPE_p_svn_stringbuf_t swig_types[128]
-#define SWIGTYPE_p_svn_tristate_t swig_types[129]
-#define SWIGTYPE_p_svn_txdelta_op_t swig_types[130]
-#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[131]
-#define SWIGTYPE_p_svn_txdelta_window_t swig_types[132]
-#define SWIGTYPE_p_svn_version_checklist_t swig_types[133]
-#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[134]
-#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[135]
-#define SWIGTYPE_p_svn_version_extended_t swig_types[136]
-#define SWIGTYPE_p_svn_version_t swig_types[137]
-#define SWIGTYPE_p_svn_wc_adm_access_t swig_types[138]
-#define SWIGTYPE_p_svn_wc_committed_queue_t swig_types[139]
-#define SWIGTYPE_p_svn_wc_conflict_action_t swig_types[140]
-#define SWIGTYPE_p_svn_wc_conflict_choice_t swig_types[141]
-#define SWIGTYPE_p_svn_wc_conflict_description2_t swig_types[142]
-#define SWIGTYPE_p_svn_wc_conflict_description_t swig_types[143]
-#define SWIGTYPE_p_svn_wc_conflict_kind_t swig_types[144]
-#define SWIGTYPE_p_svn_wc_conflict_reason_t swig_types[145]
-#define SWIGTYPE_p_svn_wc_conflict_result_t swig_types[146]
+#define SWIGTYPE_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[17]
+#define SWIGTYPE_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t swig_types[18]
+#define SWIGTYPE_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[19]
+#define SWIGTYPE_p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[20]
+#define SWIGTYPE_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[21]
+#define SWIGTYPE_p_f_p_void__p_svn_error_t swig_types[22]
+#define SWIGTYPE_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[23]
+#define SWIGTYPE_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[24]
+#define SWIGTYPE_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[25]
+#define SWIGTYPE_p_f_p_void_p_q_const__char__int swig_types[26]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void swig_types[27]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[28]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[29]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[30]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_client_info2_t_p_apr_pool_t__p_svn_error_t swig_types[31]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t swig_types[32]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[33]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[34]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t swig_types[35]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void swig_types[36]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void swig_types[37]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t swig_types[38]
+#define SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void swig_types[39]
+#define SWIGTYPE_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[40]
+#define SWIGTYPE_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__svn_io_dirent2_t_p_apr_pool_t__p_svn_error_t swig_types[41]
+#define SWIGTYPE_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t swig_types[42]
+#define SWIGTYPE_p_f_p_void_svn_revnum_t_svn_revnum_t_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[43]
+#define SWIGTYPE_p_int swig_types[44]
+#define SWIGTYPE_p_long swig_types[45]
+#define SWIGTYPE_p_p_apr_array_header_t swig_types[46]
+#define SWIGTYPE_p_p_apr_hash_t swig_types[47]
+#define SWIGTYPE_p_p_char swig_types[48]
+#define SWIGTYPE_p_p_svn_auth_provider_object_t swig_types[49]
+#define SWIGTYPE_p_p_svn_client_commit_info_t swig_types[50]
+#define SWIGTYPE_p_p_svn_client_commit_item3_t swig_types[51]
+#define SWIGTYPE_p_p_svn_client_ctx_t swig_types[52]
+#define SWIGTYPE_p_p_svn_commit_info_t swig_types[53]
+#define SWIGTYPE_p_p_svn_ra_session_t swig_types[54]
+#define SWIGTYPE_p_p_svn_string_t swig_types[55]
+#define SWIGTYPE_p_svn_auth_baton_t swig_types[56]
+#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[57]
+#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[58]
+#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[59]
+#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[60]
+#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[61]
+#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[62]
+#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[63]
+#define SWIGTYPE_p_svn_auth_provider_t swig_types[64]
+#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[65]
+#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[66]
+#define SWIGTYPE_p_svn_checksum_kind_t swig_types[67]
+#define SWIGTYPE_p_svn_checksum_t swig_types[68]
+#define SWIGTYPE_p_svn_client_commit_info_t swig_types[69]
+#define SWIGTYPE_p_svn_client_commit_item2_t swig_types[70]
+#define SWIGTYPE_p_svn_client_commit_item3_t swig_types[71]
+#define SWIGTYPE_p_svn_client_commit_item_t swig_types[72]
+#define SWIGTYPE_p_svn_client_copy_source_t swig_types[73]
+#define SWIGTYPE_p_svn_client_ctx_t swig_types[74]
+#define SWIGTYPE_p_svn_client_diff_summarize_kind_t swig_types[75]
+#define SWIGTYPE_p_svn_client_diff_summarize_t swig_types[76]
+#define SWIGTYPE_p_svn_client_info2_t swig_types[77]
+#define SWIGTYPE_p_svn_client_proplist_item_t swig_types[78]
+#define SWIGTYPE_p_svn_client_status_t swig_types[79]
+#define SWIGTYPE_p_svn_commit_info_t swig_types[80]
+#define SWIGTYPE_p_svn_config_t swig_types[81]
+#define SWIGTYPE_p_svn_delta_editor_t swig_types[82]
+#define SWIGTYPE_p_svn_depth_t swig_types[83]
+#define SWIGTYPE_p_svn_diff_conflict_display_style_t swig_types[84]
+#define SWIGTYPE_p_svn_diff_datasource_e swig_types[85]
+#define SWIGTYPE_p_svn_diff_file_ignore_space_t swig_types[86]
+#define SWIGTYPE_p_svn_diff_file_options_t swig_types[87]
+#define SWIGTYPE_p_svn_diff_fns2_t swig_types[88]
+#define SWIGTYPE_p_svn_diff_fns_t swig_types[89]
+#define SWIGTYPE_p_svn_diff_hunk_t swig_types[90]
+#define SWIGTYPE_p_svn_diff_operation_kind_e swig_types[91]
+#define SWIGTYPE_p_svn_diff_output_fns_t swig_types[92]
+#define SWIGTYPE_p_svn_diff_t swig_types[93]
+#define SWIGTYPE_p_svn_dirent_t swig_types[94]
+#define SWIGTYPE_p_svn_errno_t swig_types[95]
+#define SWIGTYPE_p_svn_error_t swig_types[96]
+#define SWIGTYPE_p_svn_info_t swig_types[97]
+#define SWIGTYPE_p_svn_io_dirent2_t swig_types[98]
+#define SWIGTYPE_p_svn_io_dirent_t swig_types[99]
+#define SWIGTYPE_p_svn_io_file_del_t swig_types[100]
+#define SWIGTYPE_p_svn_location_segment_t swig_types[101]
+#define SWIGTYPE_p_svn_lock_t swig_types[102]
+#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[103]
+#define SWIGTYPE_p_svn_log_changed_path_t swig_types[104]
+#define SWIGTYPE_p_svn_log_entry_t swig_types[105]
+#define SWIGTYPE_p_svn_merge_range_t swig_types[106]
+#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[107]
+#define SWIGTYPE_p_svn_node_kind_t swig_types[108]
+#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[109]
+#define SWIGTYPE_p_svn_opt_revision_t swig_types[110]
+#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[111]
+#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[112]
+#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[113]
+#define SWIGTYPE_p_svn_patch_file_t swig_types[114]
+#define SWIGTYPE_p_svn_patch_t swig_types[115]
+#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[116]
+#define SWIGTYPE_p_svn_prop_kind swig_types[117]
+#define SWIGTYPE_p_svn_prop_patch_t swig_types[118]
+#define SWIGTYPE_p_svn_prop_t swig_types[119]
+#define SWIGTYPE_p_svn_ra_callbacks2_t swig_types[120]
+#define SWIGTYPE_p_svn_ra_callbacks_t swig_types[121]
+#define SWIGTYPE_p_svn_ra_plugin_t swig_types[122]
+#define SWIGTYPE_p_svn_ra_reporter2_t swig_types[123]
+#define SWIGTYPE_p_svn_ra_reporter3_t swig_types[124]
+#define SWIGTYPE_p_svn_ra_reporter_t swig_types[125]
+#define SWIGTYPE_p_svn_ra_session_t swig_types[126]
+#define SWIGTYPE_p_svn_stream_mark_t swig_types[127]
+#define SWIGTYPE_p_svn_stream_t swig_types[128]
+#define SWIGTYPE_p_svn_string_t swig_types[129]
+#define SWIGTYPE_p_svn_stringbuf_t swig_types[130]
+#define SWIGTYPE_p_svn_tristate_t swig_types[131]
+#define SWIGTYPE_p_svn_txdelta_op_t swig_types[132]
+#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[133]
+#define SWIGTYPE_p_svn_txdelta_window_t swig_types[134]
+#define SWIGTYPE_p_svn_version_checklist_t swig_types[135]
+#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[136]
+#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[137]
+#define SWIGTYPE_p_svn_version_extended_t swig_types[138]
+#define SWIGTYPE_p_svn_version_t swig_types[139]
+#define SWIGTYPE_p_svn_wc_adm_access_t swig_types[140]
+#define SWIGTYPE_p_svn_wc_committed_queue_t swig_types[141]
+#define SWIGTYPE_p_svn_wc_conflict_action_t swig_types[142]
+#define SWIGTYPE_p_svn_wc_conflict_choice_t swig_types[143]
+#define SWIGTYPE_p_svn_wc_conflict_description_t swig_types[144]
+#define SWIGTYPE_p_svn_wc_conflict_kind_t swig_types[145]
+#define SWIGTYPE_p_svn_wc_conflict_reason_t swig_types[146]
 #define SWIGTYPE_p_svn_wc_conflict_version_t swig_types[147]
 #define SWIGTYPE_p_svn_wc_context_t swig_types[148]
 #define SWIGTYPE_p_svn_wc_diff_callbacks2_t swig_types[149]
@@ -1678,7 +1667,7 @@ static swig_module_info swig_module = {swig_types, 173, 0, 0, 0, 0};
 #define SWIG_name   "SVN::_Client::boot_SVN___Client"
 #define SWIG_prefix "SVN::_Client::"
 
-#define SWIGVERSION 0x020009 
+#define SWIGVERSION 0x020012 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -2218,6 +2207,7 @@ XS(_wrap_svn_client_get_simple_prompt_provider) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -2280,6 +2270,7 @@ XS(_wrap_svn_client_get_username_prompt_provider) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -2336,6 +2327,7 @@ XS(_wrap_svn_client_get_simple_provider) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 0) || (items > 1)) {
@@ -2376,6 +2368,7 @@ XS(_wrap_svn_client_get_username_provider) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 0) || (items > 1)) {
@@ -2416,6 +2409,7 @@ XS(_wrap_svn_client_get_ssl_server_trust_file_provider) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 0) || (items > 1)) {
@@ -2456,6 +2450,7 @@ XS(_wrap_svn_client_get_ssl_client_cert_file_provider) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 0) || (items > 1)) {
@@ -2496,6 +2491,7 @@ XS(_wrap_svn_client_get_ssl_client_cert_pw_file_provider) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 0) || (items > 1)) {
@@ -2539,6 +2535,7 @@ XS(_wrap_svn_client_get_ssl_server_trust_prompt_provider) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 2)) {
@@ -2594,6 +2591,7 @@ XS(_wrap_svn_client_get_ssl_client_cert_prompt_provider) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -2656,6 +2654,7 @@ XS(_wrap_svn_client_get_ssl_client_cert_pw_prompt_provider) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -2721,6 +2720,7 @@ XS(_wrap_svn_client_proplist_item_t_node_name_set) {
     {
       apr_size_t len;
       char *buf;
+      apr_pool_t *pool;
       
       if (!SvOK(ST(1))) {
         arg2 = NULL;
@@ -2728,8 +2728,9 @@ XS(_wrap_svn_client_proplist_item_t_node_name_set) {
         buf = SvPV(ST(1), len);
         /* Another case of ugly pool handling, this should use the current
                    default pool, or make a new one if it doesn't exist yet */
-        arg2 = svn_stringbuf_ncreate(buf,len,
-          svn_swig_pl_make_pool ((SV *)NULL));
+        pool = svn_swig_pl_make_pool ((SV *)NULL);
+        SPAGAIN;
+        arg2 = svn_stringbuf_ncreate(buf,len, pool);
       } else {
         croak("Not a string");
       }
@@ -2916,6 +2917,7 @@ XS(_wrap_svn_client_proplist_item_dup) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_client_proplist_item_dup(item,pool);");
@@ -5169,6 +5171,7 @@ XS(_wrap_svn_client_commit_item3_create) {
     
     {
       _global_pool = arg1 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 0) || (items > 1)) {
       SWIG_croak("Usage: svn_client_commit_item3_create(pool);");
@@ -5204,6 +5207,7 @@ XS(_wrap_svn_client_commit_item_create) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 0) || (items > 1)) {
@@ -5261,6 +5265,7 @@ XS(_wrap_svn_client_commit_item3_dup) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_client_commit_item3_dup(item,pool);");
@@ -5304,6 +5309,7 @@ XS(_wrap_svn_client_commit_item2_dup) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_client_commit_item2_dup(item,pool);");
@@ -5670,6 +5676,7 @@ XS(_wrap_svn_client_diff_summarize_dup) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_client_diff_summarize_dup(diff,pool);");
@@ -6043,8 +6050,9 @@ XS(_wrap_svn_client_ctx_t_config_set) {
     }
     arg1 = (struct svn_client_ctx_t *)(argp1);
     {
-      arg2 = svn_swig_pl_objs_to_hash_by_name (ST(1), "svn_config_t *",
-        svn_swig_pl_make_pool ((SV *)NULL));
+      apr_pool_t *pool = svn_swig_pl_make_pool ((SV *)NULL);
+      SPAGAIN;
+      arg2 = svn_swig_pl_objs_to_hash_by_name (ST(1), "svn_config_t *", pool);
     }
     if (arg1) (arg1)->config = arg2;
     ST(argvi) = sv_newmortal();
@@ -7195,6 +7203,197 @@ XS(_wrap_svn_client_ctx_t_wc_ctx_get) {
 }
 
 
+XS(_wrap_svn_client_ctx_t_check_tunnel_func_set) {
+  {
+    struct svn_client_ctx_t *arg1 = (struct svn_client_ctx_t *) 0 ;
+    svn_ra_check_tunnel_func_t arg2 = (svn_ra_check_tunnel_func_t) 0 ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    int argvi = 0;
+    dXSARGS;
+    
+    if ((items < 2) || (items > 2)) {
+      SWIG_croak("Usage: svn_client_ctx_t_check_tunnel_func_set(self,check_tunnel_func);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client_ctx_t_check_tunnel_func_set" "', argument " "1"" of type '" "struct svn_client_ctx_t *""'"); 
+    }
+    arg1 = (struct svn_client_ctx_t *)(argp1);
+    {
+      int res = SWIG_ConvertFunctionPtr(ST(1), (void**)(&arg2), SWIGTYPE_p_f_p_void_p_q_const__char__int);
+      if (!SWIG_IsOK(res)) {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_client_ctx_t_check_tunnel_func_set" "', argument " "2"" of type '" "svn_ra_check_tunnel_func_t""'"); 
+      }
+    }
+    if (arg1) (arg1)->check_tunnel_func = arg2;
+    ST(argvi) = sv_newmortal();
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_svn_client_ctx_t_check_tunnel_func_get) {
+  {
+    struct svn_client_ctx_t *arg1 = (struct svn_client_ctx_t *) 0 ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    int argvi = 0;
+    svn_ra_check_tunnel_func_t result;
+    dXSARGS;
+    
+    if ((items < 1) || (items > 1)) {
+      SWIG_croak("Usage: svn_client_ctx_t_check_tunnel_func_get(self);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client_ctx_t_check_tunnel_func_get" "', argument " "1"" of type '" "struct svn_client_ctx_t *""'"); 
+    }
+    arg1 = (struct svn_client_ctx_t *)(argp1);
+    result = (svn_ra_check_tunnel_func_t) ((arg1)->check_tunnel_func);
+    ST(argvi) = SWIG_NewFunctionPtrObj((void *)(result), SWIGTYPE_p_f_p_void_p_q_const__char__int); argvi++ ;
+    
+    XSRETURN(argvi);
+  fail:
+    
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_svn_client_ctx_t_open_tunnel_func_set) {
+  {
+    struct svn_client_ctx_t *arg1 = (struct svn_client_ctx_t *) 0 ;
+    svn_ra_open_tunnel_func_t arg2 = (svn_ra_open_tunnel_func_t) 0 ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    int argvi = 0;
+    dXSARGS;
+    
+    if ((items < 2) || (items > 2)) {
+      SWIG_croak("Usage: svn_client_ctx_t_open_tunnel_func_set(self,open_tunnel_func);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client_ctx_t_open_tunnel_func_set" "', argument " "1"" of type '" "struct svn_client_ctx_t *""'"); 
+    }
+    arg1 = (struct svn_client_ctx_t *)(argp1);
+    {
+      int res = SWIG_ConvertFunctionPtr(ST(1), (void**)(&arg2), SWIGTYPE_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t);
+      if (!SWIG_IsOK(res)) {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_client_ctx_t_open_tunnel_func_set" "', argument " "2"" of type '" "svn_ra_open_tunnel_func_t""'"); 
+      }
+    }
+    if (arg1) (arg1)->open_tunnel_func = arg2;
+    ST(argvi) = sv_newmortal();
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_svn_client_ctx_t_open_tunnel_func_get) {
+  {
+    struct svn_client_ctx_t *arg1 = (struct svn_client_ctx_t *) 0 ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    int argvi = 0;
+    svn_ra_open_tunnel_func_t result;
+    dXSARGS;
+    
+    if ((items < 1) || (items > 1)) {
+      SWIG_croak("Usage: svn_client_ctx_t_open_tunnel_func_get(self);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client_ctx_t_open_tunnel_func_get" "', argument " "1"" of type '" "struct svn_client_ctx_t *""'"); 
+    }
+    arg1 = (struct svn_client_ctx_t *)(argp1);
+    result = (svn_ra_open_tunnel_func_t) ((arg1)->open_tunnel_func);
+    ST(argvi) = SWIG_NewFunctionPtrObj((void *)(result), SWIGTYPE_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t); argvi++ ;
+    
+    XSRETURN(argvi);
+  fail:
+    
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_svn_client_ctx_t_tunnel_baton_set) {
+  {
+    struct svn_client_ctx_t *arg1 = (struct svn_client_ctx_t *) 0 ;
+    void *arg2 = (void *) 0 ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    int res2 ;
+    int argvi = 0;
+    dXSARGS;
+    
+    if ((items < 2) || (items > 2)) {
+      SWIG_croak("Usage: svn_client_ctx_t_tunnel_baton_set(self,tunnel_baton);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client_ctx_t_tunnel_baton_set" "', argument " "1"" of type '" "struct svn_client_ctx_t *""'"); 
+    }
+    arg1 = (struct svn_client_ctx_t *)(argp1);
+    res2 = SWIG_ConvertPtr(ST(1),SWIG_as_voidptrptr(&arg2), 0, SWIG_POINTER_DISOWN);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client_ctx_t_tunnel_baton_set" "', argument " "2"" of type '" "void *""'"); 
+    }
+    if (arg1) (arg1)->tunnel_baton = arg2;
+    ST(argvi) = sv_newmortal();
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_svn_client_ctx_t_tunnel_baton_get) {
+  {
+    struct svn_client_ctx_t *arg1 = (struct svn_client_ctx_t *) 0 ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    int argvi = 0;
+    void *result = 0 ;
+    dXSARGS;
+    
+    if ((items < 1) || (items > 1)) {
+      SWIG_croak("Usage: svn_client_ctx_t_tunnel_baton_get(self);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client_ctx_t_tunnel_baton_get" "', argument " "1"" of type '" "struct svn_client_ctx_t *""'"); 
+    }
+    arg1 = (struct svn_client_ctx_t *)(argp1);
+    result = (void *) ((arg1)->tunnel_baton);
+    ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 | 0); argvi++ ;
+    
+    XSRETURN(argvi);
+  fail:
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_new_svn_client_ctx_t) {
   {
     int argvi = 0;
@@ -7265,6 +7464,7 @@ XS(_wrap_svn_client_create_context2) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 2)) {
@@ -7334,6 +7534,7 @@ XS(_wrap_svn_client_create_context) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 0) || (items > 1)) {
@@ -7408,6 +7609,7 @@ XS(_wrap_svn_client_args_to_target_array2) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 4) || (items > 5)) {
@@ -7501,6 +7703,7 @@ XS(_wrap_svn_client_args_to_target_array) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 3) || (items > 4)) {
@@ -7603,6 +7806,7 @@ XS(_wrap_svn_client_checkout3) {
     
     {
       _global_pool = arg10 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 8) || (items > 9)) {
@@ -7619,10 +7823,18 @@ XS(_wrap_svn_client_checkout3) {
     }
     arg3 = (char *)(buf3);
     {
-      arg4 = svn_swig_pl_set_revision(&rev4, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg4 = svn_swig_pl_set_revision(&rev4, ST(2), TRUE, _global_pool);
     }
     {
-      arg5 = svn_swig_pl_set_revision(&rev5, ST(3), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg5 = svn_swig_pl_set_revision(&rev5, ST(3), TRUE, _global_pool);
     }
     ecode6 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(4), &val6);
     if (!SWIG_IsOK(ecode6)) {
@@ -7746,6 +7958,7 @@ XS(_wrap_svn_client_checkout2) {
     
     {
       _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 7) || (items > 8)) {
@@ -7762,10 +7975,18 @@ XS(_wrap_svn_client_checkout2) {
     }
     arg3 = (char *)(buf3);
     {
-      arg4 = svn_swig_pl_set_revision(&rev4, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg4 = svn_swig_pl_set_revision(&rev4, ST(2), TRUE, _global_pool);
     }
     {
-      arg5 = svn_swig_pl_set_revision(&rev5, ST(3), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg5 = svn_swig_pl_set_revision(&rev5, ST(3), TRUE, _global_pool);
     }
     ecode6 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(4), &val6);
     if (!SWIG_IsOK(ecode6)) {
@@ -7877,6 +8098,7 @@ XS(_wrap_svn_client_checkout) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 5) || (items > 6)) {
@@ -7893,7 +8115,11 @@ XS(_wrap_svn_client_checkout) {
     }
     arg3 = (char *)(buf3);
     {
-      arg4 = svn_swig_pl_set_revision(&rev4, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg4 = svn_swig_pl_set_revision(&rev4, ST(2), TRUE, _global_pool);
     }
     ecode5 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(3), &val5);
     if (!SWIG_IsOK(ecode5)) {
@@ -7998,17 +8224,22 @@ XS(_wrap_svn_client_update4) {
     
     {
       _global_pool = arg11 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 9) || (items > 10)) {
       SWIG_croak("Usage: svn_client_update4(paths,revision,depth,depth_is_sticky,ignore_externals,allow_unver_obstructions,adds_as_modification,make_parents,ctx,pool);");
     }
     {
-      arg2 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(0),
+      arg2 = svn_swig_pl_strings_to_array(ST(0),
         _global_pool);
     }
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(1), TRUE, _global_pool);
     }
     ecode4 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(2), &val4);
     if (!SWIG_IsOK(ecode4)) {
@@ -8137,17 +8368,22 @@ XS(_wrap_svn_client_update3) {
     
     {
       _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 7) || (items > 8)) {
       SWIG_croak("Usage: svn_client_update3(paths,revision,depth,depth_is_sticky,ignore_externals,allow_unver_obstructions,ctx,pool);");
     }
     {
-      arg2 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(0),
+      arg2 = svn_swig_pl_strings_to_array(ST(0),
         _global_pool);
     }
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(1), TRUE, _global_pool);
     }
     ecode4 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(2), &val4);
     if (!SWIG_IsOK(ecode4)) {
@@ -8256,17 +8492,22 @@ XS(_wrap_svn_client_update2) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 5) || (items > 6)) {
       SWIG_croak("Usage: svn_client_update2(paths,revision,recurse,ignore_externals,ctx,pool);");
     }
     {
-      arg2 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(0),
+      arg2 = svn_swig_pl_strings_to_array(ST(0),
         _global_pool);
     }
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(1), TRUE, _global_pool);
     }
     ecode4 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(2), &val4);
     if (!SWIG_IsOK(ecode4)) {
@@ -8362,6 +8603,7 @@ XS(_wrap_svn_client_update) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 4) || (items > 5)) {
@@ -8373,7 +8615,11 @@ XS(_wrap_svn_client_update) {
     }
     arg2 = (char *)(buf2);
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(1), TRUE, _global_pool);
     }
     ecode4 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(2), &val4);
     if (!SWIG_IsOK(ecode4)) {
@@ -8483,6 +8729,7 @@ XS(_wrap_svn_client_switch3) {
     
     {
       _global_pool = arg12 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 10) || (items > 11)) {
@@ -8499,10 +8746,18 @@ XS(_wrap_svn_client_switch3) {
     }
     arg3 = (char *)(buf3);
     {
-      arg4 = svn_swig_pl_set_revision(&rev4, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg4 = svn_swig_pl_set_revision(&rev4, ST(2), TRUE, _global_pool);
     }
     {
-      arg5 = svn_swig_pl_set_revision(&rev5, ST(3), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg5 = svn_swig_pl_set_revision(&rev5, ST(3), TRUE, _global_pool);
     }
     ecode6 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(4), &val6);
     if (!SWIG_IsOK(ecode6)) {
@@ -8646,6 +8901,7 @@ XS(_wrap_svn_client_switch2) {
     
     {
       _global_pool = arg11 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 9) || (items > 10)) {
@@ -8662,10 +8918,18 @@ XS(_wrap_svn_client_switch2) {
     }
     arg3 = (char *)(buf3);
     {
-      arg4 = svn_swig_pl_set_revision(&rev4, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg4 = svn_swig_pl_set_revision(&rev4, ST(2), TRUE, _global_pool);
     }
     {
-      arg5 = svn_swig_pl_set_revision(&rev5, ST(3), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg5 = svn_swig_pl_set_revision(&rev5, ST(3), TRUE, _global_pool);
     }
     ecode6 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(4), &val6);
     if (!SWIG_IsOK(ecode6)) {
@@ -8791,6 +9055,7 @@ XS(_wrap_svn_client_switch) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 5) || (items > 6)) {
@@ -8807,7 +9072,11 @@ XS(_wrap_svn_client_switch) {
     }
     arg3 = (char *)(buf3);
     {
-      arg4 = svn_swig_pl_set_revision(&rev4, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg4 = svn_swig_pl_set_revision(&rev4, ST(2), TRUE, _global_pool);
     }
     ecode5 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(3), &val5);
     if (!SWIG_IsOK(ecode5)) {
@@ -8908,6 +9177,7 @@ XS(_wrap_svn_client_add5) {
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 7) || (items > 8)) {
       SWIG_croak("Usage: svn_client_add5(path,depth,force,no_ignore,no_autoprops,add_parents,ctx,scratch_pool);");
@@ -9024,6 +9294,7 @@ XS(_wrap_svn_client_add4) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 6) || (items > 7)) {
       SWIG_croak("Usage: svn_client_add4(path,depth,force,no_ignore,add_parents,ctx,pool);");
@@ -9130,6 +9401,7 @@ XS(_wrap_svn_client_add3) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 5) || (items > 6)) {
       SWIG_croak("Usage: svn_client_add3(path,recursive,force,no_ignore,ctx,pool);");
@@ -9226,6 +9498,7 @@ XS(_wrap_svn_client_add2) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_client_add2(path,recursive,force,ctx,pool);");
@@ -9312,6 +9585,7 @@ XS(_wrap_svn_client_add) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_client_add(path,recursive,ctx,pool);");
@@ -9391,12 +9665,13 @@ XS(_wrap_svn_client_mkdir4) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 5) || (items > 6)) {
       SWIG_croak("Usage: svn_client_mkdir4(paths,make_parents,revprop_table,commit_callback,commit_baton,ctx,pool);");
     }
     {
-      arg1 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(0),
+      arg1 = svn_swig_pl_strings_to_array(ST(0),
         _global_pool);
     }
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
@@ -9405,8 +9680,10 @@ XS(_wrap_svn_client_mkdir4) {
     } 
     arg2 = (svn_boolean_t)(val2);
     {
-      if (_global_pool == NULL)
-      _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
       arg3 = svn_swig_pl_hash_to_prophash(ST(2), _global_pool);  
     }
     {
@@ -9481,13 +9758,14 @@ XS(_wrap_svn_client_mkdir3) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_client_mkdir3(paths,make_parents,revprop_table,ctx,pool);");
     }
     {
-      arg2 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(0),
+      arg2 = svn_swig_pl_strings_to_array(ST(0),
         _global_pool);
     }
     ecode3 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val3);
@@ -9496,8 +9774,10 @@ XS(_wrap_svn_client_mkdir3) {
     } 
     arg3 = (svn_boolean_t)(val3);
     {
-      if (_global_pool == NULL)
-      _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
       arg4 = svn_swig_pl_hash_to_prophash(ST(2), _global_pool);  
     }
     res5 = SWIG_ConvertPtr(ST(3), &argp5,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
@@ -9568,13 +9848,14 @@ XS(_wrap_svn_client_mkdir2) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_client_mkdir2(paths,ctx,pool);");
     }
     {
-      arg2 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(0),
+      arg2 = svn_swig_pl_strings_to_array(ST(0),
         _global_pool);
     }
     res3 = SWIG_ConvertPtr(ST(1), &argp3,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
@@ -9641,13 +9922,14 @@ XS(_wrap_svn_client_mkdir) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_client_mkdir(paths,ctx,pool);");
     }
     {
-      arg2 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(0),
+      arg2 = svn_swig_pl_strings_to_array(ST(0),
         _global_pool);
     }
     res3 = SWIG_ConvertPtr(ST(1), &argp3,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
@@ -9725,12 +10007,13 @@ XS(_wrap_svn_client_delete4) {
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 6) || (items > 7)) {
       SWIG_croak("Usage: svn_client_delete4(paths,force,keep_local,revprop_table,commit_callback,commit_baton,ctx,pool);");
     }
     {
-      arg1 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(0),
+      arg1 = svn_swig_pl_strings_to_array(ST(0),
         _global_pool);
     }
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
@@ -9744,8 +10027,10 @@ XS(_wrap_svn_client_delete4) {
     } 
     arg3 = (svn_boolean_t)(val3);
     {
-      if (_global_pool == NULL)
-      _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
       arg4 = svn_swig_pl_hash_to_prophash(ST(3), _global_pool);  
     }
     {
@@ -9825,13 +10110,14 @@ XS(_wrap_svn_client_delete3) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 5) || (items > 6)) {
       SWIG_croak("Usage: svn_client_delete3(paths,force,keep_local,revprop_table,ctx,pool);");
     }
     {
-      arg2 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(0),
+      arg2 = svn_swig_pl_strings_to_array(ST(0),
         _global_pool);
     }
     ecode3 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val3);
@@ -9845,8 +10131,10 @@ XS(_wrap_svn_client_delete3) {
     } 
     arg4 = (svn_boolean_t)(val4);
     {
-      if (_global_pool == NULL)
-      _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
       arg5 = svn_swig_pl_hash_to_prophash(ST(3), _global_pool);  
     }
     res6 = SWIG_ConvertPtr(ST(4), &argp6,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
@@ -9922,13 +10210,14 @@ XS(_wrap_svn_client_delete2) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_client_delete2(paths,force,ctx,pool);");
     }
     {
-      arg2 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(0),
+      arg2 = svn_swig_pl_strings_to_array(ST(0),
         _global_pool);
     }
     ecode3 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val3);
@@ -10005,13 +10294,14 @@ XS(_wrap_svn_client_delete) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_client_delete(paths,force,ctx,pool);");
     }
     {
-      arg2 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(0),
+      arg2 = svn_swig_pl_strings_to_array(ST(0),
         _global_pool);
     }
     ecode3 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val3);
@@ -10112,6 +10402,7 @@ XS(_wrap_svn_client_import5) {
     
     {
       _global_pool = arg13 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 11) || (items > 12)) {
       SWIG_croak("Usage: svn_client_import5(path,url,depth,no_ignore,no_autoprops,ignore_unknown_node_types,revprop_table,filter_callback,filter_baton,commit_callback,commit_baton,ctx,scratch_pool);");
@@ -10147,8 +10438,10 @@ XS(_wrap_svn_client_import5) {
     } 
     arg6 = (svn_boolean_t)(val6);
     {
-      if (_global_pool == NULL)
-      _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
       arg7 = svn_swig_pl_hash_to_prophash(ST(6), _global_pool);  
     }
     {
@@ -10258,6 +10551,7 @@ XS(_wrap_svn_client_import4) {
     
     {
       _global_pool = arg10 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 8) || (items > 9)) {
       SWIG_croak("Usage: svn_client_import4(path,url,depth,no_ignore,ignore_unknown_node_types,revprop_table,commit_callback,commit_baton,ctx,pool);");
@@ -10288,8 +10582,10 @@ XS(_wrap_svn_client_import4) {
     } 
     arg5 = (svn_boolean_t)(val5);
     {
-      if (_global_pool == NULL)
-      _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
       arg6 = svn_swig_pl_hash_to_prophash(ST(5), _global_pool);  
     }
     {
@@ -10383,6 +10679,7 @@ XS(_wrap_svn_client_import3) {
     
     {
       _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 7) || (items > 8)) {
@@ -10414,8 +10711,10 @@ XS(_wrap_svn_client_import3) {
     } 
     arg6 = (svn_boolean_t)(val6);
     {
-      if (_global_pool == NULL)
-      _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
       arg7 = svn_swig_pl_hash_to_prophash(ST(5), _global_pool);  
     }
     res8 = SWIG_ConvertPtr(ST(6), &argp8,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
@@ -10505,6 +10804,7 @@ XS(_wrap_svn_client_import2) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 5) || (items > 6)) {
@@ -10610,6 +10910,7 @@ XS(_wrap_svn_client_import) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 4) || (items > 5)) {
@@ -10722,12 +11023,13 @@ XS(_wrap_svn_client_commit6) {
     
     {
       _global_pool = arg13 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 11) || (items > 12)) {
       SWIG_croak("Usage: svn_client_commit6(targets,depth,keep_locks,keep_changelists,commit_as_operations,include_file_externals,include_dir_externals,changelists,revprop_table,commit_callback,commit_baton,ctx,pool);");
     }
     {
-      arg1 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(0),
+      arg1 = svn_swig_pl_strings_to_array(ST(0),
         _global_pool);
     }
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
@@ -10761,12 +11063,14 @@ XS(_wrap_svn_client_commit6) {
     } 
     arg7 = (svn_boolean_t)(val7);
     {
-      arg8 = SvOK(ST(7)) ? (apr_array_header_t *) svn_swig_pl_strings_to_array(
+      arg8 = SvOK(ST(7)) ? svn_swig_pl_strings_to_array(
         ST(7), _global_pool) : NULL;
     }
     {
-      if (_global_pool == NULL)
-      _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
       arg9 = svn_swig_pl_hash_to_prophash(ST(8), _global_pool);  
     }
     {
@@ -10863,12 +11167,13 @@ XS(_wrap_svn_client_commit5) {
     
     {
       _global_pool = arg11 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 9) || (items > 10)) {
       SWIG_croak("Usage: svn_client_commit5(targets,depth,keep_locks,keep_changelists,commit_as_operations,changelists,revprop_table,commit_callback,commit_baton,ctx,pool);");
     }
     {
-      arg1 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(0),
+      arg1 = svn_swig_pl_strings_to_array(ST(0),
         _global_pool);
     }
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
@@ -10892,12 +11197,14 @@ XS(_wrap_svn_client_commit5) {
     } 
     arg5 = (svn_boolean_t)(val5);
     {
-      arg6 = SvOK(ST(5)) ? (apr_array_header_t *) svn_swig_pl_strings_to_array(
+      arg6 = SvOK(ST(5)) ? svn_swig_pl_strings_to_array(
         ST(5), _global_pool) : NULL;
     }
     {
-      if (_global_pool == NULL)
-      _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
       arg7 = svn_swig_pl_hash_to_prophash(ST(6), _global_pool);  
     }
     {
@@ -10987,13 +11294,14 @@ XS(_wrap_svn_client_commit4) {
     
     {
       _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 7) || (items > 8)) {
       SWIG_croak("Usage: svn_client_commit4(targets,depth,keep_locks,keep_changelists,changelists,revprop_table,ctx,pool);");
     }
     {
-      arg2 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(0),
+      arg2 = svn_swig_pl_strings_to_array(ST(0),
         _global_pool);
     }
     ecode3 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val3);
@@ -11012,12 +11320,14 @@ XS(_wrap_svn_client_commit4) {
     } 
     arg5 = (svn_boolean_t)(val5);
     {
-      arg6 = SvOK(ST(4)) ? (apr_array_header_t *) svn_swig_pl_strings_to_array(
+      arg6 = SvOK(ST(4)) ? svn_swig_pl_strings_to_array(
         ST(4), _global_pool) : NULL;
     }
     {
-      if (_global_pool == NULL)
-      _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
       arg7 = svn_swig_pl_hash_to_prophash(ST(5), _global_pool);  
     }
     res8 = SWIG_ConvertPtr(ST(6), &argp8,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
@@ -11100,13 +11410,14 @@ XS(_wrap_svn_client_commit3) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_client_commit3(targets,recurse,keep_locks,ctx,pool);");
     }
     {
-      arg2 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(0),
+      arg2 = svn_swig_pl_strings_to_array(ST(0),
         _global_pool);
     }
     ecode3 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val3);
@@ -11193,13 +11504,14 @@ XS(_wrap_svn_client_commit2) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_client_commit2(targets,recurse,keep_locks,ctx,pool);");
     }
     {
-      arg2 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(0),
+      arg2 = svn_swig_pl_strings_to_array(ST(0),
         _global_pool);
     }
     ecode3 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val3);
@@ -11287,13 +11599,14 @@ XS(_wrap_svn_client_commit) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_client_commit(targets,nonrecursive,ctx,pool);");
     }
     {
-      arg2 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(0),
+      arg2 = svn_swig_pl_strings_to_array(ST(0),
         _global_pool);
     }
     ecode3 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val3);
@@ -11549,10 +11862,9 @@ XS(_wrap_svn_client_status_t_filesize_get) {
     arg1 = (struct svn_client_status_t *)(argp1);
     result =  ((arg1)->filesize);
     {
-      char temp[256];
+      char temp[30];
       sprintf(temp, "%" APR_INT64_T_FMT, (apr_int64_t) result);
-      ST(argvi) = sv_newmortal();
-      sv_setpv((SV*)ST(argvi++), temp);
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = sv_2mortal(newSVpv(temp, 0)); argvi++  ;
     }
     
     XSRETURN(argvi);
@@ -12423,10 +12735,9 @@ XS(_wrap_svn_client_status_t_changed_date_get) {
     arg1 = (struct svn_client_status_t *)(argp1);
     result =  ((arg1)->changed_date);
     {
-      char temp[256];
+      char temp[30];
       sprintf(temp, "%" APR_INT64_T_FMT, (apr_int64_t) result);
-      ST(argvi) = sv_newmortal();
-      sv_setpv((SV*)ST(argvi++), temp);
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = sv_2mortal(newSVpv(temp, 0)); argvi++  ;
     }
     
     XSRETURN(argvi);
@@ -13289,10 +13600,9 @@ XS(_wrap_svn_client_status_t_ood_changed_date_get) {
     arg1 = (struct svn_client_status_t *)(argp1);
     result =  ((arg1)->ood_changed_date);
     {
-      char temp[256];
+      char temp[30];
       sprintf(temp, "%" APR_INT64_T_FMT, (apr_int64_t) result);
-      ST(argvi) = sv_newmortal();
-      sv_setpv((SV*)ST(argvi++), temp);
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = sv_2mortal(newSVpv(temp, 0)); argvi++  ;
     }
     
     XSRETURN(argvi);
@@ -13653,6 +13963,7 @@ XS(_wrap_svn_client_status_dup) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_client_status_dup(status,result_pool);");
@@ -13683,6 +13994,198 @@ XS(_wrap_svn_client_status_dup) {
 }
 
 
+XS(_wrap_svn_client_status6) {
+  {
+    svn_revnum_t *arg1 = (svn_revnum_t *) 0 ;
+    svn_client_ctx_t *arg2 = (svn_client_ctx_t *) 0 ;
+    char *arg3 = (char *) 0 ;
+    svn_opt_revision_t *arg4 = (svn_opt_revision_t *) 0 ;
+    svn_depth_t arg5 ;
+    svn_boolean_t arg6 ;
+    svn_boolean_t arg7 ;
+    svn_boolean_t arg8 ;
+    svn_boolean_t arg9 ;
+    svn_boolean_t arg10 ;
+    svn_boolean_t arg11 ;
+    apr_array_header_t *arg12 = (apr_array_header_t *) 0 ;
+    svn_client_status_func_t arg13 = (svn_client_status_func_t) 0 ;
+    void *arg14 = (void *) 0 ;
+    apr_pool_t *arg15 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    svn_revnum_t temp1 ;
+    int res1 = SWIG_TMPOBJ ;
+    void *argp2 = 0 ;
+    int res2 = 0 ;
+    int res3 ;
+    char *buf3 = 0 ;
+    int alloc3 = 0 ;
+    svn_opt_revision_t rev4 ;
+    int val5 ;
+    int ecode5 = 0 ;
+    int val6 ;
+    int ecode6 = 0 ;
+    int val7 ;
+    int ecode7 = 0 ;
+    int val8 ;
+    int ecode8 = 0 ;
+    int val9 ;
+    int ecode9 = 0 ;
+    int val10 ;
+    int ecode10 = 0 ;
+    int val11 ;
+    int ecode11 = 0 ;
+    int res14 ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg15 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    arg1 = &temp1;
+    if ((items < 13) || (items > 14)) {
+      SWIG_croak("Usage: svn_client_status6(ctx,path,revision,depth,get_all,check_out_of_date,check_working_copy,no_ignore,ignore_externals,depth_as_sticky,changelists,status_func,status_baton,scratch_pool);");
+    }
+    res2 = SWIG_ConvertPtr(ST(0), &argp2,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client_status6" "', argument " "2"" of type '" "svn_client_ctx_t *""'"); 
+    }
+    arg2 = (svn_client_ctx_t *)(argp2);
+    res3 = SWIG_AsCharPtrAndSize(ST(1), &buf3, NULL, &alloc3);
+    if (!SWIG_IsOK(res3)) {
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_client_status6" "', argument " "3"" of type '" "char const *""'");
+    }
+    arg3 = (char *)(buf3);
+    {
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg4 = svn_swig_pl_set_revision(&rev4, ST(2), TRUE, _global_pool);
+    }
+    ecode5 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(3), &val5);
+    if (!SWIG_IsOK(ecode5)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "svn_client_status6" "', argument " "5"" of type '" "svn_depth_t""'");
+    } 
+    arg5 = (svn_depth_t)(val5);
+    ecode6 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(4), &val6);
+    if (!SWIG_IsOK(ecode6)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "svn_client_status6" "', argument " "6"" of type '" "svn_boolean_t""'");
+    } 
+    arg6 = (svn_boolean_t)(val6);
+    ecode7 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(5), &val7);
+    if (!SWIG_IsOK(ecode7)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "svn_client_status6" "', argument " "7"" of type '" "svn_boolean_t""'");
+    } 
+    arg7 = (svn_boolean_t)(val7);
+    ecode8 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(6), &val8);
+    if (!SWIG_IsOK(ecode8)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode8), "in method '" "svn_client_status6" "', argument " "8"" of type '" "svn_boolean_t""'");
+    } 
+    arg8 = (svn_boolean_t)(val8);
+    ecode9 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(7), &val9);
+    if (!SWIG_IsOK(ecode9)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode9), "in method '" "svn_client_status6" "', argument " "9"" of type '" "svn_boolean_t""'");
+    } 
+    arg9 = (svn_boolean_t)(val9);
+    ecode10 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(8), &val10);
+    if (!SWIG_IsOK(ecode10)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode10), "in method '" "svn_client_status6" "', argument " "10"" of type '" "svn_boolean_t""'");
+    } 
+    arg10 = (svn_boolean_t)(val10);
+    ecode11 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(9), &val11);
+    if (!SWIG_IsOK(ecode11)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode11), "in method '" "svn_client_status6" "', argument " "11"" of type '" "svn_boolean_t""'");
+    } 
+    arg11 = (svn_boolean_t)(val11);
+    {
+      arg12 = SvOK(ST(10)) ? svn_swig_pl_strings_to_array(
+        ST(10), _global_pool) : NULL;
+    }
+    {
+      int res = SWIG_ConvertFunctionPtr(ST(11), (void**)(&arg13), SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t);
+      if (!SWIG_IsOK(res)) {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_client_status6" "', argument " "13"" of type '" "svn_client_status_func_t""'"); 
+      }
+    }
+    res14 = SWIG_ConvertPtr(ST(12),SWIG_as_voidptrptr(&arg14), 0, 0);
+    if (!SWIG_IsOK(res14)) {
+      SWIG_exception_fail(SWIG_ArgError(res14), "in method '" "svn_client_status6" "', argument " "14"" of type '" "void *""'"); 
+    }
+    if (items > 13) {
+      
+    }
+    {
+      if (!arg4) {
+        SWIG_exception(SWIG_ValueError,"Received a NULL pointer.");
+      }
+    }
+    {
+      result = (svn_error_t *)svn_client_status6(arg1,arg2,(char const *)arg3,(struct svn_opt_revision_t const *)arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11,(apr_array_header_t const *)arg12,arg13,arg14,arg15);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    if (SWIG_IsTmpObj(res1)) {
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_From_long  SWIG_PERL_CALL_ARGS_1((*arg1)); argvi++  ;
+    } else {
+      int new_flags = SWIG_IsNewObj(res1) ? (SWIG_POINTER_OWN | 0) : 0;
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj((void*)(arg1), SWIGTYPE_p_long, new_flags); argvi++  ;
+    }
+    
+    
+    if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_svn_client_status5) {
   {
     svn_revnum_t *arg1 = (svn_revnum_t *) 0 ;
@@ -13727,6 +14230,7 @@ XS(_wrap_svn_client_status5) {
     
     {
       _global_pool = arg14 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 12) || (items > 13)) {
@@ -13743,7 +14247,11 @@ XS(_wrap_svn_client_status5) {
     }
     arg3 = (char *)(buf3);
     {
-      arg4 = svn_swig_pl_set_revision(&rev4, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg4 = svn_swig_pl_set_revision(&rev4, ST(2), TRUE, _global_pool);
     }
     ecode5 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(3), &val5);
     if (!SWIG_IsOK(ecode5)) {
@@ -13776,7 +14284,7 @@ XS(_wrap_svn_client_status5) {
     } 
     arg10 = (svn_boolean_t)(val10);
     {
-      arg11 = SvOK(ST(9)) ? (apr_array_header_t *) svn_swig_pl_strings_to_array(
+      arg11 = SvOK(ST(9)) ? svn_swig_pl_strings_to_array(
         ST(9), _global_pool) : NULL;
     }
     {
@@ -13900,6 +14408,7 @@ XS(_wrap_svn_client_status4) {
     
     {
       _global_pool = arg13 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 10) || (items > 11)) {
@@ -13911,10 +14420,14 @@ XS(_wrap_svn_client_status4) {
     }
     arg2 = (char *)(buf2);
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(1), TRUE, _global_pool);
     }
     {
-      arg4 = svn_swig_pl_status_func3;
+      arg4 = (svn_wc_status_func3_t) svn_swig_pl_status_func3;
       arg5 = ST(2);
     }
     ecode6 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(3), &val6);
@@ -13943,7 +14456,7 @@ XS(_wrap_svn_client_status4) {
     } 
     arg10 = (svn_boolean_t)(val10);
     {
-      arg11 = SvOK(ST(8)) ? (apr_array_header_t *) svn_swig_pl_strings_to_array(
+      arg11 = SvOK(ST(8)) ? svn_swig_pl_strings_to_array(
         ST(8), _global_pool) : NULL;
     }
     res12 = SWIG_ConvertPtr(ST(9), &argp12,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
@@ -14056,6 +14569,7 @@ XS(_wrap_svn_client_status3) {
     
     {
       _global_pool = arg13 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 10) || (items > 11)) {
@@ -14067,10 +14581,14 @@ XS(_wrap_svn_client_status3) {
     }
     arg2 = (char *)(buf2);
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(1), TRUE, _global_pool);
     }
     {
-      arg4 = svn_swig_pl_status_func2;
+      arg4 = (svn_wc_status_func2_t) svn_swig_pl_status_func2;
       arg5 = ST(2);
     }
     ecode6 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(3), &val6);
@@ -14099,7 +14617,7 @@ XS(_wrap_svn_client_status3) {
     } 
     arg10 = (svn_boolean_t)(val10);
     {
-      arg11 = SvOK(ST(8)) ? (apr_array_header_t *) svn_swig_pl_strings_to_array(
+      arg11 = SvOK(ST(8)) ? svn_swig_pl_strings_to_array(
         ST(8), _global_pool) : NULL;
     }
     res12 = SWIG_ConvertPtr(ST(9), &argp12,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
@@ -14211,6 +14729,7 @@ XS(_wrap_svn_client_status2) {
     
     {
       _global_pool = arg12 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 9) || (items > 10)) {
@@ -14222,10 +14741,14 @@ XS(_wrap_svn_client_status2) {
     }
     arg2 = (char *)(buf2);
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(1), TRUE, _global_pool);
     }
     {
-      arg4 = svn_swig_pl_status_func2;
+      arg4 = (svn_wc_status_func2_t) svn_swig_pl_status_func2;
       arg5 = ST(2);
     }
     ecode6 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(3), &val6);
@@ -14357,6 +14880,7 @@ XS(_wrap_svn_client_status) {
     
     {
       _global_pool = arg11 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 8) || (items > 9)) {
@@ -14368,10 +14892,14 @@ XS(_wrap_svn_client_status) {
     }
     arg2 = (char *)(buf2);
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(1), TRUE, _global_pool);
     }
     {
-      arg4 = svn_swig_pl_status_func;
+      arg4 = (svn_wc_status_func_t) svn_swig_pl_status_func;
       arg5 = ST(2);
     }
     ecode6 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(3), &val6);
@@ -14487,16 +15015,21 @@ XS(_wrap_svn_client_log5) {
     
     {
       _global_pool = arg12 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 10) || (items > 11)) {
       SWIG_croak("Usage: svn_client_log5(targets,peg_revision,revision_ranges,limit,discover_changed_paths,strict_node_history,include_merged_revisions,revprops,receiver,receiver_baton,ctx,pool);");
     }
     {
-      arg1 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(0),
+      arg1 = svn_swig_pl_strings_to_array(ST(0),
         _global_pool);
     }
     {
-      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE, _global_pool);
     }
     {
       arg3 = svn_swig_pl_array_to_apr_array_revision_range(ST(2), _global_pool);
@@ -14522,11 +15055,11 @@ XS(_wrap_svn_client_log5) {
     } 
     arg7 = (svn_boolean_t)(val7);
     {
-      arg8 = SvOK(ST(7)) ? (apr_array_header_t *) svn_swig_pl_strings_to_array(
+      arg8 = SvOK(ST(7)) ? svn_swig_pl_strings_to_array(
         ST(7), _global_pool) : NULL;
     }
     {
-      arg9 = svn_swig_pl_thunk_log_entry_receiver;
+      arg9 = (svn_log_entry_receiver_t) svn_swig_pl_thunk_log_entry_receiver;
       arg10 = ST(8);
     }
     res11 = SWIG_ConvertPtr(ST(9), &argp11,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
@@ -14626,22 +15159,35 @@ XS(_wrap_svn_client_log4) {
     
     {
       _global_pool = arg13 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 11) || (items > 12)) {
       SWIG_croak("Usage: svn_client_log4(targets,peg_revision,start,end,limit,discover_changed_paths,strict_node_history,include_merged_revisions,revprops,receiver,receiver_baton,ctx,pool);");
     }
     {
-      arg1 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(0),
+      arg1 = svn_swig_pl_strings_to_array(ST(0),
         _global_pool);
     }
     {
-      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE, _global_pool);
     }
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE, _global_pool);
     }
     {
-      arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE, _global_pool);
     }
     ecode5 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(4), &val5);
     if (!SWIG_IsOK(ecode5)) {
@@ -14664,11 +15210,11 @@ XS(_wrap_svn_client_log4) {
     } 
     arg8 = (svn_boolean_t)(val8);
     {
-      arg9 = SvOK(ST(8)) ? (apr_array_header_t *) svn_swig_pl_strings_to_array(
+      arg9 = SvOK(ST(8)) ? svn_swig_pl_strings_to_array(
         ST(8), _global_pool) : NULL;
     }
     {
-      arg10 = svn_swig_pl_thunk_log_entry_receiver;
+      arg10 = (svn_log_entry_receiver_t) svn_swig_pl_thunk_log_entry_receiver;
       arg11 = ST(9);
     }
     res12 = SWIG_ConvertPtr(ST(10), &argp12,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
@@ -14766,22 +15312,35 @@ XS(_wrap_svn_client_log3) {
     
     {
       _global_pool = arg11 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 9) || (items > 10)) {
       SWIG_croak("Usage: svn_client_log3(targets,peg_revision,start,end,limit,discover_changed_paths,strict_node_history,receiver,receiver_baton,ctx,pool);");
     }
     {
-      arg1 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(0),
+      arg1 = svn_swig_pl_strings_to_array(ST(0),
         _global_pool);
     }
     {
-      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE, _global_pool);
     }
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE, _global_pool);
     }
     {
-      arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE, _global_pool);
     }
     ecode5 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(4), &val5);
     if (!SWIG_IsOK(ecode5)) {
@@ -14799,7 +15358,7 @@ XS(_wrap_svn_client_log3) {
     } 
     arg7 = (svn_boolean_t)(val7);
     {
-      arg8 = svn_swig_pl_thunk_log_receiver;
+      arg8 = (svn_log_message_receiver_t) svn_swig_pl_thunk_log_receiver;
       arg9 = ST(7);
     }
     res10 = SWIG_ConvertPtr(ST(8), &argp10,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
@@ -14891,19 +15450,28 @@ XS(_wrap_svn_client_log2) {
     
     {
       _global_pool = arg10 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 8) || (items > 9)) {
       SWIG_croak("Usage: svn_client_log2(targets,start,end,limit,discover_changed_paths,strict_node_history,receiver,receiver_baton,ctx,pool);");
     }
     {
-      arg1 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(0),
+      arg1 = svn_swig_pl_strings_to_array(ST(0),
         _global_pool);
     }
     {
-      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE, _global_pool);
     }
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE, _global_pool);
     }
     ecode4 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(3), &val4);
     if (!SWIG_IsOK(ecode4)) {
@@ -14921,7 +15489,7 @@ XS(_wrap_svn_client_log2) {
     } 
     arg6 = (svn_boolean_t)(val6);
     {
-      arg7 = svn_swig_pl_thunk_log_receiver;
+      arg7 = (svn_log_message_receiver_t) svn_swig_pl_thunk_log_receiver;
       arg8 = ST(6);
     }
     res9 = SWIG_ConvertPtr(ST(7), &argp9,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
@@ -15003,19 +15571,28 @@ XS(_wrap_svn_client_log) {
     
     {
       _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 7) || (items > 8)) {
       SWIG_croak("Usage: svn_client_log(targets,start,end,discover_changed_paths,strict_node_history,receiver,receiver_baton,ctx,pool);");
     }
     {
-      arg1 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(0),
+      arg1 = svn_swig_pl_strings_to_array(ST(0),
         _global_pool);
     }
     {
-      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE, _global_pool);
     }
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE, _global_pool);
     }
     ecode4 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(3), &val4);
     if (!SWIG_IsOK(ecode4)) {
@@ -15028,7 +15605,7 @@ XS(_wrap_svn_client_log) {
     } 
     arg5 = (svn_boolean_t)(val5);
     {
-      arg6 = svn_swig_pl_thunk_log_receiver;
+      arg6 = (svn_log_message_receiver_t) svn_swig_pl_thunk_log_receiver;
       arg7 = ST(5);
     }
     res8 = SWIG_ConvertPtr(ST(6), &argp8,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
@@ -15117,6 +15694,7 @@ XS(_wrap_svn_client_blame5) {
     
     {
       _global_pool = arg11 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 10) || (items > 11)) {
       SWIG_croak("Usage: svn_client_blame5(path_or_url,peg_revision,start,end,diff_options,ignore_mime_type,include_merged_revisions,receiver,receiver_baton,ctx,pool);");
@@ -15127,13 +15705,25 @@ XS(_wrap_svn_client_blame5) {
     }
     arg1 = (char *)(buf1);
     {
-      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE, _global_pool);
     }
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE, _global_pool);
     }
     {
-      arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE, _global_pool);
     }
     res5 = SWIG_ConvertPtr(ST(4), &argp5,SWIGTYPE_p_svn_diff_file_options_t, 0 |  0 );
     if (!SWIG_IsOK(res5)) {
@@ -15259,6 +15849,7 @@ XS(_wrap_svn_client_blame4) {
     
     {
       _global_pool = arg11 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 10) || (items > 11)) {
       SWIG_croak("Usage: svn_client_blame4(path_or_url,peg_revision,start,end,diff_options,ignore_mime_type,include_merged_revisions,receiver,receiver_baton,ctx,pool);");
@@ -15269,13 +15860,25 @@ XS(_wrap_svn_client_blame4) {
     }
     arg1 = (char *)(buf1);
     {
-      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE, _global_pool);
     }
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE, _global_pool);
     }
     {
-      arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE, _global_pool);
     }
     res5 = SWIG_ConvertPtr(ST(4), &argp5,SWIGTYPE_p_svn_diff_file_options_t, 0 |  0 );
     if (!SWIG_IsOK(res5)) {
@@ -15397,6 +16000,7 @@ XS(_wrap_svn_client_blame3) {
     
     {
       _global_pool = arg10 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 8) || (items > 9)) {
       SWIG_croak("Usage: svn_client_blame3(path_or_url,peg_revision,start,end,diff_options,ignore_mime_type,receiver,receiver_baton,ctx,pool);");
@@ -15407,13 +16011,25 @@ XS(_wrap_svn_client_blame3) {
     }
     arg1 = (char *)(buf1);
     {
-      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE, _global_pool);
     }
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE, _global_pool);
     }
     {
-      arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE, _global_pool);
     }
     res5 = SWIG_ConvertPtr(ST(4), &argp5,SWIGTYPE_p_svn_diff_file_options_t, 0 |  0 );
     if (!SWIG_IsOK(res5)) {
@@ -15426,7 +16042,7 @@ XS(_wrap_svn_client_blame3) {
     } 
     arg6 = (svn_boolean_t)(val6);
     {
-      arg7 = svn_swig_pl_blame_func;
+      arg7 = (svn_client_blame_receiver_t) svn_swig_pl_blame_func;
       arg8 = ST(6);
     }
     res9 = SWIG_ConvertPtr(ST(7), &argp9,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
@@ -15512,6 +16128,7 @@ XS(_wrap_svn_client_blame2) {
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 6) || (items > 7)) {
       SWIG_croak("Usage: svn_client_blame2(path_or_url,peg_revision,start,end,receiver,receiver_baton,ctx,pool);");
@@ -15522,16 +16139,28 @@ XS(_wrap_svn_client_blame2) {
     }
     arg1 = (char *)(buf1);
     {
-      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE, _global_pool);
     }
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE, _global_pool);
     }
     {
-      arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE, _global_pool);
     }
     {
-      arg5 = svn_swig_pl_blame_func;
+      arg5 = (svn_client_blame_receiver_t) svn_swig_pl_blame_func;
       arg6 = ST(4);
     }
     res7 = SWIG_ConvertPtr(ST(5), &argp7,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
@@ -15611,6 +16240,7 @@ XS(_wrap_svn_client_blame) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 5) || (items > 6)) {
       SWIG_croak("Usage: svn_client_blame(path_or_url,start,end,receiver,receiver_baton,ctx,pool);");
@@ -15621,13 +16251,21 @@ XS(_wrap_svn_client_blame) {
     }
     arg1 = (char *)(buf1);
     {
-      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE, _global_pool);
     }
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE, _global_pool);
     }
     {
-      arg4 = svn_swig_pl_blame_func;
+      arg4 = (svn_client_blame_receiver_t) svn_swig_pl_blame_func;
       arg5 = ST(3);
     }
     res6 = SWIG_ConvertPtr(ST(4), &argp6,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
@@ -15741,12 +16379,13 @@ XS(_wrap_svn_client_diff6) {
     
     {
       _global_pool = arg21 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 20) || (items > 21)) {
       SWIG_croak("Usage: svn_client_diff6(diff_options,path_or_url1,revision1,path_or_url2,revision2,relative_to_dir,depth,ignore_ancestry,no_diff_added,no_diff_deleted,show_copies_as_adds,ignore_content_type,ignore_properties,properties_only,use_git_diff_format,header_encoding,outstream,errstream,changelists,ctx,pool);");
     }
     {
-      arg1 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(0),
+      arg1 = svn_swig_pl_strings_to_array(ST(0),
         _global_pool);
     }
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
@@ -15755,7 +16394,11 @@ XS(_wrap_svn_client_diff6) {
     }
     arg2 = (char *)(buf2);
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE, _global_pool);
     }
     res4 = SWIG_AsCharPtrAndSize(ST(3), &buf4, NULL, &alloc4);
     if (!SWIG_IsOK(res4)) {
@@ -15763,7 +16406,11 @@ XS(_wrap_svn_client_diff6) {
     }
     arg4 = (char *)(buf4);
     {
-      arg5 = svn_swig_pl_set_revision(&rev5, ST(4), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg5 = svn_swig_pl_set_revision(&rev5, ST(4), TRUE, _global_pool);
     }
     res6 = SWIG_AsCharPtrAndSize(ST(5), &buf6, NULL, &alloc6);
     if (!SWIG_IsOK(res6)) {
@@ -15822,12 +16469,14 @@ XS(_wrap_svn_client_diff6) {
     arg16 = (char *)(buf16);
     {
       svn_swig_pl_make_stream (&arg17, ST(16));
+      SPAGAIN;
     }
     {
       svn_swig_pl_make_stream (&arg18, ST(17));
+      SPAGAIN;
     }
     {
-      arg19 = SvOK(ST(18)) ? (apr_array_header_t *) svn_swig_pl_strings_to_array(
+      arg19 = SvOK(ST(18)) ? svn_swig_pl_strings_to_array(
         ST(18), _global_pool) : NULL;
     }
     res20 = SWIG_ConvertPtr(ST(19), &argp20,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
@@ -15964,12 +16613,13 @@ XS(_wrap_svn_client_diff5) {
     
     {
       _global_pool = arg18 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 17) || (items > 18)) {
       SWIG_croak("Usage: svn_client_diff5(diff_options,path1,revision1,path2,revision2,relative_to_dir,depth,ignore_ancestry,no_diff_deleted,show_copies_as_adds,ignore_content_type,use_git_diff_format,header_encoding,outfile,errfile,changelists,ctx,pool);");
     }
     {
-      arg1 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(0),
+      arg1 = svn_swig_pl_strings_to_array(ST(0),
         _global_pool);
     }
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
@@ -15978,7 +16628,11 @@ XS(_wrap_svn_client_diff5) {
     }
     arg2 = (char *)(buf2);
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE, _global_pool);
     }
     res4 = SWIG_AsCharPtrAndSize(ST(3), &buf4, NULL, &alloc4);
     if (!SWIG_IsOK(res4)) {
@@ -15986,7 +16640,11 @@ XS(_wrap_svn_client_diff5) {
     }
     arg4 = (char *)(buf4);
     {
-      arg5 = svn_swig_pl_set_revision(&rev5, ST(4), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg5 = svn_swig_pl_set_revision(&rev5, ST(4), TRUE, _global_pool);
     }
     res6 = SWIG_AsCharPtrAndSize(ST(5), &buf6, NULL, &alloc6);
     if (!SWIG_IsOK(res6)) {
@@ -16035,7 +16693,7 @@ XS(_wrap_svn_client_diff5) {
       arg15 = svn_swig_pl_make_file(ST(14), _global_pool);
     }
     {
-      arg16 = SvOK(ST(15)) ? (apr_array_header_t *) svn_swig_pl_strings_to_array(
+      arg16 = SvOK(ST(15)) ? svn_swig_pl_strings_to_array(
         ST(15), _global_pool) : NULL;
     }
     res17 = SWIG_ConvertPtr(ST(16), &argp17,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
@@ -16160,12 +16818,13 @@ XS(_wrap_svn_client_diff4) {
     
     {
       _global_pool = arg16 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 15) || (items > 16)) {
       SWIG_croak("Usage: svn_client_diff4(diff_options,path1,revision1,path2,revision2,relative_to_dir,depth,ignore_ancestry,no_diff_deleted,ignore_content_type,header_encoding,outfile,errfile,changelists,ctx,pool);");
     }
     {
-      arg1 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(0),
+      arg1 = svn_swig_pl_strings_to_array(ST(0),
         _global_pool);
     }
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
@@ -16174,7 +16833,11 @@ XS(_wrap_svn_client_diff4) {
     }
     arg2 = (char *)(buf2);
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE, _global_pool);
     }
     res4 = SWIG_AsCharPtrAndSize(ST(3), &buf4, NULL, &alloc4);
     if (!SWIG_IsOK(res4)) {
@@ -16182,7 +16845,11 @@ XS(_wrap_svn_client_diff4) {
     }
     arg4 = (char *)(buf4);
     {
-      arg5 = svn_swig_pl_set_revision(&rev5, ST(4), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg5 = svn_swig_pl_set_revision(&rev5, ST(4), TRUE, _global_pool);
     }
     res6 = SWIG_AsCharPtrAndSize(ST(5), &buf6, NULL, &alloc6);
     if (!SWIG_IsOK(res6)) {
@@ -16221,7 +16888,7 @@ XS(_wrap_svn_client_diff4) {
       arg13 = svn_swig_pl_make_file(ST(12), _global_pool);
     }
     {
-      arg14 = SvOK(ST(13)) ? (apr_array_header_t *) svn_swig_pl_strings_to_array(
+      arg14 = SvOK(ST(13)) ? svn_swig_pl_strings_to_array(
         ST(13), _global_pool) : NULL;
     }
     res15 = SWIG_ConvertPtr(ST(14), &argp15,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
@@ -16337,12 +17004,13 @@ XS(_wrap_svn_client_diff3) {
     
     {
       _global_pool = arg14 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 13) || (items > 14)) {
       SWIG_croak("Usage: svn_client_diff3(diff_options,path1,revision1,path2,revision2,recurse,ignore_ancestry,no_diff_deleted,ignore_content_type,header_encoding,outfile,errfile,ctx,pool);");
     }
     {
-      arg1 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(0),
+      arg1 = svn_swig_pl_strings_to_array(ST(0),
         _global_pool);
     }
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
@@ -16351,7 +17019,11 @@ XS(_wrap_svn_client_diff3) {
     }
     arg2 = (char *)(buf2);
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE, _global_pool);
     }
     res4 = SWIG_AsCharPtrAndSize(ST(3), &buf4, NULL, &alloc4);
     if (!SWIG_IsOK(res4)) {
@@ -16359,7 +17031,11 @@ XS(_wrap_svn_client_diff3) {
     }
     arg4 = (char *)(buf4);
     {
-      arg5 = svn_swig_pl_set_revision(&rev5, ST(4), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg5 = svn_swig_pl_set_revision(&rev5, ST(4), TRUE, _global_pool);
     }
     ecode6 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(5), &val6);
     if (!SWIG_IsOK(ecode6)) {
@@ -16497,12 +17173,13 @@ XS(_wrap_svn_client_diff2) {
     
     {
       _global_pool = arg13 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 12) || (items > 13)) {
       SWIG_croak("Usage: svn_client_diff2(diff_options,path1,revision1,path2,revision2,recurse,ignore_ancestry,no_diff_deleted,ignore_content_type,outfile,errfile,ctx,pool);");
     }
     {
-      arg1 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(0),
+      arg1 = svn_swig_pl_strings_to_array(ST(0),
         _global_pool);
     }
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
@@ -16511,7 +17188,11 @@ XS(_wrap_svn_client_diff2) {
     }
     arg2 = (char *)(buf2);
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE, _global_pool);
     }
     res4 = SWIG_AsCharPtrAndSize(ST(3), &buf4, NULL, &alloc4);
     if (!SWIG_IsOK(res4)) {
@@ -16519,7 +17200,11 @@ XS(_wrap_svn_client_diff2) {
     }
     arg4 = (char *)(buf4);
     {
-      arg5 = svn_swig_pl_set_revision(&rev5, ST(4), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg5 = svn_swig_pl_set_revision(&rev5, ST(4), TRUE, _global_pool);
     }
     ecode6 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(5), &val6);
     if (!SWIG_IsOK(ecode6)) {
@@ -16647,12 +17332,13 @@ XS(_wrap_svn_client_diff) {
     
     {
       _global_pool = arg12 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 11) || (items > 12)) {
       SWIG_croak("Usage: svn_client_diff(diff_options,path1,revision1,path2,revision2,recurse,ignore_ancestry,no_diff_deleted,outfile,errfile,ctx,pool);");
     }
     {
-      arg1 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(0),
+      arg1 = svn_swig_pl_strings_to_array(ST(0),
         _global_pool);
     }
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
@@ -16661,7 +17347,11 @@ XS(_wrap_svn_client_diff) {
     }
     arg2 = (char *)(buf2);
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE, _global_pool);
     }
     res4 = SWIG_AsCharPtrAndSize(ST(3), &buf4, NULL, &alloc4);
     if (!SWIG_IsOK(res4)) {
@@ -16669,7 +17359,11 @@ XS(_wrap_svn_client_diff) {
     }
     arg4 = (char *)(buf4);
     {
-      arg5 = svn_swig_pl_set_revision(&rev5, ST(4), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg5 = svn_swig_pl_set_revision(&rev5, ST(4), TRUE, _global_pool);
     }
     ecode6 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(5), &val6);
     if (!SWIG_IsOK(ecode6)) {
@@ -16815,12 +17509,13 @@ XS(_wrap_svn_client_diff_peg6) {
     
     {
       _global_pool = arg21 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 20) || (items > 21)) {
       SWIG_croak("Usage: svn_client_diff_peg6(diff_options,path_or_url,peg_revision,start_revision,end_revision,relative_to_dir,depth,ignore_ancestry,no_diff_added,no_diff_deleted,show_copies_as_adds,ignore_content_type,ignore_properties,properties_only,use_git_diff_format,header_encoding,outstream,errstream,changelists,ctx,pool);");
     }
     {
-      arg1 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(0),
+      arg1 = svn_swig_pl_strings_to_array(ST(0),
         _global_pool);
     }
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
@@ -16829,13 +17524,25 @@ XS(_wrap_svn_client_diff_peg6) {
     }
     arg2 = (char *)(buf2);
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE, _global_pool);
     }
     {
-      arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE, _global_pool);
     }
     {
-      arg5 = svn_swig_pl_set_revision(&rev5, ST(4), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg5 = svn_swig_pl_set_revision(&rev5, ST(4), TRUE, _global_pool);
     }
     res6 = SWIG_AsCharPtrAndSize(ST(5), &buf6, NULL, &alloc6);
     if (!SWIG_IsOK(res6)) {
@@ -16894,12 +17601,14 @@ XS(_wrap_svn_client_diff_peg6) {
     arg16 = (char *)(buf16);
     {
       svn_swig_pl_make_stream (&arg17, ST(16));
+      SPAGAIN;
     }
     {
       svn_swig_pl_make_stream (&arg18, ST(17));
+      SPAGAIN;
     }
     {
-      arg19 = SvOK(ST(18)) ? (apr_array_header_t *) svn_swig_pl_strings_to_array(
+      arg19 = SvOK(ST(18)) ? svn_swig_pl_strings_to_array(
         ST(18), _global_pool) : NULL;
     }
     res20 = SWIG_ConvertPtr(ST(19), &argp20,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
@@ -17039,12 +17748,13 @@ XS(_wrap_svn_client_diff_peg5) {
     
     {
       _global_pool = arg18 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 17) || (items > 18)) {
       SWIG_croak("Usage: svn_client_diff_peg5(diff_options,path,peg_revision,start_revision,end_revision,relative_to_dir,depth,ignore_ancestry,no_diff_deleted,show_copies_as_adds,ignore_content_type,use_git_diff_format,header_encoding,outfile,errfile,changelists,ctx,pool);");
     }
     {
-      arg1 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(0),
+      arg1 = svn_swig_pl_strings_to_array(ST(0),
         _global_pool);
     }
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
@@ -17053,13 +17763,25 @@ XS(_wrap_svn_client_diff_peg5) {
     }
     arg2 = (char *)(buf2);
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE, _global_pool);
     }
     {
-      arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE, _global_pool);
     }
     {
-      arg5 = svn_swig_pl_set_revision(&rev5, ST(4), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg5 = svn_swig_pl_set_revision(&rev5, ST(4), TRUE, _global_pool);
     }
     res6 = SWIG_AsCharPtrAndSize(ST(5), &buf6, NULL, &alloc6);
     if (!SWIG_IsOK(res6)) {
@@ -17108,7 +17830,7 @@ XS(_wrap_svn_client_diff_peg5) {
       arg15 = svn_swig_pl_make_file(ST(14), _global_pool);
     }
     {
-      arg16 = SvOK(ST(15)) ? (apr_array_header_t *) svn_swig_pl_strings_to_array(
+      arg16 = SvOK(ST(15)) ? svn_swig_pl_strings_to_array(
         ST(15), _global_pool) : NULL;
     }
     res17 = SWIG_ConvertPtr(ST(16), &argp17,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
@@ -17236,12 +17958,13 @@ XS(_wrap_svn_client_diff_peg4) {
     
     {
       _global_pool = arg16 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 15) || (items > 16)) {
       SWIG_croak("Usage: svn_client_diff_peg4(diff_options,path,peg_revision,start_revision,end_revision,relative_to_dir,depth,ignore_ancestry,no_diff_deleted,ignore_content_type,header_encoding,outfile,errfile,changelists,ctx,pool);");
     }
     {
-      arg1 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(0),
+      arg1 = svn_swig_pl_strings_to_array(ST(0),
         _global_pool);
     }
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
@@ -17250,13 +17973,25 @@ XS(_wrap_svn_client_diff_peg4) {
     }
     arg2 = (char *)(buf2);
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE, _global_pool);
     }
     {
-      arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE, _global_pool);
     }
     {
-      arg5 = svn_swig_pl_set_revision(&rev5, ST(4), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg5 = svn_swig_pl_set_revision(&rev5, ST(4), TRUE, _global_pool);
     }
     res6 = SWIG_AsCharPtrAndSize(ST(5), &buf6, NULL, &alloc6);
     if (!SWIG_IsOK(res6)) {
@@ -17295,7 +18030,7 @@ XS(_wrap_svn_client_diff_peg4) {
       arg13 = svn_swig_pl_make_file(ST(12), _global_pool);
     }
     {
-      arg14 = SvOK(ST(13)) ? (apr_array_header_t *) svn_swig_pl_strings_to_array(
+      arg14 = SvOK(ST(13)) ? svn_swig_pl_strings_to_array(
         ST(13), _global_pool) : NULL;
     }
     res15 = SWIG_ConvertPtr(ST(14), &argp15,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
@@ -17414,12 +18149,13 @@ XS(_wrap_svn_client_diff_peg3) {
     
     {
       _global_pool = arg14 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 13) || (items > 14)) {
       SWIG_croak("Usage: svn_client_diff_peg3(diff_options,path,peg_revision,start_revision,end_revision,recurse,ignore_ancestry,no_diff_deleted,ignore_content_type,header_encoding,outfile,errfile,ctx,pool);");
     }
     {
-      arg1 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(0),
+      arg1 = svn_swig_pl_strings_to_array(ST(0),
         _global_pool);
     }
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
@@ -17428,13 +18164,25 @@ XS(_wrap_svn_client_diff_peg3) {
     }
     arg2 = (char *)(buf2);
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE, _global_pool);
     }
     {
-      arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE, _global_pool);
     }
     {
-      arg5 = svn_swig_pl_set_revision(&rev5, ST(4), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg5 = svn_swig_pl_set_revision(&rev5, ST(4), TRUE, _global_pool);
     }
     ecode6 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(5), &val6);
     if (!SWIG_IsOK(ecode6)) {
@@ -17575,12 +18323,13 @@ XS(_wrap_svn_client_diff_peg2) {
     
     {
       _global_pool = arg13 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 12) || (items > 13)) {
       SWIG_croak("Usage: svn_client_diff_peg2(diff_options,path,peg_revision,start_revision,end_revision,recurse,ignore_ancestry,no_diff_deleted,ignore_content_type,outfile,errfile,ctx,pool);");
     }
     {
-      arg1 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(0),
+      arg1 = svn_swig_pl_strings_to_array(ST(0),
         _global_pool);
     }
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
@@ -17589,13 +18338,25 @@ XS(_wrap_svn_client_diff_peg2) {
     }
     arg2 = (char *)(buf2);
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE, _global_pool);
     }
     {
-      arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE, _global_pool);
     }
     {
-      arg5 = svn_swig_pl_set_revision(&rev5, ST(4), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg5 = svn_swig_pl_set_revision(&rev5, ST(4), TRUE, _global_pool);
     }
     ecode6 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(5), &val6);
     if (!SWIG_IsOK(ecode6)) {
@@ -17726,12 +18487,13 @@ XS(_wrap_svn_client_diff_peg) {
     
     {
       _global_pool = arg12 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 11) || (items > 12)) {
       SWIG_croak("Usage: svn_client_diff_peg(diff_options,path,peg_revision,start_revision,end_revision,recurse,ignore_ancestry,no_diff_deleted,outfile,errfile,ctx,pool);");
     }
     {
-      arg1 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(0),
+      arg1 = svn_swig_pl_strings_to_array(ST(0),
         _global_pool);
     }
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
@@ -17740,13 +18502,25 @@ XS(_wrap_svn_client_diff_peg) {
     }
     arg2 = (char *)(buf2);
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE, _global_pool);
     }
     {
-      arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE, _global_pool);
     }
     {
-      arg5 = svn_swig_pl_set_revision(&rev5, ST(4), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg5 = svn_swig_pl_set_revision(&rev5, ST(4), TRUE, _global_pool);
     }
     ecode6 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(5), &val6);
     if (!SWIG_IsOK(ecode6)) {
@@ -17869,6 +18643,7 @@ XS(_wrap_svn_client_diff_summarize2) {
     
     {
       _global_pool = arg11 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 9) || (items > 10)) {
       SWIG_croak("Usage: svn_client_diff_summarize2(path_or_url1,revision1,path_or_url2,revision2,depth,ignore_ancestry,changelists,summarize_func,summarize_baton,ctx,pool);");
@@ -17879,7 +18654,11 @@ XS(_wrap_svn_client_diff_summarize2) {
     }
     arg1 = (char *)(buf1);
     {
-      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE, _global_pool);
     }
     res3 = SWIG_AsCharPtrAndSize(ST(2), &buf3, NULL, &alloc3);
     if (!SWIG_IsOK(res3)) {
@@ -17887,7 +18666,11 @@ XS(_wrap_svn_client_diff_summarize2) {
     }
     arg3 = (char *)(buf3);
     {
-      arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE, _global_pool);
     }
     ecode5 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(4), &val5);
     if (!SWIG_IsOK(ecode5)) {
@@ -17900,7 +18683,7 @@ XS(_wrap_svn_client_diff_summarize2) {
     } 
     arg6 = (svn_boolean_t)(val6);
     {
-      arg7 = SvOK(ST(6)) ? (apr_array_header_t *) svn_swig_pl_strings_to_array(
+      arg7 = SvOK(ST(6)) ? svn_swig_pl_strings_to_array(
         ST(6), _global_pool) : NULL;
     }
     {
@@ -17995,6 +18778,7 @@ XS(_wrap_svn_client_diff_summarize) {
     
     {
       _global_pool = arg10 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 8) || (items > 9)) {
       SWIG_croak("Usage: svn_client_diff_summarize(path1,revision1,path2,revision2,recurse,ignore_ancestry,summarize_func,summarize_baton,ctx,pool);");
@@ -18005,7 +18789,11 @@ XS(_wrap_svn_client_diff_summarize) {
     }
     arg1 = (char *)(buf1);
     {
-      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE, _global_pool);
     }
     res3 = SWIG_AsCharPtrAndSize(ST(2), &buf3, NULL, &alloc3);
     if (!SWIG_IsOK(res3)) {
@@ -18013,7 +18801,11 @@ XS(_wrap_svn_client_diff_summarize) {
     }
     arg3 = (char *)(buf3);
     {
-      arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE, _global_pool);
     }
     ecode5 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(4), &val5);
     if (!SWIG_IsOK(ecode5)) {
@@ -18114,6 +18906,7 @@ XS(_wrap_svn_client_diff_summarize_peg2) {
     
     {
       _global_pool = arg11 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 9) || (items > 10)) {
       SWIG_croak("Usage: svn_client_diff_summarize_peg2(path_or_url,peg_revision,start_revision,end_revision,depth,ignore_ancestry,changelists,summarize_func,summarize_baton,ctx,pool);");
@@ -18124,13 +18917,25 @@ XS(_wrap_svn_client_diff_summarize_peg2) {
     }
     arg1 = (char *)(buf1);
     {
-      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE, _global_pool);
     }
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE, _global_pool);
     }
     {
-      arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE, _global_pool);
     }
     ecode5 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(4), &val5);
     if (!SWIG_IsOK(ecode5)) {
@@ -18143,7 +18948,7 @@ XS(_wrap_svn_client_diff_summarize_peg2) {
     } 
     arg6 = (svn_boolean_t)(val6);
     {
-      arg7 = SvOK(ST(6)) ? (apr_array_header_t *) svn_swig_pl_strings_to_array(
+      arg7 = SvOK(ST(6)) ? svn_swig_pl_strings_to_array(
         ST(6), _global_pool) : NULL;
     }
     {
@@ -18241,6 +19046,7 @@ XS(_wrap_svn_client_diff_summarize_peg) {
     
     {
       _global_pool = arg10 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 8) || (items > 9)) {
       SWIG_croak("Usage: svn_client_diff_summarize_peg(path,peg_revision,start_revision,end_revision,recurse,ignore_ancestry,summarize_func,summarize_baton,ctx,pool);");
@@ -18251,13 +19057,25 @@ XS(_wrap_svn_client_diff_summarize_peg) {
     }
     arg1 = (char *)(buf1);
     {
-      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE, _global_pool);
     }
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE, _global_pool);
     }
     {
-      arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE, _global_pool);
     }
     ecode5 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(4), &val5);
     if (!SWIG_IsOK(ecode5)) {
@@ -18382,9 +19200,11 @@ XS(_wrap_svn_client_get_merging_summary) {
     
     {
       _global_pool = arg16 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg17 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
@@ -18405,7 +19225,11 @@ XS(_wrap_svn_client_get_merging_summary) {
     }
     arg11 = (char *)(buf11);
     {
-      arg12 = svn_swig_pl_set_revision(&rev12, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg12 = svn_swig_pl_set_revision(&rev12, ST(1), TRUE, _global_pool);
     }
     res13 = SWIG_AsCharPtrAndSize(ST(2), &buf13, NULL, &alloc13);
     if (!SWIG_IsOK(res13)) {
@@ -18413,7 +19237,11 @@ XS(_wrap_svn_client_get_merging_summary) {
     }
     arg13 = (char *)(buf13);
     {
-      arg14 = svn_swig_pl_set_revision(&rev14, ST(3), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg14 = svn_swig_pl_set_revision(&rev14, ST(3), TRUE, _global_pool);
     }
     res15 = SWIG_ConvertPtr(ST(4), &argp15,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
     if (!SWIG_IsOK(res15)) {
@@ -18607,6 +19435,7 @@ XS(_wrap_svn_client_merge5) {
     
     {
       _global_pool = arg15 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 14) || (items > 15)) {
       SWIG_croak("Usage: svn_client_merge5(source1,revision1,source2,revision2,target_wcpath,depth,ignore_mergeinfo,diff_ignore_ancestry,force_delete,record_only,dry_run,allow_mixed_rev,merge_options,ctx,pool);");
@@ -18617,7 +19446,11 @@ XS(_wrap_svn_client_merge5) {
     }
     arg1 = (char *)(buf1);
     {
-      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE, _global_pool);
     }
     res3 = SWIG_AsCharPtrAndSize(ST(2), &buf3, NULL, &alloc3);
     if (!SWIG_IsOK(res3)) {
@@ -18625,7 +19458,11 @@ XS(_wrap_svn_client_merge5) {
     }
     arg3 = (char *)(buf3);
     {
-      arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE, _global_pool);
     }
     res5 = SWIG_AsCharPtrAndSize(ST(4), &buf5, NULL, &alloc5);
     if (!SWIG_IsOK(res5)) {
@@ -18789,6 +19626,7 @@ XS(_wrap_svn_client_merge4) {
     
     {
       _global_pool = arg14 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 13) || (items > 14)) {
       SWIG_croak("Usage: svn_client_merge4(source1,revision1,source2,revision2,target_wcpath,depth,ignore_ancestry,force_delete,record_only,dry_run,allow_mixed_rev,merge_options,ctx,pool);");
@@ -18799,7 +19637,11 @@ XS(_wrap_svn_client_merge4) {
     }
     arg1 = (char *)(buf1);
     {
-      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE, _global_pool);
     }
     res3 = SWIG_AsCharPtrAndSize(ST(2), &buf3, NULL, &alloc3);
     if (!SWIG_IsOK(res3)) {
@@ -18807,7 +19649,11 @@ XS(_wrap_svn_client_merge4) {
     }
     arg3 = (char *)(buf3);
     {
-      arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE, _global_pool);
     }
     res5 = SWIG_AsCharPtrAndSize(ST(4), &buf5, NULL, &alloc5);
     if (!SWIG_IsOK(res5)) {
@@ -18961,6 +19807,7 @@ XS(_wrap_svn_client_merge3) {
     
     {
       _global_pool = arg13 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 12) || (items > 13)) {
       SWIG_croak("Usage: svn_client_merge3(source1,revision1,source2,revision2,target_wcpath,depth,ignore_ancestry,force,record_only,dry_run,merge_options,ctx,pool);");
@@ -18971,7 +19818,11 @@ XS(_wrap_svn_client_merge3) {
     }
     arg1 = (char *)(buf1);
     {
-      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE, _global_pool);
     }
     res3 = SWIG_AsCharPtrAndSize(ST(2), &buf3, NULL, &alloc3);
     if (!SWIG_IsOK(res3)) {
@@ -18979,7 +19830,11 @@ XS(_wrap_svn_client_merge3) {
     }
     arg3 = (char *)(buf3);
     {
-      arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE, _global_pool);
     }
     res5 = SWIG_AsCharPtrAndSize(ST(4), &buf5, NULL, &alloc5);
     if (!SWIG_IsOK(res5)) {
@@ -19123,6 +19978,7 @@ XS(_wrap_svn_client_merge2) {
     
     {
       _global_pool = arg12 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 11) || (items > 12)) {
       SWIG_croak("Usage: svn_client_merge2(source1,revision1,source2,revision2,target_wcpath,recurse,ignore_ancestry,force,dry_run,merge_options,ctx,pool);");
@@ -19133,7 +19989,11 @@ XS(_wrap_svn_client_merge2) {
     }
     arg1 = (char *)(buf1);
     {
-      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE, _global_pool);
     }
     res3 = SWIG_AsCharPtrAndSize(ST(2), &buf3, NULL, &alloc3);
     if (!SWIG_IsOK(res3)) {
@@ -19141,7 +20001,11 @@ XS(_wrap_svn_client_merge2) {
     }
     arg3 = (char *)(buf3);
     {
-      arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE, _global_pool);
     }
     res5 = SWIG_AsCharPtrAndSize(ST(4), &buf5, NULL, &alloc5);
     if (!SWIG_IsOK(res5)) {
@@ -19275,6 +20139,7 @@ XS(_wrap_svn_client_merge) {
     
     {
       _global_pool = arg11 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 10) || (items > 11)) {
       SWIG_croak("Usage: svn_client_merge(source1,revision1,source2,revision2,target_wcpath,recurse,ignore_ancestry,force,dry_run,ctx,pool);");
@@ -19285,7 +20150,11 @@ XS(_wrap_svn_client_merge) {
     }
     arg1 = (char *)(buf1);
     {
-      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE, _global_pool);
     }
     res3 = SWIG_AsCharPtrAndSize(ST(2), &buf3, NULL, &alloc3);
     if (!SWIG_IsOK(res3)) {
@@ -19293,7 +20162,11 @@ XS(_wrap_svn_client_merge) {
     }
     arg3 = (char *)(buf3);
     {
-      arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE, _global_pool);
     }
     res5 = SWIG_AsCharPtrAndSize(ST(4), &buf5, NULL, &alloc5);
     if (!SWIG_IsOK(res5)) {
@@ -19408,6 +20281,7 @@ XS(_wrap_svn_client_merge_reintegrate) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 6) || (items > 7)) {
       SWIG_croak("Usage: svn_client_merge_reintegrate(source_path_or_url,source_peg_revision,target_wcpath,dry_run,merge_options,ctx,pool);");
@@ -19418,7 +20292,11 @@ XS(_wrap_svn_client_merge_reintegrate) {
     }
     arg1 = (char *)(buf1);
     {
-      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE, _global_pool);
     }
     res3 = SWIG_AsCharPtrAndSize(ST(2), &buf3, NULL, &alloc3);
     if (!SWIG_IsOK(res3)) {
@@ -19534,6 +20412,7 @@ XS(_wrap_svn_client_merge_peg5) {
     
     {
       _global_pool = arg14 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 13) || (items > 14)) {
       SWIG_croak("Usage: svn_client_merge_peg5(source_path_or_url,ranges_to_merge,source_peg_revision,target_wcpath,depth,ignore_mergeinfo,diff_ignore_ancestry,force_delete,record_only,dry_run,allow_mixed_rev,merge_options,ctx,pool);");
@@ -19547,7 +20426,11 @@ XS(_wrap_svn_client_merge_peg5) {
       arg2 = svn_swig_pl_array_to_apr_array_revision_range(ST(1), _global_pool);
     }
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE, _global_pool);
     }
     res4 = SWIG_AsCharPtrAndSize(ST(3), &buf4, NULL, &alloc4);
     if (!SWIG_IsOK(res4)) {
@@ -19704,6 +20587,7 @@ XS(_wrap_svn_client_merge_peg4) {
     
     {
       _global_pool = arg13 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 12) || (items > 13)) {
       SWIG_croak("Usage: svn_client_merge_peg4(source_path_or_url,ranges_to_merge,source_peg_revision,target_wcpath,depth,ignore_ancestry,force_delete,record_only,dry_run,allow_mixed_rev,merge_options,ctx,pool);");
@@ -19717,7 +20601,11 @@ XS(_wrap_svn_client_merge_peg4) {
       arg2 = svn_swig_pl_array_to_apr_array_revision_range(ST(1), _global_pool);
     }
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE, _global_pool);
     }
     res4 = SWIG_AsCharPtrAndSize(ST(3), &buf4, NULL, &alloc4);
     if (!SWIG_IsOK(res4)) {
@@ -19864,6 +20752,7 @@ XS(_wrap_svn_client_merge_peg3) {
     
     {
       _global_pool = arg12 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 11) || (items > 12)) {
       SWIG_croak("Usage: svn_client_merge_peg3(source,ranges_to_merge,peg_revision,target_wcpath,depth,ignore_ancestry,force,record_only,dry_run,merge_options,ctx,pool);");
@@ -19877,7 +20766,11 @@ XS(_wrap_svn_client_merge_peg3) {
       arg2 = svn_swig_pl_array_to_apr_array_revision_range(ST(1), _global_pool);
     }
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE, _global_pool);
     }
     res4 = SWIG_AsCharPtrAndSize(ST(3), &buf4, NULL, &alloc4);
     if (!SWIG_IsOK(res4)) {
@@ -20022,6 +20915,7 @@ XS(_wrap_svn_client_merge_peg2) {
     
     {
       _global_pool = arg12 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 11) || (items > 12)) {
       SWIG_croak("Usage: svn_client_merge_peg2(source,revision1,revision2,peg_revision,target_wcpath,recurse,ignore_ancestry,force,dry_run,merge_options,ctx,pool);");
@@ -20032,13 +20926,25 @@ XS(_wrap_svn_client_merge_peg2) {
     }
     arg1 = (char *)(buf1);
     {
-      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE, _global_pool);
     }
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE, _global_pool);
     }
     {
-      arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE, _global_pool);
     }
     res5 = SWIG_AsCharPtrAndSize(ST(4), &buf5, NULL, &alloc5);
     if (!SWIG_IsOK(res5)) {
@@ -20175,6 +21081,7 @@ XS(_wrap_svn_client_merge_peg) {
     
     {
       _global_pool = arg11 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 10) || (items > 11)) {
       SWIG_croak("Usage: svn_client_merge_peg(source,revision1,revision2,peg_revision,target_wcpath,recurse,ignore_ancestry,force,dry_run,ctx,pool);");
@@ -20185,13 +21092,25 @@ XS(_wrap_svn_client_merge_peg) {
     }
     arg1 = (char *)(buf1);
     {
-      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE, _global_pool);
     }
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE, _global_pool);
     }
     {
-      arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE, _global_pool);
     }
     res5 = SWIG_AsCharPtrAndSize(ST(4), &buf5, NULL, &alloc5);
     if (!SWIG_IsOK(res5)) {
@@ -20303,6 +21222,7 @@ XS(_wrap_svn_client_suggest_merge_sources) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 3) || (items > 4)) {
@@ -20314,7 +21234,11 @@ XS(_wrap_svn_client_suggest_merge_sources) {
     }
     arg2 = (char *)(buf2);
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(1), TRUE, _global_pool);
     }
     res4 = SWIG_ConvertPtr(ST(2), &argp4,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
     if (!SWIG_IsOK(res4)) {
@@ -20392,6 +21316,7 @@ XS(_wrap_svn_client_mergeinfo_get_merged) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 3) || (items > 4)) {
@@ -20403,7 +21328,11 @@ XS(_wrap_svn_client_mergeinfo_get_merged) {
     }
     arg2 = (char *)(buf2);
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(1), TRUE, _global_pool);
     }
     res4 = SWIG_ConvertPtr(ST(2), &argp4,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
     if (!SWIG_IsOK(res4)) {
@@ -20507,6 +21436,7 @@ XS(_wrap_svn_client_mergeinfo_log2) {
     
     {
       _global_pool = arg14 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 12) || (items > 13)) {
       SWIG_croak("Usage: svn_client_mergeinfo_log2(finding_merged,target_path_or_url,target_peg_revision,source_path_or_url,source_peg_revision,source_start_revision,source_end_revision,receiver,receiver_baton,discover_changed_paths,depth,revprops,ctx,scratch_pool);");
@@ -20522,7 +21452,11 @@ XS(_wrap_svn_client_mergeinfo_log2) {
     }
     arg2 = (char *)(buf2);
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE, _global_pool);
     }
     res4 = SWIG_AsCharPtrAndSize(ST(3), &buf4, NULL, &alloc4);
     if (!SWIG_IsOK(res4)) {
@@ -20530,16 +21464,28 @@ XS(_wrap_svn_client_mergeinfo_log2) {
     }
     arg4 = (char *)(buf4);
     {
-      arg5 = svn_swig_pl_set_revision(&rev5, ST(4), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg5 = svn_swig_pl_set_revision(&rev5, ST(4), TRUE, _global_pool);
     }
     {
-      arg6 = svn_swig_pl_set_revision(&rev6, ST(5), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg6 = svn_swig_pl_set_revision(&rev6, ST(5), TRUE, _global_pool);
     }
     {
-      arg7 = svn_swig_pl_set_revision(&rev7, ST(6), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg7 = svn_swig_pl_set_revision(&rev7, ST(6), TRUE, _global_pool);
     }
     {
-      arg8 = svn_swig_pl_thunk_log_entry_receiver;
+      arg8 = (svn_log_entry_receiver_t) svn_swig_pl_thunk_log_entry_receiver;
       arg9 = ST(7);
     }
     ecode10 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(8), &val10);
@@ -20553,7 +21499,7 @@ XS(_wrap_svn_client_mergeinfo_log2) {
     } 
     arg11 = (svn_depth_t)(val11);
     {
-      arg12 = SvOK(ST(10)) ? (apr_array_header_t *) svn_swig_pl_strings_to_array(
+      arg12 = SvOK(ST(10)) ? svn_swig_pl_strings_to_array(
         ST(10), _global_pool) : NULL;
     }
     res13 = SWIG_ConvertPtr(ST(11), &argp13,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
@@ -20654,6 +21600,7 @@ XS(_wrap_svn_client_mergeinfo_log) {
     
     {
       _global_pool = arg12 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 10) || (items > 11)) {
       SWIG_croak("Usage: svn_client_mergeinfo_log(finding_merged,target_path_or_url,target_peg_revision,source_path_or_url,source_peg_revision,receiver,receiver_baton,discover_changed_paths,depth,revprops,ctx,scratch_pool);");
@@ -20669,7 +21616,11 @@ XS(_wrap_svn_client_mergeinfo_log) {
     }
     arg2 = (char *)(buf2);
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE, _global_pool);
     }
     res4 = SWIG_AsCharPtrAndSize(ST(3), &buf4, NULL, &alloc4);
     if (!SWIG_IsOK(res4)) {
@@ -20677,10 +21628,14 @@ XS(_wrap_svn_client_mergeinfo_log) {
     }
     arg4 = (char *)(buf4);
     {
-      arg5 = svn_swig_pl_set_revision(&rev5, ST(4), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg5 = svn_swig_pl_set_revision(&rev5, ST(4), TRUE, _global_pool);
     }
     {
-      arg6 = svn_swig_pl_thunk_log_entry_receiver;
+      arg6 = (svn_log_entry_receiver_t) svn_swig_pl_thunk_log_entry_receiver;
       arg7 = ST(5);
     }
     ecode8 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(6), &val8);
@@ -20694,7 +21649,7 @@ XS(_wrap_svn_client_mergeinfo_log) {
     } 
     arg9 = (svn_depth_t)(val9);
     {
-      arg10 = SvOK(ST(8)) ? (apr_array_header_t *) svn_swig_pl_strings_to_array(
+      arg10 = SvOK(ST(8)) ? svn_swig_pl_strings_to_array(
         ST(8), _global_pool) : NULL;
     }
     res11 = SWIG_ConvertPtr(ST(9), &argp11,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
@@ -20785,6 +21740,7 @@ XS(_wrap_svn_client_mergeinfo_log_merged) {
     
     {
       _global_pool = arg10 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 8) || (items > 9)) {
       SWIG_croak("Usage: svn_client_mergeinfo_log_merged(path_or_url,peg_revision,merge_source_path_or_url,src_peg_revision,receiver,receiver_baton,discover_changed_paths,revprops,ctx,pool);");
@@ -20795,7 +21751,11 @@ XS(_wrap_svn_client_mergeinfo_log_merged) {
     }
     arg1 = (char *)(buf1);
     {
-      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE, _global_pool);
     }
     res3 = SWIG_AsCharPtrAndSize(ST(2), &buf3, NULL, &alloc3);
     if (!SWIG_IsOK(res3)) {
@@ -20803,10 +21763,14 @@ XS(_wrap_svn_client_mergeinfo_log_merged) {
     }
     arg3 = (char *)(buf3);
     {
-      arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE, _global_pool);
     }
     {
-      arg5 = svn_swig_pl_thunk_log_entry_receiver;
+      arg5 = (svn_log_entry_receiver_t) svn_swig_pl_thunk_log_entry_receiver;
       arg6 = ST(4);
     }
     ecode7 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(5), &val7);
@@ -20815,7 +21779,7 @@ XS(_wrap_svn_client_mergeinfo_log_merged) {
     } 
     arg7 = (svn_boolean_t)(val7);
     {
-      arg8 = SvOK(ST(6)) ? (apr_array_header_t *) svn_swig_pl_strings_to_array(
+      arg8 = SvOK(ST(6)) ? svn_swig_pl_strings_to_array(
         ST(6), _global_pool) : NULL;
     }
     res9 = SWIG_ConvertPtr(ST(7), &argp9,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
@@ -20907,6 +21871,7 @@ XS(_wrap_svn_client_mergeinfo_log_eligible) {
     
     {
       _global_pool = arg10 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 8) || (items > 9)) {
       SWIG_croak("Usage: svn_client_mergeinfo_log_eligible(path_or_url,peg_revision,merge_source_path_or_url,src_peg_revision,receiver,receiver_baton,discover_changed_paths,revprops,ctx,pool);");
@@ -20917,7 +21882,11 @@ XS(_wrap_svn_client_mergeinfo_log_eligible) {
     }
     arg1 = (char *)(buf1);
     {
-      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE, _global_pool);
     }
     res3 = SWIG_AsCharPtrAndSize(ST(2), &buf3, NULL, &alloc3);
     if (!SWIG_IsOK(res3)) {
@@ -20925,10 +21894,14 @@ XS(_wrap_svn_client_mergeinfo_log_eligible) {
     }
     arg3 = (char *)(buf3);
     {
-      arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE, _global_pool);
     }
     {
-      arg5 = svn_swig_pl_thunk_log_entry_receiver;
+      arg5 = (svn_log_entry_receiver_t) svn_swig_pl_thunk_log_entry_receiver;
       arg6 = ST(4);
     }
     ecode7 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(5), &val7);
@@ -20937,7 +21910,7 @@ XS(_wrap_svn_client_mergeinfo_log_eligible) {
     } 
     arg7 = (svn_boolean_t)(val7);
     {
-      arg8 = SvOK(ST(6)) ? (apr_array_header_t *) svn_swig_pl_strings_to_array(
+      arg8 = SvOK(ST(6)) ? svn_swig_pl_strings_to_array(
         ST(6), _global_pool) : NULL;
     }
     res9 = SWIG_ConvertPtr(ST(7), &argp9,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
@@ -20998,6 +21971,246 @@ XS(_wrap_svn_client_mergeinfo_log_eligible) {
 }
 
 
+XS(_wrap_svn_client_vacuum) {
+  {
+    char *arg1 = (char *) 0 ;
+    svn_boolean_t arg2 ;
+    svn_boolean_t arg3 ;
+    svn_boolean_t arg4 ;
+    svn_boolean_t arg5 ;
+    svn_boolean_t arg6 ;
+    svn_client_ctx_t *arg7 = (svn_client_ctx_t *) 0 ;
+    apr_pool_t *arg8 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    int res1 ;
+    char *buf1 = 0 ;
+    int alloc1 = 0 ;
+    int val2 ;
+    int ecode2 = 0 ;
+    int val3 ;
+    int ecode3 = 0 ;
+    int val4 ;
+    int ecode4 = 0 ;
+    int val5 ;
+    int ecode5 = 0 ;
+    int val6 ;
+    int ecode6 = 0 ;
+    void *argp7 = 0 ;
+    int res7 = 0 ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    if ((items < 7) || (items > 8)) {
+      SWIG_croak("Usage: svn_client_vacuum(dir_abspath,remove_unversioned_items,remove_ignored_items,fix_recorded_timestamps,vacuum_pristines,include_externals,ctx,scratch_pool);");
+    }
+    res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1);
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client_vacuum" "', argument " "1"" of type '" "char const *""'");
+    }
+    arg1 = (char *)(buf1);
+    ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
+    if (!SWIG_IsOK(ecode2)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "svn_client_vacuum" "', argument " "2"" of type '" "svn_boolean_t""'");
+    } 
+    arg2 = (svn_boolean_t)(val2);
+    ecode3 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(2), &val3);
+    if (!SWIG_IsOK(ecode3)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "svn_client_vacuum" "', argument " "3"" of type '" "svn_boolean_t""'");
+    } 
+    arg3 = (svn_boolean_t)(val3);
+    ecode4 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(3), &val4);
+    if (!SWIG_IsOK(ecode4)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "svn_client_vacuum" "', argument " "4"" of type '" "svn_boolean_t""'");
+    } 
+    arg4 = (svn_boolean_t)(val4);
+    ecode5 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(4), &val5);
+    if (!SWIG_IsOK(ecode5)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "svn_client_vacuum" "', argument " "5"" of type '" "svn_boolean_t""'");
+    } 
+    arg5 = (svn_boolean_t)(val5);
+    ecode6 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(5), &val6);
+    if (!SWIG_IsOK(ecode6)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "svn_client_vacuum" "', argument " "6"" of type '" "svn_boolean_t""'");
+    } 
+    arg6 = (svn_boolean_t)(val6);
+    res7 = SWIG_ConvertPtr(ST(6), &argp7,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
+    if (!SWIG_IsOK(res7)) {
+      SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "svn_client_vacuum" "', argument " "7"" of type '" "svn_client_ctx_t *""'"); 
+    }
+    arg7 = (svn_client_ctx_t *)(argp7);
+    if (items > 7) {
+      
+    }
+    {
+      result = (svn_error_t *)svn_client_vacuum((char const *)arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+    
+    
+    
+    
+    
+    
+    
+    XSRETURN(argvi);
+  fail:
+    if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+    
+    
+    
+    
+    
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_svn_client_cleanup2) {
+  {
+    char *arg1 = (char *) 0 ;
+    svn_boolean_t arg2 ;
+    svn_boolean_t arg3 ;
+    svn_boolean_t arg4 ;
+    svn_boolean_t arg5 ;
+    svn_boolean_t arg6 ;
+    svn_client_ctx_t *arg7 = (svn_client_ctx_t *) 0 ;
+    apr_pool_t *arg8 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    int res1 ;
+    char *buf1 = 0 ;
+    int alloc1 = 0 ;
+    int val2 ;
+    int ecode2 = 0 ;
+    int val3 ;
+    int ecode3 = 0 ;
+    int val4 ;
+    int ecode4 = 0 ;
+    int val5 ;
+    int ecode5 = 0 ;
+    int val6 ;
+    int ecode6 = 0 ;
+    void *argp7 = 0 ;
+    int res7 = 0 ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    if ((items < 7) || (items > 8)) {
+      SWIG_croak("Usage: svn_client_cleanup2(dir_abspath,break_locks,fix_recorded_timestamps,clear_dav_cache,vacuum_pristines,include_externals,ctx,scratch_pool);");
+    }
+    res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1);
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client_cleanup2" "', argument " "1"" of type '" "char const *""'");
+    }
+    arg1 = (char *)(buf1);
+    ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
+    if (!SWIG_IsOK(ecode2)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "svn_client_cleanup2" "', argument " "2"" of type '" "svn_boolean_t""'");
+    } 
+    arg2 = (svn_boolean_t)(val2);
+    ecode3 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(2), &val3);
+    if (!SWIG_IsOK(ecode3)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "svn_client_cleanup2" "', argument " "3"" of type '" "svn_boolean_t""'");
+    } 
+    arg3 = (svn_boolean_t)(val3);
+    ecode4 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(3), &val4);
+    if (!SWIG_IsOK(ecode4)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "svn_client_cleanup2" "', argument " "4"" of type '" "svn_boolean_t""'");
+    } 
+    arg4 = (svn_boolean_t)(val4);
+    ecode5 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(4), &val5);
+    if (!SWIG_IsOK(ecode5)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "svn_client_cleanup2" "', argument " "5"" of type '" "svn_boolean_t""'");
+    } 
+    arg5 = (svn_boolean_t)(val5);
+    ecode6 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(5), &val6);
+    if (!SWIG_IsOK(ecode6)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "svn_client_cleanup2" "', argument " "6"" of type '" "svn_boolean_t""'");
+    } 
+    arg6 = (svn_boolean_t)(val6);
+    res7 = SWIG_ConvertPtr(ST(6), &argp7,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
+    if (!SWIG_IsOK(res7)) {
+      SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "svn_client_cleanup2" "', argument " "7"" of type '" "svn_client_ctx_t *""'"); 
+    }
+    arg7 = (svn_client_ctx_t *)(argp7);
+    if (items > 7) {
+      
+    }
+    {
+      result = (svn_error_t *)svn_client_cleanup2((char const *)arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+    
+    
+    
+    
+    
+    
+    
+    XSRETURN(argvi);
+  fail:
+    if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+    
+    
+    
+    
+    
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_svn_client_cleanup) {
   {
     char *arg1 = (char *) 0 ;
@@ -21015,6 +22228,7 @@ XS(_wrap_svn_client_cleanup) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_client_cleanup(dir,ctx,scratch_pool);");
@@ -21084,6 +22298,7 @@ XS(_wrap_svn_client_upgrade) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_client_upgrade(wcroot_dir,ctx,scratch_pool);");
@@ -21164,6 +22379,7 @@ XS(_wrap_svn_client_relocate2) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 5) || (items > 6)) {
       SWIG_croak("Usage: svn_client_relocate2(wcroot_dir,from_prefix,to_prefix,ignore_externals,ctx,pool);");
@@ -21265,6 +22481,7 @@ XS(_wrap_svn_client_relocate) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 5) || (items > 6)) {
       SWIG_croak("Usage: svn_client_relocate(dir,from_prefix,to_prefix,recurse,ctx,pool);");
@@ -21338,6 +22555,109 @@ XS(_wrap_svn_client_relocate) {
 }
 
 
+XS(_wrap_svn_client_revert3) {
+  {
+    apr_array_header_t *arg1 = (apr_array_header_t *) 0 ;
+    svn_depth_t arg2 ;
+    apr_array_header_t *arg3 = (apr_array_header_t *) 0 ;
+    svn_boolean_t arg4 ;
+    svn_boolean_t arg5 ;
+    svn_client_ctx_t *arg6 = (svn_client_ctx_t *) 0 ;
+    apr_pool_t *arg7 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    int val2 ;
+    int ecode2 = 0 ;
+    int val4 ;
+    int ecode4 = 0 ;
+    int val5 ;
+    int ecode5 = 0 ;
+    void *argp6 = 0 ;
+    int res6 = 0 ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    if ((items < 6) || (items > 7)) {
+      SWIG_croak("Usage: svn_client_revert3(paths,depth,changelists,clear_changelists,metadata_only,ctx,pool);");
+    }
+    {
+      arg1 = svn_swig_pl_strings_to_array(ST(0),
+        _global_pool);
+    }
+    ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
+    if (!SWIG_IsOK(ecode2)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "svn_client_revert3" "', argument " "2"" of type '" "svn_depth_t""'");
+    } 
+    arg2 = (svn_depth_t)(val2);
+    {
+      arg3 = SvOK(ST(2)) ? svn_swig_pl_strings_to_array(
+        ST(2), _global_pool) : NULL;
+    }
+    ecode4 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(3), &val4);
+    if (!SWIG_IsOK(ecode4)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "svn_client_revert3" "', argument " "4"" of type '" "svn_boolean_t""'");
+    } 
+    arg4 = (svn_boolean_t)(val4);
+    ecode5 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(4), &val5);
+    if (!SWIG_IsOK(ecode5)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "svn_client_revert3" "', argument " "5"" of type '" "svn_boolean_t""'");
+    } 
+    arg5 = (svn_boolean_t)(val5);
+    res6 = SWIG_ConvertPtr(ST(5), &argp6,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
+    if (!SWIG_IsOK(res6)) {
+      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "svn_client_revert3" "', argument " "6"" of type '" "svn_client_ctx_t *""'"); 
+    }
+    arg6 = (svn_client_ctx_t *)(argp6);
+    if (items > 6) {
+      
+    }
+    {
+      result = (svn_error_t *)svn_client_revert3((apr_array_header_t const *)arg1,arg2,(apr_array_header_t const *)arg3,arg4,arg5,arg6,arg7);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    
+    
+    
+    
+    
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    
+    
+    
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_svn_client_revert2) {
   {
     apr_array_header_t *arg1 = (apr_array_header_t *) 0 ;
@@ -21356,12 +22676,13 @@ XS(_wrap_svn_client_revert2) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_client_revert2(paths,depth,changelists,ctx,pool);");
     }
     {
-      arg1 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(0),
+      arg1 = svn_swig_pl_strings_to_array(ST(0),
         _global_pool);
     }
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
@@ -21370,7 +22691,7 @@ XS(_wrap_svn_client_revert2) {
     } 
     arg2 = (svn_depth_t)(val2);
     {
-      arg3 = SvOK(ST(2)) ? (apr_array_header_t *) svn_swig_pl_strings_to_array(
+      arg3 = SvOK(ST(2)) ? svn_swig_pl_strings_to_array(
         ST(2), _global_pool) : NULL;
     }
     res4 = SWIG_ConvertPtr(ST(3), &argp4,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
@@ -21437,12 +22758,13 @@ XS(_wrap_svn_client_revert) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_client_revert(paths,recursive,ctx,pool);");
     }
     {
-      arg1 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(0),
+      arg1 = svn_swig_pl_strings_to_array(ST(0),
         _global_pool);
     }
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
@@ -21515,6 +22837,7 @@ XS(_wrap_svn_client_resolved) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_client_resolved(path,recursive,ctx,pool);");
@@ -21597,6 +22920,7 @@ XS(_wrap_svn_client_resolve) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_client_resolve(path,depth,conflict_choice,ctx,pool);");
@@ -21743,6 +23067,7 @@ XS(_wrap_svn_client_copy_source_t_revision_set) {
     void *argp1 = 0 ;
     int res1 = 0 ;
     svn_opt_revision_t rev2 ;
+    apr_pool_t *_global_pool = NULL ;
     int argvi = 0;
     dXSARGS;
     
@@ -21755,7 +23080,11 @@ XS(_wrap_svn_client_copy_source_t_revision_set) {
     }
     arg1 = (struct svn_client_copy_source_t *)(argp1);
     {
-      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE, _global_pool);
     }
     {
       if (!arg2) {
@@ -21810,6 +23139,7 @@ XS(_wrap_svn_client_copy_source_t_peg_revision_set) {
     void *argp1 = 0 ;
     int res1 = 0 ;
     svn_opt_revision_t rev2 ;
+    apr_pool_t *_global_pool = NULL ;
     int argvi = 0;
     dXSARGS;
     
@@ -21822,7 +23152,11 @@ XS(_wrap_svn_client_copy_source_t_peg_revision_set) {
     }
     arg1 = (struct svn_client_copy_source_t *)(argp1);
     {
-      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE, _global_pool);
     }
     {
       if (!arg2) {
@@ -21925,6 +23259,163 @@ XS(_wrap_delete_svn_client_copy_source_t) {
 }
 
 
+XS(_wrap_svn_client_copy7) {
+  {
+    apr_array_header_t *arg1 = (apr_array_header_t *) 0 ;
+    char *arg2 = (char *) 0 ;
+    svn_boolean_t arg3 ;
+    svn_boolean_t arg4 ;
+    svn_boolean_t arg5 ;
+    svn_boolean_t arg6 ;
+    svn_boolean_t arg7 ;
+    apr_hash_t *arg8 = (apr_hash_t *) 0 ;
+    apr_hash_t *arg9 = (apr_hash_t *) 0 ;
+    svn_commit_callback2_t arg10 = (svn_commit_callback2_t) 0 ;
+    void *arg11 = (void *) 0 ;
+    svn_client_ctx_t *arg12 = (svn_client_ctx_t *) 0 ;
+    apr_pool_t *arg13 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    int res2 ;
+    char *buf2 = 0 ;
+    int alloc2 = 0 ;
+    int val3 ;
+    int ecode3 = 0 ;
+    int val4 ;
+    int ecode4 = 0 ;
+    int val5 ;
+    int ecode5 = 0 ;
+    int val6 ;
+    int ecode6 = 0 ;
+    int val7 ;
+    int ecode7 = 0 ;
+    void *argp8 = 0 ;
+    int res8 = 0 ;
+    void *argp12 = 0 ;
+    int res12 = 0 ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg13 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    if ((items < 11) || (items > 12)) {
+      SWIG_croak("Usage: svn_client_copy7(sources,dst_path,copy_as_child,make_parents,ignore_externals,metadata_only,pin_externals,externals_to_pin,revprop_table,commit_callback,commit_baton,ctx,pool);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_apr_array_header_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client_copy7" "', argument " "1"" of type '" "apr_array_header_t const *""'"); 
+    }
+    arg1 = (apr_array_header_t *)(argp1);
+    res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_client_copy7" "', argument " "2"" of type '" "char const *""'");
+    }
+    arg2 = (char *)(buf2);
+    ecode3 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(2), &val3);
+    if (!SWIG_IsOK(ecode3)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "svn_client_copy7" "', argument " "3"" of type '" "svn_boolean_t""'");
+    } 
+    arg3 = (svn_boolean_t)(val3);
+    ecode4 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(3), &val4);
+    if (!SWIG_IsOK(ecode4)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "svn_client_copy7" "', argument " "4"" of type '" "svn_boolean_t""'");
+    } 
+    arg4 = (svn_boolean_t)(val4);
+    ecode5 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(4), &val5);
+    if (!SWIG_IsOK(ecode5)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "svn_client_copy7" "', argument " "5"" of type '" "svn_boolean_t""'");
+    } 
+    arg5 = (svn_boolean_t)(val5);
+    ecode6 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(5), &val6);
+    if (!SWIG_IsOK(ecode6)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "svn_client_copy7" "', argument " "6"" of type '" "svn_boolean_t""'");
+    } 
+    arg6 = (svn_boolean_t)(val6);
+    ecode7 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(6), &val7);
+    if (!SWIG_IsOK(ecode7)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "svn_client_copy7" "', argument " "7"" of type '" "svn_boolean_t""'");
+    } 
+    arg7 = (svn_boolean_t)(val7);
+    res8 = SWIG_ConvertPtr(ST(7), &argp8,SWIGTYPE_p_apr_hash_t, 0 |  0 );
+    if (!SWIG_IsOK(res8)) {
+      SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "svn_client_copy7" "', argument " "8"" of type '" "apr_hash_t const *""'"); 
+    }
+    arg8 = (apr_hash_t *)(argp8);
+    {
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg9 = svn_swig_pl_hash_to_prophash(ST(8), _global_pool);  
+    }
+    {
+      arg10 = svn_swig_pl_thunk_commit_callback2;
+      arg11 = (void *)ST(9);
+      svn_swig_pl_hold_ref_in_pool (_global_pool, ST(9));
+    }
+    res12 = SWIG_ConvertPtr(ST(10), &argp12,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
+    if (!SWIG_IsOK(res12)) {
+      SWIG_exception_fail(SWIG_ArgError(res12), "in method '" "svn_client_copy7" "', argument " "12"" of type '" "svn_client_ctx_t *""'"); 
+    }
+    arg12 = (svn_client_ctx_t *)(argp12);
+    if (items > 11) {
+      
+    }
+    {
+      result = (svn_error_t *)svn_client_copy7((apr_array_header_t const *)arg1,(char const *)arg2,arg3,arg4,arg5,arg6,arg7,(apr_hash_t const *)arg8,(apr_hash_t const *)arg9,arg10,arg11,arg12,arg13);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    
+    if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_svn_client_copy6) {
   {
     apr_array_header_t *arg1 = (apr_array_header_t *) 0 ;
@@ -21957,6 +23448,7 @@ XS(_wrap_svn_client_copy6) {
     
     {
       _global_pool = arg10 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 8) || (items > 9)) {
       SWIG_croak("Usage: svn_client_copy6(sources,dst_path,copy_as_child,make_parents,ignore_externals,revprop_table,commit_callback,commit_baton,ctx,pool);");
@@ -21987,8 +23479,10 @@ XS(_wrap_svn_client_copy6) {
     } 
     arg5 = (svn_boolean_t)(val5);
     {
-      if (_global_pool == NULL)
-      _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
       arg6 = svn_swig_pl_hash_to_prophash(ST(5), _global_pool);  
     }
     {
@@ -22081,6 +23575,7 @@ XS(_wrap_svn_client_copy5) {
     
     {
       _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 7) || (items > 8)) {
@@ -22112,8 +23607,10 @@ XS(_wrap_svn_client_copy5) {
     } 
     arg6 = (svn_boolean_t)(val6);
     {
-      if (_global_pool == NULL)
-      _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
       arg7 = svn_swig_pl_hash_to_prophash(ST(5), _global_pool);  
     }
     res8 = SWIG_ConvertPtr(ST(6), &argp8,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
@@ -22203,6 +23700,7 @@ XS(_wrap_svn_client_copy4) {
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 6) || (items > 7)) {
@@ -22229,8 +23727,10 @@ XS(_wrap_svn_client_copy4) {
     } 
     arg5 = (svn_boolean_t)(val5);
     {
-      if (_global_pool == NULL)
-      _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
       arg6 = svn_swig_pl_hash_to_prophash(ST(4), _global_pool);  
     }
     res7 = SWIG_ConvertPtr(ST(5), &argp7,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
@@ -22314,6 +23814,7 @@ XS(_wrap_svn_client_copy3) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 4) || (items > 5)) {
@@ -22325,7 +23826,11 @@ XS(_wrap_svn_client_copy3) {
     }
     arg2 = (char *)(buf2);
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(1), TRUE, _global_pool);
     }
     res4 = SWIG_AsCharPtrAndSize(ST(2), &buf4, NULL, &alloc4);
     if (!SWIG_IsOK(res4)) {
@@ -22409,6 +23914,7 @@ XS(_wrap_svn_client_copy2) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 4) || (items > 5)) {
@@ -22420,7 +23926,11 @@ XS(_wrap_svn_client_copy2) {
     }
     arg2 = (char *)(buf2);
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(1), TRUE, _global_pool);
     }
     res4 = SWIG_AsCharPtrAndSize(ST(2), &buf4, NULL, &alloc4);
     if (!SWIG_IsOK(res4)) {
@@ -22504,6 +24014,7 @@ XS(_wrap_svn_client_copy) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 4) || (items > 5)) {
@@ -22515,7 +24026,11 @@ XS(_wrap_svn_client_copy) {
     }
     arg2 = (char *)(buf2);
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(1), TRUE, _global_pool);
     }
     res4 = SWIG_AsCharPtrAndSize(ST(2), &buf4, NULL, &alloc4);
     if (!SWIG_IsOK(res4)) {
@@ -22611,12 +24126,13 @@ XS(_wrap_svn_client_move7) {
     
     {
       _global_pool = arg11 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 9) || (items > 10)) {
       SWIG_croak("Usage: svn_client_move7(src_paths,dst_path,move_as_child,make_parents,allow_mixed_revisions,metadata_only,revprop_table,commit_callback,commit_baton,ctx,pool);");
     }
     {
-      arg1 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(0),
+      arg1 = svn_swig_pl_strings_to_array(ST(0),
         _global_pool);
     }
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
@@ -22645,8 +24161,10 @@ XS(_wrap_svn_client_move7) {
     } 
     arg6 = (svn_boolean_t)(val6);
     {
-      if (_global_pool == NULL)
-      _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
       arg7 = svn_swig_pl_hash_to_prophash(ST(6), _global_pool);  
     }
     {
@@ -22736,12 +24254,13 @@ XS(_wrap_svn_client_move6) {
     
     {
       _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 7) || (items > 8)) {
       SWIG_croak("Usage: svn_client_move6(src_paths,dst_path,move_as_child,make_parents,revprop_table,commit_callback,commit_baton,ctx,pool);");
     }
     {
-      arg1 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(0),
+      arg1 = svn_swig_pl_strings_to_array(ST(0),
         _global_pool);
     }
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
@@ -22760,8 +24279,10 @@ XS(_wrap_svn_client_move6) {
     } 
     arg4 = (svn_boolean_t)(val4);
     {
-      if (_global_pool == NULL)
-      _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
       arg5 = svn_swig_pl_hash_to_prophash(ST(4), _global_pool);  
     }
     {
@@ -22850,13 +24371,14 @@ XS(_wrap_svn_client_move5) {
     
     {
       _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 7) || (items > 8)) {
       SWIG_croak("Usage: svn_client_move5(src_paths,dst_path,force,move_as_child,make_parents,revprop_table,ctx,pool);");
     }
     {
-      arg2 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(0),
+      arg2 = svn_swig_pl_strings_to_array(ST(0),
         _global_pool);
     }
     res3 = SWIG_AsCharPtrAndSize(ST(1), &buf3, NULL, &alloc3);
@@ -22880,8 +24402,10 @@ XS(_wrap_svn_client_move5) {
     } 
     arg6 = (svn_boolean_t)(val6);
     {
-      if (_global_pool == NULL)
-      _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
       arg7 = svn_swig_pl_hash_to_prophash(ST(5), _global_pool);  
     }
     res8 = SWIG_ConvertPtr(ST(6), &argp8,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
@@ -22968,6 +24492,7 @@ XS(_wrap_svn_client_move4) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 4) || (items > 5)) {
@@ -23066,6 +24591,7 @@ XS(_wrap_svn_client_move3) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 4) || (items > 5)) {
@@ -23164,6 +24690,7 @@ XS(_wrap_svn_client_move2) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 4) || (items > 5)) {
@@ -23268,6 +24795,7 @@ XS(_wrap_svn_client_move) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 5) || (items > 6)) {
@@ -23279,7 +24807,11 @@ XS(_wrap_svn_client_move) {
     }
     arg2 = (char *)(buf2);
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(1), TRUE, _global_pool);
     }
     res4 = SWIG_AsCharPtrAndSize(ST(2), &buf4, NULL, &alloc4);
     if (!SWIG_IsOK(res4)) {
@@ -23381,6 +24913,7 @@ XS(_wrap_svn_client_propset_remote) {
     
     {
       _global_pool = arg10 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 8) || (items > 9)) {
       SWIG_croak("Usage: svn_client_propset_remote(propname,propval,url,skip_checks,base_revision_for_url,revprop_table,commit_callback,commit_baton,ctx,scratch_pool);");
@@ -23415,8 +24948,10 @@ XS(_wrap_svn_client_propset_remote) {
     } 
     arg5 = (svn_revnum_t)(val5);
     {
-      if (_global_pool == NULL)
-      _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
       arg6 = svn_swig_pl_hash_to_prophash(ST(5), _global_pool);  
     }
     {
@@ -23504,6 +25039,7 @@ XS(_wrap_svn_client_propset_local) {
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 7) || (items > 8)) {
       SWIG_croak("Usage: svn_client_propset_local(propname,propval,targets,depth,skip_checks,changelists,ctx,scratch_pool);");
@@ -23523,7 +25059,7 @@ XS(_wrap_svn_client_propset_local) {
       }
     }
     {
-      arg3 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(2),
+      arg3 = svn_swig_pl_strings_to_array(ST(2),
         _global_pool);
     }
     ecode4 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(3), &val4);
@@ -23537,7 +25073,7 @@ XS(_wrap_svn_client_propset_local) {
     } 
     arg5 = (svn_boolean_t)(val5);
     {
-      arg6 = SvOK(ST(5)) ? (apr_array_header_t *) svn_swig_pl_strings_to_array(
+      arg6 = SvOK(ST(5)) ? svn_swig_pl_strings_to_array(
         ST(5), _global_pool) : NULL;
     }
     res7 = SWIG_ConvertPtr(ST(6), &argp7,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
@@ -23629,6 +25165,7 @@ XS(_wrap_svn_client_propset3) {
     
     {
       _global_pool = arg11 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 9) || (items > 10)) {
@@ -23669,12 +25206,14 @@ XS(_wrap_svn_client_propset3) {
     } 
     arg7 = (svn_revnum_t)(val7);
     {
-      arg8 = SvOK(ST(6)) ? (apr_array_header_t *) svn_swig_pl_strings_to_array(
+      arg8 = SvOK(ST(6)) ? svn_swig_pl_strings_to_array(
         ST(6), _global_pool) : NULL;
     }
     {
-      if (_global_pool == NULL)
-      _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
       arg9 = svn_swig_pl_hash_to_prophash(ST(7), _global_pool);  
     }
     res10 = SWIG_ConvertPtr(ST(8), &argp10,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
@@ -23768,6 +25307,7 @@ XS(_wrap_svn_client_propset2) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 6) || (items > 7)) {
       SWIG_croak("Usage: svn_client_propset2(propname,propval,target,recurse,skip_checks,ctx,pool);");
@@ -23875,6 +25415,7 @@ XS(_wrap_svn_client_propset) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_client_propset(propname,propval,target,recurse,pool);");
@@ -23978,6 +25519,7 @@ XS(_wrap_svn_client_revprop_set2) {
     
     {
       _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg6 = &temp6;
     if ((items < 7) || (items > 8)) {
@@ -24012,7 +25554,11 @@ XS(_wrap_svn_client_revprop_set2) {
     }
     arg4 = (char *)(buf4);
     {
-      arg5 = svn_swig_pl_set_revision(&rev5, ST(4), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg5 = svn_swig_pl_set_revision(&rev5, ST(4), TRUE, _global_pool);
     }
     ecode7 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(5), &val7);
     if (!SWIG_IsOK(ecode7)) {
@@ -24116,6 +25662,7 @@ XS(_wrap_svn_client_revprop_set) {
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg5 = &temp5;
     if ((items < 6) || (items > 7)) {
@@ -24141,7 +25688,11 @@ XS(_wrap_svn_client_revprop_set) {
     }
     arg3 = (char *)(buf3);
     {
-      arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE, _global_pool);
     }
     ecode6 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(4), &val6);
     if (!SWIG_IsOK(ecode6)) {
@@ -24249,9 +25800,11 @@ XS(_wrap_svn_client_propget5) {
     
     {
       _global_pool = arg11 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg12 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
@@ -24270,10 +25823,18 @@ XS(_wrap_svn_client_propget5) {
     }
     arg4 = (char *)(buf4);
     {
-      arg5 = svn_swig_pl_set_revision(&rev5, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg5 = svn_swig_pl_set_revision(&rev5, ST(2), TRUE, _global_pool);
     }
     {
-      arg6 = svn_swig_pl_set_revision(&rev6, ST(3), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg6 = svn_swig_pl_set_revision(&rev6, ST(3), TRUE, _global_pool);
     }
     ecode8 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(4), &val8);
     if (!SWIG_IsOK(ecode8)) {
@@ -24281,7 +25842,7 @@ XS(_wrap_svn_client_propget5) {
     } 
     arg8 = (svn_depth_t)(val8);
     {
-      arg9 = SvOK(ST(5)) ? (apr_array_header_t *) svn_swig_pl_strings_to_array(
+      arg9 = SvOK(ST(5)) ? svn_swig_pl_strings_to_array(
         ST(5), _global_pool) : NULL;
     }
     res10 = SWIG_ConvertPtr(ST(6), &argp10,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
@@ -24411,9 +25972,11 @@ XS(_wrap_svn_client_propget4) {
     
     {
       _global_pool = arg10 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg11 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg6 = &temp6;
@@ -24431,10 +25994,18 @@ XS(_wrap_svn_client_propget4) {
     }
     arg3 = (char *)(buf3);
     {
-      arg4 = svn_swig_pl_set_revision(&rev4, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg4 = svn_swig_pl_set_revision(&rev4, ST(2), TRUE, _global_pool);
     }
     {
-      arg5 = svn_swig_pl_set_revision(&rev5, ST(3), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg5 = svn_swig_pl_set_revision(&rev5, ST(3), TRUE, _global_pool);
     }
     ecode7 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(4), &val7);
     if (!SWIG_IsOK(ecode7)) {
@@ -24442,7 +26013,7 @@ XS(_wrap_svn_client_propget4) {
     } 
     arg7 = (svn_depth_t)(val7);
     {
-      arg8 = SvOK(ST(5)) ? (apr_array_header_t *) svn_swig_pl_strings_to_array(
+      arg8 = SvOK(ST(5)) ? svn_swig_pl_strings_to_array(
         ST(5), _global_pool) : NULL;
     }
     res9 = SWIG_ConvertPtr(ST(6), &argp9,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
@@ -24560,6 +26131,7 @@ XS(_wrap_svn_client_propget3) {
     
     {
       _global_pool = arg10 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg6 = &temp6;
@@ -24577,10 +26149,18 @@ XS(_wrap_svn_client_propget3) {
     }
     arg3 = (char *)(buf3);
     {
-      arg4 = svn_swig_pl_set_revision(&rev4, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg4 = svn_swig_pl_set_revision(&rev4, ST(2), TRUE, _global_pool);
     }
     {
-      arg5 = svn_swig_pl_set_revision(&rev5, ST(3), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg5 = svn_swig_pl_set_revision(&rev5, ST(3), TRUE, _global_pool);
     }
     ecode7 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(4), &val7);
     if (!SWIG_IsOK(ecode7)) {
@@ -24588,7 +26168,7 @@ XS(_wrap_svn_client_propget3) {
     } 
     arg7 = (svn_depth_t)(val7);
     {
-      arg8 = SvOK(ST(5)) ? (apr_array_header_t *) svn_swig_pl_strings_to_array(
+      arg8 = SvOK(ST(5)) ? svn_swig_pl_strings_to_array(
         ST(5), _global_pool) : NULL;
     }
     res9 = SWIG_ConvertPtr(ST(6), &argp9,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
@@ -24697,6 +26277,7 @@ XS(_wrap_svn_client_propget2) {
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 6) || (items > 7)) {
@@ -24713,10 +26294,18 @@ XS(_wrap_svn_client_propget2) {
     }
     arg3 = (char *)(buf3);
     {
-      arg4 = svn_swig_pl_set_revision(&rev4, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg4 = svn_swig_pl_set_revision(&rev4, ST(2), TRUE, _global_pool);
     }
     {
-      arg5 = svn_swig_pl_set_revision(&rev5, ST(3), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg5 = svn_swig_pl_set_revision(&rev5, ST(3), TRUE, _global_pool);
     }
     ecode6 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(4), &val6);
     if (!SWIG_IsOK(ecode6)) {
@@ -24817,6 +26406,7 @@ XS(_wrap_svn_client_propget) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 5) || (items > 6)) {
@@ -24833,7 +26423,11 @@ XS(_wrap_svn_client_propget) {
     }
     arg3 = (char *)(buf3);
     {
-      arg4 = svn_swig_pl_set_revision(&rev4, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg4 = svn_swig_pl_set_revision(&rev4, ST(2), TRUE, _global_pool);
     }
     ecode5 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(3), &val5);
     if (!SWIG_IsOK(ecode5)) {
@@ -24927,6 +26521,7 @@ XS(_wrap_svn_client_revprop_get) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     arg5 = &temp5;
@@ -24944,7 +26539,11 @@ XS(_wrap_svn_client_revprop_get) {
     }
     arg3 = (char *)(buf3);
     {
-      arg4 = svn_swig_pl_set_revision(&rev4, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg4 = svn_swig_pl_set_revision(&rev4, ST(2), TRUE, _global_pool);
     }
     res6 = SWIG_ConvertPtr(ST(3), &argp6,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
     if (!SWIG_IsOK(res6)) {
@@ -25046,6 +26645,7 @@ XS(_wrap_svn_client_proplist4) {
     
     {
       _global_pool = arg10 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 9) || (items > 10)) {
       SWIG_croak("Usage: svn_client_proplist4(target,peg_revision,revision,depth,changelists,get_target_inherited_props,receiver,receiver_baton,ctx,scratch_pool);");
@@ -25056,10 +26656,18 @@ XS(_wrap_svn_client_proplist4) {
     }
     arg1 = (char *)(buf1);
     {
-      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE, _global_pool);
     }
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE, _global_pool);
     }
     ecode4 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(3), &val4);
     if (!SWIG_IsOK(ecode4)) {
@@ -25067,7 +26675,7 @@ XS(_wrap_svn_client_proplist4) {
     } 
     arg4 = (svn_depth_t)(val4);
     {
-      arg5 = SvOK(ST(4)) ? (apr_array_header_t *) svn_swig_pl_strings_to_array(
+      arg5 = SvOK(ST(4)) ? svn_swig_pl_strings_to_array(
         ST(4), _global_pool) : NULL;
     }
     ecode6 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(5), &val6);
@@ -25180,6 +26788,7 @@ XS(_wrap_svn_client_proplist3) {
     
     {
       _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 8) || (items > 9)) {
       SWIG_croak("Usage: svn_client_proplist3(target,peg_revision,revision,depth,changelists,receiver,receiver_baton,ctx,pool);");
@@ -25190,10 +26799,18 @@ XS(_wrap_svn_client_proplist3) {
     }
     arg1 = (char *)(buf1);
     {
-      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE, _global_pool);
     }
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE, _global_pool);
     }
     ecode4 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(3), &val4);
     if (!SWIG_IsOK(ecode4)) {
@@ -25201,7 +26818,7 @@ XS(_wrap_svn_client_proplist3) {
     } 
     arg4 = (svn_depth_t)(val4);
     {
-      arg5 = SvOK(ST(4)) ? (apr_array_header_t *) svn_swig_pl_strings_to_array(
+      arg5 = SvOK(ST(4)) ? svn_swig_pl_strings_to_array(
         ST(4), _global_pool) : NULL;
     }
     {
@@ -25305,6 +26922,7 @@ XS(_wrap_svn_client_proplist2) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 5) || (items > 6)) {
@@ -25316,10 +26934,18 @@ XS(_wrap_svn_client_proplist2) {
     }
     arg2 = (char *)(buf2);
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(1), TRUE, _global_pool);
     }
     {
-      arg4 = svn_swig_pl_set_revision(&rev4, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg4 = svn_swig_pl_set_revision(&rev4, ST(2), TRUE, _global_pool);
     }
     ecode5 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(3), &val5);
     if (!SWIG_IsOK(ecode5)) {
@@ -25367,7 +26993,7 @@ XS(_wrap_svn_client_proplist2) {
       }
     }
     {
-      /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = svn_swig_pl_convert_array(*arg1,
+      /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = svn_swig_pl_convert_array(*arg1,
         SWIGTYPE_p_svn_client_proplist_item_t); argvi++ /*@SWIG@*/
       /*@SWIG@*/
       ;
@@ -25417,6 +27043,7 @@ XS(_wrap_svn_client_proplist) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 4) || (items > 5)) {
@@ -25428,7 +27055,11 @@ XS(_wrap_svn_client_proplist) {
     }
     arg2 = (char *)(buf2);
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(1), TRUE, _global_pool);
     }
     ecode4 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(2), &val4);
     if (!SWIG_IsOK(ecode4)) {
@@ -25471,7 +27102,7 @@ XS(_wrap_svn_client_proplist) {
       }
     }
     {
-      /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = svn_swig_pl_convert_array(*arg1,
+      /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = svn_swig_pl_convert_array(*arg1,
         SWIGTYPE_p_svn_client_proplist_item_t); argvi++ /*@SWIG@*/
       /*@SWIG@*/
       ;
@@ -25519,6 +27150,7 @@ XS(_wrap_svn_client_revprop_list) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg4 = &temp4;
@@ -25531,7 +27163,11 @@ XS(_wrap_svn_client_revprop_list) {
     }
     arg2 = (char *)(buf2);
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(1), TRUE, _global_pool);
     }
     res5 = SWIG_ConvertPtr(ST(2), &argp5,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
     if (!SWIG_IsOK(res5)) {
@@ -25640,6 +27276,7 @@ XS(_wrap_svn_client_export5) {
     
     {
       _global_pool = arg12 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 10) || (items > 11)) {
@@ -25656,10 +27293,18 @@ XS(_wrap_svn_client_export5) {
     }
     arg3 = (char *)(buf3);
     {
-      arg4 = svn_swig_pl_set_revision(&rev4, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg4 = svn_swig_pl_set_revision(&rev4, ST(2), TRUE, _global_pool);
     }
     {
-      arg5 = svn_swig_pl_set_revision(&rev5, ST(3), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg5 = svn_swig_pl_set_revision(&rev5, ST(3), TRUE, _global_pool);
     }
     ecode6 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(4), &val6);
     if (!SWIG_IsOK(ecode6)) {
@@ -25804,6 +27449,7 @@ XS(_wrap_svn_client_export4) {
     
     {
       _global_pool = arg11 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 9) || (items > 10)) {
@@ -25820,10 +27466,18 @@ XS(_wrap_svn_client_export4) {
     }
     arg3 = (char *)(buf3);
     {
-      arg4 = svn_swig_pl_set_revision(&rev4, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg4 = svn_swig_pl_set_revision(&rev4, ST(2), TRUE, _global_pool);
     }
     {
-      arg5 = svn_swig_pl_set_revision(&rev5, ST(3), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg5 = svn_swig_pl_set_revision(&rev5, ST(3), TRUE, _global_pool);
     }
     ecode6 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(4), &val6);
     if (!SWIG_IsOK(ecode6)) {
@@ -25961,6 +27615,7 @@ XS(_wrap_svn_client_export3) {
     
     {
       _global_pool = arg11 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 9) || (items > 10)) {
@@ -25977,10 +27632,18 @@ XS(_wrap_svn_client_export3) {
     }
     arg3 = (char *)(buf3);
     {
-      arg4 = svn_swig_pl_set_revision(&rev4, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg4 = svn_swig_pl_set_revision(&rev4, ST(2), TRUE, _global_pool);
     }
     {
-      arg5 = svn_swig_pl_set_revision(&rev5, ST(3), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg5 = svn_swig_pl_set_revision(&rev5, ST(3), TRUE, _global_pool);
     }
     ecode6 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(4), &val6);
     if (!SWIG_IsOK(ecode6)) {
@@ -26110,6 +27773,7 @@ XS(_wrap_svn_client_export2) {
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 6) || (items > 7)) {
@@ -26126,7 +27790,11 @@ XS(_wrap_svn_client_export2) {
     }
     arg3 = (char *)(buf3);
     {
-      arg4 = svn_swig_pl_set_revision(&rev4, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg4 = svn_swig_pl_set_revision(&rev4, ST(2), TRUE, _global_pool);
     }
     ecode5 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(3), &val5);
     if (!SWIG_IsOK(ecode5)) {
@@ -26226,6 +27894,7 @@ XS(_wrap_svn_client_export) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 5) || (items > 6)) {
@@ -26242,7 +27911,11 @@ XS(_wrap_svn_client_export) {
     }
     arg3 = (char *)(buf3);
     {
-      arg4 = svn_swig_pl_set_revision(&rev4, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg4 = svn_swig_pl_set_revision(&rev4, ST(2), TRUE, _global_pool);
     }
     ecode5 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(3), &val5);
     if (!SWIG_IsOK(ecode5)) {
@@ -26342,6 +28015,7 @@ XS(_wrap_svn_client_list3) {
     
     {
       _global_pool = arg11 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 10) || (items > 11)) {
       SWIG_croak("Usage: svn_client_list3(path_or_url,peg_revision,revision,depth,dirent_fields,fetch_locks,include_externals,list_func,baton,ctx,pool);");
@@ -26352,10 +28026,18 @@ XS(_wrap_svn_client_list3) {
     }
     arg1 = (char *)(buf1);
     {
-      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE, _global_pool);
     }
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE, _global_pool);
     }
     ecode4 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(3), &val4);
     if (!SWIG_IsOK(ecode4)) {
@@ -26489,6 +28171,7 @@ XS(_wrap_svn_client_list2) {
     
     {
       _global_pool = arg10 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 9) || (items > 10)) {
       SWIG_croak("Usage: svn_client_list2(path_or_url,peg_revision,revision,depth,dirent_fields,fetch_locks,list_func,baton,ctx,pool);");
@@ -26499,10 +28182,18 @@ XS(_wrap_svn_client_list2) {
     }
     arg1 = (char *)(buf1);
     {
-      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE, _global_pool);
     }
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE, _global_pool);
     }
     ecode4 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(3), &val4);
     if (!SWIG_IsOK(ecode4)) {
@@ -26629,6 +28320,7 @@ XS(_wrap_svn_client_list) {
     
     {
       _global_pool = arg10 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 9) || (items > 10)) {
       SWIG_croak("Usage: svn_client_list(path_or_url,peg_revision,revision,recurse,dirent_fields,fetch_locks,list_func,baton,ctx,pool);");
@@ -26639,10 +28331,18 @@ XS(_wrap_svn_client_list) {
     }
     arg1 = (char *)(buf1);
     {
-      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE, _global_pool);
     }
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE, _global_pool);
     }
     ecode4 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(3), &val4);
     if (!SWIG_IsOK(ecode4)) {
@@ -26764,6 +28464,7 @@ XS(_wrap_svn_client_ls3) {
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
@@ -26776,10 +28477,18 @@ XS(_wrap_svn_client_ls3) {
     }
     arg3 = (char *)(buf3);
     {
-      arg4 = svn_swig_pl_set_revision(&rev4, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg4 = svn_swig_pl_set_revision(&rev4, ST(1), TRUE, _global_pool);
     }
     {
-      arg5 = svn_swig_pl_set_revision(&rev5, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg5 = svn_swig_pl_set_revision(&rev5, ST(2), TRUE, _global_pool);
     }
     ecode6 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(3), &val6);
     if (!SWIG_IsOK(ecode6)) {
@@ -26881,6 +28590,7 @@ XS(_wrap_svn_client_ls2) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 5) || (items > 6)) {
@@ -26892,10 +28602,18 @@ XS(_wrap_svn_client_ls2) {
     }
     arg2 = (char *)(buf2);
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(1), TRUE, _global_pool);
     }
     {
-      arg4 = svn_swig_pl_set_revision(&rev4, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg4 = svn_swig_pl_set_revision(&rev4, ST(2), TRUE, _global_pool);
     }
     ecode5 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(3), &val5);
     if (!SWIG_IsOK(ecode5)) {
@@ -26990,6 +28708,7 @@ XS(_wrap_svn_client_ls) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 4) || (items > 5)) {
@@ -27001,7 +28720,11 @@ XS(_wrap_svn_client_ls) {
     }
     arg2 = (char *)(buf2);
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(1), TRUE, _global_pool);
     }
     ecode4 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(2), &val4);
     if (!SWIG_IsOK(ecode4)) {
@@ -27060,6 +28783,143 @@ XS(_wrap_svn_client_ls) {
 }
 
 
+XS(_wrap_svn_client_cat3) {
+  {
+    apr_hash_t **arg1 = (apr_hash_t **) 0 ;
+    svn_stream_t *arg2 = (svn_stream_t *) 0 ;
+    char *arg3 = (char *) 0 ;
+    svn_opt_revision_t *arg4 = (svn_opt_revision_t *) 0 ;
+    svn_opt_revision_t *arg5 = (svn_opt_revision_t *) 0 ;
+    svn_boolean_t arg6 ;
+    svn_client_ctx_t *arg7 = (svn_client_ctx_t *) 0 ;
+    apr_pool_t *arg8 = (apr_pool_t *) 0 ;
+    apr_pool_t *arg9 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    apr_hash_t *temp1 ;
+    int res3 ;
+    char *buf3 = 0 ;
+    int alloc3 = 0 ;
+    svn_opt_revision_t rev4 ;
+    svn_opt_revision_t rev5 ;
+    int val6 ;
+    int ecode6 = 0 ;
+    void *argp7 = 0 ;
+    int res7 = 0 ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    {
+      _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    arg1 = &temp1;
+    if ((items < 6) || (items > 8)) {
+      SWIG_croak("Usage: svn_client_cat3(out,path_or_url,peg_revision,revision,expand_keywords,ctx,result_pool,scratch_pool);");
+    }
+    {
+      svn_swig_pl_make_stream (&arg2, ST(0));
+      SPAGAIN;
+    }
+    res3 = SWIG_AsCharPtrAndSize(ST(1), &buf3, NULL, &alloc3);
+    if (!SWIG_IsOK(res3)) {
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_client_cat3" "', argument " "3"" of type '" "char const *""'");
+    }
+    arg3 = (char *)(buf3);
+    {
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg4 = svn_swig_pl_set_revision(&rev4, ST(2), TRUE, _global_pool);
+    }
+    {
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg5 = svn_swig_pl_set_revision(&rev5, ST(3), TRUE, _global_pool);
+    }
+    ecode6 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(4), &val6);
+    if (!SWIG_IsOK(ecode6)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "svn_client_cat3" "', argument " "6"" of type '" "svn_boolean_t""'");
+    } 
+    arg6 = (svn_boolean_t)(val6);
+    res7 = SWIG_ConvertPtr(ST(5), &argp7,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
+    if (!SWIG_IsOK(res7)) {
+      SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "svn_client_cat3" "', argument " "7"" of type '" "svn_client_ctx_t *""'"); 
+    }
+    arg7 = (svn_client_ctx_t *)(argp7);
+    if (items > 6) {
+      
+    }
+    if (items > 7) {
+      
+    }
+    {
+      if (!arg4) {
+        SWIG_exception(SWIG_ValueError,"Received a NULL pointer.");
+      }
+    }
+    {
+      if (!arg5) {
+        SWIG_exception(SWIG_ValueError,"Received a NULL pointer.");
+      }
+    }
+    {
+      result = (svn_error_t *)svn_client_cat3(arg1,arg2,(char const *)arg3,(struct svn_opt_revision_t const *)arg4,(struct svn_opt_revision_t const *)arg5,arg6,arg7,arg8,arg9);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    {
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = svn_swig_pl_prophash_to_hash(*arg1); argvi++  ;
+    }
+    
+    
+    if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+    
+    
+    
+    
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+    
+    
+    
+    
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_svn_client_cat2) {
   {
     svn_stream_t *arg1 = (svn_stream_t *) 0 ;
@@ -27082,12 +28942,14 @@ XS(_wrap_svn_client_cat2) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 5) || (items > 6)) {
       SWIG_croak("Usage: svn_client_cat2(out,path_or_url,peg_revision,revision,ctx,pool);");
     }
     {
       svn_swig_pl_make_stream (&arg1, ST(0));
+      SPAGAIN;
     }
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
@@ -27095,10 +28957,18 @@ XS(_wrap_svn_client_cat2) {
     }
     arg2 = (char *)(buf2);
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE, _global_pool);
     }
     {
-      arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg4 = svn_swig_pl_set_revision(&rev4, ST(3), TRUE, _global_pool);
     }
     res5 = SWIG_ConvertPtr(ST(4), &argp5,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
     if (!SWIG_IsOK(res5)) {
@@ -27179,12 +29049,14 @@ XS(_wrap_svn_client_cat) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_client_cat(out,path_or_url,revision,ctx,pool);");
     }
     {
       svn_swig_pl_make_stream (&arg1, ST(0));
+      SPAGAIN;
     }
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
@@ -27192,7 +29064,11 @@ XS(_wrap_svn_client_cat) {
     }
     arg2 = (char *)(buf2);
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE, _global_pool);
     }
     res4 = SWIG_ConvertPtr(ST(3), &argp4,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
     if (!SWIG_IsOK(res4)) {
@@ -27268,12 +29144,13 @@ XS(_wrap_svn_client_add_to_changelist) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 5) || (items > 6)) {
       SWIG_croak("Usage: svn_client_add_to_changelist(paths,changelist,depth,changelists,ctx,pool);");
     }
     {
-      arg1 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(0),
+      arg1 = svn_swig_pl_strings_to_array(ST(0),
         _global_pool);
     }
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
@@ -27287,7 +29164,7 @@ XS(_wrap_svn_client_add_to_changelist) {
     } 
     arg3 = (svn_depth_t)(val3);
     {
-      arg4 = SvOK(ST(3)) ? (apr_array_header_t *) svn_swig_pl_strings_to_array(
+      arg4 = SvOK(ST(3)) ? svn_swig_pl_strings_to_array(
         ST(3), _global_pool) : NULL;
     }
     res5 = SWIG_ConvertPtr(ST(4), &argp5,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
@@ -27357,12 +29234,13 @@ XS(_wrap_svn_client_remove_from_changelists) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_client_remove_from_changelists(paths,depth,changelists,ctx,pool);");
     }
     {
-      arg1 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(0),
+      arg1 = svn_swig_pl_strings_to_array(ST(0),
         _global_pool);
     }
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
@@ -27371,7 +29249,7 @@ XS(_wrap_svn_client_remove_from_changelists) {
     } 
     arg2 = (svn_depth_t)(val2);
     {
-      arg3 = SvOK(ST(2)) ? (apr_array_header_t *) svn_swig_pl_strings_to_array(
+      arg3 = SvOK(ST(2)) ? svn_swig_pl_strings_to_array(
         ST(2), _global_pool) : NULL;
     }
     res4 = SWIG_ConvertPtr(ST(3), &argp4,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
@@ -27445,6 +29323,7 @@ XS(_wrap_svn_client_get_changelists) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 6) || (items > 7)) {
       SWIG_croak("Usage: svn_client_get_changelists(path,changelists,depth,callback_func,callback_baton,ctx,pool);");
@@ -27455,7 +29334,7 @@ XS(_wrap_svn_client_get_changelists) {
     }
     arg1 = (char *)(buf1);
     {
-      arg2 = SvOK(ST(1)) ? (apr_array_header_t *) svn_swig_pl_strings_to_array(
+      arg2 = SvOK(ST(1)) ? svn_swig_pl_strings_to_array(
         ST(1), _global_pool) : NULL;
     }
     ecode3 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(2), &val3);
@@ -27545,12 +29424,13 @@ XS(_wrap_svn_client_lock) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_client_lock(targets,comment,steal_lock,ctx,pool);");
     }
     {
-      arg1 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(0),
+      arg1 = svn_swig_pl_strings_to_array(ST(0),
         _global_pool);
     }
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
@@ -27627,12 +29507,13 @@ XS(_wrap_svn_client_unlock) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_client_unlock(targets,break_lock,ctx,pool);");
     }
     {
-      arg1 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(0),
+      arg1 = svn_swig_pl_strings_to_array(ST(0),
         _global_pool);
     }
     ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
@@ -28155,10 +30036,9 @@ XS(_wrap_svn_info_t_last_changed_date_get) {
     arg1 = (struct svn_info_t *)(argp1);
     result =  ((arg1)->last_changed_date);
     {
-      char temp[256];
+      char temp[30];
       sprintf(temp, "%" APR_INT64_T_FMT, (apr_int64_t) result);
-      ST(argvi) = sv_newmortal();
-      sv_setpv((SV*)ST(argvi++), temp);
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = sv_2mortal(newSVpv(temp, 0)); argvi++  ;
     }
     
     XSRETURN(argvi);
@@ -28629,10 +30509,9 @@ XS(_wrap_svn_info_t_text_time_get) {
     arg1 = (struct svn_info_t *)(argp1);
     result =  ((arg1)->text_time);
     {
-      char temp[256];
+      char temp[30];
       sprintf(temp, "%" APR_INT64_T_FMT, (apr_int64_t) result);
-      ST(argvi) = sv_newmortal();
-      sv_setpv((SV*)ST(argvi++), temp);
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = sv_2mortal(newSVpv(temp, 0)); argvi++  ;
     }
     
     XSRETURN(argvi);
@@ -28699,10 +30578,9 @@ XS(_wrap_svn_info_t_prop_time_get) {
     arg1 = (struct svn_info_t *)(argp1);
     result =  ((arg1)->prop_time);
     {
-      char temp[256];
+      char temp[30];
       sprintf(temp, "%" APR_INT64_T_FMT, (apr_int64_t) result);
-      ST(argvi) = sv_newmortal();
-      sv_setpv((SV*)ST(argvi++), temp);
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = sv_2mortal(newSVpv(temp, 0)); argvi++  ;
     }
     
     XSRETURN(argvi);
@@ -29402,10 +31280,9 @@ XS(_wrap_svn_info_t_size64_get) {
     arg1 = (struct svn_info_t *)(argp1);
     result =  ((arg1)->size64);
     {
-      char temp[256];
+      char temp[30];
       sprintf(temp, "%" APR_INT64_T_FMT, (apr_int64_t) result);
-      ST(argvi) = sv_newmortal();
-      sv_setpv((SV*)ST(argvi++), temp);
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = sv_2mortal(newSVpv(temp, 0)); argvi++  ;
     }
     
     XSRETURN(argvi);
@@ -29472,10 +31349,9 @@ XS(_wrap_svn_info_t_working_size64_get) {
     arg1 = (struct svn_info_t *)(argp1);
     result =  ((arg1)->working_size64);
     {
-      char temp[256];
+      char temp[30];
       sprintf(temp, "%" APR_INT64_T_FMT, (apr_int64_t) result);
-      ST(argvi) = sv_newmortal();
-      sv_setpv((SV*)ST(argvi++), temp);
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = sv_2mortal(newSVpv(temp, 0)); argvi++  ;
     }
     
     XSRETURN(argvi);
@@ -29619,6 +31495,7 @@ XS(_wrap_svn_info_dup) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_info_dup(info,pool);");
@@ -30054,10 +31931,9 @@ XS(_wrap_svn_client_info2_t_size_get) {
     arg1 = (struct svn_client_info2_t *)(argp1);
     result =  ((arg1)->size);
     {
-      char temp[256];
+      char temp[30];
       sprintf(temp, "%" APR_INT64_T_FMT, (apr_int64_t) result);
-      ST(argvi) = sv_newmortal();
-      sv_setpv((SV*)ST(argvi++), temp);
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = sv_2mortal(newSVpv(temp, 0)); argvi++  ;
     }
     
     XSRETURN(argvi);
@@ -30189,10 +32065,9 @@ XS(_wrap_svn_client_info2_t_last_changed_date_get) {
     arg1 = (struct svn_client_info2_t *)(argp1);
     result =  ((arg1)->last_changed_date);
     {
-      char temp[256];
+      char temp[30];
       sprintf(temp, "%" APR_INT64_T_FMT, (apr_int64_t) result);
-      ST(argvi) = sv_newmortal();
-      sv_setpv((SV*)ST(argvi++), temp);
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = sv_2mortal(newSVpv(temp, 0)); argvi++  ;
     }
     
     XSRETURN(argvi);
@@ -30474,6 +32349,7 @@ XS(_wrap_svn_client_info2_dup) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_client_info2_dup(info,pool);");
@@ -30504,6 +32380,172 @@ XS(_wrap_svn_client_info2_dup) {
 }
 
 
+XS(_wrap_svn_client_info4) {
+  {
+    char *arg1 = (char *) 0 ;
+    svn_opt_revision_t *arg2 = (svn_opt_revision_t *) 0 ;
+    svn_opt_revision_t *arg3 = (svn_opt_revision_t *) 0 ;
+    svn_depth_t arg4 ;
+    svn_boolean_t arg5 ;
+    svn_boolean_t arg6 ;
+    svn_boolean_t arg7 ;
+    apr_array_header_t *arg8 = (apr_array_header_t *) 0 ;
+    svn_client_info_receiver2_t arg9 = (svn_client_info_receiver2_t) 0 ;
+    void *arg10 = (void *) 0 ;
+    svn_client_ctx_t *arg11 = (svn_client_ctx_t *) 0 ;
+    apr_pool_t *arg12 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    int res1 ;
+    char *buf1 = 0 ;
+    int alloc1 = 0 ;
+    svn_opt_revision_t rev2 ;
+    svn_opt_revision_t rev3 ;
+    int val4 ;
+    int ecode4 = 0 ;
+    int val5 ;
+    int ecode5 = 0 ;
+    int val6 ;
+    int ecode6 = 0 ;
+    int val7 ;
+    int ecode7 = 0 ;
+    int res10 ;
+    void *argp11 = 0 ;
+    int res11 = 0 ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg12 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    if ((items < 11) || (items > 12)) {
+      SWIG_croak("Usage: svn_client_info4(abspath_or_url,peg_revision,revision,depth,fetch_excluded,fetch_actual_only,include_externals,changelists,receiver,receiver_baton,ctx,scratch_pool);");
+    }
+    res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1);
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_client_info4" "', argument " "1"" of type '" "char const *""'");
+    }
+    arg1 = (char *)(buf1);
+    {
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE, _global_pool);
+    }
+    {
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE, _global_pool);
+    }
+    ecode4 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(3), &val4);
+    if (!SWIG_IsOK(ecode4)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "svn_client_info4" "', argument " "4"" of type '" "svn_depth_t""'");
+    } 
+    arg4 = (svn_depth_t)(val4);
+    ecode5 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(4), &val5);
+    if (!SWIG_IsOK(ecode5)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "svn_client_info4" "', argument " "5"" of type '" "svn_boolean_t""'");
+    } 
+    arg5 = (svn_boolean_t)(val5);
+    ecode6 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(5), &val6);
+    if (!SWIG_IsOK(ecode6)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "svn_client_info4" "', argument " "6"" of type '" "svn_boolean_t""'");
+    } 
+    arg6 = (svn_boolean_t)(val6);
+    ecode7 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(6), &val7);
+    if (!SWIG_IsOK(ecode7)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "svn_client_info4" "', argument " "7"" of type '" "svn_boolean_t""'");
+    } 
+    arg7 = (svn_boolean_t)(val7);
+    {
+      arg8 = SvOK(ST(7)) ? svn_swig_pl_strings_to_array(
+        ST(7), _global_pool) : NULL;
+    }
+    {
+      int res = SWIG_ConvertFunctionPtr(ST(8), (void**)(&arg9), SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_client_info2_t_p_apr_pool_t__p_svn_error_t);
+      if (!SWIG_IsOK(res)) {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_client_info4" "', argument " "9"" of type '" "svn_client_info_receiver2_t""'"); 
+      }
+    }
+    res10 = SWIG_ConvertPtr(ST(9),SWIG_as_voidptrptr(&arg10), 0, 0);
+    if (!SWIG_IsOK(res10)) {
+      SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "svn_client_info4" "', argument " "10"" of type '" "void *""'"); 
+    }
+    res11 = SWIG_ConvertPtr(ST(10), &argp11,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
+    if (!SWIG_IsOK(res11)) {
+      SWIG_exception_fail(SWIG_ArgError(res11), "in method '" "svn_client_info4" "', argument " "11"" of type '" "svn_client_ctx_t *""'"); 
+    }
+    arg11 = (svn_client_ctx_t *)(argp11);
+    if (items > 11) {
+      
+    }
+    {
+      if (!arg2) {
+        SWIG_exception(SWIG_ValueError,"Received a NULL pointer.");
+      }
+    }
+    {
+      if (!arg3) {
+        SWIG_exception(SWIG_ValueError,"Received a NULL pointer.");
+      }
+    }
+    {
+      result = (svn_error_t *)svn_client_info4((char const *)arg1,(struct svn_opt_revision_t const *)arg2,(struct svn_opt_revision_t const *)arg3,arg4,arg5,arg6,arg7,(apr_array_header_t const *)arg8,arg9,arg10,arg11,arg12);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    XSRETURN(argvi);
+  fail:
+    if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_svn_client_info3) {
   {
     char *arg1 = (char *) 0 ;
@@ -30538,6 +32580,7 @@ XS(_wrap_svn_client_info3) {
     
     {
       _global_pool = arg11 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 10) || (items > 11)) {
       SWIG_croak("Usage: svn_client_info3(abspath_or_url,peg_revision,revision,depth,fetch_excluded,fetch_actual_only,changelists,receiver,receiver_baton,ctx,scratch_pool);");
@@ -30548,10 +32591,18 @@ XS(_wrap_svn_client_info3) {
     }
     arg1 = (char *)(buf1);
     {
-      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE, _global_pool);
     }
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE, _global_pool);
     }
     ecode4 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(3), &val4);
     if (!SWIG_IsOK(ecode4)) {
@@ -30569,7 +32620,7 @@ XS(_wrap_svn_client_info3) {
     } 
     arg6 = (svn_boolean_t)(val6);
     {
-      arg7 = SvOK(ST(6)) ? (apr_array_header_t *) svn_swig_pl_strings_to_array(
+      arg7 = SvOK(ST(6)) ? svn_swig_pl_strings_to_array(
         ST(6), _global_pool) : NULL;
     }
     {
@@ -30678,6 +32729,7 @@ XS(_wrap_svn_client_info2) {
     
     {
       _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 7) || (items > 8)) {
       SWIG_croak("Usage: svn_client_info2(path_or_url,peg_revision,revision,receiver,receiver_baton,depth,changelists,ctx,pool);");
@@ -30688,10 +32740,18 @@ XS(_wrap_svn_client_info2) {
     }
     arg1 = (char *)(buf1);
     {
-      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE, _global_pool);
     }
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE, _global_pool);
     }
     {
       arg4 = svn_swig_pl_info_receiver;
@@ -30703,7 +32763,7 @@ XS(_wrap_svn_client_info2) {
     } 
     arg6 = (svn_depth_t)(val6);
     {
-      arg7 = SvOK(ST(5)) ? (apr_array_header_t *) svn_swig_pl_strings_to_array(
+      arg7 = SvOK(ST(5)) ? svn_swig_pl_strings_to_array(
         ST(5), _global_pool) : NULL;
     }
     res8 = SWIG_ConvertPtr(ST(6), &argp8,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
@@ -30793,6 +32853,7 @@ XS(_wrap_svn_client_info) {
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 6) || (items > 7)) {
       SWIG_croak("Usage: svn_client_info(path_or_url,peg_revision,revision,receiver,receiver_baton,recurse,ctx,pool);");
@@ -30803,10 +32864,18 @@ XS(_wrap_svn_client_info) {
     }
     arg1 = (char *)(buf1);
     {
-      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE, _global_pool);
     }
     {
-      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_set_revision(&rev3, ST(2), TRUE, _global_pool);
     }
     {
       arg4 = svn_swig_pl_info_receiver;
@@ -30896,9 +32965,11 @@ XS(_wrap_svn_client_get_wc_root) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 4)) {
@@ -30992,6 +33063,7 @@ XS(_wrap_svn_client_min_max_revisions) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
@@ -31108,6 +33180,7 @@ XS(_wrap_svn_client_patch) {
     
     {
       _global_pool = arg11 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 10) || (items > 11)) {
       SWIG_croak("Usage: svn_client_patch(patch_abspath,wc_dir_abspath,dry_run,strip_count,reverse,ignore_whitespace,remove_tempfiles,patch_func,patch_baton,ctx,scratch_pool);");
@@ -31236,9 +33309,11 @@ XS(_wrap_svn_client_url_from_path2) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 4)) {
@@ -31322,6 +33397,7 @@ XS(_wrap_svn_client_url_from_path) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 2)) {
@@ -31399,9 +33475,11 @@ XS(_wrap_svn_client_get_repos_root) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
@@ -31498,6 +33576,7 @@ XS(_wrap_svn_client_root_url_from_path) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -31579,6 +33658,7 @@ XS(_wrap_svn_client_uuid_from_url) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -31661,9 +33741,11 @@ XS(_wrap_svn_client_uuid_from_path2) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 4)) {
@@ -31753,6 +33835,7 @@ XS(_wrap_svn_client_uuid_from_path) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 3) || (items > 4)) {
@@ -31846,9 +33929,11 @@ XS(_wrap_svn_client_open_ra_session2) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 3) || (items > 5)) {
@@ -31938,6 +34023,7 @@ XS(_wrap_svn_client_open_ra_session) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -32019,6 +34105,7 @@ XS(_wrap_svn_proplist_invoke_receiver2) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 5) || (items > 6)) {
       SWIG_croak("Usage: svn_proplist_invoke_receiver2(_obj,baton,path,prop_hash,inherited_props,scratch_pool);");
@@ -32112,6 +34199,7 @@ XS(_wrap_svn_proplist_invoke_receiver) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_proplist_invoke_receiver(_obj,baton,path,prop_hash,pool);");
@@ -32198,6 +34286,7 @@ XS(_wrap_svn_client_invoke_get_commit_log3) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     arg3 = &temp3;
@@ -32297,6 +34386,7 @@ XS(_wrap_svn_client_invoke_get_commit_log2) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     arg3 = &temp3;
@@ -32396,6 +34486,7 @@ XS(_wrap_svn_client_invoke_get_commit_log) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     arg3 = &temp3;
@@ -32520,6 +34611,7 @@ XS(_wrap_svn_client_invoke_blame_receiver3) {
     
     {
       _global_pool = arg13 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 12) || (items > 13)) {
       SWIG_croak("Usage: svn_client_invoke_blame_receiver3(_obj,baton,start_revnum,end_revnum,line_no,revision,rev_props,merged_revision,merged_rev_props,merged_path,line,local_change,pool);");
@@ -32688,6 +34780,7 @@ XS(_wrap_svn_client_invoke_blame_receiver2) {
     
     {
       _global_pool = arg12 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 11) || (items > 12)) {
       SWIG_croak("Usage: svn_client_invoke_blame_receiver2(_obj,baton,line_no,revision,author,date,merged_revision,merged_author,merged_date,merged_path,line,pool);");
@@ -32834,6 +34927,7 @@ XS(_wrap_svn_client_invoke_blame_receiver) {
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 7) || (items > 8)) {
       SWIG_croak("Usage: svn_client_invoke_blame_receiver(_obj,baton,line_no,revision,author,date,line,pool);");
@@ -32937,6 +35031,7 @@ XS(_wrap_svn_client_invoke_diff_summarize_func) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_client_invoke_diff_summarize_func(_obj,diff,baton,pool);");
@@ -33019,6 +35114,7 @@ XS(_wrap_svn_client_invoke_import_filter_func) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg3 = &temp3;
     if ((items < 4) || (items > 5)) {
@@ -33114,6 +35210,7 @@ XS(_wrap_svn_client_invoke_status_func) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_client_invoke_status_func(_obj,baton,path,status,scratch_pool);");
@@ -33215,6 +35312,7 @@ XS(_wrap_svn_client_invoke_list_func2) {
     
     {
       _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 8) || (items > 9)) {
       SWIG_croak("Usage: svn_client_invoke_list_func2(_obj,baton,path,dirent,lock,abs_path,external_parent_url,external_target,scratch_pool);");
@@ -33336,6 +35434,7 @@ XS(_wrap_svn_client_invoke_list_func) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 6) || (items > 7)) {
       SWIG_croak("Usage: svn_client_invoke_list_func(_obj,baton,path,dirent,lock,abs_path,pool);");
@@ -33436,6 +35535,7 @@ XS(_wrap_svn_info_invoke_receiver) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_info_invoke_receiver(_obj,baton,path,info,pool);");
@@ -33522,6 +35622,7 @@ XS(_wrap_svn_client_invoke_info_receiver2) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_client_invoke_info_receiver2(_obj,baton,abspath_or_url,info,scratch_pool);");
@@ -33616,6 +35717,7 @@ XS(_wrap_svn_client_invoke_patch_func) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg3 = &temp3;
     if ((items < 5) || (items > 6)) {
@@ -33718,6 +35820,7 @@ static swig_type_info _swigt__p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_
 static swig_type_info _swigt__p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_auth_ssl_client_cert_prompt_func_t|struct svn_error_t *(*)(svn_auth_cred_ssl_client_cert_t **,void *,char const *,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_auth_cred_ssl_server_trust_t **,void *,char const *,apr_uint32_t,svn_auth_ssl_server_cert_info_t const *,svn_boolean_t,apr_pool_t *)|svn_auth_ssl_server_trust_prompt_func_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_auth_cred_username_t **,void *,char const *,svn_boolean_t,apr_pool_t *)|svn_auth_username_prompt_func_t", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_ra_open_tunnel_func_t|struct svn_error_t *(*)(svn_stream_t **,svn_stream_t **,svn_ra_close_tunnel_func_t *,void **,void *,char const *,char const *,char const *,int,svn_cancel_func_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t", "svn_wc_conflict_resolver_func2_t|struct svn_error_t *(*)(svn_wc_conflict_result_t **,svn_wc_conflict_description2_t const *,void *,apr_pool_t *,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_wc_conflict_resolver_func_t|struct svn_error_t *(*)(svn_wc_conflict_result_t **,svn_wc_conflict_description_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_client_diff_summarize_func_t|struct svn_error_t *(*)(svn_client_diff_summarize_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0};
@@ -33726,6 +35829,7 @@ static swig_type_info _swigt__p_f_p_void__p_svn_error_t = {"_p_f_p_void__p_svn_e
 static swig_type_info _swigt__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_int64_t,svn_revnum_t,char const *,char const *,char const *,apr_pool_t *)|svn_client_blame_receiver_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_client_blame_receiver2_t|struct svn_error_t *(*)(void *,apr_int64_t,svn_revnum_t,char const *,char const *,svn_revnum_t,char const *,char const *,char const *,char const *,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_hash_t *,svn_revnum_t,char const *,char const *,char const *,apr_pool_t *)|svn_log_message_receiver_t", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_f_p_void_p_q_const__char__int = {"_p_f_p_void_p_q_const__char__int", "int (*)(void *,char const *)|svn_ra_check_tunnel_func_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void = {"_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void", "void (*)(void *,char const *,enum svn_wc_notify_action_t,enum svn_node_kind_t,char const *,enum svn_wc_notify_state_t,enum svn_wc_notify_state_t,long)|svn_wc_notify_func_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,apr_hash_t *,apr_array_header_t *,apr_pool_t *)|svn_proplist_receiver2_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,apr_hash_t *,apr_pool_t *)|svn_proplist_receiver_t", 0, 0, (void*)0, 0};
@@ -33843,11 +35947,9 @@ static swig_type_info _swigt__p_svn_wc_adm_access_t = {"_p_svn_wc_adm_access_t",
 static swig_type_info _swigt__p_svn_wc_committed_queue_t = {"_p_svn_wc_committed_queue_t", "struct svn_wc_committed_queue_t *|svn_wc_committed_queue_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_wc_conflict_action_t = {"_p_svn_wc_conflict_action_t", "enum svn_wc_conflict_action_t *|svn_wc_conflict_action_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_wc_conflict_choice_t = {"_p_svn_wc_conflict_choice_t", "enum svn_wc_conflict_choice_t *|svn_wc_conflict_choice_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_svn_wc_conflict_description2_t = {"_p_svn_wc_conflict_description2_t", "struct svn_wc_conflict_description2_t *|svn_wc_conflict_description2_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_wc_conflict_description_t = {"_p_svn_wc_conflict_description_t", "struct svn_wc_conflict_description_t *|svn_wc_conflict_description_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_wc_conflict_kind_t = {"_p_svn_wc_conflict_kind_t", "enum svn_wc_conflict_kind_t *|svn_wc_conflict_kind_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_wc_conflict_reason_t = {"_p_svn_wc_conflict_reason_t", "enum svn_wc_conflict_reason_t *|svn_wc_conflict_reason_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_svn_wc_conflict_result_t = {"_p_svn_wc_conflict_result_t", "struct svn_wc_conflict_result_t *|svn_wc_conflict_result_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_wc_conflict_version_t = {"_p_svn_wc_conflict_version_t", "struct svn_wc_conflict_version_t *|svn_wc_conflict_version_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_wc_context_t = {"_p_svn_wc_context_t", "struct svn_wc_context_t *|svn_wc_context_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_wc_diff_callbacks2_t = {"_p_svn_wc_diff_callbacks2_t", "struct svn_wc_diff_callbacks2_t *|svn_wc_diff_callbacks2_t *", 0, 0, (void*)0, 0};
@@ -33893,6 +35995,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t,
+  &_swigt__p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t,
@@ -33901,6 +36004,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t,
+  &_swigt__p_f_p_void_p_q_const__char__int,
   &_swigt__p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void,
   &_swigt__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t,
@@ -34018,11 +36122,9 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_svn_wc_committed_queue_t,
   &_swigt__p_svn_wc_conflict_action_t,
   &_swigt__p_svn_wc_conflict_choice_t,
-  &_swigt__p_svn_wc_conflict_description2_t,
   &_swigt__p_svn_wc_conflict_description_t,
   &_swigt__p_svn_wc_conflict_kind_t,
   &_swigt__p_svn_wc_conflict_reason_t,
-  &_swigt__p_svn_wc_conflict_result_t,
   &_swigt__p_svn_wc_conflict_version_t,
   &_swigt__p_svn_wc_context_t,
   &_swigt__p_svn_wc_diff_callbacks2_t,
@@ -34068,6 +36170,7 @@ static swig_cast_info _swigc__p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_
 static swig_cast_info _swigc__p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -34076,6 +36179,7 @@ static swig_cast_info _swigc__p_f_p_void__p_svn_error_t[] = {  {&_swigt__p_f_p_v
 static swig_cast_info _swigc__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_f_p_void_p_q_const__char__int[] = {  {&_swigt__p_f_p_void_p_q_const__char__int, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void[] = {  {&_swigt__p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -34193,11 +36297,9 @@ static swig_cast_info _swigc__p_svn_wc_adm_access_t[] = {  {&_swigt__p_svn_wc_ad
 static swig_cast_info _swigc__p_svn_wc_committed_queue_t[] = {  {&_swigt__p_svn_wc_committed_queue_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_wc_conflict_action_t[] = {  {&_swigt__p_svn_wc_conflict_action_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_wc_conflict_choice_t[] = {  {&_swigt__p_svn_wc_conflict_choice_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_svn_wc_conflict_description2_t[] = {  {&_swigt__p_svn_wc_conflict_description2_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_wc_conflict_description_t[] = {  {&_swigt__p_svn_wc_conflict_description_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_wc_conflict_kind_t[] = {  {&_swigt__p_svn_wc_conflict_kind_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_wc_conflict_reason_t[] = {  {&_swigt__p_svn_wc_conflict_reason_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_svn_wc_conflict_result_t[] = {  {&_swigt__p_svn_wc_conflict_result_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_wc_conflict_version_t[] = {  {&_swigt__p_svn_wc_conflict_version_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_wc_context_t[] = {  {&_swigt__p_svn_wc_context_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_wc_diff_callbacks2_t[] = {  {&_swigt__p_svn_wc_diff_callbacks2_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -34243,6 +36345,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t,
+  _swigc__p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t,
@@ -34251,6 +36354,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t,
+  _swigc__p_f_p_void_p_q_const__char__int,
   _swigc__p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void,
   _swigc__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t,
@@ -34368,11 +36472,9 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_svn_wc_committed_queue_t,
   _swigc__p_svn_wc_conflict_action_t,
   _swigc__p_svn_wc_conflict_choice_t,
-  _swigc__p_svn_wc_conflict_description2_t,
   _swigc__p_svn_wc_conflict_description_t,
   _swigc__p_svn_wc_conflict_kind_t,
   _swigc__p_svn_wc_conflict_reason_t,
-  _swigc__p_svn_wc_conflict_result_t,
   _swigc__p_svn_wc_conflict_version_t,
   _swigc__p_svn_wc_context_t,
   _swigc__p_svn_wc_diff_callbacks2_t,
@@ -34559,6 +36661,12 @@ static swig_command_info swig_commands[] = {
 {"SVN::_Client::svn_client_ctx_t_conflict_baton2_get", _wrap_svn_client_ctx_t_conflict_baton2_get},
 {"SVN::_Client::svn_client_ctx_t_wc_ctx_set", _wrap_svn_client_ctx_t_wc_ctx_set},
 {"SVN::_Client::svn_client_ctx_t_wc_ctx_get", _wrap_svn_client_ctx_t_wc_ctx_get},
+{"SVN::_Client::svn_client_ctx_t_check_tunnel_func_set", _wrap_svn_client_ctx_t_check_tunnel_func_set},
+{"SVN::_Client::svn_client_ctx_t_check_tunnel_func_get", _wrap_svn_client_ctx_t_check_tunnel_func_get},
+{"SVN::_Client::svn_client_ctx_t_open_tunnel_func_set", _wrap_svn_client_ctx_t_open_tunnel_func_set},
+{"SVN::_Client::svn_client_ctx_t_open_tunnel_func_get", _wrap_svn_client_ctx_t_open_tunnel_func_get},
+{"SVN::_Client::svn_client_ctx_t_tunnel_baton_set", _wrap_svn_client_ctx_t_tunnel_baton_set},
+{"SVN::_Client::svn_client_ctx_t_tunnel_baton_get", _wrap_svn_client_ctx_t_tunnel_baton_get},
 {"SVN::_Client::new_svn_client_ctx_t", _wrap_new_svn_client_ctx_t},
 {"SVN::_Client::delete_svn_client_ctx_t", _wrap_delete_svn_client_ctx_t},
 {"SVN::_Client::svn_client_create_context2", _wrap_svn_client_create_context2},
@@ -34668,6 +36776,7 @@ static swig_command_info swig_commands[] = {
 {"SVN::_Client::new_svn_client_status_t", _wrap_new_svn_client_status_t},
 {"SVN::_Client::delete_svn_client_status_t", _wrap_delete_svn_client_status_t},
 {"SVN::_Client::svn_client_status_dup", _wrap_svn_client_status_dup},
+{"SVN::_Client::svn_client_status6", _wrap_svn_client_status6},
 {"SVN::_Client::svn_client_status5", _wrap_svn_client_status5},
 {"SVN::_Client::svn_client_status4", _wrap_svn_client_status4},
 {"SVN::_Client::svn_client_status3", _wrap_svn_client_status3},
@@ -34717,10 +36826,13 @@ static swig_command_info swig_commands[] = {
 {"SVN::_Client::svn_client_mergeinfo_log", _wrap_svn_client_mergeinfo_log},
 {"SVN::_Client::svn_client_mergeinfo_log_merged", _wrap_svn_client_mergeinfo_log_merged},
 {"SVN::_Client::svn_client_mergeinfo_log_eligible", _wrap_svn_client_mergeinfo_log_eligible},
+{"SVN::_Client::svn_client_vacuum", _wrap_svn_client_vacuum},
+{"SVN::_Client::svn_client_cleanup2", _wrap_svn_client_cleanup2},
 {"SVN::_Client::svn_client_cleanup", _wrap_svn_client_cleanup},
 {"SVN::_Client::svn_client_upgrade", _wrap_svn_client_upgrade},
 {"SVN::_Client::svn_client_relocate2", _wrap_svn_client_relocate2},
 {"SVN::_Client::svn_client_relocate", _wrap_svn_client_relocate},
+{"SVN::_Client::svn_client_revert3", _wrap_svn_client_revert3},
 {"SVN::_Client::svn_client_revert2", _wrap_svn_client_revert2},
 {"SVN::_Client::svn_client_revert", _wrap_svn_client_revert},
 {"SVN::_Client::svn_client_resolved", _wrap_svn_client_resolved},
@@ -34733,6 +36845,7 @@ static swig_command_info swig_commands[] = {
 {"SVN::_Client::svn_client_copy_source_t_peg_revision_get", _wrap_svn_client_copy_source_t_peg_revision_get},
 {"SVN::_Client::new_svn_client_copy_source_t", _wrap_new_svn_client_copy_source_t},
 {"SVN::_Client::delete_svn_client_copy_source_t", _wrap_delete_svn_client_copy_source_t},
+{"SVN::_Client::svn_client_copy7", _wrap_svn_client_copy7},
 {"SVN::_Client::svn_client_copy6", _wrap_svn_client_copy6},
 {"SVN::_Client::svn_client_copy5", _wrap_svn_client_copy5},
 {"SVN::_Client::svn_client_copy4", _wrap_svn_client_copy4},
@@ -34775,6 +36888,7 @@ static swig_command_info swig_commands[] = {
 {"SVN::_Client::svn_client_ls3", _wrap_svn_client_ls3},
 {"SVN::_Client::svn_client_ls2", _wrap_svn_client_ls2},
 {"SVN::_Client::svn_client_ls", _wrap_svn_client_ls},
+{"SVN::_Client::svn_client_cat3", _wrap_svn_client_cat3},
 {"SVN::_Client::svn_client_cat2", _wrap_svn_client_cat2},
 {"SVN::_Client::svn_client_cat", _wrap_svn_client_cat},
 {"SVN::_Client::svn_client_add_to_changelist", _wrap_svn_client_add_to_changelist},
@@ -34864,6 +36978,7 @@ static swig_command_info swig_commands[] = {
 {"SVN::_Client::new_svn_client_info2_t", _wrap_new_svn_client_info2_t},
 {"SVN::_Client::delete_svn_client_info2_t", _wrap_delete_svn_client_info2_t},
 {"SVN::_Client::svn_client_info2_dup", _wrap_svn_client_info2_dup},
+{"SVN::_Client::svn_client_info4", _wrap_svn_client_info4},
 {"SVN::_Client::svn_client_info3", _wrap_svn_client_info3},
 {"SVN::_Client::svn_client_info2", _wrap_svn_client_info2},
 {"SVN::_Client::svn_client_info", _wrap_svn_client_info},
@@ -34899,18 +37014,18 @@ static swig_command_info swig_commands[] = {
 };
 /* -----------------------------------------------------------------------------
  * Type initialization:
- * This problem is tough by the requirement that no dynamic 
- * memory is used. Also, since swig_type_info structures store pointers to 
+ * This problem is tough by the requirement that no dynamic
+ * memory is used. Also, since swig_type_info structures store pointers to
  * swig_cast_info structures and swig_cast_info structures store pointers back
- * to swig_type_info structures, we need some lookup code at initialization. 
- * The idea is that swig generates all the structures that are needed. 
- * The runtime then collects these partially filled structures. 
- * The SWIG_InitializeModule function takes these initial arrays out of 
+ * to swig_type_info structures, we need some lookup code at initialization.
+ * The idea is that swig generates all the structures that are needed.
+ * The runtime then collects these partially filled structures.
+ * The SWIG_InitializeModule function takes these initial arrays out of
  * swig_module, and does all the lookup, filling in the swig_module.types
  * array with the correct data and linking the correct swig_cast_info
  * structures together.
  *
- * The generated swig_type_info structures are assigned staticly to an initial 
+ * The generated swig_type_info structures are assigned staticly to an initial
  * array. We just loop through that array, and handle each type individually.
  * First we lookup if this type has been already loaded, and if so, use the
  * loaded structure instead of the generated one. Then we have to fill in the
@@ -34920,17 +37035,17 @@ static swig_command_info swig_commands[] = {
  * a column is one of the swig_cast_info structures for that type.
  * The cast_initial array is actually an array of arrays, because each row has
  * a variable number of columns. So to actually build the cast linked list,
- * we find the array of casts associated with the type, and loop through it 
+ * we find the array of casts associated with the type, and loop through it
  * adding the casts to the list. The one last trick we need to do is making
  * sure the type pointer in the swig_cast_info struct is correct.
  *
- * First off, we lookup the cast->type name to see if it is already loaded. 
+ * First off, we lookup the cast->type name to see if it is already loaded.
  * There are three cases to handle:
  *  1) If the cast->type has already been loaded AND the type we are adding
  *     casting info to has not been loaded (it is in this module), THEN we
  *     replace the cast->type pointer with the type pointer that has already
  *     been loaded.
- *  2) If BOTH types (the one we are adding casting info to, and the 
+ *  2) If BOTH types (the one we are adding casting info to, and the
  *     cast->type) are loaded, THEN the cast info has already been loaded by
  *     the previous module so we just ignore it.
  *  3) Finally, if cast->type has not already been loaded, then we add that
@@ -34993,7 +37108,7 @@ SWIG_InitializeModule(void *clientdata) {
     module_head->next = &swig_module;
   }
   
-  /* When multiple interpeters are used, a module could have already been initialized in
+  /* When multiple interpreters are used, a module could have already been initialized in
        a different interpreter, but not yet have a pointer in this interpreter.
        In this case, we do not want to continue adding types... everything should be
        set up already */
@@ -35192,72 +37307,72 @@ XS(SWIG_init) {
     SvREADONLY_on(sv);
   }
   
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CLIENT_COMMIT_ITEM_ADD", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(0x01)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CLIENT_COMMIT_ITEM_DELETE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(0x02)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CLIENT_COMMIT_ITEM_TEXT_MODS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(0x04)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CLIENT_COMMIT_ITEM_PROP_MODS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(0x08)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CLIENT_COMMIT_ITEM_IS_COPY", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(0x10)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CLIENT_COMMIT_ITEM_LOCK_TOKEN", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(0x20)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CLIENT_COMMIT_ITEM_MOVED_HERE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(0x40)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_client_diff_summarize_kind_normal", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_client_diff_summarize_kind_normal)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_client_diff_summarize_kind_added", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_client_diff_summarize_kind_added)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_client_diff_summarize_kind_modified", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_client_diff_summarize_kind_modified)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_client_diff_summarize_kind_deleted", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_client_diff_summarize_kind_deleted)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CLIENT_AUTH_USERNAME", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("username"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_CLIENT_AUTH_PASSWORD", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("password"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SWIG_SVN_INFO_SIZE_UNKNOWN", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_unsigned_SS_long  SWIG_PERL_CALL_ARGS_1((unsigned long)(-1)));
     SvREADONLY_on(sv);
diff --git a/subversion/bindings/swig/perl/native/svn_delta.c b/subversion/bindings/swig/perl/native/svn_delta.c
index 9bbeabf..2dea9c9 100644
--- a/subversion/bindings/swig/perl/native/svn_delta.c
+++ b/subversion/bindings/swig/perl/native/svn_delta.c
@@ -1,11 +1,11 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
- * 
- * This file is not intended to be easily readable and contains a number of 
+ * Version 2.0.12
+ *
+ * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
- * changes to this file unless you know what you are doing--modify the SWIG 
- * interface file instead. 
+ * changes to this file unless you know what you are doing--modify the SWIG
+ * interface file instead.
  * ----------------------------------------------------------------------------- */
 
 #define SWIGPERL
@@ -42,28 +42,28 @@
 #ifndef SWIGUNUSED
 # if defined(__GNUC__)
 #   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__)) 
+#     define SWIGUNUSED __attribute__ ((__unused__))
 #   else
 #     define SWIGUNUSED
 #   endif
 # elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__)) 
+#   define SWIGUNUSED __attribute__ ((__unused__))
 # else
-#   define SWIGUNUSED 
+#   define SWIGUNUSED
 # endif
 #endif
 
 #ifndef SWIG_MSC_UNSUPPRESS_4505
 # if defined(_MSC_VER)
 #   pragma warning(disable : 4505) /* unreferenced local function has been removed */
-# endif 
+# endif
 #endif
 
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
 # else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
 # endif
 #endif
 
@@ -106,7 +106,7 @@
 #   define SWIGSTDCALL __stdcall
 # else
 #   define SWIGSTDCALL
-# endif 
+# endif
 #endif
 
 /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
@@ -144,7 +144,7 @@
   You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for
   creating a static or dynamic library from the SWIG runtime code.
   In 99.9% of the cases, SWIG just needs to declare them as 'static'.
-  
+
   But only do this if strictly necessary, ie, if you have problems
   with your compiler or suchlike.
 */
@@ -170,16 +170,16 @@
 #define SWIG_POINTER_OWN           0x1
 
 
-/* 
+/*
    Flags/methods for returning states.
-   
-   The SWIG conversion methods, as ConvertPtr, return an integer 
+
+   The SWIG conversion methods, as ConvertPtr, return an integer
    that tells if the conversion was successful or not. And if not,
    an error code can be returned (see swigerrors.swg for the codes).
-   
+
    Use the following macros/flags to set or process the returning
    states.
-   
+
    In old versions of SWIG, code such as the following was usually written:
 
      if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) {
@@ -212,23 +212,23 @@
     } else {
       // fail code
     }
-    
+
    I.e., now SWIG_ConvertPtr can return new objects and you can
    identify the case and take care of the deallocation. Of course that
    also requires SWIG_ConvertPtr to return new result values, such as
 
-      int SWIG_ConvertPtr(obj, ptr,...) {         
-        if (<obj is ok>) {			       
-          if (<need new object>) {		       
-            *ptr = <ptr to new allocated object>; 
-            return SWIG_NEWOBJ;		       
-          } else {				       
-            *ptr = <ptr to old object>;	       
-            return SWIG_OLDOBJ;		       
-          } 				       
-        } else {				       
-          return SWIG_BADOBJ;		       
-        }					       
+      int SWIG_ConvertPtr(obj, ptr,...) {
+        if (<obj is ok>) {
+          if (<need new object>) {
+            *ptr = <ptr to new allocated object>;
+            return SWIG_NEWOBJ;
+          } else {
+            *ptr = <ptr to old object>;
+            return SWIG_OLDOBJ;
+          }
+        } else {
+          return SWIG_BADOBJ;
+        }
       }
 
    Of course, returning the plain '0(success)/-1(fail)' still works, but you can be
@@ -242,17 +242,17 @@
        int fooi(int);
 
    and you call
- 
+
       food(1)   // cast rank '1'  (1 -> 1.0)
       fooi(1)   // cast rank '0'
 
    just use the SWIG_AddCast()/SWIG_CheckState()
 */
 
-#define SWIG_OK                    (0) 
+#define SWIG_OK                    (0)
 #define SWIG_ERROR                 (-1)
 #define SWIG_IsOK(r)               (r >= 0)
-#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)  
+#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)
 
 /* The CastRankLimit says how many bits are used for the cast rank */
 #define SWIG_CASTRANKLIMIT         (1 << 8)
@@ -283,14 +283,14 @@
 #  endif
 #  define SWIG_CASTRANKMASK          ((SWIG_CASTRANKLIMIT) -1)
 #  define SWIG_CastRank(r)           (r & SWIG_CASTRANKMASK)
-SWIGINTERNINLINE int SWIG_AddCast(int r) { 
+SWIGINTERNINLINE int SWIG_AddCast(int r) {
   return SWIG_IsOK(r) ? ((SWIG_CastRank(r) < SWIG_MAXCASTRANK) ? (r + 1) : SWIG_ERROR) : r;
 }
-SWIGINTERNINLINE int SWIG_CheckState(int r) { 
-  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0; 
+SWIGINTERNINLINE int SWIG_CheckState(int r) {
+  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0;
 }
 #else /* no cast-rank mode */
-#  define SWIG_AddCast
+#  define SWIG_AddCast(r) (r)
 #  define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0)
 #endif
 
@@ -334,7 +334,7 @@ typedef struct swig_module_info {
   void                    *clientdata;		/* Language specific module data */
 } swig_module_info;
 
-/* 
+/*
   Compare two type names skipping the space characters, therefore
   "char*" == "char *" and "Class<int>" == "Class<int >", etc.
 
@@ -354,18 +354,18 @@ SWIG_TypeNameComp(const char *f1, const char *l1,
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if not equal, 1 if equal
+  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
 */
 SWIGRUNTIME int
-SWIG_TypeEquiv(const char *nb, const char *tb) {
-  int equiv = 0;
+SWIG_TypeCmp(const char *nb, const char *tb) {
+  int equiv = 1;
   const char* te = tb + strlen(tb);
   const char* ne = nb;
-  while (!equiv && *ne) {
+  while (equiv != 0 && *ne) {
     for (nb = ne; *ne; ++ne) {
       if (*ne == '|') break;
     }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
+    equiv = SWIG_TypeNameComp(nb, ne, tb, te);
     if (*ne) ++ne;
   }
   return equiv;
@@ -373,24 +373,13 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
+  Return 0 if not equal, 1 if equal
 */
 SWIGRUNTIME int
-SWIG_TypeCompare(const char *nb, const char *tb) {
-  int equiv = 0;
-  const char* te = tb + strlen(tb);
-  const char* ne = nb;
-  while (!equiv && *ne) {
-    for (nb = ne; *ne; ++ne) {
-      if (*ne == '|') break;
-    }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
-    if (*ne) ++ne;
-  }
-  return equiv;
+SWIG_TypeEquiv(const char *nb, const char *tb) {
+  return SWIG_TypeCmp(nb, tb) == 0 ? 1 : 0;
 }
 
-
 /*
   Check the typename
 */
@@ -418,7 +407,7 @@ SWIG_TypeCheck(const char *c, swig_type_info *ty) {
   return 0;
 }
 
-/* 
+/*
   Identical to SWIG_TypeCheck, except strcmp is replaced with a pointer comparison
 */
 SWIGRUNTIME swig_cast_info *
@@ -453,7 +442,7 @@ SWIG_TypeCast(swig_cast_info *ty, void *ptr, int *newmemory) {
   return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr, newmemory);
 }
 
-/* 
+/*
    Dynamic pointer casting. Down an inheritance hierarchy
 */
 SWIGRUNTIME swig_type_info *
@@ -497,7 +486,7 @@ SWIG_TypePrettyName(const swig_type_info *type) {
     return type->name;
 }
 
-/* 
+/*
    Set the clientdata field for a type
 */
 SWIGRUNTIME void
@@ -505,14 +494,14 @@ SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
   swig_cast_info *cast = ti->cast;
   /* if (ti->clientdata == clientdata) return; */
   ti->clientdata = clientdata;
-  
+
   while (cast) {
     if (!cast->converter) {
       swig_type_info *tc = cast->type;
       if (!tc->clientdata) {
 	SWIG_TypeClientData(tc, clientdata);
       }
-    }    
+    }
     cast = cast->next;
   }
 }
@@ -521,18 +510,18 @@ SWIG_TypeNewClientData(swig_type_info *ti, void *clientdata) {
   SWIG_TypeClientData(ti, clientdata);
   ti->owndata = 1;
 }
-  
+
 /*
   Search for a swig_type_info structure only by mangled name
   Search is a O(log #types)
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_MangledTypeQueryModule(swig_module_info *start, 
-                            swig_module_info *end, 
+SWIG_MangledTypeQueryModule(swig_module_info *start,
+                            swig_module_info *end,
 		            const char *name) {
   swig_module_info *iter = start;
   do {
@@ -541,11 +530,11 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
       register size_t r = iter->size - 1;
       do {
 	/* since l+r >= 0, we can (>> 1) instead (/ 2) */
-	register size_t i = (l + r) >> 1; 
+	register size_t i = (l + r) >> 1;
 	const char *iname = iter->types[i]->name;
 	if (iname) {
 	  register int compare = strcmp(name, iname);
-	  if (compare == 0) {	    
+	  if (compare == 0) {
 	    return iter->types[i];
 	  } else if (compare < 0) {
 	    if (i) {
@@ -570,14 +559,14 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
   Search for a swig_type_info structure for either a mangled name or a human readable name.
   It first searches the mangled names of the types, which is a O(log #types)
   If a type is not found it then searches the human readable names, which is O(#types).
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_TypeQueryModule(swig_module_info *start, 
-                     swig_module_info *end, 
+SWIG_TypeQueryModule(swig_module_info *start,
+                     swig_module_info *end,
 		     const char *name) {
   /* STEP 1: Search the name field using binary search */
   swig_type_info *ret = SWIG_MangledTypeQueryModule(start, end, name);
@@ -596,12 +585,12 @@ SWIG_TypeQueryModule(swig_module_info *start,
       iter = iter->next;
     } while (iter != end);
   }
-  
+
   /* neither found a match */
   return 0;
 }
 
-/* 
+/*
    Pack binary data into a string
 */
 SWIGRUNTIME char *
@@ -617,7 +606,7 @@ SWIG_PackData(char *c, void *ptr, size_t sz) {
   return c;
 }
 
-/* 
+/*
    Unpack binary data from a string
 */
 SWIGRUNTIME const char *
@@ -631,21 +620,21 @@ SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
       uu = ((d - '0') << 4);
     else if ((d >= 'a') && (d <= 'f'))
       uu = ((d - ('a'-10)) << 4);
-    else 
+    else
       return (char *) 0;
     d = *(c++);
     if ((d >= '0') && (d <= '9'))
       uu |= (d - '0');
     else if ((d >= 'a') && (d <= 'f'))
       uu |= (d - ('a'-10));
-    else 
+    else
       return (char *) 0;
     *u = uu;
   }
   return c;
 }
 
-/* 
+/*
    Pack 'void *' into a string buffer.
 */
 SWIGRUNTIME char *
@@ -705,18 +694,18 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 #endif
 
 /*  Errors in SWIG */
-#define  SWIG_UnknownError    	   -1 
-#define  SWIG_IOError        	   -2 
-#define  SWIG_RuntimeError   	   -3 
-#define  SWIG_IndexError     	   -4 
-#define  SWIG_TypeError      	   -5 
-#define  SWIG_DivisionByZero 	   -6 
-#define  SWIG_OverflowError  	   -7 
-#define  SWIG_SyntaxError    	   -8 
-#define  SWIG_ValueError     	   -9 
+#define  SWIG_UnknownError    	   -1
+#define  SWIG_IOError        	   -2
+#define  SWIG_RuntimeError   	   -3
+#define  SWIG_IndexError     	   -4
+#define  SWIG_TypeError      	   -5
+#define  SWIG_DivisionByZero 	   -6
+#define  SWIG_OverflowError  	   -7
+#define  SWIG_SyntaxError    	   -8
+#define  SWIG_ValueError     	   -9
 #define  SWIG_SystemError    	   -10
 #define  SWIG_AttributeError 	   -11
-#define  SWIG_MemoryError    	   -12 
+#define  SWIG_MemoryError    	   -12
 #define  SWIG_NullReferenceError   -13
 
 
@@ -1608,7 +1597,7 @@ static swig_module_info swig_module = {swig_types, 103, 0, 0, 0, 0};
 #define SWIG_name   "SVN::_Delta::boot_SVN___Delta"
 #define SWIG_prefix "SVN::_Delta::"
 
-#define SWIGVERSION 0x020009 
+#define SWIGVERSION 0x020012 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -2122,58 +2111,6 @@ SWIGCLASS_STATIC int swig_magic_readonly(pTHX_ SV *SWIGUNUSEDPARM(sv), MAGIC *SW
 #ifdef __cplusplus
 extern "C" {
 #endif
-XS(_wrap_svn_delta_wrap_window_handler) {
-  {
-    svn_txdelta_window_handler_t *arg1 = (svn_txdelta_window_handler_t *) 0 ;
-    void **arg2 = (void **) 0 ;
-    SV *arg3 = (SV *) 0 ;
-    apr_pool_t *arg4 = (apr_pool_t *) 0 ;
-    apr_pool_t *_global_pool ;
-    svn_txdelta_window_handler_t temp1 ;
-    void *temp2 ;
-    int argvi = 0;
-    dXSARGS;
-    
-    {
-      _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
-    }
-    arg1 = &temp1;
-    arg2 = &temp2;
-    if ((items < 1) || (items > 2)) {
-      SWIG_croak("Usage: svn_delta_wrap_window_handler(callback,pool);");
-    }
-    arg3 = ST(0);
-    if (items > 1) {
-      
-    }
-    {
-      svn_delta_wrap_window_handler(arg1,arg2,arg3,arg4);
-      
-      
-      
-    }
-    ST(argvi) = sv_newmortal();
-    {
-      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg1, SWIGTYPE_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t, 0); argvi++  ;
-    }
-    {
-      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg2, SWIGTYPE_p_void, 0); argvi++  ;
-    }
-    
-    
-    
-    
-    XSRETURN(argvi);
-  fail:
-    
-    
-    
-    
-    SWIG_croak_null();
-  }
-}
-
-
 XS(_wrap_svn_delta_version) {
   {
     int argvi = 0;
@@ -2503,10 +2440,9 @@ XS(_wrap_svn_txdelta_window_t_sview_offset_get) {
     arg1 = (struct svn_txdelta_window_t *)(argp1);
     result =  ((arg1)->sview_offset);
     {
-      char temp[256];
+      char temp[30];
       sprintf(temp, "%" APR_INT64_T_FMT, (apr_int64_t) result);
-      ST(argvi) = sv_newmortal();
-      sv_setpv((SV*)ST(argvi++), temp);
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = sv_2mortal(newSVpv(temp, 0)); argvi++  ;
     }
     
     XSRETURN(argvi);
@@ -2941,6 +2877,7 @@ XS(_wrap_svn_txdelta_window_dup) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_txdelta_window_dup(window,pool);");
@@ -2987,6 +2924,7 @@ XS(_wrap_svn_txdelta_compose_windows) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_txdelta_compose_windows(window_A,window_B,pool);");
@@ -3107,26 +3045,29 @@ XS(_wrap_svn_txdelta_run) {
     int val5 ;
     int ecode5 = 0 ;
     svn_checksum_t *temp6 ;
-    int res8 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
     dXSARGS;
     
     {
       _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg10 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg6 = &temp6;
-    if ((items < 7) || (items > 9)) {
+    if ((items < 6) || (items > 8)) {
       SWIG_croak("Usage: svn_txdelta_run(source,target,handler,handler_baton,checksum_kind,cancel_func,cancel_baton,result_pool,scratch_pool);");
     }
     {
       svn_swig_pl_make_stream (&arg1, ST(0));
+      SPAGAIN;
     }
     {
       svn_swig_pl_make_stream (&arg2, ST(1));
+      SPAGAIN;
     }
     {
       int res = SWIG_ConvertFunctionPtr(ST(2), (void**)(&arg3), SWIGTYPE_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t);
@@ -3144,19 +3085,13 @@ XS(_wrap_svn_txdelta_run) {
     } 
     arg5 = (svn_checksum_kind_t)(val5);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(5), (void**)(&arg7), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_txdelta_run" "', argument " "7"" of type '" "svn_cancel_func_t""'"); 
-      }
+      arg7 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg8 = ST(5);
     }
-    res8 = SWIG_ConvertPtr(ST(6),SWIG_as_voidptrptr(&arg8), 0, 0);
-    if (!SWIG_IsOK(res8)) {
-      SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "svn_txdelta_run" "', argument " "8"" of type '" "void *""'"); 
-    }
-    if (items > 7) {
+    if (items > 6) {
       
     }
-    if (items > 8) {
+    if (items > 7) {
       
     }
     {
@@ -3198,8 +3133,6 @@ XS(_wrap_svn_txdelta_run) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
@@ -3210,8 +3143,6 @@ XS(_wrap_svn_txdelta_run) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -3231,6 +3162,7 @@ XS(_wrap_svn_txdelta_stream_create) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_txdelta_stream_create(baton,next_window,md5_digest,pool);");
@@ -3291,6 +3223,7 @@ XS(_wrap_svn_txdelta_next_window) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 2)) {
@@ -3391,6 +3324,7 @@ XS(_wrap_svn_txdelta2) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 3) || (items > 4)) {
@@ -3398,9 +3332,11 @@ XS(_wrap_svn_txdelta2) {
     }
     {
       svn_swig_pl_make_stream (&arg2, ST(0));
+      SPAGAIN;
     }
     {
       svn_swig_pl_make_stream (&arg3, ST(1));
+      SPAGAIN;
     }
     ecode4 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(2), &val4);
     if (!SWIG_IsOK(ecode4)) {
@@ -3450,6 +3386,7 @@ XS(_wrap_svn_txdelta) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -3457,9 +3394,11 @@ XS(_wrap_svn_txdelta) {
     }
     {
       svn_swig_pl_make_stream (&arg2, ST(0));
+      SPAGAIN;
     }
     {
       svn_swig_pl_make_stream (&arg3, ST(1));
+      SPAGAIN;
     }
     if (items > 2) {
       
@@ -3503,6 +3442,7 @@ XS(_wrap_svn_txdelta_target_push) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_txdelta_target_push(handler,handler_baton,source,pool);");
@@ -3519,6 +3459,7 @@ XS(_wrap_svn_txdelta_target_push) {
     }
     {
       svn_swig_pl_make_stream (&arg3, ST(2));
+      SPAGAIN;
     }
     if (items > 3) {
       
@@ -3530,7 +3471,11 @@ XS(_wrap_svn_txdelta_target_push) {
       
     }
     {
-      ST(argvi) = svn_swig_pl_from_stream (result);
+      SV* tmp;
+      PUTBACK;
+      tmp = svn_swig_pl_from_stream (result);
+      SPAGAIN;
+      ST(argvi) = tmp;
       argvi++;
     }
     
@@ -3563,6 +3508,7 @@ XS(_wrap_svn_txdelta_send_string) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_txdelta_send_string(string,handler,handler_baton,pool);");
@@ -3642,6 +3588,7 @@ XS(_wrap_svn_txdelta_send_stream) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg4 = temp4;
     if ((items < 3) || (items > 4)) {
@@ -3649,6 +3596,7 @@ XS(_wrap_svn_txdelta_send_stream) {
     }
     {
       svn_swig_pl_make_stream (&arg1, ST(0));
+      SPAGAIN;
     }
     {
       int res = SWIG_ConvertFunctionPtr(ST(1), (void**)(&arg2), SWIGTYPE_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t);
@@ -3686,7 +3634,7 @@ XS(_wrap_svn_txdelta_send_stream) {
       }
     }
     {
-      /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = sv_2mortal(newSVpv(svn_md5_digest_to_cstring(arg4,
+      /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = sv_2mortal(newSVpv(svn_md5_digest_to_cstring(arg4,
             _global_pool),
           0)); argvi++ /*@SWIG@*/
       
@@ -3727,6 +3675,7 @@ XS(_wrap_svn_txdelta_send_txstream) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_txdelta_send_txstream(txstream,handler,handler_baton,pool);");
@@ -3805,6 +3754,7 @@ XS(_wrap_svn_txdelta_send_contents) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_txdelta_send_contents(contents,len,handler,handler_baton,pool);");
@@ -3891,6 +3841,7 @@ XS(_wrap_svn_txdelta_apply) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       arg3 = (unsigned char *)apr_palloc(_global_pool, APR_MD5_DIGESTSIZE);
@@ -3902,9 +3853,11 @@ XS(_wrap_svn_txdelta_apply) {
     }
     {
       svn_swig_pl_make_stream (&arg1, ST(0));
+      SPAGAIN;
     }
     {
       svn_swig_pl_make_stream (&arg2, ST(1));
+      SPAGAIN;
     }
     res4 = SWIG_AsCharPtrAndSize(ST(2), &buf4, NULL, &alloc4);
     if (!SWIG_IsOK(res4)) {
@@ -3922,11 +3875,11 @@ XS(_wrap_svn_txdelta_apply) {
     }
     ST(argvi) = sv_newmortal();
     {
-      /* FIXME: This code is clearly buggy. The return value of sv_newmortal()
-           is immediately overwritten by the return value
-           of svn_swig_pl_from_md5(). */
-      ST(argvi) = sv_newmortal();
-      ST(argvi++) = svn_swig_pl_from_md5(arg3);
+      SV *tmp;
+      PUTBACK;
+      tmp = svn_swig_pl_from_md5(arg3);
+      SPAGAIN;
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = tmp; argvi++  ;
     }
     {
       if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg6, SWIGTYPE_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t, 0); argvi++  ;
@@ -3975,6 +3928,7 @@ XS(_wrap_svn_txdelta_to_svndiff3) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
@@ -3983,6 +3937,7 @@ XS(_wrap_svn_txdelta_to_svndiff3) {
     }
     {
       svn_swig_pl_make_stream (&arg3, ST(0));
+      SPAGAIN;
     }
     ecode4 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val4);
     if (!SWIG_IsOK(ecode4)) {
@@ -4046,6 +4001,7 @@ XS(_wrap_svn_txdelta_to_svndiff2) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
@@ -4054,6 +4010,7 @@ XS(_wrap_svn_txdelta_to_svndiff2) {
     }
     {
       svn_swig_pl_make_stream (&arg3, ST(0));
+      SPAGAIN;
     }
     ecode4 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val4);
     if (!SWIG_IsOK(ecode4)) {
@@ -4107,6 +4064,7 @@ XS(_wrap_svn_txdelta_to_svndiff) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg3 = &temp3;
     arg4 = &temp4;
@@ -4115,6 +4073,7 @@ XS(_wrap_svn_txdelta_to_svndiff) {
     }
     {
       svn_swig_pl_make_stream (&arg1, ST(0));
+      SPAGAIN;
     }
     if (items > 1) {
       
@@ -4163,6 +4122,7 @@ XS(_wrap_svn_txdelta_parse_svndiff) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_txdelta_parse_svndiff(handler,handler_baton,error_on_early_close,pool);");
@@ -4192,7 +4152,11 @@ XS(_wrap_svn_txdelta_parse_svndiff) {
       
     }
     {
-      ST(argvi) = svn_swig_pl_from_stream (result);
+      SV* tmp;
+      PUTBACK;
+      tmp = svn_swig_pl_from_stream (result);
+      SPAGAIN;
+      ST(argvi) = tmp;
       argvi++;
     }
     
@@ -4226,6 +4190,7 @@ XS(_wrap_svn_txdelta_read_svndiff_window) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -4233,6 +4198,7 @@ XS(_wrap_svn_txdelta_read_svndiff_window) {
     }
     {
       svn_swig_pl_make_stream (&arg2, ST(0));
+      SPAGAIN;
     }
     ecode3 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val3);
     if (!SWIG_IsOK(ecode3)) {
@@ -4296,6 +4262,7 @@ XS(_wrap_svn_txdelta_skip_svndiff_window) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_txdelta_skip_svndiff_window(file,svndiff_version,pool);");
@@ -5435,6 +5402,7 @@ XS(_wrap_svn_delta_default_editor) {
     
     {
       _global_pool = arg1 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 0) || (items > 1)) {
       SWIG_croak("Usage: svn_delta_default_editor(pool);");
@@ -5524,7 +5492,6 @@ XS(_wrap_svn_delta_get_cancellation_editor) {
     void **arg6 = (void **) 0 ;
     apr_pool_t *arg7 = (apr_pool_t *) 0 ;
     apr_pool_t *_global_pool ;
-    int res2 ;
     void *argp3 = 0 ;
     int res3 = 0 ;
     int res4 ;
@@ -5536,32 +5503,27 @@ XS(_wrap_svn_delta_get_cancellation_editor) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg5 = &temp5;
     arg6 = &temp6;
-    if ((items < 4) || (items > 5)) {
+    if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_delta_get_cancellation_editor(cancel_func,cancel_baton,wrapped_editor,wrapped_baton,pool);");
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(0), (void**)(&arg1), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_delta_get_cancellation_editor" "', argument " "1"" of type '" "svn_cancel_func_t""'"); 
-      }
-    }
-    res2 = SWIG_ConvertPtr(ST(1),SWIG_as_voidptrptr(&arg2), 0, 0);
-    if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_delta_get_cancellation_editor" "', argument " "2"" of type '" "void *""'"); 
+      arg1 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg2 = ST(0);
     }
-    res3 = SWIG_ConvertPtr(ST(2), &argp3,SWIGTYPE_p_svn_delta_editor_t, 0 |  0 );
+    res3 = SWIG_ConvertPtr(ST(1), &argp3,SWIGTYPE_p_svn_delta_editor_t, 0 |  0 );
     if (!SWIG_IsOK(res3)) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_delta_get_cancellation_editor" "', argument " "3"" of type '" "svn_delta_editor_t const *""'"); 
     }
     arg3 = (svn_delta_editor_t *)(argp3);
-    res4 = SWIG_ConvertPtr(ST(3),SWIG_as_voidptrptr(&arg4), 0, 0);
+    res4 = SWIG_ConvertPtr(ST(2),SWIG_as_voidptrptr(&arg4), 0, 0);
     if (!SWIG_IsOK(res4)) {
       SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "svn_delta_get_cancellation_editor" "', argument " "4"" of type '" "void *""'"); 
     }
-    if (items > 4) {
+    if (items > 3) {
       
     }
     {
@@ -5597,8 +5559,6 @@ XS(_wrap_svn_delta_get_cancellation_editor) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
@@ -5606,8 +5566,6 @@ XS(_wrap_svn_delta_get_cancellation_editor) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -5638,6 +5596,7 @@ XS(_wrap_svn_delta_depth_filter_editor) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
@@ -5734,15 +5693,16 @@ XS(_wrap_svn_delta_path_driver2) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 5) || (items > 6)) {
       SWIG_croak("Usage: svn_delta_path_driver2(editor,edit_baton,paths,sort_paths,callback_func,callback_baton,scratch_pool);");
     }
     {
-      svn_delta_make_editor(&arg1, &arg2, ST(0), _global_pool);
+      svn_swig_pl_make_editor(&arg1, &arg2, ST(0), _global_pool);
     }
     {
-      arg3 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(1),
+      arg3 = svn_swig_pl_strings_to_array(ST(1),
         _global_pool);
     }
     ecode4 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(2), &val4);
@@ -5821,12 +5781,13 @@ XS(_wrap_svn_delta_path_driver) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 5) || (items > 6)) {
       SWIG_croak("Usage: svn_delta_path_driver(editor,edit_baton,revision,paths,callback_func,callback_baton,scratch_pool);");
     }
     {
-      svn_delta_make_editor(&arg1, &arg2, ST(0), _global_pool);
+      svn_swig_pl_make_editor(&arg1, &arg2, ST(0), _global_pool);
     }
     ecode3 = SWIG_AsVal_long SWIG_PERL_CALL_ARGS_2(ST(1), &val3);
     if (!SWIG_IsOK(ecode3)) {
@@ -5834,7 +5795,7 @@ XS(_wrap_svn_delta_path_driver) {
     } 
     arg3 = (svn_revnum_t)(val3);
     {
-      arg4 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(2),
+      arg4 = svn_swig_pl_strings_to_array(ST(2),
         _global_pool);
     }
     {
@@ -5905,6 +5866,7 @@ XS(_wrap_svn_compat_wrap_file_rev_handler) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
@@ -5984,6 +5946,7 @@ XS(_wrap_svn_delta_editor_invoke_set_target_revision) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_delta_editor_invoke_set_target_revision(_obj,edit_baton,target_revision,scratch_pool);");
@@ -6062,6 +6025,7 @@ XS(_wrap_svn_delta_editor_invoke_open_root) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg5 = &temp5;
     if ((items < 3) || (items > 4)) {
@@ -6148,6 +6112,7 @@ XS(_wrap_svn_delta_editor_invoke_delete_entry) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_delta_editor_invoke_delete_entry(_obj,path,revision,parent_baton,scratch_pool);");
@@ -6241,6 +6206,7 @@ XS(_wrap_svn_delta_editor_invoke_add_directory) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg7 = &temp7;
     if ((items < 5) || (items > 6)) {
@@ -6343,6 +6309,7 @@ XS(_wrap_svn_delta_editor_invoke_open_directory) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg6 = &temp6;
     if ((items < 4) || (items > 5)) {
@@ -6435,6 +6402,7 @@ XS(_wrap_svn_delta_editor_invoke_change_dir_prop) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_delta_editor_invoke_change_dir_prop(_obj,dir_baton,name,value,scratch_pool);");
@@ -6519,6 +6487,7 @@ XS(_wrap_svn_delta_editor_invoke_close_directory) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_delta_editor_invoke_close_directory(_obj,dir_baton,scratch_pool);");
@@ -6589,6 +6558,7 @@ XS(_wrap_svn_delta_editor_invoke_absent_directory) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_delta_editor_invoke_absent_directory(_obj,path,parent_baton,scratch_pool);");
@@ -6675,6 +6645,7 @@ XS(_wrap_svn_delta_editor_invoke_add_file) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg7 = &temp7;
     if ((items < 5) || (items > 6)) {
@@ -6777,6 +6748,7 @@ XS(_wrap_svn_delta_editor_invoke_open_file) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg6 = &temp6;
     if ((items < 4) || (items > 5)) {
@@ -6871,6 +6843,7 @@ XS(_wrap_svn_delta_editor_invoke_apply_textdelta) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg5 = &temp5;
     arg6 = &temp6;
@@ -6962,6 +6935,7 @@ XS(_wrap_svn_delta_editor_invoke_change_file_prop) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_delta_editor_invoke_change_file_prop(_obj,file_baton,name,value,scratch_pool);");
@@ -7050,6 +7024,7 @@ XS(_wrap_svn_delta_editor_invoke_close_file) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_delta_editor_invoke_close_file(_obj,file_baton,text_checksum,scratch_pool);");
@@ -7127,6 +7102,7 @@ XS(_wrap_svn_delta_editor_invoke_absent_file) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_delta_editor_invoke_absent_file(_obj,path,parent_baton,scratch_pool);");
@@ -7200,6 +7176,7 @@ XS(_wrap_svn_delta_editor_invoke_close_edit) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_delta_editor_invoke_close_edit(_obj,edit_baton,scratch_pool);");
@@ -7266,6 +7243,7 @@ XS(_wrap_svn_delta_editor_invoke_abort_edit) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_delta_editor_invoke_abort_edit(_obj,edit_baton,scratch_pool);");
@@ -7397,6 +7375,7 @@ XS(_wrap_svn_txdelta_invoke_next_window_fn) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     if ((items < 2) || (items > 3)) {
@@ -7516,6 +7495,7 @@ XS(_wrap_svn_delta_invoke_path_driver_cb_func) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     if ((items < 4) || (items > 5)) {
@@ -7620,6 +7600,7 @@ XS(_wrap_svn_file_invoke_rev_handler) {
     
     {
       _global_pool = arg10 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg7 = &temp7;
     arg8 = &temp8;
@@ -7749,6 +7730,7 @@ XS(_wrap_svn_file_invoke_rev_handler_old) {
     
     {
       _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg6 = &temp6;
     arg7 = &temp7;
@@ -8277,7 +8259,6 @@ static swig_variable_info swig_variables[] = {
 {0,0,0,0}
 };
 static swig_command_info swig_commands[] = {
-{"SVN::_Delta::svn_delta_wrap_window_handler", _wrap_svn_delta_wrap_window_handler},
 {"SVN::_Delta::svn_delta_version", _wrap_svn_delta_version},
 {"SVN::_Delta::svn_txdelta_op_t_action_code_set", _wrap_svn_txdelta_op_t_action_code_set},
 {"SVN::_Delta::svn_txdelta_op_t_action_code_get", _wrap_svn_txdelta_op_t_action_code_get},
@@ -8390,18 +8371,18 @@ static swig_command_info swig_commands[] = {
 };
 /* -----------------------------------------------------------------------------
  * Type initialization:
- * This problem is tough by the requirement that no dynamic 
- * memory is used. Also, since swig_type_info structures store pointers to 
+ * This problem is tough by the requirement that no dynamic
+ * memory is used. Also, since swig_type_info structures store pointers to
  * swig_cast_info structures and swig_cast_info structures store pointers back
- * to swig_type_info structures, we need some lookup code at initialization. 
- * The idea is that swig generates all the structures that are needed. 
- * The runtime then collects these partially filled structures. 
- * The SWIG_InitializeModule function takes these initial arrays out of 
+ * to swig_type_info structures, we need some lookup code at initialization.
+ * The idea is that swig generates all the structures that are needed.
+ * The runtime then collects these partially filled structures.
+ * The SWIG_InitializeModule function takes these initial arrays out of
  * swig_module, and does all the lookup, filling in the swig_module.types
  * array with the correct data and linking the correct swig_cast_info
  * structures together.
  *
- * The generated swig_type_info structures are assigned staticly to an initial 
+ * The generated swig_type_info structures are assigned staticly to an initial
  * array. We just loop through that array, and handle each type individually.
  * First we lookup if this type has been already loaded, and if so, use the
  * loaded structure instead of the generated one. Then we have to fill in the
@@ -8411,17 +8392,17 @@ static swig_command_info swig_commands[] = {
  * a column is one of the swig_cast_info structures for that type.
  * The cast_initial array is actually an array of arrays, because each row has
  * a variable number of columns. So to actually build the cast linked list,
- * we find the array of casts associated with the type, and loop through it 
+ * we find the array of casts associated with the type, and loop through it
  * adding the casts to the list. The one last trick we need to do is making
  * sure the type pointer in the swig_cast_info struct is correct.
  *
- * First off, we lookup the cast->type name to see if it is already loaded. 
+ * First off, we lookup the cast->type name to see if it is already loaded.
  * There are three cases to handle:
  *  1) If the cast->type has already been loaded AND the type we are adding
  *     casting info to has not been loaded (it is in this module), THEN we
  *     replace the cast->type pointer with the type pointer that has already
  *     been loaded.
- *  2) If BOTH types (the one we are adding casting info to, and the 
+ *  2) If BOTH types (the one we are adding casting info to, and the
  *     cast->type) are loaded, THEN the cast info has already been loaded by
  *     the previous module so we just ignore it.
  *  3) Finally, if cast->type has not already been loaded, then we add that
@@ -8484,7 +8465,7 @@ SWIG_InitializeModule(void *clientdata) {
     module_head->next = &swig_module;
   }
   
-  /* When multiple interpeters are used, a module could have already been initialized in
+  /* When multiple interpreters are used, a module could have already been initialized in
        a different interpreter, but not yet have a pointer in this interpreter.
        In this case, we do not want to continue adding types... everything should be
        set up already */
@@ -8683,32 +8664,32 @@ XS(SWIG_init) {
     SvREADONLY_on(sv);
   }
   
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_DELTA_COMPRESSION_LEVEL_NONE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(0)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_DELTA_COMPRESSION_LEVEL_MAX", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(9)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_DELTA_COMPRESSION_LEVEL_DEFAULT", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(5)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_txdelta_source", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_txdelta_source)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_txdelta_target", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_txdelta_target)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_txdelta_new", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_txdelta_new)));
     SvREADONLY_on(sv);
diff --git a/subversion/bindings/swig/perl/native/svn_diff.c b/subversion/bindings/swig/perl/native/svn_diff.c
index 0e75a59..24bfd01 100644
--- a/subversion/bindings/swig/perl/native/svn_diff.c
+++ b/subversion/bindings/swig/perl/native/svn_diff.c
@@ -1,11 +1,11 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
- * 
- * This file is not intended to be easily readable and contains a number of 
+ * Version 2.0.12
+ *
+ * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
- * changes to this file unless you know what you are doing--modify the SWIG 
- * interface file instead. 
+ * changes to this file unless you know what you are doing--modify the SWIG
+ * interface file instead.
  * ----------------------------------------------------------------------------- */
 
 #define SWIGPERL
@@ -42,28 +42,28 @@
 #ifndef SWIGUNUSED
 # if defined(__GNUC__)
 #   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__)) 
+#     define SWIGUNUSED __attribute__ ((__unused__))
 #   else
 #     define SWIGUNUSED
 #   endif
 # elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__)) 
+#   define SWIGUNUSED __attribute__ ((__unused__))
 # else
-#   define SWIGUNUSED 
+#   define SWIGUNUSED
 # endif
 #endif
 
 #ifndef SWIG_MSC_UNSUPPRESS_4505
 # if defined(_MSC_VER)
 #   pragma warning(disable : 4505) /* unreferenced local function has been removed */
-# endif 
+# endif
 #endif
 
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
 # else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
 # endif
 #endif
 
@@ -106,7 +106,7 @@
 #   define SWIGSTDCALL __stdcall
 # else
 #   define SWIGSTDCALL
-# endif 
+# endif
 #endif
 
 /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
@@ -144,7 +144,7 @@
   You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for
   creating a static or dynamic library from the SWIG runtime code.
   In 99.9% of the cases, SWIG just needs to declare them as 'static'.
-  
+
   But only do this if strictly necessary, ie, if you have problems
   with your compiler or suchlike.
 */
@@ -170,16 +170,16 @@
 #define SWIG_POINTER_OWN           0x1
 
 
-/* 
+/*
    Flags/methods for returning states.
-   
-   The SWIG conversion methods, as ConvertPtr, return an integer 
+
+   The SWIG conversion methods, as ConvertPtr, return an integer
    that tells if the conversion was successful or not. And if not,
    an error code can be returned (see swigerrors.swg for the codes).
-   
+
    Use the following macros/flags to set or process the returning
    states.
-   
+
    In old versions of SWIG, code such as the following was usually written:
 
      if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) {
@@ -212,23 +212,23 @@
     } else {
       // fail code
     }
-    
+
    I.e., now SWIG_ConvertPtr can return new objects and you can
    identify the case and take care of the deallocation. Of course that
    also requires SWIG_ConvertPtr to return new result values, such as
 
-      int SWIG_ConvertPtr(obj, ptr,...) {         
-        if (<obj is ok>) {			       
-          if (<need new object>) {		       
-            *ptr = <ptr to new allocated object>; 
-            return SWIG_NEWOBJ;		       
-          } else {				       
-            *ptr = <ptr to old object>;	       
-            return SWIG_OLDOBJ;		       
-          } 				       
-        } else {				       
-          return SWIG_BADOBJ;		       
-        }					       
+      int SWIG_ConvertPtr(obj, ptr,...) {
+        if (<obj is ok>) {
+          if (<need new object>) {
+            *ptr = <ptr to new allocated object>;
+            return SWIG_NEWOBJ;
+          } else {
+            *ptr = <ptr to old object>;
+            return SWIG_OLDOBJ;
+          }
+        } else {
+          return SWIG_BADOBJ;
+        }
       }
 
    Of course, returning the plain '0(success)/-1(fail)' still works, but you can be
@@ -242,17 +242,17 @@
        int fooi(int);
 
    and you call
- 
+
       food(1)   // cast rank '1'  (1 -> 1.0)
       fooi(1)   // cast rank '0'
 
    just use the SWIG_AddCast()/SWIG_CheckState()
 */
 
-#define SWIG_OK                    (0) 
+#define SWIG_OK                    (0)
 #define SWIG_ERROR                 (-1)
 #define SWIG_IsOK(r)               (r >= 0)
-#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)  
+#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)
 
 /* The CastRankLimit says how many bits are used for the cast rank */
 #define SWIG_CASTRANKLIMIT         (1 << 8)
@@ -283,14 +283,14 @@
 #  endif
 #  define SWIG_CASTRANKMASK          ((SWIG_CASTRANKLIMIT) -1)
 #  define SWIG_CastRank(r)           (r & SWIG_CASTRANKMASK)
-SWIGINTERNINLINE int SWIG_AddCast(int r) { 
+SWIGINTERNINLINE int SWIG_AddCast(int r) {
   return SWIG_IsOK(r) ? ((SWIG_CastRank(r) < SWIG_MAXCASTRANK) ? (r + 1) : SWIG_ERROR) : r;
 }
-SWIGINTERNINLINE int SWIG_CheckState(int r) { 
-  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0; 
+SWIGINTERNINLINE int SWIG_CheckState(int r) {
+  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0;
 }
 #else /* no cast-rank mode */
-#  define SWIG_AddCast
+#  define SWIG_AddCast(r) (r)
 #  define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0)
 #endif
 
@@ -334,7 +334,7 @@ typedef struct swig_module_info {
   void                    *clientdata;		/* Language specific module data */
 } swig_module_info;
 
-/* 
+/*
   Compare two type names skipping the space characters, therefore
   "char*" == "char *" and "Class<int>" == "Class<int >", etc.
 
@@ -354,18 +354,18 @@ SWIG_TypeNameComp(const char *f1, const char *l1,
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if not equal, 1 if equal
+  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
 */
 SWIGRUNTIME int
-SWIG_TypeEquiv(const char *nb, const char *tb) {
-  int equiv = 0;
+SWIG_TypeCmp(const char *nb, const char *tb) {
+  int equiv = 1;
   const char* te = tb + strlen(tb);
   const char* ne = nb;
-  while (!equiv && *ne) {
+  while (equiv != 0 && *ne) {
     for (nb = ne; *ne; ++ne) {
       if (*ne == '|') break;
     }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
+    equiv = SWIG_TypeNameComp(nb, ne, tb, te);
     if (*ne) ++ne;
   }
   return equiv;
@@ -373,24 +373,13 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
+  Return 0 if not equal, 1 if equal
 */
 SWIGRUNTIME int
-SWIG_TypeCompare(const char *nb, const char *tb) {
-  int equiv = 0;
-  const char* te = tb + strlen(tb);
-  const char* ne = nb;
-  while (!equiv && *ne) {
-    for (nb = ne; *ne; ++ne) {
-      if (*ne == '|') break;
-    }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
-    if (*ne) ++ne;
-  }
-  return equiv;
+SWIG_TypeEquiv(const char *nb, const char *tb) {
+  return SWIG_TypeCmp(nb, tb) == 0 ? 1 : 0;
 }
 
-
 /*
   Check the typename
 */
@@ -418,7 +407,7 @@ SWIG_TypeCheck(const char *c, swig_type_info *ty) {
   return 0;
 }
 
-/* 
+/*
   Identical to SWIG_TypeCheck, except strcmp is replaced with a pointer comparison
 */
 SWIGRUNTIME swig_cast_info *
@@ -453,7 +442,7 @@ SWIG_TypeCast(swig_cast_info *ty, void *ptr, int *newmemory) {
   return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr, newmemory);
 }
 
-/* 
+/*
    Dynamic pointer casting. Down an inheritance hierarchy
 */
 SWIGRUNTIME swig_type_info *
@@ -497,7 +486,7 @@ SWIG_TypePrettyName(const swig_type_info *type) {
     return type->name;
 }
 
-/* 
+/*
    Set the clientdata field for a type
 */
 SWIGRUNTIME void
@@ -505,14 +494,14 @@ SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
   swig_cast_info *cast = ti->cast;
   /* if (ti->clientdata == clientdata) return; */
   ti->clientdata = clientdata;
-  
+
   while (cast) {
     if (!cast->converter) {
       swig_type_info *tc = cast->type;
       if (!tc->clientdata) {
 	SWIG_TypeClientData(tc, clientdata);
       }
-    }    
+    }
     cast = cast->next;
   }
 }
@@ -521,18 +510,18 @@ SWIG_TypeNewClientData(swig_type_info *ti, void *clientdata) {
   SWIG_TypeClientData(ti, clientdata);
   ti->owndata = 1;
 }
-  
+
 /*
   Search for a swig_type_info structure only by mangled name
   Search is a O(log #types)
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_MangledTypeQueryModule(swig_module_info *start, 
-                            swig_module_info *end, 
+SWIG_MangledTypeQueryModule(swig_module_info *start,
+                            swig_module_info *end,
 		            const char *name) {
   swig_module_info *iter = start;
   do {
@@ -541,11 +530,11 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
       register size_t r = iter->size - 1;
       do {
 	/* since l+r >= 0, we can (>> 1) instead (/ 2) */
-	register size_t i = (l + r) >> 1; 
+	register size_t i = (l + r) >> 1;
 	const char *iname = iter->types[i]->name;
 	if (iname) {
 	  register int compare = strcmp(name, iname);
-	  if (compare == 0) {	    
+	  if (compare == 0) {
 	    return iter->types[i];
 	  } else if (compare < 0) {
 	    if (i) {
@@ -570,14 +559,14 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
   Search for a swig_type_info structure for either a mangled name or a human readable name.
   It first searches the mangled names of the types, which is a O(log #types)
   If a type is not found it then searches the human readable names, which is O(#types).
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_TypeQueryModule(swig_module_info *start, 
-                     swig_module_info *end, 
+SWIG_TypeQueryModule(swig_module_info *start,
+                     swig_module_info *end,
 		     const char *name) {
   /* STEP 1: Search the name field using binary search */
   swig_type_info *ret = SWIG_MangledTypeQueryModule(start, end, name);
@@ -596,12 +585,12 @@ SWIG_TypeQueryModule(swig_module_info *start,
       iter = iter->next;
     } while (iter != end);
   }
-  
+
   /* neither found a match */
   return 0;
 }
 
-/* 
+/*
    Pack binary data into a string
 */
 SWIGRUNTIME char *
@@ -617,7 +606,7 @@ SWIG_PackData(char *c, void *ptr, size_t sz) {
   return c;
 }
 
-/* 
+/*
    Unpack binary data from a string
 */
 SWIGRUNTIME const char *
@@ -631,21 +620,21 @@ SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
       uu = ((d - '0') << 4);
     else if ((d >= 'a') && (d <= 'f'))
       uu = ((d - ('a'-10)) << 4);
-    else 
+    else
       return (char *) 0;
     d = *(c++);
     if ((d >= '0') && (d <= '9'))
       uu |= (d - '0');
     else if ((d >= 'a') && (d <= 'f'))
       uu |= (d - ('a'-10));
-    else 
+    else
       return (char *) 0;
     *u = uu;
   }
   return c;
 }
 
-/* 
+/*
    Pack 'void *' into a string buffer.
 */
 SWIGRUNTIME char *
@@ -705,18 +694,18 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 #endif
 
 /*  Errors in SWIG */
-#define  SWIG_UnknownError    	   -1 
-#define  SWIG_IOError        	   -2 
-#define  SWIG_RuntimeError   	   -3 
-#define  SWIG_IndexError     	   -4 
-#define  SWIG_TypeError      	   -5 
-#define  SWIG_DivisionByZero 	   -6 
-#define  SWIG_OverflowError  	   -7 
-#define  SWIG_SyntaxError    	   -8 
-#define  SWIG_ValueError     	   -9 
+#define  SWIG_UnknownError    	   -1
+#define  SWIG_IOError        	   -2
+#define  SWIG_RuntimeError   	   -3
+#define  SWIG_IndexError     	   -4
+#define  SWIG_TypeError      	   -5
+#define  SWIG_DivisionByZero 	   -6
+#define  SWIG_OverflowError  	   -7
+#define  SWIG_SyntaxError    	   -8
+#define  SWIG_ValueError     	   -9
 #define  SWIG_SystemError    	   -10
 #define  SWIG_AttributeError 	   -11
-#define  SWIG_MemoryError    	   -12 
+#define  SWIG_MemoryError    	   -12
 #define  SWIG_NullReferenceError   -13
 
 
@@ -1574,7 +1563,7 @@ static swig_module_info swig_module = {swig_types, 69, 0, 0, 0, 0};
 #define SWIG_name   "SVN::_Diff::boot_SVN___Diff"
 #define SWIG_prefix "SVN::_Diff::"
 
-#define SWIGVERSION 0x020009 
+#define SWIGVERSION 0x020012 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -1935,18 +1924,18 @@ static swig_command_info swig_commands[] = {
 };
 /* -----------------------------------------------------------------------------
  * Type initialization:
- * This problem is tough by the requirement that no dynamic 
- * memory is used. Also, since swig_type_info structures store pointers to 
+ * This problem is tough by the requirement that no dynamic
+ * memory is used. Also, since swig_type_info structures store pointers to
  * swig_cast_info structures and swig_cast_info structures store pointers back
- * to swig_type_info structures, we need some lookup code at initialization. 
- * The idea is that swig generates all the structures that are needed. 
- * The runtime then collects these partially filled structures. 
- * The SWIG_InitializeModule function takes these initial arrays out of 
+ * to swig_type_info structures, we need some lookup code at initialization.
+ * The idea is that swig generates all the structures that are needed.
+ * The runtime then collects these partially filled structures.
+ * The SWIG_InitializeModule function takes these initial arrays out of
  * swig_module, and does all the lookup, filling in the swig_module.types
  * array with the correct data and linking the correct swig_cast_info
  * structures together.
  *
- * The generated swig_type_info structures are assigned staticly to an initial 
+ * The generated swig_type_info structures are assigned staticly to an initial
  * array. We just loop through that array, and handle each type individually.
  * First we lookup if this type has been already loaded, and if so, use the
  * loaded structure instead of the generated one. Then we have to fill in the
@@ -1956,17 +1945,17 @@ static swig_command_info swig_commands[] = {
  * a column is one of the swig_cast_info structures for that type.
  * The cast_initial array is actually an array of arrays, because each row has
  * a variable number of columns. So to actually build the cast linked list,
- * we find the array of casts associated with the type, and loop through it 
+ * we find the array of casts associated with the type, and loop through it
  * adding the casts to the list. The one last trick we need to do is making
  * sure the type pointer in the swig_cast_info struct is correct.
  *
- * First off, we lookup the cast->type name to see if it is already loaded. 
+ * First off, we lookup the cast->type name to see if it is already loaded.
  * There are three cases to handle:
  *  1) If the cast->type has already been loaded AND the type we are adding
  *     casting info to has not been loaded (it is in this module), THEN we
  *     replace the cast->type pointer with the type pointer that has already
  *     been loaded.
- *  2) If BOTH types (the one we are adding casting info to, and the 
+ *  2) If BOTH types (the one we are adding casting info to, and the
  *     cast->type) are loaded, THEN the cast info has already been loaded by
  *     the previous module so we just ignore it.
  *  3) Finally, if cast->type has not already been loaded, then we add that
@@ -2029,7 +2018,7 @@ SWIG_InitializeModule(void *clientdata) {
     module_head->next = &swig_module;
   }
   
-  /* When multiple interpeters are used, a module could have already been initialized in
+  /* When multiple interpreters are used, a module could have already been initialized in
        a different interpreter, but not yet have a pointer in this interpreter.
        In this case, we do not want to continue adding types... everything should be
        set up already */
diff --git a/subversion/bindings/swig/perl/native/svn_fs.c b/subversion/bindings/swig/perl/native/svn_fs.c
index 0c456c6..634bfc2 100644
--- a/subversion/bindings/swig/perl/native/svn_fs.c
+++ b/subversion/bindings/swig/perl/native/svn_fs.c
@@ -1,11 +1,11 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
- * 
- * This file is not intended to be easily readable and contains a number of 
+ * Version 2.0.12
+ *
+ * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
- * changes to this file unless you know what you are doing--modify the SWIG 
- * interface file instead. 
+ * changes to this file unless you know what you are doing--modify the SWIG
+ * interface file instead.
  * ----------------------------------------------------------------------------- */
 
 #define SWIGPERL
@@ -42,28 +42,28 @@
 #ifndef SWIGUNUSED
 # if defined(__GNUC__)
 #   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__)) 
+#     define SWIGUNUSED __attribute__ ((__unused__))
 #   else
 #     define SWIGUNUSED
 #   endif
 # elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__)) 
+#   define SWIGUNUSED __attribute__ ((__unused__))
 # else
-#   define SWIGUNUSED 
+#   define SWIGUNUSED
 # endif
 #endif
 
 #ifndef SWIG_MSC_UNSUPPRESS_4505
 # if defined(_MSC_VER)
 #   pragma warning(disable : 4505) /* unreferenced local function has been removed */
-# endif 
+# endif
 #endif
 
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
 # else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
 # endif
 #endif
 
@@ -106,7 +106,7 @@
 #   define SWIGSTDCALL __stdcall
 # else
 #   define SWIGSTDCALL
-# endif 
+# endif
 #endif
 
 /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
@@ -144,7 +144,7 @@
   You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for
   creating a static or dynamic library from the SWIG runtime code.
   In 99.9% of the cases, SWIG just needs to declare them as 'static'.
-  
+
   But only do this if strictly necessary, ie, if you have problems
   with your compiler or suchlike.
 */
@@ -170,16 +170,16 @@
 #define SWIG_POINTER_OWN           0x1
 
 
-/* 
+/*
    Flags/methods for returning states.
-   
-   The SWIG conversion methods, as ConvertPtr, return an integer 
+
+   The SWIG conversion methods, as ConvertPtr, return an integer
    that tells if the conversion was successful or not. And if not,
    an error code can be returned (see swigerrors.swg for the codes).
-   
+
    Use the following macros/flags to set or process the returning
    states.
-   
+
    In old versions of SWIG, code such as the following was usually written:
 
      if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) {
@@ -212,23 +212,23 @@
     } else {
       // fail code
     }
-    
+
    I.e., now SWIG_ConvertPtr can return new objects and you can
    identify the case and take care of the deallocation. Of course that
    also requires SWIG_ConvertPtr to return new result values, such as
 
-      int SWIG_ConvertPtr(obj, ptr,...) {         
-        if (<obj is ok>) {			       
-          if (<need new object>) {		       
-            *ptr = <ptr to new allocated object>; 
-            return SWIG_NEWOBJ;		       
-          } else {				       
-            *ptr = <ptr to old object>;	       
-            return SWIG_OLDOBJ;		       
-          } 				       
-        } else {				       
-          return SWIG_BADOBJ;		       
-        }					       
+      int SWIG_ConvertPtr(obj, ptr,...) {
+        if (<obj is ok>) {
+          if (<need new object>) {
+            *ptr = <ptr to new allocated object>;
+            return SWIG_NEWOBJ;
+          } else {
+            *ptr = <ptr to old object>;
+            return SWIG_OLDOBJ;
+          }
+        } else {
+          return SWIG_BADOBJ;
+        }
       }
 
    Of course, returning the plain '0(success)/-1(fail)' still works, but you can be
@@ -242,17 +242,17 @@
        int fooi(int);
 
    and you call
- 
+
       food(1)   // cast rank '1'  (1 -> 1.0)
       fooi(1)   // cast rank '0'
 
    just use the SWIG_AddCast()/SWIG_CheckState()
 */
 
-#define SWIG_OK                    (0) 
+#define SWIG_OK                    (0)
 #define SWIG_ERROR                 (-1)
 #define SWIG_IsOK(r)               (r >= 0)
-#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)  
+#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)
 
 /* The CastRankLimit says how many bits are used for the cast rank */
 #define SWIG_CASTRANKLIMIT         (1 << 8)
@@ -283,14 +283,14 @@
 #  endif
 #  define SWIG_CASTRANKMASK          ((SWIG_CASTRANKLIMIT) -1)
 #  define SWIG_CastRank(r)           (r & SWIG_CASTRANKMASK)
-SWIGINTERNINLINE int SWIG_AddCast(int r) { 
+SWIGINTERNINLINE int SWIG_AddCast(int r) {
   return SWIG_IsOK(r) ? ((SWIG_CastRank(r) < SWIG_MAXCASTRANK) ? (r + 1) : SWIG_ERROR) : r;
 }
-SWIGINTERNINLINE int SWIG_CheckState(int r) { 
-  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0; 
+SWIGINTERNINLINE int SWIG_CheckState(int r) {
+  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0;
 }
 #else /* no cast-rank mode */
-#  define SWIG_AddCast
+#  define SWIG_AddCast(r) (r)
 #  define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0)
 #endif
 
@@ -334,7 +334,7 @@ typedef struct swig_module_info {
   void                    *clientdata;		/* Language specific module data */
 } swig_module_info;
 
-/* 
+/*
   Compare two type names skipping the space characters, therefore
   "char*" == "char *" and "Class<int>" == "Class<int >", etc.
 
@@ -354,18 +354,18 @@ SWIG_TypeNameComp(const char *f1, const char *l1,
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if not equal, 1 if equal
+  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
 */
 SWIGRUNTIME int
-SWIG_TypeEquiv(const char *nb, const char *tb) {
-  int equiv = 0;
+SWIG_TypeCmp(const char *nb, const char *tb) {
+  int equiv = 1;
   const char* te = tb + strlen(tb);
   const char* ne = nb;
-  while (!equiv && *ne) {
+  while (equiv != 0 && *ne) {
     for (nb = ne; *ne; ++ne) {
       if (*ne == '|') break;
     }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
+    equiv = SWIG_TypeNameComp(nb, ne, tb, te);
     if (*ne) ++ne;
   }
   return equiv;
@@ -373,24 +373,13 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
+  Return 0 if not equal, 1 if equal
 */
 SWIGRUNTIME int
-SWIG_TypeCompare(const char *nb, const char *tb) {
-  int equiv = 0;
-  const char* te = tb + strlen(tb);
-  const char* ne = nb;
-  while (!equiv && *ne) {
-    for (nb = ne; *ne; ++ne) {
-      if (*ne == '|') break;
-    }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
-    if (*ne) ++ne;
-  }
-  return equiv;
+SWIG_TypeEquiv(const char *nb, const char *tb) {
+  return SWIG_TypeCmp(nb, tb) == 0 ? 1 : 0;
 }
 
-
 /*
   Check the typename
 */
@@ -418,7 +407,7 @@ SWIG_TypeCheck(const char *c, swig_type_info *ty) {
   return 0;
 }
 
-/* 
+/*
   Identical to SWIG_TypeCheck, except strcmp is replaced with a pointer comparison
 */
 SWIGRUNTIME swig_cast_info *
@@ -453,7 +442,7 @@ SWIG_TypeCast(swig_cast_info *ty, void *ptr, int *newmemory) {
   return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr, newmemory);
 }
 
-/* 
+/*
    Dynamic pointer casting. Down an inheritance hierarchy
 */
 SWIGRUNTIME swig_type_info *
@@ -497,7 +486,7 @@ SWIG_TypePrettyName(const swig_type_info *type) {
     return type->name;
 }
 
-/* 
+/*
    Set the clientdata field for a type
 */
 SWIGRUNTIME void
@@ -505,14 +494,14 @@ SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
   swig_cast_info *cast = ti->cast;
   /* if (ti->clientdata == clientdata) return; */
   ti->clientdata = clientdata;
-  
+
   while (cast) {
     if (!cast->converter) {
       swig_type_info *tc = cast->type;
       if (!tc->clientdata) {
 	SWIG_TypeClientData(tc, clientdata);
       }
-    }    
+    }
     cast = cast->next;
   }
 }
@@ -521,18 +510,18 @@ SWIG_TypeNewClientData(swig_type_info *ti, void *clientdata) {
   SWIG_TypeClientData(ti, clientdata);
   ti->owndata = 1;
 }
-  
+
 /*
   Search for a swig_type_info structure only by mangled name
   Search is a O(log #types)
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_MangledTypeQueryModule(swig_module_info *start, 
-                            swig_module_info *end, 
+SWIG_MangledTypeQueryModule(swig_module_info *start,
+                            swig_module_info *end,
 		            const char *name) {
   swig_module_info *iter = start;
   do {
@@ -541,11 +530,11 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
       register size_t r = iter->size - 1;
       do {
 	/* since l+r >= 0, we can (>> 1) instead (/ 2) */
-	register size_t i = (l + r) >> 1; 
+	register size_t i = (l + r) >> 1;
 	const char *iname = iter->types[i]->name;
 	if (iname) {
 	  register int compare = strcmp(name, iname);
-	  if (compare == 0) {	    
+	  if (compare == 0) {
 	    return iter->types[i];
 	  } else if (compare < 0) {
 	    if (i) {
@@ -570,14 +559,14 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
   Search for a swig_type_info structure for either a mangled name or a human readable name.
   It first searches the mangled names of the types, which is a O(log #types)
   If a type is not found it then searches the human readable names, which is O(#types).
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_TypeQueryModule(swig_module_info *start, 
-                     swig_module_info *end, 
+SWIG_TypeQueryModule(swig_module_info *start,
+                     swig_module_info *end,
 		     const char *name) {
   /* STEP 1: Search the name field using binary search */
   swig_type_info *ret = SWIG_MangledTypeQueryModule(start, end, name);
@@ -596,12 +585,12 @@ SWIG_TypeQueryModule(swig_module_info *start,
       iter = iter->next;
     } while (iter != end);
   }
-  
+
   /* neither found a match */
   return 0;
 }
 
-/* 
+/*
    Pack binary data into a string
 */
 SWIGRUNTIME char *
@@ -617,7 +606,7 @@ SWIG_PackData(char *c, void *ptr, size_t sz) {
   return c;
 }
 
-/* 
+/*
    Unpack binary data from a string
 */
 SWIGRUNTIME const char *
@@ -631,21 +620,21 @@ SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
       uu = ((d - '0') << 4);
     else if ((d >= 'a') && (d <= 'f'))
       uu = ((d - ('a'-10)) << 4);
-    else 
+    else
       return (char *) 0;
     d = *(c++);
     if ((d >= '0') && (d <= '9'))
       uu |= (d - '0');
     else if ((d >= 'a') && (d <= 'f'))
       uu |= (d - ('a'-10));
-    else 
+    else
       return (char *) 0;
     *u = uu;
   }
   return c;
 }
 
-/* 
+/*
    Pack 'void *' into a string buffer.
 */
 SWIGRUNTIME char *
@@ -705,18 +694,18 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 #endif
 
 /*  Errors in SWIG */
-#define  SWIG_UnknownError    	   -1 
-#define  SWIG_IOError        	   -2 
-#define  SWIG_RuntimeError   	   -3 
-#define  SWIG_IndexError     	   -4 
-#define  SWIG_TypeError      	   -5 
-#define  SWIG_DivisionByZero 	   -6 
-#define  SWIG_OverflowError  	   -7 
-#define  SWIG_SyntaxError    	   -8 
-#define  SWIG_ValueError     	   -9 
+#define  SWIG_UnknownError    	   -1
+#define  SWIG_IOError        	   -2
+#define  SWIG_RuntimeError   	   -3
+#define  SWIG_IndexError     	   -4
+#define  SWIG_TypeError      	   -5
+#define  SWIG_DivisionByZero 	   -6
+#define  SWIG_OverflowError  	   -7
+#define  SWIG_SyntaxError    	   -8
+#define  SWIG_ValueError     	   -9
 #define  SWIG_SystemError    	   -10
 #define  SWIG_AttributeError 	   -11
-#define  SWIG_MemoryError    	   -12 
+#define  SWIG_MemoryError    	   -12
 #define  SWIG_NullReferenceError   -13
 
 
@@ -1505,108 +1494,119 @@ SWIG_Perl_SetModule(swig_module_info *module) {
 #define SWIGTYPE_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t swig_types[9]
 #define SWIGTYPE_p_f_p_void__p_svn_error_t swig_types[10]
 #define SWIGTYPE_p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t swig_types[11]
-#define SWIGTYPE_p_f_p_void_p_apr_pool_t__p_svn_error_t swig_types[12]
-#define SWIGTYPE_p_f_p_void_p_struct_svn_error_t__void swig_types[13]
-#define SWIGTYPE_p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t swig_types[14]
-#define SWIGTYPE_p_int swig_types[15]
-#define SWIGTYPE_p_long swig_types[16]
-#define SWIGTYPE_p_p_apr_array_header_t swig_types[17]
-#define SWIGTYPE_p_p_apr_hash_t swig_types[18]
-#define SWIGTYPE_p_p_char swig_types[19]
-#define SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t swig_types[20]
-#define SWIGTYPE_p_p_svn_checksum_t swig_types[21]
-#define SWIGTYPE_p_p_svn_fs_access_t swig_types[22]
-#define SWIGTYPE_p_p_svn_fs_history_t swig_types[23]
-#define SWIGTYPE_p_p_svn_fs_id_t swig_types[24]
-#define SWIGTYPE_p_p_svn_fs_root_t swig_types[25]
-#define SWIGTYPE_p_p_svn_fs_t swig_types[26]
-#define SWIGTYPE_p_p_svn_fs_txn_t swig_types[27]
-#define SWIGTYPE_p_p_svn_lock_t swig_types[28]
-#define SWIGTYPE_p_p_svn_stream_t swig_types[29]
-#define SWIGTYPE_p_p_svn_string_t swig_types[30]
-#define SWIGTYPE_p_p_svn_txdelta_stream_t swig_types[31]
-#define SWIGTYPE_p_p_void swig_types[32]
-#define SWIGTYPE_p_svn_auth_baton_t swig_types[33]
-#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[34]
-#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[35]
-#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[36]
-#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[37]
-#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[38]
-#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[39]
-#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[40]
-#define SWIGTYPE_p_svn_auth_provider_t swig_types[41]
-#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[42]
-#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[43]
-#define SWIGTYPE_p_svn_checksum_kind_t swig_types[44]
-#define SWIGTYPE_p_svn_checksum_t swig_types[45]
-#define SWIGTYPE_p_svn_commit_info_t swig_types[46]
-#define SWIGTYPE_p_svn_config_t swig_types[47]
-#define SWIGTYPE_p_svn_delta_editor_t swig_types[48]
-#define SWIGTYPE_p_svn_depth_t swig_types[49]
-#define SWIGTYPE_p_svn_diff_conflict_display_style_t swig_types[50]
-#define SWIGTYPE_p_svn_diff_datasource_e swig_types[51]
-#define SWIGTYPE_p_svn_diff_file_ignore_space_t swig_types[52]
-#define SWIGTYPE_p_svn_diff_file_options_t swig_types[53]
-#define SWIGTYPE_p_svn_diff_fns2_t swig_types[54]
-#define SWIGTYPE_p_svn_diff_fns_t swig_types[55]
-#define SWIGTYPE_p_svn_diff_hunk_t swig_types[56]
-#define SWIGTYPE_p_svn_diff_operation_kind_e swig_types[57]
-#define SWIGTYPE_p_svn_diff_output_fns_t swig_types[58]
-#define SWIGTYPE_p_svn_diff_t swig_types[59]
-#define SWIGTYPE_p_svn_dirent_t swig_types[60]
-#define SWIGTYPE_p_svn_errno_t swig_types[61]
-#define SWIGTYPE_p_svn_error_t swig_types[62]
-#define SWIGTYPE_p_svn_fs_access_t swig_types[63]
-#define SWIGTYPE_p_svn_fs_dirent_t swig_types[64]
-#define SWIGTYPE_p_svn_fs_history_t swig_types[65]
-#define SWIGTYPE_p_svn_fs_id_t swig_types[66]
-#define SWIGTYPE_p_svn_fs_pack_notify_action_t swig_types[67]
-#define SWIGTYPE_p_svn_fs_path_change2_t swig_types[68]
-#define SWIGTYPE_p_svn_fs_path_change_kind_t swig_types[69]
-#define SWIGTYPE_p_svn_fs_path_change_t swig_types[70]
-#define SWIGTYPE_p_svn_fs_root_t swig_types[71]
-#define SWIGTYPE_p_svn_fs_t swig_types[72]
-#define SWIGTYPE_p_svn_fs_txn_t swig_types[73]
-#define SWIGTYPE_p_svn_io_dirent2_t swig_types[74]
-#define SWIGTYPE_p_svn_io_dirent_t swig_types[75]
-#define SWIGTYPE_p_svn_io_file_del_t swig_types[76]
-#define SWIGTYPE_p_svn_location_segment_t swig_types[77]
-#define SWIGTYPE_p_svn_lock_t swig_types[78]
-#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[79]
-#define SWIGTYPE_p_svn_log_changed_path_t swig_types[80]
-#define SWIGTYPE_p_svn_log_entry_t swig_types[81]
-#define SWIGTYPE_p_svn_merge_range_t swig_types[82]
-#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[83]
-#define SWIGTYPE_p_svn_node_kind_t swig_types[84]
-#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[85]
-#define SWIGTYPE_p_svn_opt_revision_t swig_types[86]
-#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[87]
-#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[88]
-#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[89]
-#define SWIGTYPE_p_svn_patch_file_t swig_types[90]
-#define SWIGTYPE_p_svn_patch_t swig_types[91]
-#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[92]
-#define SWIGTYPE_p_svn_prop_kind swig_types[93]
-#define SWIGTYPE_p_svn_prop_patch_t swig_types[94]
-#define SWIGTYPE_p_svn_stream_mark_t swig_types[95]
-#define SWIGTYPE_p_svn_stream_t swig_types[96]
-#define SWIGTYPE_p_svn_string_t swig_types[97]
-#define SWIGTYPE_p_svn_stringbuf_t swig_types[98]
-#define SWIGTYPE_p_svn_tristate_t swig_types[99]
-#define SWIGTYPE_p_svn_txdelta_op_t swig_types[100]
-#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[101]
-#define SWIGTYPE_p_svn_txdelta_window_t swig_types[102]
-#define SWIGTYPE_p_svn_version_checklist_t swig_types[103]
-#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[104]
-#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[105]
-#define SWIGTYPE_p_svn_version_extended_t swig_types[106]
-#define SWIGTYPE_p_svn_version_t swig_types[107]
-#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[108]
-#define SWIGTYPE_p_unsigned_char swig_types[109]
-#define SWIGTYPE_p_unsigned_long swig_types[110]
-#define SWIGTYPE_p_void swig_types[111]
-static swig_type_info *swig_types[113];
-static swig_module_info swig_module = {swig_types, 112, 0, 0, 0, 0};
+#define SWIGTYPE_p_f_p_void_apr_uint64_t_svn_fs_upgrade_notify_action_t_p_apr_pool_t__p_svn_error_t swig_types[12]
+#define SWIGTYPE_p_f_p_void_long_long_p_apr_pool_t__void swig_types[13]
+#define SWIGTYPE_p_f_p_void_p_apr_pool_t__p_svn_error_t swig_types[14]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t swig_types[15]
+#define SWIGTYPE_p_f_p_void_p_struct_svn_error_t__void swig_types[16]
+#define SWIGTYPE_p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t swig_types[17]
+#define SWIGTYPE_p_int swig_types[18]
+#define SWIGTYPE_p_long swig_types[19]
+#define SWIGTYPE_p_p_apr_array_header_t swig_types[20]
+#define SWIGTYPE_p_p_apr_hash_t swig_types[21]
+#define SWIGTYPE_p_p_char swig_types[22]
+#define SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t swig_types[23]
+#define SWIGTYPE_p_p_svn_checksum_t swig_types[24]
+#define SWIGTYPE_p_p_svn_fs_access_t swig_types[25]
+#define SWIGTYPE_p_p_svn_fs_history_t swig_types[26]
+#define SWIGTYPE_p_p_svn_fs_id_t swig_types[27]
+#define SWIGTYPE_p_p_svn_fs_info_placeholder_t swig_types[28]
+#define SWIGTYPE_p_p_svn_fs_root_t swig_types[29]
+#define SWIGTYPE_p_p_svn_fs_t swig_types[30]
+#define SWIGTYPE_p_p_svn_fs_txn_t swig_types[31]
+#define SWIGTYPE_p_p_svn_lock_t swig_types[32]
+#define SWIGTYPE_p_p_svn_stream_t swig_types[33]
+#define SWIGTYPE_p_p_svn_string_t swig_types[34]
+#define SWIGTYPE_p_p_svn_txdelta_stream_t swig_types[35]
+#define SWIGTYPE_p_p_svn_version_t swig_types[36]
+#define SWIGTYPE_p_p_void swig_types[37]
+#define SWIGTYPE_p_svn_auth_baton_t swig_types[38]
+#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[39]
+#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[40]
+#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[41]
+#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[42]
+#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[43]
+#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[44]
+#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[45]
+#define SWIGTYPE_p_svn_auth_provider_t swig_types[46]
+#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[47]
+#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[48]
+#define SWIGTYPE_p_svn_checksum_kind_t swig_types[49]
+#define SWIGTYPE_p_svn_checksum_t swig_types[50]
+#define SWIGTYPE_p_svn_commit_info_t swig_types[51]
+#define SWIGTYPE_p_svn_config_t swig_types[52]
+#define SWIGTYPE_p_svn_delta_editor_t swig_types[53]
+#define SWIGTYPE_p_svn_depth_t swig_types[54]
+#define SWIGTYPE_p_svn_diff_conflict_display_style_t swig_types[55]
+#define SWIGTYPE_p_svn_diff_datasource_e swig_types[56]
+#define SWIGTYPE_p_svn_diff_file_ignore_space_t swig_types[57]
+#define SWIGTYPE_p_svn_diff_file_options_t swig_types[58]
+#define SWIGTYPE_p_svn_diff_fns2_t swig_types[59]
+#define SWIGTYPE_p_svn_diff_fns_t swig_types[60]
+#define SWIGTYPE_p_svn_diff_hunk_t swig_types[61]
+#define SWIGTYPE_p_svn_diff_operation_kind_e swig_types[62]
+#define SWIGTYPE_p_svn_diff_output_fns_t swig_types[63]
+#define SWIGTYPE_p_svn_diff_t swig_types[64]
+#define SWIGTYPE_p_svn_dirent_t swig_types[65]
+#define SWIGTYPE_p_svn_errno_t swig_types[66]
+#define SWIGTYPE_p_svn_error_t swig_types[67]
+#define SWIGTYPE_p_svn_fs_access_t swig_types[68]
+#define SWIGTYPE_p_svn_fs_dirent_t swig_types[69]
+#define SWIGTYPE_p_svn_fs_fsfs_info_t swig_types[70]
+#define SWIGTYPE_p_svn_fs_fsx_info_t swig_types[71]
+#define SWIGTYPE_p_svn_fs_history_t swig_types[72]
+#define SWIGTYPE_p_svn_fs_id_t swig_types[73]
+#define SWIGTYPE_p_svn_fs_info_placeholder_t swig_types[74]
+#define SWIGTYPE_p_svn_fs_lock_target_t swig_types[75]
+#define SWIGTYPE_p_svn_fs_node_relation_t swig_types[76]
+#define SWIGTYPE_p_svn_fs_pack_notify_action_t swig_types[77]
+#define SWIGTYPE_p_svn_fs_path_change2_t swig_types[78]
+#define SWIGTYPE_p_svn_fs_path_change_kind_t swig_types[79]
+#define SWIGTYPE_p_svn_fs_path_change_t swig_types[80]
+#define SWIGTYPE_p_svn_fs_root_t swig_types[81]
+#define SWIGTYPE_p_svn_fs_t swig_types[82]
+#define SWIGTYPE_p_svn_fs_txn_t swig_types[83]
+#define SWIGTYPE_p_svn_fs_upgrade_notify_action_t swig_types[84]
+#define SWIGTYPE_p_svn_io_dirent2_t swig_types[85]
+#define SWIGTYPE_p_svn_io_dirent_t swig_types[86]
+#define SWIGTYPE_p_svn_io_file_del_t swig_types[87]
+#define SWIGTYPE_p_svn_location_segment_t swig_types[88]
+#define SWIGTYPE_p_svn_lock_t swig_types[89]
+#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[90]
+#define SWIGTYPE_p_svn_log_changed_path_t swig_types[91]
+#define SWIGTYPE_p_svn_log_entry_t swig_types[92]
+#define SWIGTYPE_p_svn_merge_range_t swig_types[93]
+#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[94]
+#define SWIGTYPE_p_svn_node_kind_t swig_types[95]
+#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[96]
+#define SWIGTYPE_p_svn_opt_revision_t swig_types[97]
+#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[98]
+#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[99]
+#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[100]
+#define SWIGTYPE_p_svn_patch_file_t swig_types[101]
+#define SWIGTYPE_p_svn_patch_t swig_types[102]
+#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[103]
+#define SWIGTYPE_p_svn_prop_kind swig_types[104]
+#define SWIGTYPE_p_svn_prop_patch_t swig_types[105]
+#define SWIGTYPE_p_svn_stream_mark_t swig_types[106]
+#define SWIGTYPE_p_svn_stream_t swig_types[107]
+#define SWIGTYPE_p_svn_string_t swig_types[108]
+#define SWIGTYPE_p_svn_stringbuf_t swig_types[109]
+#define SWIGTYPE_p_svn_tristate_t swig_types[110]
+#define SWIGTYPE_p_svn_txdelta_op_t swig_types[111]
+#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[112]
+#define SWIGTYPE_p_svn_txdelta_window_t swig_types[113]
+#define SWIGTYPE_p_svn_version_checklist_t swig_types[114]
+#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[115]
+#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[116]
+#define SWIGTYPE_p_svn_version_extended_t swig_types[117]
+#define SWIGTYPE_p_svn_version_t swig_types[118]
+#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[119]
+#define SWIGTYPE_p_unsigned_char swig_types[120]
+#define SWIGTYPE_p_unsigned_long swig_types[121]
+#define SWIGTYPE_p_void swig_types[122]
+static swig_type_info *swig_types[124];
+static swig_module_info swig_module = {swig_types, 123, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
@@ -1617,7 +1617,7 @@ static swig_module_info swig_module = {swig_types, 112, 0, 0, 0, 0};
 #define SWIG_name   "SVN::_Fs::boot_SVN___Fs"
 #define SWIG_prefix "SVN::_Fs::"
 
-#define SWIGVERSION 0x020009 
+#define SWIGVERSION 0x020012 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -1729,6 +1729,25 @@ SWIG_AsCharPtrAndSize(SV *obj, char** cptr, size_t* psize, int *alloc)
 
 
 
+SWIGINTERNINLINE SV *
+SWIG_From_long  SWIG_PERL_DECL_ARGS_1(long value)
+{
+  SV *sv;
+  if (value >= IV_MIN && value <= IV_MAX)
+    sv = newSViv(value);
+  else
+    sv = newSVpvf("%ld", value);
+  return sv_2mortal(sv);
+}
+
+
+SWIGINTERNINLINE SV *
+SWIG_From_int  SWIG_PERL_DECL_ARGS_1(int value)
+{    
+  return SWIG_From_long  SWIG_PERL_CALL_ARGS_1(value);
+}
+
+
 #include <limits.h>
 #if !defined(SWIG_NO_LLONG_MAX)
 # if !defined(LLONG_MAX) && defined(__GNUC__) && defined (__LONG_LONG_MAX__)
@@ -1870,25 +1889,6 @@ SWIG_AsVal_int SWIG_PERL_DECL_ARGS_2(SV * obj, int *val)
 }
 
 
-SWIGINTERNINLINE SV *
-SWIG_From_long  SWIG_PERL_DECL_ARGS_1(long value)
-{
-  SV *sv;
-  if (value >= IV_MIN && value <= IV_MAX)
-    sv = newSViv(value);
-  else
-    sv = newSVpvf("%ld", value);
-  return sv_2mortal(sv);
-}
-
-
-SWIGINTERNINLINE SV *
-SWIG_From_int  SWIG_PERL_DECL_ARGS_1(int value)
-{    
-  return SWIG_From_long  SWIG_PERL_CALL_ARGS_1(value);
-}
-
-
 SWIGINTERN int
 SWIG_AsVal_unsigned_SS_long SWIG_PERL_DECL_ARGS_2(SV *obj, unsigned long *val) 
 {
@@ -2004,11 +2004,21 @@ static void svn_fs_invoke_warning_callback(
   _obj(baton, err);
 }
 
+static svn_error_t * svn_fs_invoke_upgrade_notify(
+  svn_fs_upgrade_notify_t _obj, void *baton, apr_uint64_t number, svn_fs_upgrade_notify_action_t action, apr_pool_t *scratch_pool) {
+  return _obj(baton, number, action, scratch_pool);
+}
+
 static void svn_fs_invoke_progress_notify_func(
   svn_fs_progress_notify_func_t _obj, svn_revnum_t revision, void *baton, apr_pool_t *pool) {
   _obj(revision, baton, pool);
 }
 
+static void svn_fs_invoke_hotcopy_notify(
+  svn_fs_hotcopy_notify_t _obj, void *baton, svn_revnum_t start_revision, svn_revnum_t end_revision, apr_pool_t *scratch_pool) {
+  _obj(baton, start_revision, end_revision, scratch_pool);
+}
+
 static svn_error_t * svn_fs_invoke_freeze_func(
   svn_fs_freeze_func_t _obj, void *baton, apr_pool_t *pool) {
   return _obj(baton, pool);
@@ -2019,6 +2029,11 @@ static svn_error_t * svn_fs_invoke_process_contents_func(
   return _obj(contents, len, baton, scratch_pool);
 }
 
+static svn_error_t * svn_fs_invoke_lock_callback(
+  svn_fs_lock_callback_t _obj, void *baton, const char *path, const svn_lock_t *lock, svn_error_t *fs_err, apr_pool_t *scratch_pool) {
+  return _obj(baton, path, lock, fs_err, scratch_pool);
+}
+
 static svn_error_t * svn_fs_invoke_get_locks_callback(
   svn_fs_get_locks_callback_t _obj, void *baton, svn_lock_t *lock, apr_pool_t *pool) {
   return _obj(baton, lock, pool);
@@ -2030,6 +2045,52 @@ static svn_error_t * svn_fs_invoke_pack_notify(
 }
 
 
+
+SWIGINTERN int
+SWIG_AsVal_unsigned_SS_long_SS_long SWIG_PERL_DECL_ARGS_2(SV *obj, unsigned long long *val)
+{
+  if (SvUOK(obj)) {
+    if (val) *val = SvUV(obj);
+    return SWIG_OK;
+  } else  if (SvIOK(obj)) {
+    IV v = SvIV(obj);
+    if (v >= 0 && v <= ULLONG_MAX) {
+      if (val) *val = v;
+      return SWIG_OK;
+    } else {
+      return SWIG_OverflowError;
+    }
+  } else {
+    int dispatch = 0;
+    const char *nptr = SvPV_nolen(obj);
+    if (nptr) {
+      char *endptr;
+      unsigned long long v;
+      errno = 0;
+      v = strtoull(nptr, &endptr,0);
+      if (errno == ERANGE) {
+	errno = 0;
+	return SWIG_OverflowError;
+      } else {
+	if (*endptr == '\0') {
+	  if (val) *val = v;
+	  return SWIG_Str2NumCast(SWIG_OK);
+	}
+      }
+    }
+    if (!dispatch) {
+      const double mant_max = 1LL << DBL_MANT_DIG;
+      double d;
+      int res = SWIG_AddCast(SWIG_AsVal_double SWIG_PERL_CALL_ARGS_2(obj,&d));
+      if (SWIG_IsOK(res) && SWIG_CanCastAsInteger(&d, 0, mant_max)) {
+	if (val) *val = (unsigned long long)(d);
+	return res;
+      }
+    }
+  }
+  return SWIG_TypeError;
+}
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -2092,6 +2153,7 @@ XS(_wrap_svn_fs_initialize) {
     
     {
       _global_pool = arg1 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 0) || (items > 1)) {
       SWIG_croak("Usage: svn_fs_initialize(pool);");
@@ -2147,6 +2209,7 @@ XS(_wrap_svn_fs_create) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -2204,6 +2267,91 @@ XS(_wrap_svn_fs_create) {
 }
 
 
+XS(_wrap_svn_fs_open2) {
+  {
+    svn_fs_t **arg1 = (svn_fs_t **) 0 ;
+    char *arg2 = (char *) 0 ;
+    apr_hash_t *arg3 = (apr_hash_t *) 0 ;
+    apr_pool_t *arg4 = (apr_pool_t *) 0 ;
+    apr_pool_t *arg5 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    svn_fs_t *temp1 ;
+    int res2 ;
+    char *buf2 = 0 ;
+    int alloc2 = 0 ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    {
+      _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    arg1 = &temp1;
+    if ((items < 2) || (items > 4)) {
+      SWIG_croak("Usage: svn_fs_open2(path,fs_config,result_pool,scratch_pool);");
+    }
+    res2 = SWIG_AsCharPtrAndSize(ST(0), &buf2, NULL, &alloc2);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_fs_open2" "', argument " "2"" of type '" "char const *""'");
+    }
+    arg2 = (char *)(buf2);
+    {
+      /* PERL-FIXME: Handle undef -> NULL. */
+      arg3 = svn_swig_pl_strings_to_hash(ST(1), _global_pool);
+    }
+    if (items > 2) {
+      
+    }
+    if (items > 3) {
+      
+    }
+    {
+      result = (svn_error_t *)svn_fs_open2(arg1,(char const *)arg2,arg3,arg4,arg5);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    {
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg1, SWIGTYPE_p_svn_fs_t, 0); argvi++  ;
+    }
+    
+    if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+    
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+    
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_svn_fs_open) {
   {
     svn_fs_t **arg1 = (svn_fs_t **) 0 ;
@@ -2221,6 +2369,7 @@ XS(_wrap_svn_fs_open) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -2278,6 +2427,89 @@ XS(_wrap_svn_fs_open) {
 }
 
 
+XS(_wrap_svn_fs_upgrade2) {
+  {
+    char *arg1 = (char *) 0 ;
+    svn_fs_upgrade_notify_t arg2 = (svn_fs_upgrade_notify_t) 0 ;
+    void *arg3 = (void *) 0 ;
+    svn_cancel_func_t arg4 = (svn_cancel_func_t) 0 ;
+    void *arg5 = (void *) 0 ;
+    apr_pool_t *arg6 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    int res1 ;
+    char *buf1 = 0 ;
+    int alloc1 = 0 ;
+    int res3 ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    if ((items < 4) || (items > 5)) {
+      SWIG_croak("Usage: svn_fs_upgrade2(path,notify_func,notify_baton,cancel_func,cancel_baton,scratch_pool);");
+    }
+    res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1);
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_fs_upgrade2" "', argument " "1"" of type '" "char const *""'");
+    }
+    arg1 = (char *)(buf1);
+    {
+      int res = SWIG_ConvertFunctionPtr(ST(1), (void**)(&arg2), SWIGTYPE_p_f_p_void_apr_uint64_t_svn_fs_upgrade_notify_action_t_p_apr_pool_t__p_svn_error_t);
+      if (!SWIG_IsOK(res)) {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_fs_upgrade2" "', argument " "2"" of type '" "svn_fs_upgrade_notify_t""'"); 
+      }
+    }
+    res3 = SWIG_ConvertPtr(ST(2),SWIG_as_voidptrptr(&arg3), 0, 0);
+    if (!SWIG_IsOK(res3)) {
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_fs_upgrade2" "', argument " "3"" of type '" "void *""'"); 
+    }
+    {
+      arg4 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg5 = ST(3);
+    }
+    if (items > 4) {
+      
+    }
+    {
+      result = (svn_error_t *)svn_fs_upgrade2((char const *)arg1,arg2,arg3,arg4,arg5,arg6);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+    
+    
+    
+    XSRETURN(argvi);
+  fail:
+    if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+    
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_svn_fs_upgrade) {
   {
     char *arg1 = (char *) 0 ;
@@ -2292,6 +2524,7 @@ XS(_wrap_svn_fs_upgrade) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_fs_upgrade(path,pool);");
@@ -2353,6 +2586,7 @@ XS(_wrap_svn_fs_type) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 2)) {
@@ -2421,6 +2655,7 @@ XS(_wrap_svn_fs_path) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_fs_path(fs,pool);");
@@ -2464,6 +2699,7 @@ XS(_wrap_svn_fs_config) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_fs_config(fs,pool);");
@@ -2508,6 +2744,7 @@ XS(_wrap_svn_fs_delete_fs) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_fs_delete_fs(path,pool);");
@@ -2553,15 +2790,17 @@ XS(_wrap_svn_fs_delete_fs) {
 }
 
 
-XS(_wrap_svn_fs_hotcopy2) {
+XS(_wrap_svn_fs_hotcopy3) {
   {
     char *arg1 = (char *) 0 ;
     char *arg2 = (char *) 0 ;
     svn_boolean_t arg3 ;
     svn_boolean_t arg4 ;
-    svn_cancel_func_t arg5 = (svn_cancel_func_t) 0 ;
+    svn_fs_hotcopy_notify_t arg5 = (svn_fs_hotcopy_notify_t) 0 ;
     void *arg6 = (void *) 0 ;
-    apr_pool_t *arg7 = (apr_pool_t *) 0 ;
+    svn_cancel_func_t arg7 = (svn_cancel_func_t) 0 ;
+    void *arg8 = (void *) 0 ;
+    apr_pool_t *arg9 = (apr_pool_t *) 0 ;
     apr_pool_t *_global_pool ;
     int res1 ;
     char *buf1 = 0 ;
@@ -2579,46 +2818,51 @@ XS(_wrap_svn_fs_hotcopy2) {
     dXSARGS;
     
     {
-      _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 6) || (items > 7)) {
-      SWIG_croak("Usage: svn_fs_hotcopy2(src_path,dest_path,clean,incremental,cancel_func,cancel_baton,scratch_pool);");
+    if ((items < 7) || (items > 8)) {
+      SWIG_croak("Usage: svn_fs_hotcopy3(src_path,dest_path,clean,incremental,notify_func,notify_baton,cancel_func,cancel_baton,scratch_pool);");
     }
     res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1);
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_fs_hotcopy2" "', argument " "1"" of type '" "char const *""'");
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_fs_hotcopy3" "', argument " "1"" of type '" "char const *""'");
     }
     arg1 = (char *)(buf1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_fs_hotcopy2" "', argument " "2"" of type '" "char const *""'");
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_fs_hotcopy3" "', argument " "2"" of type '" "char const *""'");
     }
     arg2 = (char *)(buf2);
     ecode3 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(2), &val3);
     if (!SWIG_IsOK(ecode3)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "svn_fs_hotcopy2" "', argument " "3"" of type '" "svn_boolean_t""'");
+      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "svn_fs_hotcopy3" "', argument " "3"" of type '" "svn_boolean_t""'");
     } 
     arg3 = (svn_boolean_t)(val3);
     ecode4 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(3), &val4);
     if (!SWIG_IsOK(ecode4)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "svn_fs_hotcopy2" "', argument " "4"" of type '" "svn_boolean_t""'");
+      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "svn_fs_hotcopy3" "', argument " "4"" of type '" "svn_boolean_t""'");
     } 
     arg4 = (svn_boolean_t)(val4);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(4), (void**)(&arg5), SWIGTYPE_p_f_p_void__p_svn_error_t);
+      int res = SWIG_ConvertFunctionPtr(ST(4), (void**)(&arg5), SWIGTYPE_p_f_p_void_long_long_p_apr_pool_t__void);
       if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_fs_hotcopy2" "', argument " "5"" of type '" "svn_cancel_func_t""'"); 
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_fs_hotcopy3" "', argument " "5"" of type '" "svn_fs_hotcopy_notify_t""'"); 
       }
     }
     res6 = SWIG_ConvertPtr(ST(5),SWIG_as_voidptrptr(&arg6), 0, 0);
     if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "svn_fs_hotcopy2" "', argument " "6"" of type '" "void *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "svn_fs_hotcopy3" "', argument " "6"" of type '" "void *""'"); 
     }
-    if (items > 6) {
+    {
+      arg7 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg8 = ST(6);
+    }
+    if (items > 7) {
       
     }
     {
-      result = (svn_error_t *)svn_fs_hotcopy2((char const *)arg1,(char const *)arg2,arg3,arg4,arg5,arg6,arg7);
+      result = (svn_error_t *)svn_fs_hotcopy3((char const *)arg1,(char const *)arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9);
       
       
       
@@ -2660,6 +2904,103 @@ XS(_wrap_svn_fs_hotcopy2) {
 }
 
 
+XS(_wrap_svn_fs_hotcopy2) {
+  {
+    char *arg1 = (char *) 0 ;
+    char *arg2 = (char *) 0 ;
+    svn_boolean_t arg3 ;
+    svn_boolean_t arg4 ;
+    svn_cancel_func_t arg5 = (svn_cancel_func_t) 0 ;
+    void *arg6 = (void *) 0 ;
+    apr_pool_t *arg7 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    int res1 ;
+    char *buf1 = 0 ;
+    int alloc1 = 0 ;
+    int res2 ;
+    char *buf2 = 0 ;
+    int alloc2 = 0 ;
+    int val3 ;
+    int ecode3 = 0 ;
+    int val4 ;
+    int ecode4 = 0 ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    if ((items < 5) || (items > 6)) {
+      SWIG_croak("Usage: svn_fs_hotcopy2(src_path,dest_path,clean,incremental,cancel_func,cancel_baton,scratch_pool);");
+    }
+    res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1);
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_fs_hotcopy2" "', argument " "1"" of type '" "char const *""'");
+    }
+    arg1 = (char *)(buf1);
+    res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_fs_hotcopy2" "', argument " "2"" of type '" "char const *""'");
+    }
+    arg2 = (char *)(buf2);
+    ecode3 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(2), &val3);
+    if (!SWIG_IsOK(ecode3)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "svn_fs_hotcopy2" "', argument " "3"" of type '" "svn_boolean_t""'");
+    } 
+    arg3 = (svn_boolean_t)(val3);
+    ecode4 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(3), &val4);
+    if (!SWIG_IsOK(ecode4)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "svn_fs_hotcopy2" "', argument " "4"" of type '" "svn_boolean_t""'");
+    } 
+    arg4 = (svn_boolean_t)(val4);
+    {
+      arg5 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg6 = ST(4);
+    }
+    if (items > 5) {
+      
+    }
+    {
+      result = (svn_error_t *)svn_fs_hotcopy2((char const *)arg1,(char const *)arg2,arg3,arg4,arg5,arg6,arg7);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+    if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+    
+    
+    
+    XSRETURN(argvi);
+  fail:
+    if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+    if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+    
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_svn_fs_hotcopy) {
   {
     char *arg1 = (char *) 0 ;
@@ -2681,6 +3022,7 @@ XS(_wrap_svn_fs_hotcopy) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_fs_hotcopy(src_path,dest_path,clean,pool);");
@@ -2750,15 +3092,15 @@ XS(_wrap_svn_fs_recover) {
     int res1 ;
     char *buf1 = 0 ;
     int alloc1 = 0 ;
-    int res3 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
     dXSARGS;
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 3) || (items > 4)) {
+    if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_fs_recover(path,cancel_func,cancel_baton,pool);");
     }
     res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1);
@@ -2767,16 +3109,10 @@ XS(_wrap_svn_fs_recover) {
     }
     arg1 = (char *)(buf1);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(1), (void**)(&arg2), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_fs_recover" "', argument " "2"" of type '" "svn_cancel_func_t""'"); 
-      }
+      arg2 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg3 = ST(1);
     }
-    res3 = SWIG_ConvertPtr(ST(2),SWIG_as_voidptrptr(&arg3), 0, 0);
-    if (!SWIG_IsOK(res3)) {
-      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_fs_recover" "', argument " "3"" of type '" "void *""'"); 
-    }
-    if (items > 3) {
+    if (items > 2) {
       
     }
     {
@@ -2803,14 +3139,10 @@ XS(_wrap_svn_fs_recover) {
     }
     if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
     
-    
-    
     XSRETURN(argvi);
   fail:
     if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -2832,6 +3164,7 @@ XS(_wrap_svn_fs_freeze) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_fs_freeze(fs,freeze_func,freeze_baton,pool);");
@@ -2910,6 +3243,7 @@ XS(_wrap_svn_fs_berkeley_logfiles) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -2979,6 +3313,7 @@ XS(_wrap_svn_fs_new) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_fs_new(fs_config,pool);");
@@ -3139,6 +3474,7 @@ XS(_wrap_svn_fs_berkeley_path) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_fs_berkeley_path(fs,pool);");
@@ -3183,6 +3519,7 @@ XS(_wrap_svn_fs_delete_berkeley) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_fs_delete_berkeley(path,pool);");
@@ -3249,6 +3586,7 @@ XS(_wrap_svn_fs_hotcopy_berkeley) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_fs_hotcopy_berkeley(src_path,dest_path,clean_logs,pool);");
@@ -3322,6 +3660,7 @@ XS(_wrap_svn_fs_berkeley_recover) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_fs_berkeley_recover(path,pool);");
@@ -3383,6 +3722,7 @@ XS(_wrap_svn_fs_create_access) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 2)) {
@@ -3835,6 +4175,7 @@ XS(_wrap_svn_fs_parse_id) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_fs_parse_id(data,len,pool);");
@@ -3883,6 +4224,7 @@ XS(_wrap_svn_fs_unparse_id) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_fs_unparse_id(id,pool);");
@@ -3937,6 +4279,7 @@ XS(_wrap_svn_fs_begin_txn2) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 3) || (items > 4)) {
@@ -4020,6 +4363,7 @@ XS(_wrap_svn_fs_begin_txn) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -4096,6 +4440,7 @@ XS(_wrap_svn_fs_commit_txn) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
@@ -4173,6 +4518,7 @@ XS(_wrap_svn_fs_abort_txn) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_fs_abort_txn(txn,pool);");
@@ -4235,6 +4581,7 @@ XS(_wrap_svn_fs_purge_txn) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_fs_purge_txn(fs,txn_id,pool);");
@@ -4302,6 +4649,7 @@ XS(_wrap_svn_fs_txn_name) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 2)) {
@@ -4409,6 +4757,7 @@ XS(_wrap_svn_fs_open_txn) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -4482,6 +4831,7 @@ XS(_wrap_svn_fs_list_transactions) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 2)) {
@@ -4552,6 +4902,7 @@ XS(_wrap_svn_fs_txn_prop) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -4629,6 +4980,7 @@ XS(_wrap_svn_fs_txn_proplist) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 2)) {
@@ -4699,6 +5051,7 @@ XS(_wrap_svn_fs_change_txn_prop) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_fs_change_txn_prop(txn,name,value,pool);");
@@ -4778,6 +5131,7 @@ XS(_wrap_svn_fs_change_txn_props) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_fs_change_txn_props(txn,props,pool);");
@@ -4848,6 +5202,7 @@ XS(_wrap_svn_fs_revision_root) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -4921,6 +5276,7 @@ XS(_wrap_svn_fs_txn_root) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 2)) {
@@ -5116,6 +5472,7 @@ XS(_wrap_svn_fs_txn_root_name) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_fs_txn_root_name(root,pool);");
@@ -5738,6 +6095,71 @@ XS(_wrap_svn_fs_path_change2_t_copyfrom_path_get) {
 }
 
 
+XS(_wrap_svn_fs_path_change2_t_mergeinfo_mod_set) {
+  {
+    struct svn_fs_path_change2_t *arg1 = (struct svn_fs_path_change2_t *) 0 ;
+    svn_tristate_t arg2 ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    int val2 ;
+    int ecode2 = 0 ;
+    int argvi = 0;
+    dXSARGS;
+    
+    if ((items < 2) || (items > 2)) {
+      SWIG_croak("Usage: svn_fs_path_change2_t_mergeinfo_mod_set(self,mergeinfo_mod);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_fs_path_change2_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_fs_path_change2_t_mergeinfo_mod_set" "', argument " "1"" of type '" "struct svn_fs_path_change2_t *""'"); 
+    }
+    arg1 = (struct svn_fs_path_change2_t *)(argp1);
+    ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
+    if (!SWIG_IsOK(ecode2)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "svn_fs_path_change2_t_mergeinfo_mod_set" "', argument " "2"" of type '" "svn_tristate_t""'");
+    } 
+    arg2 = (svn_tristate_t)(val2);
+    if (arg1) (arg1)->mergeinfo_mod = arg2;
+    ST(argvi) = sv_newmortal();
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_svn_fs_path_change2_t_mergeinfo_mod_get) {
+  {
+    struct svn_fs_path_change2_t *arg1 = (struct svn_fs_path_change2_t *) 0 ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    int argvi = 0;
+    svn_tristate_t result;
+    dXSARGS;
+    
+    if ((items < 1) || (items > 1)) {
+      SWIG_croak("Usage: svn_fs_path_change2_t_mergeinfo_mod_get(self);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_fs_path_change2_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_fs_path_change2_t_mergeinfo_mod_get" "', argument " "1"" of type '" "struct svn_fs_path_change2_t *""'"); 
+    }
+    arg1 = (struct svn_fs_path_change2_t *)(argp1);
+    result = (svn_tristate_t) ((arg1)->mergeinfo_mod);
+    ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
+    
+    XSRETURN(argvi);
+  fail:
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_svn_fs_path_change_t_node_rev_id_set) {
   {
     struct svn_fs_path_change_t *arg1 = (struct svn_fs_path_change_t *) 0 ;
@@ -6014,6 +6436,7 @@ XS(_wrap_svn_fs_path_change2_create) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_fs_path_change2_create(node_rev_id,change_kind,pool);");
@@ -6066,6 +6489,7 @@ XS(_wrap_svn_fs_paths_changed2) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 2)) {
@@ -6132,6 +6556,7 @@ XS(_wrap_svn_fs_paths_changed) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 2)) {
@@ -6203,6 +6628,7 @@ XS(_wrap_svn_fs_check_path) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -6264,6 +6690,94 @@ XS(_wrap_svn_fs_check_path) {
 }
 
 
+XS(_wrap_svn_fs_node_history2) {
+  {
+    svn_fs_history_t **arg1 = (svn_fs_history_t **) 0 ;
+    svn_fs_root_t *arg2 = (svn_fs_root_t *) 0 ;
+    char *arg3 = (char *) 0 ;
+    apr_pool_t *arg4 = (apr_pool_t *) 0 ;
+    apr_pool_t *arg5 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    svn_fs_history_t *temp1 ;
+    void *argp2 = 0 ;
+    int res2 = 0 ;
+    int res3 ;
+    char *buf3 = 0 ;
+    int alloc3 = 0 ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    {
+      _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    arg1 = &temp1;
+    if ((items < 2) || (items > 4)) {
+      SWIG_croak("Usage: svn_fs_node_history2(root,path,result_pool,scratch_pool);");
+    }
+    res2 = SWIG_ConvertPtr(ST(0), &argp2,SWIGTYPE_p_svn_fs_root_t, 0 |  0 );
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_fs_node_history2" "', argument " "2"" of type '" "svn_fs_root_t *""'"); 
+    }
+    arg2 = (svn_fs_root_t *)(argp2);
+    res3 = SWIG_AsCharPtrAndSize(ST(1), &buf3, NULL, &alloc3);
+    if (!SWIG_IsOK(res3)) {
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_fs_node_history2" "', argument " "3"" of type '" "char const *""'");
+    }
+    arg3 = (char *)(buf3);
+    if (items > 2) {
+      
+    }
+    if (items > 3) {
+      
+    }
+    {
+      result = (svn_error_t *)svn_fs_node_history2(arg1,arg2,(char const *)arg3,arg4,arg5);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    {
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg1, SWIGTYPE_p_svn_fs_history_t, 0); argvi++  ;
+    }
+    
+    
+    if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_svn_fs_node_history) {
   {
     svn_fs_history_t **arg1 = (svn_fs_history_t **) 0 ;
@@ -6283,6 +6797,7 @@ XS(_wrap_svn_fs_node_history) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -6341,6 +6856,93 @@ XS(_wrap_svn_fs_node_history) {
 }
 
 
+XS(_wrap_svn_fs_history_prev2) {
+  {
+    svn_fs_history_t **arg1 = (svn_fs_history_t **) 0 ;
+    svn_fs_history_t *arg2 = (svn_fs_history_t *) 0 ;
+    svn_boolean_t arg3 ;
+    apr_pool_t *arg4 = (apr_pool_t *) 0 ;
+    apr_pool_t *arg5 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    svn_fs_history_t *temp1 ;
+    void *argp2 = 0 ;
+    int res2 = 0 ;
+    int val3 ;
+    int ecode3 = 0 ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    {
+      _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    arg1 = &temp1;
+    if ((items < 2) || (items > 4)) {
+      SWIG_croak("Usage: svn_fs_history_prev2(history,cross_copies,result_pool,scratch_pool);");
+    }
+    res2 = SWIG_ConvertPtr(ST(0), &argp2,SWIGTYPE_p_svn_fs_history_t, 0 |  0 );
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_fs_history_prev2" "', argument " "2"" of type '" "svn_fs_history_t *""'"); 
+    }
+    arg2 = (svn_fs_history_t *)(argp2);
+    ecode3 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val3);
+    if (!SWIG_IsOK(ecode3)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "svn_fs_history_prev2" "', argument " "3"" of type '" "svn_boolean_t""'");
+    } 
+    arg3 = (svn_boolean_t)(val3);
+    if (items > 2) {
+      
+    }
+    if (items > 3) {
+      
+    }
+    {
+      result = (svn_error_t *)svn_fs_history_prev2(arg1,arg2,arg3,arg4,arg5);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    {
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg1, SWIGTYPE_p_svn_fs_history_t, 0); argvi++  ;
+    }
+    
+    
+    
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_svn_fs_history_prev) {
   {
     svn_fs_history_t **arg1 = (svn_fs_history_t **) 0 ;
@@ -6359,6 +6961,7 @@ XS(_wrap_svn_fs_history_prev) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -6435,6 +7038,7 @@ XS(_wrap_svn_fs_history_location) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
@@ -6519,6 +7123,7 @@ XS(_wrap_svn_fs_is_dir) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -6600,6 +7205,7 @@ XS(_wrap_svn_fs_is_file) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -6680,6 +7286,7 @@ XS(_wrap_svn_fs_node_id) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -6738,6 +7345,107 @@ XS(_wrap_svn_fs_node_id) {
 }
 
 
+XS(_wrap_svn_fs_node_relation) {
+  {
+    svn_fs_node_relation_t *arg1 = (svn_fs_node_relation_t *) 0 ;
+    svn_fs_root_t *arg2 = (svn_fs_root_t *) 0 ;
+    char *arg3 = (char *) 0 ;
+    svn_fs_root_t *arg4 = (svn_fs_root_t *) 0 ;
+    char *arg5 = (char *) 0 ;
+    apr_pool_t *arg6 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    void *argp2 = 0 ;
+    int res2 = 0 ;
+    int res3 ;
+    char *buf3 = 0 ;
+    int alloc3 = 0 ;
+    void *argp4 = 0 ;
+    int res4 = 0 ;
+    int res5 ;
+    char *buf5 = 0 ;
+    int alloc5 = 0 ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    if ((items < 5) || (items > 6)) {
+      SWIG_croak("Usage: svn_fs_node_relation(relation,root_a,path_a,root_b,path_b,scratch_pool);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_fs_node_relation_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_fs_node_relation" "', argument " "1"" of type '" "svn_fs_node_relation_t *""'"); 
+    }
+    arg1 = (svn_fs_node_relation_t *)(argp1);
+    res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_svn_fs_root_t, 0 |  0 );
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_fs_node_relation" "', argument " "2"" of type '" "svn_fs_root_t *""'"); 
+    }
+    arg2 = (svn_fs_root_t *)(argp2);
+    res3 = SWIG_AsCharPtrAndSize(ST(2), &buf3, NULL, &alloc3);
+    if (!SWIG_IsOK(res3)) {
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_fs_node_relation" "', argument " "3"" of type '" "char const *""'");
+    }
+    arg3 = (char *)(buf3);
+    res4 = SWIG_ConvertPtr(ST(3), &argp4,SWIGTYPE_p_svn_fs_root_t, 0 |  0 );
+    if (!SWIG_IsOK(res4)) {
+      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "svn_fs_node_relation" "', argument " "4"" of type '" "svn_fs_root_t *""'"); 
+    }
+    arg4 = (svn_fs_root_t *)(argp4);
+    res5 = SWIG_AsCharPtrAndSize(ST(4), &buf5, NULL, &alloc5);
+    if (!SWIG_IsOK(res5)) {
+      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "svn_fs_node_relation" "', argument " "5"" of type '" "char const *""'");
+    }
+    arg5 = (char *)(buf5);
+    if (items > 5) {
+      
+    }
+    {
+      result = (svn_error_t *)svn_fs_node_relation(arg1,arg2,(char const *)arg3,arg4,(char const *)arg5,arg6);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    
+    
+    if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+    
+    if (alloc5 == SWIG_NEWOBJ) free((char*)buf5);
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+    
+    if (alloc5 == SWIG_NEWOBJ) free((char*)buf5);
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_svn_fs_node_created_rev) {
   {
     svn_revnum_t *arg1 = (svn_revnum_t *) 0 ;
@@ -6758,6 +7466,7 @@ XS(_wrap_svn_fs_node_created_rev) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -6839,6 +7548,7 @@ XS(_wrap_svn_fs_node_origin_rev) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -6919,6 +7629,7 @@ XS(_wrap_svn_fs_node_created_path) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -7004,6 +7715,7 @@ XS(_wrap_svn_fs_node_prop) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 3) || (items > 4)) {
@@ -7092,6 +7804,7 @@ XS(_wrap_svn_fs_node_proplist) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -7150,6 +7863,88 @@ XS(_wrap_svn_fs_node_proplist) {
 }
 
 
+XS(_wrap_svn_fs_node_has_props) {
+  {
+    svn_boolean_t *arg1 = (svn_boolean_t *) 0 ;
+    svn_fs_root_t *arg2 = (svn_fs_root_t *) 0 ;
+    char *arg3 = (char *) 0 ;
+    apr_pool_t *arg4 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    svn_boolean_t temp1 ;
+    int res1 = SWIG_TMPOBJ ;
+    void *argp2 = 0 ;
+    int res2 = 0 ;
+    int res3 ;
+    char *buf3 = 0 ;
+    int alloc3 = 0 ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    arg1 = &temp1;
+    if ((items < 2) || (items > 3)) {
+      SWIG_croak("Usage: svn_fs_node_has_props(root,path,scratch_pool);");
+    }
+    res2 = SWIG_ConvertPtr(ST(0), &argp2,SWIGTYPE_p_svn_fs_root_t, 0 |  0 );
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_fs_node_has_props" "', argument " "2"" of type '" "svn_fs_root_t *""'"); 
+    }
+    arg2 = (svn_fs_root_t *)(argp2);
+    res3 = SWIG_AsCharPtrAndSize(ST(1), &buf3, NULL, &alloc3);
+    if (!SWIG_IsOK(res3)) {
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_fs_node_has_props" "', argument " "3"" of type '" "char const *""'");
+    }
+    arg3 = (char *)(buf3);
+    if (items > 2) {
+      
+    }
+    {
+      result = (svn_error_t *)svn_fs_node_has_props(arg1,arg2,(char const *)arg3,arg4);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    if (SWIG_IsTmpObj(res1)) {
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((*arg1)); argvi++  ;
+    } else {
+      int new_flags = SWIG_IsNewObj(res1) ? (SWIG_POINTER_OWN | 0) : 0;
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj((void*)(arg1), SWIGTYPE_p_int, new_flags); argvi++  ;
+    }
+    
+    
+    if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_svn_fs_change_node_prop) {
   {
     svn_fs_root_t *arg1 = (svn_fs_root_t *) 0 ;
@@ -7173,6 +7968,7 @@ XS(_wrap_svn_fs_change_node_prop) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_fs_change_node_prop(root,path,name,value,pool);");
@@ -7243,6 +8039,109 @@ XS(_wrap_svn_fs_change_node_prop) {
 }
 
 
+XS(_wrap_svn_fs_props_different) {
+  {
+    svn_boolean_t *arg1 = (svn_boolean_t *) 0 ;
+    svn_fs_root_t *arg2 = (svn_fs_root_t *) 0 ;
+    char *arg3 = (char *) 0 ;
+    svn_fs_root_t *arg4 = (svn_fs_root_t *) 0 ;
+    char *arg5 = (char *) 0 ;
+    apr_pool_t *arg6 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    svn_boolean_t temp1 ;
+    int res1 = SWIG_TMPOBJ ;
+    void *argp2 = 0 ;
+    int res2 = 0 ;
+    int res3 ;
+    char *buf3 = 0 ;
+    int alloc3 = 0 ;
+    void *argp4 = 0 ;
+    int res4 = 0 ;
+    int res5 ;
+    char *buf5 = 0 ;
+    int alloc5 = 0 ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    arg1 = &temp1;
+    if ((items < 4) || (items > 5)) {
+      SWIG_croak("Usage: svn_fs_props_different(root1,path1,root2,path2,scratch_pool);");
+    }
+    res2 = SWIG_ConvertPtr(ST(0), &argp2,SWIGTYPE_p_svn_fs_root_t, 0 |  0 );
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_fs_props_different" "', argument " "2"" of type '" "svn_fs_root_t *""'"); 
+    }
+    arg2 = (svn_fs_root_t *)(argp2);
+    res3 = SWIG_AsCharPtrAndSize(ST(1), &buf3, NULL, &alloc3);
+    if (!SWIG_IsOK(res3)) {
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_fs_props_different" "', argument " "3"" of type '" "char const *""'");
+    }
+    arg3 = (char *)(buf3);
+    res4 = SWIG_ConvertPtr(ST(2), &argp4,SWIGTYPE_p_svn_fs_root_t, 0 |  0 );
+    if (!SWIG_IsOK(res4)) {
+      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "svn_fs_props_different" "', argument " "4"" of type '" "svn_fs_root_t *""'"); 
+    }
+    arg4 = (svn_fs_root_t *)(argp4);
+    res5 = SWIG_AsCharPtrAndSize(ST(3), &buf5, NULL, &alloc5);
+    if (!SWIG_IsOK(res5)) {
+      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "svn_fs_props_different" "', argument " "5"" of type '" "char const *""'");
+    }
+    arg5 = (char *)(buf5);
+    if (items > 4) {
+      
+    }
+    {
+      result = (svn_error_t *)svn_fs_props_different(arg1,arg2,(char const *)arg3,arg4,(char const *)arg5,arg6);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    if (SWIG_IsTmpObj(res1)) {
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((*arg1)); argvi++  ;
+    } else {
+      int new_flags = SWIG_IsNewObj(res1) ? (SWIG_POINTER_OWN | 0) : 0;
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj((void*)(arg1), SWIGTYPE_p_int, new_flags); argvi++  ;
+    }
+    
+    
+    if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+    
+    if (alloc5 == SWIG_NEWOBJ) free((char*)buf5);
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+    
+    if (alloc5 == SWIG_NEWOBJ) free((char*)buf5);
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_svn_fs_props_changed) {
   {
     svn_boolean_t *arg1 = (svn_boolean_t *) 0 ;
@@ -7270,6 +8169,7 @@ XS(_wrap_svn_fs_props_changed) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 4) || (items > 5)) {
@@ -7367,6 +8267,7 @@ XS(_wrap_svn_fs_copied_from) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
@@ -7459,6 +8360,7 @@ XS(_wrap_svn_fs_closest_copy) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
@@ -7553,9 +8455,11 @@ XS(_wrap_svn_fs_get_mergeinfo2) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 5) || (items > 7)) {
@@ -7567,7 +8471,7 @@ XS(_wrap_svn_fs_get_mergeinfo2) {
     }
     arg2 = (svn_fs_root_t *)(argp2);
     {
-      arg3 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(1),
+      arg3 = svn_swig_pl_strings_to_array(ST(1),
         _global_pool);
     }
     ecode4 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(2), &val4);
@@ -7667,6 +8571,7 @@ XS(_wrap_svn_fs_get_mergeinfo) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 4) || (items > 5)) {
@@ -7678,7 +8583,7 @@ XS(_wrap_svn_fs_get_mergeinfo) {
     }
     arg2 = (svn_fs_root_t *)(argp2);
     {
-      arg3 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(1),
+      arg3 = svn_swig_pl_strings_to_array(ST(1),
         _global_pool);
     }
     ecode4 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(2), &val4);
@@ -7777,6 +8682,7 @@ XS(_wrap_svn_fs_merge) {
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 6) || (items > 7)) {
@@ -8089,6 +8995,7 @@ XS(_wrap_svn_fs_dir_entries) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -8147,6 +9054,99 @@ XS(_wrap_svn_fs_dir_entries) {
 }
 
 
+XS(_wrap_svn_fs_dir_optimal_order) {
+  {
+    apr_array_header_t **arg1 = (apr_array_header_t **) 0 ;
+    svn_fs_root_t *arg2 = (svn_fs_root_t *) 0 ;
+    apr_hash_t *arg3 = (apr_hash_t *) 0 ;
+    apr_pool_t *arg4 = (apr_pool_t *) 0 ;
+    apr_pool_t *arg5 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    apr_array_header_t *temp1 ;
+    void *argp2 = 0 ;
+    int res2 = 0 ;
+    void *argp3 = 0 ;
+    int res3 = 0 ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    {
+      _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    arg1 = &temp1;
+    if ((items < 2) || (items > 4)) {
+      SWIG_croak("Usage: svn_fs_dir_optimal_order(root,entries,result_pool,scratch_pool);");
+    }
+    res2 = SWIG_ConvertPtr(ST(0), &argp2,SWIGTYPE_p_svn_fs_root_t, 0 |  0 );
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_fs_dir_optimal_order" "', argument " "2"" of type '" "svn_fs_root_t *""'"); 
+    }
+    arg2 = (svn_fs_root_t *)(argp2);
+    res3 = SWIG_ConvertPtr(ST(1), &argp3,SWIGTYPE_p_apr_hash_t, 0 |  0 );
+    if (!SWIG_IsOK(res3)) {
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_fs_dir_optimal_order" "', argument " "3"" of type '" "apr_hash_t *""'"); 
+    }
+    arg3 = (apr_hash_t *)(argp3);
+    if (items > 2) {
+      
+    }
+    if (items > 3) {
+      
+    }
+    {
+      result = (svn_error_t *)svn_fs_dir_optimal_order(arg1,arg2,arg3,arg4,arg5);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    {
+      /* FIXME: Missing argout typemap: svn_fs_dir_optimal_order arg 1 (apr_array_header_t **) */
+      
+      
+      
+      
+      SWIG_exception(SWIG_ValueError, "svn_fs_dir_optimal_order is not implemented yet");
+      
+    }
+    
+    
+    
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_svn_fs_make_dir) {
   {
     svn_fs_root_t *arg1 = (svn_fs_root_t *) 0 ;
@@ -8164,6 +9164,7 @@ XS(_wrap_svn_fs_make_dir) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_fs_make_dir(root,path,pool);");
@@ -8233,6 +9234,7 @@ XS(_wrap_svn_fs_delete) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_fs_delete(root,path,pool);");
@@ -8309,6 +9311,7 @@ XS(_wrap_svn_fs_copy) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_fs_copy(from_root,from_path,to_root,to_path,pool);");
@@ -8395,6 +9398,7 @@ XS(_wrap_svn_fs_revision_link) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_fs_revision_link(from_root,to_root,path,pool);");
@@ -8473,6 +9477,7 @@ XS(_wrap_svn_fs_file_length) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -8514,7 +9519,7 @@ XS(_wrap_svn_fs_file_length) {
       }
     }
     {
-      char temp[256];
+      char temp[30];
       sprintf(temp, "%" APR_INT64_T_FMT, (apr_int64_t)*(arg1));
       if (argvi >= items) EXTEND(sp,1);  ST(argvi) = sv_2mortal(newSVpv(temp, 0)); argvi++  ;
     }
@@ -8558,6 +9563,7 @@ XS(_wrap_svn_fs_file_checksum) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 4) || (items > 5)) {
@@ -8655,6 +9661,7 @@ XS(_wrap_svn_fs_file_md5_checksum) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = temp1;
     if ((items < 2) || (items > 3)) {
@@ -8696,7 +9703,7 @@ XS(_wrap_svn_fs_file_md5_checksum) {
       }
     }
     {
-      /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = sv_2mortal(newSVpv(svn_md5_digest_to_cstring(arg1,
+      /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = sv_2mortal(newSVpv(svn_md5_digest_to_cstring(arg1,
             _global_pool),
           0)); argvi++ /*@SWIG@*/
       
@@ -8738,6 +9745,7 @@ XS(_wrap_svn_fs_file_contents) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -8779,7 +9787,11 @@ XS(_wrap_svn_fs_file_contents) {
       }
     }
     {
-      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = svn_swig_pl_from_stream(*arg1); argvi++  ;
+      SV *tmp;
+      PUTBACK;
+      tmp = svn_swig_pl_from_stream(*arg1);
+      SPAGAIN;
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = tmp; argvi++  ;
     }
     
     
@@ -8819,6 +9831,7 @@ XS(_wrap_svn_fs_try_process_file_contents) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 4) || (items > 5)) {
@@ -8911,6 +9924,7 @@ XS(_wrap_svn_fs_make_file) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_fs_make_file(root,path,pool);");
@@ -8992,6 +10006,7 @@ XS(_wrap_svn_fs_apply_textdelta) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
@@ -9093,6 +10108,7 @@ XS(_wrap_svn_fs_apply_text) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 3) || (items > 4)) {
@@ -9139,7 +10155,11 @@ XS(_wrap_svn_fs_apply_text) {
       }
     }
     {
-      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = svn_swig_pl_from_stream(*arg1); argvi++  ;
+      SV *tmp;
+      PUTBACK;
+      tmp = svn_swig_pl_from_stream(*arg1);
+      SPAGAIN;
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = tmp; argvi++  ;
     }
     
     
@@ -9158,6 +10178,109 @@ XS(_wrap_svn_fs_apply_text) {
 }
 
 
+XS(_wrap_svn_fs_contents_different) {
+  {
+    svn_boolean_t *arg1 = (svn_boolean_t *) 0 ;
+    svn_fs_root_t *arg2 = (svn_fs_root_t *) 0 ;
+    char *arg3 = (char *) 0 ;
+    svn_fs_root_t *arg4 = (svn_fs_root_t *) 0 ;
+    char *arg5 = (char *) 0 ;
+    apr_pool_t *arg6 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    svn_boolean_t temp1 ;
+    int res1 = SWIG_TMPOBJ ;
+    void *argp2 = 0 ;
+    int res2 = 0 ;
+    int res3 ;
+    char *buf3 = 0 ;
+    int alloc3 = 0 ;
+    void *argp4 = 0 ;
+    int res4 = 0 ;
+    int res5 ;
+    char *buf5 = 0 ;
+    int alloc5 = 0 ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    arg1 = &temp1;
+    if ((items < 4) || (items > 5)) {
+      SWIG_croak("Usage: svn_fs_contents_different(root1,path1,root2,path2,scratch_pool);");
+    }
+    res2 = SWIG_ConvertPtr(ST(0), &argp2,SWIGTYPE_p_svn_fs_root_t, 0 |  0 );
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_fs_contents_different" "', argument " "2"" of type '" "svn_fs_root_t *""'"); 
+    }
+    arg2 = (svn_fs_root_t *)(argp2);
+    res3 = SWIG_AsCharPtrAndSize(ST(1), &buf3, NULL, &alloc3);
+    if (!SWIG_IsOK(res3)) {
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_fs_contents_different" "', argument " "3"" of type '" "char const *""'");
+    }
+    arg3 = (char *)(buf3);
+    res4 = SWIG_ConvertPtr(ST(2), &argp4,SWIGTYPE_p_svn_fs_root_t, 0 |  0 );
+    if (!SWIG_IsOK(res4)) {
+      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "svn_fs_contents_different" "', argument " "4"" of type '" "svn_fs_root_t *""'"); 
+    }
+    arg4 = (svn_fs_root_t *)(argp4);
+    res5 = SWIG_AsCharPtrAndSize(ST(3), &buf5, NULL, &alloc5);
+    if (!SWIG_IsOK(res5)) {
+      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "svn_fs_contents_different" "', argument " "5"" of type '" "char const *""'");
+    }
+    arg5 = (char *)(buf5);
+    if (items > 4) {
+      
+    }
+    {
+      result = (svn_error_t *)svn_fs_contents_different(arg1,arg2,(char const *)arg3,arg4,(char const *)arg5,arg6);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    if (SWIG_IsTmpObj(res1)) {
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((*arg1)); argvi++  ;
+    } else {
+      int new_flags = SWIG_IsNewObj(res1) ? (SWIG_POINTER_OWN | 0) : 0;
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj((void*)(arg1), SWIGTYPE_p_int, new_flags); argvi++  ;
+    }
+    
+    
+    if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+    
+    if (alloc5 == SWIG_NEWOBJ) free((char*)buf5);
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+    
+    if (alloc5 == SWIG_NEWOBJ) free((char*)buf5);
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_svn_fs_contents_changed) {
   {
     svn_boolean_t *arg1 = (svn_boolean_t *) 0 ;
@@ -9185,6 +10308,7 @@ XS(_wrap_svn_fs_contents_changed) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 4) || (items > 5)) {
@@ -9276,6 +10400,7 @@ XS(_wrap_svn_fs_youngest_rev) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 2)) {
@@ -9330,6 +10455,184 @@ XS(_wrap_svn_fs_youngest_rev) {
 }
 
 
+XS(_wrap_svn_fs_info_format) {
+  {
+    int *arg1 = (int *) 0 ;
+    svn_version_t **arg2 = (svn_version_t **) 0 ;
+    svn_fs_t *arg3 = (svn_fs_t *) 0 ;
+    apr_pool_t *arg4 = (apr_pool_t *) 0 ;
+    apr_pool_t *arg5 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    int temp1 ;
+    int res1 = SWIG_TMPOBJ ;
+    svn_version_t *temp2 ;
+    void *argp3 = 0 ;
+    int res3 = 0 ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    {
+      _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    arg1 = &temp1;
+    arg2 = &temp2;
+    if ((items < 1) || (items > 3)) {
+      SWIG_croak("Usage: svn_fs_info_format(fs,result_pool,scratch_pool);");
+    }
+    res3 = SWIG_ConvertPtr(ST(0), &argp3,SWIGTYPE_p_svn_fs_t, 0 |  0 );
+    if (!SWIG_IsOK(res3)) {
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_fs_info_format" "', argument " "3"" of type '" "svn_fs_t *""'"); 
+    }
+    arg3 = (svn_fs_t *)(argp3);
+    if (items > 1) {
+      
+    }
+    if (items > 2) {
+      
+    }
+    {
+      result = (svn_error_t *)svn_fs_info_format(arg1,arg2,arg3,arg4,arg5);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    if (SWIG_IsTmpObj(res1)) {
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((*arg1)); argvi++  ;
+    } else {
+      int new_flags = SWIG_IsNewObj(res1) ? (SWIG_POINTER_OWN | 0) : 0;
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj((void*)(arg1), SWIGTYPE_p_int, new_flags); argvi++  ;
+    }
+    {
+      /* FIXME: Missing argout typemap: svn_fs_info_format arg 2 (svn_version_t **) */
+      
+      
+      
+      
+      SWIG_exception(SWIG_ValueError, "svn_fs_info_format is not implemented yet");
+      
+    }
+    
+    
+    
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_svn_fs_info_config_files) {
+  {
+    apr_array_header_t **arg1 = (apr_array_header_t **) 0 ;
+    svn_fs_t *arg2 = (svn_fs_t *) 0 ;
+    apr_pool_t *arg3 = (apr_pool_t *) 0 ;
+    apr_pool_t *arg4 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    apr_array_header_t *temp1 ;
+    void *argp2 = 0 ;
+    int res2 = 0 ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    {
+      _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    arg1 = &temp1;
+    if ((items < 1) || (items > 3)) {
+      SWIG_croak("Usage: svn_fs_info_config_files(fs,result_pool,scratch_pool);");
+    }
+    res2 = SWIG_ConvertPtr(ST(0), &argp2,SWIGTYPE_p_svn_fs_t, 0 |  0 );
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_fs_info_config_files" "', argument " "2"" of type '" "svn_fs_t *""'"); 
+    }
+    arg2 = (svn_fs_t *)(argp2);
+    if (items > 1) {
+      
+    }
+    if (items > 2) {
+      
+    }
+    {
+      result = (svn_error_t *)svn_fs_info_config_files(arg1,arg2,arg3,arg4);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    {
+      /* FIXME: Missing argout typemap: svn_fs_info_config_files arg 1 (apr_array_header_t **) */
+      
+      
+      
+      
+      SWIG_exception(SWIG_ValueError, "svn_fs_info_config_files is not implemented yet");
+      
+    }
+    
+    
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_svn_fs_deltify_revision) {
   {
     svn_fs_t *arg1 = (svn_fs_t *) 0 ;
@@ -9346,6 +10649,7 @@ XS(_wrap_svn_fs_deltify_revision) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_fs_deltify_revision(fs,revision,pool);");
@@ -9420,6 +10724,7 @@ XS(_wrap_svn_fs_revision_prop) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 3) || (items > 4)) {
@@ -9507,6 +10812,7 @@ XS(_wrap_svn_fs_revision_proplist) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -9591,6 +10897,7 @@ XS(_wrap_svn_fs_change_rev_prop2) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 5) || (items > 6)) {
       SWIG_croak("Usage: svn_fs_change_rev_prop2(fs,rev,name,old_value_p,value,pool);");
@@ -9698,6 +11005,7 @@ XS(_wrap_svn_fs_change_rev_prop) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_fs_change_rev_prop(fs,rev,name,value,pool);");
@@ -9794,6 +11102,7 @@ XS(_wrap_svn_fs_get_file_delta_stream) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 4) || (items > 5)) {
@@ -9881,6 +11190,7 @@ XS(_wrap_svn_fs_get_uuid) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     if ((items < 1) || (items > 2)) {
@@ -9953,6 +11263,7 @@ XS(_wrap_svn_fs_set_uuid) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_fs_set_uuid(fs,uuid,pool);");
@@ -10005,6 +11316,241 @@ XS(_wrap_svn_fs_set_uuid) {
 }
 
 
+XS(_wrap_svn_fs_lock_target_create) {
+  {
+    char *arg1 = (char *) 0 ;
+    svn_revnum_t arg2 ;
+    apr_pool_t *arg3 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    int res1 ;
+    char *buf1 = 0 ;
+    int alloc1 = 0 ;
+    long val2 ;
+    int ecode2 = 0 ;
+    int argvi = 0;
+    svn_fs_lock_target_t *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    if ((items < 2) || (items > 3)) {
+      SWIG_croak("Usage: svn_fs_lock_target_create(token,current_rev,result_pool);");
+    }
+    res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1);
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_fs_lock_target_create" "', argument " "1"" of type '" "char const *""'");
+    }
+    arg1 = (char *)(buf1);
+    ecode2 = SWIG_AsVal_long SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
+    if (!SWIG_IsOK(ecode2)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "svn_fs_lock_target_create" "', argument " "2"" of type '" "svn_revnum_t""'");
+    } 
+    arg2 = (svn_revnum_t)(val2);
+    if (items > 2) {
+      
+    }
+    {
+      result = (svn_fs_lock_target_t *)svn_fs_lock_target_create((char const *)arg1,arg2,arg3);
+      
+      
+      
+    }
+    ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_svn_fs_lock_target_t, 0 | 0); argvi++ ;
+    if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+    
+    
+    XSRETURN(argvi);
+  fail:
+    if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_svn_fs_lock_target_set_token) {
+  {
+    svn_fs_lock_target_t *arg1 = (svn_fs_lock_target_t *) 0 ;
+    char *arg2 = (char *) 0 ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    int res2 ;
+    char *buf2 = 0 ;
+    int alloc2 = 0 ;
+    int argvi = 0;
+    dXSARGS;
+    
+    if ((items < 2) || (items > 2)) {
+      SWIG_croak("Usage: svn_fs_lock_target_set_token(target,token);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_fs_lock_target_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_fs_lock_target_set_token" "', argument " "1"" of type '" "svn_fs_lock_target_t *""'"); 
+    }
+    arg1 = (svn_fs_lock_target_t *)(argp1);
+    res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_fs_lock_target_set_token" "', argument " "2"" of type '" "char const *""'");
+    }
+    arg2 = (char *)(buf2);
+    {
+      svn_fs_lock_target_set_token(arg1,(char const *)arg2);
+      
+      
+      
+    }
+    ST(argvi) = sv_newmortal();
+    
+    if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+    XSRETURN(argvi);
+  fail:
+    
+    if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_svn_fs_lock_many) {
+  {
+    svn_fs_t *arg1 = (svn_fs_t *) 0 ;
+    apr_hash_t *arg2 = (apr_hash_t *) 0 ;
+    char *arg3 = (char *) 0 ;
+    svn_boolean_t arg4 ;
+    apr_time_t arg5 ;
+    svn_boolean_t arg6 ;
+    svn_fs_lock_callback_t arg7 = (svn_fs_lock_callback_t) 0 ;
+    void *arg8 = (void *) 0 ;
+    apr_pool_t *arg9 = (apr_pool_t *) 0 ;
+    apr_pool_t *arg10 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    void *argp2 = 0 ;
+    int res2 = 0 ;
+    int res3 ;
+    char *buf3 = 0 ;
+    int alloc3 = 0 ;
+    int val4 ;
+    int ecode4 = 0 ;
+    long long val5 ;
+    int ecode5 = 0 ;
+    int val6 ;
+    int ecode6 = 0 ;
+    int res8 ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    {
+      _global_pool = arg10 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    if ((items < 8) || (items > 10)) {
+      SWIG_croak("Usage: svn_fs_lock_many(fs,lock_targets,comment,is_dav_comment,expiration_date,steal_lock,lock_callback,lock_baton,result_pool,scratch_pool);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_fs_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_fs_lock_many" "', argument " "1"" of type '" "svn_fs_t *""'"); 
+    }
+    arg1 = (svn_fs_t *)(argp1);
+    res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_apr_hash_t, 0 |  0 );
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_fs_lock_many" "', argument " "2"" of type '" "apr_hash_t *""'"); 
+    }
+    arg2 = (apr_hash_t *)(argp2);
+    res3 = SWIG_AsCharPtrAndSize(ST(2), &buf3, NULL, &alloc3);
+    if (!SWIG_IsOK(res3)) {
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_fs_lock_many" "', argument " "3"" of type '" "char const *""'");
+    }
+    arg3 = (char *)(buf3);
+    ecode4 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(3), &val4);
+    if (!SWIG_IsOK(ecode4)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "svn_fs_lock_many" "', argument " "4"" of type '" "svn_boolean_t""'");
+    } 
+    arg4 = (svn_boolean_t)(val4);
+    ecode5 = SWIG_AsVal_long_SS_long SWIG_PERL_CALL_ARGS_2(ST(4), &val5);
+    if (!SWIG_IsOK(ecode5)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "svn_fs_lock_many" "', argument " "5"" of type '" "apr_time_t""'");
+    } 
+    arg5 = (apr_time_t)(val5);
+    ecode6 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(5), &val6);
+    if (!SWIG_IsOK(ecode6)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "svn_fs_lock_many" "', argument " "6"" of type '" "svn_boolean_t""'");
+    } 
+    arg6 = (svn_boolean_t)(val6);
+    {
+      int res = SWIG_ConvertFunctionPtr(ST(6), (void**)(&arg7), SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t);
+      if (!SWIG_IsOK(res)) {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_fs_lock_many" "', argument " "7"" of type '" "svn_fs_lock_callback_t""'"); 
+      }
+    }
+    res8 = SWIG_ConvertPtr(ST(7),SWIG_as_voidptrptr(&arg8), 0, 0);
+    if (!SWIG_IsOK(res8)) {
+      SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "svn_fs_lock_many" "', argument " "8"" of type '" "void *""'"); 
+    }
+    if (items > 8) {
+      
+    }
+    if (items > 9) {
+      
+    }
+    {
+      result = (svn_error_t *)svn_fs_lock_many(arg1,arg2,(char const *)arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    
+    
+    if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+    
+    
+    
+    
+    
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+    
+    
+    
+    
+    
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_svn_fs_lock) {
   {
     svn_lock_t **arg1 = (svn_lock_t **) 0 ;
@@ -10044,6 +11590,7 @@ XS(_wrap_svn_fs_lock) {
     
     {
       _global_pool = arg10 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 8) || (items > 9)) {
@@ -10159,6 +11706,7 @@ XS(_wrap_svn_fs_generate_lock_token) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 2)) {
@@ -10214,6 +11762,112 @@ XS(_wrap_svn_fs_generate_lock_token) {
 }
 
 
+XS(_wrap_svn_fs_unlock_many) {
+  {
+    svn_fs_t *arg1 = (svn_fs_t *) 0 ;
+    apr_hash_t *arg2 = (apr_hash_t *) 0 ;
+    svn_boolean_t arg3 ;
+    svn_fs_lock_callback_t arg4 = (svn_fs_lock_callback_t) 0 ;
+    void *arg5 = (void *) 0 ;
+    apr_pool_t *arg6 = (apr_pool_t *) 0 ;
+    apr_pool_t *arg7 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    void *argp2 = 0 ;
+    int res2 = 0 ;
+    int val3 ;
+    int ecode3 = 0 ;
+    int res5 ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    {
+      _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    if ((items < 5) || (items > 7)) {
+      SWIG_croak("Usage: svn_fs_unlock_many(fs,unlock_targets,break_lock,lock_callback,lock_baton,result_pool,scratch_pool);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_fs_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_fs_unlock_many" "', argument " "1"" of type '" "svn_fs_t *""'"); 
+    }
+    arg1 = (svn_fs_t *)(argp1);
+    res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_apr_hash_t, 0 |  0 );
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_fs_unlock_many" "', argument " "2"" of type '" "apr_hash_t *""'"); 
+    }
+    arg2 = (apr_hash_t *)(argp2);
+    ecode3 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(2), &val3);
+    if (!SWIG_IsOK(ecode3)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "svn_fs_unlock_many" "', argument " "3"" of type '" "svn_boolean_t""'");
+    } 
+    arg3 = (svn_boolean_t)(val3);
+    {
+      int res = SWIG_ConvertFunctionPtr(ST(3), (void**)(&arg4), SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t);
+      if (!SWIG_IsOK(res)) {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_fs_unlock_many" "', argument " "4"" of type '" "svn_fs_lock_callback_t""'"); 
+      }
+    }
+    res5 = SWIG_ConvertPtr(ST(4),SWIG_as_voidptrptr(&arg5), 0, 0);
+    if (!SWIG_IsOK(res5)) {
+      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "svn_fs_unlock_many" "', argument " "5"" of type '" "void *""'"); 
+    }
+    if (items > 5) {
+      
+    }
+    if (items > 6) {
+      
+    }
+    {
+      result = (svn_error_t *)svn_fs_unlock_many(arg1,arg2,arg3,arg4,arg5,arg6,arg7);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    
+    
+    
+    
+    
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    
+    
+    
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_svn_fs_unlock) {
   {
     svn_fs_t *arg1 = (svn_fs_t *) 0 ;
@@ -10238,6 +11892,7 @@ XS(_wrap_svn_fs_unlock) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_fs_unlock(fs,path,token,break_lock,pool);");
@@ -10323,6 +11978,7 @@ XS(_wrap_svn_fs_get_lock) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -10404,6 +12060,7 @@ XS(_wrap_svn_fs_get_locks2) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 5) || (items > 6)) {
       SWIG_croak("Usage: svn_fs_get_locks2(fs,path,depth,get_locks_func,get_locks_baton,pool);");
@@ -10497,6 +12154,7 @@ XS(_wrap_svn_fs_get_locks) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_fs_get_locks(fs,path,get_locks_func,get_locks_baton,pool);");
@@ -10574,6 +12232,7 @@ XS(_wrap_svn_fs_print_modules) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_fs_print_modules(output,pool);");
@@ -10581,6 +12240,7 @@ XS(_wrap_svn_fs_print_modules) {
     {
       apr_size_t len;
       char *buf;
+      apr_pool_t *pool;
       
       if (!SvOK(ST(0))) {
         arg1 = NULL;
@@ -10588,8 +12248,9 @@ XS(_wrap_svn_fs_print_modules) {
         buf = SvPV(ST(0), len);
         /* Another case of ugly pool handling, this should use the current
                    default pool, or make a new one if it doesn't exist yet */
-        arg1 = svn_stringbuf_ncreate(buf,len,
-          svn_swig_pl_make_pool ((SV *)NULL));
+        pool = svn_swig_pl_make_pool ((SV *)NULL);
+        SPAGAIN;
+        arg1 = svn_stringbuf_ncreate(buf,len, pool);
       } else {
         croak("Not a string");
       }
@@ -10643,15 +12304,15 @@ XS(_wrap_svn_fs_pack) {
     char *buf1 = 0 ;
     int alloc1 = 0 ;
     int res3 ;
-    int res5 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
     dXSARGS;
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 5) || (items > 6)) {
+    if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_fs_pack(db_path,notify_func,notify_baton,cancel_func,cancel_baton,pool);");
     }
     res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1);
@@ -10670,16 +12331,10 @@ XS(_wrap_svn_fs_pack) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_fs_pack" "', argument " "3"" of type '" "void *""'"); 
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(3), (void**)(&arg4), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_fs_pack" "', argument " "4"" of type '" "svn_cancel_func_t""'"); 
-      }
+      arg4 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg5 = ST(3);
     }
-    res5 = SWIG_ConvertPtr(ST(4),SWIG_as_voidptrptr(&arg5), 0, 0);
-    if (!SWIG_IsOK(res5)) {
-      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "svn_fs_pack" "', argument " "5"" of type '" "void *""'"); 
-    }
-    if (items > 5) {
+    if (items > 4) {
       
     }
     {
@@ -10708,16 +12363,12 @@ XS(_wrap_svn_fs_pack) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -10743,15 +12394,15 @@ XS(_wrap_svn_fs_verify) {
     long val4 ;
     int ecode4 = 0 ;
     int res6 ;
-    int res8 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
     dXSARGS;
     
     {
       _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 8) || (items > 9)) {
+    if ((items < 7) || (items > 8)) {
       SWIG_croak("Usage: svn_fs_verify(path,fs_config,start,end,notify_func,notify_baton,cancel_func,cancel_baton,scratch_pool);");
     }
     res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1);
@@ -10784,16 +12435,10 @@ XS(_wrap_svn_fs_verify) {
       SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "svn_fs_verify" "', argument " "6"" of type '" "void *""'"); 
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(6), (void**)(&arg7), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_fs_verify" "', argument " "7"" of type '" "svn_cancel_func_t""'"); 
-      }
+      arg7 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg8 = ST(6);
     }
-    res8 = SWIG_ConvertPtr(ST(7),SWIG_as_voidptrptr(&arg8), 0, 0);
-    if (!SWIG_IsOK(res8)) {
-      SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "svn_fs_verify" "', argument " "8"" of type '" "void *""'"); 
-    }
-    if (items > 8) {
+    if (items > 7) {
       
     }
     {
@@ -10825,8 +12470,6 @@ XS(_wrap_svn_fs_verify) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
@@ -10836,8 +12479,6 @@ XS(_wrap_svn_fs_verify) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -10856,6 +12497,7 @@ XS(_wrap_svn_fs_verify_root) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_fs_verify_root(root,scratch_pool);");
@@ -10901,6 +12543,685 @@ XS(_wrap_svn_fs_verify_root) {
 }
 
 
+XS(_wrap_svn_fs_fsfs_info_t_fs_type_set) {
+  {
+    struct svn_fs_fsfs_info_t *arg1 = (struct svn_fs_fsfs_info_t *) 0 ;
+    char *arg2 = (char *) 0 ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    int res2 ;
+    char *buf2 = 0 ;
+    int alloc2 = 0 ;
+    int argvi = 0;
+    dXSARGS;
+    
+    if ((items < 2) || (items > 2)) {
+      SWIG_croak("Usage: svn_fs_fsfs_info_t_fs_type_set(self,fs_type);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_fs_fsfs_info_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_fs_fsfs_info_t_fs_type_set" "', argument " "1"" of type '" "struct svn_fs_fsfs_info_t *""'"); 
+    }
+    arg1 = (struct svn_fs_fsfs_info_t *)(argp1);
+    res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_fs_fsfs_info_t_fs_type_set" "', argument " "2"" of type '" "char const *""'");
+    }
+    arg2 = (char *)(buf2);
+    {
+      apr_size_t len = strlen(arg2) + 1;
+      char *copied;
+      if (arg1->fs_type) free((char *)arg1->fs_type);
+      copied = malloc(len);
+      memcpy(copied, arg2, len);
+      arg1->fs_type = copied;
+    }
+    ST(argvi) = sv_newmortal();
+    
+    if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+    XSRETURN(argvi);
+  fail:
+    
+    if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_svn_fs_fsfs_info_t_fs_type_get) {
+  {
+    struct svn_fs_fsfs_info_t *arg1 = (struct svn_fs_fsfs_info_t *) 0 ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    int argvi = 0;
+    char *result = 0 ;
+    dXSARGS;
+    
+    if ((items < 1) || (items > 1)) {
+      SWIG_croak("Usage: svn_fs_fsfs_info_t_fs_type_get(self);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_fs_fsfs_info_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_fs_fsfs_info_t_fs_type_get" "', argument " "1"" of type '" "struct svn_fs_fsfs_info_t *""'"); 
+    }
+    arg1 = (struct svn_fs_fsfs_info_t *)(argp1);
+    result = (char *) ((arg1)->fs_type);
+    ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
+    
+    XSRETURN(argvi);
+  fail:
+    
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_svn_fs_fsfs_info_t_shard_size_set) {
+  {
+    struct svn_fs_fsfs_info_t *arg1 = (struct svn_fs_fsfs_info_t *) 0 ;
+    int arg2 ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    int val2 ;
+    int ecode2 = 0 ;
+    int argvi = 0;
+    dXSARGS;
+    
+    if ((items < 2) || (items > 2)) {
+      SWIG_croak("Usage: svn_fs_fsfs_info_t_shard_size_set(self,shard_size);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_fs_fsfs_info_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_fs_fsfs_info_t_shard_size_set" "', argument " "1"" of type '" "struct svn_fs_fsfs_info_t *""'"); 
+    }
+    arg1 = (struct svn_fs_fsfs_info_t *)(argp1);
+    ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
+    if (!SWIG_IsOK(ecode2)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "svn_fs_fsfs_info_t_shard_size_set" "', argument " "2"" of type '" "int""'");
+    } 
+    arg2 = (int)(val2);
+    if (arg1) (arg1)->shard_size = arg2;
+    ST(argvi) = sv_newmortal();
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_svn_fs_fsfs_info_t_shard_size_get) {
+  {
+    struct svn_fs_fsfs_info_t *arg1 = (struct svn_fs_fsfs_info_t *) 0 ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    int argvi = 0;
+    int result;
+    dXSARGS;
+    
+    if ((items < 1) || (items > 1)) {
+      SWIG_croak("Usage: svn_fs_fsfs_info_t_shard_size_get(self);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_fs_fsfs_info_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_fs_fsfs_info_t_shard_size_get" "', argument " "1"" of type '" "struct svn_fs_fsfs_info_t *""'"); 
+    }
+    arg1 = (struct svn_fs_fsfs_info_t *)(argp1);
+    result = (int) ((arg1)->shard_size);
+    ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
+    
+    XSRETURN(argvi);
+  fail:
+    
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_svn_fs_fsfs_info_t_min_unpacked_rev_set) {
+  {
+    struct svn_fs_fsfs_info_t *arg1 = (struct svn_fs_fsfs_info_t *) 0 ;
+    svn_revnum_t arg2 ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    long val2 ;
+    int ecode2 = 0 ;
+    int argvi = 0;
+    dXSARGS;
+    
+    if ((items < 2) || (items > 2)) {
+      SWIG_croak("Usage: svn_fs_fsfs_info_t_min_unpacked_rev_set(self,min_unpacked_rev);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_fs_fsfs_info_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_fs_fsfs_info_t_min_unpacked_rev_set" "', argument " "1"" of type '" "struct svn_fs_fsfs_info_t *""'"); 
+    }
+    arg1 = (struct svn_fs_fsfs_info_t *)(argp1);
+    ecode2 = SWIG_AsVal_long SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
+    if (!SWIG_IsOK(ecode2)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "svn_fs_fsfs_info_t_min_unpacked_rev_set" "', argument " "2"" of type '" "svn_revnum_t""'");
+    } 
+    arg2 = (svn_revnum_t)(val2);
+    if (arg1) (arg1)->min_unpacked_rev = arg2;
+    ST(argvi) = sv_newmortal();
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_svn_fs_fsfs_info_t_min_unpacked_rev_get) {
+  {
+    struct svn_fs_fsfs_info_t *arg1 = (struct svn_fs_fsfs_info_t *) 0 ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    int argvi = 0;
+    svn_revnum_t result;
+    dXSARGS;
+    
+    if ((items < 1) || (items > 1)) {
+      SWIG_croak("Usage: svn_fs_fsfs_info_t_min_unpacked_rev_get(self);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_fs_fsfs_info_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_fs_fsfs_info_t_min_unpacked_rev_get" "', argument " "1"" of type '" "struct svn_fs_fsfs_info_t *""'"); 
+    }
+    arg1 = (struct svn_fs_fsfs_info_t *)(argp1);
+    result = (svn_revnum_t) ((arg1)->min_unpacked_rev);
+    ST(argvi) = SWIG_From_long  SWIG_PERL_CALL_ARGS_1((long)(result)); argvi++ ;
+    
+    XSRETURN(argvi);
+  fail:
+    
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_svn_fs_fsfs_info_t_log_addressing_set) {
+  {
+    struct svn_fs_fsfs_info_t *arg1 = (struct svn_fs_fsfs_info_t *) 0 ;
+    svn_boolean_t arg2 ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    int val2 ;
+    int ecode2 = 0 ;
+    int argvi = 0;
+    dXSARGS;
+    
+    if ((items < 2) || (items > 2)) {
+      SWIG_croak("Usage: svn_fs_fsfs_info_t_log_addressing_set(self,log_addressing);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_fs_fsfs_info_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_fs_fsfs_info_t_log_addressing_set" "', argument " "1"" of type '" "struct svn_fs_fsfs_info_t *""'"); 
+    }
+    arg1 = (struct svn_fs_fsfs_info_t *)(argp1);
+    ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
+    if (!SWIG_IsOK(ecode2)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "svn_fs_fsfs_info_t_log_addressing_set" "', argument " "2"" of type '" "svn_boolean_t""'");
+    } 
+    arg2 = (svn_boolean_t)(val2);
+    if (arg1) (arg1)->log_addressing = arg2;
+    ST(argvi) = sv_newmortal();
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_svn_fs_fsfs_info_t_log_addressing_get) {
+  {
+    struct svn_fs_fsfs_info_t *arg1 = (struct svn_fs_fsfs_info_t *) 0 ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    int argvi = 0;
+    svn_boolean_t result;
+    dXSARGS;
+    
+    if ((items < 1) || (items > 1)) {
+      SWIG_croak("Usage: svn_fs_fsfs_info_t_log_addressing_get(self);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_fs_fsfs_info_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_fs_fsfs_info_t_log_addressing_get" "', argument " "1"" of type '" "struct svn_fs_fsfs_info_t *""'"); 
+    }
+    arg1 = (struct svn_fs_fsfs_info_t *)(argp1);
+    result = (svn_boolean_t) ((arg1)->log_addressing);
+    ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
+    
+    XSRETURN(argvi);
+  fail:
+    
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_svn_fs_fsx_info_t_fs_type_set) {
+  {
+    struct svn_fs_fsx_info_t *arg1 = (struct svn_fs_fsx_info_t *) 0 ;
+    char *arg2 = (char *) 0 ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    int res2 ;
+    char *buf2 = 0 ;
+    int alloc2 = 0 ;
+    int argvi = 0;
+    dXSARGS;
+    
+    if ((items < 2) || (items > 2)) {
+      SWIG_croak("Usage: svn_fs_fsx_info_t_fs_type_set(self,fs_type);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_fs_fsx_info_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_fs_fsx_info_t_fs_type_set" "', argument " "1"" of type '" "struct svn_fs_fsx_info_t *""'"); 
+    }
+    arg1 = (struct svn_fs_fsx_info_t *)(argp1);
+    res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_fs_fsx_info_t_fs_type_set" "', argument " "2"" of type '" "char const *""'");
+    }
+    arg2 = (char *)(buf2);
+    {
+      apr_size_t len = strlen(arg2) + 1;
+      char *copied;
+      if (arg1->fs_type) free((char *)arg1->fs_type);
+      copied = malloc(len);
+      memcpy(copied, arg2, len);
+      arg1->fs_type = copied;
+    }
+    ST(argvi) = sv_newmortal();
+    
+    if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+    XSRETURN(argvi);
+  fail:
+    
+    if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_svn_fs_fsx_info_t_fs_type_get) {
+  {
+    struct svn_fs_fsx_info_t *arg1 = (struct svn_fs_fsx_info_t *) 0 ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    int argvi = 0;
+    char *result = 0 ;
+    dXSARGS;
+    
+    if ((items < 1) || (items > 1)) {
+      SWIG_croak("Usage: svn_fs_fsx_info_t_fs_type_get(self);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_fs_fsx_info_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_fs_fsx_info_t_fs_type_get" "', argument " "1"" of type '" "struct svn_fs_fsx_info_t *""'"); 
+    }
+    arg1 = (struct svn_fs_fsx_info_t *)(argp1);
+    result = (char *) ((arg1)->fs_type);
+    ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
+    
+    XSRETURN(argvi);
+  fail:
+    
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_svn_fs_fsx_info_t_shard_size_set) {
+  {
+    struct svn_fs_fsx_info_t *arg1 = (struct svn_fs_fsx_info_t *) 0 ;
+    int arg2 ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    int val2 ;
+    int ecode2 = 0 ;
+    int argvi = 0;
+    dXSARGS;
+    
+    if ((items < 2) || (items > 2)) {
+      SWIG_croak("Usage: svn_fs_fsx_info_t_shard_size_set(self,shard_size);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_fs_fsx_info_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_fs_fsx_info_t_shard_size_set" "', argument " "1"" of type '" "struct svn_fs_fsx_info_t *""'"); 
+    }
+    arg1 = (struct svn_fs_fsx_info_t *)(argp1);
+    ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
+    if (!SWIG_IsOK(ecode2)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "svn_fs_fsx_info_t_shard_size_set" "', argument " "2"" of type '" "int""'");
+    } 
+    arg2 = (int)(val2);
+    if (arg1) (arg1)->shard_size = arg2;
+    ST(argvi) = sv_newmortal();
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_svn_fs_fsx_info_t_shard_size_get) {
+  {
+    struct svn_fs_fsx_info_t *arg1 = (struct svn_fs_fsx_info_t *) 0 ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    int argvi = 0;
+    int result;
+    dXSARGS;
+    
+    if ((items < 1) || (items > 1)) {
+      SWIG_croak("Usage: svn_fs_fsx_info_t_shard_size_get(self);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_fs_fsx_info_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_fs_fsx_info_t_shard_size_get" "', argument " "1"" of type '" "struct svn_fs_fsx_info_t *""'"); 
+    }
+    arg1 = (struct svn_fs_fsx_info_t *)(argp1);
+    result = (int) ((arg1)->shard_size);
+    ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
+    
+    XSRETURN(argvi);
+  fail:
+    
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_svn_fs_fsx_info_t_min_unpacked_rev_set) {
+  {
+    struct svn_fs_fsx_info_t *arg1 = (struct svn_fs_fsx_info_t *) 0 ;
+    svn_revnum_t arg2 ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    long val2 ;
+    int ecode2 = 0 ;
+    int argvi = 0;
+    dXSARGS;
+    
+    if ((items < 2) || (items > 2)) {
+      SWIG_croak("Usage: svn_fs_fsx_info_t_min_unpacked_rev_set(self,min_unpacked_rev);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_fs_fsx_info_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_fs_fsx_info_t_min_unpacked_rev_set" "', argument " "1"" of type '" "struct svn_fs_fsx_info_t *""'"); 
+    }
+    arg1 = (struct svn_fs_fsx_info_t *)(argp1);
+    ecode2 = SWIG_AsVal_long SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
+    if (!SWIG_IsOK(ecode2)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "svn_fs_fsx_info_t_min_unpacked_rev_set" "', argument " "2"" of type '" "svn_revnum_t""'");
+    } 
+    arg2 = (svn_revnum_t)(val2);
+    if (arg1) (arg1)->min_unpacked_rev = arg2;
+    ST(argvi) = sv_newmortal();
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_svn_fs_fsx_info_t_min_unpacked_rev_get) {
+  {
+    struct svn_fs_fsx_info_t *arg1 = (struct svn_fs_fsx_info_t *) 0 ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    int argvi = 0;
+    svn_revnum_t result;
+    dXSARGS;
+    
+    if ((items < 1) || (items > 1)) {
+      SWIG_croak("Usage: svn_fs_fsx_info_t_min_unpacked_rev_get(self);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_fs_fsx_info_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_fs_fsx_info_t_min_unpacked_rev_get" "', argument " "1"" of type '" "struct svn_fs_fsx_info_t *""'"); 
+    }
+    arg1 = (struct svn_fs_fsx_info_t *)(argp1);
+    result = (svn_revnum_t) ((arg1)->min_unpacked_rev);
+    ST(argvi) = SWIG_From_long  SWIG_PERL_CALL_ARGS_1((long)(result)); argvi++ ;
+    
+    XSRETURN(argvi);
+  fail:
+    
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_svn_fs_info_placeholder_t_fs_type_set) {
+  {
+    struct svn_fs_info_placeholder_t *arg1 = (struct svn_fs_info_placeholder_t *) 0 ;
+    char *arg2 = (char *) 0 ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    int res2 ;
+    char *buf2 = 0 ;
+    int alloc2 = 0 ;
+    int argvi = 0;
+    dXSARGS;
+    
+    if ((items < 2) || (items > 2)) {
+      SWIG_croak("Usage: svn_fs_info_placeholder_t_fs_type_set(self,fs_type);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_fs_info_placeholder_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_fs_info_placeholder_t_fs_type_set" "', argument " "1"" of type '" "struct svn_fs_info_placeholder_t *""'"); 
+    }
+    arg1 = (struct svn_fs_info_placeholder_t *)(argp1);
+    res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_fs_info_placeholder_t_fs_type_set" "', argument " "2"" of type '" "char const *""'");
+    }
+    arg2 = (char *)(buf2);
+    {
+      apr_size_t len = strlen(arg2) + 1;
+      char *copied;
+      if (arg1->fs_type) free((char *)arg1->fs_type);
+      copied = malloc(len);
+      memcpy(copied, arg2, len);
+      arg1->fs_type = copied;
+    }
+    ST(argvi) = sv_newmortal();
+    
+    if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+    XSRETURN(argvi);
+  fail:
+    
+    if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_svn_fs_info_placeholder_t_fs_type_get) {
+  {
+    struct svn_fs_info_placeholder_t *arg1 = (struct svn_fs_info_placeholder_t *) 0 ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    int argvi = 0;
+    char *result = 0 ;
+    dXSARGS;
+    
+    if ((items < 1) || (items > 1)) {
+      SWIG_croak("Usage: svn_fs_info_placeholder_t_fs_type_get(self);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_fs_info_placeholder_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_fs_info_placeholder_t_fs_type_get" "', argument " "1"" of type '" "struct svn_fs_info_placeholder_t *""'"); 
+    }
+    arg1 = (struct svn_fs_info_placeholder_t *)(argp1);
+    result = (char *) ((arg1)->fs_type);
+    ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
+    
+    XSRETURN(argvi);
+  fail:
+    
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_svn_fs_info) {
+  {
+    svn_fs_info_placeholder_t **arg1 = (svn_fs_info_placeholder_t **) 0 ;
+    svn_fs_t *arg2 = (svn_fs_t *) 0 ;
+    apr_pool_t *arg3 = (apr_pool_t *) 0 ;
+    apr_pool_t *arg4 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    svn_fs_info_placeholder_t *temp1 ;
+    void *argp2 = 0 ;
+    int res2 = 0 ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    {
+      _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    arg1 = &temp1;
+    if ((items < 1) || (items > 3)) {
+      SWIG_croak("Usage: svn_fs_info(fs,result_pool,scratch_pool);");
+    }
+    res2 = SWIG_ConvertPtr(ST(0), &argp2,SWIGTYPE_p_svn_fs_t, 0 |  0 );
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_fs_info" "', argument " "2"" of type '" "svn_fs_t *""'"); 
+    }
+    arg2 = (svn_fs_t *)(argp2);
+    if (items > 1) {
+      
+    }
+    if (items > 2) {
+      
+    }
+    {
+      result = (svn_error_t *)svn_fs_info((struct svn_fs_info_placeholder_t const **)arg1,arg2,arg3,arg4);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    {
+      /* FIXME: Missing argout typemap: svn_fs_info arg 1 (svn_fs_info_placeholder_t const **) */
+      
+      
+      
+      
+      SWIG_exception(SWIG_ValueError, "svn_fs_info is not implemented yet");
+      
+    }
+    
+    
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_svn_fs_info_dup) {
+  {
+    void *arg1 = (void *) 0 ;
+    apr_pool_t *arg2 = (apr_pool_t *) 0 ;
+    apr_pool_t *arg3 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    int res1 ;
+    int argvi = 0;
+    void *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    {
+      _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    if ((items < 1) || (items > 3)) {
+      SWIG_croak("Usage: svn_fs_info_dup(info,result_pool,scratch_pool);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0),SWIG_as_voidptrptr(&arg1), 0, 0);
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_fs_info_dup" "', argument " "1"" of type '" "void const *""'"); 
+    }
+    if (items > 1) {
+      
+    }
+    if (items > 2) {
+      
+    }
+    {
+      result = (void *)svn_fs_info_dup((void const *)arg1,arg2,arg3);
+      
+      
+      
+    }
+    ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 | 0); argvi++ ;
+    
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_svn_fs_invoke_warning_callback) {
   {
     svn_fs_warning_callback_t arg1 = (svn_fs_warning_callback_t) 0 ;
@@ -10950,6 +13271,92 @@ XS(_wrap_svn_fs_invoke_warning_callback) {
 }
 
 
+XS(_wrap_svn_fs_invoke_upgrade_notify) {
+  {
+    svn_fs_upgrade_notify_t arg1 = (svn_fs_upgrade_notify_t) 0 ;
+    void *arg2 = (void *) 0 ;
+    apr_uint64_t arg3 ;
+    svn_fs_upgrade_notify_action_t arg4 ;
+    apr_pool_t *arg5 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    int res2 ;
+    unsigned long long val3 ;
+    int ecode3 = 0 ;
+    int val4 ;
+    int ecode4 = 0 ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    if ((items < 4) || (items > 5)) {
+      SWIG_croak("Usage: svn_fs_invoke_upgrade_notify(_obj,baton,number,action,scratch_pool);");
+    }
+    {
+      int res = SWIG_ConvertFunctionPtr(ST(0), (void**)(&arg1), SWIGTYPE_p_f_p_void_apr_uint64_t_svn_fs_upgrade_notify_action_t_p_apr_pool_t__p_svn_error_t);
+      if (!SWIG_IsOK(res)) {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_fs_invoke_upgrade_notify" "', argument " "1"" of type '" "svn_fs_upgrade_notify_t""'"); 
+      }
+    }
+    res2 = SWIG_ConvertPtr(ST(1),SWIG_as_voidptrptr(&arg2), 0, 0);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_fs_invoke_upgrade_notify" "', argument " "2"" of type '" "void *""'"); 
+    }
+    ecode3 = SWIG_AsVal_unsigned_SS_long_SS_long SWIG_PERL_CALL_ARGS_2(ST(2), &val3);
+    if (!SWIG_IsOK(ecode3)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "svn_fs_invoke_upgrade_notify" "', argument " "3"" of type '" "apr_uint64_t""'");
+    } 
+    arg3 = (apr_uint64_t)(val3);
+    ecode4 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(3), &val4);
+    if (!SWIG_IsOK(ecode4)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "svn_fs_invoke_upgrade_notify" "', argument " "4"" of type '" "svn_fs_upgrade_notify_action_t""'");
+    } 
+    arg4 = (svn_fs_upgrade_notify_action_t)(val4);
+    if (items > 4) {
+      
+    }
+    {
+      result = (svn_error_t *)svn_fs_invoke_upgrade_notify(arg1,arg2,arg3,arg4,arg5);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    
+    
+    
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_svn_fs_invoke_progress_notify_func) {
   {
     svn_fs_progress_notify_func_t arg1 = (svn_fs_progress_notify_func_t) 0 ;
@@ -10965,6 +13372,7 @@ XS(_wrap_svn_fs_invoke_progress_notify_func) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_fs_invoke_progress_notify_func(_obj,revision,baton,pool);");
@@ -11009,6 +13417,76 @@ XS(_wrap_svn_fs_invoke_progress_notify_func) {
 }
 
 
+XS(_wrap_svn_fs_invoke_hotcopy_notify) {
+  {
+    svn_fs_hotcopy_notify_t arg1 = (svn_fs_hotcopy_notify_t) 0 ;
+    void *arg2 = (void *) 0 ;
+    svn_revnum_t arg3 ;
+    svn_revnum_t arg4 ;
+    apr_pool_t *arg5 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    int res2 ;
+    long val3 ;
+    int ecode3 = 0 ;
+    long val4 ;
+    int ecode4 = 0 ;
+    int argvi = 0;
+    dXSARGS;
+    
+    {
+      _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    if ((items < 4) || (items > 5)) {
+      SWIG_croak("Usage: svn_fs_invoke_hotcopy_notify(_obj,baton,start_revision,end_revision,scratch_pool);");
+    }
+    {
+      int res = SWIG_ConvertFunctionPtr(ST(0), (void**)(&arg1), SWIGTYPE_p_f_p_void_long_long_p_apr_pool_t__void);
+      if (!SWIG_IsOK(res)) {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_fs_invoke_hotcopy_notify" "', argument " "1"" of type '" "svn_fs_hotcopy_notify_t""'"); 
+      }
+    }
+    res2 = SWIG_ConvertPtr(ST(1),SWIG_as_voidptrptr(&arg2), 0, 0);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_fs_invoke_hotcopy_notify" "', argument " "2"" of type '" "void *""'"); 
+    }
+    ecode3 = SWIG_AsVal_long SWIG_PERL_CALL_ARGS_2(ST(2), &val3);
+    if (!SWIG_IsOK(ecode3)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "svn_fs_invoke_hotcopy_notify" "', argument " "3"" of type '" "svn_revnum_t""'");
+    } 
+    arg3 = (svn_revnum_t)(val3);
+    ecode4 = SWIG_AsVal_long SWIG_PERL_CALL_ARGS_2(ST(3), &val4);
+    if (!SWIG_IsOK(ecode4)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "svn_fs_invoke_hotcopy_notify" "', argument " "4"" of type '" "svn_revnum_t""'");
+    } 
+    arg4 = (svn_revnum_t)(val4);
+    if (items > 4) {
+      
+    }
+    {
+      svn_fs_invoke_hotcopy_notify(arg1,arg2,arg3,arg4,arg5);
+      
+      
+      
+    }
+    ST(argvi) = sv_newmortal();
+    
+    
+    
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_svn_fs_invoke_freeze_func) {
   {
     svn_fs_freeze_func_t arg1 = (svn_fs_freeze_func_t) 0 ;
@@ -11022,6 +13500,7 @@ XS(_wrap_svn_fs_invoke_freeze_func) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_fs_invoke_freeze_func(_obj,baton,pool);");
@@ -11093,6 +13572,7 @@ XS(_wrap_svn_fs_invoke_process_contents_func) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_fs_invoke_process_contents_func(_obj,contents,len,baton,scratch_pool);");
@@ -11159,6 +13639,103 @@ XS(_wrap_svn_fs_invoke_process_contents_func) {
 }
 
 
+XS(_wrap_svn_fs_invoke_lock_callback) {
+  {
+    svn_fs_lock_callback_t arg1 = (svn_fs_lock_callback_t) 0 ;
+    void *arg2 = (void *) 0 ;
+    char *arg3 = (char *) 0 ;
+    svn_lock_t *arg4 = (svn_lock_t *) 0 ;
+    svn_error_t *arg5 = (svn_error_t *) 0 ;
+    apr_pool_t *arg6 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    int res2 ;
+    int res3 ;
+    char *buf3 = 0 ;
+    int alloc3 = 0 ;
+    void *argp4 = 0 ;
+    int res4 = 0 ;
+    void *argp5 = 0 ;
+    int res5 = 0 ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    if ((items < 5) || (items > 6)) {
+      SWIG_croak("Usage: svn_fs_invoke_lock_callback(_obj,baton,path,lock,fs_err,scratch_pool);");
+    }
+    {
+      int res = SWIG_ConvertFunctionPtr(ST(0), (void**)(&arg1), SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t);
+      if (!SWIG_IsOK(res)) {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_fs_invoke_lock_callback" "', argument " "1"" of type '" "svn_fs_lock_callback_t""'"); 
+      }
+    }
+    res2 = SWIG_ConvertPtr(ST(1),SWIG_as_voidptrptr(&arg2), 0, 0);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_fs_invoke_lock_callback" "', argument " "2"" of type '" "void *""'"); 
+    }
+    res3 = SWIG_AsCharPtrAndSize(ST(2), &buf3, NULL, &alloc3);
+    if (!SWIG_IsOK(res3)) {
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_fs_invoke_lock_callback" "', argument " "3"" of type '" "char const *""'");
+    }
+    arg3 = (char *)(buf3);
+    res4 = SWIG_ConvertPtr(ST(3), &argp4,SWIGTYPE_p_svn_lock_t, 0 |  0 );
+    if (!SWIG_IsOK(res4)) {
+      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "svn_fs_invoke_lock_callback" "', argument " "4"" of type '" "svn_lock_t const *""'"); 
+    }
+    arg4 = (svn_lock_t *)(argp4);
+    res5 = SWIG_ConvertPtr(ST(4), &argp5,SWIGTYPE_p_svn_error_t, 0 |  0 );
+    if (!SWIG_IsOK(res5)) {
+      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "svn_fs_invoke_lock_callback" "', argument " "5"" of type '" "svn_error_t *""'"); 
+    }
+    arg5 = (svn_error_t *)(argp5);
+    if (items > 5) {
+      
+    }
+    {
+      result = (svn_error_t *)svn_fs_invoke_lock_callback(arg1,arg2,(char const *)arg3,(struct svn_lock_t const *)arg4,arg5,arg6);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    
+    
+    if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+    
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+    
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_svn_fs_invoke_get_locks_callback) {
   {
     svn_fs_get_locks_callback_t arg1 = (svn_fs_get_locks_callback_t) 0 ;
@@ -11175,6 +13752,7 @@ XS(_wrap_svn_fs_invoke_get_locks_callback) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_fs_invoke_get_locks_callback(_obj,baton,lock,pool);");
@@ -11253,6 +13831,7 @@ XS(_wrap_svn_fs_invoke_pack_notify) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_fs_invoke_pack_notify(_obj,baton,shard,action,pool);");
@@ -11334,7 +13913,10 @@ static swig_type_info _swigt__p_f_p_q_const__unsigned_char_apr_size_t_p_void_p_a
 static swig_type_info _swigt__p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t = {"_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_txdelta_window_t *,void *)|svn_txdelta_window_handler_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void__p_svn_error_t = {"_p_f_p_void__p_svn_error_t", "svn_cancel_func_t|struct svn_error_t *(*)(void *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_int64_t,svn_fs_pack_notify_action_t,apr_pool_t *)|svn_fs_pack_notify_t", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_f_p_void_apr_uint64_t_svn_fs_upgrade_notify_action_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_apr_uint64_t_svn_fs_upgrade_notify_action_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_uint64_t,svn_fs_upgrade_notify_action_t,apr_pool_t *)|svn_fs_upgrade_notify_t", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_f_p_void_long_long_p_apr_pool_t__void = {"_p_f_p_void_long_long_p_apr_pool_t__void", "void (*)(void *,long,long,apr_pool_t *)|svn_fs_hotcopy_notify_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_pool_t *)|svn_fs_freeze_func_t", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_lock_t const *,svn_error_t *,apr_pool_t *)|svn_fs_lock_callback_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_struct_svn_error_t__void = {"_p_f_p_void_p_struct_svn_error_t__void", "void (*)(void *,struct svn_error_t *)|svn_fs_warning_callback_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_lock_t *,apr_pool_t *)|svn_fs_get_locks_callback_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_int = {"_p_int", "int *|svn_boolean_t *|apr_status_t *", 0, 0, (void*)0, 0};
@@ -11347,6 +13929,7 @@ static swig_type_info _swigt__p_p_svn_checksum_t = {"_p_p_svn_checksum_t", "stru
 static swig_type_info _swigt__p_p_svn_fs_access_t = {"_p_p_svn_fs_access_t", "struct svn_fs_access_t **|svn_fs_access_t **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_svn_fs_history_t = {"_p_p_svn_fs_history_t", "struct svn_fs_history_t **|svn_fs_history_t **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_svn_fs_id_t = {"_p_p_svn_fs_id_t", "struct svn_fs_id_t **|svn_fs_id_t **", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_p_svn_fs_info_placeholder_t = {"_p_p_svn_fs_info_placeholder_t", "struct svn_fs_info_placeholder_t **|svn_fs_info_placeholder_t **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_svn_fs_root_t = {"_p_p_svn_fs_root_t", "struct svn_fs_root_t **|svn_fs_root_t **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_svn_fs_t = {"_p_p_svn_fs_t", "struct svn_fs_t **|svn_fs_t **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_svn_fs_txn_t = {"_p_p_svn_fs_txn_t", "struct svn_fs_txn_t **|svn_fs_txn_t **", 0, 0, (void*)0, 0};
@@ -11354,6 +13937,7 @@ static swig_type_info _swigt__p_p_svn_lock_t = {"_p_p_svn_lock_t", "struct svn_l
 static swig_type_info _swigt__p_p_svn_stream_t = {"_p_p_svn_stream_t", "struct svn_stream_t **|svn_stream_t **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_svn_string_t = {"_p_p_svn_string_t", "struct svn_string_t **|svn_string_t **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_svn_txdelta_stream_t = {"_p_p_svn_txdelta_stream_t", "struct svn_txdelta_stream_t **|svn_txdelta_stream_t **", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_p_svn_version_t = {"_p_p_svn_version_t", "struct svn_version_t **|svn_version_t **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_void = {"_p_p_void", "void **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_auth_baton_t = {"_p_svn_auth_baton_t", "struct svn_auth_baton_t *|svn_auth_baton_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_auth_cred_simple_t = {"_p_svn_auth_cred_simple_t", "struct svn_auth_cred_simple_t *|svn_auth_cred_simple_t *", 0, 0, (void*)0, 0};
@@ -11387,8 +13971,13 @@ static swig_type_info _swigt__p_svn_errno_t = {"_p_svn_errno_t", "enum svn_errno
 static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "struct svn_error_t *|svn_error_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_fs_access_t = {"_p_svn_fs_access_t", "struct svn_fs_access_t *|svn_fs_access_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_fs_dirent_t = {"_p_svn_fs_dirent_t", "struct svn_fs_dirent_t *|svn_fs_dirent_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_fs_fsfs_info_t = {"_p_svn_fs_fsfs_info_t", "struct svn_fs_fsfs_info_t *|svn_fs_fsfs_info_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_fs_fsx_info_t = {"_p_svn_fs_fsx_info_t", "struct svn_fs_fsx_info_t *|svn_fs_fsx_info_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_fs_history_t = {"_p_svn_fs_history_t", "struct svn_fs_history_t *|svn_fs_history_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_fs_id_t = {"_p_svn_fs_id_t", "struct svn_fs_id_t *|svn_fs_id_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_fs_info_placeholder_t = {"_p_svn_fs_info_placeholder_t", "struct svn_fs_info_placeholder_t *|svn_fs_info_placeholder_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_fs_lock_target_t = {"_p_svn_fs_lock_target_t", "struct svn_fs_lock_target_t *|svn_fs_lock_target_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_fs_node_relation_t = {"_p_svn_fs_node_relation_t", "enum svn_fs_node_relation_t *|svn_fs_node_relation_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_fs_pack_notify_action_t = {"_p_svn_fs_pack_notify_action_t", "enum svn_fs_pack_notify_action_t *|svn_fs_pack_notify_action_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_fs_path_change2_t = {"_p_svn_fs_path_change2_t", "struct svn_fs_path_change2_t *|svn_fs_path_change2_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_fs_path_change_kind_t = {"_p_svn_fs_path_change_kind_t", "enum svn_fs_path_change_kind_t *|svn_fs_path_change_kind_t *", 0, 0, (void*)0, 0};
@@ -11396,6 +13985,7 @@ static swig_type_info _swigt__p_svn_fs_path_change_t = {"_p_svn_fs_path_change_t
 static swig_type_info _swigt__p_svn_fs_root_t = {"_p_svn_fs_root_t", "struct svn_fs_root_t *|svn_fs_root_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_fs_t = {"_p_svn_fs_t", "struct svn_fs_t *|svn_fs_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_fs_txn_t = {"_p_svn_fs_txn_t", "struct svn_fs_txn_t *|svn_fs_txn_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_fs_upgrade_notify_action_t = {"_p_svn_fs_upgrade_notify_action_t", "enum svn_fs_upgrade_notify_action_t *|svn_fs_upgrade_notify_action_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_io_dirent2_t = {"_p_svn_io_dirent2_t", "struct svn_io_dirent2_t *|svn_io_dirent2_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_io_dirent_t = {"_p_svn_io_dirent_t", "struct svn_io_dirent_t *|svn_io_dirent_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_io_file_del_t = {"_p_svn_io_file_del_t", "enum svn_io_file_del_t *|svn_io_file_del_t *", 0, 0, (void*)0, 0};
@@ -11448,7 +14038,10 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t,
   &_swigt__p_f_p_void__p_svn_error_t,
   &_swigt__p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t,
+  &_swigt__p_f_p_void_apr_uint64_t_svn_fs_upgrade_notify_action_t_p_apr_pool_t__p_svn_error_t,
+  &_swigt__p_f_p_void_long_long_p_apr_pool_t__void,
   &_swigt__p_f_p_void_p_apr_pool_t__p_svn_error_t,
+  &_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_struct_svn_error_t__void,
   &_swigt__p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_int,
@@ -11461,6 +14054,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_p_svn_fs_access_t,
   &_swigt__p_p_svn_fs_history_t,
   &_swigt__p_p_svn_fs_id_t,
+  &_swigt__p_p_svn_fs_info_placeholder_t,
   &_swigt__p_p_svn_fs_root_t,
   &_swigt__p_p_svn_fs_t,
   &_swigt__p_p_svn_fs_txn_t,
@@ -11468,6 +14062,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_p_svn_stream_t,
   &_swigt__p_p_svn_string_t,
   &_swigt__p_p_svn_txdelta_stream_t,
+  &_swigt__p_p_svn_version_t,
   &_swigt__p_p_void,
   &_swigt__p_svn_auth_baton_t,
   &_swigt__p_svn_auth_cred_simple_t,
@@ -11501,8 +14096,13 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_svn_error_t,
   &_swigt__p_svn_fs_access_t,
   &_swigt__p_svn_fs_dirent_t,
+  &_swigt__p_svn_fs_fsfs_info_t,
+  &_swigt__p_svn_fs_fsx_info_t,
   &_swigt__p_svn_fs_history_t,
   &_swigt__p_svn_fs_id_t,
+  &_swigt__p_svn_fs_info_placeholder_t,
+  &_swigt__p_svn_fs_lock_target_t,
+  &_swigt__p_svn_fs_node_relation_t,
   &_swigt__p_svn_fs_pack_notify_action_t,
   &_swigt__p_svn_fs_path_change2_t,
   &_swigt__p_svn_fs_path_change_kind_t,
@@ -11510,6 +14110,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_svn_fs_root_t,
   &_swigt__p_svn_fs_t,
   &_swigt__p_svn_fs_txn_t,
+  &_swigt__p_svn_fs_upgrade_notify_action_t,
   &_swigt__p_svn_io_dirent2_t,
   &_swigt__p_svn_io_dirent_t,
   &_swigt__p_svn_io_file_del_t,
@@ -11562,7 +14163,10 @@ static swig_cast_info _swigc__p_f_p_q_const__unsigned_char_apr_size_t_p_void_p_a
 static swig_cast_info _swigc__p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t[] = {  {&_swigt__p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void__p_svn_error_t[] = {  {&_swigt__p_f_p_void__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_f_p_void_apr_uint64_t_svn_fs_upgrade_notify_action_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_apr_uint64_t_svn_fs_upgrade_notify_action_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_f_p_void_long_long_p_apr_pool_t__void[] = {  {&_swigt__p_f_p_void_long_long_p_apr_pool_t__void, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_struct_svn_error_t__void[] = {  {&_swigt__p_f_p_void_p_struct_svn_error_t__void, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_int[] = {  {&_swigt__p_int, 0, 0, 0},{0, 0, 0, 0}};
@@ -11575,6 +14179,7 @@ static swig_cast_info _swigc__p_p_svn_checksum_t[] = {  {&_swigt__p_p_svn_checks
 static swig_cast_info _swigc__p_p_svn_fs_access_t[] = {  {&_swigt__p_p_svn_fs_access_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_svn_fs_history_t[] = {  {&_swigt__p_p_svn_fs_history_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_svn_fs_id_t[] = {  {&_swigt__p_p_svn_fs_id_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_p_svn_fs_info_placeholder_t[] = {  {&_swigt__p_p_svn_fs_info_placeholder_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_svn_fs_root_t[] = {  {&_swigt__p_p_svn_fs_root_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_svn_fs_t[] = {  {&_swigt__p_p_svn_fs_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_svn_fs_txn_t[] = {  {&_swigt__p_p_svn_fs_txn_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -11582,6 +14187,7 @@ static swig_cast_info _swigc__p_p_svn_lock_t[] = {  {&_swigt__p_p_svn_lock_t, 0,
 static swig_cast_info _swigc__p_p_svn_stream_t[] = {  {&_swigt__p_p_svn_stream_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_svn_string_t[] = {  {&_swigt__p_p_svn_string_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_svn_txdelta_stream_t[] = {  {&_swigt__p_p_svn_txdelta_stream_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_p_svn_version_t[] = {  {&_swigt__p_p_svn_version_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_void[] = {  {&_swigt__p_p_void, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_auth_baton_t[] = {  {&_swigt__p_svn_auth_baton_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_auth_cred_simple_t[] = {  {&_swigt__p_svn_auth_cred_simple_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -11615,8 +14221,13 @@ static swig_cast_info _swigc__p_svn_errno_t[] = {  {&_swigt__p_svn_errno_t, 0, 0
 static swig_cast_info _swigc__p_svn_error_t[] = {  {&_swigt__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_fs_access_t[] = {  {&_swigt__p_svn_fs_access_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_fs_dirent_t[] = {  {&_swigt__p_svn_fs_dirent_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_fs_fsfs_info_t[] = {  {&_swigt__p_svn_fs_fsfs_info_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_fs_fsx_info_t[] = {  {&_swigt__p_svn_fs_fsx_info_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_fs_history_t[] = {  {&_swigt__p_svn_fs_history_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_fs_id_t[] = {  {&_swigt__p_svn_fs_id_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_fs_info_placeholder_t[] = {  {&_swigt__p_svn_fs_info_placeholder_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_fs_lock_target_t[] = {  {&_swigt__p_svn_fs_lock_target_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_fs_node_relation_t[] = {  {&_swigt__p_svn_fs_node_relation_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_fs_pack_notify_action_t[] = {  {&_swigt__p_svn_fs_pack_notify_action_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_fs_path_change2_t[] = {  {&_swigt__p_svn_fs_path_change2_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_fs_path_change_kind_t[] = {  {&_swigt__p_svn_fs_path_change_kind_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -11624,6 +14235,7 @@ static swig_cast_info _swigc__p_svn_fs_path_change_t[] = {  {&_swigt__p_svn_fs_p
 static swig_cast_info _swigc__p_svn_fs_root_t[] = {  {&_swigt__p_svn_fs_root_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_fs_t[] = {  {&_swigt__p_svn_fs_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_fs_txn_t[] = {  {&_swigt__p_svn_fs_txn_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_fs_upgrade_notify_action_t[] = {  {&_swigt__p_svn_fs_upgrade_notify_action_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_io_dirent2_t[] = {  {&_swigt__p_svn_io_dirent2_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_io_dirent_t[] = {  {&_swigt__p_svn_io_dirent_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_io_file_del_t[] = {  {&_swigt__p_svn_io_file_del_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -11676,7 +14288,10 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t,
   _swigc__p_f_p_void__p_svn_error_t,
   _swigc__p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t,
+  _swigc__p_f_p_void_apr_uint64_t_svn_fs_upgrade_notify_action_t_p_apr_pool_t__p_svn_error_t,
+  _swigc__p_f_p_void_long_long_p_apr_pool_t__void,
   _swigc__p_f_p_void_p_apr_pool_t__p_svn_error_t,
+  _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_p_struct_svn_error_t__void,
   _swigc__p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_int,
@@ -11689,6 +14304,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_p_svn_fs_access_t,
   _swigc__p_p_svn_fs_history_t,
   _swigc__p_p_svn_fs_id_t,
+  _swigc__p_p_svn_fs_info_placeholder_t,
   _swigc__p_p_svn_fs_root_t,
   _swigc__p_p_svn_fs_t,
   _swigc__p_p_svn_fs_txn_t,
@@ -11696,6 +14312,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_p_svn_stream_t,
   _swigc__p_p_svn_string_t,
   _swigc__p_p_svn_txdelta_stream_t,
+  _swigc__p_p_svn_version_t,
   _swigc__p_p_void,
   _swigc__p_svn_auth_baton_t,
   _swigc__p_svn_auth_cred_simple_t,
@@ -11729,8 +14346,13 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_svn_error_t,
   _swigc__p_svn_fs_access_t,
   _swigc__p_svn_fs_dirent_t,
+  _swigc__p_svn_fs_fsfs_info_t,
+  _swigc__p_svn_fs_fsx_info_t,
   _swigc__p_svn_fs_history_t,
   _swigc__p_svn_fs_id_t,
+  _swigc__p_svn_fs_info_placeholder_t,
+  _swigc__p_svn_fs_lock_target_t,
+  _swigc__p_svn_fs_node_relation_t,
   _swigc__p_svn_fs_pack_notify_action_t,
   _swigc__p_svn_fs_path_change2_t,
   _swigc__p_svn_fs_path_change_kind_t,
@@ -11738,6 +14360,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_svn_fs_root_t,
   _swigc__p_svn_fs_t,
   _swigc__p_svn_fs_txn_t,
+  _swigc__p_svn_fs_upgrade_notify_action_t,
   _swigc__p_svn_io_dirent2_t,
   _swigc__p_svn_io_dirent_t,
   _swigc__p_svn_io_file_del_t,
@@ -11794,12 +14417,15 @@ static swig_command_info swig_commands[] = {
 {"SVN::_Fs::svn_fs_version", _wrap_svn_fs_version},
 {"SVN::_Fs::svn_fs_initialize", _wrap_svn_fs_initialize},
 {"SVN::_Fs::svn_fs_create", _wrap_svn_fs_create},
+{"SVN::_Fs::svn_fs_open2", _wrap_svn_fs_open2},
 {"SVN::_Fs::svn_fs_open", _wrap_svn_fs_open},
+{"SVN::_Fs::svn_fs_upgrade2", _wrap_svn_fs_upgrade2},
 {"SVN::_Fs::svn_fs_upgrade", _wrap_svn_fs_upgrade},
 {"SVN::_Fs::svn_fs_type", _wrap_svn_fs_type},
 {"SVN::_Fs::svn_fs_path", _wrap_svn_fs_path},
 {"SVN::_Fs::svn_fs_config", _wrap_svn_fs_config},
 {"SVN::_Fs::svn_fs_delete_fs", _wrap_svn_fs_delete_fs},
+{"SVN::_Fs::svn_fs_hotcopy3", _wrap_svn_fs_hotcopy3},
 {"SVN::_Fs::svn_fs_hotcopy2", _wrap_svn_fs_hotcopy2},
 {"SVN::_Fs::svn_fs_hotcopy", _wrap_svn_fs_hotcopy},
 {"SVN::_Fs::svn_fs_recover", _wrap_svn_fs_recover},
@@ -11860,6 +14486,8 @@ static swig_command_info swig_commands[] = {
 {"SVN::_Fs::svn_fs_path_change2_t_copyfrom_rev_get", _wrap_svn_fs_path_change2_t_copyfrom_rev_get},
 {"SVN::_Fs::svn_fs_path_change2_t_copyfrom_path_set", _wrap_svn_fs_path_change2_t_copyfrom_path_set},
 {"SVN::_Fs::svn_fs_path_change2_t_copyfrom_path_get", _wrap_svn_fs_path_change2_t_copyfrom_path_get},
+{"SVN::_Fs::svn_fs_path_change2_t_mergeinfo_mod_set", _wrap_svn_fs_path_change2_t_mergeinfo_mod_set},
+{"SVN::_Fs::svn_fs_path_change2_t_mergeinfo_mod_get", _wrap_svn_fs_path_change2_t_mergeinfo_mod_get},
 {"SVN::_Fs::svn_fs_path_change_t_node_rev_id_set", _wrap_svn_fs_path_change_t_node_rev_id_set},
 {"SVN::_Fs::svn_fs_path_change_t_node_rev_id_get", _wrap_svn_fs_path_change_t_node_rev_id_get},
 {"SVN::_Fs::svn_fs_path_change_t_change_kind_set", _wrap_svn_fs_path_change_t_change_kind_set},
@@ -11872,18 +14500,23 @@ static swig_command_info swig_commands[] = {
 {"SVN::_Fs::svn_fs_paths_changed2", _wrap_svn_fs_paths_changed2},
 {"SVN::_Fs::svn_fs_paths_changed", _wrap_svn_fs_paths_changed},
 {"SVN::_Fs::svn_fs_check_path", _wrap_svn_fs_check_path},
+{"SVN::_Fs::svn_fs_node_history2", _wrap_svn_fs_node_history2},
 {"SVN::_Fs::svn_fs_node_history", _wrap_svn_fs_node_history},
+{"SVN::_Fs::svn_fs_history_prev2", _wrap_svn_fs_history_prev2},
 {"SVN::_Fs::svn_fs_history_prev", _wrap_svn_fs_history_prev},
 {"SVN::_Fs::svn_fs_history_location", _wrap_svn_fs_history_location},
 {"SVN::_Fs::svn_fs_is_dir", _wrap_svn_fs_is_dir},
 {"SVN::_Fs::svn_fs_is_file", _wrap_svn_fs_is_file},
 {"SVN::_Fs::svn_fs_node_id", _wrap_svn_fs_node_id},
+{"SVN::_Fs::svn_fs_node_relation", _wrap_svn_fs_node_relation},
 {"SVN::_Fs::svn_fs_node_created_rev", _wrap_svn_fs_node_created_rev},
 {"SVN::_Fs::svn_fs_node_origin_rev", _wrap_svn_fs_node_origin_rev},
 {"SVN::_Fs::svn_fs_node_created_path", _wrap_svn_fs_node_created_path},
 {"SVN::_Fs::svn_fs_node_prop", _wrap_svn_fs_node_prop},
 {"SVN::_Fs::svn_fs_node_proplist", _wrap_svn_fs_node_proplist},
+{"SVN::_Fs::svn_fs_node_has_props", _wrap_svn_fs_node_has_props},
 {"SVN::_Fs::svn_fs_change_node_prop", _wrap_svn_fs_change_node_prop},
+{"SVN::_Fs::svn_fs_props_different", _wrap_svn_fs_props_different},
 {"SVN::_Fs::svn_fs_props_changed", _wrap_svn_fs_props_changed},
 {"SVN::_Fs::svn_fs_copied_from", _wrap_svn_fs_copied_from},
 {"SVN::_Fs::svn_fs_closest_copy", _wrap_svn_fs_closest_copy},
@@ -11897,6 +14530,7 @@ static swig_command_info swig_commands[] = {
 {"SVN::_Fs::svn_fs_dirent_t_kind_set", _wrap_svn_fs_dirent_t_kind_set},
 {"SVN::_Fs::svn_fs_dirent_t_kind_get", _wrap_svn_fs_dirent_t_kind_get},
 {"SVN::_Fs::svn_fs_dir_entries", _wrap_svn_fs_dir_entries},
+{"SVN::_Fs::svn_fs_dir_optimal_order", _wrap_svn_fs_dir_optimal_order},
 {"SVN::_Fs::svn_fs_make_dir", _wrap_svn_fs_make_dir},
 {"SVN::_Fs::svn_fs_delete", _wrap_svn_fs_delete},
 {"SVN::_Fs::svn_fs_copy", _wrap_svn_fs_copy},
@@ -11909,8 +14543,11 @@ static swig_command_info swig_commands[] = {
 {"SVN::_Fs::svn_fs_make_file", _wrap_svn_fs_make_file},
 {"SVN::_Fs::svn_fs_apply_textdelta", _wrap_svn_fs_apply_textdelta},
 {"SVN::_Fs::svn_fs_apply_text", _wrap_svn_fs_apply_text},
+{"SVN::_Fs::svn_fs_contents_different", _wrap_svn_fs_contents_different},
 {"SVN::_Fs::svn_fs_contents_changed", _wrap_svn_fs_contents_changed},
 {"SVN::_Fs::svn_fs_youngest_rev", _wrap_svn_fs_youngest_rev},
+{"SVN::_Fs::svn_fs_info_format", _wrap_svn_fs_info_format},
+{"SVN::_Fs::svn_fs_info_config_files", _wrap_svn_fs_info_config_files},
 {"SVN::_Fs::svn_fs_deltify_revision", _wrap_svn_fs_deltify_revision},
 {"SVN::_Fs::svn_fs_revision_prop", _wrap_svn_fs_revision_prop},
 {"SVN::_Fs::svn_fs_revision_proplist", _wrap_svn_fs_revision_proplist},
@@ -11919,8 +14556,12 @@ static swig_command_info swig_commands[] = {
 {"SVN::_Fs::svn_fs_get_file_delta_stream", _wrap_svn_fs_get_file_delta_stream},
 {"SVN::_Fs::svn_fs_get_uuid", _wrap_svn_fs_get_uuid},
 {"SVN::_Fs::svn_fs_set_uuid", _wrap_svn_fs_set_uuid},
+{"SVN::_Fs::svn_fs_lock_target_create", _wrap_svn_fs_lock_target_create},
+{"SVN::_Fs::svn_fs_lock_target_set_token", _wrap_svn_fs_lock_target_set_token},
+{"SVN::_Fs::svn_fs_lock_many", _wrap_svn_fs_lock_many},
 {"SVN::_Fs::svn_fs_lock", _wrap_svn_fs_lock},
 {"SVN::_Fs::svn_fs_generate_lock_token", _wrap_svn_fs_generate_lock_token},
+{"SVN::_Fs::svn_fs_unlock_many", _wrap_svn_fs_unlock_many},
 {"SVN::_Fs::svn_fs_unlock", _wrap_svn_fs_unlock},
 {"SVN::_Fs::svn_fs_get_lock", _wrap_svn_fs_get_lock},
 {"SVN::_Fs::svn_fs_get_locks2", _wrap_svn_fs_get_locks2},
@@ -11929,28 +14570,49 @@ static swig_command_info swig_commands[] = {
 {"SVN::_Fs::svn_fs_pack", _wrap_svn_fs_pack},
 {"SVN::_Fs::svn_fs_verify", _wrap_svn_fs_verify},
 {"SVN::_Fs::svn_fs_verify_root", _wrap_svn_fs_verify_root},
+{"SVN::_Fs::svn_fs_fsfs_info_t_fs_type_set", _wrap_svn_fs_fsfs_info_t_fs_type_set},
+{"SVN::_Fs::svn_fs_fsfs_info_t_fs_type_get", _wrap_svn_fs_fsfs_info_t_fs_type_get},
+{"SVN::_Fs::svn_fs_fsfs_info_t_shard_size_set", _wrap_svn_fs_fsfs_info_t_shard_size_set},
+{"SVN::_Fs::svn_fs_fsfs_info_t_shard_size_get", _wrap_svn_fs_fsfs_info_t_shard_size_get},
+{"SVN::_Fs::svn_fs_fsfs_info_t_min_unpacked_rev_set", _wrap_svn_fs_fsfs_info_t_min_unpacked_rev_set},
+{"SVN::_Fs::svn_fs_fsfs_info_t_min_unpacked_rev_get", _wrap_svn_fs_fsfs_info_t_min_unpacked_rev_get},
+{"SVN::_Fs::svn_fs_fsfs_info_t_log_addressing_set", _wrap_svn_fs_fsfs_info_t_log_addressing_set},
+{"SVN::_Fs::svn_fs_fsfs_info_t_log_addressing_get", _wrap_svn_fs_fsfs_info_t_log_addressing_get},
+{"SVN::_Fs::svn_fs_fsx_info_t_fs_type_set", _wrap_svn_fs_fsx_info_t_fs_type_set},
+{"SVN::_Fs::svn_fs_fsx_info_t_fs_type_get", _wrap_svn_fs_fsx_info_t_fs_type_get},
+{"SVN::_Fs::svn_fs_fsx_info_t_shard_size_set", _wrap_svn_fs_fsx_info_t_shard_size_set},
+{"SVN::_Fs::svn_fs_fsx_info_t_shard_size_get", _wrap_svn_fs_fsx_info_t_shard_size_get},
+{"SVN::_Fs::svn_fs_fsx_info_t_min_unpacked_rev_set", _wrap_svn_fs_fsx_info_t_min_unpacked_rev_set},
+{"SVN::_Fs::svn_fs_fsx_info_t_min_unpacked_rev_get", _wrap_svn_fs_fsx_info_t_min_unpacked_rev_get},
+{"SVN::_Fs::svn_fs_info_placeholder_t_fs_type_set", _wrap_svn_fs_info_placeholder_t_fs_type_set},
+{"SVN::_Fs::svn_fs_info_placeholder_t_fs_type_get", _wrap_svn_fs_info_placeholder_t_fs_type_get},
+{"SVN::_Fs::svn_fs_info", _wrap_svn_fs_info},
+{"SVN::_Fs::svn_fs_info_dup", _wrap_svn_fs_info_dup},
 {"SVN::_Fs::svn_fs_invoke_warning_callback", _wrap_svn_fs_invoke_warning_callback},
+{"SVN::_Fs::svn_fs_invoke_upgrade_notify", _wrap_svn_fs_invoke_upgrade_notify},
 {"SVN::_Fs::svn_fs_invoke_progress_notify_func", _wrap_svn_fs_invoke_progress_notify_func},
+{"SVN::_Fs::svn_fs_invoke_hotcopy_notify", _wrap_svn_fs_invoke_hotcopy_notify},
 {"SVN::_Fs::svn_fs_invoke_freeze_func", _wrap_svn_fs_invoke_freeze_func},
 {"SVN::_Fs::svn_fs_invoke_process_contents_func", _wrap_svn_fs_invoke_process_contents_func},
+{"SVN::_Fs::svn_fs_invoke_lock_callback", _wrap_svn_fs_invoke_lock_callback},
 {"SVN::_Fs::svn_fs_invoke_get_locks_callback", _wrap_svn_fs_invoke_get_locks_callback},
 {"SVN::_Fs::svn_fs_invoke_pack_notify", _wrap_svn_fs_invoke_pack_notify},
 {0,0}
 };
 /* -----------------------------------------------------------------------------
  * Type initialization:
- * This problem is tough by the requirement that no dynamic 
- * memory is used. Also, since swig_type_info structures store pointers to 
+ * This problem is tough by the requirement that no dynamic
+ * memory is used. Also, since swig_type_info structures store pointers to
  * swig_cast_info structures and swig_cast_info structures store pointers back
- * to swig_type_info structures, we need some lookup code at initialization. 
- * The idea is that swig generates all the structures that are needed. 
- * The runtime then collects these partially filled structures. 
- * The SWIG_InitializeModule function takes these initial arrays out of 
+ * to swig_type_info structures, we need some lookup code at initialization.
+ * The idea is that swig generates all the structures that are needed.
+ * The runtime then collects these partially filled structures.
+ * The SWIG_InitializeModule function takes these initial arrays out of
  * swig_module, and does all the lookup, filling in the swig_module.types
  * array with the correct data and linking the correct swig_cast_info
  * structures together.
  *
- * The generated swig_type_info structures are assigned staticly to an initial 
+ * The generated swig_type_info structures are assigned staticly to an initial
  * array. We just loop through that array, and handle each type individually.
  * First we lookup if this type has been already loaded, and if so, use the
  * loaded structure instead of the generated one. Then we have to fill in the
@@ -11960,17 +14622,17 @@ static swig_command_info swig_commands[] = {
  * a column is one of the swig_cast_info structures for that type.
  * The cast_initial array is actually an array of arrays, because each row has
  * a variable number of columns. So to actually build the cast linked list,
- * we find the array of casts associated with the type, and loop through it 
+ * we find the array of casts associated with the type, and loop through it
  * adding the casts to the list. The one last trick we need to do is making
  * sure the type pointer in the swig_cast_info struct is correct.
  *
- * First off, we lookup the cast->type name to see if it is already loaded. 
+ * First off, we lookup the cast->type name to see if it is already loaded.
  * There are three cases to handle:
  *  1) If the cast->type has already been loaded AND the type we are adding
  *     casting info to has not been loaded (it is in this module), THEN we
  *     replace the cast->type pointer with the type pointer that has already
  *     been loaded.
- *  2) If BOTH types (the one we are adding casting info to, and the 
+ *  2) If BOTH types (the one we are adding casting info to, and the
  *     cast->type) are loaded, THEN the cast info has already been loaded by
  *     the previous module so we just ignore it.
  *  3) Finally, if cast->type has not already been loaded, then we add that
@@ -12033,7 +14695,7 @@ SWIG_InitializeModule(void *clientdata) {
     module_head->next = &swig_module;
   }
   
-  /* When multiple interpeters are used, a module could have already been initialized in
+  /* When multiple interpreters are used, a module could have already been initialized in
        a different interpreter, but not yet have a pointer in this interpreter.
        In this case, we do not want to continue adding types... everything should be
        set up already */
@@ -12232,122 +14894,182 @@ XS(SWIG_init) {
     SvREADONLY_on(sv);
   }
   
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_TYPE_BDB", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_FromCharPtr("bdb"));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_TYPE_FSFS", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_FromCharPtr("fsfs"));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_TYPE_FSX", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_FromCharPtr("fsx"));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_CONFIG_BDB_TXN_NOSYNC", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("bdb-txn-nosync"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_CONFIG_BDB_LOG_AUTOREMOVE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("bdb-log-autoremove"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_CONFIG_FSFS_CACHE_DELTAS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("fsfs-cache-deltas"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_CONFIG_FSFS_CACHE_FULLTEXTS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("fsfs-cache-fulltexts"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_CONFIG_FSFS_CACHE_REVPROPS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("fsfs-cache-revprops"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_CONFIG_FSFS_CACHE_NS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("fsfs-cache-namespace"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
-    SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_CONFIG_FS_TYPE", TRUE | 0x2 | GV_ADDMULTI);
-    sv_setsv(sv, SWIG_FromCharPtr("fs-type"));
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_CONFIG_FSFS_BLOCK_READ", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_FromCharPtr("fsfs-block-read"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
-    SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_TYPE_BDB", TRUE | 0x2 | GV_ADDMULTI);
-    sv_setsv(sv, SWIG_FromCharPtr("bdb"));
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_CONFIG_FSFS_SHARD_SIZE", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_FromCharPtr("fsfs-shard-size"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
-    SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_TYPE_FSFS", TRUE | 0x2 | GV_ADDMULTI);
-    sv_setsv(sv, SWIG_FromCharPtr("fsfs"));
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_CONFIG_FSFS_LOG_ADDRESSING", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_FromCharPtr("fsfs-log-addressing"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_CONFIG_FS_TYPE", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_FromCharPtr("fs-type"));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_CONFIG_PRE_1_4_COMPATIBLE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("pre-1.4-compatible"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_CONFIG_PRE_1_5_COMPATIBLE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("pre-1.5-compatible"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_CONFIG_PRE_1_6_COMPATIBLE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("pre-1.6-compatible"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_CONFIG_PRE_1_8_COMPATIBLE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("pre-1.8-compatible"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_CONFIG_COMPATIBLE_VERSION", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_FromCharPtr("compatible-version"));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "svn_fs_upgrade_pack_revprops", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_fs_upgrade_pack_revprops)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "svn_fs_upgrade_cleanup_revprops", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_fs_upgrade_cleanup_revprops)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "svn_fs_upgrade_format_bumped", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_fs_upgrade_format_bumped)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "svn_fs_node_unrelated", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_fs_node_unrelated)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "svn_fs_node_unchanged", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_fs_node_unchanged)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "svn_fs_node_common_ancestor", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_fs_node_common_ancestor)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_TXN_CHECK_OOD", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(0x00001)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_TXN_CHECK_LOCKS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(0x00002)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_TXN_CLIENT_DATE", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(0x00004)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_fs_path_change_modify", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_fs_path_change_modify)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_fs_path_change_add", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_fs_path_change_add)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_fs_path_change_delete", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_fs_path_change_delete)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_fs_path_change_replace", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_fs_path_change_replace)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_fs_path_change_reset", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_fs_path_change_reset)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_fs_pack_notify_start", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_fs_pack_notify_start)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_fs_pack_notify_end", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_fs_pack_notify_end)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_fs_pack_notify_start_revprop", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_fs_pack_notify_start_revprop)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_fs_pack_notify_end_revprop", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_fs_pack_notify_end_revprop)));
     SvREADONLY_on(sv);
diff --git a/subversion/bindings/swig/perl/native/svn_ra.c b/subversion/bindings/swig/perl/native/svn_ra.c
index 3dd93ea..677a0fc 100644
--- a/subversion/bindings/swig/perl/native/svn_ra.c
+++ b/subversion/bindings/swig/perl/native/svn_ra.c
@@ -1,11 +1,11 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
- * 
- * This file is not intended to be easily readable and contains a number of 
+ * Version 2.0.12
+ *
+ * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
- * changes to this file unless you know what you are doing--modify the SWIG 
- * interface file instead. 
+ * changes to this file unless you know what you are doing--modify the SWIG
+ * interface file instead.
  * ----------------------------------------------------------------------------- */
 
 #define SWIGPERL
@@ -42,28 +42,28 @@
 #ifndef SWIGUNUSED
 # if defined(__GNUC__)
 #   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__)) 
+#     define SWIGUNUSED __attribute__ ((__unused__))
 #   else
 #     define SWIGUNUSED
 #   endif
 # elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__)) 
+#   define SWIGUNUSED __attribute__ ((__unused__))
 # else
-#   define SWIGUNUSED 
+#   define SWIGUNUSED
 # endif
 #endif
 
 #ifndef SWIG_MSC_UNSUPPRESS_4505
 # if defined(_MSC_VER)
 #   pragma warning(disable : 4505) /* unreferenced local function has been removed */
-# endif 
+# endif
 #endif
 
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
 # else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
 # endif
 #endif
 
@@ -106,7 +106,7 @@
 #   define SWIGSTDCALL __stdcall
 # else
 #   define SWIGSTDCALL
-# endif 
+# endif
 #endif
 
 /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
@@ -144,7 +144,7 @@
   You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for
   creating a static or dynamic library from the SWIG runtime code.
   In 99.9% of the cases, SWIG just needs to declare them as 'static'.
-  
+
   But only do this if strictly necessary, ie, if you have problems
   with your compiler or suchlike.
 */
@@ -170,16 +170,16 @@
 #define SWIG_POINTER_OWN           0x1
 
 
-/* 
+/*
    Flags/methods for returning states.
-   
-   The SWIG conversion methods, as ConvertPtr, return an integer 
+
+   The SWIG conversion methods, as ConvertPtr, return an integer
    that tells if the conversion was successful or not. And if not,
    an error code can be returned (see swigerrors.swg for the codes).
-   
+
    Use the following macros/flags to set or process the returning
    states.
-   
+
    In old versions of SWIG, code such as the following was usually written:
 
      if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) {
@@ -212,23 +212,23 @@
     } else {
       // fail code
     }
-    
+
    I.e., now SWIG_ConvertPtr can return new objects and you can
    identify the case and take care of the deallocation. Of course that
    also requires SWIG_ConvertPtr to return new result values, such as
 
-      int SWIG_ConvertPtr(obj, ptr,...) {         
-        if (<obj is ok>) {			       
-          if (<need new object>) {		       
-            *ptr = <ptr to new allocated object>; 
-            return SWIG_NEWOBJ;		       
-          } else {				       
-            *ptr = <ptr to old object>;	       
-            return SWIG_OLDOBJ;		       
-          } 				       
-        } else {				       
-          return SWIG_BADOBJ;		       
-        }					       
+      int SWIG_ConvertPtr(obj, ptr,...) {
+        if (<obj is ok>) {
+          if (<need new object>) {
+            *ptr = <ptr to new allocated object>;
+            return SWIG_NEWOBJ;
+          } else {
+            *ptr = <ptr to old object>;
+            return SWIG_OLDOBJ;
+          }
+        } else {
+          return SWIG_BADOBJ;
+        }
       }
 
    Of course, returning the plain '0(success)/-1(fail)' still works, but you can be
@@ -242,17 +242,17 @@
        int fooi(int);
 
    and you call
- 
+
       food(1)   // cast rank '1'  (1 -> 1.0)
       fooi(1)   // cast rank '0'
 
    just use the SWIG_AddCast()/SWIG_CheckState()
 */
 
-#define SWIG_OK                    (0) 
+#define SWIG_OK                    (0)
 #define SWIG_ERROR                 (-1)
 #define SWIG_IsOK(r)               (r >= 0)
-#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)  
+#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)
 
 /* The CastRankLimit says how many bits are used for the cast rank */
 #define SWIG_CASTRANKLIMIT         (1 << 8)
@@ -283,14 +283,14 @@
 #  endif
 #  define SWIG_CASTRANKMASK          ((SWIG_CASTRANKLIMIT) -1)
 #  define SWIG_CastRank(r)           (r & SWIG_CASTRANKMASK)
-SWIGINTERNINLINE int SWIG_AddCast(int r) { 
+SWIGINTERNINLINE int SWIG_AddCast(int r) {
   return SWIG_IsOK(r) ? ((SWIG_CastRank(r) < SWIG_MAXCASTRANK) ? (r + 1) : SWIG_ERROR) : r;
 }
-SWIGINTERNINLINE int SWIG_CheckState(int r) { 
-  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0; 
+SWIGINTERNINLINE int SWIG_CheckState(int r) {
+  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0;
 }
 #else /* no cast-rank mode */
-#  define SWIG_AddCast
+#  define SWIG_AddCast(r) (r)
 #  define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0)
 #endif
 
@@ -334,7 +334,7 @@ typedef struct swig_module_info {
   void                    *clientdata;		/* Language specific module data */
 } swig_module_info;
 
-/* 
+/*
   Compare two type names skipping the space characters, therefore
   "char*" == "char *" and "Class<int>" == "Class<int >", etc.
 
@@ -354,18 +354,18 @@ SWIG_TypeNameComp(const char *f1, const char *l1,
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if not equal, 1 if equal
+  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
 */
 SWIGRUNTIME int
-SWIG_TypeEquiv(const char *nb, const char *tb) {
-  int equiv = 0;
+SWIG_TypeCmp(const char *nb, const char *tb) {
+  int equiv = 1;
   const char* te = tb + strlen(tb);
   const char* ne = nb;
-  while (!equiv && *ne) {
+  while (equiv != 0 && *ne) {
     for (nb = ne; *ne; ++ne) {
       if (*ne == '|') break;
     }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
+    equiv = SWIG_TypeNameComp(nb, ne, tb, te);
     if (*ne) ++ne;
   }
   return equiv;
@@ -373,24 +373,13 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
+  Return 0 if not equal, 1 if equal
 */
 SWIGRUNTIME int
-SWIG_TypeCompare(const char *nb, const char *tb) {
-  int equiv = 0;
-  const char* te = tb + strlen(tb);
-  const char* ne = nb;
-  while (!equiv && *ne) {
-    for (nb = ne; *ne; ++ne) {
-      if (*ne == '|') break;
-    }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
-    if (*ne) ++ne;
-  }
-  return equiv;
+SWIG_TypeEquiv(const char *nb, const char *tb) {
+  return SWIG_TypeCmp(nb, tb) == 0 ? 1 : 0;
 }
 
-
 /*
   Check the typename
 */
@@ -418,7 +407,7 @@ SWIG_TypeCheck(const char *c, swig_type_info *ty) {
   return 0;
 }
 
-/* 
+/*
   Identical to SWIG_TypeCheck, except strcmp is replaced with a pointer comparison
 */
 SWIGRUNTIME swig_cast_info *
@@ -453,7 +442,7 @@ SWIG_TypeCast(swig_cast_info *ty, void *ptr, int *newmemory) {
   return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr, newmemory);
 }
 
-/* 
+/*
    Dynamic pointer casting. Down an inheritance hierarchy
 */
 SWIGRUNTIME swig_type_info *
@@ -497,7 +486,7 @@ SWIG_TypePrettyName(const swig_type_info *type) {
     return type->name;
 }
 
-/* 
+/*
    Set the clientdata field for a type
 */
 SWIGRUNTIME void
@@ -505,14 +494,14 @@ SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
   swig_cast_info *cast = ti->cast;
   /* if (ti->clientdata == clientdata) return; */
   ti->clientdata = clientdata;
-  
+
   while (cast) {
     if (!cast->converter) {
       swig_type_info *tc = cast->type;
       if (!tc->clientdata) {
 	SWIG_TypeClientData(tc, clientdata);
       }
-    }    
+    }
     cast = cast->next;
   }
 }
@@ -521,18 +510,18 @@ SWIG_TypeNewClientData(swig_type_info *ti, void *clientdata) {
   SWIG_TypeClientData(ti, clientdata);
   ti->owndata = 1;
 }
-  
+
 /*
   Search for a swig_type_info structure only by mangled name
   Search is a O(log #types)
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_MangledTypeQueryModule(swig_module_info *start, 
-                            swig_module_info *end, 
+SWIG_MangledTypeQueryModule(swig_module_info *start,
+                            swig_module_info *end,
 		            const char *name) {
   swig_module_info *iter = start;
   do {
@@ -541,11 +530,11 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
       register size_t r = iter->size - 1;
       do {
 	/* since l+r >= 0, we can (>> 1) instead (/ 2) */
-	register size_t i = (l + r) >> 1; 
+	register size_t i = (l + r) >> 1;
 	const char *iname = iter->types[i]->name;
 	if (iname) {
 	  register int compare = strcmp(name, iname);
-	  if (compare == 0) {	    
+	  if (compare == 0) {
 	    return iter->types[i];
 	  } else if (compare < 0) {
 	    if (i) {
@@ -570,14 +559,14 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
   Search for a swig_type_info structure for either a mangled name or a human readable name.
   It first searches the mangled names of the types, which is a O(log #types)
   If a type is not found it then searches the human readable names, which is O(#types).
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_TypeQueryModule(swig_module_info *start, 
-                     swig_module_info *end, 
+SWIG_TypeQueryModule(swig_module_info *start,
+                     swig_module_info *end,
 		     const char *name) {
   /* STEP 1: Search the name field using binary search */
   swig_type_info *ret = SWIG_MangledTypeQueryModule(start, end, name);
@@ -596,12 +585,12 @@ SWIG_TypeQueryModule(swig_module_info *start,
       iter = iter->next;
     } while (iter != end);
   }
-  
+
   /* neither found a match */
   return 0;
 }
 
-/* 
+/*
    Pack binary data into a string
 */
 SWIGRUNTIME char *
@@ -617,7 +606,7 @@ SWIG_PackData(char *c, void *ptr, size_t sz) {
   return c;
 }
 
-/* 
+/*
    Unpack binary data from a string
 */
 SWIGRUNTIME const char *
@@ -631,21 +620,21 @@ SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
       uu = ((d - '0') << 4);
     else if ((d >= 'a') && (d <= 'f'))
       uu = ((d - ('a'-10)) << 4);
-    else 
+    else
       return (char *) 0;
     d = *(c++);
     if ((d >= '0') && (d <= '9'))
       uu |= (d - '0');
     else if ((d >= 'a') && (d <= 'f'))
       uu |= (d - ('a'-10));
-    else 
+    else
       return (char *) 0;
     *u = uu;
   }
   return c;
 }
 
-/* 
+/*
    Pack 'void *' into a string buffer.
 */
 SWIGRUNTIME char *
@@ -705,18 +694,18 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 #endif
 
 /*  Errors in SWIG */
-#define  SWIG_UnknownError    	   -1 
-#define  SWIG_IOError        	   -2 
-#define  SWIG_RuntimeError   	   -3 
-#define  SWIG_IndexError     	   -4 
-#define  SWIG_TypeError      	   -5 
-#define  SWIG_DivisionByZero 	   -6 
-#define  SWIG_OverflowError  	   -7 
-#define  SWIG_SyntaxError    	   -8 
-#define  SWIG_ValueError     	   -9 
+#define  SWIG_UnknownError    	   -1
+#define  SWIG_IOError        	   -2
+#define  SWIG_RuntimeError   	   -3
+#define  SWIG_IndexError     	   -4
+#define  SWIG_TypeError      	   -5
+#define  SWIG_DivisionByZero 	   -6
+#define  SWIG_OverflowError  	   -7
+#define  SWIG_SyntaxError    	   -8
+#define  SWIG_ValueError     	   -9
 #define  SWIG_SystemError    	   -10
 #define  SWIG_AttributeError 	   -11
-#define  SWIG_MemoryError    	   -12 
+#define  SWIG_MemoryError    	   -12
 #define  SWIG_NullReferenceError   -13
 
 
@@ -1504,146 +1493,150 @@ SWIG_Perl_SetModule(swig_module_info *module) {
 #define SWIGTYPE_p_f_int_p_apr_pool_t_p_apr_hash_t__p_svn_error_t swig_types[8]
 #define SWIGTYPE_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[9]
 #define SWIGTYPE_p_f_p_p_apr_file_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[10]
-#define SWIGTYPE_p_f_p_p_void_p_q_const__char_p_q_const__svn_ra_callbacks_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[11]
-#define SWIGTYPE_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[12]
-#define SWIGTYPE_p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[13]
-#define SWIGTYPE_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t swig_types[14]
-#define SWIGTYPE_p_f_p_void__p_svn_error_t swig_types[15]
-#define SWIGTYPE_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[16]
-#define SWIGTYPE_p_f_p_void_p_apr_pool_t__p_svn_error_t swig_types[17]
-#define SWIGTYPE_p_f_p_void_p_p_apr_hash_t_p_q_const__char_svn_revnum_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[18]
-#define SWIGTYPE_p_f_p_void_p_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[19]
-#define SWIGTYPE_p_f_p_void_p_p_q_const__svn_delta_editor_t_p_p_void_p_q_const__char_svn_commit_callback_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[20]
-#define SWIGTYPE_p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_p_q_const__char_svn_revnum_t_svn_boolean_t_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[21]
-#define SWIGTYPE_p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_p_q_const__char_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[22]
-#define SWIGTYPE_p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[23]
-#define SWIGTYPE_p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[24]
-#define SWIGTYPE_p_f_p_void_p_p_svn_stream_t_p_q_const__svn_checksum_t_p_apr_pool_t__p_svn_error_t swig_types[25]
-#define SWIGTYPE_p_f_p_void_p_q_const__apr_array_header_t_svn_revnum_t_svn_revnum_t_svn_boolean_t_svn_boolean_t_svn_log_message_receiver_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[26]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[27]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[28]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t swig_types[29]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t swig_types[30]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__char_svn_revnum_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[31]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__char_svn_revnum_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[32]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__char_svn_revnum_t_svn_depth_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[33]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_boolean_t_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t swig_types[34]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[35]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[36]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_p_apr_hash_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[37]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_node_kind_t_p_apr_pool_t__p_svn_error_t swig_types[38]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_stream_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[39]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[40]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[41]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_svn_depth_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[42]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_svn_revnum_t_svn_ra_file_rev_handler_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[43]
-#define SWIGTYPE_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t swig_types[44]
-#define SWIGTYPE_p_f_p_void_p_svn_revnum_t__p_svn_error_t swig_types[45]
-#define SWIGTYPE_p_f_p_void_p_svn_revnum_t_apr_time_t_p_apr_pool_t__p_svn_error_t swig_types[46]
-#define SWIGTYPE_p_f_p_void_p_svn_revnum_t_p_apr_pool_t__p_svn_error_t swig_types[47]
-#define SWIGTYPE_p_f_p_void_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[48]
-#define SWIGTYPE_p_f_p_void_svn_revnum_t_p_q_const__char_p_p_svn_string_t_p_apr_pool_t__p_svn_error_t swig_types[49]
-#define SWIGTYPE_p_f_p_void_svn_revnum_t_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t swig_types[50]
-#define SWIGTYPE_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t swig_types[51]
-#define SWIGTYPE_p_f_svn_revnum_t_p_void_p_p_q_const__svn_delta_editor_t_p_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[52]
-#define SWIGTYPE_p_f_svn_revnum_t_p_void_p_q_const__svn_delta_editor_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[53]
-#define SWIGTYPE_p_f_void__p_svn_version_t swig_types[54]
-#define SWIGTYPE_p_int swig_types[55]
-#define SWIGTYPE_p_long swig_types[56]
-#define SWIGTYPE_p_p_apr_array_header_t swig_types[57]
-#define SWIGTYPE_p_p_apr_file_t swig_types[58]
-#define SWIGTYPE_p_p_apr_hash_t swig_types[59]
-#define SWIGTYPE_p_p_char swig_types[60]
-#define SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t swig_types[61]
-#define SWIGTYPE_p_p_svn_delta_editor_t swig_types[62]
-#define SWIGTYPE_p_p_svn_dirent_t swig_types[63]
-#define SWIGTYPE_p_p_svn_lock_t swig_types[64]
-#define SWIGTYPE_p_p_svn_ra_callbacks2_t swig_types[65]
-#define SWIGTYPE_p_p_svn_ra_plugin_t swig_types[66]
-#define SWIGTYPE_p_p_svn_ra_reporter2_t swig_types[67]
-#define SWIGTYPE_p_p_svn_ra_reporter3_t swig_types[68]
-#define SWIGTYPE_p_p_svn_ra_reporter_t swig_types[69]
-#define SWIGTYPE_p_p_svn_ra_session_t swig_types[70]
-#define SWIGTYPE_p_p_svn_stream_t swig_types[71]
-#define SWIGTYPE_p_p_svn_string_t swig_types[72]
-#define SWIGTYPE_p_p_svn_stringbuf_t swig_types[73]
-#define SWIGTYPE_p_p_void swig_types[74]
-#define SWIGTYPE_p_svn_auth_baton_t swig_types[75]
-#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[76]
-#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[77]
-#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[78]
-#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[79]
-#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[80]
-#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[81]
-#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[82]
-#define SWIGTYPE_p_svn_auth_provider_t swig_types[83]
-#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[84]
-#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[85]
-#define SWIGTYPE_p_svn_checksum_kind_t swig_types[86]
-#define SWIGTYPE_p_svn_checksum_t swig_types[87]
-#define SWIGTYPE_p_svn_commit_info_t swig_types[88]
-#define SWIGTYPE_p_svn_config_t swig_types[89]
-#define SWIGTYPE_p_svn_delta_editor_t swig_types[90]
-#define SWIGTYPE_p_svn_depth_t swig_types[91]
-#define SWIGTYPE_p_svn_diff_conflict_display_style_t swig_types[92]
-#define SWIGTYPE_p_svn_diff_datasource_e swig_types[93]
-#define SWIGTYPE_p_svn_diff_file_ignore_space_t swig_types[94]
-#define SWIGTYPE_p_svn_diff_file_options_t swig_types[95]
-#define SWIGTYPE_p_svn_diff_fns2_t swig_types[96]
-#define SWIGTYPE_p_svn_diff_fns_t swig_types[97]
-#define SWIGTYPE_p_svn_diff_hunk_t swig_types[98]
-#define SWIGTYPE_p_svn_diff_operation_kind_e swig_types[99]
-#define SWIGTYPE_p_svn_diff_output_fns_t swig_types[100]
-#define SWIGTYPE_p_svn_diff_t swig_types[101]
-#define SWIGTYPE_p_svn_dirent_t swig_types[102]
-#define SWIGTYPE_p_svn_errno_t swig_types[103]
-#define SWIGTYPE_p_svn_error_t swig_types[104]
-#define SWIGTYPE_p_svn_io_dirent2_t swig_types[105]
-#define SWIGTYPE_p_svn_io_dirent_t swig_types[106]
-#define SWIGTYPE_p_svn_io_file_del_t swig_types[107]
-#define SWIGTYPE_p_svn_location_segment_t swig_types[108]
-#define SWIGTYPE_p_svn_lock_t swig_types[109]
-#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[110]
-#define SWIGTYPE_p_svn_log_changed_path_t swig_types[111]
-#define SWIGTYPE_p_svn_log_entry_t swig_types[112]
-#define SWIGTYPE_p_svn_merge_range_t swig_types[113]
-#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[114]
-#define SWIGTYPE_p_svn_node_kind_t swig_types[115]
-#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[116]
-#define SWIGTYPE_p_svn_opt_revision_t swig_types[117]
-#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[118]
-#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[119]
-#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[120]
-#define SWIGTYPE_p_svn_patch_file_t swig_types[121]
-#define SWIGTYPE_p_svn_patch_t swig_types[122]
-#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[123]
-#define SWIGTYPE_p_svn_prop_kind swig_types[124]
-#define SWIGTYPE_p_svn_prop_patch_t swig_types[125]
-#define SWIGTYPE_p_svn_ra_callbacks2_t swig_types[126]
-#define SWIGTYPE_p_svn_ra_callbacks_t swig_types[127]
-#define SWIGTYPE_p_svn_ra_plugin_t swig_types[128]
-#define SWIGTYPE_p_svn_ra_reporter2_t swig_types[129]
-#define SWIGTYPE_p_svn_ra_reporter3_t swig_types[130]
-#define SWIGTYPE_p_svn_ra_reporter_t swig_types[131]
-#define SWIGTYPE_p_svn_ra_session_t swig_types[132]
-#define SWIGTYPE_p_svn_stream_mark_t swig_types[133]
-#define SWIGTYPE_p_svn_stream_t swig_types[134]
-#define SWIGTYPE_p_svn_string_t swig_types[135]
-#define SWIGTYPE_p_svn_stringbuf_t swig_types[136]
-#define SWIGTYPE_p_svn_tristate_t swig_types[137]
-#define SWIGTYPE_p_svn_txdelta_op_t swig_types[138]
-#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[139]
-#define SWIGTYPE_p_svn_txdelta_window_t swig_types[140]
-#define SWIGTYPE_p_svn_version_checklist_t swig_types[141]
-#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[142]
-#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[143]
-#define SWIGTYPE_p_svn_version_extended_t swig_types[144]
-#define SWIGTYPE_p_svn_version_t swig_types[145]
-#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[146]
-#define SWIGTYPE_p_unsigned_long swig_types[147]
-#define SWIGTYPE_p_void swig_types[148]
-static swig_type_info *swig_types[150];
-static swig_module_info swig_module = {swig_types, 149, 0, 0, 0, 0};
+#define SWIGTYPE_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[11]
+#define SWIGTYPE_p_f_p_p_void_p_q_const__char_p_q_const__svn_ra_callbacks_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[12]
+#define SWIGTYPE_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[13]
+#define SWIGTYPE_p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[14]
+#define SWIGTYPE_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t swig_types[15]
+#define SWIGTYPE_p_f_p_void__p_svn_error_t swig_types[16]
+#define SWIGTYPE_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[17]
+#define SWIGTYPE_p_f_p_void_p_apr_pool_t__p_svn_error_t swig_types[18]
+#define SWIGTYPE_p_f_p_void_p_p_apr_hash_t_p_q_const__char_svn_revnum_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[19]
+#define SWIGTYPE_p_f_p_void_p_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[20]
+#define SWIGTYPE_p_f_p_void_p_p_q_const__svn_delta_editor_t_p_p_void_p_q_const__char_svn_commit_callback_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[21]
+#define SWIGTYPE_p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_p_q_const__char_svn_revnum_t_svn_boolean_t_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[22]
+#define SWIGTYPE_p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_p_q_const__char_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[23]
+#define SWIGTYPE_p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[24]
+#define SWIGTYPE_p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[25]
+#define SWIGTYPE_p_f_p_void_p_p_svn_stream_t_p_q_const__svn_checksum_t_p_apr_pool_t__p_svn_error_t swig_types[26]
+#define SWIGTYPE_p_f_p_void_p_q_const__apr_array_header_t_svn_revnum_t_svn_revnum_t_svn_boolean_t_svn_boolean_t_svn_log_message_receiver_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[27]
+#define SWIGTYPE_p_f_p_void_p_q_const__char__int swig_types[28]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[29]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[30]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t swig_types[31]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t swig_types[32]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__char_svn_revnum_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[33]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__char_svn_revnum_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[34]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__char_svn_revnum_t_svn_depth_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[35]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_boolean_t_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t swig_types[36]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[37]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[38]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_p_apr_hash_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[39]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_node_kind_t_p_apr_pool_t__p_svn_error_t swig_types[40]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_stream_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[41]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[42]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[43]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_svn_depth_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[44]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_svn_revnum_t_svn_ra_file_rev_handler_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[45]
+#define SWIGTYPE_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t swig_types[46]
+#define SWIGTYPE_p_f_p_void_p_svn_revnum_t__p_svn_error_t swig_types[47]
+#define SWIGTYPE_p_f_p_void_p_svn_revnum_t_apr_time_t_p_apr_pool_t__p_svn_error_t swig_types[48]
+#define SWIGTYPE_p_f_p_void_p_svn_revnum_t_p_apr_pool_t__p_svn_error_t swig_types[49]
+#define SWIGTYPE_p_f_p_void_p_void__void swig_types[50]
+#define SWIGTYPE_p_f_p_void_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[51]
+#define SWIGTYPE_p_f_p_void_svn_revnum_t_p_q_const__char_p_p_svn_string_t_p_apr_pool_t__p_svn_error_t swig_types[52]
+#define SWIGTYPE_p_f_p_void_svn_revnum_t_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t swig_types[53]
+#define SWIGTYPE_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t swig_types[54]
+#define SWIGTYPE_p_f_svn_revnum_t_p_void_p_p_q_const__svn_delta_editor_t_p_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[55]
+#define SWIGTYPE_p_f_svn_revnum_t_p_void_p_q_const__svn_delta_editor_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[56]
+#define SWIGTYPE_p_f_void__p_svn_version_t swig_types[57]
+#define SWIGTYPE_p_int swig_types[58]
+#define SWIGTYPE_p_long swig_types[59]
+#define SWIGTYPE_p_p_apr_array_header_t swig_types[60]
+#define SWIGTYPE_p_p_apr_file_t swig_types[61]
+#define SWIGTYPE_p_p_apr_hash_t swig_types[62]
+#define SWIGTYPE_p_p_char swig_types[63]
+#define SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t swig_types[64]
+#define SWIGTYPE_p_p_f_p_void_p_void__void swig_types[65]
+#define SWIGTYPE_p_p_svn_delta_editor_t swig_types[66]
+#define SWIGTYPE_p_p_svn_dirent_t swig_types[67]
+#define SWIGTYPE_p_p_svn_lock_t swig_types[68]
+#define SWIGTYPE_p_p_svn_ra_callbacks2_t swig_types[69]
+#define SWIGTYPE_p_p_svn_ra_plugin_t swig_types[70]
+#define SWIGTYPE_p_p_svn_ra_reporter2_t swig_types[71]
+#define SWIGTYPE_p_p_svn_ra_reporter3_t swig_types[72]
+#define SWIGTYPE_p_p_svn_ra_reporter_t swig_types[73]
+#define SWIGTYPE_p_p_svn_ra_session_t swig_types[74]
+#define SWIGTYPE_p_p_svn_stream_t swig_types[75]
+#define SWIGTYPE_p_p_svn_string_t swig_types[76]
+#define SWIGTYPE_p_p_svn_stringbuf_t swig_types[77]
+#define SWIGTYPE_p_p_void swig_types[78]
+#define SWIGTYPE_p_svn_auth_baton_t swig_types[79]
+#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[80]
+#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[81]
+#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[82]
+#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[83]
+#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[84]
+#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[85]
+#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[86]
+#define SWIGTYPE_p_svn_auth_provider_t swig_types[87]
+#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[88]
+#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[89]
+#define SWIGTYPE_p_svn_checksum_kind_t swig_types[90]
+#define SWIGTYPE_p_svn_checksum_t swig_types[91]
+#define SWIGTYPE_p_svn_commit_info_t swig_types[92]
+#define SWIGTYPE_p_svn_config_t swig_types[93]
+#define SWIGTYPE_p_svn_delta_editor_t swig_types[94]
+#define SWIGTYPE_p_svn_depth_t swig_types[95]
+#define SWIGTYPE_p_svn_diff_conflict_display_style_t swig_types[96]
+#define SWIGTYPE_p_svn_diff_datasource_e swig_types[97]
+#define SWIGTYPE_p_svn_diff_file_ignore_space_t swig_types[98]
+#define SWIGTYPE_p_svn_diff_file_options_t swig_types[99]
+#define SWIGTYPE_p_svn_diff_fns2_t swig_types[100]
+#define SWIGTYPE_p_svn_diff_fns_t swig_types[101]
+#define SWIGTYPE_p_svn_diff_hunk_t swig_types[102]
+#define SWIGTYPE_p_svn_diff_operation_kind_e swig_types[103]
+#define SWIGTYPE_p_svn_diff_output_fns_t swig_types[104]
+#define SWIGTYPE_p_svn_diff_t swig_types[105]
+#define SWIGTYPE_p_svn_dirent_t swig_types[106]
+#define SWIGTYPE_p_svn_errno_t swig_types[107]
+#define SWIGTYPE_p_svn_error_t swig_types[108]
+#define SWIGTYPE_p_svn_io_dirent2_t swig_types[109]
+#define SWIGTYPE_p_svn_io_dirent_t swig_types[110]
+#define SWIGTYPE_p_svn_io_file_del_t swig_types[111]
+#define SWIGTYPE_p_svn_location_segment_t swig_types[112]
+#define SWIGTYPE_p_svn_lock_t swig_types[113]
+#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[114]
+#define SWIGTYPE_p_svn_log_changed_path_t swig_types[115]
+#define SWIGTYPE_p_svn_log_entry_t swig_types[116]
+#define SWIGTYPE_p_svn_merge_range_t swig_types[117]
+#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[118]
+#define SWIGTYPE_p_svn_node_kind_t swig_types[119]
+#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[120]
+#define SWIGTYPE_p_svn_opt_revision_t swig_types[121]
+#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[122]
+#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[123]
+#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[124]
+#define SWIGTYPE_p_svn_patch_file_t swig_types[125]
+#define SWIGTYPE_p_svn_patch_t swig_types[126]
+#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[127]
+#define SWIGTYPE_p_svn_prop_kind swig_types[128]
+#define SWIGTYPE_p_svn_prop_patch_t swig_types[129]
+#define SWIGTYPE_p_svn_ra_callbacks2_t swig_types[130]
+#define SWIGTYPE_p_svn_ra_callbacks_t swig_types[131]
+#define SWIGTYPE_p_svn_ra_plugin_t swig_types[132]
+#define SWIGTYPE_p_svn_ra_reporter2_t swig_types[133]
+#define SWIGTYPE_p_svn_ra_reporter3_t swig_types[134]
+#define SWIGTYPE_p_svn_ra_reporter_t swig_types[135]
+#define SWIGTYPE_p_svn_ra_session_t swig_types[136]
+#define SWIGTYPE_p_svn_stream_mark_t swig_types[137]
+#define SWIGTYPE_p_svn_stream_t swig_types[138]
+#define SWIGTYPE_p_svn_string_t swig_types[139]
+#define SWIGTYPE_p_svn_stringbuf_t swig_types[140]
+#define SWIGTYPE_p_svn_tristate_t swig_types[141]
+#define SWIGTYPE_p_svn_txdelta_op_t swig_types[142]
+#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[143]
+#define SWIGTYPE_p_svn_txdelta_window_t swig_types[144]
+#define SWIGTYPE_p_svn_version_checklist_t swig_types[145]
+#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[146]
+#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[147]
+#define SWIGTYPE_p_svn_version_extended_t swig_types[148]
+#define SWIGTYPE_p_svn_version_t swig_types[149]
+#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[150]
+#define SWIGTYPE_p_unsigned_long swig_types[151]
+#define SWIGTYPE_p_void swig_types[152]
+static swig_type_info *swig_types[154];
+static swig_module_info swig_module = {swig_types, 153, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
@@ -1654,7 +1647,7 @@ static swig_module_info swig_module = {swig_types, 149, 0, 0, 0, 0};
 #define SWIG_name   "SVN::_Ra::boot_SVN___Ra"
 #define SWIG_prefix "SVN::_Ra::"
 
-#define SWIGVERSION 0x020009 
+#define SWIGVERSION 0x020012 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -2277,6 +2270,21 @@ static svn_error_t * svn_ra_invoke_replay_revfinish_callback(
   return _obj(revision, replay_baton, editor, edit_baton, rev_props, pool);
 }
 
+static svn_boolean_t svn_ra_invoke_check_tunnel_func(
+  svn_ra_check_tunnel_func_t _obj, void *tunnel_baton, const char *tunnel_name) {
+  return _obj(tunnel_baton, tunnel_name);
+}
+
+static void svn_ra_invoke_close_tunnel_func(
+  svn_ra_close_tunnel_func_t _obj, void *close_baton, void *tunnel_baton) {
+  _obj(close_baton, tunnel_baton);
+}
+
+static svn_error_t * svn_ra_invoke_open_tunnel_func(
+  svn_ra_open_tunnel_func_t _obj, svn_stream_t **request, svn_stream_t **response, svn_ra_close_tunnel_func_t *close_func, void **close_baton, void *tunnel_baton, const char *tunnel_name, const char *user, const char *hostname, int port, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *pool) {
+  return _obj(request, response, close_func, close_baton, tunnel_baton, tunnel_name, user, hostname, port, cancel_func, cancel_baton, pool);
+}
+
 static svn_error_t * svn_ra_invoke_init_func(
   svn_ra_init_func_t _obj, int abi_version, apr_pool_t *pool, apr_hash_t *hash) {
   return _obj(abi_version, pool, hash);
@@ -4164,6 +4172,197 @@ XS(_wrap_svn_ra_callbacks2_t_get_wc_contents_get) {
 }
 
 
+XS(_wrap_svn_ra_callbacks2_t_check_tunnel_func_set) {
+  {
+    struct svn_ra_callbacks2_t *arg1 = (struct svn_ra_callbacks2_t *) 0 ;
+    svn_ra_check_tunnel_func_t arg2 = (svn_ra_check_tunnel_func_t) 0 ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    int argvi = 0;
+    dXSARGS;
+    
+    if ((items < 2) || (items > 2)) {
+      SWIG_croak("Usage: svn_ra_callbacks2_t_check_tunnel_func_set(self,check_tunnel_func);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_ra_callbacks2_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_ra_callbacks2_t_check_tunnel_func_set" "', argument " "1"" of type '" "struct svn_ra_callbacks2_t *""'"); 
+    }
+    arg1 = (struct svn_ra_callbacks2_t *)(argp1);
+    {
+      int res = SWIG_ConvertFunctionPtr(ST(1), (void**)(&arg2), SWIGTYPE_p_f_p_void_p_q_const__char__int);
+      if (!SWIG_IsOK(res)) {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_ra_callbacks2_t_check_tunnel_func_set" "', argument " "2"" of type '" "svn_ra_check_tunnel_func_t""'"); 
+      }
+    }
+    if (arg1) (arg1)->check_tunnel_func = arg2;
+    ST(argvi) = sv_newmortal();
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_svn_ra_callbacks2_t_check_tunnel_func_get) {
+  {
+    struct svn_ra_callbacks2_t *arg1 = (struct svn_ra_callbacks2_t *) 0 ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    int argvi = 0;
+    svn_ra_check_tunnel_func_t result;
+    dXSARGS;
+    
+    if ((items < 1) || (items > 1)) {
+      SWIG_croak("Usage: svn_ra_callbacks2_t_check_tunnel_func_get(self);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_ra_callbacks2_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_ra_callbacks2_t_check_tunnel_func_get" "', argument " "1"" of type '" "struct svn_ra_callbacks2_t *""'"); 
+    }
+    arg1 = (struct svn_ra_callbacks2_t *)(argp1);
+    result = (svn_ra_check_tunnel_func_t) ((arg1)->check_tunnel_func);
+    ST(argvi) = SWIG_NewFunctionPtrObj((void *)(result), SWIGTYPE_p_f_p_void_p_q_const__char__int); argvi++ ;
+    
+    XSRETURN(argvi);
+  fail:
+    
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_svn_ra_callbacks2_t_open_tunnel_func_set) {
+  {
+    struct svn_ra_callbacks2_t *arg1 = (struct svn_ra_callbacks2_t *) 0 ;
+    svn_ra_open_tunnel_func_t arg2 = (svn_ra_open_tunnel_func_t) 0 ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    int argvi = 0;
+    dXSARGS;
+    
+    if ((items < 2) || (items > 2)) {
+      SWIG_croak("Usage: svn_ra_callbacks2_t_open_tunnel_func_set(self,open_tunnel_func);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_ra_callbacks2_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_ra_callbacks2_t_open_tunnel_func_set" "', argument " "1"" of type '" "struct svn_ra_callbacks2_t *""'"); 
+    }
+    arg1 = (struct svn_ra_callbacks2_t *)(argp1);
+    {
+      int res = SWIG_ConvertFunctionPtr(ST(1), (void**)(&arg2), SWIGTYPE_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t);
+      if (!SWIG_IsOK(res)) {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_ra_callbacks2_t_open_tunnel_func_set" "', argument " "2"" of type '" "svn_ra_open_tunnel_func_t""'"); 
+      }
+    }
+    if (arg1) (arg1)->open_tunnel_func = arg2;
+    ST(argvi) = sv_newmortal();
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_svn_ra_callbacks2_t_open_tunnel_func_get) {
+  {
+    struct svn_ra_callbacks2_t *arg1 = (struct svn_ra_callbacks2_t *) 0 ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    int argvi = 0;
+    svn_ra_open_tunnel_func_t result;
+    dXSARGS;
+    
+    if ((items < 1) || (items > 1)) {
+      SWIG_croak("Usage: svn_ra_callbacks2_t_open_tunnel_func_get(self);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_ra_callbacks2_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_ra_callbacks2_t_open_tunnel_func_get" "', argument " "1"" of type '" "struct svn_ra_callbacks2_t *""'"); 
+    }
+    arg1 = (struct svn_ra_callbacks2_t *)(argp1);
+    result = (svn_ra_open_tunnel_func_t) ((arg1)->open_tunnel_func);
+    ST(argvi) = SWIG_NewFunctionPtrObj((void *)(result), SWIGTYPE_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t); argvi++ ;
+    
+    XSRETURN(argvi);
+  fail:
+    
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_svn_ra_callbacks2_t_tunnel_baton_set) {
+  {
+    struct svn_ra_callbacks2_t *arg1 = (struct svn_ra_callbacks2_t *) 0 ;
+    void *arg2 = (void *) 0 ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    int res2 ;
+    int argvi = 0;
+    dXSARGS;
+    
+    if ((items < 2) || (items > 2)) {
+      SWIG_croak("Usage: svn_ra_callbacks2_t_tunnel_baton_set(self,tunnel_baton);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_ra_callbacks2_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_ra_callbacks2_t_tunnel_baton_set" "', argument " "1"" of type '" "struct svn_ra_callbacks2_t *""'"); 
+    }
+    arg1 = (struct svn_ra_callbacks2_t *)(argp1);
+    res2 = SWIG_ConvertPtr(ST(1),SWIG_as_voidptrptr(&arg2), 0, SWIG_POINTER_DISOWN);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_ra_callbacks2_t_tunnel_baton_set" "', argument " "2"" of type '" "void *""'"); 
+    }
+    if (arg1) (arg1)->tunnel_baton = arg2;
+    ST(argvi) = sv_newmortal();
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_svn_ra_callbacks2_t_tunnel_baton_get) {
+  {
+    struct svn_ra_callbacks2_t *arg1 = (struct svn_ra_callbacks2_t *) 0 ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    int argvi = 0;
+    void *result = 0 ;
+    dXSARGS;
+    
+    if ((items < 1) || (items > 1)) {
+      SWIG_croak("Usage: svn_ra_callbacks2_t_tunnel_baton_get(self);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_ra_callbacks2_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_ra_callbacks2_t_tunnel_baton_get" "', argument " "1"" of type '" "struct svn_ra_callbacks2_t *""'"); 
+    }
+    arg1 = (struct svn_ra_callbacks2_t *)(argp1);
+    result = (void *) ((arg1)->tunnel_baton);
+    ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 | 0); argvi++ ;
+    
+    XSRETURN(argvi);
+  fail:
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_new_svn_ra_callbacks2_t) {
   {
     int argvi = 0;
@@ -4669,6 +4868,7 @@ XS(_wrap_svn_ra_initialize) {
     
     {
       _global_pool = arg1 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 0) || (items > 1)) {
       SWIG_croak("Usage: svn_ra_initialize(pool);");
@@ -4719,6 +4919,7 @@ XS(_wrap_svn_ra_create_callbacks) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 0) || (items > 1)) {
@@ -4791,6 +4992,7 @@ XS(_wrap_svn_ra_open4) {
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
@@ -4909,6 +5111,7 @@ XS(_wrap_svn_ra_open3) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 5) || (items > 6)) {
@@ -5013,6 +5216,7 @@ XS(_wrap_svn_ra_open2) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 4) || (items > 5)) {
@@ -5107,6 +5311,7 @@ XS(_wrap_svn_ra_open) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 3) || (items > 4)) {
@@ -5118,7 +5323,7 @@ XS(_wrap_svn_ra_open) {
     }
     arg2 = (char *)(buf2);
     {
-      svn_ra_make_callbacks(&arg3, &arg4, ST(1), _global_pool);
+      svn_swig_pl_make_callbacks(&arg3, &arg4, ST(1), _global_pool);
     }
     {
       arg5 = svn_swig_pl_objs_to_hash_by_name (ST(2), "svn_config_t *",
@@ -5184,6 +5389,7 @@ XS(_wrap_svn_ra_reparent) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_ra_reparent(ra_session,url,pool);");
@@ -5251,6 +5457,7 @@ XS(_wrap_svn_ra_get_session_url) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     if ((items < 1) || (items > 2)) {
@@ -5325,6 +5532,7 @@ XS(_wrap_svn_ra_get_path_relative_to_session) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     if ((items < 2) || (items > 3)) {
@@ -5406,6 +5614,7 @@ XS(_wrap_svn_ra_get_path_relative_to_root) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     if ((items < 2) || (items > 3)) {
@@ -5484,6 +5693,7 @@ XS(_wrap_svn_ra_get_latest_revnum) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     if ((items < 1) || (items > 2)) {
@@ -5557,6 +5767,7 @@ XS(_wrap_svn_ra_get_dated_revision) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     if ((items < 2) || (items > 3)) {
@@ -5644,6 +5855,7 @@ XS(_wrap_svn_ra_change_rev_prop2) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 5) || (items > 6)) {
       SWIG_croak("Usage: svn_ra_change_rev_prop2(session,rev,name,old_value_p,value,pool);");
@@ -5751,6 +5963,7 @@ XS(_wrap_svn_ra_change_rev_prop) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_ra_change_rev_prop(session,rev,name,value,pool);");
@@ -5839,6 +6052,7 @@ XS(_wrap_svn_ra_rev_proplist) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg3 = &temp3;
     if ((items < 2) || (items > 3)) {
@@ -5919,6 +6133,7 @@ XS(_wrap_svn_ra_rev_prop) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg4 = &temp4;
     if ((items < 3) || (items > 4)) {
@@ -6012,6 +6227,7 @@ XS(_wrap_svn_ra_get_commit_editor3) {
     
     {
       _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     arg3 = &temp3;
@@ -6024,8 +6240,10 @@ XS(_wrap_svn_ra_get_commit_editor3) {
     }
     arg1 = (svn_ra_session_t *)(argp1);
     {
-      if (_global_pool == NULL)
-      _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
       arg4 = svn_swig_pl_hash_to_prophash(ST(1), _global_pool);  
     }
     {
@@ -6121,6 +6339,7 @@ XS(_wrap_svn_ra_get_commit_editor2) {
     
     {
       _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     arg3 = &temp3;
@@ -6230,6 +6449,7 @@ XS(_wrap_svn_ra_get_commit_editor) {
     
     {
       _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     arg3 = &temp3;
@@ -6338,6 +6558,7 @@ XS(_wrap_svn_ra_get_file) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg5 = &temp5;
     arg6 = &temp6;
@@ -6361,6 +6582,7 @@ XS(_wrap_svn_ra_get_file) {
     arg3 = (svn_revnum_t)(val3);
     {
       svn_swig_pl_make_stream (&arg4, ST(3));
+      SPAGAIN;
     }
     if (items > 4) {
       
@@ -6447,6 +6669,7 @@ XS(_wrap_svn_ra_get_dir2) {
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     arg3 = &temp3;
@@ -6561,6 +6784,7 @@ XS(_wrap_svn_ra_get_dir) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg4 = &temp4;
     arg5 = &temp5;
@@ -6666,6 +6890,7 @@ XS(_wrap_svn_ra_get_mergeinfo) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     if ((items < 5) || (items > 6)) {
@@ -6677,7 +6902,7 @@ XS(_wrap_svn_ra_get_mergeinfo) {
     }
     arg1 = (svn_ra_session_t *)(argp1);
     {
-      arg3 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(1),
+      arg3 = svn_swig_pl_strings_to_array(ST(1),
         _global_pool);
     }
     ecode4 = SWIG_AsVal_long SWIG_PERL_CALL_ARGS_2(ST(2), &val4);
@@ -6786,9 +7011,11 @@ XS(_wrap_svn_ra_do_update3) {
     
     {
       _global_pool = arg11 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg12 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     arg3 = &temp3;
@@ -6826,7 +7053,7 @@ XS(_wrap_svn_ra_do_update3) {
     } 
     arg8 = (svn_boolean_t)(val8);
     {
-      svn_delta_make_editor(&arg9, &arg10, ST(6), _global_pool);
+      svn_swig_pl_make_editor(&arg9, &arg10, ST(6), _global_pool);
     }
     if (items > 7) {
       
@@ -6921,6 +7148,7 @@ XS(_wrap_svn_ra_do_update2) {
     
     {
       _global_pool = arg10 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     arg3 = &temp3;
@@ -6953,7 +7181,7 @@ XS(_wrap_svn_ra_do_update2) {
     } 
     arg7 = (svn_boolean_t)(val7);
     {
-      svn_delta_make_editor(&arg8, &arg9, ST(5), _global_pool);
+      svn_swig_pl_make_editor(&arg8, &arg9, ST(5), _global_pool);
     }
     if (items > 6) {
       
@@ -7038,6 +7266,7 @@ XS(_wrap_svn_ra_do_update) {
     
     {
       _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     arg3 = &temp3;
@@ -7065,7 +7294,7 @@ XS(_wrap_svn_ra_do_update) {
     } 
     arg6 = (svn_boolean_t)(val6);
     {
-      svn_delta_make_editor(&arg7, &arg8, ST(4), _global_pool);
+      svn_swig_pl_make_editor(&arg7, &arg8, ST(4), _global_pool);
     }
     if (items > 5) {
       
@@ -7159,9 +7388,11 @@ XS(_wrap_svn_ra_do_switch3) {
     
     {
       _global_pool = arg12 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg13 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     arg3 = &temp3;
@@ -7204,7 +7435,7 @@ XS(_wrap_svn_ra_do_switch3) {
     } 
     arg9 = (svn_boolean_t)(val9);
     {
-      svn_delta_make_editor(&arg10, &arg11, ST(7), _global_pool);
+      svn_swig_pl_make_editor(&arg10, &arg11, ST(7), _global_pool);
     }
     if (items > 8) {
       
@@ -7302,6 +7533,7 @@ XS(_wrap_svn_ra_do_switch2) {
     
     {
       _global_pool = arg10 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     arg3 = &temp3;
@@ -7334,7 +7566,7 @@ XS(_wrap_svn_ra_do_switch2) {
     }
     arg7 = (char *)(buf7);
     {
-      svn_delta_make_editor(&arg8, &arg9, ST(5), _global_pool);
+      svn_swig_pl_make_editor(&arg8, &arg9, ST(5), _global_pool);
     }
     if (items > 6) {
       
@@ -7423,6 +7655,7 @@ XS(_wrap_svn_ra_do_switch) {
     
     {
       _global_pool = arg10 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     arg3 = &temp3;
@@ -7455,7 +7688,7 @@ XS(_wrap_svn_ra_do_switch) {
     }
     arg7 = (char *)(buf7);
     {
-      svn_delta_make_editor(&arg8, &arg9, ST(5), _global_pool);
+      svn_swig_pl_make_editor(&arg8, &arg9, ST(5), _global_pool);
     }
     if (items > 6) {
       
@@ -7540,6 +7773,7 @@ XS(_wrap_svn_ra_do_status2) {
     
     {
       _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     arg3 = &temp3;
@@ -7567,7 +7801,7 @@ XS(_wrap_svn_ra_do_status2) {
     } 
     arg6 = (svn_depth_t)(val6);
     {
-      svn_delta_make_editor(&arg7, &arg8, ST(4), _global_pool);
+      svn_swig_pl_make_editor(&arg7, &arg8, ST(4), _global_pool);
     }
     if (items > 5) {
       
@@ -7650,6 +7884,7 @@ XS(_wrap_svn_ra_do_status) {
     
     {
       _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     arg3 = &temp3;
@@ -7677,7 +7912,7 @@ XS(_wrap_svn_ra_do_status) {
     } 
     arg6 = (svn_boolean_t)(val6);
     {
-      svn_delta_make_editor(&arg7, &arg8, ST(4), _global_pool);
+      svn_swig_pl_make_editor(&arg7, &arg8, ST(4), _global_pool);
     }
     if (items > 5) {
       
@@ -7770,6 +8005,7 @@ XS(_wrap_svn_ra_do_diff3) {
     
     {
       _global_pool = arg12 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     arg3 = &temp3;
@@ -7812,7 +8048,7 @@ XS(_wrap_svn_ra_do_diff3) {
     }
     arg9 = (char *)(buf9);
     {
-      svn_delta_make_editor(&arg10, &arg11, ST(7), _global_pool);
+      svn_swig_pl_make_editor(&arg10, &arg11, ST(7), _global_pool);
     }
     if (items > 8) {
       
@@ -7911,6 +8147,7 @@ XS(_wrap_svn_ra_do_diff2) {
     
     {
       _global_pool = arg12 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     arg3 = &temp3;
@@ -7953,7 +8190,7 @@ XS(_wrap_svn_ra_do_diff2) {
     }
     arg9 = (char *)(buf9);
     {
-      svn_delta_make_editor(&arg10, &arg11, ST(7), _global_pool);
+      svn_swig_pl_make_editor(&arg10, &arg11, ST(7), _global_pool);
     }
     if (items > 8) {
       
@@ -8049,6 +8286,7 @@ XS(_wrap_svn_ra_do_diff) {
     
     {
       _global_pool = arg11 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     arg3 = &temp3;
@@ -8086,7 +8324,7 @@ XS(_wrap_svn_ra_do_diff) {
     }
     arg8 = (char *)(buf8);
     {
-      svn_delta_make_editor(&arg9, &arg10, ST(6), _global_pool);
+      svn_swig_pl_make_editor(&arg9, &arg10, ST(6), _global_pool);
     }
     if (items > 7) {
       
@@ -8179,6 +8417,7 @@ XS(_wrap_svn_ra_get_log2) {
     
     {
       _global_pool = arg12 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 10) || (items > 11)) {
       SWIG_croak("Usage: svn_ra_get_log2(session,paths,start,end,limit,discover_changed_paths,strict_node_history,include_merged_revisions,revprops,receiver,receiver_baton,pool);");
@@ -8189,7 +8428,7 @@ XS(_wrap_svn_ra_get_log2) {
     }
     arg1 = (svn_ra_session_t *)(argp1);
     {
-      arg2 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(1),
+      arg2 = svn_swig_pl_strings_to_array(ST(1),
         _global_pool);
     }
     ecode3 = SWIG_AsVal_long SWIG_PERL_CALL_ARGS_2(ST(2), &val3);
@@ -8223,11 +8462,11 @@ XS(_wrap_svn_ra_get_log2) {
     } 
     arg8 = (svn_boolean_t)(val8);
     {
-      arg9 = SvOK(ST(8)) ? (apr_array_header_t *) svn_swig_pl_strings_to_array(
+      arg9 = SvOK(ST(8)) ? svn_swig_pl_strings_to_array(
         ST(8), _global_pool) : NULL;
     }
     {
-      arg10 = svn_swig_pl_thunk_log_entry_receiver;
+      arg10 = (svn_log_entry_receiver_t) svn_swig_pl_thunk_log_entry_receiver;
       arg11 = ST(9);
     }
     if (items > 10) {
@@ -8313,6 +8552,7 @@ XS(_wrap_svn_ra_get_log) {
     
     {
       _global_pool = arg10 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 8) || (items > 9)) {
       SWIG_croak("Usage: svn_ra_get_log(session,paths,start,end,limit,discover_changed_paths,strict_node_history,receiver,receiver_baton,pool);");
@@ -8323,7 +8563,7 @@ XS(_wrap_svn_ra_get_log) {
     }
     arg1 = (svn_ra_session_t *)(argp1);
     {
-      arg2 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(1),
+      arg2 = svn_swig_pl_strings_to_array(ST(1),
         _global_pool);
     }
     ecode3 = SWIG_AsVal_long SWIG_PERL_CALL_ARGS_2(ST(2), &val3);
@@ -8352,7 +8592,7 @@ XS(_wrap_svn_ra_get_log) {
     } 
     arg7 = (svn_boolean_t)(val7);
     {
-      arg8 = svn_swig_pl_thunk_log_receiver;
+      arg8 = (svn_log_message_receiver_t) svn_swig_pl_thunk_log_receiver;
       arg9 = ST(7);
     }
     if (items > 8) {
@@ -8426,6 +8666,7 @@ XS(_wrap_svn_ra_check_path) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg4 = &temp4;
     if ((items < 3) || (items > 4)) {
@@ -8516,6 +8757,7 @@ XS(_wrap_svn_ra_stat) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg4 = &temp4;
     if ((items < 3) || (items > 4)) {
@@ -8596,6 +8838,7 @@ XS(_wrap_svn_ra_get_uuid2) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     if ((items < 1) || (items > 2)) {
@@ -8666,6 +8909,7 @@ XS(_wrap_svn_ra_get_uuid) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     if ((items < 1) || (items > 2)) {
@@ -8736,6 +8980,7 @@ XS(_wrap_svn_ra_get_repos_root2) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     if ((items < 1) || (items > 2)) {
@@ -8806,6 +9051,7 @@ XS(_wrap_svn_ra_get_repos_root) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     if ((items < 1) || (items > 2)) {
@@ -8886,6 +9132,7 @@ XS(_wrap_svn_ra_get_locations) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     if ((items < 4) || (items > 5)) {
@@ -8993,6 +9240,7 @@ XS(_wrap_svn_ra_get_location_segments) {
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 7) || (items > 8)) {
       SWIG_croak("Usage: svn_ra_get_location_segments(session,path,peg_revision,start_rev,end_rev,receiver,receiver_baton,pool);");
@@ -9109,6 +9357,7 @@ XS(_wrap_svn_ra_get_file_revs2) {
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 7) || (items > 8)) {
       SWIG_croak("Usage: svn_ra_get_file_revs2(session,path,start,end,include_merged_revisions,handler,handler_baton,pool);");
@@ -9222,6 +9471,7 @@ XS(_wrap_svn_ra_get_file_revs) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 6) || (items > 7)) {
       SWIG_croak("Usage: svn_ra_get_file_revs(session,path,start,end,handler,handler_baton,pool);");
@@ -9325,6 +9575,7 @@ XS(_wrap_svn_ra_lock) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 5) || (items > 6)) {
       SWIG_croak("Usage: svn_ra_lock(session,path_revs,comment,steal_lock,lock_func,lock_baton,pool);");
@@ -9348,7 +9599,7 @@ XS(_wrap_svn_ra_lock) {
     } 
     arg4 = (svn_boolean_t)(val4);
     {
-      arg5 = svn_swig_pl_ra_lock_callback;
+      arg5 = (svn_ra_lock_callback_t) svn_swig_pl_ra_lock_callback;
       arg6 = ST(4);
     }
     if (items > 5) {
@@ -9412,6 +9663,7 @@ XS(_wrap_svn_ra_unlock) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_ra_unlock(session,path_tokens,break_lock,lock_func,lock_baton,pool);");
@@ -9430,7 +9682,7 @@ XS(_wrap_svn_ra_unlock) {
     } 
     arg3 = (svn_boolean_t)(val3);
     {
-      arg4 = svn_swig_pl_ra_lock_callback;
+      arg4 = (svn_ra_lock_callback_t) svn_swig_pl_ra_lock_callback;
       arg5 = ST(3);
     }
     if (items > 4) {
@@ -9492,6 +9744,7 @@ XS(_wrap_svn_ra_get_lock) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     if ((items < 2) || (items > 3)) {
@@ -9572,6 +9825,7 @@ XS(_wrap_svn_ra_get_locks2) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     if ((items < 3) || (items > 4)) {
@@ -9656,6 +9910,7 @@ XS(_wrap_svn_ra_get_locks) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     if ((items < 2) || (items > 3)) {
@@ -9743,6 +9998,7 @@ XS(_wrap_svn_ra_replay_range) {
     
     {
       _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 8) || (items > 9)) {
       SWIG_croak("Usage: svn_ra_replay_range(session,start_revision,end_revision,low_water_mark,send_deltas,revstart_func,revfinish_func,replay_baton,pool);");
@@ -9862,6 +10118,7 @@ XS(_wrap_svn_ra_replay) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 5) || (items > 6)) {
       SWIG_croak("Usage: svn_ra_replay(session,revision,low_water_mark,send_deltas,editor,edit_baton,pool);");
@@ -9887,7 +10144,7 @@ XS(_wrap_svn_ra_replay) {
     } 
     arg4 = (svn_boolean_t)(val4);
     {
-      svn_delta_make_editor(&arg5, &arg6, ST(4), _global_pool);
+      svn_swig_pl_make_editor(&arg5, &arg6, ST(4), _global_pool);
     }
     if (items > 5) {
       
@@ -9957,6 +10214,7 @@ XS(_wrap_svn_ra_get_deleted_rev) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg5 = &temp5;
     if ((items < 4) || (items > 5)) {
@@ -10055,9 +10313,11 @@ XS(_wrap_svn_ra_get_inherited_props) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     if ((items < 3) || (items > 5)) {
@@ -10154,6 +10414,7 @@ XS(_wrap_svn_ra_has_capability) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     if ((items < 2) || (items > 3)) {
@@ -10226,6 +10487,7 @@ XS(_wrap_svn_ra_print_modules) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_ra_print_modules(output,pool);");
@@ -10233,6 +10495,7 @@ XS(_wrap_svn_ra_print_modules) {
     {
       apr_size_t len;
       char *buf;
+      apr_pool_t *pool;
       
       if (!SvOK(ST(0))) {
         arg1 = NULL;
@@ -10240,8 +10503,9 @@ XS(_wrap_svn_ra_print_modules) {
         buf = SvPV(ST(0), len);
         /* Another case of ugly pool handling, this should use the current
                    default pool, or make a new one if it doesn't exist yet */
-        arg1 = svn_stringbuf_ncreate(buf,len,
-          svn_swig_pl_make_pool ((SV *)NULL));
+        pool = svn_swig_pl_make_pool ((SV *)NULL);
+        SPAGAIN;
+        arg1 = svn_stringbuf_ncreate(buf,len, pool);
       } else {
         croak("Not a string");
       }
@@ -10296,6 +10560,7 @@ XS(_wrap_svn_ra_print_ra_libraries) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 2)) {
@@ -11843,6 +12108,7 @@ XS(_wrap_svn_ra_init_ra_libs) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 0) || (items > 1)) {
@@ -11905,6 +12171,7 @@ XS(_wrap_svn_ra_get_ra_library) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -11994,6 +12261,7 @@ XS(_wrap_svn_ra_reporter3_invoke_set_path) {
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 7) || (items > 8)) {
       SWIG_croak("Usage: svn_ra_reporter3_invoke_set_path(_obj,report_baton,path,revision,depth,start_empty,lock_token,pool);");
@@ -12099,6 +12367,7 @@ XS(_wrap_svn_ra_reporter3_invoke_delete_path) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_ra_reporter3_invoke_delete_path(_obj,report_baton,path,pool);");
@@ -12193,6 +12462,7 @@ XS(_wrap_svn_ra_reporter3_invoke_link_path) {
     
     {
       _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 8) || (items > 9)) {
       SWIG_croak("Usage: svn_ra_reporter3_invoke_link_path(_obj,report_baton,path,url,revision,depth,start_empty,lock_token,pool);");
@@ -12301,6 +12571,7 @@ XS(_wrap_svn_ra_reporter3_invoke_finish_report) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_ra_reporter3_invoke_finish_report(_obj,report_baton,pool);");
@@ -12367,6 +12638,7 @@ XS(_wrap_svn_ra_reporter3_invoke_abort_report) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_ra_reporter3_invoke_abort_report(_obj,report_baton,pool);");
@@ -12447,6 +12719,7 @@ XS(_wrap_svn_ra_reporter2_invoke_set_path) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 6) || (items > 7)) {
       SWIG_croak("Usage: svn_ra_reporter2_invoke_set_path(_obj,report_baton,path,revision,start_empty,lock_token,pool);");
@@ -12545,6 +12818,7 @@ XS(_wrap_svn_ra_reporter2_invoke_delete_path) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_ra_reporter2_invoke_delete_path(_obj,report_baton,path,pool);");
@@ -12636,6 +12910,7 @@ XS(_wrap_svn_ra_reporter2_invoke_link_path) {
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 7) || (items > 8)) {
       SWIG_croak("Usage: svn_ra_reporter2_invoke_link_path(_obj,report_baton,path,url,revision,start_empty,lock_token,pool);");
@@ -12737,6 +13012,7 @@ XS(_wrap_svn_ra_reporter2_invoke_finish_report) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_ra_reporter2_invoke_finish_report(_obj,report_baton,pool);");
@@ -12803,6 +13079,7 @@ XS(_wrap_svn_ra_reporter2_invoke_abort_report) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_ra_reporter2_invoke_abort_report(_obj,report_baton,pool);");
@@ -12879,6 +13156,7 @@ XS(_wrap_svn_ra_reporter_invoke_set_path) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 5) || (items > 6)) {
       SWIG_croak("Usage: svn_ra_reporter_invoke_set_path(_obj,report_baton,path,revision,start_empty,pool);");
@@ -12970,6 +13248,7 @@ XS(_wrap_svn_ra_reporter_invoke_delete_path) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_ra_reporter_invoke_delete_path(_obj,report_baton,path,pool);");
@@ -13057,6 +13336,7 @@ XS(_wrap_svn_ra_reporter_invoke_link_path) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 6) || (items > 7)) {
       SWIG_croak("Usage: svn_ra_reporter_invoke_link_path(_obj,report_baton,path,url,revision,start_empty,pool);");
@@ -13151,6 +13431,7 @@ XS(_wrap_svn_ra_reporter_invoke_finish_report) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_ra_reporter_invoke_finish_report(_obj,report_baton,pool);");
@@ -13217,6 +13498,7 @@ XS(_wrap_svn_ra_reporter_invoke_abort_report) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_ra_reporter_invoke_abort_report(_obj,report_baton,pool);");
@@ -13285,6 +13567,7 @@ XS(_wrap_svn_ra_callbacks2_invoke_open_tmp_file) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     if ((items < 2) || (items > 3)) {
@@ -13359,6 +13642,7 @@ XS(_wrap_svn_ra_callbacks_invoke_open_tmp_file) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     if ((items < 2) || (items > 3)) {
@@ -13438,6 +13722,7 @@ XS(_wrap_svn_ra_plugin_invoke_open) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     if ((items < 4) || (items > 5)) {
@@ -13454,7 +13739,7 @@ XS(_wrap_svn_ra_plugin_invoke_open) {
     }
     arg3 = (char *)(buf3);
     {
-      svn_ra_make_callbacks(&arg4, &arg5, ST(2), _global_pool);
+      svn_swig_pl_make_callbacks(&arg4, &arg5, ST(2), _global_pool);
     }
     {
       arg6 = svn_swig_pl_objs_to_hash_by_name (ST(3), "svn_config_t *",
@@ -13523,6 +13808,7 @@ XS(_wrap_svn_ra_plugin_invoke_get_latest_revnum) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg3 = &temp3;
     if ((items < 2) || (items > 3)) {
@@ -13604,6 +13890,7 @@ XS(_wrap_svn_ra_plugin_invoke_get_dated_revision) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg3 = &temp3;
     if ((items < 3) || (items > 4)) {
@@ -13695,6 +13982,7 @@ XS(_wrap_svn_ra_plugin_invoke_change_rev_prop) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 5) || (items > 6)) {
       SWIG_croak("Usage: svn_ra_plugin_invoke_change_rev_prop(_obj,session_baton,rev,name,value,pool);");
@@ -13791,6 +14079,7 @@ XS(_wrap_svn_ra_plugin_invoke_rev_proplist) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg4 = &temp4;
     if ((items < 3) || (items > 4)) {
@@ -13879,6 +14168,7 @@ XS(_wrap_svn_ra_plugin_invoke_rev_prop) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg5 = &temp5;
     if ((items < 4) || (items > 5)) {
@@ -13979,6 +14269,7 @@ XS(_wrap_svn_ra_plugin_invoke_get_commit_editor) {
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg3 = &temp3;
     arg4 = &temp4;
@@ -14082,6 +14373,7 @@ XS(_wrap_svn_ra_plugin_invoke_get_file) {
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg6 = &temp6;
     arg7 = &temp7;
@@ -14109,6 +14401,7 @@ XS(_wrap_svn_ra_plugin_invoke_get_file) {
     arg4 = (svn_revnum_t)(val4);
     {
       svn_swig_pl_make_stream (&arg5, ST(4));
+      SPAGAIN;
     }
     if (items > 5) {
       
@@ -14196,6 +14489,7 @@ XS(_wrap_svn_ra_plugin_invoke_get_dir) {
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg5 = &temp5;
     arg6 = &temp6;
@@ -14313,6 +14607,7 @@ XS(_wrap_svn_ra_plugin_invoke_do_update) {
     
     {
       _global_pool = arg10 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg3 = &temp3;
     arg4 = &temp4;
@@ -14344,7 +14639,7 @@ XS(_wrap_svn_ra_plugin_invoke_do_update) {
     } 
     arg7 = (svn_boolean_t)(val7);
     {
-      svn_delta_make_editor(&arg8, &arg9, ST(5), _global_pool);
+      svn_swig_pl_make_editor(&arg8, &arg9, ST(5), _global_pool);
     }
     if (items > 6) {
       
@@ -14435,6 +14730,7 @@ XS(_wrap_svn_ra_plugin_invoke_do_switch) {
     
     {
       _global_pool = arg11 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg3 = &temp3;
     arg4 = &temp4;
@@ -14471,7 +14767,7 @@ XS(_wrap_svn_ra_plugin_invoke_do_switch) {
     }
     arg8 = (char *)(buf8);
     {
-      svn_delta_make_editor(&arg9, &arg10, ST(6), _global_pool);
+      svn_swig_pl_make_editor(&arg9, &arg10, ST(6), _global_pool);
     }
     if (items > 7) {
       
@@ -14560,6 +14856,7 @@ XS(_wrap_svn_ra_plugin_invoke_do_status) {
     
     {
       _global_pool = arg10 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg3 = &temp3;
     arg4 = &temp4;
@@ -14591,7 +14888,7 @@ XS(_wrap_svn_ra_plugin_invoke_do_status) {
     } 
     arg7 = (svn_boolean_t)(val7);
     {
-      svn_delta_make_editor(&arg8, &arg9, ST(5), _global_pool);
+      svn_swig_pl_make_editor(&arg8, &arg9, ST(5), _global_pool);
     }
     if (items > 6) {
       
@@ -14685,6 +14982,7 @@ XS(_wrap_svn_ra_plugin_invoke_do_diff) {
     
     {
       _global_pool = arg12 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg3 = &temp3;
     arg4 = &temp4;
@@ -14726,7 +15024,7 @@ XS(_wrap_svn_ra_plugin_invoke_do_diff) {
     }
     arg9 = (char *)(buf9);
     {
-      svn_delta_make_editor(&arg10, &arg11, ST(7), _global_pool);
+      svn_swig_pl_make_editor(&arg10, &arg11, ST(7), _global_pool);
     }
     if (items > 8) {
       
@@ -14816,6 +15114,7 @@ XS(_wrap_svn_ra_plugin_invoke_get_log) {
     
     {
       _global_pool = arg10 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 8) || (items > 9)) {
       SWIG_croak("Usage: svn_ra_plugin_invoke_get_log(_obj,session_baton,paths,start,end,discover_changed_paths,strict_node_history,receiver,receiver_baton,pool);");
@@ -14830,7 +15129,7 @@ XS(_wrap_svn_ra_plugin_invoke_get_log) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_ra_plugin_invoke_get_log" "', argument " "2"" of type '" "void *""'"); 
     }
     {
-      arg3 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(2),
+      arg3 = svn_swig_pl_strings_to_array(ST(2),
         _global_pool);
     }
     ecode4 = SWIG_AsVal_long SWIG_PERL_CALL_ARGS_2(ST(3), &val4);
@@ -14854,7 +15153,7 @@ XS(_wrap_svn_ra_plugin_invoke_get_log) {
     } 
     arg7 = (svn_boolean_t)(val7);
     {
-      arg8 = svn_swig_pl_thunk_log_receiver;
+      arg8 = (svn_log_message_receiver_t) svn_swig_pl_thunk_log_receiver;
       arg9 = ST(7);
     }
     if (items > 8) {
@@ -14930,6 +15229,7 @@ XS(_wrap_svn_ra_plugin_invoke_check_path) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg5 = &temp5;
     if ((items < 4) || (items > 5)) {
@@ -15021,6 +15321,7 @@ XS(_wrap_svn_ra_plugin_invoke_get_uuid) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg3 = &temp3;
     if ((items < 2) || (items > 3)) {
@@ -15099,6 +15400,7 @@ XS(_wrap_svn_ra_plugin_invoke_get_repos_root) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg3 = &temp3;
     if ((items < 2) || (items > 3)) {
@@ -15187,6 +15489,7 @@ XS(_wrap_svn_ra_plugin_invoke_get_locations) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg3 = &temp3;
     if ((items < 5) || (items > 6)) {
@@ -15299,6 +15602,7 @@ XS(_wrap_svn_ra_plugin_invoke_get_file_revs) {
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 7) || (items > 8)) {
       SWIG_croak("Usage: svn_ra_plugin_invoke_get_file_revs(_obj,session_baton,path,start,end,handler,handler_baton,pool);");
@@ -15441,6 +15745,7 @@ XS(_wrap_svn_ra_invoke_get_wc_prop_func) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg5 = &temp5;
     if ((items < 4) || (items > 5)) {
@@ -15540,6 +15845,7 @@ XS(_wrap_svn_ra_invoke_set_wc_prop_func) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 5) || (items > 6)) {
       SWIG_croak("Usage: svn_ra_invoke_set_wc_prop_func(_obj,baton,path,name,value,pool);");
@@ -15640,6 +15946,7 @@ XS(_wrap_svn_ra_invoke_push_wc_prop_func) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 5) || (items > 6)) {
       SWIG_croak("Usage: svn_ra_invoke_push_wc_prop_func(_obj,baton,path,name,value,pool);");
@@ -15738,6 +16045,7 @@ XS(_wrap_svn_ra_invoke_invalidate_wc_props_func) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_ra_invoke_invalidate_wc_props_func(_obj,baton,path,name,pool);");
@@ -15822,6 +16130,7 @@ XS(_wrap_svn_ra_invoke_get_wc_contents_func) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg3 = &temp3;
     if ((items < 3) || (items > 4)) {
@@ -15868,7 +16177,11 @@ XS(_wrap_svn_ra_invoke_get_wc_contents_func) {
       }
     }
     {
-      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = svn_swig_pl_from_stream(*arg3); argvi++  ;
+      SV *tmp;
+      PUTBACK;
+      tmp = svn_swig_pl_from_stream(*arg3);
+      SPAGAIN;
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = tmp; argvi++  ;
     }
     
     
@@ -15969,6 +16282,7 @@ XS(_wrap_svn_ra_invoke_get_client_string_func) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg3 = &temp3;
     if ((items < 2) || (items > 3)) {
@@ -16061,6 +16375,7 @@ XS(_wrap_svn_ra_invoke_file_rev_handler) {
     
     {
       _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg6 = &temp6;
     arg7 = &temp7;
@@ -16179,6 +16494,7 @@ XS(_wrap_svn_ra_invoke_lock_callback) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 6) || (items > 7)) {
       SWIG_croak("Usage: svn_ra_invoke_lock_callback(_obj,baton,path,do_lock,lock,ra_err,pool);");
@@ -16277,6 +16593,7 @@ XS(_wrap_svn_ra_invoke_progress_notify_func) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_ra_invoke_progress_notify_func(_obj,progress,total,baton,pool);");
@@ -16351,6 +16668,7 @@ XS(_wrap_svn_ra_invoke_replay_revstart_callback) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg4 = &temp4;
     arg5 = &temp5;
@@ -16450,6 +16768,7 @@ XS(_wrap_svn_ra_invoke_replay_revfinish_callback) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 5) || (items > 6)) {
       SWIG_croak("Usage: svn_ra_invoke_replay_revfinish_callback(_obj,revision,replay_baton,editor,edit_baton,rev_props,pool);");
@@ -16470,7 +16789,7 @@ XS(_wrap_svn_ra_invoke_replay_revfinish_callback) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_ra_invoke_replay_revfinish_callback" "', argument " "3"" of type '" "void *""'"); 
     }
     {
-      svn_delta_make_editor(&arg4, &arg5, ST(3), _global_pool);
+      svn_swig_pl_make_editor(&arg4, &arg5, ST(3), _global_pool);
     }
     res6 = SWIG_ConvertPtr(ST(4), &argp6,SWIGTYPE_p_apr_hash_t, 0 |  0 );
     if (!SWIG_IsOK(res6)) {
@@ -16519,6 +16838,271 @@ XS(_wrap_svn_ra_invoke_replay_revfinish_callback) {
 }
 
 
+XS(_wrap_svn_ra_invoke_check_tunnel_func) {
+  {
+    svn_ra_check_tunnel_func_t arg1 = (svn_ra_check_tunnel_func_t) 0 ;
+    void *arg2 = (void *) 0 ;
+    char *arg3 = (char *) 0 ;
+    int res2 ;
+    int res3 ;
+    char *buf3 = 0 ;
+    int alloc3 = 0 ;
+    int argvi = 0;
+    svn_boolean_t result;
+    dXSARGS;
+    
+    if ((items < 3) || (items > 3)) {
+      SWIG_croak("Usage: svn_ra_invoke_check_tunnel_func(_obj,tunnel_baton,tunnel_name);");
+    }
+    {
+      int res = SWIG_ConvertFunctionPtr(ST(0), (void**)(&arg1), SWIGTYPE_p_f_p_void_p_q_const__char__int);
+      if (!SWIG_IsOK(res)) {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_ra_invoke_check_tunnel_func" "', argument " "1"" of type '" "svn_ra_check_tunnel_func_t""'"); 
+      }
+    }
+    res2 = SWIG_ConvertPtr(ST(1),SWIG_as_voidptrptr(&arg2), 0, 0);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_ra_invoke_check_tunnel_func" "', argument " "2"" of type '" "void *""'"); 
+    }
+    res3 = SWIG_AsCharPtrAndSize(ST(2), &buf3, NULL, &alloc3);
+    if (!SWIG_IsOK(res3)) {
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_ra_invoke_check_tunnel_func" "', argument " "3"" of type '" "char const *""'");
+    }
+    arg3 = (char *)(buf3);
+    {
+      result = (svn_boolean_t)svn_ra_invoke_check_tunnel_func(arg1,arg2,(char const *)arg3);
+      
+      
+      
+    }
+    ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
+    
+    
+    if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+    XSRETURN(argvi);
+  fail:
+    
+    
+    if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_svn_ra_invoke_close_tunnel_func) {
+  {
+    svn_ra_close_tunnel_func_t arg1 = (svn_ra_close_tunnel_func_t) 0 ;
+    void *arg2 = (void *) 0 ;
+    void *arg3 = (void *) 0 ;
+    int res2 ;
+    int res3 ;
+    int argvi = 0;
+    dXSARGS;
+    
+    if ((items < 3) || (items > 3)) {
+      SWIG_croak("Usage: svn_ra_invoke_close_tunnel_func(_obj,close_baton,tunnel_baton);");
+    }
+    {
+      int res = SWIG_ConvertFunctionPtr(ST(0), (void**)(&arg1), SWIGTYPE_p_f_p_void_p_void__void);
+      if (!SWIG_IsOK(res)) {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_ra_invoke_close_tunnel_func" "', argument " "1"" of type '" "svn_ra_close_tunnel_func_t""'"); 
+      }
+    }
+    res2 = SWIG_ConvertPtr(ST(1),SWIG_as_voidptrptr(&arg2), 0, 0);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_ra_invoke_close_tunnel_func" "', argument " "2"" of type '" "void *""'"); 
+    }
+    res3 = SWIG_ConvertPtr(ST(2),SWIG_as_voidptrptr(&arg3), 0, 0);
+    if (!SWIG_IsOK(res3)) {
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_ra_invoke_close_tunnel_func" "', argument " "3"" of type '" "void *""'"); 
+    }
+    {
+      svn_ra_invoke_close_tunnel_func(arg1,arg2,arg3);
+      
+      
+      
+    }
+    ST(argvi) = sv_newmortal();
+    
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_svn_ra_invoke_open_tunnel_func) {
+  {
+    svn_ra_open_tunnel_func_t arg1 = (svn_ra_open_tunnel_func_t) 0 ;
+    svn_stream_t **arg2 = (svn_stream_t **) 0 ;
+    svn_stream_t **arg3 = (svn_stream_t **) 0 ;
+    svn_ra_close_tunnel_func_t *arg4 = (svn_ra_close_tunnel_func_t *) 0 ;
+    void **arg5 = (void **) 0 ;
+    void *arg6 = (void *) 0 ;
+    char *arg7 = (char *) 0 ;
+    char *arg8 = (char *) 0 ;
+    char *arg9 = (char *) 0 ;
+    int arg10 ;
+    svn_cancel_func_t arg11 = (svn_cancel_func_t) 0 ;
+    void *arg12 = (void *) 0 ;
+    apr_pool_t *arg13 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    svn_stream_t *temp2 ;
+    svn_stream_t *temp3 ;
+    svn_ra_close_tunnel_func_t temp4 ;
+    void *temp5 ;
+    int res6 ;
+    int res7 ;
+    char *buf7 = 0 ;
+    int alloc7 = 0 ;
+    int res8 ;
+    char *buf8 = 0 ;
+    int alloc8 = 0 ;
+    int res9 ;
+    char *buf9 = 0 ;
+    int alloc9 = 0 ;
+    int val10 ;
+    int ecode10 = 0 ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg13 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    arg2 = &temp2;
+    arg3 = &temp3;
+    arg4 = &temp4;
+    arg5 = &temp5;
+    if ((items < 7) || (items > 8)) {
+      SWIG_croak("Usage: svn_ra_invoke_open_tunnel_func(_obj,tunnel_baton,tunnel_name,user,hostname,port,cancel_func,cancel_baton,pool);");
+    }
+    {
+      int res = SWIG_ConvertFunctionPtr(ST(0), (void**)(&arg1), SWIGTYPE_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t);
+      if (!SWIG_IsOK(res)) {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_ra_invoke_open_tunnel_func" "', argument " "1"" of type '" "svn_ra_open_tunnel_func_t""'"); 
+      }
+    }
+    res6 = SWIG_ConvertPtr(ST(1),SWIG_as_voidptrptr(&arg6), 0, 0);
+    if (!SWIG_IsOK(res6)) {
+      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "svn_ra_invoke_open_tunnel_func" "', argument " "6"" of type '" "void *""'"); 
+    }
+    res7 = SWIG_AsCharPtrAndSize(ST(2), &buf7, NULL, &alloc7);
+    if (!SWIG_IsOK(res7)) {
+      SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "svn_ra_invoke_open_tunnel_func" "', argument " "7"" of type '" "char const *""'");
+    }
+    arg7 = (char *)(buf7);
+    res8 = SWIG_AsCharPtrAndSize(ST(3), &buf8, NULL, &alloc8);
+    if (!SWIG_IsOK(res8)) {
+      SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "svn_ra_invoke_open_tunnel_func" "', argument " "8"" of type '" "char const *""'");
+    }
+    arg8 = (char *)(buf8);
+    res9 = SWIG_AsCharPtrAndSize(ST(4), &buf9, NULL, &alloc9);
+    if (!SWIG_IsOK(res9)) {
+      SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "svn_ra_invoke_open_tunnel_func" "', argument " "9"" of type '" "char const *""'");
+    }
+    arg9 = (char *)(buf9);
+    ecode10 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(5), &val10);
+    if (!SWIG_IsOK(ecode10)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode10), "in method '" "svn_ra_invoke_open_tunnel_func" "', argument " "10"" of type '" "int""'");
+    } 
+    arg10 = (int)(val10);
+    {
+      arg11 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg12 = ST(6);
+    }
+    if (items > 7) {
+      
+    }
+    {
+      result = (svn_error_t *)svn_ra_invoke_open_tunnel_func(arg1,arg2,arg3,arg4,arg5,arg6,(char const *)arg7,(char const *)arg8,(char const *)arg9,arg10,arg11,arg12,arg13);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    {
+      SV *tmp;
+      PUTBACK;
+      tmp = svn_swig_pl_from_stream(*arg2);
+      SPAGAIN;
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = tmp; argvi++  ;
+    }
+    {
+      SV *tmp;
+      PUTBACK;
+      tmp = svn_swig_pl_from_stream(*arg3);
+      SPAGAIN;
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = tmp; argvi++  ;
+    }
+    {
+      /* FIXME: Missing argout typemap: svn_ra_invoke_open_tunnel_func arg 4 (svn_ra_close_tunnel_func_t *) */
+      
+      
+      
+      
+      SWIG_exception(SWIG_ValueError, "svn_ra_invoke_open_tunnel_func is not implemented yet");
+      
+    }
+    {
+      /* FIXME: Missing argout typemap: svn_ra_invoke_open_tunnel_func arg 5 (void **) */
+      
+      
+      
+      
+      SWIG_exception(SWIG_ValueError, "svn_ra_invoke_open_tunnel_func is not implemented yet");
+      
+    }
+    
+    
+    
+    
+    
+    
+    if (alloc7 == SWIG_NEWOBJ) free((char*)buf7);
+    if (alloc8 == SWIG_NEWOBJ) free((char*)buf8);
+    if (alloc9 == SWIG_NEWOBJ) free((char*)buf9);
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    
+    
+    
+    
+    if (alloc7 == SWIG_NEWOBJ) free((char*)buf7);
+    if (alloc8 == SWIG_NEWOBJ) free((char*)buf8);
+    if (alloc9 == SWIG_NEWOBJ) free((char*)buf9);
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_svn_ra_invoke_init_func) {
   {
     svn_ra_init_func_t arg1 = (svn_ra_init_func_t) 0 ;
@@ -16534,6 +17118,7 @@ XS(_wrap_svn_ra_invoke_init_func) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 4)) {
       SWIG_croak("Usage: svn_ra_invoke_init_func(_obj,abi_version,pool,hash);");
@@ -16554,8 +17139,10 @@ XS(_wrap_svn_ra_invoke_init_func) {
     }
     if (items > 3) {
       {
-        if (_global_pool == NULL)
-        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        if (_global_pool == NULL) {
+          _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+          SPAGAIN;
+        }
         arg4 = svn_swig_pl_hash_to_prophash(ST(3), _global_pool);  
       }
     }
@@ -16610,6 +17197,7 @@ static swig_type_info _swigt__p_f_apr_off_t_apr_off_t_p_void_p_apr_pool_t__void
 static swig_type_info _swigt__p_f_int_p_apr_pool_t_p_apr_hash_t__p_svn_error_t = {"_p_f_int_p_apr_pool_t_p_apr_hash_t__p_svn_error_t", "struct svn_error_t *(*)(int,apr_pool_t *,apr_hash_t *)|svn_ra_init_func_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|struct svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_p_apr_file_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_apr_file_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(apr_file_t **,void *,apr_pool_t *)|struct svn_error_t *(*)(apr_file_t **,void *,apr_pool_t *)", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_ra_open_tunnel_func_t|struct svn_error_t *(*)(svn_stream_t **,svn_stream_t **,svn_ra_close_tunnel_func_t *,void **,void *,char const *,char const *,char const *,int,svn_cancel_func_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_p_void_p_q_const__char_p_q_const__svn_ra_callbacks_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_void_p_q_const__char_p_q_const__svn_ra_callbacks_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void **,char const *,svn_ra_callbacks_t const *,void *,apr_hash_t *,apr_pool_t *)|svn_error_t *(*)(void **,char const *,svn_ra_callbacks_t const *,void *,apr_hash_t *,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_commit_callback2_t|struct svn_error_t *(*)(svn_commit_info_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_location_segment_t *,void *,apr_pool_t *)|svn_location_segment_receiver_t", 0, 0, (void*)0, 0};
@@ -16626,6 +17214,7 @@ static swig_type_info _swigt__p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void
 static swig_type_info _swigt__p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_ra_reporter_t const **,void **,svn_revnum_t,char const *,svn_boolean_t,svn_boolean_t,char const *,svn_delta_editor_t const *,void *,apr_pool_t *)|struct svn_error_t *(*)(void *,svn_ra_reporter_t const **,void **,svn_revnum_t,char const *,svn_boolean_t,svn_boolean_t,char const *,svn_delta_editor_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_p_svn_stream_t_p_q_const__svn_checksum_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_svn_stream_t_p_q_const__svn_checksum_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_stream_t **,svn_checksum_t const *,apr_pool_t *)|svn_ra_get_wc_contents_func_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__apr_array_header_t_svn_revnum_t_svn_revnum_t_svn_boolean_t_svn_boolean_t_svn_log_message_receiver_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__apr_array_header_t_svn_revnum_t_svn_revnum_t_svn_boolean_t_svn_boolean_t_svn_log_message_receiver_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_array_header_t const *,svn_revnum_t,svn_revnum_t,svn_boolean_t,svn_boolean_t,svn_log_message_receiver_t,void *,apr_pool_t *)|struct svn_error_t *(*)(void *,apr_array_header_t const *,svn_revnum_t,svn_revnum_t,svn_boolean_t,svn_boolean_t,svn_log_message_receiver_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_f_p_void_p_q_const__char__int = {"_p_f_p_void_p_q_const__char__int", "int (*)(void *,char const *)|svn_ra_check_tunnel_func_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,apr_pool_t *)|struct svn_error_t *(*)(void *,char const *,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,char const *,apr_pool_t *)|svn_ra_invalidate_wc_props_func_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,char const *,svn_string_t const **,apr_pool_t *)|svn_ra_get_wc_prop_func_t", 0, 0, (void*)0, 0};
@@ -16647,6 +17236,7 @@ static swig_type_info _swigt__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_e
 static swig_type_info _swigt__p_f_p_void_p_svn_revnum_t__p_svn_error_t = {"_p_f_p_void_p_svn_revnum_t__p_svn_error_t", "svn_ra_get_latest_revnum_func_t|struct svn_error_t *(*)(void *,svn_revnum_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_svn_revnum_t_apr_time_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_revnum_t_apr_time_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_revnum_t *,apr_time_t,apr_pool_t *)|struct svn_error_t *(*)(void *,svn_revnum_t *,apr_time_t,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_svn_revnum_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_revnum_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_revnum_t *,apr_pool_t *)|struct svn_error_t *(*)(void *,svn_revnum_t *,apr_pool_t *)", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_f_p_void_p_void__void = {"_p_f_p_void_p_void__void", "svn_ra_close_tunnel_func_t|void (*)(void *,void *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_revnum_t,apr_hash_t **,apr_pool_t *)|svn_error_t *(*)(void *,svn_revnum_t,apr_hash_t **,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_svn_revnum_t_p_q_const__char_p_p_svn_string_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_svn_revnum_t_p_q_const__char_p_p_svn_string_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_revnum_t,char const *,svn_string_t **,apr_pool_t *)|svn_error_t *(*)(void *,svn_revnum_t,char const *,svn_string_t **,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_svn_revnum_t_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_svn_revnum_t_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_revnum_t,char const *,svn_string_t const *,apr_pool_t *)|svn_error_t *(*)(void *,svn_revnum_t,char const *,svn_string_t const *,apr_pool_t *)", 0, 0, (void*)0, 0};
@@ -16661,6 +17251,7 @@ static swig_type_info _swigt__p_p_apr_file_t = {"_p_p_apr_file_t", "apr_file_t *
 static swig_type_info _swigt__p_p_apr_hash_t = {"_p_p_apr_hash_t", "apr_hash_t **|svn_mergeinfo_catalog_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_char = {"_p_p_char", "char **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t = {"_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t", "svn_txdelta_window_handler_t *|struct svn_error_t *(**)(svn_txdelta_window_t *,void *)", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_p_f_p_void_p_void__void = {"_p_p_f_p_void_p_void__void", "svn_ra_close_tunnel_func_t *|void (**)(void *,void *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_svn_delta_editor_t = {"_p_p_svn_delta_editor_t", "struct svn_delta_editor_t **|svn_delta_editor_t **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_svn_dirent_t = {"_p_p_svn_dirent_t", "struct svn_dirent_t **|svn_dirent_t **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_svn_lock_t = {"_p_p_svn_lock_t", "struct svn_lock_t **|svn_lock_t **", 0, 0, (void*)0, 0};
@@ -16761,6 +17352,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_f_int_p_apr_pool_t_p_apr_hash_t__p_svn_error_t,
   &_swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_p_apr_file_t_p_void_p_apr_pool_t__p_svn_error_t,
+  &_swigt__p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_p_void_p_q_const__char_p_q_const__svn_ra_callbacks_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t,
@@ -16777,6 +17369,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_p_svn_stream_t_p_q_const__svn_checksum_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_q_const__apr_array_header_t_svn_revnum_t_svn_revnum_t_svn_boolean_t_svn_boolean_t_svn_log_message_receiver_t_p_void_p_apr_pool_t__p_svn_error_t,
+  &_swigt__p_f_p_void_p_q_const__char__int,
   &_swigt__p_f_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t,
@@ -16798,6 +17391,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_f_p_void_p_svn_revnum_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_svn_revnum_t_apr_time_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_svn_revnum_t_p_apr_pool_t__p_svn_error_t,
+  &_swigt__p_f_p_void_p_void__void,
   &_swigt__p_f_p_void_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_svn_revnum_t_p_q_const__char_p_p_svn_string_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_svn_revnum_t_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t,
@@ -16812,6 +17406,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_p_apr_hash_t,
   &_swigt__p_p_char,
   &_swigt__p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t,
+  &_swigt__p_p_f_p_void_p_void__void,
   &_swigt__p_p_svn_delta_editor_t,
   &_swigt__p_p_svn_dirent_t,
   &_swigt__p_p_svn_lock_t,
@@ -16912,6 +17507,7 @@ static swig_cast_info _swigc__p_f_apr_off_t_apr_off_t_p_void_p_apr_pool_t__void[
 static swig_cast_info _swigc__p_f_int_p_apr_pool_t_p_apr_hash_t__p_svn_error_t[] = {  {&_swigt__p_f_int_p_apr_pool_t_p_apr_hash_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_p_apr_file_t_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_p_apr_file_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_p_void_p_q_const__char_p_q_const__svn_ra_callbacks_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_p_void_p_q_const__char_p_q_const__svn_ra_callbacks_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -16928,6 +17524,7 @@ static swig_cast_info _swigc__p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void
 static swig_cast_info _swigc__p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_p_svn_stream_t_p_q_const__svn_checksum_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_p_svn_stream_t_p_q_const__svn_checksum_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_q_const__apr_array_header_t_svn_revnum_t_svn_revnum_t_svn_boolean_t_svn_boolean_t_svn_log_message_receiver_t_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__apr_array_header_t_svn_revnum_t_svn_revnum_t_svn_boolean_t_svn_boolean_t_svn_log_message_receiver_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_f_p_void_p_q_const__char__int[] = {  {&_swigt__p_f_p_void_p_q_const__char__int, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -16949,6 +17546,7 @@ static swig_cast_info _swigc__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_e
 static swig_cast_info _swigc__p_f_p_void_p_svn_revnum_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_svn_revnum_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_svn_revnum_t_apr_time_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_svn_revnum_t_apr_time_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_svn_revnum_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_svn_revnum_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_f_p_void_p_void__void[] = {  {&_swigt__p_f_p_void_p_void__void, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_svn_revnum_t_p_q_const__char_p_p_svn_string_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_svn_revnum_t_p_q_const__char_p_p_svn_string_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_svn_revnum_t_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_svn_revnum_t_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -16963,6 +17561,7 @@ static swig_cast_info _swigc__p_p_apr_file_t[] = {  {&_swigt__p_p_apr_file_t, 0,
 static swig_cast_info _swigc__p_p_apr_hash_t[] = {  {&_swigt__p_p_apr_hash_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_char[] = {  {&_swigt__p_p_char, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t[] = {  {&_swigt__p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_p_f_p_void_p_void__void[] = {  {&_swigt__p_p_f_p_void_p_void__void, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_svn_delta_editor_t[] = {  {&_swigt__p_p_svn_delta_editor_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_svn_dirent_t[] = {  {&_swigt__p_p_svn_dirent_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_svn_lock_t[] = {  {&_swigt__p_p_svn_lock_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -17063,6 +17662,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_f_int_p_apr_pool_t_p_apr_hash_t__p_svn_error_t,
   _swigc__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_p_apr_file_t_p_void_p_apr_pool_t__p_svn_error_t,
+  _swigc__p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_p_void_p_q_const__char_p_q_const__svn_ra_callbacks_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t,
@@ -17079,6 +17679,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_p_p_svn_stream_t_p_q_const__svn_checksum_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_p_q_const__apr_array_header_t_svn_revnum_t_svn_revnum_t_svn_boolean_t_svn_boolean_t_svn_log_message_receiver_t_p_void_p_apr_pool_t__p_svn_error_t,
+  _swigc__p_f_p_void_p_q_const__char__int,
   _swigc__p_f_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t,
@@ -17100,6 +17701,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_f_p_void_p_svn_revnum_t__p_svn_error_t,
   _swigc__p_f_p_void_p_svn_revnum_t_apr_time_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_p_svn_revnum_t_p_apr_pool_t__p_svn_error_t,
+  _swigc__p_f_p_void_p_void__void,
   _swigc__p_f_p_void_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_svn_revnum_t_p_q_const__char_p_p_svn_string_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_svn_revnum_t_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t,
@@ -17114,6 +17716,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_p_apr_hash_t,
   _swigc__p_p_char,
   _swigc__p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t,
+  _swigc__p_p_f_p_void_p_void__void,
   _swigc__p_p_svn_delta_editor_t,
   _swigc__p_p_svn_dirent_t,
   _swigc__p_p_svn_lock_t,
@@ -17275,6 +17878,12 @@ static swig_command_info swig_commands[] = {
 {"SVN::_Ra::svn_ra_callbacks2_t_get_client_string_get", _wrap_svn_ra_callbacks2_t_get_client_string_get},
 {"SVN::_Ra::svn_ra_callbacks2_t_get_wc_contents_set", _wrap_svn_ra_callbacks2_t_get_wc_contents_set},
 {"SVN::_Ra::svn_ra_callbacks2_t_get_wc_contents_get", _wrap_svn_ra_callbacks2_t_get_wc_contents_get},
+{"SVN::_Ra::svn_ra_callbacks2_t_check_tunnel_func_set", _wrap_svn_ra_callbacks2_t_check_tunnel_func_set},
+{"SVN::_Ra::svn_ra_callbacks2_t_check_tunnel_func_get", _wrap_svn_ra_callbacks2_t_check_tunnel_func_get},
+{"SVN::_Ra::svn_ra_callbacks2_t_open_tunnel_func_set", _wrap_svn_ra_callbacks2_t_open_tunnel_func_set},
+{"SVN::_Ra::svn_ra_callbacks2_t_open_tunnel_func_get", _wrap_svn_ra_callbacks2_t_open_tunnel_func_get},
+{"SVN::_Ra::svn_ra_callbacks2_t_tunnel_baton_set", _wrap_svn_ra_callbacks2_t_tunnel_baton_set},
+{"SVN::_Ra::svn_ra_callbacks2_t_tunnel_baton_get", _wrap_svn_ra_callbacks2_t_tunnel_baton_get},
 {"SVN::_Ra::new_svn_ra_callbacks2_t", _wrap_new_svn_ra_callbacks2_t},
 {"SVN::_Ra::delete_svn_ra_callbacks2_t", _wrap_delete_svn_ra_callbacks2_t},
 {"SVN::_Ra::svn_ra_callbacks_t_open_tmp_file_set", _wrap_svn_ra_callbacks_t_open_tmp_file_set},
@@ -17446,23 +18055,26 @@ static swig_command_info swig_commands[] = {
 {"SVN::_Ra::svn_ra_invoke_progress_notify_func", _wrap_svn_ra_invoke_progress_notify_func},
 {"SVN::_Ra::svn_ra_invoke_replay_revstart_callback", _wrap_svn_ra_invoke_replay_revstart_callback},
 {"SVN::_Ra::svn_ra_invoke_replay_revfinish_callback", _wrap_svn_ra_invoke_replay_revfinish_callback},
+{"SVN::_Ra::svn_ra_invoke_check_tunnel_func", _wrap_svn_ra_invoke_check_tunnel_func},
+{"SVN::_Ra::svn_ra_invoke_close_tunnel_func", _wrap_svn_ra_invoke_close_tunnel_func},
+{"SVN::_Ra::svn_ra_invoke_open_tunnel_func", _wrap_svn_ra_invoke_open_tunnel_func},
 {"SVN::_Ra::svn_ra_invoke_init_func", _wrap_svn_ra_invoke_init_func},
 {0,0}
 };
 /* -----------------------------------------------------------------------------
  * Type initialization:
- * This problem is tough by the requirement that no dynamic 
- * memory is used. Also, since swig_type_info structures store pointers to 
+ * This problem is tough by the requirement that no dynamic
+ * memory is used. Also, since swig_type_info structures store pointers to
  * swig_cast_info structures and swig_cast_info structures store pointers back
- * to swig_type_info structures, we need some lookup code at initialization. 
- * The idea is that swig generates all the structures that are needed. 
- * The runtime then collects these partially filled structures. 
- * The SWIG_InitializeModule function takes these initial arrays out of 
+ * to swig_type_info structures, we need some lookup code at initialization.
+ * The idea is that swig generates all the structures that are needed.
+ * The runtime then collects these partially filled structures.
+ * The SWIG_InitializeModule function takes these initial arrays out of
  * swig_module, and does all the lookup, filling in the swig_module.types
  * array with the correct data and linking the correct swig_cast_info
  * structures together.
  *
- * The generated swig_type_info structures are assigned staticly to an initial 
+ * The generated swig_type_info structures are assigned staticly to an initial
  * array. We just loop through that array, and handle each type individually.
  * First we lookup if this type has been already loaded, and if so, use the
  * loaded structure instead of the generated one. Then we have to fill in the
@@ -17472,17 +18084,17 @@ static swig_command_info swig_commands[] = {
  * a column is one of the swig_cast_info structures for that type.
  * The cast_initial array is actually an array of arrays, because each row has
  * a variable number of columns. So to actually build the cast linked list,
- * we find the array of casts associated with the type, and loop through it 
+ * we find the array of casts associated with the type, and loop through it
  * adding the casts to the list. The one last trick we need to do is making
  * sure the type pointer in the swig_cast_info struct is correct.
  *
- * First off, we lookup the cast->type name to see if it is already loaded. 
+ * First off, we lookup the cast->type name to see if it is already loaded.
  * There are three cases to handle:
  *  1) If the cast->type has already been loaded AND the type we are adding
  *     casting info to has not been loaded (it is in this module), THEN we
  *     replace the cast->type pointer with the type pointer that has already
  *     been loaded.
- *  2) If BOTH types (the one we are adding casting info to, and the 
+ *  2) If BOTH types (the one we are adding casting info to, and the
  *     cast->type) are loaded, THEN the cast info has already been loaded by
  *     the previous module so we just ignore it.
  *  3) Finally, if cast->type has not already been loaded, then we add that
@@ -17545,7 +18157,7 @@ SWIG_InitializeModule(void *clientdata) {
     module_head->next = &swig_module;
   }
   
-  /* When multiple interpeters are used, a module could have already been initialized in
+  /* When multiple interpreters are used, a module could have already been initialized in
        a different interpreter, but not yet have a pointer in this interpreter.
        In this case, we do not want to continue adding types... everything should be
        set up already */
@@ -17744,52 +18356,52 @@ XS(SWIG_init) {
     SvREADONLY_on(sv);
   }
   
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_RA_CAPABILITY_DEPTH", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("depth"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_RA_CAPABILITY_MERGEINFO", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("mergeinfo"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_RA_CAPABILITY_LOG_REVPROPS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("log-revprops"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_RA_CAPABILITY_PARTIAL_REPLAY", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("partial-replay"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_RA_CAPABILITY_COMMIT_REVPROPS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("commit-revprops"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_RA_CAPABILITY_ATOMIC_REVPROPS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("atomic-revprops"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_RA_CAPABILITY_INHERITED_PROPS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("inherited-props"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_RA_CAPABILITY_EPHEMERAL_TXNPROPS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("ephemeral-txnprops"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_RA_CAPABILITY_GET_FILE_REVS_REVERSE", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("get-file-revs-reversed"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_RA_ABI_VERSION", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(2)));
     SvREADONLY_on(sv);
diff --git a/subversion/bindings/swig/perl/native/svn_repos.c b/subversion/bindings/swig/perl/native/svn_repos.c
index 08a8d95..8eb2cc0 100644
--- a/subversion/bindings/swig/perl/native/svn_repos.c
+++ b/subversion/bindings/swig/perl/native/svn_repos.c
@@ -1,11 +1,11 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
- * 
- * This file is not intended to be easily readable and contains a number of 
+ * Version 2.0.12
+ *
+ * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
- * changes to this file unless you know what you are doing--modify the SWIG 
- * interface file instead. 
+ * changes to this file unless you know what you are doing--modify the SWIG
+ * interface file instead.
  * ----------------------------------------------------------------------------- */
 
 #define SWIGPERL
@@ -42,28 +42,28 @@
 #ifndef SWIGUNUSED
 # if defined(__GNUC__)
 #   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__)) 
+#     define SWIGUNUSED __attribute__ ((__unused__))
 #   else
 #     define SWIGUNUSED
 #   endif
 # elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__)) 
+#   define SWIGUNUSED __attribute__ ((__unused__))
 # else
-#   define SWIGUNUSED 
+#   define SWIGUNUSED
 # endif
 #endif
 
 #ifndef SWIG_MSC_UNSUPPRESS_4505
 # if defined(_MSC_VER)
 #   pragma warning(disable : 4505) /* unreferenced local function has been removed */
-# endif 
+# endif
 #endif
 
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
 # else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
 # endif
 #endif
 
@@ -106,7 +106,7 @@
 #   define SWIGSTDCALL __stdcall
 # else
 #   define SWIGSTDCALL
-# endif 
+# endif
 #endif
 
 /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
@@ -144,7 +144,7 @@
   You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for
   creating a static or dynamic library from the SWIG runtime code.
   In 99.9% of the cases, SWIG just needs to declare them as 'static'.
-  
+
   But only do this if strictly necessary, ie, if you have problems
   with your compiler or suchlike.
 */
@@ -170,16 +170,16 @@
 #define SWIG_POINTER_OWN           0x1
 
 
-/* 
+/*
    Flags/methods for returning states.
-   
-   The SWIG conversion methods, as ConvertPtr, return an integer 
+
+   The SWIG conversion methods, as ConvertPtr, return an integer
    that tells if the conversion was successful or not. And if not,
    an error code can be returned (see swigerrors.swg for the codes).
-   
+
    Use the following macros/flags to set or process the returning
    states.
-   
+
    In old versions of SWIG, code such as the following was usually written:
 
      if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) {
@@ -212,23 +212,23 @@
     } else {
       // fail code
     }
-    
+
    I.e., now SWIG_ConvertPtr can return new objects and you can
    identify the case and take care of the deallocation. Of course that
    also requires SWIG_ConvertPtr to return new result values, such as
 
-      int SWIG_ConvertPtr(obj, ptr,...) {         
-        if (<obj is ok>) {			       
-          if (<need new object>) {		       
-            *ptr = <ptr to new allocated object>; 
-            return SWIG_NEWOBJ;		       
-          } else {				       
-            *ptr = <ptr to old object>;	       
-            return SWIG_OLDOBJ;		       
-          } 				       
-        } else {				       
-          return SWIG_BADOBJ;		       
-        }					       
+      int SWIG_ConvertPtr(obj, ptr,...) {
+        if (<obj is ok>) {
+          if (<need new object>) {
+            *ptr = <ptr to new allocated object>;
+            return SWIG_NEWOBJ;
+          } else {
+            *ptr = <ptr to old object>;
+            return SWIG_OLDOBJ;
+          }
+        } else {
+          return SWIG_BADOBJ;
+        }
       }
 
    Of course, returning the plain '0(success)/-1(fail)' still works, but you can be
@@ -242,17 +242,17 @@
        int fooi(int);
 
    and you call
- 
+
       food(1)   // cast rank '1'  (1 -> 1.0)
       fooi(1)   // cast rank '0'
 
    just use the SWIG_AddCast()/SWIG_CheckState()
 */
 
-#define SWIG_OK                    (0) 
+#define SWIG_OK                    (0)
 #define SWIG_ERROR                 (-1)
 #define SWIG_IsOK(r)               (r >= 0)
-#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)  
+#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)
 
 /* The CastRankLimit says how many bits are used for the cast rank */
 #define SWIG_CASTRANKLIMIT         (1 << 8)
@@ -283,14 +283,14 @@
 #  endif
 #  define SWIG_CASTRANKMASK          ((SWIG_CASTRANKLIMIT) -1)
 #  define SWIG_CastRank(r)           (r & SWIG_CASTRANKMASK)
-SWIGINTERNINLINE int SWIG_AddCast(int r) { 
+SWIGINTERNINLINE int SWIG_AddCast(int r) {
   return SWIG_IsOK(r) ? ((SWIG_CastRank(r) < SWIG_MAXCASTRANK) ? (r + 1) : SWIG_ERROR) : r;
 }
-SWIGINTERNINLINE int SWIG_CheckState(int r) { 
-  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0; 
+SWIGINTERNINLINE int SWIG_CheckState(int r) {
+  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0;
 }
 #else /* no cast-rank mode */
-#  define SWIG_AddCast
+#  define SWIG_AddCast(r) (r)
 #  define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0)
 #endif
 
@@ -334,7 +334,7 @@ typedef struct swig_module_info {
   void                    *clientdata;		/* Language specific module data */
 } swig_module_info;
 
-/* 
+/*
   Compare two type names skipping the space characters, therefore
   "char*" == "char *" and "Class<int>" == "Class<int >", etc.
 
@@ -354,18 +354,18 @@ SWIG_TypeNameComp(const char *f1, const char *l1,
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if not equal, 1 if equal
+  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
 */
 SWIGRUNTIME int
-SWIG_TypeEquiv(const char *nb, const char *tb) {
-  int equiv = 0;
+SWIG_TypeCmp(const char *nb, const char *tb) {
+  int equiv = 1;
   const char* te = tb + strlen(tb);
   const char* ne = nb;
-  while (!equiv && *ne) {
+  while (equiv != 0 && *ne) {
     for (nb = ne; *ne; ++ne) {
       if (*ne == '|') break;
     }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
+    equiv = SWIG_TypeNameComp(nb, ne, tb, te);
     if (*ne) ++ne;
   }
   return equiv;
@@ -373,24 +373,13 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
+  Return 0 if not equal, 1 if equal
 */
 SWIGRUNTIME int
-SWIG_TypeCompare(const char *nb, const char *tb) {
-  int equiv = 0;
-  const char* te = tb + strlen(tb);
-  const char* ne = nb;
-  while (!equiv && *ne) {
-    for (nb = ne; *ne; ++ne) {
-      if (*ne == '|') break;
-    }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
-    if (*ne) ++ne;
-  }
-  return equiv;
+SWIG_TypeEquiv(const char *nb, const char *tb) {
+  return SWIG_TypeCmp(nb, tb) == 0 ? 1 : 0;
 }
 
-
 /*
   Check the typename
 */
@@ -418,7 +407,7 @@ SWIG_TypeCheck(const char *c, swig_type_info *ty) {
   return 0;
 }
 
-/* 
+/*
   Identical to SWIG_TypeCheck, except strcmp is replaced with a pointer comparison
 */
 SWIGRUNTIME swig_cast_info *
@@ -453,7 +442,7 @@ SWIG_TypeCast(swig_cast_info *ty, void *ptr, int *newmemory) {
   return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr, newmemory);
 }
 
-/* 
+/*
    Dynamic pointer casting. Down an inheritance hierarchy
 */
 SWIGRUNTIME swig_type_info *
@@ -497,7 +486,7 @@ SWIG_TypePrettyName(const swig_type_info *type) {
     return type->name;
 }
 
-/* 
+/*
    Set the clientdata field for a type
 */
 SWIGRUNTIME void
@@ -505,14 +494,14 @@ SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
   swig_cast_info *cast = ti->cast;
   /* if (ti->clientdata == clientdata) return; */
   ti->clientdata = clientdata;
-  
+
   while (cast) {
     if (!cast->converter) {
       swig_type_info *tc = cast->type;
       if (!tc->clientdata) {
 	SWIG_TypeClientData(tc, clientdata);
       }
-    }    
+    }
     cast = cast->next;
   }
 }
@@ -521,18 +510,18 @@ SWIG_TypeNewClientData(swig_type_info *ti, void *clientdata) {
   SWIG_TypeClientData(ti, clientdata);
   ti->owndata = 1;
 }
-  
+
 /*
   Search for a swig_type_info structure only by mangled name
   Search is a O(log #types)
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_MangledTypeQueryModule(swig_module_info *start, 
-                            swig_module_info *end, 
+SWIG_MangledTypeQueryModule(swig_module_info *start,
+                            swig_module_info *end,
 		            const char *name) {
   swig_module_info *iter = start;
   do {
@@ -541,11 +530,11 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
       register size_t r = iter->size - 1;
       do {
 	/* since l+r >= 0, we can (>> 1) instead (/ 2) */
-	register size_t i = (l + r) >> 1; 
+	register size_t i = (l + r) >> 1;
 	const char *iname = iter->types[i]->name;
 	if (iname) {
 	  register int compare = strcmp(name, iname);
-	  if (compare == 0) {	    
+	  if (compare == 0) {
 	    return iter->types[i];
 	  } else if (compare < 0) {
 	    if (i) {
@@ -570,14 +559,14 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
   Search for a swig_type_info structure for either a mangled name or a human readable name.
   It first searches the mangled names of the types, which is a O(log #types)
   If a type is not found it then searches the human readable names, which is O(#types).
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_TypeQueryModule(swig_module_info *start, 
-                     swig_module_info *end, 
+SWIG_TypeQueryModule(swig_module_info *start,
+                     swig_module_info *end,
 		     const char *name) {
   /* STEP 1: Search the name field using binary search */
   swig_type_info *ret = SWIG_MangledTypeQueryModule(start, end, name);
@@ -596,12 +585,12 @@ SWIG_TypeQueryModule(swig_module_info *start,
       iter = iter->next;
     } while (iter != end);
   }
-  
+
   /* neither found a match */
   return 0;
 }
 
-/* 
+/*
    Pack binary data into a string
 */
 SWIGRUNTIME char *
@@ -617,7 +606,7 @@ SWIG_PackData(char *c, void *ptr, size_t sz) {
   return c;
 }
 
-/* 
+/*
    Unpack binary data from a string
 */
 SWIGRUNTIME const char *
@@ -631,21 +620,21 @@ SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
       uu = ((d - '0') << 4);
     else if ((d >= 'a') && (d <= 'f'))
       uu = ((d - ('a'-10)) << 4);
-    else 
+    else
       return (char *) 0;
     d = *(c++);
     if ((d >= '0') && (d <= '9'))
       uu |= (d - '0');
     else if ((d >= 'a') && (d <= 'f'))
       uu |= (d - ('a'-10));
-    else 
+    else
       return (char *) 0;
     *u = uu;
   }
   return c;
 }
 
-/* 
+/*
    Pack 'void *' into a string buffer.
 */
 SWIGRUNTIME char *
@@ -705,18 +694,18 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 #endif
 
 /*  Errors in SWIG */
-#define  SWIG_UnknownError    	   -1 
-#define  SWIG_IOError        	   -2 
-#define  SWIG_RuntimeError   	   -3 
-#define  SWIG_IndexError     	   -4 
-#define  SWIG_TypeError      	   -5 
-#define  SWIG_DivisionByZero 	   -6 
-#define  SWIG_OverflowError  	   -7 
-#define  SWIG_SyntaxError    	   -8 
-#define  SWIG_ValueError     	   -9 
+#define  SWIG_UnknownError    	   -1
+#define  SWIG_IOError        	   -2
+#define  SWIG_RuntimeError   	   -3
+#define  SWIG_IndexError     	   -4
+#define  SWIG_TypeError      	   -5
+#define  SWIG_DivisionByZero 	   -6
+#define  SWIG_OverflowError  	   -7
+#define  SWIG_SyntaxError    	   -8
+#define  SWIG_ValueError     	   -9
 #define  SWIG_SystemError    	   -10
 #define  SWIG_AttributeError 	   -11
-#define  SWIG_MemoryError    	   -12 
+#define  SWIG_MemoryError    	   -12
 #define  SWIG_NullReferenceError   -13
 
 
@@ -1514,123 +1503,132 @@ SWIG_Perl_SetModule(swig_module_info *module) {
 #define SWIGTYPE_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[18]
 #define SWIGTYPE_p_f_p_void_p_apr_pool_t__p_svn_error_t swig_types[19]
 #define SWIGTYPE_p_f_p_void_p_q_const__char__p_svn_error_t swig_types[20]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_string_t__p_svn_error_t swig_types[21]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[22]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[23]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t swig_types[24]
-#define SWIGTYPE_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void swig_types[25]
-#define SWIGTYPE_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t swig_types[26]
-#define SWIGTYPE_p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t swig_types[27]
-#define SWIGTYPE_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t swig_types[28]
-#define SWIGTYPE_p_int swig_types[29]
-#define SWIGTYPE_p_long swig_types[30]
-#define SWIGTYPE_p_p_apr_array_header_t swig_types[31]
-#define SWIGTYPE_p_p_apr_hash_t swig_types[32]
-#define SWIGTYPE_p_p_char swig_types[33]
-#define SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t swig_types[34]
-#define SWIGTYPE_p_p_svn_authz_t swig_types[35]
-#define SWIGTYPE_p_p_svn_delta_editor_t swig_types[36]
-#define SWIGTYPE_p_p_svn_dirent_t swig_types[37]
-#define SWIGTYPE_p_p_svn_fs_txn_t swig_types[38]
-#define SWIGTYPE_p_p_svn_lock_t swig_types[39]
-#define SWIGTYPE_p_p_svn_repos_parse_fns2_t swig_types[40]
-#define SWIGTYPE_p_p_svn_repos_parse_fns3_t swig_types[41]
-#define SWIGTYPE_p_p_svn_repos_parse_fns_t swig_types[42]
-#define SWIGTYPE_p_p_svn_repos_t swig_types[43]
-#define SWIGTYPE_p_p_svn_stream_t swig_types[44]
-#define SWIGTYPE_p_p_svn_string_t swig_types[45]
-#define SWIGTYPE_p_p_void swig_types[46]
-#define SWIGTYPE_p_svn_auth_baton_t swig_types[47]
-#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[48]
-#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[49]
-#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[50]
-#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[51]
-#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[52]
-#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[53]
-#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[54]
-#define SWIGTYPE_p_svn_auth_provider_t swig_types[55]
-#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[56]
-#define SWIGTYPE_p_svn_authz_t swig_types[57]
-#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[58]
-#define SWIGTYPE_p_svn_checksum_kind_t swig_types[59]
-#define SWIGTYPE_p_svn_checksum_t swig_types[60]
-#define SWIGTYPE_p_svn_commit_info_t swig_types[61]
-#define SWIGTYPE_p_svn_config_t swig_types[62]
-#define SWIGTYPE_p_svn_delta_editor_t swig_types[63]
-#define SWIGTYPE_p_svn_depth_t swig_types[64]
-#define SWIGTYPE_p_svn_diff_conflict_display_style_t swig_types[65]
-#define SWIGTYPE_p_svn_diff_datasource_e swig_types[66]
-#define SWIGTYPE_p_svn_diff_file_ignore_space_t swig_types[67]
-#define SWIGTYPE_p_svn_diff_file_options_t swig_types[68]
-#define SWIGTYPE_p_svn_diff_fns2_t swig_types[69]
-#define SWIGTYPE_p_svn_diff_fns_t swig_types[70]
-#define SWIGTYPE_p_svn_diff_hunk_t swig_types[71]
-#define SWIGTYPE_p_svn_diff_operation_kind_e swig_types[72]
-#define SWIGTYPE_p_svn_diff_output_fns_t swig_types[73]
-#define SWIGTYPE_p_svn_diff_t swig_types[74]
-#define SWIGTYPE_p_svn_dirent_t swig_types[75]
-#define SWIGTYPE_p_svn_errno_t swig_types[76]
-#define SWIGTYPE_p_svn_error_t swig_types[77]
-#define SWIGTYPE_p_svn_fs_access_t swig_types[78]
-#define SWIGTYPE_p_svn_fs_dirent_t swig_types[79]
-#define SWIGTYPE_p_svn_fs_history_t swig_types[80]
-#define SWIGTYPE_p_svn_fs_id_t swig_types[81]
-#define SWIGTYPE_p_svn_fs_pack_notify_action_t swig_types[82]
-#define SWIGTYPE_p_svn_fs_path_change2_t swig_types[83]
-#define SWIGTYPE_p_svn_fs_path_change_kind_t swig_types[84]
-#define SWIGTYPE_p_svn_fs_path_change_t swig_types[85]
-#define SWIGTYPE_p_svn_fs_root_t swig_types[86]
-#define SWIGTYPE_p_svn_fs_t swig_types[87]
-#define SWIGTYPE_p_svn_fs_txn_t swig_types[88]
-#define SWIGTYPE_p_svn_io_dirent2_t swig_types[89]
-#define SWIGTYPE_p_svn_io_dirent_t swig_types[90]
-#define SWIGTYPE_p_svn_io_file_del_t swig_types[91]
-#define SWIGTYPE_p_svn_location_segment_t swig_types[92]
-#define SWIGTYPE_p_svn_lock_t swig_types[93]
-#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[94]
-#define SWIGTYPE_p_svn_log_changed_path_t swig_types[95]
-#define SWIGTYPE_p_svn_log_entry_t swig_types[96]
-#define SWIGTYPE_p_svn_merge_range_t swig_types[97]
-#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[98]
-#define SWIGTYPE_p_svn_node_kind_t swig_types[99]
-#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[100]
-#define SWIGTYPE_p_svn_opt_revision_t swig_types[101]
-#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[102]
-#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[103]
-#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[104]
-#define SWIGTYPE_p_svn_patch_file_t swig_types[105]
-#define SWIGTYPE_p_svn_patch_t swig_types[106]
-#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[107]
-#define SWIGTYPE_p_svn_prop_kind swig_types[108]
-#define SWIGTYPE_p_svn_prop_patch_t swig_types[109]
-#define SWIGTYPE_p_svn_repos_authz_access_t swig_types[110]
-#define SWIGTYPE_p_svn_repos_node_t swig_types[111]
-#define SWIGTYPE_p_svn_repos_notify_action_t swig_types[112]
-#define SWIGTYPE_p_svn_repos_notify_t swig_types[113]
-#define SWIGTYPE_p_svn_repos_notify_warning_t swig_types[114]
-#define SWIGTYPE_p_svn_repos_parse_fns2_t swig_types[115]
-#define SWIGTYPE_p_svn_repos_parse_fns3_t swig_types[116]
-#define SWIGTYPE_p_svn_repos_parse_fns_t swig_types[117]
-#define SWIGTYPE_p_svn_repos_revision_access_level_t swig_types[118]
-#define SWIGTYPE_p_svn_repos_t swig_types[119]
-#define SWIGTYPE_p_svn_stream_mark_t swig_types[120]
-#define SWIGTYPE_p_svn_stream_t swig_types[121]
-#define SWIGTYPE_p_svn_string_t swig_types[122]
-#define SWIGTYPE_p_svn_stringbuf_t swig_types[123]
-#define SWIGTYPE_p_svn_tristate_t swig_types[124]
-#define SWIGTYPE_p_svn_txdelta_op_t swig_types[125]
-#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[126]
-#define SWIGTYPE_p_svn_txdelta_window_t swig_types[127]
-#define SWIGTYPE_p_svn_version_checklist_t swig_types[128]
-#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[129]
-#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[130]
-#define SWIGTYPE_p_svn_version_extended_t swig_types[131]
-#define SWIGTYPE_p_svn_version_t swig_types[132]
-#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[133]
-#define SWIGTYPE_p_unsigned_long swig_types[134]
-#define SWIGTYPE_p_void swig_types[135]
-static swig_type_info *swig_types[137];
-static swig_module_info swig_module = {swig_types, 136, 0, 0, 0, 0};
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t swig_types[21]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_string_t__p_svn_error_t swig_types[22]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[23]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[24]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t swig_types[25]
+#define SWIGTYPE_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void swig_types[26]
+#define SWIGTYPE_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t swig_types[27]
+#define SWIGTYPE_p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t swig_types[28]
+#define SWIGTYPE_p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t swig_types[29]
+#define SWIGTYPE_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t swig_types[30]
+#define SWIGTYPE_p_int swig_types[31]
+#define SWIGTYPE_p_long swig_types[32]
+#define SWIGTYPE_p_p_apr_array_header_t swig_types[33]
+#define SWIGTYPE_p_p_apr_hash_t swig_types[34]
+#define SWIGTYPE_p_p_char swig_types[35]
+#define SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t swig_types[36]
+#define SWIGTYPE_p_p_svn_authz_t swig_types[37]
+#define SWIGTYPE_p_p_svn_delta_editor_t swig_types[38]
+#define SWIGTYPE_p_p_svn_dirent_t swig_types[39]
+#define SWIGTYPE_p_p_svn_fs_txn_t swig_types[40]
+#define SWIGTYPE_p_p_svn_lock_t swig_types[41]
+#define SWIGTYPE_p_p_svn_repos_parse_fns2_t swig_types[42]
+#define SWIGTYPE_p_p_svn_repos_parse_fns3_t swig_types[43]
+#define SWIGTYPE_p_p_svn_repos_parse_fns_t swig_types[44]
+#define SWIGTYPE_p_p_svn_repos_t swig_types[45]
+#define SWIGTYPE_p_p_svn_stream_t swig_types[46]
+#define SWIGTYPE_p_p_svn_string_t swig_types[47]
+#define SWIGTYPE_p_p_svn_version_t swig_types[48]
+#define SWIGTYPE_p_p_void swig_types[49]
+#define SWIGTYPE_p_svn_auth_baton_t swig_types[50]
+#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[51]
+#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[52]
+#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[53]
+#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[54]
+#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[55]
+#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[56]
+#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[57]
+#define SWIGTYPE_p_svn_auth_provider_t swig_types[58]
+#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[59]
+#define SWIGTYPE_p_svn_authz_t swig_types[60]
+#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[61]
+#define SWIGTYPE_p_svn_checksum_kind_t swig_types[62]
+#define SWIGTYPE_p_svn_checksum_t swig_types[63]
+#define SWIGTYPE_p_svn_commit_info_t swig_types[64]
+#define SWIGTYPE_p_svn_config_t swig_types[65]
+#define SWIGTYPE_p_svn_delta_editor_t swig_types[66]
+#define SWIGTYPE_p_svn_depth_t swig_types[67]
+#define SWIGTYPE_p_svn_diff_conflict_display_style_t swig_types[68]
+#define SWIGTYPE_p_svn_diff_datasource_e swig_types[69]
+#define SWIGTYPE_p_svn_diff_file_ignore_space_t swig_types[70]
+#define SWIGTYPE_p_svn_diff_file_options_t swig_types[71]
+#define SWIGTYPE_p_svn_diff_fns2_t swig_types[72]
+#define SWIGTYPE_p_svn_diff_fns_t swig_types[73]
+#define SWIGTYPE_p_svn_diff_hunk_t swig_types[74]
+#define SWIGTYPE_p_svn_diff_operation_kind_e swig_types[75]
+#define SWIGTYPE_p_svn_diff_output_fns_t swig_types[76]
+#define SWIGTYPE_p_svn_diff_t swig_types[77]
+#define SWIGTYPE_p_svn_dirent_t swig_types[78]
+#define SWIGTYPE_p_svn_errno_t swig_types[79]
+#define SWIGTYPE_p_svn_error_t swig_types[80]
+#define SWIGTYPE_p_svn_fs_access_t swig_types[81]
+#define SWIGTYPE_p_svn_fs_dirent_t swig_types[82]
+#define SWIGTYPE_p_svn_fs_fsfs_info_t swig_types[83]
+#define SWIGTYPE_p_svn_fs_fsx_info_t swig_types[84]
+#define SWIGTYPE_p_svn_fs_history_t swig_types[85]
+#define SWIGTYPE_p_svn_fs_id_t swig_types[86]
+#define SWIGTYPE_p_svn_fs_info_placeholder_t swig_types[87]
+#define SWIGTYPE_p_svn_fs_lock_target_t swig_types[88]
+#define SWIGTYPE_p_svn_fs_node_relation_t swig_types[89]
+#define SWIGTYPE_p_svn_fs_pack_notify_action_t swig_types[90]
+#define SWIGTYPE_p_svn_fs_path_change2_t swig_types[91]
+#define SWIGTYPE_p_svn_fs_path_change_kind_t swig_types[92]
+#define SWIGTYPE_p_svn_fs_path_change_t swig_types[93]
+#define SWIGTYPE_p_svn_fs_root_t swig_types[94]
+#define SWIGTYPE_p_svn_fs_t swig_types[95]
+#define SWIGTYPE_p_svn_fs_txn_t swig_types[96]
+#define SWIGTYPE_p_svn_fs_upgrade_notify_action_t swig_types[97]
+#define SWIGTYPE_p_svn_io_dirent2_t swig_types[98]
+#define SWIGTYPE_p_svn_io_dirent_t swig_types[99]
+#define SWIGTYPE_p_svn_io_file_del_t swig_types[100]
+#define SWIGTYPE_p_svn_location_segment_t swig_types[101]
+#define SWIGTYPE_p_svn_lock_t swig_types[102]
+#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[103]
+#define SWIGTYPE_p_svn_log_changed_path_t swig_types[104]
+#define SWIGTYPE_p_svn_log_entry_t swig_types[105]
+#define SWIGTYPE_p_svn_merge_range_t swig_types[106]
+#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[107]
+#define SWIGTYPE_p_svn_node_kind_t swig_types[108]
+#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[109]
+#define SWIGTYPE_p_svn_opt_revision_t swig_types[110]
+#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[111]
+#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[112]
+#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[113]
+#define SWIGTYPE_p_svn_patch_file_t swig_types[114]
+#define SWIGTYPE_p_svn_patch_t swig_types[115]
+#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[116]
+#define SWIGTYPE_p_svn_prop_kind swig_types[117]
+#define SWIGTYPE_p_svn_prop_patch_t swig_types[118]
+#define SWIGTYPE_p_svn_repos_authz_access_t swig_types[119]
+#define SWIGTYPE_p_svn_repos_node_t swig_types[120]
+#define SWIGTYPE_p_svn_repos_notify_action_t swig_types[121]
+#define SWIGTYPE_p_svn_repos_notify_t swig_types[122]
+#define SWIGTYPE_p_svn_repos_notify_warning_t swig_types[123]
+#define SWIGTYPE_p_svn_repos_parse_fns2_t swig_types[124]
+#define SWIGTYPE_p_svn_repos_parse_fns3_t swig_types[125]
+#define SWIGTYPE_p_svn_repos_parse_fns_t swig_types[126]
+#define SWIGTYPE_p_svn_repos_revision_access_level_t swig_types[127]
+#define SWIGTYPE_p_svn_repos_t swig_types[128]
+#define SWIGTYPE_p_svn_stream_mark_t swig_types[129]
+#define SWIGTYPE_p_svn_stream_t swig_types[130]
+#define SWIGTYPE_p_svn_string_t swig_types[131]
+#define SWIGTYPE_p_svn_stringbuf_t swig_types[132]
+#define SWIGTYPE_p_svn_tristate_t swig_types[133]
+#define SWIGTYPE_p_svn_txdelta_op_t swig_types[134]
+#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[135]
+#define SWIGTYPE_p_svn_txdelta_window_t swig_types[136]
+#define SWIGTYPE_p_svn_version_checklist_t swig_types[137]
+#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[138]
+#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[139]
+#define SWIGTYPE_p_svn_version_extended_t swig_types[140]
+#define SWIGTYPE_p_svn_version_t swig_types[141]
+#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[142]
+#define SWIGTYPE_p_unsigned_long swig_types[143]
+#define SWIGTYPE_p_void swig_types[144]
+static swig_type_info *swig_types[146];
+static swig_module_info swig_module = {swig_types, 145, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
@@ -1641,7 +1639,7 @@ static swig_module_info swig_module = {swig_types, 136, 0, 0, 0, 0};
 #define SWIG_name   "SVN::_Repos::boot_SVN___Repos"
 #define SWIG_prefix "SVN::_Repos::"
 
-#define SWIGVERSION 0x020009 
+#define SWIGVERSION 0x020012 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -2194,11 +2192,6 @@ static svn_error_t * svn_repos_invoke_authz_callback(
   return _obj(required, allowed, root, path, baton, pool);
 }
 
-static svn_error_t * svn_repos_invoke_file_rev_handler(
-  svn_repos_file_rev_handler_t _obj, void *baton, const char *path, svn_revnum_t rev, apr_hash_t *rev_props, svn_txdelta_window_handler_t *delta_handler, void **delta_baton, apr_array_header_t *prop_diffs, apr_pool_t *pool) {
-  return _obj(baton, path, rev, rev_props, delta_handler, delta_baton, prop_diffs, pool);
-}
-
 static void svn_repos_invoke_notify_func(
   svn_repos_notify_func_t _obj, void *baton, const svn_repos_notify_t *notify, apr_pool_t *scratch_pool) {
   _obj(baton, notify, scratch_pool);
@@ -2214,6 +2207,16 @@ static svn_error_t * svn_repos_invoke_history_func(
   return _obj(baton, path, revision, pool);
 }
 
+static svn_error_t * svn_repos_invoke_file_rev_handler(
+  svn_repos_file_rev_handler_t _obj, void *baton, const char *path, svn_revnum_t rev, apr_hash_t *rev_props, svn_txdelta_window_handler_t *delta_handler, void **delta_baton, apr_array_header_t *prop_diffs, apr_pool_t *pool) {
+  return _obj(baton, path, rev, rev_props, delta_handler, delta_baton, prop_diffs, pool);
+}
+
+static svn_error_t * svn_repos_invoke_verify_callback(
+  svn_repos_verify_callback_t _obj, void *baton, svn_revnum_t revision, svn_error_t *verify_err, apr_pool_t *scratch_pool) {
+  return _obj(baton, revision, verify_err, scratch_pool);
+}
+
 
 #ifdef __cplusplus
 extern "C" {
@@ -2591,10 +2594,9 @@ XS(_wrap_svn_repos_notify_t_shard_get) {
     arg1 = (struct svn_repos_notify_t *)(argp1);
     result =  ((arg1)->shard);
     {
-      char temp[256];
+      char temp[30];
       sprintf(temp, "%" APR_INT64_T_FMT, (apr_int64_t) result);
-      ST(argvi) = sv_newmortal();
-      sv_setpv((SV*)ST(argvi++), temp);
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = sv_2mortal(newSVpv(temp, 0)); argvi++  ;
     }
     
     XSRETURN(argvi);
@@ -2873,6 +2875,136 @@ XS(_wrap_svn_repos_notify_t_path_get) {
 }
 
 
+XS(_wrap_svn_repos_notify_t_start_revision_set) {
+  {
+    struct svn_repos_notify_t *arg1 = (struct svn_repos_notify_t *) 0 ;
+    svn_revnum_t arg2 ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    long val2 ;
+    int ecode2 = 0 ;
+    int argvi = 0;
+    dXSARGS;
+    
+    if ((items < 2) || (items > 2)) {
+      SWIG_croak("Usage: svn_repos_notify_t_start_revision_set(self,start_revision);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_repos_notify_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_repos_notify_t_start_revision_set" "', argument " "1"" of type '" "struct svn_repos_notify_t *""'"); 
+    }
+    arg1 = (struct svn_repos_notify_t *)(argp1);
+    ecode2 = SWIG_AsVal_long SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
+    if (!SWIG_IsOK(ecode2)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "svn_repos_notify_t_start_revision_set" "', argument " "2"" of type '" "svn_revnum_t""'");
+    } 
+    arg2 = (svn_revnum_t)(val2);
+    if (arg1) (arg1)->start_revision = arg2;
+    ST(argvi) = sv_newmortal();
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_svn_repos_notify_t_start_revision_get) {
+  {
+    struct svn_repos_notify_t *arg1 = (struct svn_repos_notify_t *) 0 ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    int argvi = 0;
+    svn_revnum_t result;
+    dXSARGS;
+    
+    if ((items < 1) || (items > 1)) {
+      SWIG_croak("Usage: svn_repos_notify_t_start_revision_get(self);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_repos_notify_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_repos_notify_t_start_revision_get" "', argument " "1"" of type '" "struct svn_repos_notify_t *""'"); 
+    }
+    arg1 = (struct svn_repos_notify_t *)(argp1);
+    result = (svn_revnum_t) ((arg1)->start_revision);
+    ST(argvi) = SWIG_From_long  SWIG_PERL_CALL_ARGS_1((long)(result)); argvi++ ;
+    
+    XSRETURN(argvi);
+  fail:
+    
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_svn_repos_notify_t_end_revision_set) {
+  {
+    struct svn_repos_notify_t *arg1 = (struct svn_repos_notify_t *) 0 ;
+    svn_revnum_t arg2 ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    long val2 ;
+    int ecode2 = 0 ;
+    int argvi = 0;
+    dXSARGS;
+    
+    if ((items < 2) || (items > 2)) {
+      SWIG_croak("Usage: svn_repos_notify_t_end_revision_set(self,end_revision);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_repos_notify_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_repos_notify_t_end_revision_set" "', argument " "1"" of type '" "struct svn_repos_notify_t *""'"); 
+    }
+    arg1 = (struct svn_repos_notify_t *)(argp1);
+    ecode2 = SWIG_AsVal_long SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
+    if (!SWIG_IsOK(ecode2)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "svn_repos_notify_t_end_revision_set" "', argument " "2"" of type '" "svn_revnum_t""'");
+    } 
+    arg2 = (svn_revnum_t)(val2);
+    if (arg1) (arg1)->end_revision = arg2;
+    ST(argvi) = sv_newmortal();
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_svn_repos_notify_t_end_revision_get) {
+  {
+    struct svn_repos_notify_t *arg1 = (struct svn_repos_notify_t *) 0 ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    int argvi = 0;
+    svn_revnum_t result;
+    dXSARGS;
+    
+    if ((items < 1) || (items > 1)) {
+      SWIG_croak("Usage: svn_repos_notify_t_end_revision_get(self);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_repos_notify_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_repos_notify_t_end_revision_get" "', argument " "1"" of type '" "struct svn_repos_notify_t *""'"); 
+    }
+    arg1 = (struct svn_repos_notify_t *)(argp1);
+    result = (svn_revnum_t) ((arg1)->end_revision);
+    ST(argvi) = SWIG_From_long  SWIG_PERL_CALL_ARGS_1((long)(result)); argvi++ ;
+    
+    XSRETURN(argvi);
+  fail:
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_svn_repos_notify_create) {
   {
     svn_repos_notify_action_t arg1 ;
@@ -2886,6 +3018,7 @@ XS(_wrap_svn_repos_notify_create) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_repos_notify_create(action,result_pool);");
@@ -2930,6 +3063,7 @@ XS(_wrap_svn_repos_find_root_path) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_repos_find_root_path(path,pool);");
@@ -2960,6 +3094,91 @@ XS(_wrap_svn_repos_find_root_path) {
 }
 
 
+XS(_wrap_svn_repos_open3) {
+  {
+    svn_repos_t **arg1 = (svn_repos_t **) 0 ;
+    char *arg2 = (char *) 0 ;
+    apr_hash_t *arg3 = (apr_hash_t *) 0 ;
+    apr_pool_t *arg4 = (apr_pool_t *) 0 ;
+    apr_pool_t *arg5 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    svn_repos_t *temp1 ;
+    int res2 ;
+    char *buf2 = 0 ;
+    int alloc2 = 0 ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    {
+      _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    arg1 = &temp1;
+    if ((items < 2) || (items > 4)) {
+      SWIG_croak("Usage: svn_repos_open3(path,fs_config,result_pool,scratch_pool);");
+    }
+    res2 = SWIG_AsCharPtrAndSize(ST(0), &buf2, NULL, &alloc2);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_repos_open3" "', argument " "2"" of type '" "char const *""'");
+    }
+    arg2 = (char *)(buf2);
+    {
+      /* PERL-FIXME: Handle undef -> NULL. */
+      arg3 = svn_swig_pl_strings_to_hash(ST(1), _global_pool);
+    }
+    if (items > 2) {
+      
+    }
+    if (items > 3) {
+      
+    }
+    {
+      result = (svn_error_t *)svn_repos_open3(arg1,(char const *)arg2,arg3,arg4,arg5);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    {
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg1, SWIGTYPE_p_svn_repos_t, 0); argvi++  ;
+    }
+    
+    if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+    
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+    
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_svn_repos_open2) {
   {
     svn_repos_t **arg1 = (svn_repos_t **) 0 ;
@@ -2977,6 +3196,7 @@ XS(_wrap_svn_repos_open2) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -3050,6 +3270,7 @@ XS(_wrap_svn_repos_open) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 2)) {
@@ -3127,6 +3348,7 @@ XS(_wrap_svn_repos_create) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 5) || (items > 6)) {
@@ -3224,6 +3446,7 @@ XS(_wrap_svn_repos_upgrade2) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_repos_upgrade2(path,nonblocking,notify_func,notify_baton,pool);");
@@ -3310,6 +3533,7 @@ XS(_wrap_svn_repos_upgrade) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_repos_upgrade(path,nonblocking,start_callback,start_callback_baton,pool);");
@@ -3390,6 +3614,7 @@ XS(_wrap_svn_repos_delete) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_repos_delete(path,pool);");
@@ -3455,6 +3680,7 @@ XS(_wrap_svn_repos_has_capability) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     if ((items < 2) || (items > 3)) {
@@ -3516,6 +3742,147 @@ XS(_wrap_svn_repos_has_capability) {
 }
 
 
+XS(_wrap_svn_repos_capabilities) {
+  {
+    apr_hash_t **arg1 = (apr_hash_t **) 0 ;
+    svn_repos_t *arg2 = (svn_repos_t *) 0 ;
+    apr_pool_t *arg3 = (apr_pool_t *) 0 ;
+    apr_pool_t *arg4 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    apr_hash_t *temp1 ;
+    void *argp2 = 0 ;
+    int res2 = 0 ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    {
+      _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    arg1 = &temp1;
+    if ((items < 1) || (items > 3)) {
+      SWIG_croak("Usage: svn_repos_capabilities(repos,result_pool,scratch_pool);");
+    }
+    res2 = SWIG_ConvertPtr(ST(0), &argp2,SWIGTYPE_p_svn_repos_t, 0 |  0 );
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_repos_capabilities" "', argument " "2"" of type '" "svn_repos_t *""'"); 
+    }
+    arg2 = (svn_repos_t *)(argp2);
+    if (items > 1) {
+      
+    }
+    if (items > 2) {
+      
+    }
+    {
+      result = (svn_error_t *)svn_repos_capabilities(arg1,arg2,arg3,arg4);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    {
+      /* FIXME: Missing argout typemap: svn_repos_capabilities arg 1 (apr_hash_t **) */
+      
+      
+      
+      
+      SWIG_exception(SWIG_ValueError, "svn_repos_capabilities is not implemented yet");
+      
+    }
+    
+    
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_svn_repos_remember_client_capabilities) {
+  {
+    svn_repos_t *arg1 = (svn_repos_t *) 0 ;
+    apr_array_header_t *arg2 = (apr_array_header_t *) 0 ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    void *argp2 = 0 ;
+    int res2 = 0 ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    if ((items < 2) || (items > 2)) {
+      SWIG_croak("Usage: svn_repos_remember_client_capabilities(repos,capabilities);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_repos_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_repos_remember_client_capabilities" "', argument " "1"" of type '" "svn_repos_t *""'"); 
+    }
+    arg1 = (svn_repos_t *)(argp1);
+    res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_apr_array_header_t, 0 |  0 );
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_repos_remember_client_capabilities" "', argument " "2"" of type '" "apr_array_header_t const *""'"); 
+    }
+    arg2 = (apr_array_header_t *)(argp2);
+    {
+      result = (svn_error_t *)svn_repos_remember_client_capabilities(arg1,(apr_array_header_t const *)arg2);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_svn_repos_fs) {
   {
     svn_repos_t *arg1 = (svn_repos_t *) 0 ;
@@ -3549,15 +3916,61 @@ XS(_wrap_svn_repos_fs) {
 }
 
 
-XS(_wrap_svn_repos_hotcopy2) {
+XS(_wrap_svn_repos_fs_type) {
+  {
+    svn_repos_t *arg1 = (svn_repos_t *) 0 ;
+    apr_pool_t *arg2 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    int argvi = 0;
+    char *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    if ((items < 1) || (items > 2)) {
+      SWIG_croak("Usage: svn_repos_fs_type(repos,result_pool);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_repos_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_repos_fs_type" "', argument " "1"" of type '" "svn_repos_t *""'"); 
+    }
+    arg1 = (svn_repos_t *)(argp1);
+    if (items > 1) {
+      
+    }
+    {
+      result = (char *)svn_repos_fs_type(arg1,arg2);
+      
+      
+      
+    }
+    ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_svn_repos_hotcopy3) {
   {
     char *arg1 = (char *) 0 ;
     char *arg2 = (char *) 0 ;
     svn_boolean_t arg3 ;
     svn_boolean_t arg4 ;
-    svn_cancel_func_t arg5 = (svn_cancel_func_t) 0 ;
+    svn_repos_notify_func_t arg5 = (svn_repos_notify_func_t) 0 ;
     void *arg6 = (void *) 0 ;
-    apr_pool_t *arg7 = (apr_pool_t *) 0 ;
+    svn_cancel_func_t arg7 = (svn_cancel_func_t) 0 ;
+    void *arg8 = (void *) 0 ;
+    apr_pool_t *arg9 = (apr_pool_t *) 0 ;
     apr_pool_t *_global_pool ;
     int res1 ;
     char *buf1 = 0 ;
@@ -3575,46 +3988,51 @@ XS(_wrap_svn_repos_hotcopy2) {
     dXSARGS;
     
     {
-      _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 6) || (items > 7)) {
-      SWIG_croak("Usage: svn_repos_hotcopy2(src_path,dst_path,clean_logs,incremental,cancel_func,cancel_baton,pool);");
+    if ((items < 7) || (items > 8)) {
+      SWIG_croak("Usage: svn_repos_hotcopy3(src_path,dst_path,clean_logs,incremental,notify_func,notify_baton,cancel_func,cancel_baton,scratch_pool);");
     }
     res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1);
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_repos_hotcopy2" "', argument " "1"" of type '" "char const *""'");
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_repos_hotcopy3" "', argument " "1"" of type '" "char const *""'");
     }
     arg1 = (char *)(buf1);
     res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_repos_hotcopy2" "', argument " "2"" of type '" "char const *""'");
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_repos_hotcopy3" "', argument " "2"" of type '" "char const *""'");
     }
     arg2 = (char *)(buf2);
     ecode3 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(2), &val3);
     if (!SWIG_IsOK(ecode3)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "svn_repos_hotcopy2" "', argument " "3"" of type '" "svn_boolean_t""'");
+      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "svn_repos_hotcopy3" "', argument " "3"" of type '" "svn_boolean_t""'");
     } 
     arg3 = (svn_boolean_t)(val3);
     ecode4 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(3), &val4);
     if (!SWIG_IsOK(ecode4)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "svn_repos_hotcopy2" "', argument " "4"" of type '" "svn_boolean_t""'");
+      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "svn_repos_hotcopy3" "', argument " "4"" of type '" "svn_boolean_t""'");
     } 
     arg4 = (svn_boolean_t)(val4);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(4), (void**)(&arg5), SWIGTYPE_p_f_p_void__p_svn_error_t);
+      int res = SWIG_ConvertFunctionPtr(ST(4), (void**)(&arg5), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void);
       if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_repos_hotcopy2" "', argument " "5"" of type '" "svn_cancel_func_t""'"); 
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_repos_hotcopy3" "', argument " "5"" of type '" "svn_repos_notify_func_t""'"); 
       }
     }
     res6 = SWIG_ConvertPtr(ST(5),SWIG_as_voidptrptr(&arg6), 0, 0);
     if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "svn_repos_hotcopy2" "', argument " "6"" of type '" "void *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "svn_repos_hotcopy3" "', argument " "6"" of type '" "void *""'"); 
     }
-    if (items > 6) {
+    {
+      arg7 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg8 = ST(6);
+    }
+    if (items > 7) {
       
     }
     {
-      result = (svn_error_t *)svn_repos_hotcopy2((char const *)arg1,(char const *)arg2,arg3,arg4,arg5,arg6,arg7);
+      result = (svn_error_t *)svn_repos_hotcopy3((char const *)arg1,(char const *)arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9);
       
       
       
@@ -3656,6 +4074,103 @@ XS(_wrap_svn_repos_hotcopy2) {
 }
 
 
+XS(_wrap_svn_repos_hotcopy2) {
+  {
+    char *arg1 = (char *) 0 ;
+    char *arg2 = (char *) 0 ;
+    svn_boolean_t arg3 ;
+    svn_boolean_t arg4 ;
+    svn_cancel_func_t arg5 = (svn_cancel_func_t) 0 ;
+    void *arg6 = (void *) 0 ;
+    apr_pool_t *arg7 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    int res1 ;
+    char *buf1 = 0 ;
+    int alloc1 = 0 ;
+    int res2 ;
+    char *buf2 = 0 ;
+    int alloc2 = 0 ;
+    int val3 ;
+    int ecode3 = 0 ;
+    int val4 ;
+    int ecode4 = 0 ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    if ((items < 5) || (items > 6)) {
+      SWIG_croak("Usage: svn_repos_hotcopy2(src_path,dst_path,clean_logs,incremental,cancel_func,cancel_baton,pool);");
+    }
+    res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1);
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_repos_hotcopy2" "', argument " "1"" of type '" "char const *""'");
+    }
+    arg1 = (char *)(buf1);
+    res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_repos_hotcopy2" "', argument " "2"" of type '" "char const *""'");
+    }
+    arg2 = (char *)(buf2);
+    ecode3 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(2), &val3);
+    if (!SWIG_IsOK(ecode3)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "svn_repos_hotcopy2" "', argument " "3"" of type '" "svn_boolean_t""'");
+    } 
+    arg3 = (svn_boolean_t)(val3);
+    ecode4 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(3), &val4);
+    if (!SWIG_IsOK(ecode4)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "svn_repos_hotcopy2" "', argument " "4"" of type '" "svn_boolean_t""'");
+    } 
+    arg4 = (svn_boolean_t)(val4);
+    {
+      arg5 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg6 = ST(4);
+    }
+    if (items > 5) {
+      
+    }
+    {
+      result = (svn_error_t *)svn_repos_hotcopy2((char const *)arg1,(char const *)arg2,arg3,arg4,arg5,arg6,arg7);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+    if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+    
+    
+    
+    XSRETURN(argvi);
+  fail:
+    if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+    if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+    
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_svn_repos_hotcopy) {
   {
     char *arg1 = (char *) 0 ;
@@ -3677,6 +4192,7 @@ XS(_wrap_svn_repos_hotcopy) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_repos_hotcopy(src_path,dst_path,clean_logs,pool);");
@@ -3748,15 +4264,15 @@ XS(_wrap_svn_repos_fs_pack2) {
     void *argp1 = 0 ;
     int res1 = 0 ;
     int res3 ;
-    int res5 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
     dXSARGS;
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 5) || (items > 6)) {
+    if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_repos_fs_pack2(repos,notify_func,notify_baton,cancel_func,cancel_baton,pool);");
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_repos_t, 0 |  0 );
@@ -3775,16 +4291,10 @@ XS(_wrap_svn_repos_fs_pack2) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_repos_fs_pack2" "', argument " "3"" of type '" "void *""'"); 
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(3), (void**)(&arg4), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_repos_fs_pack2" "', argument " "4"" of type '" "svn_cancel_func_t""'"); 
-      }
+      arg4 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg5 = ST(3);
     }
-    res5 = SWIG_ConvertPtr(ST(4),SWIG_as_voidptrptr(&arg5), 0, 0);
-    if (!SWIG_IsOK(res5)) {
-      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "svn_repos_fs_pack2" "', argument " "5"" of type '" "void *""'"); 
-    }
-    if (items > 5) {
+    if (items > 4) {
       
     }
     {
@@ -3813,16 +4323,12 @@ XS(_wrap_svn_repos_fs_pack2) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -3840,15 +4346,15 @@ XS(_wrap_svn_repos_fs_pack) {
     void *argp1 = 0 ;
     int res1 = 0 ;
     int res3 ;
-    int res5 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
     dXSARGS;
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 5) || (items > 6)) {
+    if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_repos_fs_pack(repos,notify_func,notify_baton,cancel_func,cancel_baton,pool);");
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_repos_t, 0 |  0 );
@@ -3867,16 +4373,10 @@ XS(_wrap_svn_repos_fs_pack) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_repos_fs_pack" "', argument " "3"" of type '" "void *""'"); 
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(3), (void**)(&arg4), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_repos_fs_pack" "', argument " "4"" of type '" "svn_cancel_func_t""'"); 
-      }
+      arg4 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg5 = ST(3);
     }
-    res5 = SWIG_ConvertPtr(ST(4),SWIG_as_voidptrptr(&arg5), 0, 0);
-    if (!SWIG_IsOK(res5)) {
-      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "svn_repos_fs_pack" "', argument " "5"" of type '" "void *""'"); 
-    }
-    if (items > 5) {
+    if (items > 4) {
       
     }
     {
@@ -3905,16 +4405,12 @@ XS(_wrap_svn_repos_fs_pack) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -3936,15 +4432,15 @@ XS(_wrap_svn_repos_recover4) {
     int val2 ;
     int ecode2 = 0 ;
     int res4 ;
-    int res6 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
     dXSARGS;
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 6) || (items > 7)) {
+    if ((items < 5) || (items > 6)) {
       SWIG_croak("Usage: svn_repos_recover4(path,nonblocking,notify_func,notify_baton,cancel_func,cancel_baton,pool);");
     }
     res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1);
@@ -3968,16 +4464,10 @@ XS(_wrap_svn_repos_recover4) {
       SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "svn_repos_recover4" "', argument " "4"" of type '" "void *""'"); 
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(4), (void**)(&arg5), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_repos_recover4" "', argument " "5"" of type '" "svn_cancel_func_t""'"); 
-      }
-    }
-    res6 = SWIG_ConvertPtr(ST(5),SWIG_as_voidptrptr(&arg6), 0, 0);
-    if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "svn_repos_recover4" "', argument " "6"" of type '" "void *""'"); 
+      arg5 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg6 = ST(4);
     }
-    if (items > 6) {
+    if (items > 5) {
       
     }
     {
@@ -4007,8 +4497,6 @@ XS(_wrap_svn_repos_recover4) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
@@ -4016,8 +4504,6 @@ XS(_wrap_svn_repos_recover4) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -4039,15 +4525,15 @@ XS(_wrap_svn_repos_recover3) {
     int val2 ;
     int ecode2 = 0 ;
     int res4 ;
-    int res6 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
     dXSARGS;
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 6) || (items > 7)) {
+    if ((items < 5) || (items > 6)) {
       SWIG_croak("Usage: svn_repos_recover3(path,nonblocking,start_callback,start_callback_baton,cancel_func,cancel_baton,pool);");
     }
     res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1);
@@ -4071,16 +4557,10 @@ XS(_wrap_svn_repos_recover3) {
       SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "svn_repos_recover3" "', argument " "4"" of type '" "void *""'"); 
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(4), (void**)(&arg5), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_repos_recover3" "', argument " "5"" of type '" "svn_cancel_func_t""'"); 
-      }
-    }
-    res6 = SWIG_ConvertPtr(ST(5),SWIG_as_voidptrptr(&arg6), 0, 0);
-    if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "svn_repos_recover3" "', argument " "6"" of type '" "void *""'"); 
+      arg5 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg6 = ST(4);
     }
-    if (items > 6) {
+    if (items > 5) {
       
     }
     {
@@ -4110,8 +4590,6 @@ XS(_wrap_svn_repos_recover3) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
@@ -4119,8 +4597,6 @@ XS(_wrap_svn_repos_recover3) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -4146,6 +4622,7 @@ XS(_wrap_svn_repos_recover2) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_repos_recover2(path,nonblocking,start_callback,start_callback_baton,pool);");
@@ -4226,6 +4703,7 @@ XS(_wrap_svn_repos_recover) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_repos_recover(path,pool);");
@@ -4285,12 +4763,13 @@ XS(_wrap_svn_repos_freeze) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_repos_freeze(paths,freeze_func,freeze_baton,pool);");
     }
     {
-      arg1 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(0),
+      arg1 = svn_swig_pl_strings_to_array(ST(0),
         _global_pool);
     }
     {
@@ -4362,6 +4841,7 @@ XS(_wrap_svn_repos_db_logfiles) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -4433,6 +4913,7 @@ XS(_wrap_svn_repos_path) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_repos_path(repos,pool);");
@@ -4476,6 +4957,7 @@ XS(_wrap_svn_repos_db_env) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_repos_db_env(repos,pool);");
@@ -4519,6 +5001,7 @@ XS(_wrap_svn_repos_conf_dir) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_repos_conf_dir(repos,pool);");
@@ -4562,6 +5045,7 @@ XS(_wrap_svn_repos_svnserve_conf) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_repos_svnserve_conf(repos,pool);");
@@ -4605,6 +5089,7 @@ XS(_wrap_svn_repos_lock_dir) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_repos_lock_dir(repos,pool);");
@@ -4648,6 +5133,7 @@ XS(_wrap_svn_repos_db_lockfile) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_repos_db_lockfile(repos,pool);");
@@ -4691,6 +5177,7 @@ XS(_wrap_svn_repos_db_logs_lockfile) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_repos_db_logs_lockfile(repos,pool);");
@@ -4734,6 +5221,7 @@ XS(_wrap_svn_repos_hook_dir) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_repos_hook_dir(repos,pool);");
@@ -4777,6 +5265,7 @@ XS(_wrap_svn_repos_start_commit_hook) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_repos_start_commit_hook(repos,pool);");
@@ -4820,6 +5309,7 @@ XS(_wrap_svn_repos_pre_commit_hook) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_repos_pre_commit_hook(repos,pool);");
@@ -4863,6 +5353,7 @@ XS(_wrap_svn_repos_post_commit_hook) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_repos_post_commit_hook(repos,pool);");
@@ -4906,6 +5397,7 @@ XS(_wrap_svn_repos_pre_revprop_change_hook) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_repos_pre_revprop_change_hook(repos,pool);");
@@ -4949,6 +5441,7 @@ XS(_wrap_svn_repos_post_revprop_change_hook) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_repos_post_revprop_change_hook(repos,pool);");
@@ -4992,6 +5485,7 @@ XS(_wrap_svn_repos_pre_lock_hook) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_repos_pre_lock_hook(repos,pool);");
@@ -5035,6 +5529,7 @@ XS(_wrap_svn_repos_post_lock_hook) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_repos_post_lock_hook(repos,pool);");
@@ -5078,6 +5573,7 @@ XS(_wrap_svn_repos_pre_unlock_hook) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_repos_pre_unlock_hook(repos,pool);");
@@ -5121,6 +5617,7 @@ XS(_wrap_svn_repos_post_unlock_hook) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_repos_post_unlock_hook(repos,pool);");
@@ -5168,6 +5665,7 @@ XS(_wrap_svn_repos_hooks_setenv) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_repos_hooks_setenv(repos,hooks_env_path,scratch_pool);");
@@ -5269,6 +5767,7 @@ XS(_wrap_svn_repos_begin_report3) {
     
     {
       _global_pool = arg16 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 12) || (items > 13)) {
@@ -5320,14 +5819,14 @@ XS(_wrap_svn_repos_begin_report3) {
     } 
     arg10 = (svn_boolean_t)(val10);
     {
-      svn_delta_make_editor(&arg11, &arg12, ST(9), _global_pool);
+      svn_swig_pl_make_editor(&arg11, &arg12, ST(9), _global_pool);
     }
     {
       if (SvOK(ST(10))) {
-        arg13 = svn_swig_pl_thunk_authz_func;
+        arg13 = (svn_repos_authz_func_t) svn_swig_pl_thunk_authz_func;
         arg14 = ST(10);
       } else {
-        arg13 = NULL;
+        arg13 = (svn_repos_authz_func_t) NULL;
         arg14 = NULL;
       }
     }
@@ -5441,6 +5940,7 @@ XS(_wrap_svn_repos_begin_report2) {
     
     {
       _global_pool = arg15 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 11) || (items > 12)) {
@@ -5492,14 +5992,14 @@ XS(_wrap_svn_repos_begin_report2) {
     } 
     arg10 = (svn_boolean_t)(val10);
     {
-      svn_delta_make_editor(&arg11, &arg12, ST(9), _global_pool);
+      svn_swig_pl_make_editor(&arg11, &arg12, ST(9), _global_pool);
     }
     {
       if (SvOK(ST(10))) {
-        arg13 = svn_swig_pl_thunk_authz_func;
+        arg13 = (svn_repos_authz_func_t) svn_swig_pl_thunk_authz_func;
         arg14 = ST(10);
       } else {
-        arg13 = NULL;
+        arg13 = (svn_repos_authz_func_t) NULL;
         arg14 = NULL;
       }
     }
@@ -5607,6 +6107,7 @@ XS(_wrap_svn_repos_begin_report) {
     
     {
       _global_pool = arg15 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 11) || (items > 12)) {
@@ -5658,14 +6159,14 @@ XS(_wrap_svn_repos_begin_report) {
     } 
     arg10 = (svn_boolean_t)(val10);
     {
-      svn_delta_make_editor(&arg11, &arg12, ST(9), _global_pool);
+      svn_swig_pl_make_editor(&arg11, &arg12, ST(9), _global_pool);
     }
     {
       if (SvOK(ST(10))) {
-        arg13 = svn_swig_pl_thunk_authz_func;
+        arg13 = (svn_repos_authz_func_t) svn_swig_pl_thunk_authz_func;
         arg14 = ST(10);
       } else {
-        arg13 = NULL;
+        arg13 = (svn_repos_authz_func_t) NULL;
         arg14 = NULL;
       }
     }
@@ -5755,6 +6256,7 @@ XS(_wrap_svn_repos_set_path3) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 6) || (items > 7)) {
       SWIG_croak("Usage: svn_repos_set_path3(report_baton,path,revision,depth,start_empty,lock_token,pool);");
@@ -5860,6 +6362,7 @@ XS(_wrap_svn_repos_set_path2) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 5) || (items > 6)) {
       SWIG_croak("Usage: svn_repos_set_path2(report_baton,path,revision,start_empty,lock_token,pool);");
@@ -5954,6 +6457,7 @@ XS(_wrap_svn_repos_set_path) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_repos_set_path(report_baton,path,revision,start_empty,pool);");
@@ -6052,6 +6556,7 @@ XS(_wrap_svn_repos_link_path3) {
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 7) || (items > 8)) {
       SWIG_croak("Usage: svn_repos_link_path3(report_baton,path,link_path,revision,depth,start_empty,lock_token,pool);");
@@ -6168,6 +6673,7 @@ XS(_wrap_svn_repos_link_path2) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 6) || (items > 7)) {
       SWIG_croak("Usage: svn_repos_link_path2(report_baton,path,link_path,revision,start_empty,lock_token,pool);");
@@ -6273,6 +6779,7 @@ XS(_wrap_svn_repos_link_path) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 5) || (items > 6)) {
       SWIG_croak("Usage: svn_repos_link_path(report_baton,path,link_path,revision,start_empty,pool);");
@@ -6361,6 +6868,7 @@ XS(_wrap_svn_repos_delete_path) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_repos_delete_path(report_baton,path,pool);");
@@ -6424,6 +6932,7 @@ XS(_wrap_svn_repos_finish_report) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_repos_finish_report(report_baton,pool);");
@@ -6480,6 +6989,7 @@ XS(_wrap_svn_repos_abort_report) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_repos_abort_report(report_baton,pool);");
@@ -6568,6 +7078,7 @@ XS(_wrap_svn_repos_dir_delta2) {
     
     {
       _global_pool = arg14 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 11) || (items > 12)) {
       SWIG_croak("Usage: svn_repos_dir_delta2(src_root,src_parent_dir,src_entry,tgt_root,tgt_path,editor,edit_baton,authz_read_func,authz_read_baton,text_deltas,depth,entry_props,ignore_ancestry,pool);");
@@ -6598,14 +7109,14 @@ XS(_wrap_svn_repos_dir_delta2) {
     }
     arg5 = (char *)(buf5);
     {
-      svn_delta_make_editor(&arg6, &arg7, ST(5), _global_pool);
+      svn_swig_pl_make_editor(&arg6, &arg7, ST(5), _global_pool);
     }
     {
       if (SvOK(ST(6))) {
-        arg8 = svn_swig_pl_thunk_authz_func;
+        arg8 = (svn_repos_authz_func_t) svn_swig_pl_thunk_authz_func;
         arg9 = ST(6);
       } else {
-        arg8 = NULL;
+        arg8 = (svn_repos_authz_func_t) NULL;
         arg9 = NULL;
       }
     }
@@ -6725,6 +7236,7 @@ XS(_wrap_svn_repos_dir_delta) {
     
     {
       _global_pool = arg14 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 11) || (items > 12)) {
       SWIG_croak("Usage: svn_repos_dir_delta(src_root,src_parent_dir,src_entry,tgt_root,tgt_path,editor,edit_baton,authz_read_func,authz_read_baton,text_deltas,recurse,entry_props,ignore_ancestry,pool);");
@@ -6755,14 +7267,14 @@ XS(_wrap_svn_repos_dir_delta) {
     }
     arg5 = (char *)(buf5);
     {
-      svn_delta_make_editor(&arg6, &arg7, ST(5), _global_pool);
+      svn_swig_pl_make_editor(&arg6, &arg7, ST(5), _global_pool);
     }
     {
       if (SvOK(ST(6))) {
-        arg8 = svn_swig_pl_thunk_authz_func;
+        arg8 = (svn_repos_authz_func_t) svn_swig_pl_thunk_authz_func;
         arg9 = ST(6);
       } else {
-        arg8 = NULL;
+        arg8 = (svn_repos_authz_func_t) NULL;
         arg9 = NULL;
       }
     }
@@ -6865,6 +7377,7 @@ XS(_wrap_svn_repos_replay2) {
     
     {
       _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 6) || (items > 7)) {
       SWIG_croak("Usage: svn_repos_replay2(root,base_dir,low_water_mark,send_deltas,editor,edit_baton,authz_read_func,authz_read_baton,pool);");
@@ -6890,14 +7403,14 @@ XS(_wrap_svn_repos_replay2) {
     } 
     arg4 = (svn_boolean_t)(val4);
     {
-      svn_delta_make_editor(&arg5, &arg6, ST(4), _global_pool);
+      svn_swig_pl_make_editor(&arg5, &arg6, ST(4), _global_pool);
     }
     {
       if (SvOK(ST(5))) {
-        arg7 = svn_swig_pl_thunk_authz_func;
+        arg7 = (svn_repos_authz_func_t) svn_swig_pl_thunk_authz_func;
         arg8 = ST(5);
       } else {
-        arg7 = NULL;
+        arg7 = (svn_repos_authz_func_t) NULL;
         arg8 = NULL;
       }
     }
@@ -6958,6 +7471,7 @@ XS(_wrap_svn_repos_replay) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_repos_replay(root,editor,edit_baton,pool);");
@@ -6968,7 +7482,7 @@ XS(_wrap_svn_repos_replay) {
     }
     arg1 = (svn_fs_root_t *)(argp1);
     {
-      svn_delta_make_editor(&arg2, &arg3, ST(1), _global_pool);
+      svn_swig_pl_make_editor(&arg2, &arg3, ST(1), _global_pool);
     }
     if (items > 2) {
       
@@ -7040,11 +7554,12 @@ XS(_wrap_svn_repos_get_commit_editor5) {
     
     {
       _global_pool = arg12 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
     if ((items < 8) || (items > 9)) {
-      SWIG_croak("Usage: svn_repos_get_commit_editor5(repos,txn,repos_url,base_path,revprop_table,commit_callback,commit_baton,authz_callback,authz_baton,pool);");
+      SWIG_croak("Usage: svn_repos_get_commit_editor5(repos,txn,repos_url_decoded,base_path,revprop_table,commit_callback,commit_baton,authz_callback,authz_baton,pool);");
     }
     res3 = SWIG_ConvertPtr(ST(0), &argp3,SWIGTYPE_p_svn_repos_t, 0 |  0 );
     if (!SWIG_IsOK(res3)) {
@@ -7067,8 +7582,10 @@ XS(_wrap_svn_repos_get_commit_editor5) {
     }
     arg6 = (char *)(buf6);
     {
-      if (_global_pool == NULL)
-      _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
       arg7 = svn_swig_pl_hash_to_prophash(ST(4), _global_pool);  
     }
     {
@@ -7185,6 +7702,7 @@ XS(_wrap_svn_repos_get_commit_editor4) {
     
     {
       _global_pool = arg13 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
@@ -7337,6 +7855,7 @@ XS(_wrap_svn_repos_get_commit_editor3) {
     
     {
       _global_pool = arg13 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
@@ -7486,6 +8005,7 @@ XS(_wrap_svn_repos_get_commit_editor2) {
     
     {
       _global_pool = arg11 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
@@ -7618,6 +8138,7 @@ XS(_wrap_svn_repos_get_commit_editor) {
     
     {
       _global_pool = arg10 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
@@ -7727,6 +8248,7 @@ XS(_wrap_svn_repos_dated_revision) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -7812,6 +8334,7 @@ XS(_wrap_svn_repos_get_committed_info) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
@@ -7912,6 +8435,7 @@ XS(_wrap_svn_repos_stat) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -7996,6 +8520,7 @@ XS(_wrap_svn_repos_deleted_rev) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg5 = &temp5;
     if ((items < 4) || (items > 5)) {
@@ -8101,6 +8626,7 @@ XS(_wrap_svn_repos_history2) {
     
     {
       _global_pool = arg10 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 7) || (items > 8)) {
       SWIG_croak("Usage: svn_repos_history2(fs,path,history_func,history_baton,authz_read_func,authz_read_baton,start,end,cross_copies,pool);");
@@ -8116,15 +8642,15 @@ XS(_wrap_svn_repos_history2) {
     }
     arg2 = (char *)(buf2);
     {
-      arg3 = svn_swig_pl_thunk_history_func;
+      arg3 = (svn_repos_history_func_t) svn_swig_pl_thunk_history_func;
       arg4 = ST(2);
     }
     {
       if (SvOK(ST(3))) {
-        arg5 = svn_swig_pl_thunk_authz_func;
+        arg5 = (svn_repos_authz_func_t) svn_swig_pl_thunk_authz_func;
         arg6 = ST(3);
       } else {
-        arg5 = NULL;
+        arg5 = (svn_repos_authz_func_t) NULL;
         arg6 = NULL;
       }
     }
@@ -8215,6 +8741,7 @@ XS(_wrap_svn_repos_history) {
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 6) || (items > 7)) {
       SWIG_croak("Usage: svn_repos_history(fs,path,history_func,history_baton,start,end,cross_copies,pool);");
@@ -8230,7 +8757,7 @@ XS(_wrap_svn_repos_history) {
     }
     arg2 = (char *)(buf2);
     {
-      arg3 = svn_swig_pl_thunk_history_func;
+      arg3 = (svn_repos_history_func_t) svn_swig_pl_thunk_history_func;
       arg4 = ST(2);
     }
     ecode5 = SWIG_AsVal_long SWIG_PERL_CALL_ARGS_2(ST(3), &val5);
@@ -8319,6 +8846,7 @@ XS(_wrap_svn_repos_trace_node_locations) {
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     if ((items < 5) || (items > 6)) {
@@ -8346,10 +8874,10 @@ XS(_wrap_svn_repos_trace_node_locations) {
     arg5 = (apr_array_header_t *)(argp5);
     {
       if (SvOK(ST(4))) {
-        arg6 = svn_swig_pl_thunk_authz_func;
+        arg6 = (svn_repos_authz_func_t) svn_swig_pl_thunk_authz_func;
         arg7 = ST(4);
       } else {
-        arg6 = NULL;
+        arg6 = (svn_repos_authz_func_t) NULL;
         arg7 = NULL;
       }
     }
@@ -8437,6 +8965,7 @@ XS(_wrap_svn_repos_node_location_segments) {
     
     {
       _global_pool = arg10 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 8) || (items > 9)) {
       SWIG_croak("Usage: svn_repos_node_location_segments(repos,path,peg_revision,start_rev,end_rev,receiver,receiver_baton,authz_read_func,authz_read_baton,pool);");
@@ -8478,10 +9007,10 @@ XS(_wrap_svn_repos_node_location_segments) {
     }
     {
       if (SvOK(ST(7))) {
-        arg8 = svn_swig_pl_thunk_authz_func;
+        arg8 = (svn_repos_authz_func_t) svn_swig_pl_thunk_authz_func;
         arg9 = ST(7);
       } else {
-        arg8 = NULL;
+        arg8 = (svn_repos_authz_func_t) NULL;
         arg9 = NULL;
       }
     }
@@ -8570,6 +9099,7 @@ XS(_wrap_svn_repos_get_logs4) {
     
     {
       _global_pool = arg14 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 11) || (items > 12)) {
       SWIG_croak("Usage: svn_repos_get_logs4(repos,paths,start,end,limit,discover_changed_paths,strict_node_history,include_merged_revisions,revprops,authz_read_func,authz_read_baton,receiver,receiver_baton,pool);");
@@ -8580,7 +9110,7 @@ XS(_wrap_svn_repos_get_logs4) {
     }
     arg1 = (svn_repos_t *)(argp1);
     {
-      arg2 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(1),
+      arg2 = svn_swig_pl_strings_to_array(ST(1),
         _global_pool);
     }
     ecode3 = SWIG_AsVal_long SWIG_PERL_CALL_ARGS_2(ST(2), &val3);
@@ -8614,20 +9144,20 @@ XS(_wrap_svn_repos_get_logs4) {
     } 
     arg8 = (svn_boolean_t)(val8);
     {
-      arg9 = SvOK(ST(8)) ? (apr_array_header_t *) svn_swig_pl_strings_to_array(
+      arg9 = SvOK(ST(8)) ? svn_swig_pl_strings_to_array(
         ST(8), _global_pool) : NULL;
     }
     {
       if (SvOK(ST(9))) {
-        arg10 = svn_swig_pl_thunk_authz_func;
+        arg10 = (svn_repos_authz_func_t) svn_swig_pl_thunk_authz_func;
         arg11 = ST(9);
       } else {
-        arg10 = NULL;
+        arg10 = (svn_repos_authz_func_t) NULL;
         arg11 = NULL;
       }
     }
     {
-      arg12 = svn_swig_pl_thunk_log_entry_receiver;
+      arg12 = (svn_log_entry_receiver_t) svn_swig_pl_thunk_log_entry_receiver;
       arg13 = ST(10);
     }
     if (items > 11) {
@@ -8715,6 +9245,7 @@ XS(_wrap_svn_repos_get_logs3) {
     
     {
       _global_pool = arg12 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 9) || (items > 10)) {
       SWIG_croak("Usage: svn_repos_get_logs3(repos,paths,start,end,limit,discover_changed_paths,strict_node_history,authz_read_func,authz_read_baton,receiver,receiver_baton,pool);");
@@ -8725,7 +9256,7 @@ XS(_wrap_svn_repos_get_logs3) {
     }
     arg1 = (svn_repos_t *)(argp1);
     {
-      arg2 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(1),
+      arg2 = svn_swig_pl_strings_to_array(ST(1),
         _global_pool);
     }
     ecode3 = SWIG_AsVal_long SWIG_PERL_CALL_ARGS_2(ST(2), &val3);
@@ -8755,15 +9286,15 @@ XS(_wrap_svn_repos_get_logs3) {
     arg7 = (svn_boolean_t)(val7);
     {
       if (SvOK(ST(7))) {
-        arg8 = svn_swig_pl_thunk_authz_func;
+        arg8 = (svn_repos_authz_func_t) svn_swig_pl_thunk_authz_func;
         arg9 = ST(7);
       } else {
-        arg8 = NULL;
+        arg8 = (svn_repos_authz_func_t) NULL;
         arg9 = NULL;
       }
     }
     {
-      arg10 = svn_swig_pl_thunk_log_receiver;
+      arg10 = (svn_log_message_receiver_t) svn_swig_pl_thunk_log_receiver;
       arg11 = ST(8);
     }
     if (items > 9) {
@@ -8844,6 +9375,7 @@ XS(_wrap_svn_repos_get_logs2) {
     
     {
       _global_pool = arg11 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 8) || (items > 9)) {
       SWIG_croak("Usage: svn_repos_get_logs2(repos,paths,start,end,discover_changed_paths,strict_node_history,authz_read_func,authz_read_baton,receiver,receiver_baton,pool);");
@@ -8854,7 +9386,7 @@ XS(_wrap_svn_repos_get_logs2) {
     }
     arg1 = (svn_repos_t *)(argp1);
     {
-      arg2 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(1),
+      arg2 = svn_swig_pl_strings_to_array(ST(1),
         _global_pool);
     }
     ecode3 = SWIG_AsVal_long SWIG_PERL_CALL_ARGS_2(ST(2), &val3);
@@ -8879,15 +9411,15 @@ XS(_wrap_svn_repos_get_logs2) {
     arg6 = (svn_boolean_t)(val6);
     {
       if (SvOK(ST(6))) {
-        arg7 = svn_swig_pl_thunk_authz_func;
+        arg7 = (svn_repos_authz_func_t) svn_swig_pl_thunk_authz_func;
         arg8 = ST(6);
       } else {
-        arg7 = NULL;
+        arg7 = (svn_repos_authz_func_t) NULL;
         arg8 = NULL;
       }
     }
     {
-      arg9 = svn_swig_pl_thunk_log_receiver;
+      arg9 = (svn_log_message_receiver_t) svn_swig_pl_thunk_log_receiver;
       arg10 = ST(7);
     }
     if (items > 8) {
@@ -8964,6 +9496,7 @@ XS(_wrap_svn_repos_get_logs) {
     
     {
       _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 7) || (items > 8)) {
       SWIG_croak("Usage: svn_repos_get_logs(repos,paths,start,end,discover_changed_paths,strict_node_history,receiver,receiver_baton,pool);");
@@ -8974,7 +9507,7 @@ XS(_wrap_svn_repos_get_logs) {
     }
     arg1 = (svn_repos_t *)(argp1);
     {
-      arg2 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(1),
+      arg2 = svn_swig_pl_strings_to_array(ST(1),
         _global_pool);
     }
     ecode3 = SWIG_AsVal_long SWIG_PERL_CALL_ARGS_2(ST(2), &val3);
@@ -8998,7 +9531,7 @@ XS(_wrap_svn_repos_get_logs) {
     } 
     arg6 = (svn_boolean_t)(val6);
     {
-      arg7 = svn_swig_pl_thunk_log_receiver;
+      arg7 = (svn_log_message_receiver_t) svn_swig_pl_thunk_log_receiver;
       arg8 = ST(6);
     }
     if (items > 7) {
@@ -9074,6 +9607,7 @@ XS(_wrap_svn_repos_fs_get_mergeinfo) {
     
     {
       _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 6) || (items > 7)) {
@@ -9085,7 +9619,7 @@ XS(_wrap_svn_repos_fs_get_mergeinfo) {
     }
     arg2 = (svn_repos_t *)(argp2);
     {
-      arg3 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(1),
+      arg3 = svn_swig_pl_strings_to_array(ST(1),
         _global_pool);
     }
     ecode4 = SWIG_AsVal_long SWIG_PERL_CALL_ARGS_2(ST(2), &val4);
@@ -9105,10 +9639,10 @@ XS(_wrap_svn_repos_fs_get_mergeinfo) {
     arg6 = (svn_boolean_t)(val6);
     {
       if (SvOK(ST(5))) {
-        arg7 = svn_swig_pl_thunk_authz_func;
+        arg7 = (svn_repos_authz_func_t) svn_swig_pl_thunk_authz_func;
         arg8 = ST(5);
       } else {
-        arg7 = NULL;
+        arg7 = (svn_repos_authz_func_t) NULL;
         arg8 = NULL;
       }
     }
@@ -9198,6 +9732,7 @@ XS(_wrap_svn_repos_get_file_revs2) {
     
     {
       _global_pool = arg10 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 8) || (items > 9)) {
       SWIG_croak("Usage: svn_repos_get_file_revs2(repos,path,start,end,include_merged_revisions,authz_read_func,authz_read_baton,handler,handler_baton,pool);");
@@ -9229,10 +9764,10 @@ XS(_wrap_svn_repos_get_file_revs2) {
     arg5 = (svn_boolean_t)(val5);
     {
       if (SvOK(ST(5))) {
-        arg6 = svn_swig_pl_thunk_authz_func;
+        arg6 = (svn_repos_authz_func_t) svn_swig_pl_thunk_authz_func;
         arg7 = ST(5);
       } else {
-        arg6 = NULL;
+        arg6 = (svn_repos_authz_func_t) NULL;
         arg7 = NULL;
       }
     }
@@ -9322,6 +9857,7 @@ XS(_wrap_svn_repos_get_file_revs) {
     
     {
       _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 7) || (items > 8)) {
       SWIG_croak("Usage: svn_repos_get_file_revs(repos,path,start,end,authz_read_func,authz_read_baton,handler,handler_baton,pool);");
@@ -9348,10 +9884,10 @@ XS(_wrap_svn_repos_get_file_revs) {
     arg4 = (svn_revnum_t)(val4);
     {
       if (SvOK(ST(4))) {
-        arg5 = svn_swig_pl_thunk_authz_func;
+        arg5 = (svn_repos_authz_func_t) svn_swig_pl_thunk_authz_func;
         arg6 = ST(4);
       } else {
-        arg5 = NULL;
+        arg5 = (svn_repos_authz_func_t) NULL;
         arg6 = NULL;
       }
     }
@@ -9432,6 +9968,7 @@ XS(_wrap_svn_repos_fs_commit_txn) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg3 = &temp3;
@@ -9522,6 +10059,7 @@ XS(_wrap_svn_repos_fs_begin_txn_for_commit2) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 3) || (items > 4)) {
@@ -9538,8 +10076,10 @@ XS(_wrap_svn_repos_fs_begin_txn_for_commit2) {
     } 
     arg3 = (svn_revnum_t)(val3);
     {
-      if (_global_pool == NULL)
-      _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
       arg4 = svn_swig_pl_hash_to_prophash(ST(2), _global_pool);  
     }
     if (items > 3) {
@@ -9613,6 +10153,7 @@ XS(_wrap_svn_repos_fs_begin_txn_for_commit) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 4) || (items > 5)) {
@@ -9707,6 +10248,7 @@ XS(_wrap_svn_repos_fs_begin_txn_for_update) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 3) || (items > 4)) {
@@ -9772,6 +10314,143 @@ XS(_wrap_svn_repos_fs_begin_txn_for_update) {
 }
 
 
+XS(_wrap_svn_repos_fs_lock_many) {
+  {
+    svn_repos_t *arg1 = (svn_repos_t *) 0 ;
+    apr_hash_t *arg2 = (apr_hash_t *) 0 ;
+    char *arg3 = (char *) 0 ;
+    svn_boolean_t arg4 ;
+    apr_time_t arg5 ;
+    svn_boolean_t arg6 ;
+    svn_fs_lock_callback_t arg7 = (svn_fs_lock_callback_t) 0 ;
+    void *arg8 = (void *) 0 ;
+    apr_pool_t *arg9 = (apr_pool_t *) 0 ;
+    apr_pool_t *arg10 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    void *argp2 = 0 ;
+    int res2 = 0 ;
+    int res3 ;
+    char *buf3 = 0 ;
+    int alloc3 = 0 ;
+    int val4 ;
+    int ecode4 = 0 ;
+    long long val5 ;
+    int ecode5 = 0 ;
+    int val6 ;
+    int ecode6 = 0 ;
+    int res8 ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    {
+      _global_pool = arg10 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    if ((items < 8) || (items > 10)) {
+      SWIG_croak("Usage: svn_repos_fs_lock_many(repos,lock_targets,comment,is_dav_comment,expiration_date,steal_lock,lock_callback,lock_baton,result_pool,scratch_pool);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_repos_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_repos_fs_lock_many" "', argument " "1"" of type '" "svn_repos_t *""'"); 
+    }
+    arg1 = (svn_repos_t *)(argp1);
+    res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_apr_hash_t, 0 |  0 );
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_repos_fs_lock_many" "', argument " "2"" of type '" "apr_hash_t *""'"); 
+    }
+    arg2 = (apr_hash_t *)(argp2);
+    res3 = SWIG_AsCharPtrAndSize(ST(2), &buf3, NULL, &alloc3);
+    if (!SWIG_IsOK(res3)) {
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_repos_fs_lock_many" "', argument " "3"" of type '" "char const *""'");
+    }
+    arg3 = (char *)(buf3);
+    ecode4 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(3), &val4);
+    if (!SWIG_IsOK(ecode4)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "svn_repos_fs_lock_many" "', argument " "4"" of type '" "svn_boolean_t""'");
+    } 
+    arg4 = (svn_boolean_t)(val4);
+    ecode5 = SWIG_AsVal_long_SS_long SWIG_PERL_CALL_ARGS_2(ST(4), &val5);
+    if (!SWIG_IsOK(ecode5)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "svn_repos_fs_lock_many" "', argument " "5"" of type '" "apr_time_t""'");
+    } 
+    arg5 = (apr_time_t)(val5);
+    ecode6 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(5), &val6);
+    if (!SWIG_IsOK(ecode6)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "svn_repos_fs_lock_many" "', argument " "6"" of type '" "svn_boolean_t""'");
+    } 
+    arg6 = (svn_boolean_t)(val6);
+    {
+      int res = SWIG_ConvertFunctionPtr(ST(6), (void**)(&arg7), SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t);
+      if (!SWIG_IsOK(res)) {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_repos_fs_lock_many" "', argument " "7"" of type '" "svn_fs_lock_callback_t""'"); 
+      }
+    }
+    res8 = SWIG_ConvertPtr(ST(7),SWIG_as_voidptrptr(&arg8), 0, 0);
+    if (!SWIG_IsOK(res8)) {
+      SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "svn_repos_fs_lock_many" "', argument " "8"" of type '" "void *""'"); 
+    }
+    if (items > 8) {
+      
+    }
+    if (items > 9) {
+      
+    }
+    {
+      result = (svn_error_t *)svn_repos_fs_lock_many(arg1,arg2,(char const *)arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    
+    
+    if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+    
+    
+    
+    
+    
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+    
+    
+    
+    
+    
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_svn_repos_fs_lock) {
   {
     svn_lock_t **arg1 = (svn_lock_t **) 0 ;
@@ -9811,6 +10490,7 @@ XS(_wrap_svn_repos_fs_lock) {
     
     {
       _global_pool = arg10 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 8) || (items > 9)) {
@@ -9911,6 +10591,112 @@ XS(_wrap_svn_repos_fs_lock) {
 }
 
 
+XS(_wrap_svn_repos_fs_unlock_many) {
+  {
+    svn_repos_t *arg1 = (svn_repos_t *) 0 ;
+    apr_hash_t *arg2 = (apr_hash_t *) 0 ;
+    svn_boolean_t arg3 ;
+    svn_fs_lock_callback_t arg4 = (svn_fs_lock_callback_t) 0 ;
+    void *arg5 = (void *) 0 ;
+    apr_pool_t *arg6 = (apr_pool_t *) 0 ;
+    apr_pool_t *arg7 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    void *argp2 = 0 ;
+    int res2 = 0 ;
+    int val3 ;
+    int ecode3 = 0 ;
+    int res5 ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    {
+      _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    if ((items < 5) || (items > 7)) {
+      SWIG_croak("Usage: svn_repos_fs_unlock_many(repos,unlock_targets,break_lock,lock_callback,lock_baton,result_pool,scratch_pool);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_repos_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_repos_fs_unlock_many" "', argument " "1"" of type '" "svn_repos_t *""'"); 
+    }
+    arg1 = (svn_repos_t *)(argp1);
+    res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_apr_hash_t, 0 |  0 );
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_repos_fs_unlock_many" "', argument " "2"" of type '" "apr_hash_t *""'"); 
+    }
+    arg2 = (apr_hash_t *)(argp2);
+    ecode3 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(2), &val3);
+    if (!SWIG_IsOK(ecode3)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "svn_repos_fs_unlock_many" "', argument " "3"" of type '" "svn_boolean_t""'");
+    } 
+    arg3 = (svn_boolean_t)(val3);
+    {
+      int res = SWIG_ConvertFunctionPtr(ST(3), (void**)(&arg4), SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t);
+      if (!SWIG_IsOK(res)) {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_repos_fs_unlock_many" "', argument " "4"" of type '" "svn_fs_lock_callback_t""'"); 
+      }
+    }
+    res5 = SWIG_ConvertPtr(ST(4),SWIG_as_voidptrptr(&arg5), 0, 0);
+    if (!SWIG_IsOK(res5)) {
+      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "svn_repos_fs_unlock_many" "', argument " "5"" of type '" "void *""'"); 
+    }
+    if (items > 5) {
+      
+    }
+    if (items > 6) {
+      
+    }
+    {
+      result = (svn_error_t *)svn_repos_fs_unlock_many(arg1,arg2,arg3,arg4,arg5,arg6,arg7);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    
+    
+    
+    
+    
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    
+    
+    
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_svn_repos_fs_unlock) {
   {
     svn_repos_t *arg1 = (svn_repos_t *) 0 ;
@@ -9935,6 +10721,7 @@ XS(_wrap_svn_repos_fs_unlock) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_repos_fs_unlock(repos,path,token,break_lock,pool);");
@@ -10025,6 +10812,7 @@ XS(_wrap_svn_repos_fs_get_locks2) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 4) || (items > 5)) {
@@ -10047,10 +10835,10 @@ XS(_wrap_svn_repos_fs_get_locks2) {
     arg4 = (svn_depth_t)(val4);
     {
       if (SvOK(ST(3))) {
-        arg5 = svn_swig_pl_thunk_authz_func;
+        arg5 = (svn_repos_authz_func_t) svn_swig_pl_thunk_authz_func;
         arg6 = ST(3);
       } else {
-        arg5 = NULL;
+        arg5 = (svn_repos_authz_func_t) NULL;
         arg6 = NULL;
       }
     }
@@ -10120,6 +10908,7 @@ XS(_wrap_svn_repos_fs_get_locks) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 3) || (items > 4)) {
@@ -10137,10 +10926,10 @@ XS(_wrap_svn_repos_fs_get_locks) {
     arg3 = (char *)(buf3);
     {
       if (SvOK(ST(2))) {
-        arg4 = svn_swig_pl_thunk_authz_func;
+        arg4 = (svn_repos_authz_func_t) svn_swig_pl_thunk_authz_func;
         arg5 = ST(2);
       } else {
-        arg4 = NULL;
+        arg4 = (svn_repos_authz_func_t) NULL;
         arg5 = NULL;
       }
     }
@@ -10225,6 +11014,7 @@ XS(_wrap_svn_repos_fs_change_rev_prop4) {
     
     {
       _global_pool = arg11 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 9) || (items > 10)) {
       SWIG_croak("Usage: svn_repos_fs_change_rev_prop4(repos,rev,author,name,old_value_p,new_value,use_pre_revprop_change_hook,use_post_revprop_change_hook,authz_read_func,authz_read_baton,pool);");
@@ -10275,10 +11065,10 @@ XS(_wrap_svn_repos_fs_change_rev_prop4) {
     arg8 = (svn_boolean_t)(val8);
     {
       if (SvOK(ST(8))) {
-        arg9 = svn_swig_pl_thunk_authz_func;
+        arg9 = (svn_repos_authz_func_t) svn_swig_pl_thunk_authz_func;
         arg10 = ST(8);
       } else {
-        arg9 = NULL;
+        arg9 = (svn_repos_authz_func_t) NULL;
         arg10 = NULL;
       }
     }
@@ -10374,6 +11164,7 @@ XS(_wrap_svn_repos_fs_change_rev_prop3) {
     
     {
       _global_pool = arg10 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 8) || (items > 9)) {
       SWIG_croak("Usage: svn_repos_fs_change_rev_prop3(repos,rev,author,name,new_value,use_pre_revprop_change_hook,use_post_revprop_change_hook,authz_read_func,authz_read_baton,pool);");
@@ -10419,10 +11210,10 @@ XS(_wrap_svn_repos_fs_change_rev_prop3) {
     arg7 = (svn_boolean_t)(val7);
     {
       if (SvOK(ST(7))) {
-        arg8 = svn_swig_pl_thunk_authz_func;
+        arg8 = (svn_repos_authz_func_t) svn_swig_pl_thunk_authz_func;
         arg9 = ST(7);
       } else {
-        arg8 = NULL;
+        arg8 = (svn_repos_authz_func_t) NULL;
         arg9 = NULL;
       }
     }
@@ -10502,6 +11293,7 @@ XS(_wrap_svn_repos_fs_change_rev_prop2) {
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 6) || (items > 7)) {
       SWIG_croak("Usage: svn_repos_fs_change_rev_prop2(repos,rev,author,name,new_value,authz_read_func,authz_read_baton,pool);");
@@ -10537,10 +11329,10 @@ XS(_wrap_svn_repos_fs_change_rev_prop2) {
     }
     {
       if (SvOK(ST(5))) {
-        arg6 = svn_swig_pl_thunk_authz_func;
+        arg6 = (svn_repos_authz_func_t) svn_swig_pl_thunk_authz_func;
         arg7 = ST(5);
       } else {
-        arg6 = NULL;
+        arg6 = (svn_repos_authz_func_t) NULL;
         arg7 = NULL;
       }
     }
@@ -10614,6 +11406,7 @@ XS(_wrap_svn_repos_fs_change_rev_prop) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 5) || (items > 6)) {
       SWIG_croak("Usage: svn_repos_fs_change_rev_prop(repos,rev,author,name,new_value,pool);");
@@ -10715,6 +11508,7 @@ XS(_wrap_svn_repos_fs_revision_prop) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 4) || (items > 5)) {
@@ -10737,10 +11531,10 @@ XS(_wrap_svn_repos_fs_revision_prop) {
     arg4 = (char *)(buf4);
     {
       if (SvOK(ST(3))) {
-        arg5 = svn_swig_pl_thunk_authz_func;
+        arg5 = (svn_repos_authz_func_t) svn_swig_pl_thunk_authz_func;
         arg6 = ST(3);
       } else {
-        arg5 = NULL;
+        arg5 = (svn_repos_authz_func_t) NULL;
         arg6 = NULL;
       }
     }
@@ -10813,6 +11607,7 @@ XS(_wrap_svn_repos_fs_revision_proplist) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 3) || (items > 4)) {
@@ -10830,10 +11625,10 @@ XS(_wrap_svn_repos_fs_revision_proplist) {
     arg3 = (svn_revnum_t)(val3);
     {
       if (SvOK(ST(2))) {
-        arg4 = svn_swig_pl_thunk_authz_func;
+        arg4 = (svn_repos_authz_func_t) svn_swig_pl_thunk_authz_func;
         arg5 = ST(2);
       } else {
-        arg4 = NULL;
+        arg4 = (svn_repos_authz_func_t) NULL;
         arg5 = NULL;
       }
     }
@@ -10903,6 +11698,7 @@ XS(_wrap_svn_repos_fs_change_node_prop) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_repos_fs_change_node_prop(root,path,name,value,pool);");
@@ -10973,6 +11769,122 @@ XS(_wrap_svn_repos_fs_change_node_prop) {
 }
 
 
+XS(_wrap_svn_repos_fs_get_inherited_props) {
+  {
+    apr_array_header_t **arg1 = (apr_array_header_t **) 0 ;
+    svn_fs_root_t *arg2 = (svn_fs_root_t *) 0 ;
+    char *arg3 = (char *) 0 ;
+    char *arg4 = (char *) 0 ;
+    svn_repos_authz_func_t arg5 = (svn_repos_authz_func_t) 0 ;
+    void *arg6 = (void *) 0 ;
+    apr_pool_t *arg7 = (apr_pool_t *) 0 ;
+    apr_pool_t *arg8 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    apr_array_header_t *temp1 ;
+    void *argp2 = 0 ;
+    int res2 = 0 ;
+    int res3 ;
+    char *buf3 = 0 ;
+    int alloc3 = 0 ;
+    int res4 ;
+    char *buf4 = 0 ;
+    int alloc4 = 0 ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    {
+      _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    arg1 = &temp1;
+    if ((items < 4) || (items > 6)) {
+      SWIG_croak("Usage: svn_repos_fs_get_inherited_props(root,path,propname,authz_read_func,authz_read_baton,result_pool,scratch_pool);");
+    }
+    res2 = SWIG_ConvertPtr(ST(0), &argp2,SWIGTYPE_p_svn_fs_root_t, 0 |  0 );
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_repos_fs_get_inherited_props" "', argument " "2"" of type '" "svn_fs_root_t *""'"); 
+    }
+    arg2 = (svn_fs_root_t *)(argp2);
+    res3 = SWIG_AsCharPtrAndSize(ST(1), &buf3, NULL, &alloc3);
+    if (!SWIG_IsOK(res3)) {
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_repos_fs_get_inherited_props" "', argument " "3"" of type '" "char const *""'");
+    }
+    arg3 = (char *)(buf3);
+    res4 = SWIG_AsCharPtrAndSize(ST(2), &buf4, NULL, &alloc4);
+    if (!SWIG_IsOK(res4)) {
+      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "svn_repos_fs_get_inherited_props" "', argument " "4"" of type '" "char const *""'");
+    }
+    arg4 = (char *)(buf4);
+    {
+      if (SvOK(ST(3))) {
+        arg5 = (svn_repos_authz_func_t) svn_swig_pl_thunk_authz_func;
+        arg6 = ST(3);
+      } else {
+        arg5 = (svn_repos_authz_func_t) NULL;
+        arg6 = NULL;
+      }
+    }
+    if (items > 4) {
+      
+    }
+    if (items > 5) {
+      
+    }
+    {
+      result = (svn_error_t *)svn_repos_fs_get_inherited_props(arg1,arg2,(char const *)arg3,(char const *)arg4,arg5,arg6,arg7,arg8);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    {
+      /* FIXME: Missing argout typemap: svn_repos_fs_get_inherited_props arg 1 (apr_array_header_t **) */
+      
+      
+      
+      
+      SWIG_exception(SWIG_ValueError, "svn_repos_fs_get_inherited_props is not implemented yet");
+      
+    }
+    
+    
+    if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+    if (alloc4 == SWIG_NEWOBJ) free((char*)buf4);
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+    if (alloc4 == SWIG_NEWOBJ) free((char*)buf4);
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_svn_repos_fs_change_txn_prop) {
   {
     svn_fs_txn_t *arg1 = (svn_fs_txn_t *) 0 ;
@@ -10992,6 +11904,7 @@ XS(_wrap_svn_repos_fs_change_txn_prop) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_repos_fs_change_txn_prop(txn,name,value,pool);");
@@ -11071,6 +11984,7 @@ XS(_wrap_svn_repos_fs_change_txn_props) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_repos_fs_change_txn_props(txn,props,pool);");
@@ -11811,9 +12725,11 @@ XS(_wrap_svn_repos_node_editor) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
@@ -11921,6 +12837,251 @@ XS(_wrap_svn_repos_node_from_baton) {
 }
 
 
+XS(_wrap_svn_repos_info_format) {
+  {
+    int *arg1 = (int *) 0 ;
+    svn_version_t **arg2 = (svn_version_t **) 0 ;
+    svn_repos_t *arg3 = (svn_repos_t *) 0 ;
+    apr_pool_t *arg4 = (apr_pool_t *) 0 ;
+    apr_pool_t *arg5 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    int temp1 ;
+    int res1 = SWIG_TMPOBJ ;
+    svn_version_t *temp2 ;
+    void *argp3 = 0 ;
+    int res3 = 0 ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    {
+      _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    arg1 = &temp1;
+    arg2 = &temp2;
+    if ((items < 1) || (items > 3)) {
+      SWIG_croak("Usage: svn_repos_info_format(repos,result_pool,scratch_pool);");
+    }
+    res3 = SWIG_ConvertPtr(ST(0), &argp3,SWIGTYPE_p_svn_repos_t, 0 |  0 );
+    if (!SWIG_IsOK(res3)) {
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_repos_info_format" "', argument " "3"" of type '" "svn_repos_t *""'"); 
+    }
+    arg3 = (svn_repos_t *)(argp3);
+    if (items > 1) {
+      
+    }
+    if (items > 2) {
+      
+    }
+    {
+      result = (svn_error_t *)svn_repos_info_format(arg1,arg2,arg3,arg4,arg5);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    if (SWIG_IsTmpObj(res1)) {
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((*arg1)); argvi++  ;
+    } else {
+      int new_flags = SWIG_IsNewObj(res1) ? (SWIG_POINTER_OWN | 0) : 0;
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj((void*)(arg1), SWIGTYPE_p_int, new_flags); argvi++  ;
+    }
+    {
+      /* FIXME: Missing argout typemap: svn_repos_info_format arg 2 (svn_version_t **) */
+      
+      
+      
+      
+      SWIG_exception(SWIG_ValueError, "svn_repos_info_format is not implemented yet");
+      
+    }
+    
+    
+    
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_svn_repos_verify_fs3) {
+  {
+    svn_repos_t *arg1 = (svn_repos_t *) 0 ;
+    svn_revnum_t arg2 ;
+    svn_revnum_t arg3 ;
+    svn_boolean_t arg4 ;
+    svn_boolean_t arg5 ;
+    svn_repos_notify_func_t arg6 = (svn_repos_notify_func_t) 0 ;
+    void *arg7 = (void *) 0 ;
+    svn_repos_verify_callback_t arg8 = (svn_repos_verify_callback_t) 0 ;
+    void *arg9 = (void *) 0 ;
+    svn_cancel_func_t arg10 = (svn_cancel_func_t) 0 ;
+    void *arg11 = (void *) 0 ;
+    apr_pool_t *arg12 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    long val2 ;
+    int ecode2 = 0 ;
+    long val3 ;
+    int ecode3 = 0 ;
+    int val4 ;
+    int ecode4 = 0 ;
+    int val5 ;
+    int ecode5 = 0 ;
+    int res7 ;
+    int res9 ;
+    int res11 ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg12 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    if ((items < 11) || (items > 12)) {
+      SWIG_croak("Usage: svn_repos_verify_fs3(repos,start_rev,end_rev,check_normalization,metadata_only,notify_func,notify_baton,verify_callback,verify_baton,cancel,cancel_baton,scratch_pool);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_repos_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_repos_verify_fs3" "', argument " "1"" of type '" "svn_repos_t *""'"); 
+    }
+    arg1 = (svn_repos_t *)(argp1);
+    ecode2 = SWIG_AsVal_long SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
+    if (!SWIG_IsOK(ecode2)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "svn_repos_verify_fs3" "', argument " "2"" of type '" "svn_revnum_t""'");
+    } 
+    arg2 = (svn_revnum_t)(val2);
+    ecode3 = SWIG_AsVal_long SWIG_PERL_CALL_ARGS_2(ST(2), &val3);
+    if (!SWIG_IsOK(ecode3)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "svn_repos_verify_fs3" "', argument " "3"" of type '" "svn_revnum_t""'");
+    } 
+    arg3 = (svn_revnum_t)(val3);
+    ecode4 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(3), &val4);
+    if (!SWIG_IsOK(ecode4)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "svn_repos_verify_fs3" "', argument " "4"" of type '" "svn_boolean_t""'");
+    } 
+    arg4 = (svn_boolean_t)(val4);
+    ecode5 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(4), &val5);
+    if (!SWIG_IsOK(ecode5)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "svn_repos_verify_fs3" "', argument " "5"" of type '" "svn_boolean_t""'");
+    } 
+    arg5 = (svn_boolean_t)(val5);
+    {
+      int res = SWIG_ConvertFunctionPtr(ST(5), (void**)(&arg6), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void);
+      if (!SWIG_IsOK(res)) {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_repos_verify_fs3" "', argument " "6"" of type '" "svn_repos_notify_func_t""'"); 
+      }
+    }
+    res7 = SWIG_ConvertPtr(ST(6),SWIG_as_voidptrptr(&arg7), 0, 0);
+    if (!SWIG_IsOK(res7)) {
+      SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "svn_repos_verify_fs3" "', argument " "7"" of type '" "void *""'"); 
+    }
+    {
+      int res = SWIG_ConvertFunctionPtr(ST(7), (void**)(&arg8), SWIGTYPE_p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t);
+      if (!SWIG_IsOK(res)) {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_repos_verify_fs3" "', argument " "8"" of type '" "svn_repos_verify_callback_t""'"); 
+      }
+    }
+    res9 = SWIG_ConvertPtr(ST(8),SWIG_as_voidptrptr(&arg9), 0, 0);
+    if (!SWIG_IsOK(res9)) {
+      SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "svn_repos_verify_fs3" "', argument " "9"" of type '" "void *""'"); 
+    }
+    {
+      int res = SWIG_ConvertFunctionPtr(ST(9), (void**)(&arg10), SWIGTYPE_p_f_p_void__p_svn_error_t);
+      if (!SWIG_IsOK(res)) {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_repos_verify_fs3" "', argument " "10"" of type '" "svn_cancel_func_t""'"); 
+      }
+    }
+    res11 = SWIG_ConvertPtr(ST(10),SWIG_as_voidptrptr(&arg11), 0, 0);
+    if (!SWIG_IsOK(res11)) {
+      SWIG_exception_fail(SWIG_ArgError(res11), "in method '" "svn_repos_verify_fs3" "', argument " "11"" of type '" "void *""'"); 
+    }
+    if (items > 11) {
+      
+    }
+    {
+      result = (svn_error_t *)svn_repos_verify_fs3(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_svn_repos_verify_fs2) {
   {
     svn_repos_t *arg1 = (svn_repos_t *) 0 ;
@@ -11946,6 +13107,7 @@ XS(_wrap_svn_repos_verify_fs2) {
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 7) || (items > 8)) {
       SWIG_croak("Usage: svn_repos_verify_fs2(repos,start_rev,end_rev,notify_func,notify_baton,cancel,cancel_baton,scratch_pool);");
@@ -12049,15 +13211,15 @@ XS(_wrap_svn_repos_verify_fs) {
     int ecode3 = 0 ;
     long val4 ;
     int ecode4 = 0 ;
-    int res6 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
     dXSARGS;
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 6) || (items > 7)) {
+    if ((items < 5) || (items > 6)) {
       SWIG_croak("Usage: svn_repos_verify_fs(repos,feedback_stream,start_rev,end_rev,cancel_func,cancel_baton,pool);");
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_repos_t, 0 |  0 );
@@ -12067,6 +13229,7 @@ XS(_wrap_svn_repos_verify_fs) {
     arg1 = (svn_repos_t *)(argp1);
     {
       svn_swig_pl_make_stream (&arg2, ST(1));
+      SPAGAIN;
     }
     ecode3 = SWIG_AsVal_long SWIG_PERL_CALL_ARGS_2(ST(2), &val3);
     if (!SWIG_IsOK(ecode3)) {
@@ -12079,16 +13242,10 @@ XS(_wrap_svn_repos_verify_fs) {
     } 
     arg4 = (svn_revnum_t)(val4);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(4), (void**)(&arg5), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_repos_verify_fs" "', argument " "5"" of type '" "svn_cancel_func_t""'"); 
-      }
+      arg5 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg6 = ST(4);
     }
-    res6 = SWIG_ConvertPtr(ST(5),SWIG_as_voidptrptr(&arg6), 0, 0);
-    if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "svn_repos_verify_fs" "', argument " "6"" of type '" "void *""'"); 
-    }
-    if (items > 6) {
+    if (items > 5) {
       
     }
     {
@@ -12118,8 +13275,6 @@ XS(_wrap_svn_repos_verify_fs) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
@@ -12127,8 +13282,6 @@ XS(_wrap_svn_repos_verify_fs) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -12159,15 +13312,15 @@ XS(_wrap_svn_repos_dump_fs3) {
     int val6 ;
     int ecode6 = 0 ;
     int res8 ;
-    int res10 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
     dXSARGS;
     
     {
       _global_pool = arg11 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 10) || (items > 11)) {
+    if ((items < 9) || (items > 10)) {
       SWIG_croak("Usage: svn_repos_dump_fs3(repos,dumpstream,start_rev,end_rev,incremental,use_deltas,notify_func,notify_baton,cancel_func,cancel_baton,scratch_pool);");
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_repos_t, 0 |  0 );
@@ -12177,6 +13330,7 @@ XS(_wrap_svn_repos_dump_fs3) {
     arg1 = (svn_repos_t *)(argp1);
     {
       svn_swig_pl_make_stream (&arg2, ST(1));
+      SPAGAIN;
     }
     ecode3 = SWIG_AsVal_long SWIG_PERL_CALL_ARGS_2(ST(2), &val3);
     if (!SWIG_IsOK(ecode3)) {
@@ -12209,16 +13363,10 @@ XS(_wrap_svn_repos_dump_fs3) {
       SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "svn_repos_dump_fs3" "', argument " "8"" of type '" "void *""'"); 
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(8), (void**)(&arg9), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_repos_dump_fs3" "', argument " "9"" of type '" "svn_cancel_func_t""'"); 
-      }
+      arg9 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg10 = ST(8);
     }
-    res10 = SWIG_ConvertPtr(ST(9),SWIG_as_voidptrptr(&arg10), 0, 0);
-    if (!SWIG_IsOK(res10)) {
-      SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "svn_repos_dump_fs3" "', argument " "10"" of type '" "void *""'"); 
-    }
-    if (items > 10) {
+    if (items > 9) {
       
     }
     {
@@ -12252,8 +13400,6 @@ XS(_wrap_svn_repos_dump_fs3) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
@@ -12265,8 +13411,6 @@ XS(_wrap_svn_repos_dump_fs3) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -12295,15 +13439,15 @@ XS(_wrap_svn_repos_dump_fs2) {
     int ecode6 = 0 ;
     int val7 ;
     int ecode7 = 0 ;
-    int res9 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
     dXSARGS;
     
     {
       _global_pool = arg10 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 9) || (items > 10)) {
+    if ((items < 8) || (items > 9)) {
       SWIG_croak("Usage: svn_repos_dump_fs2(repos,dumpstream,feedback_stream,start_rev,end_rev,incremental,use_deltas,cancel_func,cancel_baton,pool);");
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_repos_t, 0 |  0 );
@@ -12313,9 +13457,11 @@ XS(_wrap_svn_repos_dump_fs2) {
     arg1 = (svn_repos_t *)(argp1);
     {
       svn_swig_pl_make_stream (&arg2, ST(1));
+      SPAGAIN;
     }
     {
       svn_swig_pl_make_stream (&arg3, ST(2));
+      SPAGAIN;
     }
     ecode4 = SWIG_AsVal_long SWIG_PERL_CALL_ARGS_2(ST(3), &val4);
     if (!SWIG_IsOK(ecode4)) {
@@ -12338,16 +13484,10 @@ XS(_wrap_svn_repos_dump_fs2) {
     } 
     arg7 = (svn_boolean_t)(val7);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(7), (void**)(&arg8), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_repos_dump_fs2" "', argument " "8"" of type '" "svn_cancel_func_t""'"); 
-      }
+      arg8 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg9 = ST(7);
     }
-    res9 = SWIG_ConvertPtr(ST(8),SWIG_as_voidptrptr(&arg9), 0, 0);
-    if (!SWIG_IsOK(res9)) {
-      SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "svn_repos_dump_fs2" "', argument " "9"" of type '" "void *""'"); 
-    }
-    if (items > 9) {
+    if (items > 8) {
       
     }
     {
@@ -12380,8 +13520,6 @@ XS(_wrap_svn_repos_dump_fs2) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
@@ -12392,8 +13530,6 @@ XS(_wrap_svn_repos_dump_fs2) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -12419,15 +13555,15 @@ XS(_wrap_svn_repos_dump_fs) {
     int ecode5 = 0 ;
     int val6 ;
     int ecode6 = 0 ;
-    int res8 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
     dXSARGS;
     
     {
       _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 8) || (items > 9)) {
+    if ((items < 7) || (items > 8)) {
       SWIG_croak("Usage: svn_repos_dump_fs(repos,dumpstream,feedback_stream,start_rev,end_rev,incremental,cancel_func,cancel_baton,pool);");
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_repos_t, 0 |  0 );
@@ -12437,9 +13573,11 @@ XS(_wrap_svn_repos_dump_fs) {
     arg1 = (svn_repos_t *)(argp1);
     {
       svn_swig_pl_make_stream (&arg2, ST(1));
+      SPAGAIN;
     }
     {
       svn_swig_pl_make_stream (&arg3, ST(2));
+      SPAGAIN;
     }
     ecode4 = SWIG_AsVal_long SWIG_PERL_CALL_ARGS_2(ST(3), &val4);
     if (!SWIG_IsOK(ecode4)) {
@@ -12457,20 +13595,172 @@ XS(_wrap_svn_repos_dump_fs) {
     } 
     arg6 = (svn_boolean_t)(val6);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(6), (void**)(&arg7), SWIGTYPE_p_f_p_void__p_svn_error_t);
+      arg7 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg8 = ST(6);
+    }
+    if (items > 7) {
+      
+    }
+    {
+      result = (svn_error_t *)svn_repos_dump_fs(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    
+    
+    
+    
+    
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    
+    
+    
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_svn_repos_load_fs5) {
+  {
+    svn_repos_t *arg1 = (svn_repos_t *) 0 ;
+    svn_stream_t *arg2 = (svn_stream_t *) 0 ;
+    svn_revnum_t arg3 ;
+    svn_revnum_t arg4 ;
+    enum svn_repos_load_uuid arg5 ;
+    char *arg6 = (char *) 0 ;
+    svn_boolean_t arg7 ;
+    svn_boolean_t arg8 ;
+    svn_boolean_t arg9 ;
+    svn_boolean_t arg10 ;
+    svn_repos_notify_func_t arg11 = (svn_repos_notify_func_t) 0 ;
+    void *arg12 = (void *) 0 ;
+    svn_cancel_func_t arg13 = (svn_cancel_func_t) 0 ;
+    void *arg14 = (void *) 0 ;
+    apr_pool_t *arg15 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    long val3 ;
+    int ecode3 = 0 ;
+    long val4 ;
+    int ecode4 = 0 ;
+    int val5 ;
+    int ecode5 = 0 ;
+    int res6 ;
+    char *buf6 = 0 ;
+    int alloc6 = 0 ;
+    int val7 ;
+    int ecode7 = 0 ;
+    int val8 ;
+    int ecode8 = 0 ;
+    int val9 ;
+    int ecode9 = 0 ;
+    int val10 ;
+    int ecode10 = 0 ;
+    int res12 ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg15 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    if ((items < 13) || (items > 14)) {
+      SWIG_croak("Usage: svn_repos_load_fs5(repos,dumpstream,start_rev,end_rev,uuid_action,parent_dir,use_pre_commit_hook,use_post_commit_hook,validate_props,ignore_dates,notify_func,notify_baton,cancel_func,cancel_baton,pool);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_repos_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_repos_load_fs5" "', argument " "1"" of type '" "svn_repos_t *""'"); 
+    }
+    arg1 = (svn_repos_t *)(argp1);
+    {
+      svn_swig_pl_make_stream (&arg2, ST(1));
+      SPAGAIN;
+    }
+    ecode3 = SWIG_AsVal_long SWIG_PERL_CALL_ARGS_2(ST(2), &val3);
+    if (!SWIG_IsOK(ecode3)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "svn_repos_load_fs5" "', argument " "3"" of type '" "svn_revnum_t""'");
+    } 
+    arg3 = (svn_revnum_t)(val3);
+    ecode4 = SWIG_AsVal_long SWIG_PERL_CALL_ARGS_2(ST(3), &val4);
+    if (!SWIG_IsOK(ecode4)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "svn_repos_load_fs5" "', argument " "4"" of type '" "svn_revnum_t""'");
+    } 
+    arg4 = (svn_revnum_t)(val4);
+    ecode5 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(4), &val5);
+    if (!SWIG_IsOK(ecode5)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "svn_repos_load_fs5" "', argument " "5"" of type '" "enum svn_repos_load_uuid""'");
+    } 
+    arg5 = (enum svn_repos_load_uuid)(val5);
+    res6 = SWIG_AsCharPtrAndSize(ST(5), &buf6, NULL, &alloc6);
+    if (!SWIG_IsOK(res6)) {
+      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "svn_repos_load_fs5" "', argument " "6"" of type '" "char const *""'");
+    }
+    arg6 = (char *)(buf6);
+    ecode7 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(6), &val7);
+    if (!SWIG_IsOK(ecode7)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "svn_repos_load_fs5" "', argument " "7"" of type '" "svn_boolean_t""'");
+    } 
+    arg7 = (svn_boolean_t)(val7);
+    ecode8 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(7), &val8);
+    if (!SWIG_IsOK(ecode8)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode8), "in method '" "svn_repos_load_fs5" "', argument " "8"" of type '" "svn_boolean_t""'");
+    } 
+    arg8 = (svn_boolean_t)(val8);
+    ecode9 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(8), &val9);
+    if (!SWIG_IsOK(ecode9)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode9), "in method '" "svn_repos_load_fs5" "', argument " "9"" of type '" "svn_boolean_t""'");
+    } 
+    arg9 = (svn_boolean_t)(val9);
+    ecode10 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(9), &val10);
+    if (!SWIG_IsOK(ecode10)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode10), "in method '" "svn_repos_load_fs5" "', argument " "10"" of type '" "svn_boolean_t""'");
+    } 
+    arg10 = (svn_boolean_t)(val10);
+    {
+      int res = SWIG_ConvertFunctionPtr(ST(10), (void**)(&arg11), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void);
       if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_repos_dump_fs" "', argument " "7"" of type '" "svn_cancel_func_t""'"); 
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_repos_load_fs5" "', argument " "11"" of type '" "svn_repos_notify_func_t""'"); 
       }
     }
-    res8 = SWIG_ConvertPtr(ST(7),SWIG_as_voidptrptr(&arg8), 0, 0);
-    if (!SWIG_IsOK(res8)) {
-      SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "svn_repos_dump_fs" "', argument " "8"" of type '" "void *""'"); 
+    res12 = SWIG_ConvertPtr(ST(11),SWIG_as_voidptrptr(&arg12), 0, 0);
+    if (!SWIG_IsOK(res12)) {
+      SWIG_exception_fail(SWIG_ArgError(res12), "in method '" "svn_repos_load_fs5" "', argument " "12"" of type '" "void *""'"); 
     }
-    if (items > 8) {
+    {
+      arg13 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg14 = ST(12);
+    }
+    if (items > 13) {
       
     }
     {
-      result = (svn_error_t *)svn_repos_dump_fs(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9);
+      result = (svn_error_t *)svn_repos_load_fs5(arg1,arg2,arg3,arg4,arg5,(char const *)arg6,arg7,arg8,arg9,arg10,arg11,arg12,arg13,arg14,arg15);
       
       
       
@@ -12496,6 +13786,10 @@ XS(_wrap_svn_repos_dump_fs) {
     
     
     
+    if (alloc6 == SWIG_NEWOBJ) free((char*)buf6);
+    
+    
+    
     
     
     
@@ -12507,6 +13801,10 @@ XS(_wrap_svn_repos_dump_fs) {
     
     
     
+    if (alloc6 == SWIG_NEWOBJ) free((char*)buf6);
+    
+    
+    
     
     
     
@@ -12551,15 +13849,15 @@ XS(_wrap_svn_repos_load_fs4) {
     int val9 ;
     int ecode9 = 0 ;
     int res11 ;
-    int res13 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
     dXSARGS;
     
     {
       _global_pool = arg14 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 13) || (items > 14)) {
+    if ((items < 12) || (items > 13)) {
       SWIG_croak("Usage: svn_repos_load_fs4(repos,dumpstream,start_rev,end_rev,uuid_action,parent_dir,use_pre_commit_hook,use_post_commit_hook,validate_props,notify_func,notify_baton,cancel_func,cancel_baton,pool);");
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_repos_t, 0 |  0 );
@@ -12569,6 +13867,7 @@ XS(_wrap_svn_repos_load_fs4) {
     arg1 = (svn_repos_t *)(argp1);
     {
       svn_swig_pl_make_stream (&arg2, ST(1));
+      SPAGAIN;
     }
     ecode3 = SWIG_AsVal_long SWIG_PERL_CALL_ARGS_2(ST(2), &val3);
     if (!SWIG_IsOK(ecode3)) {
@@ -12616,16 +13915,10 @@ XS(_wrap_svn_repos_load_fs4) {
       SWIG_exception_fail(SWIG_ArgError(res11), "in method '" "svn_repos_load_fs4" "', argument " "11"" of type '" "void *""'"); 
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(11), (void**)(&arg12), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_repos_load_fs4" "', argument " "12"" of type '" "svn_cancel_func_t""'"); 
-      }
-    }
-    res13 = SWIG_ConvertPtr(ST(12),SWIG_as_voidptrptr(&arg13), 0, 0);
-    if (!SWIG_IsOK(res13)) {
-      SWIG_exception_fail(SWIG_ArgError(res13), "in method '" "svn_repos_load_fs4" "', argument " "13"" of type '" "void *""'"); 
+      arg12 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg13 = ST(11);
     }
-    if (items > 13) {
+    if (items > 12) {
       
     }
     {
@@ -12662,8 +13955,6 @@ XS(_wrap_svn_repos_load_fs4) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
@@ -12678,8 +13969,6 @@ XS(_wrap_svn_repos_load_fs4) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -12714,15 +14003,15 @@ XS(_wrap_svn_repos_load_fs3) {
     int val7 ;
     int ecode7 = 0 ;
     int res9 ;
-    int res11 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
     dXSARGS;
     
     {
       _global_pool = arg12 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 11) || (items > 12)) {
+    if ((items < 10) || (items > 11)) {
       SWIG_croak("Usage: svn_repos_load_fs3(repos,dumpstream,uuid_action,parent_dir,use_pre_commit_hook,use_post_commit_hook,validate_props,notify_func,notify_baton,cancel_func,cancel_baton,pool);");
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_repos_t, 0 |  0 );
@@ -12732,6 +14021,7 @@ XS(_wrap_svn_repos_load_fs3) {
     arg1 = (svn_repos_t *)(argp1);
     {
       svn_swig_pl_make_stream (&arg2, ST(1));
+      SPAGAIN;
     }
     ecode3 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(2), &val3);
     if (!SWIG_IsOK(ecode3)) {
@@ -12769,16 +14059,10 @@ XS(_wrap_svn_repos_load_fs3) {
       SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "svn_repos_load_fs3" "', argument " "9"" of type '" "void *""'"); 
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(9), (void**)(&arg10), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_repos_load_fs3" "', argument " "10"" of type '" "svn_cancel_func_t""'"); 
-      }
-    }
-    res11 = SWIG_ConvertPtr(ST(10),SWIG_as_voidptrptr(&arg11), 0, 0);
-    if (!SWIG_IsOK(res11)) {
-      SWIG_exception_fail(SWIG_ArgError(res11), "in method '" "svn_repos_load_fs3" "', argument " "11"" of type '" "void *""'"); 
+      arg10 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg11 = ST(9);
     }
-    if (items > 11) {
+    if (items > 10) {
       
     }
     {
@@ -12813,8 +14097,6 @@ XS(_wrap_svn_repos_load_fs3) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
@@ -12827,8 +14109,6 @@ XS(_wrap_svn_repos_load_fs3) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -12858,15 +14138,15 @@ XS(_wrap_svn_repos_load_fs2) {
     int ecode6 = 0 ;
     int val7 ;
     int ecode7 = 0 ;
-    int res9 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
     dXSARGS;
     
     {
       _global_pool = arg10 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 9) || (items > 10)) {
+    if ((items < 8) || (items > 9)) {
       SWIG_croak("Usage: svn_repos_load_fs2(repos,dumpstream,feedback_stream,uuid_action,parent_dir,use_pre_commit_hook,use_post_commit_hook,cancel_func,cancel_baton,pool);");
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_repos_t, 0 |  0 );
@@ -12876,9 +14156,11 @@ XS(_wrap_svn_repos_load_fs2) {
     arg1 = (svn_repos_t *)(argp1);
     {
       svn_swig_pl_make_stream (&arg2, ST(1));
+      SPAGAIN;
     }
     {
       svn_swig_pl_make_stream (&arg3, ST(2));
+      SPAGAIN;
     }
     ecode4 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(3), &val4);
     if (!SWIG_IsOK(ecode4)) {
@@ -12901,16 +14183,10 @@ XS(_wrap_svn_repos_load_fs2) {
     } 
     arg7 = (svn_boolean_t)(val7);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(7), (void**)(&arg8), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_repos_load_fs2" "', argument " "8"" of type '" "svn_cancel_func_t""'"); 
-      }
+      arg8 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg9 = ST(7);
     }
-    res9 = SWIG_ConvertPtr(ST(8),SWIG_as_voidptrptr(&arg9), 0, 0);
-    if (!SWIG_IsOK(res9)) {
-      SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "svn_repos_load_fs2" "', argument " "9"" of type '" "void *""'"); 
-    }
-    if (items > 9) {
+    if (items > 8) {
       
     }
     {
@@ -12943,8 +14219,6 @@ XS(_wrap_svn_repos_load_fs2) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
@@ -12955,8 +14229,6 @@ XS(_wrap_svn_repos_load_fs2) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -12980,15 +14252,15 @@ XS(_wrap_svn_repos_load_fs) {
     int res5 ;
     char *buf5 = 0 ;
     int alloc5 = 0 ;
-    int res7 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
     dXSARGS;
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 7) || (items > 8)) {
+    if ((items < 6) || (items > 7)) {
       SWIG_croak("Usage: svn_repos_load_fs(repos,dumpstream,feedback_stream,uuid_action,parent_dir,cancel_func,cancel_baton,pool);");
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_repos_t, 0 |  0 );
@@ -12998,9 +14270,11 @@ XS(_wrap_svn_repos_load_fs) {
     arg1 = (svn_repos_t *)(argp1);
     {
       svn_swig_pl_make_stream (&arg2, ST(1));
+      SPAGAIN;
     }
     {
       svn_swig_pl_make_stream (&arg3, ST(2));
+      SPAGAIN;
     }
     ecode4 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(3), &val4);
     if (!SWIG_IsOK(ecode4)) {
@@ -13013,16 +14287,10 @@ XS(_wrap_svn_repos_load_fs) {
     }
     arg5 = (char *)(buf5);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(5), (void**)(&arg6), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_repos_load_fs" "', argument " "6"" of type '" "svn_cancel_func_t""'"); 
-      }
-    }
-    res7 = SWIG_ConvertPtr(ST(6),SWIG_as_voidptrptr(&arg7), 0, 0);
-    if (!SWIG_IsOK(res7)) {
-      SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "svn_repos_load_fs" "', argument " "7"" of type '" "void *""'"); 
+      arg6 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg7 = ST(5);
     }
-    if (items > 7) {
+    if (items > 6) {
       
     }
     {
@@ -13053,8 +14321,6 @@ XS(_wrap_svn_repos_load_fs) {
     
     if (alloc5 == SWIG_NEWOBJ) free((char*)buf5);
     
-    
-    
     XSRETURN(argvi);
   fail:
     
@@ -13063,8 +14329,6 @@ XS(_wrap_svn_repos_load_fs) {
     
     if (alloc5 == SWIG_NEWOBJ) free((char*)buf5);
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -13853,19 +15117,20 @@ XS(_wrap_svn_repos_parse_dumpstream3) {
     int res3 ;
     int val4 ;
     int ecode4 = 0 ;
-    int res6 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
     dXSARGS;
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 6) || (items > 7)) {
+    if ((items < 5) || (items > 6)) {
       SWIG_croak("Usage: svn_repos_parse_dumpstream3(stream,parse_fns,parse_baton,deltas_are_text,cancel_func,cancel_baton,pool);");
     }
     {
       svn_swig_pl_make_stream (&arg1, ST(0));
+      SPAGAIN;
     }
     res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_svn_repos_parse_fns3_t, 0 |  0 );
     if (!SWIG_IsOK(res2)) {
@@ -13882,20 +15147,171 @@ XS(_wrap_svn_repos_parse_dumpstream3) {
     } 
     arg4 = (svn_boolean_t)(val4);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(4), (void**)(&arg5), SWIGTYPE_p_f_p_void__p_svn_error_t);
+      arg5 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg6 = ST(4);
+    }
+    if (items > 5) {
+      
+    }
+    {
+      result = (svn_error_t *)svn_repos_parse_dumpstream3(arg1,(struct svn_repos_parse_fns3_t const *)arg2,arg3,arg4,arg5,arg6,arg7);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    
+    
+    
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_svn_repos_get_fs_build_parser5) {
+  {
+    svn_repos_parse_fns3_t **arg1 = (svn_repos_parse_fns3_t **) 0 ;
+    void **arg2 = (void **) 0 ;
+    svn_repos_t *arg3 = (svn_repos_t *) 0 ;
+    svn_revnum_t arg4 ;
+    svn_revnum_t arg5 ;
+    svn_boolean_t arg6 ;
+    svn_boolean_t arg7 ;
+    enum svn_repos_load_uuid arg8 ;
+    char *arg9 = (char *) 0 ;
+    svn_boolean_t arg10 ;
+    svn_boolean_t arg11 ;
+    svn_boolean_t arg12 ;
+    svn_repos_notify_func_t arg13 = (svn_repos_notify_func_t) 0 ;
+    void *arg14 = (void *) 0 ;
+    apr_pool_t *arg15 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    svn_repos_parse_fns3_t *temp1 ;
+    void *temp2 ;
+    void *argp3 = 0 ;
+    int res3 = 0 ;
+    long val4 ;
+    int ecode4 = 0 ;
+    long val5 ;
+    int ecode5 = 0 ;
+    int val6 ;
+    int ecode6 = 0 ;
+    int val7 ;
+    int ecode7 = 0 ;
+    int val8 ;
+    int ecode8 = 0 ;
+    int res9 ;
+    char *buf9 = 0 ;
+    int alloc9 = 0 ;
+    int val10 ;
+    int ecode10 = 0 ;
+    int val11 ;
+    int ecode11 = 0 ;
+    int val12 ;
+    int ecode12 = 0 ;
+    int res14 ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg15 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    arg1 = &temp1;
+    arg2 = &temp2;
+    if ((items < 12) || (items > 13)) {
+      SWIG_croak("Usage: svn_repos_get_fs_build_parser5(repos,start_rev,end_rev,use_history,validate_props,uuid_action,parent_dir,use_pre_commit_hook,use_post_commit_hook,ignore_dates,notify_func,notify_baton,pool);");
+    }
+    res3 = SWIG_ConvertPtr(ST(0), &argp3,SWIGTYPE_p_svn_repos_t, 0 |  0 );
+    if (!SWIG_IsOK(res3)) {
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_repos_get_fs_build_parser5" "', argument " "3"" of type '" "svn_repos_t *""'"); 
+    }
+    arg3 = (svn_repos_t *)(argp3);
+    ecode4 = SWIG_AsVal_long SWIG_PERL_CALL_ARGS_2(ST(1), &val4);
+    if (!SWIG_IsOK(ecode4)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "svn_repos_get_fs_build_parser5" "', argument " "4"" of type '" "svn_revnum_t""'");
+    } 
+    arg4 = (svn_revnum_t)(val4);
+    ecode5 = SWIG_AsVal_long SWIG_PERL_CALL_ARGS_2(ST(2), &val5);
+    if (!SWIG_IsOK(ecode5)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "svn_repos_get_fs_build_parser5" "', argument " "5"" of type '" "svn_revnum_t""'");
+    } 
+    arg5 = (svn_revnum_t)(val5);
+    ecode6 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(3), &val6);
+    if (!SWIG_IsOK(ecode6)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "svn_repos_get_fs_build_parser5" "', argument " "6"" of type '" "svn_boolean_t""'");
+    } 
+    arg6 = (svn_boolean_t)(val6);
+    ecode7 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(4), &val7);
+    if (!SWIG_IsOK(ecode7)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "svn_repos_get_fs_build_parser5" "', argument " "7"" of type '" "svn_boolean_t""'");
+    } 
+    arg7 = (svn_boolean_t)(val7);
+    ecode8 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(5), &val8);
+    if (!SWIG_IsOK(ecode8)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode8), "in method '" "svn_repos_get_fs_build_parser5" "', argument " "8"" of type '" "enum svn_repos_load_uuid""'");
+    } 
+    arg8 = (enum svn_repos_load_uuid)(val8);
+    res9 = SWIG_AsCharPtrAndSize(ST(6), &buf9, NULL, &alloc9);
+    if (!SWIG_IsOK(res9)) {
+      SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "svn_repos_get_fs_build_parser5" "', argument " "9"" of type '" "char const *""'");
+    }
+    arg9 = (char *)(buf9);
+    ecode10 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(7), &val10);
+    if (!SWIG_IsOK(ecode10)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode10), "in method '" "svn_repos_get_fs_build_parser5" "', argument " "10"" of type '" "svn_boolean_t""'");
+    } 
+    arg10 = (svn_boolean_t)(val10);
+    ecode11 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(8), &val11);
+    if (!SWIG_IsOK(ecode11)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode11), "in method '" "svn_repos_get_fs_build_parser5" "', argument " "11"" of type '" "svn_boolean_t""'");
+    } 
+    arg11 = (svn_boolean_t)(val11);
+    ecode12 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(9), &val12);
+    if (!SWIG_IsOK(ecode12)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode12), "in method '" "svn_repos_get_fs_build_parser5" "', argument " "12"" of type '" "svn_boolean_t""'");
+    } 
+    arg12 = (svn_boolean_t)(val12);
+    {
+      int res = SWIG_ConvertFunctionPtr(ST(10), (void**)(&arg13), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void);
       if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_repos_parse_dumpstream3" "', argument " "5"" of type '" "svn_cancel_func_t""'"); 
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_repos_get_fs_build_parser5" "', argument " "13"" of type '" "svn_repos_notify_func_t""'"); 
       }
     }
-    res6 = SWIG_ConvertPtr(ST(5),SWIG_as_voidptrptr(&arg6), 0, 0);
-    if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "svn_repos_parse_dumpstream3" "', argument " "6"" of type '" "void *""'"); 
+    res14 = SWIG_ConvertPtr(ST(11),SWIG_as_voidptrptr(&arg14), 0, 0);
+    if (!SWIG_IsOK(res14)) {
+      SWIG_exception_fail(SWIG_ArgError(res14), "in method '" "svn_repos_get_fs_build_parser5" "', argument " "14"" of type '" "void *""'"); 
     }
-    if (items > 6) {
+    if (items > 12) {
       
     }
     {
-      result = (svn_error_t *)svn_repos_parse_dumpstream3(arg1,(struct svn_repos_parse_fns3_t const *)arg2,arg3,arg4,arg5,arg6,arg7);
+      result = (svn_error_t *)svn_repos_get_fs_build_parser5((struct svn_repos_parse_fns3_t const **)arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,(char const *)arg9,arg10,arg11,arg12,arg13,arg14,arg15);
       
       
       
@@ -13916,6 +15332,13 @@ XS(_wrap_svn_repos_parse_dumpstream3) {
         }
       }
     }
+    {
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg1, SWIGTYPE_p_svn_repos_parse_fns3_t, 0); argvi++  ;
+    }
+    {
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg2, SWIGTYPE_p_void, 0); argvi++  ;
+    }
+    
     
     
     
@@ -13923,6 +15346,13 @@ XS(_wrap_svn_repos_parse_dumpstream3) {
     
     
     
+    if (alloc9 == SWIG_NEWOBJ) free((char*)buf9);
+    
+    
+    
+    
+    
+    
     XSRETURN(argvi);
   fail:
     
@@ -13932,6 +15362,14 @@ XS(_wrap_svn_repos_parse_dumpstream3) {
     
     
     
+    
+    if (alloc9 == SWIG_NEWOBJ) free((char*)buf9);
+    
+    
+    
+    
+    
+    
     SWIG_croak_null();
   }
 }
@@ -13976,6 +15414,7 @@ XS(_wrap_svn_repos_get_fs_build_parser4) {
     
     {
       _global_pool = arg12 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
@@ -14053,13 +15492,7 @@ XS(_wrap_svn_repos_get_fs_build_parser4) {
       }
     }
     {
-      /* FIXME: Missing argout typemap: svn_repos_get_fs_build_parser4 arg 1 (svn_repos_parse_fns3_t const **) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_repos_get_fs_build_parser4 is not implemented yet");
-      
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg1, SWIGTYPE_p_svn_repos_parse_fns3_t, 0); argvi++  ;
     }
     {
       if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg2, SWIGTYPE_p_void, 0); argvi++  ;
@@ -15387,19 +16820,20 @@ XS(_wrap_svn_repos_parse_dumpstream2) {
     void *argp2 = 0 ;
     int res2 = 0 ;
     int res3 ;
-    int res5 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
     dXSARGS;
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 5) || (items > 6)) {
+    if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_repos_parse_dumpstream2(stream,parse_fns,parse_baton,cancel_func,cancel_baton,pool);");
     }
     {
       svn_swig_pl_make_stream (&arg1, ST(0));
+      SPAGAIN;
     }
     res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_svn_repos_parse_fns2_t, 0 |  0 );
     if (!SWIG_IsOK(res2)) {
@@ -15411,16 +16845,10 @@ XS(_wrap_svn_repos_parse_dumpstream2) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_repos_parse_dumpstream2" "', argument " "3"" of type '" "void *""'"); 
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(3), (void**)(&arg4), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_repos_parse_dumpstream2" "', argument " "4"" of type '" "svn_cancel_func_t""'"); 
-      }
+      arg4 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg5 = ST(3);
     }
-    res5 = SWIG_ConvertPtr(ST(4),SWIG_as_voidptrptr(&arg5), 0, 0);
-    if (!SWIG_IsOK(res5)) {
-      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "svn_repos_parse_dumpstream2" "', argument " "5"" of type '" "void *""'"); 
-    }
-    if (items > 5) {
+    if (items > 4) {
       
     }
     {
@@ -15449,16 +16877,12 @@ XS(_wrap_svn_repos_parse_dumpstream2) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -15476,19 +16900,20 @@ XS(_wrap_svn_repos_parse_dumpstream) {
     void *argp2 = 0 ;
     int res2 = 0 ;
     int res3 ;
-    int res5 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
     dXSARGS;
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 5) || (items > 6)) {
+    if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_repos_parse_dumpstream(stream,parse_fns,parse_baton,cancel_func,cancel_baton,pool);");
     }
     {
       svn_swig_pl_make_stream (&arg1, ST(0));
+      SPAGAIN;
     }
     res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_svn_repos_parse_fns_t, 0 |  0 );
     if (!SWIG_IsOK(res2)) {
@@ -15500,16 +16925,10 @@ XS(_wrap_svn_repos_parse_dumpstream) {
       SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_repos_parse_dumpstream" "', argument " "3"" of type '" "void *""'"); 
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(3), (void**)(&arg4), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_repos_parse_dumpstream" "', argument " "4"" of type '" "svn_cancel_func_t""'"); 
-      }
-    }
-    res5 = SWIG_ConvertPtr(ST(4),SWIG_as_voidptrptr(&arg5), 0, 0);
-    if (!SWIG_IsOK(res5)) {
-      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "svn_repos_parse_dumpstream" "', argument " "5"" of type '" "void *""'"); 
+      arg4 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg5 = ST(3);
     }
-    if (items > 5) {
+    if (items > 4) {
       
     }
     {
@@ -15538,16 +16957,12 @@ XS(_wrap_svn_repos_parse_dumpstream) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -15586,6 +17001,7 @@ XS(_wrap_svn_repos_get_fs_build_parser3) {
     
     {
       _global_pool = arg10 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
@@ -15653,7 +17069,13 @@ XS(_wrap_svn_repos_get_fs_build_parser3) {
       }
     }
     {
-      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg1, SWIGTYPE_p_svn_repos_parse_fns2_t, 0); argvi++  ;
+      /* FIXME: Missing argout typemap: svn_repos_get_fs_build_parser3 arg 1 (svn_repos_parse_fns2_t const **) */
+      
+      
+      
+      
+      SWIG_exception(SWIG_ValueError, "svn_repos_get_fs_build_parser3 is not implemented yet");
+      
     }
     {
       if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg2, SWIGTYPE_p_void, 0); argvi++  ;
@@ -15713,6 +17135,7 @@ XS(_wrap_svn_repos_get_fs_build_parser2) {
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
@@ -15736,6 +17159,7 @@ XS(_wrap_svn_repos_get_fs_build_parser2) {
     arg5 = (enum svn_repos_load_uuid)(val5);
     {
       svn_swig_pl_make_stream (&arg6, ST(3));
+      SPAGAIN;
     }
     res7 = SWIG_AsCharPtrAndSize(ST(4), &buf7, NULL, &alloc7);
     if (!SWIG_IsOK(res7)) {
@@ -15768,7 +17192,13 @@ XS(_wrap_svn_repos_get_fs_build_parser2) {
       }
     }
     {
-      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg1, SWIGTYPE_p_svn_repos_parse_fns2_t, 0); argvi++  ;
+      /* FIXME: Missing argout typemap: svn_repos_get_fs_build_parser2 arg 1 (svn_repos_parse_fns2_t const **) */
+      
+      
+      
+      
+      SWIG_exception(SWIG_ValueError, "svn_repos_get_fs_build_parser2 is not implemented yet");
+      
     }
     {
       if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg2, SWIGTYPE_p_void, 0); argvi++  ;
@@ -15824,6 +17254,7 @@ XS(_wrap_svn_repos_get_fs_build_parser) {
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
@@ -15847,6 +17278,7 @@ XS(_wrap_svn_repos_get_fs_build_parser) {
     arg5 = (enum svn_repos_load_uuid)(val5);
     {
       svn_swig_pl_make_stream (&arg6, ST(3));
+      SPAGAIN;
     }
     res7 = SWIG_AsCharPtrAndSize(ST(4), &buf7, NULL, &alloc7);
     if (!SWIG_IsOK(res7)) {
@@ -15930,6 +17362,7 @@ XS(_wrap_svn_repos_authz_read2) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 3) || (items > 4)) {
@@ -16014,6 +17447,7 @@ XS(_wrap_svn_repos_authz_read) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -16086,6 +17520,7 @@ XS(_wrap_svn_repos_authz_parse) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -16093,9 +17528,11 @@ XS(_wrap_svn_repos_authz_parse) {
     }
     {
       svn_swig_pl_make_stream (&arg2, ST(0));
+      SPAGAIN;
     }
     {
       svn_swig_pl_make_stream (&arg3, ST(1));
+      SPAGAIN;
     }
     if (items > 2) {
       
@@ -16171,6 +17608,7 @@ XS(_wrap_svn_repos_authz_check_access) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg6 = &temp6;
     if ((items < 5) || (items > 6)) {
@@ -16274,6 +17712,7 @@ XS(_wrap_svn_repos_check_revision_access) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_repos_check_revision_access(access_level,repos,revision,authz_read_func,authz_read_baton,pool);");
@@ -16295,10 +17734,10 @@ XS(_wrap_svn_repos_check_revision_access) {
     arg3 = (svn_revnum_t)(val3);
     {
       if (SvOK(ST(3))) {
-        arg4 = svn_swig_pl_thunk_authz_func;
+        arg4 = (svn_repos_authz_func_t) svn_swig_pl_thunk_authz_func;
         arg5 = ST(3);
       } else {
-        arg4 = NULL;
+        arg4 = (svn_repos_authz_func_t) NULL;
         arg5 = NULL;
       }
     }
@@ -16342,178 +17781,6 @@ XS(_wrap_svn_repos_check_revision_access) {
 }
 
 
-XS(_wrap_svn_repos_fs_get_inherited_props) {
-  {
-    apr_array_header_t **arg1 = (apr_array_header_t **) 0 ;
-    svn_fs_root_t *arg2 = (svn_fs_root_t *) 0 ;
-    char *arg3 = (char *) 0 ;
-    char *arg4 = (char *) 0 ;
-    svn_repos_authz_func_t arg5 = (svn_repos_authz_func_t) 0 ;
-    void *arg6 = (void *) 0 ;
-    apr_pool_t *arg7 = (apr_pool_t *) 0 ;
-    apr_pool_t *arg8 = (apr_pool_t *) 0 ;
-    apr_pool_t *_global_pool ;
-    apr_array_header_t *temp1 ;
-    void *argp2 = 0 ;
-    int res2 = 0 ;
-    int res3 ;
-    char *buf3 = 0 ;
-    int alloc3 = 0 ;
-    int res4 ;
-    char *buf4 = 0 ;
-    int alloc4 = 0 ;
-    int argvi = 0;
-    svn_error_t *result = 0 ;
-    dXSARGS;
-    
-    {
-      _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
-    }
-    {
-      _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
-    }
-    arg1 = &temp1;
-    if ((items < 4) || (items > 6)) {
-      SWIG_croak("Usage: svn_repos_fs_get_inherited_props(root,path,propname,authz_read_func,authz_read_baton,result_pool,scratch_pool);");
-    }
-    res2 = SWIG_ConvertPtr(ST(0), &argp2,SWIGTYPE_p_svn_fs_root_t, 0 |  0 );
-    if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_repos_fs_get_inherited_props" "', argument " "2"" of type '" "svn_fs_root_t *""'"); 
-    }
-    arg2 = (svn_fs_root_t *)(argp2);
-    res3 = SWIG_AsCharPtrAndSize(ST(1), &buf3, NULL, &alloc3);
-    if (!SWIG_IsOK(res3)) {
-      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_repos_fs_get_inherited_props" "', argument " "3"" of type '" "char const *""'");
-    }
-    arg3 = (char *)(buf3);
-    res4 = SWIG_AsCharPtrAndSize(ST(2), &buf4, NULL, &alloc4);
-    if (!SWIG_IsOK(res4)) {
-      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "svn_repos_fs_get_inherited_props" "', argument " "4"" of type '" "char const *""'");
-    }
-    arg4 = (char *)(buf4);
-    {
-      if (SvOK(ST(3))) {
-        arg5 = svn_swig_pl_thunk_authz_func;
-        arg6 = ST(3);
-      } else {
-        arg5 = NULL;
-        arg6 = NULL;
-      }
-    }
-    if (items > 4) {
-      
-    }
-    if (items > 5) {
-      
-    }
-    {
-      result = (svn_error_t *)svn_repos_fs_get_inherited_props(arg1,arg2,(char const *)arg3,(char const *)arg4,arg5,arg6,arg7,arg8);
-      
-      
-      
-    }
-    {
-      if (result) {
-        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
-        
-        if (SvOK(exception_handler)) {
-          SV *callback_result;
-          
-          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
-            &callback_result, "S", result,
-            SWIGTYPE_p_svn_error_t);
-        } else {
-          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
-          argvi++;
-        }
-      }
-    }
-    {
-      /* FIXME: Missing argout typemap: svn_repos_fs_get_inherited_props arg 1 (apr_array_header_t **) */
-      
-      
-      
-      
-      SWIG_exception(SWIG_ValueError, "svn_repos_fs_get_inherited_props is not implemented yet");
-      
-    }
-    
-    
-    if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
-    if (alloc4 == SWIG_NEWOBJ) free((char*)buf4);
-    
-    
-    XSRETURN(argvi);
-  fail:
-    
-    
-    if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
-    if (alloc4 == SWIG_NEWOBJ) free((char*)buf4);
-    
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_repos_remember_client_capabilities) {
-  {
-    svn_repos_t *arg1 = (svn_repos_t *) 0 ;
-    apr_array_header_t *arg2 = (apr_array_header_t *) 0 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    void *argp2 = 0 ;
-    int res2 = 0 ;
-    int argvi = 0;
-    svn_error_t *result = 0 ;
-    dXSARGS;
-    
-    if ((items < 2) || (items > 2)) {
-      SWIG_croak("Usage: svn_repos_remember_client_capabilities(repos,capabilities);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_repos_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_repos_remember_client_capabilities" "', argument " "1"" of type '" "svn_repos_t *""'"); 
-    }
-    arg1 = (svn_repos_t *)(argp1);
-    res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_apr_array_header_t, 0 |  0 );
-    if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_repos_remember_client_capabilities" "', argument " "2"" of type '" "apr_array_header_t const *""'"); 
-    }
-    arg2 = (apr_array_header_t *)(argp2);
-    {
-      result = (svn_error_t *)svn_repos_remember_client_capabilities(arg1,(apr_array_header_t const *)arg2);
-      
-      
-      
-    }
-    {
-      if (result) {
-        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
-        
-        if (SvOK(exception_handler)) {
-          SV *callback_result;
-          
-          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
-            &callback_result, "S", result,
-            SWIGTYPE_p_svn_error_t);
-        } else {
-          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
-          argvi++;
-        }
-      }
-    }
-    
-    
-    XSRETURN(argvi);
-  fail:
-    
-    
-    SWIG_croak_null();
-  }
-}
-
-
 XS(_wrap_svn_repos_parse_fns3_invoke_magic_header_record) {
   {
     svn_repos_parse_fns3_t *arg1 = (svn_repos_parse_fns3_t *) 0 ;
@@ -16532,6 +17799,7 @@ XS(_wrap_svn_repos_parse_fns3_invoke_magic_header_record) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_repos_parse_fns3_invoke_magic_header_record(_obj,version,parse_baton,pool);");
@@ -16609,6 +17877,7 @@ XS(_wrap_svn_repos_parse_fns3_invoke_uuid_record) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_repos_parse_fns3_invoke_uuid_record(_obj,uuid,parse_baton,pool);");
@@ -16687,6 +17956,7 @@ XS(_wrap_svn_repos_parse_fns3_invoke_new_revision_record) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     if ((items < 3) || (items > 4)) {
@@ -16771,6 +18041,7 @@ XS(_wrap_svn_repos_parse_fns3_invoke_new_node_record) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     if ((items < 3) || (items > 4)) {
@@ -17167,7 +18438,11 @@ XS(_wrap_svn_repos_parse_fns3_invoke_set_fulltext) {
       }
     }
     {
-      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = svn_swig_pl_from_stream(*arg2); argvi++  ;
+      SV *tmp;
+      PUTBACK;
+      tmp = svn_swig_pl_from_stream(*arg2);
+      SPAGAIN;
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = tmp; argvi++  ;
     }
     
     
@@ -17386,6 +18661,7 @@ XS(_wrap_svn_repos_parse_fns2_invoke_new_revision_record) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     if ((items < 3) || (items > 4)) {
@@ -17469,6 +18745,7 @@ XS(_wrap_svn_repos_parse_fns2_invoke_uuid_record) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_repos_parse_fns2_invoke_uuid_record(_obj,uuid,parse_baton,pool);");
@@ -17547,6 +18824,7 @@ XS(_wrap_svn_repos_parse_fns2_invoke_new_node_record) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     if ((items < 3) || (items > 4)) {
@@ -17943,7 +19221,11 @@ XS(_wrap_svn_repos_parse_fns2_invoke_set_fulltext) {
       }
     }
     {
-      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = svn_swig_pl_from_stream(*arg2); argvi++  ;
+      SV *tmp;
+      PUTBACK;
+      tmp = svn_swig_pl_from_stream(*arg2);
+      SPAGAIN;
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = tmp; argvi++  ;
     }
     
     
@@ -18165,6 +19447,7 @@ XS(_wrap_svn_repos_invoke_authz_func) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     if ((items < 4) || (items > 5)) {
@@ -18266,6 +19549,7 @@ XS(_wrap_svn_repos_invoke_authz_callback) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg3 = &temp3;
     if ((items < 5) || (items > 6)) {
@@ -18348,77 +19632,99 @@ XS(_wrap_svn_repos_invoke_authz_callback) {
 }
 
 
-XS(_wrap_svn_repos_invoke_file_rev_handler) {
+XS(_wrap_svn_repos_invoke_notify_func) {
   {
-    svn_repos_file_rev_handler_t arg1 = (svn_repos_file_rev_handler_t) 0 ;
+    svn_repos_notify_func_t arg1 = (svn_repos_notify_func_t) 0 ;
     void *arg2 = (void *) 0 ;
-    char *arg3 = (char *) 0 ;
-    svn_revnum_t arg4 ;
-    apr_hash_t *arg5 = (apr_hash_t *) 0 ;
-    svn_txdelta_window_handler_t *arg6 = (svn_txdelta_window_handler_t *) 0 ;
-    void **arg7 = (void **) 0 ;
-    apr_array_header_t *arg8 = (apr_array_header_t *) 0 ;
-    apr_pool_t *arg9 = (apr_pool_t *) 0 ;
+    svn_repos_notify_t *arg3 = (svn_repos_notify_t *) 0 ;
+    apr_pool_t *arg4 = (apr_pool_t *) 0 ;
     apr_pool_t *_global_pool ;
     int res2 ;
-    int res3 ;
-    char *buf3 = 0 ;
-    int alloc3 = 0 ;
-    long val4 ;
-    int ecode4 = 0 ;
-    void *argp5 = 0 ;
-    int res5 = 0 ;
-    svn_txdelta_window_handler_t temp6 ;
-    void *temp7 ;
-    void *argp8 = 0 ;
-    int res8 = 0 ;
+    void *argp3 = 0 ;
+    int res3 = 0 ;
     int argvi = 0;
-    svn_error_t *result = 0 ;
     dXSARGS;
     
     {
-      _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    arg6 = &temp6;
-    arg7 = &temp7;
-    if ((items < 6) || (items > 7)) {
-      SWIG_croak("Usage: svn_repos_invoke_file_rev_handler(_obj,baton,path,rev,rev_props,prop_diffs,pool);");
+    if ((items < 3) || (items > 4)) {
+      SWIG_croak("Usage: svn_repos_invoke_notify_func(_obj,baton,notify,scratch_pool);");
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(0), (void**)(&arg1), SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t);
+      int res = SWIG_ConvertFunctionPtr(ST(0), (void**)(&arg1), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void);
       if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_repos_invoke_file_rev_handler" "', argument " "1"" of type '" "svn_repos_file_rev_handler_t""'"); 
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_repos_invoke_notify_func" "', argument " "1"" of type '" "svn_repos_notify_func_t""'"); 
       }
     }
     res2 = SWIG_ConvertPtr(ST(1),SWIG_as_voidptrptr(&arg2), 0, 0);
     if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_repos_invoke_file_rev_handler" "', argument " "2"" of type '" "void *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_repos_invoke_notify_func" "', argument " "2"" of type '" "void *""'"); 
     }
-    res3 = SWIG_AsCharPtrAndSize(ST(2), &buf3, NULL, &alloc3);
+    res3 = SWIG_ConvertPtr(ST(2), &argp3,SWIGTYPE_p_svn_repos_notify_t, 0 |  0 );
     if (!SWIG_IsOK(res3)) {
-      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_repos_invoke_file_rev_handler" "', argument " "3"" of type '" "char const *""'");
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_repos_invoke_notify_func" "', argument " "3"" of type '" "svn_repos_notify_t const *""'"); 
     }
-    arg3 = (char *)(buf3);
-    ecode4 = SWIG_AsVal_long SWIG_PERL_CALL_ARGS_2(ST(3), &val4);
-    if (!SWIG_IsOK(ecode4)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "svn_repos_invoke_file_rev_handler" "', argument " "4"" of type '" "svn_revnum_t""'");
-    } 
-    arg4 = (svn_revnum_t)(val4);
-    res5 = SWIG_ConvertPtr(ST(4), &argp5,SWIGTYPE_p_apr_hash_t, 0 |  0 );
-    if (!SWIG_IsOK(res5)) {
-      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "svn_repos_invoke_file_rev_handler" "', argument " "5"" of type '" "apr_hash_t *""'"); 
+    arg3 = (svn_repos_notify_t *)(argp3);
+    if (items > 3) {
+      
     }
-    arg5 = (apr_hash_t *)(argp5);
-    res8 = SWIG_ConvertPtr(ST(5), &argp8,SWIGTYPE_p_apr_array_header_t, 0 |  0 );
-    if (!SWIG_IsOK(res8)) {
-      SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "svn_repos_invoke_file_rev_handler" "', argument " "8"" of type '" "apr_array_header_t *""'"); 
+    {
+      svn_repos_invoke_notify_func(arg1,arg2,(struct svn_repos_notify_t const *)arg3,arg4);
+      
+      
+      
     }
-    arg8 = (apr_array_header_t *)(argp8);
-    if (items > 6) {
+    ST(argvi) = sv_newmortal();
+    
+    
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_svn_repos_invoke_freeze_func) {
+  {
+    svn_repos_freeze_func_t arg1 = (svn_repos_freeze_func_t) 0 ;
+    void *arg2 = (void *) 0 ;
+    apr_pool_t *arg3 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    int res2 ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    if ((items < 2) || (items > 3)) {
+      SWIG_croak("Usage: svn_repos_invoke_freeze_func(_obj,baton,pool);");
+    }
+    {
+      int res = SWIG_ConvertFunctionPtr(ST(0), (void**)(&arg1), SWIGTYPE_p_f_p_void_p_apr_pool_t__p_svn_error_t);
+      if (!SWIG_IsOK(res)) {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_repos_invoke_freeze_func" "', argument " "1"" of type '" "svn_repos_freeze_func_t""'"); 
+      }
+    }
+    res2 = SWIG_ConvertPtr(ST(1),SWIG_as_voidptrptr(&arg2), 0, 0);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_repos_invoke_freeze_func" "', argument " "2"" of type '" "void *""'"); 
+    }
+    if (items > 2) {
       
     }
     {
-      result = (svn_error_t *)svn_repos_invoke_file_rev_handler(arg1,arg2,(char const *)arg3,arg4,arg5,arg6,arg7,arg8,arg9);
+      result = (svn_error_t *)svn_repos_invoke_freeze_func(arg1,arg2,arg3);
       
       
       
@@ -18439,18 +19745,6 @@ XS(_wrap_svn_repos_invoke_file_rev_handler) {
         }
       }
     }
-    {
-      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg6, SWIGTYPE_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t, 0); argvi++  ;
-    }
-    {
-      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg7, SWIGTYPE_p_void, 0); argvi++  ;
-    }
-    
-    
-    if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
-    
-    
-    
     
     
     
@@ -18458,70 +19752,92 @@ XS(_wrap_svn_repos_invoke_file_rev_handler) {
   fail:
     
     
-    if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
-    
-    
-    
-    
-    
     
     SWIG_croak_null();
   }
 }
 
 
-XS(_wrap_svn_repos_invoke_notify_func) {
+XS(_wrap_svn_repos_invoke_history_func) {
   {
-    svn_repos_notify_func_t arg1 = (svn_repos_notify_func_t) 0 ;
+    svn_repos_history_func_t arg1 = (svn_repos_history_func_t) 0 ;
     void *arg2 = (void *) 0 ;
-    svn_repos_notify_t *arg3 = (svn_repos_notify_t *) 0 ;
-    apr_pool_t *arg4 = (apr_pool_t *) 0 ;
+    char *arg3 = (char *) 0 ;
+    svn_revnum_t arg4 ;
+    apr_pool_t *arg5 = (apr_pool_t *) 0 ;
     apr_pool_t *_global_pool ;
     int res2 ;
-    void *argp3 = 0 ;
-    int res3 = 0 ;
+    int res3 ;
+    char *buf3 = 0 ;
+    int alloc3 = 0 ;
+    long val4 ;
+    int ecode4 = 0 ;
     int argvi = 0;
+    svn_error_t *result = 0 ;
     dXSARGS;
     
     {
-      _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 3) || (items > 4)) {
-      SWIG_croak("Usage: svn_repos_invoke_notify_func(_obj,baton,notify,scratch_pool);");
+    if ((items < 4) || (items > 5)) {
+      SWIG_croak("Usage: svn_repos_invoke_history_func(_obj,baton,path,revision,pool);");
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(0), (void**)(&arg1), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void);
+      int res = SWIG_ConvertFunctionPtr(ST(0), (void**)(&arg1), SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t);
       if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_repos_invoke_notify_func" "', argument " "1"" of type '" "svn_repos_notify_func_t""'"); 
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_repos_invoke_history_func" "', argument " "1"" of type '" "svn_repos_history_func_t""'"); 
       }
     }
     res2 = SWIG_ConvertPtr(ST(1),SWIG_as_voidptrptr(&arg2), 0, 0);
     if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_repos_invoke_notify_func" "', argument " "2"" of type '" "void *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_repos_invoke_history_func" "', argument " "2"" of type '" "void *""'"); 
     }
-    res3 = SWIG_ConvertPtr(ST(2), &argp3,SWIGTYPE_p_svn_repos_notify_t, 0 |  0 );
+    res3 = SWIG_AsCharPtrAndSize(ST(2), &buf3, NULL, &alloc3);
     if (!SWIG_IsOK(res3)) {
-      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_repos_invoke_notify_func" "', argument " "3"" of type '" "svn_repos_notify_t const *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_repos_invoke_history_func" "', argument " "3"" of type '" "char const *""'");
     }
-    arg3 = (svn_repos_notify_t *)(argp3);
-    if (items > 3) {
+    arg3 = (char *)(buf3);
+    ecode4 = SWIG_AsVal_long SWIG_PERL_CALL_ARGS_2(ST(3), &val4);
+    if (!SWIG_IsOK(ecode4)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "svn_repos_invoke_history_func" "', argument " "4"" of type '" "svn_revnum_t""'");
+    } 
+    arg4 = (svn_revnum_t)(val4);
+    if (items > 4) {
       
     }
     {
-      svn_repos_invoke_notify_func(arg1,arg2,(struct svn_repos_notify_t const *)arg3,arg4);
+      result = (svn_error_t *)svn_repos_invoke_history_func(arg1,arg2,(char const *)arg3,arg4,arg5);
       
       
       
     }
-    ST(argvi) = sv_newmortal();
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
     
     
+    if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
     
     
     XSRETURN(argvi);
   fail:
     
     
+    if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
     
     
     SWIG_croak_null();
@@ -18529,38 +19845,78 @@ XS(_wrap_svn_repos_invoke_notify_func) {
 }
 
 
-XS(_wrap_svn_repos_invoke_freeze_func) {
+XS(_wrap_svn_repos_invoke_file_rev_handler) {
   {
-    svn_repos_freeze_func_t arg1 = (svn_repos_freeze_func_t) 0 ;
+    svn_repos_file_rev_handler_t arg1 = (svn_repos_file_rev_handler_t) 0 ;
     void *arg2 = (void *) 0 ;
-    apr_pool_t *arg3 = (apr_pool_t *) 0 ;
+    char *arg3 = (char *) 0 ;
+    svn_revnum_t arg4 ;
+    apr_hash_t *arg5 = (apr_hash_t *) 0 ;
+    svn_txdelta_window_handler_t *arg6 = (svn_txdelta_window_handler_t *) 0 ;
+    void **arg7 = (void **) 0 ;
+    apr_array_header_t *arg8 = (apr_array_header_t *) 0 ;
+    apr_pool_t *arg9 = (apr_pool_t *) 0 ;
     apr_pool_t *_global_pool ;
     int res2 ;
+    int res3 ;
+    char *buf3 = 0 ;
+    int alloc3 = 0 ;
+    long val4 ;
+    int ecode4 = 0 ;
+    void *argp5 = 0 ;
+    int res5 = 0 ;
+    svn_txdelta_window_handler_t temp6 ;
+    void *temp7 ;
+    void *argp8 = 0 ;
+    int res8 = 0 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
     dXSARGS;
     
     {
-      _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 2) || (items > 3)) {
-      SWIG_croak("Usage: svn_repos_invoke_freeze_func(_obj,baton,pool);");
+    arg6 = &temp6;
+    arg7 = &temp7;
+    if ((items < 6) || (items > 7)) {
+      SWIG_croak("Usage: svn_repos_invoke_file_rev_handler(_obj,baton,path,rev,rev_props,prop_diffs,pool);");
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(0), (void**)(&arg1), SWIGTYPE_p_f_p_void_p_apr_pool_t__p_svn_error_t);
+      int res = SWIG_ConvertFunctionPtr(ST(0), (void**)(&arg1), SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t);
       if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_repos_invoke_freeze_func" "', argument " "1"" of type '" "svn_repos_freeze_func_t""'"); 
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_repos_invoke_file_rev_handler" "', argument " "1"" of type '" "svn_repos_file_rev_handler_t""'"); 
       }
     }
     res2 = SWIG_ConvertPtr(ST(1),SWIG_as_voidptrptr(&arg2), 0, 0);
     if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_repos_invoke_freeze_func" "', argument " "2"" of type '" "void *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_repos_invoke_file_rev_handler" "', argument " "2"" of type '" "void *""'"); 
     }
-    if (items > 2) {
+    res3 = SWIG_AsCharPtrAndSize(ST(2), &buf3, NULL, &alloc3);
+    if (!SWIG_IsOK(res3)) {
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_repos_invoke_file_rev_handler" "', argument " "3"" of type '" "char const *""'");
+    }
+    arg3 = (char *)(buf3);
+    ecode4 = SWIG_AsVal_long SWIG_PERL_CALL_ARGS_2(ST(3), &val4);
+    if (!SWIG_IsOK(ecode4)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "svn_repos_invoke_file_rev_handler" "', argument " "4"" of type '" "svn_revnum_t""'");
+    } 
+    arg4 = (svn_revnum_t)(val4);
+    res5 = SWIG_ConvertPtr(ST(4), &argp5,SWIGTYPE_p_apr_hash_t, 0 |  0 );
+    if (!SWIG_IsOK(res5)) {
+      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "svn_repos_invoke_file_rev_handler" "', argument " "5"" of type '" "apr_hash_t *""'"); 
+    }
+    arg5 = (apr_hash_t *)(argp5);
+    res8 = SWIG_ConvertPtr(ST(5), &argp8,SWIGTYPE_p_apr_array_header_t, 0 |  0 );
+    if (!SWIG_IsOK(res8)) {
+      SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "svn_repos_invoke_file_rev_handler" "', argument " "8"" of type '" "apr_array_header_t *""'"); 
+    }
+    arg8 = (apr_array_header_t *)(argp8);
+    if (items > 6) {
       
     }
     {
-      result = (svn_error_t *)svn_repos_invoke_freeze_func(arg1,arg2,arg3);
+      result = (svn_error_t *)svn_repos_invoke_file_rev_handler(arg1,arg2,(char const *)arg3,arg4,arg5,arg6,arg7,arg8,arg9);
       
       
       
@@ -18581,6 +19937,18 @@ XS(_wrap_svn_repos_invoke_freeze_func) {
         }
       }
     }
+    {
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg6, SWIGTYPE_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t, 0); argvi++  ;
+    }
+    {
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = SWIG_NewPointerObj(*arg7, SWIGTYPE_p_void, 0); argvi++  ;
+    }
+    
+    
+    if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+    
+    
+    
     
     
     
@@ -18588,61 +19956,67 @@ XS(_wrap_svn_repos_invoke_freeze_func) {
   fail:
     
     
+    if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+    
+    
+    
+    
+    
     
     SWIG_croak_null();
   }
 }
 
 
-XS(_wrap_svn_repos_invoke_history_func) {
+XS(_wrap_svn_repos_invoke_verify_callback) {
   {
-    svn_repos_history_func_t arg1 = (svn_repos_history_func_t) 0 ;
+    svn_repos_verify_callback_t arg1 = (svn_repos_verify_callback_t) 0 ;
     void *arg2 = (void *) 0 ;
-    char *arg3 = (char *) 0 ;
-    svn_revnum_t arg4 ;
+    svn_revnum_t arg3 ;
+    svn_error_t *arg4 = (svn_error_t *) 0 ;
     apr_pool_t *arg5 = (apr_pool_t *) 0 ;
     apr_pool_t *_global_pool ;
     int res2 ;
-    int res3 ;
-    char *buf3 = 0 ;
-    int alloc3 = 0 ;
-    long val4 ;
-    int ecode4 = 0 ;
+    long val3 ;
+    int ecode3 = 0 ;
+    void *argp4 = 0 ;
+    int res4 = 0 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
     dXSARGS;
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 4) || (items > 5)) {
-      SWIG_croak("Usage: svn_repos_invoke_history_func(_obj,baton,path,revision,pool);");
+      SWIG_croak("Usage: svn_repos_invoke_verify_callback(_obj,baton,revision,verify_err,scratch_pool);");
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(0), (void**)(&arg1), SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t);
+      int res = SWIG_ConvertFunctionPtr(ST(0), (void**)(&arg1), SWIGTYPE_p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t);
       if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_repos_invoke_history_func" "', argument " "1"" of type '" "svn_repos_history_func_t""'"); 
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_repos_invoke_verify_callback" "', argument " "1"" of type '" "svn_repos_verify_callback_t""'"); 
       }
     }
     res2 = SWIG_ConvertPtr(ST(1),SWIG_as_voidptrptr(&arg2), 0, 0);
     if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_repos_invoke_history_func" "', argument " "2"" of type '" "void *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_repos_invoke_verify_callback" "', argument " "2"" of type '" "void *""'"); 
     }
-    res3 = SWIG_AsCharPtrAndSize(ST(2), &buf3, NULL, &alloc3);
-    if (!SWIG_IsOK(res3)) {
-      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_repos_invoke_history_func" "', argument " "3"" of type '" "char const *""'");
-    }
-    arg3 = (char *)(buf3);
-    ecode4 = SWIG_AsVal_long SWIG_PERL_CALL_ARGS_2(ST(3), &val4);
-    if (!SWIG_IsOK(ecode4)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "svn_repos_invoke_history_func" "', argument " "4"" of type '" "svn_revnum_t""'");
+    ecode3 = SWIG_AsVal_long SWIG_PERL_CALL_ARGS_2(ST(2), &val3);
+    if (!SWIG_IsOK(ecode3)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "svn_repos_invoke_verify_callback" "', argument " "3"" of type '" "svn_revnum_t""'");
     } 
-    arg4 = (svn_revnum_t)(val4);
+    arg3 = (svn_revnum_t)(val3);
+    res4 = SWIG_ConvertPtr(ST(3), &argp4,SWIGTYPE_p_svn_error_t, 0 |  0 );
+    if (!SWIG_IsOK(res4)) {
+      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "svn_repos_invoke_verify_callback" "', argument " "4"" of type '" "svn_error_t *""'"); 
+    }
+    arg4 = (svn_error_t *)(argp4);
     if (items > 4) {
       
     }
     {
-      result = (svn_error_t *)svn_repos_invoke_history_func(arg1,arg2,(char const *)arg3,arg4,arg5);
+      result = (svn_error_t *)svn_repos_invoke_verify_callback(arg1,arg2,arg3,arg4,arg5);
       
       
       
@@ -18665,14 +20039,14 @@ XS(_wrap_svn_repos_invoke_history_func) {
     }
     
     
-    if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+    
     
     
     XSRETURN(argvi);
   fail:
     
     
-    if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+    
     
     
     SWIG_croak_null();
@@ -18704,12 +20078,14 @@ static swig_type_info _swigt__p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t
 static swig_type_info _swigt__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_hash_t *,svn_revnum_t,char const *,char const *,char const *,apr_pool_t *)|svn_log_message_receiver_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_pool_t *)|svn_repos_freeze_func_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__char__p_svn_error_t = {"_p_f_p_void_p_q_const__char__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *)|svn_error_t *(*)(void *,char const *)", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_lock_t const *,svn_error_t *,apr_pool_t *)|svn_fs_lock_callback_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_string_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_string_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_string_t const *)|svn_error_t *(*)(void *,char const *,svn_string_t const *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)|svn_repos_file_rev_handler_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_boolean_t,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)|svn_file_rev_handler_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_pool_t *)|svn_repos_history_func_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void = {"_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void", "svn_repos_notify_func_t|void (*)(void *,struct svn_repos_notify_t const *,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_log_entry_t *,apr_pool_t *)|svn_log_entry_receiver_t", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t", "svn_repos_verify_callback_t|struct svn_error_t *(*)(void *,svn_revnum_t,svn_error_t *,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_repos_authz_access_t,svn_boolean_t *,svn_fs_root_t *,char const *,void *,apr_pool_t *)|svn_repos_authz_callback_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t = {"_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_revnum_t,char const *,char const *,void *)|svn_commit_callback_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_int = {"_p_int", "int *|svn_boolean_t *|apr_status_t *", 0, 0, (void*)0, 0};
@@ -18729,6 +20105,7 @@ static swig_type_info _swigt__p_p_svn_repos_parse_fns_t = {"_p_p_svn_repos_parse
 static swig_type_info _swigt__p_p_svn_repos_t = {"_p_p_svn_repos_t", "struct svn_repos_t **|svn_repos_t **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_svn_stream_t = {"_p_p_svn_stream_t", "struct svn_stream_t **|svn_stream_t **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_svn_string_t = {"_p_p_svn_string_t", "struct svn_string_t **|svn_string_t **", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_p_svn_version_t = {"_p_p_svn_version_t", "struct svn_version_t **|svn_version_t **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_void = {"_p_p_void", "void **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_auth_baton_t = {"_p_svn_auth_baton_t", "struct svn_auth_baton_t *|svn_auth_baton_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_auth_cred_simple_t = {"_p_svn_auth_cred_simple_t", "struct svn_auth_cred_simple_t *|svn_auth_cred_simple_t *", 0, 0, (void*)0, 0};
@@ -18763,8 +20140,13 @@ static swig_type_info _swigt__p_svn_errno_t = {"_p_svn_errno_t", "enum svn_errno
 static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "struct svn_error_t *|svn_error_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_fs_access_t = {"_p_svn_fs_access_t", "struct svn_fs_access_t *|svn_fs_access_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_fs_dirent_t = {"_p_svn_fs_dirent_t", "struct svn_fs_dirent_t *|svn_fs_dirent_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_fs_fsfs_info_t = {"_p_svn_fs_fsfs_info_t", "struct svn_fs_fsfs_info_t *|svn_fs_fsfs_info_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_fs_fsx_info_t = {"_p_svn_fs_fsx_info_t", "struct svn_fs_fsx_info_t *|svn_fs_fsx_info_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_fs_history_t = {"_p_svn_fs_history_t", "struct svn_fs_history_t *|svn_fs_history_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_fs_id_t = {"_p_svn_fs_id_t", "struct svn_fs_id_t *|svn_fs_id_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_fs_info_placeholder_t = {"_p_svn_fs_info_placeholder_t", "struct svn_fs_info_placeholder_t *|svn_fs_info_placeholder_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_fs_lock_target_t = {"_p_svn_fs_lock_target_t", "struct svn_fs_lock_target_t *|svn_fs_lock_target_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_fs_node_relation_t = {"_p_svn_fs_node_relation_t", "enum svn_fs_node_relation_t *|svn_fs_node_relation_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_fs_pack_notify_action_t = {"_p_svn_fs_pack_notify_action_t", "enum svn_fs_pack_notify_action_t *|svn_fs_pack_notify_action_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_fs_path_change2_t = {"_p_svn_fs_path_change2_t", "struct svn_fs_path_change2_t *|svn_fs_path_change2_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_fs_path_change_kind_t = {"_p_svn_fs_path_change_kind_t", "enum svn_fs_path_change_kind_t *|svn_fs_path_change_kind_t *", 0, 0, (void*)0, 0};
@@ -18772,6 +20154,7 @@ static swig_type_info _swigt__p_svn_fs_path_change_t = {"_p_svn_fs_path_change_t
 static swig_type_info _swigt__p_svn_fs_root_t = {"_p_svn_fs_root_t", "struct svn_fs_root_t *|svn_fs_root_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_fs_t = {"_p_svn_fs_t", "struct svn_fs_t *|svn_fs_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_fs_txn_t = {"_p_svn_fs_txn_t", "struct svn_fs_txn_t *|svn_fs_txn_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_fs_upgrade_notify_action_t = {"_p_svn_fs_upgrade_notify_action_t", "enum svn_fs_upgrade_notify_action_t *|svn_fs_upgrade_notify_action_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_io_dirent2_t = {"_p_svn_io_dirent2_t", "struct svn_io_dirent2_t *|svn_io_dirent2_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_io_dirent_t = {"_p_svn_io_dirent_t", "struct svn_io_dirent_t *|svn_io_dirent_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_io_file_del_t = {"_p_svn_io_file_del_t", "enum svn_io_file_del_t *|svn_io_file_del_t *", 0, 0, (void*)0, 0};
@@ -18842,12 +20225,14 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_q_const__char__p_svn_error_t,
+  &_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_string_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void,
   &_swigt__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t,
+  &_swigt__p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t,
   &_swigt__p_int,
@@ -18867,6 +20252,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_p_svn_repos_t,
   &_swigt__p_p_svn_stream_t,
   &_swigt__p_p_svn_string_t,
+  &_swigt__p_p_svn_version_t,
   &_swigt__p_p_void,
   &_swigt__p_svn_auth_baton_t,
   &_swigt__p_svn_auth_cred_simple_t,
@@ -18901,8 +20287,13 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_svn_error_t,
   &_swigt__p_svn_fs_access_t,
   &_swigt__p_svn_fs_dirent_t,
+  &_swigt__p_svn_fs_fsfs_info_t,
+  &_swigt__p_svn_fs_fsx_info_t,
   &_swigt__p_svn_fs_history_t,
   &_swigt__p_svn_fs_id_t,
+  &_swigt__p_svn_fs_info_placeholder_t,
+  &_swigt__p_svn_fs_lock_target_t,
+  &_swigt__p_svn_fs_node_relation_t,
   &_swigt__p_svn_fs_pack_notify_action_t,
   &_swigt__p_svn_fs_path_change2_t,
   &_swigt__p_svn_fs_path_change_kind_t,
@@ -18910,6 +20301,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_svn_fs_root_t,
   &_swigt__p_svn_fs_t,
   &_swigt__p_svn_fs_txn_t,
+  &_swigt__p_svn_fs_upgrade_notify_action_t,
   &_swigt__p_svn_io_dirent2_t,
   &_swigt__p_svn_io_dirent_t,
   &_swigt__p_svn_io_file_del_t,
@@ -18980,12 +20372,14 @@ static swig_cast_info _swigc__p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t
 static swig_cast_info _swigc__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_q_const__char__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__char__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_string_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_string_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void[] = {  {&_swigt__p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t[] = {  {&_swigt__p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_int[] = {  {&_swigt__p_int, 0, 0, 0},{0, 0, 0, 0}};
@@ -19005,6 +20399,7 @@ static swig_cast_info _swigc__p_p_svn_repos_parse_fns_t[] = {  {&_swigt__p_p_svn
 static swig_cast_info _swigc__p_p_svn_repos_t[] = {  {&_swigt__p_p_svn_repos_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_svn_stream_t[] = {  {&_swigt__p_p_svn_stream_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_svn_string_t[] = {  {&_swigt__p_p_svn_string_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_p_svn_version_t[] = {  {&_swigt__p_p_svn_version_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_void[] = {  {&_swigt__p_p_void, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_auth_baton_t[] = {  {&_swigt__p_svn_auth_baton_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_auth_cred_simple_t[] = {  {&_swigt__p_svn_auth_cred_simple_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -19039,8 +20434,13 @@ static swig_cast_info _swigc__p_svn_errno_t[] = {  {&_swigt__p_svn_errno_t, 0, 0
 static swig_cast_info _swigc__p_svn_error_t[] = {  {&_swigt__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_fs_access_t[] = {  {&_swigt__p_svn_fs_access_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_fs_dirent_t[] = {  {&_swigt__p_svn_fs_dirent_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_fs_fsfs_info_t[] = {  {&_swigt__p_svn_fs_fsfs_info_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_fs_fsx_info_t[] = {  {&_swigt__p_svn_fs_fsx_info_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_fs_history_t[] = {  {&_swigt__p_svn_fs_history_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_fs_id_t[] = {  {&_swigt__p_svn_fs_id_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_fs_info_placeholder_t[] = {  {&_swigt__p_svn_fs_info_placeholder_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_fs_lock_target_t[] = {  {&_swigt__p_svn_fs_lock_target_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_fs_node_relation_t[] = {  {&_swigt__p_svn_fs_node_relation_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_fs_pack_notify_action_t[] = {  {&_swigt__p_svn_fs_pack_notify_action_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_fs_path_change2_t[] = {  {&_swigt__p_svn_fs_path_change2_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_fs_path_change_kind_t[] = {  {&_swigt__p_svn_fs_path_change_kind_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -19048,6 +20448,7 @@ static swig_cast_info _swigc__p_svn_fs_path_change_t[] = {  {&_swigt__p_svn_fs_p
 static swig_cast_info _swigc__p_svn_fs_root_t[] = {  {&_swigt__p_svn_fs_root_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_fs_t[] = {  {&_swigt__p_svn_fs_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_fs_txn_t[] = {  {&_swigt__p_svn_fs_txn_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_fs_upgrade_notify_action_t[] = {  {&_swigt__p_svn_fs_upgrade_notify_action_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_io_dirent2_t[] = {  {&_swigt__p_svn_io_dirent2_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_io_dirent_t[] = {  {&_swigt__p_svn_io_dirent_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_io_file_del_t[] = {  {&_swigt__p_svn_io_file_del_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -19118,12 +20519,14 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_p_q_const__char__p_svn_error_t,
+  _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_string_t__p_svn_error_t,
   _swigc__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void,
   _swigc__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t,
+  _swigc__p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t,
   _swigc__p_int,
@@ -19143,6 +20546,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_p_svn_repos_t,
   _swigc__p_p_svn_stream_t,
   _swigc__p_p_svn_string_t,
+  _swigc__p_p_svn_version_t,
   _swigc__p_p_void,
   _swigc__p_svn_auth_baton_t,
   _swigc__p_svn_auth_cred_simple_t,
@@ -19177,8 +20581,13 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_svn_error_t,
   _swigc__p_svn_fs_access_t,
   _swigc__p_svn_fs_dirent_t,
+  _swigc__p_svn_fs_fsfs_info_t,
+  _swigc__p_svn_fs_fsx_info_t,
   _swigc__p_svn_fs_history_t,
   _swigc__p_svn_fs_id_t,
+  _swigc__p_svn_fs_info_placeholder_t,
+  _swigc__p_svn_fs_lock_target_t,
+  _swigc__p_svn_fs_node_relation_t,
   _swigc__p_svn_fs_pack_notify_action_t,
   _swigc__p_svn_fs_path_change2_t,
   _swigc__p_svn_fs_path_change_kind_t,
@@ -19186,6 +20595,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_svn_fs_root_t,
   _swigc__p_svn_fs_t,
   _swigc__p_svn_fs_txn_t,
+  _swigc__p_svn_fs_upgrade_notify_action_t,
   _swigc__p_svn_io_dirent2_t,
   _swigc__p_svn_io_dirent_t,
   _swigc__p_svn_io_file_del_t,
@@ -19267,8 +20677,13 @@ static swig_command_info swig_commands[] = {
 {"SVN::_Repos::svn_repos_notify_t_node_action_get", _wrap_svn_repos_notify_t_node_action_get},
 {"SVN::_Repos::svn_repos_notify_t_path_set", _wrap_svn_repos_notify_t_path_set},
 {"SVN::_Repos::svn_repos_notify_t_path_get", _wrap_svn_repos_notify_t_path_get},
+{"SVN::_Repos::svn_repos_notify_t_start_revision_set", _wrap_svn_repos_notify_t_start_revision_set},
+{"SVN::_Repos::svn_repos_notify_t_start_revision_get", _wrap_svn_repos_notify_t_start_revision_get},
+{"SVN::_Repos::svn_repos_notify_t_end_revision_set", _wrap_svn_repos_notify_t_end_revision_set},
+{"SVN::_Repos::svn_repos_notify_t_end_revision_get", _wrap_svn_repos_notify_t_end_revision_get},
 {"SVN::_Repos::svn_repos_notify_create", _wrap_svn_repos_notify_create},
 {"SVN::_Repos::svn_repos_find_root_path", _wrap_svn_repos_find_root_path},
+{"SVN::_Repos::svn_repos_open3", _wrap_svn_repos_open3},
 {"SVN::_Repos::svn_repos_open2", _wrap_svn_repos_open2},
 {"SVN::_Repos::svn_repos_open", _wrap_svn_repos_open},
 {"SVN::_Repos::svn_repos_create", _wrap_svn_repos_create},
@@ -19276,7 +20691,11 @@ static swig_command_info swig_commands[] = {
 {"SVN::_Repos::svn_repos_upgrade", _wrap_svn_repos_upgrade},
 {"SVN::_Repos::svn_repos_delete", _wrap_svn_repos_delete},
 {"SVN::_Repos::svn_repos_has_capability", _wrap_svn_repos_has_capability},
+{"SVN::_Repos::svn_repos_capabilities", _wrap_svn_repos_capabilities},
+{"SVN::_Repos::svn_repos_remember_client_capabilities", _wrap_svn_repos_remember_client_capabilities},
 {"SVN::_Repos::svn_repos_fs", _wrap_svn_repos_fs},
+{"SVN::_Repos::svn_repos_fs_type", _wrap_svn_repos_fs_type},
+{"SVN::_Repos::svn_repos_hotcopy3", _wrap_svn_repos_hotcopy3},
 {"SVN::_Repos::svn_repos_hotcopy2", _wrap_svn_repos_hotcopy2},
 {"SVN::_Repos::svn_repos_hotcopy", _wrap_svn_repos_hotcopy},
 {"SVN::_Repos::svn_repos_fs_pack2", _wrap_svn_repos_fs_pack2},
@@ -19345,7 +20764,9 @@ static swig_command_info swig_commands[] = {
 {"SVN::_Repos::svn_repos_fs_begin_txn_for_commit2", _wrap_svn_repos_fs_begin_txn_for_commit2},
 {"SVN::_Repos::svn_repos_fs_begin_txn_for_commit", _wrap_svn_repos_fs_begin_txn_for_commit},
 {"SVN::_Repos::svn_repos_fs_begin_txn_for_update", _wrap_svn_repos_fs_begin_txn_for_update},
+{"SVN::_Repos::svn_repos_fs_lock_many", _wrap_svn_repos_fs_lock_many},
 {"SVN::_Repos::svn_repos_fs_lock", _wrap_svn_repos_fs_lock},
+{"SVN::_Repos::svn_repos_fs_unlock_many", _wrap_svn_repos_fs_unlock_many},
 {"SVN::_Repos::svn_repos_fs_unlock", _wrap_svn_repos_fs_unlock},
 {"SVN::_Repos::svn_repos_fs_get_locks2", _wrap_svn_repos_fs_get_locks2},
 {"SVN::_Repos::svn_repos_fs_get_locks", _wrap_svn_repos_fs_get_locks},
@@ -19356,6 +20777,7 @@ static swig_command_info swig_commands[] = {
 {"SVN::_Repos::svn_repos_fs_revision_prop", _wrap_svn_repos_fs_revision_prop},
 {"SVN::_Repos::svn_repos_fs_revision_proplist", _wrap_svn_repos_fs_revision_proplist},
 {"SVN::_Repos::svn_repos_fs_change_node_prop", _wrap_svn_repos_fs_change_node_prop},
+{"SVN::_Repos::svn_repos_fs_get_inherited_props", _wrap_svn_repos_fs_get_inherited_props},
 {"SVN::_Repos::svn_repos_fs_change_txn_prop", _wrap_svn_repos_fs_change_txn_prop},
 {"SVN::_Repos::svn_repos_fs_change_txn_props", _wrap_svn_repos_fs_change_txn_props},
 {"SVN::_Repos::svn_repos_node_t_kind_set", _wrap_svn_repos_node_t_kind_set},
@@ -19380,11 +20802,14 @@ static swig_command_info swig_commands[] = {
 {"SVN::_Repos::svn_repos_node_t_parent_get", _wrap_svn_repos_node_t_parent_get},
 {"SVN::_Repos::svn_repos_node_editor", _wrap_svn_repos_node_editor},
 {"SVN::_Repos::svn_repos_node_from_baton", _wrap_svn_repos_node_from_baton},
+{"SVN::_Repos::svn_repos_info_format", _wrap_svn_repos_info_format},
+{"SVN::_Repos::svn_repos_verify_fs3", _wrap_svn_repos_verify_fs3},
 {"SVN::_Repos::svn_repos_verify_fs2", _wrap_svn_repos_verify_fs2},
 {"SVN::_Repos::svn_repos_verify_fs", _wrap_svn_repos_verify_fs},
 {"SVN::_Repos::svn_repos_dump_fs3", _wrap_svn_repos_dump_fs3},
 {"SVN::_Repos::svn_repos_dump_fs2", _wrap_svn_repos_dump_fs2},
 {"SVN::_Repos::svn_repos_dump_fs", _wrap_svn_repos_dump_fs},
+{"SVN::_Repos::svn_repos_load_fs5", _wrap_svn_repos_load_fs5},
 {"SVN::_Repos::svn_repos_load_fs4", _wrap_svn_repos_load_fs4},
 {"SVN::_Repos::svn_repos_load_fs3", _wrap_svn_repos_load_fs3},
 {"SVN::_Repos::svn_repos_load_fs2", _wrap_svn_repos_load_fs2},
@@ -19414,6 +20839,7 @@ static swig_command_info swig_commands[] = {
 {"SVN::_Repos::svn_repos_parse_fns3_t_close_revision_set", _wrap_svn_repos_parse_fns3_t_close_revision_set},
 {"SVN::_Repos::svn_repos_parse_fns3_t_close_revision_get", _wrap_svn_repos_parse_fns3_t_close_revision_get},
 {"SVN::_Repos::svn_repos_parse_dumpstream3", _wrap_svn_repos_parse_dumpstream3},
+{"SVN::_Repos::svn_repos_get_fs_build_parser5", _wrap_svn_repos_get_fs_build_parser5},
 {"SVN::_Repos::svn_repos_get_fs_build_parser4", _wrap_svn_repos_get_fs_build_parser4},
 {"SVN::_Repos::svn_repos_parse_fns2_t_new_revision_record_set", _wrap_svn_repos_parse_fns2_t_new_revision_record_set},
 {"SVN::_Repos::svn_repos_parse_fns2_t_new_revision_record_get", _wrap_svn_repos_parse_fns2_t_new_revision_record_get},
@@ -19465,8 +20891,6 @@ static swig_command_info swig_commands[] = {
 {"SVN::_Repos::svn_repos_authz_parse", _wrap_svn_repos_authz_parse},
 {"SVN::_Repos::svn_repos_authz_check_access", _wrap_svn_repos_authz_check_access},
 {"SVN::_Repos::svn_repos_check_revision_access", _wrap_svn_repos_check_revision_access},
-{"SVN::_Repos::svn_repos_fs_get_inherited_props", _wrap_svn_repos_fs_get_inherited_props},
-{"SVN::_Repos::svn_repos_remember_client_capabilities", _wrap_svn_repos_remember_client_capabilities},
 {"SVN::_Repos::svn_repos_parse_fns3_invoke_magic_header_record", _wrap_svn_repos_parse_fns3_invoke_magic_header_record},
 {"SVN::_Repos::svn_repos_parse_fns3_invoke_uuid_record", _wrap_svn_repos_parse_fns3_invoke_uuid_record},
 {"SVN::_Repos::svn_repos_parse_fns3_invoke_new_revision_record", _wrap_svn_repos_parse_fns3_invoke_new_revision_record},
@@ -19492,26 +20916,27 @@ static swig_command_info swig_commands[] = {
 {"SVN::_Repos::svn_repos_parse_fns2_invoke_close_revision", _wrap_svn_repos_parse_fns2_invoke_close_revision},
 {"SVN::_Repos::svn_repos_invoke_authz_func", _wrap_svn_repos_invoke_authz_func},
 {"SVN::_Repos::svn_repos_invoke_authz_callback", _wrap_svn_repos_invoke_authz_callback},
-{"SVN::_Repos::svn_repos_invoke_file_rev_handler", _wrap_svn_repos_invoke_file_rev_handler},
 {"SVN::_Repos::svn_repos_invoke_notify_func", _wrap_svn_repos_invoke_notify_func},
 {"SVN::_Repos::svn_repos_invoke_freeze_func", _wrap_svn_repos_invoke_freeze_func},
 {"SVN::_Repos::svn_repos_invoke_history_func", _wrap_svn_repos_invoke_history_func},
+{"SVN::_Repos::svn_repos_invoke_file_rev_handler", _wrap_svn_repos_invoke_file_rev_handler},
+{"SVN::_Repos::svn_repos_invoke_verify_callback", _wrap_svn_repos_invoke_verify_callback},
 {0,0}
 };
 /* -----------------------------------------------------------------------------
  * Type initialization:
- * This problem is tough by the requirement that no dynamic 
- * memory is used. Also, since swig_type_info structures store pointers to 
+ * This problem is tough by the requirement that no dynamic
+ * memory is used. Also, since swig_type_info structures store pointers to
  * swig_cast_info structures and swig_cast_info structures store pointers back
- * to swig_type_info structures, we need some lookup code at initialization. 
- * The idea is that swig generates all the structures that are needed. 
- * The runtime then collects these partially filled structures. 
- * The SWIG_InitializeModule function takes these initial arrays out of 
+ * to swig_type_info structures, we need some lookup code at initialization.
+ * The idea is that swig generates all the structures that are needed.
+ * The runtime then collects these partially filled structures.
+ * The SWIG_InitializeModule function takes these initial arrays out of
  * swig_module, and does all the lookup, filling in the swig_module.types
  * array with the correct data and linking the correct swig_cast_info
  * structures together.
  *
- * The generated swig_type_info structures are assigned staticly to an initial 
+ * The generated swig_type_info structures are assigned staticly to an initial
  * array. We just loop through that array, and handle each type individually.
  * First we lookup if this type has been already loaded, and if so, use the
  * loaded structure instead of the generated one. Then we have to fill in the
@@ -19521,17 +20946,17 @@ static swig_command_info swig_commands[] = {
  * a column is one of the swig_cast_info structures for that type.
  * The cast_initial array is actually an array of arrays, because each row has
  * a variable number of columns. So to actually build the cast linked list,
- * we find the array of casts associated with the type, and loop through it 
+ * we find the array of casts associated with the type, and loop through it
  * adding the casts to the list. The one last trick we need to do is making
  * sure the type pointer in the swig_cast_info struct is correct.
  *
- * First off, we lookup the cast->type name to see if it is already loaded. 
+ * First off, we lookup the cast->type name to see if it is already loaded.
  * There are three cases to handle:
  *  1) If the cast->type has already been loaded AND the type we are adding
  *     casting info to has not been loaded (it is in this module), THEN we
  *     replace the cast->type pointer with the type pointer that has already
  *     been loaded.
- *  2) If BOTH types (the one we are adding casting info to, and the 
+ *  2) If BOTH types (the one we are adding casting info to, and the
  *     cast->type) are loaded, THEN the cast info has already been loaded by
  *     the previous module so we just ignore it.
  *  3) Finally, if cast->type has not already been loaded, then we add that
@@ -19594,7 +21019,7 @@ SWIG_InitializeModule(void *clientdata) {
     module_head->next = &swig_module;
   }
   
-  /* When multiple interpeters are used, a module could have already been initialized in
+  /* When multiple interpreters are used, a module could have already been initialized in
        a different interpreter, but not yet have a pointer in this interpreter.
        In this case, we do not want to continue adding types... everything should be
        set up already */
@@ -19793,312 +21218,347 @@ XS(SWIG_init) {
     SvREADONLY_on(sv);
   }
   
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_node_action_change", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_node_action_change)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_node_action_add", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_node_action_add)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_node_action_delete", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_node_action_delete)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_node_action_replace", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_node_action_replace)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
-    SV *sv = get_sv((char*) SWIG_prefix "svn_repos_load_uuid_default", TRUE | 0x2 | GV_ADDMULTI);
-    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_repos_load_uuid_default)));
-    SvREADONLY_on(sv);
-  } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
-    SV *sv = get_sv((char*) SWIG_prefix "svn_repos_load_uuid_ignore", TRUE | 0x2 | GV_ADDMULTI);
-    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_repos_load_uuid_ignore)));
-    SvREADONLY_on(sv);
-  } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
-    SV *sv = get_sv((char*) SWIG_prefix "svn_repos_load_uuid_force", TRUE | 0x2 | GV_ADDMULTI);
-    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_repos_load_uuid_force)));
-    SvREADONLY_on(sv);
-  } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_authz_none", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_authz_none)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_authz_read", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_authz_read)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_authz_write", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_authz_write)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_authz_recursive", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_authz_recursive)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_warning", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_warning)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_dump_rev_end", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_dump_rev_end)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_verify_rev_end", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_verify_rev_end)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_dump_end", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_dump_end)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_verify_end", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_verify_end)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_pack_shard_start", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_pack_shard_start)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_pack_shard_end", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_pack_shard_end)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_pack_shard_start_revprop", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_pack_shard_start_revprop)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_pack_shard_end_revprop", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_pack_shard_end_revprop)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_load_txn_start", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_load_txn_start)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_load_txn_committed", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_load_txn_committed)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_load_node_start", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_load_node_start)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_load_node_done", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_load_node_done)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_load_copied_node", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_load_copied_node)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_load_normalized_mergeinfo", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_load_normalized_mergeinfo)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_mutex_acquired", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_mutex_acquired)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_recover_start", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_recover_start)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_upgrade_start", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_upgrade_start)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_load_skipped_rev", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_load_skipped_rev)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_verify_rev_structure", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_verify_rev_structure)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_pack_revprops", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_pack_revprops)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_cleanup_revprops", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_cleanup_revprops)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_format_bumped", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_format_bumped)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_hotcopy_rev_range", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_hotcopy_rev_range)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_warning_found_old_reference", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_warning_found_old_reference)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_warning_found_old_mergeinfo", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_warning_found_old_mergeinfo)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_warning_invalid_fspath", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_warning_invalid_fspath)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_warning_name_collision", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_warning_name_collision)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_warning_mergeinfo_collision", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_warning_mergeinfo_collision)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_warning_invalid_mergeinfo", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_warning_invalid_mergeinfo)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_CAPABILITY_MERGEINFO", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("mergeinfo"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_MAGIC_HEADER", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("SVN-fs-dump-format-version"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_FORMAT_VERSION", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(3)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_FORMAT_VERSION_DELTAS", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(3)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_UUID", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("UUID"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_CONTENT_LENGTH", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("Content-length"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_REVISION_NUMBER", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("Revision-number"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_NODE_PATH", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("Node-path"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_NODE_KIND", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("Node-kind"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_NODE_ACTION", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("Node-action"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_NODE_COPYFROM_PATH", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("Node-copyfrom-path"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_NODE_COPYFROM_REV", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("Node-copyfrom-rev"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_TEXT_COPY_SOURCE_MD5", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("Text-copy-source-md5"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_TEXT_COPY_SOURCE_SHA1", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("Text-copy-source-sha1"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_TEXT_COPY_SOURCE_CHECKSUM", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("Text-copy-source-md5"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_TEXT_CONTENT_MD5", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("Text-content-md5"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_TEXT_CONTENT_SHA1", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("Text-content-sha1"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_TEXT_CONTENT_CHECKSUM", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("Text-content-md5"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_PROP_CONTENT_LENGTH", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("Prop-content-length"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_TEXT_CONTENT_LENGTH", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("Text-content-length"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_PROP_DELTA", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("Prop-delta"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_TEXT_DELTA", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("Text-delta"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_TEXT_DELTA_BASE_MD5", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("Text-delta-base-md5"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_TEXT_DELTA_BASE_SHA1", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("Text-delta-base-sha1"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_TEXT_DELTA_BASE_CHECKSUM", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr("Text-delta-base-md5"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "svn_repos_load_uuid_default", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_repos_load_uuid_default)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "svn_repos_load_uuid_ignore", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_repos_load_uuid_ignore)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "svn_repos_load_uuid_force", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_repos_load_uuid_force)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_repos_revision_access_none", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_repos_revision_access_none)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_repos_revision_access_partial", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_repos_revision_access_partial)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_repos_revision_access_full", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_repos_revision_access_full)));
     SvREADONLY_on(sv);
diff --git a/subversion/bindings/swig/perl/native/svn_wc.c b/subversion/bindings/swig/perl/native/svn_wc.c
index c7e723b..d5ea25f 100644
--- a/subversion/bindings/swig/perl/native/svn_wc.c
+++ b/subversion/bindings/swig/perl/native/svn_wc.c
@@ -1,11 +1,11 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
- * 
- * This file is not intended to be easily readable and contains a number of 
+ * Version 2.0.12
+ *
+ * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
- * changes to this file unless you know what you are doing--modify the SWIG 
- * interface file instead. 
+ * changes to this file unless you know what you are doing--modify the SWIG
+ * interface file instead.
  * ----------------------------------------------------------------------------- */
 
 #define SWIGPERL
@@ -42,28 +42,28 @@
 #ifndef SWIGUNUSED
 # if defined(__GNUC__)
 #   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__)) 
+#     define SWIGUNUSED __attribute__ ((__unused__))
 #   else
 #     define SWIGUNUSED
 #   endif
 # elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__)) 
+#   define SWIGUNUSED __attribute__ ((__unused__))
 # else
-#   define SWIGUNUSED 
+#   define SWIGUNUSED
 # endif
 #endif
 
 #ifndef SWIG_MSC_UNSUPPRESS_4505
 # if defined(_MSC_VER)
 #   pragma warning(disable : 4505) /* unreferenced local function has been removed */
-# endif 
+# endif
 #endif
 
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
 # else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
 # endif
 #endif
 
@@ -106,7 +106,7 @@
 #   define SWIGSTDCALL __stdcall
 # else
 #   define SWIGSTDCALL
-# endif 
+# endif
 #endif
 
 /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
@@ -144,7 +144,7 @@
   You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for
   creating a static or dynamic library from the SWIG runtime code.
   In 99.9% of the cases, SWIG just needs to declare them as 'static'.
-  
+
   But only do this if strictly necessary, ie, if you have problems
   with your compiler or suchlike.
 */
@@ -170,16 +170,16 @@
 #define SWIG_POINTER_OWN           0x1
 
 
-/* 
+/*
    Flags/methods for returning states.
-   
-   The SWIG conversion methods, as ConvertPtr, return an integer 
+
+   The SWIG conversion methods, as ConvertPtr, return an integer
    that tells if the conversion was successful or not. And if not,
    an error code can be returned (see swigerrors.swg for the codes).
-   
+
    Use the following macros/flags to set or process the returning
    states.
-   
+
    In old versions of SWIG, code such as the following was usually written:
 
      if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) {
@@ -212,23 +212,23 @@
     } else {
       // fail code
     }
-    
+
    I.e., now SWIG_ConvertPtr can return new objects and you can
    identify the case and take care of the deallocation. Of course that
    also requires SWIG_ConvertPtr to return new result values, such as
 
-      int SWIG_ConvertPtr(obj, ptr,...) {         
-        if (<obj is ok>) {			       
-          if (<need new object>) {		       
-            *ptr = <ptr to new allocated object>; 
-            return SWIG_NEWOBJ;		       
-          } else {				       
-            *ptr = <ptr to old object>;	       
-            return SWIG_OLDOBJ;		       
-          } 				       
-        } else {				       
-          return SWIG_BADOBJ;		       
-        }					       
+      int SWIG_ConvertPtr(obj, ptr,...) {
+        if (<obj is ok>) {
+          if (<need new object>) {
+            *ptr = <ptr to new allocated object>;
+            return SWIG_NEWOBJ;
+          } else {
+            *ptr = <ptr to old object>;
+            return SWIG_OLDOBJ;
+          }
+        } else {
+          return SWIG_BADOBJ;
+        }
       }
 
    Of course, returning the plain '0(success)/-1(fail)' still works, but you can be
@@ -242,17 +242,17 @@
        int fooi(int);
 
    and you call
- 
+
       food(1)   // cast rank '1'  (1 -> 1.0)
       fooi(1)   // cast rank '0'
 
    just use the SWIG_AddCast()/SWIG_CheckState()
 */
 
-#define SWIG_OK                    (0) 
+#define SWIG_OK                    (0)
 #define SWIG_ERROR                 (-1)
 #define SWIG_IsOK(r)               (r >= 0)
-#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)  
+#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)
 
 /* The CastRankLimit says how many bits are used for the cast rank */
 #define SWIG_CASTRANKLIMIT         (1 << 8)
@@ -283,14 +283,14 @@
 #  endif
 #  define SWIG_CASTRANKMASK          ((SWIG_CASTRANKLIMIT) -1)
 #  define SWIG_CastRank(r)           (r & SWIG_CASTRANKMASK)
-SWIGINTERNINLINE int SWIG_AddCast(int r) { 
+SWIGINTERNINLINE int SWIG_AddCast(int r) {
   return SWIG_IsOK(r) ? ((SWIG_CastRank(r) < SWIG_MAXCASTRANK) ? (r + 1) : SWIG_ERROR) : r;
 }
-SWIGINTERNINLINE int SWIG_CheckState(int r) { 
-  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0; 
+SWIGINTERNINLINE int SWIG_CheckState(int r) {
+  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0;
 }
 #else /* no cast-rank mode */
-#  define SWIG_AddCast
+#  define SWIG_AddCast(r) (r)
 #  define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0)
 #endif
 
@@ -334,7 +334,7 @@ typedef struct swig_module_info {
   void                    *clientdata;		/* Language specific module data */
 } swig_module_info;
 
-/* 
+/*
   Compare two type names skipping the space characters, therefore
   "char*" == "char *" and "Class<int>" == "Class<int >", etc.
 
@@ -354,18 +354,18 @@ SWIG_TypeNameComp(const char *f1, const char *l1,
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if not equal, 1 if equal
+  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
 */
 SWIGRUNTIME int
-SWIG_TypeEquiv(const char *nb, const char *tb) {
-  int equiv = 0;
+SWIG_TypeCmp(const char *nb, const char *tb) {
+  int equiv = 1;
   const char* te = tb + strlen(tb);
   const char* ne = nb;
-  while (!equiv && *ne) {
+  while (equiv != 0 && *ne) {
     for (nb = ne; *ne; ++ne) {
       if (*ne == '|') break;
     }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
+    equiv = SWIG_TypeNameComp(nb, ne, tb, te);
     if (*ne) ++ne;
   }
   return equiv;
@@ -373,24 +373,13 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
+  Return 0 if not equal, 1 if equal
 */
 SWIGRUNTIME int
-SWIG_TypeCompare(const char *nb, const char *tb) {
-  int equiv = 0;
-  const char* te = tb + strlen(tb);
-  const char* ne = nb;
-  while (!equiv && *ne) {
-    for (nb = ne; *ne; ++ne) {
-      if (*ne == '|') break;
-    }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
-    if (*ne) ++ne;
-  }
-  return equiv;
+SWIG_TypeEquiv(const char *nb, const char *tb) {
+  return SWIG_TypeCmp(nb, tb) == 0 ? 1 : 0;
 }
 
-
 /*
   Check the typename
 */
@@ -418,7 +407,7 @@ SWIG_TypeCheck(const char *c, swig_type_info *ty) {
   return 0;
 }
 
-/* 
+/*
   Identical to SWIG_TypeCheck, except strcmp is replaced with a pointer comparison
 */
 SWIGRUNTIME swig_cast_info *
@@ -453,7 +442,7 @@ SWIG_TypeCast(swig_cast_info *ty, void *ptr, int *newmemory) {
   return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr, newmemory);
 }
 
-/* 
+/*
    Dynamic pointer casting. Down an inheritance hierarchy
 */
 SWIGRUNTIME swig_type_info *
@@ -497,7 +486,7 @@ SWIG_TypePrettyName(const swig_type_info *type) {
     return type->name;
 }
 
-/* 
+/*
    Set the clientdata field for a type
 */
 SWIGRUNTIME void
@@ -505,14 +494,14 @@ SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
   swig_cast_info *cast = ti->cast;
   /* if (ti->clientdata == clientdata) return; */
   ti->clientdata = clientdata;
-  
+
   while (cast) {
     if (!cast->converter) {
       swig_type_info *tc = cast->type;
       if (!tc->clientdata) {
 	SWIG_TypeClientData(tc, clientdata);
       }
-    }    
+    }
     cast = cast->next;
   }
 }
@@ -521,18 +510,18 @@ SWIG_TypeNewClientData(swig_type_info *ti, void *clientdata) {
   SWIG_TypeClientData(ti, clientdata);
   ti->owndata = 1;
 }
-  
+
 /*
   Search for a swig_type_info structure only by mangled name
   Search is a O(log #types)
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_MangledTypeQueryModule(swig_module_info *start, 
-                            swig_module_info *end, 
+SWIG_MangledTypeQueryModule(swig_module_info *start,
+                            swig_module_info *end,
 		            const char *name) {
   swig_module_info *iter = start;
   do {
@@ -541,11 +530,11 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
       register size_t r = iter->size - 1;
       do {
 	/* since l+r >= 0, we can (>> 1) instead (/ 2) */
-	register size_t i = (l + r) >> 1; 
+	register size_t i = (l + r) >> 1;
 	const char *iname = iter->types[i]->name;
 	if (iname) {
 	  register int compare = strcmp(name, iname);
-	  if (compare == 0) {	    
+	  if (compare == 0) {
 	    return iter->types[i];
 	  } else if (compare < 0) {
 	    if (i) {
@@ -570,14 +559,14 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
   Search for a swig_type_info structure for either a mangled name or a human readable name.
   It first searches the mangled names of the types, which is a O(log #types)
   If a type is not found it then searches the human readable names, which is O(#types).
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_TypeQueryModule(swig_module_info *start, 
-                     swig_module_info *end, 
+SWIG_TypeQueryModule(swig_module_info *start,
+                     swig_module_info *end,
 		     const char *name) {
   /* STEP 1: Search the name field using binary search */
   swig_type_info *ret = SWIG_MangledTypeQueryModule(start, end, name);
@@ -596,12 +585,12 @@ SWIG_TypeQueryModule(swig_module_info *start,
       iter = iter->next;
     } while (iter != end);
   }
-  
+
   /* neither found a match */
   return 0;
 }
 
-/* 
+/*
    Pack binary data into a string
 */
 SWIGRUNTIME char *
@@ -617,7 +606,7 @@ SWIG_PackData(char *c, void *ptr, size_t sz) {
   return c;
 }
 
-/* 
+/*
    Unpack binary data from a string
 */
 SWIGRUNTIME const char *
@@ -631,21 +620,21 @@ SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
       uu = ((d - '0') << 4);
     else if ((d >= 'a') && (d <= 'f'))
       uu = ((d - ('a'-10)) << 4);
-    else 
+    else
       return (char *) 0;
     d = *(c++);
     if ((d >= '0') && (d <= '9'))
       uu |= (d - '0');
     else if ((d >= 'a') && (d <= 'f'))
       uu |= (d - ('a'-10));
-    else 
+    else
       return (char *) 0;
     *u = uu;
   }
   return c;
 }
 
-/* 
+/*
    Pack 'void *' into a string buffer.
 */
 SWIGRUNTIME char *
@@ -705,18 +694,18 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 #endif
 
 /*  Errors in SWIG */
-#define  SWIG_UnknownError    	   -1 
-#define  SWIG_IOError        	   -2 
-#define  SWIG_RuntimeError   	   -3 
-#define  SWIG_IndexError     	   -4 
-#define  SWIG_TypeError      	   -5 
-#define  SWIG_DivisionByZero 	   -6 
-#define  SWIG_OverflowError  	   -7 
-#define  SWIG_SyntaxError    	   -8 
-#define  SWIG_ValueError     	   -9 
+#define  SWIG_UnknownError    	   -1
+#define  SWIG_IOError        	   -2
+#define  SWIG_RuntimeError   	   -3
+#define  SWIG_IndexError     	   -4
+#define  SWIG_TypeError      	   -5
+#define  SWIG_DivisionByZero 	   -6
+#define  SWIG_OverflowError  	   -7
+#define  SWIG_SyntaxError    	   -8
+#define  SWIG_ValueError     	   -9
 #define  SWIG_SystemError    	   -10
 #define  SWIG_AttributeError 	   -11
-#define  SWIG_MemoryError    	   -12 
+#define  SWIG_MemoryError    	   -12
 #define  SWIG_NullReferenceError   -13
 
 
@@ -1684,7 +1673,7 @@ static swig_module_info swig_module = {swig_types, 179, 0, 0, 0, 0};
 #define SWIG_name   "SVN::_Wc::boot_SVN___Wc"
 #define SWIG_prefix "SVN::_Wc::"
 
-#define SWIGVERSION 0x020009 
+#define SWIGVERSION 0x020012 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -2403,9 +2392,11 @@ XS(_wrap_svn_wc_context_create) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 3)) {
@@ -2537,16 +2528,16 @@ XS(_wrap_svn_wc_adm_open3) {
     int ecode4 = 0 ;
     int val5 ;
     int ecode5 = 0 ;
-    int res7 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
     dXSARGS;
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
-    if ((items < 6) || (items > 7)) {
+    if ((items < 5) || (items > 6)) {
       SWIG_croak("Usage: svn_wc_adm_open3(associated,path,write_lock,levels_to_lock,cancel_func,cancel_baton,pool);");
     }
     res2 = SWIG_ConvertPtr(ST(0), &argp2,SWIGTYPE_p_svn_wc_adm_access_t, 0 |  0 );
@@ -2570,16 +2561,10 @@ XS(_wrap_svn_wc_adm_open3) {
     } 
     arg5 = (int)(val5);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(4), (void**)(&arg6), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_adm_open3" "', argument " "6"" of type '" "svn_cancel_func_t""'"); 
-      }
+      arg6 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg7 = ST(4);
     }
-    res7 = SWIG_ConvertPtr(ST(5),SWIG_as_voidptrptr(&arg7), 0, 0);
-    if (!SWIG_IsOK(res7)) {
-      SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "svn_wc_adm_open3" "', argument " "7"" of type '" "void *""'"); 
-    }
-    if (items > 6) {
+    if (items > 5) {
       
     }
     {
@@ -2613,8 +2598,6 @@ XS(_wrap_svn_wc_adm_open3) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
@@ -2623,8 +2606,6 @@ XS(_wrap_svn_wc_adm_open3) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -2655,6 +2636,7 @@ XS(_wrap_svn_wc_adm_open2) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 4) || (items > 5)) {
@@ -2752,6 +2734,7 @@ XS(_wrap_svn_wc_adm_open) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 4) || (items > 5)) {
@@ -2845,16 +2828,16 @@ XS(_wrap_svn_wc_adm_probe_open3) {
     int ecode4 = 0 ;
     int val5 ;
     int ecode5 = 0 ;
-    int res7 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
     dXSARGS;
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
-    if ((items < 6) || (items > 7)) {
+    if ((items < 5) || (items > 6)) {
       SWIG_croak("Usage: svn_wc_adm_probe_open3(associated,path,write_lock,levels_to_lock,cancel_func,cancel_baton,pool);");
     }
     res2 = SWIG_ConvertPtr(ST(0), &argp2,SWIGTYPE_p_svn_wc_adm_access_t, 0 |  0 );
@@ -2878,16 +2861,10 @@ XS(_wrap_svn_wc_adm_probe_open3) {
     } 
     arg5 = (int)(val5);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(4), (void**)(&arg6), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_adm_probe_open3" "', argument " "6"" of type '" "svn_cancel_func_t""'"); 
-      }
-    }
-    res7 = SWIG_ConvertPtr(ST(5),SWIG_as_voidptrptr(&arg7), 0, 0);
-    if (!SWIG_IsOK(res7)) {
-      SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "svn_wc_adm_probe_open3" "', argument " "7"" of type '" "void *""'"); 
+      arg6 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg7 = ST(4);
     }
-    if (items > 6) {
+    if (items > 5) {
       
     }
     {
@@ -2921,8 +2898,6 @@ XS(_wrap_svn_wc_adm_probe_open3) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
@@ -2931,8 +2906,6 @@ XS(_wrap_svn_wc_adm_probe_open3) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -2963,6 +2936,7 @@ XS(_wrap_svn_wc_adm_probe_open2) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 4) || (items > 5)) {
@@ -3060,6 +3034,7 @@ XS(_wrap_svn_wc_adm_probe_open) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 4) || (items > 5)) {
@@ -3154,18 +3129,18 @@ XS(_wrap_svn_wc_adm_open_anchor) {
     int ecode5 = 0 ;
     int val6 ;
     int ecode6 = 0 ;
-    int res8 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
     dXSARGS;
     
     {
       _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
     arg3 = &temp3;
-    if ((items < 5) || (items > 6)) {
+    if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_wc_adm_open_anchor(path,write_lock,levels_to_lock,cancel_func,cancel_baton,pool);");
     }
     res4 = SWIG_AsCharPtrAndSize(ST(0), &buf4, NULL, &alloc4);
@@ -3184,16 +3159,10 @@ XS(_wrap_svn_wc_adm_open_anchor) {
     } 
     arg6 = (int)(val6);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(3), (void**)(&arg7), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_adm_open_anchor" "', argument " "7"" of type '" "svn_cancel_func_t""'"); 
-      }
+      arg7 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg8 = ST(3);
     }
-    res8 = SWIG_ConvertPtr(ST(4),SWIG_as_voidptrptr(&arg8), 0, 0);
-    if (!SWIG_IsOK(res8)) {
-      SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "svn_wc_adm_open_anchor" "', argument " "8"" of type '" "void *""'"); 
-    }
-    if (items > 5) {
+    if (items > 4) {
       
     }
     {
@@ -3238,8 +3207,6 @@ XS(_wrap_svn_wc_adm_open_anchor) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
@@ -3249,8 +3216,6 @@ XS(_wrap_svn_wc_adm_open_anchor) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -3275,6 +3240,7 @@ XS(_wrap_svn_wc_adm_retrieve) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -3352,6 +3318,7 @@ XS(_wrap_svn_wc_adm_probe_retrieve) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -3431,16 +3398,16 @@ XS(_wrap_svn_wc_adm_probe_try3) {
     int ecode4 = 0 ;
     int val5 ;
     int ecode5 = 0 ;
-    int res7 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
     dXSARGS;
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
-    if ((items < 6) || (items > 7)) {
+    if ((items < 5) || (items > 6)) {
       SWIG_croak("Usage: svn_wc_adm_probe_try3(associated,path,write_lock,levels_to_lock,cancel_func,cancel_baton,pool);");
     }
     res2 = SWIG_ConvertPtr(ST(0), &argp2,SWIGTYPE_p_svn_wc_adm_access_t, 0 |  0 );
@@ -3464,16 +3431,10 @@ XS(_wrap_svn_wc_adm_probe_try3) {
     } 
     arg5 = (int)(val5);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(4), (void**)(&arg6), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_adm_probe_try3" "', argument " "6"" of type '" "svn_cancel_func_t""'"); 
-      }
-    }
-    res7 = SWIG_ConvertPtr(ST(5),SWIG_as_voidptrptr(&arg7), 0, 0);
-    if (!SWIG_IsOK(res7)) {
-      SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "svn_wc_adm_probe_try3" "', argument " "7"" of type '" "void *""'"); 
+      arg6 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg7 = ST(4);
     }
-    if (items > 6) {
+    if (items > 5) {
       
     }
     {
@@ -3507,8 +3468,6 @@ XS(_wrap_svn_wc_adm_probe_try3) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
@@ -3517,8 +3476,6 @@ XS(_wrap_svn_wc_adm_probe_try3) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -3549,6 +3506,7 @@ XS(_wrap_svn_wc_adm_probe_try2) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 4) || (items > 5)) {
@@ -3646,6 +3604,7 @@ XS(_wrap_svn_wc_adm_probe_try) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 4) || (items > 5)) {
@@ -3731,6 +3690,7 @@ XS(_wrap_svn_wc_adm_close2) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_wc_adm_close2(adm_access,scratch_pool);");
@@ -3946,6 +3906,7 @@ XS(_wrap_svn_wc_locked2) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
@@ -4033,6 +3994,7 @@ XS(_wrap_svn_wc_locked) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 2)) {
@@ -4101,6 +4063,7 @@ XS(_wrap_svn_wc_is_adm_dir) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_wc_is_adm_dir(name,pool);");
@@ -4141,6 +4104,7 @@ XS(_wrap_svn_wc_get_adm_dir) {
     
     {
       _global_pool = arg1 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 0) || (items > 1)) {
       SWIG_croak("Usage: svn_wc_get_adm_dir(pool);");
@@ -4178,6 +4142,7 @@ XS(_wrap_svn_wc_set_adm_dir) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_wc_set_adm_dir(name,pool);");
@@ -4233,6 +4198,7 @@ XS(_wrap_svn_wc_init_traversal_info) {
     
     {
       _global_pool = arg1 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 0) || (items > 1)) {
       SWIG_croak("Usage: svn_wc_init_traversal_info(pool);");
@@ -4515,6 +4481,7 @@ XS(_wrap_svn_wc_external_item2_t_revision_set) {
     void *argp1 = 0 ;
     int res1 = 0 ;
     svn_opt_revision_t rev2 ;
+    apr_pool_t *_global_pool = NULL ;
     int argvi = 0;
     dXSARGS;
     
@@ -4527,7 +4494,11 @@ XS(_wrap_svn_wc_external_item2_t_revision_set) {
     }
     arg1 = (struct svn_wc_external_item2_t *)(argp1);
     {
-      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE, _global_pool);
     }
     if (arg1) (arg1)->revision = *arg2;
     ST(argvi) = sv_newmortal();
@@ -4577,6 +4548,7 @@ XS(_wrap_svn_wc_external_item2_t_peg_revision_set) {
     void *argp1 = 0 ;
     int res1 = 0 ;
     svn_opt_revision_t rev2 ;
+    apr_pool_t *_global_pool = NULL ;
     int argvi = 0;
     dXSARGS;
     
@@ -4589,7 +4561,11 @@ XS(_wrap_svn_wc_external_item2_t_peg_revision_set) {
     }
     arg1 = (struct svn_wc_external_item2_t *)(argp1);
     {
-      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE, _global_pool);
     }
     if (arg1) (arg1)->peg_revision = *arg2;
     ST(argvi) = sv_newmortal();
@@ -4699,6 +4675,7 @@ XS(_wrap_svn_wc_external_item2_create) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 0) || (items > 1)) {
@@ -4755,6 +4732,7 @@ XS(_wrap_svn_wc_external_item_create) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 0) || (items > 1)) {
@@ -4812,6 +4790,7 @@ XS(_wrap_svn_wc_external_item2_dup) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_wc_external_item2_dup(item,pool);");
@@ -4995,6 +4974,7 @@ XS(_wrap_svn_wc_external_item_t_revision_set) {
     void *argp1 = 0 ;
     int res1 = 0 ;
     svn_opt_revision_t rev2 ;
+    apr_pool_t *_global_pool = NULL ;
     int argvi = 0;
     dXSARGS;
     
@@ -5007,7 +4987,11 @@ XS(_wrap_svn_wc_external_item_t_revision_set) {
     }
     arg1 = (struct svn_wc_external_item_t *)(argp1);
     {
-      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE, _global_pool);
     }
     if (arg1) (arg1)->revision = *arg2;
     ST(argvi) = sv_newmortal();
@@ -5118,6 +5102,7 @@ XS(_wrap_svn_wc_external_item_dup) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_wc_external_item_dup(item,pool);");
@@ -5171,10 +5156,11 @@ XS(_wrap_svn_wc_parse_externals_description3) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 3) || (items > 4)) {
-      SWIG_croak("Usage: svn_wc_parse_externals_description3(parent_directory,desc,canonicalize_url,pool);");
+      SWIG_croak("Usage: svn_wc_parse_externals_description3(defining_directory,desc,canonicalize_url,pool);");
     }
     res2 = SWIG_AsCharPtrAndSize(ST(0), &buf2, NULL, &alloc2);
     if (!SWIG_IsOK(res2)) {
@@ -5257,6 +5243,7 @@ XS(_wrap_svn_wc_parse_externals_description2) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -5336,6 +5323,7 @@ XS(_wrap_svn_wc_parse_externals_description) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -7024,6 +7012,7 @@ XS(_wrap_svn_wc_create_notify) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_wc_create_notify(path,action,pool);");
@@ -7078,6 +7067,7 @@ XS(_wrap_svn_wc_create_notify_url) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_wc_create_notify_url(url,action,pool);");
@@ -7128,6 +7118,7 @@ XS(_wrap_svn_wc_dup_notify) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_wc_dup_notify(notify,pool);");
@@ -7590,6 +7581,7 @@ XS(_wrap_svn_wc_conflict_version_create2) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 5) || (items > 6)) {
       SWIG_croak("Usage: svn_wc_conflict_version_create2(repos_root_url,repos_uuid,repos_relpath,revision,kind,result_pool);");
@@ -7672,6 +7664,7 @@ XS(_wrap_svn_wc_conflict_version_create) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_wc_conflict_version_create(repos_url,path_in_repos,peg_rev,node_kind,pool);");
@@ -7736,6 +7729,7 @@ XS(_wrap_svn_wc_conflict_version_dup) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_wc_conflict_version_dup(version,pool);");
@@ -7766,1092 +7760,6 @@ XS(_wrap_svn_wc_conflict_version_dup) {
 }
 
 
-XS(_wrap_svn_wc_conflict_description2_t_local_abspath_set) {
-  {
-    struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-    char *arg2 = (char *) 0 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int res2 ;
-    char *buf2 = 0 ;
-    int alloc2 = 0 ;
-    int argvi = 0;
-    dXSARGS;
-    
-    if ((items < 2) || (items > 2)) {
-      SWIG_croak("Usage: svn_wc_conflict_description2_t_local_abspath_set(self,local_abspath);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_wc_conflict_description2_t_local_abspath_set" "', argument " "1"" of type '" "struct svn_wc_conflict_description2_t *""'"); 
-    }
-    arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-    res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
-    if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_wc_conflict_description2_t_local_abspath_set" "', argument " "2"" of type '" "char const *""'");
-    }
-    arg2 = (char *)(buf2);
-    {
-      apr_size_t len = strlen(arg2) + 1;
-      char *copied;
-      if (arg1->local_abspath) free((char *)arg1->local_abspath);
-      copied = malloc(len);
-      memcpy(copied, arg2, len);
-      arg1->local_abspath = copied;
-    }
-    ST(argvi) = sv_newmortal();
-    
-    if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-    XSRETURN(argvi);
-  fail:
-    
-    if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_wc_conflict_description2_t_local_abspath_get) {
-  {
-    struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int argvi = 0;
-    char *result = 0 ;
-    dXSARGS;
-    
-    if ((items < 1) || (items > 1)) {
-      SWIG_croak("Usage: svn_wc_conflict_description2_t_local_abspath_get(self);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_wc_conflict_description2_t_local_abspath_get" "', argument " "1"" of type '" "struct svn_wc_conflict_description2_t *""'"); 
-    }
-    arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-    result = (char *) ((arg1)->local_abspath);
-    ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
-    
-    XSRETURN(argvi);
-  fail:
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_wc_conflict_description2_t_node_kind_set) {
-  {
-    struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-    svn_node_kind_t arg2 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int val2 ;
-    int ecode2 = 0 ;
-    int argvi = 0;
-    dXSARGS;
-    
-    if ((items < 2) || (items > 2)) {
-      SWIG_croak("Usage: svn_wc_conflict_description2_t_node_kind_set(self,node_kind);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_wc_conflict_description2_t_node_kind_set" "', argument " "1"" of type '" "struct svn_wc_conflict_description2_t *""'"); 
-    }
-    arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-    ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
-    if (!SWIG_IsOK(ecode2)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "svn_wc_conflict_description2_t_node_kind_set" "', argument " "2"" of type '" "svn_node_kind_t""'");
-    } 
-    arg2 = (svn_node_kind_t)(val2);
-    if (arg1) (arg1)->node_kind = arg2;
-    ST(argvi) = sv_newmortal();
-    
-    
-    XSRETURN(argvi);
-  fail:
-    
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_wc_conflict_description2_t_node_kind_get) {
-  {
-    struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int argvi = 0;
-    svn_node_kind_t result;
-    dXSARGS;
-    
-    if ((items < 1) || (items > 1)) {
-      SWIG_croak("Usage: svn_wc_conflict_description2_t_node_kind_get(self);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_wc_conflict_description2_t_node_kind_get" "', argument " "1"" of type '" "struct svn_wc_conflict_description2_t *""'"); 
-    }
-    arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-    result = (svn_node_kind_t) ((arg1)->node_kind);
-    ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
-    
-    XSRETURN(argvi);
-  fail:
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_wc_conflict_description2_t_kind_set) {
-  {
-    struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-    svn_wc_conflict_kind_t arg2 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int val2 ;
-    int ecode2 = 0 ;
-    int argvi = 0;
-    dXSARGS;
-    
-    if ((items < 2) || (items > 2)) {
-      SWIG_croak("Usage: svn_wc_conflict_description2_t_kind_set(self,kind);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_wc_conflict_description2_t_kind_set" "', argument " "1"" of type '" "struct svn_wc_conflict_description2_t *""'"); 
-    }
-    arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-    ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
-    if (!SWIG_IsOK(ecode2)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "svn_wc_conflict_description2_t_kind_set" "', argument " "2"" of type '" "svn_wc_conflict_kind_t""'");
-    } 
-    arg2 = (svn_wc_conflict_kind_t)(val2);
-    if (arg1) (arg1)->kind = arg2;
-    ST(argvi) = sv_newmortal();
-    
-    
-    XSRETURN(argvi);
-  fail:
-    
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_wc_conflict_description2_t_kind_get) {
-  {
-    struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int argvi = 0;
-    svn_wc_conflict_kind_t result;
-    dXSARGS;
-    
-    if ((items < 1) || (items > 1)) {
-      SWIG_croak("Usage: svn_wc_conflict_description2_t_kind_get(self);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_wc_conflict_description2_t_kind_get" "', argument " "1"" of type '" "struct svn_wc_conflict_description2_t *""'"); 
-    }
-    arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-    result = (svn_wc_conflict_kind_t) ((arg1)->kind);
-    ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
-    
-    XSRETURN(argvi);
-  fail:
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_wc_conflict_description2_t_property_name_set) {
-  {
-    struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-    char *arg2 = (char *) 0 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int res2 ;
-    char *buf2 = 0 ;
-    int alloc2 = 0 ;
-    int argvi = 0;
-    dXSARGS;
-    
-    if ((items < 2) || (items > 2)) {
-      SWIG_croak("Usage: svn_wc_conflict_description2_t_property_name_set(self,property_name);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_wc_conflict_description2_t_property_name_set" "', argument " "1"" of type '" "struct svn_wc_conflict_description2_t *""'"); 
-    }
-    arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-    res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
-    if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_wc_conflict_description2_t_property_name_set" "', argument " "2"" of type '" "char const *""'");
-    }
-    arg2 = (char *)(buf2);
-    {
-      apr_size_t len = strlen(arg2) + 1;
-      char *copied;
-      if (arg1->property_name) free((char *)arg1->property_name);
-      copied = malloc(len);
-      memcpy(copied, arg2, len);
-      arg1->property_name = copied;
-    }
-    ST(argvi) = sv_newmortal();
-    
-    if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-    XSRETURN(argvi);
-  fail:
-    
-    if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_wc_conflict_description2_t_property_name_get) {
-  {
-    struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int argvi = 0;
-    char *result = 0 ;
-    dXSARGS;
-    
-    if ((items < 1) || (items > 1)) {
-      SWIG_croak("Usage: svn_wc_conflict_description2_t_property_name_get(self);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_wc_conflict_description2_t_property_name_get" "', argument " "1"" of type '" "struct svn_wc_conflict_description2_t *""'"); 
-    }
-    arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-    result = (char *) ((arg1)->property_name);
-    ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
-    
-    XSRETURN(argvi);
-  fail:
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_wc_conflict_description2_t_is_binary_set) {
-  {
-    struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-    svn_boolean_t arg2 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int val2 ;
-    int ecode2 = 0 ;
-    int argvi = 0;
-    dXSARGS;
-    
-    if ((items < 2) || (items > 2)) {
-      SWIG_croak("Usage: svn_wc_conflict_description2_t_is_binary_set(self,is_binary);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_wc_conflict_description2_t_is_binary_set" "', argument " "1"" of type '" "struct svn_wc_conflict_description2_t *""'"); 
-    }
-    arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-    ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
-    if (!SWIG_IsOK(ecode2)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "svn_wc_conflict_description2_t_is_binary_set" "', argument " "2"" of type '" "svn_boolean_t""'");
-    } 
-    arg2 = (svn_boolean_t)(val2);
-    if (arg1) (arg1)->is_binary = arg2;
-    ST(argvi) = sv_newmortal();
-    
-    
-    XSRETURN(argvi);
-  fail:
-    
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_wc_conflict_description2_t_is_binary_get) {
-  {
-    struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int argvi = 0;
-    svn_boolean_t result;
-    dXSARGS;
-    
-    if ((items < 1) || (items > 1)) {
-      SWIG_croak("Usage: svn_wc_conflict_description2_t_is_binary_get(self);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_wc_conflict_description2_t_is_binary_get" "', argument " "1"" of type '" "struct svn_wc_conflict_description2_t *""'"); 
-    }
-    arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-    result = (svn_boolean_t) ((arg1)->is_binary);
-    ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
-    
-    XSRETURN(argvi);
-  fail:
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_wc_conflict_description2_t_mime_type_set) {
-  {
-    struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-    char *arg2 = (char *) 0 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int res2 ;
-    char *buf2 = 0 ;
-    int alloc2 = 0 ;
-    int argvi = 0;
-    dXSARGS;
-    
-    if ((items < 2) || (items > 2)) {
-      SWIG_croak("Usage: svn_wc_conflict_description2_t_mime_type_set(self,mime_type);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_wc_conflict_description2_t_mime_type_set" "', argument " "1"" of type '" "struct svn_wc_conflict_description2_t *""'"); 
-    }
-    arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-    res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
-    if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_wc_conflict_description2_t_mime_type_set" "', argument " "2"" of type '" "char const *""'");
-    }
-    arg2 = (char *)(buf2);
-    {
-      apr_size_t len = strlen(arg2) + 1;
-      char *copied;
-      if (arg1->mime_type) free((char *)arg1->mime_type);
-      copied = malloc(len);
-      memcpy(copied, arg2, len);
-      arg1->mime_type = copied;
-    }
-    ST(argvi) = sv_newmortal();
-    
-    if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-    XSRETURN(argvi);
-  fail:
-    
-    if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_wc_conflict_description2_t_mime_type_get) {
-  {
-    struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int argvi = 0;
-    char *result = 0 ;
-    dXSARGS;
-    
-    if ((items < 1) || (items > 1)) {
-      SWIG_croak("Usage: svn_wc_conflict_description2_t_mime_type_get(self);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_wc_conflict_description2_t_mime_type_get" "', argument " "1"" of type '" "struct svn_wc_conflict_description2_t *""'"); 
-    }
-    arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-    result = (char *) ((arg1)->mime_type);
-    ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
-    
-    XSRETURN(argvi);
-  fail:
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_wc_conflict_description2_t_action_set) {
-  {
-    struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-    svn_wc_conflict_action_t arg2 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int val2 ;
-    int ecode2 = 0 ;
-    int argvi = 0;
-    dXSARGS;
-    
-    if ((items < 2) || (items > 2)) {
-      SWIG_croak("Usage: svn_wc_conflict_description2_t_action_set(self,action);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_wc_conflict_description2_t_action_set" "', argument " "1"" of type '" "struct svn_wc_conflict_description2_t *""'"); 
-    }
-    arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-    ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
-    if (!SWIG_IsOK(ecode2)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "svn_wc_conflict_description2_t_action_set" "', argument " "2"" of type '" "svn_wc_conflict_action_t""'");
-    } 
-    arg2 = (svn_wc_conflict_action_t)(val2);
-    if (arg1) (arg1)->action = arg2;
-    ST(argvi) = sv_newmortal();
-    
-    
-    XSRETURN(argvi);
-  fail:
-    
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_wc_conflict_description2_t_action_get) {
-  {
-    struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int argvi = 0;
-    svn_wc_conflict_action_t result;
-    dXSARGS;
-    
-    if ((items < 1) || (items > 1)) {
-      SWIG_croak("Usage: svn_wc_conflict_description2_t_action_get(self);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_wc_conflict_description2_t_action_get" "', argument " "1"" of type '" "struct svn_wc_conflict_description2_t *""'"); 
-    }
-    arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-    result = (svn_wc_conflict_action_t) ((arg1)->action);
-    ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
-    
-    XSRETURN(argvi);
-  fail:
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_wc_conflict_description2_t_reason_set) {
-  {
-    struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-    svn_wc_conflict_reason_t arg2 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int val2 ;
-    int ecode2 = 0 ;
-    int argvi = 0;
-    dXSARGS;
-    
-    if ((items < 2) || (items > 2)) {
-      SWIG_croak("Usage: svn_wc_conflict_description2_t_reason_set(self,reason);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_wc_conflict_description2_t_reason_set" "', argument " "1"" of type '" "struct svn_wc_conflict_description2_t *""'"); 
-    }
-    arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-    ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
-    if (!SWIG_IsOK(ecode2)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "svn_wc_conflict_description2_t_reason_set" "', argument " "2"" of type '" "svn_wc_conflict_reason_t""'");
-    } 
-    arg2 = (svn_wc_conflict_reason_t)(val2);
-    if (arg1) (arg1)->reason = arg2;
-    ST(argvi) = sv_newmortal();
-    
-    
-    XSRETURN(argvi);
-  fail:
-    
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_wc_conflict_description2_t_reason_get) {
-  {
-    struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int argvi = 0;
-    svn_wc_conflict_reason_t result;
-    dXSARGS;
-    
-    if ((items < 1) || (items > 1)) {
-      SWIG_croak("Usage: svn_wc_conflict_description2_t_reason_get(self);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_wc_conflict_description2_t_reason_get" "', argument " "1"" of type '" "struct svn_wc_conflict_description2_t *""'"); 
-    }
-    arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-    result = (svn_wc_conflict_reason_t) ((arg1)->reason);
-    ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
-    
-    XSRETURN(argvi);
-  fail:
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_wc_conflict_description2_t_base_abspath_set) {
-  {
-    struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-    char *arg2 = (char *) 0 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int res2 ;
-    char *buf2 = 0 ;
-    int alloc2 = 0 ;
-    int argvi = 0;
-    dXSARGS;
-    
-    if ((items < 2) || (items > 2)) {
-      SWIG_croak("Usage: svn_wc_conflict_description2_t_base_abspath_set(self,base_abspath);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_wc_conflict_description2_t_base_abspath_set" "', argument " "1"" of type '" "struct svn_wc_conflict_description2_t *""'"); 
-    }
-    arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-    res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
-    if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_wc_conflict_description2_t_base_abspath_set" "', argument " "2"" of type '" "char const *""'");
-    }
-    arg2 = (char *)(buf2);
-    {
-      apr_size_t len = strlen(arg2) + 1;
-      char *copied;
-      if (arg1->base_abspath) free((char *)arg1->base_abspath);
-      copied = malloc(len);
-      memcpy(copied, arg2, len);
-      arg1->base_abspath = copied;
-    }
-    ST(argvi) = sv_newmortal();
-    
-    if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-    XSRETURN(argvi);
-  fail:
-    
-    if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_wc_conflict_description2_t_base_abspath_get) {
-  {
-    struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int argvi = 0;
-    char *result = 0 ;
-    dXSARGS;
-    
-    if ((items < 1) || (items > 1)) {
-      SWIG_croak("Usage: svn_wc_conflict_description2_t_base_abspath_get(self);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_wc_conflict_description2_t_base_abspath_get" "', argument " "1"" of type '" "struct svn_wc_conflict_description2_t *""'"); 
-    }
-    arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-    result = (char *) ((arg1)->base_abspath);
-    ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
-    
-    XSRETURN(argvi);
-  fail:
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_wc_conflict_description2_t_their_abspath_set) {
-  {
-    struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-    char *arg2 = (char *) 0 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int res2 ;
-    char *buf2 = 0 ;
-    int alloc2 = 0 ;
-    int argvi = 0;
-    dXSARGS;
-    
-    if ((items < 2) || (items > 2)) {
-      SWIG_croak("Usage: svn_wc_conflict_description2_t_their_abspath_set(self,their_abspath);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_wc_conflict_description2_t_their_abspath_set" "', argument " "1"" of type '" "struct svn_wc_conflict_description2_t *""'"); 
-    }
-    arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-    res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
-    if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_wc_conflict_description2_t_their_abspath_set" "', argument " "2"" of type '" "char const *""'");
-    }
-    arg2 = (char *)(buf2);
-    {
-      apr_size_t len = strlen(arg2) + 1;
-      char *copied;
-      if (arg1->their_abspath) free((char *)arg1->their_abspath);
-      copied = malloc(len);
-      memcpy(copied, arg2, len);
-      arg1->their_abspath = copied;
-    }
-    ST(argvi) = sv_newmortal();
-    
-    if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-    XSRETURN(argvi);
-  fail:
-    
-    if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_wc_conflict_description2_t_their_abspath_get) {
-  {
-    struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int argvi = 0;
-    char *result = 0 ;
-    dXSARGS;
-    
-    if ((items < 1) || (items > 1)) {
-      SWIG_croak("Usage: svn_wc_conflict_description2_t_their_abspath_get(self);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_wc_conflict_description2_t_their_abspath_get" "', argument " "1"" of type '" "struct svn_wc_conflict_description2_t *""'"); 
-    }
-    arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-    result = (char *) ((arg1)->their_abspath);
-    ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
-    
-    XSRETURN(argvi);
-  fail:
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_wc_conflict_description2_t_my_abspath_set) {
-  {
-    struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-    char *arg2 = (char *) 0 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int res2 ;
-    char *buf2 = 0 ;
-    int alloc2 = 0 ;
-    int argvi = 0;
-    dXSARGS;
-    
-    if ((items < 2) || (items > 2)) {
-      SWIG_croak("Usage: svn_wc_conflict_description2_t_my_abspath_set(self,my_abspath);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_wc_conflict_description2_t_my_abspath_set" "', argument " "1"" of type '" "struct svn_wc_conflict_description2_t *""'"); 
-    }
-    arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-    res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
-    if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_wc_conflict_description2_t_my_abspath_set" "', argument " "2"" of type '" "char const *""'");
-    }
-    arg2 = (char *)(buf2);
-    {
-      apr_size_t len = strlen(arg2) + 1;
-      char *copied;
-      if (arg1->my_abspath) free((char *)arg1->my_abspath);
-      copied = malloc(len);
-      memcpy(copied, arg2, len);
-      arg1->my_abspath = copied;
-    }
-    ST(argvi) = sv_newmortal();
-    
-    if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-    XSRETURN(argvi);
-  fail:
-    
-    if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_wc_conflict_description2_t_my_abspath_get) {
-  {
-    struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int argvi = 0;
-    char *result = 0 ;
-    dXSARGS;
-    
-    if ((items < 1) || (items > 1)) {
-      SWIG_croak("Usage: svn_wc_conflict_description2_t_my_abspath_get(self);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_wc_conflict_description2_t_my_abspath_get" "', argument " "1"" of type '" "struct svn_wc_conflict_description2_t *""'"); 
-    }
-    arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-    result = (char *) ((arg1)->my_abspath);
-    ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
-    
-    XSRETURN(argvi);
-  fail:
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_wc_conflict_description2_t_merged_file_set) {
-  {
-    struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-    char *arg2 = (char *) 0 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int res2 ;
-    char *buf2 = 0 ;
-    int alloc2 = 0 ;
-    int argvi = 0;
-    dXSARGS;
-    
-    if ((items < 2) || (items > 2)) {
-      SWIG_croak("Usage: svn_wc_conflict_description2_t_merged_file_set(self,merged_file);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_wc_conflict_description2_t_merged_file_set" "', argument " "1"" of type '" "struct svn_wc_conflict_description2_t *""'"); 
-    }
-    arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-    res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
-    if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_wc_conflict_description2_t_merged_file_set" "', argument " "2"" of type '" "char const *""'");
-    }
-    arg2 = (char *)(buf2);
-    {
-      apr_size_t len = strlen(arg2) + 1;
-      char *copied;
-      if (arg1->merged_file) free((char *)arg1->merged_file);
-      copied = malloc(len);
-      memcpy(copied, arg2, len);
-      arg1->merged_file = copied;
-    }
-    ST(argvi) = sv_newmortal();
-    
-    if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-    XSRETURN(argvi);
-  fail:
-    
-    if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_wc_conflict_description2_t_merged_file_get) {
-  {
-    struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int argvi = 0;
-    char *result = 0 ;
-    dXSARGS;
-    
-    if ((items < 1) || (items > 1)) {
-      SWIG_croak("Usage: svn_wc_conflict_description2_t_merged_file_get(self);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_wc_conflict_description2_t_merged_file_get" "', argument " "1"" of type '" "struct svn_wc_conflict_description2_t *""'"); 
-    }
-    arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-    result = (char *) ((arg1)->merged_file);
-    ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
-    
-    XSRETURN(argvi);
-  fail:
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_wc_conflict_description2_t_operation_set) {
-  {
-    struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-    svn_wc_operation_t arg2 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int val2 ;
-    int ecode2 = 0 ;
-    int argvi = 0;
-    dXSARGS;
-    
-    if ((items < 2) || (items > 2)) {
-      SWIG_croak("Usage: svn_wc_conflict_description2_t_operation_set(self,operation);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_wc_conflict_description2_t_operation_set" "', argument " "1"" of type '" "struct svn_wc_conflict_description2_t *""'"); 
-    }
-    arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-    ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
-    if (!SWIG_IsOK(ecode2)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "svn_wc_conflict_description2_t_operation_set" "', argument " "2"" of type '" "svn_wc_operation_t""'");
-    } 
-    arg2 = (svn_wc_operation_t)(val2);
-    if (arg1) (arg1)->operation = arg2;
-    ST(argvi) = sv_newmortal();
-    
-    
-    XSRETURN(argvi);
-  fail:
-    
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_wc_conflict_description2_t_operation_get) {
-  {
-    struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int argvi = 0;
-    svn_wc_operation_t result;
-    dXSARGS;
-    
-    if ((items < 1) || (items > 1)) {
-      SWIG_croak("Usage: svn_wc_conflict_description2_t_operation_get(self);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_wc_conflict_description2_t_operation_get" "', argument " "1"" of type '" "struct svn_wc_conflict_description2_t *""'"); 
-    }
-    arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-    result = (svn_wc_operation_t) ((arg1)->operation);
-    ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
-    
-    XSRETURN(argvi);
-  fail:
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_wc_conflict_description2_t_src_left_version_set) {
-  {
-    struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-    svn_wc_conflict_version_t *arg2 = (svn_wc_conflict_version_t *) 0 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    void *argp2 = 0 ;
-    int res2 = 0 ;
-    int argvi = 0;
-    dXSARGS;
-    
-    if ((items < 2) || (items > 2)) {
-      SWIG_croak("Usage: svn_wc_conflict_description2_t_src_left_version_set(self,src_left_version);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_wc_conflict_description2_t_src_left_version_set" "', argument " "1"" of type '" "struct svn_wc_conflict_description2_t *""'"); 
-    }
-    arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-    res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_svn_wc_conflict_version_t, SWIG_POINTER_DISOWN |  0 );
-    if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_wc_conflict_description2_t_src_left_version_set" "', argument " "2"" of type '" "svn_wc_conflict_version_t const *""'"); 
-    }
-    arg2 = (svn_wc_conflict_version_t *)(argp2);
-    if (arg1) (arg1)->src_left_version = (svn_wc_conflict_version_t const *)arg2;
-    ST(argvi) = sv_newmortal();
-    
-    
-    XSRETURN(argvi);
-  fail:
-    
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_wc_conflict_description2_t_src_left_version_get) {
-  {
-    struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int argvi = 0;
-    svn_wc_conflict_version_t *result = 0 ;
-    dXSARGS;
-    
-    if ((items < 1) || (items > 1)) {
-      SWIG_croak("Usage: svn_wc_conflict_description2_t_src_left_version_get(self);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_wc_conflict_description2_t_src_left_version_get" "', argument " "1"" of type '" "struct svn_wc_conflict_description2_t *""'"); 
-    }
-    arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-    result = (svn_wc_conflict_version_t *) ((arg1)->src_left_version);
-    ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_svn_wc_conflict_version_t, 0 | SWIG_SHADOW); argvi++ ;
-    
-    XSRETURN(argvi);
-  fail:
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_wc_conflict_description2_t_src_right_version_set) {
-  {
-    struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-    svn_wc_conflict_version_t *arg2 = (svn_wc_conflict_version_t *) 0 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    void *argp2 = 0 ;
-    int res2 = 0 ;
-    int argvi = 0;
-    dXSARGS;
-    
-    if ((items < 2) || (items > 2)) {
-      SWIG_croak("Usage: svn_wc_conflict_description2_t_src_right_version_set(self,src_right_version);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_wc_conflict_description2_t_src_right_version_set" "', argument " "1"" of type '" "struct svn_wc_conflict_description2_t *""'"); 
-    }
-    arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-    res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_svn_wc_conflict_version_t, SWIG_POINTER_DISOWN |  0 );
-    if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_wc_conflict_description2_t_src_right_version_set" "', argument " "2"" of type '" "svn_wc_conflict_version_t const *""'"); 
-    }
-    arg2 = (svn_wc_conflict_version_t *)(argp2);
-    if (arg1) (arg1)->src_right_version = (svn_wc_conflict_version_t const *)arg2;
-    ST(argvi) = sv_newmortal();
-    
-    
-    XSRETURN(argvi);
-  fail:
-    
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_wc_conflict_description2_t_src_right_version_get) {
-  {
-    struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int argvi = 0;
-    svn_wc_conflict_version_t *result = 0 ;
-    dXSARGS;
-    
-    if ((items < 1) || (items > 1)) {
-      SWIG_croak("Usage: svn_wc_conflict_description2_t_src_right_version_get(self);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_wc_conflict_description2_t_src_right_version_get" "', argument " "1"" of type '" "struct svn_wc_conflict_description2_t *""'"); 
-    }
-    arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-    result = (svn_wc_conflict_version_t *) ((arg1)->src_right_version);
-    ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_svn_wc_conflict_version_t, 0 | SWIG_SHADOW); argvi++ ;
-    
-    XSRETURN(argvi);
-  fail:
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_new_svn_wc_conflict_description2_t) {
-  {
-    int argvi = 0;
-    struct svn_wc_conflict_description2_t *result = 0 ;
-    dXSARGS;
-    
-    if ((items < 0) || (items > 0)) {
-      SWIG_croak("Usage: new_svn_wc_conflict_description2_t();");
-    }
-    {
-      result = (struct svn_wc_conflict_description2_t *)calloc(1, sizeof(struct svn_wc_conflict_description2_t));
-      
-      
-      
-    }
-    ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_svn_wc_conflict_description2_t, SWIG_OWNER | SWIG_SHADOW); argvi++ ;
-    XSRETURN(argvi);
-  fail:
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_delete_svn_wc_conflict_description2_t) {
-  {
-    struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int argvi = 0;
-    dXSARGS;
-    
-    if ((items < 1) || (items > 1)) {
-      SWIG_croak("Usage: delete_svn_wc_conflict_description2_t(self);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, SWIG_POINTER_DISOWN |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_svn_wc_conflict_description2_t" "', argument " "1"" of type '" "struct svn_wc_conflict_description2_t *""'"); 
-    }
-    arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-    {
-      free((char *) arg1);
-      
-      
-      
-    }
-    ST(argvi) = sv_newmortal();
-    
-    XSRETURN(argvi);
-  fail:
-    
-    SWIG_croak_null();
-  }
-}
-
-
 XS(_wrap_svn_wc_conflict_description_t_path_set) {
   {
     struct svn_wc_conflict_description_t *arg1 = (struct svn_wc_conflict_description_t *) 0 ;
@@ -10017,6 +8925,7 @@ XS(_wrap_svn_wc_conflict_description_create_text2) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_wc_conflict_description_create_text2(local_abspath,result_pool);");
@@ -10035,7 +8944,7 @@ XS(_wrap_svn_wc_conflict_description_create_text2) {
       
       
     }
-    ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_svn_wc_conflict_description2_t, 0 | SWIG_SHADOW); argvi++ ;
+    ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_svn_wc_conflict_description2_t, 0 | 0); argvi++ ;
     if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
     
     XSRETURN(argvi);
@@ -10064,6 +8973,7 @@ XS(_wrap_svn_wc_conflict_description_create_text) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_wc_conflict_description_create_text(path,adm_access,pool);");
@@ -10122,6 +9032,7 @@ XS(_wrap_svn_wc_conflict_description_create_prop2) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_wc_conflict_description_create_prop2(local_abspath,node_kind,property_name,result_pool);");
@@ -10150,7 +9061,7 @@ XS(_wrap_svn_wc_conflict_description_create_prop2) {
       
       
     }
-    ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_svn_wc_conflict_description2_t, 0 | SWIG_SHADOW); argvi++ ;
+    ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_svn_wc_conflict_description2_t, 0 | 0); argvi++ ;
     if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
     
     if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
@@ -10190,6 +9101,7 @@ XS(_wrap_svn_wc_conflict_description_create_prop) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_wc_conflict_description_create_prop(path,adm_access,node_kind,property_name,pool);");
@@ -10267,6 +9179,7 @@ XS(_wrap_svn_wc_conflict_description_create_tree2) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 5) || (items > 6)) {
       SWIG_croak("Usage: svn_wc_conflict_description_create_tree2(local_abspath,node_kind,operation,src_left_version,src_right_version,result_pool);");
@@ -10305,7 +9218,7 @@ XS(_wrap_svn_wc_conflict_description_create_tree2) {
       
       
     }
-    ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_svn_wc_conflict_description2_t, 0 | SWIG_SHADOW); argvi++ ;
+    ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_svn_wc_conflict_description2_t, 0 | 0); argvi++ ;
     if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
     
     
@@ -10354,6 +9267,7 @@ XS(_wrap_svn_wc_conflict_description_create_tree) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 6) || (items > 7)) {
       SWIG_croak("Usage: svn_wc_conflict_description_create_tree(path,adm_access,node_kind,operation,src_left_version,src_right_version,pool);");
@@ -10419,7 +9333,7 @@ XS(_wrap_svn_wc_conflict_description_create_tree) {
 }
 
 
-XS(_wrap_svn_wc__conflict_description2_dup) {
+XS(_wrap_svn_wc_conflict_description2_dup) {
   {
     svn_wc_conflict_description2_t *arg1 = (svn_wc_conflict_description2_t *) 0 ;
     apr_pool_t *arg2 = (apr_pool_t *) 0 ;
@@ -10432,62 +9346,26 @@ XS(_wrap_svn_wc__conflict_description2_dup) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
-      SWIG_croak("Usage: svn_wc__conflict_description2_dup(conflict,result_pool);");
+      SWIG_croak("Usage: svn_wc_conflict_description2_dup(conflict,result_pool);");
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_wc__conflict_description2_dup" "', argument " "1"" of type '" "svn_wc_conflict_description2_t const *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_wc_conflict_description2_dup" "', argument " "1"" of type '" "svn_wc_conflict_description2_t const *""'"); 
     }
     arg1 = (svn_wc_conflict_description2_t *)(argp1);
     if (items > 1) {
       
     }
     {
-      result = (svn_wc_conflict_description2_t *)svn_wc__conflict_description2_dup((struct svn_wc_conflict_description2_t const *)arg1,arg2);
+      result = (svn_wc_conflict_description2_t *)svn_wc_conflict_description2_dup((struct svn_wc_conflict_description2_t const *)arg1,arg2);
       
       
       
     }
-    ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_svn_wc_conflict_description2_t, 0 | SWIG_SHADOW); argvi++ ;
-    
-    
-    XSRETURN(argvi);
-  fail:
-    
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_wc_conflict_result_t_choice_set) {
-  {
-    struct svn_wc_conflict_result_t *arg1 = (struct svn_wc_conflict_result_t *) 0 ;
-    svn_wc_conflict_choice_t arg2 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int val2 ;
-    int ecode2 = 0 ;
-    int argvi = 0;
-    dXSARGS;
-    
-    if ((items < 2) || (items > 2)) {
-      SWIG_croak("Usage: svn_wc_conflict_result_t_choice_set(self,choice);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_conflict_result_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_wc_conflict_result_t_choice_set" "', argument " "1"" of type '" "struct svn_wc_conflict_result_t *""'"); 
-    }
-    arg1 = (struct svn_wc_conflict_result_t *)(argp1);
-    ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
-    if (!SWIG_IsOK(ecode2)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "svn_wc_conflict_result_t_choice_set" "', argument " "2"" of type '" "svn_wc_conflict_choice_t""'");
-    } 
-    arg2 = (svn_wc_conflict_choice_t)(val2);
-    if (arg1) (arg1)->choice = arg2;
-    ST(argvi) = sv_newmortal();
+    ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_svn_wc_conflict_description2_t, 0 | 0); argvi++ ;
     
     
     XSRETURN(argvi);
@@ -10499,222 +9377,45 @@ XS(_wrap_svn_wc_conflict_result_t_choice_set) {
 }
 
 
-XS(_wrap_svn_wc_conflict_result_t_choice_get) {
-  {
-    struct svn_wc_conflict_result_t *arg1 = (struct svn_wc_conflict_result_t *) 0 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int argvi = 0;
-    svn_wc_conflict_choice_t result;
-    dXSARGS;
-    
-    if ((items < 1) || (items > 1)) {
-      SWIG_croak("Usage: svn_wc_conflict_result_t_choice_get(self);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_conflict_result_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_wc_conflict_result_t_choice_get" "', argument " "1"" of type '" "struct svn_wc_conflict_result_t *""'"); 
-    }
-    arg1 = (struct svn_wc_conflict_result_t *)(argp1);
-    result = (svn_wc_conflict_choice_t) ((arg1)->choice);
-    ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
-    
-    XSRETURN(argvi);
-  fail:
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_wc_conflict_result_t_merged_file_set) {
+XS(_wrap_svn_wc__conflict_description2_dup) {
   {
-    struct svn_wc_conflict_result_t *arg1 = (struct svn_wc_conflict_result_t *) 0 ;
-    char *arg2 = (char *) 0 ;
+    svn_wc_conflict_description2_t *arg1 = (svn_wc_conflict_description2_t *) 0 ;
+    apr_pool_t *arg2 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
     void *argp1 = 0 ;
     int res1 = 0 ;
-    int res2 ;
-    char *buf2 = 0 ;
-    int alloc2 = 0 ;
     int argvi = 0;
+    svn_wc_conflict_description2_t *result = 0 ;
     dXSARGS;
     
-    if ((items < 2) || (items > 2)) {
-      SWIG_croak("Usage: svn_wc_conflict_result_t_merged_file_set(self,merged_file);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_conflict_result_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_wc_conflict_result_t_merged_file_set" "', argument " "1"" of type '" "struct svn_wc_conflict_result_t *""'"); 
-    }
-    arg1 = (struct svn_wc_conflict_result_t *)(argp1);
-    res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
-    if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_wc_conflict_result_t_merged_file_set" "', argument " "2"" of type '" "char const *""'");
-    }
-    arg2 = (char *)(buf2);
     {
-      apr_size_t len = strlen(arg2) + 1;
-      char *copied;
-      if (arg1->merged_file) free((char *)arg1->merged_file);
-      copied = malloc(len);
-      memcpy(copied, arg2, len);
-      arg1->merged_file = copied;
-    }
-    ST(argvi) = sv_newmortal();
-    
-    if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-    XSRETURN(argvi);
-  fail:
-    
-    if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_wc_conflict_result_t_merged_file_get) {
-  {
-    struct svn_wc_conflict_result_t *arg1 = (struct svn_wc_conflict_result_t *) 0 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int argvi = 0;
-    char *result = 0 ;
-    dXSARGS;
-    
-    if ((items < 1) || (items > 1)) {
-      SWIG_croak("Usage: svn_wc_conflict_result_t_merged_file_get(self);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_conflict_result_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_wc_conflict_result_t_merged_file_get" "', argument " "1"" of type '" "struct svn_wc_conflict_result_t *""'"); 
-    }
-    arg1 = (struct svn_wc_conflict_result_t *)(argp1);
-    result = (char *) ((arg1)->merged_file);
-    ST(argvi) = SWIG_FromCharPtr((const char *)result); argvi++ ;
-    
-    XSRETURN(argvi);
-  fail:
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_wc_conflict_result_t_save_merged_set) {
-  {
-    struct svn_wc_conflict_result_t *arg1 = (struct svn_wc_conflict_result_t *) 0 ;
-    svn_boolean_t arg2 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int val2 ;
-    int ecode2 = 0 ;
-    int argvi = 0;
-    dXSARGS;
-    
-    if ((items < 2) || (items > 2)) {
-      SWIG_croak("Usage: svn_wc_conflict_result_t_save_merged_set(self,save_merged);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_conflict_result_t, 0 |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_wc_conflict_result_t_save_merged_set" "', argument " "1"" of type '" "struct svn_wc_conflict_result_t *""'"); 
+      _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    arg1 = (struct svn_wc_conflict_result_t *)(argp1);
-    ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
-    if (!SWIG_IsOK(ecode2)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "svn_wc_conflict_result_t_save_merged_set" "', argument " "2"" of type '" "svn_boolean_t""'");
-    } 
-    arg2 = (svn_boolean_t)(val2);
-    if (arg1) (arg1)->save_merged = arg2;
-    ST(argvi) = sv_newmortal();
-    
-    
-    XSRETURN(argvi);
-  fail:
-    
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_svn_wc_conflict_result_t_save_merged_get) {
-  {
-    struct svn_wc_conflict_result_t *arg1 = (struct svn_wc_conflict_result_t *) 0 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int argvi = 0;
-    svn_boolean_t result;
-    dXSARGS;
-    
-    if ((items < 1) || (items > 1)) {
-      SWIG_croak("Usage: svn_wc_conflict_result_t_save_merged_get(self);");
+    if ((items < 1) || (items > 2)) {
+      SWIG_croak("Usage: svn_wc__conflict_description2_dup(conflict,result_pool);");
     }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_conflict_result_t, 0 |  0 );
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_wc_conflict_result_t_save_merged_get" "', argument " "1"" of type '" "struct svn_wc_conflict_result_t *""'"); 
-    }
-    arg1 = (struct svn_wc_conflict_result_t *)(argp1);
-    result = (svn_boolean_t) ((arg1)->save_merged);
-    ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
-    
-    XSRETURN(argvi);
-  fail:
-    
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_new_svn_wc_conflict_result_t) {
-  {
-    int argvi = 0;
-    struct svn_wc_conflict_result_t *result = 0 ;
-    dXSARGS;
-    
-    if ((items < 0) || (items > 0)) {
-      SWIG_croak("Usage: new_svn_wc_conflict_result_t();");
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_wc__conflict_description2_dup" "', argument " "1"" of type '" "svn_wc_conflict_description2_t const *""'"); 
     }
-    {
-      result = (struct svn_wc_conflict_result_t *)calloc(1, sizeof(struct svn_wc_conflict_result_t));
-      
-      
+    arg1 = (svn_wc_conflict_description2_t *)(argp1);
+    if (items > 1) {
       
     }
-    ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_svn_wc_conflict_result_t, SWIG_OWNER | SWIG_SHADOW); argvi++ ;
-    XSRETURN(argvi);
-  fail:
-    SWIG_croak_null();
-  }
-}
-
-
-XS(_wrap_delete_svn_wc_conflict_result_t) {
-  {
-    struct svn_wc_conflict_result_t *arg1 = (struct svn_wc_conflict_result_t *) 0 ;
-    void *argp1 = 0 ;
-    int res1 = 0 ;
-    int argvi = 0;
-    dXSARGS;
-    
-    if ((items < 1) || (items > 1)) {
-      SWIG_croak("Usage: delete_svn_wc_conflict_result_t(self);");
-    }
-    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_conflict_result_t, SWIG_POINTER_DISOWN |  0 );
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_svn_wc_conflict_result_t" "', argument " "1"" of type '" "struct svn_wc_conflict_result_t *""'"); 
-    }
-    arg1 = (struct svn_wc_conflict_result_t *)(argp1);
     {
-      free((char *) arg1);
+      result = (svn_wc_conflict_description2_t *)svn_wc__conflict_description2_dup((struct svn_wc_conflict_description2_t const *)arg1,arg2);
       
       
       
     }
-    ST(argvi) = sv_newmortal();
+    ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_svn_wc_conflict_description2_t, 0 | 0); argvi++ ;
+    
     
     XSRETURN(argvi);
   fail:
     
+    
     SWIG_croak_null();
   }
 }
@@ -10737,6 +9438,7 @@ XS(_wrap_svn_wc_create_conflict_result) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_wc_create_conflict_result(choice,merged_file,pool);");
@@ -10760,7 +9462,7 @@ XS(_wrap_svn_wc_create_conflict_result) {
       
       
     }
-    ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_svn_wc_conflict_result_t, 0 | SWIG_SHADOW); argvi++ ;
+    ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_svn_wc_conflict_result_t, 0 | 0); argvi++ ;
     
     if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
     
@@ -12870,6 +11572,7 @@ XS(_wrap_svn_wc_check_wc2) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -12948,6 +11651,7 @@ XS(_wrap_svn_wc_check_wc) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     if ((items < 1) || (items > 2)) {
@@ -13022,6 +11726,7 @@ XS(_wrap_svn_wc_has_binary_prop) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -13106,6 +11811,7 @@ XS(_wrap_svn_wc_text_modified_p2) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 3) || (items > 4)) {
@@ -13197,6 +11903,7 @@ XS(_wrap_svn_wc_text_modified_p) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 3) || (items > 4)) {
@@ -13285,6 +11992,7 @@ XS(_wrap_svn_wc_props_modified_p2) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -13366,6 +12074,7 @@ XS(_wrap_svn_wc_props_modified_p) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -14654,10 +13363,9 @@ XS(_wrap_svn_wc_entry_t_text_time_get) {
     arg1 = (struct svn_wc_entry_t *)(argp1);
     result =  ((arg1)->text_time);
     {
-      char temp[256];
+      char temp[30];
       sprintf(temp, "%" APR_INT64_T_FMT, (apr_int64_t) result);
-      ST(argvi) = sv_newmortal();
-      sv_setpv((SV*)ST(argvi++), temp);
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = sv_2mortal(newSVpv(temp, 0)); argvi++  ;
     }
     
     XSRETURN(argvi);
@@ -14724,10 +13432,9 @@ XS(_wrap_svn_wc_entry_t_prop_time_get) {
     arg1 = (struct svn_wc_entry_t *)(argp1);
     result =  ((arg1)->prop_time);
     {
-      char temp[256];
+      char temp[30];
       sprintf(temp, "%" APR_INT64_T_FMT, (apr_int64_t) result);
-      ST(argvi) = sv_newmortal();
-      sv_setpv((SV*)ST(argvi++), temp);
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = sv_2mortal(newSVpv(temp, 0)); argvi++  ;
     }
     
     XSRETURN(argvi);
@@ -14932,10 +13639,9 @@ XS(_wrap_svn_wc_entry_t_cmt_date_get) {
     arg1 = (struct svn_wc_entry_t *)(argp1);
     result =  ((arg1)->cmt_date);
     {
-      char temp[256];
+      char temp[30];
       sprintf(temp, "%" APR_INT64_T_FMT, (apr_int64_t) result);
-      ST(argvi) = sv_newmortal();
-      sv_setpv((SV*)ST(argvi++), temp);
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = sv_2mortal(newSVpv(temp, 0)); argvi++  ;
     }
     
     XSRETURN(argvi);
@@ -15292,10 +13998,9 @@ XS(_wrap_svn_wc_entry_t_lock_creation_date_get) {
     arg1 = (struct svn_wc_entry_t *)(argp1);
     result =  ((arg1)->lock_creation_date);
     {
-      char temp[256];
+      char temp[30];
       sprintf(temp, "%" APR_INT64_T_FMT, (apr_int64_t) result);
-      ST(argvi) = sv_newmortal();
-      sv_setpv((SV*)ST(argvi++), temp);
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = sv_2mortal(newSVpv(temp, 0)); argvi++  ;
     }
     
     XSRETURN(argvi);
@@ -15711,10 +14416,9 @@ XS(_wrap_svn_wc_entry_t_working_size_get) {
     arg1 = (struct svn_wc_entry_t *)(argp1);
     result =  ((arg1)->working_size);
     {
-      char temp[256];
+      char temp[30];
       sprintf(temp, "%" APR_INT64_T_FMT, (apr_int64_t) result);
-      ST(argvi) = sv_newmortal();
-      sv_setpv((SV*)ST(argvi++), temp);
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = sv_2mortal(newSVpv(temp, 0)); argvi++  ;
     }
     
     XSRETURN(argvi);
@@ -16008,6 +14712,7 @@ XS(_wrap_svn_wc_entry_t_file_external_peg_rev_set) {
     void *argp1 = 0 ;
     int res1 = 0 ;
     svn_opt_revision_t rev2 ;
+    apr_pool_t *_global_pool = NULL ;
     int argvi = 0;
     dXSARGS;
     
@@ -16020,7 +14725,11 @@ XS(_wrap_svn_wc_entry_t_file_external_peg_rev_set) {
     }
     arg1 = (struct svn_wc_entry_t *)(argp1);
     {
-      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE, _global_pool);
     }
     if (arg1) (arg1)->file_external_peg_rev = *arg2;
     ST(argvi) = sv_newmortal();
@@ -16070,6 +14779,7 @@ XS(_wrap_svn_wc_entry_t_file_external_rev_set) {
     void *argp1 = 0 ;
     int res1 = 0 ;
     svn_opt_revision_t rev2 ;
+    apr_pool_t *_global_pool = NULL ;
     int argvi = 0;
     dXSARGS;
     
@@ -16082,7 +14792,11 @@ XS(_wrap_svn_wc_entry_t_file_external_rev_set) {
     }
     arg1 = (struct svn_wc_entry_t *)(argp1);
     {
-      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg2 = svn_swig_pl_set_revision(&rev2, ST(1), TRUE, _global_pool);
     }
     if (arg1) (arg1)->file_external_rev = *arg2;
     ST(argvi) = sv_newmortal();
@@ -16202,6 +14916,7 @@ XS(_wrap_svn_wc_entry) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 3) || (items > 4)) {
@@ -16285,6 +15000,7 @@ XS(_wrap_svn_wc_entries_read) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -16356,6 +15072,7 @@ XS(_wrap_svn_wc_entry_dup) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_wc_entry_dup(entry,pool);");
@@ -16846,10 +15563,9 @@ XS(_wrap_svn_wc_info_t_recorded_size_get) {
     arg1 = (struct svn_wc_info_t *)(argp1);
     result =  ((arg1)->recorded_size);
     {
-      char temp[256];
+      char temp[30];
       sprintf(temp, "%" APR_INT64_T_FMT, (apr_int64_t) result);
-      ST(argvi) = sv_newmortal();
-      sv_setpv((SV*)ST(argvi++), temp);
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = sv_2mortal(newSVpv(temp, 0)); argvi++  ;
     }
     
     XSRETURN(argvi);
@@ -16916,10 +15632,9 @@ XS(_wrap_svn_wc_info_t_recorded_time_get) {
     arg1 = (struct svn_wc_info_t *)(argp1);
     result =  ((arg1)->recorded_time);
     {
-      char temp[256];
+      char temp[30];
       sprintf(temp, "%" APR_INT64_T_FMT, (apr_int64_t) result);
-      ST(argvi) = sv_newmortal();
-      sv_setpv((SV*)ST(argvi++), temp);
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = sv_2mortal(newSVpv(temp, 0)); argvi++  ;
     }
     
     XSRETURN(argvi);
@@ -17282,6 +15997,7 @@ XS(_wrap_svn_wc_info_dup) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_wc_info_dup(info,pool);");
@@ -17338,6 +16054,7 @@ XS(_wrap_svn_wc_conflicted_p3) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
@@ -17443,6 +16160,7 @@ XS(_wrap_svn_wc_conflicted_p2) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
@@ -17545,6 +16263,7 @@ XS(_wrap_svn_wc_conflicted_p) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
@@ -17637,6 +16356,7 @@ XS(_wrap_svn_wc_get_ancestry) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
@@ -18034,15 +16754,15 @@ XS(_wrap_svn_wc_walk_entries3) {
     int ecode5 = 0 ;
     int val6 ;
     int ecode6 = 0 ;
-    int res8 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
     dXSARGS;
     
     {
       _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 8) || (items > 9)) {
+    if ((items < 7) || (items > 8)) {
       SWIG_croak("Usage: svn_wc_walk_entries3(path,adm_access,walk_callbacks,walk_baton,depth,show_hidden,cancel_func,cancel_baton,pool);");
     }
     res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1);
@@ -18075,16 +16795,10 @@ XS(_wrap_svn_wc_walk_entries3) {
     } 
     arg6 = (svn_boolean_t)(val6);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(6), (void**)(&arg7), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_walk_entries3" "', argument " "7"" of type '" "svn_cancel_func_t""'"); 
-      }
+      arg7 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg8 = ST(6);
     }
-    res8 = SWIG_ConvertPtr(ST(7),SWIG_as_voidptrptr(&arg8), 0, 0);
-    if (!SWIG_IsOK(res8)) {
-      SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "svn_wc_walk_entries3" "', argument " "8"" of type '" "void *""'"); 
-    }
-    if (items > 8) {
+    if (items > 7) {
       
     }
     {
@@ -18116,8 +16830,6 @@ XS(_wrap_svn_wc_walk_entries3) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
@@ -18127,8 +16839,6 @@ XS(_wrap_svn_wc_walk_entries3) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -18155,15 +16865,15 @@ XS(_wrap_svn_wc_walk_entries2) {
     int res4 ;
     int val5 ;
     int ecode5 = 0 ;
-    int res7 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
     dXSARGS;
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 7) || (items > 8)) {
+    if ((items < 6) || (items > 7)) {
       SWIG_croak("Usage: svn_wc_walk_entries2(path,adm_access,walk_callbacks,walk_baton,show_hidden,cancel_func,cancel_baton,pool);");
     }
     res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1);
@@ -18191,16 +16901,10 @@ XS(_wrap_svn_wc_walk_entries2) {
     } 
     arg5 = (svn_boolean_t)(val5);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(5), (void**)(&arg6), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_walk_entries2" "', argument " "6"" of type '" "svn_cancel_func_t""'"); 
-      }
+      arg6 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg7 = ST(5);
     }
-    res7 = SWIG_ConvertPtr(ST(6),SWIG_as_voidptrptr(&arg7), 0, 0);
-    if (!SWIG_IsOK(res7)) {
-      SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "svn_wc_walk_entries2" "', argument " "7"" of type '" "void *""'"); 
-    }
-    if (items > 7) {
+    if (items > 6) {
       
     }
     {
@@ -18231,8 +16935,6 @@ XS(_wrap_svn_wc_walk_entries2) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
@@ -18241,8 +16943,6 @@ XS(_wrap_svn_wc_walk_entries2) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -18273,6 +16973,7 @@ XS(_wrap_svn_wc_walk_entries) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 5) || (items > 6)) {
       SWIG_croak("Usage: svn_wc_walk_entries(path,adm_access,walk_callbacks,walk_baton,show_hidden,pool);");
@@ -18362,6 +17063,7 @@ XS(_wrap_svn_wc_mark_missing_deleted) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_wc_mark_missing_deleted(path,parent,pool);");
@@ -18449,6 +17151,7 @@ XS(_wrap_svn_wc_ensure_adm4) {
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 7) || (items > 8)) {
       SWIG_croak("Usage: svn_wc_ensure_adm4(wc_ctx,local_abspath,url,repos_root_url,repos_uuid,revision,depth,scratch_pool);");
@@ -18568,6 +17271,7 @@ XS(_wrap_svn_wc_ensure_adm3) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 6) || (items > 7)) {
       SWIG_croak("Usage: svn_wc_ensure_adm3(path,uuid,url,repos,revision,depth,pool);");
@@ -18677,6 +17381,7 @@ XS(_wrap_svn_wc_ensure_adm2) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 5) || (items > 6)) {
       SWIG_croak("Usage: svn_wc_ensure_adm2(path,uuid,url,repos,revision,pool);");
@@ -18775,6 +17480,7 @@ XS(_wrap_svn_wc_ensure_adm) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_wc_ensure_adm(path,uuid,url,revision,pool);");
@@ -18862,6 +17568,7 @@ XS(_wrap_svn_wc_maybe_set_repos_root) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_wc_maybe_set_repos_root(adm_access,path,repos,pool);");
@@ -19107,10 +17814,9 @@ XS(_wrap_svn_wc_status3_t_filesize_get) {
     arg1 = (struct svn_wc_status3_t *)(argp1);
     result =  ((arg1)->filesize);
     {
-      char temp[256];
+      char temp[30];
       sprintf(temp, "%" APR_INT64_T_FMT, (apr_int64_t) result);
-      ST(argvi) = sv_newmortal();
-      sv_setpv((SV*)ST(argvi++), temp);
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = sv_2mortal(newSVpv(temp, 0)); argvi++  ;
     }
     
     XSRETURN(argvi);
@@ -19697,10 +18403,9 @@ XS(_wrap_svn_wc_status3_t_changed_date_get) {
     arg1 = (struct svn_wc_status3_t *)(argp1);
     result =  ((arg1)->changed_date);
     {
-      char temp[256];
+      char temp[30];
       sprintf(temp, "%" APR_INT64_T_FMT, (apr_int64_t) result);
-      ST(argvi) = sv_newmortal();
-      sv_setpv((SV*)ST(argvi++), temp);
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = sv_2mortal(newSVpv(temp, 0)); argvi++  ;
     }
     
     XSRETURN(argvi);
@@ -20717,10 +19422,9 @@ XS(_wrap_svn_wc_status3_t_ood_changed_date_get) {
     arg1 = (struct svn_wc_status3_t *)(argp1);
     result =  ((arg1)->ood_changed_date);
     {
-      char temp[256];
+      char temp[30];
       sprintf(temp, "%" APR_INT64_T_FMT, (apr_int64_t) result);
-      ST(argvi) = sv_newmortal();
-      sv_setpv((SV*)ST(argvi++), temp);
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = sv_2mortal(newSVpv(temp, 0)); argvi++  ;
     }
     
     XSRETURN(argvi);
@@ -21015,6 +19719,71 @@ XS(_wrap_svn_wc_status3_t_file_external_get) {
 }
 
 
+XS(_wrap_svn_wc_status3_t_actual_kind_set) {
+  {
+    struct svn_wc_status3_t *arg1 = (struct svn_wc_status3_t *) 0 ;
+    svn_node_kind_t arg2 ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    int val2 ;
+    int ecode2 = 0 ;
+    int argvi = 0;
+    dXSARGS;
+    
+    if ((items < 2) || (items > 2)) {
+      SWIG_croak("Usage: svn_wc_status3_t_actual_kind_set(self,actual_kind);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_status3_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_wc_status3_t_actual_kind_set" "', argument " "1"" of type '" "struct svn_wc_status3_t *""'"); 
+    }
+    arg1 = (struct svn_wc_status3_t *)(argp1);
+    ecode2 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(1), &val2);
+    if (!SWIG_IsOK(ecode2)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "svn_wc_status3_t_actual_kind_set" "', argument " "2"" of type '" "svn_node_kind_t""'");
+    } 
+    arg2 = (svn_node_kind_t)(val2);
+    if (arg1) (arg1)->actual_kind = arg2;
+    ST(argvi) = sv_newmortal();
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_svn_wc_status3_t_actual_kind_get) {
+  {
+    struct svn_wc_status3_t *arg1 = (struct svn_wc_status3_t *) 0 ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    int argvi = 0;
+    svn_node_kind_t result;
+    dXSARGS;
+    
+    if ((items < 1) || (items > 1)) {
+      SWIG_croak("Usage: svn_wc_status3_t_actual_kind_get(self);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_status3_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_wc_status3_t_actual_kind_get" "', argument " "1"" of type '" "struct svn_wc_status3_t *""'"); 
+    }
+    arg1 = (struct svn_wc_status3_t *)(argp1);
+    result = (svn_node_kind_t) ((arg1)->actual_kind);
+    ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(result)); argvi++ ;
+    
+    XSRETURN(argvi);
+  fail:
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_new_svn_wc_status3_t) {
   {
     int argvi = 0;
@@ -21849,10 +20618,9 @@ XS(_wrap_svn_wc_status2_t_ood_last_cmt_date_get) {
     arg1 = (struct svn_wc_status2_t *)(argp1);
     result =  ((arg1)->ood_last_cmt_date);
     {
-      char temp[256];
+      char temp[30];
       sprintf(temp, "%" APR_INT64_T_FMT, (apr_int64_t) result);
-      ST(argvi) = sv_newmortal();
-      sv_setpv((SV*)ST(argvi++), temp);
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = sv_2mortal(newSVpv(temp, 0)); argvi++  ;
     }
     
     XSRETURN(argvi);
@@ -22904,6 +21672,7 @@ XS(_wrap_svn_wc_dup_status3) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_wc_dup_status3(orig_stat,pool);");
@@ -22947,6 +21716,7 @@ XS(_wrap_svn_wc_dup_status2) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_wc_dup_status2(orig_stat,pool);");
@@ -22990,6 +21760,7 @@ XS(_wrap_svn_wc_dup_status) {
     
     {
       _global_pool = arg2 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 1) || (items > 2)) {
       SWIG_croak("Usage: svn_wc_dup_status(orig_stat,pool);");
@@ -23040,9 +21811,11 @@ XS(_wrap_svn_wc_status3) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 4)) {
@@ -23131,6 +21904,7 @@ XS(_wrap_svn_wc_status2) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -23208,6 +21982,7 @@ XS(_wrap_svn_wc_status) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -23297,15 +22072,15 @@ XS(_wrap_svn_wc_walk_status) {
     void *argp7 = 0 ;
     int res7 = 0 ;
     int res9 ;
-    int res11 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
     dXSARGS;
     
     {
       _global_pool = arg12 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 11) || (items > 12)) {
+    if ((items < 10) || (items > 11)) {
       SWIG_croak("Usage: svn_wc_walk_status(wc_ctx,local_abspath,depth,get_all,no_ignore,ignore_text_mods,ignore_patterns,status_func,status_baton,cancel_func,cancel_baton,scratch_pool);");
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_context_t, 0 |  0 );
@@ -23354,16 +22129,10 @@ XS(_wrap_svn_wc_walk_status) {
       SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "svn_wc_walk_status" "', argument " "9"" of type '" "void *""'"); 
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(9), (void**)(&arg10), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_walk_status" "', argument " "10"" of type '" "svn_cancel_func_t""'"); 
-      }
+      arg10 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg11 = ST(9);
     }
-    res11 = SWIG_ConvertPtr(ST(10),SWIG_as_voidptrptr(&arg11), 0, 0);
-    if (!SWIG_IsOK(res11)) {
-      SWIG_exception_fail(SWIG_ArgError(res11), "in method '" "svn_wc_walk_status" "', argument " "11"" of type '" "void *""'"); 
-    }
-    if (items > 11) {
+    if (items > 10) {
       
     }
     {
@@ -23398,8 +22167,6 @@ XS(_wrap_svn_wc_walk_status) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
@@ -23412,8 +22179,6 @@ XS(_wrap_svn_wc_walk_status) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -23467,22 +22232,23 @@ XS(_wrap_svn_wc_get_status_editor5) {
     void *argp13 = 0 ;
     int res13 = 0 ;
     int res15 ;
-    int res17 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
     dXSARGS;
     
     {
       _global_pool = arg18 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg19 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
     arg3 = &temp3;
     arg4 = &temp4;
-    if ((items < 13) || (items > 15)) {
+    if ((items < 12) || (items > 14)) {
       SWIG_croak("Usage: svn_wc_get_status_editor5(wc_ctx,anchor_abspath,target_basename,depth,get_all,no_ignore,depth_as_sticky,server_performs_filtering,ignore_patterns,status_func,status_baton,cancel_func,cancel_baton,result_pool,scratch_pool);");
     }
     res5 = SWIG_ConvertPtr(ST(0), &argp5,SWIGTYPE_p_svn_wc_context_t, 0 |  0 );
@@ -23541,19 +22307,13 @@ XS(_wrap_svn_wc_get_status_editor5) {
       SWIG_exception_fail(SWIG_ArgError(res15), "in method '" "svn_wc_get_status_editor5" "', argument " "15"" of type '" "void *""'"); 
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(11), (void**)(&arg16), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_get_status_editor5" "', argument " "16"" of type '" "svn_cancel_func_t""'"); 
-      }
-    }
-    res17 = SWIG_ConvertPtr(ST(12),SWIG_as_voidptrptr(&arg17), 0, 0);
-    if (!SWIG_IsOK(res17)) {
-      SWIG_exception_fail(SWIG_ArgError(res17), "in method '" "svn_wc_get_status_editor5" "', argument " "17"" of type '" "void *""'"); 
+      arg16 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg17 = ST(11);
     }
-    if (items > 13) {
+    if (items > 12) {
       
     }
-    if (items > 14) {
+    if (items > 13) {
       
     }
     {
@@ -23610,8 +22370,6 @@ XS(_wrap_svn_wc_get_status_editor5) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
@@ -23631,8 +22389,6 @@ XS(_wrap_svn_wc_get_status_editor5) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -23675,7 +22431,6 @@ XS(_wrap_svn_wc_get_status_editor4) {
     int ecode9 = 0 ;
     void *argp10 = 0 ;
     int res10 = 0 ;
-    int res14 ;
     void *argp15 = 0 ;
     int res15 = 0 ;
     int argvi = 0;
@@ -23684,12 +22439,13 @@ XS(_wrap_svn_wc_get_status_editor4) {
     
     {
       _global_pool = arg16 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
     arg3 = &temp3;
     arg4 = &temp4;
-    if ((items < 10) || (items > 11)) {
+    if ((items < 9) || (items > 10)) {
       SWIG_croak("Usage: svn_wc_get_status_editor4(anchor,target,depth,get_all,no_ignore,ignore_patterns,status_func,status_baton,cancel_func,cancel_baton,traversal_info,pool);");
     }
     res5 = SWIG_ConvertPtr(ST(0), &argp5,SWIGTYPE_p_svn_wc_adm_access_t, 0 |  0 );
@@ -23723,25 +22479,19 @@ XS(_wrap_svn_wc_get_status_editor4) {
     }
     arg10 = (apr_array_header_t *)(argp10);
     {
-      arg11 = svn_swig_pl_status_func3;
+      arg11 = (svn_wc_status_func3_t) svn_swig_pl_status_func3;
       arg12 = ST(6);
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(7), (void**)(&arg13), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_get_status_editor4" "', argument " "13"" of type '" "svn_cancel_func_t""'"); 
-      }
-    }
-    res14 = SWIG_ConvertPtr(ST(8),SWIG_as_voidptrptr(&arg14), 0, 0);
-    if (!SWIG_IsOK(res14)) {
-      SWIG_exception_fail(SWIG_ArgError(res14), "in method '" "svn_wc_get_status_editor4" "', argument " "14"" of type '" "void *""'"); 
+      arg13 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg14 = ST(7);
     }
-    res15 = SWIG_ConvertPtr(ST(9), &argp15,SWIGTYPE_p_svn_wc_traversal_info_t, 0 |  0 );
+    res15 = SWIG_ConvertPtr(ST(8), &argp15,SWIGTYPE_p_svn_wc_traversal_info_t, 0 |  0 );
     if (!SWIG_IsOK(res15)) {
       SWIG_exception_fail(SWIG_ArgError(res15), "in method '" "svn_wc_get_status_editor4" "', argument " "15"" of type '" "svn_wc_traversal_info_t *""'"); 
     }
     arg15 = (svn_wc_traversal_info_t *)(argp15);
-    if (items > 10) {
+    if (items > 9) {
       
     }
     {
@@ -23793,8 +22543,6 @@ XS(_wrap_svn_wc_get_status_editor4) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
@@ -23809,8 +22557,6 @@ XS(_wrap_svn_wc_get_status_editor4) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -23853,7 +22599,6 @@ XS(_wrap_svn_wc_get_status_editor3) {
     int ecode9 = 0 ;
     void *argp10 = 0 ;
     int res10 = 0 ;
-    int res14 ;
     void *argp15 = 0 ;
     int res15 = 0 ;
     int argvi = 0;
@@ -23862,12 +22607,13 @@ XS(_wrap_svn_wc_get_status_editor3) {
     
     {
       _global_pool = arg16 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
     arg3 = &temp3;
     arg4 = &temp4;
-    if ((items < 10) || (items > 11)) {
+    if ((items < 9) || (items > 10)) {
       SWIG_croak("Usage: svn_wc_get_status_editor3(anchor,target,depth,get_all,no_ignore,ignore_patterns,status_func,status_baton,cancel_func,cancel_baton,traversal_info,pool);");
     }
     res5 = SWIG_ConvertPtr(ST(0), &argp5,SWIGTYPE_p_svn_wc_adm_access_t, 0 |  0 );
@@ -23901,25 +22647,19 @@ XS(_wrap_svn_wc_get_status_editor3) {
     }
     arg10 = (apr_array_header_t *)(argp10);
     {
-      arg11 = svn_swig_pl_status_func2;
+      arg11 = (svn_wc_status_func2_t) svn_swig_pl_status_func2;
       arg12 = ST(6);
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(7), (void**)(&arg13), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_get_status_editor3" "', argument " "13"" of type '" "svn_cancel_func_t""'"); 
-      }
-    }
-    res14 = SWIG_ConvertPtr(ST(8),SWIG_as_voidptrptr(&arg14), 0, 0);
-    if (!SWIG_IsOK(res14)) {
-      SWIG_exception_fail(SWIG_ArgError(res14), "in method '" "svn_wc_get_status_editor3" "', argument " "14"" of type '" "void *""'"); 
+      arg13 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg14 = ST(7);
     }
-    res15 = SWIG_ConvertPtr(ST(9), &argp15,SWIGTYPE_p_svn_wc_traversal_info_t, 0 |  0 );
+    res15 = SWIG_ConvertPtr(ST(8), &argp15,SWIGTYPE_p_svn_wc_traversal_info_t, 0 |  0 );
     if (!SWIG_IsOK(res15)) {
       SWIG_exception_fail(SWIG_ArgError(res15), "in method '" "svn_wc_get_status_editor3" "', argument " "15"" of type '" "svn_wc_traversal_info_t *""'"); 
     }
     arg15 = (svn_wc_traversal_info_t *)(argp15);
-    if (items > 10) {
+    if (items > 9) {
       
     }
     {
@@ -23971,8 +22711,6 @@ XS(_wrap_svn_wc_get_status_editor3) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
@@ -23987,8 +22725,6 @@ XS(_wrap_svn_wc_get_status_editor3) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -24029,7 +22765,6 @@ XS(_wrap_svn_wc_get_status_editor2) {
     int ecode9 = 0 ;
     int val10 ;
     int ecode10 = 0 ;
-    int res14 ;
     void *argp15 = 0 ;
     int res15 = 0 ;
     int argvi = 0;
@@ -24038,12 +22773,13 @@ XS(_wrap_svn_wc_get_status_editor2) {
     
     {
       _global_pool = arg16 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
     arg3 = &temp3;
     arg4 = &temp4;
-    if ((items < 10) || (items > 11)) {
+    if ((items < 9) || (items > 10)) {
       SWIG_croak("Usage: svn_wc_get_status_editor2(anchor,target,config,recurse,get_all,no_ignore,status_func,status_baton,cancel_func,cancel_baton,traversal_info,pool);");
     }
     res5 = SWIG_ConvertPtr(ST(0), &argp5,SWIGTYPE_p_svn_wc_adm_access_t, 0 |  0 );
@@ -24076,25 +22812,19 @@ XS(_wrap_svn_wc_get_status_editor2) {
     } 
     arg10 = (svn_boolean_t)(val10);
     {
-      arg11 = svn_swig_pl_status_func2;
+      arg11 = (svn_wc_status_func2_t) svn_swig_pl_status_func2;
       arg12 = ST(6);
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(7), (void**)(&arg13), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_get_status_editor2" "', argument " "13"" of type '" "svn_cancel_func_t""'"); 
-      }
+      arg13 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg14 = ST(7);
     }
-    res14 = SWIG_ConvertPtr(ST(8),SWIG_as_voidptrptr(&arg14), 0, 0);
-    if (!SWIG_IsOK(res14)) {
-      SWIG_exception_fail(SWIG_ArgError(res14), "in method '" "svn_wc_get_status_editor2" "', argument " "14"" of type '" "void *""'"); 
-    }
-    res15 = SWIG_ConvertPtr(ST(9), &argp15,SWIGTYPE_p_svn_wc_traversal_info_t, 0 |  0 );
+    res15 = SWIG_ConvertPtr(ST(8), &argp15,SWIGTYPE_p_svn_wc_traversal_info_t, 0 |  0 );
     if (!SWIG_IsOK(res15)) {
       SWIG_exception_fail(SWIG_ArgError(res15), "in method '" "svn_wc_get_status_editor2" "', argument " "15"" of type '" "svn_wc_traversal_info_t *""'"); 
     }
     arg15 = (svn_wc_traversal_info_t *)(argp15);
-    if (items > 10) {
+    if (items > 9) {
       
     }
     {
@@ -24146,8 +22876,6 @@ XS(_wrap_svn_wc_get_status_editor2) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
@@ -24162,8 +22890,6 @@ XS(_wrap_svn_wc_get_status_editor2) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -24202,7 +22928,6 @@ XS(_wrap_svn_wc_get_status_editor) {
     int ecode8 = 0 ;
     int val9 ;
     int ecode9 = 0 ;
-    int res13 ;
     void *argp14 = 0 ;
     int res14 = 0 ;
     int argvi = 0;
@@ -24211,11 +22936,12 @@ XS(_wrap_svn_wc_get_status_editor) {
     
     {
       _global_pool = arg15 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
     arg3 = &temp3;
-    if ((items < 10) || (items > 11)) {
+    if ((items < 9) || (items > 10)) {
       SWIG_croak("Usage: svn_wc_get_status_editor(anchor,target,config,recurse,get_all,no_ignore,status_func,status_baton,cancel_func,cancel_baton,traversal_info,pool);");
     }
     res4 = SWIG_ConvertPtr(ST(0), &argp4,SWIGTYPE_p_svn_wc_adm_access_t, 0 |  0 );
@@ -24248,25 +22974,19 @@ XS(_wrap_svn_wc_get_status_editor) {
     } 
     arg9 = (svn_boolean_t)(val9);
     {
-      arg10 = svn_swig_pl_status_func;
+      arg10 = (svn_wc_status_func_t) svn_swig_pl_status_func;
       arg11 = ST(6);
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(7), (void**)(&arg12), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_get_status_editor" "', argument " "12"" of type '" "svn_cancel_func_t""'"); 
-      }
-    }
-    res13 = SWIG_ConvertPtr(ST(8),SWIG_as_voidptrptr(&arg13), 0, 0);
-    if (!SWIG_IsOK(res13)) {
-      SWIG_exception_fail(SWIG_ArgError(res13), "in method '" "svn_wc_get_status_editor" "', argument " "13"" of type '" "void *""'"); 
+      arg12 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg13 = ST(7);
     }
-    res14 = SWIG_ConvertPtr(ST(9), &argp14,SWIGTYPE_p_svn_wc_traversal_info_t, 0 |  0 );
+    res14 = SWIG_ConvertPtr(ST(8), &argp14,SWIGTYPE_p_svn_wc_traversal_info_t, 0 |  0 );
     if (!SWIG_IsOK(res14)) {
       SWIG_exception_fail(SWIG_ArgError(res14), "in method '" "svn_wc_get_status_editor" "', argument " "14"" of type '" "svn_wc_traversal_info_t *""'"); 
     }
     arg14 = (svn_wc_traversal_info_t *)(argp14);
-    if (items > 10) {
+    if (items > 9) {
       
     }
     {
@@ -24314,8 +23034,6 @@ XS(_wrap_svn_wc_get_status_editor) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
@@ -24329,8 +23047,6 @@ XS(_wrap_svn_wc_get_status_editor) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -24355,6 +23071,7 @@ XS(_wrap_svn_wc_status_set_repos_locks) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_wc_status_set_repos_locks(set_locks_baton,locks,repos_root,pool);");
@@ -24435,7 +23152,6 @@ XS(_wrap_svn_wc_copy3) {
     int alloc3 = 0 ;
     int val4 ;
     int ecode4 = 0 ;
-    int res6 ;
     int res8 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
@@ -24443,8 +23159,9 @@ XS(_wrap_svn_wc_copy3) {
     
     {
       _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 8) || (items > 9)) {
+    if ((items < 7) || (items > 8)) {
       SWIG_croak("Usage: svn_wc_copy3(wc_ctx,src_abspath,dst_abspath,metadata_only,cancel_func,cancel_baton,notify_func,notify_baton,scratch_pool);");
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_context_t, 0 |  0 );
@@ -24468,26 +23185,20 @@ XS(_wrap_svn_wc_copy3) {
     } 
     arg4 = (svn_boolean_t)(val4);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(4), (void**)(&arg5), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_copy3" "', argument " "5"" of type '" "svn_cancel_func_t""'"); 
-      }
-    }
-    res6 = SWIG_ConvertPtr(ST(5),SWIG_as_voidptrptr(&arg6), 0, 0);
-    if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "svn_wc_copy3" "', argument " "6"" of type '" "void *""'"); 
+      arg5 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg6 = ST(4);
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(6), (void**)(&arg7), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void);
+      int res = SWIG_ConvertFunctionPtr(ST(5), (void**)(&arg7), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void);
       if (!SWIG_IsOK(res)) {
         SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_copy3" "', argument " "7"" of type '" "svn_wc_notify_func2_t""'"); 
       }
     }
-    res8 = SWIG_ConvertPtr(ST(7),SWIG_as_voidptrptr(&arg8), 0, 0);
+    res8 = SWIG_ConvertPtr(ST(6),SWIG_as_voidptrptr(&arg8), 0, 0);
     if (!SWIG_IsOK(res8)) {
       SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "svn_wc_copy3" "', argument " "8"" of type '" "void *""'"); 
     }
-    if (items > 8) {
+    if (items > 7) {
       
     }
     {
@@ -24519,8 +23230,6 @@ XS(_wrap_svn_wc_copy3) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
@@ -24530,8 +23239,6 @@ XS(_wrap_svn_wc_copy3) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -24556,7 +23263,6 @@ XS(_wrap_svn_wc_copy2) {
     int res3 ;
     char *buf3 = 0 ;
     int alloc3 = 0 ;
-    int res5 ;
     int res7 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
@@ -24564,8 +23270,9 @@ XS(_wrap_svn_wc_copy2) {
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 7) || (items > 8)) {
+    if ((items < 6) || (items > 7)) {
       SWIG_croak("Usage: svn_wc_copy2(src,dst_parent,dst_basename,cancel_func,cancel_baton,notify_func,notify_baton,pool);");
     }
     res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1);
@@ -24584,26 +23291,20 @@ XS(_wrap_svn_wc_copy2) {
     }
     arg3 = (char *)(buf3);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(3), (void**)(&arg4), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_copy2" "', argument " "4"" of type '" "svn_cancel_func_t""'"); 
-      }
-    }
-    res5 = SWIG_ConvertPtr(ST(4),SWIG_as_voidptrptr(&arg5), 0, 0);
-    if (!SWIG_IsOK(res5)) {
-      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "svn_wc_copy2" "', argument " "5"" of type '" "void *""'"); 
+      arg4 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg5 = ST(3);
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(5), (void**)(&arg6), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void);
+      int res = SWIG_ConvertFunctionPtr(ST(4), (void**)(&arg6), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void);
       if (!SWIG_IsOK(res)) {
         SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_copy2" "', argument " "6"" of type '" "svn_wc_notify_func2_t""'"); 
       }
     }
-    res7 = SWIG_ConvertPtr(ST(6),SWIG_as_voidptrptr(&arg7), 0, 0);
+    res7 = SWIG_ConvertPtr(ST(5),SWIG_as_voidptrptr(&arg7), 0, 0);
     if (!SWIG_IsOK(res7)) {
       SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "svn_wc_copy2" "', argument " "7"" of type '" "void *""'"); 
     }
-    if (items > 7) {
+    if (items > 6) {
       
     }
     {
@@ -24634,8 +23335,6 @@ XS(_wrap_svn_wc_copy2) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
@@ -24644,8 +23343,6 @@ XS(_wrap_svn_wc_copy2) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -24670,7 +23367,6 @@ XS(_wrap_svn_wc_copy) {
     int res3 ;
     char *buf3 = 0 ;
     int alloc3 = 0 ;
-    int res5 ;
     int res7 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
@@ -24678,8 +23374,9 @@ XS(_wrap_svn_wc_copy) {
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 7) || (items > 8)) {
+    if ((items < 6) || (items > 7)) {
       SWIG_croak("Usage: svn_wc_copy(src,dst_parent,dst_basename,cancel_func,cancel_baton,notify_func,notify_baton,pool);");
     }
     res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1);
@@ -24698,26 +23395,20 @@ XS(_wrap_svn_wc_copy) {
     }
     arg3 = (char *)(buf3);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(3), (void**)(&arg4), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_copy" "', argument " "4"" of type '" "svn_cancel_func_t""'"); 
-      }
-    }
-    res5 = SWIG_ConvertPtr(ST(4),SWIG_as_voidptrptr(&arg5), 0, 0);
-    if (!SWIG_IsOK(res5)) {
-      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "svn_wc_copy" "', argument " "5"" of type '" "void *""'"); 
+      arg4 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg5 = ST(3);
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(5), (void**)(&arg6), SWIGTYPE_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void);
+      int res = SWIG_ConvertFunctionPtr(ST(4), (void**)(&arg6), SWIGTYPE_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void);
       if (!SWIG_IsOK(res)) {
         SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_copy" "', argument " "6"" of type '" "svn_wc_notify_func_t""'"); 
       }
     }
-    res7 = SWIG_ConvertPtr(ST(6),SWIG_as_voidptrptr(&arg7), 0, 0);
+    res7 = SWIG_ConvertPtr(ST(5),SWIG_as_voidptrptr(&arg7), 0, 0);
     if (!SWIG_IsOK(res7)) {
       SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "svn_wc_copy" "', argument " "7"" of type '" "void *""'"); 
     }
-    if (items > 7) {
+    if (items > 6) {
       
     }
     {
@@ -24748,8 +23439,6 @@ XS(_wrap_svn_wc_copy) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
@@ -24758,8 +23447,6 @@ XS(_wrap_svn_wc_copy) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -24787,7 +23474,6 @@ XS(_wrap_svn_wc_move) {
     int alloc3 = 0 ;
     int val4 ;
     int ecode4 = 0 ;
-    int res6 ;
     int res8 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
@@ -24795,8 +23481,9 @@ XS(_wrap_svn_wc_move) {
     
     {
       _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 8) || (items > 9)) {
+    if ((items < 7) || (items > 8)) {
       SWIG_croak("Usage: svn_wc_move(wc_ctx,src_abspath,dst_abspath,metadata_only,cancel_func,cancel_baton,notify_func,notify_baton,scratch_pool);");
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_context_t, 0 |  0 );
@@ -24820,26 +23507,20 @@ XS(_wrap_svn_wc_move) {
     } 
     arg4 = (svn_boolean_t)(val4);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(4), (void**)(&arg5), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_move" "', argument " "5"" of type '" "svn_cancel_func_t""'"); 
-      }
-    }
-    res6 = SWIG_ConvertPtr(ST(5),SWIG_as_voidptrptr(&arg6), 0, 0);
-    if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "svn_wc_move" "', argument " "6"" of type '" "void *""'"); 
+      arg5 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg6 = ST(4);
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(6), (void**)(&arg7), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void);
+      int res = SWIG_ConvertFunctionPtr(ST(5), (void**)(&arg7), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void);
       if (!SWIG_IsOK(res)) {
         SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_move" "', argument " "7"" of type '" "svn_wc_notify_func2_t""'"); 
       }
     }
-    res8 = SWIG_ConvertPtr(ST(7),SWIG_as_voidptrptr(&arg8), 0, 0);
+    res8 = SWIG_ConvertPtr(ST(6),SWIG_as_voidptrptr(&arg8), 0, 0);
     if (!SWIG_IsOK(res8)) {
       SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "svn_wc_move" "', argument " "8"" of type '" "void *""'"); 
     }
-    if (items > 8) {
+    if (items > 7) {
       
     }
     {
@@ -24871,8 +23552,6 @@ XS(_wrap_svn_wc_move) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
@@ -24882,8 +23561,6 @@ XS(_wrap_svn_wc_move) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -24910,7 +23587,6 @@ XS(_wrap_svn_wc_delete4) {
     int ecode3 = 0 ;
     int val4 ;
     int ecode4 = 0 ;
-    int res6 ;
     int res8 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
@@ -24918,8 +23594,9 @@ XS(_wrap_svn_wc_delete4) {
     
     {
       _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 8) || (items > 9)) {
+    if ((items < 7) || (items > 8)) {
       SWIG_croak("Usage: svn_wc_delete4(wc_ctx,local_abspath,keep_local,delete_unversioned_target,cancel_func,cancel_baton,notify_func,notify_baton,scratch_pool);");
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_context_t, 0 |  0 );
@@ -24943,26 +23620,20 @@ XS(_wrap_svn_wc_delete4) {
     } 
     arg4 = (svn_boolean_t)(val4);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(4), (void**)(&arg5), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_delete4" "', argument " "5"" of type '" "svn_cancel_func_t""'"); 
-      }
-    }
-    res6 = SWIG_ConvertPtr(ST(5),SWIG_as_voidptrptr(&arg6), 0, 0);
-    if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "svn_wc_delete4" "', argument " "6"" of type '" "void *""'"); 
+      arg5 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg6 = ST(4);
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(6), (void**)(&arg7), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void);
+      int res = SWIG_ConvertFunctionPtr(ST(5), (void**)(&arg7), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void);
       if (!SWIG_IsOK(res)) {
         SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_delete4" "', argument " "7"" of type '" "svn_wc_notify_func2_t""'"); 
       }
     }
-    res8 = SWIG_ConvertPtr(ST(7),SWIG_as_voidptrptr(&arg8), 0, 0);
+    res8 = SWIG_ConvertPtr(ST(6),SWIG_as_voidptrptr(&arg8), 0, 0);
     if (!SWIG_IsOK(res8)) {
       SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "svn_wc_delete4" "', argument " "8"" of type '" "void *""'"); 
     }
-    if (items > 8) {
+    if (items > 7) {
       
     }
     {
@@ -24994,8 +23665,6 @@ XS(_wrap_svn_wc_delete4) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
@@ -25005,8 +23674,6 @@ XS(_wrap_svn_wc_delete4) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -25028,7 +23695,6 @@ XS(_wrap_svn_wc_delete3) {
     int alloc1 = 0 ;
     void *argp2 = 0 ;
     int res2 = 0 ;
-    int res4 ;
     int res6 ;
     int val7 ;
     int ecode7 = 0 ;
@@ -25038,8 +23704,9 @@ XS(_wrap_svn_wc_delete3) {
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 7) || (items > 8)) {
+    if ((items < 6) || (items > 7)) {
       SWIG_croak("Usage: svn_wc_delete3(path,adm_access,cancel_func,cancel_baton,notify_func,notify_baton,keep_local,pool);");
     }
     res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1);
@@ -25053,31 +23720,25 @@ XS(_wrap_svn_wc_delete3) {
     }
     arg2 = (svn_wc_adm_access_t *)(argp2);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(2), (void**)(&arg3), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_delete3" "', argument " "3"" of type '" "svn_cancel_func_t""'"); 
-      }
-    }
-    res4 = SWIG_ConvertPtr(ST(3),SWIG_as_voidptrptr(&arg4), 0, 0);
-    if (!SWIG_IsOK(res4)) {
-      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "svn_wc_delete3" "', argument " "4"" of type '" "void *""'"); 
+      arg3 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg4 = ST(2);
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(4), (void**)(&arg5), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void);
+      int res = SWIG_ConvertFunctionPtr(ST(3), (void**)(&arg5), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void);
       if (!SWIG_IsOK(res)) {
         SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_delete3" "', argument " "5"" of type '" "svn_wc_notify_func2_t""'"); 
       }
     }
-    res6 = SWIG_ConvertPtr(ST(5),SWIG_as_voidptrptr(&arg6), 0, 0);
+    res6 = SWIG_ConvertPtr(ST(4),SWIG_as_voidptrptr(&arg6), 0, 0);
     if (!SWIG_IsOK(res6)) {
       SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "svn_wc_delete3" "', argument " "6"" of type '" "void *""'"); 
     }
-    ecode7 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(6), &val7);
+    ecode7 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(5), &val7);
     if (!SWIG_IsOK(ecode7)) {
       SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "svn_wc_delete3" "', argument " "7"" of type '" "svn_boolean_t""'");
     } 
     arg7 = (svn_boolean_t)(val7);
-    if (items > 7) {
+    if (items > 6) {
       
     }
     {
@@ -25108,8 +23769,6 @@ XS(_wrap_svn_wc_delete3) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
@@ -25118,8 +23777,6 @@ XS(_wrap_svn_wc_delete3) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -25140,7 +23797,6 @@ XS(_wrap_svn_wc_delete2) {
     int alloc1 = 0 ;
     void *argp2 = 0 ;
     int res2 = 0 ;
-    int res4 ;
     int res6 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
@@ -25148,8 +23804,9 @@ XS(_wrap_svn_wc_delete2) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 6) || (items > 7)) {
+    if ((items < 5) || (items > 6)) {
       SWIG_croak("Usage: svn_wc_delete2(path,adm_access,cancel_func,cancel_baton,notify_func,notify_baton,pool);");
     }
     res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1);
@@ -25163,26 +23820,20 @@ XS(_wrap_svn_wc_delete2) {
     }
     arg2 = (svn_wc_adm_access_t *)(argp2);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(2), (void**)(&arg3), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_delete2" "', argument " "3"" of type '" "svn_cancel_func_t""'"); 
-      }
-    }
-    res4 = SWIG_ConvertPtr(ST(3),SWIG_as_voidptrptr(&arg4), 0, 0);
-    if (!SWIG_IsOK(res4)) {
-      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "svn_wc_delete2" "', argument " "4"" of type '" "void *""'"); 
+      arg3 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg4 = ST(2);
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(4), (void**)(&arg5), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void);
+      int res = SWIG_ConvertFunctionPtr(ST(3), (void**)(&arg5), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void);
       if (!SWIG_IsOK(res)) {
         SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_delete2" "', argument " "5"" of type '" "svn_wc_notify_func2_t""'"); 
       }
     }
-    res6 = SWIG_ConvertPtr(ST(5),SWIG_as_voidptrptr(&arg6), 0, 0);
+    res6 = SWIG_ConvertPtr(ST(4),SWIG_as_voidptrptr(&arg6), 0, 0);
     if (!SWIG_IsOK(res6)) {
       SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "svn_wc_delete2" "', argument " "6"" of type '" "void *""'"); 
     }
-    if (items > 6) {
+    if (items > 5) {
       
     }
     {
@@ -25212,8 +23863,6 @@ XS(_wrap_svn_wc_delete2) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
@@ -25221,8 +23870,6 @@ XS(_wrap_svn_wc_delete2) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -25243,7 +23890,6 @@ XS(_wrap_svn_wc_delete) {
     int alloc1 = 0 ;
     void *argp2 = 0 ;
     int res2 = 0 ;
-    int res4 ;
     int res6 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
@@ -25251,8 +23897,9 @@ XS(_wrap_svn_wc_delete) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 6) || (items > 7)) {
+    if ((items < 5) || (items > 6)) {
       SWIG_croak("Usage: svn_wc_delete(path,adm_access,cancel_func,cancel_baton,notify_func,notify_baton,pool);");
     }
     res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1);
@@ -25266,30 +23913,127 @@ XS(_wrap_svn_wc_delete) {
     }
     arg2 = (svn_wc_adm_access_t *)(argp2);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(2), (void**)(&arg3), SWIGTYPE_p_f_p_void__p_svn_error_t);
+      arg3 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg4 = ST(2);
+    }
+    {
+      int res = SWIG_ConvertFunctionPtr(ST(3), (void**)(&arg5), SWIGTYPE_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void);
       if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_delete" "', argument " "3"" of type '" "svn_cancel_func_t""'"); 
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_delete" "', argument " "5"" of type '" "svn_wc_notify_func_t""'"); 
       }
     }
-    res4 = SWIG_ConvertPtr(ST(3),SWIG_as_voidptrptr(&arg4), 0, 0);
-    if (!SWIG_IsOK(res4)) {
-      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "svn_wc_delete" "', argument " "4"" of type '" "void *""'"); 
+    res6 = SWIG_ConvertPtr(ST(4),SWIG_as_voidptrptr(&arg6), 0, 0);
+    if (!SWIG_IsOK(res6)) {
+      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "svn_wc_delete" "', argument " "6"" of type '" "void *""'"); 
+    }
+    if (items > 5) {
+      
+    }
+    {
+      result = (svn_error_t *)svn_wc_delete((char const *)arg1,arg2,arg3,arg4,arg5,arg6,arg7);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+    
+    
+    
+    
+    XSRETURN(argvi);
+  fail:
+    if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+    
+    
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
+XS(_wrap_svn_wc_add_from_disk3) {
+  {
+    svn_wc_context_t *arg1 = (svn_wc_context_t *) 0 ;
+    char *arg2 = (char *) 0 ;
+    apr_hash_t *arg3 = (apr_hash_t *) 0 ;
+    svn_boolean_t arg4 ;
+    svn_wc_notify_func2_t arg5 = (svn_wc_notify_func2_t) 0 ;
+    void *arg6 = (void *) 0 ;
+    apr_pool_t *arg7 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    int res2 ;
+    char *buf2 = 0 ;
+    int alloc2 = 0 ;
+    int val4 ;
+    int ecode4 = 0 ;
+    int res6 ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    if ((items < 6) || (items > 7)) {
+      SWIG_croak("Usage: svn_wc_add_from_disk3(wc_ctx,local_abspath,props,skip_checks,notify_func,notify_baton,scratch_pool);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_context_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_wc_add_from_disk3" "', argument " "1"" of type '" "svn_wc_context_t *""'"); 
+    }
+    arg1 = (svn_wc_context_t *)(argp1);
+    res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_wc_add_from_disk3" "', argument " "2"" of type '" "char const *""'");
     }
+    arg2 = (char *)(buf2);
+    {
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
+      arg3 = svn_swig_pl_hash_to_prophash(ST(2), _global_pool);  
+    }
+    ecode4 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(3), &val4);
+    if (!SWIG_IsOK(ecode4)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "svn_wc_add_from_disk3" "', argument " "4"" of type '" "svn_boolean_t""'");
+    } 
+    arg4 = (svn_boolean_t)(val4);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(4), (void**)(&arg5), SWIGTYPE_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void);
+      int res = SWIG_ConvertFunctionPtr(ST(4), (void**)(&arg5), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void);
       if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_delete" "', argument " "5"" of type '" "svn_wc_notify_func_t""'"); 
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_add_from_disk3" "', argument " "5"" of type '" "svn_wc_notify_func2_t""'"); 
       }
     }
     res6 = SWIG_ConvertPtr(ST(5),SWIG_as_voidptrptr(&arg6), 0, 0);
     if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "svn_wc_delete" "', argument " "6"" of type '" "void *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "svn_wc_add_from_disk3" "', argument " "6"" of type '" "void *""'"); 
     }
     if (items > 6) {
       
     }
     {
-      result = (svn_error_t *)svn_wc_delete((char const *)arg1,arg2,arg3,arg4,arg5,arg6,arg7);
+      result = (svn_error_t *)svn_wc_add_from_disk3(arg1,(char const *)arg2,(apr_hash_t const *)arg3,arg4,arg5,arg6,arg7);
       
       
       
@@ -25310,8 +24054,8 @@ XS(_wrap_svn_wc_delete) {
         }
       }
     }
-    if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
     
+    if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
     
     
     
@@ -25319,8 +24063,8 @@ XS(_wrap_svn_wc_delete) {
     
     XSRETURN(argvi);
   fail:
-    if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
     
+    if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
     
     
     
@@ -25352,6 +24096,7 @@ XS(_wrap_svn_wc_add_from_disk2) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 5) || (items > 6)) {
       SWIG_croak("Usage: svn_wc_add_from_disk2(wc_ctx,local_abspath,props,notify_func,notify_baton,scratch_pool);");
@@ -25367,8 +24112,10 @@ XS(_wrap_svn_wc_add_from_disk2) {
     }
     arg2 = (char *)(buf2);
     {
-      if (_global_pool == NULL)
-      _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
       arg3 = svn_swig_pl_hash_to_prophash(ST(2), _global_pool);  
     }
     {
@@ -25445,6 +24192,7 @@ XS(_wrap_svn_wc_add_from_disk) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_wc_add_from_disk(wc_ctx,local_abspath,notify_func,notify_baton,scratch_pool);");
@@ -25536,7 +24284,6 @@ XS(_wrap_svn_wc_add4) {
     int alloc4 = 0 ;
     long val5 ;
     int ecode5 = 0 ;
-    int res7 ;
     int res9 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
@@ -25544,8 +24291,9 @@ XS(_wrap_svn_wc_add4) {
     
     {
       _global_pool = arg10 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 9) || (items > 10)) {
+    if ((items < 8) || (items > 9)) {
       SWIG_croak("Usage: svn_wc_add4(wc_ctx,local_abspath,depth,copyfrom_url,copyfrom_rev,cancel_func,cancel_baton,notify_func,notify_baton,scratch_pool);");
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_context_t, 0 |  0 );
@@ -25574,26 +24322,20 @@ XS(_wrap_svn_wc_add4) {
     } 
     arg5 = (svn_revnum_t)(val5);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(5), (void**)(&arg6), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_add4" "', argument " "6"" of type '" "svn_cancel_func_t""'"); 
-      }
-    }
-    res7 = SWIG_ConvertPtr(ST(6),SWIG_as_voidptrptr(&arg7), 0, 0);
-    if (!SWIG_IsOK(res7)) {
-      SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "svn_wc_add4" "', argument " "7"" of type '" "void *""'"); 
+      arg6 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg7 = ST(5);
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(7), (void**)(&arg8), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void);
+      int res = SWIG_ConvertFunctionPtr(ST(6), (void**)(&arg8), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void);
       if (!SWIG_IsOK(res)) {
         SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_add4" "', argument " "8"" of type '" "svn_wc_notify_func2_t""'"); 
       }
     }
-    res9 = SWIG_ConvertPtr(ST(8),SWIG_as_voidptrptr(&arg9), 0, 0);
+    res9 = SWIG_ConvertPtr(ST(7),SWIG_as_voidptrptr(&arg9), 0, 0);
     if (!SWIG_IsOK(res9)) {
       SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "svn_wc_add4" "', argument " "9"" of type '" "void *""'"); 
     }
-    if (items > 9) {
+    if (items > 8) {
       
     }
     {
@@ -25626,8 +24368,6 @@ XS(_wrap_svn_wc_add4) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
@@ -25638,8 +24378,6 @@ XS(_wrap_svn_wc_add4) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -25670,7 +24408,6 @@ XS(_wrap_svn_wc_add3) {
     int alloc4 = 0 ;
     long val5 ;
     int ecode5 = 0 ;
-    int res7 ;
     int res9 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
@@ -25678,8 +24415,9 @@ XS(_wrap_svn_wc_add3) {
     
     {
       _global_pool = arg10 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 9) || (items > 10)) {
+    if ((items < 8) || (items > 9)) {
       SWIG_croak("Usage: svn_wc_add3(path,parent_access,depth,copyfrom_url,copyfrom_rev,cancel_func,cancel_baton,notify_func,notify_baton,pool);");
     }
     res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1);
@@ -25708,26 +24446,20 @@ XS(_wrap_svn_wc_add3) {
     } 
     arg5 = (svn_revnum_t)(val5);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(5), (void**)(&arg6), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_add3" "', argument " "6"" of type '" "svn_cancel_func_t""'"); 
-      }
-    }
-    res7 = SWIG_ConvertPtr(ST(6),SWIG_as_voidptrptr(&arg7), 0, 0);
-    if (!SWIG_IsOK(res7)) {
-      SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "svn_wc_add3" "', argument " "7"" of type '" "void *""'"); 
+      arg6 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg7 = ST(5);
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(7), (void**)(&arg8), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void);
+      int res = SWIG_ConvertFunctionPtr(ST(6), (void**)(&arg8), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void);
       if (!SWIG_IsOK(res)) {
         SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_add3" "', argument " "8"" of type '" "svn_wc_notify_func2_t""'"); 
       }
     }
-    res9 = SWIG_ConvertPtr(ST(8),SWIG_as_voidptrptr(&arg9), 0, 0);
+    res9 = SWIG_ConvertPtr(ST(7),SWIG_as_voidptrptr(&arg9), 0, 0);
     if (!SWIG_IsOK(res9)) {
       SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "svn_wc_add3" "', argument " "9"" of type '" "void *""'"); 
     }
-    if (items > 9) {
+    if (items > 8) {
       
     }
     {
@@ -25760,8 +24492,6 @@ XS(_wrap_svn_wc_add3) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
@@ -25772,8 +24502,6 @@ XS(_wrap_svn_wc_add3) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -25801,7 +24529,6 @@ XS(_wrap_svn_wc_add2) {
     int alloc3 = 0 ;
     long val4 ;
     int ecode4 = 0 ;
-    int res6 ;
     int res8 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
@@ -25809,8 +24536,9 @@ XS(_wrap_svn_wc_add2) {
     
     {
       _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 8) || (items > 9)) {
+    if ((items < 7) || (items > 8)) {
       SWIG_croak("Usage: svn_wc_add2(path,parent_access,copyfrom_url,copyfrom_rev,cancel_func,cancel_baton,notify_func,notify_baton,pool);");
     }
     res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1);
@@ -25834,26 +24562,20 @@ XS(_wrap_svn_wc_add2) {
     } 
     arg4 = (svn_revnum_t)(val4);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(4), (void**)(&arg5), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_add2" "', argument " "5"" of type '" "svn_cancel_func_t""'"); 
-      }
-    }
-    res6 = SWIG_ConvertPtr(ST(5),SWIG_as_voidptrptr(&arg6), 0, 0);
-    if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "svn_wc_add2" "', argument " "6"" of type '" "void *""'"); 
+      arg5 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg6 = ST(4);
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(6), (void**)(&arg7), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void);
+      int res = SWIG_ConvertFunctionPtr(ST(5), (void**)(&arg7), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void);
       if (!SWIG_IsOK(res)) {
         SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_add2" "', argument " "7"" of type '" "svn_wc_notify_func2_t""'"); 
       }
     }
-    res8 = SWIG_ConvertPtr(ST(7),SWIG_as_voidptrptr(&arg8), 0, 0);
+    res8 = SWIG_ConvertPtr(ST(6),SWIG_as_voidptrptr(&arg8), 0, 0);
     if (!SWIG_IsOK(res8)) {
       SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "svn_wc_add2" "', argument " "8"" of type '" "void *""'"); 
     }
-    if (items > 8) {
+    if (items > 7) {
       
     }
     {
@@ -25885,8 +24607,6 @@ XS(_wrap_svn_wc_add2) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
@@ -25896,8 +24616,6 @@ XS(_wrap_svn_wc_add2) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -25925,7 +24643,6 @@ XS(_wrap_svn_wc_add) {
     int alloc3 = 0 ;
     long val4 ;
     int ecode4 = 0 ;
-    int res6 ;
     int res8 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
@@ -25933,8 +24650,9 @@ XS(_wrap_svn_wc_add) {
     
     {
       _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 8) || (items > 9)) {
+    if ((items < 7) || (items > 8)) {
       SWIG_croak("Usage: svn_wc_add(path,parent_access,copyfrom_url,copyfrom_rev,cancel_func,cancel_baton,notify_func,notify_baton,pool);");
     }
     res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1);
@@ -25958,26 +24676,20 @@ XS(_wrap_svn_wc_add) {
     } 
     arg4 = (svn_revnum_t)(val4);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(4), (void**)(&arg5), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_add" "', argument " "5"" of type '" "svn_cancel_func_t""'"); 
-      }
-    }
-    res6 = SWIG_ConvertPtr(ST(5),SWIG_as_voidptrptr(&arg6), 0, 0);
-    if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "svn_wc_add" "', argument " "6"" of type '" "void *""'"); 
+      arg5 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg6 = ST(4);
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(6), (void**)(&arg7), SWIGTYPE_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void);
+      int res = SWIG_ConvertFunctionPtr(ST(5), (void**)(&arg7), SWIGTYPE_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void);
       if (!SWIG_IsOK(res)) {
         SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_add" "', argument " "7"" of type '" "svn_wc_notify_func_t""'"); 
       }
     }
-    res8 = SWIG_ConvertPtr(ST(7),SWIG_as_voidptrptr(&arg8), 0, 0);
+    res8 = SWIG_ConvertPtr(ST(6),SWIG_as_voidptrptr(&arg8), 0, 0);
     if (!SWIG_IsOK(res8)) {
       SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "svn_wc_add" "', argument " "8"" of type '" "void *""'"); 
     }
-    if (items > 8) {
+    if (items > 7) {
       
     }
     {
@@ -26009,8 +24721,6 @@ XS(_wrap_svn_wc_add) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
@@ -26020,8 +24730,6 @@ XS(_wrap_svn_wc_add) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -26051,15 +24759,15 @@ XS(_wrap_svn_wc_add_repos_file4) {
     int alloc7 = 0 ;
     long val8 ;
     int ecode8 = 0 ;
-    int res10 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
     dXSARGS;
     
     {
       _global_pool = arg11 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 10) || (items > 11)) {
+    if ((items < 9) || (items > 10)) {
       SWIG_croak("Usage: svn_wc_add_repos_file4(wc_ctx,local_abspath,new_base_contents,new_contents,new_base_props,new_props,copyfrom_url,copyfrom_rev,cancel_func,cancel_baton,scratch_pool);");
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_context_t, 0 |  0 );
@@ -26074,18 +24782,24 @@ XS(_wrap_svn_wc_add_repos_file4) {
     arg2 = (char *)(buf2);
     {
       svn_swig_pl_make_stream (&arg3, ST(2));
+      SPAGAIN;
     }
     {
       svn_swig_pl_make_stream (&arg4, ST(3));
+      SPAGAIN;
     }
     {
-      if (_global_pool == NULL)
-      _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
       arg5 = svn_swig_pl_hash_to_prophash(ST(4), _global_pool);  
     }
     {
-      if (_global_pool == NULL)
-      _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
       arg6 = svn_swig_pl_hash_to_prophash(ST(5), _global_pool);  
     }
     res7 = SWIG_AsCharPtrAndSize(ST(6), &buf7, NULL, &alloc7);
@@ -26099,16 +24813,10 @@ XS(_wrap_svn_wc_add_repos_file4) {
     } 
     arg8 = (svn_revnum_t)(val8);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(8), (void**)(&arg9), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_add_repos_file4" "', argument " "9"" of type '" "svn_cancel_func_t""'"); 
-      }
-    }
-    res10 = SWIG_ConvertPtr(ST(9),SWIG_as_voidptrptr(&arg10), 0, 0);
-    if (!SWIG_IsOK(res10)) {
-      SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "svn_wc_add_repos_file4" "', argument " "10"" of type '" "void *""'"); 
+      arg9 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg10 = ST(8);
     }
-    if (items > 10) {
+    if (items > 9) {
       
     }
     {
@@ -26142,8 +24850,6 @@ XS(_wrap_svn_wc_add_repos_file4) {
     if (alloc7 == SWIG_NEWOBJ) free((char*)buf7);
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
@@ -26155,8 +24861,6 @@ XS(_wrap_svn_wc_add_repos_file4) {
     if (alloc7 == SWIG_NEWOBJ) free((char*)buf7);
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -26188,7 +24892,6 @@ XS(_wrap_svn_wc_add_repos_file3) {
     int alloc7 = 0 ;
     long val8 ;
     int ecode8 = 0 ;
-    int res10 ;
     int res12 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
@@ -26196,8 +24899,9 @@ XS(_wrap_svn_wc_add_repos_file3) {
     
     {
       _global_pool = arg13 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 12) || (items > 13)) {
+    if ((items < 11) || (items > 12)) {
       SWIG_croak("Usage: svn_wc_add_repos_file3(dst_path,adm_access,new_base_contents,new_contents,new_base_props,new_props,copyfrom_url,copyfrom_rev,cancel_func,cancel_baton,notify_func,notify_baton,scratch_pool);");
     }
     res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1);
@@ -26212,18 +24916,24 @@ XS(_wrap_svn_wc_add_repos_file3) {
     arg2 = (svn_wc_adm_access_t *)(argp2);
     {
       svn_swig_pl_make_stream (&arg3, ST(2));
+      SPAGAIN;
     }
     {
       svn_swig_pl_make_stream (&arg4, ST(3));
+      SPAGAIN;
     }
     {
-      if (_global_pool == NULL)
-      _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
       arg5 = svn_swig_pl_hash_to_prophash(ST(4), _global_pool);  
     }
     {
-      if (_global_pool == NULL)
-      _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
       arg6 = svn_swig_pl_hash_to_prophash(ST(5), _global_pool);  
     }
     res7 = SWIG_AsCharPtrAndSize(ST(6), &buf7, NULL, &alloc7);
@@ -26237,26 +24947,20 @@ XS(_wrap_svn_wc_add_repos_file3) {
     } 
     arg8 = (svn_revnum_t)(val8);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(8), (void**)(&arg9), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_add_repos_file3" "', argument " "9"" of type '" "svn_cancel_func_t""'"); 
-      }
-    }
-    res10 = SWIG_ConvertPtr(ST(9),SWIG_as_voidptrptr(&arg10), 0, 0);
-    if (!SWIG_IsOK(res10)) {
-      SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "svn_wc_add_repos_file3" "', argument " "10"" of type '" "void *""'"); 
+      arg9 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg10 = ST(8);
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(10), (void**)(&arg11), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void);
+      int res = SWIG_ConvertFunctionPtr(ST(9), (void**)(&arg11), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void);
       if (!SWIG_IsOK(res)) {
         SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_add_repos_file3" "', argument " "11"" of type '" "svn_wc_notify_func2_t""'"); 
       }
     }
-    res12 = SWIG_ConvertPtr(ST(11),SWIG_as_voidptrptr(&arg12), 0, 0);
+    res12 = SWIG_ConvertPtr(ST(10),SWIG_as_voidptrptr(&arg12), 0, 0);
     if (!SWIG_IsOK(res12)) {
       SWIG_exception_fail(SWIG_ArgError(res12), "in method '" "svn_wc_add_repos_file3" "', argument " "12"" of type '" "void *""'"); 
     }
-    if (items > 12) {
+    if (items > 11) {
       
     }
     {
@@ -26292,8 +24996,6 @@ XS(_wrap_svn_wc_add_repos_file3) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
@@ -26307,8 +25009,6 @@ XS(_wrap_svn_wc_add_repos_file3) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -26348,6 +25048,7 @@ XS(_wrap_svn_wc_add_repos_file2) {
     
     {
       _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 8) || (items > 9)) {
       SWIG_croak("Usage: svn_wc_add_repos_file2(dst_path,adm_access,new_text_base_path,new_text_path,new_base_props,new_props,copyfrom_url,copyfrom_rev,pool);");
@@ -26373,13 +25074,17 @@ XS(_wrap_svn_wc_add_repos_file2) {
     }
     arg4 = (char *)(buf4);
     {
-      if (_global_pool == NULL)
-      _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
       arg5 = svn_swig_pl_hash_to_prophash(ST(4), _global_pool);  
     }
     {
-      if (_global_pool == NULL)
-      _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
       arg6 = svn_swig_pl_hash_to_prophash(ST(5), _global_pool);  
     }
     res7 = SWIG_AsCharPtrAndSize(ST(6), &buf7, NULL, &alloc7);
@@ -26471,6 +25176,7 @@ XS(_wrap_svn_wc_add_repos_file) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 6) || (items > 7)) {
       SWIG_croak("Usage: svn_wc_add_repos_file(dst_path,adm_access,new_text_path,new_props,copyfrom_url,copyfrom_rev,pool);");
@@ -26491,8 +25197,10 @@ XS(_wrap_svn_wc_add_repos_file) {
     }
     arg3 = (char *)(buf3);
     {
-      if (_global_pool == NULL)
-      _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
       arg4 = svn_swig_pl_hash_to_prophash(ST(3), _global_pool);  
     }
     res5 = SWIG_AsCharPtrAndSize(ST(4), &buf5, NULL, &alloc5);
@@ -26570,15 +25278,15 @@ XS(_wrap_svn_wc_remove_from_revision_control2) {
     int ecode3 = 0 ;
     int val4 ;
     int ecode4 = 0 ;
-    int res6 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
     dXSARGS;
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 6) || (items > 7)) {
+    if ((items < 5) || (items > 6)) {
       SWIG_croak("Usage: svn_wc_remove_from_revision_control2(wc_ctx,local_abspath,destroy_wf,instant_error,cancel_func,cancel_baton,pool);");
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_context_t, 0 |  0 );
@@ -26602,16 +25310,10 @@ XS(_wrap_svn_wc_remove_from_revision_control2) {
     } 
     arg4 = (svn_boolean_t)(val4);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(4), (void**)(&arg5), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_remove_from_revision_control2" "', argument " "5"" of type '" "svn_cancel_func_t""'"); 
-      }
+      arg5 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg6 = ST(4);
     }
-    res6 = SWIG_ConvertPtr(ST(5),SWIG_as_voidptrptr(&arg6), 0, 0);
-    if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "svn_wc_remove_from_revision_control2" "', argument " "6"" of type '" "void *""'"); 
-    }
-    if (items > 6) {
+    if (items > 5) {
       
     }
     {
@@ -26641,8 +25343,6 @@ XS(_wrap_svn_wc_remove_from_revision_control2) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
@@ -26650,8 +25350,6 @@ XS(_wrap_svn_wc_remove_from_revision_control2) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -26676,15 +25374,15 @@ XS(_wrap_svn_wc_remove_from_revision_control) {
     int ecode3 = 0 ;
     int val4 ;
     int ecode4 = 0 ;
-    int res6 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
     dXSARGS;
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 6) || (items > 7)) {
+    if ((items < 5) || (items > 6)) {
       SWIG_croak("Usage: svn_wc_remove_from_revision_control(adm_access,name,destroy_wf,instant_error,cancel_func,cancel_baton,pool);");
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_adm_access_t, 0 |  0 );
@@ -26708,16 +25406,10 @@ XS(_wrap_svn_wc_remove_from_revision_control) {
     } 
     arg4 = (svn_boolean_t)(val4);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(4), (void**)(&arg5), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_remove_from_revision_control" "', argument " "5"" of type '" "svn_cancel_func_t""'"); 
-      }
+      arg5 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg6 = ST(4);
     }
-    res6 = SWIG_ConvertPtr(ST(5),SWIG_as_voidptrptr(&arg6), 0, 0);
-    if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "svn_wc_remove_from_revision_control" "', argument " "6"" of type '" "void *""'"); 
-    }
-    if (items > 6) {
+    if (items > 5) {
       
     }
     {
@@ -26747,8 +25439,6 @@ XS(_wrap_svn_wc_remove_from_revision_control) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
@@ -26756,8 +25446,6 @@ XS(_wrap_svn_wc_remove_from_revision_control) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -26794,7 +25482,6 @@ XS(_wrap_svn_wc_resolved_conflict5) {
     int ecode6 = 0 ;
     int val7 ;
     int ecode7 = 0 ;
-    int res9 ;
     int res11 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
@@ -26802,8 +25489,9 @@ XS(_wrap_svn_wc_resolved_conflict5) {
     
     {
       _global_pool = arg12 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 11) || (items > 12)) {
+    if ((items < 10) || (items > 11)) {
       SWIG_croak("Usage: svn_wc_resolved_conflict5(wc_ctx,local_abspath,depth,resolve_text,resolve_prop,resolve_tree,conflict_choice,cancel_func,cancel_baton,notify_func,notify_baton,scratch_pool);");
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_context_t, 0 |  0 );
@@ -26842,26 +25530,20 @@ XS(_wrap_svn_wc_resolved_conflict5) {
     } 
     arg7 = (svn_wc_conflict_choice_t)(val7);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(7), (void**)(&arg8), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_resolved_conflict5" "', argument " "8"" of type '" "svn_cancel_func_t""'"); 
-      }
-    }
-    res9 = SWIG_ConvertPtr(ST(8),SWIG_as_voidptrptr(&arg9), 0, 0);
-    if (!SWIG_IsOK(res9)) {
-      SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "svn_wc_resolved_conflict5" "', argument " "9"" of type '" "void *""'"); 
+      arg8 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg9 = ST(7);
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(9), (void**)(&arg10), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void);
+      int res = SWIG_ConvertFunctionPtr(ST(8), (void**)(&arg10), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void);
       if (!SWIG_IsOK(res)) {
         SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_resolved_conflict5" "', argument " "10"" of type '" "svn_wc_notify_func2_t""'"); 
       }
     }
-    res11 = SWIG_ConvertPtr(ST(10),SWIG_as_voidptrptr(&arg11), 0, 0);
+    res11 = SWIG_ConvertPtr(ST(9),SWIG_as_voidptrptr(&arg11), 0, 0);
     if (!SWIG_IsOK(res11)) {
       SWIG_exception_fail(SWIG_ArgError(res11), "in method '" "svn_wc_resolved_conflict5" "', argument " "11"" of type '" "void *""'"); 
     }
-    if (items > 11) {
+    if (items > 10) {
       
     }
     {
@@ -26896,8 +25578,6 @@ XS(_wrap_svn_wc_resolved_conflict5) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
@@ -26910,8 +25590,6 @@ XS(_wrap_svn_wc_resolved_conflict5) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -26948,15 +25626,15 @@ XS(_wrap_svn_wc_resolved_conflict4) {
     int val7 ;
     int ecode7 = 0 ;
     int res9 ;
-    int res11 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
     dXSARGS;
     
     {
       _global_pool = arg12 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 11) || (items > 12)) {
+    if ((items < 10) || (items > 11)) {
       SWIG_croak("Usage: svn_wc_resolved_conflict4(path,adm_access,resolve_text,resolve_props,resolve_tree,depth,conflict_choice,notify_func,notify_baton,cancel_func,cancel_baton,pool);");
     }
     res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1);
@@ -27005,16 +25683,10 @@ XS(_wrap_svn_wc_resolved_conflict4) {
       SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "svn_wc_resolved_conflict4" "', argument " "9"" of type '" "void *""'"); 
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(9), (void**)(&arg10), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_resolved_conflict4" "', argument " "10"" of type '" "svn_cancel_func_t""'"); 
-      }
-    }
-    res11 = SWIG_ConvertPtr(ST(10),SWIG_as_voidptrptr(&arg11), 0, 0);
-    if (!SWIG_IsOK(res11)) {
-      SWIG_exception_fail(SWIG_ArgError(res11), "in method '" "svn_wc_resolved_conflict4" "', argument " "11"" of type '" "void *""'"); 
+      arg10 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg11 = ST(9);
     }
-    if (items > 11) {
+    if (items > 10) {
       
     }
     {
@@ -27049,8 +25721,6 @@ XS(_wrap_svn_wc_resolved_conflict4) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
@@ -27063,8 +25733,6 @@ XS(_wrap_svn_wc_resolved_conflict4) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -27098,15 +25766,15 @@ XS(_wrap_svn_wc_resolved_conflict3) {
     int val6 ;
     int ecode6 = 0 ;
     int res8 ;
-    int res10 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
     dXSARGS;
     
     {
       _global_pool = arg11 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 10) || (items > 11)) {
+    if ((items < 9) || (items > 10)) {
       SWIG_croak("Usage: svn_wc_resolved_conflict3(path,adm_access,resolve_text,resolve_props,depth,conflict_choice,notify_func,notify_baton,cancel_func,cancel_baton,pool);");
     }
     res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1);
@@ -27150,16 +25818,10 @@ XS(_wrap_svn_wc_resolved_conflict3) {
       SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "svn_wc_resolved_conflict3" "', argument " "8"" of type '" "void *""'"); 
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(8), (void**)(&arg9), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_resolved_conflict3" "', argument " "9"" of type '" "svn_cancel_func_t""'"); 
-      }
-    }
-    res10 = SWIG_ConvertPtr(ST(9),SWIG_as_voidptrptr(&arg10), 0, 0);
-    if (!SWIG_IsOK(res10)) {
-      SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "svn_wc_resolved_conflict3" "', argument " "10"" of type '" "void *""'"); 
+      arg9 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg10 = ST(8);
     }
-    if (items > 10) {
+    if (items > 9) {
       
     }
     {
@@ -27193,8 +25855,6 @@ XS(_wrap_svn_wc_resolved_conflict3) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
@@ -27206,8 +25866,6 @@ XS(_wrap_svn_wc_resolved_conflict3) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -27238,15 +25896,15 @@ XS(_wrap_svn_wc_resolved_conflict2) {
     int val5 ;
     int ecode5 = 0 ;
     int res7 ;
-    int res9 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
     dXSARGS;
     
     {
       _global_pool = arg10 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 9) || (items > 10)) {
+    if ((items < 8) || (items > 9)) {
       SWIG_croak("Usage: svn_wc_resolved_conflict2(path,adm_access,resolve_text,resolve_props,recurse,notify_func,notify_baton,cancel_func,cancel_baton,pool);");
     }
     res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1);
@@ -27285,16 +25943,10 @@ XS(_wrap_svn_wc_resolved_conflict2) {
       SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "svn_wc_resolved_conflict2" "', argument " "7"" of type '" "void *""'"); 
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(7), (void**)(&arg8), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_resolved_conflict2" "', argument " "8"" of type '" "svn_cancel_func_t""'"); 
-      }
-    }
-    res9 = SWIG_ConvertPtr(ST(8),SWIG_as_voidptrptr(&arg9), 0, 0);
-    if (!SWIG_IsOK(res9)) {
-      SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "svn_wc_resolved_conflict2" "', argument " "9"" of type '" "void *""'"); 
+      arg8 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg9 = ST(7);
     }
-    if (items > 9) {
+    if (items > 8) {
       
     }
     {
@@ -27327,8 +25979,6 @@ XS(_wrap_svn_wc_resolved_conflict2) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
@@ -27339,8 +25989,6 @@ XS(_wrap_svn_wc_resolved_conflict2) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -27375,6 +26023,7 @@ XS(_wrap_svn_wc_resolved_conflict) {
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 7) || (items > 8)) {
       SWIG_croak("Usage: svn_wc_resolved_conflict(path,adm_access,resolve_text,resolve_props,recurse,notify_func,notify_baton,pool);");
@@ -27472,6 +26121,7 @@ XS(_wrap_svn_wc_committed_queue_create) {
     
     {
       _global_pool = arg1 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 0) || (items > 1)) {
       SWIG_croak("Usage: svn_wc_committed_queue_create(pool);");
@@ -27495,6 +26145,146 @@ XS(_wrap_svn_wc_committed_queue_create) {
 }
 
 
+XS(_wrap_svn_wc_queue_committed4) {
+  {
+    svn_wc_committed_queue_t *arg1 = (svn_wc_committed_queue_t *) 0 ;
+    svn_wc_context_t *arg2 = (svn_wc_context_t *) 0 ;
+    char *arg3 = (char *) 0 ;
+    svn_boolean_t arg4 ;
+    svn_boolean_t arg5 ;
+    apr_array_header_t *arg6 = (apr_array_header_t *) 0 ;
+    svn_boolean_t arg7 ;
+    svn_boolean_t arg8 ;
+    svn_checksum_t *arg9 = (svn_checksum_t *) 0 ;
+    apr_pool_t *arg10 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    void *argp2 = 0 ;
+    int res2 = 0 ;
+    int res3 ;
+    char *buf3 = 0 ;
+    int alloc3 = 0 ;
+    int val4 ;
+    int ecode4 = 0 ;
+    int val5 ;
+    int ecode5 = 0 ;
+    void *argp6 = 0 ;
+    int res6 = 0 ;
+    int val7 ;
+    int ecode7 = 0 ;
+    int val8 ;
+    int ecode8 = 0 ;
+    void *argp9 = 0 ;
+    int res9 = 0 ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg10 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    if ((items < 9) || (items > 10)) {
+      SWIG_croak("Usage: svn_wc_queue_committed4(queue,wc_ctx,local_abspath,recurse,is_committed,wcprop_changes,remove_lock,remove_changelist,sha1_checksum,scratch_pool);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_committed_queue_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_wc_queue_committed4" "', argument " "1"" of type '" "svn_wc_committed_queue_t *""'"); 
+    }
+    arg1 = (svn_wc_committed_queue_t *)(argp1);
+    res2 = SWIG_ConvertPtr(ST(1), &argp2,SWIGTYPE_p_svn_wc_context_t, 0 |  0 );
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_wc_queue_committed4" "', argument " "2"" of type '" "svn_wc_context_t *""'"); 
+    }
+    arg2 = (svn_wc_context_t *)(argp2);
+    res3 = SWIG_AsCharPtrAndSize(ST(2), &buf3, NULL, &alloc3);
+    if (!SWIG_IsOK(res3)) {
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_wc_queue_committed4" "', argument " "3"" of type '" "char const *""'");
+    }
+    arg3 = (char *)(buf3);
+    ecode4 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(3), &val4);
+    if (!SWIG_IsOK(ecode4)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "svn_wc_queue_committed4" "', argument " "4"" of type '" "svn_boolean_t""'");
+    } 
+    arg4 = (svn_boolean_t)(val4);
+    ecode5 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(4), &val5);
+    if (!SWIG_IsOK(ecode5)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "svn_wc_queue_committed4" "', argument " "5"" of type '" "svn_boolean_t""'");
+    } 
+    arg5 = (svn_boolean_t)(val5);
+    res6 = SWIG_ConvertPtr(ST(5), &argp6,SWIGTYPE_p_apr_array_header_t, 0 |  0 );
+    if (!SWIG_IsOK(res6)) {
+      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "svn_wc_queue_committed4" "', argument " "6"" of type '" "apr_array_header_t const *""'"); 
+    }
+    arg6 = (apr_array_header_t *)(argp6);
+    ecode7 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(6), &val7);
+    if (!SWIG_IsOK(ecode7)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "svn_wc_queue_committed4" "', argument " "7"" of type '" "svn_boolean_t""'");
+    } 
+    arg7 = (svn_boolean_t)(val7);
+    ecode8 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(7), &val8);
+    if (!SWIG_IsOK(ecode8)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode8), "in method '" "svn_wc_queue_committed4" "', argument " "8"" of type '" "svn_boolean_t""'");
+    } 
+    arg8 = (svn_boolean_t)(val8);
+    res9 = SWIG_ConvertPtr(ST(8), &argp9,SWIGTYPE_p_svn_checksum_t, 0 |  0 );
+    if (!SWIG_IsOK(res9)) {
+      SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "svn_wc_queue_committed4" "', argument " "9"" of type '" "svn_checksum_t const *""'"); 
+    }
+    arg9 = (svn_checksum_t *)(argp9);
+    if (items > 9) {
+      
+    }
+    {
+      result = (svn_error_t *)svn_wc_queue_committed4(arg1,arg2,(char const *)arg3,arg4,arg5,(apr_array_header_t const *)arg6,arg7,arg8,(struct svn_checksum_t const *)arg9,arg10);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    
+    
+    if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+    
+    
+    
+    
+    
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    
+    if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+    
+    
+    
+    
+    
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_svn_wc_queue_committed3) {
   {
     svn_wc_committed_queue_t *arg1 = (svn_wc_committed_queue_t *) 0 ;
@@ -27530,6 +26320,7 @@ XS(_wrap_svn_wc_queue_committed3) {
     
     {
       _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 8) || (items > 9)) {
       SWIG_croak("Usage: svn_wc_queue_committed3(queue,wc_ctx,local_abspath,recurse,wcprop_changes,remove_lock,remove_changelist,sha1_checksum,scratch_pool);");
@@ -27659,6 +26450,7 @@ XS(_wrap_svn_wc_queue_committed2) {
     
     {
       _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 8) || (items > 9)) {
       SWIG_croak("Usage: svn_wc_queue_committed2(queue,path,adm_access,recurse,wcprop_changes,remove_lock,remove_changelist,md5_checksum,scratch_pool);");
@@ -27786,6 +26578,7 @@ XS(_wrap_svn_wc_queue_committed) {
     
     {
       _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 7) || (items > 8)) {
@@ -27900,15 +26693,15 @@ XS(_wrap_svn_wc_process_committed_queue2) {
     int res5 ;
     char *buf5 = 0 ;
     int alloc5 = 0 ;
-    int res7 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
     dXSARGS;
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 7) || (items > 8)) {
+    if ((items < 6) || (items > 7)) {
       SWIG_croak("Usage: svn_wc_process_committed_queue2(queue,wc_ctx,new_revnum,rev_date,rev_author,cancel_func,cancel_baton,scratch_pool);");
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_committed_queue_t, 0 |  0 );
@@ -27937,16 +26730,10 @@ XS(_wrap_svn_wc_process_committed_queue2) {
     }
     arg5 = (char *)(buf5);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(5), (void**)(&arg6), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_process_committed_queue2" "', argument " "6"" of type '" "svn_cancel_func_t""'"); 
-      }
-    }
-    res7 = SWIG_ConvertPtr(ST(6),SWIG_as_voidptrptr(&arg7), 0, 0);
-    if (!SWIG_IsOK(res7)) {
-      SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "svn_wc_process_committed_queue2" "', argument " "7"" of type '" "void *""'"); 
+      arg6 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg7 = ST(5);
     }
-    if (items > 7) {
+    if (items > 6) {
       
     }
     {
@@ -27977,8 +26764,6 @@ XS(_wrap_svn_wc_process_committed_queue2) {
     if (alloc4 == SWIG_NEWOBJ) free((char*)buf4);
     if (alloc5 == SWIG_NEWOBJ) free((char*)buf5);
     
-    
-    
     XSRETURN(argvi);
   fail:
     
@@ -27987,8 +26772,6 @@ XS(_wrap_svn_wc_process_committed_queue2) {
     if (alloc4 == SWIG_NEWOBJ) free((char*)buf4);
     if (alloc5 == SWIG_NEWOBJ) free((char*)buf5);
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -28021,6 +26804,7 @@ XS(_wrap_svn_wc_process_committed_queue) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 5) || (items > 6)) {
       SWIG_croak("Usage: svn_wc_process_committed_queue(queue,adm_access,new_revnum,rev_date,rev_author,pool);");
@@ -28136,6 +26920,7 @@ XS(_wrap_svn_wc_process_committed4) {
     
     {
       _global_pool = arg11 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 10) || (items > 11)) {
       SWIG_croak("Usage: svn_wc_process_committed4(path,adm_access,recurse,new_revnum,rev_date,rev_author,wcprop_changes,remove_lock,remove_changelist,digest,pool);");
@@ -28281,6 +27066,7 @@ XS(_wrap_svn_wc_process_committed3) {
     
     {
       _global_pool = arg10 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 9) || (items > 10)) {
       SWIG_croak("Usage: svn_wc_process_committed3(path,adm_access,recurse,new_revnum,rev_date,rev_author,wcprop_changes,remove_lock,digest,pool);");
@@ -28417,6 +27203,7 @@ XS(_wrap_svn_wc_process_committed2) {
     
     {
       _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 8) || (items > 9)) {
       SWIG_croak("Usage: svn_wc_process_committed2(path,adm_access,recurse,new_revnum,rev_date,rev_author,wcprop_changes,remove_lock,pool);");
@@ -28545,6 +27332,7 @@ XS(_wrap_svn_wc_process_committed) {
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 7) || (items > 8)) {
       SWIG_croak("Usage: svn_wc_process_committed(path,adm_access,recurse,new_revnum,rev_date,rev_author,wcprop_changes,pool);");
@@ -28667,7 +27455,6 @@ XS(_wrap_svn_wc_crawl_revisions5) {
     int ecode8 = 0 ;
     int val9 ;
     int ecode9 = 0 ;
-    int res11 ;
     int res13 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
@@ -28675,8 +27462,9 @@ XS(_wrap_svn_wc_crawl_revisions5) {
     
     {
       _global_pool = arg14 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 13) || (items > 14)) {
+    if ((items < 12) || (items > 13)) {
       SWIG_croak("Usage: svn_wc_crawl_revisions5(wc_ctx,local_abspath,reporter,report_baton,restore_files,depth,honor_depth_exclude,depth_compatibility_trick,use_commit_times,cancel_func,cancel_baton,notify_func,notify_baton,scratch_pool);");
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_context_t, 0 |  0 );
@@ -28724,26 +27512,20 @@ XS(_wrap_svn_wc_crawl_revisions5) {
     } 
     arg9 = (svn_boolean_t)(val9);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(9), (void**)(&arg10), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_crawl_revisions5" "', argument " "10"" of type '" "svn_cancel_func_t""'"); 
-      }
-    }
-    res11 = SWIG_ConvertPtr(ST(10),SWIG_as_voidptrptr(&arg11), 0, 0);
-    if (!SWIG_IsOK(res11)) {
-      SWIG_exception_fail(SWIG_ArgError(res11), "in method '" "svn_wc_crawl_revisions5" "', argument " "11"" of type '" "void *""'"); 
+      arg10 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg11 = ST(9);
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(11), (void**)(&arg12), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void);
+      int res = SWIG_ConvertFunctionPtr(ST(10), (void**)(&arg12), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void);
       if (!SWIG_IsOK(res)) {
         SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_crawl_revisions5" "', argument " "12"" of type '" "svn_wc_notify_func2_t""'"); 
       }
     }
-    res13 = SWIG_ConvertPtr(ST(12),SWIG_as_voidptrptr(&arg13), 0, 0);
+    res13 = SWIG_ConvertPtr(ST(11),SWIG_as_voidptrptr(&arg13), 0, 0);
     if (!SWIG_IsOK(res13)) {
       SWIG_exception_fail(SWIG_ArgError(res13), "in method '" "svn_wc_crawl_revisions5" "', argument " "13"" of type '" "void *""'"); 
     }
-    if (items > 13) {
+    if (items > 12) {
       
     }
     {
@@ -28780,8 +27562,6 @@ XS(_wrap_svn_wc_crawl_revisions5) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
@@ -28796,8 +27576,6 @@ XS(_wrap_svn_wc_crawl_revisions5) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -28846,6 +27624,7 @@ XS(_wrap_svn_wc_crawl_revisions4) {
     
     {
       _global_pool = arg13 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 12) || (items > 13)) {
       SWIG_croak("Usage: svn_wc_crawl_revisions4(path,adm_access,reporter,report_baton,restore_files,depth,honor_depth_exclude,depth_compatibility_trick,use_commit_times,notify_func,notify_baton,traversal_info,pool);");
@@ -29007,6 +27786,7 @@ XS(_wrap_svn_wc_crawl_revisions3) {
     
     {
       _global_pool = arg12 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 11) || (items > 12)) {
       SWIG_croak("Usage: svn_wc_crawl_revisions3(path,adm_access,reporter,report_baton,restore_files,depth,depth_compatibility_trick,use_commit_times,notify_func,notify_baton,traversal_info,pool);");
@@ -29158,6 +27938,7 @@ XS(_wrap_svn_wc_crawl_revisions2) {
     
     {
       _global_pool = arg11 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 10) || (items > 11)) {
       SWIG_croak("Usage: svn_wc_crawl_revisions2(path,adm_access,reporter,report_baton,restore_files,recurse,use_commit_times,notify_func,notify_baton,traversal_info,pool);");
@@ -29302,6 +28083,7 @@ XS(_wrap_svn_wc_crawl_revisions) {
     
     {
       _global_pool = arg11 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 10) || (items > 11)) {
       SWIG_croak("Usage: svn_wc_crawl_revisions(path,adm_access,reporter,report_baton,restore_files,recurse,use_commit_times,notify_func,notify_baton,traversal_info,pool);");
@@ -29435,6 +28217,7 @@ XS(_wrap_svn_wc_check_root) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
@@ -29534,6 +28317,7 @@ XS(_wrap_svn_wc_is_wc_root2) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -29615,6 +28399,7 @@ XS(_wrap_svn_wc_is_wc_root) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -29698,9 +28483,11 @@ XS(_wrap_svn_wc_get_actual_target2) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
@@ -29796,6 +28583,7 @@ XS(_wrap_svn_wc_get_actual_target) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     arg3 = &temp3;
@@ -29923,7 +28711,6 @@ XS(_wrap_svn_wc_get_update_editor4) {
     int res17 ;
     int res19 ;
     int res21 ;
-    int res23 ;
     int res25 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
@@ -29931,14 +28718,16 @@ XS(_wrap_svn_wc_get_update_editor4) {
     
     {
       _global_pool = arg26 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg27 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
     arg3 = &temp3;
-    if ((items < 22) || (items > 24)) {
+    if ((items < 21) || (items > 23)) {
       SWIG_croak("Usage: svn_wc_get_update_editor4(wc_ctx,anchor_abspath,target_basename,use_commit_times,depth,depth_is_sticky,allow_unver_obstructions,adds_as_modification,server_performs_filtering,clean_checkout,diff3_cmd,preserved_exts,fetch_dirents_func,fetch_dirents_baton,conflict_func,conflict_baton,external_func,external_baton,cancel_func,cancel_baton,notify_func,notify_baton,result_pool,scratch_pool);");
     }
     res4 = SWIG_ConvertPtr(ST(0), &argp4,SWIGTYPE_p_svn_wc_context_t, 0 |  0 );
@@ -29997,7 +28786,7 @@ XS(_wrap_svn_wc_get_update_editor4) {
     }
     arg14 = (char *)(buf14);
     {
-      arg15 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(11),
+      arg15 = svn_swig_pl_strings_to_array(ST(11),
         _global_pool);
     }
     {
@@ -30031,29 +28820,23 @@ XS(_wrap_svn_wc_get_update_editor4) {
       SWIG_exception_fail(SWIG_ArgError(res21), "in method '" "svn_wc_get_update_editor4" "', argument " "21"" of type '" "void *""'"); 
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(18), (void**)(&arg22), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_get_update_editor4" "', argument " "22"" of type '" "svn_cancel_func_t""'"); 
-      }
-    }
-    res23 = SWIG_ConvertPtr(ST(19),SWIG_as_voidptrptr(&arg23), 0, 0);
-    if (!SWIG_IsOK(res23)) {
-      SWIG_exception_fail(SWIG_ArgError(res23), "in method '" "svn_wc_get_update_editor4" "', argument " "23"" of type '" "void *""'"); 
+      arg22 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg23 = ST(18);
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(20), (void**)(&arg24), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void);
+      int res = SWIG_ConvertFunctionPtr(ST(19), (void**)(&arg24), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void);
       if (!SWIG_IsOK(res)) {
         SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_get_update_editor4" "', argument " "24"" of type '" "svn_wc_notify_func2_t""'"); 
       }
     }
-    res25 = SWIG_ConvertPtr(ST(21),SWIG_as_voidptrptr(&arg25), 0, 0);
+    res25 = SWIG_ConvertPtr(ST(20),SWIG_as_voidptrptr(&arg25), 0, 0);
     if (!SWIG_IsOK(res25)) {
       SWIG_exception_fail(SWIG_ArgError(res25), "in method '" "svn_wc_get_update_editor4" "', argument " "25"" of type '" "void *""'"); 
     }
-    if (items > 22) {
+    if (items > 21) {
       
     }
-    if (items > 23) {
+    if (items > 22) {
       
     }
     {
@@ -30115,8 +28898,6 @@ XS(_wrap_svn_wc_get_update_editor4) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
@@ -30144,8 +28925,6 @@ XS(_wrap_svn_wc_get_update_editor4) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -30191,7 +28970,6 @@ XS(_wrap_svn_wc_get_update_editor3) {
     int val7 ;
     int ecode7 = 0 ;
     int res9 ;
-    int res11 ;
     int res13 ;
     int res15 ;
     int res16 ;
@@ -30207,11 +28985,12 @@ XS(_wrap_svn_wc_get_update_editor3) {
     
     {
       _global_pool = arg21 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg18 = &temp18;
     arg19 = &temp19;
-    if ((items < 17) || (items > 18)) {
+    if ((items < 16) || (items > 17)) {
       SWIG_croak("Usage: svn_wc_get_update_editor3(anchor,target,use_commit_times,depth,depth_is_sticky,allow_unver_obstructions,notify_func,notify_baton,cancel_func,cancel_baton,conflict_func,conflict_baton,fetch_func,fetch_baton,diff3_cmd,preserved_exts,ti,pool);");
     }
     res2 = SWIG_ConvertPtr(ST(0), &argp2,SWIGTYPE_p_svn_wc_adm_access_t, 0 |  0 );
@@ -30255,50 +29034,44 @@ XS(_wrap_svn_wc_get_update_editor3) {
       SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "svn_wc_get_update_editor3" "', argument " "9"" of type '" "void *""'"); 
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(8), (void**)(&arg10), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_get_update_editor3" "', argument " "10"" of type '" "svn_cancel_func_t""'"); 
-      }
-    }
-    res11 = SWIG_ConvertPtr(ST(9),SWIG_as_voidptrptr(&arg11), 0, 0);
-    if (!SWIG_IsOK(res11)) {
-      SWIG_exception_fail(SWIG_ArgError(res11), "in method '" "svn_wc_get_update_editor3" "', argument " "11"" of type '" "void *""'"); 
+      arg10 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg11 = ST(8);
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(10), (void**)(&arg12), SWIGTYPE_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t);
+      int res = SWIG_ConvertFunctionPtr(ST(9), (void**)(&arg12), SWIGTYPE_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t);
       if (!SWIG_IsOK(res)) {
         SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_get_update_editor3" "', argument " "12"" of type '" "svn_wc_conflict_resolver_func_t""'"); 
       }
     }
-    res13 = SWIG_ConvertPtr(ST(11),SWIG_as_voidptrptr(&arg13), 0, 0);
+    res13 = SWIG_ConvertPtr(ST(10),SWIG_as_voidptrptr(&arg13), 0, 0);
     if (!SWIG_IsOK(res13)) {
       SWIG_exception_fail(SWIG_ArgError(res13), "in method '" "svn_wc_get_update_editor3" "', argument " "13"" of type '" "void *""'"); 
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(12), (void**)(&arg14), SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_stream_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t);
+      int res = SWIG_ConvertFunctionPtr(ST(11), (void**)(&arg14), SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_stream_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t);
       if (!SWIG_IsOK(res)) {
         SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_get_update_editor3" "', argument " "14"" of type '" "svn_wc_get_file_t""'"); 
       }
     }
-    res15 = SWIG_ConvertPtr(ST(13),SWIG_as_voidptrptr(&arg15), 0, 0);
+    res15 = SWIG_ConvertPtr(ST(12),SWIG_as_voidptrptr(&arg15), 0, 0);
     if (!SWIG_IsOK(res15)) {
       SWIG_exception_fail(SWIG_ArgError(res15), "in method '" "svn_wc_get_update_editor3" "', argument " "15"" of type '" "void *""'"); 
     }
-    res16 = SWIG_AsCharPtrAndSize(ST(14), &buf16, NULL, &alloc16);
+    res16 = SWIG_AsCharPtrAndSize(ST(13), &buf16, NULL, &alloc16);
     if (!SWIG_IsOK(res16)) {
       SWIG_exception_fail(SWIG_ArgError(res16), "in method '" "svn_wc_get_update_editor3" "', argument " "16"" of type '" "char const *""'");
     }
     arg16 = (char *)(buf16);
     {
-      arg17 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(15),
+      arg17 = svn_swig_pl_strings_to_array(ST(14),
         _global_pool);
     }
-    res20 = SWIG_ConvertPtr(ST(16), &argp20,SWIGTYPE_p_svn_wc_traversal_info_t, 0 |  0 );
+    res20 = SWIG_ConvertPtr(ST(15), &argp20,SWIGTYPE_p_svn_wc_traversal_info_t, 0 |  0 );
     if (!SWIG_IsOK(res20)) {
       SWIG_exception_fail(SWIG_ArgError(res20), "in method '" "svn_wc_get_update_editor3" "', argument " "20"" of type '" "svn_wc_traversal_info_t *""'"); 
     }
     arg20 = (svn_wc_traversal_info_t *)(argp20);
-    if (items > 17) {
+    if (items > 16) {
       
     }
     {
@@ -30348,8 +29121,6 @@ XS(_wrap_svn_wc_get_update_editor3) {
     
     
     
-    
-    
     if (alloc16 == SWIG_NEWOBJ) free((char*)buf16);
     
     
@@ -30371,8 +29142,6 @@ XS(_wrap_svn_wc_get_update_editor3) {
     
     
     
-    
-    
     if (alloc16 == SWIG_NEWOBJ) free((char*)buf16);
     
     
@@ -30413,7 +29182,6 @@ XS(_wrap_svn_wc_get_update_editor2) {
     int val5 ;
     int ecode5 = 0 ;
     int res7 ;
-    int res9 ;
     int res10 ;
     char *buf10 = 0 ;
     int alloc10 = 0 ;
@@ -30427,11 +29195,12 @@ XS(_wrap_svn_wc_get_update_editor2) {
     
     {
       _global_pool = arg14 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg11 = &temp11;
     arg12 = &temp12;
-    if ((items < 10) || (items > 11)) {
+    if ((items < 9) || (items > 10)) {
       SWIG_croak("Usage: svn_wc_get_update_editor2(anchor,target,use_commit_times,recurse,notify_func,notify_baton,cancel_func,cancel_baton,diff3_cmd,ti,pool);");
     }
     res2 = SWIG_ConvertPtr(ST(0), &argp2,SWIGTYPE_p_svn_wc_adm_access_t, 0 |  0 );
@@ -30465,26 +29234,20 @@ XS(_wrap_svn_wc_get_update_editor2) {
       SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "svn_wc_get_update_editor2" "', argument " "7"" of type '" "void *""'"); 
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(6), (void**)(&arg8), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_get_update_editor2" "', argument " "8"" of type '" "svn_cancel_func_t""'"); 
-      }
+      arg8 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg9 = ST(6);
     }
-    res9 = SWIG_ConvertPtr(ST(7),SWIG_as_voidptrptr(&arg9), 0, 0);
-    if (!SWIG_IsOK(res9)) {
-      SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "svn_wc_get_update_editor2" "', argument " "9"" of type '" "void *""'"); 
-    }
-    res10 = SWIG_AsCharPtrAndSize(ST(8), &buf10, NULL, &alloc10);
+    res10 = SWIG_AsCharPtrAndSize(ST(7), &buf10, NULL, &alloc10);
     if (!SWIG_IsOK(res10)) {
       SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "svn_wc_get_update_editor2" "', argument " "10"" of type '" "char const *""'");
     }
     arg10 = (char *)(buf10);
-    res13 = SWIG_ConvertPtr(ST(9), &argp13,SWIGTYPE_p_svn_wc_traversal_info_t, 0 |  0 );
+    res13 = SWIG_ConvertPtr(ST(8), &argp13,SWIGTYPE_p_svn_wc_traversal_info_t, 0 |  0 );
     if (!SWIG_IsOK(res13)) {
       SWIG_exception_fail(SWIG_ArgError(res13), "in method '" "svn_wc_get_update_editor2" "', argument " "13"" of type '" "svn_wc_traversal_info_t *""'"); 
     }
     arg13 = (svn_wc_traversal_info_t *)(argp13);
-    if (items > 10) {
+    if (items > 9) {
       
     }
     {
@@ -30528,8 +29291,6 @@ XS(_wrap_svn_wc_get_update_editor2) {
     
     
     
-    
-    
     if (alloc10 == SWIG_NEWOBJ) free((char*)buf10);
     
     
@@ -30544,8 +29305,6 @@ XS(_wrap_svn_wc_get_update_editor2) {
     
     
     
-    
-    
     if (alloc10 == SWIG_NEWOBJ) free((char*)buf10);
     
     
@@ -30585,7 +29344,6 @@ XS(_wrap_svn_wc_get_update_editor) {
     int val5 ;
     int ecode5 = 0 ;
     int res7 ;
-    int res9 ;
     int res10 ;
     char *buf10 = 0 ;
     int alloc10 = 0 ;
@@ -30599,11 +29357,12 @@ XS(_wrap_svn_wc_get_update_editor) {
     
     {
       _global_pool = arg14 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg11 = &temp11;
     arg12 = &temp12;
-    if ((items < 10) || (items > 11)) {
+    if ((items < 9) || (items > 10)) {
       SWIG_croak("Usage: svn_wc_get_update_editor(anchor,target,use_commit_times,recurse,notify_func,notify_baton,cancel_func,cancel_baton,diff3_cmd,ti,pool);");
     }
     res2 = SWIG_ConvertPtr(ST(0), &argp2,SWIGTYPE_p_svn_wc_adm_access_t, 0 |  0 );
@@ -30637,26 +29396,20 @@ XS(_wrap_svn_wc_get_update_editor) {
       SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "svn_wc_get_update_editor" "', argument " "7"" of type '" "void *""'"); 
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(6), (void**)(&arg8), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_get_update_editor" "', argument " "8"" of type '" "svn_cancel_func_t""'"); 
-      }
+      arg8 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg9 = ST(6);
     }
-    res9 = SWIG_ConvertPtr(ST(7),SWIG_as_voidptrptr(&arg9), 0, 0);
-    if (!SWIG_IsOK(res9)) {
-      SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "svn_wc_get_update_editor" "', argument " "9"" of type '" "void *""'"); 
-    }
-    res10 = SWIG_AsCharPtrAndSize(ST(8), &buf10, NULL, &alloc10);
+    res10 = SWIG_AsCharPtrAndSize(ST(7), &buf10, NULL, &alloc10);
     if (!SWIG_IsOK(res10)) {
       SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "svn_wc_get_update_editor" "', argument " "10"" of type '" "char const *""'");
     }
     arg10 = (char *)(buf10);
-    res13 = SWIG_ConvertPtr(ST(9), &argp13,SWIGTYPE_p_svn_wc_traversal_info_t, 0 |  0 );
+    res13 = SWIG_ConvertPtr(ST(8), &argp13,SWIGTYPE_p_svn_wc_traversal_info_t, 0 |  0 );
     if (!SWIG_IsOK(res13)) {
       SWIG_exception_fail(SWIG_ArgError(res13), "in method '" "svn_wc_get_update_editor" "', argument " "13"" of type '" "svn_wc_traversal_info_t *""'"); 
     }
     arg13 = (svn_wc_traversal_info_t *)(argp13);
-    if (items > 10) {
+    if (items > 9) {
       
     }
     {
@@ -30700,8 +29453,6 @@ XS(_wrap_svn_wc_get_update_editor) {
     
     
     
-    
-    
     if (alloc10 == SWIG_NEWOBJ) free((char*)buf10);
     
     
@@ -30716,8 +29467,6 @@ XS(_wrap_svn_wc_get_update_editor) {
     
     
     
-    
-    
     if (alloc10 == SWIG_NEWOBJ) free((char*)buf10);
     
     
@@ -30788,7 +29537,6 @@ XS(_wrap_svn_wc_get_switch_editor4) {
     int res16 ;
     int res18 ;
     int res20 ;
-    int res22 ;
     int res24 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
@@ -30796,14 +29544,16 @@ XS(_wrap_svn_wc_get_switch_editor4) {
     
     {
       _global_pool = arg25 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg26 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
     arg3 = &temp3;
-    if ((items < 21) || (items > 23)) {
+    if ((items < 20) || (items > 22)) {
       SWIG_croak("Usage: svn_wc_get_switch_editor4(wc_ctx,anchor_abspath,target_basename,switch_url,use_commit_times,depth,depth_is_sticky,allow_unver_obstructions,server_performs_filtering,diff3_cmd,preserved_exts,fetch_dirents_func,fetch_dirents_baton,conflict_func,conflict_baton,external_func,external_baton,cancel_func,cancel_baton,notify_func,notify_baton,result_pool,scratch_pool);");
     }
     res4 = SWIG_ConvertPtr(ST(0), &argp4,SWIGTYPE_p_svn_wc_context_t, 0 |  0 );
@@ -30857,7 +29607,7 @@ XS(_wrap_svn_wc_get_switch_editor4) {
     }
     arg13 = (char *)(buf13);
     {
-      arg14 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(10),
+      arg14 = svn_swig_pl_strings_to_array(ST(10),
         _global_pool);
     }
     {
@@ -30891,29 +29641,23 @@ XS(_wrap_svn_wc_get_switch_editor4) {
       SWIG_exception_fail(SWIG_ArgError(res20), "in method '" "svn_wc_get_switch_editor4" "', argument " "20"" of type '" "void *""'"); 
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(17), (void**)(&arg21), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_get_switch_editor4" "', argument " "21"" of type '" "svn_cancel_func_t""'"); 
-      }
-    }
-    res22 = SWIG_ConvertPtr(ST(18),SWIG_as_voidptrptr(&arg22), 0, 0);
-    if (!SWIG_IsOK(res22)) {
-      SWIG_exception_fail(SWIG_ArgError(res22), "in method '" "svn_wc_get_switch_editor4" "', argument " "22"" of type '" "void *""'"); 
+      arg21 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg22 = ST(17);
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(19), (void**)(&arg23), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void);
+      int res = SWIG_ConvertFunctionPtr(ST(18), (void**)(&arg23), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void);
       if (!SWIG_IsOK(res)) {
         SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_get_switch_editor4" "', argument " "23"" of type '" "svn_wc_notify_func2_t""'"); 
       }
     }
-    res24 = SWIG_ConvertPtr(ST(20),SWIG_as_voidptrptr(&arg24), 0, 0);
+    res24 = SWIG_ConvertPtr(ST(19),SWIG_as_voidptrptr(&arg24), 0, 0);
     if (!SWIG_IsOK(res24)) {
       SWIG_exception_fail(SWIG_ArgError(res24), "in method '" "svn_wc_get_switch_editor4" "', argument " "24"" of type '" "void *""'"); 
     }
-    if (items > 21) {
+    if (items > 20) {
       
     }
-    if (items > 22) {
+    if (items > 21) {
       
     }
     {
@@ -30974,8 +29718,6 @@ XS(_wrap_svn_wc_get_switch_editor4) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
@@ -31002,8 +29744,6 @@ XS(_wrap_svn_wc_get_switch_editor4) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -31051,7 +29791,6 @@ XS(_wrap_svn_wc_get_switch_editor3) {
     int val8 ;
     int ecode8 = 0 ;
     int res10 ;
-    int res12 ;
     int res14 ;
     int res15 ;
     char *buf15 = 0 ;
@@ -31066,11 +29805,12 @@ XS(_wrap_svn_wc_get_switch_editor3) {
     
     {
       _global_pool = arg20 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg17 = &temp17;
     arg18 = &temp18;
-    if ((items < 16) || (items > 17)) {
+    if ((items < 15) || (items > 16)) {
       SWIG_croak("Usage: svn_wc_get_switch_editor3(anchor,target,switch_url,use_commit_times,depth,depth_is_sticky,allow_unver_obstructions,notify_func,notify_baton,cancel_func,cancel_baton,conflict_func,conflict_baton,diff3_cmd,preserved_exts,ti,pool);");
     }
     res2 = SWIG_ConvertPtr(ST(0), &argp2,SWIGTYPE_p_svn_wc_adm_access_t, 0 |  0 );
@@ -31119,40 +29859,34 @@ XS(_wrap_svn_wc_get_switch_editor3) {
       SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "svn_wc_get_switch_editor3" "', argument " "10"" of type '" "void *""'"); 
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(9), (void**)(&arg11), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_get_switch_editor3" "', argument " "11"" of type '" "svn_cancel_func_t""'"); 
-      }
-    }
-    res12 = SWIG_ConvertPtr(ST(10),SWIG_as_voidptrptr(&arg12), 0, 0);
-    if (!SWIG_IsOK(res12)) {
-      SWIG_exception_fail(SWIG_ArgError(res12), "in method '" "svn_wc_get_switch_editor3" "', argument " "12"" of type '" "void *""'"); 
+      arg11 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg12 = ST(9);
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(11), (void**)(&arg13), SWIGTYPE_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t);
+      int res = SWIG_ConvertFunctionPtr(ST(10), (void**)(&arg13), SWIGTYPE_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t);
       if (!SWIG_IsOK(res)) {
         SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_get_switch_editor3" "', argument " "13"" of type '" "svn_wc_conflict_resolver_func_t""'"); 
       }
     }
-    res14 = SWIG_ConvertPtr(ST(12),SWIG_as_voidptrptr(&arg14), 0, 0);
+    res14 = SWIG_ConvertPtr(ST(11),SWIG_as_voidptrptr(&arg14), 0, 0);
     if (!SWIG_IsOK(res14)) {
       SWIG_exception_fail(SWIG_ArgError(res14), "in method '" "svn_wc_get_switch_editor3" "', argument " "14"" of type '" "void *""'"); 
     }
-    res15 = SWIG_AsCharPtrAndSize(ST(13), &buf15, NULL, &alloc15);
+    res15 = SWIG_AsCharPtrAndSize(ST(12), &buf15, NULL, &alloc15);
     if (!SWIG_IsOK(res15)) {
       SWIG_exception_fail(SWIG_ArgError(res15), "in method '" "svn_wc_get_switch_editor3" "', argument " "15"" of type '" "char const *""'");
     }
     arg15 = (char *)(buf15);
     {
-      arg16 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(14),
+      arg16 = svn_swig_pl_strings_to_array(ST(13),
         _global_pool);
     }
-    res19 = SWIG_ConvertPtr(ST(15), &argp19,SWIGTYPE_p_svn_wc_traversal_info_t, 0 |  0 );
+    res19 = SWIG_ConvertPtr(ST(14), &argp19,SWIGTYPE_p_svn_wc_traversal_info_t, 0 |  0 );
     if (!SWIG_IsOK(res19)) {
       SWIG_exception_fail(SWIG_ArgError(res19), "in method '" "svn_wc_get_switch_editor3" "', argument " "19"" of type '" "svn_wc_traversal_info_t *""'"); 
     }
     arg19 = (svn_wc_traversal_info_t *)(argp19);
-    if (items > 16) {
+    if (items > 15) {
       
     }
     {
@@ -31201,8 +29935,6 @@ XS(_wrap_svn_wc_get_switch_editor3) {
     
     
     
-    
-    
     if (alloc15 == SWIG_NEWOBJ) free((char*)buf15);
     
     
@@ -31223,8 +29955,6 @@ XS(_wrap_svn_wc_get_switch_editor3) {
     
     
     
-    
-    
     if (alloc15 == SWIG_NEWOBJ) free((char*)buf15);
     
     
@@ -31269,7 +29999,6 @@ XS(_wrap_svn_wc_get_switch_editor2) {
     int val6 ;
     int ecode6 = 0 ;
     int res8 ;
-    int res10 ;
     int res11 ;
     char *buf11 = 0 ;
     int alloc11 = 0 ;
@@ -31283,11 +30012,12 @@ XS(_wrap_svn_wc_get_switch_editor2) {
     
     {
       _global_pool = arg15 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg12 = &temp12;
     arg13 = &temp13;
-    if ((items < 11) || (items > 12)) {
+    if ((items < 10) || (items > 11)) {
       SWIG_croak("Usage: svn_wc_get_switch_editor2(anchor,target,switch_url,use_commit_times,recurse,notify_func,notify_baton,cancel_func,cancel_baton,diff3_cmd,ti,pool);");
     }
     res2 = SWIG_ConvertPtr(ST(0), &argp2,SWIGTYPE_p_svn_wc_adm_access_t, 0 |  0 );
@@ -31326,26 +30056,20 @@ XS(_wrap_svn_wc_get_switch_editor2) {
       SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "svn_wc_get_switch_editor2" "', argument " "8"" of type '" "void *""'"); 
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(7), (void**)(&arg9), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_get_switch_editor2" "', argument " "9"" of type '" "svn_cancel_func_t""'"); 
-      }
+      arg9 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg10 = ST(7);
     }
-    res10 = SWIG_ConvertPtr(ST(8),SWIG_as_voidptrptr(&arg10), 0, 0);
-    if (!SWIG_IsOK(res10)) {
-      SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "svn_wc_get_switch_editor2" "', argument " "10"" of type '" "void *""'"); 
-    }
-    res11 = SWIG_AsCharPtrAndSize(ST(9), &buf11, NULL, &alloc11);
+    res11 = SWIG_AsCharPtrAndSize(ST(8), &buf11, NULL, &alloc11);
     if (!SWIG_IsOK(res11)) {
       SWIG_exception_fail(SWIG_ArgError(res11), "in method '" "svn_wc_get_switch_editor2" "', argument " "11"" of type '" "char const *""'");
     }
     arg11 = (char *)(buf11);
-    res14 = SWIG_ConvertPtr(ST(10), &argp14,SWIGTYPE_p_svn_wc_traversal_info_t, 0 |  0 );
+    res14 = SWIG_ConvertPtr(ST(9), &argp14,SWIGTYPE_p_svn_wc_traversal_info_t, 0 |  0 );
     if (!SWIG_IsOK(res14)) {
       SWIG_exception_fail(SWIG_ArgError(res14), "in method '" "svn_wc_get_switch_editor2" "', argument " "14"" of type '" "svn_wc_traversal_info_t *""'"); 
     }
     arg14 = (svn_wc_traversal_info_t *)(argp14);
-    if (items > 11) {
+    if (items > 10) {
       
     }
     {
@@ -31390,8 +30114,6 @@ XS(_wrap_svn_wc_get_switch_editor2) {
     
     
     
-    
-    
     if (alloc11 == SWIG_NEWOBJ) free((char*)buf11);
     
     
@@ -31407,8 +30129,6 @@ XS(_wrap_svn_wc_get_switch_editor2) {
     
     
     
-    
-    
     if (alloc11 == SWIG_NEWOBJ) free((char*)buf11);
     
     
@@ -31452,7 +30172,6 @@ XS(_wrap_svn_wc_get_switch_editor) {
     int val6 ;
     int ecode6 = 0 ;
     int res8 ;
-    int res10 ;
     int res11 ;
     char *buf11 = 0 ;
     int alloc11 = 0 ;
@@ -31466,11 +30185,12 @@ XS(_wrap_svn_wc_get_switch_editor) {
     
     {
       _global_pool = arg15 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg12 = &temp12;
     arg13 = &temp13;
-    if ((items < 11) || (items > 12)) {
+    if ((items < 10) || (items > 11)) {
       SWIG_croak("Usage: svn_wc_get_switch_editor(anchor,target,switch_url,use_commit_times,recurse,notify_func,notify_baton,cancel_func,cancel_baton,diff3_cmd,ti,pool);");
     }
     res2 = SWIG_ConvertPtr(ST(0), &argp2,SWIGTYPE_p_svn_wc_adm_access_t, 0 |  0 );
@@ -31509,26 +30229,20 @@ XS(_wrap_svn_wc_get_switch_editor) {
       SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "svn_wc_get_switch_editor" "', argument " "8"" of type '" "void *""'"); 
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(7), (void**)(&arg9), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_get_switch_editor" "', argument " "9"" of type '" "svn_cancel_func_t""'"); 
-      }
+      arg9 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg10 = ST(7);
     }
-    res10 = SWIG_ConvertPtr(ST(8),SWIG_as_voidptrptr(&arg10), 0, 0);
-    if (!SWIG_IsOK(res10)) {
-      SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "svn_wc_get_switch_editor" "', argument " "10"" of type '" "void *""'"); 
-    }
-    res11 = SWIG_AsCharPtrAndSize(ST(9), &buf11, NULL, &alloc11);
+    res11 = SWIG_AsCharPtrAndSize(ST(8), &buf11, NULL, &alloc11);
     if (!SWIG_IsOK(res11)) {
       SWIG_exception_fail(SWIG_ArgError(res11), "in method '" "svn_wc_get_switch_editor" "', argument " "11"" of type '" "char const *""'");
     }
     arg11 = (char *)(buf11);
-    res14 = SWIG_ConvertPtr(ST(10), &argp14,SWIGTYPE_p_svn_wc_traversal_info_t, 0 |  0 );
+    res14 = SWIG_ConvertPtr(ST(9), &argp14,SWIGTYPE_p_svn_wc_traversal_info_t, 0 |  0 );
     if (!SWIG_IsOK(res14)) {
       SWIG_exception_fail(SWIG_ArgError(res14), "in method '" "svn_wc_get_switch_editor" "', argument " "14"" of type '" "svn_wc_traversal_info_t *""'"); 
     }
     arg14 = (svn_wc_traversal_info_t *)(argp14);
-    if (items > 11) {
+    if (items > 10) {
       
     }
     {
@@ -31573,8 +30287,6 @@ XS(_wrap_svn_wc_get_switch_editor) {
     
     
     
-    
-    
     if (alloc11 == SWIG_NEWOBJ) free((char*)buf11);
     
     
@@ -31590,8 +30302,6 @@ XS(_wrap_svn_wc_get_switch_editor) {
     
     
     
-    
-    
     if (alloc11 == SWIG_NEWOBJ) free((char*)buf11);
     
     
@@ -31622,9 +30332,11 @@ XS(_wrap_svn_wc_prop_list2) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 4)) {
@@ -31707,6 +30419,7 @@ XS(_wrap_svn_wc_prop_list) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -31785,9 +30498,11 @@ XS(_wrap_svn_wc_get_pristine_props) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 4)) {
@@ -31875,9 +30590,11 @@ XS(_wrap_svn_wc_prop_get2) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 3) || (items > 5)) {
@@ -31975,6 +30692,7 @@ XS(_wrap_svn_wc_prop_get) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 3) || (items > 4)) {
@@ -32074,7 +30792,6 @@ XS(_wrap_svn_wc_prop_set4) {
     int ecode6 = 0 ;
     void *argp7 = 0 ;
     int res7 = 0 ;
-    int res9 ;
     int res11 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
@@ -32082,8 +30799,9 @@ XS(_wrap_svn_wc_prop_set4) {
     
     {
       _global_pool = arg12 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 11) || (items > 12)) {
+    if ((items < 10) || (items > 11)) {
       SWIG_croak("Usage: svn_wc_prop_set4(wc_ctx,local_abspath,name,value,depth,skip_checks,changelist_filter,cancel_func,cancel_baton,notify_func,notify_baton,scratch_pool);");
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_context_t, 0 |  0 );
@@ -32126,26 +30844,20 @@ XS(_wrap_svn_wc_prop_set4) {
     }
     arg7 = (apr_array_header_t *)(argp7);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(7), (void**)(&arg8), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_prop_set4" "', argument " "8"" of type '" "svn_cancel_func_t""'"); 
-      }
-    }
-    res9 = SWIG_ConvertPtr(ST(8),SWIG_as_voidptrptr(&arg9), 0, 0);
-    if (!SWIG_IsOK(res9)) {
-      SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "svn_wc_prop_set4" "', argument " "9"" of type '" "void *""'"); 
+      arg8 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg9 = ST(7);
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(9), (void**)(&arg10), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void);
+      int res = SWIG_ConvertFunctionPtr(ST(8), (void**)(&arg10), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void);
       if (!SWIG_IsOK(res)) {
         SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_prop_set4" "', argument " "10"" of type '" "svn_wc_notify_func2_t""'"); 
       }
     }
-    res11 = SWIG_ConvertPtr(ST(10),SWIG_as_voidptrptr(&arg11), 0, 0);
+    res11 = SWIG_ConvertPtr(ST(9),SWIG_as_voidptrptr(&arg11), 0, 0);
     if (!SWIG_IsOK(res11)) {
       SWIG_exception_fail(SWIG_ArgError(res11), "in method '" "svn_wc_prop_set4" "', argument " "11"" of type '" "void *""'"); 
     }
-    if (items > 11) {
+    if (items > 10) {
       
     }
     {
@@ -32180,8 +30892,6 @@ XS(_wrap_svn_wc_prop_set4) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
@@ -32194,8 +30904,6 @@ XS(_wrap_svn_wc_prop_set4) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -32230,6 +30938,7 @@ XS(_wrap_svn_wc_prop_set3) {
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 7) || (items > 8)) {
       SWIG_croak("Usage: svn_wc_prop_set3(name,value,path,adm_access,skip_checks,notify_func,notify_baton,pool);");
@@ -32347,6 +31056,7 @@ XS(_wrap_svn_wc_prop_set2) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 5) || (items > 6)) {
       SWIG_croak("Usage: svn_wc_prop_set2(name,value,path,adm_access,skip_checks,pool);");
@@ -32447,6 +31157,7 @@ XS(_wrap_svn_wc_prop_set) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_wc_prop_set(name,value,path,adm_access,pool);");
@@ -32650,6 +31361,7 @@ XS(_wrap_svn_wc_canonicalize_svn_prop) {
     
     {
       _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 7) || (items > 8)) {
@@ -32802,20 +31514,21 @@ XS(_wrap_svn_wc_get_diff_editor6) {
     void *argp14 = 0 ;
     int res14 = 0 ;
     int res15 ;
-    int res17 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
     dXSARGS;
     
     {
       _global_pool = arg18 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg19 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
-    if ((items < 15) || (items > 17)) {
+    if ((items < 14) || (items > 16)) {
       SWIG_croak("Usage: svn_wc_get_diff_editor6(wc_ctx,anchor_abspath,target,depth,ignore_ancestry,show_copies_as_adds,use_git_diff_format,use_text_base,reverse_order,server_performs_filtering,changelist_filter,callbacks,callback_baton,cancel_func,cancel_baton,result_pool,scratch_pool);");
     }
     res3 = SWIG_ConvertPtr(ST(0), &argp3,SWIGTYPE_p_svn_wc_context_t, 0 |  0 );
@@ -32883,19 +31596,13 @@ XS(_wrap_svn_wc_get_diff_editor6) {
       SWIG_exception_fail(SWIG_ArgError(res15), "in method '" "svn_wc_get_diff_editor6" "', argument " "15"" of type '" "void *""'"); 
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(13), (void**)(&arg16), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_get_diff_editor6" "', argument " "16"" of type '" "svn_cancel_func_t""'"); 
-      }
+      arg16 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg17 = ST(13);
     }
-    res17 = SWIG_ConvertPtr(ST(14),SWIG_as_voidptrptr(&arg17), 0, 0);
-    if (!SWIG_IsOK(res17)) {
-      SWIG_exception_fail(SWIG_ArgError(res17), "in method '" "svn_wc_get_diff_editor6" "', argument " "17"" of type '" "void *""'"); 
-    }
-    if (items > 15) {
+    if (items > 14) {
       
     }
-    if (items > 16) {
+    if (items > 15) {
       
     }
     {
@@ -32943,8 +31650,6 @@ XS(_wrap_svn_wc_get_diff_editor6) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
@@ -32964,8 +31669,6 @@ XS(_wrap_svn_wc_get_diff_editor6) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -33004,7 +31707,6 @@ XS(_wrap_svn_wc_get_diff_editor5) {
     int ecode7 = 0 ;
     int val8 ;
     int ecode8 = 0 ;
-    int res10 ;
     void *argp11 = 0 ;
     int res11 = 0 ;
     svn_delta_editor_t *temp12 ;
@@ -33015,10 +31717,11 @@ XS(_wrap_svn_wc_get_diff_editor5) {
     
     {
       _global_pool = arg14 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg12 = &temp12;
     arg13 = &temp13;
-    if ((items < 11) || (items > 12)) {
+    if ((items < 10) || (items > 11)) {
       SWIG_croak("Usage: svn_wc_get_diff_editor5(anchor,target,callbacks,callback_baton,depth,ignore_ancestry,use_text_base,reverse_order,cancel_func,cancel_baton,changelist_filter,pool);");
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_adm_access_t, 0 |  0 );
@@ -33061,21 +31764,15 @@ XS(_wrap_svn_wc_get_diff_editor5) {
     } 
     arg8 = (svn_boolean_t)(val8);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(8), (void**)(&arg9), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_get_diff_editor5" "', argument " "9"" of type '" "svn_cancel_func_t""'"); 
-      }
+      arg9 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg10 = ST(8);
     }
-    res10 = SWIG_ConvertPtr(ST(9),SWIG_as_voidptrptr(&arg10), 0, 0);
-    if (!SWIG_IsOK(res10)) {
-      SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "svn_wc_get_diff_editor5" "', argument " "10"" of type '" "void *""'"); 
-    }
-    res11 = SWIG_ConvertPtr(ST(10), &argp11,SWIGTYPE_p_apr_array_header_t, 0 |  0 );
+    res11 = SWIG_ConvertPtr(ST(9), &argp11,SWIGTYPE_p_apr_array_header_t, 0 |  0 );
     if (!SWIG_IsOK(res11)) {
       SWIG_exception_fail(SWIG_ArgError(res11), "in method '" "svn_wc_get_diff_editor5" "', argument " "11"" of type '" "apr_array_header_t const *""'"); 
     }
     arg11 = (apr_array_header_t *)(argp11);
-    if (items > 11) {
+    if (items > 10) {
       
     }
     {
@@ -33118,8 +31815,6 @@ XS(_wrap_svn_wc_get_diff_editor5) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
@@ -33134,8 +31829,6 @@ XS(_wrap_svn_wc_get_diff_editor5) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -33174,7 +31867,6 @@ XS(_wrap_svn_wc_get_diff_editor4) {
     int ecode7 = 0 ;
     int val8 ;
     int ecode8 = 0 ;
-    int res10 ;
     void *argp11 = 0 ;
     int res11 = 0 ;
     svn_delta_editor_t *temp12 ;
@@ -33185,10 +31877,11 @@ XS(_wrap_svn_wc_get_diff_editor4) {
     
     {
       _global_pool = arg14 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg12 = &temp12;
     arg13 = &temp13;
-    if ((items < 11) || (items > 12)) {
+    if ((items < 10) || (items > 11)) {
       SWIG_croak("Usage: svn_wc_get_diff_editor4(anchor,target,callbacks,callback_baton,depth,ignore_ancestry,use_text_base,reverse_order,cancel_func,cancel_baton,changelist_filter,pool);");
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_adm_access_t, 0 |  0 );
@@ -33231,21 +31924,15 @@ XS(_wrap_svn_wc_get_diff_editor4) {
     } 
     arg8 = (svn_boolean_t)(val8);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(8), (void**)(&arg9), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_get_diff_editor4" "', argument " "9"" of type '" "svn_cancel_func_t""'"); 
-      }
+      arg9 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg10 = ST(8);
     }
-    res10 = SWIG_ConvertPtr(ST(9),SWIG_as_voidptrptr(&arg10), 0, 0);
-    if (!SWIG_IsOK(res10)) {
-      SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "svn_wc_get_diff_editor4" "', argument " "10"" of type '" "void *""'"); 
-    }
-    res11 = SWIG_ConvertPtr(ST(10), &argp11,SWIGTYPE_p_apr_array_header_t, 0 |  0 );
+    res11 = SWIG_ConvertPtr(ST(9), &argp11,SWIGTYPE_p_apr_array_header_t, 0 |  0 );
     if (!SWIG_IsOK(res11)) {
       SWIG_exception_fail(SWIG_ArgError(res11), "in method '" "svn_wc_get_diff_editor4" "', argument " "11"" of type '" "apr_array_header_t const *""'"); 
     }
     arg11 = (apr_array_header_t *)(argp11);
-    if (items > 11) {
+    if (items > 10) {
       
     }
     {
@@ -33288,8 +31975,6 @@ XS(_wrap_svn_wc_get_diff_editor4) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
@@ -33304,8 +31989,6 @@ XS(_wrap_svn_wc_get_diff_editor4) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -33343,7 +32026,6 @@ XS(_wrap_svn_wc_get_diff_editor3) {
     int ecode7 = 0 ;
     int val8 ;
     int ecode8 = 0 ;
-    int res10 ;
     svn_delta_editor_t *temp11 ;
     void *temp12 ;
     int argvi = 0;
@@ -33352,10 +32034,11 @@ XS(_wrap_svn_wc_get_diff_editor3) {
     
     {
       _global_pool = arg13 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg11 = &temp11;
     arg12 = &temp12;
-    if ((items < 10) || (items > 11)) {
+    if ((items < 9) || (items > 10)) {
       SWIG_croak("Usage: svn_wc_get_diff_editor3(anchor,target,callbacks,callback_baton,recurse,ignore_ancestry,use_text_base,reverse_order,cancel_func,cancel_baton,pool);");
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_adm_access_t, 0 |  0 );
@@ -33398,16 +32081,10 @@ XS(_wrap_svn_wc_get_diff_editor3) {
     } 
     arg8 = (svn_boolean_t)(val8);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(8), (void**)(&arg9), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_get_diff_editor3" "', argument " "9"" of type '" "svn_cancel_func_t""'"); 
-      }
-    }
-    res10 = SWIG_ConvertPtr(ST(9),SWIG_as_voidptrptr(&arg10), 0, 0);
-    if (!SWIG_IsOK(res10)) {
-      SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "svn_wc_get_diff_editor3" "', argument " "10"" of type '" "void *""'"); 
+      arg9 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg10 = ST(8);
     }
-    if (items > 10) {
+    if (items > 9) {
       
     }
     {
@@ -33449,8 +32126,6 @@ XS(_wrap_svn_wc_get_diff_editor3) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
@@ -33464,8 +32139,6 @@ XS(_wrap_svn_wc_get_diff_editor3) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -33503,7 +32176,6 @@ XS(_wrap_svn_wc_get_diff_editor2) {
     int ecode7 = 0 ;
     int val8 ;
     int ecode8 = 0 ;
-    int res10 ;
     svn_delta_editor_t *temp11 ;
     void *temp12 ;
     int argvi = 0;
@@ -33512,10 +32184,11 @@ XS(_wrap_svn_wc_get_diff_editor2) {
     
     {
       _global_pool = arg13 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg11 = &temp11;
     arg12 = &temp12;
-    if ((items < 10) || (items > 11)) {
+    if ((items < 9) || (items > 10)) {
       SWIG_croak("Usage: svn_wc_get_diff_editor2(anchor,target,callbacks,callback_baton,recurse,ignore_ancestry,use_text_base,reverse_order,cancel_func,cancel_baton,pool);");
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_adm_access_t, 0 |  0 );
@@ -33558,16 +32231,10 @@ XS(_wrap_svn_wc_get_diff_editor2) {
     } 
     arg8 = (svn_boolean_t)(val8);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(8), (void**)(&arg9), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_get_diff_editor2" "', argument " "9"" of type '" "svn_cancel_func_t""'"); 
-      }
-    }
-    res10 = SWIG_ConvertPtr(ST(9),SWIG_as_voidptrptr(&arg10), 0, 0);
-    if (!SWIG_IsOK(res10)) {
-      SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "svn_wc_get_diff_editor2" "', argument " "10"" of type '" "void *""'"); 
+      arg9 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg10 = ST(8);
     }
-    if (items > 10) {
+    if (items > 9) {
       
     }
     {
@@ -33609,8 +32276,6 @@ XS(_wrap_svn_wc_get_diff_editor2) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
@@ -33624,8 +32289,6 @@ XS(_wrap_svn_wc_get_diff_editor2) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -33660,7 +32323,6 @@ XS(_wrap_svn_wc_get_diff_editor) {
     int ecode6 = 0 ;
     int val7 ;
     int ecode7 = 0 ;
-    int res9 ;
     svn_delta_editor_t *temp10 ;
     void *temp11 ;
     int argvi = 0;
@@ -33669,10 +32331,11 @@ XS(_wrap_svn_wc_get_diff_editor) {
     
     {
       _global_pool = arg12 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg10 = &temp10;
     arg11 = &temp11;
-    if ((items < 9) || (items > 10)) {
+    if ((items < 8) || (items > 9)) {
       SWIG_croak("Usage: svn_wc_get_diff_editor(anchor,target,callbacks,callback_baton,recurse,use_text_base,reverse_order,cancel_func,cancel_baton,pool);");
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_adm_access_t, 0 |  0 );
@@ -33710,16 +32373,10 @@ XS(_wrap_svn_wc_get_diff_editor) {
     } 
     arg7 = (svn_boolean_t)(val7);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(7), (void**)(&arg8), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_get_diff_editor" "', argument " "8"" of type '" "svn_cancel_func_t""'"); 
-      }
+      arg8 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg9 = ST(7);
     }
-    res9 = SWIG_ConvertPtr(ST(8),SWIG_as_voidptrptr(&arg9), 0, 0);
-    if (!SWIG_IsOK(res9)) {
-      SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "svn_wc_get_diff_editor" "', argument " "9"" of type '" "void *""'"); 
-    }
-    if (items > 9) {
+    if (items > 8) {
       
     }
     {
@@ -33760,8 +32417,6 @@ XS(_wrap_svn_wc_get_diff_editor) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
@@ -33774,8 +32429,6 @@ XS(_wrap_svn_wc_get_diff_editor) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -33814,15 +32467,15 @@ XS(_wrap_svn_wc_diff6) {
     int ecode8 = 0 ;
     void *argp9 = 0 ;
     int res9 = 0 ;
-    int res11 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
     dXSARGS;
     
     {
       _global_pool = arg12 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 11) || (items > 12)) {
+    if ((items < 10) || (items > 11)) {
       SWIG_croak("Usage: svn_wc_diff6(wc_ctx,target_abspath,callbacks,callback_baton,depth,ignore_ancestry,show_copies_as_adds,use_git_diff_format,changelist_filter,cancel_func,cancel_baton,scratch_pool);");
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_context_t, 0 |  0 );
@@ -33870,16 +32523,10 @@ XS(_wrap_svn_wc_diff6) {
     }
     arg9 = (apr_array_header_t *)(argp9);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(9), (void**)(&arg10), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_diff6" "', argument " "10"" of type '" "svn_cancel_func_t""'"); 
-      }
-    }
-    res11 = SWIG_ConvertPtr(ST(10),SWIG_as_voidptrptr(&arg11), 0, 0);
-    if (!SWIG_IsOK(res11)) {
-      SWIG_exception_fail(SWIG_ArgError(res11), "in method '" "svn_wc_diff6" "', argument " "11"" of type '" "void *""'"); 
+      arg10 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg11 = ST(9);
     }
-    if (items > 11) {
+    if (items > 10) {
       
     }
     {
@@ -33914,8 +32561,6 @@ XS(_wrap_svn_wc_diff6) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
@@ -33928,8 +32573,6 @@ XS(_wrap_svn_wc_diff6) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -33966,6 +32609,7 @@ XS(_wrap_svn_wc_diff5) {
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 7) || (items > 8)) {
       SWIG_croak("Usage: svn_wc_diff5(anchor,target,callbacks,callback_baton,depth,ignore_ancestry,changelist_filter,pool);");
@@ -34083,6 +32727,7 @@ XS(_wrap_svn_wc_diff4) {
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 7) || (items > 8)) {
       SWIG_croak("Usage: svn_wc_diff4(anchor,target,callbacks,callback_baton,depth,ignore_ancestry,changelist_filter,pool);");
@@ -34197,6 +32842,7 @@ XS(_wrap_svn_wc_diff3) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 6) || (items > 7)) {
       SWIG_croak("Usage: svn_wc_diff3(anchor,target,callbacks,callback_baton,recurse,ignore_ancestry,pool);");
@@ -34304,6 +32950,7 @@ XS(_wrap_svn_wc_diff2) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 6) || (items > 7)) {
       SWIG_croak("Usage: svn_wc_diff2(anchor,target,callbacks,callback_baton,recurse,ignore_ancestry,pool);");
@@ -34408,6 +33055,7 @@ XS(_wrap_svn_wc_diff) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 5) || (items > 6)) {
       SWIG_croak("Usage: svn_wc_diff(anchor,target,callbacks,callback_baton,recurse,pool);");
@@ -34502,9 +33150,11 @@ XS(_wrap_svn_wc_get_prop_diffs2) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
@@ -34601,6 +33251,7 @@ XS(_wrap_svn_wc_get_prop_diffs) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
@@ -34735,16 +33386,16 @@ XS(_wrap_svn_wc_merge5) {
     void *argp16 = 0 ;
     int res16 = 0 ;
     int res18 ;
-    int res20 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
     dXSARGS;
     
     {
       _global_pool = arg21 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
-    if ((items < 19) || (items > 20)) {
+    if ((items < 18) || (items > 19)) {
       SWIG_croak("Usage: svn_wc_merge5(merge_props_state,wc_ctx,left_abspath,right_abspath,target_abspath,left_label,right_label,target_label,left_version,right_version,dry_run,diff3_cmd,merge_options,original_props,prop_diff,conflict_func,conflict_baton,cancel_func,cancel_baton,scratch_pool);");
     }
     res2 = SWIG_ConvertPtr(ST(0), &argp2,SWIGTYPE_p_svn_wc_notify_state_t, 0 |  0 );
@@ -34833,16 +33484,10 @@ XS(_wrap_svn_wc_merge5) {
       SWIG_exception_fail(SWIG_ArgError(res18), "in method '" "svn_wc_merge5" "', argument " "18"" of type '" "void *""'"); 
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(17), (void**)(&arg19), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_merge5" "', argument " "19"" of type '" "svn_cancel_func_t""'"); 
-      }
+      arg19 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg20 = ST(17);
     }
-    res20 = SWIG_ConvertPtr(ST(18),SWIG_as_voidptrptr(&arg20), 0, 0);
-    if (!SWIG_IsOK(res20)) {
-      SWIG_exception_fail(SWIG_ArgError(res20), "in method '" "svn_wc_merge5" "', argument " "20"" of type '" "void *""'"); 
-    }
-    if (items > 19) {
+    if (items > 18) {
       
     }
     {
@@ -34892,8 +33537,6 @@ XS(_wrap_svn_wc_merge5) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
@@ -34915,8 +33558,6 @@ XS(_wrap_svn_wc_merge5) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -34980,16 +33621,16 @@ XS(_wrap_svn_wc_merge4) {
     void *argp14 = 0 ;
     int res14 = 0 ;
     int res16 ;
-    int res18 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
     dXSARGS;
     
     {
       _global_pool = arg19 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
-    if ((items < 17) || (items > 18)) {
+    if ((items < 16) || (items > 17)) {
       SWIG_croak("Usage: svn_wc_merge4(wc_ctx,left_abspath,right_abspath,target_abspath,left_label,right_label,target_label,left_version,right_version,dry_run,diff3_cmd,merge_options,prop_diff,conflict_func,conflict_baton,cancel_func,cancel_baton,scratch_pool);");
     }
     res2 = SWIG_ConvertPtr(ST(0), &argp2,SWIGTYPE_p_svn_wc_context_t, 0 |  0 );
@@ -35068,16 +33709,10 @@ XS(_wrap_svn_wc_merge4) {
       SWIG_exception_fail(SWIG_ArgError(res16), "in method '" "svn_wc_merge4" "', argument " "16"" of type '" "void *""'"); 
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(15), (void**)(&arg17), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_merge4" "', argument " "17"" of type '" "svn_cancel_func_t""'"); 
-      }
-    }
-    res18 = SWIG_ConvertPtr(ST(16),SWIG_as_voidptrptr(&arg18), 0, 0);
-    if (!SWIG_IsOK(res18)) {
-      SWIG_exception_fail(SWIG_ArgError(res18), "in method '" "svn_wc_merge4" "', argument " "18"" of type '" "void *""'"); 
+      arg17 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg18 = ST(15);
     }
-    if (items > 17) {
+    if (items > 16) {
       
     }
     {
@@ -35125,8 +33760,6 @@ XS(_wrap_svn_wc_merge4) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
@@ -35146,8 +33779,6 @@ XS(_wrap_svn_wc_merge4) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -35209,6 +33840,7 @@ XS(_wrap_svn_wc_merge3) {
     
     {
       _global_pool = arg15 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 13) || (items > 14)) {
@@ -35397,6 +34029,7 @@ XS(_wrap_svn_wc_merge2) {
     
     {
       _global_pool = arg12 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 10) || (items > 11)) {
@@ -35561,6 +34194,7 @@ XS(_wrap_svn_wc_merge) {
     
     {
       _global_pool = arg11 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg9 = &temp9;
     if ((items < 9) || (items > 10)) {
@@ -35703,15 +34337,15 @@ XS(_wrap_svn_wc_merge_props3) {
     int val8 ;
     int ecode8 = 0 ;
     int res10 ;
-    int res12 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
     dXSARGS;
     
     {
       _global_pool = arg13 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 12) || (items > 13)) {
+    if ((items < 11) || (items > 12)) {
       SWIG_croak("Usage: svn_wc_merge_props3(state,wc_ctx,local_abspath,left_version,right_version,baseprops,propchanges,dry_run,conflict_func,conflict_baton,cancel_func,cancel_baton,scratch_pool);");
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_notify_state_t, 0 |  0 );
@@ -35740,8 +34374,10 @@ XS(_wrap_svn_wc_merge_props3) {
     }
     arg5 = (svn_wc_conflict_version_t *)(argp5);
     {
-      if (_global_pool == NULL)
-      _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
       arg6 = svn_swig_pl_hash_to_prophash(ST(5), _global_pool);  
     }
     res7 = SWIG_ConvertPtr(ST(6), &argp7,SWIGTYPE_p_apr_array_header_t, 0 |  0 );
@@ -35765,16 +34401,10 @@ XS(_wrap_svn_wc_merge_props3) {
       SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "svn_wc_merge_props3" "', argument " "10"" of type '" "void *""'"); 
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(10), (void**)(&arg11), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_merge_props3" "', argument " "11"" of type '" "svn_cancel_func_t""'"); 
-      }
+      arg11 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg12 = ST(10);
     }
-    res12 = SWIG_ConvertPtr(ST(11),SWIG_as_voidptrptr(&arg12), 0, 0);
-    if (!SWIG_IsOK(res12)) {
-      SWIG_exception_fail(SWIG_ArgError(res12), "in method '" "svn_wc_merge_props3" "', argument " "12"" of type '" "void *""'"); 
-    }
-    if (items > 12) {
+    if (items > 11) {
       
     }
     {
@@ -35810,8 +34440,6 @@ XS(_wrap_svn_wc_merge_props3) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
@@ -35825,8 +34453,6 @@ XS(_wrap_svn_wc_merge_props3) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -35865,6 +34491,7 @@ XS(_wrap_svn_wc_merge_props2) {
     
     {
       _global_pool = arg10 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 9) || (items > 10)) {
       SWIG_croak("Usage: svn_wc_merge_props2(state,path,adm_access,baseprops,propchanges,base_merge,dry_run,conflict_func,conflict_baton,pool);");
@@ -35885,8 +34512,10 @@ XS(_wrap_svn_wc_merge_props2) {
     }
     arg3 = (svn_wc_adm_access_t *)(argp3);
     {
-      if (_global_pool == NULL)
-      _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
       arg4 = svn_swig_pl_hash_to_prophash(ST(3), _global_pool);  
     }
     res5 = SWIG_ConvertPtr(ST(4), &argp5,SWIGTYPE_p_apr_array_header_t, 0 |  0 );
@@ -35996,6 +34625,7 @@ XS(_wrap_svn_wc_merge_props) {
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 7) || (items > 8)) {
       SWIG_croak("Usage: svn_wc_merge_props(state,path,adm_access,baseprops,propchanges,base_merge,dry_run,pool);");
@@ -36016,8 +34646,10 @@ XS(_wrap_svn_wc_merge_props) {
     }
     arg3 = (svn_wc_adm_access_t *)(argp3);
     {
-      if (_global_pool == NULL)
-      _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+      if (_global_pool == NULL) {
+        _global_pool = svn_swig_pl_make_pool((SV *)NULL);
+        SPAGAIN;
+      }
       arg4 = svn_swig_pl_hash_to_prophash(ST(3), _global_pool);  
     }
     res5 = SWIG_ConvertPtr(ST(4), &argp5,SWIGTYPE_p_apr_array_header_t, 0 |  0 );
@@ -36112,6 +34744,7 @@ XS(_wrap_svn_wc_merge_prop_diffs) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 6) || (items > 7)) {
       SWIG_croak("Usage: svn_wc_merge_prop_diffs(state,path,adm_access,propchanges,base_merge,dry_run,pool);");
@@ -36212,9 +34845,11 @@ XS(_wrap_svn_wc_get_pristine_contents2) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 4)) {
@@ -36259,7 +34894,11 @@ XS(_wrap_svn_wc_get_pristine_contents2) {
       }
     }
     {
-      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = svn_swig_pl_from_stream(*arg1); argvi++  ;
+      SV *tmp;
+      PUTBACK;
+      tmp = svn_swig_pl_from_stream(*arg1);
+      SPAGAIN;
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = tmp; argvi++  ;
     }
     
     
@@ -36295,9 +34934,11 @@ XS(_wrap_svn_wc_get_pristine_contents) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 3)) {
@@ -36337,7 +34978,11 @@ XS(_wrap_svn_wc_get_pristine_contents) {
       }
     }
     {
-      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = svn_swig_pl_from_stream(*arg1); argvi++  ;
+      SV *tmp;
+      PUTBACK;
+      tmp = svn_swig_pl_from_stream(*arg1);
+      SPAGAIN;
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = tmp; argvi++  ;
     }
     
     if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
@@ -36370,6 +35015,7 @@ XS(_wrap_svn_wc_get_pristine_copy_path) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     if ((items < 1) || (items > 2)) {
@@ -36425,6 +35071,139 @@ XS(_wrap_svn_wc_get_pristine_copy_path) {
 }
 
 
+XS(_wrap_svn_wc_cleanup4) {
+  {
+    svn_wc_context_t *arg1 = (svn_wc_context_t *) 0 ;
+    char *arg2 = (char *) 0 ;
+    svn_boolean_t arg3 ;
+    svn_boolean_t arg4 ;
+    svn_boolean_t arg5 ;
+    svn_boolean_t arg6 ;
+    svn_cancel_func_t arg7 = (svn_cancel_func_t) 0 ;
+    void *arg8 = (void *) 0 ;
+    svn_wc_notify_func2_t arg9 = (svn_wc_notify_func2_t) 0 ;
+    void *arg10 = (void *) 0 ;
+    apr_pool_t *arg11 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    int res2 ;
+    char *buf2 = 0 ;
+    int alloc2 = 0 ;
+    int val3 ;
+    int ecode3 = 0 ;
+    int val4 ;
+    int ecode4 = 0 ;
+    int val5 ;
+    int ecode5 = 0 ;
+    int val6 ;
+    int ecode6 = 0 ;
+    int res10 ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg11 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    if ((items < 9) || (items > 10)) {
+      SWIG_croak("Usage: svn_wc_cleanup4(wc_ctx,local_abspath,break_locks,fix_recorded_timestamps,clear_dav_cache,vacuum_pristines,cancel_func,cancel_baton,notify_func,notify_baton,scratch_pool);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_context_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_wc_cleanup4" "', argument " "1"" of type '" "svn_wc_context_t *""'"); 
+    }
+    arg1 = (svn_wc_context_t *)(argp1);
+    res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_wc_cleanup4" "', argument " "2"" of type '" "char const *""'");
+    }
+    arg2 = (char *)(buf2);
+    ecode3 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(2), &val3);
+    if (!SWIG_IsOK(ecode3)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "svn_wc_cleanup4" "', argument " "3"" of type '" "svn_boolean_t""'");
+    } 
+    arg3 = (svn_boolean_t)(val3);
+    ecode4 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(3), &val4);
+    if (!SWIG_IsOK(ecode4)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "svn_wc_cleanup4" "', argument " "4"" of type '" "svn_boolean_t""'");
+    } 
+    arg4 = (svn_boolean_t)(val4);
+    ecode5 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(4), &val5);
+    if (!SWIG_IsOK(ecode5)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "svn_wc_cleanup4" "', argument " "5"" of type '" "svn_boolean_t""'");
+    } 
+    arg5 = (svn_boolean_t)(val5);
+    ecode6 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(5), &val6);
+    if (!SWIG_IsOK(ecode6)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "svn_wc_cleanup4" "', argument " "6"" of type '" "svn_boolean_t""'");
+    } 
+    arg6 = (svn_boolean_t)(val6);
+    {
+      arg7 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg8 = ST(6);
+    }
+    {
+      int res = SWIG_ConvertFunctionPtr(ST(7), (void**)(&arg9), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void);
+      if (!SWIG_IsOK(res)) {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_cleanup4" "', argument " "9"" of type '" "svn_wc_notify_func2_t""'"); 
+      }
+    }
+    res10 = SWIG_ConvertPtr(ST(8),SWIG_as_voidptrptr(&arg10), 0, 0);
+    if (!SWIG_IsOK(res10)) {
+      SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "svn_wc_cleanup4" "', argument " "10"" of type '" "void *""'"); 
+    }
+    if (items > 9) {
+      
+    }
+    {
+      result = (svn_error_t *)svn_wc_cleanup4(arg1,(char const *)arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    
+    if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+    
+    
+    
+    
+    
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+    
+    
+    
+    
+    
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_svn_wc_cleanup3) {
   {
     svn_wc_context_t *arg1 = (svn_wc_context_t *) 0 ;
@@ -36438,15 +35217,15 @@ XS(_wrap_svn_wc_cleanup3) {
     int res2 ;
     char *buf2 = 0 ;
     int alloc2 = 0 ;
-    int res4 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
     dXSARGS;
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 4) || (items > 5)) {
+    if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_wc_cleanup3(wc_ctx,local_abspath,cancel_func,cancel_baton,scratch_pool);");
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_context_t, 0 |  0 );
@@ -36460,16 +35239,10 @@ XS(_wrap_svn_wc_cleanup3) {
     }
     arg2 = (char *)(buf2);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(2), (void**)(&arg3), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_cleanup3" "', argument " "3"" of type '" "svn_cancel_func_t""'"); 
-      }
-    }
-    res4 = SWIG_ConvertPtr(ST(3),SWIG_as_voidptrptr(&arg4), 0, 0);
-    if (!SWIG_IsOK(res4)) {
-      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "svn_wc_cleanup3" "', argument " "4"" of type '" "void *""'"); 
+      arg3 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg4 = ST(2);
     }
-    if (items > 4) {
+    if (items > 3) {
       
     }
     {
@@ -36497,15 +35270,11 @@ XS(_wrap_svn_wc_cleanup3) {
     
     if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
     
-    
-    
     XSRETURN(argvi);
   fail:
     
     if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -36525,15 +35294,15 @@ XS(_wrap_svn_wc_cleanup2) {
     int res2 ;
     char *buf2 = 0 ;
     int alloc2 = 0 ;
-    int res4 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
     dXSARGS;
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 4) || (items > 5)) {
+    if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_wc_cleanup2(path,diff3_cmd,cancel_func,cancel_baton,pool);");
     }
     res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1);
@@ -36547,16 +35316,10 @@ XS(_wrap_svn_wc_cleanup2) {
     }
     arg2 = (char *)(buf2);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(2), (void**)(&arg3), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_cleanup2" "', argument " "3"" of type '" "svn_cancel_func_t""'"); 
-      }
+      arg3 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg4 = ST(2);
     }
-    res4 = SWIG_ConvertPtr(ST(3),SWIG_as_voidptrptr(&arg4), 0, 0);
-    if (!SWIG_IsOK(res4)) {
-      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "svn_wc_cleanup2" "', argument " "4"" of type '" "void *""'"); 
-    }
-    if (items > 4) {
+    if (items > 3) {
       
     }
     {
@@ -36584,15 +35347,11 @@ XS(_wrap_svn_wc_cleanup2) {
     if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
     if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
     
-    
-    
     XSRETURN(argvi);
   fail:
     if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
     if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -36615,15 +35374,15 @@ XS(_wrap_svn_wc_cleanup) {
     int res3 ;
     char *buf3 = 0 ;
     int alloc3 = 0 ;
-    int res5 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
     dXSARGS;
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 5) || (items > 6)) {
+    if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_wc_cleanup(path,optional_adm_access,diff3_cmd,cancel_func,cancel_baton,pool);");
     }
     res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1);
@@ -36642,16 +35401,10 @@ XS(_wrap_svn_wc_cleanup) {
     }
     arg3 = (char *)(buf3);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(3), (void**)(&arg4), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_cleanup" "', argument " "4"" of type '" "svn_cancel_func_t""'"); 
-      }
+      arg4 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg5 = ST(3);
     }
-    res5 = SWIG_ConvertPtr(ST(4),SWIG_as_voidptrptr(&arg5), 0, 0);
-    if (!SWIG_IsOK(res5)) {
-      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "svn_wc_cleanup" "', argument " "5"" of type '" "void *""'"); 
-    }
-    if (items > 5) {
+    if (items > 4) {
       
     }
     {
@@ -36680,16 +35433,12 @@ XS(_wrap_svn_wc_cleanup) {
     
     if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
     
-    
-    
     XSRETURN(argvi);
   fail:
     if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
     
     if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -36713,7 +35462,6 @@ XS(_wrap_svn_wc_upgrade) {
     char *buf2 = 0 ;
     int alloc2 = 0 ;
     int res4 ;
-    int res6 ;
     int res8 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
@@ -36721,8 +35469,9 @@ XS(_wrap_svn_wc_upgrade) {
     
     {
       _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 8) || (items > 9)) {
+    if ((items < 7) || (items > 8)) {
       SWIG_croak("Usage: svn_wc_upgrade(wc_ctx,local_abspath,repos_info_func,repos_info_baton,cancel_func,cancel_baton,notify_func,notify_baton,scratch_pool);");
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_context_t, 0 |  0 );
@@ -36746,26 +35495,20 @@ XS(_wrap_svn_wc_upgrade) {
       SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "svn_wc_upgrade" "', argument " "4"" of type '" "void *""'"); 
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(4), (void**)(&arg5), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_upgrade" "', argument " "5"" of type '" "svn_cancel_func_t""'"); 
-      }
-    }
-    res6 = SWIG_ConvertPtr(ST(5),SWIG_as_voidptrptr(&arg6), 0, 0);
-    if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "svn_wc_upgrade" "', argument " "6"" of type '" "void *""'"); 
+      arg5 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg6 = ST(4);
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(6), (void**)(&arg7), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void);
+      int res = SWIG_ConvertFunctionPtr(ST(5), (void**)(&arg7), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void);
       if (!SWIG_IsOK(res)) {
         SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_upgrade" "', argument " "7"" of type '" "svn_wc_notify_func2_t""'"); 
       }
     }
-    res8 = SWIG_ConvertPtr(ST(7),SWIG_as_voidptrptr(&arg8), 0, 0);
+    res8 = SWIG_ConvertPtr(ST(6),SWIG_as_voidptrptr(&arg8), 0, 0);
     if (!SWIG_IsOK(res8)) {
       SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "svn_wc_upgrade" "', argument " "8"" of type '" "void *""'"); 
     }
-    if (items > 8) {
+    if (items > 7) {
       
     }
     {
@@ -36797,8 +35540,6 @@ XS(_wrap_svn_wc_upgrade) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
@@ -36808,8 +35549,6 @@ XS(_wrap_svn_wc_upgrade) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -36843,6 +35582,7 @@ XS(_wrap_svn_wc_relocate4) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 6) || (items > 7)) {
       SWIG_croak("Usage: svn_wc_relocate4(wc_ctx,wcroot_abspath,from,to,validator,validator_baton,scratch_pool);");
@@ -36954,6 +35694,7 @@ XS(_wrap_svn_wc_relocate3) {
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 7) || (items > 8)) {
       SWIG_croak("Usage: svn_wc_relocate3(path,adm_access,from,to,recurse,validator,validator_baton,pool);");
@@ -37072,6 +35813,7 @@ XS(_wrap_svn_wc_relocate2) {
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 7) || (items > 8)) {
       SWIG_croak("Usage: svn_wc_relocate2(path,adm_access,from,to,recurse,validator,validator_baton,pool);");
@@ -37190,6 +35932,7 @@ XS(_wrap_svn_wc_relocate) {
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 7) || (items > 8)) {
       SWIG_croak("Usage: svn_wc_relocate(path,adm_access,from,to,recurse,validator,validator_baton,pool);");
@@ -37277,6 +36020,149 @@ XS(_wrap_svn_wc_relocate) {
 }
 
 
+XS(_wrap_svn_wc_revert5) {
+  {
+    svn_wc_context_t *arg1 = (svn_wc_context_t *) 0 ;
+    char *arg2 = (char *) 0 ;
+    svn_depth_t arg3 ;
+    svn_boolean_t arg4 ;
+    apr_array_header_t *arg5 = (apr_array_header_t *) 0 ;
+    svn_boolean_t arg6 ;
+    svn_boolean_t arg7 ;
+    svn_cancel_func_t arg8 = (svn_cancel_func_t) 0 ;
+    void *arg9 = (void *) 0 ;
+    svn_wc_notify_func2_t arg10 = (svn_wc_notify_func2_t) 0 ;
+    void *arg11 = (void *) 0 ;
+    apr_pool_t *arg12 = (apr_pool_t *) 0 ;
+    apr_pool_t *_global_pool ;
+    void *argp1 = 0 ;
+    int res1 = 0 ;
+    int res2 ;
+    char *buf2 = 0 ;
+    int alloc2 = 0 ;
+    int val3 ;
+    int ecode3 = 0 ;
+    int val4 ;
+    int ecode4 = 0 ;
+    void *argp5 = 0 ;
+    int res5 = 0 ;
+    int val6 ;
+    int ecode6 = 0 ;
+    int val7 ;
+    int ecode7 = 0 ;
+    int res11 ;
+    int argvi = 0;
+    svn_error_t *result = 0 ;
+    dXSARGS;
+    
+    {
+      _global_pool = arg12 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
+    }
+    if ((items < 10) || (items > 11)) {
+      SWIG_croak("Usage: svn_wc_revert5(wc_ctx,local_abspath,depth,use_commit_times,changelist_filter,clear_changelists,metadata_only,cancel_func,cancel_baton,notify_func,notify_baton,scratch_pool);");
+    }
+    res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_context_t, 0 |  0 );
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_wc_revert5" "', argument " "1"" of type '" "svn_wc_context_t *""'"); 
+    }
+    arg1 = (svn_wc_context_t *)(argp1);
+    res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "svn_wc_revert5" "', argument " "2"" of type '" "char const *""'");
+    }
+    arg2 = (char *)(buf2);
+    ecode3 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(2), &val3);
+    if (!SWIG_IsOK(ecode3)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "svn_wc_revert5" "', argument " "3"" of type '" "svn_depth_t""'");
+    } 
+    arg3 = (svn_depth_t)(val3);
+    ecode4 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(3), &val4);
+    if (!SWIG_IsOK(ecode4)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "svn_wc_revert5" "', argument " "4"" of type '" "svn_boolean_t""'");
+    } 
+    arg4 = (svn_boolean_t)(val4);
+    res5 = SWIG_ConvertPtr(ST(4), &argp5,SWIGTYPE_p_apr_array_header_t, 0 |  0 );
+    if (!SWIG_IsOK(res5)) {
+      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "svn_wc_revert5" "', argument " "5"" of type '" "apr_array_header_t const *""'"); 
+    }
+    arg5 = (apr_array_header_t *)(argp5);
+    ecode6 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(5), &val6);
+    if (!SWIG_IsOK(ecode6)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "svn_wc_revert5" "', argument " "6"" of type '" "svn_boolean_t""'");
+    } 
+    arg6 = (svn_boolean_t)(val6);
+    ecode7 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(6), &val7);
+    if (!SWIG_IsOK(ecode7)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "svn_wc_revert5" "', argument " "7"" of type '" "svn_boolean_t""'");
+    } 
+    arg7 = (svn_boolean_t)(val7);
+    {
+      arg8 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg9 = ST(7);
+    }
+    {
+      int res = SWIG_ConvertFunctionPtr(ST(8), (void**)(&arg10), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void);
+      if (!SWIG_IsOK(res)) {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_revert5" "', argument " "10"" of type '" "svn_wc_notify_func2_t""'"); 
+      }
+    }
+    res11 = SWIG_ConvertPtr(ST(9),SWIG_as_voidptrptr(&arg11), 0, 0);
+    if (!SWIG_IsOK(res11)) {
+      SWIG_exception_fail(SWIG_ArgError(res11), "in method '" "svn_wc_revert5" "', argument " "11"" of type '" "void *""'"); 
+    }
+    if (items > 10) {
+      
+    }
+    {
+      result = (svn_error_t *)svn_wc_revert5(arg1,(char const *)arg2,arg3,arg4,(apr_array_header_t const *)arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12);
+      
+      
+      
+    }
+    {
+      if (result) {
+        SV *exception_handler = perl_get_sv ("SVN::Error::handler", FALSE);
+        
+        if (SvOK(exception_handler)) {
+          SV *callback_result;
+          
+          svn_swig_pl_callback_thunk (CALL_SV, exception_handler,
+            &callback_result, "S", result,
+            SWIGTYPE_p_svn_error_t);
+        } else {
+          ST(argvi) = SWIG_NewPointerObj(result, SWIGTYPE_p_svn_error_t, 0);
+          argvi++;
+        }
+      }
+    }
+    
+    if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+    
+    
+    
+    
+    
+    
+    
+    
+    XSRETURN(argvi);
+  fail:
+    
+    if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+    
+    
+    
+    
+    
+    
+    
+    
+    SWIG_croak_null();
+  }
+}
+
+
 XS(_wrap_svn_wc_revert4) {
   {
     svn_wc_context_t *arg1 = (svn_wc_context_t *) 0 ;
@@ -37301,7 +36187,6 @@ XS(_wrap_svn_wc_revert4) {
     int ecode4 = 0 ;
     void *argp5 = 0 ;
     int res5 = 0 ;
-    int res7 ;
     int res9 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
@@ -37309,8 +36194,9 @@ XS(_wrap_svn_wc_revert4) {
     
     {
       _global_pool = arg10 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 9) || (items > 10)) {
+    if ((items < 8) || (items > 9)) {
       SWIG_croak("Usage: svn_wc_revert4(wc_ctx,local_abspath,depth,use_commit_times,changelist_filter,cancel_func,cancel_baton,notify_func,notify_baton,scratch_pool);");
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_context_t, 0 |  0 );
@@ -37339,26 +36225,20 @@ XS(_wrap_svn_wc_revert4) {
     }
     arg5 = (apr_array_header_t *)(argp5);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(5), (void**)(&arg6), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_revert4" "', argument " "6"" of type '" "svn_cancel_func_t""'"); 
-      }
-    }
-    res7 = SWIG_ConvertPtr(ST(6),SWIG_as_voidptrptr(&arg7), 0, 0);
-    if (!SWIG_IsOK(res7)) {
-      SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "svn_wc_revert4" "', argument " "7"" of type '" "void *""'"); 
+      arg6 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg7 = ST(5);
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(7), (void**)(&arg8), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void);
+      int res = SWIG_ConvertFunctionPtr(ST(6), (void**)(&arg8), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void);
       if (!SWIG_IsOK(res)) {
         SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_revert4" "', argument " "8"" of type '" "svn_wc_notify_func2_t""'"); 
       }
     }
-    res9 = SWIG_ConvertPtr(ST(8),SWIG_as_voidptrptr(&arg9), 0, 0);
+    res9 = SWIG_ConvertPtr(ST(7),SWIG_as_voidptrptr(&arg9), 0, 0);
     if (!SWIG_IsOK(res9)) {
       SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "svn_wc_revert4" "', argument " "9"" of type '" "void *""'"); 
     }
-    if (items > 9) {
+    if (items > 8) {
       
     }
     {
@@ -37391,8 +36271,6 @@ XS(_wrap_svn_wc_revert4) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
@@ -37403,8 +36281,6 @@ XS(_wrap_svn_wc_revert4) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -37434,7 +36310,6 @@ XS(_wrap_svn_wc_revert3) {
     int ecode4 = 0 ;
     void *argp5 = 0 ;
     int res5 = 0 ;
-    int res7 ;
     int res9 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
@@ -37442,8 +36317,9 @@ XS(_wrap_svn_wc_revert3) {
     
     {
       _global_pool = arg10 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 9) || (items > 10)) {
+    if ((items < 8) || (items > 9)) {
       SWIG_croak("Usage: svn_wc_revert3(path,parent_access,depth,use_commit_times,changelist_filter,cancel_func,cancel_baton,notify_func,notify_baton,pool);");
     }
     res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1);
@@ -37472,26 +36348,20 @@ XS(_wrap_svn_wc_revert3) {
     }
     arg5 = (apr_array_header_t *)(argp5);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(5), (void**)(&arg6), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_revert3" "', argument " "6"" of type '" "svn_cancel_func_t""'"); 
-      }
-    }
-    res7 = SWIG_ConvertPtr(ST(6),SWIG_as_voidptrptr(&arg7), 0, 0);
-    if (!SWIG_IsOK(res7)) {
-      SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "svn_wc_revert3" "', argument " "7"" of type '" "void *""'"); 
+      arg6 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg7 = ST(5);
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(7), (void**)(&arg8), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void);
+      int res = SWIG_ConvertFunctionPtr(ST(6), (void**)(&arg8), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void);
       if (!SWIG_IsOK(res)) {
         SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_revert3" "', argument " "8"" of type '" "svn_wc_notify_func2_t""'"); 
       }
     }
-    res9 = SWIG_ConvertPtr(ST(8),SWIG_as_voidptrptr(&arg9), 0, 0);
+    res9 = SWIG_ConvertPtr(ST(7),SWIG_as_voidptrptr(&arg9), 0, 0);
     if (!SWIG_IsOK(res9)) {
       SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "svn_wc_revert3" "', argument " "9"" of type '" "void *""'"); 
     }
-    if (items > 9) {
+    if (items > 8) {
       
     }
     {
@@ -37524,8 +36394,6 @@ XS(_wrap_svn_wc_revert3) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
@@ -37536,8 +36404,6 @@ XS(_wrap_svn_wc_revert3) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -37564,7 +36430,6 @@ XS(_wrap_svn_wc_revert2) {
     int ecode3 = 0 ;
     int val4 ;
     int ecode4 = 0 ;
-    int res6 ;
     int res8 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
@@ -37572,8 +36437,9 @@ XS(_wrap_svn_wc_revert2) {
     
     {
       _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 8) || (items > 9)) {
+    if ((items < 7) || (items > 8)) {
       SWIG_croak("Usage: svn_wc_revert2(path,parent_access,recursive,use_commit_times,cancel_func,cancel_baton,notify_func,notify_baton,pool);");
     }
     res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1);
@@ -37597,26 +36463,20 @@ XS(_wrap_svn_wc_revert2) {
     } 
     arg4 = (svn_boolean_t)(val4);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(4), (void**)(&arg5), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_revert2" "', argument " "5"" of type '" "svn_cancel_func_t""'"); 
-      }
-    }
-    res6 = SWIG_ConvertPtr(ST(5),SWIG_as_voidptrptr(&arg6), 0, 0);
-    if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "svn_wc_revert2" "', argument " "6"" of type '" "void *""'"); 
+      arg5 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg6 = ST(4);
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(6), (void**)(&arg7), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void);
+      int res = SWIG_ConvertFunctionPtr(ST(5), (void**)(&arg7), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void);
       if (!SWIG_IsOK(res)) {
         SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_revert2" "', argument " "7"" of type '" "svn_wc_notify_func2_t""'"); 
       }
     }
-    res8 = SWIG_ConvertPtr(ST(7),SWIG_as_voidptrptr(&arg8), 0, 0);
+    res8 = SWIG_ConvertPtr(ST(6),SWIG_as_voidptrptr(&arg8), 0, 0);
     if (!SWIG_IsOK(res8)) {
       SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "svn_wc_revert2" "', argument " "8"" of type '" "void *""'"); 
     }
-    if (items > 8) {
+    if (items > 7) {
       
     }
     {
@@ -37648,8 +36508,6 @@ XS(_wrap_svn_wc_revert2) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
@@ -37659,8 +36517,6 @@ XS(_wrap_svn_wc_revert2) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -37687,7 +36543,6 @@ XS(_wrap_svn_wc_revert) {
     int ecode3 = 0 ;
     int val4 ;
     int ecode4 = 0 ;
-    int res6 ;
     int res8 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
@@ -37695,8 +36550,9 @@ XS(_wrap_svn_wc_revert) {
     
     {
       _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 8) || (items > 9)) {
+    if ((items < 7) || (items > 8)) {
       SWIG_croak("Usage: svn_wc_revert(path,parent_access,recursive,use_commit_times,cancel_func,cancel_baton,notify_func,notify_baton,pool);");
     }
     res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1);
@@ -37720,26 +36576,20 @@ XS(_wrap_svn_wc_revert) {
     } 
     arg4 = (svn_boolean_t)(val4);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(4), (void**)(&arg5), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_revert" "', argument " "5"" of type '" "svn_cancel_func_t""'"); 
-      }
-    }
-    res6 = SWIG_ConvertPtr(ST(5),SWIG_as_voidptrptr(&arg6), 0, 0);
-    if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "svn_wc_revert" "', argument " "6"" of type '" "void *""'"); 
+      arg5 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg6 = ST(4);
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(6), (void**)(&arg7), SWIGTYPE_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void);
+      int res = SWIG_ConvertFunctionPtr(ST(5), (void**)(&arg7), SWIGTYPE_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void);
       if (!SWIG_IsOK(res)) {
         SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_revert" "', argument " "7"" of type '" "svn_wc_notify_func_t""'"); 
       }
     }
-    res8 = SWIG_ConvertPtr(ST(7),SWIG_as_voidptrptr(&arg8), 0, 0);
+    res8 = SWIG_ConvertPtr(ST(6),SWIG_as_voidptrptr(&arg8), 0, 0);
     if (!SWIG_IsOK(res8)) {
       SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "svn_wc_revert" "', argument " "8"" of type '" "void *""'"); 
     }
-    if (items > 8) {
+    if (items > 7) {
       
     }
     {
@@ -37771,8 +36621,6 @@ XS(_wrap_svn_wc_revert) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
@@ -37782,8 +36630,6 @@ XS(_wrap_svn_wc_revert) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -37809,6 +36655,7 @@ XS(_wrap_svn_wc_restore) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_wc_restore(wc_ctx,local_abspath,use_commit_times,scratch_pool);");
@@ -37889,6 +36736,7 @@ XS(_wrap_svn_wc_create_tmp_file2) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
@@ -37976,6 +36824,7 @@ XS(_wrap_svn_wc_create_tmp_file) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -38060,6 +36909,7 @@ XS(_wrap_svn_wc_translated_file2) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 4) || (items > 5)) {
@@ -38158,6 +37008,7 @@ XS(_wrap_svn_wc_translated_file) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 3) || (items > 4)) {
@@ -38253,6 +37104,7 @@ XS(_wrap_svn_wc_translated_stream) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 4) || (items > 5)) {
@@ -38304,7 +37156,11 @@ XS(_wrap_svn_wc_translated_stream) {
       }
     }
     {
-      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = svn_swig_pl_from_stream(*arg1); argvi++  ;
+      SV *tmp;
+      PUTBACK;
+      tmp = svn_swig_pl_from_stream(*arg1);
+      SPAGAIN;
+      if (argvi >= items) EXTEND(sp,1);  ST(argvi) = tmp; argvi++  ;
     }
     
     if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
@@ -38352,9 +37208,11 @@ XS(_wrap_svn_wc_transmit_text_deltas3) {
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = &temp2;
@@ -38377,7 +37235,7 @@ XS(_wrap_svn_wc_transmit_text_deltas3) {
     } 
     arg5 = (svn_boolean_t)(val5);
     {
-      svn_delta_make_editor(&arg6, &arg7, ST(3), _global_pool);
+      svn_swig_pl_make_editor(&arg6, &arg7, ST(3), _global_pool);
     }
     if (items > 4) {
       
@@ -38472,6 +37330,7 @@ XS(_wrap_svn_wc_transmit_text_deltas2) {
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     arg2 = temp2;
@@ -38494,7 +37353,7 @@ XS(_wrap_svn_wc_transmit_text_deltas2) {
     } 
     arg5 = (svn_boolean_t)(val5);
     {
-      svn_delta_make_editor(&arg6, &arg7, ST(3), _global_pool);
+      svn_swig_pl_make_editor(&arg6, &arg7, ST(3), _global_pool);
     }
     if (items > 4) {
       
@@ -38529,7 +37388,7 @@ XS(_wrap_svn_wc_transmit_text_deltas2) {
       }
     }
     {
-      /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = sv_2mortal(newSVpv(svn_md5_digest_to_cstring(arg2,
+      /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = sv_2mortal(newSVpv(svn_md5_digest_to_cstring(arg2,
             _global_pool),
           0)); argvi++ /*@SWIG@*/
       
@@ -38580,6 +37439,7 @@ XS(_wrap_svn_wc_transmit_text_deltas) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg6 = &temp6;
     if ((items < 4) || (items > 5)) {
@@ -38601,7 +37461,7 @@ XS(_wrap_svn_wc_transmit_text_deltas) {
     } 
     arg3 = (svn_boolean_t)(val3);
     {
-      svn_delta_make_editor(&arg4, &arg5, ST(3), _global_pool);
+      svn_swig_pl_make_editor(&arg4, &arg5, ST(3), _global_pool);
     }
     if (items > 4) {
       
@@ -38671,6 +37531,7 @@ XS(_wrap_svn_wc_transmit_prop_deltas2) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_wc_transmit_prop_deltas2(wc_ctx,local_abspath,editor,baton,scratch_pool);");
@@ -38686,7 +37547,7 @@ XS(_wrap_svn_wc_transmit_prop_deltas2) {
     }
     arg2 = (char *)(buf2);
     {
-      svn_delta_make_editor(&arg3, &arg4, ST(2), _global_pool);
+      svn_swig_pl_make_editor(&arg3, &arg4, ST(2), _global_pool);
     }
     if (items > 3) {
       
@@ -38750,6 +37611,7 @@ XS(_wrap_svn_wc_transmit_prop_deltas) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg6 = &temp6;
     if ((items < 4) || (items > 5)) {
@@ -38771,7 +37633,7 @@ XS(_wrap_svn_wc_transmit_prop_deltas) {
     }
     arg3 = (svn_wc_entry_t *)(argp3);
     {
-      svn_delta_make_editor(&arg4, &arg5, ST(3), _global_pool);
+      svn_swig_pl_make_editor(&arg4, &arg5, ST(3), _global_pool);
     }
     if (items > 4) {
       
@@ -38835,6 +37697,7 @@ XS(_wrap_svn_wc_get_default_ignores) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 1) || (items > 2)) {
@@ -38906,9 +37769,11 @@ XS(_wrap_svn_wc_get_ignores2) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 3) || (items > 5)) {
@@ -38994,6 +37859,7 @@ XS(_wrap_svn_wc_get_ignores) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 2) || (items > 3)) {
@@ -39066,6 +37932,7 @@ XS(_wrap_svn_wc_match_ignore_list) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_wc_match_ignore_list(str,list,pool);");
@@ -39076,7 +37943,7 @@ XS(_wrap_svn_wc_match_ignore_list) {
     }
     arg1 = (char *)(buf1);
     {
-      arg2 = (apr_array_header_t *) svn_swig_pl_strings_to_array(ST(1),
+      arg2 = svn_swig_pl_strings_to_array(ST(1),
         _global_pool);
     }
     if (items > 2) {
@@ -39122,6 +37989,7 @@ XS(_wrap_svn_wc_add_lock2) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_wc_add_lock2(wc_ctx,abspath,lock,scratch_pool);");
@@ -39201,6 +38069,7 @@ XS(_wrap_svn_wc_add_lock) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_wc_add_lock(path,lock,adm_access,pool);");
@@ -39277,6 +38146,7 @@ XS(_wrap_svn_wc_remove_lock2) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_wc_remove_lock2(wc_ctx,local_abspath,scratch_pool);");
@@ -39346,6 +38216,7 @@ XS(_wrap_svn_wc_remove_lock) {
     
     {
       _global_pool = arg3 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 2) || (items > 3)) {
       SWIG_croak("Usage: svn_wc_remove_lock(path,adm_access,pool);");
@@ -39801,19 +38672,20 @@ XS(_wrap_svn_wc_revision_status2) {
     int alloc4 = 0 ;
     int val5 ;
     int ecode5 = 0 ;
-    int res7 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
     dXSARGS;
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
-    if ((items < 6) || (items > 8)) {
+    if ((items < 5) || (items > 7)) {
       SWIG_croak("Usage: svn_wc_revision_status2(wc_ctx,local_abspath,trail_url,committed,cancel_func,cancel_baton,result_pool,scratch_pool);");
     }
     res2 = SWIG_ConvertPtr(ST(0), &argp2,SWIGTYPE_p_svn_wc_context_t, 0 |  0 );
@@ -39837,19 +38709,13 @@ XS(_wrap_svn_wc_revision_status2) {
     } 
     arg5 = (svn_boolean_t)(val5);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(4), (void**)(&arg6), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_revision_status2" "', argument " "6"" of type '" "svn_cancel_func_t""'"); 
-      }
-    }
-    res7 = SWIG_ConvertPtr(ST(5),SWIG_as_voidptrptr(&arg7), 0, 0);
-    if (!SWIG_IsOK(res7)) {
-      SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "svn_wc_revision_status2" "', argument " "7"" of type '" "void *""'"); 
+      arg6 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg7 = ST(4);
     }
-    if (items > 6) {
+    if (items > 5) {
       
     }
-    if (items > 7) {
+    if (items > 6) {
       
     }
     {
@@ -39884,8 +38750,6 @@ XS(_wrap_svn_wc_revision_status2) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
@@ -39895,8 +38759,6 @@ XS(_wrap_svn_wc_revision_status2) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -39921,16 +38783,16 @@ XS(_wrap_svn_wc_revision_status) {
     int alloc3 = 0 ;
     int val4 ;
     int ecode4 = 0 ;
-    int res6 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
     dXSARGS;
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
-    if ((items < 5) || (items > 6)) {
+    if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_wc_revision_status(wc_path,trail_url,committed,cancel_func,cancel_baton,pool);");
     }
     res2 = SWIG_AsCharPtrAndSize(ST(0), &buf2, NULL, &alloc2);
@@ -39949,16 +38811,10 @@ XS(_wrap_svn_wc_revision_status) {
     } 
     arg4 = (svn_boolean_t)(val4);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(3), (void**)(&arg5), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_revision_status" "', argument " "5"" of type '" "svn_cancel_func_t""'"); 
-      }
+      arg5 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg6 = ST(3);
     }
-    res6 = SWIG_ConvertPtr(ST(4),SWIG_as_voidptrptr(&arg6), 0, 0);
-    if (!SWIG_IsOK(res6)) {
-      SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "svn_wc_revision_status" "', argument " "6"" of type '" "void *""'"); 
-    }
-    if (items > 5) {
+    if (items > 4) {
       
     }
     {
@@ -39991,8 +38847,6 @@ XS(_wrap_svn_wc_revision_status) {
     if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
@@ -40000,8 +38854,6 @@ XS(_wrap_svn_wc_revision_status) {
     if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -40032,7 +38884,6 @@ XS(_wrap_svn_wc_set_changelist2) {
     int ecode4 = 0 ;
     void *argp5 = 0 ;
     int res5 = 0 ;
-    int res7 ;
     int res9 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
@@ -40040,8 +38891,9 @@ XS(_wrap_svn_wc_set_changelist2) {
     
     {
       _global_pool = arg10 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 9) || (items > 10)) {
+    if ((items < 8) || (items > 9)) {
       SWIG_croak("Usage: svn_wc_set_changelist2(wc_ctx,local_abspath,changelist,depth,changelist_filter,cancel_func,cancel_baton,notify_func,notify_baton,scratch_pool);");
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_context_t, 0 |  0 );
@@ -40070,26 +38922,20 @@ XS(_wrap_svn_wc_set_changelist2) {
     }
     arg5 = (apr_array_header_t *)(argp5);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(5), (void**)(&arg6), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_set_changelist2" "', argument " "6"" of type '" "svn_cancel_func_t""'"); 
-      }
-    }
-    res7 = SWIG_ConvertPtr(ST(6),SWIG_as_voidptrptr(&arg7), 0, 0);
-    if (!SWIG_IsOK(res7)) {
-      SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "svn_wc_set_changelist2" "', argument " "7"" of type '" "void *""'"); 
+      arg6 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg7 = ST(5);
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(7), (void**)(&arg8), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void);
+      int res = SWIG_ConvertFunctionPtr(ST(6), (void**)(&arg8), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void);
       if (!SWIG_IsOK(res)) {
         SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_set_changelist2" "', argument " "8"" of type '" "svn_wc_notify_func2_t""'"); 
       }
     }
-    res9 = SWIG_ConvertPtr(ST(8),SWIG_as_voidptrptr(&arg9), 0, 0);
+    res9 = SWIG_ConvertPtr(ST(7),SWIG_as_voidptrptr(&arg9), 0, 0);
     if (!SWIG_IsOK(res9)) {
       SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "svn_wc_set_changelist2" "', argument " "9"" of type '" "void *""'"); 
     }
-    if (items > 9) {
+    if (items > 8) {
       
     }
     {
@@ -40122,8 +38968,6 @@ XS(_wrap_svn_wc_set_changelist2) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
@@ -40134,8 +38978,6 @@ XS(_wrap_svn_wc_set_changelist2) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -40160,7 +39002,6 @@ XS(_wrap_svn_wc_set_changelist) {
     int alloc2 = 0 ;
     void *argp3 = 0 ;
     int res3 = 0 ;
-    int res5 ;
     int res7 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
@@ -40168,8 +39009,9 @@ XS(_wrap_svn_wc_set_changelist) {
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 7) || (items > 8)) {
+    if ((items < 6) || (items > 7)) {
       SWIG_croak("Usage: svn_wc_set_changelist(path,changelist,adm_access,cancel_func,cancel_baton,notify_func,notify_baton,pool);");
     }
     res1 = SWIG_AsCharPtrAndSize(ST(0), &buf1, NULL, &alloc1);
@@ -40188,26 +39030,20 @@ XS(_wrap_svn_wc_set_changelist) {
     }
     arg3 = (svn_wc_adm_access_t *)(argp3);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(3), (void**)(&arg4), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_set_changelist" "', argument " "4"" of type '" "svn_cancel_func_t""'"); 
-      }
-    }
-    res5 = SWIG_ConvertPtr(ST(4),SWIG_as_voidptrptr(&arg5), 0, 0);
-    if (!SWIG_IsOK(res5)) {
-      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "svn_wc_set_changelist" "', argument " "5"" of type '" "void *""'"); 
+      arg4 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg5 = ST(3);
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(5), (void**)(&arg6), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void);
+      int res = SWIG_ConvertFunctionPtr(ST(4), (void**)(&arg6), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void);
       if (!SWIG_IsOK(res)) {
         SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_set_changelist" "', argument " "6"" of type '" "svn_wc_notify_func2_t""'"); 
       }
     }
-    res7 = SWIG_ConvertPtr(ST(6),SWIG_as_voidptrptr(&arg7), 0, 0);
+    res7 = SWIG_ConvertPtr(ST(5),SWIG_as_voidptrptr(&arg7), 0, 0);
     if (!SWIG_IsOK(res7)) {
       SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "svn_wc_set_changelist" "', argument " "7"" of type '" "void *""'"); 
     }
-    if (items > 7) {
+    if (items > 6) {
       
     }
     {
@@ -40238,8 +39074,6 @@ XS(_wrap_svn_wc_set_changelist) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
@@ -40248,8 +39082,6 @@ XS(_wrap_svn_wc_set_changelist) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -40277,15 +39109,15 @@ XS(_wrap_svn_wc_get_changelists) {
     void *argp4 = 0 ;
     int res4 = 0 ;
     int res6 ;
-    int res8 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
     dXSARGS;
     
     {
       _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 8) || (items > 9)) {
+    if ((items < 7) || (items > 8)) {
       SWIG_croak("Usage: svn_wc_get_changelists(wc_ctx,local_abspath,depth,changelist_filter,callback_func,callback_baton,cancel_func,cancel_baton,scratch_pool);");
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_context_t, 0 |  0 );
@@ -40319,16 +39151,10 @@ XS(_wrap_svn_wc_get_changelists) {
       SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "svn_wc_get_changelists" "', argument " "6"" of type '" "void *""'"); 
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(6), (void**)(&arg7), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_get_changelists" "', argument " "7"" of type '" "svn_cancel_func_t""'"); 
-      }
+      arg7 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg8 = ST(6);
     }
-    res8 = SWIG_ConvertPtr(ST(7),SWIG_as_voidptrptr(&arg8), 0, 0);
-    if (!SWIG_IsOK(res8)) {
-      SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "svn_wc_get_changelists" "', argument " "8"" of type '" "void *""'"); 
-    }
-    if (items > 8) {
+    if (items > 7) {
       
     }
     {
@@ -40360,8 +39186,6 @@ XS(_wrap_svn_wc_get_changelists) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
@@ -40371,8 +39195,6 @@ XS(_wrap_svn_wc_get_changelists) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -40396,7 +39218,6 @@ XS(_wrap_svn_wc_crop_tree2) {
     int alloc2 = 0 ;
     int val3 ;
     int ecode3 = 0 ;
-    int res5 ;
     int res7 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
@@ -40404,8 +39225,9 @@ XS(_wrap_svn_wc_crop_tree2) {
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 7) || (items > 8)) {
+    if ((items < 6) || (items > 7)) {
       SWIG_croak("Usage: svn_wc_crop_tree2(wc_ctx,local_abspath,depth,cancel_func,cancel_baton,notify_func,notify_baton,scratch_pool);");
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_context_t, 0 |  0 );
@@ -40424,26 +39246,20 @@ XS(_wrap_svn_wc_crop_tree2) {
     } 
     arg3 = (svn_depth_t)(val3);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(3), (void**)(&arg4), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_crop_tree2" "', argument " "4"" of type '" "svn_cancel_func_t""'"); 
-      }
-    }
-    res5 = SWIG_ConvertPtr(ST(4),SWIG_as_voidptrptr(&arg5), 0, 0);
-    if (!SWIG_IsOK(res5)) {
-      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "svn_wc_crop_tree2" "', argument " "5"" of type '" "void *""'"); 
+      arg4 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg5 = ST(3);
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(5), (void**)(&arg6), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void);
+      int res = SWIG_ConvertFunctionPtr(ST(4), (void**)(&arg6), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void);
       if (!SWIG_IsOK(res)) {
         SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_crop_tree2" "', argument " "6"" of type '" "svn_wc_notify_func2_t""'"); 
       }
     }
-    res7 = SWIG_ConvertPtr(ST(6),SWIG_as_voidptrptr(&arg7), 0, 0);
+    res7 = SWIG_ConvertPtr(ST(5),SWIG_as_voidptrptr(&arg7), 0, 0);
     if (!SWIG_IsOK(res7)) {
       SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "svn_wc_crop_tree2" "', argument " "7"" of type '" "void *""'"); 
     }
-    if (items > 7) {
+    if (items > 6) {
       
     }
     {
@@ -40474,8 +39290,6 @@ XS(_wrap_svn_wc_crop_tree2) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
@@ -40484,8 +39298,6 @@ XS(_wrap_svn_wc_crop_tree2) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -40510,15 +39322,15 @@ XS(_wrap_svn_wc_crop_tree) {
     int val3 ;
     int ecode3 = 0 ;
     int res5 ;
-    int res7 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
     dXSARGS;
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 7) || (items > 8)) {
+    if ((items < 6) || (items > 7)) {
       SWIG_croak("Usage: svn_wc_crop_tree(anchor,target,depth,notify_func,notify_baton,cancel_func,cancel_baton,pool);");
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_adm_access_t, 0 |  0 );
@@ -40547,16 +39359,10 @@ XS(_wrap_svn_wc_crop_tree) {
       SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "svn_wc_crop_tree" "', argument " "5"" of type '" "void *""'"); 
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(5), (void**)(&arg6), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_crop_tree" "', argument " "6"" of type '" "svn_cancel_func_t""'"); 
-      }
+      arg6 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg7 = ST(5);
     }
-    res7 = SWIG_ConvertPtr(ST(6),SWIG_as_voidptrptr(&arg7), 0, 0);
-    if (!SWIG_IsOK(res7)) {
-      SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "svn_wc_crop_tree" "', argument " "7"" of type '" "void *""'"); 
-    }
-    if (items > 7) {
+    if (items > 6) {
       
     }
     {
@@ -40587,8 +39393,6 @@ XS(_wrap_svn_wc_crop_tree) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
@@ -40597,8 +39401,6 @@ XS(_wrap_svn_wc_crop_tree) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -40619,7 +39421,6 @@ XS(_wrap_svn_wc_exclude) {
     int res2 ;
     char *buf2 = 0 ;
     int alloc2 = 0 ;
-    int res4 ;
     int res6 ;
     int argvi = 0;
     svn_error_t *result = 0 ;
@@ -40627,8 +39428,9 @@ XS(_wrap_svn_wc_exclude) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
-    if ((items < 6) || (items > 7)) {
+    if ((items < 5) || (items > 6)) {
       SWIG_croak("Usage: svn_wc_exclude(wc_ctx,local_abspath,cancel_func,cancel_baton,notify_func,notify_baton,scratch_pool);");
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_wc_context_t, 0 |  0 );
@@ -40642,26 +39444,20 @@ XS(_wrap_svn_wc_exclude) {
     }
     arg2 = (char *)(buf2);
     {
-      int res = SWIG_ConvertFunctionPtr(ST(2), (void**)(&arg3), SWIGTYPE_p_f_p_void__p_svn_error_t);
-      if (!SWIG_IsOK(res)) {
-        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_exclude" "', argument " "3"" of type '" "svn_cancel_func_t""'"); 
-      }
-    }
-    res4 = SWIG_ConvertPtr(ST(3),SWIG_as_voidptrptr(&arg4), 0, 0);
-    if (!SWIG_IsOK(res4)) {
-      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "svn_wc_exclude" "', argument " "4"" of type '" "void *""'"); 
+      arg3 = (svn_cancel_func_t) svn_swig_pl_cancel_func;
+      arg4 = ST(2);
     }
     {
-      int res = SWIG_ConvertFunctionPtr(ST(4), (void**)(&arg5), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void);
+      int res = SWIG_ConvertFunctionPtr(ST(3), (void**)(&arg5), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void);
       if (!SWIG_IsOK(res)) {
         SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_wc_exclude" "', argument " "5"" of type '" "svn_wc_notify_func2_t""'"); 
       }
     }
-    res6 = SWIG_ConvertPtr(ST(5),SWIG_as_voidptrptr(&arg6), 0, 0);
+    res6 = SWIG_ConvertPtr(ST(4),SWIG_as_voidptrptr(&arg6), 0, 0);
     if (!SWIG_IsOK(res6)) {
       SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "svn_wc_exclude" "', argument " "6"" of type '" "void *""'"); 
     }
-    if (items > 6) {
+    if (items > 5) {
       
     }
     {
@@ -40691,8 +39487,6 @@ XS(_wrap_svn_wc_exclude) {
     
     
     
-    
-    
     XSRETURN(argvi);
   fail:
     
@@ -40700,8 +39494,6 @@ XS(_wrap_svn_wc_exclude) {
     
     
     
-    
-    
     SWIG_croak_null();
   }
 }
@@ -40733,6 +39525,7 @@ XS(_wrap_svn_wc_read_kind2) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 4) || (items > 5)) {
@@ -40831,6 +39624,7 @@ XS(_wrap_svn_wc_read_kind) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg1 = &temp1;
     if ((items < 3) || (items > 4)) {
@@ -40927,6 +39721,7 @@ XS(_wrap_svn_wc_diff_callbacks4_invoke_file_opened) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     arg3 = &temp3;
@@ -41066,6 +39861,7 @@ XS(_wrap_svn_wc_diff_callbacks4_invoke_file_changed) {
     
     {
       _global_pool = arg15 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg4 = &temp4;
     if ((items < 13) || (items > 14)) {
@@ -41266,6 +40062,7 @@ XS(_wrap_svn_wc_diff_callbacks4_invoke_file_added) {
     
     {
       _global_pool = arg17 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg4 = &temp4;
     if ((items < 15) || (items > 16)) {
@@ -41461,6 +40258,7 @@ XS(_wrap_svn_wc_diff_callbacks4_invoke_file_deleted) {
     
     {
       _global_pool = arg11 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg3 = &temp3;
     if ((items < 9) || (items > 10)) {
@@ -41595,6 +40393,7 @@ XS(_wrap_svn_wc_diff_callbacks4_invoke_dir_deleted) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg3 = &temp3;
     if ((items < 4) || (items > 5)) {
@@ -41700,6 +40499,7 @@ XS(_wrap_svn_wc_diff_callbacks4_invoke_dir_opened) {
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     arg3 = &temp3;
@@ -41833,6 +40633,7 @@ XS(_wrap_svn_wc_diff_callbacks4_invoke_dir_added) {
     
     {
       _global_pool = arg11 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg3 = &temp3;
     arg4 = &temp4;
@@ -41980,6 +40781,7 @@ XS(_wrap_svn_wc_diff_callbacks4_invoke_dir_props_changed) {
     
     {
       _global_pool = arg9 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg3 = &temp3;
     if ((items < 7) || (items > 8)) {
@@ -42106,6 +40908,7 @@ XS(_wrap_svn_wc_diff_callbacks4_invoke_dir_closed) {
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg4 = &temp4;
     if ((items < 6) || (items > 7)) {
@@ -44808,6 +43611,7 @@ XS(_wrap_svn_wc_entry_callbacks2_invoke_found_entry) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_wc_entry_callbacks2_invoke_found_entry(_obj,path,entry,walk_baton,pool);");
@@ -44895,6 +43699,7 @@ XS(_wrap_svn_wc_entry_callbacks2_invoke_handle_error) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_wc_entry_callbacks2_invoke_handle_error(_obj,path,err,walk_baton,pool);");
@@ -44982,6 +43787,7 @@ XS(_wrap_svn_wc_entry_callbacks_invoke_found_entry) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_wc_entry_callbacks_invoke_found_entry(_obj,path,entry,walk_baton,pool);");
@@ -45071,6 +43877,7 @@ XS(_wrap_svn_wc_invoke_external_update) {
     
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 6) || (items > 7)) {
       SWIG_croak("Usage: svn_wc_invoke_external_update(_obj,baton,local_abspath,old_val,new_val,depth,scratch_pool);");
@@ -45174,6 +43981,7 @@ XS(_wrap_svn_wc_invoke_notify_func2) {
     
     {
       _global_pool = arg4 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 3) || (items > 4)) {
       SWIG_croak("Usage: svn_wc_invoke_notify_func2(_obj,baton,notify,pool);");
@@ -45348,9 +44156,11 @@ XS(_wrap_svn_wc_invoke_conflict_resolver_func2) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     if ((items < 3) || (items > 5)) {
@@ -45445,6 +44255,7 @@ XS(_wrap_svn_wc_invoke_conflict_resolver_func) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     if ((items < 3) || (items > 4)) {
@@ -45536,6 +44347,7 @@ XS(_wrap_svn_wc_invoke_status_func4) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_wc_invoke_status_func4(_obj,baton,local_abspath,status,scratch_pool);");
@@ -45622,6 +44434,7 @@ XS(_wrap_svn_wc_invoke_status_func3) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_wc_invoke_status_func3(_obj,baton,path,status,pool);");
@@ -45834,6 +44647,7 @@ XS(_wrap_svn_wc_invoke_get_file) {
     
     {
       _global_pool = arg8 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg6 = &temp6;
     arg7 = &temp7;
@@ -45862,6 +44676,7 @@ XS(_wrap_svn_wc_invoke_get_file) {
     arg4 = (svn_revnum_t)(val4);
     {
       svn_swig_pl_make_stream (&arg5, ST(4));
+      SPAGAIN;
     }
     if (items > 5) {
       
@@ -45944,9 +44759,11 @@ XS(_wrap_svn_wc_invoke_dirents_func) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg3 = &temp3;
     if ((items < 4) || (items > 6)) {
@@ -46040,6 +44857,7 @@ XS(_wrap_svn_wc_invoke_canonicalize_svn_prop_get_file) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     if ((items < 3) || (items > 4)) {
@@ -46053,6 +44871,7 @@ XS(_wrap_svn_wc_invoke_canonicalize_svn_prop_get_file) {
     }
     {
       svn_swig_pl_make_stream (&arg3, ST(1));
+      SPAGAIN;
     }
     res4 = SWIG_ConvertPtr(ST(2),SWIG_as_voidptrptr(&arg4), 0, 0);
     if (!SWIG_IsOK(res4)) {
@@ -46129,9 +44948,11 @@ XS(_wrap_svn_wc_invoke_upgrade_get_repos_info) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     {
       _global_pool = arg7 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     arg2 = &temp2;
     arg3 = &temp3;
@@ -46241,6 +45062,7 @@ XS(_wrap_svn_wc_invoke_relocation_validator3) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 5) || (items > 6)) {
       SWIG_croak("Usage: svn_wc_invoke_relocation_validator3(_obj,baton,uuid,url,root_url,pool);");
@@ -46338,6 +45160,7 @@ XS(_wrap_svn_wc_invoke_relocation_validator2) {
     
     {
       _global_pool = arg6 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 5) || (items > 6)) {
       SWIG_croak("Usage: svn_wc_invoke_relocation_validator2(_obj,baton,uuid,url,root,pool);");
@@ -46509,6 +45332,7 @@ XS(_wrap_svn_changelist_invoke_receiver) {
     
     {
       _global_pool = arg5 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 4) || (items > 5)) {
       SWIG_croak("Usage: svn_changelist_invoke_receiver(_obj,baton,path,changelist,pool);");
@@ -46585,6 +45409,7 @@ XS(_wrap_svn_wc_swig_init_asp_dot_net_hack) {
     
     {
       _global_pool = arg1 = svn_swig_pl_make_pool (ST(items-1));
+      SPAGAIN;
     }
     if ((items < 0) || (items > 1)) {
       SWIG_croak("Usage: svn_wc_swig_init_asp_dot_net_hack(pool);");
@@ -47482,38 +46307,6 @@ static swig_command_info swig_commands[] = {
 {"SVN::_Wc::svn_wc_conflict_version_create2", _wrap_svn_wc_conflict_version_create2},
 {"SVN::_Wc::svn_wc_conflict_version_create", _wrap_svn_wc_conflict_version_create},
 {"SVN::_Wc::svn_wc_conflict_version_dup", _wrap_svn_wc_conflict_version_dup},
-{"SVN::_Wc::svn_wc_conflict_description2_t_local_abspath_set", _wrap_svn_wc_conflict_description2_t_local_abspath_set},
-{"SVN::_Wc::svn_wc_conflict_description2_t_local_abspath_get", _wrap_svn_wc_conflict_description2_t_local_abspath_get},
-{"SVN::_Wc::svn_wc_conflict_description2_t_node_kind_set", _wrap_svn_wc_conflict_description2_t_node_kind_set},
-{"SVN::_Wc::svn_wc_conflict_description2_t_node_kind_get", _wrap_svn_wc_conflict_description2_t_node_kind_get},
-{"SVN::_Wc::svn_wc_conflict_description2_t_kind_set", _wrap_svn_wc_conflict_description2_t_kind_set},
-{"SVN::_Wc::svn_wc_conflict_description2_t_kind_get", _wrap_svn_wc_conflict_description2_t_kind_get},
-{"SVN::_Wc::svn_wc_conflict_description2_t_property_name_set", _wrap_svn_wc_conflict_description2_t_property_name_set},
-{"SVN::_Wc::svn_wc_conflict_description2_t_property_name_get", _wrap_svn_wc_conflict_description2_t_property_name_get},
-{"SVN::_Wc::svn_wc_conflict_description2_t_is_binary_set", _wrap_svn_wc_conflict_description2_t_is_binary_set},
-{"SVN::_Wc::svn_wc_conflict_description2_t_is_binary_get", _wrap_svn_wc_conflict_description2_t_is_binary_get},
-{"SVN::_Wc::svn_wc_conflict_description2_t_mime_type_set", _wrap_svn_wc_conflict_description2_t_mime_type_set},
-{"SVN::_Wc::svn_wc_conflict_description2_t_mime_type_get", _wrap_svn_wc_conflict_description2_t_mime_type_get},
-{"SVN::_Wc::svn_wc_conflict_description2_t_action_set", _wrap_svn_wc_conflict_description2_t_action_set},
-{"SVN::_Wc::svn_wc_conflict_description2_t_action_get", _wrap_svn_wc_conflict_description2_t_action_get},
-{"SVN::_Wc::svn_wc_conflict_description2_t_reason_set", _wrap_svn_wc_conflict_description2_t_reason_set},
-{"SVN::_Wc::svn_wc_conflict_description2_t_reason_get", _wrap_svn_wc_conflict_description2_t_reason_get},
-{"SVN::_Wc::svn_wc_conflict_description2_t_base_abspath_set", _wrap_svn_wc_conflict_description2_t_base_abspath_set},
-{"SVN::_Wc::svn_wc_conflict_description2_t_base_abspath_get", _wrap_svn_wc_conflict_description2_t_base_abspath_get},
-{"SVN::_Wc::svn_wc_conflict_description2_t_their_abspath_set", _wrap_svn_wc_conflict_description2_t_their_abspath_set},
-{"SVN::_Wc::svn_wc_conflict_description2_t_their_abspath_get", _wrap_svn_wc_conflict_description2_t_their_abspath_get},
-{"SVN::_Wc::svn_wc_conflict_description2_t_my_abspath_set", _wrap_svn_wc_conflict_description2_t_my_abspath_set},
-{"SVN::_Wc::svn_wc_conflict_description2_t_my_abspath_get", _wrap_svn_wc_conflict_description2_t_my_abspath_get},
-{"SVN::_Wc::svn_wc_conflict_description2_t_merged_file_set", _wrap_svn_wc_conflict_description2_t_merged_file_set},
-{"SVN::_Wc::svn_wc_conflict_description2_t_merged_file_get", _wrap_svn_wc_conflict_description2_t_merged_file_get},
-{"SVN::_Wc::svn_wc_conflict_description2_t_operation_set", _wrap_svn_wc_conflict_description2_t_operation_set},
-{"SVN::_Wc::svn_wc_conflict_description2_t_operation_get", _wrap_svn_wc_conflict_description2_t_operation_get},
-{"SVN::_Wc::svn_wc_conflict_description2_t_src_left_version_set", _wrap_svn_wc_conflict_description2_t_src_left_version_set},
-{"SVN::_Wc::svn_wc_conflict_description2_t_src_left_version_get", _wrap_svn_wc_conflict_description2_t_src_left_version_get},
-{"SVN::_Wc::svn_wc_conflict_description2_t_src_right_version_set", _wrap_svn_wc_conflict_description2_t_src_right_version_set},
-{"SVN::_Wc::svn_wc_conflict_description2_t_src_right_version_get", _wrap_svn_wc_conflict_description2_t_src_right_version_get},
-{"SVN::_Wc::new_svn_wc_conflict_description2_t", _wrap_new_svn_wc_conflict_description2_t},
-{"SVN::_Wc::delete_svn_wc_conflict_description2_t", _wrap_delete_svn_wc_conflict_description2_t},
 {"SVN::_Wc::svn_wc_conflict_description_t_path_set", _wrap_svn_wc_conflict_description_t_path_set},
 {"SVN::_Wc::svn_wc_conflict_description_t_path_get", _wrap_svn_wc_conflict_description_t_path_get},
 {"SVN::_Wc::svn_wc_conflict_description_t_node_kind_set", _wrap_svn_wc_conflict_description_t_node_kind_set},
@@ -47554,15 +46347,8 @@ static swig_command_info swig_commands[] = {
 {"SVN::_Wc::svn_wc_conflict_description_create_prop", _wrap_svn_wc_conflict_description_create_prop},
 {"SVN::_Wc::svn_wc_conflict_description_create_tree2", _wrap_svn_wc_conflict_description_create_tree2},
 {"SVN::_Wc::svn_wc_conflict_description_create_tree", _wrap_svn_wc_conflict_description_create_tree},
+{"SVN::_Wc::svn_wc_conflict_description2_dup", _wrap_svn_wc_conflict_description2_dup},
 {"SVN::_Wc::svn_wc__conflict_description2_dup", _wrap_svn_wc__conflict_description2_dup},
-{"SVN::_Wc::svn_wc_conflict_result_t_choice_set", _wrap_svn_wc_conflict_result_t_choice_set},
-{"SVN::_Wc::svn_wc_conflict_result_t_choice_get", _wrap_svn_wc_conflict_result_t_choice_get},
-{"SVN::_Wc::svn_wc_conflict_result_t_merged_file_set", _wrap_svn_wc_conflict_result_t_merged_file_set},
-{"SVN::_Wc::svn_wc_conflict_result_t_merged_file_get", _wrap_svn_wc_conflict_result_t_merged_file_get},
-{"SVN::_Wc::svn_wc_conflict_result_t_save_merged_set", _wrap_svn_wc_conflict_result_t_save_merged_set},
-{"SVN::_Wc::svn_wc_conflict_result_t_save_merged_get", _wrap_svn_wc_conflict_result_t_save_merged_get},
-{"SVN::_Wc::new_svn_wc_conflict_result_t", _wrap_new_svn_wc_conflict_result_t},
-{"SVN::_Wc::delete_svn_wc_conflict_result_t", _wrap_delete_svn_wc_conflict_result_t},
 {"SVN::_Wc::svn_wc_create_conflict_result", _wrap_svn_wc_create_conflict_result},
 {"SVN::_Wc::svn_wc_diff_callbacks4_t_file_opened_set", _wrap_svn_wc_diff_callbacks4_t_file_opened_set},
 {"SVN::_Wc::svn_wc_diff_callbacks4_t_file_opened_get", _wrap_svn_wc_diff_callbacks4_t_file_opened_get},
@@ -47832,6 +46618,8 @@ static swig_command_info swig_commands[] = {
 {"SVN::_Wc::svn_wc_status3_t_moved_to_abspath_get", _wrap_svn_wc_status3_t_moved_to_abspath_get},
 {"SVN::_Wc::svn_wc_status3_t_file_external_set", _wrap_svn_wc_status3_t_file_external_set},
 {"SVN::_Wc::svn_wc_status3_t_file_external_get", _wrap_svn_wc_status3_t_file_external_get},
+{"SVN::_Wc::svn_wc_status3_t_actual_kind_set", _wrap_svn_wc_status3_t_actual_kind_set},
+{"SVN::_Wc::svn_wc_status3_t_actual_kind_get", _wrap_svn_wc_status3_t_actual_kind_get},
 {"SVN::_Wc::new_svn_wc_status3_t", _wrap_new_svn_wc_status3_t},
 {"SVN::_Wc::delete_svn_wc_status3_t", _wrap_delete_svn_wc_status3_t},
 {"SVN::_Wc::svn_wc_status2_t_entry_set", _wrap_svn_wc_status2_t_entry_set},
@@ -47911,6 +46699,7 @@ static swig_command_info swig_commands[] = {
 {"SVN::_Wc::svn_wc_delete3", _wrap_svn_wc_delete3},
 {"SVN::_Wc::svn_wc_delete2", _wrap_svn_wc_delete2},
 {"SVN::_Wc::svn_wc_delete", _wrap_svn_wc_delete},
+{"SVN::_Wc::svn_wc_add_from_disk3", _wrap_svn_wc_add_from_disk3},
 {"SVN::_Wc::svn_wc_add_from_disk2", _wrap_svn_wc_add_from_disk2},
 {"SVN::_Wc::svn_wc_add_from_disk", _wrap_svn_wc_add_from_disk},
 {"SVN::_Wc::svn_wc_add4", _wrap_svn_wc_add4},
@@ -47929,6 +46718,7 @@ static swig_command_info swig_commands[] = {
 {"SVN::_Wc::svn_wc_resolved_conflict2", _wrap_svn_wc_resolved_conflict2},
 {"SVN::_Wc::svn_wc_resolved_conflict", _wrap_svn_wc_resolved_conflict},
 {"SVN::_Wc::svn_wc_committed_queue_create", _wrap_svn_wc_committed_queue_create},
+{"SVN::_Wc::svn_wc_queue_committed4", _wrap_svn_wc_queue_committed4},
 {"SVN::_Wc::svn_wc_queue_committed3", _wrap_svn_wc_queue_committed3},
 {"SVN::_Wc::svn_wc_queue_committed2", _wrap_svn_wc_queue_committed2},
 {"SVN::_Wc::svn_wc_queue_committed", _wrap_svn_wc_queue_committed},
@@ -47995,6 +46785,7 @@ static swig_command_info swig_commands[] = {
 {"SVN::_Wc::svn_wc_get_pristine_contents2", _wrap_svn_wc_get_pristine_contents2},
 {"SVN::_Wc::svn_wc_get_pristine_contents", _wrap_svn_wc_get_pristine_contents},
 {"SVN::_Wc::svn_wc_get_pristine_copy_path", _wrap_svn_wc_get_pristine_copy_path},
+{"SVN::_Wc::svn_wc_cleanup4", _wrap_svn_wc_cleanup4},
 {"SVN::_Wc::svn_wc_cleanup3", _wrap_svn_wc_cleanup3},
 {"SVN::_Wc::svn_wc_cleanup2", _wrap_svn_wc_cleanup2},
 {"SVN::_Wc::svn_wc_cleanup", _wrap_svn_wc_cleanup},
@@ -48003,6 +46794,7 @@ static swig_command_info swig_commands[] = {
 {"SVN::_Wc::svn_wc_relocate3", _wrap_svn_wc_relocate3},
 {"SVN::_Wc::svn_wc_relocate2", _wrap_svn_wc_relocate2},
 {"SVN::_Wc::svn_wc_relocate", _wrap_svn_wc_relocate},
+{"SVN::_Wc::svn_wc_revert5", _wrap_svn_wc_revert5},
 {"SVN::_Wc::svn_wc_revert4", _wrap_svn_wc_revert4},
 {"SVN::_Wc::svn_wc_revert3", _wrap_svn_wc_revert3},
 {"SVN::_Wc::svn_wc_revert2", _wrap_svn_wc_revert2},
@@ -48102,18 +46894,18 @@ static swig_command_info swig_commands[] = {
 };
 /* -----------------------------------------------------------------------------
  * Type initialization:
- * This problem is tough by the requirement that no dynamic 
- * memory is used. Also, since swig_type_info structures store pointers to 
+ * This problem is tough by the requirement that no dynamic
+ * memory is used. Also, since swig_type_info structures store pointers to
  * swig_cast_info structures and swig_cast_info structures store pointers back
- * to swig_type_info structures, we need some lookup code at initialization. 
- * The idea is that swig generates all the structures that are needed. 
- * The runtime then collects these partially filled structures. 
- * The SWIG_InitializeModule function takes these initial arrays out of 
+ * to swig_type_info structures, we need some lookup code at initialization.
+ * The idea is that swig generates all the structures that are needed.
+ * The runtime then collects these partially filled structures.
+ * The SWIG_InitializeModule function takes these initial arrays out of
  * swig_module, and does all the lookup, filling in the swig_module.types
  * array with the correct data and linking the correct swig_cast_info
  * structures together.
  *
- * The generated swig_type_info structures are assigned staticly to an initial 
+ * The generated swig_type_info structures are assigned staticly to an initial
  * array. We just loop through that array, and handle each type individually.
  * First we lookup if this type has been already loaded, and if so, use the
  * loaded structure instead of the generated one. Then we have to fill in the
@@ -48123,17 +46915,17 @@ static swig_command_info swig_commands[] = {
  * a column is one of the swig_cast_info structures for that type.
  * The cast_initial array is actually an array of arrays, because each row has
  * a variable number of columns. So to actually build the cast linked list,
- * we find the array of casts associated with the type, and loop through it 
+ * we find the array of casts associated with the type, and loop through it
  * adding the casts to the list. The one last trick we need to do is making
  * sure the type pointer in the swig_cast_info struct is correct.
  *
- * First off, we lookup the cast->type name to see if it is already loaded. 
+ * First off, we lookup the cast->type name to see if it is already loaded.
  * There are three cases to handle:
  *  1) If the cast->type has already been loaded AND the type we are adding
  *     casting info to has not been loaded (it is in this module), THEN we
  *     replace the cast->type pointer with the type pointer that has already
  *     been loaded.
- *  2) If BOTH types (the one we are adding casting info to, and the 
+ *  2) If BOTH types (the one we are adding casting info to, and the
  *     cast->type) are loaded, THEN the cast info has already been loaded by
  *     the previous module so we just ignore it.
  *  3) Finally, if cast->type has not already been loaded, then we add that
@@ -48196,7 +46988,7 @@ SWIG_InitializeModule(void *clientdata) {
     module_head->next = &swig_module;
   }
   
-  /* When multiple interpeters are used, a module could have already been initialized in
+  /* When multiple interpreters are used, a module could have already been initialized in
        a different interpreter, but not yet have a pointer in this interpreter.
        In this case, we do not want to continue adding types... everything should be
        set up already */
@@ -48395,747 +47187,772 @@ XS(SWIG_init) {
     SvREADONLY_on(sv);
   }
   
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_WC_TRANSLATE_FROM_NF", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(0x00000000)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_WC_TRANSLATE_TO_NF", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(0x00000001)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_WC_TRANSLATE_FORCE_EOL_REPAIR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(0x00000002)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_WC_TRANSLATE_NO_OUTPUT_CLEANUP", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(0x00000004)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_WC_TRANSLATE_FORCE_COPY", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(0x00000008)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_WC_TRANSLATE_USE_GLOBAL_TMP", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(0x00000010)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_WC_ADM_DIR_NAME", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr(".svn"));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_add", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_add)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_copy", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_copy)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_delete", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_delete)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_restore", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_restore)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_revert", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_revert)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_failed_revert", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_failed_revert)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_resolved", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_resolved)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_skip", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_skip)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_update_delete", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_update_delete)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_update_add", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_update_add)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_update_update", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_update_update)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_update_completed", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_update_completed)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_update_external", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_update_external)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_status_completed", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_status_completed)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_status_external", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_status_external)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_commit_modified", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_commit_modified)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_commit_added", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_commit_added)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_commit_deleted", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_commit_deleted)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_commit_replaced", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_commit_replaced)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_commit_postfix_txdelta", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_commit_postfix_txdelta)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_blame_revision", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_blame_revision)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_locked", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_locked)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_unlocked", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_unlocked)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_failed_lock", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_failed_lock)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_failed_unlock", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_failed_unlock)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_exists", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_exists)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_changelist_set", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_changelist_set)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_changelist_clear", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_changelist_clear)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_changelist_moved", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_changelist_moved)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_merge_begin", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_merge_begin)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_foreign_merge_begin", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_foreign_merge_begin)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_update_replace", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_update_replace)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_property_added", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_property_added)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_property_modified", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_property_modified)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_property_deleted", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_property_deleted)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_property_deleted_nonexistent", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_property_deleted_nonexistent)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_revprop_set", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_revprop_set)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_revprop_deleted", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_revprop_deleted)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_merge_completed", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_merge_completed)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_tree_conflict", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_tree_conflict)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_failed_external", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_failed_external)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_update_started", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_update_started)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_update_skip_obstruction", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_update_skip_obstruction)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_update_skip_working_only", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_update_skip_working_only)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_update_skip_access_denied", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_update_skip_access_denied)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_update_external_removed", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_update_external_removed)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_update_shadowed_add", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_update_shadowed_add)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_update_shadowed_update", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_update_shadowed_update)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_update_shadowed_delete", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_update_shadowed_delete)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_merge_record_info", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_merge_record_info)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_upgraded_path", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_upgraded_path)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_merge_record_info_begin", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_merge_record_info_begin)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_merge_elide_info", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_merge_elide_info)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_patch", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_patch)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_patch_applied_hunk", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_patch_applied_hunk)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_patch_rejected_hunk", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_patch_rejected_hunk)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_patch_hunk_already_applied", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_patch_hunk_already_applied)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_commit_copied", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_commit_copied)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_commit_copied_replaced", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_commit_copied_replaced)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_url_redirect", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_url_redirect)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_path_nonexistent", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_path_nonexistent)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_exclude", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_exclude)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_failed_conflict", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_failed_conflict)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_failed_missing", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_failed_missing)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_failed_out_of_date", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_failed_out_of_date)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_failed_no_parent", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_failed_no_parent)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_failed_locked", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_failed_locked)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_failed_forbidden_by_server", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_failed_forbidden_by_server)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_skip_conflicted", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_skip_conflicted)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_update_broken_lock", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_update_broken_lock)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_failed_obstruction", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_failed_obstruction)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_conflict_resolver_starting", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_conflict_resolver_starting)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_conflict_resolver_done", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_conflict_resolver_done)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_left_local_modifications", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_left_local_modifications)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_foreign_copy_begin", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_foreign_copy_begin)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_move_broken", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_move_broken)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_cleanup_external", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_cleanup_external)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_failed_requires_target", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_failed_requires_target)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_info_external", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_info_external)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_commit_finalizing", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_commit_finalizing)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_state_inapplicable", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_state_inapplicable)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_state_unknown", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_state_unknown)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_state_unchanged", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_state_unchanged)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_state_missing", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_state_missing)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_state_obstructed", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_state_obstructed)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_state_changed", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_state_changed)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_state_merged", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_state_merged)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_state_conflicted", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_state_conflicted)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_state_source_missing", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_state_source_missing)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_lock_state_inapplicable", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_lock_state_inapplicable)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_lock_state_unknown", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_lock_state_unknown)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_lock_state_unchanged", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_lock_state_unchanged)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_lock_state_locked", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_lock_state_locked)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_lock_state_unlocked", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_lock_state_unlocked)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_action_edit", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_action_edit)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_action_add", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_action_add)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_action_delete", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_action_delete)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_action_replace", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_action_replace)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_reason_edited", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_reason_edited)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_reason_obstructed", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_reason_obstructed)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_reason_deleted", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_reason_deleted)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_reason_missing", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_reason_missing)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_reason_unversioned", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_reason_unversioned)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_reason_added", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_reason_added)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_reason_replaced", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_reason_replaced)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_reason_moved_away", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_reason_moved_away)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_reason_moved_here", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_reason_moved_here)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_kind_text", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_kind_text)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_kind_property", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_kind_property)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_kind_tree", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_kind_tree)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_operation_none", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_operation_none)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_operation_update", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_operation_update)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_operation_switch", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_operation_switch)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_operation_merge", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_operation_merge)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+    SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_choose_undefined", TRUE | 0x2 | GV_ADDMULTI);
+    sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_choose_undefined)));
+    SvREADONLY_on(sv);
+  } while(0) /*@SWIG@*/;
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_choose_postpone", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_choose_postpone)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_choose_base", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_choose_base)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_choose_theirs_full", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_choose_theirs_full)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_choose_mine_full", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_choose_mine_full)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_choose_theirs_conflict", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_choose_theirs_conflict)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_choose_mine_conflict", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_choose_mine_conflict)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_choose_merged", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_choose_merged)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_choose_unspecified", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_choose_unspecified)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_schedule_normal", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_schedule_normal)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_schedule_add", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_schedule_add)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_schedule_delete", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_schedule_delete)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_schedule_replace", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_schedule_replace)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_WC_ENTRY_WORKING_SIZE_UNKNOWN", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)((-1))));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "SVN_WC_ENTRY_THIS_DIR", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_FromCharPtr(""));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_status_none", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_status_none)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_status_unversioned", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_status_unversioned)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_status_normal", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_status_normal)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_status_added", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_status_added)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_status_missing", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_status_missing)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_status_deleted", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_status_deleted)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_status_replaced", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_status_replaced)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_status_modified", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_status_modified)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_status_merged", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_status_merged)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_status_conflicted", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_status_conflicted)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_status_ignored", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_status_ignored)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_status_obstructed", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_status_obstructed)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_status_external", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_status_external)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_status_incomplete", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_status_incomplete)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_merge_unchanged", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_merge_unchanged)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_merge_merged", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_merge_merged)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_merge_conflict", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_merge_conflict)));
     SvREADONLY_on(sv);
   } while(0) /*@SWIG@*/;
-  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+  /*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do {
     SV *sv = get_sv((char*) SWIG_prefix "svn_wc_merge_no_merge", TRUE | 0x2 | GV_ADDMULTI);
     sv_setsv(sv, SWIG_From_int  SWIG_PERL_CALL_ARGS_1((int)(svn_wc_merge_no_merge)));
     SvREADONLY_on(sv);
diff --git a/subversion/bindings/swig/perl/native/t/1repos.t b/subversion/bindings/swig/perl/native/t/1repos.t
index 85abd2c..0375d7e 100644
--- a/subversion/bindings/swig/perl/native/t/1repos.t
+++ b/subversion/bindings/swig/perl/native/t/1repos.t
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 #
 #
 # Licensed to the Apache Software Foundation (ASF) under one
@@ -20,16 +20,21 @@
 #
 #
 
-use Test::More tests => 6;
+use strict;
+use warnings;
+
+use Test::More tests => 8;
 use File::Temp qw(tempdir);
 use File::Path qw(rmtree);
-use strict;
+use File::Spec;
+use POSIX qw(locale_h);
 
-require SVN::Core;
-require SVN::Repos;
-require SVN::Fs;
-require SVN::Delta;
-use File::Path;
+use SVN::Core;
+use SVN::Repos;
+use SVN::Fs;
+use SVN::Delta;
+
+setlocale(LC_ALL, "C");
 
 my $repospath = tempdir('svn-perl-test-XXXXXX', TMPDIR => 1, CLEANUP => 1);
 
@@ -107,6 +112,26 @@ ok($main::something_destroyed, 'callback properly destroyed');
 # TEST
 cmp_ok($fs->youngest_rev, '==', 3);
 
+open my $dump_fh, ">", File::Spec->devnull or die "open file sink: $!";
+
+my $feedback;
+open my $feedback_fh, ">", \$feedback or die "open string: $!";
+
+my $cancel_cb_called = 0;
+$repos->dump_fs2($dump_fh, $feedback_fh,
+                 0, $SVN::Core::INVALID_REVNUM,     # start_rev, end_rev
+                 0, 0,                              # incremental, deltify
+                 sub { $cancel_cb_called++; 0 });
+# TEST
+ok($cancel_cb_called, 'cancel callback was called');
+# TEST
+is($feedback, <<'...', 'dump feedback');
+* Dumped revision 0.
+* Dumped revision 1.
+* Dumped revision 2.
+* Dumped revision 3.
+...
+
 END {
 diag "cleanup";
 rmtree($repospath);
diff --git a/subversion/bindings/swig/perl/native/t/3client.t b/subversion/bindings/swig/perl/native/t/3client.t
index 4a97f38..5d5c64f 100644
--- a/subversion/bindings/swig/perl/native/t/3client.t
+++ b/subversion/bindings/swig/perl/native/t/3client.t
@@ -20,7 +20,7 @@
 #
 #
 
-use Test::More tests => 297;
+use Test::More tests => 302;
 use strict;
 
 # shut up about variables that are only used once.
@@ -1119,6 +1119,45 @@ isa_ok($ph2,'HASH','propget returns HASH');
 is(scalar(keys %$ph2),0,
    'No properties after deleting a property');
 
+# test cancel callback
+my $cancel_cb_called = 0;
+$ctx->cancel(sub { $cancel_cb_called++; 0 });
+my $log_entries_received = 0;
+$ctx->log5($reposurl,
+              'HEAD',['HEAD',1],0, # peg rev, rev ranges, limit
+              1,1,0, # discover_changed_paths, strict_node_history, include_merged_revisions
+              undef, # revprops
+              sub { $log_entries_received++ });
+# TEST
+ok($cancel_cb_called, 'cancel callback was called');
+# TEST
+is($log_entries_received, $current_rev, 'log entries received');
+
+my $cancel_msg = "stop the presses";
+$ctx->cancel(sub { $cancel_msg });
+$svn_error = $ctx->log5($reposurl,
+              'HEAD',['HEAD',1],0, # peg rev, rev ranges, limit
+              1,1,0, # discover_changed_paths, strict_node_history, include_merged_revisions
+              undef, # revprops
+              sub { });
+# TEST
+isa_ok($svn_error, '_p_svn_error_t', 'return of a cancelled operation');
+# TEST
+is($svn_error->apr_err, $SVN::Error::CANCELLED, "SVN_ERR_CANCELLED");
+{
+    # If we're running a debug build, $svn_error may be the top of a
+    # chain of svn_error_t's (all with message "traced call"), we need 
+    # to get to the bottom svn_error_t to check for the original message.
+    my $chained = $svn_error;
+    $chained = $chained->child while $chained->child;
+    # TEST
+    is($chained->message, $cancel_msg, 'cancellation message');
+}
+
+$svn_error->clear(); # don't leak this
+$ctx->cancel(undef); # reset cancel callback
+
+
 SKIP: {
     # This is ugly.  It is included here as an aide to understand how
     # to test this and because it makes my life easier as I only have
@@ -1236,7 +1275,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 {
diff --git a/subversion/bindings/swig/perl/native/t/6ra.t b/subversion/bindings/swig/perl/native/t/6ra.t
index 083ea86..26bbf55 100644
--- a/subversion/bindings/swig/perl/native/t/6ra.t
+++ b/subversion/bindings/swig/perl/native/t/6ra.t
@@ -202,12 +202,6 @@ is($ed->{trunk}{props}{'dir-prop'}, 'frob', 'replay: dir-prop');
 is($ed->{'trunk/filea'}{props}{'binary-prop'}, $BINARY_DATA,
    'replay: binary-prop');
 
-END {
-diag "cleanup";
-rmtree($repospath);
-}
-
-
 package MockEditor;
 
 sub new { bless {}, shift }
diff --git a/subversion/bindings/swig/proxy/pyrun.swg b/subversion/bindings/swig/proxy/pyrun.swg
index 3585e7a..b077fad 100644
--- a/subversion/bindings/swig/proxy/pyrun.swg
+++ b/subversion/bindings/swig/proxy/pyrun.swg
@@ -449,34 +449,6 @@ SwigPyObject_repr(SwigPyObject *v, PyObject *args)
 }
 
 SWIGRUNTIME int
-SwigPyObject_print(SwigPyObject *v, FILE *fp, int SWIGUNUSEDPARM(flags))
-{
-  char *str;
-#ifdef METH_NOARGS
-  PyObject *repr = SwigPyObject_repr(v);
-#else
-  PyObject *repr = SwigPyObject_repr(v, NULL);
-#endif
-  if (repr) {
-    str = SWIG_Python_str_AsChar(repr); 
-    fputs(str, fp);
-    SWIG_Python_str_DelForPy3(str);
-    Py_DECREF(repr);
-    return 0; 
-  } else {
-    return 1; 
-  }
-}
-
-SWIGRUNTIME PyObject *
-SwigPyObject_str(SwigPyObject *v)
-{
-  char result[SWIG_BUFFER_SIZE];
-  return SWIG_PackVoidPtr(result, v->ptr, v->ty->name, sizeof(result)) ?
-    SWIG_Python_str_FromChar(result) : 0;
-}
-
-SWIGRUNTIME int
 SwigPyObject_compare(SwigPyObject *v, SwigPyObject *w)
 {
   void *i = v->ptr;
@@ -668,7 +640,7 @@ SwigPyObject_own(PyObject *v, PyObject *args)
 static PyMethodDef
 swigobject_methods[] = {
   {(char *)"disown",  (PyCFunction)SwigPyObject_disown,  METH_NOARGS,  (char *)"releases ownership of the pointer"},
-  {(char *)"acquire", (PyCFunction)SwigPyObject_acquire, METH_NOARGS,  (char *)"aquires ownership of the pointer"},
+  {(char *)"acquire", (PyCFunction)SwigPyObject_acquire, METH_NOARGS,  (char *)"acquires ownership of the pointer"},
   {(char *)"own",     (PyCFunction)SwigPyObject_own,     METH_VARARGS, (char *)"returns/sets ownership of the pointer"},
   {(char *)"append",  (PyCFunction)SwigPyObject_append,  METH_O,       (char *)"appends another 'this' object"},
   {(char *)"next",    (PyCFunction)SwigPyObject_next,    METH_NOARGS,  (char *)"returns the next 'this' object"},
@@ -761,7 +733,7 @@ SwigPyObject_TypeOnce(void) {
       sizeof(SwigPyObject),                 /* tp_basicsize */
       0,                                    /* tp_itemsize */
       (destructor)SwigPyObject_dealloc,     /* tp_dealloc */
-      (printfunc)SwigPyObject_print,        /* tp_print */
+      0,				    /* tp_print */
 #if PY_VERSION_HEX < 0x02020000
       (getattrfunc)SwigPyObject_getattr,    /* tp_getattr */
 #else
@@ -779,7 +751,7 @@ SwigPyObject_TypeOnce(void) {
       0,                                    /* tp_as_mapping */
       (hashfunc)0,                          /* tp_hash */
       (ternaryfunc)0,                       /* tp_call */
-      (reprfunc)SwigPyObject_str,           /* tp_str */
+      0,				    /* tp_str */
       PyObject_GenericGetAttr,              /* tp_getattro */
       0,                                    /* tp_setattro */
       0,                                    /* tp_as_buffer */
@@ -1156,10 +1128,11 @@ SWIGRUNTIME int
 SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int flags, int *own) {
   int res;
   SwigPyObject *sobj;
+  int implicit_conv = (flags & SWIG_POINTER_IMPLICIT_CONV) != 0;
 
   if (!obj)
     return SWIG_ERROR;
-  if (obj == Py_None) {
+  if (obj == Py_None && !implicit_conv) {
     if (ptr)
       *ptr = 0;
     return SWIG_OK;
@@ -1208,7 +1181,7 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
     }
     res = SWIG_OK;
   } else {
-    if (flags & SWIG_POINTER_IMPLICIT_CONV) {
+    if (implicit_conv) {
       SwigPyClientData *data = ty ? (SwigPyClientData *) ty->clientdata : 0;
       if (data && !data->implicitconv) {
         PyObject *klass = data->klass;
@@ -1243,6 +1216,13 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
         }
       }
     }
+    if (!SWIG_IsOK(res) && obj == Py_None) {
+      if (ptr)
+        *ptr = 0;
+      if (PyErr_Occurred())
+        PyErr_Clear();
+      res = SWIG_OK;
+    }
   }
   return res;
 }
@@ -1742,7 +1722,7 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) {
   PyObject *descr;
   PyObject *encoded_name;
   descrsetfunc f;
-  int res;
+  int res = -1;
 
 # ifdef Py_USING_UNICODE
   if (PyString_Check(name)) {
@@ -1765,7 +1745,6 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) {
       goto done;
   }
 
-  res = -1;
   descr = _PyType_Lookup(tp, name);
   f = NULL;
   if (descr != NULL)
diff --git a/subversion/bindings/swig/proxy/svn_client_h.swg b/subversion/bindings/swig/proxy/svn_client_h.swg
index a11cccc..2fe2715 100644
--- a/subversion/bindings/swig/proxy/svn_client_h.swg
+++ b/subversion/bindings/swig/proxy/svn_client_h.swg
@@ -60,6 +60,7 @@
   void *log_msg_baton3,
   void *conflict_baton,
   void *conflict_baton2,
+  void *tunnel_baton,
   void *commit_baton,
   void *filter_baton,
   void *backwards_compatibility_baton,
diff --git a/subversion/bindings/swig/proxy/svn_config_h.swg b/subversion/bindings/swig/proxy/svn_config_h.swg
index 7b4b50f..63db12a 100644
--- a/subversion/bindings/swig/proxy/svn_config_h.swg
+++ b/subversion/bindings/swig/proxy/svn_config_h.swg
@@ -29,7 +29,6 @@
 #ifdef SWIGPYTHON
 %apply void *PY_AS_VOID {
   void *baton,
-  void *cleanup_baton,
   void *walk_baton
 };
 #endif
@@ -69,8 +68,8 @@ static svn_boolean_t svn_config_invoke_enumerator2(
 }
 
 static svn_error_t * svn_config_invoke_auth_walk_func(
-  svn_config_auth_walk_func_t _obj, svn_boolean_t *delete_cred, void *cleanup_baton, const char *cred_kind, const char *realmstring, apr_hash_t *hash, apr_pool_t *scratch_pool) {
-  return _obj(delete_cred, cleanup_baton, cred_kind, realmstring, hash, scratch_pool);
+  svn_config_auth_walk_func_t _obj, svn_boolean_t *delete_cred, void *walk_baton, const char *cred_kind, const char *realmstring, apr_hash_t *hash, apr_pool_t *scratch_pool) {
+  return _obj(delete_cred, walk_baton, cred_kind, realmstring, hash, scratch_pool);
 }
 
 %}
diff --git a/subversion/bindings/swig/proxy/svn_diff_h.swg b/subversion/bindings/swig/proxy/svn_diff_h.swg
index f4eab90..dc80678 100644
--- a/subversion/bindings/swig/proxy/svn_diff_h.swg
+++ b/subversion/bindings/swig/proxy/svn_diff_h.swg
@@ -15,7 +15,8 @@
 #ifdef SWIGPYTHON
 %apply void *PY_AS_VOID {
   void *diff_baton,
-  void *output_baton
+  void *output_baton,
+  void *cancel_baton
 };
 #endif
 
diff --git a/subversion/bindings/swig/proxy/svn_fs_h.swg b/subversion/bindings/swig/proxy/svn_fs_h.swg
index 0775f98..effabf8 100644
--- a/subversion/bindings/swig/proxy/svn_fs_h.swg
+++ b/subversion/bindings/swig/proxy/svn_fs_h.swg
@@ -10,23 +10,30 @@
 %nodefault svn_fs_txn_t;
 %nodefault svn_fs_root_t;
 %nodefault svn_fs_history_t;
+%nodefault svn_fs_lock_target_t;
 #endif
 
 /* Callback typemaps */
 #ifdef SWIGPYTHON
 %apply CALLABLE_CALLBACK {
   svn_fs_warning_callback_t,
+  svn_fs_upgrade_notify_t,
   svn_fs_progress_notify_func_t,
+  svn_fs_hotcopy_notify_t,
   svn_fs_freeze_func_t,
   svn_fs_process_contents_func_t,
+  svn_fs_lock_callback_t,
   svn_fs_get_locks_callback_t,
   svn_fs_pack_notify_t
 };
 %apply CALLABLE_CALLBACK * {
   svn_fs_warning_callback_t *,
+  svn_fs_upgrade_notify_t *,
   svn_fs_progress_notify_func_t *,
+  svn_fs_hotcopy_notify_t *,
   svn_fs_freeze_func_t *,
   svn_fs_process_contents_func_t *,
+  svn_fs_lock_callback_t *,
   svn_fs_get_locks_callback_t *,
   svn_fs_pack_notify_t *
 };
@@ -37,10 +44,11 @@
 %apply void *PY_AS_VOID {
   void *baton,
   void *warning_baton,
+  void *notify_baton,
   void *cancel_baton,
   void *freeze_baton,
-  void *get_locks_baton,
-  void *notify_baton
+  void *lock_baton,
+  void *get_locks_baton
 };
 #endif
 
@@ -61,6 +69,10 @@
 %proxy(svn_fs_path_change_t);
 %opaque_proxy(svn_fs_history_t);
 %proxy(svn_fs_dirent_t);
+%opaque_proxy(svn_fs_lock_target_t);
+%proxy(svn_fs_fsfs_info_t);
+%proxy(svn_fs_fsx_info_t);
+%proxy(svn_fs_info_placeholder_t);
 #endif
 
 /* Callbacks */
@@ -71,11 +83,21 @@ static void svn_fs_invoke_warning_callback(
   _obj(baton, err);
 }
 
+static svn_error_t * svn_fs_invoke_upgrade_notify(
+  svn_fs_upgrade_notify_t _obj, void *baton, apr_uint64_t number, svn_fs_upgrade_notify_action_t action, apr_pool_t *scratch_pool) {
+  return _obj(baton, number, action, scratch_pool);
+}
+
 static void svn_fs_invoke_progress_notify_func(
   svn_fs_progress_notify_func_t _obj, svn_revnum_t revision, void *baton, apr_pool_t *pool) {
   _obj(revision, baton, pool);
 }
 
+static void svn_fs_invoke_hotcopy_notify(
+  svn_fs_hotcopy_notify_t _obj, void *baton, svn_revnum_t start_revision, svn_revnum_t end_revision, apr_pool_t *scratch_pool) {
+  _obj(baton, start_revision, end_revision, scratch_pool);
+}
+
 static svn_error_t * svn_fs_invoke_freeze_func(
   svn_fs_freeze_func_t _obj, void *baton, apr_pool_t *pool) {
   return _obj(baton, pool);
@@ -86,6 +108,11 @@ static svn_error_t * svn_fs_invoke_process_contents_func(
   return _obj(contents, len, baton, scratch_pool);
 }
 
+static svn_error_t * svn_fs_invoke_lock_callback(
+  svn_fs_lock_callback_t _obj, void *baton, const char *path, const svn_lock_t *lock, svn_error_t *fs_err, apr_pool_t *scratch_pool) {
+  return _obj(baton, path, lock, fs_err, scratch_pool);
+}
+
 static svn_error_t * svn_fs_invoke_get_locks_callback(
   svn_fs_get_locks_callback_t _obj, void *baton, svn_lock_t *lock, apr_pool_t *pool) {
   return _obj(baton, lock, pool);
@@ -100,9 +127,12 @@ static svn_error_t * svn_fs_invoke_pack_notify(
 
 #ifdef SWIGPYTHON
 %funcptr_proxy(svn_fs_warning_callback_t, svn_fs_invoke_warning_callback);
+%funcptr_proxy(svn_fs_upgrade_notify_t, svn_fs_invoke_upgrade_notify);
 %funcptr_proxy(svn_fs_progress_notify_func_t, svn_fs_invoke_progress_notify_func);
+%funcptr_proxy(svn_fs_hotcopy_notify_t, svn_fs_invoke_hotcopy_notify);
 %funcptr_proxy(svn_fs_freeze_func_t, svn_fs_invoke_freeze_func);
 %funcptr_proxy(svn_fs_process_contents_func_t, svn_fs_invoke_process_contents_func);
+%funcptr_proxy(svn_fs_lock_callback_t, svn_fs_invoke_lock_callback);
 %funcptr_proxy(svn_fs_get_locks_callback_t, svn_fs_invoke_get_locks_callback);
 %funcptr_proxy(svn_fs_pack_notify_t, svn_fs_invoke_pack_notify);
 
diff --git a/subversion/bindings/swig/proxy/svn_io_h.swg b/subversion/bindings/swig/proxy/svn_io_h.swg
index 961104c..1fc2a5a 100644
--- a/subversion/bindings/swig/proxy/svn_io_h.swg
+++ b/subversion/bindings/swig/proxy/svn_io_h.swg
@@ -17,6 +17,7 @@
   svn_close_fn_t,
   svn_stream_mark_fn_t,
   svn_stream_seek_fn_t,
+  svn_stream_data_available_fn_t,
   svn_stream_lazyopen_func_t,
   svn_io_walk_func_t
 };
@@ -27,6 +28,7 @@
   svn_close_fn_t *,
   svn_stream_mark_fn_t *,
   svn_stream_seek_fn_t *,
+  svn_stream_data_available_fn_t *,
   svn_stream_lazyopen_func_t *,
   svn_io_walk_func_t *
 };
@@ -89,6 +91,11 @@ static svn_error_t * svn_stream_invoke_seek_fn(
   return _obj(baton, mark);
 }
 
+static svn_error_t * svn_stream_invoke_data_available_fn(
+  svn_stream_data_available_fn_t _obj, void *baton, svn_boolean_t *data_available) {
+  return _obj(baton, data_available);
+}
+
 static svn_error_t * svn_stream_invoke_lazyopen_func(
   svn_stream_lazyopen_func_t _obj, svn_stream_t **stream, void *baton, apr_pool_t *result_pool, apr_pool_t *scratch_pool) {
   return _obj(stream, baton, result_pool, scratch_pool);
@@ -108,6 +115,7 @@ static svn_error_t * svn_io_invoke_walk_func(
 %funcptr_proxy(svn_close_fn_t, svn_close_invoke_fn);
 %funcptr_proxy(svn_stream_mark_fn_t, svn_stream_invoke_mark_fn);
 %funcptr_proxy(svn_stream_seek_fn_t, svn_stream_invoke_seek_fn);
+%funcptr_proxy(svn_stream_data_available_fn_t, svn_stream_invoke_data_available_fn);
 %funcptr_proxy(svn_stream_lazyopen_func_t, svn_stream_invoke_lazyopen_func);
 %funcptr_proxy(svn_io_walk_func_t, svn_io_invoke_walk_func);
 
diff --git a/subversion/bindings/swig/proxy/svn_ra_h.swg b/subversion/bindings/swig/proxy/svn_ra_h.swg
index f4dbd63..fdb59ce 100644
--- a/subversion/bindings/swig/proxy/svn_ra_h.swg
+++ b/subversion/bindings/swig/proxy/svn_ra_h.swg
@@ -22,6 +22,9 @@
   svn_ra_progress_notify_func_t,
   svn_ra_replay_revstart_callback_t,
   svn_ra_replay_revfinish_callback_t,
+  svn_ra_check_tunnel_func_t,
+  svn_ra_close_tunnel_func_t,
+  svn_ra_open_tunnel_func_t,
   svn_ra_init_func_t
 };
 %apply CALLABLE_CALLBACK * {
@@ -37,6 +40,9 @@
   svn_ra_progress_notify_func_t *,
   svn_ra_replay_revstart_callback_t *,
   svn_ra_replay_revfinish_callback_t *,
+  svn_ra_check_tunnel_func_t *,
+  svn_ra_close_tunnel_func_t *,
+  svn_ra_open_tunnel_func_t *,
   svn_ra_init_func_t *
 };
 #endif
@@ -48,6 +54,9 @@
   void *session_baton,
   void *replay_baton,
   void *edit_baton,
+  void *tunnel_baton,
+  void *close_baton,
+  void *cancel_baton,
   void *report_baton,
   void *callback_baton,
   void *progress_baton,
@@ -328,6 +337,21 @@ static svn_error_t * svn_ra_invoke_replay_revfinish_callback(
   return _obj(revision, replay_baton, editor, edit_baton, rev_props, pool);
 }
 
+static svn_boolean_t svn_ra_invoke_check_tunnel_func(
+  svn_ra_check_tunnel_func_t _obj, void *tunnel_baton, const char *tunnel_name) {
+  return _obj(tunnel_baton, tunnel_name);
+}
+
+static void svn_ra_invoke_close_tunnel_func(
+  svn_ra_close_tunnel_func_t _obj, void *close_baton, void *tunnel_baton) {
+  _obj(close_baton, tunnel_baton);
+}
+
+static svn_error_t * svn_ra_invoke_open_tunnel_func(
+  svn_ra_open_tunnel_func_t _obj, svn_stream_t **request, svn_stream_t **response, svn_ra_close_tunnel_func_t *close_func, void **close_baton, void *tunnel_baton, const char *tunnel_name, const char *user, const char *hostname, int port, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *pool) {
+  return _obj(request, response, close_func, close_baton, tunnel_baton, tunnel_name, user, hostname, port, cancel_func, cancel_baton, pool);
+}
+
 static svn_error_t * svn_ra_invoke_init_func(
   svn_ra_init_func_t _obj, int abi_version, apr_pool_t *pool, apr_hash_t *hash) {
   return _obj(abi_version, pool, hash);
@@ -385,6 +409,9 @@ static svn_error_t * svn_ra_invoke_init_func(
 %funcptr_proxy(svn_ra_progress_notify_func_t, svn_ra_invoke_progress_notify_func);
 %funcptr_proxy(svn_ra_replay_revstart_callback_t, svn_ra_invoke_replay_revstart_callback);
 %funcptr_proxy(svn_ra_replay_revfinish_callback_t, svn_ra_invoke_replay_revfinish_callback);
+%funcptr_proxy(svn_ra_check_tunnel_func_t, svn_ra_invoke_check_tunnel_func);
+%funcptr_proxy(svn_ra_close_tunnel_func_t, svn_ra_invoke_close_tunnel_func);
+%funcptr_proxy(svn_ra_open_tunnel_func_t, svn_ra_invoke_open_tunnel_func);
 %funcptr_proxy(svn_ra_init_func_t, svn_ra_invoke_init_func);
 
 #endif
diff --git a/subversion/bindings/swig/proxy/svn_repos_h.swg b/subversion/bindings/swig/proxy/svn_repos_h.swg
index 22aea45..067eb55 100644
--- a/subversion/bindings/swig/proxy/svn_repos_h.swg
+++ b/subversion/bindings/swig/proxy/svn_repos_h.swg
@@ -13,18 +13,20 @@
 %apply CALLABLE_CALLBACK {
   svn_repos_authz_func_t,
   svn_repos_authz_callback_t,
-  svn_repos_file_rev_handler_t,
   svn_repos_notify_func_t,
   svn_repos_freeze_func_t,
-  svn_repos_history_func_t
+  svn_repos_history_func_t,
+  svn_repos_file_rev_handler_t,
+  svn_repos_verify_callback_t
 };
 %apply CALLABLE_CALLBACK * {
   svn_repos_authz_func_t *,
   svn_repos_authz_callback_t *,
-  svn_repos_file_rev_handler_t *,
   svn_repos_notify_func_t *,
   svn_repos_freeze_func_t *,
-  svn_repos_history_func_t *
+  svn_repos_history_func_t *,
+  svn_repos_file_rev_handler_t *,
+  svn_repos_verify_callback_t *
 };
 #endif
 
@@ -45,6 +47,8 @@
   void *history_baton,
   void *receiver_baton,
   void *handler_baton,
+  void *lock_baton,
+  void *verify_baton,
   void *parse_baton,
   void *revision_baton,
   void *node_baton
@@ -196,11 +200,6 @@ static svn_error_t * svn_repos_invoke_authz_callback(
   return _obj(required, allowed, root, path, baton, pool);
 }
 
-static svn_error_t * svn_repos_invoke_file_rev_handler(
-  svn_repos_file_rev_handler_t _obj, void *baton, const char *path, svn_revnum_t rev, apr_hash_t *rev_props, svn_txdelta_window_handler_t *delta_handler, void **delta_baton, apr_array_header_t *prop_diffs, apr_pool_t *pool) {
-  return _obj(baton, path, rev, rev_props, delta_handler, delta_baton, prop_diffs, pool);
-}
-
 static void svn_repos_invoke_notify_func(
   svn_repos_notify_func_t _obj, void *baton, const svn_repos_notify_t *notify, apr_pool_t *scratch_pool) {
   _obj(baton, notify, scratch_pool);
@@ -216,6 +215,16 @@ static svn_error_t * svn_repos_invoke_history_func(
   return _obj(baton, path, revision, pool);
 }
 
+static svn_error_t * svn_repos_invoke_file_rev_handler(
+  svn_repos_file_rev_handler_t _obj, void *baton, const char *path, svn_revnum_t rev, apr_hash_t *rev_props, svn_txdelta_window_handler_t *delta_handler, void **delta_baton, apr_array_header_t *prop_diffs, apr_pool_t *pool) {
+  return _obj(baton, path, rev, rev_props, delta_handler, delta_baton, prop_diffs, pool);
+}
+
+static svn_error_t * svn_repos_invoke_verify_callback(
+  svn_repos_verify_callback_t _obj, void *baton, svn_revnum_t revision, svn_error_t *verify_err, apr_pool_t *scratch_pool) {
+  return _obj(baton, revision, verify_err, scratch_pool);
+}
+
 %}
 
 #ifdef SWIGPYTHON
@@ -244,9 +253,10 @@ static svn_error_t * svn_repos_invoke_history_func(
 %funcptr_member_proxy(svn_repos_parse_fns2_t, close_revision, svn_repos_parse_fns2_invoke_close_revision);
 %funcptr_proxy(svn_repos_authz_func_t, svn_repos_invoke_authz_func);
 %funcptr_proxy(svn_repos_authz_callback_t, svn_repos_invoke_authz_callback);
-%funcptr_proxy(svn_repos_file_rev_handler_t, svn_repos_invoke_file_rev_handler);
 %funcptr_proxy(svn_repos_notify_func_t, svn_repos_invoke_notify_func);
 %funcptr_proxy(svn_repos_freeze_func_t, svn_repos_invoke_freeze_func);
 %funcptr_proxy(svn_repos_history_func_t, svn_repos_invoke_history_func);
+%funcptr_proxy(svn_repos_file_rev_handler_t, svn_repos_invoke_file_rev_handler);
+%funcptr_proxy(svn_repos_verify_callback_t, svn_repos_invoke_verify_callback);
 
 #endif
diff --git a/subversion/bindings/swig/proxy/svn_sorts_h.swg b/subversion/bindings/swig/proxy/svn_sorts_h.swg
index d398b11..82aca37 100644
--- a/subversion/bindings/swig/proxy/svn_sorts_h.swg
+++ b/subversion/bindings/swig/proxy/svn_sorts_h.swg
@@ -4,6 +4,7 @@
 
 /* No default constructors for opaque structs */
 #ifdef SWIGPYTHON
+%nodefault svn_sort__item_t;
 #endif
 
 /* Callback typemaps */
@@ -18,7 +19,7 @@
 
 /* Structure definitions */
 #ifdef SWIGPYTHON
-%proxy(svn_sort__item_t);
+%opaque_proxy(svn_sort__item_t);
 #endif
 
 /* Callbacks */
diff --git a/subversion/bindings/swig/proxy/svn_x509_h.swg b/subversion/bindings/swig/proxy/svn_x509_h.swg
new file mode 100644
index 0000000..febe1fe
--- /dev/null
+++ b/subversion/bindings/swig/proxy/svn_x509_h.swg
@@ -0,0 +1,34 @@
+/* Proxy classes for svn_x509.h
+ * DO NOT EDIT -- AUTOMATICALLY GENERATED
+ * BY build/generator/swig/header_wrappers.py */
+
+/* No default constructors for opaque structs */
+#ifdef SWIGPYTHON
+%nodefault svn_x509_certinfo_t;
+%nodefault svn_x509_name_attr_t;
+#endif
+
+/* Callback typemaps */
+
+/* Baton typemaps */
+
+/* Includes */
+%{
+#include "svn_x509.h"
+%}
+%include svn_x509.h
+
+/* Structure definitions */
+#ifdef SWIGPYTHON
+%opaque_proxy(svn_x509_certinfo_t);
+%opaque_proxy(svn_x509_name_attr_t);
+#endif
+
+/* Callbacks */
+
+%inline %{
+%}
+
+#ifdef SWIGPYTHON
+
+#endif
diff --git a/subversion/bindings/swig/proxy/swig_perl_external_runtime.swg b/subversion/bindings/swig/proxy/swig_perl_external_runtime.swg
index 4822bae..f17c123 100644
--- a/subversion/bindings/swig/proxy/swig_perl_external_runtime.swg
+++ b/subversion/bindings/swig/proxy/swig_perl_external_runtime.swg
@@ -1,11 +1,11 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
- * 
- * This file is not intended to be easily readable and contains a number of 
+ * Version 2.0.12
+ *
+ * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
- * changes to this file unless you know what you are doing--modify the SWIG 
- * interface file instead. 
+ * changes to this file unless you know what you are doing--modify the SWIG
+ * interface file instead.
  * ----------------------------------------------------------------------------- */
 
 /* -----------------------------------------------------------------------------
@@ -39,28 +39,28 @@
 #ifndef SWIGUNUSED
 # if defined(__GNUC__)
 #   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__)) 
+#     define SWIGUNUSED __attribute__ ((__unused__))
 #   else
 #     define SWIGUNUSED
 #   endif
 # elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__)) 
+#   define SWIGUNUSED __attribute__ ((__unused__))
 # else
-#   define SWIGUNUSED 
+#   define SWIGUNUSED
 # endif
 #endif
 
 #ifndef SWIG_MSC_UNSUPPRESS_4505
 # if defined(_MSC_VER)
 #   pragma warning(disable : 4505) /* unreferenced local function has been removed */
-# endif 
+# endif
 #endif
 
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
 # else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
 # endif
 #endif
 
@@ -103,7 +103,7 @@
 #   define SWIGSTDCALL __stdcall
 # else
 #   define SWIGSTDCALL
-# endif 
+# endif
 #endif
 
 /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
@@ -117,18 +117,18 @@
 #endif
 
 /*  Errors in SWIG */
-#define  SWIG_UnknownError    	   -1 
-#define  SWIG_IOError        	   -2 
-#define  SWIG_RuntimeError   	   -3 
-#define  SWIG_IndexError     	   -4 
-#define  SWIG_TypeError      	   -5 
-#define  SWIG_DivisionByZero 	   -6 
-#define  SWIG_OverflowError  	   -7 
-#define  SWIG_SyntaxError    	   -8 
-#define  SWIG_ValueError     	   -9 
+#define  SWIG_UnknownError    	   -1
+#define  SWIG_IOError        	   -2
+#define  SWIG_RuntimeError   	   -3
+#define  SWIG_IndexError     	   -4
+#define  SWIG_TypeError      	   -5
+#define  SWIG_DivisionByZero 	   -6
+#define  SWIG_OverflowError  	   -7
+#define  SWIG_SyntaxError    	   -8
+#define  SWIG_ValueError     	   -9
 #define  SWIG_SystemError    	   -10
 #define  SWIG_AttributeError 	   -11
-#define  SWIG_MemoryError    	   -12 
+#define  SWIG_MemoryError    	   -12
 #define  SWIG_NullReferenceError   -13
 
 
@@ -156,7 +156,7 @@
   You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for
   creating a static or dynamic library from the SWIG runtime code.
   In 99.9% of the cases, SWIG just needs to declare them as 'static'.
-  
+
   But only do this if strictly necessary, ie, if you have problems
   with your compiler or suchlike.
 */
@@ -182,16 +182,16 @@
 #define SWIG_POINTER_OWN           0x1
 
 
-/* 
+/*
    Flags/methods for returning states.
-   
-   The SWIG conversion methods, as ConvertPtr, return an integer 
+
+   The SWIG conversion methods, as ConvertPtr, return an integer
    that tells if the conversion was successful or not. And if not,
    an error code can be returned (see swigerrors.swg for the codes).
-   
+
    Use the following macros/flags to set or process the returning
    states.
-   
+
    In old versions of SWIG, code such as the following was usually written:
 
      if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) {
@@ -224,23 +224,23 @@
     } else {
       // fail code
     }
-    
+
    I.e., now SWIG_ConvertPtr can return new objects and you can
    identify the case and take care of the deallocation. Of course that
    also requires SWIG_ConvertPtr to return new result values, such as
 
-      int SWIG_ConvertPtr(obj, ptr,...) {         
-        if (<obj is ok>) {			       
-          if (<need new object>) {		       
-            *ptr = <ptr to new allocated object>; 
-            return SWIG_NEWOBJ;		       
-          } else {				       
-            *ptr = <ptr to old object>;	       
-            return SWIG_OLDOBJ;		       
-          } 				       
-        } else {				       
-          return SWIG_BADOBJ;		       
-        }					       
+      int SWIG_ConvertPtr(obj, ptr,...) {
+        if (<obj is ok>) {
+          if (<need new object>) {
+            *ptr = <ptr to new allocated object>;
+            return SWIG_NEWOBJ;
+          } else {
+            *ptr = <ptr to old object>;
+            return SWIG_OLDOBJ;
+          }
+        } else {
+          return SWIG_BADOBJ;
+        }
       }
 
    Of course, returning the plain '0(success)/-1(fail)' still works, but you can be
@@ -254,17 +254,17 @@
        int fooi(int);
 
    and you call
- 
+
       food(1)   // cast rank '1'  (1 -> 1.0)
       fooi(1)   // cast rank '0'
 
    just use the SWIG_AddCast()/SWIG_CheckState()
 */
 
-#define SWIG_OK                    (0) 
+#define SWIG_OK                    (0)
 #define SWIG_ERROR                 (-1)
 #define SWIG_IsOK(r)               (r >= 0)
-#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)  
+#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)
 
 /* The CastRankLimit says how many bits are used for the cast rank */
 #define SWIG_CASTRANKLIMIT         (1 << 8)
@@ -295,14 +295,14 @@
 #  endif
 #  define SWIG_CASTRANKMASK          ((SWIG_CASTRANKLIMIT) -1)
 #  define SWIG_CastRank(r)           (r & SWIG_CASTRANKMASK)
-SWIGINTERNINLINE int SWIG_AddCast(int r) { 
+SWIGINTERNINLINE int SWIG_AddCast(int r) {
   return SWIG_IsOK(r) ? ((SWIG_CastRank(r) < SWIG_MAXCASTRANK) ? (r + 1) : SWIG_ERROR) : r;
 }
-SWIGINTERNINLINE int SWIG_CheckState(int r) { 
-  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0; 
+SWIGINTERNINLINE int SWIG_CheckState(int r) {
+  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0;
 }
 #else /* no cast-rank mode */
-#  define SWIG_AddCast
+#  define SWIG_AddCast(r) (r)
 #  define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0)
 #endif
 
@@ -346,7 +346,7 @@ typedef struct swig_module_info {
   void                    *clientdata;		/* Language specific module data */
 } swig_module_info;
 
-/* 
+/*
   Compare two type names skipping the space characters, therefore
   "char*" == "char *" and "Class<int>" == "Class<int >", etc.
 
@@ -366,18 +366,18 @@ SWIG_TypeNameComp(const char *f1, const char *l1,
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if not equal, 1 if equal
+  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
 */
 SWIGRUNTIME int
-SWIG_TypeEquiv(const char *nb, const char *tb) {
-  int equiv = 0;
+SWIG_TypeCmp(const char *nb, const char *tb) {
+  int equiv = 1;
   const char* te = tb + strlen(tb);
   const char* ne = nb;
-  while (!equiv && *ne) {
+  while (equiv != 0 && *ne) {
     for (nb = ne; *ne; ++ne) {
       if (*ne == '|') break;
     }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
+    equiv = SWIG_TypeNameComp(nb, ne, tb, te);
     if (*ne) ++ne;
   }
   return equiv;
@@ -385,24 +385,13 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
+  Return 0 if not equal, 1 if equal
 */
 SWIGRUNTIME int
-SWIG_TypeCompare(const char *nb, const char *tb) {
-  int equiv = 0;
-  const char* te = tb + strlen(tb);
-  const char* ne = nb;
-  while (!equiv && *ne) {
-    for (nb = ne; *ne; ++ne) {
-      if (*ne == '|') break;
-    }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
-    if (*ne) ++ne;
-  }
-  return equiv;
+SWIG_TypeEquiv(const char *nb, const char *tb) {
+  return SWIG_TypeCmp(nb, tb) == 0 ? 1 : 0;
 }
 
-
 /*
   Check the typename
 */
@@ -430,7 +419,7 @@ SWIG_TypeCheck(const char *c, swig_type_info *ty) {
   return 0;
 }
 
-/* 
+/*
   Identical to SWIG_TypeCheck, except strcmp is replaced with a pointer comparison
 */
 SWIGRUNTIME swig_cast_info *
@@ -465,7 +454,7 @@ SWIG_TypeCast(swig_cast_info *ty, void *ptr, int *newmemory) {
   return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr, newmemory);
 }
 
-/* 
+/*
    Dynamic pointer casting. Down an inheritance hierarchy
 */
 SWIGRUNTIME swig_type_info *
@@ -509,7 +498,7 @@ SWIG_TypePrettyName(const swig_type_info *type) {
     return type->name;
 }
 
-/* 
+/*
    Set the clientdata field for a type
 */
 SWIGRUNTIME void
@@ -517,14 +506,14 @@ SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
   swig_cast_info *cast = ti->cast;
   /* if (ti->clientdata == clientdata) return; */
   ti->clientdata = clientdata;
-  
+
   while (cast) {
     if (!cast->converter) {
       swig_type_info *tc = cast->type;
       if (!tc->clientdata) {
 	SWIG_TypeClientData(tc, clientdata);
       }
-    }    
+    }
     cast = cast->next;
   }
 }
@@ -533,18 +522,18 @@ SWIG_TypeNewClientData(swig_type_info *ti, void *clientdata) {
   SWIG_TypeClientData(ti, clientdata);
   ti->owndata = 1;
 }
-  
+
 /*
   Search for a swig_type_info structure only by mangled name
   Search is a O(log #types)
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_MangledTypeQueryModule(swig_module_info *start, 
-                            swig_module_info *end, 
+SWIG_MangledTypeQueryModule(swig_module_info *start,
+                            swig_module_info *end,
 		            const char *name) {
   swig_module_info *iter = start;
   do {
@@ -553,11 +542,11 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
       register size_t r = iter->size - 1;
       do {
 	/* since l+r >= 0, we can (>> 1) instead (/ 2) */
-	register size_t i = (l + r) >> 1; 
+	register size_t i = (l + r) >> 1;
 	const char *iname = iter->types[i]->name;
 	if (iname) {
 	  register int compare = strcmp(name, iname);
-	  if (compare == 0) {	    
+	  if (compare == 0) {
 	    return iter->types[i];
 	  } else if (compare < 0) {
 	    if (i) {
@@ -582,14 +571,14 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
   Search for a swig_type_info structure for either a mangled name or a human readable name.
   It first searches the mangled names of the types, which is a O(log #types)
   If a type is not found it then searches the human readable names, which is O(#types).
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_TypeQueryModule(swig_module_info *start, 
-                     swig_module_info *end, 
+SWIG_TypeQueryModule(swig_module_info *start,
+                     swig_module_info *end,
 		     const char *name) {
   /* STEP 1: Search the name field using binary search */
   swig_type_info *ret = SWIG_MangledTypeQueryModule(start, end, name);
@@ -608,12 +597,12 @@ SWIG_TypeQueryModule(swig_module_info *start,
       iter = iter->next;
     } while (iter != end);
   }
-  
+
   /* neither found a match */
   return 0;
 }
 
-/* 
+/*
    Pack binary data into a string
 */
 SWIGRUNTIME char *
@@ -629,7 +618,7 @@ SWIG_PackData(char *c, void *ptr, size_t sz) {
   return c;
 }
 
-/* 
+/*
    Unpack binary data from a string
 */
 SWIGRUNTIME const char *
@@ -643,21 +632,21 @@ SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
       uu = ((d - '0') << 4);
     else if ((d >= 'a') && (d <= 'f'))
       uu = ((d - ('a'-10)) << 4);
-    else 
+    else
       return (char *) 0;
     d = *(c++);
     if ((d >= '0') && (d <= '9'))
       uu |= (d - '0');
     else if ((d >= 'a') && (d <= 'f'))
       uu |= (d - ('a'-10));
-    else 
+    else
       return (char *) 0;
     *u = uu;
   }
   return c;
 }
 
-/* 
+/*
    Pack 'void *' into a string buffer.
 */
 SWIGRUNTIME char *
diff --git a/subversion/bindings/swig/proxy/swig_python_external_runtime.swg b/subversion/bindings/swig/proxy/swig_python_external_runtime.swg
index 23ee4fb..b0cf143 100644
--- a/subversion/bindings/swig/proxy/swig_python_external_runtime.swg
+++ b/subversion/bindings/swig/proxy/swig_python_external_runtime.swg
@@ -1,11 +1,11 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
- * 
- * This file is not intended to be easily readable and contains a number of 
+ * Version 2.0.12
+ *
+ * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
- * changes to this file unless you know what you are doing--modify the SWIG 
- * interface file instead. 
+ * changes to this file unless you know what you are doing--modify the SWIG
+ * interface file instead.
  * ----------------------------------------------------------------------------- */
 
 /* -----------------------------------------------------------------------------
@@ -39,28 +39,28 @@
 #ifndef SWIGUNUSED
 # if defined(__GNUC__)
 #   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__)) 
+#     define SWIGUNUSED __attribute__ ((__unused__))
 #   else
 #     define SWIGUNUSED
 #   endif
 # elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__)) 
+#   define SWIGUNUSED __attribute__ ((__unused__))
 # else
-#   define SWIGUNUSED 
+#   define SWIGUNUSED
 # endif
 #endif
 
 #ifndef SWIG_MSC_UNSUPPRESS_4505
 # if defined(_MSC_VER)
 #   pragma warning(disable : 4505) /* unreferenced local function has been removed */
-# endif 
+# endif
 #endif
 
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
 # else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
 # endif
 #endif
 
@@ -103,7 +103,7 @@
 #   define SWIGSTDCALL __stdcall
 # else
 #   define SWIGSTDCALL
-# endif 
+# endif
 #endif
 
 /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
@@ -117,18 +117,18 @@
 #endif
 
 /*  Errors in SWIG */
-#define  SWIG_UnknownError    	   -1 
-#define  SWIG_IOError        	   -2 
-#define  SWIG_RuntimeError   	   -3 
-#define  SWIG_IndexError     	   -4 
-#define  SWIG_TypeError      	   -5 
-#define  SWIG_DivisionByZero 	   -6 
-#define  SWIG_OverflowError  	   -7 
-#define  SWIG_SyntaxError    	   -8 
-#define  SWIG_ValueError     	   -9 
+#define  SWIG_UnknownError    	   -1
+#define  SWIG_IOError        	   -2
+#define  SWIG_RuntimeError   	   -3
+#define  SWIG_IndexError     	   -4
+#define  SWIG_TypeError      	   -5
+#define  SWIG_DivisionByZero 	   -6
+#define  SWIG_OverflowError  	   -7
+#define  SWIG_SyntaxError    	   -8
+#define  SWIG_ValueError     	   -9
 #define  SWIG_SystemError    	   -10
 #define  SWIG_AttributeError 	   -11
-#define  SWIG_MemoryError    	   -12 
+#define  SWIG_MemoryError    	   -12
 #define  SWIG_NullReferenceError   -13
 
 
@@ -156,7 +156,7 @@
   You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for
   creating a static or dynamic library from the SWIG runtime code.
   In 99.9% of the cases, SWIG just needs to declare them as 'static'.
-  
+
   But only do this if strictly necessary, ie, if you have problems
   with your compiler or suchlike.
 */
@@ -182,16 +182,16 @@
 #define SWIG_POINTER_OWN           0x1
 
 
-/* 
+/*
    Flags/methods for returning states.
-   
-   The SWIG conversion methods, as ConvertPtr, return an integer 
+
+   The SWIG conversion methods, as ConvertPtr, return an integer
    that tells if the conversion was successful or not. And if not,
    an error code can be returned (see swigerrors.swg for the codes).
-   
+
    Use the following macros/flags to set or process the returning
    states.
-   
+
    In old versions of SWIG, code such as the following was usually written:
 
      if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) {
@@ -224,23 +224,23 @@
     } else {
       // fail code
     }
-    
+
    I.e., now SWIG_ConvertPtr can return new objects and you can
    identify the case and take care of the deallocation. Of course that
    also requires SWIG_ConvertPtr to return new result values, such as
 
-      int SWIG_ConvertPtr(obj, ptr,...) {         
-        if (<obj is ok>) {			       
-          if (<need new object>) {		       
-            *ptr = <ptr to new allocated object>; 
-            return SWIG_NEWOBJ;		       
-          } else {				       
-            *ptr = <ptr to old object>;	       
-            return SWIG_OLDOBJ;		       
-          } 				       
-        } else {				       
-          return SWIG_BADOBJ;		       
-        }					       
+      int SWIG_ConvertPtr(obj, ptr,...) {
+        if (<obj is ok>) {
+          if (<need new object>) {
+            *ptr = <ptr to new allocated object>;
+            return SWIG_NEWOBJ;
+          } else {
+            *ptr = <ptr to old object>;
+            return SWIG_OLDOBJ;
+          }
+        } else {
+          return SWIG_BADOBJ;
+        }
       }
 
    Of course, returning the plain '0(success)/-1(fail)' still works, but you can be
@@ -254,17 +254,17 @@
        int fooi(int);
 
    and you call
- 
+
       food(1)   // cast rank '1'  (1 -> 1.0)
       fooi(1)   // cast rank '0'
 
    just use the SWIG_AddCast()/SWIG_CheckState()
 */
 
-#define SWIG_OK                    (0) 
+#define SWIG_OK                    (0)
 #define SWIG_ERROR                 (-1)
 #define SWIG_IsOK(r)               (r >= 0)
-#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)  
+#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)
 
 /* The CastRankLimit says how many bits are used for the cast rank */
 #define SWIG_CASTRANKLIMIT         (1 << 8)
@@ -295,14 +295,14 @@
 #  endif
 #  define SWIG_CASTRANKMASK          ((SWIG_CASTRANKLIMIT) -1)
 #  define SWIG_CastRank(r)           (r & SWIG_CASTRANKMASK)
-SWIGINTERNINLINE int SWIG_AddCast(int r) { 
+SWIGINTERNINLINE int SWIG_AddCast(int r) {
   return SWIG_IsOK(r) ? ((SWIG_CastRank(r) < SWIG_MAXCASTRANK) ? (r + 1) : SWIG_ERROR) : r;
 }
-SWIGINTERNINLINE int SWIG_CheckState(int r) { 
-  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0; 
+SWIGINTERNINLINE int SWIG_CheckState(int r) {
+  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0;
 }
 #else /* no cast-rank mode */
-#  define SWIG_AddCast
+#  define SWIG_AddCast(r) (r)
 #  define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0)
 #endif
 
@@ -346,7 +346,7 @@ typedef struct swig_module_info {
   void                    *clientdata;		/* Language specific module data */
 } swig_module_info;
 
-/* 
+/*
   Compare two type names skipping the space characters, therefore
   "char*" == "char *" and "Class<int>" == "Class<int >", etc.
 
@@ -366,18 +366,18 @@ SWIG_TypeNameComp(const char *f1, const char *l1,
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if not equal, 1 if equal
+  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
 */
 SWIGRUNTIME int
-SWIG_TypeEquiv(const char *nb, const char *tb) {
-  int equiv = 0;
+SWIG_TypeCmp(const char *nb, const char *tb) {
+  int equiv = 1;
   const char* te = tb + strlen(tb);
   const char* ne = nb;
-  while (!equiv && *ne) {
+  while (equiv != 0 && *ne) {
     for (nb = ne; *ne; ++ne) {
       if (*ne == '|') break;
     }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
+    equiv = SWIG_TypeNameComp(nb, ne, tb, te);
     if (*ne) ++ne;
   }
   return equiv;
@@ -385,24 +385,13 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
+  Return 0 if not equal, 1 if equal
 */
 SWIGRUNTIME int
-SWIG_TypeCompare(const char *nb, const char *tb) {
-  int equiv = 0;
-  const char* te = tb + strlen(tb);
-  const char* ne = nb;
-  while (!equiv && *ne) {
-    for (nb = ne; *ne; ++ne) {
-      if (*ne == '|') break;
-    }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
-    if (*ne) ++ne;
-  }
-  return equiv;
+SWIG_TypeEquiv(const char *nb, const char *tb) {
+  return SWIG_TypeCmp(nb, tb) == 0 ? 1 : 0;
 }
 
-
 /*
   Check the typename
 */
@@ -430,7 +419,7 @@ SWIG_TypeCheck(const char *c, swig_type_info *ty) {
   return 0;
 }
 
-/* 
+/*
   Identical to SWIG_TypeCheck, except strcmp is replaced with a pointer comparison
 */
 SWIGRUNTIME swig_cast_info *
@@ -465,7 +454,7 @@ SWIG_TypeCast(swig_cast_info *ty, void *ptr, int *newmemory) {
   return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr, newmemory);
 }
 
-/* 
+/*
    Dynamic pointer casting. Down an inheritance hierarchy
 */
 SWIGRUNTIME swig_type_info *
@@ -509,7 +498,7 @@ SWIG_TypePrettyName(const swig_type_info *type) {
     return type->name;
 }
 
-/* 
+/*
    Set the clientdata field for a type
 */
 SWIGRUNTIME void
@@ -517,14 +506,14 @@ SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
   swig_cast_info *cast = ti->cast;
   /* if (ti->clientdata == clientdata) return; */
   ti->clientdata = clientdata;
-  
+
   while (cast) {
     if (!cast->converter) {
       swig_type_info *tc = cast->type;
       if (!tc->clientdata) {
 	SWIG_TypeClientData(tc, clientdata);
       }
-    }    
+    }
     cast = cast->next;
   }
 }
@@ -533,18 +522,18 @@ SWIG_TypeNewClientData(swig_type_info *ti, void *clientdata) {
   SWIG_TypeClientData(ti, clientdata);
   ti->owndata = 1;
 }
-  
+
 /*
   Search for a swig_type_info structure only by mangled name
   Search is a O(log #types)
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_MangledTypeQueryModule(swig_module_info *start, 
-                            swig_module_info *end, 
+SWIG_MangledTypeQueryModule(swig_module_info *start,
+                            swig_module_info *end,
 		            const char *name) {
   swig_module_info *iter = start;
   do {
@@ -553,11 +542,11 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
       register size_t r = iter->size - 1;
       do {
 	/* since l+r >= 0, we can (>> 1) instead (/ 2) */
-	register size_t i = (l + r) >> 1; 
+	register size_t i = (l + r) >> 1;
 	const char *iname = iter->types[i]->name;
 	if (iname) {
 	  register int compare = strcmp(name, iname);
-	  if (compare == 0) {	    
+	  if (compare == 0) {
 	    return iter->types[i];
 	  } else if (compare < 0) {
 	    if (i) {
@@ -582,14 +571,14 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
   Search for a swig_type_info structure for either a mangled name or a human readable name.
   It first searches the mangled names of the types, which is a O(log #types)
   If a type is not found it then searches the human readable names, which is O(#types).
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_TypeQueryModule(swig_module_info *start, 
-                     swig_module_info *end, 
+SWIG_TypeQueryModule(swig_module_info *start,
+                     swig_module_info *end,
 		     const char *name) {
   /* STEP 1: Search the name field using binary search */
   swig_type_info *ret = SWIG_MangledTypeQueryModule(start, end, name);
@@ -608,12 +597,12 @@ SWIG_TypeQueryModule(swig_module_info *start,
       iter = iter->next;
     } while (iter != end);
   }
-  
+
   /* neither found a match */
   return 0;
 }
 
-/* 
+/*
    Pack binary data into a string
 */
 SWIGRUNTIME char *
@@ -629,7 +618,7 @@ SWIG_PackData(char *c, void *ptr, size_t sz) {
   return c;
 }
 
-/* 
+/*
    Unpack binary data from a string
 */
 SWIGRUNTIME const char *
@@ -643,21 +632,21 @@ SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
       uu = ((d - '0') << 4);
     else if ((d >= 'a') && (d <= 'f'))
       uu = ((d - ('a'-10)) << 4);
-    else 
+    else
       return (char *) 0;
     d = *(c++);
     if ((d >= '0') && (d <= '9'))
       uu |= (d - '0');
     else if ((d >= 'a') && (d <= 'f'))
       uu |= (d - ('a'-10));
-    else 
+    else
       return (char *) 0;
     *u = uu;
   }
   return c;
 }
 
-/* 
+/*
    Pack 'void *' into a string buffer.
 */
 SWIGRUNTIME char *
@@ -1567,34 +1556,6 @@ SwigPyObject_repr(SwigPyObject *v, PyObject *args)
 }
 
 SWIGRUNTIME int
-SwigPyObject_print(SwigPyObject *v, FILE *fp, int SWIGUNUSEDPARM(flags))
-{
-  char *str;
-#ifdef METH_NOARGS
-  PyObject *repr = SwigPyObject_repr(v);
-#else
-  PyObject *repr = SwigPyObject_repr(v, NULL);
-#endif
-  if (repr) {
-    str = SWIG_Python_str_AsChar(repr); 
-    fputs(str, fp);
-    SWIG_Python_str_DelForPy3(str);
-    Py_DECREF(repr);
-    return 0; 
-  } else {
-    return 1; 
-  }
-}
-
-SWIGRUNTIME PyObject *
-SwigPyObject_str(SwigPyObject *v)
-{
-  char result[SWIG_BUFFER_SIZE];
-  return SWIG_PackVoidPtr(result, v->ptr, v->ty->name, sizeof(result)) ?
-    SWIG_Python_str_FromChar(result) : 0;
-}
-
-SWIGRUNTIME int
 SwigPyObject_compare(SwigPyObject *v, SwigPyObject *w)
 {
   void *i = v->ptr;
@@ -1786,7 +1747,7 @@ SwigPyObject_own(PyObject *v, PyObject *args)
 static PyMethodDef
 swigobject_methods[] = {
   {(char *)"disown",  (PyCFunction)SwigPyObject_disown,  METH_NOARGS,  (char *)"releases ownership of the pointer"},
-  {(char *)"acquire", (PyCFunction)SwigPyObject_acquire, METH_NOARGS,  (char *)"aquires ownership of the pointer"},
+  {(char *)"acquire", (PyCFunction)SwigPyObject_acquire, METH_NOARGS,  (char *)"acquires ownership of the pointer"},
   {(char *)"own",     (PyCFunction)SwigPyObject_own,     METH_VARARGS, (char *)"returns/sets ownership of the pointer"},
   {(char *)"append",  (PyCFunction)SwigPyObject_append,  METH_O,       (char *)"appends another 'this' object"},
   {(char *)"next",    (PyCFunction)SwigPyObject_next,    METH_NOARGS,  (char *)"returns the next 'this' object"},
@@ -1879,7 +1840,7 @@ SwigPyObject_TypeOnce(void) {
       sizeof(SwigPyObject),                 /* tp_basicsize */
       0,                                    /* tp_itemsize */
       (destructor)SwigPyObject_dealloc,     /* tp_dealloc */
-      (printfunc)SwigPyObject_print,        /* tp_print */
+      0,				    /* tp_print */
 #if PY_VERSION_HEX < 0x02020000
       (getattrfunc)SwigPyObject_getattr,    /* tp_getattr */
 #else
@@ -1897,7 +1858,7 @@ SwigPyObject_TypeOnce(void) {
       0,                                    /* tp_as_mapping */
       (hashfunc)0,                          /* tp_hash */
       (ternaryfunc)0,                       /* tp_call */
-      (reprfunc)SwigPyObject_str,           /* tp_str */
+      0,				    /* tp_str */
       PyObject_GenericGetAttr,              /* tp_getattro */
       0,                                    /* tp_setattro */
       0,                                    /* tp_as_buffer */
@@ -2274,10 +2235,11 @@ SWIGRUNTIME int
 SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int flags, int *own) {
   int res;
   SwigPyObject *sobj;
+  int implicit_conv = (flags & SWIG_POINTER_IMPLICIT_CONV) != 0;
 
   if (!obj)
     return SWIG_ERROR;
-  if (obj == Py_None) {
+  if (obj == Py_None && !implicit_conv) {
     if (ptr)
       *ptr = 0;
     return SWIG_OK;
@@ -2326,7 +2288,7 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
     }
     res = SWIG_OK;
   } else {
-    if (flags & SWIG_POINTER_IMPLICIT_CONV) {
+    if (implicit_conv) {
       SwigPyClientData *data = ty ? (SwigPyClientData *) ty->clientdata : 0;
       if (data && !data->implicitconv) {
         PyObject *klass = data->klass;
@@ -2361,6 +2323,13 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
         }
       }
     }
+    if (!SWIG_IsOK(res) && obj == Py_None) {
+      if (ptr)
+        *ptr = 0;
+      if (PyErr_Occurred())
+        PyErr_Clear();
+      res = SWIG_OK;
+    }
   }
   return res;
 }
@@ -2860,7 +2829,7 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) {
   PyObject *descr;
   PyObject *encoded_name;
   descrsetfunc f;
-  int res;
+  int res = -1;
 
 # ifdef Py_USING_UNICODE
   if (PyString_Check(name)) {
@@ -2883,7 +2852,6 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) {
       goto done;
   }
 
-  res = -1;
   descr = _PyType_Lookup(tp, name);
   f = NULL;
   if (descr != NULL)
diff --git a/subversion/bindings/swig/proxy/swig_ruby_external_runtime.swg b/subversion/bindings/swig/proxy/swig_ruby_external_runtime.swg
index 1bb5159..787f2ad 100644
--- a/subversion/bindings/swig/proxy/swig_ruby_external_runtime.swg
+++ b/subversion/bindings/swig/proxy/swig_ruby_external_runtime.swg
@@ -1,11 +1,11 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
- * 
- * This file is not intended to be easily readable and contains a number of 
+ * Version 2.0.12
+ *
+ * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
- * changes to this file unless you know what you are doing--modify the SWIG 
- * interface file instead. 
+ * changes to this file unless you know what you are doing--modify the SWIG
+ * interface file instead.
  * ----------------------------------------------------------------------------- */
 
 /* -----------------------------------------------------------------------------
@@ -39,28 +39,28 @@
 #ifndef SWIGUNUSED
 # if defined(__GNUC__)
 #   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__)) 
+#     define SWIGUNUSED __attribute__ ((__unused__))
 #   else
 #     define SWIGUNUSED
 #   endif
 # elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__)) 
+#   define SWIGUNUSED __attribute__ ((__unused__))
 # else
-#   define SWIGUNUSED 
+#   define SWIGUNUSED
 # endif
 #endif
 
 #ifndef SWIG_MSC_UNSUPPRESS_4505
 # if defined(_MSC_VER)
 #   pragma warning(disable : 4505) /* unreferenced local function has been removed */
-# endif 
+# endif
 #endif
 
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
 # else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
 # endif
 #endif
 
@@ -103,7 +103,7 @@
 #   define SWIGSTDCALL __stdcall
 # else
 #   define SWIGSTDCALL
-# endif 
+# endif
 #endif
 
 /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
@@ -117,18 +117,18 @@
 #endif
 
 /*  Errors in SWIG */
-#define  SWIG_UnknownError    	   -1 
-#define  SWIG_IOError        	   -2 
-#define  SWIG_RuntimeError   	   -3 
-#define  SWIG_IndexError     	   -4 
-#define  SWIG_TypeError      	   -5 
-#define  SWIG_DivisionByZero 	   -6 
-#define  SWIG_OverflowError  	   -7 
-#define  SWIG_SyntaxError    	   -8 
-#define  SWIG_ValueError     	   -9 
+#define  SWIG_UnknownError    	   -1
+#define  SWIG_IOError        	   -2
+#define  SWIG_RuntimeError   	   -3
+#define  SWIG_IndexError     	   -4
+#define  SWIG_TypeError      	   -5
+#define  SWIG_DivisionByZero 	   -6
+#define  SWIG_OverflowError  	   -7
+#define  SWIG_SyntaxError    	   -8
+#define  SWIG_ValueError     	   -9
 #define  SWIG_SystemError    	   -10
 #define  SWIG_AttributeError 	   -11
-#define  SWIG_MemoryError    	   -12 
+#define  SWIG_MemoryError    	   -12
 #define  SWIG_NullReferenceError   -13
 
 
@@ -156,7 +156,7 @@
   You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for
   creating a static or dynamic library from the SWIG runtime code.
   In 99.9% of the cases, SWIG just needs to declare them as 'static'.
-  
+
   But only do this if strictly necessary, ie, if you have problems
   with your compiler or suchlike.
 */
@@ -182,16 +182,16 @@
 #define SWIG_POINTER_OWN           0x1
 
 
-/* 
+/*
    Flags/methods for returning states.
-   
-   The SWIG conversion methods, as ConvertPtr, return an integer 
+
+   The SWIG conversion methods, as ConvertPtr, return an integer
    that tells if the conversion was successful or not. And if not,
    an error code can be returned (see swigerrors.swg for the codes).
-   
+
    Use the following macros/flags to set or process the returning
    states.
-   
+
    In old versions of SWIG, code such as the following was usually written:
 
      if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) {
@@ -224,23 +224,23 @@
     } else {
       // fail code
     }
-    
+
    I.e., now SWIG_ConvertPtr can return new objects and you can
    identify the case and take care of the deallocation. Of course that
    also requires SWIG_ConvertPtr to return new result values, such as
 
-      int SWIG_ConvertPtr(obj, ptr,...) {         
-        if (<obj is ok>) {			       
-          if (<need new object>) {		       
-            *ptr = <ptr to new allocated object>; 
-            return SWIG_NEWOBJ;		       
-          } else {				       
-            *ptr = <ptr to old object>;	       
-            return SWIG_OLDOBJ;		       
-          } 				       
-        } else {				       
-          return SWIG_BADOBJ;		       
-        }					       
+      int SWIG_ConvertPtr(obj, ptr,...) {
+        if (<obj is ok>) {
+          if (<need new object>) {
+            *ptr = <ptr to new allocated object>;
+            return SWIG_NEWOBJ;
+          } else {
+            *ptr = <ptr to old object>;
+            return SWIG_OLDOBJ;
+          }
+        } else {
+          return SWIG_BADOBJ;
+        }
       }
 
    Of course, returning the plain '0(success)/-1(fail)' still works, but you can be
@@ -254,17 +254,17 @@
        int fooi(int);
 
    and you call
- 
+
       food(1)   // cast rank '1'  (1 -> 1.0)
       fooi(1)   // cast rank '0'
 
    just use the SWIG_AddCast()/SWIG_CheckState()
 */
 
-#define SWIG_OK                    (0) 
+#define SWIG_OK                    (0)
 #define SWIG_ERROR                 (-1)
 #define SWIG_IsOK(r)               (r >= 0)
-#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)  
+#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)
 
 /* The CastRankLimit says how many bits are used for the cast rank */
 #define SWIG_CASTRANKLIMIT         (1 << 8)
@@ -295,14 +295,14 @@
 #  endif
 #  define SWIG_CASTRANKMASK          ((SWIG_CASTRANKLIMIT) -1)
 #  define SWIG_CastRank(r)           (r & SWIG_CASTRANKMASK)
-SWIGINTERNINLINE int SWIG_AddCast(int r) { 
+SWIGINTERNINLINE int SWIG_AddCast(int r) {
   return SWIG_IsOK(r) ? ((SWIG_CastRank(r) < SWIG_MAXCASTRANK) ? (r + 1) : SWIG_ERROR) : r;
 }
-SWIGINTERNINLINE int SWIG_CheckState(int r) { 
-  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0; 
+SWIGINTERNINLINE int SWIG_CheckState(int r) {
+  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0;
 }
 #else /* no cast-rank mode */
-#  define SWIG_AddCast
+#  define SWIG_AddCast(r) (r)
 #  define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0)
 #endif
 
@@ -346,7 +346,7 @@ typedef struct swig_module_info {
   void                    *clientdata;		/* Language specific module data */
 } swig_module_info;
 
-/* 
+/*
   Compare two type names skipping the space characters, therefore
   "char*" == "char *" and "Class<int>" == "Class<int >", etc.
 
@@ -366,18 +366,18 @@ SWIG_TypeNameComp(const char *f1, const char *l1,
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if not equal, 1 if equal
+  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
 */
 SWIGRUNTIME int
-SWIG_TypeEquiv(const char *nb, const char *tb) {
-  int equiv = 0;
+SWIG_TypeCmp(const char *nb, const char *tb) {
+  int equiv = 1;
   const char* te = tb + strlen(tb);
   const char* ne = nb;
-  while (!equiv && *ne) {
+  while (equiv != 0 && *ne) {
     for (nb = ne; *ne; ++ne) {
       if (*ne == '|') break;
     }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
+    equiv = SWIG_TypeNameComp(nb, ne, tb, te);
     if (*ne) ++ne;
   }
   return equiv;
@@ -385,24 +385,13 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
+  Return 0 if not equal, 1 if equal
 */
 SWIGRUNTIME int
-SWIG_TypeCompare(const char *nb, const char *tb) {
-  int equiv = 0;
-  const char* te = tb + strlen(tb);
-  const char* ne = nb;
-  while (!equiv && *ne) {
-    for (nb = ne; *ne; ++ne) {
-      if (*ne == '|') break;
-    }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
-    if (*ne) ++ne;
-  }
-  return equiv;
+SWIG_TypeEquiv(const char *nb, const char *tb) {
+  return SWIG_TypeCmp(nb, tb) == 0 ? 1 : 0;
 }
 
-
 /*
   Check the typename
 */
@@ -430,7 +419,7 @@ SWIG_TypeCheck(const char *c, swig_type_info *ty) {
   return 0;
 }
 
-/* 
+/*
   Identical to SWIG_TypeCheck, except strcmp is replaced with a pointer comparison
 */
 SWIGRUNTIME swig_cast_info *
@@ -465,7 +454,7 @@ SWIG_TypeCast(swig_cast_info *ty, void *ptr, int *newmemory) {
   return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr, newmemory);
 }
 
-/* 
+/*
    Dynamic pointer casting. Down an inheritance hierarchy
 */
 SWIGRUNTIME swig_type_info *
@@ -509,7 +498,7 @@ SWIG_TypePrettyName(const swig_type_info *type) {
     return type->name;
 }
 
-/* 
+/*
    Set the clientdata field for a type
 */
 SWIGRUNTIME void
@@ -517,14 +506,14 @@ SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
   swig_cast_info *cast = ti->cast;
   /* if (ti->clientdata == clientdata) return; */
   ti->clientdata = clientdata;
-  
+
   while (cast) {
     if (!cast->converter) {
       swig_type_info *tc = cast->type;
       if (!tc->clientdata) {
 	SWIG_TypeClientData(tc, clientdata);
       }
-    }    
+    }
     cast = cast->next;
   }
 }
@@ -533,18 +522,18 @@ SWIG_TypeNewClientData(swig_type_info *ti, void *clientdata) {
   SWIG_TypeClientData(ti, clientdata);
   ti->owndata = 1;
 }
-  
+
 /*
   Search for a swig_type_info structure only by mangled name
   Search is a O(log #types)
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_MangledTypeQueryModule(swig_module_info *start, 
-                            swig_module_info *end, 
+SWIG_MangledTypeQueryModule(swig_module_info *start,
+                            swig_module_info *end,
 		            const char *name) {
   swig_module_info *iter = start;
   do {
@@ -553,11 +542,11 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
       register size_t r = iter->size - 1;
       do {
 	/* since l+r >= 0, we can (>> 1) instead (/ 2) */
-	register size_t i = (l + r) >> 1; 
+	register size_t i = (l + r) >> 1;
 	const char *iname = iter->types[i]->name;
 	if (iname) {
 	  register int compare = strcmp(name, iname);
-	  if (compare == 0) {	    
+	  if (compare == 0) {
 	    return iter->types[i];
 	  } else if (compare < 0) {
 	    if (i) {
@@ -582,14 +571,14 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
   Search for a swig_type_info structure for either a mangled name or a human readable name.
   It first searches the mangled names of the types, which is a O(log #types)
   If a type is not found it then searches the human readable names, which is O(#types).
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_TypeQueryModule(swig_module_info *start, 
-                     swig_module_info *end, 
+SWIG_TypeQueryModule(swig_module_info *start,
+                     swig_module_info *end,
 		     const char *name) {
   /* STEP 1: Search the name field using binary search */
   swig_type_info *ret = SWIG_MangledTypeQueryModule(start, end, name);
@@ -608,12 +597,12 @@ SWIG_TypeQueryModule(swig_module_info *start,
       iter = iter->next;
     } while (iter != end);
   }
-  
+
   /* neither found a match */
   return 0;
 }
 
-/* 
+/*
    Pack binary data into a string
 */
 SWIGRUNTIME char *
@@ -629,7 +618,7 @@ SWIG_PackData(char *c, void *ptr, size_t sz) {
   return c;
 }
 
-/* 
+/*
    Unpack binary data from a string
 */
 SWIGRUNTIME const char *
@@ -643,21 +632,21 @@ SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
       uu = ((d - '0') << 4);
     else if ((d >= 'a') && (d <= 'f'))
       uu = ((d - ('a'-10)) << 4);
-    else 
+    else
       return (char *) 0;
     d = *(c++);
     if ((d >= '0') && (d <= '9'))
       uu |= (d - '0');
     else if ((d >= 'a') && (d <= 'f'))
       uu |= (d - ('a'-10));
-    else 
+    else
       return (char *) 0;
     *u = uu;
   }
   return c;
 }
 
-/* 
+/*
    Pack 'void *' into a string buffer.
 */
 SWIGRUNTIME char *
@@ -1632,7 +1621,7 @@ SWIG_Ruby_SetModule(swig_module_info *pointer)
 SWIGINTERN
 int SWIG_Ruby_isCallable( VALUE proc )
 {
-  if ( rb_respond_to( proc, swig_call_id ) == Qtrue )
+  if ( rb_respond_to( proc, swig_call_id ) )
     return 1;
   return 0;
 }
@@ -1645,7 +1634,7 @@ int SWIG_Ruby_isCallable( VALUE proc )
 SWIGINTERN
 int SWIG_Ruby_arity( VALUE proc, int minimal )
 {
-  if ( rb_respond_to( proc, swig_arity_id ) == Qtrue )
+  if ( rb_respond_to( proc, swig_arity_id ) )
     {
       VALUE num = rb_funcall( proc, swig_arity_id, 0 );
       int arity = NUM2INT(num);
diff --git a/subversion/bindings/swig/proxy/swigrun.swg b/subversion/bindings/swig/proxy/swigrun.swg
index e5afb62..7066e67 100644
--- a/subversion/bindings/swig/proxy/swigrun.swg
+++ b/subversion/bindings/swig/proxy/swigrun.swg
@@ -22,7 +22,7 @@
   You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for
   creating a static or dynamic library from the SWIG runtime code.
   In 99.9% of the cases, SWIG just needs to declare them as 'static'.
-  
+
   But only do this if strictly necessary, ie, if you have problems
   with your compiler or suchlike.
 */
@@ -48,16 +48,16 @@
 #define SWIG_POINTER_OWN           0x1
 
 
-/* 
+/*
    Flags/methods for returning states.
-   
-   The SWIG conversion methods, as ConvertPtr, return an integer 
+
+   The SWIG conversion methods, as ConvertPtr, return an integer
    that tells if the conversion was successful or not. And if not,
    an error code can be returned (see swigerrors.swg for the codes).
-   
+
    Use the following macros/flags to set or process the returning
    states.
-   
+
    In old versions of SWIG, code such as the following was usually written:
 
      if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) {
@@ -90,23 +90,23 @@
     } else {
       // fail code
     }
-    
+
    I.e., now SWIG_ConvertPtr can return new objects and you can
    identify the case and take care of the deallocation. Of course that
    also requires SWIG_ConvertPtr to return new result values, such as
 
-      int SWIG_ConvertPtr(obj, ptr,...) {         
-        if (<obj is ok>) {			       
-          if (<need new object>) {		       
-            *ptr = <ptr to new allocated object>; 
-            return SWIG_NEWOBJ;		       
-          } else {				       
-            *ptr = <ptr to old object>;	       
-            return SWIG_OLDOBJ;		       
-          } 				       
-        } else {				       
-          return SWIG_BADOBJ;		       
-        }					       
+      int SWIG_ConvertPtr(obj, ptr,...) {
+        if (<obj is ok>) {
+          if (<need new object>) {
+            *ptr = <ptr to new allocated object>;
+            return SWIG_NEWOBJ;
+          } else {
+            *ptr = <ptr to old object>;
+            return SWIG_OLDOBJ;
+          }
+        } else {
+          return SWIG_BADOBJ;
+        }
       }
 
    Of course, returning the plain '0(success)/-1(fail)' still works, but you can be
@@ -120,17 +120,17 @@
        int fooi(int);
 
    and you call
- 
+
       food(1)   // cast rank '1'  (1 -> 1.0)
       fooi(1)   // cast rank '0'
 
    just use the SWIG_AddCast()/SWIG_CheckState()
 */
 
-#define SWIG_OK                    (0) 
+#define SWIG_OK                    (0)
 #define SWIG_ERROR                 (-1)
 #define SWIG_IsOK(r)               (r >= 0)
-#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)  
+#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)
 
 /* The CastRankLimit says how many bits are used for the cast rank */
 #define SWIG_CASTRANKLIMIT         (1 << 8)
@@ -161,14 +161,14 @@
 #  endif
 #  define SWIG_CASTRANKMASK          ((SWIG_CASTRANKLIMIT) -1)
 #  define SWIG_CastRank(r)           (r & SWIG_CASTRANKMASK)
-SWIGINTERNINLINE int SWIG_AddCast(int r) { 
+SWIGINTERNINLINE int SWIG_AddCast(int r) {
   return SWIG_IsOK(r) ? ((SWIG_CastRank(r) < SWIG_MAXCASTRANK) ? (r + 1) : SWIG_ERROR) : r;
 }
-SWIGINTERNINLINE int SWIG_CheckState(int r) { 
-  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0; 
+SWIGINTERNINLINE int SWIG_CheckState(int r) {
+  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0;
 }
 #else /* no cast-rank mode */
-#  define SWIG_AddCast
+#  define SWIG_AddCast(r) (r)
 #  define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0)
 #endif
 
@@ -212,7 +212,7 @@ typedef struct swig_module_info {
   void                    *clientdata;		/* Language specific module data */
 } swig_module_info;
 
-/* 
+/*
   Compare two type names skipping the space characters, therefore
   "char*" == "char *" and "Class<int>" == "Class<int >", etc.
 
@@ -232,18 +232,18 @@ SWIG_TypeNameComp(const char *f1, const char *l1,
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if not equal, 1 if equal
+  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
 */
 SWIGRUNTIME int
-SWIG_TypeEquiv(const char *nb, const char *tb) {
-  int equiv = 0;
+SWIG_TypeCmp(const char *nb, const char *tb) {
+  int equiv = 1;
   const char* te = tb + strlen(tb);
   const char* ne = nb;
-  while (!equiv && *ne) {
+  while (equiv != 0 && *ne) {
     for (nb = ne; *ne; ++ne) {
       if (*ne == '|') break;
     }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
+    equiv = SWIG_TypeNameComp(nb, ne, tb, te);
     if (*ne) ++ne;
   }
   return equiv;
@@ -251,24 +251,13 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
+  Return 0 if not equal, 1 if equal
 */
 SWIGRUNTIME int
-SWIG_TypeCompare(const char *nb, const char *tb) {
-  int equiv = 0;
-  const char* te = tb + strlen(tb);
-  const char* ne = nb;
-  while (!equiv && *ne) {
-    for (nb = ne; *ne; ++ne) {
-      if (*ne == '|') break;
-    }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
-    if (*ne) ++ne;
-  }
-  return equiv;
+SWIG_TypeEquiv(const char *nb, const char *tb) {
+  return SWIG_TypeCmp(nb, tb) == 0 ? 1 : 0;
 }
 
-
 /*
   Check the typename
 */
@@ -296,7 +285,7 @@ SWIG_TypeCheck(const char *c, swig_type_info *ty) {
   return 0;
 }
 
-/* 
+/*
   Identical to SWIG_TypeCheck, except strcmp is replaced with a pointer comparison
 */
 SWIGRUNTIME swig_cast_info *
@@ -331,7 +320,7 @@ SWIG_TypeCast(swig_cast_info *ty, void *ptr, int *newmemory) {
   return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr, newmemory);
 }
 
-/* 
+/*
    Dynamic pointer casting. Down an inheritance hierarchy
 */
 SWIGRUNTIME swig_type_info *
@@ -375,7 +364,7 @@ SWIG_TypePrettyName(const swig_type_info *type) {
     return type->name;
 }
 
-/* 
+/*
    Set the clientdata field for a type
 */
 SWIGRUNTIME void
@@ -383,14 +372,14 @@ SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
   swig_cast_info *cast = ti->cast;
   /* if (ti->clientdata == clientdata) return; */
   ti->clientdata = clientdata;
-  
+
   while (cast) {
     if (!cast->converter) {
       swig_type_info *tc = cast->type;
       if (!tc->clientdata) {
 	SWIG_TypeClientData(tc, clientdata);
       }
-    }    
+    }
     cast = cast->next;
   }
 }
@@ -399,18 +388,18 @@ SWIG_TypeNewClientData(swig_type_info *ti, void *clientdata) {
   SWIG_TypeClientData(ti, clientdata);
   ti->owndata = 1;
 }
-  
+
 /*
   Search for a swig_type_info structure only by mangled name
   Search is a O(log #types)
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_MangledTypeQueryModule(swig_module_info *start, 
-                            swig_module_info *end, 
+SWIG_MangledTypeQueryModule(swig_module_info *start,
+                            swig_module_info *end,
 		            const char *name) {
   swig_module_info *iter = start;
   do {
@@ -419,11 +408,11 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
       register size_t r = iter->size - 1;
       do {
 	/* since l+r >= 0, we can (>> 1) instead (/ 2) */
-	register size_t i = (l + r) >> 1; 
+	register size_t i = (l + r) >> 1;
 	const char *iname = iter->types[i]->name;
 	if (iname) {
 	  register int compare = strcmp(name, iname);
-	  if (compare == 0) {	    
+	  if (compare == 0) {
 	    return iter->types[i];
 	  } else if (compare < 0) {
 	    if (i) {
@@ -448,14 +437,14 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
   Search for a swig_type_info structure for either a mangled name or a human readable name.
   It first searches the mangled names of the types, which is a O(log #types)
   If a type is not found it then searches the human readable names, which is O(#types).
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_TypeQueryModule(swig_module_info *start, 
-                     swig_module_info *end, 
+SWIG_TypeQueryModule(swig_module_info *start,
+                     swig_module_info *end,
 		     const char *name) {
   /* STEP 1: Search the name field using binary search */
   swig_type_info *ret = SWIG_MangledTypeQueryModule(start, end, name);
@@ -474,12 +463,12 @@ SWIG_TypeQueryModule(swig_module_info *start,
       iter = iter->next;
     } while (iter != end);
   }
-  
+
   /* neither found a match */
   return 0;
 }
 
-/* 
+/*
    Pack binary data into a string
 */
 SWIGRUNTIME char *
@@ -495,7 +484,7 @@ SWIG_PackData(char *c, void *ptr, size_t sz) {
   return c;
 }
 
-/* 
+/*
    Unpack binary data from a string
 */
 SWIGRUNTIME const char *
@@ -509,21 +498,21 @@ SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
       uu = ((d - '0') << 4);
     else if ((d >= 'a') && (d <= 'f'))
       uu = ((d - ('a'-10)) << 4);
-    else 
+    else
       return (char *) 0;
     d = *(c++);
     if ((d >= '0') && (d <= '9'))
       uu |= (d - '0');
     else if ((d >= 'a') && (d <= 'f'))
       uu |= (d - ('a'-10));
-    else 
+    else
       return (char *) 0;
     *u = uu;
   }
   return c;
 }
 
-/* 
+/*
    Pack 'void *' into a string buffer.
 */
 SWIGRUNTIME char *
diff --git a/subversion/bindings/swig/python/client.py b/subversion/bindings/swig/python/client.py
index c62d460..065247c 100644
--- a/subversion/bindings/swig/python/client.py
+++ b/subversion/bindings/swig/python/client.py
@@ -1,11 +1,13 @@
 # This file was automatically generated by SWIG (http://www.swig.org).
-# Version 2.0.9
+# Version 2.0.12
 #
 # Do not make changes to this file unless you know what you are doing--modify
 # the SWIG interface file instead.
 
 
 
+
+
 from sys import version_info
 if version_info >= (2,6,0):
     def swig_import_helper():
@@ -150,7 +152,7 @@ class svn_client_commit_info_t:
     __swig_setmethods__["author"] = _client.svn_client_commit_info_t_author_set
     __swig_getmethods__["author"] = _client.svn_client_commit_info_t_author_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_client_commit_info_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -169,13 +171,13 @@ class svn_client_commit_info_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -184,9 +186,9 @@ class svn_client_commit_info_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -238,7 +240,7 @@ class svn_client_commit_item3_t:
     __swig_setmethods__["moved_from_abspath"] = _client.svn_client_commit_item3_t_moved_from_abspath_set
     __swig_getmethods__["moved_from_abspath"] = _client.svn_client_commit_item3_t_moved_from_abspath_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_client_commit_item3_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -257,13 +259,13 @@ class svn_client_commit_item3_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -272,9 +274,9 @@ class svn_client_commit_item3_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -313,7 +315,7 @@ class svn_client_commit_item2_t:
     __swig_setmethods__["wcprop_changes"] = _client.svn_client_commit_item2_t_wcprop_changes_set
     __swig_getmethods__["wcprop_changes"] = _client.svn_client_commit_item2_t_wcprop_changes_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_client_commit_item2_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -332,13 +334,13 @@ class svn_client_commit_item2_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -347,9 +349,9 @@ class svn_client_commit_item2_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -386,7 +388,7 @@ class svn_client_commit_item_t:
     __swig_setmethods__["wcprop_changes"] = _client.svn_client_commit_item_t_wcprop_changes_set
     __swig_getmethods__["wcprop_changes"] = _client.svn_client_commit_item_t_wcprop_changes_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_client_commit_item_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -405,13 +407,13 @@ class svn_client_commit_item_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -420,9 +422,9 @@ class svn_client_commit_item_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -473,7 +475,7 @@ class svn_client_diff_summarize_t:
     __swig_setmethods__["node_kind"] = _client.svn_client_diff_summarize_t_node_kind_set
     __swig_getmethods__["node_kind"] = _client.svn_client_diff_summarize_t_node_kind_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_client_diff_summarize_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -492,13 +494,13 @@ class svn_client_diff_summarize_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -507,9 +509,9 @@ class svn_client_diff_summarize_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -581,8 +583,14 @@ class svn_client_ctx_t:
     __swig_getmethods__["conflict_baton2"] = _client.svn_client_ctx_t_conflict_baton2_get
     __swig_setmethods__["wc_ctx"] = _client.svn_client_ctx_t_wc_ctx_set
     __swig_getmethods__["wc_ctx"] = _client.svn_client_ctx_t_wc_ctx_get
+    __swig_setmethods__["check_tunnel_func"] = _client.svn_client_ctx_t_check_tunnel_func_set
+    __swig_getmethods__["check_tunnel_func"] = _client.svn_client_ctx_t_check_tunnel_func_get
+    __swig_setmethods__["open_tunnel_func"] = _client.svn_client_ctx_t_open_tunnel_func_set
+    __swig_getmethods__["open_tunnel_func"] = _client.svn_client_ctx_t_open_tunnel_func_get
+    __swig_setmethods__["tunnel_baton"] = _client.svn_client_ctx_t_tunnel_baton_set
+    __swig_getmethods__["tunnel_baton"] = _client.svn_client_ctx_t_tunnel_baton_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_client_ctx_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -601,13 +609,13 @@ class svn_client_ctx_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -616,9 +624,9 @@ class svn_client_ctx_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -970,7 +978,7 @@ class svn_client_status_t:
     __swig_setmethods__["moved_to_abspath"] = _client.svn_client_status_t_moved_to_abspath_set
     __swig_getmethods__["moved_to_abspath"] = _client.svn_client_status_t_moved_to_abspath_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_client_status_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -989,13 +997,13 @@ class svn_client_status_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1004,9 +1012,9 @@ class svn_client_status_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -1026,6 +1034,16 @@ def svn_client_status_dup(*args):
   """svn_client_status_dup(svn_client_status_t status, apr_pool_t result_pool) -> svn_client_status_t"""
   return _client.svn_client_status_dup(*args)
 
+def svn_client_status6(*args):
+  """
+    svn_client_status6(svn_client_ctx_t ctx, char const * path, svn_opt_revision_t revision, svn_depth_t depth, 
+        svn_boolean_t get_all, svn_boolean_t check_out_of_date, svn_boolean_t check_working_copy, 
+        svn_boolean_t no_ignore, svn_boolean_t ignore_externals, 
+        svn_boolean_t depth_as_sticky, apr_array_header_t changelists, svn_client_status_func_t status_func, 
+        void * status_baton, apr_pool_t scratch_pool) -> svn_error_t
+    """
+  return _client.svn_client_status6(*args)
+
 def svn_client_status5(*args):
   """
     svn_client_status5(svn_client_ctx_t ctx, char const * path, svn_opt_revision_t revision, svn_depth_t depth, 
@@ -1491,6 +1509,22 @@ def svn_client_mergeinfo_log_eligible(*args):
     """
   return _client.svn_client_mergeinfo_log_eligible(*args)
 
+def svn_client_vacuum(*args):
+  """
+    svn_client_vacuum(char const * dir_abspath, svn_boolean_t remove_unversioned_items, svn_boolean_t remove_ignored_items, 
+        svn_boolean_t fix_recorded_timestamps, svn_boolean_t vacuum_pristines, 
+        svn_boolean_t include_externals, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t
+    """
+  return _client.svn_client_vacuum(*args)
+
+def svn_client_cleanup2(*args):
+  """
+    svn_client_cleanup2(char const * dir_abspath, svn_boolean_t break_locks, svn_boolean_t fix_recorded_timestamps, 
+        svn_boolean_t clear_dav_cache, svn_boolean_t vacuum_pristines, svn_boolean_t include_externals, 
+        svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t
+    """
+  return _client.svn_client_cleanup2(*args)
+
 def svn_client_cleanup(*args):
   """svn_client_cleanup(char const * dir, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t"""
   return _client.svn_client_cleanup(*args)
@@ -1513,6 +1547,14 @@ def svn_client_relocate(*args):
     """
   return _client.svn_client_relocate(*args)
 
+def svn_client_revert3(*args):
+  """
+    svn_client_revert3(apr_array_header_t paths, svn_depth_t depth, apr_array_header_t changelists, svn_boolean_t clear_changelists, 
+        svn_boolean_t metadata_only, svn_client_ctx_t ctx, 
+        apr_pool_t pool) -> svn_error_t
+    """
+  return _client.svn_client_revert3(*args)
+
 def svn_client_revert2(*args):
   """
     svn_client_revert2(apr_array_header_t paths, svn_depth_t depth, apr_array_header_t changelists, svn_client_ctx_t ctx, 
@@ -1548,7 +1590,7 @@ class svn_client_copy_source_t:
     __swig_setmethods__["peg_revision"] = _client.svn_client_copy_source_t_peg_revision_set
     __swig_getmethods__["peg_revision"] = _client.svn_client_copy_source_t_peg_revision_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_client_copy_source_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1567,13 +1609,13 @@ class svn_client_copy_source_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1582,9 +1624,9 @@ class svn_client_copy_source_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -1600,6 +1642,16 @@ svn_client_copy_source_t_swigregister = _client.svn_client_copy_source_t_swigreg
 svn_client_copy_source_t_swigregister(svn_client_copy_source_t)
 
 
+def svn_client_copy7(*args):
+  """
+    svn_client_copy7(apr_array_header_t sources, char const * dst_path, svn_boolean_t copy_as_child, svn_boolean_t make_parents, 
+        svn_boolean_t ignore_externals, svn_boolean_t metadata_only, 
+        svn_boolean_t pin_externals, apr_hash_t externals_to_pin, apr_hash_t revprop_table, 
+        svn_commit_callback2_t commit_callback, svn_client_ctx_t ctx, 
+        apr_pool_t pool) -> svn_error_t
+    """
+  return _client.svn_client_copy7(*args)
+
 def svn_client_copy6(*args):
   """
     svn_client_copy6(apr_array_header_t sources, char const * dst_path, svn_boolean_t copy_as_child, svn_boolean_t make_parents, 
@@ -1921,6 +1973,14 @@ def svn_client_ls(*args):
     """
   return _client.svn_client_ls(*args)
 
+def svn_client_cat3(*args):
+  """
+    svn_client_cat3(svn_stream_t * out, char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, 
+        svn_boolean_t expand_keywords, svn_client_ctx_t ctx, 
+        apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t
+    """
+  return _client.svn_client_cat3(*args)
+
 def svn_client_cat2(*args):
   """
     svn_client_cat2(svn_stream_t * out, char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, 
@@ -2028,7 +2088,7 @@ class svn_info_t:
     __swig_setmethods__["tree_conflict"] = _client.svn_info_t_tree_conflict_set
     __swig_getmethods__["tree_conflict"] = _client.svn_info_t_tree_conflict_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_info_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -2047,13 +2107,13 @@ class svn_info_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -2062,9 +2122,9 @@ class svn_info_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -2113,7 +2173,7 @@ class svn_client_info2_t:
     __swig_setmethods__["wc_info"] = _client.svn_client_info2_t_wc_info_set
     __swig_getmethods__["wc_info"] = _client.svn_client_info2_t_wc_info_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_client_info2_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -2132,13 +2192,13 @@ class svn_client_info2_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -2147,9 +2207,9 @@ class svn_client_info2_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -2169,6 +2229,16 @@ def svn_client_info2_dup(*args):
   """svn_client_info2_dup(svn_client_info2_t info, apr_pool_t pool) -> svn_client_info2_t"""
   return _client.svn_client_info2_dup(*args)
 
+def svn_client_info4(*args):
+  """
+    svn_client_info4(char const * abspath_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, 
+        svn_depth_t depth, svn_boolean_t fetch_excluded, svn_boolean_t fetch_actual_only, 
+        svn_boolean_t include_externals, apr_array_header_t changelists, 
+        svn_client_info_receiver2_t receiver, void * receiver_baton, svn_client_ctx_t ctx, 
+        apr_pool_t scratch_pool) -> svn_error_t
+    """
+  return _client.svn_client_info4(*args)
+
 def svn_client_info3(*args):
   """
     svn_client_info3(char const * abspath_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, 
@@ -2372,7 +2442,7 @@ class svn_proplist_receiver2_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_proplist_receiver2_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -2391,13 +2461,13 @@ class svn_proplist_receiver2_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -2406,9 +2476,9 @@ class svn_proplist_receiver2_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -2428,7 +2498,7 @@ class svn_proplist_receiver_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_proplist_receiver_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -2447,13 +2517,13 @@ class svn_proplist_receiver_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -2462,9 +2532,9 @@ class svn_proplist_receiver_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -2484,7 +2554,7 @@ class svn_client_get_commit_log3_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_client_get_commit_log3_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -2503,13 +2573,13 @@ class svn_client_get_commit_log3_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -2518,9 +2588,9 @@ class svn_client_get_commit_log3_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -2540,7 +2610,7 @@ class svn_client_get_commit_log2_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_client_get_commit_log2_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -2559,13 +2629,13 @@ class svn_client_get_commit_log2_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -2574,9 +2644,9 @@ class svn_client_get_commit_log2_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -2596,7 +2666,7 @@ class svn_client_get_commit_log_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_client_get_commit_log_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -2615,13 +2685,13 @@ class svn_client_get_commit_log_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -2630,9 +2700,9 @@ class svn_client_get_commit_log_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -2652,7 +2722,7 @@ class svn_client_blame_receiver3_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_client_blame_receiver3_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -2671,13 +2741,13 @@ class svn_client_blame_receiver3_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -2686,9 +2756,9 @@ class svn_client_blame_receiver3_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -2708,7 +2778,7 @@ class svn_client_blame_receiver2_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_client_blame_receiver2_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -2727,13 +2797,13 @@ class svn_client_blame_receiver2_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -2742,9 +2812,9 @@ class svn_client_blame_receiver2_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -2764,7 +2834,7 @@ class svn_client_blame_receiver_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_client_blame_receiver_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -2783,13 +2853,13 @@ class svn_client_blame_receiver_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -2798,9 +2868,9 @@ class svn_client_blame_receiver_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -2820,7 +2890,7 @@ class svn_client_diff_summarize_func_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_client_diff_summarize_func_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -2839,13 +2909,13 @@ class svn_client_diff_summarize_func_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -2854,9 +2924,9 @@ class svn_client_diff_summarize_func_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -2876,7 +2946,7 @@ class svn_client_import_filter_func_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_client_import_filter_func_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -2895,13 +2965,13 @@ class svn_client_import_filter_func_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -2910,9 +2980,9 @@ class svn_client_import_filter_func_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -2932,7 +3002,7 @@ class svn_client_status_func_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_client_status_func_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -2951,13 +3021,13 @@ class svn_client_status_func_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -2966,9 +3036,9 @@ class svn_client_status_func_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -2988,7 +3058,7 @@ class svn_client_list_func2_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_client_list_func2_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -3007,13 +3077,13 @@ class svn_client_list_func2_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -3022,9 +3092,9 @@ class svn_client_list_func2_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -3044,7 +3114,7 @@ class svn_client_list_func_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_client_list_func_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -3063,13 +3133,13 @@ class svn_client_list_func_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -3078,9 +3148,9 @@ class svn_client_list_func_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -3100,7 +3170,7 @@ class svn_info_receiver_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_info_receiver_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -3119,13 +3189,13 @@ class svn_info_receiver_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -3134,9 +3204,9 @@ class svn_info_receiver_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -3156,7 +3226,7 @@ class svn_client_info_receiver2_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_client_info_receiver2_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -3175,13 +3245,13 @@ class svn_client_info_receiver2_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -3190,9 +3260,9 @@ class svn_client_info_receiver2_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -3212,7 +3282,7 @@ class svn_client_patch_func_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_client_patch_func_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -3231,13 +3301,13 @@ class svn_client_patch_func_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -3246,9 +3316,9 @@ class svn_client_patch_func_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
diff --git a/subversion/bindings/swig/python/core.c b/subversion/bindings/swig/python/core.c
index 8c95dbd..29e5fc1 100644
--- a/subversion/bindings/swig/python/core.c
+++ b/subversion/bindings/swig/python/core.c
@@ -1,11 +1,11 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
- * 
- * This file is not intended to be easily readable and contains a number of 
+ * Version 2.0.12
+ *
+ * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
- * changes to this file unless you know what you are doing--modify the SWIG 
- * interface file instead. 
+ * changes to this file unless you know what you are doing--modify the SWIG
+ * interface file instead.
  * ----------------------------------------------------------------------------- */
 
 #define SWIGPYTHON
@@ -43,28 +43,28 @@
 #ifndef SWIGUNUSED
 # if defined(__GNUC__)
 #   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__)) 
+#     define SWIGUNUSED __attribute__ ((__unused__))
 #   else
 #     define SWIGUNUSED
 #   endif
 # elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__)) 
+#   define SWIGUNUSED __attribute__ ((__unused__))
 # else
-#   define SWIGUNUSED 
+#   define SWIGUNUSED
 # endif
 #endif
 
 #ifndef SWIG_MSC_UNSUPPRESS_4505
 # if defined(_MSC_VER)
 #   pragma warning(disable : 4505) /* unreferenced local function has been removed */
-# endif 
+# endif
 #endif
 
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
 # else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
 # endif
 #endif
 
@@ -107,7 +107,7 @@
 #   define SWIGSTDCALL __stdcall
 # else
 #   define SWIGSTDCALL
-# endif 
+# endif
 #endif
 
 /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
@@ -122,8 +122,14 @@
 
 
 
-/* Python.h has to appear first */
-#include <Python.h>
+#if defined(_DEBUG) && defined(SWIG_PYTHON_INTERPRETER_NO_DEBUG)
+/* Use debug wrappers with the Python release dll */
+# undef _DEBUG
+# include <Python.h>
+# define _DEBUG
+#else
+# include <Python.h>
+#endif
 
 /* -----------------------------------------------------------------------------
  * swigrun.swg
@@ -149,7 +155,7 @@
   You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for
   creating a static or dynamic library from the SWIG runtime code.
   In 99.9% of the cases, SWIG just needs to declare them as 'static'.
-  
+
   But only do this if strictly necessary, ie, if you have problems
   with your compiler or suchlike.
 */
@@ -175,16 +181,16 @@
 #define SWIG_POINTER_OWN           0x1
 
 
-/* 
+/*
    Flags/methods for returning states.
-   
-   The SWIG conversion methods, as ConvertPtr, return an integer 
+
+   The SWIG conversion methods, as ConvertPtr, return an integer
    that tells if the conversion was successful or not. And if not,
    an error code can be returned (see swigerrors.swg for the codes).
-   
+
    Use the following macros/flags to set or process the returning
    states.
-   
+
    In old versions of SWIG, code such as the following was usually written:
 
      if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) {
@@ -217,23 +223,23 @@
     } else {
       // fail code
     }
-    
+
    I.e., now SWIG_ConvertPtr can return new objects and you can
    identify the case and take care of the deallocation. Of course that
    also requires SWIG_ConvertPtr to return new result values, such as
 
-      int SWIG_ConvertPtr(obj, ptr,...) {         
-        if (<obj is ok>) {			       
-          if (<need new object>) {		       
-            *ptr = <ptr to new allocated object>; 
-            return SWIG_NEWOBJ;		       
-          } else {				       
-            *ptr = <ptr to old object>;	       
-            return SWIG_OLDOBJ;		       
-          } 				       
-        } else {				       
-          return SWIG_BADOBJ;		       
-        }					       
+      int SWIG_ConvertPtr(obj, ptr,...) {
+        if (<obj is ok>) {
+          if (<need new object>) {
+            *ptr = <ptr to new allocated object>;
+            return SWIG_NEWOBJ;
+          } else {
+            *ptr = <ptr to old object>;
+            return SWIG_OLDOBJ;
+          }
+        } else {
+          return SWIG_BADOBJ;
+        }
       }
 
    Of course, returning the plain '0(success)/-1(fail)' still works, but you can be
@@ -247,17 +253,17 @@
        int fooi(int);
 
    and you call
- 
+
       food(1)   // cast rank '1'  (1 -> 1.0)
       fooi(1)   // cast rank '0'
 
    just use the SWIG_AddCast()/SWIG_CheckState()
 */
 
-#define SWIG_OK                    (0) 
+#define SWIG_OK                    (0)
 #define SWIG_ERROR                 (-1)
 #define SWIG_IsOK(r)               (r >= 0)
-#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)  
+#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)
 
 /* The CastRankLimit says how many bits are used for the cast rank */
 #define SWIG_CASTRANKLIMIT         (1 << 8)
@@ -288,14 +294,14 @@
 #  endif
 #  define SWIG_CASTRANKMASK          ((SWIG_CASTRANKLIMIT) -1)
 #  define SWIG_CastRank(r)           (r & SWIG_CASTRANKMASK)
-SWIGINTERNINLINE int SWIG_AddCast(int r) { 
+SWIGINTERNINLINE int SWIG_AddCast(int r) {
   return SWIG_IsOK(r) ? ((SWIG_CastRank(r) < SWIG_MAXCASTRANK) ? (r + 1) : SWIG_ERROR) : r;
 }
-SWIGINTERNINLINE int SWIG_CheckState(int r) { 
-  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0; 
+SWIGINTERNINLINE int SWIG_CheckState(int r) {
+  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0;
 }
 #else /* no cast-rank mode */
-#  define SWIG_AddCast
+#  define SWIG_AddCast(r) (r)
 #  define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0)
 #endif
 
@@ -339,7 +345,7 @@ typedef struct swig_module_info {
   void                    *clientdata;		/* Language specific module data */
 } swig_module_info;
 
-/* 
+/*
   Compare two type names skipping the space characters, therefore
   "char*" == "char *" and "Class<int>" == "Class<int >", etc.
 
@@ -359,18 +365,18 @@ SWIG_TypeNameComp(const char *f1, const char *l1,
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if not equal, 1 if equal
+  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
 */
 SWIGRUNTIME int
-SWIG_TypeEquiv(const char *nb, const char *tb) {
-  int equiv = 0;
+SWIG_TypeCmp(const char *nb, const char *tb) {
+  int equiv = 1;
   const char* te = tb + strlen(tb);
   const char* ne = nb;
-  while (!equiv && *ne) {
+  while (equiv != 0 && *ne) {
     for (nb = ne; *ne; ++ne) {
       if (*ne == '|') break;
     }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
+    equiv = SWIG_TypeNameComp(nb, ne, tb, te);
     if (*ne) ++ne;
   }
   return equiv;
@@ -378,24 +384,13 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
+  Return 0 if not equal, 1 if equal
 */
 SWIGRUNTIME int
-SWIG_TypeCompare(const char *nb, const char *tb) {
-  int equiv = 0;
-  const char* te = tb + strlen(tb);
-  const char* ne = nb;
-  while (!equiv && *ne) {
-    for (nb = ne; *ne; ++ne) {
-      if (*ne == '|') break;
-    }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
-    if (*ne) ++ne;
-  }
-  return equiv;
+SWIG_TypeEquiv(const char *nb, const char *tb) {
+  return SWIG_TypeCmp(nb, tb) == 0 ? 1 : 0;
 }
 
-
 /*
   Check the typename
 */
@@ -423,7 +418,7 @@ SWIG_TypeCheck(const char *c, swig_type_info *ty) {
   return 0;
 }
 
-/* 
+/*
   Identical to SWIG_TypeCheck, except strcmp is replaced with a pointer comparison
 */
 SWIGRUNTIME swig_cast_info *
@@ -458,7 +453,7 @@ SWIG_TypeCast(swig_cast_info *ty, void *ptr, int *newmemory) {
   return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr, newmemory);
 }
 
-/* 
+/*
    Dynamic pointer casting. Down an inheritance hierarchy
 */
 SWIGRUNTIME swig_type_info *
@@ -502,7 +497,7 @@ SWIG_TypePrettyName(const swig_type_info *type) {
     return type->name;
 }
 
-/* 
+/*
    Set the clientdata field for a type
 */
 SWIGRUNTIME void
@@ -510,14 +505,14 @@ SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
   swig_cast_info *cast = ti->cast;
   /* if (ti->clientdata == clientdata) return; */
   ti->clientdata = clientdata;
-  
+
   while (cast) {
     if (!cast->converter) {
       swig_type_info *tc = cast->type;
       if (!tc->clientdata) {
 	SWIG_TypeClientData(tc, clientdata);
       }
-    }    
+    }
     cast = cast->next;
   }
 }
@@ -526,18 +521,18 @@ SWIG_TypeNewClientData(swig_type_info *ti, void *clientdata) {
   SWIG_TypeClientData(ti, clientdata);
   ti->owndata = 1;
 }
-  
+
 /*
   Search for a swig_type_info structure only by mangled name
   Search is a O(log #types)
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_MangledTypeQueryModule(swig_module_info *start, 
-                            swig_module_info *end, 
+SWIG_MangledTypeQueryModule(swig_module_info *start,
+                            swig_module_info *end,
 		            const char *name) {
   swig_module_info *iter = start;
   do {
@@ -546,11 +541,11 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
       register size_t r = iter->size - 1;
       do {
 	/* since l+r >= 0, we can (>> 1) instead (/ 2) */
-	register size_t i = (l + r) >> 1; 
+	register size_t i = (l + r) >> 1;
 	const char *iname = iter->types[i]->name;
 	if (iname) {
 	  register int compare = strcmp(name, iname);
-	  if (compare == 0) {	    
+	  if (compare == 0) {
 	    return iter->types[i];
 	  } else if (compare < 0) {
 	    if (i) {
@@ -575,14 +570,14 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
   Search for a swig_type_info structure for either a mangled name or a human readable name.
   It first searches the mangled names of the types, which is a O(log #types)
   If a type is not found it then searches the human readable names, which is O(#types).
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_TypeQueryModule(swig_module_info *start, 
-                     swig_module_info *end, 
+SWIG_TypeQueryModule(swig_module_info *start,
+                     swig_module_info *end,
 		     const char *name) {
   /* STEP 1: Search the name field using binary search */
   swig_type_info *ret = SWIG_MangledTypeQueryModule(start, end, name);
@@ -601,12 +596,12 @@ SWIG_TypeQueryModule(swig_module_info *start,
       iter = iter->next;
     } while (iter != end);
   }
-  
+
   /* neither found a match */
   return 0;
 }
 
-/* 
+/*
    Pack binary data into a string
 */
 SWIGRUNTIME char *
@@ -622,7 +617,7 @@ SWIG_PackData(char *c, void *ptr, size_t sz) {
   return c;
 }
 
-/* 
+/*
    Unpack binary data from a string
 */
 SWIGRUNTIME const char *
@@ -636,21 +631,21 @@ SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
       uu = ((d - '0') << 4);
     else if ((d >= 'a') && (d <= 'f'))
       uu = ((d - ('a'-10)) << 4);
-    else 
+    else
       return (char *) 0;
     d = *(c++);
     if ((d >= '0') && (d <= '9'))
       uu |= (d - '0');
     else if ((d >= 'a') && (d <= 'f'))
       uu |= (d - ('a'-10));
-    else 
+    else
       return (char *) 0;
     *u = uu;
   }
   return c;
 }
 
-/* 
+/*
    Pack 'void *' into a string buffer.
 */
 SWIGRUNTIME char *
@@ -710,18 +705,18 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 #endif
 
 /*  Errors in SWIG */
-#define  SWIG_UnknownError    	   -1 
-#define  SWIG_IOError        	   -2 
-#define  SWIG_RuntimeError   	   -3 
-#define  SWIG_IndexError     	   -4 
-#define  SWIG_TypeError      	   -5 
-#define  SWIG_DivisionByZero 	   -6 
-#define  SWIG_OverflowError  	   -7 
-#define  SWIG_SyntaxError    	   -8 
-#define  SWIG_ValueError     	   -9 
+#define  SWIG_UnknownError    	   -1
+#define  SWIG_IOError        	   -2
+#define  SWIG_RuntimeError   	   -3
+#define  SWIG_IndexError     	   -4
+#define  SWIG_TypeError      	   -5
+#define  SWIG_DivisionByZero 	   -6
+#define  SWIG_OverflowError  	   -7
+#define  SWIG_SyntaxError    	   -8
+#define  SWIG_ValueError     	   -9
 #define  SWIG_SystemError    	   -10
 #define  SWIG_AttributeError 	   -11
-#define  SWIG_MemoryError    	   -12 
+#define  SWIG_MemoryError    	   -12
 #define  SWIG_NullReferenceError   -13
 
 
@@ -1582,34 +1577,6 @@ SwigPyObject_repr(SwigPyObject *v, PyObject *args)
 }
 
 SWIGRUNTIME int
-SwigPyObject_print(SwigPyObject *v, FILE *fp, int SWIGUNUSEDPARM(flags))
-{
-  char *str;
-#ifdef METH_NOARGS
-  PyObject *repr = SwigPyObject_repr(v);
-#else
-  PyObject *repr = SwigPyObject_repr(v, NULL);
-#endif
-  if (repr) {
-    str = SWIG_Python_str_AsChar(repr); 
-    fputs(str, fp);
-    SWIG_Python_str_DelForPy3(str);
-    Py_DECREF(repr);
-    return 0; 
-  } else {
-    return 1; 
-  }
-}
-
-SWIGRUNTIME PyObject *
-SwigPyObject_str(SwigPyObject *v)
-{
-  char result[SWIG_BUFFER_SIZE];
-  return SWIG_PackVoidPtr(result, v->ptr, v->ty->name, sizeof(result)) ?
-    SWIG_Python_str_FromChar(result) : 0;
-}
-
-SWIGRUNTIME int
 SwigPyObject_compare(SwigPyObject *v, SwigPyObject *w)
 {
   void *i = v->ptr;
@@ -1801,7 +1768,7 @@ SwigPyObject_own(PyObject *v, PyObject *args)
 static PyMethodDef
 swigobject_methods[] = {
   {(char *)"disown",  (PyCFunction)SwigPyObject_disown,  METH_NOARGS,  (char *)"releases ownership of the pointer"},
-  {(char *)"acquire", (PyCFunction)SwigPyObject_acquire, METH_NOARGS,  (char *)"aquires ownership of the pointer"},
+  {(char *)"acquire", (PyCFunction)SwigPyObject_acquire, METH_NOARGS,  (char *)"acquires ownership of the pointer"},
   {(char *)"own",     (PyCFunction)SwigPyObject_own,     METH_VARARGS, (char *)"returns/sets ownership of the pointer"},
   {(char *)"append",  (PyCFunction)SwigPyObject_append,  METH_O,       (char *)"appends another 'this' object"},
   {(char *)"next",    (PyCFunction)SwigPyObject_next,    METH_NOARGS,  (char *)"returns the next 'this' object"},
@@ -1894,7 +1861,7 @@ SwigPyObject_TypeOnce(void) {
       sizeof(SwigPyObject),                 /* tp_basicsize */
       0,                                    /* tp_itemsize */
       (destructor)SwigPyObject_dealloc,     /* tp_dealloc */
-      (printfunc)SwigPyObject_print,        /* tp_print */
+      0,				    /* tp_print */
 #if PY_VERSION_HEX < 0x02020000
       (getattrfunc)SwigPyObject_getattr,    /* tp_getattr */
 #else
@@ -1912,7 +1879,7 @@ SwigPyObject_TypeOnce(void) {
       0,                                    /* tp_as_mapping */
       (hashfunc)0,                          /* tp_hash */
       (ternaryfunc)0,                       /* tp_call */
-      (reprfunc)SwigPyObject_str,           /* tp_str */
+      0,				    /* tp_str */
       PyObject_GenericGetAttr,              /* tp_getattro */
       0,                                    /* tp_setattro */
       0,                                    /* tp_as_buffer */
@@ -2289,10 +2256,11 @@ SWIGRUNTIME int
 SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int flags, int *own) {
   int res;
   SwigPyObject *sobj;
+  int implicit_conv = (flags & SWIG_POINTER_IMPLICIT_CONV) != 0;
 
   if (!obj)
     return SWIG_ERROR;
-  if (obj == Py_None) {
+  if (obj == Py_None && !implicit_conv) {
     if (ptr)
       *ptr = 0;
     return SWIG_OK;
@@ -2341,7 +2309,7 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
     }
     res = SWIG_OK;
   } else {
-    if (flags & SWIG_POINTER_IMPLICIT_CONV) {
+    if (implicit_conv) {
       SwigPyClientData *data = ty ? (SwigPyClientData *) ty->clientdata : 0;
       if (data && !data->implicitconv) {
         PyObject *klass = data->klass;
@@ -2376,6 +2344,13 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
         }
       }
     }
+    if (!SWIG_IsOK(res) && obj == Py_None) {
+      if (ptr)
+        *ptr = 0;
+      if (PyErr_Occurred())
+        PyErr_Clear();
+      res = SWIG_OK;
+    }
   }
   return res;
 }
@@ -2875,7 +2850,7 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) {
   PyObject *descr;
   PyObject *encoded_name;
   descrsetfunc f;
-  int res;
+  int res = -1;
 
 # ifdef Py_USING_UNICODE
   if (PyString_Check(name)) {
@@ -2898,7 +2873,6 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) {
       goto done;
   }
 
-  res = -1;
   descr = _PyType_Lookup(tp, name);
   f = NULL;
   if (descr != NULL)
@@ -2948,30 +2922,30 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) {
 #define SWIGTYPE_p_apr_finfo_t swig_types[5]
 #define SWIGTYPE_p_apr_getopt_option_t swig_types[6]
 #define SWIGTYPE_p_apr_getopt_t swig_types[7]
-#define SWIGTYPE_p_apr_hash_index_t swig_types[8]
-#define SWIGTYPE_p_apr_hash_t swig_types[9]
-#define SWIGTYPE_p_apr_int32_t swig_types[10]
-#define SWIGTYPE_p_apr_int64_t swig_types[11]
-#define SWIGTYPE_p_apr_off_t swig_types[12]
-#define SWIGTYPE_p_apr_pool_t swig_types[13]
-#define SWIGTYPE_p_apr_proc_t swig_types[14]
-#define SWIGTYPE_p_apr_size_t swig_types[15]
-#define SWIGTYPE_p_char swig_types[16]
-#define SWIGTYPE_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[17]
-#define SWIGTYPE_p_f_p_p_char_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t swig_types[18]
-#define SWIGTYPE_p_f_p_p_struct_svn_auth_provider_object_t_p_apr_pool_t__void swig_types[19]
-#define SWIGTYPE_p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[20]
-#define SWIGTYPE_p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[21]
-#define SWIGTYPE_p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[22]
-#define SWIGTYPE_p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[23]
-#define SWIGTYPE_p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[24]
-#define SWIGTYPE_p_f_p_p_svn_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t swig_types[25]
-#define SWIGTYPE_p_f_p_p_void_p_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[26]
-#define SWIGTYPE_p_f_p_p_void_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[27]
-#define SWIGTYPE_p_f_p_q_const__char_p_q_const__char_p_void__int swig_types[28]
-#define SWIGTYPE_p_f_p_q_const__char_p_q_const__char_p_void_p_apr_pool_t__int swig_types[29]
-#define SWIGTYPE_p_f_p_q_const__char_p_void__int swig_types[30]
-#define SWIGTYPE_p_f_p_q_const__char_p_void_p_apr_pool_t__int swig_types[31]
+#define SWIGTYPE_p_apr_hash_t swig_types[8]
+#define SWIGTYPE_p_apr_int32_t swig_types[9]
+#define SWIGTYPE_p_apr_int64_t swig_types[10]
+#define SWIGTYPE_p_apr_off_t swig_types[11]
+#define SWIGTYPE_p_apr_pool_t swig_types[12]
+#define SWIGTYPE_p_apr_proc_t swig_types[13]
+#define SWIGTYPE_p_apr_size_t swig_types[14]
+#define SWIGTYPE_p_char swig_types[15]
+#define SWIGTYPE_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[16]
+#define SWIGTYPE_p_f_p_p_char_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t swig_types[17]
+#define SWIGTYPE_p_f_p_p_struct_svn_auth_provider_object_t_p_apr_pool_t__void swig_types[18]
+#define SWIGTYPE_p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[19]
+#define SWIGTYPE_p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[20]
+#define SWIGTYPE_p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[21]
+#define SWIGTYPE_p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[22]
+#define SWIGTYPE_p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[23]
+#define SWIGTYPE_p_f_p_p_svn_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t swig_types[24]
+#define SWIGTYPE_p_f_p_p_void_p_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[25]
+#define SWIGTYPE_p_f_p_p_void_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[26]
+#define SWIGTYPE_p_f_p_q_const__char_p_q_const__char_p_void__int swig_types[27]
+#define SWIGTYPE_p_f_p_q_const__char_p_q_const__char_p_void_p_apr_pool_t__int swig_types[28]
+#define SWIGTYPE_p_f_p_q_const__char_p_void__int swig_types[29]
+#define SWIGTYPE_p_f_p_q_const__char_p_void_p_apr_pool_t__int swig_types[30]
+#define SWIGTYPE_p_f_p_q_const__struct_svn_version_t_p_q_const__struct_svn_version_t__int swig_types[31]
 #define SWIGTYPE_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[32]
 #define SWIGTYPE_p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t swig_types[33]
 #define SWIGTYPE_p_f_p_svn_boolean_t_p_void_p_q_const__char_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[34]
@@ -2985,113 +2959,117 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) {
 #define SWIGTYPE_p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t swig_types[42]
 #define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t swig_types[43]
 #define SWIGTYPE_p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t swig_types[44]
-#define SWIGTYPE_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t swig_types[45]
-#define SWIGTYPE_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t swig_types[46]
-#define SWIGTYPE_p_f_void__p_svn_version_t swig_types[47]
-#define SWIGTYPE_p_int swig_types[48]
-#define SWIGTYPE_p_long swig_types[49]
-#define SWIGTYPE_p_p_apr_array_header_t swig_types[50]
-#define SWIGTYPE_p_p_apr_file_t swig_types[51]
-#define SWIGTYPE_p_p_apr_hash_t swig_types[52]
-#define SWIGTYPE_p_p_char swig_types[53]
-#define SWIGTYPE_p_p_f_p_p_char_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t swig_types[54]
-#define SWIGTYPE_p_p_f_p_p_struct_svn_auth_provider_object_t_p_apr_pool_t__void swig_types[55]
-#define SWIGTYPE_p_p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[56]
-#define SWIGTYPE_p_p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[57]
-#define SWIGTYPE_p_p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[58]
-#define SWIGTYPE_p_p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[59]
-#define SWIGTYPE_p_p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[60]
-#define SWIGTYPE_p_p_f_p_p_svn_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t swig_types[61]
-#define SWIGTYPE_p_p_f_p_q_const__char_p_q_const__char_p_void__int swig_types[62]
-#define SWIGTYPE_p_p_f_p_q_const__char_p_q_const__char_p_void_p_apr_pool_t__int swig_types[63]
-#define SWIGTYPE_p_p_f_p_q_const__char_p_void__int swig_types[64]
-#define SWIGTYPE_p_p_f_p_q_const__char_p_void_p_apr_pool_t__int swig_types[65]
-#define SWIGTYPE_p_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[66]
-#define SWIGTYPE_p_p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t swig_types[67]
-#define SWIGTYPE_p_p_f_p_svn_boolean_t_p_void_p_q_const__char_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[68]
-#define SWIGTYPE_p_p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[69]
-#define SWIGTYPE_p_p_f_p_void__p_svn_error_t swig_types[70]
-#define SWIGTYPE_p_p_f_p_void_apr_size_t__p_svn_error_t swig_types[71]
-#define SWIGTYPE_p_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[72]
-#define SWIGTYPE_p_p_f_p_void_p_char_p_apr_size_t__p_svn_error_t swig_types[73]
-#define SWIGTYPE_p_p_f_p_void_p_p_svn_stream_mark_t_p_apr_pool_t__p_svn_error_t swig_types[74]
-#define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t swig_types[75]
-#define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t swig_types[76]
-#define SWIGTYPE_p_p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t swig_types[77]
-#define SWIGTYPE_p_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t swig_types[78]
-#define SWIGTYPE_p_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t swig_types[79]
-#define SWIGTYPE_p_p_f_void__p_svn_version_t swig_types[80]
-#define SWIGTYPE_p_p_svn_auth_baton_t swig_types[81]
-#define SWIGTYPE_p_p_svn_auth_cred_simple_t swig_types[82]
-#define SWIGTYPE_p_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[83]
-#define SWIGTYPE_p_p_svn_auth_cred_ssl_client_cert_t swig_types[84]
-#define SWIGTYPE_p_p_svn_auth_cred_ssl_server_trust_t swig_types[85]
-#define SWIGTYPE_p_p_svn_auth_cred_username_t swig_types[86]
-#define SWIGTYPE_p_p_svn_auth_iterstate_t swig_types[87]
-#define SWIGTYPE_p_p_svn_auth_provider_object_t swig_types[88]
-#define SWIGTYPE_p_p_svn_checksum_t swig_types[89]
-#define SWIGTYPE_p_p_svn_config_t swig_types[90]
-#define SWIGTYPE_p_p_svn_io_dirent2_t swig_types[91]
-#define SWIGTYPE_p_p_svn_stream_mark_t swig_types[92]
-#define SWIGTYPE_p_p_svn_stream_t swig_types[93]
-#define SWIGTYPE_p_p_svn_string_t swig_types[94]
-#define SWIGTYPE_p_p_svn_stringbuf_t swig_types[95]
-#define SWIGTYPE_p_p_void swig_types[96]
-#define SWIGTYPE_p_svn_auth_baton_t swig_types[97]
-#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[98]
-#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[99]
-#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[100]
-#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[101]
-#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[102]
-#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[103]
-#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[104]
-#define SWIGTYPE_p_svn_auth_provider_t swig_types[105]
-#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[106]
-#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[107]
-#define SWIGTYPE_p_svn_checksum_kind_t swig_types[108]
-#define SWIGTYPE_p_svn_checksum_t swig_types[109]
-#define SWIGTYPE_p_svn_commit_info_t swig_types[110]
-#define SWIGTYPE_p_svn_config_t swig_types[111]
-#define SWIGTYPE_p_svn_depth_t swig_types[112]
-#define SWIGTYPE_p_svn_dirent_t swig_types[113]
-#define SWIGTYPE_p_svn_errno_t swig_types[114]
-#define SWIGTYPE_p_svn_error_t swig_types[115]
-#define SWIGTYPE_p_svn_io_dirent2_t swig_types[116]
-#define SWIGTYPE_p_svn_io_dirent_t swig_types[117]
-#define SWIGTYPE_p_svn_io_file_del_t swig_types[118]
-#define SWIGTYPE_p_svn_location_segment_t swig_types[119]
-#define SWIGTYPE_p_svn_lock_t swig_types[120]
-#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[121]
-#define SWIGTYPE_p_svn_log_changed_path_t swig_types[122]
-#define SWIGTYPE_p_svn_log_entry_t swig_types[123]
-#define SWIGTYPE_p_svn_merge_range_t swig_types[124]
-#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[125]
-#define SWIGTYPE_p_svn_node_kind_t swig_types[126]
-#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[127]
-#define SWIGTYPE_p_svn_opt_revision_t swig_types[128]
-#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[129]
-#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[130]
-#define SWIGTYPE_p_svn_opt_subcommand_desc2_t_desc_overrides swig_types[131]
-#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[132]
-#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[133]
-#define SWIGTYPE_p_svn_prop_kind swig_types[134]
-#define SWIGTYPE_p_svn_prop_t swig_types[135]
-#define SWIGTYPE_p_svn_stream_mark_t swig_types[136]
-#define SWIGTYPE_p_svn_stream_t swig_types[137]
-#define SWIGTYPE_p_svn_string_t swig_types[138]
-#define SWIGTYPE_p_svn_stringbuf_t swig_types[139]
-#define SWIGTYPE_p_svn_tristate_t swig_types[140]
-#define SWIGTYPE_p_svn_version_checklist_t swig_types[141]
-#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[142]
-#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[143]
-#define SWIGTYPE_p_svn_version_extended_t swig_types[144]
-#define SWIGTYPE_p_svn_version_t swig_types[145]
-#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[146]
-#define SWIGTYPE_p_unsigned_char swig_types[147]
-#define SWIGTYPE_p_unsigned_long swig_types[148]
-#define SWIGTYPE_p_void swig_types[149]
-static swig_type_info *swig_types[151];
-static swig_module_info swig_module = {swig_types, 150, 0, 0, 0, 0};
+#define SWIGTYPE_p_f_p_void_p_svn_boolean_t__p_svn_error_t swig_types[45]
+#define SWIGTYPE_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t swig_types[46]
+#define SWIGTYPE_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t swig_types[47]
+#define SWIGTYPE_p_f_void__p_svn_version_t swig_types[48]
+#define SWIGTYPE_p_int swig_types[49]
+#define SWIGTYPE_p_long swig_types[50]
+#define SWIGTYPE_p_p_apr_array_header_t swig_types[51]
+#define SWIGTYPE_p_p_apr_file_t swig_types[52]
+#define SWIGTYPE_p_p_apr_hash_t swig_types[53]
+#define SWIGTYPE_p_p_char swig_types[54]
+#define SWIGTYPE_p_p_f_p_p_char_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t swig_types[55]
+#define SWIGTYPE_p_p_f_p_p_struct_svn_auth_provider_object_t_p_apr_pool_t__void swig_types[56]
+#define SWIGTYPE_p_p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[57]
+#define SWIGTYPE_p_p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[58]
+#define SWIGTYPE_p_p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[59]
+#define SWIGTYPE_p_p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[60]
+#define SWIGTYPE_p_p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[61]
+#define SWIGTYPE_p_p_f_p_p_svn_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t swig_types[62]
+#define SWIGTYPE_p_p_f_p_q_const__char_p_q_const__char_p_void__int swig_types[63]
+#define SWIGTYPE_p_p_f_p_q_const__char_p_q_const__char_p_void_p_apr_pool_t__int swig_types[64]
+#define SWIGTYPE_p_p_f_p_q_const__char_p_void__int swig_types[65]
+#define SWIGTYPE_p_p_f_p_q_const__char_p_void_p_apr_pool_t__int swig_types[66]
+#define SWIGTYPE_p_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[67]
+#define SWIGTYPE_p_p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t swig_types[68]
+#define SWIGTYPE_p_p_f_p_svn_boolean_t_p_void_p_q_const__char_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[69]
+#define SWIGTYPE_p_p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[70]
+#define SWIGTYPE_p_p_f_p_void__p_svn_error_t swig_types[71]
+#define SWIGTYPE_p_p_f_p_void_apr_size_t__p_svn_error_t swig_types[72]
+#define SWIGTYPE_p_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[73]
+#define SWIGTYPE_p_p_f_p_void_p_char_p_apr_size_t__p_svn_error_t swig_types[74]
+#define SWIGTYPE_p_p_f_p_void_p_p_svn_stream_mark_t_p_apr_pool_t__p_svn_error_t swig_types[75]
+#define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t swig_types[76]
+#define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t swig_types[77]
+#define SWIGTYPE_p_p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t swig_types[78]
+#define SWIGTYPE_p_p_f_p_void_p_svn_boolean_t__p_svn_error_t swig_types[79]
+#define SWIGTYPE_p_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t swig_types[80]
+#define SWIGTYPE_p_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t swig_types[81]
+#define SWIGTYPE_p_p_f_void__p_svn_version_t swig_types[82]
+#define SWIGTYPE_p_p_svn_auth_baton_t swig_types[83]
+#define SWIGTYPE_p_p_svn_auth_cred_simple_t swig_types[84]
+#define SWIGTYPE_p_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[85]
+#define SWIGTYPE_p_p_svn_auth_cred_ssl_client_cert_t swig_types[86]
+#define SWIGTYPE_p_p_svn_auth_cred_ssl_server_trust_t swig_types[87]
+#define SWIGTYPE_p_p_svn_auth_cred_username_t swig_types[88]
+#define SWIGTYPE_p_p_svn_auth_iterstate_t swig_types[89]
+#define SWIGTYPE_p_p_svn_auth_provider_object_t swig_types[90]
+#define SWIGTYPE_p_p_svn_checksum_t swig_types[91]
+#define SWIGTYPE_p_p_svn_config_t swig_types[92]
+#define SWIGTYPE_p_p_svn_io_dirent2_t swig_types[93]
+#define SWIGTYPE_p_p_svn_stream_mark_t swig_types[94]
+#define SWIGTYPE_p_p_svn_stream_t swig_types[95]
+#define SWIGTYPE_p_p_svn_string_t swig_types[96]
+#define SWIGTYPE_p_p_svn_stringbuf_t swig_types[97]
+#define SWIGTYPE_p_p_void swig_types[98]
+#define SWIGTYPE_p_svn_auth_baton_t swig_types[99]
+#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[100]
+#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[101]
+#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[102]
+#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[103]
+#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[104]
+#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[105]
+#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[106]
+#define SWIGTYPE_p_svn_auth_provider_t swig_types[107]
+#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[108]
+#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[109]
+#define SWIGTYPE_p_svn_checksum_kind_t swig_types[110]
+#define SWIGTYPE_p_svn_checksum_t swig_types[111]
+#define SWIGTYPE_p_svn_commit_info_t swig_types[112]
+#define SWIGTYPE_p_svn_config_t swig_types[113]
+#define SWIGTYPE_p_svn_depth_t swig_types[114]
+#define SWIGTYPE_p_svn_diff_hunk_t swig_types[115]
+#define SWIGTYPE_p_svn_dirent_t swig_types[116]
+#define SWIGTYPE_p_svn_errno_t swig_types[117]
+#define SWIGTYPE_p_svn_error_t swig_types[118]
+#define SWIGTYPE_p_svn_fs_lock_target_t swig_types[119]
+#define SWIGTYPE_p_svn_io_dirent2_t swig_types[120]
+#define SWIGTYPE_p_svn_io_dirent_t swig_types[121]
+#define SWIGTYPE_p_svn_io_file_del_t swig_types[122]
+#define SWIGTYPE_p_svn_location_segment_t swig_types[123]
+#define SWIGTYPE_p_svn_lock_t swig_types[124]
+#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[125]
+#define SWIGTYPE_p_svn_log_changed_path_t swig_types[126]
+#define SWIGTYPE_p_svn_log_entry_t swig_types[127]
+#define SWIGTYPE_p_svn_merge_range_t swig_types[128]
+#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[129]
+#define SWIGTYPE_p_svn_node_kind_t swig_types[130]
+#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[131]
+#define SWIGTYPE_p_svn_opt_revision_t swig_types[132]
+#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[133]
+#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[134]
+#define SWIGTYPE_p_svn_opt_subcommand_desc2_t_desc_overrides swig_types[135]
+#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[136]
+#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[137]
+#define SWIGTYPE_p_svn_prop_kind swig_types[138]
+#define SWIGTYPE_p_svn_prop_t swig_types[139]
+#define SWIGTYPE_p_svn_stream_mark_t swig_types[140]
+#define SWIGTYPE_p_svn_stream_t swig_types[141]
+#define SWIGTYPE_p_svn_string_t swig_types[142]
+#define SWIGTYPE_p_svn_stringbuf_t swig_types[143]
+#define SWIGTYPE_p_svn_tristate_t swig_types[144]
+#define SWIGTYPE_p_svn_version_checklist_t swig_types[145]
+#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[146]
+#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[147]
+#define SWIGTYPE_p_svn_version_extended_t swig_types[148]
+#define SWIGTYPE_p_svn_version_t swig_types[149]
+#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[150]
+#define SWIGTYPE_p_unsigned_char swig_types[151]
+#define SWIGTYPE_p_unsigned_long swig_types[152]
+#define SWIGTYPE_p_void swig_types[153]
+static swig_type_info *swig_types[155];
+static swig_module_info swig_module = {swig_types, 154, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
@@ -3115,7 +3093,7 @@ static swig_module_info swig_module = {swig_types, 150, 0, 0, 0, 0};
 #endif
 #define SWIG_name    "_core"
 
-#define SWIGVERSION 0x020009 
+#define SWIGVERSION 0x020012 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -3617,6 +3595,18 @@ SWIG_AsVal_unsigned_SS_long (PyObject *obj, unsigned long *val)
       return SWIG_OK;
     } else {
       PyErr_Clear();
+#if PY_VERSION_HEX >= 0x03000000
+      {
+        long v = PyLong_AsLong(obj);
+        if (!PyErr_Occurred()) {
+          if (v < 0) {
+            return SWIG_OverflowError;
+          }
+        } else {
+          PyErr_Clear();
+        }
+      }
+#endif
     }
   }
 #ifdef SWIG_PYTHON_CAST_MODE
@@ -3753,8 +3743,8 @@ static svn_boolean_t svn_config_invoke_enumerator2(
 }
 
 static svn_error_t * svn_config_invoke_auth_walk_func(
-  svn_config_auth_walk_func_t _obj, svn_boolean_t *delete_cred, void *cleanup_baton, const char *cred_kind, const char *realmstring, apr_hash_t *hash, apr_pool_t *scratch_pool) {
-  return _obj(delete_cred, cleanup_baton, cred_kind, realmstring, hash, scratch_pool);
+  svn_config_auth_walk_func_t _obj, svn_boolean_t *delete_cred, void *walk_baton, const char *cred_kind, const char *realmstring, apr_hash_t *hash, apr_pool_t *scratch_pool) {
+  return _obj(delete_cred, walk_baton, cred_kind, realmstring, hash, scratch_pool);
 }
 
 
@@ -3817,6 +3807,11 @@ static svn_error_t * svn_stream_invoke_seek_fn(
   return _obj(baton, mark);
 }
 
+static svn_error_t * svn_stream_invoke_data_available_fn(
+  svn_stream_data_available_fn_t _obj, void *baton, svn_boolean_t *data_available) {
+  return _obj(baton, data_available);
+}
+
 static svn_error_t * svn_stream_invoke_lazyopen_func(
   svn_stream_lazyopen_func_t _obj, svn_stream_t **stream, void *baton, apr_pool_t *result_pool, apr_pool_t *scratch_pool) {
   return _obj(stream, baton, result_pool, scratch_pool);
@@ -4078,7 +4073,7 @@ SWIGINTERN PyObject *_wrap_apr_file_open_stdout(PyObject *SWIGUNUSEDPARM(self),
   }
   resultobj = SWIG_From_long((long)(result));
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_apr_file_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_apr_file_t,
         _global_py_pool, args))
     
     ;
@@ -4129,7 +4124,7 @@ SWIGINTERN PyObject *_wrap_apr_file_open_stderr(PyObject *SWIGUNUSEDPARM(self),
   }
   resultobj = SWIG_From_long((long)(result));
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_apr_file_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_apr_file_t,
         _global_py_pool, args))
     
     ;
@@ -4395,7 +4390,7 @@ SWIGINTERN PyObject *_wrap_svn_error_t_apr_err_set(PyObject *SWIGUNUSEDPARM(self
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_error_t_apr_err_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_error_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_error_t, svn_argnum_obj0);
+    arg1 = (struct svn_error_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_error_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4422,7 +4417,7 @@ SWIGINTERN PyObject *_wrap_svn_error_t_apr_err_get(PyObject *SWIGUNUSEDPARM(self
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_error_t_apr_err_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_error_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_error_t, svn_argnum_obj0);
+    arg1 = (struct svn_error_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_error_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4443,7 +4438,7 @@ SWIGINTERN PyObject *_wrap_svn_error_t_message_get(PyObject *SWIGUNUSEDPARM(self
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_error_t_message_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_error_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_error_t, svn_argnum_obj0);
+    arg1 = (struct svn_error_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_error_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4465,13 +4460,13 @@ SWIGINTERN PyObject *_wrap_svn_error_t_child_set(PyObject *SWIGUNUSEDPARM(self),
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_error_t_child_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_error_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_error_t, svn_argnum_obj0);
+    arg1 = (struct svn_error_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_error_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (struct svn_error_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_error_t, svn_argnum_obj1);
+    arg2 = (struct svn_error_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_error_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4492,13 +4487,13 @@ SWIGINTERN PyObject *_wrap_svn_error_t_child_get(PyObject *SWIGUNUSEDPARM(self),
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_error_t_child_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_error_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_error_t, svn_argnum_obj0);
+    arg1 = (struct svn_error_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_error_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (struct svn_error_t *) ((arg1)->child);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_error_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_error_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -4521,7 +4516,7 @@ SWIGINTERN PyObject *_wrap_svn_error_t_pool_set(PyObject *SWIGUNUSEDPARM(self),
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_error_t_pool_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_error_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_error_t, svn_argnum_obj0);
+    arg1 = (struct svn_error_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_error_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4556,13 +4551,13 @@ SWIGINTERN PyObject *_wrap_svn_error_t_pool_get(PyObject *SWIGUNUSEDPARM(self),
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_error_t_pool_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_error_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_error_t, svn_argnum_obj0);
+    arg1 = (struct svn_error_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_error_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (apr_pool_t *) ((arg1)->pool);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_apr_pool_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_apr_pool_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -4578,7 +4573,7 @@ SWIGINTERN PyObject *_wrap_svn_error_t_file_get(PyObject *SWIGUNUSEDPARM(self),
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_error_t_file_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_error_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_error_t, svn_argnum_obj0);
+    arg1 = (struct svn_error_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_error_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4600,7 +4595,7 @@ SWIGINTERN PyObject *_wrap_svn_error_t_line_set(PyObject *SWIGUNUSEDPARM(self),
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_error_t_line_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_error_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_error_t, svn_argnum_obj0);
+    arg1 = (struct svn_error_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_error_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4627,7 +4622,7 @@ SWIGINTERN PyObject *_wrap_svn_error_t_line_get(PyObject *SWIGUNUSEDPARM(self),
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_error_t_line_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_error_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_error_t, svn_argnum_obj0);
+    arg1 = (struct svn_error_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_error_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4653,7 +4648,7 @@ SWIGINTERN PyObject *_wrap_new_svn_error_t(PyObject *SWIGUNUSEDPARM(self), PyObj
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_error_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_error_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -4668,7 +4663,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_error_t(PyObject *SWIGUNUSEDPARM(self), Py
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_error_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_error_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_error_t, svn_argnum_obj0);
+    arg1 = (struct svn_error_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_error_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4695,92 +4690,6 @@ SWIGINTERN PyObject *svn_error_t_swigregister(PyObject *SWIGUNUSEDPARM(self), Py
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_svn__apr_hash_index_key(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  apr_hash_index_t *arg1 = (apr_hash_index_t *) 0 ;
-  PyObject * obj0 = 0 ;
-  void *result = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:svn__apr_hash_index_key",&obj0)) SWIG_fail;
-  {
-    arg1 = (apr_hash_index_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_apr_hash_index_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  {
-    svn_swig_py_release_py_lock();
-    
-    result = (void *)svn__apr_hash_index_key((apr_hash_index_t const *)arg1);
-    
-    svn_swig_py_acquire_py_lock();
-    
-  }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_void,
-    _global_py_pool, args);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn__apr_hash_index_klen(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  apr_hash_index_t *arg1 = (apr_hash_index_t *) 0 ;
-  PyObject * obj0 = 0 ;
-  apr_ssize_t result;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:svn__apr_hash_index_klen",&obj0)) SWIG_fail;
-  {
-    arg1 = (apr_hash_index_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_apr_hash_index_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  {
-    svn_swig_py_release_py_lock();
-    
-    result = svn__apr_hash_index_klen((apr_hash_index_t const *)arg1);
-    
-    svn_swig_py_acquire_py_lock();
-    
-  }
-  resultobj = SWIG_From_long((long)(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn__apr_hash_index_val(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  apr_hash_index_t *arg1 = (apr_hash_index_t *) 0 ;
-  PyObject * obj0 = 0 ;
-  void *result = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:svn__apr_hash_index_val",&obj0)) SWIG_fail;
-  {
-    arg1 = (apr_hash_index_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_apr_hash_index_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  {
-    svn_swig_py_release_py_lock();
-    
-    result = (void *)svn__apr_hash_index_val((apr_hash_index_t const *)arg1);
-    
-    svn_swig_py_acquire_py_lock();
-    
-  }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_void,
-    _global_py_pool, args);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_svn_node_kind_to_word(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   svn_node_kind_t arg1 ;
@@ -4994,7 +4903,7 @@ SWIGINTERN PyObject *_wrap_svn_dirent_t_kind_set(PyObject *SWIGUNUSEDPARM(self),
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_dirent_t_kind_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_dirent_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_dirent_t, svn_argnum_obj0);
+    arg1 = (struct svn_dirent_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_dirent_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5021,7 +4930,7 @@ SWIGINTERN PyObject *_wrap_svn_dirent_t_kind_get(PyObject *SWIGUNUSEDPARM(self),
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_dirent_t_kind_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_dirent_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_dirent_t, svn_argnum_obj0);
+    arg1 = (struct svn_dirent_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_dirent_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5043,7 +4952,7 @@ SWIGINTERN PyObject *_wrap_svn_dirent_t_size_set(PyObject *SWIGUNUSEDPARM(self),
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_dirent_t_size_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_dirent_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_dirent_t, svn_argnum_obj0);
+    arg1 = (struct svn_dirent_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_dirent_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5065,7 +4974,7 @@ SWIGINTERN PyObject *_wrap_svn_dirent_t_size_get(PyObject *SWIGUNUSEDPARM(self),
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_dirent_t_size_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_dirent_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_dirent_t, svn_argnum_obj0);
+    arg1 = (struct svn_dirent_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_dirent_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5087,7 +4996,7 @@ SWIGINTERN PyObject *_wrap_svn_dirent_t_has_props_set(PyObject *SWIGUNUSEDPARM(s
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_dirent_t_has_props_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_dirent_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_dirent_t, svn_argnum_obj0);
+    arg1 = (struct svn_dirent_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_dirent_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5114,7 +5023,7 @@ SWIGINTERN PyObject *_wrap_svn_dirent_t_has_props_get(PyObject *SWIGUNUSEDPARM(s
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_dirent_t_has_props_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_dirent_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_dirent_t, svn_argnum_obj0);
+    arg1 = (struct svn_dirent_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_dirent_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5136,7 +5045,7 @@ SWIGINTERN PyObject *_wrap_svn_dirent_t_created_rev_set(PyObject *SWIGUNUSEDPARM
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_dirent_t_created_rev_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_dirent_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_dirent_t, svn_argnum_obj0);
+    arg1 = (struct svn_dirent_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_dirent_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5163,7 +5072,7 @@ SWIGINTERN PyObject *_wrap_svn_dirent_t_created_rev_get(PyObject *SWIGUNUSEDPARM
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_dirent_t_created_rev_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_dirent_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_dirent_t, svn_argnum_obj0);
+    arg1 = (struct svn_dirent_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_dirent_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5185,7 +5094,7 @@ SWIGINTERN PyObject *_wrap_svn_dirent_t_time_set(PyObject *SWIGUNUSEDPARM(self),
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_dirent_t_time_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_dirent_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_dirent_t, svn_argnum_obj0);
+    arg1 = (struct svn_dirent_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_dirent_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5207,7 +5116,7 @@ SWIGINTERN PyObject *_wrap_svn_dirent_t_time_get(PyObject *SWIGUNUSEDPARM(self),
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_dirent_t_time_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_dirent_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_dirent_t, svn_argnum_obj0);
+    arg1 = (struct svn_dirent_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_dirent_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5228,7 +5137,7 @@ SWIGINTERN PyObject *_wrap_svn_dirent_t_last_author_get(PyObject *SWIGUNUSEDPARM
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_dirent_t_last_author_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_dirent_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_dirent_t, svn_argnum_obj0);
+    arg1 = (struct svn_dirent_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_dirent_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5254,7 +5163,7 @@ SWIGINTERN PyObject *_wrap_new_svn_dirent_t(PyObject *SWIGUNUSEDPARM(self), PyOb
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_dirent_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_dirent_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -5269,7 +5178,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_dirent_t(PyObject *SWIGUNUSEDPARM(self), P
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_dirent_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_dirent_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_dirent_t, svn_argnum_obj0);
+    arg1 = (struct svn_dirent_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_dirent_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5312,7 +5221,7 @@ SWIGINTERN PyObject *_wrap_svn_dirent_dup(PyObject *SWIGUNUSEDPARM(self), PyObje
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_dirent_dup",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_dirent_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_dirent_t, svn_argnum_obj0);
+    arg1 = (svn_dirent_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_dirent_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5333,7 +5242,7 @@ SWIGINTERN PyObject *_wrap_svn_dirent_dup(PyObject *SWIGUNUSEDPARM(self), PyObje
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_dirent_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_dirent_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -5376,7 +5285,7 @@ SWIGINTERN PyObject *_wrap_svn_dirent_create(PyObject *SWIGUNUSEDPARM(self), PyO
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_dirent_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_dirent_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -5399,7 +5308,7 @@ SWIGINTERN PyObject *_wrap_svn_commit_info_t_revision_set(PyObject *SWIGUNUSEDPA
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_commit_info_t_revision_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_commit_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_commit_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_commit_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_commit_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5426,7 +5335,7 @@ SWIGINTERN PyObject *_wrap_svn_commit_info_t_revision_get(PyObject *SWIGUNUSEDPA
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_commit_info_t_revision_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_commit_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_commit_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_commit_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_commit_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5447,7 +5356,7 @@ SWIGINTERN PyObject *_wrap_svn_commit_info_t_date_set(PyObject *SWIGUNUSEDPARM(s
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_commit_info_t_date_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_commit_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_commit_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_commit_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_commit_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5475,7 +5384,7 @@ SWIGINTERN PyObject *_wrap_svn_commit_info_t_date_get(PyObject *SWIGUNUSEDPARM(s
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_commit_info_t_date_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_commit_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_commit_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_commit_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_commit_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5496,7 +5405,7 @@ SWIGINTERN PyObject *_wrap_svn_commit_info_t_author_set(PyObject *SWIGUNUSEDPARM
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_commit_info_t_author_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_commit_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_commit_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_commit_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_commit_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5524,7 +5433,7 @@ SWIGINTERN PyObject *_wrap_svn_commit_info_t_author_get(PyObject *SWIGUNUSEDPARM
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_commit_info_t_author_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_commit_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_commit_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_commit_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_commit_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5545,7 +5454,7 @@ SWIGINTERN PyObject *_wrap_svn_commit_info_t_post_commit_err_set(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_commit_info_t_post_commit_err_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_commit_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_commit_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_commit_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_commit_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5573,7 +5482,7 @@ SWIGINTERN PyObject *_wrap_svn_commit_info_t_post_commit_err_get(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_commit_info_t_post_commit_err_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_commit_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_commit_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_commit_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_commit_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5594,7 +5503,7 @@ SWIGINTERN PyObject *_wrap_svn_commit_info_t_repos_root_set(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_commit_info_t_repos_root_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_commit_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_commit_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_commit_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_commit_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5622,7 +5531,7 @@ SWIGINTERN PyObject *_wrap_svn_commit_info_t_repos_root_get(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_commit_info_t_repos_root_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_commit_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_commit_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_commit_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_commit_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5648,7 +5557,7 @@ SWIGINTERN PyObject *_wrap_new_svn_commit_info_t(PyObject *SWIGUNUSEDPARM(self),
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_commit_info_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_commit_info_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -5663,7 +5572,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_commit_info_t(PyObject *SWIGUNUSEDPARM(sel
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_commit_info_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_commit_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_commit_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_commit_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_commit_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5719,7 +5628,7 @@ SWIGINTERN PyObject *_wrap_svn_create_commit_info(PyObject *SWIGUNUSEDPARM(self)
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_commit_info_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_commit_info_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -5749,7 +5658,7 @@ SWIGINTERN PyObject *_wrap_svn_commit_info_dup(PyObject *SWIGUNUSEDPARM(self), P
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_commit_info_dup",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_commit_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_commit_info_t, svn_argnum_obj0);
+    arg1 = (svn_commit_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_commit_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5770,7 +5679,7 @@ SWIGINTERN PyObject *_wrap_svn_commit_info_dup(PyObject *SWIGUNUSEDPARM(self), P
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_commit_info_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_commit_info_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -5792,7 +5701,7 @@ SWIGINTERN PyObject *_wrap_svn_log_changed_path2_t_action_set(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"Oc:svn_log_changed_path2_t_action_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_log_changed_path2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_log_changed_path2_t, svn_argnum_obj0);
+    arg1 = (struct svn_log_changed_path2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_log_changed_path2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5813,7 +5722,7 @@ SWIGINTERN PyObject *_wrap_svn_log_changed_path2_t_action_get(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_log_changed_path2_t_action_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_log_changed_path2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_log_changed_path2_t, svn_argnum_obj0);
+    arg1 = (struct svn_log_changed_path2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_log_changed_path2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5834,7 +5743,7 @@ SWIGINTERN PyObject *_wrap_svn_log_changed_path2_t_copyfrom_path_set(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_log_changed_path2_t_copyfrom_path_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_log_changed_path2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_log_changed_path2_t, svn_argnum_obj0);
+    arg1 = (struct svn_log_changed_path2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_log_changed_path2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5862,7 +5771,7 @@ SWIGINTERN PyObject *_wrap_svn_log_changed_path2_t_copyfrom_path_get(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_log_changed_path2_t_copyfrom_path_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_log_changed_path2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_log_changed_path2_t, svn_argnum_obj0);
+    arg1 = (struct svn_log_changed_path2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_log_changed_path2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5884,7 +5793,7 @@ SWIGINTERN PyObject *_wrap_svn_log_changed_path2_t_copyfrom_rev_set(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_log_changed_path2_t_copyfrom_rev_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_log_changed_path2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_log_changed_path2_t, svn_argnum_obj0);
+    arg1 = (struct svn_log_changed_path2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_log_changed_path2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5911,7 +5820,7 @@ SWIGINTERN PyObject *_wrap_svn_log_changed_path2_t_copyfrom_rev_get(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_log_changed_path2_t_copyfrom_rev_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_log_changed_path2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_log_changed_path2_t, svn_argnum_obj0);
+    arg1 = (struct svn_log_changed_path2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_log_changed_path2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5933,7 +5842,7 @@ SWIGINTERN PyObject *_wrap_svn_log_changed_path2_t_node_kind_set(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_log_changed_path2_t_node_kind_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_log_changed_path2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_log_changed_path2_t, svn_argnum_obj0);
+    arg1 = (struct svn_log_changed_path2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_log_changed_path2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5960,7 +5869,7 @@ SWIGINTERN PyObject *_wrap_svn_log_changed_path2_t_node_kind_get(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_log_changed_path2_t_node_kind_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_log_changed_path2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_log_changed_path2_t, svn_argnum_obj0);
+    arg1 = (struct svn_log_changed_path2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_log_changed_path2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5982,7 +5891,7 @@ SWIGINTERN PyObject *_wrap_svn_log_changed_path2_t_text_modified_set(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_log_changed_path2_t_text_modified_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_log_changed_path2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_log_changed_path2_t, svn_argnum_obj0);
+    arg1 = (struct svn_log_changed_path2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_log_changed_path2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6009,7 +5918,7 @@ SWIGINTERN PyObject *_wrap_svn_log_changed_path2_t_text_modified_get(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_log_changed_path2_t_text_modified_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_log_changed_path2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_log_changed_path2_t, svn_argnum_obj0);
+    arg1 = (struct svn_log_changed_path2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_log_changed_path2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6031,7 +5940,7 @@ SWIGINTERN PyObject *_wrap_svn_log_changed_path2_t_props_modified_set(PyObject *
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_log_changed_path2_t_props_modified_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_log_changed_path2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_log_changed_path2_t, svn_argnum_obj0);
+    arg1 = (struct svn_log_changed_path2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_log_changed_path2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6058,7 +5967,7 @@ SWIGINTERN PyObject *_wrap_svn_log_changed_path2_t_props_modified_get(PyObject *
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_log_changed_path2_t_props_modified_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_log_changed_path2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_log_changed_path2_t, svn_argnum_obj0);
+    arg1 = (struct svn_log_changed_path2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_log_changed_path2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6084,7 +5993,7 @@ SWIGINTERN PyObject *_wrap_new_svn_log_changed_path2_t(PyObject *SWIGUNUSEDPARM(
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_log_changed_path2_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_log_changed_path2_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -6099,7 +6008,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_log_changed_path2_t(PyObject *SWIGUNUSEDPA
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_log_changed_path2_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_log_changed_path2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_log_changed_path2_t, svn_argnum_obj0);
+    arg1 = (struct svn_log_changed_path2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_log_changed_path2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6155,7 +6064,7 @@ SWIGINTERN PyObject *_wrap_svn_log_changed_path2_create(PyObject *SWIGUNUSEDPARM
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_log_changed_path2_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_log_changed_path2_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -6185,7 +6094,7 @@ SWIGINTERN PyObject *_wrap_svn_log_changed_path2_dup(PyObject *SWIGUNUSEDPARM(se
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_log_changed_path2_dup",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_log_changed_path2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_log_changed_path2_t, svn_argnum_obj0);
+    arg1 = (svn_log_changed_path2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_log_changed_path2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6206,7 +6115,7 @@ SWIGINTERN PyObject *_wrap_svn_log_changed_path2_dup(PyObject *SWIGUNUSEDPARM(se
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_log_changed_path2_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_log_changed_path2_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -6228,7 +6137,7 @@ SWIGINTERN PyObject *_wrap_svn_log_changed_path_t_action_set(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"Oc:svn_log_changed_path_t_action_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_log_changed_path_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_log_changed_path_t, svn_argnum_obj0);
+    arg1 = (struct svn_log_changed_path_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_log_changed_path_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6249,7 +6158,7 @@ SWIGINTERN PyObject *_wrap_svn_log_changed_path_t_action_get(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_log_changed_path_t_action_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_log_changed_path_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_log_changed_path_t, svn_argnum_obj0);
+    arg1 = (struct svn_log_changed_path_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_log_changed_path_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6270,7 +6179,7 @@ SWIGINTERN PyObject *_wrap_svn_log_changed_path_t_copyfrom_path_get(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_log_changed_path_t_copyfrom_path_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_log_changed_path_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_log_changed_path_t, svn_argnum_obj0);
+    arg1 = (struct svn_log_changed_path_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_log_changed_path_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6292,7 +6201,7 @@ SWIGINTERN PyObject *_wrap_svn_log_changed_path_t_copyfrom_rev_set(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_log_changed_path_t_copyfrom_rev_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_log_changed_path_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_log_changed_path_t, svn_argnum_obj0);
+    arg1 = (struct svn_log_changed_path_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_log_changed_path_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6319,7 +6228,7 @@ SWIGINTERN PyObject *_wrap_svn_log_changed_path_t_copyfrom_rev_get(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_log_changed_path_t_copyfrom_rev_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_log_changed_path_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_log_changed_path_t, svn_argnum_obj0);
+    arg1 = (struct svn_log_changed_path_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_log_changed_path_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6345,7 +6254,7 @@ SWIGINTERN PyObject *_wrap_new_svn_log_changed_path_t(PyObject *SWIGUNUSEDPARM(s
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_log_changed_path_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_log_changed_path_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -6360,7 +6269,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_log_changed_path_t(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_log_changed_path_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_log_changed_path_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_log_changed_path_t, svn_argnum_obj0);
+    arg1 = (struct svn_log_changed_path_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_log_changed_path_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6403,7 +6312,7 @@ SWIGINTERN PyObject *_wrap_svn_log_changed_path_dup(PyObject *SWIGUNUSEDPARM(sel
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_log_changed_path_dup",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_log_changed_path_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_log_changed_path_t, svn_argnum_obj0);
+    arg1 = (svn_log_changed_path_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_log_changed_path_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6424,7 +6333,7 @@ SWIGINTERN PyObject *_wrap_svn_log_changed_path_dup(PyObject *SWIGUNUSEDPARM(sel
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_log_changed_path_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_log_changed_path_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -6449,7 +6358,7 @@ SWIGINTERN PyObject *_wrap_svn_log_entry_t_changed_paths_set(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_log_entry_t_changed_paths_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_log_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_log_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_log_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_log_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6484,7 +6393,7 @@ SWIGINTERN PyObject *_wrap_svn_log_entry_t_changed_paths_get(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_log_entry_t_changed_paths_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_log_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_log_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_log_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_log_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6508,7 +6417,7 @@ SWIGINTERN PyObject *_wrap_svn_log_entry_t_revision_set(PyObject *SWIGUNUSEDPARM
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_log_entry_t_revision_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_log_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_log_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_log_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_log_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6535,7 +6444,7 @@ SWIGINTERN PyObject *_wrap_svn_log_entry_t_revision_get(PyObject *SWIGUNUSEDPARM
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_log_entry_t_revision_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_log_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_log_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_log_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_log_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6559,7 +6468,7 @@ SWIGINTERN PyObject *_wrap_svn_log_entry_t_revprops_set(PyObject *SWIGUNUSEDPARM
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_log_entry_t_revprops_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_log_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_log_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_log_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_log_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6593,7 +6502,7 @@ SWIGINTERN PyObject *_wrap_svn_log_entry_t_revprops_get(PyObject *SWIGUNUSEDPARM
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_log_entry_t_revprops_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_log_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_log_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_log_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_log_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6617,7 +6526,7 @@ SWIGINTERN PyObject *_wrap_svn_log_entry_t_has_children_set(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_log_entry_t_has_children_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_log_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_log_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_log_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_log_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6644,7 +6553,7 @@ SWIGINTERN PyObject *_wrap_svn_log_entry_t_has_children_get(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_log_entry_t_has_children_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_log_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_log_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_log_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_log_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6668,7 +6577,7 @@ SWIGINTERN PyObject *_wrap_svn_log_entry_t_changed_paths2_set(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_log_entry_t_changed_paths2_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_log_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_log_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_log_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_log_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6703,7 +6612,7 @@ SWIGINTERN PyObject *_wrap_svn_log_entry_t_changed_paths2_get(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_log_entry_t_changed_paths2_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_log_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_log_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_log_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_log_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6727,7 +6636,7 @@ SWIGINTERN PyObject *_wrap_svn_log_entry_t_non_inheritable_set(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_log_entry_t_non_inheritable_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_log_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_log_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_log_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_log_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6754,7 +6663,7 @@ SWIGINTERN PyObject *_wrap_svn_log_entry_t_non_inheritable_get(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_log_entry_t_non_inheritable_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_log_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_log_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_log_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_log_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6776,7 +6685,7 @@ SWIGINTERN PyObject *_wrap_svn_log_entry_t_subtractive_merge_set(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_log_entry_t_subtractive_merge_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_log_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_log_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_log_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_log_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6803,7 +6712,7 @@ SWIGINTERN PyObject *_wrap_svn_log_entry_t_subtractive_merge_get(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_log_entry_t_subtractive_merge_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_log_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_log_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_log_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_log_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6829,7 +6738,7 @@ SWIGINTERN PyObject *_wrap_new_svn_log_entry_t(PyObject *SWIGUNUSEDPARM(self), P
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_log_entry_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_log_entry_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -6844,7 +6753,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_log_entry_t(PyObject *SWIGUNUSEDPARM(self)
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_log_entry_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_log_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_log_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_log_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_log_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6900,7 +6809,7 @@ SWIGINTERN PyObject *_wrap_svn_log_entry_create(PyObject *SWIGUNUSEDPARM(self),
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_log_entry_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_log_entry_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -6930,7 +6839,7 @@ SWIGINTERN PyObject *_wrap_svn_log_entry_dup(PyObject *SWIGUNUSEDPARM(self), PyO
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_log_entry_dup",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_log_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_log_entry_t, svn_argnum_obj0);
+    arg1 = (svn_log_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_log_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6951,7 +6860,7 @@ SWIGINTERN PyObject *_wrap_svn_log_entry_dup(PyObject *SWIGUNUSEDPARM(self), PyO
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_log_entry_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_log_entry_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -7047,7 +6956,7 @@ SWIGINTERN PyObject *_wrap_svn_lock_t_path_set(PyObject *SWIGUNUSEDPARM(self), P
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_lock_t_path_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_lock_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_lock_t, svn_argnum_obj0);
+    arg1 = (struct svn_lock_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_lock_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7075,7 +6984,7 @@ SWIGINTERN PyObject *_wrap_svn_lock_t_path_get(PyObject *SWIGUNUSEDPARM(self), P
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_lock_t_path_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_lock_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_lock_t, svn_argnum_obj0);
+    arg1 = (struct svn_lock_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_lock_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7096,7 +7005,7 @@ SWIGINTERN PyObject *_wrap_svn_lock_t_token_set(PyObject *SWIGUNUSEDPARM(self),
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_lock_t_token_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_lock_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_lock_t, svn_argnum_obj0);
+    arg1 = (struct svn_lock_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_lock_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7124,7 +7033,7 @@ SWIGINTERN PyObject *_wrap_svn_lock_t_token_get(PyObject *SWIGUNUSEDPARM(self),
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_lock_t_token_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_lock_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_lock_t, svn_argnum_obj0);
+    arg1 = (struct svn_lock_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_lock_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7145,7 +7054,7 @@ SWIGINTERN PyObject *_wrap_svn_lock_t_owner_set(PyObject *SWIGUNUSEDPARM(self),
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_lock_t_owner_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_lock_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_lock_t, svn_argnum_obj0);
+    arg1 = (struct svn_lock_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_lock_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7173,7 +7082,7 @@ SWIGINTERN PyObject *_wrap_svn_lock_t_owner_get(PyObject *SWIGUNUSEDPARM(self),
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_lock_t_owner_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_lock_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_lock_t, svn_argnum_obj0);
+    arg1 = (struct svn_lock_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_lock_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7194,7 +7103,7 @@ SWIGINTERN PyObject *_wrap_svn_lock_t_comment_set(PyObject *SWIGUNUSEDPARM(self)
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_lock_t_comment_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_lock_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_lock_t, svn_argnum_obj0);
+    arg1 = (struct svn_lock_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_lock_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7222,7 +7131,7 @@ SWIGINTERN PyObject *_wrap_svn_lock_t_comment_get(PyObject *SWIGUNUSEDPARM(self)
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_lock_t_comment_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_lock_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_lock_t, svn_argnum_obj0);
+    arg1 = (struct svn_lock_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_lock_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7244,7 +7153,7 @@ SWIGINTERN PyObject *_wrap_svn_lock_t_is_dav_comment_set(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_lock_t_is_dav_comment_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_lock_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_lock_t, svn_argnum_obj0);
+    arg1 = (struct svn_lock_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_lock_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7271,7 +7180,7 @@ SWIGINTERN PyObject *_wrap_svn_lock_t_is_dav_comment_get(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_lock_t_is_dav_comment_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_lock_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_lock_t, svn_argnum_obj0);
+    arg1 = (struct svn_lock_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_lock_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7293,7 +7202,7 @@ SWIGINTERN PyObject *_wrap_svn_lock_t_creation_date_set(PyObject *SWIGUNUSEDPARM
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_lock_t_creation_date_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_lock_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_lock_t, svn_argnum_obj0);
+    arg1 = (struct svn_lock_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_lock_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7315,7 +7224,7 @@ SWIGINTERN PyObject *_wrap_svn_lock_t_creation_date_get(PyObject *SWIGUNUSEDPARM
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_lock_t_creation_date_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_lock_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_lock_t, svn_argnum_obj0);
+    arg1 = (struct svn_lock_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_lock_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7337,7 +7246,7 @@ SWIGINTERN PyObject *_wrap_svn_lock_t_expiration_date_set(PyObject *SWIGUNUSEDPA
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_lock_t_expiration_date_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_lock_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_lock_t, svn_argnum_obj0);
+    arg1 = (struct svn_lock_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_lock_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7359,7 +7268,7 @@ SWIGINTERN PyObject *_wrap_svn_lock_t_expiration_date_get(PyObject *SWIGUNUSEDPA
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_lock_t_expiration_date_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_lock_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_lock_t, svn_argnum_obj0);
+    arg1 = (struct svn_lock_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_lock_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7385,7 +7294,7 @@ SWIGINTERN PyObject *_wrap_new_svn_lock_t(PyObject *SWIGUNUSEDPARM(self), PyObje
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_lock_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_lock_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -7400,7 +7309,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_lock_t(PyObject *SWIGUNUSEDPARM(self), PyO
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_lock_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_lock_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_lock_t, svn_argnum_obj0);
+    arg1 = (struct svn_lock_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_lock_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7456,7 +7365,7 @@ SWIGINTERN PyObject *_wrap_svn_lock_create(PyObject *SWIGUNUSEDPARM(self), PyObj
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_lock_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_lock_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -7486,7 +7395,7 @@ SWIGINTERN PyObject *_wrap_svn_lock_dup(PyObject *SWIGUNUSEDPARM(self), PyObject
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_lock_dup",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_lock_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_lock_t, svn_argnum_obj0);
+    arg1 = (svn_lock_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_lock_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7507,7 +7416,7 @@ SWIGINTERN PyObject *_wrap_svn_lock_dup(PyObject *SWIGUNUSEDPARM(self), PyObject
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_lock_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_lock_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -7572,7 +7481,7 @@ SWIGINTERN PyObject *_wrap_svn_merge_range_t_start_set(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_merge_range_t_start_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_merge_range_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_merge_range_t, svn_argnum_obj0);
+    arg1 = (struct svn_merge_range_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_merge_range_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7599,7 +7508,7 @@ SWIGINTERN PyObject *_wrap_svn_merge_range_t_start_get(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_merge_range_t_start_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_merge_range_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_merge_range_t, svn_argnum_obj0);
+    arg1 = (struct svn_merge_range_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_merge_range_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7621,7 +7530,7 @@ SWIGINTERN PyObject *_wrap_svn_merge_range_t_end_set(PyObject *SWIGUNUSEDPARM(se
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_merge_range_t_end_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_merge_range_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_merge_range_t, svn_argnum_obj0);
+    arg1 = (struct svn_merge_range_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_merge_range_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7648,7 +7557,7 @@ SWIGINTERN PyObject *_wrap_svn_merge_range_t_end_get(PyObject *SWIGUNUSEDPARM(se
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_merge_range_t_end_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_merge_range_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_merge_range_t, svn_argnum_obj0);
+    arg1 = (struct svn_merge_range_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_merge_range_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7670,7 +7579,7 @@ SWIGINTERN PyObject *_wrap_svn_merge_range_t_inheritable_set(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_merge_range_t_inheritable_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_merge_range_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_merge_range_t, svn_argnum_obj0);
+    arg1 = (struct svn_merge_range_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_merge_range_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7697,7 +7606,7 @@ SWIGINTERN PyObject *_wrap_svn_merge_range_t_inheritable_get(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_merge_range_t_inheritable_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_merge_range_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_merge_range_t, svn_argnum_obj0);
+    arg1 = (struct svn_merge_range_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_merge_range_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7723,7 +7632,7 @@ SWIGINTERN PyObject *_wrap_new_svn_merge_range_t(PyObject *SWIGUNUSEDPARM(self),
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_merge_range_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_merge_range_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -7738,7 +7647,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_merge_range_t(PyObject *SWIGUNUSEDPARM(sel
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_merge_range_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_merge_range_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_merge_range_t, svn_argnum_obj0);
+    arg1 = (struct svn_merge_range_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_merge_range_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7781,7 +7690,7 @@ SWIGINTERN PyObject *_wrap_svn_merge_range_dup(PyObject *SWIGUNUSEDPARM(self), P
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_merge_range_dup",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_merge_range_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_merge_range_t, svn_argnum_obj0);
+    arg1 = (svn_merge_range_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_merge_range_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7802,7 +7711,7 @@ SWIGINTERN PyObject *_wrap_svn_merge_range_dup(PyObject *SWIGUNUSEDPARM(self), P
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_merge_range_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_merge_range_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -7826,7 +7735,7 @@ SWIGINTERN PyObject *_wrap_svn_merge_range_contains_rev(PyObject *SWIGUNUSEDPARM
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_merge_range_contains_rev",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_merge_range_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_merge_range_t, svn_argnum_obj0);
+    arg1 = (svn_merge_range_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_merge_range_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7861,7 +7770,7 @@ SWIGINTERN PyObject *_wrap_svn_location_segment_t_range_start_set(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_location_segment_t_range_start_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_location_segment_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_location_segment_t, svn_argnum_obj0);
+    arg1 = (struct svn_location_segment_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_location_segment_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7888,7 +7797,7 @@ SWIGINTERN PyObject *_wrap_svn_location_segment_t_range_start_get(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_location_segment_t_range_start_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_location_segment_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_location_segment_t, svn_argnum_obj0);
+    arg1 = (struct svn_location_segment_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_location_segment_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7910,7 +7819,7 @@ SWIGINTERN PyObject *_wrap_svn_location_segment_t_range_end_set(PyObject *SWIGUN
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_location_segment_t_range_end_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_location_segment_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_location_segment_t, svn_argnum_obj0);
+    arg1 = (struct svn_location_segment_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_location_segment_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7937,7 +7846,7 @@ SWIGINTERN PyObject *_wrap_svn_location_segment_t_range_end_get(PyObject *SWIGUN
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_location_segment_t_range_end_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_location_segment_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_location_segment_t, svn_argnum_obj0);
+    arg1 = (struct svn_location_segment_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_location_segment_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7958,7 +7867,7 @@ SWIGINTERN PyObject *_wrap_svn_location_segment_t_path_set(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_location_segment_t_path_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_location_segment_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_location_segment_t, svn_argnum_obj0);
+    arg1 = (struct svn_location_segment_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_location_segment_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7986,7 +7895,7 @@ SWIGINTERN PyObject *_wrap_svn_location_segment_t_path_get(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_location_segment_t_path_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_location_segment_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_location_segment_t, svn_argnum_obj0);
+    arg1 = (struct svn_location_segment_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_location_segment_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8012,7 +7921,7 @@ SWIGINTERN PyObject *_wrap_new_svn_location_segment_t(PyObject *SWIGUNUSEDPARM(s
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_location_segment_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_location_segment_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -8027,7 +7936,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_location_segment_t(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_location_segment_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_location_segment_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_location_segment_t, svn_argnum_obj0);
+    arg1 = (struct svn_location_segment_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_location_segment_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8070,7 +7979,7 @@ SWIGINTERN PyObject *_wrap_svn_location_segment_dup(PyObject *SWIGUNUSEDPARM(sel
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_location_segment_dup",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_location_segment_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_location_segment_t, svn_argnum_obj0);
+    arg1 = (svn_location_segment_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_location_segment_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8091,7 +8000,7 @@ SWIGINTERN PyObject *_wrap_svn_location_segment_dup(PyObject *SWIGUNUSEDPARM(sel
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_location_segment_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_location_segment_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -8133,7 +8042,7 @@ SWIGINTERN PyObject *_wrap_svn_log_invoke_entry_receiver(PyObject *SWIGUNUSEDPAR
   if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_log_invoke_entry_receiver",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     svn_log_entry_receiver_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8148,7 +8057,7 @@ SWIGINTERN PyObject *_wrap_svn_log_invoke_entry_receiver(PyObject *SWIGUNUSEDPAR
     }
   }
   {
-    arg3 = (svn_log_entry_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_log_entry_t, svn_argnum_obj2);
+    arg3 = (svn_log_entry_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_log_entry_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8218,7 +8127,7 @@ SWIGINTERN PyObject *_wrap_svn_log_invoke_message_receiver(PyObject *SWIGUNUSEDP
   if (!PyArg_ParseTuple(args,(char *)"OOOOsss|O:svn_log_invoke_message_receiver",&obj0,&obj1,&obj2,&obj3,&arg5,&arg6,&arg7,&obj7)) SWIG_fail;
   {
     svn_log_message_receiver_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8312,14 +8221,14 @@ SWIGINTERN PyObject *_wrap_svn_commit_invoke_callback2(PyObject *SWIGUNUSEDPARM(
   if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_commit_invoke_callback2",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     svn_commit_callback2_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
     arg1 = *tmp;
   }
   {
-    arg2 = (svn_commit_info_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_commit_info_t, svn_argnum_obj1);
+    arg2 = (svn_commit_info_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_commit_info_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8386,7 +8295,7 @@ SWIGINTERN PyObject *_wrap_svn_commit_invoke_callback(PyObject *SWIGUNUSEDPARM(s
   if (!PyArg_ParseTuple(args,(char *)"OOssO:svn_commit_invoke_callback",&obj0,&obj1,&arg3,&arg4,&obj4)) SWIG_fail;
   {
     svn_commit_callback_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8442,7 +8351,7 @@ SWIGINTERN PyObject *_wrap_svn_cancel_invoke_func(PyObject *SWIGUNUSEDPARM(self)
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_cancel_invoke_func",&obj0,&obj1)) SWIG_fail;
   {
     svn_cancel_func_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8502,14 +8411,14 @@ SWIGINTERN PyObject *_wrap_svn_location_invoke_segment_receiver(PyObject *SWIGUN
   if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_location_invoke_segment_receiver",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     svn_location_segment_receiver_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
     arg1 = *tmp;
   }
   {
-    arg2 = (svn_location_segment_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_location_segment_t, svn_argnum_obj1);
+    arg2 = (svn_location_segment_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_location_segment_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8631,7 +8540,7 @@ SWIGINTERN PyObject *_wrap_svn_pool_create(PyObject *SWIGUNUSEDPARM(self), PyObj
   }
   if (obj1) {
     {
-      arg2 = (apr_allocator_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_apr_allocator_t, svn_argnum_obj1);
+      arg2 = (apr_allocator_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_apr_allocator_t, svn_argnum_obj1);
       if (PyErr_Occurred()) {
         SWIG_fail;
       }
@@ -8645,7 +8554,7 @@ SWIGINTERN PyObject *_wrap_svn_pool_create(PyObject *SWIGUNUSEDPARM(self), PyObj
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_apr_pool_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_apr_pool_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -8680,7 +8589,7 @@ SWIGINTERN PyObject *_wrap_svn_pool_create_allocator(PyObject *SWIGUNUSEDPARM(se
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_apr_allocator_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_apr_allocator_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -8698,13 +8607,13 @@ SWIGINTERN PyObject *_wrap_svn_ver_compatible(PyObject *SWIGUNUSEDPARM(self), Py
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ver_compatible",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_version_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_version_t, svn_argnum_obj0);
+    arg1 = (svn_version_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_version_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_version_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_version_t, svn_argnum_obj1);
+    arg2 = (svn_version_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_version_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8734,13 +8643,13 @@ SWIGINTERN PyObject *_wrap_svn_ver_equal(PyObject *SWIGUNUSEDPARM(self), PyObjec
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ver_equal",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_version_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_version_t, svn_argnum_obj0);
+    arg1 = (svn_version_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_version_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_version_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_version_t, svn_argnum_obj1);
+    arg2 = (svn_version_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_version_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8768,7 +8677,7 @@ SWIGINTERN PyObject *_wrap_svn_version_checklist_t_label_set(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_version_checklist_t_label_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_version_checklist_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_version_checklist_t, svn_argnum_obj0);
+    arg1 = (struct svn_version_checklist_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_version_checklist_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8796,7 +8705,7 @@ SWIGINTERN PyObject *_wrap_svn_version_checklist_t_label_get(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_version_checklist_t_label_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_version_checklist_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_version_checklist_t, svn_argnum_obj0);
+    arg1 = (struct svn_version_checklist_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_version_checklist_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8818,7 +8727,7 @@ SWIGINTERN PyObject *_wrap_svn_version_checklist_t_version_query_set(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_version_checklist_t_version_query_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_version_checklist_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_version_checklist_t, svn_argnum_obj0);
+    arg1 = (struct svn_version_checklist_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_version_checklist_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8845,7 +8754,7 @@ SWIGINTERN PyObject *_wrap_svn_version_checklist_t_version_query_get(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_version_checklist_t_version_query_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_version_checklist_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_version_checklist_t, svn_argnum_obj0);
+    arg1 = (struct svn_version_checklist_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_version_checklist_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8871,7 +8780,7 @@ SWIGINTERN PyObject *_wrap_new_svn_version_checklist_t(PyObject *SWIGUNUSEDPARM(
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_version_checklist_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_version_checklist_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -8886,7 +8795,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_version_checklist_t(PyObject *SWIGUNUSEDPA
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_version_checklist_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_version_checklist_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_version_checklist_t, svn_argnum_obj0);
+    arg1 = (struct svn_version_checklist_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_version_checklist_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8913,6 +8822,60 @@ SWIGINTERN PyObject *svn_version_checklist_t_swigregister(PyObject *SWIGUNUSEDPA
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *_wrap_svn_ver_check_list2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  svn_version_t *arg1 = (svn_version_t *) 0 ;
+  svn_version_checklist_t *arg2 = (svn_version_checklist_t *) 0 ;
+  svn_boolean_t (*arg3)(svn_version_t const *,svn_version_t const *) = (svn_boolean_t (*)(svn_version_t const *,svn_version_t const *)) 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:svn_ver_check_list2",&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg1 = (svn_version_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_version_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg2 = (svn_version_checklist_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_version_checklist_t, svn_argnum_obj1);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    int res = SWIG_ConvertFunctionPtr(obj2, (void**)(&arg3), SWIGTYPE_p_f_p_q_const__struct_svn_version_t_p_q_const__struct_svn_version_t__int);
+    if (!SWIG_IsOK(res)) {
+      SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_ver_check_list2" "', argument " "3"" of type '" "svn_boolean_t (*)(svn_version_t const *,svn_version_t const *)""'"); 
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_ver_check_list2((struct svn_version_t const *)arg1,(struct svn_version_checklist_t const *)arg2,arg3);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_svn_ver_check_list(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   svn_version_t *arg1 = (svn_version_t *) 0 ;
@@ -8923,13 +8886,13 @@ SWIGINTERN PyObject *_wrap_svn_ver_check_list(PyObject *SWIGUNUSEDPARM(self), Py
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ver_check_list",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_version_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_version_t, svn_argnum_obj0);
+    arg1 = (svn_version_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_version_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_version_checklist_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_version_checklist_t, svn_argnum_obj1);
+    arg2 = (svn_version_checklist_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_version_checklist_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8972,7 +8935,7 @@ SWIGINTERN PyObject *_wrap_svn_subr_version(PyObject *SWIGUNUSEDPARM(self), PyOb
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_version_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_version_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -9017,7 +8980,7 @@ SWIGINTERN PyObject *_wrap_svn_version_extended(PyObject *SWIGUNUSEDPARM(self),
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_version_extended_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_version_extended_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -9039,7 +9002,7 @@ SWIGINTERN PyObject *_wrap_svn_version_ext_build_date(PyObject *SWIGUNUSEDPARM(s
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_version_ext_build_date",&obj0)) SWIG_fail;
   {
-    arg1 = (svn_version_extended_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_version_extended_t, svn_argnum_obj0);
+    arg1 = (svn_version_extended_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_version_extended_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9067,7 +9030,7 @@ SWIGINTERN PyObject *_wrap_svn_version_ext_build_time(PyObject *SWIGUNUSEDPARM(s
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_version_ext_build_time",&obj0)) SWIG_fail;
   {
-    arg1 = (svn_version_extended_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_version_extended_t, svn_argnum_obj0);
+    arg1 = (svn_version_extended_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_version_extended_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9095,7 +9058,7 @@ SWIGINTERN PyObject *_wrap_svn_version_ext_build_host(PyObject *SWIGUNUSEDPARM(s
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_version_ext_build_host",&obj0)) SWIG_fail;
   {
-    arg1 = (svn_version_extended_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_version_extended_t, svn_argnum_obj0);
+    arg1 = (svn_version_extended_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_version_extended_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9123,7 +9086,7 @@ SWIGINTERN PyObject *_wrap_svn_version_ext_copyright(PyObject *SWIGUNUSEDPARM(se
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_version_ext_copyright",&obj0)) SWIG_fail;
   {
-    arg1 = (svn_version_extended_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_version_extended_t, svn_argnum_obj0);
+    arg1 = (svn_version_extended_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_version_extended_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9151,7 +9114,7 @@ SWIGINTERN PyObject *_wrap_svn_version_ext_runtime_host(PyObject *SWIGUNUSEDPARM
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_version_ext_runtime_host",&obj0)) SWIG_fail;
   {
-    arg1 = (svn_version_extended_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_version_extended_t, svn_argnum_obj0);
+    arg1 = (svn_version_extended_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_version_extended_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9179,7 +9142,7 @@ SWIGINTERN PyObject *_wrap_svn_version_ext_runtime_osname(PyObject *SWIGUNUSEDPA
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_version_ext_runtime_osname",&obj0)) SWIG_fail;
   {
-    arg1 = (svn_version_extended_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_version_extended_t, svn_argnum_obj0);
+    arg1 = (svn_version_extended_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_version_extended_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9207,7 +9170,7 @@ SWIGINTERN PyObject *_wrap_svn_version_ext_linked_lib_t_name_set(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_version_ext_linked_lib_t_name_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_version_ext_linked_lib_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_version_ext_linked_lib_t, svn_argnum_obj0);
+    arg1 = (struct svn_version_ext_linked_lib_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_version_ext_linked_lib_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9235,7 +9198,7 @@ SWIGINTERN PyObject *_wrap_svn_version_ext_linked_lib_t_name_get(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_version_ext_linked_lib_t_name_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_version_ext_linked_lib_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_version_ext_linked_lib_t, svn_argnum_obj0);
+    arg1 = (struct svn_version_ext_linked_lib_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_version_ext_linked_lib_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9256,7 +9219,7 @@ SWIGINTERN PyObject *_wrap_svn_version_ext_linked_lib_t_compiled_version_set(PyO
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_version_ext_linked_lib_t_compiled_version_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_version_ext_linked_lib_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_version_ext_linked_lib_t, svn_argnum_obj0);
+    arg1 = (struct svn_version_ext_linked_lib_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_version_ext_linked_lib_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9284,7 +9247,7 @@ SWIGINTERN PyObject *_wrap_svn_version_ext_linked_lib_t_compiled_version_get(PyO
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_version_ext_linked_lib_t_compiled_version_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_version_ext_linked_lib_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_version_ext_linked_lib_t, svn_argnum_obj0);
+    arg1 = (struct svn_version_ext_linked_lib_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_version_ext_linked_lib_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9305,7 +9268,7 @@ SWIGINTERN PyObject *_wrap_svn_version_ext_linked_lib_t_runtime_version_set(PyOb
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_version_ext_linked_lib_t_runtime_version_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_version_ext_linked_lib_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_version_ext_linked_lib_t, svn_argnum_obj0);
+    arg1 = (struct svn_version_ext_linked_lib_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_version_ext_linked_lib_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9333,7 +9296,7 @@ SWIGINTERN PyObject *_wrap_svn_version_ext_linked_lib_t_runtime_version_get(PyOb
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_version_ext_linked_lib_t_runtime_version_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_version_ext_linked_lib_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_version_ext_linked_lib_t, svn_argnum_obj0);
+    arg1 = (struct svn_version_ext_linked_lib_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_version_ext_linked_lib_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9359,7 +9322,7 @@ SWIGINTERN PyObject *_wrap_new_svn_version_ext_linked_lib_t(PyObject *SWIGUNUSED
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_version_ext_linked_lib_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_version_ext_linked_lib_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -9374,7 +9337,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_version_ext_linked_lib_t(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_version_ext_linked_lib_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_version_ext_linked_lib_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_version_ext_linked_lib_t, svn_argnum_obj0);
+    arg1 = (struct svn_version_ext_linked_lib_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_version_ext_linked_lib_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9409,7 +9372,7 @@ SWIGINTERN PyObject *_wrap_svn_version_ext_linked_libs(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_version_ext_linked_libs",&obj0)) SWIG_fail;
   {
-    arg1 = (svn_version_extended_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_version_extended_t, svn_argnum_obj0);
+    arg1 = (svn_version_extended_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_version_extended_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9422,7 +9385,7 @@ SWIGINTERN PyObject *_wrap_svn_version_ext_linked_libs(PyObject *SWIGUNUSEDPARM(
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_apr_array_header_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_apr_array_header_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -9438,7 +9401,7 @@ SWIGINTERN PyObject *_wrap_svn_version_ext_loaded_lib_t_name_set(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_version_ext_loaded_lib_t_name_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_version_ext_loaded_lib_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_version_ext_loaded_lib_t, svn_argnum_obj0);
+    arg1 = (struct svn_version_ext_loaded_lib_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_version_ext_loaded_lib_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9466,7 +9429,7 @@ SWIGINTERN PyObject *_wrap_svn_version_ext_loaded_lib_t_name_get(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_version_ext_loaded_lib_t_name_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_version_ext_loaded_lib_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_version_ext_loaded_lib_t, svn_argnum_obj0);
+    arg1 = (struct svn_version_ext_loaded_lib_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_version_ext_loaded_lib_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9487,7 +9450,7 @@ SWIGINTERN PyObject *_wrap_svn_version_ext_loaded_lib_t_version_set(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_version_ext_loaded_lib_t_version_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_version_ext_loaded_lib_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_version_ext_loaded_lib_t, svn_argnum_obj0);
+    arg1 = (struct svn_version_ext_loaded_lib_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_version_ext_loaded_lib_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9515,7 +9478,7 @@ SWIGINTERN PyObject *_wrap_svn_version_ext_loaded_lib_t_version_get(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_version_ext_loaded_lib_t_version_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_version_ext_loaded_lib_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_version_ext_loaded_lib_t, svn_argnum_obj0);
+    arg1 = (struct svn_version_ext_loaded_lib_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_version_ext_loaded_lib_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9541,7 +9504,7 @@ SWIGINTERN PyObject *_wrap_new_svn_version_ext_loaded_lib_t(PyObject *SWIGUNUSED
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_version_ext_loaded_lib_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_version_ext_loaded_lib_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -9556,7 +9519,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_version_ext_loaded_lib_t(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_version_ext_loaded_lib_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_version_ext_loaded_lib_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_version_ext_loaded_lib_t, svn_argnum_obj0);
+    arg1 = (struct svn_version_ext_loaded_lib_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_version_ext_loaded_lib_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9591,7 +9554,7 @@ SWIGINTERN PyObject *_wrap_svn_version_ext_loaded_libs(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_version_ext_loaded_libs",&obj0)) SWIG_fail;
   {
-    arg1 = (svn_version_extended_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_version_extended_t, svn_argnum_obj0);
+    arg1 = (svn_version_extended_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_version_extended_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9604,7 +9567,7 @@ SWIGINTERN PyObject *_wrap_svn_version_ext_loaded_libs(PyObject *SWIGUNUSEDPARM(
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_apr_array_header_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_apr_array_header_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -9627,7 +9590,7 @@ SWIGINTERN PyObject *_wrap_svn_version_checklist_invoke_version_query(PyObject *
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_version_checklist_invoke_version_query",&obj0)) SWIG_fail;
   {
-    arg1 = (svn_version_checklist_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_version_checklist_t, svn_argnum_obj0);
+    arg1 = (svn_version_checklist_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_version_checklist_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9640,7 +9603,7 @@ SWIGINTERN PyObject *_wrap_svn_version_checklist_invoke_version_query(PyObject *
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_version_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_version_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -9657,7 +9620,7 @@ SWIGINTERN PyObject *_wrap_svn_version_invoke_func(PyObject *SWIGUNUSEDPARM(self
   if (!PyArg_ParseTuple(args,(char *)"O:svn_version_invoke_func",&obj0)) SWIG_fail;
   {
     svn_version_func_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_void__p_svn_version_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_void__p_svn_version_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9671,7 +9634,7 @@ SWIGINTERN PyObject *_wrap_svn_version_invoke_func(PyObject *SWIGUNUSEDPARM(self
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_version_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_version_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -9702,7 +9665,7 @@ SWIGINTERN PyObject *_wrap_svn_prop_dup(PyObject *SWIGUNUSEDPARM(self), PyObject
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_prop_dup",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_prop_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_prop_t, svn_argnum_obj0);
+    arg1 = (svn_prop_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_prop_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9723,7 +9686,7 @@ SWIGINTERN PyObject *_wrap_svn_prop_dup(PyObject *SWIGUNUSEDPARM(self), PyObject
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_prop_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_prop_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -9753,7 +9716,7 @@ SWIGINTERN PyObject *_wrap_svn_prop_array_dup(PyObject *SWIGUNUSEDPARM(self), Py
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_prop_array_dup",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (apr_array_header_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj0);
+    arg1 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9774,7 +9737,7 @@ SWIGINTERN PyObject *_wrap_svn_prop_array_dup(PyObject *SWIGUNUSEDPARM(self), Py
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_apr_array_header_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_apr_array_header_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -9796,7 +9759,7 @@ SWIGINTERN PyObject *_wrap_svn_prop_inherited_item_t_path_or_url_set(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_prop_inherited_item_t_path_or_url_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_prop_inherited_item_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_prop_inherited_item_t, svn_argnum_obj0);
+    arg1 = (struct svn_prop_inherited_item_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_prop_inherited_item_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9824,7 +9787,7 @@ SWIGINTERN PyObject *_wrap_svn_prop_inherited_item_t_path_or_url_get(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_prop_inherited_item_t_path_or_url_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_prop_inherited_item_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_prop_inherited_item_t, svn_argnum_obj0);
+    arg1 = (struct svn_prop_inherited_item_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_prop_inherited_item_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9846,13 +9809,13 @@ SWIGINTERN PyObject *_wrap_svn_prop_inherited_item_t_prop_hash_set(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_prop_inherited_item_t_prop_hash_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_prop_inherited_item_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_prop_inherited_item_t, svn_argnum_obj0);
+    arg1 = (struct svn_prop_inherited_item_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_prop_inherited_item_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (apr_hash_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_apr_hash_t, svn_argnum_obj1);
+    arg2 = (apr_hash_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_apr_hash_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9873,13 +9836,13 @@ SWIGINTERN PyObject *_wrap_svn_prop_inherited_item_t_prop_hash_get(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_prop_inherited_item_t_prop_hash_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_prop_inherited_item_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_prop_inherited_item_t, svn_argnum_obj0);
+    arg1 = (struct svn_prop_inherited_item_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_prop_inherited_item_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (apr_hash_t *) ((arg1)->prop_hash);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_apr_hash_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_apr_hash_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -9900,7 +9863,7 @@ SWIGINTERN PyObject *_wrap_new_svn_prop_inherited_item_t(PyObject *SWIGUNUSEDPAR
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_prop_inherited_item_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_prop_inherited_item_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -9915,7 +9878,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_prop_inherited_item_t(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_prop_inherited_item_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_prop_inherited_item_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_prop_inherited_item_t, svn_argnum_obj0);
+    arg1 = (struct svn_prop_inherited_item_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_prop_inherited_item_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9986,7 +9949,7 @@ SWIGINTERN PyObject *_wrap_svn_prop_hash_to_array(PyObject *SWIGUNUSEDPARM(self)
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_apr_array_header_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_apr_array_header_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -10016,7 +9979,7 @@ SWIGINTERN PyObject *_wrap_svn_prop_array_to_hash(PyObject *SWIGUNUSEDPARM(self)
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_prop_array_to_hash",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (apr_array_header_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj0);
+    arg1 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10037,7 +10000,7 @@ SWIGINTERN PyObject *_wrap_svn_prop_array_to_hash(PyObject *SWIGUNUSEDPARM(self)
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_apr_hash_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_apr_hash_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -10095,7 +10058,7 @@ SWIGINTERN PyObject *_wrap_svn_prop_hash_dup(PyObject *SWIGUNUSEDPARM(self), PyO
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_apr_hash_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_apr_hash_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -10118,7 +10081,7 @@ SWIGINTERN PyObject *_wrap_svn_prop_get_value(PyObject *SWIGUNUSEDPARM(self), Py
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_prop_get_value",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (apr_hash_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_apr_hash_t, svn_argnum_obj0);
+    arg1 = (apr_hash_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_hash_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10419,7 +10382,7 @@ SWIGINTERN PyObject *_wrap_svn_categorize_props(PyObject *SWIGUNUSEDPARM(self),
   arg4 = &temp4;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_categorize_props",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (apr_array_header_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj0);
+    arg1 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10589,7 +10552,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc2_t_name_set(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_opt_subcommand_desc2_t_name_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_opt_subcommand_desc2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc2_t, svn_argnum_obj0);
+    arg1 = (struct svn_opt_subcommand_desc2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10617,7 +10580,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc2_t_name_get(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_opt_subcommand_desc2_t_name_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_opt_subcommand_desc2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc2_t, svn_argnum_obj0);
+    arg1 = (struct svn_opt_subcommand_desc2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10639,7 +10602,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc2_t_cmd_func_set(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_opt_subcommand_desc2_t_cmd_func_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_opt_subcommand_desc2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc2_t, svn_argnum_obj0);
+    arg1 = (struct svn_opt_subcommand_desc2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10666,7 +10629,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc2_t_cmd_func_get(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_opt_subcommand_desc2_t_cmd_func_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_opt_subcommand_desc2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc2_t, svn_argnum_obj0);
+    arg1 = (struct svn_opt_subcommand_desc2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10688,13 +10651,13 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc2_t_aliases_set(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_opt_subcommand_desc2_t_aliases_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_opt_subcommand_desc2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc2_t, svn_argnum_obj0);
+    arg1 = (struct svn_opt_subcommand_desc2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (char **)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_p_char, svn_argnum_obj1);
+    arg2 = (char **)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_p_char, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10722,13 +10685,13 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc2_t_aliases_get(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_opt_subcommand_desc2_t_aliases_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_opt_subcommand_desc2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc2_t, svn_argnum_obj0);
+    arg1 = (struct svn_opt_subcommand_desc2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (char **)(char **) ((arg1)->aliases);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_p_char,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_p_char,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -10744,7 +10707,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc2_t_help_set(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_opt_subcommand_desc2_t_help_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_opt_subcommand_desc2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc2_t, svn_argnum_obj0);
+    arg1 = (struct svn_opt_subcommand_desc2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10772,7 +10735,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc2_t_help_get(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_opt_subcommand_desc2_t_help_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_opt_subcommand_desc2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc2_t, svn_argnum_obj0);
+    arg1 = (struct svn_opt_subcommand_desc2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10794,13 +10757,13 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc2_t_valid_options_set(PyObject
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_opt_subcommand_desc2_t_valid_options_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_opt_subcommand_desc2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc2_t, svn_argnum_obj0);
+    arg1 = (struct svn_opt_subcommand_desc2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (int *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_int, svn_argnum_obj1);
+    arg2 = (int *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_int, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10828,13 +10791,13 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc2_t_valid_options_get(PyObject
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_opt_subcommand_desc2_t_valid_options_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_opt_subcommand_desc2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc2_t, svn_argnum_obj0);
+    arg1 = (struct svn_opt_subcommand_desc2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (int *)(int *) ((arg1)->valid_options);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_int,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_int,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -10850,13 +10813,13 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc2_t_desc_overrides_get(PyObjec
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_opt_subcommand_desc2_t_desc_overrides_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_opt_subcommand_desc2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc2_t, svn_argnum_obj0);
+    arg1 = (struct svn_opt_subcommand_desc2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (svn_opt_subcommand_desc2_t_desc_overrides *)(svn_opt_subcommand_desc2_t_desc_overrides *) ((arg1)->desc_overrides);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_opt_subcommand_desc2_t_desc_overrides,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_opt_subcommand_desc2_t_desc_overrides,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -10877,7 +10840,7 @@ SWIGINTERN PyObject *_wrap_new_svn_opt_subcommand_desc2_t(PyObject *SWIGUNUSEDPA
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_opt_subcommand_desc2_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_opt_subcommand_desc2_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -10892,7 +10855,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_opt_subcommand_desc2_t(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_opt_subcommand_desc2_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_opt_subcommand_desc2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc2_t, svn_argnum_obj0);
+    arg1 = (struct svn_opt_subcommand_desc2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10928,7 +10891,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc2_t_desc_overrides_optch_set(P
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_opt_subcommand_desc2_t_desc_overrides_optch_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_opt_subcommand_desc2_t_desc_overrides *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc2_t_desc_overrides, svn_argnum_obj0);
+    arg1 = (svn_opt_subcommand_desc2_t_desc_overrides *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc2_t_desc_overrides, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10955,7 +10918,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc2_t_desc_overrides_optch_get(P
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_opt_subcommand_desc2_t_desc_overrides_optch_get",&obj0)) SWIG_fail;
   {
-    arg1 = (svn_opt_subcommand_desc2_t_desc_overrides *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc2_t_desc_overrides, svn_argnum_obj0);
+    arg1 = (svn_opt_subcommand_desc2_t_desc_overrides *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc2_t_desc_overrides, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10976,7 +10939,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc2_t_desc_overrides_desc_set(Py
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_opt_subcommand_desc2_t_desc_overrides_desc_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (svn_opt_subcommand_desc2_t_desc_overrides *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc2_t_desc_overrides, svn_argnum_obj0);
+    arg1 = (svn_opt_subcommand_desc2_t_desc_overrides *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc2_t_desc_overrides, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11004,7 +10967,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc2_t_desc_overrides_desc_get(Py
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_opt_subcommand_desc2_t_desc_overrides_desc_get",&obj0)) SWIG_fail;
   {
-    arg1 = (svn_opt_subcommand_desc2_t_desc_overrides *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc2_t_desc_overrides, svn_argnum_obj0);
+    arg1 = (svn_opt_subcommand_desc2_t_desc_overrides *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc2_t_desc_overrides, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11030,7 +10993,7 @@ SWIGINTERN PyObject *_wrap_new_svn_opt_subcommand_desc2_t_desc_overrides(PyObjec
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_opt_subcommand_desc2_t_desc_overrides,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_opt_subcommand_desc2_t_desc_overrides,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -11045,7 +11008,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_opt_subcommand_desc2_t_desc_overrides(PyOb
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_opt_subcommand_desc2_t_desc_overrides",&obj0)) SWIG_fail;
   {
-    arg1 = (svn_opt_subcommand_desc2_t_desc_overrides *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc2_t_desc_overrides, svn_argnum_obj0);
+    arg1 = (svn_opt_subcommand_desc2_t_desc_overrides *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc2_t_desc_overrides, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11080,7 +11043,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc_t_name_set(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_opt_subcommand_desc_t_name_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_opt_subcommand_desc_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc_t, svn_argnum_obj0);
+    arg1 = (struct svn_opt_subcommand_desc_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11108,7 +11071,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc_t_name_get(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_opt_subcommand_desc_t_name_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_opt_subcommand_desc_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc_t, svn_argnum_obj0);
+    arg1 = (struct svn_opt_subcommand_desc_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11130,7 +11093,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc_t_cmd_func_set(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_opt_subcommand_desc_t_cmd_func_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_opt_subcommand_desc_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc_t, svn_argnum_obj0);
+    arg1 = (struct svn_opt_subcommand_desc_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11157,7 +11120,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc_t_cmd_func_get(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_opt_subcommand_desc_t_cmd_func_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_opt_subcommand_desc_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc_t, svn_argnum_obj0);
+    arg1 = (struct svn_opt_subcommand_desc_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11179,13 +11142,13 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc_t_aliases_set(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_opt_subcommand_desc_t_aliases_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_opt_subcommand_desc_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc_t, svn_argnum_obj0);
+    arg1 = (struct svn_opt_subcommand_desc_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (char **)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_p_char, svn_argnum_obj1);
+    arg2 = (char **)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_p_char, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11213,13 +11176,13 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc_t_aliases_get(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_opt_subcommand_desc_t_aliases_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_opt_subcommand_desc_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc_t, svn_argnum_obj0);
+    arg1 = (struct svn_opt_subcommand_desc_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (char **)(char **) ((arg1)->aliases);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_p_char,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_p_char,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -11235,7 +11198,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc_t_help_set(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_opt_subcommand_desc_t_help_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_opt_subcommand_desc_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc_t, svn_argnum_obj0);
+    arg1 = (struct svn_opt_subcommand_desc_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11263,7 +11226,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc_t_help_get(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_opt_subcommand_desc_t_help_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_opt_subcommand_desc_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc_t, svn_argnum_obj0);
+    arg1 = (struct svn_opt_subcommand_desc_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11285,13 +11248,13 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc_t_valid_options_set(PyObject
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_opt_subcommand_desc_t_valid_options_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_opt_subcommand_desc_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc_t, svn_argnum_obj0);
+    arg1 = (struct svn_opt_subcommand_desc_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (int *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_int, svn_argnum_obj1);
+    arg2 = (int *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_int, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11319,13 +11282,13 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_desc_t_valid_options_get(PyObject
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_opt_subcommand_desc_t_valid_options_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_opt_subcommand_desc_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc_t, svn_argnum_obj0);
+    arg1 = (struct svn_opt_subcommand_desc_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (int *)(int *) ((arg1)->valid_options);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_int,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_int,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -11346,7 +11309,7 @@ SWIGINTERN PyObject *_wrap_new_svn_opt_subcommand_desc_t(PyObject *SWIGUNUSEDPAR
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_opt_subcommand_desc_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_opt_subcommand_desc_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -11361,7 +11324,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_opt_subcommand_desc_t(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_opt_subcommand_desc_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_opt_subcommand_desc_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc_t, svn_argnum_obj0);
+    arg1 = (struct svn_opt_subcommand_desc_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11397,7 +11360,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_get_canonical_subcommand2(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_opt_get_canonical_subcommand2",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (svn_opt_subcommand_desc2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc2_t, svn_argnum_obj0);
+    arg1 = (svn_opt_subcommand_desc2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11410,7 +11373,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_get_canonical_subcommand2(PyObject *SWIGUNUSE
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_opt_subcommand_desc2_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_opt_subcommand_desc2_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -11427,7 +11390,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_get_canonical_subcommand(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_opt_get_canonical_subcommand",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (svn_opt_subcommand_desc_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc_t, svn_argnum_obj0);
+    arg1 = (svn_opt_subcommand_desc_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11440,7 +11403,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_get_canonical_subcommand(PyObject *SWIGUNUSED
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_opt_subcommand_desc_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_opt_subcommand_desc_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -11474,13 +11437,13 @@ SWIGINTERN PyObject *_wrap_svn_opt_get_option_from_code2(PyObject *SWIGUNUSEDPAR
     }
   }
   {
-    arg2 = (apr_getopt_option_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_apr_getopt_option_t, svn_argnum_obj1);
+    arg2 = (apr_getopt_option_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_apr_getopt_option_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_opt_subcommand_desc2_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_subcommand_desc2_t, svn_argnum_obj2);
+    arg3 = (svn_opt_subcommand_desc2_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_subcommand_desc2_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11501,7 +11464,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_get_option_from_code2(PyObject *SWIGUNUSEDPAR
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_apr_getopt_option_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_apr_getopt_option_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -11531,7 +11494,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_get_option_from_code(PyObject *SWIGUNUSEDPARM
     }
   }
   {
-    arg2 = (apr_getopt_option_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_apr_getopt_option_t, svn_argnum_obj1);
+    arg2 = (apr_getopt_option_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_apr_getopt_option_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11544,7 +11507,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_get_option_from_code(PyObject *SWIGUNUSEDPARM
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_apr_getopt_option_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_apr_getopt_option_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -11566,7 +11529,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_takes_option3(PyObject *SWIGUNUSED
   arg3 = &temp3;
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_opt_subcommand_takes_option3",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_opt_subcommand_desc2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc2_t, svn_argnum_obj0);
+    arg1 = (svn_opt_subcommand_desc2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11608,7 +11571,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_takes_option2(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_opt_subcommand_takes_option2",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_opt_subcommand_desc2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc2_t, svn_argnum_obj0);
+    arg1 = (svn_opt_subcommand_desc2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11644,7 +11607,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_takes_option(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_opt_subcommand_takes_option",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_opt_subcommand_desc_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc_t, svn_argnum_obj0);
+    arg1 = (svn_opt_subcommand_desc_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_subcommand_desc_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11691,13 +11654,13 @@ SWIGINTERN PyObject *_wrap_svn_opt_print_generic_help2(PyObject *SWIGUNUSEDPARM(
   arg5 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOOs|OO:svn_opt_print_generic_help2",&arg1,&obj1,&obj2,&arg4,&obj4,&obj5)) SWIG_fail;
   {
-    arg2 = (svn_opt_subcommand_desc2_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_subcommand_desc2_t, svn_argnum_obj1);
+    arg2 = (svn_opt_subcommand_desc2_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_subcommand_desc2_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (apr_getopt_option_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_apr_getopt_option_t, svn_argnum_obj2);
+    arg3 = (apr_getopt_option_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_apr_getopt_option_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11760,7 +11723,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_format_option(PyObject *SWIGUNUSEDPARM(self),
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_opt_format_option",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg2 = (apr_getopt_option_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_apr_getopt_option_t, svn_argnum_obj0);
+    arg2 = (apr_getopt_option_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_getopt_option_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11835,13 +11798,13 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_help3(PyObject *SWIGUNUSEDPARM(sel
   arg4 = &temp4;
   if (!PyArg_ParseTuple(args,(char *)"sOO|O:svn_opt_subcommand_help3",&arg1,&obj1,&obj2,&obj3)) SWIG_fail;
   {
-    arg2 = (svn_opt_subcommand_desc2_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_subcommand_desc2_t, svn_argnum_obj1);
+    arg2 = (svn_opt_subcommand_desc2_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_subcommand_desc2_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (apr_getopt_option_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_apr_getopt_option_t, svn_argnum_obj2);
+    arg3 = (apr_getopt_option_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_apr_getopt_option_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11899,13 +11862,13 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_help2(PyObject *SWIGUNUSEDPARM(sel
   arg4 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOO|O:svn_opt_subcommand_help2",&arg1,&obj1,&obj2,&obj3)) SWIG_fail;
   {
-    arg2 = (svn_opt_subcommand_desc2_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_subcommand_desc2_t, svn_argnum_obj1);
+    arg2 = (svn_opt_subcommand_desc2_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_subcommand_desc2_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (apr_getopt_option_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_apr_getopt_option_t, svn_argnum_obj2);
+    arg3 = (apr_getopt_option_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_apr_getopt_option_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11957,13 +11920,13 @@ SWIGINTERN PyObject *_wrap_svn_opt_subcommand_help(PyObject *SWIGUNUSEDPARM(self
   arg4 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOO|O:svn_opt_subcommand_help",&arg1,&obj1,&obj2,&obj3)) SWIG_fail;
   {
-    arg2 = (svn_opt_subcommand_desc_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_subcommand_desc_t, svn_argnum_obj1);
+    arg2 = (svn_opt_subcommand_desc_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_subcommand_desc_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (apr_getopt_option_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_apr_getopt_option_t, svn_argnum_obj2);
+    arg3 = (apr_getopt_option_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_apr_getopt_option_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12006,7 +11969,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_revision_value_t_number_set(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_opt_revision_value_t_number_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (union svn_opt_revision_value_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_opt_revision_value_t, svn_argnum_obj0);
+    arg1 = (union svn_opt_revision_value_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_revision_value_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12033,7 +11996,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_revision_value_t_number_get(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_opt_revision_value_t_number_get",&obj0)) SWIG_fail;
   {
-    arg1 = (union svn_opt_revision_value_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_opt_revision_value_t, svn_argnum_obj0);
+    arg1 = (union svn_opt_revision_value_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_revision_value_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12055,7 +12018,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_revision_value_t_date_set(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_opt_revision_value_t_date_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (union svn_opt_revision_value_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_opt_revision_value_t, svn_argnum_obj0);
+    arg1 = (union svn_opt_revision_value_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_revision_value_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12077,7 +12040,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_revision_value_t_date_get(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_opt_revision_value_t_date_get",&obj0)) SWIG_fail;
   {
-    arg1 = (union svn_opt_revision_value_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_opt_revision_value_t, svn_argnum_obj0);
+    arg1 = (union svn_opt_revision_value_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_revision_value_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12103,7 +12066,7 @@ SWIGINTERN PyObject *_wrap_new_svn_opt_revision_value_t(PyObject *SWIGUNUSEDPARM
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_opt_revision_value_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_opt_revision_value_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -12118,7 +12081,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_opt_revision_value_t(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_opt_revision_value_t",&obj0)) SWIG_fail;
   {
-    arg1 = (union svn_opt_revision_value_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_opt_revision_value_t, svn_argnum_obj0);
+    arg1 = (union svn_opt_revision_value_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_revision_value_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12154,7 +12117,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_revision_t_kind_set(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_opt_revision_t_kind_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_opt_revision_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj0);
+    arg1 = (struct svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12181,7 +12144,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_revision_t_kind_get(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_opt_revision_t_kind_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_opt_revision_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj0);
+    arg1 = (struct svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12203,13 +12166,13 @@ SWIGINTERN PyObject *_wrap_svn_opt_revision_t_value_set(PyObject *SWIGUNUSEDPARM
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_opt_revision_t_value_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_opt_revision_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj0);
+    arg1 = (struct svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_opt_revision_value_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_value_t, svn_argnum_obj1);
+    arg2 = (svn_opt_revision_value_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_value_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12230,13 +12193,13 @@ SWIGINTERN PyObject *_wrap_svn_opt_revision_t_value_get(PyObject *SWIGUNUSEDPARM
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_opt_revision_t_value_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_opt_revision_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj0);
+    arg1 = (struct svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (svn_opt_revision_value_t *)& ((arg1)->value);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_opt_revision_value_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_opt_revision_value_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -12257,7 +12220,7 @@ SWIGINTERN PyObject *_wrap_new_svn_opt_revision_t(PyObject *SWIGUNUSEDPARM(self)
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_opt_revision_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_opt_revision_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -12272,7 +12235,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_opt_revision_t(PyObject *SWIGUNUSEDPARM(se
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_opt_revision_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_opt_revision_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj0);
+    arg1 = (struct svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12308,13 +12271,13 @@ SWIGINTERN PyObject *_wrap_svn_opt_revision_range_t_start_set(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_opt_revision_range_t_start_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_opt_revision_range_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_opt_revision_range_t, svn_argnum_obj0);
+    arg1 = (struct svn_opt_revision_range_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_revision_range_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg2 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12335,13 +12298,13 @@ SWIGINTERN PyObject *_wrap_svn_opt_revision_range_t_start_get(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_opt_revision_range_t_start_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_opt_revision_range_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_opt_revision_range_t, svn_argnum_obj0);
+    arg1 = (struct svn_opt_revision_range_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_revision_range_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (svn_opt_revision_t *)& ((arg1)->start);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_opt_revision_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_opt_revision_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -12358,13 +12321,13 @@ SWIGINTERN PyObject *_wrap_svn_opt_revision_range_t_end_set(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_opt_revision_range_t_end_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_opt_revision_range_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_opt_revision_range_t, svn_argnum_obj0);
+    arg1 = (struct svn_opt_revision_range_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_revision_range_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg2 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12385,13 +12348,13 @@ SWIGINTERN PyObject *_wrap_svn_opt_revision_range_t_end_get(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_opt_revision_range_t_end_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_opt_revision_range_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_opt_revision_range_t, svn_argnum_obj0);
+    arg1 = (struct svn_opt_revision_range_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_revision_range_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (svn_opt_revision_t *)& ((arg1)->end);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_opt_revision_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_opt_revision_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -12412,7 +12375,7 @@ SWIGINTERN PyObject *_wrap_new_svn_opt_revision_range_t(PyObject *SWIGUNUSEDPARM
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_opt_revision_range_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_opt_revision_range_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -12427,7 +12390,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_opt_revision_range_t(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_opt_revision_range_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_opt_revision_range_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_opt_revision_range_t, svn_argnum_obj0);
+    arg1 = (struct svn_opt_revision_range_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_revision_range_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12473,13 +12436,13 @@ SWIGINTERN PyObject *_wrap_svn_opt_parse_revision(PyObject *SWIGUNUSEDPARM(self)
   arg4 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOs|O:svn_opt_parse_revision",&obj0,&obj1,&arg3,&obj3)) SWIG_fail;
   {
-    arg1 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj0);
+    arg1 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg2 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12530,7 +12493,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_parse_revision_to_range(PyObject *SWIGUNUSEDP
   arg3 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_opt_parse_revision_to_range",&obj0,&arg2,&obj2)) SWIG_fail;
   {
-    arg1 = (apr_array_header_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj0);
+    arg1 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12586,13 +12549,13 @@ SWIGINTERN PyObject *_wrap_svn_opt_resolve_revisions(PyObject *SWIGUNUSEDPARM(se
   arg5 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOOO|O:svn_opt_resolve_revisions",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
-    arg1 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj0);
+    arg1 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg2 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12669,13 +12632,13 @@ SWIGINTERN PyObject *_wrap_svn_opt_args_to_target_array3(PyObject *SWIGUNUSEDPAR
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_opt_args_to_target_array3",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg2 = (apr_getopt_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_apr_getopt_t, svn_argnum_obj0);
+    arg2 = (apr_getopt_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_getopt_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (apr_array_header_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj1);
+    arg3 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12743,13 +12706,13 @@ SWIGINTERN PyObject *_wrap_svn_opt_args_to_target_array2(PyObject *SWIGUNUSEDPAR
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_opt_args_to_target_array2",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg2 = (apr_getopt_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_apr_getopt_t, svn_argnum_obj0);
+    arg2 = (apr_getopt_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_getopt_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (apr_array_header_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj1);
+    arg3 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12870,7 +12833,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_push_implicit_dot_target(PyObject *SWIGUNUSED
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_opt_push_implicit_dot_target",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (apr_array_header_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj0);
+    arg1 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12925,7 +12888,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_parse_num_args(PyObject *SWIGUNUSEDPARM(self)
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_opt_parse_num_args",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg2 = (apr_getopt_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_apr_getopt_t, svn_argnum_obj0);
+    arg2 = (apr_getopt_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_getopt_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12997,7 +12960,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_parse_all_args(PyObject *SWIGUNUSEDPARM(self)
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_opt_parse_all_args",&obj0,&obj1)) SWIG_fail;
   {
-    arg2 = (apr_getopt_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_apr_getopt_t, svn_argnum_obj0);
+    arg2 = (apr_getopt_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_getopt_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13064,7 +13027,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_parse_path(PyObject *SWIGUNUSEDPARM(self), Py
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_opt_parse_path",&obj0,&arg3,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj0);
+    arg1 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13155,7 +13118,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_print_help4(PyObject *SWIGUNUSEDPARM(self), P
   arg10 = &temp10;
   if (!PyArg_ParseTuple(args,(char *)"OsOOOssOOs|O:svn_opt_print_help4",&obj0,&arg2,&obj2,&obj3,&obj4,&arg6,&arg7,&obj7,&obj8,&arg11,&obj10)) SWIG_fail;
   {
-    arg1 = (apr_getopt_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_apr_getopt_t, svn_argnum_obj0);
+    arg1 = (apr_getopt_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_getopt_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13179,13 +13142,13 @@ SWIGINTERN PyObject *_wrap_svn_opt_print_help4(PyObject *SWIGUNUSEDPARM(self), P
     }
   }
   {
-    arg8 = (svn_opt_subcommand_desc2_t *)svn_swig_MustGetPtr(obj7, SWIGTYPE_p_svn_opt_subcommand_desc2_t, svn_argnum_obj7);
+    arg8 = (svn_opt_subcommand_desc2_t *)svn_swig_py_must_get_ptr(obj7, SWIGTYPE_p_svn_opt_subcommand_desc2_t, svn_argnum_obj7);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg9 = (apr_getopt_option_t *)svn_swig_MustGetPtr(obj8, SWIGTYPE_p_apr_getopt_option_t, svn_argnum_obj8);
+    arg9 = (apr_getopt_option_t *)svn_swig_py_must_get_ptr(obj8, SWIGTYPE_p_apr_getopt_option_t, svn_argnum_obj8);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13267,7 +13230,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_print_help3(PyObject *SWIGUNUSEDPARM(self), P
   arg9 = &temp9;
   if (!PyArg_ParseTuple(args,(char *)"OsOOssOOs|O:svn_opt_print_help3",&obj0,&arg2,&obj2,&obj3,&arg5,&arg6,&obj6,&obj7,&arg10,&obj9)) SWIG_fail;
   {
-    arg1 = (apr_getopt_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_apr_getopt_t, svn_argnum_obj0);
+    arg1 = (apr_getopt_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_getopt_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13285,13 +13248,13 @@ SWIGINTERN PyObject *_wrap_svn_opt_print_help3(PyObject *SWIGUNUSEDPARM(self), P
     }
   }
   {
-    arg7 = (svn_opt_subcommand_desc2_t *)svn_swig_MustGetPtr(obj6, SWIGTYPE_p_svn_opt_subcommand_desc2_t, svn_argnum_obj6);
+    arg7 = (svn_opt_subcommand_desc2_t *)svn_swig_py_must_get_ptr(obj6, SWIGTYPE_p_svn_opt_subcommand_desc2_t, svn_argnum_obj6);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg8 = (apr_getopt_option_t *)svn_swig_MustGetPtr(obj7, SWIGTYPE_p_apr_getopt_option_t, svn_argnum_obj7);
+    arg8 = (apr_getopt_option_t *)svn_swig_py_must_get_ptr(obj7, SWIGTYPE_p_apr_getopt_option_t, svn_argnum_obj7);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13369,7 +13332,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_print_help2(PyObject *SWIGUNUSEDPARM(self), P
   arg10 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OsOOssOOs|O:svn_opt_print_help2",&obj0,&arg2,&obj2,&obj3,&arg5,&arg6,&obj6,&obj7,&arg9,&obj9)) SWIG_fail;
   {
-    arg1 = (apr_getopt_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_apr_getopt_t, svn_argnum_obj0);
+    arg1 = (apr_getopt_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_getopt_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13387,13 +13350,13 @@ SWIGINTERN PyObject *_wrap_svn_opt_print_help2(PyObject *SWIGUNUSEDPARM(self), P
     }
   }
   {
-    arg7 = (svn_opt_subcommand_desc2_t *)svn_swig_MustGetPtr(obj6, SWIGTYPE_p_svn_opt_subcommand_desc2_t, svn_argnum_obj6);
+    arg7 = (svn_opt_subcommand_desc2_t *)svn_swig_py_must_get_ptr(obj6, SWIGTYPE_p_svn_opt_subcommand_desc2_t, svn_argnum_obj6);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg8 = (apr_getopt_option_t *)svn_swig_MustGetPtr(obj7, SWIGTYPE_p_apr_getopt_option_t, svn_argnum_obj7);
+    arg8 = (apr_getopt_option_t *)svn_swig_py_must_get_ptr(obj7, SWIGTYPE_p_apr_getopt_option_t, svn_argnum_obj7);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13465,7 +13428,7 @@ SWIGINTERN PyObject *_wrap_svn_opt_print_help(PyObject *SWIGUNUSEDPARM(self), Py
   arg10 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OsOOssOOs|O:svn_opt_print_help",&obj0,&arg2,&obj2,&obj3,&arg5,&arg6,&obj6,&obj7,&arg9,&obj9)) SWIG_fail;
   {
-    arg1 = (apr_getopt_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_apr_getopt_t, svn_argnum_obj0);
+    arg1 = (apr_getopt_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_getopt_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13483,13 +13446,13 @@ SWIGINTERN PyObject *_wrap_svn_opt_print_help(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
-    arg7 = (svn_opt_subcommand_desc_t *)svn_swig_MustGetPtr(obj6, SWIGTYPE_p_svn_opt_subcommand_desc_t, svn_argnum_obj6);
+    arg7 = (svn_opt_subcommand_desc_t *)svn_swig_py_must_get_ptr(obj6, SWIGTYPE_p_svn_opt_subcommand_desc_t, svn_argnum_obj6);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg8 = (apr_getopt_option_t *)svn_swig_MustGetPtr(obj7, SWIGTYPE_p_apr_getopt_option_t, svn_argnum_obj7);
+    arg8 = (apr_getopt_option_t *)svn_swig_py_must_get_ptr(obj7, SWIGTYPE_p_apr_getopt_option_t, svn_argnum_obj7);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13563,6 +13526,141 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_cmdline_create_auth_baton2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  svn_auth_baton_t **arg1 = (svn_auth_baton_t **) 0 ;
+  svn_boolean_t arg2 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  char *arg5 = (char *) 0 ;
+  svn_boolean_t arg6 ;
+  svn_boolean_t arg7 ;
+  svn_boolean_t arg8 ;
+  svn_boolean_t arg9 ;
+  svn_boolean_t arg10 ;
+  svn_boolean_t arg11 ;
+  svn_config_t *arg12 = (svn_config_t *) 0 ;
+  svn_cancel_func_t arg13 = (svn_cancel_func_t) 0 ;
+  void *arg14 = (void *) 0 ;
+  apr_pool_t *arg15 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  svn_auth_baton_t *temp1 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj4 = 0 ;
+  PyObject * obj5 = 0 ;
+  PyObject * obj6 = 0 ;
+  PyObject * obj7 = 0 ;
+  PyObject * obj8 = 0 ;
+  PyObject * obj9 = 0 ;
+  PyObject * obj10 = 0 ;
+  PyObject * obj11 = 0 ;
+  PyObject * obj12 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg15 = _global_pool;
+  arg1 = &temp1;
+  if (!PyArg_ParseTuple(args,(char *)"OzzzOOOOOOOO|O:svn_cmdline_create_auth_baton2",&obj0,&arg3,&arg4,&arg5,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12)) SWIG_fail;
+  {
+    arg2 = (svn_boolean_t)SWIG_As_long (obj0);
+    if (SWIG_arg_fail(svn_argnum_obj0)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg6 = (svn_boolean_t)SWIG_As_long (obj4);
+    if (SWIG_arg_fail(svn_argnum_obj4)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg7 = (svn_boolean_t)SWIG_As_long (obj5);
+    if (SWIG_arg_fail(svn_argnum_obj5)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg8 = (svn_boolean_t)SWIG_As_long (obj6);
+    if (SWIG_arg_fail(svn_argnum_obj6)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg9 = (svn_boolean_t)SWIG_As_long (obj7);
+    if (SWIG_arg_fail(svn_argnum_obj7)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg10 = (svn_boolean_t)SWIG_As_long (obj8);
+    if (SWIG_arg_fail(svn_argnum_obj8)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg11 = (svn_boolean_t)SWIG_As_long (obj9);
+    if (SWIG_arg_fail(svn_argnum_obj9)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg12 = (svn_config_t *)svn_swig_py_must_get_ptr(obj10, SWIGTYPE_p_svn_config_t, svn_argnum_obj10);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg13 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg14 = obj11;
+  }
+  if (obj12) {
+    /* Verify that the user supplied a valid pool */
+    if (obj12 != Py_None && obj12 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj12);
+      SWIG_arg_fail(svn_argnum_obj12);
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_cmdline_create_auth_baton2(arg1,arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12,arg13,arg14,arg15);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  {
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_auth_baton_t,
+        _global_py_pool, args))
+    
+    ;
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_svn_cmdline_create_auth_baton(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   svn_auth_baton_t **arg1 = (svn_auth_baton_t **) 0 ;
@@ -13612,14 +13710,14 @@ SWIGINTERN PyObject *_wrap_svn_cmdline_create_auth_baton(PyObject *SWIGUNUSEDPAR
     }
   }
   {
-    arg8 = (svn_config_t *)svn_swig_MustGetPtr(obj6, SWIGTYPE_p_svn_config_t, svn_argnum_obj6);
+    arg8 = (svn_config_t *)svn_swig_py_must_get_ptr(obj6, SWIGTYPE_p_svn_config_t, svn_argnum_obj6);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg9 = svn_swig_py_cancel_func;
-    arg10 = obj7; /* our function is the baton. */
+    arg9 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg10 = obj7;
   }
   if (obj8) {
     /* Verify that the user supplied a valid pool */
@@ -13649,7 +13747,7 @@ SWIGINTERN PyObject *_wrap_svn_cmdline_create_auth_baton(PyObject *SWIGUNUSEDPAR
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_auth_baton_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_auth_baton_t,
         _global_py_pool, args))
     
     ;
@@ -13674,7 +13772,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_provider_t_cred_kind_set(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_auth_provider_t_cred_kind_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_auth_provider_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_provider_t, svn_argnum_obj0);
+    arg1 = (struct svn_auth_provider_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_provider_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13702,7 +13800,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_provider_t_cred_kind_get(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_auth_provider_t_cred_kind_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_auth_provider_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_provider_t, svn_argnum_obj0);
+    arg1 = (struct svn_auth_provider_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_provider_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13724,7 +13822,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_provider_t_first_credentials_set(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_auth_provider_t_first_credentials_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_auth_provider_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_provider_t, svn_argnum_obj0);
+    arg1 = (struct svn_auth_provider_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_provider_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13751,7 +13849,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_provider_t_first_credentials_get(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_auth_provider_t_first_credentials_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_auth_provider_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_provider_t, svn_argnum_obj0);
+    arg1 = (struct svn_auth_provider_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_provider_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13773,7 +13871,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_provider_t_next_credentials_set(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_auth_provider_t_next_credentials_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_auth_provider_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_provider_t, svn_argnum_obj0);
+    arg1 = (struct svn_auth_provider_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_provider_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13800,7 +13898,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_provider_t_next_credentials_get(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_auth_provider_t_next_credentials_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_auth_provider_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_provider_t, svn_argnum_obj0);
+    arg1 = (struct svn_auth_provider_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_provider_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13822,7 +13920,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_provider_t_save_credentials_set(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_auth_provider_t_save_credentials_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_auth_provider_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_provider_t, svn_argnum_obj0);
+    arg1 = (struct svn_auth_provider_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_provider_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13849,7 +13947,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_provider_t_save_credentials_get(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_auth_provider_t_save_credentials_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_auth_provider_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_provider_t, svn_argnum_obj0);
+    arg1 = (struct svn_auth_provider_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_provider_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13875,7 +13973,7 @@ SWIGINTERN PyObject *_wrap_new_svn_auth_provider_t(PyObject *SWIGUNUSEDPARM(self
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_auth_provider_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_auth_provider_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -13890,7 +13988,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_auth_provider_t(PyObject *SWIGUNUSEDPARM(s
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_auth_provider_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_auth_provider_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_provider_t, svn_argnum_obj0);
+    arg1 = (struct svn_auth_provider_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_provider_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13926,13 +14024,13 @@ SWIGINTERN PyObject *_wrap_svn_auth_provider_object_t_vtable_set(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_auth_provider_object_t_vtable_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_auth_provider_object_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_provider_object_t, svn_argnum_obj0);
+    arg1 = (struct svn_auth_provider_object_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_provider_object_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_auth_provider_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_auth_provider_t, svn_argnum_obj1);
+    arg2 = (svn_auth_provider_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_auth_provider_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13953,13 +14051,13 @@ SWIGINTERN PyObject *_wrap_svn_auth_provider_object_t_vtable_get(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_auth_provider_object_t_vtable_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_auth_provider_object_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_provider_object_t, svn_argnum_obj0);
+    arg1 = (struct svn_auth_provider_object_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_provider_object_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (svn_auth_provider_t *) ((arg1)->vtable);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_auth_provider_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_auth_provider_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -13976,7 +14074,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_provider_object_t_provider_baton_set(PyObjec
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_auth_provider_object_t_provider_baton_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_auth_provider_object_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_provider_object_t, svn_argnum_obj0);
+    arg1 = (struct svn_auth_provider_object_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_provider_object_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14005,7 +14103,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_provider_object_t_provider_baton_get(PyObjec
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_auth_provider_object_t_provider_baton_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_auth_provider_object_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_provider_object_t, svn_argnum_obj0);
+    arg1 = (struct svn_auth_provider_object_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_provider_object_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14030,7 +14128,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_provider_object_t_provider_baton_get(PyObjec
         /* We don't know the type of this reference, so we'll have to
                * treat it as an opaque void pointer.
                */
-        resultobj = svn_swig_NewPointerObj(result, SWIGTYPE_p_void,
+        resultobj = svn_swig_py_new_pointer_obj(result, SWIGTYPE_p_void,
           _global_py_pool, args);
       }
     }
@@ -14055,7 +14153,7 @@ SWIGINTERN PyObject *_wrap_new_svn_auth_provider_object_t(PyObject *SWIGUNUSEDPA
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_auth_provider_object_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_auth_provider_object_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -14070,7 +14168,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_auth_provider_object_t(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_auth_provider_object_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_auth_provider_object_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_provider_object_t, svn_argnum_obj0);
+    arg1 = (struct svn_auth_provider_object_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_provider_object_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14105,7 +14203,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_cred_simple_t_username_set(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"Oz:svn_auth_cred_simple_t_username_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_auth_cred_simple_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_cred_simple_t, svn_argnum_obj0);
+    arg1 = (struct svn_auth_cred_simple_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_cred_simple_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14133,7 +14231,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_cred_simple_t_username_get(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_auth_cred_simple_t_username_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_auth_cred_simple_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_cred_simple_t, svn_argnum_obj0);
+    arg1 = (struct svn_auth_cred_simple_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_cred_simple_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14154,7 +14252,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_cred_simple_t_password_set(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"Oz:svn_auth_cred_simple_t_password_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_auth_cred_simple_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_cred_simple_t, svn_argnum_obj0);
+    arg1 = (struct svn_auth_cred_simple_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_cred_simple_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14182,7 +14280,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_cred_simple_t_password_get(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_auth_cred_simple_t_password_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_auth_cred_simple_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_cred_simple_t, svn_argnum_obj0);
+    arg1 = (struct svn_auth_cred_simple_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_cred_simple_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14204,7 +14302,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_cred_simple_t_may_save_set(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_auth_cred_simple_t_may_save_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_auth_cred_simple_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_cred_simple_t, svn_argnum_obj0);
+    arg1 = (struct svn_auth_cred_simple_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_cred_simple_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14231,7 +14329,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_cred_simple_t_may_save_get(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_auth_cred_simple_t_may_save_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_auth_cred_simple_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_cred_simple_t, svn_argnum_obj0);
+    arg1 = (struct svn_auth_cred_simple_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_cred_simple_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14257,7 +14355,7 @@ SWIGINTERN PyObject *_wrap_new_svn_auth_cred_simple_t(PyObject *SWIGUNUSEDPARM(s
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_auth_cred_simple_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_auth_cred_simple_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -14272,7 +14370,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_auth_cred_simple_t(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_auth_cred_simple_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_auth_cred_simple_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_cred_simple_t, svn_argnum_obj0);
+    arg1 = (struct svn_auth_cred_simple_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_cred_simple_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14307,7 +14405,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_cred_username_t_username_set(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"Oz:svn_auth_cred_username_t_username_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_auth_cred_username_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_cred_username_t, svn_argnum_obj0);
+    arg1 = (struct svn_auth_cred_username_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_cred_username_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14335,7 +14433,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_cred_username_t_username_get(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_auth_cred_username_t_username_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_auth_cred_username_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_cred_username_t, svn_argnum_obj0);
+    arg1 = (struct svn_auth_cred_username_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_cred_username_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14357,7 +14455,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_cred_username_t_may_save_set(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_auth_cred_username_t_may_save_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_auth_cred_username_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_cred_username_t, svn_argnum_obj0);
+    arg1 = (struct svn_auth_cred_username_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_cred_username_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14384,7 +14482,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_cred_username_t_may_save_get(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_auth_cred_username_t_may_save_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_auth_cred_username_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_cred_username_t, svn_argnum_obj0);
+    arg1 = (struct svn_auth_cred_username_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_cred_username_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14410,7 +14508,7 @@ SWIGINTERN PyObject *_wrap_new_svn_auth_cred_username_t(PyObject *SWIGUNUSEDPARM
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_auth_cred_username_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_auth_cred_username_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -14425,7 +14523,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_auth_cred_username_t(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_auth_cred_username_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_auth_cred_username_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_cred_username_t, svn_argnum_obj0);
+    arg1 = (struct svn_auth_cred_username_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_cred_username_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14460,7 +14558,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_cred_ssl_client_cert_t_cert_file_set(PyObjec
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_auth_cred_ssl_client_cert_t_cert_file_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_auth_cred_ssl_client_cert_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t, svn_argnum_obj0);
+    arg1 = (struct svn_auth_cred_ssl_client_cert_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14488,7 +14586,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_cred_ssl_client_cert_t_cert_file_get(PyObjec
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_auth_cred_ssl_client_cert_t_cert_file_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_auth_cred_ssl_client_cert_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t, svn_argnum_obj0);
+    arg1 = (struct svn_auth_cred_ssl_client_cert_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14510,7 +14608,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_cred_ssl_client_cert_t_may_save_set(PyObject
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_auth_cred_ssl_client_cert_t_may_save_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_auth_cred_ssl_client_cert_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t, svn_argnum_obj0);
+    arg1 = (struct svn_auth_cred_ssl_client_cert_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14537,7 +14635,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_cred_ssl_client_cert_t_may_save_get(PyObject
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_auth_cred_ssl_client_cert_t_may_save_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_auth_cred_ssl_client_cert_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t, svn_argnum_obj0);
+    arg1 = (struct svn_auth_cred_ssl_client_cert_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14563,7 +14661,7 @@ SWIGINTERN PyObject *_wrap_new_svn_auth_cred_ssl_client_cert_t(PyObject *SWIGUNU
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -14578,7 +14676,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_auth_cred_ssl_client_cert_t(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_auth_cred_ssl_client_cert_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_auth_cred_ssl_client_cert_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t, svn_argnum_obj0);
+    arg1 = (struct svn_auth_cred_ssl_client_cert_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14613,7 +14711,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_cred_ssl_client_cert_pw_t_password_set(PyObj
   
   if (!PyArg_ParseTuple(args,(char *)"Oz:svn_auth_cred_ssl_client_cert_pw_t_password_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_auth_cred_ssl_client_cert_pw_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t, svn_argnum_obj0);
+    arg1 = (struct svn_auth_cred_ssl_client_cert_pw_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14641,7 +14739,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_cred_ssl_client_cert_pw_t_password_get(PyObj
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_auth_cred_ssl_client_cert_pw_t_password_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_auth_cred_ssl_client_cert_pw_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t, svn_argnum_obj0);
+    arg1 = (struct svn_auth_cred_ssl_client_cert_pw_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14663,7 +14761,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_cred_ssl_client_cert_pw_t_may_save_set(PyObj
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_auth_cred_ssl_client_cert_pw_t_may_save_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_auth_cred_ssl_client_cert_pw_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t, svn_argnum_obj0);
+    arg1 = (struct svn_auth_cred_ssl_client_cert_pw_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14690,7 +14788,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_cred_ssl_client_cert_pw_t_may_save_get(PyObj
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_auth_cred_ssl_client_cert_pw_t_may_save_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_auth_cred_ssl_client_cert_pw_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t, svn_argnum_obj0);
+    arg1 = (struct svn_auth_cred_ssl_client_cert_pw_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14716,7 +14814,7 @@ SWIGINTERN PyObject *_wrap_new_svn_auth_cred_ssl_client_cert_pw_t(PyObject *SWIG
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -14731,7 +14829,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_auth_cred_ssl_client_cert_pw_t(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_auth_cred_ssl_client_cert_pw_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_auth_cred_ssl_client_cert_pw_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t, svn_argnum_obj0);
+    arg1 = (struct svn_auth_cred_ssl_client_cert_pw_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14766,7 +14864,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_ssl_server_cert_info_t_hostname_set(PyObject
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_auth_ssl_server_cert_info_t_hostname_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_auth_ssl_server_cert_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_ssl_server_cert_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_auth_ssl_server_cert_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_ssl_server_cert_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14794,7 +14892,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_ssl_server_cert_info_t_hostname_get(PyObject
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_auth_ssl_server_cert_info_t_hostname_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_auth_ssl_server_cert_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_ssl_server_cert_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_auth_ssl_server_cert_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_ssl_server_cert_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14815,7 +14913,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_ssl_server_cert_info_t_fingerprint_set(PyObj
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_auth_ssl_server_cert_info_t_fingerprint_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_auth_ssl_server_cert_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_ssl_server_cert_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_auth_ssl_server_cert_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_ssl_server_cert_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14843,7 +14941,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_ssl_server_cert_info_t_fingerprint_get(PyObj
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_auth_ssl_server_cert_info_t_fingerprint_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_auth_ssl_server_cert_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_ssl_server_cert_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_auth_ssl_server_cert_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_ssl_server_cert_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14864,7 +14962,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_ssl_server_cert_info_t_valid_from_set(PyObje
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_auth_ssl_server_cert_info_t_valid_from_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_auth_ssl_server_cert_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_ssl_server_cert_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_auth_ssl_server_cert_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_ssl_server_cert_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14892,7 +14990,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_ssl_server_cert_info_t_valid_from_get(PyObje
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_auth_ssl_server_cert_info_t_valid_from_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_auth_ssl_server_cert_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_ssl_server_cert_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_auth_ssl_server_cert_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_ssl_server_cert_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14913,7 +15011,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_ssl_server_cert_info_t_valid_until_set(PyObj
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_auth_ssl_server_cert_info_t_valid_until_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_auth_ssl_server_cert_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_ssl_server_cert_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_auth_ssl_server_cert_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_ssl_server_cert_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14941,7 +15039,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_ssl_server_cert_info_t_valid_until_get(PyObj
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_auth_ssl_server_cert_info_t_valid_until_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_auth_ssl_server_cert_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_ssl_server_cert_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_auth_ssl_server_cert_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_ssl_server_cert_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14962,7 +15060,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_ssl_server_cert_info_t_issuer_dname_set(PyOb
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_auth_ssl_server_cert_info_t_issuer_dname_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_auth_ssl_server_cert_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_ssl_server_cert_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_auth_ssl_server_cert_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_ssl_server_cert_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14990,7 +15088,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_ssl_server_cert_info_t_issuer_dname_get(PyOb
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_auth_ssl_server_cert_info_t_issuer_dname_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_auth_ssl_server_cert_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_ssl_server_cert_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_auth_ssl_server_cert_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_ssl_server_cert_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15011,7 +15109,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_ssl_server_cert_info_t_ascii_cert_set(PyObje
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_auth_ssl_server_cert_info_t_ascii_cert_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_auth_ssl_server_cert_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_ssl_server_cert_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_auth_ssl_server_cert_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_ssl_server_cert_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15039,7 +15137,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_ssl_server_cert_info_t_ascii_cert_get(PyObje
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_auth_ssl_server_cert_info_t_ascii_cert_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_auth_ssl_server_cert_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_ssl_server_cert_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_auth_ssl_server_cert_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_ssl_server_cert_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15065,7 +15163,7 @@ SWIGINTERN PyObject *_wrap_new_svn_auth_ssl_server_cert_info_t(PyObject *SWIGUNU
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_auth_ssl_server_cert_info_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_auth_ssl_server_cert_info_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -15080,7 +15178,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_auth_ssl_server_cert_info_t(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_auth_ssl_server_cert_info_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_auth_ssl_server_cert_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_ssl_server_cert_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_auth_ssl_server_cert_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_ssl_server_cert_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15123,7 +15221,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_ssl_server_cert_info_dup(PyObject *SWIGUNUSE
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_auth_ssl_server_cert_info_dup",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_auth_ssl_server_cert_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_ssl_server_cert_info_t, svn_argnum_obj0);
+    arg1 = (svn_auth_ssl_server_cert_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_ssl_server_cert_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15144,7 +15242,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_ssl_server_cert_info_dup(PyObject *SWIGUNUSE
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_auth_ssl_server_cert_info_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_auth_ssl_server_cert_info_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -15167,7 +15265,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_cred_ssl_server_trust_t_may_save_set(PyObjec
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_auth_cred_ssl_server_trust_t_may_save_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_auth_cred_ssl_server_trust_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t, svn_argnum_obj0);
+    arg1 = (struct svn_auth_cred_ssl_server_trust_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15194,7 +15292,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_cred_ssl_server_trust_t_may_save_get(PyObjec
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_auth_cred_ssl_server_trust_t_may_save_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_auth_cred_ssl_server_trust_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t, svn_argnum_obj0);
+    arg1 = (struct svn_auth_cred_ssl_server_trust_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15216,7 +15314,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_cred_ssl_server_trust_t_accepted_failures_se
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_auth_cred_ssl_server_trust_t_accepted_failures_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_auth_cred_ssl_server_trust_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t, svn_argnum_obj0);
+    arg1 = (struct svn_auth_cred_ssl_server_trust_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15243,7 +15341,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_cred_ssl_server_trust_t_accepted_failures_ge
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_auth_cred_ssl_server_trust_t_accepted_failures_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_auth_cred_ssl_server_trust_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t, svn_argnum_obj0);
+    arg1 = (struct svn_auth_cred_ssl_server_trust_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15269,7 +15367,7 @@ SWIGINTERN PyObject *_wrap_new_svn_auth_cred_ssl_server_trust_t(PyObject *SWIGUN
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -15284,7 +15382,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_auth_cred_ssl_server_trust_t(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_auth_cred_ssl_server_trust_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_auth_cred_ssl_server_trust_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t, svn_argnum_obj0);
+    arg1 = (struct svn_auth_cred_ssl_server_trust_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15355,7 +15453,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_open(PyObject *SWIGUNUSEDPARM(self), PyObjec
   }
   resultobj = SWIG_Py_Void();
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_auth_baton_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_auth_baton_t,
         _global_py_pool, args))
     
     ;
@@ -15384,7 +15482,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_set_parameter(PyObject *SWIGUNUSEDPARM(self)
   
   if (!PyArg_ParseTuple(args,(char *)"OsO:svn_auth_set_parameter",&obj0,&arg2,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_auth_baton_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_baton_t, svn_argnum_obj0);
+    arg1 = (svn_auth_baton_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_baton_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15412,7 +15510,8 @@ SWIGINTERN PyObject *_wrap_svn_auth_set_parameter(PyObject *SWIGUNUSEDPARM(self)
     else if (obj2 == Py_None) {
       arg3 = NULL;
     }
-    else if (svn_swig_ConvertPtr(obj2, (void **)&arg3, SWIGTYPE_p_svn_auth_ssl_server_cert_info_t) == 0) {
+    else if (svn_swig_py_convert_ptr(obj2, (void **)&arg3,
+        SWIGTYPE_p_svn_auth_ssl_server_cert_info_t) == 0) {
       
     }
     else {
@@ -15459,7 +15558,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_first_credentials(PyObject *SWIGUNUSEDPARM(s
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"ssO|O:svn_auth_first_credentials",&arg3,&arg4,&obj2,&obj3)) SWIG_fail;
   {
-    arg5 = (svn_auth_baton_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_auth_baton_t, svn_argnum_obj2);
+    arg5 = (svn_auth_baton_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_auth_baton_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15492,13 +15591,13 @@ SWIGINTERN PyObject *_wrap_svn_auth_first_credentials(PyObject *SWIGUNUSEDPARM(s
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_svn_auth_iterstate_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_svn_auth_iterstate_t,
         _global_py_pool, args))
     
     ;
@@ -15534,7 +15633,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_next_credentials(PyObject *SWIGUNUSEDPARM(se
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_auth_next_credentials",&obj0,&obj1)) SWIG_fail;
   {
-    arg2 = (svn_auth_iterstate_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_iterstate_t, svn_argnum_obj0);
+    arg2 = (svn_auth_iterstate_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_iterstate_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15567,7 +15666,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_next_credentials(PyObject *SWIGUNUSEDPARM(se
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -15600,7 +15699,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_save_credentials(PyObject *SWIGUNUSEDPARM(se
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_auth_save_credentials",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_auth_iterstate_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_iterstate_t, svn_argnum_obj0);
+    arg1 = (svn_auth_iterstate_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_iterstate_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15662,7 +15761,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_forget_credentials(PyObject *SWIGUNUSEDPARM(
   arg4 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"Oss|O:svn_auth_forget_credentials",&obj0,&arg2,&arg3,&obj3)) SWIG_fail;
   {
-    arg1 = (svn_auth_baton_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_baton_t, svn_argnum_obj0);
+    arg1 = (svn_auth_baton_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_baton_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15727,7 +15826,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_get_simple_prompt_provider(PyObject *SWIGUNU
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_auth_get_simple_prompt_provider",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg2 = svn_swig_py_auth_simple_prompt_func;
+    arg2 = (svn_auth_simple_prompt_func_t) svn_swig_py_auth_simple_prompt_func;
     arg3 = obj0;
   }
   {
@@ -15754,7 +15853,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_get_simple_prompt_provider(PyObject *SWIGUNU
   }
   resultobj = SWIG_Py_Void();
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_auth_provider_object_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_auth_provider_object_t,
         _global_py_pool, args))
     
     ;
@@ -15792,7 +15891,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_get_username_prompt_provider(PyObject *SWIGU
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_auth_get_username_prompt_provider",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg2 = svn_swig_py_auth_username_prompt_func;
+    arg2 = (svn_auth_username_prompt_func_t) svn_swig_py_auth_username_prompt_func;
     arg3 = obj0;
   }
   {
@@ -15819,7 +15918,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_get_username_prompt_provider(PyObject *SWIGU
   }
   resultobj = SWIG_Py_Void();
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_auth_provider_object_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_auth_provider_object_t,
         _global_py_pool, args))
     
     ;
@@ -15857,7 +15956,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_get_simple_provider2(PyObject *SWIGUNUSEDPAR
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_auth_get_simple_provider2",&obj0,&obj1,&obj2)) SWIG_fail;
   {
     svn_auth_plaintext_prompt_func_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15889,7 +15988,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_get_simple_provider2(PyObject *SWIGUNUSEDPAR
   }
   resultobj = SWIG_Py_Void();
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_auth_provider_object_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_auth_provider_object_t,
         _global_py_pool, args))
     
     ;
@@ -15939,7 +16038,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_get_simple_provider(PyObject *SWIGUNUSEDPARM
   }
   resultobj = SWIG_Py_Void();
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_auth_provider_object_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_auth_provider_object_t,
         _global_py_pool, args))
     
     ;
@@ -16002,7 +16101,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_get_platform_specific_provider(PyObject *SWI
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_auth_provider_object_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_auth_provider_object_t,
         _global_py_pool, args))
     
     ;
@@ -16038,7 +16137,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_get_platform_specific_client_providers(PyObj
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_auth_get_platform_specific_client_providers",&obj0,&obj1)) SWIG_fail;
   {
-    arg2 = (svn_config_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
+    arg2 = (svn_config_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16125,7 +16224,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_get_username_provider(PyObject *SWIGUNUSEDPA
   }
   resultobj = SWIG_Py_Void();
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_auth_provider_object_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_auth_provider_object_t,
         _global_py_pool, args))
     
     ;
@@ -16175,7 +16274,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_get_ssl_server_trust_file_provider(PyObject
   }
   resultobj = SWIG_Py_Void();
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_auth_provider_object_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_auth_provider_object_t,
         _global_py_pool, args))
     
     ;
@@ -16225,7 +16324,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_get_ssl_client_cert_file_provider(PyObject *
   }
   resultobj = SWIG_Py_Void();
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_auth_provider_object_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_auth_provider_object_t,
         _global_py_pool, args))
     
     ;
@@ -16263,7 +16362,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_get_ssl_client_cert_pw_file_provider2(PyObje
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_auth_get_ssl_client_cert_pw_file_provider2",&obj0,&obj1,&obj2)) SWIG_fail;
   {
     svn_auth_plaintext_passphrase_prompt_func_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16295,7 +16394,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_get_ssl_client_cert_pw_file_provider2(PyObje
   }
   resultobj = SWIG_Py_Void();
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_auth_provider_object_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_auth_provider_object_t,
         _global_py_pool, args))
     
     ;
@@ -16345,7 +16444,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_get_ssl_client_cert_pw_file_provider(PyObjec
   }
   resultobj = SWIG_Py_Void();
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_auth_provider_object_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_auth_provider_object_t,
         _global_py_pool, args))
     
     ;
@@ -16381,7 +16480,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_get_ssl_server_trust_prompt_provider(PyObjec
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_auth_get_ssl_server_trust_prompt_provider",&obj0,&obj1)) SWIG_fail;
   {
-    arg2 = svn_swig_py_auth_ssl_server_trust_prompt_func;
+    arg2 = (svn_auth_ssl_server_trust_prompt_func_t) svn_swig_py_auth_ssl_server_trust_prompt_func;
     arg3 = obj0;
   }
   if (obj1) {
@@ -16402,7 +16501,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_get_ssl_server_trust_prompt_provider(PyObjec
   }
   resultobj = SWIG_Py_Void();
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_auth_provider_object_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_auth_provider_object_t,
         _global_py_pool, args))
     
     ;
@@ -16440,7 +16539,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_get_ssl_client_cert_prompt_provider(PyObject
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_auth_get_ssl_client_cert_prompt_provider",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg2 = svn_swig_py_auth_ssl_client_cert_prompt_func;
+    arg2 = (svn_auth_ssl_client_cert_prompt_func_t) svn_swig_py_auth_ssl_client_cert_prompt_func;
     arg3 = obj0;
   }
   {
@@ -16467,7 +16566,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_get_ssl_client_cert_prompt_provider(PyObject
   }
   resultobj = SWIG_Py_Void();
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_auth_provider_object_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_auth_provider_object_t,
         _global_py_pool, args))
     
     ;
@@ -16505,7 +16604,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_get_ssl_client_cert_pw_prompt_provider(PyObj
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_auth_get_ssl_client_cert_pw_prompt_provider",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg2 = svn_swig_py_auth_ssl_client_cert_pw_prompt_func;
+    arg2 = (svn_auth_ssl_client_cert_pw_prompt_func_t) svn_swig_py_auth_ssl_client_cert_pw_prompt_func;
     arg3 = obj0;
   }
   {
@@ -16532,7 +16631,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_get_ssl_client_cert_pw_prompt_provider(PyObj
   }
   resultobj = SWIG_Py_Void();
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_auth_provider_object_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_auth_provider_object_t,
         _global_py_pool, args))
     
     ;
@@ -16590,7 +16689,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_provider_invoke_first_credentials(PyObject *
   arg3 = &temp3;
   if (!PyArg_ParseTuple(args,(char *)"OOOs|O:svn_auth_provider_invoke_first_credentials",&obj0,&obj1,&obj2,&arg6,&obj4)) SWIG_fail;
   {
-    arg1 = (svn_auth_provider_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_provider_t, svn_argnum_obj0);
+    arg1 = (svn_auth_provider_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_provider_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16604,7 +16703,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_provider_invoke_first_credentials(PyObject *
     }
   }
   {
-    arg5 = (apr_hash_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_apr_hash_t, svn_argnum_obj2);
+    arg5 = (apr_hash_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_apr_hash_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16637,13 +16736,13 @@ SWIGINTERN PyObject *_wrap_svn_auth_provider_invoke_first_credentials(PyObject *
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg3, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg3, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -16686,7 +16785,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_provider_invoke_next_credentials(PyObject *S
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"OOOOs|O:svn_auth_provider_invoke_next_credentials",&obj0,&obj1,&obj2,&obj3,&arg6,&obj5)) SWIG_fail;
   {
-    arg1 = (svn_auth_provider_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_provider_t, svn_argnum_obj0);
+    arg1 = (svn_auth_provider_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_provider_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16708,7 +16807,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_provider_invoke_next_credentials(PyObject *S
     }
   }
   {
-    arg5 = (apr_hash_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_apr_hash_t, svn_argnum_obj3);
+    arg5 = (apr_hash_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_apr_hash_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16741,7 +16840,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_provider_invoke_next_credentials(PyObject *S
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -16785,13 +16884,13 @@ SWIGINTERN PyObject *_wrap_svn_auth_provider_invoke_save_credentials(PyObject *S
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"OOOOs|O:svn_auth_provider_invoke_save_credentials",&obj0,&obj1,&obj2,&obj3,&arg6,&obj5)) SWIG_fail;
   {
-    arg1 = (svn_auth_provider_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_provider_t, svn_argnum_obj0);
+    arg1 = (svn_auth_provider_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_provider_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (void *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_void, svn_argnum_obj1);
+    arg3 = (void *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_void, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16805,7 +16904,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_provider_invoke_save_credentials(PyObject *S
     }
   }
   {
-    arg5 = (apr_hash_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_apr_hash_t, svn_argnum_obj3);
+    arg5 = (apr_hash_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_apr_hash_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16874,7 +16973,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_invoke_simple_provider_func(PyObject *SWIGUN
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_auth_invoke_simple_provider_func",&obj0,&obj1)) SWIG_fail;
   {
     svn_auth_simple_provider_func_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_p_struct_svn_auth_provider_object_t_p_apr_pool_t__void, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_p_struct_svn_auth_provider_object_t_p_apr_pool_t__void, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16898,7 +16997,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_invoke_simple_provider_func(PyObject *SWIGUN
   }
   resultobj = SWIG_Py_Void();
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_svn_auth_provider_object_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_svn_auth_provider_object_t,
         _global_py_pool, args))
     
     ;
@@ -16934,7 +17033,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_invoke_ssl_client_cert_pw_provider_func(PyOb
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_auth_invoke_ssl_client_cert_pw_provider_func",&obj0,&obj1)) SWIG_fail;
   {
     svn_auth_ssl_client_cert_pw_provider_func_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_p_struct_svn_auth_provider_object_t_p_apr_pool_t__void, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_p_struct_svn_auth_provider_object_t_p_apr_pool_t__void, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16958,7 +17057,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_invoke_ssl_client_cert_pw_provider_func(PyOb
   }
   resultobj = SWIG_Py_Void();
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_svn_auth_provider_object_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_svn_auth_provider_object_t,
         _global_py_pool, args))
     
     ;
@@ -17001,7 +17100,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_invoke_simple_prompt_func(PyObject *SWIGUNUS
   if (!PyArg_ParseTuple(args,(char *)"OOszO|O:svn_auth_invoke_simple_prompt_func",&obj0,&obj1,&arg4,&arg5,&obj4,&obj5)) SWIG_fail;
   {
     svn_auth_simple_prompt_func_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17049,7 +17148,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_invoke_simple_prompt_func(PyObject *SWIGUNUS
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_svn_auth_cred_simple_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_svn_auth_cred_simple_t,
         _global_py_pool, args))
     
     ;
@@ -17091,7 +17190,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_invoke_username_prompt_func(PyObject *SWIGUN
   if (!PyArg_ParseTuple(args,(char *)"OOsO|O:svn_auth_invoke_username_prompt_func",&obj0,&obj1,&arg4,&obj3,&obj4)) SWIG_fail;
   {
     svn_auth_username_prompt_func_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17139,7 +17238,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_invoke_username_prompt_func(PyObject *SWIGUN
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_svn_auth_cred_username_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_svn_auth_cred_username_t,
         _global_py_pool, args))
     
     ;
@@ -17185,7 +17284,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_invoke_ssl_server_trust_prompt_func(PyObject
   if (!PyArg_ParseTuple(args,(char *)"OOsOOO|O:svn_auth_invoke_ssl_server_trust_prompt_func",&obj0,&obj1,&arg4,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
     svn_auth_ssl_server_trust_prompt_func_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17206,7 +17305,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_invoke_ssl_server_trust_prompt_func(PyObject
     }
   }
   {
-    arg6 = (svn_auth_ssl_server_cert_info_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_auth_ssl_server_cert_info_t, svn_argnum_obj4);
+    arg6 = (svn_auth_ssl_server_cert_info_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_auth_ssl_server_cert_info_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17245,7 +17344,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_invoke_ssl_server_trust_prompt_func(PyObject
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t,
         _global_py_pool, args))
     
     ;
@@ -17287,7 +17386,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_invoke_ssl_client_cert_prompt_func(PyObject
   if (!PyArg_ParseTuple(args,(char *)"OOsO|O:svn_auth_invoke_ssl_client_cert_prompt_func",&obj0,&obj1,&arg4,&obj3,&obj4)) SWIG_fail;
   {
     svn_auth_ssl_client_cert_prompt_func_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17335,7 +17434,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_invoke_ssl_client_cert_prompt_func(PyObject
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t,
         _global_py_pool, args))
     
     ;
@@ -17377,7 +17476,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_invoke_ssl_client_cert_pw_prompt_func(PyObje
   if (!PyArg_ParseTuple(args,(char *)"OOsO|O:svn_auth_invoke_ssl_client_cert_pw_prompt_func",&obj0,&obj1,&arg4,&obj3,&obj4)) SWIG_fail;
   {
     svn_auth_ssl_client_cert_pw_prompt_func_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17425,7 +17524,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_invoke_ssl_client_cert_pw_prompt_func(PyObje
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t,
         _global_py_pool, args))
     
     ;
@@ -17466,7 +17565,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_invoke_plaintext_prompt_func(PyObject *SWIGU
   if (!PyArg_ParseTuple(args,(char *)"OsO|O:svn_auth_invoke_plaintext_prompt_func",&obj0,&arg3,&obj2,&obj3)) SWIG_fail;
   {
     svn_auth_plaintext_prompt_func_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17549,7 +17648,7 @@ SWIGINTERN PyObject *_wrap_svn_auth_invoke_plaintext_passphrase_prompt_func(PyOb
   if (!PyArg_ParseTuple(args,(char *)"OsO|O:svn_auth_invoke_plaintext_passphrase_prompt_func",&obj0,&arg3,&obj2,&obj3)) SWIG_fail;
   {
     svn_auth_plaintext_passphrase_prompt_func_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17803,7 +17902,7 @@ SWIGINTERN PyObject *_wrap_svn_config_create2(PyObject *SWIGUNUSEDPARM(self), Py
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_config_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_config_t,
         _global_py_pool, args))
     
     ;
@@ -17872,7 +17971,7 @@ SWIGINTERN PyObject *_wrap_svn_config_create(PyObject *SWIGUNUSEDPARM(self), PyO
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_config_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_config_t,
         _global_py_pool, args))
     
     ;
@@ -17958,7 +18057,7 @@ SWIGINTERN PyObject *_wrap_svn_config_read3(PyObject *SWIGUNUSEDPARM(self), PyOb
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_config_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_config_t,
         _global_py_pool, args))
     
     ;
@@ -18036,7 +18135,7 @@ SWIGINTERN PyObject *_wrap_svn_config_read2(PyObject *SWIGUNUSEDPARM(self), PyOb
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_config_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_config_t,
         _global_py_pool, args))
     
     ;
@@ -18106,7 +18205,7 @@ SWIGINTERN PyObject *_wrap_svn_config_read(PyObject *SWIGUNUSEDPARM(self), PyObj
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_config_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_config_t,
         _global_py_pool, args))
     
     ;
@@ -18146,7 +18245,7 @@ SWIGINTERN PyObject *_wrap_svn_config_parse(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_config_parse",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
-    arg2 = (svn_stream_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
+    arg2 = (svn_stream_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18191,7 +18290,7 @@ SWIGINTERN PyObject *_wrap_svn_config_parse(PyObject *SWIGUNUSEDPARM(self), PyOb
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_config_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_config_t,
         _global_py_pool, args))
     
     ;
@@ -18219,7 +18318,7 @@ SWIGINTERN PyObject *_wrap_svn_config_merge(PyObject *SWIGUNUSEDPARM(self), PyOb
   
   if (!PyArg_ParseTuple(args,(char *)"OsO:svn_config_merge",&obj0,&arg2,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_config_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
+    arg1 = (svn_config_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18268,7 +18367,7 @@ SWIGINTERN PyObject *_wrap_svn_config_get(PyObject *SWIGUNUSEDPARM(self), PyObje
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"Ossz:svn_config_get",&obj0,&arg3,&arg4,&arg5)) SWIG_fail;
   {
-    arg1 = (svn_config_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
+    arg1 = (svn_config_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18311,7 +18410,7 @@ SWIGINTERN PyObject *_wrap_svn_config_set(PyObject *SWIGUNUSEDPARM(self), PyObje
   
   if (!PyArg_ParseTuple(args,(char *)"Osss:svn_config_set",&obj0,&arg2,&arg3,&arg4)) SWIG_fail;
   {
-    arg1 = (svn_config_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
+    arg1 = (svn_config_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18347,7 +18446,7 @@ SWIGINTERN PyObject *_wrap_svn_config_get_bool(PyObject *SWIGUNUSEDPARM(self), P
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"OssO:svn_config_get_bool",&obj0,&arg3,&arg4,&obj3)) SWIG_fail;
   {
-    arg1 = (svn_config_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
+    arg1 = (svn_config_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18400,7 +18499,7 @@ SWIGINTERN PyObject *_wrap_svn_config_set_bool(PyObject *SWIGUNUSEDPARM(self), P
   
   if (!PyArg_ParseTuple(args,(char *)"OssO:svn_config_set_bool",&obj0,&arg2,&arg3,&obj3)) SWIG_fail;
   {
-    arg1 = (svn_config_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
+    arg1 = (svn_config_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18441,7 +18540,7 @@ SWIGINTERN PyObject *_wrap_svn_config_get_int64(PyObject *SWIGUNUSEDPARM(self),
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"OssO:svn_config_get_int64",&obj0,&arg3,&arg4,&obj3)) SWIG_fail;
   {
-    arg1 = (svn_config_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
+    arg1 = (svn_config_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18486,7 +18585,7 @@ SWIGINTERN PyObject *_wrap_svn_config_set_int64(PyObject *SWIGUNUSEDPARM(self),
   
   if (!PyArg_ParseTuple(args,(char *)"OssO:svn_config_set_int64",&obj0,&arg2,&arg3,&obj3)) SWIG_fail;
   {
-    arg1 = (svn_config_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
+    arg1 = (svn_config_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18521,7 +18620,7 @@ SWIGINTERN PyObject *_wrap_svn_config_get_yes_no_ask(PyObject *SWIGUNUSEDPARM(se
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"Ossz:svn_config_get_yes_no_ask",&obj0,&arg3,&arg4,&arg5)) SWIG_fail;
   {
-    arg1 = (svn_config_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
+    arg1 = (svn_config_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18579,13 +18678,13 @@ SWIGINTERN PyObject *_wrap_svn_config_get_tristate(PyObject *SWIGUNUSEDPARM(self
   
   if (!PyArg_ParseTuple(args,(char *)"OOsssO:svn_config_get_tristate",&obj0,&obj1,&arg3,&arg4,&arg5,&obj5)) SWIG_fail;
   {
-    arg1 = (svn_config_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
+    arg1 = (svn_config_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_tristate_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_tristate_t, svn_argnum_obj1);
+    arg2 = (svn_tristate_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_tristate_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18633,14 +18732,14 @@ SWIGINTERN PyObject *_wrap_svn_config_enumerate_sections(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:svn_config_enumerate_sections",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_config_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
+    arg1 = (svn_config_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
     svn_config_section_enumerator_t * tmp =
-    svn_swig_MustGetPtr(obj1, SWIGTYPE_p_p_f_p_q_const__char_p_void__int, svn_argnum_obj1);
+    svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_p_f_p_q_const__char_p_void__int, svn_argnum_obj1);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18688,13 +18787,13 @@ SWIGINTERN PyObject *_wrap_svn_config_enumerate_sections2(PyObject *SWIGUNUSEDPA
   arg4 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_config_enumerate_sections2",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_config_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
+    arg1 = (svn_config_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = svn_swig_py_config_section_enumerator2;
+    arg2 = (svn_config_section_enumerator2_t) svn_swig_py_config_section_enumerator2;
     arg3 = obj1;
   }
   if (obj2) {
@@ -18739,14 +18838,14 @@ SWIGINTERN PyObject *_wrap_svn_config_enumerate(PyObject *SWIGUNUSEDPARM(self),
   
   if (!PyArg_ParseTuple(args,(char *)"OsOO:svn_config_enumerate",&obj0,&arg2,&obj2,&obj3)) SWIG_fail;
   {
-    arg1 = (svn_config_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
+    arg1 = (svn_config_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
     svn_config_enumerator_t * tmp =
-    svn_swig_MustGetPtr(obj2, SWIGTYPE_p_p_f_p_q_const__char_p_q_const__char_p_void__int, svn_argnum_obj2);
+    svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_p_f_p_q_const__char_p_q_const__char_p_void__int, svn_argnum_obj2);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18795,13 +18894,13 @@ SWIGINTERN PyObject *_wrap_svn_config_enumerate2(PyObject *SWIGUNUSEDPARM(self),
   arg5 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OsO|O:svn_config_enumerate2",&obj0,&arg2,&obj2,&obj3)) SWIG_fail;
   {
-    arg1 = (svn_config_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
+    arg1 = (svn_config_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = svn_swig_py_config_enumerator2;
+    arg3 = (svn_config_enumerator2_t) svn_swig_py_config_enumerator2;
     arg4 = obj2;
   }
   if (obj3) {
@@ -18842,7 +18941,7 @@ SWIGINTERN PyObject *_wrap_svn_config_has_section(PyObject *SWIGUNUSEDPARM(self)
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_config_has_section",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (svn_config_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
+    arg1 = (svn_config_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18880,7 +18979,7 @@ SWIGINTERN PyObject *_wrap_svn_config_find_group(PyObject *SWIGUNUSEDPARM(self),
   arg4 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"Oss|O:svn_config_find_group",&obj0,&arg2,&arg3,&obj3)) SWIG_fail;
   {
-    arg1 = (svn_config_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
+    arg1 = (svn_config_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18925,7 +19024,7 @@ SWIGINTERN PyObject *_wrap_svn_config_get_server_setting(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"Ossz:svn_config_get_server_setting",&obj0,&arg2,&arg3,&arg4)) SWIG_fail;
   {
-    arg1 = (svn_config_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
+    arg1 = (svn_config_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18968,7 +19067,7 @@ SWIGINTERN PyObject *_wrap_svn_config_get_server_setting_int(PyObject *SWIGUNUSE
   arg5 = &temp5;
   if (!PyArg_ParseTuple(args,(char *)"OssO|O:svn_config_get_server_setting_int",&obj0,&arg2,&arg3,&obj3,&obj4)) SWIG_fail;
   {
-    arg1 = (svn_config_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
+    arg1 = (svn_config_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -19032,7 +19131,7 @@ SWIGINTERN PyObject *_wrap_svn_config_get_server_setting_bool(PyObject *SWIGUNUS
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"OssO:svn_config_get_server_setting_bool",&obj0,&arg3,&arg4,&obj3)) SWIG_fail;
   {
-    arg1 = (svn_config_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
+    arg1 = (svn_config_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -19277,7 +19376,7 @@ SWIGINTERN PyObject *_wrap_svn_config_walk_auth_data(PyObject *SWIGUNUSEDPARM(se
   if (!PyArg_ParseTuple(args,(char *)"zO|O:svn_config_walk_auth_data",&arg1,&obj1,&obj2)) SWIG_fail;
   {
     /* FIXME: Handle the NULL case. */
-    arg2 = svn_swig_py_config_auth_walk_func;
+    arg2 = (svn_config_auth_walk_func_t) svn_swig_py_config_auth_walk_func;
     arg3 = obj1;
   }
   if (obj2) {
@@ -19408,7 +19507,7 @@ SWIGINTERN PyObject *_wrap_svn_config_dup(PyObject *SWIGUNUSEDPARM(self), PyObje
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_config_dup",&obj0,&obj1)) SWIG_fail;
   {
-    arg2 = (svn_config_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
+    arg2 = (svn_config_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -19424,7 +19523,7 @@ SWIGINTERN PyObject *_wrap_svn_config_dup(PyObject *SWIGUNUSEDPARM(self), PyObje
   {
     svn_swig_py_release_py_lock();
     
-    result = (svn_error_t *)svn_config_dup(arg1,arg2,arg3);
+    result = (svn_error_t *)svn_config_dup(arg1,(struct svn_config_t const *)arg2,arg3);
     
     svn_swig_py_acquire_py_lock();
     
@@ -19441,7 +19540,7 @@ SWIGINTERN PyObject *_wrap_svn_config_dup(PyObject *SWIGUNUSEDPARM(self), PyObje
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_config_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_config_t,
         _global_py_pool, args))
     
     ;
@@ -19477,7 +19576,7 @@ SWIGINTERN PyObject *_wrap_svn_config_copy_config(PyObject *SWIGUNUSEDPARM(self)
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_config_copy_config",&obj0,&obj1)) SWIG_fail;
   {
-    arg2 = (apr_hash_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_apr_hash_t, svn_argnum_obj0);
+    arg2 = (apr_hash_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_hash_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -19549,7 +19648,7 @@ SWIGINTERN PyObject *_wrap_svn_config_invoke_section_enumerator(PyObject *SWIGUN
   if (!PyArg_ParseTuple(args,(char *)"OsO:svn_config_invoke_section_enumerator",&obj0,&arg2,&obj2)) SWIG_fail;
   {
     svn_config_section_enumerator_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_q_const__char_p_void__int, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_q_const__char_p_void__int, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -19598,7 +19697,7 @@ SWIGINTERN PyObject *_wrap_svn_config_invoke_section_enumerator2(PyObject *SWIGU
   if (!PyArg_ParseTuple(args,(char *)"OsO|O:svn_config_invoke_section_enumerator2",&obj0,&arg2,&obj2,&obj3)) SWIG_fail;
   {
     svn_config_section_enumerator2_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_q_const__char_p_void_p_apr_pool_t__int, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_q_const__char_p_void_p_apr_pool_t__int, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -19654,7 +19753,7 @@ SWIGINTERN PyObject *_wrap_svn_config_invoke_enumerator(PyObject *SWIGUNUSEDPARM
   if (!PyArg_ParseTuple(args,(char *)"OssO:svn_config_invoke_enumerator",&obj0,&arg2,&arg3,&obj3)) SWIG_fail;
   {
     svn_config_enumerator_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_q_const__char_p_q_const__char_p_void__int, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_q_const__char_p_q_const__char_p_void__int, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -19704,7 +19803,7 @@ SWIGINTERN PyObject *_wrap_svn_config_invoke_enumerator2(PyObject *SWIGUNUSEDPAR
   if (!PyArg_ParseTuple(args,(char *)"OssO|O:svn_config_invoke_enumerator2",&obj0,&arg2,&arg3,&obj3,&obj4)) SWIG_fail;
   {
     svn_config_enumerator2_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_q_const__char_p_q_const__char_p_void_p_apr_pool_t__int, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_q_const__char_p_q_const__char_p_void_p_apr_pool_t__int, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -19774,7 +19873,7 @@ SWIGINTERN PyObject *_wrap_svn_config_invoke_auth_walk_func(PyObject *SWIGUNUSED
   if (!PyArg_ParseTuple(args,(char *)"OOssO|O:svn_config_invoke_auth_walk_func",&obj0,&obj1,&arg4,&arg5,&obj4,&obj5)) SWIG_fail;
   {
     svn_config_auth_walk_func_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_svn_boolean_t_p_void_p_q_const__char_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_svn_boolean_t_p_void_p_q_const__char_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -22117,6 +22216,57 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_relpath_prefix(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  char *arg1 = (char *) 0 ;
+  int arg2 ;
+  apr_pool_t *arg3 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  char *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg3 = _global_pool;
+  if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_relpath_prefix",&arg1,&obj1,&obj2)) SWIG_fail;
+  {
+    arg2 = (int)SWIG_As_long (obj1);
+    if (SWIG_arg_fail(svn_argnum_obj1)) {
+      SWIG_fail;
+    }
+  }
+  if (obj2) {
+    /* Verify that the user supplied a valid pool */
+    if (obj2 != Py_None && obj2 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj2);
+      SWIG_arg_fail(svn_argnum_obj2);
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (char *)svn_relpath_prefix((char const *)arg1,arg2,arg3);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  resultobj = SWIG_FromCharPtr((const char *)result);
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_svn_uri_split(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   char **arg1 = (char **) 0 ;
@@ -23177,12 +23327,26 @@ SWIGINTERN PyObject *_wrap_svn_mergeinfo_diff2(PyObject *SWIGUNUSEDPARM(self), P
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"OOO|OO:svn_mergeinfo_diff2",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
+    if (_global_pool == NULL)
+    {
+      if (svn_swig_py_get_parent_pool(args, SWIGTYPE_p_apr_pool_t,
+          &_global_py_pool, &_global_pool))
+      SWIG_fail;
+    }
+    
     arg3 = svn_swig_py_mergeinfo_from_dict(obj0, _global_pool);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
+    if (_global_pool == NULL)
+    {
+      if (svn_swig_py_get_parent_pool(args, SWIGTYPE_p_apr_pool_t,
+          &_global_py_pool, &_global_pool))
+      SWIG_fail;
+    }
+    
     arg4 = svn_swig_py_mergeinfo_from_dict(obj1, _global_pool);
     if (PyErr_Occurred()) {
       SWIG_fail;
@@ -23295,12 +23459,26 @@ SWIGINTERN PyObject *_wrap_svn_mergeinfo_diff(PyObject *SWIGUNUSEDPARM(self), Py
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_mergeinfo_diff",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
+    if (_global_pool == NULL)
+    {
+      if (svn_swig_py_get_parent_pool(args, SWIGTYPE_p_apr_pool_t,
+          &_global_py_pool, &_global_pool))
+      SWIG_fail;
+    }
+    
     arg3 = svn_swig_py_mergeinfo_from_dict(obj0, _global_pool);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
+    if (_global_pool == NULL)
+    {
+      if (svn_swig_py_get_parent_pool(args, SWIGTYPE_p_apr_pool_t,
+          &_global_py_pool, &_global_pool))
+      SWIG_fail;
+    }
+    
     arg4 = svn_swig_py_mergeinfo_from_dict(obj1, _global_pool);
     if (PyErr_Occurred()) {
       SWIG_fail;
@@ -23397,12 +23575,26 @@ SWIGINTERN PyObject *_wrap_svn_mergeinfo_merge2(PyObject *SWIGUNUSEDPARM(self),
   arg4 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OO|OO:svn_mergeinfo_merge2",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
+    if (_global_pool == NULL)
+    {
+      if (svn_swig_py_get_parent_pool(args, SWIGTYPE_p_apr_pool_t,
+          &_global_py_pool, &_global_pool))
+      SWIG_fail;
+    }
+    
     arg1 = svn_swig_py_mergeinfo_from_dict(obj0, _global_pool);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
+    if (_global_pool == NULL)
+    {
+      if (svn_swig_py_get_parent_pool(args, SWIGTYPE_p_apr_pool_t,
+          &_global_py_pool, &_global_pool))
+      SWIG_fail;
+    }
+    
     arg2 = svn_swig_py_mergeinfo_from_dict(obj1, _global_pool);
     if (PyErr_Occurred()) {
       SWIG_fail;
@@ -23485,13 +23677,13 @@ SWIGINTERN PyObject *_wrap_svn_mergeinfo_catalog_merge(PyObject *SWIGUNUSEDPARM(
   arg4 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OO|OO:svn_mergeinfo_catalog_merge",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
-    arg1 = (svn_mergeinfo_catalog_t)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_apr_hash_t, svn_argnum_obj0);
+    arg1 = (svn_mergeinfo_catalog_t)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_hash_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_mergeinfo_catalog_t)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_apr_hash_t, svn_argnum_obj1);
+    arg2 = (svn_mergeinfo_catalog_t)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_apr_hash_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -23570,12 +23762,26 @@ SWIGINTERN PyObject *_wrap_svn_mergeinfo_remove(PyObject *SWIGUNUSEDPARM(self),
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_mergeinfo_remove",&obj0,&obj1,&obj2)) SWIG_fail;
   {
+    if (_global_pool == NULL)
+    {
+      if (svn_swig_py_get_parent_pool(args, SWIGTYPE_p_apr_pool_t,
+          &_global_py_pool, &_global_pool))
+      SWIG_fail;
+    }
+    
     arg2 = svn_swig_py_mergeinfo_from_dict(obj0, _global_pool);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
+    if (_global_pool == NULL)
+    {
+      if (svn_swig_py_get_parent_pool(args, SWIGTYPE_p_apr_pool_t,
+          &_global_py_pool, &_global_pool))
+      SWIG_fail;
+    }
+    
     arg3 = svn_swig_py_mergeinfo_from_dict(obj1, _global_pool);
     if (PyErr_Occurred()) {
       SWIG_fail;
@@ -23660,12 +23866,26 @@ SWIGINTERN PyObject *_wrap_svn_mergeinfo_remove2(PyObject *SWIGUNUSEDPARM(self),
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OOO|OO:svn_mergeinfo_remove2",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
+    if (_global_pool == NULL)
+    {
+      if (svn_swig_py_get_parent_pool(args, SWIGTYPE_p_apr_pool_t,
+          &_global_py_pool, &_global_pool))
+      SWIG_fail;
+    }
+    
     arg2 = svn_swig_py_mergeinfo_from_dict(obj0, _global_pool);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
+    if (_global_pool == NULL)
+    {
+      if (svn_swig_py_get_parent_pool(args, SWIGTYPE_p_apr_pool_t,
+          &_global_py_pool, &_global_pool))
+      SWIG_fail;
+    }
+    
     arg3 = svn_swig_py_mergeinfo_from_dict(obj1, _global_pool);
     if (PyErr_Occurred()) {
       SWIG_fail;
@@ -23875,7 +24095,7 @@ SWIGINTERN PyObject *_wrap_svn_rangelist_merge2(PyObject *SWIGUNUSEDPARM(self),
   arg4 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OO|OO:svn_rangelist_merge2",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
-    arg1 = (svn_rangelist_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj0);
+    arg1 = (svn_rangelist_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -24069,13 +24289,13 @@ SWIGINTERN PyObject *_wrap_svn_mergeinfo_intersect2(PyObject *SWIGUNUSEDPARM(sel
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OOO|OO:svn_mergeinfo_intersect2",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
-    arg2 = (svn_mergeinfo_t)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_apr_hash_t, svn_argnum_obj0);
+    arg2 = (svn_mergeinfo_t)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_hash_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_mergeinfo_t)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_apr_hash_t, svn_argnum_obj1);
+    arg3 = (svn_mergeinfo_t)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_apr_hash_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -24171,13 +24391,13 @@ SWIGINTERN PyObject *_wrap_svn_mergeinfo_intersect(PyObject *SWIGUNUSEDPARM(self
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_mergeinfo_intersect",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg2 = (svn_mergeinfo_t)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_apr_hash_t, svn_argnum_obj0);
+    arg2 = (svn_mergeinfo_t)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_hash_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_mergeinfo_t)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_apr_hash_t, svn_argnum_obj1);
+    arg3 = (svn_mergeinfo_t)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_apr_hash_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -24655,6 +24875,13 @@ SWIGINTERN PyObject *_wrap_svn_mergeinfo_inheritable2(PyObject *SWIGUNUSEDPARM(s
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OsOOO|OO:svn_mergeinfo_inheritable2",&obj0,&arg3,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
+    if (_global_pool == NULL)
+    {
+      if (svn_swig_py_get_parent_pool(args, SWIGTYPE_p_apr_pool_t,
+          &_global_py_pool, &_global_pool))
+      SWIG_fail;
+    }
+    
     arg2 = svn_swig_py_mergeinfo_from_dict(obj0, _global_pool);
     if (PyErr_Occurred()) {
       SWIG_fail;
@@ -24766,6 +24993,13 @@ SWIGINTERN PyObject *_wrap_svn_mergeinfo_inheritable(PyObject *SWIGUNUSEDPARM(se
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_mergeinfo_inheritable",&obj0,&arg3,&obj2,&obj3,&obj4)) SWIG_fail;
   {
+    if (_global_pool == NULL)
+    {
+      if (svn_swig_py_get_parent_pool(args, SWIGTYPE_p_apr_pool_t,
+          &_global_py_pool, &_global_pool))
+      SWIG_fail;
+    }
+    
     arg2 = svn_swig_py_mergeinfo_from_dict(obj0, _global_pool);
     if (PyErr_Occurred()) {
       SWIG_fail;
@@ -24852,6 +25086,13 @@ SWIGINTERN PyObject *_wrap_svn_mergeinfo_to_string(PyObject *SWIGUNUSEDPARM(self
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_mergeinfo_to_string",&obj0,&obj1)) SWIG_fail;
   {
+    if (_global_pool == NULL)
+    {
+      if (svn_swig_py_get_parent_pool(args, SWIGTYPE_p_apr_pool_t,
+          &_global_py_pool, &_global_pool))
+      SWIG_fail;
+    }
+    
     arg2 = svn_swig_py_mergeinfo_from_dict(obj0, _global_pool);
     if (PyErr_Occurred()) {
       SWIG_fail;
@@ -24925,7 +25166,7 @@ SWIGINTERN PyObject *_wrap_svn_mergeinfo_catalog_dup(PyObject *SWIGUNUSEDPARM(se
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_mergeinfo_catalog_dup",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_mergeinfo_catalog_t)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_apr_hash_t, svn_argnum_obj0);
+    arg1 = (svn_mergeinfo_catalog_t)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_hash_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -24946,7 +25187,7 @@ SWIGINTERN PyObject *_wrap_svn_mergeinfo_catalog_dup(PyObject *SWIGUNUSEDPARM(se
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_apr_hash_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_apr_hash_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -24976,6 +25217,13 @@ SWIGINTERN PyObject *_wrap_svn_mergeinfo_dup(PyObject *SWIGUNUSEDPARM(self), PyO
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_mergeinfo_dup",&obj0,&obj1)) SWIG_fail;
   {
+    if (_global_pool == NULL)
+    {
+      if (svn_swig_py_get_parent_pool(args, SWIGTYPE_p_apr_pool_t,
+          &_global_py_pool, &_global_pool))
+      SWIG_fail;
+    }
+    
     arg1 = svn_swig_py_mergeinfo_from_dict(obj0, _global_pool);
     if (PyErr_Occurred()) {
       SWIG_fail;
@@ -24997,7 +25245,7 @@ SWIGINTERN PyObject *_wrap_svn_mergeinfo_dup(PyObject *SWIGUNUSEDPARM(self), PyO
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_apr_hash_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_apr_hash_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -25052,7 +25300,7 @@ SWIGINTERN PyObject *_wrap_svn_rangelist_dup(PyObject *SWIGUNUSEDPARM(self), PyO
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_apr_array_header_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_apr_array_header_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -25124,7 +25372,7 @@ SWIGINTERN PyObject *_wrap_svn_io_dirent2_t_kind_set(PyObject *SWIGUNUSEDPARM(se
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_io_dirent2_t_kind_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_io_dirent2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_io_dirent2_t, svn_argnum_obj0);
+    arg1 = (struct svn_io_dirent2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_io_dirent2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -25151,7 +25399,7 @@ SWIGINTERN PyObject *_wrap_svn_io_dirent2_t_kind_get(PyObject *SWIGUNUSEDPARM(se
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_io_dirent2_t_kind_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_io_dirent2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_io_dirent2_t, svn_argnum_obj0);
+    arg1 = (struct svn_io_dirent2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_io_dirent2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -25173,7 +25421,7 @@ SWIGINTERN PyObject *_wrap_svn_io_dirent2_t_special_set(PyObject *SWIGUNUSEDPARM
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_io_dirent2_t_special_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_io_dirent2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_io_dirent2_t, svn_argnum_obj0);
+    arg1 = (struct svn_io_dirent2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_io_dirent2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -25200,7 +25448,7 @@ SWIGINTERN PyObject *_wrap_svn_io_dirent2_t_special_get(PyObject *SWIGUNUSEDPARM
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_io_dirent2_t_special_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_io_dirent2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_io_dirent2_t, svn_argnum_obj0);
+    arg1 = (struct svn_io_dirent2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_io_dirent2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -25222,7 +25470,7 @@ SWIGINTERN PyObject *_wrap_svn_io_dirent2_t_filesize_set(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_io_dirent2_t_filesize_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_io_dirent2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_io_dirent2_t, svn_argnum_obj0);
+    arg1 = (struct svn_io_dirent2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_io_dirent2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -25244,7 +25492,7 @@ SWIGINTERN PyObject *_wrap_svn_io_dirent2_t_filesize_get(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_io_dirent2_t_filesize_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_io_dirent2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_io_dirent2_t, svn_argnum_obj0);
+    arg1 = (struct svn_io_dirent2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_io_dirent2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -25266,7 +25514,7 @@ SWIGINTERN PyObject *_wrap_svn_io_dirent2_t_mtime_set(PyObject *SWIGUNUSEDPARM(s
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_io_dirent2_t_mtime_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_io_dirent2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_io_dirent2_t, svn_argnum_obj0);
+    arg1 = (struct svn_io_dirent2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_io_dirent2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -25288,7 +25536,7 @@ SWIGINTERN PyObject *_wrap_svn_io_dirent2_t_mtime_get(PyObject *SWIGUNUSEDPARM(s
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_io_dirent2_t_mtime_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_io_dirent2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_io_dirent2_t, svn_argnum_obj0);
+    arg1 = (struct svn_io_dirent2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_io_dirent2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -25314,7 +25562,7 @@ SWIGINTERN PyObject *_wrap_new_svn_io_dirent2_t(PyObject *SWIGUNUSEDPARM(self),
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_io_dirent2_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_io_dirent2_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -25329,7 +25577,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_io_dirent2_t(PyObject *SWIGUNUSEDPARM(self
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_io_dirent2_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_io_dirent2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_io_dirent2_t, svn_argnum_obj0);
+    arg1 = (struct svn_io_dirent2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_io_dirent2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -25385,7 +25633,7 @@ SWIGINTERN PyObject *_wrap_svn_io_dirent2_create(PyObject *SWIGUNUSEDPARM(self),
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_io_dirent2_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_io_dirent2_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -25415,7 +25663,7 @@ SWIGINTERN PyObject *_wrap_svn_io_dirent2_dup(PyObject *SWIGUNUSEDPARM(self), Py
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_io_dirent2_dup",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_io_dirent2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_io_dirent2_t, svn_argnum_obj0);
+    arg1 = (svn_io_dirent2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_io_dirent2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -25436,7 +25684,7 @@ SWIGINTERN PyObject *_wrap_svn_io_dirent2_dup(PyObject *SWIGUNUSEDPARM(self), Py
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_io_dirent2_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_io_dirent2_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -25459,7 +25707,7 @@ SWIGINTERN PyObject *_wrap_svn_io_dirent_t_kind_set(PyObject *SWIGUNUSEDPARM(sel
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_io_dirent_t_kind_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_io_dirent_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_io_dirent_t, svn_argnum_obj0);
+    arg1 = (struct svn_io_dirent_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_io_dirent_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -25486,7 +25734,7 @@ SWIGINTERN PyObject *_wrap_svn_io_dirent_t_kind_get(PyObject *SWIGUNUSEDPARM(sel
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_io_dirent_t_kind_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_io_dirent_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_io_dirent_t, svn_argnum_obj0);
+    arg1 = (struct svn_io_dirent_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_io_dirent_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -25508,7 +25756,7 @@ SWIGINTERN PyObject *_wrap_svn_io_dirent_t_special_set(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_io_dirent_t_special_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_io_dirent_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_io_dirent_t, svn_argnum_obj0);
+    arg1 = (struct svn_io_dirent_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_io_dirent_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -25535,7 +25783,7 @@ SWIGINTERN PyObject *_wrap_svn_io_dirent_t_special_get(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_io_dirent_t_special_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_io_dirent_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_io_dirent_t, svn_argnum_obj0);
+    arg1 = (struct svn_io_dirent_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_io_dirent_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -25561,7 +25809,7 @@ SWIGINTERN PyObject *_wrap_new_svn_io_dirent_t(PyObject *SWIGUNUSEDPARM(self), P
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_io_dirent_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_io_dirent_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -25576,7 +25824,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_io_dirent_t(PyObject *SWIGUNUSEDPARM(self)
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_io_dirent_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_io_dirent_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_io_dirent_t, svn_argnum_obj0);
+    arg1 = (struct svn_io_dirent_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_io_dirent_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -25675,7 +25923,7 @@ SWIGINTERN PyObject *_wrap_svn_io_open_uniquely_named(PyObject *SWIGUNUSEDPARM(s
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_apr_file_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_apr_file_t,
         _global_py_pool, args))
     
     ;
@@ -25781,7 +26029,7 @@ SWIGINTERN PyObject *_wrap_svn_io_open_unique_file3(PyObject *SWIGUNUSEDPARM(sel
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_apr_file_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_apr_file_t,
         _global_py_pool, args))
     
     ;
@@ -25874,7 +26122,7 @@ SWIGINTERN PyObject *_wrap_svn_io_open_unique_file2(PyObject *SWIGUNUSEDPARM(sel
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_apr_file_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_apr_file_t,
         _global_py_pool, args))
     
     ;
@@ -25961,7 +26209,7 @@ SWIGINTERN PyObject *_wrap_svn_io_open_unique_file(PyObject *SWIGUNUSEDPARM(self
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_apr_file_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_apr_file_t,
         _global_py_pool, args))
     
     ;
@@ -26453,6 +26701,128 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_io_file_create_bytes(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  char *arg1 = (char *) 0 ;
+  void *arg2 = (void *) 0 ;
+  apr_size_t arg3 ;
+  apr_pool_t *arg4 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg4 = _global_pool;
+  if (!PyArg_ParseTuple(args,(char *)"sOO|O:svn_io_file_create_bytes",&arg1,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    arg2 = (void *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_void, svn_argnum_obj1);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg3 = (apr_size_t)SWIG_As_unsigned_SS_long (obj2);
+    if (SWIG_arg_fail(svn_argnum_obj2)) {
+      SWIG_fail;
+    }
+  }
+  if (obj3) {
+    /* Verify that the user supplied a valid pool */
+    if (obj3 != Py_None && obj3 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj3);
+      SWIG_arg_fail(svn_argnum_obj3);
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_io_file_create_bytes((char const *)arg1,(void const *)arg2,arg3,arg4);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_svn_io_file_create_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  char *arg1 = (char *) 0 ;
+  apr_pool_t *arg2 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  PyObject * obj1 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg2 = _global_pool;
+  if (!PyArg_ParseTuple(args,(char *)"s|O:svn_io_file_create_empty",&arg1,&obj1)) SWIG_fail;
+  if (obj1) {
+    /* Verify that the user supplied a valid pool */
+    if (obj1 != Py_None && obj1 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj1);
+      SWIG_arg_fail(svn_argnum_obj1);
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_io_file_create_empty((char const *)arg1,arg2);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_svn_io_lock_open_file(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   apr_file_t *arg1 = (apr_file_t *) 0 ;
@@ -26585,6 +26955,53 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_stream_set_read2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  svn_stream_t *arg1 = (svn_stream_t *) 0 ;
+  svn_read_fn_t arg2 = (svn_read_fn_t) 0 ;
+  svn_read_fn_t arg3 = (svn_read_fn_t) 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:svn_stream_set_read2",&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg1 = (svn_stream_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    svn_read_fn_t * tmp =
+    svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_p_f_p_void_p_char_p_apr_size_t__p_svn_error_t, svn_argnum_obj1);
+    if (tmp == NULL || PyErr_Occurred()) {
+      SWIG_fail;
+    }
+    arg2 = *tmp;
+  }
+  {
+    svn_read_fn_t * tmp =
+    svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_p_f_p_void_p_char_p_apr_size_t__p_svn_error_t, svn_argnum_obj2);
+    if (tmp == NULL || PyErr_Occurred()) {
+      SWIG_fail;
+    }
+    arg3 = *tmp;
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    svn_stream_set_read2(arg1,arg2,arg3);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_svn_stream_set_skip(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   svn_stream_t *arg1 = (svn_stream_t *) 0 ;
@@ -26594,14 +27011,14 @@ SWIGINTERN PyObject *_wrap_svn_stream_set_skip(PyObject *SWIGUNUSEDPARM(self), P
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_stream_set_skip",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_stream_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
+    arg1 = (svn_stream_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
     svn_stream_skip_fn_t * tmp =
-    svn_swig_MustGetPtr(obj1, SWIGTYPE_p_p_f_p_void_apr_size_t__p_svn_error_t, svn_argnum_obj1);
+    svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_p_f_p_void_apr_size_t__p_svn_error_t, svn_argnum_obj1);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -26631,14 +27048,14 @@ SWIGINTERN PyObject *_wrap_svn_stream_set_mark(PyObject *SWIGUNUSEDPARM(self), P
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_stream_set_mark",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_stream_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
+    arg1 = (svn_stream_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
     svn_stream_mark_fn_t * tmp =
-    svn_swig_MustGetPtr(obj1, SWIGTYPE_p_p_f_p_void_p_p_svn_stream_mark_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj1);
+    svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_p_f_p_void_p_p_svn_stream_mark_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj1);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -26668,14 +27085,14 @@ SWIGINTERN PyObject *_wrap_svn_stream_set_seek(PyObject *SWIGUNUSEDPARM(self), P
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_stream_set_seek",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_stream_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
+    arg1 = (svn_stream_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
     svn_stream_seek_fn_t * tmp =
-    svn_swig_MustGetPtr(obj1, SWIGTYPE_p_p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t, svn_argnum_obj1);
+    svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t, svn_argnum_obj1);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -26696,6 +27113,43 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_stream_set_data_available(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  svn_stream_t *arg1 = (svn_stream_t *) 0 ;
+  svn_stream_data_available_fn_t arg2 = (svn_stream_data_available_fn_t) 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:svn_stream_set_data_available",&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = (svn_stream_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    svn_stream_data_available_fn_t * tmp =
+    svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_p_f_p_void_p_svn_boolean_t__p_svn_error_t, svn_argnum_obj1);
+    if (tmp == NULL || PyErr_Occurred()) {
+      SWIG_fail;
+    }
+    arg2 = *tmp;
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    svn_stream_set_data_available(arg1,arg2);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_svn_stream_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   apr_pool_t *arg1 = (apr_pool_t *) 0 ;
@@ -26725,7 +27179,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_empty(PyObject *SWIGUNUSEDPARM(self), PyOb
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_stream_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_stream_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -26755,7 +27209,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_disown(PyObject *SWIGUNUSEDPARM(self), PyO
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_stream_disown",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_stream_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
+    arg1 = (svn_stream_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -26776,7 +27230,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_disown(PyObject *SWIGUNUSEDPARM(self), PyO
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_stream_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_stream_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -26849,7 +27303,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_open_readonly(PyObject *SWIGUNUSEDPARM(sel
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_stream_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_stream_t,
         _global_py_pool, args))
     
     ;
@@ -26931,7 +27385,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_open_writable(PyObject *SWIGUNUSEDPARM(sel
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_stream_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_stream_t,
         _global_py_pool, args))
     
     ;
@@ -27024,7 +27478,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_open_unique(PyObject *SWIGUNUSEDPARM(self)
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_stream_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_stream_t,
         _global_py_pool, args))
     
     ;
@@ -27103,7 +27557,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_from_aprfile2(PyObject *SWIGUNUSEDPARM(sel
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_stream_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_stream_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -27152,7 +27606,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_from_aprfile(PyObject *SWIGUNUSEDPARM(self
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_stream_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_stream_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -27210,7 +27664,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_for_stdin(PyObject *SWIGUNUSEDPARM(self),
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_stream_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_stream_t,
         _global_py_pool, args))
     
     ;
@@ -27271,7 +27725,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_for_stderr(PyObject *SWIGUNUSEDPARM(self),
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_stream_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_stream_t,
         _global_py_pool, args))
     
     ;
@@ -27332,7 +27786,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_for_stdout(PyObject *SWIGUNUSEDPARM(self),
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_stream_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_stream_t,
         _global_py_pool, args))
     
     ;
@@ -27349,6 +27803,90 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_stringbuf_from_stream(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  svn_stringbuf_t **arg1 = (svn_stringbuf_t **) 0 ;
+  svn_stream_t *arg2 = (svn_stream_t *) 0 ;
+  apr_size_t arg3 ;
+  apr_pool_t *arg4 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  svn_stringbuf_t *temp1 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg4 = _global_pool;
+  arg1 = &temp1;
+  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_stringbuf_from_stream",&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg2 = (svn_stream_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg3 = (apr_size_t)SWIG_As_unsigned_SS_long (obj1);
+    if (SWIG_arg_fail(svn_argnum_obj1)) {
+      SWIG_fail;
+    }
+  }
+  if (obj2) {
+    /* Verify that the user supplied a valid pool */
+    if (obj2 != Py_None && obj2 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj2);
+      SWIG_arg_fail(svn_argnum_obj2);
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_stringbuf_from_stream(arg1,arg2,arg3,arg4);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  {
+    PyObject *s;
+    if (*arg1 == NULL) {
+      Py_INCREF(Py_None);
+      s = Py_None;
+    }
+    else {
+      s = PyString_FromStringAndSize((*arg1)->data, (*arg1)->len);
+      if (s == NULL)
+      SWIG_fail;
+    }
+    resultobj = SWIG_Python_AppendOutput(resultobj, s);
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_svn_stream_from_stringbuf(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   svn_stringbuf_t *arg1 = (svn_stringbuf_t *) 0 ;
@@ -27390,7 +27928,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_from_stringbuf(PyObject *SWIGUNUSEDPARM(se
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_stream_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_stream_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -27449,7 +27987,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_from_string(PyObject *SWIGUNUSEDPARM(self)
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_stream_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_stream_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -27492,7 +28030,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_buffered(PyObject *SWIGUNUSEDPARM(self), P
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_stream_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_stream_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -27522,7 +28060,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_compressed(PyObject *SWIGUNUSEDPARM(self),
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_stream_compressed",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_stream_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
+    arg1 = (svn_stream_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27543,7 +28081,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_compressed(PyObject *SWIGUNUSEDPARM(self),
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_stream_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_stream_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -27583,7 +28121,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_checksummed2(PyObject *SWIGUNUSEDPARM(self
   arg3 = &temp3;
   if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_stream_checksummed2",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
-    arg1 = (svn_stream_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
+    arg1 = (svn_stream_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27616,7 +28154,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_checksummed2(PyObject *SWIGUNUSEDPARM(self
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_stream_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_stream_t,
     _global_py_pool, args);
   {
     /* FIXME: Missing argout typemap: svn_stream_checksummed2 arg 2 (svn_checksum_t **) */
@@ -27648,7 +28186,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_svn_stream_read(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_svn_stream_read_full(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   svn_stream_t *arg1 = (svn_stream_t *) 0 ;
   char *arg2 = (char *) 0 ;
@@ -27658,28 +28196,188 @@ SWIGINTERN PyObject *_wrap_svn_stream_read(PyObject *SWIGUNUSEDPARM(self), PyObj
   PyObject * obj1 = 0 ;
   svn_error_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_stream_read",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:svn_stream_read_full",&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = (svn_stream_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    if (PyLong_Check(obj1)) {
+      temp2 = PyLong_AsUnsignedLong(obj1);
+    }
+    else if (PyInt_Check(obj1)) {
+      /* wish there was a PyInt_AsUnsignedLong but there isn't
+                 the mask version doesn't do bounds checking for us.
+                 I can't see a good way to do the bounds checking ourselves
+                 so just stick our head in the sand.  With Python3 this
+                 problem goes away because PyInt is gone anyway. */
+      temp2 = PyInt_AsUnsignedLongMask(obj1);
+    }
+    else {
+      PyErr_SetString(PyExc_TypeError,
+        "expecting an integer for the buffer size");
+      SWIG_fail;
+    }
+    arg2 = malloc(temp2);
+    arg3 = (apr_size_t *)&temp2;
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_stream_read_full(arg1,arg2,arg3);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  {
+    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromStringAndSize(arg2, *arg3));
+    free(arg2);
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_svn_stream_supports_partial_read(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  svn_stream_t *arg1 = (svn_stream_t *) 0 ;
+  PyObject * obj0 = 0 ;
+  svn_boolean_t result;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:svn_stream_supports_partial_read",&obj0)) SWIG_fail;
+  {
+    arg1 = (svn_stream_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_boolean_t)svn_stream_supports_partial_read(arg1);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  resultobj = SWIG_From_long((long)(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_svn_stream_read2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  svn_stream_t *arg1 = (svn_stream_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  apr_size_t *arg3 = (apr_size_t *) 0 ;
+  apr_size_t temp2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:svn_stream_read2",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_stream_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
+    arg1 = (svn_stream_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
     if (PyLong_Check(obj1)) {
-      temp2 = PyLong_AsLong(obj1);
+      temp2 = PyLong_AsUnsignedLong(obj1);
     }
     else if (PyInt_Check(obj1)) {
-      temp2 = PyInt_AsLong(obj1);
+      /* wish there was a PyInt_AsUnsignedLong but there isn't
+                 the mask version doesn't do bounds checking for us.
+                 I can't see a good way to do the bounds checking ourselves
+                 so just stick our head in the sand.  With Python3 this
+                 problem goes away because PyInt is gone anyway. */
+      temp2 = PyInt_AsUnsignedLongMask(obj1);
     }
     else {
       PyErr_SetString(PyExc_TypeError,
         "expecting an integer for the buffer size");
       SWIG_fail;
     }
-    if (temp2 < 0) {
-      PyErr_SetString(PyExc_ValueError,
-        "buffer size must be a positive integer");
+    arg2 = malloc(temp2);
+    arg3 = (apr_size_t *)&temp2;
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_stream_read2(arg1,arg2,arg3);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  {
+    resultobj = SWIG_Python_AppendOutput(resultobj, PyString_FromStringAndSize(arg2, *arg3));
+    free(arg2);
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_svn_stream_read(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  svn_stream_t *arg1 = (svn_stream_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  apr_size_t *arg3 = (apr_size_t *) 0 ;
+  apr_size_t temp2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:svn_stream_read",&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = (svn_stream_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    if (PyLong_Check(obj1)) {
+      temp2 = PyLong_AsUnsignedLong(obj1);
+    }
+    else if (PyInt_Check(obj1)) {
+      /* wish there was a PyInt_AsUnsignedLong but there isn't
+                 the mask version doesn't do bounds checking for us.
+                 I can't see a good way to do the bounds checking ourselves
+                 so just stick our head in the sand.  With Python3 this
+                 problem goes away because PyInt is gone anyway. */
+      temp2 = PyInt_AsUnsignedLongMask(obj1);
+    }
+    else {
+      PyErr_SetString(PyExc_TypeError,
+        "expecting an integer for the buffer size");
       SWIG_fail;
     }
     arg2 = malloc(temp2);
@@ -27724,7 +28422,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_skip(PyObject *SWIGUNUSEDPARM(self), PyObj
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_stream_skip",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_stream_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
+    arg1 = (svn_stream_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27772,7 +28470,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_write(PyObject *SWIGUNUSEDPARM(self), PyOb
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_stream_write",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_stream_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
+    arg1 = (svn_stream_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27823,7 +28521,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_close(PyObject *SWIGUNUSEDPARM(self), PyOb
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_stream_close",&obj0)) SWIG_fail;
   {
-    arg1 = (svn_stream_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
+    arg1 = (svn_stream_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27861,7 +28559,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_reset(PyObject *SWIGUNUSEDPARM(self), PyOb
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_stream_reset",&obj0)) SWIG_fail;
   {
-    arg1 = (svn_stream_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
+    arg1 = (svn_stream_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27899,7 +28597,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_supports_mark(PyObject *SWIGUNUSEDPARM(sel
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_stream_supports_mark",&obj0)) SWIG_fail;
   {
-    arg1 = (svn_stream_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
+    arg1 = (svn_stream_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27938,7 +28636,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_mark(PyObject *SWIGUNUSEDPARM(self), PyObj
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_stream_mark",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_stream_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
+    arg1 = (svn_stream_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -28001,13 +28699,13 @@ SWIGINTERN PyObject *_wrap_svn_stream_seek(PyObject *SWIGUNUSEDPARM(self), PyObj
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_stream_seek",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_stream_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
+    arg1 = (svn_stream_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_stream_mark_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_stream_mark_t, svn_argnum_obj1);
+    arg2 = (svn_stream_mark_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_stream_mark_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -28037,6 +28735,54 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_stream_data_available(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  svn_stream_t *arg1 = (svn_stream_t *) 0 ;
+  svn_boolean_t *arg2 = (svn_boolean_t *) 0 ;
+  svn_boolean_t temp2 ;
+  int res2 = SWIG_TMPOBJ ;
+  PyObject * obj0 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  arg2 = &temp2;
+  if (!PyArg_ParseTuple(args,(char *)"O:svn_stream_data_available",&obj0)) SWIG_fail;
+  {
+    arg1 = (svn_stream_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_stream_data_available(arg1,arg2);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  if (SWIG_IsTmpObj(res2)) {
+    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_From_int((*arg2)));
+  } else {
+    int new_flags = SWIG_IsNewObj(res2) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
+    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, new_flags));
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_svn_stream_tee(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   svn_stream_t *arg1 = (svn_stream_t *) 0 ;
@@ -28055,13 +28801,13 @@ SWIGINTERN PyObject *_wrap_svn_stream_tee(PyObject *SWIGUNUSEDPARM(self), PyObje
   arg3 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_stream_tee",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_stream_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
+    arg1 = (svn_stream_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_stream_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_stream_t, svn_argnum_obj1);
+    arg2 = (svn_stream_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_stream_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -28082,7 +28828,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_tee(PyObject *SWIGUNUSEDPARM(self), PyObje
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_stream_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_stream_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -28105,7 +28851,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_puts(PyObject *SWIGUNUSEDPARM(self), PyObj
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_stream_puts",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (svn_stream_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
+    arg1 = (svn_stream_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -28159,7 +28905,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_readline(PyObject *SWIGUNUSEDPARM(self), P
   arg4 = &temp4;
   if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_stream_readline",&obj0,&arg3,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_stream_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
+    arg1 = (svn_stream_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -28243,20 +28989,20 @@ SWIGINTERN PyObject *_wrap_svn_stream_copy3(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg5 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_stream_copy3",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
-    arg1 = (svn_stream_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
+    arg1 = (svn_stream_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_stream_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_stream_t, svn_argnum_obj1);
+    arg2 = (svn_stream_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_stream_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = svn_swig_py_cancel_func;
-    arg4 = obj2; /* our function is the baton. */
+    arg3 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg4 = obj2;
   }
   if (obj3) {
     /* Verify that the user supplied a valid pool */
@@ -28318,20 +29064,20 @@ SWIGINTERN PyObject *_wrap_svn_stream_copy2(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg5 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_stream_copy2",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
-    arg1 = (svn_stream_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
+    arg1 = (svn_stream_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_stream_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_stream_t, svn_argnum_obj1);
+    arg2 = (svn_stream_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_stream_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = svn_swig_py_cancel_func;
-    arg4 = obj2; /* our function is the baton. */
+    arg3 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg4 = obj2;
   }
   if (obj3) {
     /* Verify that the user supplied a valid pool */
@@ -28390,13 +29136,13 @@ SWIGINTERN PyObject *_wrap_svn_stream_copy(PyObject *SWIGUNUSEDPARM(self), PyObj
   arg3 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_stream_copy",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_stream_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
+    arg1 = (svn_stream_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_stream_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_stream_t, svn_argnum_obj1);
+    arg2 = (svn_stream_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_stream_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -28462,13 +29208,13 @@ SWIGINTERN PyObject *_wrap_svn_stream_contents_same2(PyObject *SWIGUNUSEDPARM(se
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_stream_contents_same2",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg2 = (svn_stream_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
+    arg2 = (svn_stream_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_stream_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_stream_t, svn_argnum_obj1);
+    arg3 = (svn_stream_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_stream_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -28540,13 +29286,13 @@ SWIGINTERN PyObject *_wrap_svn_stream_contents_same(PyObject *SWIGUNUSEDPARM(sel
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_stream_contents_same",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg2 = (svn_stream_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
+    arg2 = (svn_stream_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_stream_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_stream_t, svn_argnum_obj1);
+    arg3 = (svn_stream_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_stream_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -28621,7 +29367,7 @@ SWIGINTERN PyObject *_wrap_svn_string_from_stream(PyObject *SWIGUNUSEDPARM(self)
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"O|OO:svn_string_from_stream",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg2 = (svn_stream_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
+    arg2 = (svn_stream_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_stream_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -28713,7 +29459,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_lazyopen_create(PyObject *SWIGUNUSEDPARM(s
   if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_stream_lazyopen_create",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     svn_stream_lazyopen_func_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_p_svn_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_p_svn_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -28749,7 +29495,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_lazyopen_create(PyObject *SWIGUNUSEDPARM(s
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_stream_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_stream_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -29115,8 +29861,8 @@ SWIGINTERN PyObject *_wrap_svn_io_remove_dir2(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
-    arg3 = svn_swig_py_cancel_func;
-    arg4 = obj2; /* our function is the baton. */
+    arg3 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg4 = obj2;
   }
   if (obj3) {
     /* Verify that the user supplied a valid pool */
@@ -29525,7 +30271,7 @@ SWIGINTERN PyObject *_wrap_svn_io_dir_walk2(PyObject *SWIGUNUSEDPARM(self), PyOb
   }
   {
     svn_io_walk_func_t * tmp =
-    svn_swig_MustGetPtr(obj2, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj2);
+    svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj2);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -29614,19 +30360,19 @@ SWIGINTERN PyObject *_wrap_svn_io_start_cmd3(PyObject *SWIGUNUSEDPARM(self), PyO
   arg13 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OssOOOOOOOOO|O:svn_io_start_cmd3",&obj0,&arg2,&arg3,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12)) SWIG_fail;
   {
-    arg1 = (apr_proc_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_apr_proc_t, svn_argnum_obj0);
+    arg1 = (apr_proc_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_proc_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (char **)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_p_char, svn_argnum_obj3);
+    arg4 = (char **)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_p_char, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg5 = (char **)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_p_char, svn_argnum_obj4);
+    arg5 = (char **)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_p_char, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -29740,13 +30486,13 @@ SWIGINTERN PyObject *_wrap_svn_io_start_cmd2(PyObject *SWIGUNUSEDPARM(self), PyO
   arg12 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OssOOOOOOOO|O:svn_io_start_cmd2",&obj0,&arg2,&arg3,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11)) SWIG_fail;
   {
-    arg1 = (apr_proc_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_apr_proc_t, svn_argnum_obj0);
+    arg1 = (apr_proc_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_proc_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (char **)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_p_char, svn_argnum_obj3);
+    arg4 = (char **)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_p_char, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -29858,7 +30604,7 @@ SWIGINTERN PyObject *_wrap_svn_io_run_diff2(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg8 = &temp8;
   if (!PyArg_ParseTuple(args,(char *)"sOOssssOOs|O:svn_io_run_diff2",&arg1,&obj1,&obj2,&arg4,&arg5,&arg6,&arg7,&obj7,&obj8,&arg11,&obj10)) SWIG_fail;
   {
-    arg2 = (char **)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_p_char, svn_argnum_obj1);
+    arg2 = (char **)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_p_char, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -29956,7 +30702,7 @@ SWIGINTERN PyObject *_wrap_svn_io_run_diff3_3(PyObject *SWIGUNUSEDPARM(self), Py
     if (!arg9) SWIG_fail;
   }
   {
-    arg11 = (apr_array_header_t *)svn_swig_MustGetPtr(obj9, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj9);
+    arg11 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj9, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj9);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -30218,7 +30964,7 @@ SWIGINTERN PyObject *_wrap_svn_io_is_binary_data(PyObject *SWIGUNUSEDPARM(self),
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_io_is_binary_data",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (void *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_void, svn_argnum_obj0);
+    arg1 = (void *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_void, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -30335,7 +31081,7 @@ SWIGINTERN PyObject *_wrap_svn_io_file_read_full2(PyObject *SWIGUNUSEDPARM(self)
     if (!arg1) SWIG_fail;
   }
   {
-    arg2 = (void *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_void, svn_argnum_obj1);
+    arg2 = (void *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_void, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -30397,6 +31143,206 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_io_file_aligned_seek(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  apr_file_t *arg1 = (apr_file_t *) 0 ;
+  apr_off_t arg2 ;
+  apr_off_t *arg3 = (apr_off_t *) 0 ;
+  apr_off_t arg4 ;
+  apr_pool_t *arg5 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg5 = _global_pool;
+  if (!PyArg_ParseTuple(args,(char *)"OOOO|O:svn_io_file_aligned_seek",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_make_file(obj0, _global_pool);
+    if (!arg1) SWIG_fail;
+  }
+  arg2 = (apr_off_t) PyLong_AsLongLong(obj1); 
+  {
+    arg3 = (apr_off_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_apr_off_t, svn_argnum_obj2);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  arg4 = (apr_off_t) PyLong_AsLongLong(obj3); 
+  if (obj4) {
+    /* Verify that the user supplied a valid pool */
+    if (obj4 != Py_None && obj4 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj4);
+      SWIG_arg_fail(svn_argnum_obj4);
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_io_file_aligned_seek(arg1,arg2,arg3,arg4,arg5);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_svn_io_file_flush(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  apr_file_t *arg1 = (apr_file_t *) 0 ;
+  apr_pool_t *arg2 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg2 = _global_pool;
+  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_io_file_flush",&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_make_file(obj0, _global_pool);
+    if (!arg1) SWIG_fail;
+  }
+  if (obj1) {
+    /* Verify that the user supplied a valid pool */
+    if (obj1 != Py_None && obj1 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj1);
+      SWIG_arg_fail(svn_argnum_obj1);
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_io_file_flush(arg1,arg2);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_svn_io_write_atomic(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  char *arg1 = (char *) 0 ;
+  void *arg2 = (void *) 0 ;
+  apr_size_t arg3 ;
+  char *arg4 = (char *) 0 ;
+  apr_pool_t *arg5 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj4 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg5 = _global_pool;
+  if (!PyArg_ParseTuple(args,(char *)"sOOs|O:svn_io_write_atomic",&arg1,&obj1,&obj2,&arg4,&obj4)) SWIG_fail;
+  {
+    arg2 = (void *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_void, svn_argnum_obj1);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg3 = (apr_size_t)SWIG_As_unsigned_SS_long (obj2);
+    if (SWIG_arg_fail(svn_argnum_obj2)) {
+      SWIG_fail;
+    }
+  }
+  if (obj4) {
+    /* Verify that the user supplied a valid pool */
+    if (obj4 != Py_None && obj4 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj4);
+      SWIG_arg_fail(svn_argnum_obj4);
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_io_write_atomic((char const *)arg1,(void const *)arg2,arg3,(char const *)arg4,arg5);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_svn_io_write_unique(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   char **arg1 = (char **) 0 ;
@@ -30421,7 +31367,7 @@ SWIGINTERN PyObject *_wrap_svn_io_write_unique(PyObject *SWIGUNUSEDPARM(self), P
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"sOOO|O:svn_io_write_unique",&arg2,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
-    arg3 = (void *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_void, svn_argnum_obj1);
+    arg3 = (void *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_void, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -30559,7 +31505,7 @@ SWIGINTERN PyObject *_wrap_svn_io_dir_close(PyObject *SWIGUNUSEDPARM(self), PyOb
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_io_dir_close",&obj0)) SWIG_fail;
   {
-    arg1 = (apr_dir_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_apr_dir_t, svn_argnum_obj0);
+    arg1 = (apr_dir_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_dir_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -30820,7 +31766,7 @@ SWIGINTERN PyObject *_wrap_svn_read_invoke_fn(PyObject *SWIGUNUSEDPARM(self), Py
   if (!PyArg_ParseTuple(args,(char *)"OOO:svn_read_invoke_fn",&obj0,&obj1,&obj2)) SWIG_fail;
   {
     svn_read_fn_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void_p_char_p_apr_size_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_char_p_apr_size_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -30836,21 +31782,21 @@ SWIGINTERN PyObject *_wrap_svn_read_invoke_fn(PyObject *SWIGUNUSEDPARM(self), Py
   }
   {
     if (PyLong_Check(obj2)) {
-      temp3 = PyLong_AsLong(obj2);
+      temp3 = PyLong_AsUnsignedLong(obj2);
     }
     else if (PyInt_Check(obj2)) {
-      temp3 = PyInt_AsLong(obj2);
+      /* wish there was a PyInt_AsUnsignedLong but there isn't
+                 the mask version doesn't do bounds checking for us.
+                 I can't see a good way to do the bounds checking ourselves
+                 so just stick our head in the sand.  With Python3 this
+                 problem goes away because PyInt is gone anyway. */
+      temp3 = PyInt_AsUnsignedLongMask(obj2);
     }
     else {
       PyErr_SetString(PyExc_TypeError,
         "expecting an integer for the buffer size");
       SWIG_fail;
     }
-    if (temp3 < 0) {
-      PyErr_SetString(PyExc_ValueError,
-        "buffer size must be a positive integer");
-      SWIG_fail;
-    }
     arg3 = malloc(temp3);
     arg4 = (apr_size_t *)&temp3;
   }
@@ -30896,7 +31842,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_invoke_skip_fn(PyObject *SWIGUNUSEDPARM(se
   if (!PyArg_ParseTuple(args,(char *)"OOO:svn_stream_invoke_skip_fn",&obj0,&obj1,&obj2)) SWIG_fail;
   {
     svn_stream_skip_fn_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void_apr_size_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_apr_size_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -30956,7 +31902,7 @@ SWIGINTERN PyObject *_wrap_svn_write_invoke_fn(PyObject *SWIGUNUSEDPARM(self), P
   if (!PyArg_ParseTuple(args,(char *)"OOO:svn_write_invoke_fn",&obj0,&obj1,&obj2)) SWIG_fail;
   {
     svn_write_fn_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -31019,7 +31965,7 @@ SWIGINTERN PyObject *_wrap_svn_close_invoke_fn(PyObject *SWIGUNUSEDPARM(self), P
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_close_invoke_fn",&obj0,&obj1)) SWIG_fail;
   {
     svn_close_fn_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -31080,7 +32026,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_invoke_mark_fn(PyObject *SWIGUNUSEDPARM(se
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_stream_invoke_mark_fn",&obj0,&obj1,&obj2)) SWIG_fail;
   {
     svn_stream_mark_fn_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void_p_p_svn_stream_mark_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_p_svn_stream_mark_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -31155,7 +32101,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_invoke_seek_fn(PyObject *SWIGUNUSEDPARM(se
   if (!PyArg_ParseTuple(args,(char *)"OOO:svn_stream_invoke_seek_fn",&obj0,&obj1,&obj2)) SWIG_fail;
   {
     svn_stream_seek_fn_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -31170,7 +32116,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_invoke_seek_fn(PyObject *SWIGUNUSEDPARM(se
     }
   }
   {
-    arg3 = (svn_stream_mark_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_stream_mark_t, svn_argnum_obj2);
+    arg3 = (svn_stream_mark_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_stream_mark_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -31200,6 +32146,66 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_stream_invoke_data_available_fn(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  svn_stream_data_available_fn_t arg1 = (svn_stream_data_available_fn_t) 0 ;
+  void *arg2 = (void *) 0 ;
+  svn_boolean_t *arg3 = (svn_boolean_t *) 0 ;
+  svn_boolean_t temp3 ;
+  int res3 = SWIG_TMPOBJ ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  arg3 = &temp3;
+  if (!PyArg_ParseTuple(args,(char *)"OO:svn_stream_invoke_data_available_fn",&obj0,&obj1)) SWIG_fail;
+  {
+    svn_stream_data_available_fn_t * tmp =
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_svn_boolean_t__p_svn_error_t, svn_argnum_obj0);
+    if (tmp == NULL || PyErr_Occurred()) {
+      SWIG_fail;
+    }
+    arg1 = *tmp;
+  }
+  {
+    if (obj1 == Py_None) {
+      arg2 = NULL;
+    } else if (SWIG_ConvertPtr(obj1, (void **) &arg2, 0, 0) == -1) {
+      arg2 = (void *) obj1;
+      PyErr_Clear();
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_stream_invoke_data_available_fn(arg1,arg2,arg3);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  if (SWIG_IsTmpObj(res3)) {
+    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_From_int((*arg3)));
+  } else {
+    int new_flags = SWIG_IsNewObj(res3) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
+    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, new_flags));
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_svn_stream_invoke_lazyopen_func(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   svn_stream_lazyopen_func_t arg1 = (svn_stream_lazyopen_func_t) 0 ;
@@ -31228,7 +32234,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_invoke_lazyopen_func(PyObject *SWIGUNUSEDP
   if (!PyArg_ParseTuple(args,(char *)"OO|OO:svn_stream_invoke_lazyopen_func",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     svn_stream_lazyopen_func_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_p_svn_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_p_svn_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -31278,7 +32284,7 @@ SWIGINTERN PyObject *_wrap_svn_stream_invoke_lazyopen_func(PyObject *SWIGUNUSEDP
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_svn_stream_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_svn_stream_t,
         _global_py_pool, args))
     
     ;
@@ -31323,7 +32329,7 @@ SWIGINTERN PyObject *_wrap_svn_io_invoke_walk_func(PyObject *SWIGUNUSEDPARM(self
   if (!PyArg_ParseTuple(args,(char *)"OOsO|O:svn_io_invoke_walk_func",&obj0,&obj1,&arg3,&obj3,&obj4)) SWIG_fail;
   {
     svn_io_walk_func_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -31338,7 +32344,7 @@ SWIGINTERN PyObject *_wrap_svn_io_invoke_walk_func(PyObject *SWIGUNUSEDPARM(self
     }
   }
   {
-    arg4 = (apr_finfo_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_apr_finfo_t, svn_argnum_obj3);
+    arg4 = (apr_finfo_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_apr_finfo_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -31424,6 +32430,13 @@ SWIGINTERN PyObject *svn_stream_seek_fn_t_swigregister(PyObject *SWIGUNUSEDPARM(
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *svn_stream_data_available_fn_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_void_p_svn_boolean_t__p_svn_error_t, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
 SWIGINTERN PyObject *svn_stream_lazyopen_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
@@ -31447,7 +32460,7 @@ SWIGINTERN PyObject *_wrap_svn_checksum_t_digest_set(PyObject *SWIGUNUSEDPARM(se
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_checksum_t_digest_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_checksum_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_checksum_t, svn_argnum_obj0);
+    arg1 = (struct svn_checksum_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_checksum_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -31477,13 +32490,13 @@ SWIGINTERN PyObject *_wrap_svn_checksum_t_digest_get(PyObject *SWIGUNUSEDPARM(se
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_checksum_t_digest_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_checksum_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_checksum_t, svn_argnum_obj0);
+    arg1 = (struct svn_checksum_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_checksum_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (unsigned char *) ((arg1)->digest);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_unsigned_char,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_unsigned_char,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -31500,7 +32513,7 @@ SWIGINTERN PyObject *_wrap_svn_checksum_t_kind_set(PyObject *SWIGUNUSEDPARM(self
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_checksum_t_kind_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_checksum_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_checksum_t, svn_argnum_obj0);
+    arg1 = (struct svn_checksum_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_checksum_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -31527,7 +32540,7 @@ SWIGINTERN PyObject *_wrap_svn_checksum_t_kind_get(PyObject *SWIGUNUSEDPARM(self
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_checksum_t_kind_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_checksum_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_checksum_t, svn_argnum_obj0);
+    arg1 = (struct svn_checksum_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_checksum_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -31553,7 +32566,7 @@ SWIGINTERN PyObject *_wrap_new_svn_checksum_t(PyObject *SWIGUNUSEDPARM(self), Py
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_checksum_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_checksum_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -31568,7 +32581,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_checksum_t(PyObject *SWIGUNUSEDPARM(self),
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_checksum_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_checksum_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_checksum_t, svn_argnum_obj0);
+    arg1 = (struct svn_checksum_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_checksum_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -31632,7 +32645,7 @@ SWIGINTERN PyObject *_wrap_svn_checksum_create(PyObject *SWIGUNUSEDPARM(self), P
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_checksum_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_checksum_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -31654,7 +32667,7 @@ SWIGINTERN PyObject *_wrap_svn_checksum_clear(PyObject *SWIGUNUSEDPARM(self), Py
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_checksum_clear",&obj0)) SWIG_fail;
   {
-    arg1 = (svn_checksum_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_checksum_t, svn_argnum_obj0);
+    arg1 = (svn_checksum_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_checksum_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -31694,13 +32707,13 @@ SWIGINTERN PyObject *_wrap_svn_checksum_match(PyObject *SWIGUNUSEDPARM(self), Py
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_checksum_match",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_checksum_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_checksum_t, svn_argnum_obj0);
+    arg1 = (svn_checksum_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_checksum_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_checksum_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_checksum_t, svn_argnum_obj1);
+    arg2 = (svn_checksum_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_checksum_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -31736,7 +32749,7 @@ SWIGINTERN PyObject *_wrap_svn_checksum_dup(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_checksum_dup",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_checksum_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_checksum_t, svn_argnum_obj0);
+    arg1 = (svn_checksum_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_checksum_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -31757,7 +32770,7 @@ SWIGINTERN PyObject *_wrap_svn_checksum_dup(PyObject *SWIGUNUSEDPARM(self), PyOb
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_checksum_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_checksum_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -31787,7 +32800,7 @@ SWIGINTERN PyObject *_wrap_svn_checksum_to_cstring_display(PyObject *SWIGUNUSEDP
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_checksum_to_cstring_display",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_checksum_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_checksum_t, svn_argnum_obj0);
+    arg1 = (svn_checksum_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_checksum_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -31837,7 +32850,7 @@ SWIGINTERN PyObject *_wrap_svn_checksum_to_cstring(PyObject *SWIGUNUSEDPARM(self
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_checksum_to_cstring",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_checksum_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_checksum_t, svn_argnum_obj0);
+    arg1 = (svn_checksum_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_checksum_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -31893,7 +32906,7 @@ SWIGINTERN PyObject *_wrap_svn_checksum_serialize(PyObject *SWIGUNUSEDPARM(self)
   arg3 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|OO:svn_checksum_serialize",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_checksum_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_checksum_t, svn_argnum_obj0);
+    arg1 = (svn_checksum_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_checksum_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -32128,7 +33141,7 @@ SWIGINTERN PyObject *_wrap_svn_checksum(PyObject *SWIGUNUSEDPARM(self), PyObject
     }
   }
   {
-    arg3 = (void *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_void, svn_argnum_obj1);
+    arg3 = (void *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_void, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -32224,7 +33237,7 @@ SWIGINTERN PyObject *_wrap_svn_checksum_empty_checksum(PyObject *SWIGUNUSEDPARM(
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_checksum_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_checksum_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -32275,7 +33288,7 @@ SWIGINTERN PyObject *_wrap_svn_checksum_ctx_create(PyObject *SWIGUNUSEDPARM(self
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_checksum_ctx_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_checksum_ctx_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -32301,13 +33314,13 @@ SWIGINTERN PyObject *_wrap_svn_checksum_update(PyObject *SWIGUNUSEDPARM(self), P
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:svn_checksum_update",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_checksum_ctx_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_checksum_ctx_t, svn_argnum_obj0);
+    arg1 = (svn_checksum_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_checksum_ctx_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (void *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_void, svn_argnum_obj1);
+    arg2 = (void *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_void, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -32362,7 +33375,7 @@ SWIGINTERN PyObject *_wrap_svn_checksum_final(PyObject *SWIGUNUSEDPARM(self), Py
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_checksum_final",&obj0,&obj1)) SWIG_fail;
   {
-    arg2 = (svn_checksum_ctx_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_checksum_ctx_t, svn_argnum_obj0);
+    arg2 = (svn_checksum_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_checksum_ctx_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -32423,7 +33436,7 @@ SWIGINTERN PyObject *_wrap_svn_checksum_size(PyObject *SWIGUNUSEDPARM(self), PyO
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_checksum_size",&obj0)) SWIG_fail;
   {
-    arg1 = (svn_checksum_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_checksum_t, svn_argnum_obj0);
+    arg1 = (svn_checksum_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_checksum_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -32451,7 +33464,7 @@ SWIGINTERN PyObject *_wrap_svn_checksum_is_empty_checksum(PyObject *SWIGUNUSEDPA
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_checksum_is_empty_checksum",&obj0)) SWIG_fail;
   {
-    arg1 = (svn_checksum_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_checksum_t, svn_argnum_obj0);
+    arg1 = (svn_checksum_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_checksum_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -32491,13 +33504,13 @@ SWIGINTERN PyObject *_wrap_svn_checksum_mismatch_err__varargs__(PyObject *SWIGUN
   arg3 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OO|Os:svn_checksum_mismatch_err",&obj0,&obj1,&obj2,&arg4)) SWIG_fail;
   {
-    arg1 = (svn_checksum_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_checksum_t, svn_argnum_obj0);
+    arg1 = (svn_checksum_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_checksum_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_checksum_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_checksum_t, svn_argnum_obj1);
+    arg2 = (svn_checksum_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_checksum_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -32547,7 +33560,7 @@ SWIGINTERN PyObject *_wrap_svn_checksum_mismatch_err(PyObject *SWIGUNUSEDPARM(se
   PyObject *newargs;
   
   newargs = PyTuple_GetSlice(args,0,2);
-  varargs = PyTuple_GetSlice(args,2,PyTuple_Size(args)+1);
+  varargs = PyTuple_GetSlice(args,2,PyTuple_Size(args));
   resultobj = _wrap_svn_checksum_mismatch_err__varargs__(NULL,newargs,varargs);
   Py_XDECREF(newargs);
   Py_XDECREF(varargs);
@@ -32572,13 +33585,13 @@ SWIGINTERN PyObject *_wrap_svn_auth_set_gnome_keyring_unlock_prompt_func(PyObjec
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_auth_set_gnome_keyring_unlock_prompt_func",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_auth_baton_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_baton_t, svn_argnum_obj0);
+    arg1 = (svn_auth_baton_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_auth_baton_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = svn_swig_py_auth_gnome_keyring_unlock_prompt_func;
+    arg2 = (svn_auth_gnome_keyring_unlock_prompt_func_t) svn_swig_py_auth_gnome_keyring_unlock_prompt_func;
     arg3 = obj1;
   }
   {
@@ -32713,6 +33726,13 @@ SWIGINTERN PyObject *_wrap_svn_swig_mergeinfo_merge(PyObject *SWIGUNUSEDPARM(sel
     }
   }
   {
+    if (_global_pool == NULL)
+    {
+      if (svn_swig_py_get_parent_pool(args, SWIGTYPE_p_apr_pool_t,
+          &_global_py_pool, &_global_pool))
+      SWIG_fail;
+    }
+    
     arg2 = svn_swig_py_mergeinfo_from_dict(obj1, _global_pool);
     if (PyErr_Occurred()) {
       SWIG_fail;
@@ -33034,9 +34054,6 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"new_svn_error_t", _wrap_new_svn_error_t, METH_VARARGS, (char *)"new_svn_error_t() -> svn_error_t"},
 	 { (char *)"delete_svn_error_t", _wrap_delete_svn_error_t, METH_VARARGS, (char *)"delete_svn_error_t(svn_error_t self)"},
 	 { (char *)"svn_error_t_swigregister", svn_error_t_swigregister, METH_VARARGS, NULL},
-	 { (char *)"svn__apr_hash_index_key", _wrap_svn__apr_hash_index_key, METH_VARARGS, (char *)"svn__apr_hash_index_key(apr_hash_index_t const * hi) -> void const *"},
-	 { (char *)"svn__apr_hash_index_klen", _wrap_svn__apr_hash_index_klen, METH_VARARGS, (char *)"svn__apr_hash_index_klen(apr_hash_index_t const * hi) -> apr_ssize_t"},
-	 { (char *)"svn__apr_hash_index_val", _wrap_svn__apr_hash_index_val, METH_VARARGS, (char *)"svn__apr_hash_index_val(apr_hash_index_t const * hi) -> void *"},
 	 { (char *)"svn_node_kind_to_word", _wrap_svn_node_kind_to_word, METH_VARARGS, (char *)"svn_node_kind_to_word(svn_node_kind_t kind) -> char const *"},
 	 { (char *)"svn_node_kind_from_word", _wrap_svn_node_kind_from_word, METH_VARARGS, (char *)"svn_node_kind_from_word(char const * word) -> svn_node_kind_t"},
 	 { (char *)"svn_tristate__to_word", _wrap_svn_tristate__to_word, METH_VARARGS, (char *)"svn_tristate__to_word(svn_tristate_t tristate) -> char const *"},
@@ -33197,6 +34214,7 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"new_svn_version_checklist_t", _wrap_new_svn_version_checklist_t, METH_VARARGS, (char *)"new_svn_version_checklist_t() -> svn_version_checklist_t"},
 	 { (char *)"delete_svn_version_checklist_t", _wrap_delete_svn_version_checklist_t, METH_VARARGS, (char *)"delete_svn_version_checklist_t(svn_version_checklist_t self)"},
 	 { (char *)"svn_version_checklist_t_swigregister", svn_version_checklist_t_swigregister, METH_VARARGS, NULL},
+	 { (char *)"svn_ver_check_list2", _wrap_svn_ver_check_list2, METH_VARARGS, (char *)"svn_ver_check_list2(svn_version_t const * my_version, svn_version_checklist_t checklist, svn_boolean_t (*)(svn_version_t const *,svn_version_t const *) comparator) -> svn_error_t"},
 	 { (char *)"svn_ver_check_list", _wrap_svn_ver_check_list, METH_VARARGS, (char *)"svn_ver_check_list(svn_version_t const * my_version, svn_version_checklist_t checklist) -> svn_error_t"},
 	 { (char *)"svn_subr_version", _wrap_svn_subr_version, METH_VARARGS, (char *)"svn_subr_version() -> svn_version_t const *"},
 	 { (char *)"svn_version_extended", _wrap_svn_version_extended, METH_VARARGS, (char *)"svn_version_extended(svn_boolean_t verbose, apr_pool_t pool) -> svn_version_extended_t const *"},
@@ -33377,6 +34395,14 @@ static PyMethodDef SwigMethods[] = {
 		"    apr_pool_t pool) -> svn_error_t\n"
 		""},
 	 { (char *)"svn_cmdline_init", _wrap_svn_cmdline_init, METH_VARARGS, (char *)"svn_cmdline_init(char const * progname, FILE * error_stream) -> int"},
+	 { (char *)"svn_cmdline_create_auth_baton2", _wrap_svn_cmdline_create_auth_baton2, METH_VARARGS, (char *)"\n"
+		"svn_cmdline_create_auth_baton2(svn_boolean_t non_interactive, char const * username, char const * password, char const * config_dir, \n"
+		"    svn_boolean_t no_auth_cache, svn_boolean_t trust_server_cert_unknown_ca, \n"
+		"    svn_boolean_t trust_server_cert_cn_mismatch, svn_boolean_t trust_server_cert_expired, \n"
+		"    svn_boolean_t trust_server_cert_not_yet_valid, \n"
+		"    svn_boolean_t trust_server_cert_other_failure, svn_config_t * cfg, svn_cancel_func_t cancel_func, \n"
+		"    apr_pool_t pool) -> svn_error_t\n"
+		""},
 	 { (char *)"svn_cmdline_create_auth_baton", _wrap_svn_cmdline_create_auth_baton, METH_VARARGS, (char *)"\n"
 		"svn_cmdline_create_auth_baton(svn_boolean_t non_interactive, char const * username, char const * password, char const * config_dir, \n"
 		"    svn_boolean_t no_auth_cache, svn_boolean_t trust_server_cert, \n"
@@ -33585,7 +34611,7 @@ static PyMethodDef SwigMethods[] = {
 		""},
 	 { (char *)"svn_config_walk_auth_data", _wrap_svn_config_walk_auth_data, METH_VARARGS, (char *)"svn_config_walk_auth_data(char const * config_dir, svn_config_auth_walk_func_t walk_func, apr_pool_t scratch_pool) -> svn_error_t"},
 	 { (char *)"svn_config_get_user_config_path", _wrap_svn_config_get_user_config_path, METH_VARARGS, (char *)"svn_config_get_user_config_path(char const * config_dir, char const * fname, apr_pool_t pool) -> svn_error_t"},
-	 { (char *)"svn_config_dup", _wrap_svn_config_dup, METH_VARARGS, (char *)"svn_config_dup(svn_config_t * src, apr_pool_t pool) -> svn_error_t"},
+	 { (char *)"svn_config_dup", _wrap_svn_config_dup, METH_VARARGS, (char *)"svn_config_dup(svn_config_t const * src, apr_pool_t pool) -> svn_error_t"},
 	 { (char *)"svn_config_copy_config", _wrap_svn_config_copy_config, METH_VARARGS, (char *)"svn_config_copy_config(apr_hash_t src_hash, apr_pool_t pool) -> svn_error_t"},
 	 { (char *)"svn_config_t_swigregister", svn_config_t_swigregister, METH_VARARGS, NULL},
 	 { (char *)"svn_config_invoke_section_enumerator", _wrap_svn_config_invoke_section_enumerator, METH_VARARGS, (char *)"svn_config_invoke_section_enumerator(svn_config_section_enumerator_t _obj, char const * name, void * baton) -> svn_boolean_t"},
@@ -33596,7 +34622,7 @@ static PyMethodDef SwigMethods[] = {
 		"    apr_pool_t pool) -> svn_boolean_t\n"
 		""},
 	 { (char *)"svn_config_invoke_auth_walk_func", _wrap_svn_config_invoke_auth_walk_func, METH_VARARGS, (char *)"\n"
-		"svn_config_invoke_auth_walk_func(svn_config_auth_walk_func_t _obj, void * cleanup_baton, char const * cred_kind, char const * realmstring, \n"
+		"svn_config_invoke_auth_walk_func(svn_config_auth_walk_func_t _obj, void * walk_baton, char const * cred_kind, char const * realmstring, \n"
 		"    apr_hash_t hash, apr_pool_t scratch_pool) -> svn_error_t\n"
 		""},
 	 { (char *)"svn_config_section_enumerator_t_swigregister", svn_config_section_enumerator_t_swigregister, METH_VARARGS, NULL},
@@ -33648,6 +34674,7 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"svn_relpath_split", _wrap_svn_relpath_split, METH_VARARGS, (char *)"svn_relpath_split(char const * relpath, apr_pool_t result_pool)"},
 	 { (char *)"svn_relpath_basename", _wrap_svn_relpath_basename, METH_VARARGS, (char *)"svn_relpath_basename(char const * relpath, apr_pool_t result_pool) -> char const *"},
 	 { (char *)"svn_relpath_dirname", _wrap_svn_relpath_dirname, METH_VARARGS, (char *)"svn_relpath_dirname(char const * relpath, apr_pool_t result_pool) -> char *"},
+	 { (char *)"svn_relpath_prefix", _wrap_svn_relpath_prefix, METH_VARARGS, (char *)"svn_relpath_prefix(char const * relpath, int max_components, apr_pool_t result_pool) -> char const *"},
 	 { (char *)"svn_uri_split", _wrap_svn_uri_split, METH_VARARGS, (char *)"svn_uri_split(char const * uri, apr_pool_t result_pool)"},
 	 { (char *)"svn_uri_basename", _wrap_svn_uri_basename, METH_VARARGS, (char *)"svn_uri_basename(char const * uri, apr_pool_t result_pool) -> char const *"},
 	 { (char *)"svn_uri_dirname", _wrap_svn_uri_dirname, METH_VARARGS, (char *)"svn_uri_dirname(char const * uri, apr_pool_t result_pool) -> char *"},
@@ -33759,11 +34786,15 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"svn_io_file_checksum", _wrap_svn_io_file_checksum, METH_VARARGS, (char *)"svn_io_file_checksum(char const * file, apr_pool_t pool) -> svn_error_t"},
 	 { (char *)"svn_io_files_contents_same_p", _wrap_svn_io_files_contents_same_p, METH_VARARGS, (char *)"svn_io_files_contents_same_p(char const * file1, char const * file2, apr_pool_t pool) -> svn_error_t"},
 	 { (char *)"svn_io_files_contents_three_same_p", _wrap_svn_io_files_contents_three_same_p, METH_VARARGS, (char *)"svn_io_files_contents_three_same_p(char const * file1, char const * file2, char const * file3, apr_pool_t scratch_pool) -> svn_error_t"},
+	 { (char *)"svn_io_file_create_bytes", _wrap_svn_io_file_create_bytes, METH_VARARGS, (char *)"svn_io_file_create_bytes(char const * file, void const * contents, apr_size_t length, apr_pool_t scratch_pool) -> svn_error_t"},
+	 { (char *)"svn_io_file_create_empty", _wrap_svn_io_file_create_empty, METH_VARARGS, (char *)"svn_io_file_create_empty(char const * file, apr_pool_t scratch_pool) -> svn_error_t"},
 	 { (char *)"svn_io_lock_open_file", _wrap_svn_io_lock_open_file, METH_VARARGS, (char *)"svn_io_lock_open_file(apr_file_t lockfile_handle, svn_boolean_t exclusive, svn_boolean_t nonblocking, apr_pool_t pool) -> svn_error_t"},
 	 { (char *)"svn_io_unlock_open_file", _wrap_svn_io_unlock_open_file, METH_VARARGS, (char *)"svn_io_unlock_open_file(apr_file_t lockfile_handle, apr_pool_t pool) -> svn_error_t"},
+	 { (char *)"svn_stream_set_read2", _wrap_svn_stream_set_read2, METH_VARARGS, (char *)"svn_stream_set_read2(svn_stream_t * stream, svn_read_fn_t read_fn, svn_read_fn_t read_full_fn)"},
 	 { (char *)"svn_stream_set_skip", _wrap_svn_stream_set_skip, METH_VARARGS, (char *)"svn_stream_set_skip(svn_stream_t * stream, svn_stream_skip_fn_t skip_fn)"},
 	 { (char *)"svn_stream_set_mark", _wrap_svn_stream_set_mark, METH_VARARGS, (char *)"svn_stream_set_mark(svn_stream_t * stream, svn_stream_mark_fn_t mark_fn)"},
 	 { (char *)"svn_stream_set_seek", _wrap_svn_stream_set_seek, METH_VARARGS, (char *)"svn_stream_set_seek(svn_stream_t * stream, svn_stream_seek_fn_t seek_fn)"},
+	 { (char *)"svn_stream_set_data_available", _wrap_svn_stream_set_data_available, METH_VARARGS, (char *)"svn_stream_set_data_available(svn_stream_t * stream, svn_stream_data_available_fn_t data_available)"},
 	 { (char *)"svn_stream_empty", _wrap_svn_stream_empty, METH_VARARGS, (char *)"svn_stream_empty(apr_pool_t pool) -> svn_stream_t *"},
 	 { (char *)"svn_stream_disown", _wrap_svn_stream_disown, METH_VARARGS, (char *)"svn_stream_disown(svn_stream_t * stream, apr_pool_t pool) -> svn_stream_t *"},
 	 { (char *)"svn_stream_open_readonly", _wrap_svn_stream_open_readonly, METH_VARARGS, (char *)"svn_stream_open_readonly(char const * path, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"},
@@ -33774,6 +34805,7 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"svn_stream_for_stdin", _wrap_svn_stream_for_stdin, METH_VARARGS, (char *)"svn_stream_for_stdin(apr_pool_t pool) -> svn_error_t"},
 	 { (char *)"svn_stream_for_stderr", _wrap_svn_stream_for_stderr, METH_VARARGS, (char *)"svn_stream_for_stderr(apr_pool_t pool) -> svn_error_t"},
 	 { (char *)"svn_stream_for_stdout", _wrap_svn_stream_for_stdout, METH_VARARGS, (char *)"svn_stream_for_stdout(apr_pool_t pool) -> svn_error_t"},
+	 { (char *)"svn_stringbuf_from_stream", _wrap_svn_stringbuf_from_stream, METH_VARARGS, (char *)"svn_stringbuf_from_stream(svn_stream_t * stream, apr_size_t len_hint, apr_pool_t result_pool) -> svn_error_t"},
 	 { (char *)"svn_stream_from_stringbuf", _wrap_svn_stream_from_stringbuf, METH_VARARGS, (char *)"svn_stream_from_stringbuf(svn_stringbuf_t * str, apr_pool_t pool) -> svn_stream_t *"},
 	 { (char *)"svn_stream_from_string", _wrap_svn_stream_from_string, METH_VARARGS, (char *)"svn_stream_from_string(svn_string_t const * str, apr_pool_t pool) -> svn_stream_t *"},
 	 { (char *)"svn_stream_buffered", _wrap_svn_stream_buffered, METH_VARARGS, (char *)"svn_stream_buffered(apr_pool_t result_pool) -> svn_stream_t *"},
@@ -33782,6 +34814,9 @@ static PyMethodDef SwigMethods[] = {
 		"svn_stream_checksummed2(svn_stream_t * stream, svn_checksum_kind_t checksum_kind, svn_boolean_t read_all, \n"
 		"    apr_pool_t pool) -> svn_stream_t *\n"
 		""},
+	 { (char *)"svn_stream_read_full", _wrap_svn_stream_read_full, METH_VARARGS, (char *)"svn_stream_read_full(svn_stream_t * stream, char * buffer) -> svn_error_t"},
+	 { (char *)"svn_stream_supports_partial_read", _wrap_svn_stream_supports_partial_read, METH_VARARGS, (char *)"svn_stream_supports_partial_read(svn_stream_t * stream) -> svn_boolean_t"},
+	 { (char *)"svn_stream_read2", _wrap_svn_stream_read2, METH_VARARGS, (char *)"svn_stream_read2(svn_stream_t * stream, char * buffer) -> svn_error_t"},
 	 { (char *)"svn_stream_read", _wrap_svn_stream_read, METH_VARARGS, (char *)"svn_stream_read(svn_stream_t * stream, char * buffer) -> svn_error_t"},
 	 { (char *)"svn_stream_skip", _wrap_svn_stream_skip, METH_VARARGS, (char *)"svn_stream_skip(svn_stream_t * stream, apr_size_t len) -> svn_error_t"},
 	 { (char *)"svn_stream_write", _wrap_svn_stream_write, METH_VARARGS, (char *)"svn_stream_write(svn_stream_t * stream, char const * data) -> svn_error_t"},
@@ -33790,6 +34825,7 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"svn_stream_supports_mark", _wrap_svn_stream_supports_mark, METH_VARARGS, (char *)"svn_stream_supports_mark(svn_stream_t * stream) -> svn_boolean_t"},
 	 { (char *)"svn_stream_mark", _wrap_svn_stream_mark, METH_VARARGS, (char *)"svn_stream_mark(svn_stream_t * stream, apr_pool_t pool) -> svn_error_t"},
 	 { (char *)"svn_stream_seek", _wrap_svn_stream_seek, METH_VARARGS, (char *)"svn_stream_seek(svn_stream_t * stream, svn_stream_mark_t const * mark) -> svn_error_t"},
+	 { (char *)"svn_stream_data_available", _wrap_svn_stream_data_available, METH_VARARGS, (char *)"svn_stream_data_available(svn_stream_t * stream) -> svn_error_t"},
 	 { (char *)"svn_stream_tee", _wrap_svn_stream_tee, METH_VARARGS, (char *)"svn_stream_tee(svn_stream_t * out1, svn_stream_t * out2, apr_pool_t pool) -> svn_stream_t *"},
 	 { (char *)"svn_stream_puts", _wrap_svn_stream_puts, METH_VARARGS, (char *)"svn_stream_puts(svn_stream_t * stream, char const * str) -> svn_error_t"},
 	 { (char *)"svn_stream_readline", _wrap_svn_stream_readline, METH_VARARGS, (char *)"svn_stream_readline(svn_stream_t * stream, char const * eol, apr_pool_t pool) -> svn_error_t"},
@@ -33848,6 +34884,15 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"svn_io_is_binary_data", _wrap_svn_io_is_binary_data, METH_VARARGS, (char *)"svn_io_is_binary_data(void const * buf, apr_size_t len) -> svn_boolean_t"},
 	 { (char *)"svn_io_file_putc", _wrap_svn_io_file_putc, METH_VARARGS, (char *)"svn_io_file_putc(char ch, apr_file_t file, apr_pool_t pool) -> svn_error_t"},
 	 { (char *)"svn_io_file_read_full2", _wrap_svn_io_file_read_full2, METH_VARARGS, (char *)"svn_io_file_read_full2(apr_file_t file, void * buf, apr_size_t nbytes, apr_pool_t pool) -> svn_error_t"},
+	 { (char *)"svn_io_file_aligned_seek", _wrap_svn_io_file_aligned_seek, METH_VARARGS, (char *)"\n"
+		"svn_io_file_aligned_seek(apr_file_t file, apr_off_t block_size, apr_off_t * buffer_start, apr_off_t offset, \n"
+		"    apr_pool_t scratch_pool) -> svn_error_t\n"
+		""},
+	 { (char *)"svn_io_file_flush", _wrap_svn_io_file_flush, METH_VARARGS, (char *)"svn_io_file_flush(apr_file_t file, apr_pool_t scratch_pool) -> svn_error_t"},
+	 { (char *)"svn_io_write_atomic", _wrap_svn_io_write_atomic, METH_VARARGS, (char *)"\n"
+		"svn_io_write_atomic(char const * final_path, void const * buf, apr_size_t nbytes, char const * copy_perms_path, \n"
+		"    apr_pool_t scratch_pool) -> svn_error_t\n"
+		""},
 	 { (char *)"svn_io_write_unique", _wrap_svn_io_write_unique, METH_VARARGS, (char *)"\n"
 		"svn_io_write_unique(char const * dirpath, void const * buf, apr_size_t nbytes, svn_io_file_del_t delete_when, \n"
 		"    apr_pool_t pool) -> svn_error_t\n"
@@ -33864,6 +34909,7 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"svn_close_invoke_fn", _wrap_svn_close_invoke_fn, METH_VARARGS, (char *)"svn_close_invoke_fn(svn_close_fn_t _obj, void * baton) -> svn_error_t"},
 	 { (char *)"svn_stream_invoke_mark_fn", _wrap_svn_stream_invoke_mark_fn, METH_VARARGS, (char *)"svn_stream_invoke_mark_fn(svn_stream_mark_fn_t _obj, void * baton, apr_pool_t pool) -> svn_error_t"},
 	 { (char *)"svn_stream_invoke_seek_fn", _wrap_svn_stream_invoke_seek_fn, METH_VARARGS, (char *)"svn_stream_invoke_seek_fn(svn_stream_seek_fn_t _obj, void * baton, svn_stream_mark_t const * mark) -> svn_error_t"},
+	 { (char *)"svn_stream_invoke_data_available_fn", _wrap_svn_stream_invoke_data_available_fn, METH_VARARGS, (char *)"svn_stream_invoke_data_available_fn(svn_stream_data_available_fn_t _obj, void * baton) -> svn_error_t"},
 	 { (char *)"svn_stream_invoke_lazyopen_func", _wrap_svn_stream_invoke_lazyopen_func, METH_VARARGS, (char *)"svn_stream_invoke_lazyopen_func(svn_stream_lazyopen_func_t _obj, void * baton, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"},
 	 { (char *)"svn_io_invoke_walk_func", _wrap_svn_io_invoke_walk_func, METH_VARARGS, (char *)"\n"
 		"svn_io_invoke_walk_func(svn_io_walk_func_t _obj, void * baton, char const * path, apr_finfo_t const * finfo, \n"
@@ -33875,6 +34921,7 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"svn_close_fn_t_swigregister", svn_close_fn_t_swigregister, METH_VARARGS, NULL},
 	 { (char *)"svn_stream_mark_fn_t_swigregister", svn_stream_mark_fn_t_swigregister, METH_VARARGS, NULL},
 	 { (char *)"svn_stream_seek_fn_t_swigregister", svn_stream_seek_fn_t_swigregister, METH_VARARGS, NULL},
+	 { (char *)"svn_stream_data_available_fn_t_swigregister", svn_stream_data_available_fn_t_swigregister, METH_VARARGS, NULL},
 	 { (char *)"svn_stream_lazyopen_func_t_swigregister", svn_stream_lazyopen_func_t_swigregister, METH_VARARGS, NULL},
 	 { (char *)"svn_io_walk_func_t_swigregister", svn_io_walk_func_t_swigregister, METH_VARARGS, NULL},
 	 { (char *)"svn_checksum_t_digest_set", _wrap_svn_checksum_t_digest_set, METH_VARARGS, (char *)"svn_checksum_t_digest_set(svn_checksum_t self, unsigned char const * digest)"},
@@ -33927,7 +34974,6 @@ static swig_type_info _swigt__p_apr_file_t = {"_p_apr_file_t", "apr_file_t *", 0
 static swig_type_info _swigt__p_apr_finfo_t = {"_p_apr_finfo_t", "apr_finfo_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_apr_getopt_option_t = {"_p_apr_getopt_option_t", "apr_getopt_option_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_apr_getopt_t = {"_p_apr_getopt_t", "apr_getopt_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_apr_hash_index_t = {"_p_apr_hash_index_t", "apr_hash_index_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_apr_hash_t = {"_p_apr_hash_t", "svn_mergeinfo_catalog_t|svn_mergeinfo_t|apr_hash_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_apr_int32_t = {"_p_apr_int32_t", "apr_int32_t *|time_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_apr_int64_t = {"_p_apr_int64_t", "apr_int64_t *|svn_filesize_t *|apr_time_t *", 0, 0, (void*)0, 0};
@@ -33951,6 +34997,7 @@ static swig_type_info _swigt__p_f_p_q_const__char_p_q_const__char_p_void__int =
 static swig_type_info _swigt__p_f_p_q_const__char_p_q_const__char_p_void_p_apr_pool_t__int = {"_p_f_p_q_const__char_p_q_const__char_p_void_p_apr_pool_t__int", "svn_config_enumerator2_t|int (*)(char const *,char const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_q_const__char_p_void__int = {"_p_f_p_q_const__char_p_void__int", "svn_config_section_enumerator_t|int (*)(char const *,void *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_q_const__char_p_void_p_apr_pool_t__int = {"_p_f_p_q_const__char_p_void_p_apr_pool_t__int", "int (*)(char const *,void *,apr_pool_t *)|svn_config_section_enumerator2_t", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_f_p_q_const__struct_svn_version_t_p_q_const__struct_svn_version_t__int = {"_p_f_p_q_const__struct_svn_version_t_p_q_const__struct_svn_version_t__int", "svn_boolean_t (*)(svn_version_t const *,svn_version_t const *)|int (*)(struct svn_version_t const *,struct svn_version_t const *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_commit_callback2_t|struct svn_error_t *(*)(svn_commit_info_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_boolean_t *,char const *,void *,apr_pool_t *)|svn_auth_plaintext_prompt_func_t|svn_auth_plaintext_passphrase_prompt_func_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_svn_boolean_t_p_void_p_q_const__char_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_boolean_t_p_void_p_q_const__char_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_boolean_t *,void *,char const *,char const *,apr_hash_t *,apr_pool_t *)|svn_config_auth_walk_func_t", 0, 0, (void*)0, 0};
@@ -33964,6 +35011,7 @@ static swig_type_info _swigt__p_f_p_void_p_p_svn_stream_mark_t_p_apr_pool_t__p_s
 static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,apr_size_t *)|svn_write_fn_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,apr_finfo_t const *,apr_pool_t *)|svn_io_walk_func_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t = {"_p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t", "svn_stream_seek_fn_t|struct svn_error_t *(*)(void *,svn_stream_mark_t const *)", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_f_p_void_p_svn_boolean_t__p_svn_error_t = {"_p_f_p_void_p_svn_boolean_t__p_svn_error_t", "svn_stream_data_available_fn_t|struct svn_error_t *(*)(void *,svn_boolean_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_log_entry_t *,apr_pool_t *)|svn_log_entry_receiver_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t = {"_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_revnum_t,char const *,char const *,void *)|svn_commit_callback_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_void__p_svn_version_t = {"_p_f_void__p_svn_version_t", "svn_version_func_t|struct svn_version_t *(*)(void)|svn_version_t *(*)(void)", 0, 0, (void*)0, 0};
@@ -33997,6 +35045,7 @@ static swig_type_info _swigt__p_p_f_p_void_p_p_svn_stream_mark_t_p_apr_pool_t__p
 static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t", "struct svn_error_t *(**)(void *,char const *,apr_size_t *)|svn_write_fn_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(void *,char const *,apr_finfo_t const *,apr_pool_t *)|svn_io_walk_func_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t", "svn_stream_seek_fn_t *|struct svn_error_t *(**)(void *,svn_stream_mark_t const *)", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_p_f_p_void_p_svn_boolean_t__p_svn_error_t = {"_p_p_f_p_void_p_svn_boolean_t__p_svn_error_t", "svn_stream_data_available_fn_t *|struct svn_error_t *(**)(void *,svn_boolean_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(void *,svn_log_entry_t *,apr_pool_t *)|svn_log_entry_receiver_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t = {"_p_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t", "struct svn_error_t *(**)(svn_revnum_t,char const *,char const *,void *)|svn_commit_callback_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_f_void__p_svn_version_t = {"_p_p_f_void__p_svn_version_t", "struct svn_version_t *(**)(void)|svn_version_func_t *", 0, 0, (void*)0, 0};
@@ -34032,9 +35081,11 @@ static swig_type_info _swigt__p_svn_checksum_t = {"_p_svn_checksum_t", "struct s
 static swig_type_info _swigt__p_svn_commit_info_t = {"_p_svn_commit_info_t", "struct svn_commit_info_t *|svn_commit_info_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_config_t = {"_p_svn_config_t", "struct svn_config_t *|svn_config_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_depth_t = {"_p_svn_depth_t", "enum svn_depth_t *|svn_depth_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_diff_hunk_t = {"_p_svn_diff_hunk_t", "svn_diff_hunk_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_dirent_t = {"_p_svn_dirent_t", "struct svn_dirent_t *|svn_dirent_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_errno_t = {"_p_svn_errno_t", "enum svn_errno_t *|svn_errno_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "struct svn_error_t *|svn_error_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_fs_lock_target_t = {"_p_svn_fs_lock_target_t", "svn_fs_lock_target_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_io_dirent2_t = {"_p_svn_io_dirent2_t", "struct svn_io_dirent2_t *|svn_io_dirent2_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_io_dirent_t = {"_p_svn_io_dirent_t", "struct svn_io_dirent_t *|svn_io_dirent_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_io_file_del_t = {"_p_svn_io_file_del_t", "enum svn_io_file_del_t *|svn_io_file_del_t *", 0, 0, (void*)0, 0};
@@ -34079,7 +35130,6 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_apr_finfo_t,
   &_swigt__p_apr_getopt_option_t,
   &_swigt__p_apr_getopt_t,
-  &_swigt__p_apr_hash_index_t,
   &_swigt__p_apr_hash_t,
   &_swigt__p_apr_int32_t,
   &_swigt__p_apr_int64_t,
@@ -34103,6 +35153,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_f_p_q_const__char_p_q_const__char_p_void_p_apr_pool_t__int,
   &_swigt__p_f_p_q_const__char_p_void__int,
   &_swigt__p_f_p_q_const__char_p_void_p_apr_pool_t__int,
+  &_swigt__p_f_p_q_const__struct_svn_version_t_p_q_const__struct_svn_version_t__int,
   &_swigt__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_svn_boolean_t_p_void_p_q_const__char_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t,
@@ -34116,6 +35167,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t,
+  &_swigt__p_f_p_void_p_svn_boolean_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t,
   &_swigt__p_f_void__p_svn_version_t,
@@ -34149,6 +35201,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t,
   &_swigt__p_p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t,
+  &_swigt__p_p_f_p_void_p_svn_boolean_t__p_svn_error_t,
   &_swigt__p_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t,
   &_swigt__p_p_f_void__p_svn_version_t,
@@ -34184,9 +35237,11 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_svn_commit_info_t,
   &_swigt__p_svn_config_t,
   &_swigt__p_svn_depth_t,
+  &_swigt__p_svn_diff_hunk_t,
   &_swigt__p_svn_dirent_t,
   &_swigt__p_svn_errno_t,
   &_swigt__p_svn_error_t,
+  &_swigt__p_svn_fs_lock_target_t,
   &_swigt__p_svn_io_dirent2_t,
   &_swigt__p_svn_io_dirent_t,
   &_swigt__p_svn_io_file_del_t,
@@ -34231,7 +35286,6 @@ static swig_cast_info _swigc__p_apr_file_t[] = {  {&_swigt__p_apr_file_t, 0, 0,
 static swig_cast_info _swigc__p_apr_finfo_t[] = {  {&_swigt__p_apr_finfo_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_apr_getopt_option_t[] = {  {&_swigt__p_apr_getopt_option_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_apr_getopt_t[] = {  {&_swigt__p_apr_getopt_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_apr_hash_index_t[] = {  {&_swigt__p_apr_hash_index_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_apr_hash_t[] = {  {&_swigt__p_apr_hash_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_apr_int32_t[] = {  {&_swigt__p_apr_int32_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_apr_int64_t[] = {  {&_swigt__p_apr_int64_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -34255,6 +35309,7 @@ static swig_cast_info _swigc__p_f_p_q_const__char_p_q_const__char_p_void__int[]
 static swig_cast_info _swigc__p_f_p_q_const__char_p_q_const__char_p_void_p_apr_pool_t__int[] = {  {&_swigt__p_f_p_q_const__char_p_q_const__char_p_void_p_apr_pool_t__int, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_q_const__char_p_void__int[] = {  {&_swigt__p_f_p_q_const__char_p_void__int, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_q_const__char_p_void_p_apr_pool_t__int[] = {  {&_swigt__p_f_p_q_const__char_p_void_p_apr_pool_t__int, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_f_p_q_const__struct_svn_version_t_p_q_const__struct_svn_version_t__int[] = {  {&_swigt__p_f_p_q_const__struct_svn_version_t_p_q_const__struct_svn_version_t__int, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_svn_boolean_t_p_void_p_q_const__char_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_svn_boolean_t_p_void_p_q_const__char_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -34268,6 +35323,7 @@ static swig_cast_info _swigc__p_f_p_void_p_p_svn_stream_mark_t_p_apr_pool_t__p_s
 static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_f_p_void_p_svn_boolean_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_svn_boolean_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t[] = {  {&_swigt__p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_void__p_svn_version_t[] = {  {&_swigt__p_f_void__p_svn_version_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -34301,6 +35357,7 @@ static swig_cast_info _swigc__p_p_f_p_void_p_p_svn_stream_mark_t_p_apr_pool_t__p
 static swig_cast_info _swigc__p_p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t[] = {  {&_swigt__p_p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t[] = {  {&_swigt__p_p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_p_f_p_void_p_svn_boolean_t__p_svn_error_t[] = {  {&_swigt__p_p_f_p_void_p_svn_boolean_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t[] = {  {&_swigt__p_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_f_void__p_svn_version_t[] = {  {&_swigt__p_p_f_void__p_svn_version_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -34336,9 +35393,11 @@ static swig_cast_info _swigc__p_svn_checksum_t[] = {  {&_swigt__p_svn_checksum_t
 static swig_cast_info _swigc__p_svn_commit_info_t[] = {  {&_swigt__p_svn_commit_info_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_config_t[] = {  {&_swigt__p_svn_config_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_depth_t[] = {  {&_swigt__p_svn_depth_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_diff_hunk_t[] = {  {&_swigt__p_svn_diff_hunk_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_dirent_t[] = {  {&_swigt__p_svn_dirent_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_errno_t[] = {  {&_swigt__p_svn_errno_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_error_t[] = {  {&_swigt__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_fs_lock_target_t[] = {  {&_swigt__p_svn_fs_lock_target_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_io_dirent2_t[] = {  {&_swigt__p_svn_io_dirent2_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_io_dirent_t[] = {  {&_swigt__p_svn_io_dirent_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_io_file_del_t[] = {  {&_swigt__p_svn_io_file_del_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -34383,7 +35442,6 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_apr_finfo_t,
   _swigc__p_apr_getopt_option_t,
   _swigc__p_apr_getopt_t,
-  _swigc__p_apr_hash_index_t,
   _swigc__p_apr_hash_t,
   _swigc__p_apr_int32_t,
   _swigc__p_apr_int64_t,
@@ -34407,6 +35465,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_f_p_q_const__char_p_q_const__char_p_void_p_apr_pool_t__int,
   _swigc__p_f_p_q_const__char_p_void__int,
   _swigc__p_f_p_q_const__char_p_void_p_apr_pool_t__int,
+  _swigc__p_f_p_q_const__struct_svn_version_t_p_q_const__struct_svn_version_t__int,
   _swigc__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_svn_boolean_t_p_void_p_q_const__char_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t,
@@ -34420,6 +35479,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t,
   _swigc__p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t,
+  _swigc__p_f_p_void_p_svn_boolean_t__p_svn_error_t,
   _swigc__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t,
   _swigc__p_f_void__p_svn_version_t,
@@ -34453,6 +35513,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t,
   _swigc__p_p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t,
+  _swigc__p_p_f_p_void_p_svn_boolean_t__p_svn_error_t,
   _swigc__p_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t,
   _swigc__p_p_f_void__p_svn_version_t,
@@ -34488,9 +35549,11 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_svn_commit_info_t,
   _swigc__p_svn_config_t,
   _swigc__p_svn_depth_t,
+  _swigc__p_svn_diff_hunk_t,
   _swigc__p_svn_dirent_t,
   _swigc__p_svn_errno_t,
   _swigc__p_svn_error_t,
+  _swigc__p_svn_fs_lock_target_t,
   _swigc__p_svn_io_dirent2_t,
   _swigc__p_svn_io_dirent_t,
   _swigc__p_svn_io_file_del_t,
@@ -34538,18 +35601,18 @@ static swig_const_info swig_const_table[] = {
 #endif
 /* -----------------------------------------------------------------------------
  * Type initialization:
- * This problem is tough by the requirement that no dynamic 
- * memory is used. Also, since swig_type_info structures store pointers to 
+ * This problem is tough by the requirement that no dynamic
+ * memory is used. Also, since swig_type_info structures store pointers to
  * swig_cast_info structures and swig_cast_info structures store pointers back
- * to swig_type_info structures, we need some lookup code at initialization. 
- * The idea is that swig generates all the structures that are needed. 
- * The runtime then collects these partially filled structures. 
- * The SWIG_InitializeModule function takes these initial arrays out of 
+ * to swig_type_info structures, we need some lookup code at initialization.
+ * The idea is that swig generates all the structures that are needed.
+ * The runtime then collects these partially filled structures.
+ * The SWIG_InitializeModule function takes these initial arrays out of
  * swig_module, and does all the lookup, filling in the swig_module.types
  * array with the correct data and linking the correct swig_cast_info
  * structures together.
  *
- * The generated swig_type_info structures are assigned staticly to an initial 
+ * The generated swig_type_info structures are assigned staticly to an initial
  * array. We just loop through that array, and handle each type individually.
  * First we lookup if this type has been already loaded, and if so, use the
  * loaded structure instead of the generated one. Then we have to fill in the
@@ -34559,17 +35622,17 @@ static swig_const_info swig_const_table[] = {
  * a column is one of the swig_cast_info structures for that type.
  * The cast_initial array is actually an array of arrays, because each row has
  * a variable number of columns. So to actually build the cast linked list,
- * we find the array of casts associated with the type, and loop through it 
+ * we find the array of casts associated with the type, and loop through it
  * adding the casts to the list. The one last trick we need to do is making
  * sure the type pointer in the swig_cast_info struct is correct.
  *
- * First off, we lookup the cast->type name to see if it is already loaded. 
+ * First off, we lookup the cast->type name to see if it is already loaded.
  * There are three cases to handle:
  *  1) If the cast->type has already been loaded AND the type we are adding
  *     casting info to has not been loaded (it is in this module), THEN we
  *     replace the cast->type pointer with the type pointer that has already
  *     been loaded.
- *  2) If BOTH types (the one we are adding casting info to, and the 
+ *  2) If BOTH types (the one we are adding casting info to, and the
  *     cast->type) are loaded, THEN the cast info has already been loaded by
  *     the previous module so we just ignore it.
  *  3) Finally, if cast->type has not already been loaded, then we add that
@@ -34632,7 +35695,7 @@ SWIG_InitializeModule(void *clientdata) {
     module_head->next = &swig_module;
   }
   
-  /* When multiple interpeters are used, a module could have already been initialized in
+  /* When multiple interpreters are used, a module could have already been initialized in
        a different interpreter, but not yet have a pointer in this interpreter.
        In this case, we do not want to continue adding types... everything should be
        set up already */
@@ -35229,11 +36292,13 @@ SWIG_init(void) {
   SWIG_Python_SetConstant(d, "SVN_ERR_BAD_TOKEN",SWIG_From_long((long)(SVN_ERR_BAD_TOKEN)));
   SWIG_Python_SetConstant(d, "SVN_ERR_BAD_CHANGELIST_NAME",SWIG_From_long((long)(SVN_ERR_BAD_CHANGELIST_NAME)));
   SWIG_Python_SetConstant(d, "SVN_ERR_BAD_ATOMIC",SWIG_From_long((long)(SVN_ERR_BAD_ATOMIC)));
+  SWIG_Python_SetConstant(d, "SVN_ERR_BAD_COMPRESSION_METHOD",SWIG_From_long((long)(SVN_ERR_BAD_COMPRESSION_METHOD)));
   SWIG_Python_SetConstant(d, "SVN_ERR_XML_ATTRIB_NOT_FOUND",SWIG_From_long((long)(SVN_ERR_XML_ATTRIB_NOT_FOUND)));
   SWIG_Python_SetConstant(d, "SVN_ERR_XML_MISSING_ANCESTRY",SWIG_From_long((long)(SVN_ERR_XML_MISSING_ANCESTRY)));
   SWIG_Python_SetConstant(d, "SVN_ERR_XML_UNKNOWN_ENCODING",SWIG_From_long((long)(SVN_ERR_XML_UNKNOWN_ENCODING)));
   SWIG_Python_SetConstant(d, "SVN_ERR_XML_MALFORMED",SWIG_From_long((long)(SVN_ERR_XML_MALFORMED)));
   SWIG_Python_SetConstant(d, "SVN_ERR_XML_UNESCAPABLE_DATA",SWIG_From_long((long)(SVN_ERR_XML_UNESCAPABLE_DATA)));
+  SWIG_Python_SetConstant(d, "SVN_ERR_XML_UNEXPECTED_ELEMENT",SWIG_From_long((long)(SVN_ERR_XML_UNEXPECTED_ELEMENT)));
   SWIG_Python_SetConstant(d, "SVN_ERR_IO_INCONSISTENT_EOL",SWIG_From_long((long)(SVN_ERR_IO_INCONSISTENT_EOL)));
   SWIG_Python_SetConstant(d, "SVN_ERR_IO_UNKNOWN_EOL",SWIG_From_long((long)(SVN_ERR_IO_UNKNOWN_EOL)));
   SWIG_Python_SetConstant(d, "SVN_ERR_IO_CORRUPT_EOL",SWIG_From_long((long)(SVN_ERR_IO_CORRUPT_EOL)));
@@ -35246,6 +36311,7 @@ SWIG_init(void) {
   SWIG_Python_SetConstant(d, "SVN_ERR_STREAM_MALFORMED_DATA",SWIG_From_long((long)(SVN_ERR_STREAM_MALFORMED_DATA)));
   SWIG_Python_SetConstant(d, "SVN_ERR_STREAM_UNRECOGNIZED_DATA",SWIG_From_long((long)(SVN_ERR_STREAM_UNRECOGNIZED_DATA)));
   SWIG_Python_SetConstant(d, "SVN_ERR_STREAM_SEEK_NOT_SUPPORTED",SWIG_From_long((long)(SVN_ERR_STREAM_SEEK_NOT_SUPPORTED)));
+  SWIG_Python_SetConstant(d, "SVN_ERR_STREAM_NOT_SUPPORTED",SWIG_From_long((long)(SVN_ERR_STREAM_NOT_SUPPORTED)));
   SWIG_Python_SetConstant(d, "SVN_ERR_NODE_UNKNOWN_KIND",SWIG_From_long((long)(SVN_ERR_NODE_UNKNOWN_KIND)));
   SWIG_Python_SetConstant(d, "SVN_ERR_NODE_UNEXPECTED_KIND",SWIG_From_long((long)(SVN_ERR_NODE_UNEXPECTED_KIND)));
   SWIG_Python_SetConstant(d, "SVN_ERR_ENTRY_NOT_FOUND",SWIG_From_long((long)(SVN_ERR_ENTRY_NOT_FOUND)));
@@ -35350,6 +36416,17 @@ SWIG_init(void) {
   SWIG_Python_SetConstant(d, "SVN_ERR_FS_INCORRECT_EDITOR_COMPLETION",SWIG_From_long((long)(SVN_ERR_FS_INCORRECT_EDITOR_COMPLETION)));
   SWIG_Python_SetConstant(d, "SVN_ERR_FS_PACKED_REVPROP_READ_FAILURE",SWIG_From_long((long)(SVN_ERR_FS_PACKED_REVPROP_READ_FAILURE)));
   SWIG_Python_SetConstant(d, "SVN_ERR_FS_REVPROP_CACHE_INIT_FAILURE",SWIG_From_long((long)(SVN_ERR_FS_REVPROP_CACHE_INIT_FAILURE)));
+  SWIG_Python_SetConstant(d, "SVN_ERR_FS_MALFORMED_TXN_ID",SWIG_From_long((long)(SVN_ERR_FS_MALFORMED_TXN_ID)));
+  SWIG_Python_SetConstant(d, "SVN_ERR_FS_INDEX_CORRUPTION",SWIG_From_long((long)(SVN_ERR_FS_INDEX_CORRUPTION)));
+  SWIG_Python_SetConstant(d, "SVN_ERR_FS_INDEX_REVISION",SWIG_From_long((long)(SVN_ERR_FS_INDEX_REVISION)));
+  SWIG_Python_SetConstant(d, "SVN_ERR_FS_INDEX_OVERFLOW",SWIG_From_long((long)(SVN_ERR_FS_INDEX_OVERFLOW)));
+  SWIG_Python_SetConstant(d, "SVN_ERR_FS_CONTAINER_INDEX",SWIG_From_long((long)(SVN_ERR_FS_CONTAINER_INDEX)));
+  SWIG_Python_SetConstant(d, "SVN_ERR_FS_INDEX_INCONSISTENT",SWIG_From_long((long)(SVN_ERR_FS_INDEX_INCONSISTENT)));
+  SWIG_Python_SetConstant(d, "SVN_ERR_FS_LOCK_OPERATION_FAILED",SWIG_From_long((long)(SVN_ERR_FS_LOCK_OPERATION_FAILED)));
+  SWIG_Python_SetConstant(d, "SVN_ERR_FS_UNSUPPORTED_TYPE",SWIG_From_long((long)(SVN_ERR_FS_UNSUPPORTED_TYPE)));
+  SWIG_Python_SetConstant(d, "SVN_ERR_FS_CONTAINER_SIZE",SWIG_From_long((long)(SVN_ERR_FS_CONTAINER_SIZE)));
+  SWIG_Python_SetConstant(d, "SVN_ERR_FS_MALFORMED_NODEREV_ID",SWIG_From_long((long)(SVN_ERR_FS_MALFORMED_NODEREV_ID)));
+  SWIG_Python_SetConstant(d, "SVN_ERR_FS_INVALID_GENERATION",SWIG_From_long((long)(SVN_ERR_FS_INVALID_GENERATION)));
   SWIG_Python_SetConstant(d, "SVN_ERR_REPOS_LOCKED",SWIG_From_long((long)(SVN_ERR_REPOS_LOCKED)));
   SWIG_Python_SetConstant(d, "SVN_ERR_REPOS_HOOK_FAILURE",SWIG_From_long((long)(SVN_ERR_REPOS_HOOK_FAILURE)));
   SWIG_Python_SetConstant(d, "SVN_ERR_REPOS_BAD_ARGS",SWIG_From_long((long)(SVN_ERR_REPOS_BAD_ARGS)));
@@ -35374,6 +36451,7 @@ SWIG_init(void) {
   SWIG_Python_SetConstant(d, "SVN_ERR_RA_REPOS_ROOT_URL_MISMATCH",SWIG_From_long((long)(SVN_ERR_RA_REPOS_ROOT_URL_MISMATCH)));
   SWIG_Python_SetConstant(d, "SVN_ERR_RA_SESSION_URL_MISMATCH",SWIG_From_long((long)(SVN_ERR_RA_SESSION_URL_MISMATCH)));
   SWIG_Python_SetConstant(d, "SVN_ERR_RA_CANNOT_CREATE_TUNNEL",SWIG_From_long((long)(SVN_ERR_RA_CANNOT_CREATE_TUNNEL)));
+  SWIG_Python_SetConstant(d, "SVN_ERR_RA_CANNOT_CREATE_SESSION",SWIG_From_long((long)(SVN_ERR_RA_CANNOT_CREATE_SESSION)));
   SWIG_Python_SetConstant(d, "SVN_ERR_RA_DAV_SOCK_INIT",SWIG_From_long((long)(SVN_ERR_RA_DAV_SOCK_INIT)));
   SWIG_Python_SetConstant(d, "SVN_ERR_RA_DAV_CREATING_REQUEST",SWIG_From_long((long)(SVN_ERR_RA_DAV_CREATING_REQUEST)));
   SWIG_Python_SetConstant(d, "SVN_ERR_RA_DAV_REQUEST_FAILED",SWIG_From_long((long)(SVN_ERR_RA_DAV_REQUEST_FAILED)));
@@ -35388,6 +36466,8 @@ SWIG_init(void) {
   SWIG_Python_SetConstant(d, "SVN_ERR_RA_DAV_RELOCATED",SWIG_From_long((long)(SVN_ERR_RA_DAV_RELOCATED)));
   SWIG_Python_SetConstant(d, "SVN_ERR_RA_DAV_CONN_TIMEOUT",SWIG_From_long((long)(SVN_ERR_RA_DAV_CONN_TIMEOUT)));
   SWIG_Python_SetConstant(d, "SVN_ERR_RA_DAV_FORBIDDEN",SWIG_From_long((long)(SVN_ERR_RA_DAV_FORBIDDEN)));
+  SWIG_Python_SetConstant(d, "SVN_ERR_RA_DAV_PRECONDITION_FAILED",SWIG_From_long((long)(SVN_ERR_RA_DAV_PRECONDITION_FAILED)));
+  SWIG_Python_SetConstant(d, "SVN_ERR_RA_DAV_METHOD_NOT_ALLOWED",SWIG_From_long((long)(SVN_ERR_RA_DAV_METHOD_NOT_ALLOWED)));
   SWIG_Python_SetConstant(d, "SVN_ERR_RA_LOCAL_REPOS_NOT_FOUND",SWIG_From_long((long)(SVN_ERR_RA_LOCAL_REPOS_NOT_FOUND)));
   SWIG_Python_SetConstant(d, "SVN_ERR_RA_LOCAL_REPOS_OPEN_FAILED",SWIG_From_long((long)(SVN_ERR_RA_LOCAL_REPOS_OPEN_FAILED)));
   SWIG_Python_SetConstant(d, "SVN_ERR_SVNDIFF_INVALID_HEADER",SWIG_From_long((long)(SVN_ERR_SVNDIFF_INVALID_HEADER)));
@@ -35464,6 +36544,11 @@ SWIG_init(void) {
   SWIG_Python_SetConstant(d, "SVN_ERR_TOO_MANY_MEMCACHED_SERVERS",SWIG_From_long((long)(SVN_ERR_TOO_MANY_MEMCACHED_SERVERS)));
   SWIG_Python_SetConstant(d, "SVN_ERR_MALFORMED_VERSION_STRING",SWIG_From_long((long)(SVN_ERR_MALFORMED_VERSION_STRING)));
   SWIG_Python_SetConstant(d, "SVN_ERR_CORRUPTED_ATOMIC_STORAGE",SWIG_From_long((long)(SVN_ERR_CORRUPTED_ATOMIC_STORAGE)));
+  SWIG_Python_SetConstant(d, "SVN_ERR_UTF8PROC_ERROR",SWIG_From_long((long)(SVN_ERR_UTF8PROC_ERROR)));
+  SWIG_Python_SetConstant(d, "SVN_ERR_UTF8_GLOB",SWIG_From_long((long)(SVN_ERR_UTF8_GLOB)));
+  SWIG_Python_SetConstant(d, "SVN_ERR_CORRUPT_PACKED_DATA",SWIG_From_long((long)(SVN_ERR_CORRUPT_PACKED_DATA)));
+  SWIG_Python_SetConstant(d, "SVN_ERR_COMPOSED_ERROR",SWIG_From_long((long)(SVN_ERR_COMPOSED_ERROR)));
+  SWIG_Python_SetConstant(d, "SVN_ERR_INVALID_INPUT",SWIG_From_long((long)(SVN_ERR_INVALID_INPUT)));
   SWIG_Python_SetConstant(d, "SVN_ERR_CL_ARG_PARSING_ERROR",SWIG_From_long((long)(SVN_ERR_CL_ARG_PARSING_ERROR)));
   SWIG_Python_SetConstant(d, "SVN_ERR_CL_INSUFFICIENT_ARGS",SWIG_From_long((long)(SVN_ERR_CL_INSUFFICIENT_ARGS)));
   SWIG_Python_SetConstant(d, "SVN_ERR_CL_MUTUALLY_EXCLUSIVE_ARGS",SWIG_From_long((long)(SVN_ERR_CL_MUTUALLY_EXCLUSIVE_ARGS)));
@@ -35476,6 +36561,7 @@ SWIG_init(void) {
   SWIG_Python_SetConstant(d, "SVN_ERR_CL_UNNECESSARY_LOG_MESSAGE",SWIG_From_long((long)(SVN_ERR_CL_UNNECESSARY_LOG_MESSAGE)));
   SWIG_Python_SetConstant(d, "SVN_ERR_CL_NO_EXTERNAL_MERGE_TOOL",SWIG_From_long((long)(SVN_ERR_CL_NO_EXTERNAL_MERGE_TOOL)));
   SWIG_Python_SetConstant(d, "SVN_ERR_CL_ERROR_PROCESSING_EXTERNALS",SWIG_From_long((long)(SVN_ERR_CL_ERROR_PROCESSING_EXTERNALS)));
+  SWIG_Python_SetConstant(d, "SVN_ERR_CL_REPOS_VERIFY_FAILED",SWIG_From_long((long)(SVN_ERR_CL_REPOS_VERIFY_FAILED)));
   SWIG_Python_SetConstant(d, "SVN_ERR_RA_SVN_CMD_ERR",SWIG_From_long((long)(SVN_ERR_RA_SVN_CMD_ERR)));
   SWIG_Python_SetConstant(d, "SVN_ERR_RA_SVN_UNKNOWN_CMD",SWIG_From_long((long)(SVN_ERR_RA_SVN_UNKNOWN_CMD)));
   SWIG_Python_SetConstant(d, "SVN_ERR_RA_SVN_CONNECTION_CLOSED",SWIG_From_long((long)(SVN_ERR_RA_SVN_CONNECTION_CLOSED)));
@@ -35502,6 +36588,26 @@ SWIG_init(void) {
   SWIG_Python_SetConstant(d, "SVN_ERR_RA_SERF_WRAPPED_ERROR",SWIG_From_long((long)(SVN_ERR_RA_SERF_WRAPPED_ERROR)));
   SWIG_Python_SetConstant(d, "SVN_ERR_ASSERTION_FAIL",SWIG_From_long((long)(SVN_ERR_ASSERTION_FAIL)));
   SWIG_Python_SetConstant(d, "SVN_ERR_ASSERTION_ONLY_TRACING_LINKS",SWIG_From_long((long)(SVN_ERR_ASSERTION_ONLY_TRACING_LINKS)));
+  SWIG_Python_SetConstant(d, "SVN_ERR_ASN1_OUT_OF_DATA",SWIG_From_long((long)(SVN_ERR_ASN1_OUT_OF_DATA)));
+  SWIG_Python_SetConstant(d, "SVN_ERR_ASN1_UNEXPECTED_TAG",SWIG_From_long((long)(SVN_ERR_ASN1_UNEXPECTED_TAG)));
+  SWIG_Python_SetConstant(d, "SVN_ERR_ASN1_INVALID_LENGTH",SWIG_From_long((long)(SVN_ERR_ASN1_INVALID_LENGTH)));
+  SWIG_Python_SetConstant(d, "SVN_ERR_ASN1_LENGTH_MISMATCH",SWIG_From_long((long)(SVN_ERR_ASN1_LENGTH_MISMATCH)));
+  SWIG_Python_SetConstant(d, "SVN_ERR_ASN1_INVALID_DATA",SWIG_From_long((long)(SVN_ERR_ASN1_INVALID_DATA)));
+  SWIG_Python_SetConstant(d, "SVN_ERR_X509_FEATURE_UNAVAILABLE",SWIG_From_long((long)(SVN_ERR_X509_FEATURE_UNAVAILABLE)));
+  SWIG_Python_SetConstant(d, "SVN_ERR_X509_CERT_INVALID_PEM",SWIG_From_long((long)(SVN_ERR_X509_CERT_INVALID_PEM)));
+  SWIG_Python_SetConstant(d, "SVN_ERR_X509_CERT_INVALID_FORMAT",SWIG_From_long((long)(SVN_ERR_X509_CERT_INVALID_FORMAT)));
+  SWIG_Python_SetConstant(d, "SVN_ERR_X509_CERT_INVALID_VERSION",SWIG_From_long((long)(SVN_ERR_X509_CERT_INVALID_VERSION)));
+  SWIG_Python_SetConstant(d, "SVN_ERR_X509_CERT_INVALID_SERIAL",SWIG_From_long((long)(SVN_ERR_X509_CERT_INVALID_SERIAL)));
+  SWIG_Python_SetConstant(d, "SVN_ERR_X509_CERT_INVALID_ALG",SWIG_From_long((long)(SVN_ERR_X509_CERT_INVALID_ALG)));
+  SWIG_Python_SetConstant(d, "SVN_ERR_X509_CERT_INVALID_NAME",SWIG_From_long((long)(SVN_ERR_X509_CERT_INVALID_NAME)));
+  SWIG_Python_SetConstant(d, "SVN_ERR_X509_CERT_INVALID_DATE",SWIG_From_long((long)(SVN_ERR_X509_CERT_INVALID_DATE)));
+  SWIG_Python_SetConstant(d, "SVN_ERR_X509_CERT_INVALID_PUBKEY",SWIG_From_long((long)(SVN_ERR_X509_CERT_INVALID_PUBKEY)));
+  SWIG_Python_SetConstant(d, "SVN_ERR_X509_CERT_INVALID_SIGNATURE",SWIG_From_long((long)(SVN_ERR_X509_CERT_INVALID_SIGNATURE)));
+  SWIG_Python_SetConstant(d, "SVN_ERR_X509_CERT_INVALID_EXTENSIONS",SWIG_From_long((long)(SVN_ERR_X509_CERT_INVALID_EXTENSIONS)));
+  SWIG_Python_SetConstant(d, "SVN_ERR_X509_CERT_UNKNOWN_VERSION",SWIG_From_long((long)(SVN_ERR_X509_CERT_UNKNOWN_VERSION)));
+  SWIG_Python_SetConstant(d, "SVN_ERR_X509_CERT_UNKNOWN_PK_ALG",SWIG_From_long((long)(SVN_ERR_X509_CERT_UNKNOWN_PK_ALG)));
+  SWIG_Python_SetConstant(d, "SVN_ERR_X509_CERT_SIG_MISMATCH",SWIG_From_long((long)(SVN_ERR_X509_CERT_SIG_MISMATCH)));
+  SWIG_Python_SetConstant(d, "SVN_ERR_X509_CERT_VERIFY_FAILED",SWIG_From_long((long)(SVN_ERR_X509_CERT_VERIFY_FAILED)));
   SWIG_Python_SetConstant(d, "SVN_ERR_LAST",SWIG_From_long((long)(SVN_ERR_LAST)));
   SWIG_Python_SetConstant(d, "SVN_UNALIGNED_ACCESS_IS_OK",SWIG_From_long((long)(0)));
   SWIG_Python_SetConstant(d, "TRUE",SWIG_From_long((long)(1)));
@@ -35545,16 +36651,16 @@ SWIG_init(void) {
   SWIG_Python_SetConstant(d, "SVN__STREAM_CHUNK_SIZE",SWIG_From_long((long)(16384)));
   SWIG_Python_SetConstant(d, "SVN_ALLOCATOR_RECOMMENDED_MAX_FREE",SWIG_From_long((long)((4096*1024))));
   SWIG_Python_SetConstant(d, "SVN_VER_MAJOR",SWIG_From_long((long)(1)));
-  SWIG_Python_SetConstant(d, "SVN_VER_MINOR",SWIG_From_long((long)(8)));
-  SWIG_Python_SetConstant(d, "SVN_VER_PATCH",SWIG_From_long((long)(13)));
-  SWIG_Python_SetConstant(d, "SVN_VER_MICRO",SWIG_From_long((long)(13)));
+  SWIG_Python_SetConstant(d, "SVN_VER_MINOR",SWIG_From_long((long)(9)));
+  SWIG_Python_SetConstant(d, "SVN_VER_PATCH",SWIG_From_long((long)(7)));
+  SWIG_Python_SetConstant(d, "SVN_VER_MICRO",SWIG_From_long((long)(7)));
   SWIG_Python_SetConstant(d, "SVN_VER_LIBRARY",SWIG_From_long((long)(1)));
-  SWIG_Python_SetConstant(d, "SVN_VER_TAG",SWIG_FromCharPtr(" (r1667537)"));
+  SWIG_Python_SetConstant(d, "SVN_VER_TAG",SWIG_FromCharPtr(" (r1800392)"));
   SWIG_Python_SetConstant(d, "SVN_VER_NUMTAG",SWIG_FromCharPtr(""));
-  SWIG_Python_SetConstant(d, "SVN_VER_REVISION",SWIG_From_long((long)(1667537)));
-  SWIG_Python_SetConstant(d, "SVN_VER_NUM",SWIG_FromCharPtr("1.8.13"));
-  SWIG_Python_SetConstant(d, "SVN_VER_NUMBER",SWIG_FromCharPtr("1.8.13"));
-  SWIG_Python_SetConstant(d, "SVN_VERSION",SWIG_FromCharPtr("1.8.13 (r1667537)"));
+  SWIG_Python_SetConstant(d, "SVN_VER_REVISION",SWIG_From_long((long)(1800392)));
+  SWIG_Python_SetConstant(d, "SVN_VER_NUM",SWIG_FromCharPtr("1.9.7"));
+  SWIG_Python_SetConstant(d, "SVN_VER_NUMBER",SWIG_FromCharPtr("1.9.7"));
+  SWIG_Python_SetConstant(d, "SVN_VERSION",SWIG_FromCharPtr("1.9.7 (r1800392)"));
   SWIG_Python_SetConstant(d, "svn_prop_entry_kind",SWIG_From_long((long)(svn_prop_entry_kind)));
   SWIG_Python_SetConstant(d, "svn_prop_wc_kind",SWIG_From_long((long)(svn_prop_wc_kind)));
   SWIG_Python_SetConstant(d, "svn_prop_regular_kind",SWIG_From_long((long)(svn_prop_regular_kind)));
@@ -35666,6 +36772,9 @@ SWIG_init(void) {
   SWIG_Python_SetConstant(d, "SVN_CONFIG_OPTION_USERNAME",SWIG_FromCharPtr("username"));
   SWIG_Python_SetConstant(d, "SVN_CONFIG_OPTION_HTTP_BULK_UPDATES",SWIG_FromCharPtr("http-bulk-updates"));
   SWIG_Python_SetConstant(d, "SVN_CONFIG_OPTION_HTTP_MAX_CONNECTIONS",SWIG_FromCharPtr("http-max-connections"));
+  SWIG_Python_SetConstant(d, "SVN_CONFIG_OPTION_HTTP_CHUNKED_REQUESTS",SWIG_FromCharPtr("http-chunked-requests"));
+  SWIG_Python_SetConstant(d, "SVN_CONFIG_OPTION_SERF_LOG_COMPONENTS",SWIG_FromCharPtr("serf-log-components"));
+  SWIG_Python_SetConstant(d, "SVN_CONFIG_OPTION_SERF_LOG_LEVEL",SWIG_FromCharPtr("serf-log-level"));
   SWIG_Python_SetConstant(d, "SVN_CONFIG_CATEGORY_CONFIG",SWIG_FromCharPtr("config"));
   SWIG_Python_SetConstant(d, "SVN_CONFIG_SECTION_AUTH",SWIG_FromCharPtr("auth"));
   SWIG_Python_SetConstant(d, "SVN_CONFIG_OPTION_PASSWORD_STORES",SWIG_FromCharPtr("password-stores"));
@@ -35685,16 +36794,19 @@ SWIG_init(void) {
   SWIG_Python_SetConstant(d, "SVN_CONFIG_OPTION_USE_COMMIT_TIMES",SWIG_FromCharPtr("use-commit-times"));
   SWIG_Python_SetConstant(d, "SVN_CONFIG_OPTION_TEMPLATE_ROOT",SWIG_FromCharPtr("template-root"));
   SWIG_Python_SetConstant(d, "SVN_CONFIG_OPTION_ENABLE_AUTO_PROPS",SWIG_FromCharPtr("enable-auto-props"));
+  SWIG_Python_SetConstant(d, "SVN_CONFIG_OPTION_ENABLE_MAGIC_FILE",SWIG_FromCharPtr("enable-magic-file"));
   SWIG_Python_SetConstant(d, "SVN_CONFIG_OPTION_NO_UNLOCK",SWIG_FromCharPtr("no-unlock"));
   SWIG_Python_SetConstant(d, "SVN_CONFIG_OPTION_MIMETYPES_FILE",SWIG_FromCharPtr("mime-types-file"));
   SWIG_Python_SetConstant(d, "SVN_CONFIG_OPTION_PRESERVED_CF_EXTS",SWIG_FromCharPtr("preserved-conflict-file-exts"));
   SWIG_Python_SetConstant(d, "SVN_CONFIG_OPTION_INTERACTIVE_CONFLICTS",SWIG_FromCharPtr("interactive-conflicts"));
   SWIG_Python_SetConstant(d, "SVN_CONFIG_OPTION_MEMORY_CACHE_SIZE",SWIG_FromCharPtr("memory-cache-size"));
+  SWIG_Python_SetConstant(d, "SVN_CONFIG_OPTION_DIFF_IGNORE_CONTENT_TYPE",SWIG_FromCharPtr("diff-ignore-content-type"));
   SWIG_Python_SetConstant(d, "SVN_CONFIG_SECTION_TUNNELS",SWIG_FromCharPtr("tunnels"));
   SWIG_Python_SetConstant(d, "SVN_CONFIG_SECTION_AUTO_PROPS",SWIG_FromCharPtr("auto-props"));
   SWIG_Python_SetConstant(d, "SVN_CONFIG_SECTION_WORKING_COPY",SWIG_FromCharPtr("working-copy"));
   SWIG_Python_SetConstant(d, "SVN_CONFIG_OPTION_SQLITE_EXCLUSIVE",SWIG_FromCharPtr("exclusive-locking"));
   SWIG_Python_SetConstant(d, "SVN_CONFIG_OPTION_SQLITE_EXCLUSIVE_CLIENTS",SWIG_FromCharPtr("exclusive-locking-clients"));
+  SWIG_Python_SetConstant(d, "SVN_CONFIG_OPTION_SQLITE_BUSY_TIMEOUT",SWIG_FromCharPtr("busy-timeout"));
   SWIG_Python_SetConstant(d, "SVN_CONFIG_SECTION_GENERAL",SWIG_FromCharPtr("general"));
   SWIG_Python_SetConstant(d, "SVN_CONFIG_OPTION_ANON_ACCESS",SWIG_FromCharPtr("anon-access"));
   SWIG_Python_SetConstant(d, "SVN_CONFIG_OPTION_AUTH_ACCESS",SWIG_FromCharPtr("auth-access"));
@@ -35710,8 +36822,8 @@ SWIG_init(void) {
   SWIG_Python_SetConstant(d, "SVN_CONFIG_OPTION_MAX_SSF",SWIG_FromCharPtr("max-encryption"));
   SWIG_Python_SetConstant(d, "SVN_CONFIG_SECTION_USERS",SWIG_FromCharPtr("users"));
   SWIG_Python_SetConstant(d, "SVN_CONFIG__DEFAULT_GLOBAL_IGNORES_LINE_1",SWIG_FromCharPtr("*.o *.lo *.la *.al .libs *.so *.so.[0-9]* *.a *.pyc *.pyo __pycache__"));
-  SWIG_Python_SetConstant(d, "SVN_CONFIG__DEFAULT_GLOBAL_IGNORES_LINE_2",SWIG_FromCharPtr("*.rej *~ #*# .#* .*.swp .DS_Store"));
-  SWIG_Python_SetConstant(d, "SVN_CONFIG_DEFAULT_GLOBAL_IGNORES",SWIG_FromCharPtr("*.o *.lo *.la *.al .libs *.so *.so.[0-9]* *.a *.pyc *.pyo __pycache__ *.rej *~ #*# .#* .*.swp .DS_Store"));
+  SWIG_Python_SetConstant(d, "SVN_CONFIG__DEFAULT_GLOBAL_IGNORES_LINE_2",SWIG_FromCharPtr("*.rej *~ #*# .#* .*.swp .DS_Store [Tt]humbs.db"));
+  SWIG_Python_SetConstant(d, "SVN_CONFIG_DEFAULT_GLOBAL_IGNORES",SWIG_FromCharPtr("*.o *.lo *.la *.al .libs *.so *.so.[0-9]* *.a *.pyc *.pyo __pycache__ *.rej *~ #*# .#* .*.swp .DS_Store [Tt]humbs.db"));
   SWIG_Python_SetConstant(d, "SVN_CONFIG_TRUE",SWIG_FromCharPtr("TRUE"));
   SWIG_Python_SetConstant(d, "SVN_CONFIG_FALSE",SWIG_FromCharPtr("FALSE"));
   SWIG_Python_SetConstant(d, "SVN_CONFIG_ASK",SWIG_FromCharPtr("ASK"));
@@ -35722,6 +36834,12 @@ SWIG_init(void) {
   SWIG_Python_SetConstant(d, "SVN_CONFIG_DEFAULT_OPTION_STORE_SSL_CLIENT_CERT_PP_PLAINTEXT",SWIG_FromCharPtr("ASK"));
   SWIG_Python_SetConstant(d, "SVN_CONFIG_DEFAULT_OPTION_HTTP_MAX_CONNECTIONS",SWIG_From_long((long)(4)));
   SWIG_Python_SetConstant(d, "SVN_CONFIG_REALMSTRING_KEY",SWIG_FromCharPtr("svn:realmstring"));
+  SWIG_Python_SetConstant(d, "SVN_CONFIG_AUTHN_USERNAME_KEY",SWIG_FromCharPtr("username"));
+  SWIG_Python_SetConstant(d, "SVN_CONFIG_AUTHN_PASSWORD_KEY",SWIG_FromCharPtr("password"));
+  SWIG_Python_SetConstant(d, "SVN_CONFIG_AUTHN_PASSPHRASE_KEY",SWIG_FromCharPtr("passphrase"));
+  SWIG_Python_SetConstant(d, "SVN_CONFIG_AUTHN_PASSTYPE_KEY",SWIG_FromCharPtr("passtype"));
+  SWIG_Python_SetConstant(d, "SVN_CONFIG_AUTHN_ASCII_CERT_KEY",SWIG_FromCharPtr("ascii_cert"));
+  SWIG_Python_SetConstant(d, "SVN_CONFIG_AUTHN_FAILURES_KEY",SWIG_FromCharPtr("failures"));
   SWIG_Python_SetConstant(d, "SVN_MERGEINFO_NONINHERITABLE_STR",SWIG_FromCharPtr("*"));
   SWIG_Python_SetConstant(d, "svn_mergeinfo_explicit",SWIG_From_long((long)(svn_mergeinfo_explicit)));
   SWIG_Python_SetConstant(d, "svn_mergeinfo_inherited",SWIG_From_long((long)(svn_mergeinfo_inherited)));
@@ -35731,6 +36849,8 @@ SWIG_init(void) {
   SWIG_Python_SetConstant(d, "svn_io_file_del_on_pool_cleanup",SWIG_From_long((long)(svn_io_file_del_on_pool_cleanup)));
   SWIG_Python_SetConstant(d, "svn_checksum_md5",SWIG_From_long((long)(svn_checksum_md5)));
   SWIG_Python_SetConstant(d, "svn_checksum_sha1",SWIG_From_long((long)(svn_checksum_sha1)));
+  SWIG_Python_SetConstant(d, "svn_checksum_fnv1a_32",SWIG_From_long((long)(svn_checksum_fnv1a_32)));
+  SWIG_Python_SetConstant(d, "svn_checksum_fnv1a_32x4",SWIG_From_long((long)(svn_checksum_fnv1a_32x4)));
   
   /* Theoretically, we should be checking for errors here,
      but I do not know of any useful way to signal an error to Python
diff --git a/subversion/bindings/swig/python/core.py b/subversion/bindings/swig/python/core.py
index 19a2b17..6f46fce 100644
--- a/subversion/bindings/swig/python/core.py
+++ b/subversion/bindings/swig/python/core.py
@@ -1,11 +1,13 @@
 # This file was automatically generated by SWIG (http://www.swig.org).
-# Version 2.0.9
+# Version 2.0.12
 #
 # Do not make changes to this file unless you know what you are doing--modify
 # the SWIG interface file instead.
 
 
 
+
+
 from sys import version_info
 if version_info >= (2,6,0):
     def swig_import_helper():
@@ -132,11 +134,13 @@ SVN_ERR_BAD_CHECKSUM_PARSE = _core.SVN_ERR_BAD_CHECKSUM_PARSE
 SVN_ERR_BAD_TOKEN = _core.SVN_ERR_BAD_TOKEN
 SVN_ERR_BAD_CHANGELIST_NAME = _core.SVN_ERR_BAD_CHANGELIST_NAME
 SVN_ERR_BAD_ATOMIC = _core.SVN_ERR_BAD_ATOMIC
+SVN_ERR_BAD_COMPRESSION_METHOD = _core.SVN_ERR_BAD_COMPRESSION_METHOD
 SVN_ERR_XML_ATTRIB_NOT_FOUND = _core.SVN_ERR_XML_ATTRIB_NOT_FOUND
 SVN_ERR_XML_MISSING_ANCESTRY = _core.SVN_ERR_XML_MISSING_ANCESTRY
 SVN_ERR_XML_UNKNOWN_ENCODING = _core.SVN_ERR_XML_UNKNOWN_ENCODING
 SVN_ERR_XML_MALFORMED = _core.SVN_ERR_XML_MALFORMED
 SVN_ERR_XML_UNESCAPABLE_DATA = _core.SVN_ERR_XML_UNESCAPABLE_DATA
+SVN_ERR_XML_UNEXPECTED_ELEMENT = _core.SVN_ERR_XML_UNEXPECTED_ELEMENT
 SVN_ERR_IO_INCONSISTENT_EOL = _core.SVN_ERR_IO_INCONSISTENT_EOL
 SVN_ERR_IO_UNKNOWN_EOL = _core.SVN_ERR_IO_UNKNOWN_EOL
 SVN_ERR_IO_CORRUPT_EOL = _core.SVN_ERR_IO_CORRUPT_EOL
@@ -149,6 +153,7 @@ SVN_ERR_STREAM_UNEXPECTED_EOF = _core.SVN_ERR_STREAM_UNEXPECTED_EOF
 SVN_ERR_STREAM_MALFORMED_DATA = _core.SVN_ERR_STREAM_MALFORMED_DATA
 SVN_ERR_STREAM_UNRECOGNIZED_DATA = _core.SVN_ERR_STREAM_UNRECOGNIZED_DATA
 SVN_ERR_STREAM_SEEK_NOT_SUPPORTED = _core.SVN_ERR_STREAM_SEEK_NOT_SUPPORTED
+SVN_ERR_STREAM_NOT_SUPPORTED = _core.SVN_ERR_STREAM_NOT_SUPPORTED
 SVN_ERR_NODE_UNKNOWN_KIND = _core.SVN_ERR_NODE_UNKNOWN_KIND
 SVN_ERR_NODE_UNEXPECTED_KIND = _core.SVN_ERR_NODE_UNEXPECTED_KIND
 SVN_ERR_ENTRY_NOT_FOUND = _core.SVN_ERR_ENTRY_NOT_FOUND
@@ -253,6 +258,17 @@ SVN_ERR_FS_PROP_BASEVALUE_MISMATCH = _core.SVN_ERR_FS_PROP_BASEVALUE_MISMATCH
 SVN_ERR_FS_INCORRECT_EDITOR_COMPLETION = _core.SVN_ERR_FS_INCORRECT_EDITOR_COMPLETION
 SVN_ERR_FS_PACKED_REVPROP_READ_FAILURE = _core.SVN_ERR_FS_PACKED_REVPROP_READ_FAILURE
 SVN_ERR_FS_REVPROP_CACHE_INIT_FAILURE = _core.SVN_ERR_FS_REVPROP_CACHE_INIT_FAILURE
+SVN_ERR_FS_MALFORMED_TXN_ID = _core.SVN_ERR_FS_MALFORMED_TXN_ID
+SVN_ERR_FS_INDEX_CORRUPTION = _core.SVN_ERR_FS_INDEX_CORRUPTION
+SVN_ERR_FS_INDEX_REVISION = _core.SVN_ERR_FS_INDEX_REVISION
+SVN_ERR_FS_INDEX_OVERFLOW = _core.SVN_ERR_FS_INDEX_OVERFLOW
+SVN_ERR_FS_CONTAINER_INDEX = _core.SVN_ERR_FS_CONTAINER_INDEX
+SVN_ERR_FS_INDEX_INCONSISTENT = _core.SVN_ERR_FS_INDEX_INCONSISTENT
+SVN_ERR_FS_LOCK_OPERATION_FAILED = _core.SVN_ERR_FS_LOCK_OPERATION_FAILED
+SVN_ERR_FS_UNSUPPORTED_TYPE = _core.SVN_ERR_FS_UNSUPPORTED_TYPE
+SVN_ERR_FS_CONTAINER_SIZE = _core.SVN_ERR_FS_CONTAINER_SIZE
+SVN_ERR_FS_MALFORMED_NODEREV_ID = _core.SVN_ERR_FS_MALFORMED_NODEREV_ID
+SVN_ERR_FS_INVALID_GENERATION = _core.SVN_ERR_FS_INVALID_GENERATION
 SVN_ERR_REPOS_LOCKED = _core.SVN_ERR_REPOS_LOCKED
 SVN_ERR_REPOS_HOOK_FAILURE = _core.SVN_ERR_REPOS_HOOK_FAILURE
 SVN_ERR_REPOS_BAD_ARGS = _core.SVN_ERR_REPOS_BAD_ARGS
@@ -277,6 +293,7 @@ SVN_ERR_RA_UUID_MISMATCH = _core.SVN_ERR_RA_UUID_MISMATCH
 SVN_ERR_RA_REPOS_ROOT_URL_MISMATCH = _core.SVN_ERR_RA_REPOS_ROOT_URL_MISMATCH
 SVN_ERR_RA_SESSION_URL_MISMATCH = _core.SVN_ERR_RA_SESSION_URL_MISMATCH
 SVN_ERR_RA_CANNOT_CREATE_TUNNEL = _core.SVN_ERR_RA_CANNOT_CREATE_TUNNEL
+SVN_ERR_RA_CANNOT_CREATE_SESSION = _core.SVN_ERR_RA_CANNOT_CREATE_SESSION
 SVN_ERR_RA_DAV_SOCK_INIT = _core.SVN_ERR_RA_DAV_SOCK_INIT
 SVN_ERR_RA_DAV_CREATING_REQUEST = _core.SVN_ERR_RA_DAV_CREATING_REQUEST
 SVN_ERR_RA_DAV_REQUEST_FAILED = _core.SVN_ERR_RA_DAV_REQUEST_FAILED
@@ -291,6 +308,8 @@ SVN_ERR_RA_DAV_RESPONSE_HEADER_BADNESS = _core.SVN_ERR_RA_DAV_RESPONSE_HEADER_BA
 SVN_ERR_RA_DAV_RELOCATED = _core.SVN_ERR_RA_DAV_RELOCATED
 SVN_ERR_RA_DAV_CONN_TIMEOUT = _core.SVN_ERR_RA_DAV_CONN_TIMEOUT
 SVN_ERR_RA_DAV_FORBIDDEN = _core.SVN_ERR_RA_DAV_FORBIDDEN
+SVN_ERR_RA_DAV_PRECONDITION_FAILED = _core.SVN_ERR_RA_DAV_PRECONDITION_FAILED
+SVN_ERR_RA_DAV_METHOD_NOT_ALLOWED = _core.SVN_ERR_RA_DAV_METHOD_NOT_ALLOWED
 SVN_ERR_RA_LOCAL_REPOS_NOT_FOUND = _core.SVN_ERR_RA_LOCAL_REPOS_NOT_FOUND
 SVN_ERR_RA_LOCAL_REPOS_OPEN_FAILED = _core.SVN_ERR_RA_LOCAL_REPOS_OPEN_FAILED
 SVN_ERR_SVNDIFF_INVALID_HEADER = _core.SVN_ERR_SVNDIFF_INVALID_HEADER
@@ -367,6 +386,11 @@ SVN_ERR_SQLITE_CONSTRAINT = _core.SVN_ERR_SQLITE_CONSTRAINT
 SVN_ERR_TOO_MANY_MEMCACHED_SERVERS = _core.SVN_ERR_TOO_MANY_MEMCACHED_SERVERS
 SVN_ERR_MALFORMED_VERSION_STRING = _core.SVN_ERR_MALFORMED_VERSION_STRING
 SVN_ERR_CORRUPTED_ATOMIC_STORAGE = _core.SVN_ERR_CORRUPTED_ATOMIC_STORAGE
+SVN_ERR_UTF8PROC_ERROR = _core.SVN_ERR_UTF8PROC_ERROR
+SVN_ERR_UTF8_GLOB = _core.SVN_ERR_UTF8_GLOB
+SVN_ERR_CORRUPT_PACKED_DATA = _core.SVN_ERR_CORRUPT_PACKED_DATA
+SVN_ERR_COMPOSED_ERROR = _core.SVN_ERR_COMPOSED_ERROR
+SVN_ERR_INVALID_INPUT = _core.SVN_ERR_INVALID_INPUT
 SVN_ERR_CL_ARG_PARSING_ERROR = _core.SVN_ERR_CL_ARG_PARSING_ERROR
 SVN_ERR_CL_INSUFFICIENT_ARGS = _core.SVN_ERR_CL_INSUFFICIENT_ARGS
 SVN_ERR_CL_MUTUALLY_EXCLUSIVE_ARGS = _core.SVN_ERR_CL_MUTUALLY_EXCLUSIVE_ARGS
@@ -379,6 +403,7 @@ SVN_ERR_CL_BAD_LOG_MESSAGE = _core.SVN_ERR_CL_BAD_LOG_MESSAGE
 SVN_ERR_CL_UNNECESSARY_LOG_MESSAGE = _core.SVN_ERR_CL_UNNECESSARY_LOG_MESSAGE
 SVN_ERR_CL_NO_EXTERNAL_MERGE_TOOL = _core.SVN_ERR_CL_NO_EXTERNAL_MERGE_TOOL
 SVN_ERR_CL_ERROR_PROCESSING_EXTERNALS = _core.SVN_ERR_CL_ERROR_PROCESSING_EXTERNALS
+SVN_ERR_CL_REPOS_VERIFY_FAILED = _core.SVN_ERR_CL_REPOS_VERIFY_FAILED
 SVN_ERR_RA_SVN_CMD_ERR = _core.SVN_ERR_RA_SVN_CMD_ERR
 SVN_ERR_RA_SVN_UNKNOWN_CMD = _core.SVN_ERR_RA_SVN_UNKNOWN_CMD
 SVN_ERR_RA_SVN_CONNECTION_CLOSED = _core.SVN_ERR_RA_SVN_CONNECTION_CLOSED
@@ -405,6 +430,26 @@ SVN_ERR_RA_SERF_GSSAPI_INITIALISATION_FAILED = _core.SVN_ERR_RA_SERF_GSSAPI_INIT
 SVN_ERR_RA_SERF_WRAPPED_ERROR = _core.SVN_ERR_RA_SERF_WRAPPED_ERROR
 SVN_ERR_ASSERTION_FAIL = _core.SVN_ERR_ASSERTION_FAIL
 SVN_ERR_ASSERTION_ONLY_TRACING_LINKS = _core.SVN_ERR_ASSERTION_ONLY_TRACING_LINKS
+SVN_ERR_ASN1_OUT_OF_DATA = _core.SVN_ERR_ASN1_OUT_OF_DATA
+SVN_ERR_ASN1_UNEXPECTED_TAG = _core.SVN_ERR_ASN1_UNEXPECTED_TAG
+SVN_ERR_ASN1_INVALID_LENGTH = _core.SVN_ERR_ASN1_INVALID_LENGTH
+SVN_ERR_ASN1_LENGTH_MISMATCH = _core.SVN_ERR_ASN1_LENGTH_MISMATCH
+SVN_ERR_ASN1_INVALID_DATA = _core.SVN_ERR_ASN1_INVALID_DATA
+SVN_ERR_X509_FEATURE_UNAVAILABLE = _core.SVN_ERR_X509_FEATURE_UNAVAILABLE
+SVN_ERR_X509_CERT_INVALID_PEM = _core.SVN_ERR_X509_CERT_INVALID_PEM
+SVN_ERR_X509_CERT_INVALID_FORMAT = _core.SVN_ERR_X509_CERT_INVALID_FORMAT
+SVN_ERR_X509_CERT_INVALID_VERSION = _core.SVN_ERR_X509_CERT_INVALID_VERSION
+SVN_ERR_X509_CERT_INVALID_SERIAL = _core.SVN_ERR_X509_CERT_INVALID_SERIAL
+SVN_ERR_X509_CERT_INVALID_ALG = _core.SVN_ERR_X509_CERT_INVALID_ALG
+SVN_ERR_X509_CERT_INVALID_NAME = _core.SVN_ERR_X509_CERT_INVALID_NAME
+SVN_ERR_X509_CERT_INVALID_DATE = _core.SVN_ERR_X509_CERT_INVALID_DATE
+SVN_ERR_X509_CERT_INVALID_PUBKEY = _core.SVN_ERR_X509_CERT_INVALID_PUBKEY
+SVN_ERR_X509_CERT_INVALID_SIGNATURE = _core.SVN_ERR_X509_CERT_INVALID_SIGNATURE
+SVN_ERR_X509_CERT_INVALID_EXTENSIONS = _core.SVN_ERR_X509_CERT_INVALID_EXTENSIONS
+SVN_ERR_X509_CERT_UNKNOWN_VERSION = _core.SVN_ERR_X509_CERT_UNKNOWN_VERSION
+SVN_ERR_X509_CERT_UNKNOWN_PK_ALG = _core.SVN_ERR_X509_CERT_UNKNOWN_PK_ALG
+SVN_ERR_X509_CERT_SIG_MISMATCH = _core.SVN_ERR_X509_CERT_SIG_MISMATCH
+SVN_ERR_X509_CERT_VERIFY_FAILED = _core.SVN_ERR_X509_CERT_VERIFY_FAILED
 SVN_ERR_LAST = _core.SVN_ERR_LAST
 
 def svn_time_to_cstring(*args):
@@ -447,7 +492,7 @@ class svn_error_t:
     __swig_setmethods__["line"] = _core.svn_error_t_line_set
     __swig_getmethods__["line"] = _core.svn_error_t_line_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_error_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -466,13 +511,13 @@ class svn_error_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -481,9 +526,9 @@ class svn_error_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -498,18 +543,6 @@ class svn_error_t:
 svn_error_t_swigregister = _core.svn_error_t_swigregister
 svn_error_t_swigregister(svn_error_t)
 
-
-def svn__apr_hash_index_key(*args):
-  """svn__apr_hash_index_key(apr_hash_index_t const * hi) -> void const *"""
-  return _core.svn__apr_hash_index_key(*args)
-
-def svn__apr_hash_index_klen(*args):
-  """svn__apr_hash_index_klen(apr_hash_index_t const * hi) -> apr_ssize_t"""
-  return _core.svn__apr_hash_index_klen(*args)
-
-def svn__apr_hash_index_val(*args):
-  """svn__apr_hash_index_val(apr_hash_index_t const * hi) -> void *"""
-  return _core.svn__apr_hash_index_val(*args)
 svn_node_none = _core.svn_node_none
 svn_node_file = _core.svn_node_file
 svn_node_dir = _core.svn_node_dir
@@ -580,7 +613,7 @@ class svn_dirent_t:
     __swig_getmethods__["time"] = _core.svn_dirent_t_time_get
     __swig_getmethods__["last_author"] = _core.svn_dirent_t_last_author_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_dirent_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -599,13 +632,13 @@ class svn_dirent_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -614,9 +647,9 @@ class svn_dirent_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -669,7 +702,7 @@ class svn_commit_info_t:
     __swig_setmethods__["repos_root"] = _core.svn_commit_info_t_repos_root_set
     __swig_getmethods__["repos_root"] = _core.svn_commit_info_t_repos_root_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_commit_info_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -688,13 +721,13 @@ class svn_commit_info_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -703,9 +736,9 @@ class svn_commit_info_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -748,7 +781,7 @@ class svn_log_changed_path2_t:
     __swig_setmethods__["props_modified"] = _core.svn_log_changed_path2_t_props_modified_set
     __swig_getmethods__["props_modified"] = _core.svn_log_changed_path2_t_props_modified_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_log_changed_path2_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -767,13 +800,13 @@ class svn_log_changed_path2_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -782,9 +815,9 @@ class svn_log_changed_path2_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -820,7 +853,7 @@ class svn_log_changed_path_t:
     __swig_setmethods__["copyfrom_rev"] = _core.svn_log_changed_path_t_copyfrom_rev_set
     __swig_getmethods__["copyfrom_rev"] = _core.svn_log_changed_path_t_copyfrom_rev_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_log_changed_path_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -839,13 +872,13 @@ class svn_log_changed_path_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -854,9 +887,9 @@ class svn_log_changed_path_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -897,7 +930,7 @@ class svn_log_entry_t:
     __swig_setmethods__["subtractive_merge"] = _core.svn_log_entry_t_subtractive_merge_set
     __swig_getmethods__["subtractive_merge"] = _core.svn_log_entry_t_subtractive_merge_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_log_entry_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -916,13 +949,13 @@ class svn_log_entry_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -931,9 +964,9 @@ class svn_log_entry_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -988,7 +1021,7 @@ class svn_lock_t:
     __swig_setmethods__["expiration_date"] = _core.svn_lock_t_expiration_date_set
     __swig_getmethods__["expiration_date"] = _core.svn_lock_t_expiration_date_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_lock_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1007,13 +1040,13 @@ class svn_lock_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1022,9 +1055,9 @@ class svn_lock_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -1065,7 +1098,7 @@ class svn_merge_range_t:
     __swig_setmethods__["inheritable"] = _core.svn_merge_range_t_inheritable_set
     __swig_getmethods__["inheritable"] = _core.svn_merge_range_t_inheritable_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_merge_range_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1084,13 +1117,13 @@ class svn_merge_range_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1099,9 +1132,9 @@ class svn_merge_range_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -1138,7 +1171,7 @@ class svn_location_segment_t:
     __swig_setmethods__["path"] = _core.svn_location_segment_t_path_set
     __swig_getmethods__["path"] = _core.svn_location_segment_t_path_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_location_segment_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1157,13 +1190,13 @@ class svn_location_segment_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1172,9 +1205,9 @@ class svn_location_segment_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -1202,7 +1235,7 @@ class svn_version_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_version_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1221,13 +1254,13 @@ class svn_version_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1236,9 +1269,9 @@ class svn_version_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -1289,7 +1322,7 @@ class svn_log_entry_receiver_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_log_entry_receiver_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1308,13 +1341,13 @@ class svn_log_entry_receiver_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1323,9 +1356,9 @@ class svn_log_entry_receiver_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -1345,7 +1378,7 @@ class svn_log_message_receiver_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_log_message_receiver_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1364,13 +1397,13 @@ class svn_log_message_receiver_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1379,9 +1412,9 @@ class svn_log_message_receiver_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -1401,7 +1434,7 @@ class svn_commit_callback2_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_commit_callback2_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1420,13 +1453,13 @@ class svn_commit_callback2_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1435,9 +1468,9 @@ class svn_commit_callback2_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -1457,7 +1490,7 @@ class svn_commit_callback_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_commit_callback_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1476,13 +1509,13 @@ class svn_commit_callback_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1491,9 +1524,9 @@ class svn_commit_callback_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -1513,7 +1546,7 @@ class svn_cancel_func_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_cancel_func_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1532,13 +1565,13 @@ class svn_cancel_func_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1547,9 +1580,9 @@ class svn_cancel_func_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -1569,7 +1602,7 @@ class svn_location_segment_receiver_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_location_segment_receiver_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1588,13 +1621,13 @@ class svn_location_segment_receiver_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1603,9 +1636,9 @@ class svn_location_segment_receiver_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -1656,7 +1689,7 @@ class svn_version_checklist_t:
     __swig_setmethods__["version_query"] = _core.svn_version_checklist_t_version_query_set
     __swig_getmethods__["version_query"] = _core.svn_version_checklist_t_version_query_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_version_checklist_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1675,13 +1708,13 @@ class svn_version_checklist_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1690,9 +1723,9 @@ class svn_version_checklist_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -1711,6 +1744,10 @@ svn_version_checklist_t_swigregister = _core.svn_version_checklist_t_swigregiste
 svn_version_checklist_t_swigregister(svn_version_checklist_t)
 
 
+def svn_ver_check_list2(*args):
+  """svn_ver_check_list2(svn_version_t const * my_version, svn_version_checklist_t checklist, svn_boolean_t (*)(svn_version_t const *,svn_version_t const *) comparator) -> svn_error_t"""
+  return _core.svn_ver_check_list2(*args)
+
 def svn_ver_check_list(*args):
   """svn_ver_check_list(svn_version_t const * my_version, svn_version_checklist_t checklist) -> svn_error_t"""
   return _core.svn_ver_check_list(*args)
@@ -1760,7 +1797,7 @@ class svn_version_ext_linked_lib_t:
     __swig_setmethods__["runtime_version"] = _core.svn_version_ext_linked_lib_t_runtime_version_set
     __swig_getmethods__["runtime_version"] = _core.svn_version_ext_linked_lib_t_runtime_version_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_version_ext_linked_lib_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1779,13 +1816,13 @@ class svn_version_ext_linked_lib_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1794,9 +1831,9 @@ class svn_version_ext_linked_lib_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -1827,7 +1864,7 @@ class svn_version_ext_loaded_lib_t:
     __swig_setmethods__["version"] = _core.svn_version_ext_loaded_lib_t_version_set
     __swig_getmethods__["version"] = _core.svn_version_ext_loaded_lib_t_version_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_version_ext_loaded_lib_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1846,13 +1883,13 @@ class svn_version_ext_loaded_lib_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1861,9 +1898,9 @@ class svn_version_ext_loaded_lib_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -1891,7 +1928,7 @@ class svn_version_extended_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_version_extended_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1910,13 +1947,13 @@ class svn_version_extended_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1925,9 +1962,9 @@ class svn_version_extended_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -1952,7 +1989,7 @@ class svn_version_func_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_version_func_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1971,13 +2008,13 @@ class svn_version_func_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1986,9 +2023,9 @@ class svn_version_func_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -2019,7 +2056,7 @@ class svn_prop_inherited_item_t:
     __swig_setmethods__["prop_hash"] = _core.svn_prop_inherited_item_t_prop_hash_set
     __swig_getmethods__["prop_hash"] = _core.svn_prop_inherited_item_t_prop_hash_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_prop_inherited_item_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -2038,13 +2075,13 @@ class svn_prop_inherited_item_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -2053,9 +2090,9 @@ class svn_prop_inherited_item_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -2206,7 +2243,7 @@ class svn_opt_subcommand_desc2_t:
     __swig_getmethods__["valid_options"] = _core.svn_opt_subcommand_desc2_t_valid_options_get
     __swig_getmethods__["desc_overrides"] = _core.svn_opt_subcommand_desc2_t_desc_overrides_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_opt_subcommand_desc2_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -2225,13 +2262,13 @@ class svn_opt_subcommand_desc2_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -2240,9 +2277,9 @@ class svn_opt_subcommand_desc2_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -2296,7 +2333,7 @@ class svn_opt_subcommand_desc_t:
     __swig_setmethods__["valid_options"] = _core.svn_opt_subcommand_desc_t_valid_options_set
     __swig_getmethods__["valid_options"] = _core.svn_opt_subcommand_desc_t_valid_options_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_opt_subcommand_desc_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -2315,13 +2352,13 @@ class svn_opt_subcommand_desc_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -2330,9 +2367,9 @@ class svn_opt_subcommand_desc_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -2430,7 +2467,7 @@ class svn_opt_revision_value_t:
     __swig_setmethods__["date"] = _core.svn_opt_revision_value_t_date_set
     __swig_getmethods__["date"] = _core.svn_opt_revision_value_t_date_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_opt_revision_value_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -2449,13 +2486,13 @@ class svn_opt_revision_value_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -2464,9 +2501,9 @@ class svn_opt_revision_value_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -2493,7 +2530,7 @@ class svn_opt_revision_t:
     __swig_setmethods__["value"] = _core.svn_opt_revision_t_value_set
     __swig_getmethods__["value"] = _core.svn_opt_revision_t_value_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_opt_revision_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -2512,13 +2549,13 @@ class svn_opt_revision_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -2527,9 +2564,9 @@ class svn_opt_revision_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -2556,7 +2593,7 @@ class svn_opt_revision_range_t:
     __swig_setmethods__["end"] = _core.svn_opt_revision_range_t_end_set
     __swig_getmethods__["end"] = _core.svn_opt_revision_range_t_end_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_opt_revision_range_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -2575,13 +2612,13 @@ class svn_opt_revision_range_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -2590,9 +2627,9 @@ class svn_opt_revision_range_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -2694,6 +2731,17 @@ def svn_cmdline_init(*args):
   """svn_cmdline_init(char const * progname, FILE * error_stream) -> int"""
   return _core.svn_cmdline_init(*args)
 
+def svn_cmdline_create_auth_baton2(*args):
+  """
+    svn_cmdline_create_auth_baton2(svn_boolean_t non_interactive, char const * username, char const * password, char const * config_dir, 
+        svn_boolean_t no_auth_cache, svn_boolean_t trust_server_cert_unknown_ca, 
+        svn_boolean_t trust_server_cert_cn_mismatch, svn_boolean_t trust_server_cert_expired, 
+        svn_boolean_t trust_server_cert_not_yet_valid, 
+        svn_boolean_t trust_server_cert_other_failure, svn_config_t * cfg, svn_cancel_func_t cancel_func, 
+        apr_pool_t pool) -> svn_error_t
+    """
+  return _core.svn_cmdline_create_auth_baton2(*args)
+
 def svn_cmdline_create_auth_baton(*args):
   """
     svn_cmdline_create_auth_baton(svn_boolean_t non_interactive, char const * username, char const * password, char const * config_dir, 
@@ -2717,7 +2765,7 @@ class svn_auth_provider_t:
     __swig_setmethods__["save_credentials"] = _core.svn_auth_provider_t_save_credentials_set
     __swig_getmethods__["save_credentials"] = _core.svn_auth_provider_t_save_credentials_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_auth_provider_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -2736,13 +2784,13 @@ class svn_auth_provider_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -2751,9 +2799,9 @@ class svn_auth_provider_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -2789,7 +2837,7 @@ class svn_auth_provider_object_t:
     __swig_setmethods__["provider_baton"] = _core.svn_auth_provider_object_t_provider_baton_set
     __swig_getmethods__["provider_baton"] = _core.svn_auth_provider_object_t_provider_baton_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_auth_provider_object_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -2808,13 +2856,13 @@ class svn_auth_provider_object_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -2823,9 +2871,9 @@ class svn_auth_provider_object_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -2855,7 +2903,7 @@ class svn_auth_cred_simple_t:
     __swig_setmethods__["may_save"] = _core.svn_auth_cred_simple_t_may_save_set
     __swig_getmethods__["may_save"] = _core.svn_auth_cred_simple_t_may_save_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_auth_cred_simple_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -2874,13 +2922,13 @@ class svn_auth_cred_simple_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -2889,9 +2937,9 @@ class svn_auth_cred_simple_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -2919,7 +2967,7 @@ class svn_auth_cred_username_t:
     __swig_setmethods__["may_save"] = _core.svn_auth_cred_username_t_may_save_set
     __swig_getmethods__["may_save"] = _core.svn_auth_cred_username_t_may_save_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_auth_cred_username_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -2938,13 +2986,13 @@ class svn_auth_cred_username_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -2953,9 +3001,9 @@ class svn_auth_cred_username_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -2983,7 +3031,7 @@ class svn_auth_cred_ssl_client_cert_t:
     __swig_setmethods__["may_save"] = _core.svn_auth_cred_ssl_client_cert_t_may_save_set
     __swig_getmethods__["may_save"] = _core.svn_auth_cred_ssl_client_cert_t_may_save_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_auth_cred_ssl_client_cert_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -3002,13 +3050,13 @@ class svn_auth_cred_ssl_client_cert_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -3017,9 +3065,9 @@ class svn_auth_cred_ssl_client_cert_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -3047,7 +3095,7 @@ class svn_auth_cred_ssl_client_cert_pw_t:
     __swig_setmethods__["may_save"] = _core.svn_auth_cred_ssl_client_cert_pw_t_may_save_set
     __swig_getmethods__["may_save"] = _core.svn_auth_cred_ssl_client_cert_pw_t_may_save_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_auth_cred_ssl_client_cert_pw_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -3066,13 +3114,13 @@ class svn_auth_cred_ssl_client_cert_pw_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -3081,9 +3129,9 @@ class svn_auth_cred_ssl_client_cert_pw_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -3119,7 +3167,7 @@ class svn_auth_ssl_server_cert_info_t:
     __swig_setmethods__["ascii_cert"] = _core.svn_auth_ssl_server_cert_info_t_ascii_cert_set
     __swig_getmethods__["ascii_cert"] = _core.svn_auth_ssl_server_cert_info_t_ascii_cert_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_auth_ssl_server_cert_info_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -3138,13 +3186,13 @@ class svn_auth_ssl_server_cert_info_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -3153,9 +3201,9 @@ class svn_auth_ssl_server_cert_info_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -3186,7 +3234,7 @@ class svn_auth_cred_ssl_server_trust_t:
     __swig_setmethods__["accepted_failures"] = _core.svn_auth_cred_ssl_server_trust_t_accepted_failures_set
     __swig_getmethods__["accepted_failures"] = _core.svn_auth_cred_ssl_server_trust_t_accepted_failures_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_auth_cred_ssl_server_trust_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -3205,13 +3253,13 @@ class svn_auth_cred_ssl_server_trust_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -3220,9 +3268,9 @@ class svn_auth_cred_ssl_server_trust_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -3362,7 +3410,7 @@ class svn_auth_baton_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_auth_baton_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -3381,13 +3429,13 @@ class svn_auth_baton_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -3396,9 +3444,9 @@ class svn_auth_baton_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -3415,7 +3463,7 @@ class svn_auth_iterstate_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_auth_iterstate_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -3434,13 +3482,13 @@ class svn_auth_iterstate_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -3449,9 +3497,9 @@ class svn_auth_iterstate_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -3544,7 +3592,7 @@ class svn_auth_simple_provider_func_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_auth_simple_provider_func_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -3563,13 +3611,13 @@ class svn_auth_simple_provider_func_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -3578,9 +3626,9 @@ class svn_auth_simple_provider_func_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -3600,7 +3648,7 @@ class svn_auth_ssl_client_cert_pw_provider_func_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_auth_ssl_client_cert_pw_provider_func_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -3619,13 +3667,13 @@ class svn_auth_ssl_client_cert_pw_provider_func_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -3634,9 +3682,9 @@ class svn_auth_ssl_client_cert_pw_provider_func_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -3656,7 +3704,7 @@ class svn_auth_simple_prompt_func_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_auth_simple_prompt_func_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -3675,13 +3723,13 @@ class svn_auth_simple_prompt_func_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -3690,9 +3738,9 @@ class svn_auth_simple_prompt_func_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -3712,7 +3760,7 @@ class svn_auth_username_prompt_func_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_auth_username_prompt_func_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -3731,13 +3779,13 @@ class svn_auth_username_prompt_func_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -3746,9 +3794,9 @@ class svn_auth_username_prompt_func_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -3768,7 +3816,7 @@ class svn_auth_ssl_server_trust_prompt_func_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_auth_ssl_server_trust_prompt_func_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -3787,13 +3835,13 @@ class svn_auth_ssl_server_trust_prompt_func_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -3802,9 +3850,9 @@ class svn_auth_ssl_server_trust_prompt_func_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -3824,7 +3872,7 @@ class svn_auth_ssl_client_cert_prompt_func_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_auth_ssl_client_cert_prompt_func_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -3843,13 +3891,13 @@ class svn_auth_ssl_client_cert_prompt_func_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -3858,9 +3906,9 @@ class svn_auth_ssl_client_cert_prompt_func_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -3880,7 +3928,7 @@ class svn_auth_ssl_client_cert_pw_prompt_func_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_auth_ssl_client_cert_pw_prompt_func_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -3899,13 +3947,13 @@ class svn_auth_ssl_client_cert_pw_prompt_func_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -3914,9 +3962,9 @@ class svn_auth_ssl_client_cert_pw_prompt_func_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -3936,7 +3984,7 @@ class svn_auth_plaintext_prompt_func_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_auth_plaintext_prompt_func_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -3955,13 +4003,13 @@ class svn_auth_plaintext_prompt_func_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -3970,9 +4018,9 @@ class svn_auth_plaintext_prompt_func_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -3992,7 +4040,7 @@ class svn_auth_plaintext_passphrase_prompt_func_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_auth_plaintext_passphrase_prompt_func_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -4011,13 +4059,13 @@ class svn_auth_plaintext_passphrase_prompt_func_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -4026,9 +4074,9 @@ class svn_auth_plaintext_passphrase_prompt_func_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -4048,7 +4096,7 @@ class svn_auth_gnome_keyring_unlock_prompt_func_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_auth_gnome_keyring_unlock_prompt_func_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -4067,13 +4115,13 @@ class svn_auth_gnome_keyring_unlock_prompt_func_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -4082,9 +4130,9 @@ class svn_auth_gnome_keyring_unlock_prompt_func_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -4121,6 +4169,9 @@ SVN_CONFIG_OPTION_STORE_SSL_CLIENT_CERT_PP_PLAINTEXT = _core.SVN_CONFIG_OPTION_S
 SVN_CONFIG_OPTION_USERNAME = _core.SVN_CONFIG_OPTION_USERNAME
 SVN_CONFIG_OPTION_HTTP_BULK_UPDATES = _core.SVN_CONFIG_OPTION_HTTP_BULK_UPDATES
 SVN_CONFIG_OPTION_HTTP_MAX_CONNECTIONS = _core.SVN_CONFIG_OPTION_HTTP_MAX_CONNECTIONS
+SVN_CONFIG_OPTION_HTTP_CHUNKED_REQUESTS = _core.SVN_CONFIG_OPTION_HTTP_CHUNKED_REQUESTS
+SVN_CONFIG_OPTION_SERF_LOG_COMPONENTS = _core.SVN_CONFIG_OPTION_SERF_LOG_COMPONENTS
+SVN_CONFIG_OPTION_SERF_LOG_LEVEL = _core.SVN_CONFIG_OPTION_SERF_LOG_LEVEL
 SVN_CONFIG_CATEGORY_CONFIG = _core.SVN_CONFIG_CATEGORY_CONFIG
 SVN_CONFIG_SECTION_AUTH = _core.SVN_CONFIG_SECTION_AUTH
 SVN_CONFIG_OPTION_PASSWORD_STORES = _core.SVN_CONFIG_OPTION_PASSWORD_STORES
@@ -4140,16 +4191,19 @@ SVN_CONFIG_OPTION_LOG_ENCODING = _core.SVN_CONFIG_OPTION_LOG_ENCODING
 SVN_CONFIG_OPTION_USE_COMMIT_TIMES = _core.SVN_CONFIG_OPTION_USE_COMMIT_TIMES
 SVN_CONFIG_OPTION_TEMPLATE_ROOT = _core.SVN_CONFIG_OPTION_TEMPLATE_ROOT
 SVN_CONFIG_OPTION_ENABLE_AUTO_PROPS = _core.SVN_CONFIG_OPTION_ENABLE_AUTO_PROPS
+SVN_CONFIG_OPTION_ENABLE_MAGIC_FILE = _core.SVN_CONFIG_OPTION_ENABLE_MAGIC_FILE
 SVN_CONFIG_OPTION_NO_UNLOCK = _core.SVN_CONFIG_OPTION_NO_UNLOCK
 SVN_CONFIG_OPTION_MIMETYPES_FILE = _core.SVN_CONFIG_OPTION_MIMETYPES_FILE
 SVN_CONFIG_OPTION_PRESERVED_CF_EXTS = _core.SVN_CONFIG_OPTION_PRESERVED_CF_EXTS
 SVN_CONFIG_OPTION_INTERACTIVE_CONFLICTS = _core.SVN_CONFIG_OPTION_INTERACTIVE_CONFLICTS
 SVN_CONFIG_OPTION_MEMORY_CACHE_SIZE = _core.SVN_CONFIG_OPTION_MEMORY_CACHE_SIZE
+SVN_CONFIG_OPTION_DIFF_IGNORE_CONTENT_TYPE = _core.SVN_CONFIG_OPTION_DIFF_IGNORE_CONTENT_TYPE
 SVN_CONFIG_SECTION_TUNNELS = _core.SVN_CONFIG_SECTION_TUNNELS
 SVN_CONFIG_SECTION_AUTO_PROPS = _core.SVN_CONFIG_SECTION_AUTO_PROPS
 SVN_CONFIG_SECTION_WORKING_COPY = _core.SVN_CONFIG_SECTION_WORKING_COPY
 SVN_CONFIG_OPTION_SQLITE_EXCLUSIVE = _core.SVN_CONFIG_OPTION_SQLITE_EXCLUSIVE
 SVN_CONFIG_OPTION_SQLITE_EXCLUSIVE_CLIENTS = _core.SVN_CONFIG_OPTION_SQLITE_EXCLUSIVE_CLIENTS
+SVN_CONFIG_OPTION_SQLITE_BUSY_TIMEOUT = _core.SVN_CONFIG_OPTION_SQLITE_BUSY_TIMEOUT
 SVN_CONFIG_SECTION_GENERAL = _core.SVN_CONFIG_SECTION_GENERAL
 SVN_CONFIG_OPTION_ANON_ACCESS = _core.SVN_CONFIG_OPTION_ANON_ACCESS
 SVN_CONFIG_OPTION_AUTH_ACCESS = _core.SVN_CONFIG_OPTION_AUTH_ACCESS
@@ -4299,6 +4353,12 @@ def svn_config_ensure(*args):
   """svn_config_ensure(char const * config_dir, apr_pool_t pool) -> svn_error_t"""
   return _core.svn_config_ensure(*args)
 SVN_CONFIG_REALMSTRING_KEY = _core.SVN_CONFIG_REALMSTRING_KEY
+SVN_CONFIG_AUTHN_USERNAME_KEY = _core.SVN_CONFIG_AUTHN_USERNAME_KEY
+SVN_CONFIG_AUTHN_PASSWORD_KEY = _core.SVN_CONFIG_AUTHN_PASSWORD_KEY
+SVN_CONFIG_AUTHN_PASSPHRASE_KEY = _core.SVN_CONFIG_AUTHN_PASSPHRASE_KEY
+SVN_CONFIG_AUTHN_PASSTYPE_KEY = _core.SVN_CONFIG_AUTHN_PASSTYPE_KEY
+SVN_CONFIG_AUTHN_ASCII_CERT_KEY = _core.SVN_CONFIG_AUTHN_ASCII_CERT_KEY
+SVN_CONFIG_AUTHN_FAILURES_KEY = _core.SVN_CONFIG_AUTHN_FAILURES_KEY
 
 def svn_config_read_auth_data(*args):
   """svn_config_read_auth_data(char const * cred_kind, char const * realmstring, char const * config_dir, apr_pool_t pool) -> svn_error_t"""
@@ -4320,7 +4380,7 @@ def svn_config_get_user_config_path(*args):
   return _core.svn_config_get_user_config_path(*args)
 
 def svn_config_dup(*args):
-  """svn_config_dup(svn_config_t * src, apr_pool_t pool) -> svn_error_t"""
+  """svn_config_dup(svn_config_t const * src, apr_pool_t pool) -> svn_error_t"""
   return _core.svn_config_dup(*args)
 
 def svn_config_copy_config(*args):
@@ -4335,7 +4395,7 @@ class svn_config_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_config_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -4354,13 +4414,13 @@ class svn_config_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -4369,9 +4429,9 @@ class svn_config_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -4401,7 +4461,7 @@ def svn_config_invoke_enumerator2(*args):
 
 def svn_config_invoke_auth_walk_func(*args):
   """
-    svn_config_invoke_auth_walk_func(svn_config_auth_walk_func_t _obj, void * cleanup_baton, char const * cred_kind, char const * realmstring, 
+    svn_config_invoke_auth_walk_func(svn_config_auth_walk_func_t _obj, void * walk_baton, char const * cred_kind, char const * realmstring, 
         apr_hash_t hash, apr_pool_t scratch_pool) -> svn_error_t
     """
   return _core.svn_config_invoke_auth_walk_func(*args)
@@ -4414,7 +4474,7 @@ class svn_config_section_enumerator_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_config_section_enumerator_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -4433,13 +4493,13 @@ class svn_config_section_enumerator_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -4448,9 +4508,9 @@ class svn_config_section_enumerator_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -4470,7 +4530,7 @@ class svn_config_section_enumerator2_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_config_section_enumerator2_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -4489,13 +4549,13 @@ class svn_config_section_enumerator2_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -4504,9 +4564,9 @@ class svn_config_section_enumerator2_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -4526,7 +4586,7 @@ class svn_config_enumerator_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_config_enumerator_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -4545,13 +4605,13 @@ class svn_config_enumerator_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -4560,9 +4620,9 @@ class svn_config_enumerator_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -4582,7 +4642,7 @@ class svn_config_enumerator2_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_config_enumerator2_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -4601,13 +4661,13 @@ class svn_config_enumerator2_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -4616,9 +4676,9 @@ class svn_config_enumerator2_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -4638,7 +4698,7 @@ class svn_config_auth_walk_func_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_config_auth_walk_func_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -4657,13 +4717,13 @@ class svn_config_auth_walk_func_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -4672,9 +4732,9 @@ class svn_config_auth_walk_func_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -4862,6 +4922,10 @@ def svn_relpath_dirname(*args):
   """svn_relpath_dirname(char const * relpath, apr_pool_t result_pool) -> char *"""
   return _core.svn_relpath_dirname(*args)
 
+def svn_relpath_prefix(*args):
+  """svn_relpath_prefix(char const * relpath, int max_components, apr_pool_t result_pool) -> char const *"""
+  return _core.svn_relpath_prefix(*args)
+
 def svn_uri_split(*args):
   """svn_uri_split(char const * uri, apr_pool_t result_pool)"""
   return _core.svn_uri_split(*args)
@@ -5102,7 +5166,7 @@ class svn_io_dirent2_t:
     __swig_setmethods__["mtime"] = _core.svn_io_dirent2_t_mtime_set
     __swig_getmethods__["mtime"] = _core.svn_io_dirent2_t_mtime_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_io_dirent2_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -5121,13 +5185,13 @@ class svn_io_dirent2_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -5136,9 +5200,9 @@ class svn_io_dirent2_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -5173,7 +5237,7 @@ class svn_io_dirent_t:
     __swig_setmethods__["special"] = _core.svn_io_dirent_t_special_set
     __swig_getmethods__["special"] = _core.svn_io_dirent_t_special_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_io_dirent_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -5192,13 +5256,13 @@ class svn_io_dirent_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -5207,9 +5271,9 @@ class svn_io_dirent_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -5272,6 +5336,14 @@ def svn_io_files_contents_three_same_p(*args):
   """svn_io_files_contents_three_same_p(char const * file1, char const * file2, char const * file3, apr_pool_t scratch_pool) -> svn_error_t"""
   return _core.svn_io_files_contents_three_same_p(*args)
 
+def svn_io_file_create_bytes(*args):
+  """svn_io_file_create_bytes(char const * file, void const * contents, apr_size_t length, apr_pool_t scratch_pool) -> svn_error_t"""
+  return _core.svn_io_file_create_bytes(*args)
+
+def svn_io_file_create_empty(*args):
+  """svn_io_file_create_empty(char const * file, apr_pool_t scratch_pool) -> svn_error_t"""
+  return _core.svn_io_file_create_empty(*args)
+
 def svn_io_lock_open_file(*args):
   """svn_io_lock_open_file(apr_file_t lockfile_handle, svn_boolean_t exclusive, svn_boolean_t nonblocking, apr_pool_t pool) -> svn_error_t"""
   return _core.svn_io_lock_open_file(*args)
@@ -5280,6 +5352,10 @@ def svn_io_unlock_open_file(*args):
   """svn_io_unlock_open_file(apr_file_t lockfile_handle, apr_pool_t pool) -> svn_error_t"""
   return _core.svn_io_unlock_open_file(*args)
 
+def svn_stream_set_read2(*args):
+  """svn_stream_set_read2(svn_stream_t * stream, svn_read_fn_t read_fn, svn_read_fn_t read_full_fn)"""
+  return _core.svn_stream_set_read2(*args)
+
 def svn_stream_set_skip(*args):
   """svn_stream_set_skip(svn_stream_t * stream, svn_stream_skip_fn_t skip_fn)"""
   return _core.svn_stream_set_skip(*args)
@@ -5292,6 +5368,10 @@ def svn_stream_set_seek(*args):
   """svn_stream_set_seek(svn_stream_t * stream, svn_stream_seek_fn_t seek_fn)"""
   return _core.svn_stream_set_seek(*args)
 
+def svn_stream_set_data_available(*args):
+  """svn_stream_set_data_available(svn_stream_t * stream, svn_stream_data_available_fn_t data_available)"""
+  return _core.svn_stream_set_data_available(*args)
+
 def svn_stream_empty(*args):
   """svn_stream_empty(apr_pool_t pool) -> svn_stream_t *"""
   return _core.svn_stream_empty(*args)
@@ -5332,6 +5412,10 @@ def svn_stream_for_stdout(*args):
   """svn_stream_for_stdout(apr_pool_t pool) -> svn_error_t"""
   return _core.svn_stream_for_stdout(*args)
 
+def svn_stringbuf_from_stream(*args):
+  """svn_stringbuf_from_stream(svn_stream_t * stream, apr_size_t len_hint, apr_pool_t result_pool) -> svn_error_t"""
+  return _core.svn_stringbuf_from_stream(*args)
+
 def svn_stream_from_stringbuf(*args):
   """svn_stream_from_stringbuf(svn_stringbuf_t * str, apr_pool_t pool) -> svn_stream_t *"""
   return _core.svn_stream_from_stringbuf(*args)
@@ -5355,6 +5439,18 @@ def svn_stream_checksummed2(*args):
     """
   return _core.svn_stream_checksummed2(*args)
 
+def svn_stream_read_full(*args):
+  """svn_stream_read_full(svn_stream_t * stream, char * buffer) -> svn_error_t"""
+  return _core.svn_stream_read_full(*args)
+
+def svn_stream_supports_partial_read(*args):
+  """svn_stream_supports_partial_read(svn_stream_t * stream) -> svn_boolean_t"""
+  return _core.svn_stream_supports_partial_read(*args)
+
+def svn_stream_read2(*args):
+  """svn_stream_read2(svn_stream_t * stream, char * buffer) -> svn_error_t"""
+  return _core.svn_stream_read2(*args)
+
 def svn_stream_read(*args):
   """svn_stream_read(svn_stream_t * stream, char * buffer) -> svn_error_t"""
   return _core.svn_stream_read(*args)
@@ -5387,6 +5483,10 @@ def svn_stream_seek(*args):
   """svn_stream_seek(svn_stream_t * stream, svn_stream_mark_t const * mark) -> svn_error_t"""
   return _core.svn_stream_seek(*args)
 
+def svn_stream_data_available(*args):
+  """svn_stream_data_available(svn_stream_t * stream) -> svn_error_t"""
+  return _core.svn_stream_data_available(*args)
+
 def svn_stream_tee(*args):
   """svn_stream_tee(svn_stream_t * out1, svn_stream_t * out2, apr_pool_t pool) -> svn_stream_t *"""
   return _core.svn_stream_tee(*args)
@@ -5538,6 +5638,24 @@ def svn_io_file_read_full2(*args):
   """svn_io_file_read_full2(apr_file_t file, void * buf, apr_size_t nbytes, apr_pool_t pool) -> svn_error_t"""
   return _core.svn_io_file_read_full2(*args)
 
+def svn_io_file_aligned_seek(*args):
+  """
+    svn_io_file_aligned_seek(apr_file_t file, apr_off_t block_size, apr_off_t * buffer_start, apr_off_t offset, 
+        apr_pool_t scratch_pool) -> svn_error_t
+    """
+  return _core.svn_io_file_aligned_seek(*args)
+
+def svn_io_file_flush(*args):
+  """svn_io_file_flush(apr_file_t file, apr_pool_t scratch_pool) -> svn_error_t"""
+  return _core.svn_io_file_flush(*args)
+
+def svn_io_write_atomic(*args):
+  """
+    svn_io_write_atomic(char const * final_path, void const * buf, apr_size_t nbytes, char const * copy_perms_path, 
+        apr_pool_t scratch_pool) -> svn_error_t
+    """
+  return _core.svn_io_write_atomic(*args)
+
 def svn_io_write_unique(*args):
   """
     svn_io_write_unique(char const * dirpath, void const * buf, apr_size_t nbytes, svn_io_file_del_t delete_when, 
@@ -5569,7 +5687,7 @@ class svn_stream_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_stream_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -5588,13 +5706,13 @@ class svn_stream_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -5603,9 +5721,9 @@ class svn_stream_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -5622,7 +5740,7 @@ class svn_stream_mark_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_stream_mark_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -5641,13 +5759,13 @@ class svn_stream_mark_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -5656,9 +5774,9 @@ class svn_stream_mark_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -5691,6 +5809,10 @@ def svn_stream_invoke_seek_fn(*args):
   """svn_stream_invoke_seek_fn(svn_stream_seek_fn_t _obj, void * baton, svn_stream_mark_t const * mark) -> svn_error_t"""
   return _core.svn_stream_invoke_seek_fn(*args)
 
+def svn_stream_invoke_data_available_fn(*args):
+  """svn_stream_invoke_data_available_fn(svn_stream_data_available_fn_t _obj, void * baton) -> svn_error_t"""
+  return _core.svn_stream_invoke_data_available_fn(*args)
+
 def svn_stream_invoke_lazyopen_func(*args):
   """svn_stream_invoke_lazyopen_func(svn_stream_lazyopen_func_t _obj, void * baton, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
   return _core.svn_stream_invoke_lazyopen_func(*args)
@@ -5710,7 +5832,7 @@ class svn_read_fn_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_read_fn_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -5729,13 +5851,13 @@ class svn_read_fn_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -5744,9 +5866,9 @@ class svn_read_fn_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -5766,7 +5888,7 @@ class svn_stream_skip_fn_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_stream_skip_fn_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -5785,13 +5907,13 @@ class svn_stream_skip_fn_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -5800,9 +5922,9 @@ class svn_stream_skip_fn_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -5822,7 +5944,7 @@ class svn_write_fn_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_write_fn_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -5841,13 +5963,13 @@ class svn_write_fn_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -5856,9 +5978,9 @@ class svn_write_fn_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -5878,7 +6000,7 @@ class svn_close_fn_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_close_fn_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -5897,13 +6019,13 @@ class svn_close_fn_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -5912,9 +6034,9 @@ class svn_close_fn_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -5934,7 +6056,7 @@ class svn_stream_mark_fn_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_stream_mark_fn_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -5953,13 +6075,13 @@ class svn_stream_mark_fn_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -5968,9 +6090,9 @@ class svn_stream_mark_fn_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -5990,7 +6112,7 @@ class svn_stream_seek_fn_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_stream_seek_fn_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -6009,13 +6131,13 @@ class svn_stream_seek_fn_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -6024,9 +6146,9 @@ class svn_stream_seek_fn_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -6037,6 +6159,62 @@ class svn_stream_seek_fn_t:
 svn_stream_seek_fn_t_swigregister = _core.svn_stream_seek_fn_t_swigregister
 svn_stream_seek_fn_t_swigregister(svn_stream_seek_fn_t)
 
+class svn_stream_data_available_fn_t:
+    """Proxy of C svn_stream_data_available_fn_t struct"""
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_stream_data_available_fn_t, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, svn_stream_data_available_fn_t, name)
+    def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
+    __repr__ = _swig_repr
+    def set_parent_pool(self, parent_pool=None):
+      """Create a new proxy object for TYPE"""
+      import libsvn.core, weakref
+      self.__dict__["_parent_pool"] = \
+        parent_pool or libsvn.core.application_pool;
+      if self.__dict__["_parent_pool"]:
+        self.__dict__["_is_valid"] = weakref.ref(
+          self.__dict__["_parent_pool"]._is_valid)
+
+    def assert_valid(self):
+      """Assert that this object is using valid pool memory"""
+      if "_is_valid" in self.__dict__:
+        assert self.__dict__["_is_valid"](), "Variable has already been deleted"
+
+    def __getattr__(self, name):
+      """Get an attribute from this object"""
+      self.assert_valid()
+
+      value = _swig_getattr(self, self.__class__, name)
+
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
+      members = self.__dict__.get("_members")
+      if members is not None:
+        _copy_metadata_deep(value, members.get(name))
+
+      # Verify that the new object is good
+      _assert_valid_deep(value)
+
+      return value
+
+    def __setattr__(self, name, value):
+      """Set an attribute on this object"""
+      self.assert_valid()
+
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
+      self.__dict__.setdefault("_members",{})[name] = value
+
+      return _swig_setattr(self, self.__class__, name, value)
+
+    def __call__(self, *args):
+      return svn_stream_invoke_data_available_fn(self, *args)
+
+svn_stream_data_available_fn_t_swigregister = _core.svn_stream_data_available_fn_t_swigregister
+svn_stream_data_available_fn_t_swigregister(svn_stream_data_available_fn_t)
+
 class svn_stream_lazyopen_func_t:
     """Proxy of C svn_stream_lazyopen_func_t struct"""
     __swig_setmethods__ = {}
@@ -6046,7 +6224,7 @@ class svn_stream_lazyopen_func_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_stream_lazyopen_func_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -6065,13 +6243,13 @@ class svn_stream_lazyopen_func_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -6080,9 +6258,9 @@ class svn_stream_lazyopen_func_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -6102,7 +6280,7 @@ class svn_io_walk_func_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_io_walk_func_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -6121,13 +6299,13 @@ class svn_io_walk_func_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -6136,9 +6314,9 @@ class svn_io_walk_func_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -6151,6 +6329,8 @@ svn_io_walk_func_t_swigregister(svn_io_walk_func_t)
 
 svn_checksum_md5 = _core.svn_checksum_md5
 svn_checksum_sha1 = _core.svn_checksum_sha1
+svn_checksum_fnv1a_32 = _core.svn_checksum_fnv1a_32
+svn_checksum_fnv1a_32x4 = _core.svn_checksum_fnv1a_32x4
 class svn_checksum_t:
     """Proxy of C svn_checksum_t struct"""
     __swig_setmethods__ = {}
@@ -6163,7 +6343,7 @@ class svn_checksum_t:
     __swig_setmethods__["kind"] = _core.svn_checksum_t_kind_set
     __swig_getmethods__["kind"] = _core.svn_checksum_t_kind_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_checksum_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -6182,13 +6362,13 @@ class svn_checksum_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -6197,9 +6377,9 @@ class svn_checksum_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -6291,7 +6471,7 @@ class svn_checksum_ctx_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_checksum_ctx_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -6310,13 +6490,13 @@ class svn_checksum_ctx_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -6325,9 +6505,9 @@ class svn_checksum_ctx_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -6356,7 +6536,7 @@ class apr_array_header_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for apr_array_header_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -6375,13 +6555,13 @@ class apr_array_header_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -6390,9 +6570,9 @@ class apr_array_header_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -6409,7 +6589,7 @@ class apr_file_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for apr_file_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -6428,13 +6608,13 @@ class apr_file_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -6443,9 +6623,9 @@ class apr_file_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -6462,7 +6642,7 @@ class apr_hash_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for apr_hash_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -6481,13 +6661,13 @@ class apr_hash_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -6496,9 +6676,9 @@ class apr_hash_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -6626,7 +6806,7 @@ class 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)
 
diff --git a/subversion/bindings/swig/python/delta.py b/subversion/bindings/swig/python/delta.py
index 7504bcd..5a02c56 100644
--- a/subversion/bindings/swig/python/delta.py
+++ b/subversion/bindings/swig/python/delta.py
@@ -1,11 +1,13 @@
 # This file was automatically generated by SWIG (http://www.swig.org).
-# Version 2.0.9
+# Version 2.0.12
 #
 # Do not make changes to this file unless you know what you are doing--modify
 # the SWIG interface file instead.
 
 
 
+
+
 from sys import version_info
 if version_info >= (2,6,0):
     def swig_import_helper():
@@ -113,7 +115,7 @@ class svn_txdelta_op_t:
     __swig_setmethods__["length"] = _delta.svn_txdelta_op_t_length_set
     __swig_getmethods__["length"] = _delta.svn_txdelta_op_t_length_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_txdelta_op_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -132,13 +134,13 @@ class svn_txdelta_op_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -147,9 +149,9 @@ class svn_txdelta_op_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -189,7 +191,7 @@ class svn_txdelta_window_t:
     ops = property(_ops_get)
 
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_txdelta_window_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -208,13 +210,13 @@ class svn_txdelta_window_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -223,9 +225,9 @@ class svn_txdelta_window_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -389,7 +391,7 @@ class svn_delta_editor_t:
     __swig_setmethods__["abort_edit"] = _delta.svn_delta_editor_t_abort_edit_set
     __swig_getmethods__["abort_edit"] = _delta.svn_delta_editor_t_abort_edit_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_delta_editor_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -408,13 +410,13 @@ class svn_delta_editor_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -423,9 +425,9 @@ class svn_delta_editor_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -537,7 +539,7 @@ class svn_txdelta_stream_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_txdelta_stream_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -556,13 +558,13 @@ class svn_txdelta_stream_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -571,9 +573,9 @@ class svn_txdelta_stream_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -709,7 +711,7 @@ class svn_txdelta_window_handler_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_txdelta_window_handler_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -728,13 +730,13 @@ class svn_txdelta_window_handler_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -743,9 +745,9 @@ class svn_txdelta_window_handler_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -765,7 +767,7 @@ class svn_txdelta_next_window_fn_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_txdelta_next_window_fn_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -784,13 +786,13 @@ class svn_txdelta_next_window_fn_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -799,9 +801,9 @@ class svn_txdelta_next_window_fn_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -821,7 +823,7 @@ class svn_txdelta_md5_digest_fn_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_txdelta_md5_digest_fn_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -840,13 +842,13 @@ class svn_txdelta_md5_digest_fn_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -855,9 +857,9 @@ class svn_txdelta_md5_digest_fn_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -877,7 +879,7 @@ class svn_delta_path_driver_cb_func_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_delta_path_driver_cb_func_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -896,13 +898,13 @@ class svn_delta_path_driver_cb_func_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -911,9 +913,9 @@ class svn_delta_path_driver_cb_func_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -933,7 +935,7 @@ class svn_file_rev_handler_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_file_rev_handler_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -952,13 +954,13 @@ class svn_file_rev_handler_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -967,9 +969,9 @@ class svn_file_rev_handler_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -989,7 +991,7 @@ class svn_file_rev_handler_old_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_file_rev_handler_old_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1008,13 +1010,13 @@ class svn_file_rev_handler_old_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1023,9 +1025,9 @@ class svn_file_rev_handler_old_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -1036,6 +1038,8 @@ class svn_file_rev_handler_old_t:
 svn_file_rev_handler_old_t_swigregister = _delta.svn_file_rev_handler_old_t_swigregister
 svn_file_rev_handler_old_t_swigregister(svn_file_rev_handler_old_t)
 
+# This function is for backwards compatibility only.
+# Use svn_txdelta_window_t.ops instead.
 svn_txdelta_window_t_ops_get = svn_txdelta_window_t._ops_get
 
 # This file is compatible with both classic and new-style classes.
diff --git a/subversion/bindings/swig/python/diff.py b/subversion/bindings/swig/python/diff.py
index 476236d..24d8142 100644
--- a/subversion/bindings/swig/python/diff.py
+++ b/subversion/bindings/swig/python/diff.py
@@ -1,11 +1,13 @@
 # This file was automatically generated by SWIG (http://www.swig.org).
-# Version 2.0.9
+# Version 2.0.12
 #
 # Do not make changes to this file unless you know what you are doing--modify
 # the SWIG interface file instead.
 
 
 
+
+
 from sys import version_info
 if version_info >= (2,6,0):
     def swig_import_helper():
@@ -113,7 +115,7 @@ class svn_diff_fns2_t:
     __swig_setmethods__["token_discard_all"] = _diff.svn_diff_fns2_t_token_discard_all_set
     __swig_getmethods__["token_discard_all"] = _diff.svn_diff_fns2_t_token_discard_all_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_diff_fns2_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -132,13 +134,13 @@ class svn_diff_fns2_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -147,9 +149,9 @@ class svn_diff_fns2_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -202,7 +204,7 @@ class svn_diff_fns_t:
     __swig_setmethods__["token_discard_all"] = _diff.svn_diff_fns_t_token_discard_all_set
     __swig_getmethods__["token_discard_all"] = _diff.svn_diff_fns_t_token_discard_all_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_diff_fns_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -221,13 +223,13 @@ class svn_diff_fns_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -236,9 +238,9 @@ class svn_diff_fns_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -321,7 +323,7 @@ class svn_diff_output_fns_t:
     __swig_setmethods__["output_conflict"] = _diff.svn_diff_output_fns_t_output_conflict_set
     __swig_getmethods__["output_conflict"] = _diff.svn_diff_output_fns_t_output_conflict_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_diff_output_fns_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -340,13 +342,13 @@ class svn_diff_output_fns_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -355,9 +357,9 @@ class svn_diff_output_fns_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -394,6 +396,10 @@ svn_diff_conflict_display_modified = _diff.svn_diff_conflict_display_modified
 svn_diff_conflict_display_latest = _diff.svn_diff_conflict_display_latest
 svn_diff_conflict_display_only_conflicts = _diff.svn_diff_conflict_display_only_conflicts
 
+def svn_diff_output2(*args):
+  """svn_diff_output2(svn_diff_t * diff, void * output_baton, svn_diff_output_fns_t output_fns, svn_cancel_func_t cancel_func) -> svn_error_t"""
+  return _diff.svn_diff_output2(*args)
+
 def svn_diff_output(*args):
   """svn_diff_output(svn_diff_t * diff, void * output_baton, svn_diff_output_fns_t output_fns) -> svn_error_t"""
   return _diff.svn_diff_output(*args)
@@ -413,8 +419,10 @@ class svn_diff_file_options_t:
     __swig_getmethods__["ignore_eol_style"] = _diff.svn_diff_file_options_t_ignore_eol_style_get
     __swig_setmethods__["show_c_function"] = _diff.svn_diff_file_options_t_show_c_function_set
     __swig_getmethods__["show_c_function"] = _diff.svn_diff_file_options_t_show_c_function_get
+    __swig_setmethods__["context_size"] = _diff.svn_diff_file_options_t_context_size_set
+    __swig_getmethods__["context_size"] = _diff.svn_diff_file_options_t_context_size_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_diff_file_options_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -433,13 +441,13 @@ class svn_diff_file_options_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -448,9 +456,9 @@ class svn_diff_file_options_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -507,6 +515,15 @@ def svn_diff_file_diff4(*args):
     """
   return _diff.svn_diff_file_diff4(*args)
 
+def svn_diff_file_output_unified4(*args):
+  """
+    svn_diff_file_output_unified4(svn_stream_t * output_stream, svn_diff_t * diff, char const * original_path, char const * modified_path, 
+        char const * original_header, char const * modified_header, 
+        char const * header_encoding, char const * relative_to_dir, svn_boolean_t show_c_function, 
+        int context_size, svn_cancel_func_t cancel_func, apr_pool_t scratch_pool) -> svn_error_t
+    """
+  return _diff.svn_diff_file_output_unified4(*args)
+
 def svn_diff_file_output_unified3(*args):
   """
     svn_diff_file_output_unified3(svn_stream_t * output_stream, svn_diff_t * diff, char const * original_path, char const * modified_path, 
@@ -532,6 +549,16 @@ def svn_diff_file_output_unified(*args):
     """
   return _diff.svn_diff_file_output_unified(*args)
 
+def svn_diff_file_output_merge3(*args):
+  """
+    svn_diff_file_output_merge3(svn_stream_t * output_stream, svn_diff_t * diff, char const * original_path, char const * modified_path, 
+        char const * latest_path, char const * conflict_original, 
+        char const * conflict_modified, char const * conflict_latest, char const * conflict_separator, 
+        svn_diff_conflict_display_style_t conflict_style, 
+        svn_cancel_func_t cancel_func, apr_pool_t scratch_pool) -> svn_error_t
+    """
+  return _diff.svn_diff_file_output_merge3(*args)
+
 def svn_diff_file_output_merge2(*args):
   """
     svn_diff_file_output_merge2(svn_stream_t * output_stream, svn_diff_t * diff, char const * original_path, char const * modified_path, 
@@ -552,6 +579,13 @@ def svn_diff_file_output_merge(*args):
     """
   return _diff.svn_diff_file_output_merge(*args)
 
+def svn_diff_output_binary(*args):
+  """
+    svn_diff_output_binary(svn_stream_t * output_stream, svn_stream_t * original, svn_stream_t * latest, svn_cancel_func_t cancel_func, 
+        apr_pool_t scratch_pool) -> svn_error_t
+    """
+  return _diff.svn_diff_output_binary(*args)
+
 def svn_diff_mem_string_diff(*args):
   """
     svn_diff_mem_string_diff(svn_string_t const * original, svn_string_t const * modified, svn_diff_file_options_t options, 
@@ -573,6 +607,16 @@ def svn_diff_mem_string_diff4(*args):
     """
   return _diff.svn_diff_mem_string_diff4(*args)
 
+def svn_diff_mem_string_output_unified3(*args):
+  """
+    svn_diff_mem_string_output_unified3(svn_stream_t * output_stream, svn_diff_t * diff, svn_boolean_t with_diff_header, 
+        char const * hunk_delimiter, char const * original_header, char const * modified_header, 
+        char const * header_encoding, svn_string_t const * original, 
+        svn_string_t const * modified, int context_size, svn_cancel_func_t cancel_func, 
+        apr_pool_t scratch_pool) -> svn_error_t
+    """
+  return _diff.svn_diff_mem_string_output_unified3(*args)
+
 def svn_diff_mem_string_output_unified2(*args):
   """
     svn_diff_mem_string_output_unified2(svn_stream_t * output_stream, svn_diff_t * diff, svn_boolean_t with_diff_header, 
@@ -590,6 +634,16 @@ def svn_diff_mem_string_output_unified(*args):
     """
   return _diff.svn_diff_mem_string_output_unified(*args)
 
+def svn_diff_mem_string_output_merge3(*args):
+  """
+    svn_diff_mem_string_output_merge3(svn_stream_t * output_stream, svn_diff_t * diff, svn_string_t const * original, svn_string_t const * modified, 
+        svn_string_t const * latest, char const * conflict_original, 
+        char const * conflict_modified, char const * conflict_latest, 
+        char const * conflict_separator, svn_diff_conflict_display_style_t style, 
+        svn_cancel_func_t cancel_func, apr_pool_t scratch_pool) -> svn_error_t
+    """
+  return _diff.svn_diff_mem_string_output_merge3(*args)
+
 def svn_diff_mem_string_output_merge2(*args):
   """
     svn_diff_mem_string_output_merge2(svn_stream_t * output_stream, svn_diff_t * diff, svn_string_t const * original, svn_string_t const * modified, 
@@ -677,7 +731,7 @@ class svn_prop_patch_t:
     __swig_setmethods__["hunks"] = _diff.svn_prop_patch_t_hunks_set
     __swig_getmethods__["hunks"] = _diff.svn_prop_patch_t_hunks_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_prop_patch_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -696,13 +750,13 @@ class svn_prop_patch_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -711,9 +765,9 @@ class svn_prop_patch_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -747,8 +801,12 @@ class svn_patch_t:
     __swig_getmethods__["operation"] = _diff.svn_patch_t_operation_get
     __swig_setmethods__["reverse"] = _diff.svn_patch_t_reverse_set
     __swig_getmethods__["reverse"] = _diff.svn_patch_t_reverse_get
+    __swig_setmethods__["mergeinfo"] = _diff.svn_patch_t_mergeinfo_set
+    __swig_getmethods__["mergeinfo"] = _diff.svn_patch_t_mergeinfo_get
+    __swig_setmethods__["reverse_mergeinfo"] = _diff.svn_patch_t_reverse_mergeinfo_set
+    __swig_getmethods__["reverse_mergeinfo"] = _diff.svn_patch_t_reverse_mergeinfo_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_patch_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -767,13 +825,13 @@ class svn_patch_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -782,9 +840,9 @@ class svn_patch_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -823,7 +881,7 @@ class svn_diff_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_diff_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -842,13 +900,13 @@ class svn_diff_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -857,9 +915,9 @@ class svn_diff_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -876,7 +934,7 @@ class svn_diff_hunk_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_diff_hunk_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -895,13 +953,13 @@ class svn_diff_hunk_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -910,9 +968,9 @@ class svn_diff_hunk_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -929,7 +987,7 @@ class svn_patch_file_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_patch_file_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -948,13 +1006,13 @@ class svn_patch_file_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -963,9 +1021,9 @@ class svn_patch_file_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
diff --git a/subversion/bindings/swig/python/fs.py b/subversion/bindings/swig/python/fs.py
index 6d3b4cd..2b830bb 100644
--- a/subversion/bindings/swig/python/fs.py
+++ b/subversion/bindings/swig/python/fs.py
@@ -1,11 +1,13 @@
 # This file was automatically generated by SWIG (http://www.swig.org).
-# Version 2.0.9
+# Version 2.0.12
 #
 # Do not make changes to this file unless you know what you are doing--modify
 # the SWIG interface file instead.
 
 
 
+
+
 from sys import version_info
 if version_info >= (2,6,0):
     def swig_import_helper():
@@ -90,19 +92,24 @@ import libsvn.delta
 def svn_fs_version():
   """svn_fs_version() -> svn_version_t const *"""
   return _fs.svn_fs_version()
+SVN_FS_TYPE_BDB = _fs.SVN_FS_TYPE_BDB
+SVN_FS_TYPE_FSFS = _fs.SVN_FS_TYPE_FSFS
+SVN_FS_TYPE_FSX = _fs.SVN_FS_TYPE_FSX
 SVN_FS_CONFIG_BDB_TXN_NOSYNC = _fs.SVN_FS_CONFIG_BDB_TXN_NOSYNC
 SVN_FS_CONFIG_BDB_LOG_AUTOREMOVE = _fs.SVN_FS_CONFIG_BDB_LOG_AUTOREMOVE
 SVN_FS_CONFIG_FSFS_CACHE_DELTAS = _fs.SVN_FS_CONFIG_FSFS_CACHE_DELTAS
 SVN_FS_CONFIG_FSFS_CACHE_FULLTEXTS = _fs.SVN_FS_CONFIG_FSFS_CACHE_FULLTEXTS
 SVN_FS_CONFIG_FSFS_CACHE_REVPROPS = _fs.SVN_FS_CONFIG_FSFS_CACHE_REVPROPS
 SVN_FS_CONFIG_FSFS_CACHE_NS = _fs.SVN_FS_CONFIG_FSFS_CACHE_NS
+SVN_FS_CONFIG_FSFS_BLOCK_READ = _fs.SVN_FS_CONFIG_FSFS_BLOCK_READ
+SVN_FS_CONFIG_FSFS_SHARD_SIZE = _fs.SVN_FS_CONFIG_FSFS_SHARD_SIZE
+SVN_FS_CONFIG_FSFS_LOG_ADDRESSING = _fs.SVN_FS_CONFIG_FSFS_LOG_ADDRESSING
 SVN_FS_CONFIG_FS_TYPE = _fs.SVN_FS_CONFIG_FS_TYPE
-SVN_FS_TYPE_BDB = _fs.SVN_FS_TYPE_BDB
-SVN_FS_TYPE_FSFS = _fs.SVN_FS_TYPE_FSFS
 SVN_FS_CONFIG_PRE_1_4_COMPATIBLE = _fs.SVN_FS_CONFIG_PRE_1_4_COMPATIBLE
 SVN_FS_CONFIG_PRE_1_5_COMPATIBLE = _fs.SVN_FS_CONFIG_PRE_1_5_COMPATIBLE
 SVN_FS_CONFIG_PRE_1_6_COMPATIBLE = _fs.SVN_FS_CONFIG_PRE_1_6_COMPATIBLE
 SVN_FS_CONFIG_PRE_1_8_COMPATIBLE = _fs.SVN_FS_CONFIG_PRE_1_8_COMPATIBLE
+SVN_FS_CONFIG_COMPATIBLE_VERSION = _fs.SVN_FS_CONFIG_COMPATIBLE_VERSION
 
 def svn_fs_initialize(*args):
   """svn_fs_initialize(apr_pool_t pool) -> svn_error_t"""
@@ -112,9 +119,23 @@ def svn_fs_create(*args):
   """svn_fs_create(char const * path, apr_hash_t fs_config, apr_pool_t pool) -> svn_error_t"""
   return _fs.svn_fs_create(*args)
 
+def svn_fs_open2(*args):
+  """svn_fs_open2(char const * path, apr_hash_t fs_config, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
+  return _fs.svn_fs_open2(*args)
+
 def svn_fs_open(*args):
   """svn_fs_open(char const * path, apr_hash_t fs_config, apr_pool_t pool) -> svn_error_t"""
   return _fs.svn_fs_open(*args)
+svn_fs_upgrade_pack_revprops = _fs.svn_fs_upgrade_pack_revprops
+svn_fs_upgrade_cleanup_revprops = _fs.svn_fs_upgrade_cleanup_revprops
+svn_fs_upgrade_format_bumped = _fs.svn_fs_upgrade_format_bumped
+
+def svn_fs_upgrade2(*args):
+  """
+    svn_fs_upgrade2(char const * path, svn_fs_upgrade_notify_t notify_func, void * notify_baton, svn_cancel_func_t cancel_func, 
+        apr_pool_t scratch_pool) -> svn_error_t
+    """
+  return _fs.svn_fs_upgrade2(*args)
 
 def svn_fs_upgrade(*args):
   """svn_fs_upgrade(char const * path, apr_pool_t pool) -> svn_error_t"""
@@ -136,6 +157,14 @@ def svn_fs_delete_fs(*args):
   """svn_fs_delete_fs(char const * path, apr_pool_t pool) -> svn_error_t"""
   return _fs.svn_fs_delete_fs(*args)
 
+def svn_fs_hotcopy3(*args):
+  """
+    svn_fs_hotcopy3(char const * src_path, char const * dest_path, svn_boolean_t clean, svn_boolean_t incremental, 
+        svn_fs_hotcopy_notify_t notify_func, void * notify_baton, svn_cancel_func_t cancel_func, 
+        apr_pool_t scratch_pool) -> svn_error_t
+    """
+  return _fs.svn_fs_hotcopy3(*args)
+
 def svn_fs_hotcopy2(*args):
   """
     svn_fs_hotcopy2(char const * src_path, char const * dest_path, svn_boolean_t clean, svn_boolean_t incremental, 
@@ -210,6 +239,9 @@ def svn_fs_access_add_lock_token2(*args):
 def svn_fs_access_add_lock_token(*args):
   """svn_fs_access_add_lock_token(svn_fs_access_t * access_ctx, char const * token) -> svn_error_t"""
   return _fs.svn_fs_access_add_lock_token(*args)
+svn_fs_node_unrelated = _fs.svn_fs_node_unrelated
+svn_fs_node_unchanged = _fs.svn_fs_node_unchanged
+svn_fs_node_common_ancestor = _fs.svn_fs_node_common_ancestor
 
 def svn_fs_compare_ids(*args):
   """svn_fs_compare_ids(svn_fs_id_t const * a, svn_fs_id_t const * b) -> int"""
@@ -228,6 +260,7 @@ def svn_fs_unparse_id(*args):
   return _fs.svn_fs_unparse_id(*args)
 SVN_FS_TXN_CHECK_OOD = _fs.SVN_FS_TXN_CHECK_OOD
 SVN_FS_TXN_CHECK_LOCKS = _fs.SVN_FS_TXN_CHECK_LOCKS
+SVN_FS_TXN_CLIENT_DATE = _fs.SVN_FS_TXN_CLIENT_DATE
 
 def svn_fs_begin_txn2(*args):
   """svn_fs_begin_txn2(svn_fs_t * fs, svn_revnum_t rev, apr_uint32_t flags, apr_pool_t pool) -> svn_error_t"""
@@ -345,8 +378,10 @@ class svn_fs_path_change2_t:
     __swig_getmethods__["copyfrom_rev"] = _fs.svn_fs_path_change2_t_copyfrom_rev_get
     __swig_setmethods__["copyfrom_path"] = _fs.svn_fs_path_change2_t_copyfrom_path_set
     __swig_getmethods__["copyfrom_path"] = _fs.svn_fs_path_change2_t_copyfrom_path_get
+    __swig_setmethods__["mergeinfo_mod"] = _fs.svn_fs_path_change2_t_mergeinfo_mod_set
+    __swig_getmethods__["mergeinfo_mod"] = _fs.svn_fs_path_change2_t_mergeinfo_mod_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_fs_path_change2_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -365,13 +400,13 @@ class svn_fs_path_change2_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -380,9 +415,9 @@ class svn_fs_path_change2_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -407,7 +442,7 @@ class svn_fs_path_change_t:
     __swig_setmethods__["prop_mod"] = _fs.svn_fs_path_change_t_prop_mod_set
     __swig_getmethods__["prop_mod"] = _fs.svn_fs_path_change_t_prop_mod_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_fs_path_change_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -426,13 +461,13 @@ class svn_fs_path_change_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -441,9 +476,9 @@ class svn_fs_path_change_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -468,10 +503,18 @@ def svn_fs_check_path(*args):
   """svn_fs_check_path(svn_fs_root_t * root, char const * path, apr_pool_t pool) -> svn_error_t"""
   return _fs.svn_fs_check_path(*args)
 
+def svn_fs_node_history2(*args):
+  """svn_fs_node_history2(svn_fs_root_t * root, char const * path, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
+  return _fs.svn_fs_node_history2(*args)
+
 def svn_fs_node_history(*args):
   """svn_fs_node_history(svn_fs_root_t * root, char const * path, apr_pool_t pool) -> svn_error_t"""
   return _fs.svn_fs_node_history(*args)
 
+def svn_fs_history_prev2(*args):
+  """svn_fs_history_prev2(svn_fs_history_t * history, svn_boolean_t cross_copies, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
+  return _fs.svn_fs_history_prev2(*args)
+
 def svn_fs_history_prev(*args):
   """svn_fs_history_prev(svn_fs_history_t * history, svn_boolean_t cross_copies, apr_pool_t pool) -> svn_error_t"""
   return _fs.svn_fs_history_prev(*args)
@@ -492,6 +535,13 @@ def svn_fs_node_id(*args):
   """svn_fs_node_id(svn_fs_root_t * root, char const * path, apr_pool_t pool) -> svn_error_t"""
   return _fs.svn_fs_node_id(*args)
 
+def svn_fs_node_relation(*args):
+  """
+    svn_fs_node_relation(svn_fs_node_relation_t * relation, svn_fs_root_t * root_a, char const * path_a, svn_fs_root_t * root_b, 
+        char const * path_b, apr_pool_t scratch_pool) -> svn_error_t
+    """
+  return _fs.svn_fs_node_relation(*args)
+
 def svn_fs_node_created_rev(*args):
   """svn_fs_node_created_rev(svn_fs_root_t * root, char const * path, apr_pool_t pool) -> svn_error_t"""
   return _fs.svn_fs_node_created_rev(*args)
@@ -512,6 +562,10 @@ def svn_fs_node_proplist(*args):
   """svn_fs_node_proplist(svn_fs_root_t * root, char const * path, apr_pool_t pool) -> svn_error_t"""
   return _fs.svn_fs_node_proplist(*args)
 
+def svn_fs_node_has_props(*args):
+  """svn_fs_node_has_props(svn_fs_root_t * root, char const * path, apr_pool_t scratch_pool) -> svn_error_t"""
+  return _fs.svn_fs_node_has_props(*args)
+
 def svn_fs_change_node_prop(*args):
   """
     svn_fs_change_node_prop(svn_fs_root_t * root, char const * path, char const * name, svn_string_t const * value, 
@@ -519,6 +573,13 @@ def svn_fs_change_node_prop(*args):
     """
   return _fs.svn_fs_change_node_prop(*args)
 
+def svn_fs_props_different(*args):
+  """
+    svn_fs_props_different(svn_fs_root_t * root1, char const * path1, svn_fs_root_t * root2, char const * path2, 
+        apr_pool_t scratch_pool) -> svn_error_t
+    """
+  return _fs.svn_fs_props_different(*args)
+
 def svn_fs_props_changed(*args):
   """
     svn_fs_props_changed(svn_fs_root_t * root1, char const * path1, svn_fs_root_t * root2, char const * path2, 
@@ -571,7 +632,7 @@ class svn_fs_dirent_t:
     __swig_setmethods__["kind"] = _fs.svn_fs_dirent_t_kind_set
     __swig_getmethods__["kind"] = _fs.svn_fs_dirent_t_kind_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_fs_dirent_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -590,13 +651,13 @@ class svn_fs_dirent_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -605,9 +666,9 @@ class svn_fs_dirent_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -620,6 +681,10 @@ def svn_fs_dir_entries(*args):
   """svn_fs_dir_entries(svn_fs_root_t * root, char const * path, apr_pool_t pool) -> svn_error_t"""
   return _fs.svn_fs_dir_entries(*args)
 
+def svn_fs_dir_optimal_order(*args):
+  """svn_fs_dir_optimal_order(svn_fs_root_t * root, apr_hash_t entries, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
+  return _fs.svn_fs_dir_optimal_order(*args)
+
 def svn_fs_make_dir(*args):
   """svn_fs_make_dir(svn_fs_root_t * root, char const * path, apr_pool_t pool) -> svn_error_t"""
   return _fs.svn_fs_make_dir(*args)
@@ -680,6 +745,13 @@ def svn_fs_apply_text(*args):
   """svn_fs_apply_text(svn_fs_root_t * root, char const * path, char const * result_checksum, apr_pool_t pool) -> svn_error_t"""
   return _fs.svn_fs_apply_text(*args)
 
+def svn_fs_contents_different(*args):
+  """
+    svn_fs_contents_different(svn_fs_root_t * root1, char const * path1, svn_fs_root_t * root2, char const * path2, 
+        apr_pool_t scratch_pool) -> svn_error_t
+    """
+  return _fs.svn_fs_contents_different(*args)
+
 def svn_fs_contents_changed(*args):
   """
     svn_fs_contents_changed(svn_fs_root_t * root1, char const * path1, svn_fs_root_t * root2, char const * path2, 
@@ -691,6 +763,14 @@ def svn_fs_youngest_rev(*args):
   """svn_fs_youngest_rev(svn_fs_t * fs, apr_pool_t pool) -> svn_error_t"""
   return _fs.svn_fs_youngest_rev(*args)
 
+def svn_fs_info_format(*args):
+  """svn_fs_info_format(svn_fs_t * fs, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
+  return _fs.svn_fs_info_format(*args)
+
+def svn_fs_info_config_files(*args):
+  """svn_fs_info_config_files(svn_fs_t * fs, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
+  return _fs.svn_fs_info_config_files(*args)
+
 def svn_fs_deltify_revision(*args):
   """svn_fs_deltify_revision(svn_fs_t * fs, svn_revnum_t revision, apr_pool_t pool) -> svn_error_t"""
   return _fs.svn_fs_deltify_revision(*args)
@@ -729,6 +809,22 @@ def svn_fs_set_uuid(*args):
   """svn_fs_set_uuid(svn_fs_t * fs, char const * uuid, apr_pool_t pool) -> svn_error_t"""
   return _fs.svn_fs_set_uuid(*args)
 
+def svn_fs_lock_target_create(*args):
+  """svn_fs_lock_target_create(char const * token, svn_revnum_t current_rev, apr_pool_t result_pool) -> svn_fs_lock_target_t *"""
+  return _fs.svn_fs_lock_target_create(*args)
+
+def svn_fs_lock_target_set_token(*args):
+  """svn_fs_lock_target_set_token(svn_fs_lock_target_t * target, char const * token)"""
+  return _fs.svn_fs_lock_target_set_token(*args)
+
+def svn_fs_lock_many(*args):
+  """
+    svn_fs_lock_many(svn_fs_t * fs, apr_hash_t lock_targets, char const * comment, svn_boolean_t is_dav_comment, 
+        apr_time_t expiration_date, svn_boolean_t steal_lock, svn_fs_lock_callback_t lock_callback, 
+        apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t
+    """
+  return _fs.svn_fs_lock_many(*args)
+
 def svn_fs_lock(*args):
   """
     svn_fs_lock(svn_fs_t * fs, char const * path, char const * token, char const * comment, svn_boolean_t is_dav_comment, 
@@ -741,6 +837,13 @@ def svn_fs_generate_lock_token(*args):
   """svn_fs_generate_lock_token(svn_fs_t * fs, apr_pool_t pool) -> svn_error_t"""
   return _fs.svn_fs_generate_lock_token(*args)
 
+def svn_fs_unlock_many(*args):
+  """
+    svn_fs_unlock_many(svn_fs_t * fs, apr_hash_t unlock_targets, svn_boolean_t break_lock, svn_fs_lock_callback_t lock_callback, 
+        apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t
+    """
+  return _fs.svn_fs_unlock_many(*args)
+
 def svn_fs_unlock(*args):
   """svn_fs_unlock(svn_fs_t * fs, char const * path, char const * token, svn_boolean_t break_lock, apr_pool_t pool) -> svn_error_t"""
   return _fs.svn_fs_unlock(*args)
@@ -786,16 +889,24 @@ def svn_fs_verify(*args):
 def svn_fs_verify_root(*args):
   """svn_fs_verify_root(svn_fs_root_t * root, apr_pool_t scratch_pool) -> svn_error_t"""
   return _fs.svn_fs_verify_root(*args)
-class svn_fs_t:
-    """Proxy of C svn_fs_t struct"""
+class svn_fs_fsfs_info_t:
+    """Proxy of C svn_fs_fsfs_info_t struct"""
     __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_fs_t, name, value)
+    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_fs_fsfs_info_t, name, value)
     __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_fs_t, name)
+    __getattr__ = lambda self, name: _swig_getattr(self, svn_fs_fsfs_info_t, name)
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
+    __swig_setmethods__["fs_type"] = _fs.svn_fs_fsfs_info_t_fs_type_set
+    __swig_getmethods__["fs_type"] = _fs.svn_fs_fsfs_info_t_fs_type_get
+    __swig_setmethods__["shard_size"] = _fs.svn_fs_fsfs_info_t_shard_size_set
+    __swig_getmethods__["shard_size"] = _fs.svn_fs_fsfs_info_t_shard_size_get
+    __swig_setmethods__["min_unpacked_rev"] = _fs.svn_fs_fsfs_info_t_min_unpacked_rev_set
+    __swig_getmethods__["min_unpacked_rev"] = _fs.svn_fs_fsfs_info_t_min_unpacked_rev_get
+    __swig_setmethods__["log_addressing"] = _fs.svn_fs_fsfs_info_t_log_addressing_set
+    __swig_getmethods__["log_addressing"] = _fs.svn_fs_fsfs_info_t_log_addressing_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_fs_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -814,13 +925,127 @@ class svn_fs_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
+      members = self.__dict__.get("_members")
+      if members is not None:
+        _copy_metadata_deep(value, members.get(name))
+
+      # Verify that the new object is good
+      _assert_valid_deep(value)
+
+      return value
+
+    def __setattr__(self, name, value):
+      """Set an attribute on this object"""
+      self.assert_valid()
+
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
+      self.__dict__.setdefault("_members",{})[name] = value
+
+      return _swig_setattr(self, self.__class__, name, value)
+
+svn_fs_fsfs_info_t_swigregister = _fs.svn_fs_fsfs_info_t_swigregister
+svn_fs_fsfs_info_t_swigregister(svn_fs_fsfs_info_t)
+
+class svn_fs_fsx_info_t:
+    """Proxy of C svn_fs_fsx_info_t struct"""
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_fs_fsx_info_t, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, svn_fs_fsx_info_t, name)
+    def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
+    __repr__ = _swig_repr
+    __swig_setmethods__["fs_type"] = _fs.svn_fs_fsx_info_t_fs_type_set
+    __swig_getmethods__["fs_type"] = _fs.svn_fs_fsx_info_t_fs_type_get
+    __swig_setmethods__["shard_size"] = _fs.svn_fs_fsx_info_t_shard_size_set
+    __swig_getmethods__["shard_size"] = _fs.svn_fs_fsx_info_t_shard_size_get
+    __swig_setmethods__["min_unpacked_rev"] = _fs.svn_fs_fsx_info_t_min_unpacked_rev_set
+    __swig_getmethods__["min_unpacked_rev"] = _fs.svn_fs_fsx_info_t_min_unpacked_rev_get
+    def set_parent_pool(self, parent_pool=None):
+      """Create a new proxy object for TYPE"""
+      import libsvn.core, weakref
+      self.__dict__["_parent_pool"] = \
+        parent_pool or libsvn.core.application_pool;
+      if self.__dict__["_parent_pool"]:
+        self.__dict__["_is_valid"] = weakref.ref(
+          self.__dict__["_parent_pool"]._is_valid)
+
+    def assert_valid(self):
+      """Assert that this object is using valid pool memory"""
+      if "_is_valid" in self.__dict__:
+        assert self.__dict__["_is_valid"](), "Variable has already been deleted"
+
+    def __getattr__(self, name):
+      """Get an attribute from this object"""
+      self.assert_valid()
+
+      value = _swig_getattr(self, self.__class__, name)
+
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
+      members = self.__dict__.get("_members")
+      if members is not None:
+        _copy_metadata_deep(value, members.get(name))
+
+      # Verify that the new object is good
+      _assert_valid_deep(value)
+
+      return value
+
+    def __setattr__(self, name, value):
+      """Set an attribute on this object"""
+      self.assert_valid()
+
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
+      self.__dict__.setdefault("_members",{})[name] = value
+
+      return _swig_setattr(self, self.__class__, name, value)
+
+svn_fs_fsx_info_t_swigregister = _fs.svn_fs_fsx_info_t_swigregister
+svn_fs_fsx_info_t_swigregister(svn_fs_fsx_info_t)
+
+class svn_fs_info_placeholder_t:
+    """Proxy of C svn_fs_info_placeholder_t struct"""
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_fs_info_placeholder_t, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, svn_fs_info_placeholder_t, name)
+    def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
+    __repr__ = _swig_repr
+    __swig_setmethods__["fs_type"] = _fs.svn_fs_info_placeholder_t_fs_type_set
+    __swig_getmethods__["fs_type"] = _fs.svn_fs_info_placeholder_t_fs_type_get
+    def set_parent_pool(self, parent_pool=None):
+      """Create a new proxy object for TYPE"""
+      import libsvn.core, weakref
+      self.__dict__["_parent_pool"] = \
+        parent_pool or libsvn.core.application_pool;
+      if self.__dict__["_parent_pool"]:
+        self.__dict__["_is_valid"] = weakref.ref(
+          self.__dict__["_parent_pool"]._is_valid)
+
+    def assert_valid(self):
+      """Assert that this object is using valid pool memory"""
+      if "_is_valid" in self.__dict__:
+        assert self.__dict__["_is_valid"](), "Variable has already been deleted"
 
+    def __getattr__(self, name):
+      """Get an attribute from this object"""
+      self.assert_valid()
+
+      value = _swig_getattr(self, self.__class__, name)
 
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -829,9 +1054,70 @@ class svn_fs_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
+      self.__dict__.setdefault("_members",{})[name] = value
+
+      return _swig_setattr(self, self.__class__, name, value)
+
+svn_fs_info_placeholder_t_swigregister = _fs.svn_fs_info_placeholder_t_swigregister
+svn_fs_info_placeholder_t_swigregister(svn_fs_info_placeholder_t)
 
 
+def svn_fs_info(*args):
+  """svn_fs_info(svn_fs_t * fs, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
+  return _fs.svn_fs_info(*args)
 
+def svn_fs_info_dup(*args):
+  """svn_fs_info_dup(void const * info, apr_pool_t result_pool, apr_pool_t scratch_pool) -> void *"""
+  return _fs.svn_fs_info_dup(*args)
+class svn_fs_t:
+    """Proxy of C svn_fs_t struct"""
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_fs_t, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, svn_fs_t, name)
+    def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
+    __repr__ = _swig_repr
+    def set_parent_pool(self, parent_pool=None):
+      """Create a new proxy object for TYPE"""
+      import libsvn.core, weakref
+      self.__dict__["_parent_pool"] = \
+        parent_pool or libsvn.core.application_pool;
+      if self.__dict__["_parent_pool"]:
+        self.__dict__["_is_valid"] = weakref.ref(
+          self.__dict__["_parent_pool"]._is_valid)
+
+    def assert_valid(self):
+      """Assert that this object is using valid pool memory"""
+      if "_is_valid" in self.__dict__:
+        assert self.__dict__["_is_valid"](), "Variable has already been deleted"
+
+    def __getattr__(self, name):
+      """Get an attribute from this object"""
+      self.assert_valid()
+
+      value = _swig_getattr(self, self.__class__, name)
+
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
+      members = self.__dict__.get("_members")
+      if members is not None:
+        _copy_metadata_deep(value, members.get(name))
+
+      # Verify that the new object is good
+      _assert_valid_deep(value)
+
+      return value
+
+    def __setattr__(self, name, value):
+      """Set an attribute on this object"""
+      self.assert_valid()
+
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -848,7 +1134,7 @@ class svn_fs_access_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_fs_access_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -867,13 +1153,13 @@ class svn_fs_access_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -882,9 +1168,9 @@ class svn_fs_access_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -901,7 +1187,7 @@ class svn_fs_id_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_fs_id_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -920,13 +1206,13 @@ class svn_fs_id_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -935,9 +1221,9 @@ class svn_fs_id_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -954,7 +1240,7 @@ class svn_fs_txn_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_fs_txn_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -973,13 +1259,13 @@ class svn_fs_txn_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -988,9 +1274,9 @@ class svn_fs_txn_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -1007,7 +1293,7 @@ class svn_fs_root_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_fs_root_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1026,13 +1312,13 @@ class svn_fs_root_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1041,9 +1327,9 @@ class svn_fs_root_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -1060,7 +1346,7 @@ class svn_fs_history_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_fs_history_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1079,13 +1365,13 @@ class svn_fs_history_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1094,25 +1380,92 @@ class svn_fs_history_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
+      self.__dict__.setdefault("_members",{})[name] = value
+
+      return _swig_setattr(self, self.__class__, name, value)
+
+svn_fs_history_t_swigregister = _fs.svn_fs_history_t_swigregister
+svn_fs_history_t_swigregister(svn_fs_history_t)
+
+class svn_fs_lock_target_t:
+    """Proxy of C svn_fs_lock_target_t struct"""
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_fs_lock_target_t, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, svn_fs_lock_target_t, name)
+    def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
+    __repr__ = _swig_repr
+    def set_parent_pool(self, parent_pool=None):
+      """Create a new proxy object for TYPE"""
+      import libsvn.core, weakref
+      self.__dict__["_parent_pool"] = \
+        parent_pool or libsvn.core.application_pool;
+      if self.__dict__["_parent_pool"]:
+        self.__dict__["_is_valid"] = weakref.ref(
+          self.__dict__["_parent_pool"]._is_valid)
+
+    def assert_valid(self):
+      """Assert that this object is using valid pool memory"""
+      if "_is_valid" in self.__dict__:
+        assert self.__dict__["_is_valid"](), "Variable has already been deleted"
+
+    def __getattr__(self, name):
+      """Get an attribute from this object"""
+      self.assert_valid()
+
+      value = _swig_getattr(self, self.__class__, name)
 
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
+      members = self.__dict__.get("_members")
+      if members is not None:
+        _copy_metadata_deep(value, members.get(name))
 
+      # Verify that the new object is good
+      _assert_valid_deep(value)
+
+      return value
 
+    def __setattr__(self, name, value):
+      """Set an attribute on this object"""
+      self.assert_valid()
+
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
 
-svn_fs_history_t_swigregister = _fs.svn_fs_history_t_swigregister
-svn_fs_history_t_swigregister(svn_fs_history_t)
+svn_fs_lock_target_t_swigregister = _fs.svn_fs_lock_target_t_swigregister
+svn_fs_lock_target_t_swigregister(svn_fs_lock_target_t)
 
 
 def svn_fs_invoke_warning_callback(*args):
   """svn_fs_invoke_warning_callback(svn_fs_warning_callback_t _obj, void * baton, svn_error_t err)"""
   return _fs.svn_fs_invoke_warning_callback(*args)
 
+def svn_fs_invoke_upgrade_notify(*args):
+  """
+    svn_fs_invoke_upgrade_notify(svn_fs_upgrade_notify_t _obj, void * baton, apr_uint64_t number, svn_fs_upgrade_notify_action_t action, 
+        apr_pool_t scratch_pool) -> svn_error_t
+    """
+  return _fs.svn_fs_invoke_upgrade_notify(*args)
+
 def svn_fs_invoke_progress_notify_func(*args):
   """svn_fs_invoke_progress_notify_func(svn_fs_progress_notify_func_t _obj, svn_revnum_t revision, void * baton, apr_pool_t pool)"""
   return _fs.svn_fs_invoke_progress_notify_func(*args)
 
+def svn_fs_invoke_hotcopy_notify(*args):
+  """
+    svn_fs_invoke_hotcopy_notify(svn_fs_hotcopy_notify_t _obj, void * baton, svn_revnum_t start_revision, svn_revnum_t end_revision, 
+        apr_pool_t scratch_pool)
+    """
+  return _fs.svn_fs_invoke_hotcopy_notify(*args)
+
 def svn_fs_invoke_freeze_func(*args):
   """svn_fs_invoke_freeze_func(svn_fs_freeze_func_t _obj, void * baton, apr_pool_t pool) -> svn_error_t"""
   return _fs.svn_fs_invoke_freeze_func(*args)
@@ -1124,6 +1477,13 @@ def svn_fs_invoke_process_contents_func(*args):
     """
   return _fs.svn_fs_invoke_process_contents_func(*args)
 
+def svn_fs_invoke_lock_callback(*args):
+  """
+    svn_fs_invoke_lock_callback(svn_fs_lock_callback_t _obj, void * baton, char const * path, svn_lock_t lock, svn_error_t fs_err, 
+        apr_pool_t scratch_pool) -> svn_error_t
+    """
+  return _fs.svn_fs_invoke_lock_callback(*args)
+
 def svn_fs_invoke_get_locks_callback(*args):
   """svn_fs_invoke_get_locks_callback(svn_fs_get_locks_callback_t _obj, void * baton, svn_lock_t lock, apr_pool_t pool) -> svn_error_t"""
   return _fs.svn_fs_invoke_get_locks_callback(*args)
@@ -1143,7 +1503,7 @@ class svn_fs_warning_callback_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_fs_warning_callback_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1162,13 +1522,13 @@ class svn_fs_warning_callback_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1177,9 +1537,9 @@ class svn_fs_warning_callback_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -1190,6 +1550,62 @@ class svn_fs_warning_callback_t:
 svn_fs_warning_callback_t_swigregister = _fs.svn_fs_warning_callback_t_swigregister
 svn_fs_warning_callback_t_swigregister(svn_fs_warning_callback_t)
 
+class svn_fs_upgrade_notify_t:
+    """Proxy of C svn_fs_upgrade_notify_t struct"""
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_fs_upgrade_notify_t, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, svn_fs_upgrade_notify_t, name)
+    def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
+    __repr__ = _swig_repr
+    def set_parent_pool(self, parent_pool=None):
+      """Create a new proxy object for TYPE"""
+      import libsvn.core, weakref
+      self.__dict__["_parent_pool"] = \
+        parent_pool or libsvn.core.application_pool;
+      if self.__dict__["_parent_pool"]:
+        self.__dict__["_is_valid"] = weakref.ref(
+          self.__dict__["_parent_pool"]._is_valid)
+
+    def assert_valid(self):
+      """Assert that this object is using valid pool memory"""
+      if "_is_valid" in self.__dict__:
+        assert self.__dict__["_is_valid"](), "Variable has already been deleted"
+
+    def __getattr__(self, name):
+      """Get an attribute from this object"""
+      self.assert_valid()
+
+      value = _swig_getattr(self, self.__class__, name)
+
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
+      members = self.__dict__.get("_members")
+      if members is not None:
+        _copy_metadata_deep(value, members.get(name))
+
+      # Verify that the new object is good
+      _assert_valid_deep(value)
+
+      return value
+
+    def __setattr__(self, name, value):
+      """Set an attribute on this object"""
+      self.assert_valid()
+
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
+      self.__dict__.setdefault("_members",{})[name] = value
+
+      return _swig_setattr(self, self.__class__, name, value)
+
+    def __call__(self, *args):
+      return svn_fs_invoke_upgrade_notify(self, *args)
+
+svn_fs_upgrade_notify_t_swigregister = _fs.svn_fs_upgrade_notify_t_swigregister
+svn_fs_upgrade_notify_t_swigregister(svn_fs_upgrade_notify_t)
+
 class svn_fs_progress_notify_func_t:
     """Proxy of C svn_fs_progress_notify_func_t struct"""
     __swig_setmethods__ = {}
@@ -1199,7 +1615,7 @@ class svn_fs_progress_notify_func_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_fs_progress_notify_func_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1218,13 +1634,13 @@ class svn_fs_progress_notify_func_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1233,9 +1649,9 @@ class svn_fs_progress_notify_func_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -1246,6 +1662,62 @@ class svn_fs_progress_notify_func_t:
 svn_fs_progress_notify_func_t_swigregister = _fs.svn_fs_progress_notify_func_t_swigregister
 svn_fs_progress_notify_func_t_swigregister(svn_fs_progress_notify_func_t)
 
+class svn_fs_hotcopy_notify_t:
+    """Proxy of C svn_fs_hotcopy_notify_t struct"""
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_fs_hotcopy_notify_t, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, svn_fs_hotcopy_notify_t, name)
+    def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
+    __repr__ = _swig_repr
+    def set_parent_pool(self, parent_pool=None):
+      """Create a new proxy object for TYPE"""
+      import libsvn.core, weakref
+      self.__dict__["_parent_pool"] = \
+        parent_pool or libsvn.core.application_pool;
+      if self.__dict__["_parent_pool"]:
+        self.__dict__["_is_valid"] = weakref.ref(
+          self.__dict__["_parent_pool"]._is_valid)
+
+    def assert_valid(self):
+      """Assert that this object is using valid pool memory"""
+      if "_is_valid" in self.__dict__:
+        assert self.__dict__["_is_valid"](), "Variable has already been deleted"
+
+    def __getattr__(self, name):
+      """Get an attribute from this object"""
+      self.assert_valid()
+
+      value = _swig_getattr(self, self.__class__, name)
+
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
+      members = self.__dict__.get("_members")
+      if members is not None:
+        _copy_metadata_deep(value, members.get(name))
+
+      # Verify that the new object is good
+      _assert_valid_deep(value)
+
+      return value
+
+    def __setattr__(self, name, value):
+      """Set an attribute on this object"""
+      self.assert_valid()
+
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
+      self.__dict__.setdefault("_members",{})[name] = value
+
+      return _swig_setattr(self, self.__class__, name, value)
+
+    def __call__(self, *args):
+      return svn_fs_invoke_hotcopy_notify(self, *args)
+
+svn_fs_hotcopy_notify_t_swigregister = _fs.svn_fs_hotcopy_notify_t_swigregister
+svn_fs_hotcopy_notify_t_swigregister(svn_fs_hotcopy_notify_t)
+
 class svn_fs_freeze_func_t:
     """Proxy of C svn_fs_freeze_func_t struct"""
     __swig_setmethods__ = {}
@@ -1255,7 +1727,7 @@ class svn_fs_freeze_func_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_fs_freeze_func_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1274,13 +1746,13 @@ class svn_fs_freeze_func_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1289,9 +1761,9 @@ class svn_fs_freeze_func_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -1311,7 +1783,7 @@ class svn_fs_process_contents_func_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_fs_process_contents_func_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1330,13 +1802,13 @@ class svn_fs_process_contents_func_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1345,9 +1817,9 @@ class svn_fs_process_contents_func_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -1358,6 +1830,62 @@ class svn_fs_process_contents_func_t:
 svn_fs_process_contents_func_t_swigregister = _fs.svn_fs_process_contents_func_t_swigregister
 svn_fs_process_contents_func_t_swigregister(svn_fs_process_contents_func_t)
 
+class svn_fs_lock_callback_t:
+    """Proxy of C svn_fs_lock_callback_t struct"""
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_fs_lock_callback_t, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, svn_fs_lock_callback_t, name)
+    def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
+    __repr__ = _swig_repr
+    def set_parent_pool(self, parent_pool=None):
+      """Create a new proxy object for TYPE"""
+      import libsvn.core, weakref
+      self.__dict__["_parent_pool"] = \
+        parent_pool or libsvn.core.application_pool;
+      if self.__dict__["_parent_pool"]:
+        self.__dict__["_is_valid"] = weakref.ref(
+          self.__dict__["_parent_pool"]._is_valid)
+
+    def assert_valid(self):
+      """Assert that this object is using valid pool memory"""
+      if "_is_valid" in self.__dict__:
+        assert self.__dict__["_is_valid"](), "Variable has already been deleted"
+
+    def __getattr__(self, name):
+      """Get an attribute from this object"""
+      self.assert_valid()
+
+      value = _swig_getattr(self, self.__class__, name)
+
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
+      members = self.__dict__.get("_members")
+      if members is not None:
+        _copy_metadata_deep(value, members.get(name))
+
+      # Verify that the new object is good
+      _assert_valid_deep(value)
+
+      return value
+
+    def __setattr__(self, name, value):
+      """Set an attribute on this object"""
+      self.assert_valid()
+
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
+      self.__dict__.setdefault("_members",{})[name] = value
+
+      return _swig_setattr(self, self.__class__, name, value)
+
+    def __call__(self, *args):
+      return svn_fs_invoke_lock_callback(self, *args)
+
+svn_fs_lock_callback_t_swigregister = _fs.svn_fs_lock_callback_t_swigregister
+svn_fs_lock_callback_t_swigregister(svn_fs_lock_callback_t)
+
 class svn_fs_get_locks_callback_t:
     """Proxy of C svn_fs_get_locks_callback_t struct"""
     __swig_setmethods__ = {}
@@ -1367,7 +1895,7 @@ class svn_fs_get_locks_callback_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_fs_get_locks_callback_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1386,13 +1914,13 @@ class svn_fs_get_locks_callback_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1401,9 +1929,9 @@ class svn_fs_get_locks_callback_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -1423,7 +1951,7 @@ class svn_fs_pack_notify_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_fs_pack_notify_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1442,13 +1970,13 @@ class svn_fs_pack_notify_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1457,9 +1985,9 @@ class svn_fs_pack_notify_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
diff --git a/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c b/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
index 1dbdc1b..af22424 100644
--- a/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
+++ b/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
@@ -93,7 +93,7 @@ void svn_swig_py_release_py_lock(void)
   if (_saved_thread_key == NULL)
     {
       /* Obviously, creating a top-level pool for this is pretty stupid. */
-      apr_pool_create(&_saved_thread_pool, NULL);
+      _saved_thread_pool = svn_pool_create(NULL);
       apr_threadkey_private_create(&_saved_thread_key, NULL,
                                    _saved_thread_pool);
     }
@@ -152,7 +152,7 @@ int svn_swig_py_get_pool_arg(PyObject *args, swig_type_info *type,
       PyObject *input = PyTuple_GET_ITEM(args, argnum);
       if (input != Py_None && PyObject_HasAttrString(input, markValid))
         {
-          *pool = svn_swig_MustGetPtr(input, type, argnum+1);
+          *pool = svn_swig_py_must_get_ptr(input, type, argnum+1);
           if (*pool == NULL)
             return 1;
           *py_pool = input;
@@ -163,7 +163,7 @@ int svn_swig_py_get_pool_arg(PyObject *args, swig_type_info *type,
 
   /* We couldn't find a pool argument, so we'll create a subpool */
   *pool = svn_pool_create(application_pool);
-  *py_pool = svn_swig_NewPointerObj(*pool, type, application_py_pool,
+  *py_pool = svn_swig_py_new_pointer_obj(*pool, type, application_py_pool,
                                     NULL);
   if (*py_pool == NULL)
     return 1;
@@ -190,7 +190,7 @@ int svn_swig_py_get_parent_pool(PyObject *args, swig_type_info *type,
 
   Py_DECREF(*py_pool);
 
-  *pool = svn_swig_MustGetPtr(*py_pool, type, 1);
+  *pool = svn_swig_py_must_get_ptr(*py_pool, type, 1);
 
   if (*pool == NULL)
     return 1;
@@ -245,8 +245,8 @@ static int proxy_set_pool(PyObject **proxy, PyObject *pool)
 #define svn_swig_TypeQuery(x) SWIG_TypeQuery(x)
 
 /** Wrapper for SWIG_NewPointerObj */
-PyObject *svn_swig_NewPointerObj(void *obj, swig_type_info *type,
-                                 PyObject *pool, PyObject *args)
+PyObject *svn_swig_py_new_pointer_obj(void *obj, swig_type_info *type,
+                                      PyObject *pool, PyObject *args)
 {
   PyObject *proxy = SWIG_NewPointerObj(obj, type, 0);
 
@@ -270,7 +270,7 @@ PyObject *svn_swig_NewPointerObj(void *obj, swig_type_info *type,
   return proxy;
 }
 
-/** svn_swig_NewPointerObj, except a string is used to describe the type */
+/** svn_swig_py_new_pointer_obj, except a string is used to describe the type */
 static PyObject *svn_swig_NewPointerObjString(void *ptr, const char *type,
                                               PyObject *py_pool)
 {
@@ -282,11 +282,11 @@ static PyObject *svn_swig_NewPointerObjString(void *ptr, const char *type,
     }
 
   /* ### cache the swig_type_info at some point? */
-  return svn_swig_NewPointerObj(ptr, typeinfo, py_pool, NULL);
+  return svn_swig_py_new_pointer_obj(ptr, typeinfo, py_pool, NULL);
 }
 
 /** Wrapper for SWIG_ConvertPtr */
-int svn_swig_ConvertPtr(PyObject *input, void **obj, swig_type_info *type)
+int svn_swig_py_convert_ptr(PyObject *input, void **obj, swig_type_info *type)
 {
   if (PyObject_HasAttrString(input, assertValid))
     {
@@ -310,11 +310,11 @@ int svn_swig_ConvertPtr(PyObject *input, void **obj, swig_type_info *type)
 static int svn_swig_ConvertPtrString(PyObject *input,
     void **obj, const char *type)
 {
-  return svn_swig_ConvertPtr(input, obj, svn_swig_TypeQuery(type));
+  return svn_swig_py_convert_ptr(input, obj, svn_swig_TypeQuery(type));
 }
 
 /** Wrapper for SWIG_MustGetPtr */
-void *svn_swig_MustGetPtr(void *input, swig_type_info *type, int argnum)
+void *svn_swig_py_must_get_ptr(void *input, swig_type_info *type, int argnum)
 {
   if (PyObject_HasAttrString(input, assertValid))
     {
@@ -443,9 +443,9 @@ static PyObject *make_ob_pool(void *pool)
    * normally used for anything. It's just here for compatibility
    * with Subversion 1.2. */
   apr_pool_t *new_pool = svn_pool_create(application_pool);
-  PyObject *new_py_pool = svn_swig_NewPointerObj(new_pool,
+  PyObject *new_py_pool = svn_swig_py_new_pointer_obj(new_pool,
     svn_swig_TypeQuery("apr_pool_t *"), application_py_pool, NULL);
-  (void) pool; /* Silence compiler warnings about unused parameter. */
+  SVN_UNUSED(pool);
   return new_py_pool;
 }
 static PyObject *make_ob_fs_root(svn_fs_root_t *ptr, PyObject *py_pool)
@@ -459,12 +459,20 @@ static PyObject *make_ob_wc_adm_access(void *adm_access)
                                       NULL);
 }
 
+static PyObject *make_ob_error(svn_error_t *err)
+{
+  if (err)
+    return svn_swig_NewPointerObjString(err, "svn_error_t *", NULL);
+  else
+    Py_RETURN_NONE;
+}
+
 
 /***/
 
 /* Conversion from Python single objects (not hashes/lists/etc.) to
    Subversion types. */
-static const char *make_string_from_ob(PyObject *ob, apr_pool_t *pool)
+static char *make_string_from_ob(PyObject *ob, apr_pool_t *pool)
 {
   if (ob == Py_None)
     return NULL;
@@ -534,7 +542,7 @@ static PyObject *convert_hash(apr_hash_t *hash,
 static PyObject *convert_to_swigtype(void *value, void *ctx, PyObject *py_pool)
 {
   /* ctx is a 'swig_type_info *' */
-  return svn_swig_NewPointerObj(value, ctx, py_pool, NULL);
+  return svn_swig_py_new_pointer_obj(value, ctx, py_pool, NULL);
 }
 
 static PyObject *convert_svn_string_t(void *value, void *ctx,
@@ -853,7 +861,7 @@ PyObject *svn_swig_py_convert_hash(apr_hash_t *hash, swig_type_info *type,
 static PyObject *make_ob_##type(void *value) \
 { \
   apr_pool_t *new_pool = svn_pool_create(application_pool); \
-  PyObject *new_py_pool = svn_swig_NewPointerObj(new_pool, \
+  PyObject *new_py_pool = svn_swig_py_new_pointer_obj(new_pool, \
     svn_swig_TypeQuery("apr_pool_t *"), application_py_pool, NULL); \
   svn_##type##_t *new_value = dup(value, new_pool); \
   PyObject *obj = svn_swig_NewPointerObjString(new_value, "svn_" #type "_t *", \
@@ -1224,7 +1232,7 @@ apr_hash_t *svn_swig_py_struct_ptr_hash_from_dict(PyObject *dict,
           Py_DECREF(keys);
           return NULL;
         }
-      status = svn_swig_ConvertPtr(value, &struct_ptr, type);
+      status = svn_swig_py_convert_ptr(value, &struct_ptr, type);
       if (status != 0)
         {
           PyErr_SetString(PyExc_TypeError,
@@ -1284,7 +1292,7 @@ svn_swig_py_unwrap_struct_ptr(PyObject *source,
     void **ptr_dest = destination;
     swig_type_info *type_descriptor = baton;
 
-    int status = svn_swig_ConvertPtr(source, ptr_dest, type_descriptor);
+    int status = svn_swig_py_convert_ptr(source, ptr_dest, type_descriptor);
 
     if (status != 0)
       {
@@ -1417,62 +1425,62 @@ commit_item_array_to_list(const apr_array_header_t *array)
 }
 
 
-
+ 
 /*** Errors ***/
 
 /* Convert a given SubversionException to an svn_error_t. On failure returns
    NULL and sets a Python exception. */
 static svn_error_t *exception_to_error(PyObject * exc)
 {
-	const char *message, *file = NULL;
-	apr_status_t apr_err;
-	long line = 0;
-	PyObject *apr_err_ob = NULL, *child_ob = NULL, *message_ob = NULL;
-	PyObject *file_ob = NULL, *line_ob = NULL;
+    const char *message, *file = NULL;
+    apr_status_t apr_err;
+    long line = 0;
+    PyObject *apr_err_ob = NULL, *child_ob = NULL, *message_ob = NULL;
+    PyObject *file_ob = NULL, *line_ob = NULL;
     svn_error_t *rv = NULL, *child = NULL;
 
-	if ((apr_err_ob = PyObject_GetAttrString(exc, "apr_err")) == NULL)
-	    goto finished;
-	apr_err = (apr_status_t) PyInt_AsLong(apr_err_ob);
-	if (PyErr_Occurred()) goto finished;
-
-	if ((message_ob = PyObject_GetAttrString(exc, "message")) == NULL)
-	    goto finished;
-	message = PyString_AsString(message_ob);
-	if (PyErr_Occurred()) goto finished;
-
-	if ((file_ob = PyObject_GetAttrString(exc, "file")) == NULL)
-	    goto finished;
-	if (file_ob != Py_None)
-	    file = PyString_AsString(file_ob);
-	if (PyErr_Occurred()) goto finished;
-
-	if ((line_ob = PyObject_GetAttrString(exc, "line")) == NULL)
-	    goto finished;
-	if (line_ob != Py_None)
-	    line = PyInt_AsLong(line_ob);
-	if (PyErr_Occurred()) goto finished;
-
-	if ((child_ob = PyObject_GetAttrString(exc, "child")) == NULL)
-	    goto finished;
-	/* We could check if the child is a Subversion exception too,
-	   but let's just apply duck typing. */
-	if (child_ob != Py_None)
-	    child = exception_to_error(child_ob);
-	if (PyErr_Occurred()) goto finished;
-
-	rv = svn_error_create(apr_err, child, message);
-	/* Somewhat hacky, but we need to preserve original file/line info. */
-	rv->file = file ? apr_pstrdup(rv->pool, file) : NULL;
-	rv->line = line;
+    if ((apr_err_ob = PyObject_GetAttrString(exc, "apr_err")) == NULL)
+        goto finished;
+    apr_err = (apr_status_t) PyInt_AsLong(apr_err_ob);
+    if (PyErr_Occurred()) goto finished;
+
+    if ((message_ob = PyObject_GetAttrString(exc, "message")) == NULL)
+        goto finished;
+    message = PyString_AsString(message_ob);
+    if (PyErr_Occurred()) goto finished;
+
+    if ((file_ob = PyObject_GetAttrString(exc, "file")) == NULL)
+        goto finished;
+    if (file_ob != Py_None)
+        file = PyString_AsString(file_ob);
+    if (PyErr_Occurred()) goto finished;
+
+    if ((line_ob = PyObject_GetAttrString(exc, "line")) == NULL)
+        goto finished;
+    if (line_ob != Py_None)
+        line = PyInt_AsLong(line_ob);
+    if (PyErr_Occurred()) goto finished;
+
+    if ((child_ob = PyObject_GetAttrString(exc, "child")) == NULL)
+        goto finished;
+    /* We could check if the child is a Subversion exception too,
+       but let's just apply duck typing. */
+    if (child_ob != Py_None)
+        child = exception_to_error(child_ob);
+    if (PyErr_Occurred()) goto finished;
+
+    rv = svn_error_create(apr_err, child, message);
+    /* Somewhat hacky, but we need to preserve original file/line info. */
+    rv->file = file ? apr_pstrdup(rv->pool, file) : NULL;
+    rv->line = line;
 
 finished:
-	Py_XDECREF(child_ob);
-	Py_XDECREF(line_ob);
-	Py_XDECREF(file_ob);
-	Py_XDECREF(message_ob);
-	Py_XDECREF(apr_err_ob);
-	return rv;
+    Py_XDECREF(child_ob);
+    Py_XDECREF(line_ob);
+    Py_XDECREF(file_ob);
+    Py_XDECREF(message_ob);
+    Py_XDECREF(apr_err_ob);
+    return rv;
 }
 
 /* If the currently set Python exception is a valid SubversionException,
@@ -1540,6 +1548,7 @@ static svn_error_t *type_conversion_error(const char *datatype)
 typedef struct item_baton {
   PyObject *editor;     /* the editor handling the callbacks */
   PyObject *baton;      /* the dir/file baton (or NULL for edit baton) */
+  apr_pool_t *pool;     /* top-level pool */
 } item_baton;
 
 static item_baton *make_baton(apr_pool_t *pool,
@@ -1548,13 +1557,11 @@ static item_baton *make_baton(apr_pool_t *pool,
 {
   item_baton *newb = apr_palloc(pool, sizeof(*newb));
 
-  /* 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
-     the editor itself. */
+  /* Note: We steal the caller's reference to 'baton'. */
+  Py_INCREF(editor);
   newb->editor = editor;
   newb->baton = baton;
+  newb->pool = pool;
 
   return newb;
 }
@@ -1583,6 +1590,9 @@ static svn_error_t *close_baton(void *baton,
   /* there is no return value, so just toss this object (probably Py_None) */
   Py_DECREF(result);
 
+  /* Release the editor object */
+  Py_DECREF(ib->editor);
+
   /* We're now done with the baton. Since there isn't really a free, all
      we need to do is note that its objects are no longer referenced by
      the baton.  */
@@ -2044,6 +2054,373 @@ void svn_swig_py_make_editor(const svn_delta_editor_t **editor,
   *edit_baton = make_baton(pool, py_editor, NULL);
 }
 
+
+/* Wrappers for dump stream parser */
+
+static svn_error_t *parse_fn3_magic_header_record(int version,
+                                                  void *parse_baton,
+                                                  apr_pool_t *pool)
+{
+  item_baton *ib = parse_baton;
+  PyObject *result;
+  svn_error_t *err;
+
+  svn_swig_py_acquire_py_lock();
+
+  /* ### python doesn't have 'const' on the method name and format */
+  if ((result = PyObject_CallMethod(ib->editor, (char *)"magic_header_record",
+                                    (char *)"lO&", version,
+                                    make_ob_pool, pool)) == NULL)
+    {
+      err = callback_exception_error();
+      goto finished;
+    }
+
+  /* there is no return value, so just toss this object (probably Py_None) */
+  Py_DECREF(result);
+  err = SVN_NO_ERROR;
+
+ finished:
+  svn_swig_py_release_py_lock();
+  return err;
+}
+
+
+static svn_error_t *parse_fn3_uuid_record(const char *uuid,
+                                          void *parse_baton,
+                                          apr_pool_t *pool)
+{
+  item_baton *ib = parse_baton;
+  PyObject *result;
+  svn_error_t *err;
+
+  svn_swig_py_acquire_py_lock();
+
+  /* ### python doesn't have 'const' on the method name and format */
+  if ((result = PyObject_CallMethod(ib->editor, (char *)"uuid_record",
+                                    (char *)"sO&", uuid,
+                                    make_ob_pool, pool)) == NULL)
+    {
+      err = callback_exception_error();
+      goto finished;
+    }
+
+  /* there is no return value, so just toss this object (probably Py_None) */
+  Py_DECREF(result);
+  err = SVN_NO_ERROR;
+
+ finished:
+  svn_swig_py_release_py_lock();
+  return err;
+}
+
+
+static svn_error_t *parse_fn3_new_revision_record(void **revision_baton,
+                                                  apr_hash_t *headers,
+                                                  void *parse_baton,
+                                                  apr_pool_t *pool)
+{
+  item_baton *ib = parse_baton;
+  PyObject *result;
+  PyObject *tmp;
+  svn_error_t *err;
+
+  svn_swig_py_acquire_py_lock();
+
+  if ((result = PyObject_CallMethod(ib->editor, (char *)"new_revision_record",
+                                   (char *)"O&O&",
+                                   svn_swig_py_stringhash_to_dict, headers,
+                                   make_ob_pool, pool)) == NULL) {
+      err = callback_exception_error();
+      goto finished;
+    }
+
+  /* make_baton takes our 'result' reference */
+  *revision_baton = make_baton(pool, ib->editor, result);
+  err = SVN_NO_ERROR;
+
+ finished:
+  svn_swig_py_release_py_lock();
+  return err;
+}
+
+
+static svn_error_t *parse_fn3_new_node_record(void **node_baton,
+                                              apr_hash_t *headers,
+                                              void *revision_baton,
+                                              apr_pool_t *pool)
+{
+  item_baton *ib = revision_baton;
+  PyObject *result;
+  svn_error_t *err;
+
+  svn_swig_py_acquire_py_lock();
+
+  if ((result = PyObject_CallMethod(ib->editor, (char *)"new_node_record",
+                                   (char *)"O&OO&",
+                                   svn_swig_py_stringhash_to_dict, headers,
+                                   ib->baton,
+                                   make_ob_pool, pool)) == NULL) {
+      err = callback_exception_error();
+      goto finished;
+    }
+
+  /* make_baton takes our 'result' reference */
+  *node_baton = make_baton(pool, ib->editor, result);
+  err = SVN_NO_ERROR;
+
+ finished:
+  svn_swig_py_release_py_lock();
+  return err;
+}
+
+
+static svn_error_t *parse_fn3_set_revision_property(void *revision_baton,
+                                                    const char *name,
+                                                    const svn_string_t *value)
+{
+  item_baton *ib = revision_baton;
+  PyObject *result;
+  svn_error_t *err;
+
+  svn_swig_py_acquire_py_lock();
+
+  /* ### python doesn't have 'const' on the method name and format */
+  if ((result = PyObject_CallMethod(ib->editor, (char *)"set_revision_property",
+                                    (char *)"Oss#", ib->baton, name,
+                                    value ? value->data : NULL,
+                                    value ? value->len : 0)) == NULL)
+    {
+      err = callback_exception_error();
+      goto finished;
+    }
+
+  /* there is no return value, so just toss this object (probably Py_None) */
+  Py_DECREF(result);
+  err = SVN_NO_ERROR;
+
+ finished:
+  svn_swig_py_release_py_lock();
+  return err;
+}
+
+
+static svn_error_t *parse_fn3_set_node_property(void *node_baton,
+                                                const char *name,
+                                                const svn_string_t *value)
+{
+  item_baton *ib = node_baton;
+  PyObject *result;
+  svn_error_t *err;
+
+  svn_swig_py_acquire_py_lock();
+
+  /* ### python doesn't have 'const' on the method name and format */
+  if ((result = PyObject_CallMethod(ib->editor, (char *)"set_node_property",
+                                    (char *)"Oss#", ib->baton, name,
+                                    value ? value->data : NULL,
+                                    value ? value->len : 0)) == NULL)
+    {
+      err = callback_exception_error();
+      goto finished;
+    }
+
+  /* there is no return value, so just toss this object (probably Py_None) */
+  Py_DECREF(result);
+  err = SVN_NO_ERROR;
+
+ finished:
+  svn_swig_py_release_py_lock();
+  return err;
+}
+
+
+static svn_error_t *parse_fn3_delete_node_property(void *node_baton,
+                                                   const char *name)
+{
+  item_baton *ib = node_baton;
+  PyObject *result;
+  svn_error_t *err;
+
+  svn_swig_py_acquire_py_lock();
+
+  /* ### python doesn't have 'const' on the method name and format */
+  if ((result = PyObject_CallMethod(ib->editor, (char *)"delete_node_property",
+                                    (char *)"Os", ib->baton, name)) == NULL)
+    {
+      err = callback_exception_error();
+      goto finished;
+    }
+
+  /* there is no return value, so just toss this object (probably Py_None) */
+  Py_DECREF(result);
+  err = SVN_NO_ERROR;
+
+ finished:
+  svn_swig_py_release_py_lock();
+  return err;
+}
+
+
+static svn_error_t *parse_fn3_remove_node_props(void *node_baton)
+{
+  item_baton *ib = node_baton;
+  PyObject *result;
+  svn_error_t *err;
+
+  svn_swig_py_acquire_py_lock();
+
+  /* ### python doesn't have 'const' on the method name and format */
+  if ((result = PyObject_CallMethod(ib->editor, (char *)"remove_node_props",
+                                    (char *)"(O)", ib->baton)) == NULL)
+    {
+      err = callback_exception_error();
+      goto finished;
+    }
+
+  /* there is no return value, so just toss this object (probably Py_None) */
+  Py_DECREF(result);
+  err = SVN_NO_ERROR;
+
+ finished:
+  svn_swig_py_release_py_lock();
+  return err;
+}
+
+
+static svn_error_t *parse_fn3_set_fulltext(svn_stream_t **stream,
+                                           void *node_baton)
+{
+  item_baton *ib = node_baton;
+  PyObject *result;
+  svn_error_t *err;
+
+  svn_swig_py_acquire_py_lock();
+
+  /* ### python doesn't have 'const' on the method name and format */
+  if ((result = PyObject_CallMethod(ib->editor, (char *)"set_fulltext",
+                                    (char *)"(O)", ib->baton)) == NULL)
+    {
+      err = callback_exception_error();
+      goto finished;
+    }
+
+  /* Interpret None to mean NULL - no text is desired */
+  if (result == Py_None)
+    {
+      *stream = NULL;
+    }
+  else
+    {
+      /* create a stream from the IO object. it will increment the
+         reference on the 'result'. */
+      *stream = svn_swig_py_make_stream(result, ib->pool);
+    }
+
+  /* if the handler returned an IO object, svn_swig_py_make_stream() has
+     incremented its reference counter. If it was None, it is discarded. */
+  Py_DECREF(result);
+  err = SVN_NO_ERROR;
+
+ finished:
+  svn_swig_py_release_py_lock();
+  return err;
+}
+
+
+static svn_error_t *parse_fn3_apply_textdelta(svn_txdelta_window_handler_t *handler,
+                                              void **handler_baton,
+                                              void *node_baton)
+{
+  item_baton *ib = node_baton;
+  PyObject *result;
+  svn_error_t *err;
+
+  svn_swig_py_acquire_py_lock();
+
+  /* ### python doesn't have 'const' on the method name and format */
+  if ((result = PyObject_CallMethod(ib->editor, (char *)"apply_textdelta",
+                                    (char *)"(O)", ib->baton)) == NULL)
+    {
+      err = callback_exception_error();
+      goto finished;
+    }
+
+  /* Interpret None to mean svn_delta_noop_window_handler. This is much
+     easier/faster than making code always have to write a NOOP handler
+     in Python.  */
+  if (result == Py_None)
+    {
+      Py_DECREF(result);
+
+      *handler = svn_delta_noop_window_handler;
+      *handler_baton = NULL;
+    }
+  else
+    {
+      /* return the thunk for invoking the handler. the baton takes our
+         'result' reference, which is the handler. */
+      *handler = window_handler;
+      *handler_baton = result;
+    }
+
+  err = SVN_NO_ERROR;
+
+ finished:
+  svn_swig_py_release_py_lock();
+  return err;
+}
+
+
+static svn_error_t *parse_fn3_close_node(void *node_baton)
+{
+  return close_baton(node_baton, "close_node");
+}
+
+
+static svn_error_t *parse_fn3_close_revision(void *revision_baton)
+{
+  return close_baton(revision_baton, "close_revision");
+}
+
+
+static const svn_repos_parse_fns3_t thunk_parse_fns3_vtable =
+  {
+    parse_fn3_magic_header_record,
+    parse_fn3_uuid_record,
+    parse_fn3_new_revision_record,
+    parse_fn3_new_node_record,
+    parse_fn3_set_revision_property,
+    parse_fn3_set_node_property,
+    parse_fn3_delete_node_property,
+    parse_fn3_remove_node_props,
+    parse_fn3_set_fulltext,
+    parse_fn3_apply_textdelta,
+    parse_fn3_close_node,
+    parse_fn3_close_revision
+  };
+
+static apr_status_t
+svn_swig_py_parse_fns3_destroy(void *parse_baton)
+{
+  close_baton(parse_baton, "_close_dumpstream");
+  return APR_SUCCESS;
+}
+
+void svn_swig_py_make_parse_fns3(const svn_repos_parse_fns3_t **parse_fns3,
+                                 void **parse_baton,
+                                 PyObject *py_parse_fns3,
+                                 apr_pool_t *pool)
+{
+  *parse_fns3 = &thunk_parse_fns3_vtable;
+  *parse_baton = make_baton(pool, py_parse_fns3, NULL);
+
+  /* Dump stream vtable does not provide a method which is called right before
+     the end of the parsing (similar to close_edit/abort_edit in delta editor).
+     Thus, register a pool clean-up routine to release this parse baton. */
+  apr_pool_cleanup_register(pool, *parse_baton, svn_swig_py_parse_fns3_destroy,
+                            apr_pool_cleanup_null);
+}
 
 
 /*** Other Wrappers for SVN Functions ***/
@@ -2200,7 +2577,8 @@ svn_swig_py_make_stream(PyObject *py_io, apr_pool_t *pool)
   svn_stream_t *stream;
 
   stream = svn_stream_create(py_io, pool);
-  svn_stream_set_read(stream, read_handler_pyio);
+  svn_stream_set_read2(stream, NULL /* only full read support */,
+                       read_handler_pyio);
   svn_stream_set_write(stream, write_handler_pyio);
   svn_stream_set_close(stream, close_handler_pyio);
   apr_pool_cleanup_register(pool, py_io, svn_swig_py_stream_destroy,
@@ -2223,7 +2601,7 @@ svn_swig_py_convert_txdelta_op_c_array(int num_ops,
 
   for (i = 0; i < num_ops; ++i)
       PyList_SET_ITEM(result, i,
-                      svn_swig_NewPointerObj(ops + i, op_type_info,
+                      svn_swig_py_new_pointer_obj(ops + i, op_type_info,
                                              parent_pool, NULL));
 
   return result;
@@ -2483,6 +2861,42 @@ svn_error_t *svn_swig_py_fs_get_locks_func(void *baton,
   return err;
 }
 
+svn_error_t *svn_swig_py_fs_lock_callback(
+                    void *baton,
+                    const char *path,
+                    const svn_lock_t *lock,
+                    svn_error_t *fs_err,
+                    apr_pool_t *pool)
+{
+  svn_error_t *err = SVN_NO_ERROR;
+  PyObject *py_callback = baton, *result;
+
+  if (py_callback == NULL || py_callback == Py_None)
+    return SVN_NO_ERROR;
+
+  svn_swig_py_acquire_py_lock();
+
+  if ((result = PyObject_CallFunction(py_callback,
+                                      (char *)"sO&O&O&",
+                                      path,
+                                      make_ob_lock, lock,
+                                      make_ob_error, fs_err,
+                                      make_ob_pool, pool)) == NULL)
+    {
+      err = callback_exception_error();
+    }
+  else if (result != Py_None)
+    {
+      err = callback_bad_return_error("Not None");
+    }
+
+  Py_XDECREF(result);
+
+  svn_swig_py_release_py_lock();
+  return err;
+}
+
+
 svn_error_t *svn_swig_py_get_commit_log_func(const char **log_msg,
                                              const char **tmp_file,
                                              const apr_array_header_t *
@@ -3391,7 +3805,7 @@ ra_callbacks_open_tmp_file(apr_file_t **fp,
       *fp = svn_swig_py_make_file(result, pool);
       if (*fp == NULL)
        {
-      	  err = callback_exception_error();
+          err = callback_exception_error();
        }
     }
 
@@ -3441,7 +3855,7 @@ ra_callbacks_get_wc_prop(void *baton,
       Py_ssize_t len;
       if (PyString_AsStringAndSize(result, &buf, &len) == -1)
         {
-      	  err = callback_exception_error();
+          err = callback_exception_error();
         }
       else
         {
@@ -3683,7 +4097,7 @@ ra_callbacks_get_client_string(void *baton,
     {
       if ((*name = PyString_AsString(result)) == NULL)
         {
-      	  err = callback_exception_error();
+          err = callback_exception_error();
         }
     }
 
@@ -3882,9 +4296,10 @@ svn_error_t *svn_swig_py_ra_lock_callback(
   svn_swig_py_acquire_py_lock();
 
   if ((result = PyObject_CallFunction(py_callback,
-                                     (char *)"sbO&O&",
+                                     (char *)"sbO&O&O&",
                                      path, do_lock,
                                      make_ob_lock, lock,
+                                     make_ob_error, ra_err,
                                      make_ob_pool, pool)) == NULL)
     {
       err = callback_exception_error();
@@ -4068,7 +4483,7 @@ static svn_error_t *reporter_abort_report(void *report_baton,
   return err;
 }
 
-const svn_ra_reporter2_t swig_py_ra_reporter2 = {
+static const svn_ra_reporter2_t swig_py_ra_reporter2 = {
     reporter_set_path,
     reporter_delete_path,
     reporter_link_path,
@@ -4076,6 +4491,11 @@ const svn_ra_reporter2_t swig_py_ra_reporter2 = {
     reporter_abort_report
 };
 
+const svn_ra_reporter2_t *svn_swig_py_get_ra_reporter2()
+{
+  return &swig_py_ra_reporter2;
+}
+
 /* svn_wc_diff_callbacks2_t */
 static svn_error_t *
 wc_diff_callbacks2_file_changed_or_added(const char *callback,
diff --git a/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h b/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h
index 60931c2..512da28 100644
--- a/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h
+++ b/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h
@@ -40,16 +40,6 @@
 #include "svn_repos.h"
 
 /* Define DLL export magic on Windows. */
-#ifdef WIN32
-#  ifdef SVN_SWIG_SWIGUTIL_PY_C
-#    define SVN_SWIG_SWIGUTIL_EXPORT __declspec(dllexport)
-#  else
-#    define SVN_SWIG_SWIGUTIL_EXPORT __declspec(dllimport)
-#  endif
-#else
-#  define SVN_SWIG_SWIGUTIL_EXPORT
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
@@ -57,27 +47,22 @@ extern "C" {
 
 
 /* Initialize the libsvn_swig_py library. */
-SVN_SWIG_SWIGUTIL_EXPORT
 apr_status_t svn_swig_py_initialize(void);
 
 
 
 /* Functions to manage python's global interpreter lock */
-SVN_SWIG_SWIGUTIL_EXPORT
 void svn_swig_py_release_py_lock(void);
 
-SVN_SWIG_SWIGUTIL_EXPORT
 void svn_swig_py_acquire_py_lock(void);
 
 
 /*** Automatic Pool Management Functions ***/
 
 /* Set the application pool */
-SVN_SWIG_SWIGUTIL_EXPORT
 void svn_swig_py_set_application_pool(PyObject *py_pool, apr_pool_t *pool);
 
 /* Clear the application pool */
-SVN_SWIG_SWIGUTIL_EXPORT
 void svn_swig_py_clear_application_pool(void);
 
 /* Get the pool argument from the last element of tuple args.
@@ -85,7 +70,6 @@ void svn_swig_py_clear_application_pool(void);
  * subpool. Return 0 if successful. Return 1 if an error
  * occurs.
  */
-SVN_SWIG_SWIGUTIL_EXPORT
 int svn_swig_py_get_pool_arg(PyObject *args, swig_type_info *type,
     PyObject **py_pool, apr_pool_t **pool);
 
@@ -93,7 +77,6 @@ int svn_swig_py_get_pool_arg(PyObject *args, swig_type_info *type,
  * argument list. Return 0 if successful. Return 1 if an error
  * occurs.
  */
-SVN_SWIG_SWIGUTIL_EXPORT
 int svn_swig_py_get_parent_pool(PyObject *args, swig_type_info *type,
     PyObject **py_pool, apr_pool_t **pool);
 
@@ -101,54 +84,45 @@ int svn_swig_py_get_parent_pool(PyObject *args, swig_type_info *type,
 /*** SWIG Wrappers ***/
 
 /* Wrapper for SWIG_NewPointerObj */
-SVN_SWIG_SWIGUTIL_EXPORT
-PyObject *svn_swig_NewPointerObj(void *obj, swig_type_info *type,
+PyObject *svn_swig_py_new_pointer_obj(void *obj, swig_type_info *type,
                                  PyObject *pool, PyObject *args);
 
 /* Wrapper for SWIG_ConvertPtr */
-SVN_SWIG_SWIGUTIL_EXPORT
-int svn_swig_ConvertPtr(PyObject *input, void **obj, swig_type_info *type);
+int svn_swig_py_convert_ptr(PyObject *input, void **obj, swig_type_info *type);
 
 /* Wrapper for SWIG_MustGetPtr */
-SVN_SWIG_SWIGUTIL_EXPORT
-void *svn_swig_MustGetPtr(void *input, swig_type_info *type, int argnum);
+void *svn_swig_py_must_get_ptr(void *input, swig_type_info *type, int argnum);
 
 /*** Functions to expose a custom SubversionException ***/
 
 /* raise a subversion exception, created from a normal subversion
    error.  consume the error.  */
-SVN_SWIG_SWIGUTIL_EXPORT
 void svn_swig_py_svn_exception(svn_error_t *err);
 
 
 
 /* helper function to convert an apr_hash_t* (char* -> svnstring_t*) to
    a Python dict */
-SVN_SWIG_SWIGUTIL_EXPORT
 PyObject *svn_swig_py_prophash_to_dict(apr_hash_t *hash);
 
 /* helper function to convert an apr_hash_t* (svn_revnum_t* -> const
    char *) to a Python dict */
-SVN_SWIG_SWIGUTIL_EXPORT
 PyObject *svn_swig_py_locationhash_to_dict(apr_hash_t *hash);
 
 /* helper function to convert an apr_array_header_t* (of
    svn_merge_range_t *) to a Python list */
-SVN_SWIG_SWIGUTIL_EXPORT
 PyObject *svn_swig_py_pointerlist_to_list(apr_array_header_t *list,
                                           swig_type_info *type,
                                           PyObject *py_pool);
 
 /* helper function to convert an apr_hash_t* (const char *->array of
    svn_merge_range_t *) to a Python dict */
-SVN_SWIG_SWIGUTIL_EXPORT
 PyObject *svn_swig_py_mergeinfo_to_dict(apr_hash_t *hash,
                                         swig_type_info *type,
                                         PyObject *py_pool);
 
 /* helper function to convert an apr_hash_t* (const char *->hash of
    mergeinfo hashes) to a Python dict */
-SVN_SWIG_SWIGUTIL_EXPORT
 PyObject *svn_swig_py_mergeinfo_catalog_to_dict(apr_hash_t *hash,
                                                 swig_type_info *type,
                                                 PyObject *py_pool);
@@ -156,90 +130,75 @@ PyObject *svn_swig_py_mergeinfo_catalog_to_dict(apr_hash_t *hash,
 /* helper function to convert an apr_hash_t *(const char *->const char
  *) to a Python dict */
 
-SVN_SWIG_SWIGUTIL_EXPORT
 PyObject *svn_swig_py_stringhash_to_dict(apr_hash_t *hash);
 
 /* convert a hash of 'const char *' -> TYPE into a Python dict */
-SVN_SWIG_SWIGUTIL_EXPORT
 PyObject *svn_swig_py_convert_hash(apr_hash_t *hash, swig_type_info *type,
                                    PyObject *py_pool);
 
 /* helper function to convert a 'char **' into a Python list of string
    objects */
-SVN_SWIG_SWIGUTIL_EXPORT
 PyObject *svn_swig_py_c_strings_to_list(char **strings);
 
 /* helper function to convert an array of 'const char *' to a Python list
    of string objects */
-SVN_SWIG_SWIGUTIL_EXPORT
 PyObject *svn_swig_py_array_to_list(const apr_array_header_t *strings);
 
 /* helper function to convert a hash mapping char * to
  * svn_log_changed_path_t * to a Python dict mapping str to str. */
-SVN_SWIG_SWIGUTIL_EXPORT
 PyObject *svn_swig_py_changed_path_hash_to_dict(apr_hash_t *hash);
 
 /* helper function to convert a hash mapping char * to
  * svn_log_changed_path2_t * to a Python dict mapping str to str. */
-SVN_SWIG_SWIGUTIL_EXPORT
 PyObject *svn_swig_py_changed_path2_hash_to_dict(apr_hash_t *hash);
 
 /* helper function to convert an array of 'svn_revnum_t' to a Python list
    of int objects */
-SVN_SWIG_SWIGUTIL_EXPORT
 PyObject *svn_swig_py_revarray_to_list(const apr_array_header_t *revs);
 
 /* helper function to convert a Python dictionary mapping strings to
    strings into an apr_hash_t mapping const char *'s to const char *'s,
    allocated in POOL. */
-SVN_SWIG_SWIGUTIL_EXPORT
 apr_hash_t *svn_swig_py_stringhash_from_dict(PyObject *dict,
                                              apr_pool_t *pool);
 
 /* helper function to convert a Python dictionary mapping strings to
    rangelists into an apr_hash_t mapping const char *'s to rangelists,
    allocated in POOL. */
-SVN_SWIG_SWIGUTIL_EXPORT
 apr_hash_t *svn_swig_py_mergeinfo_from_dict(PyObject *dict,
                                              apr_pool_t *pool);
 
 /* helper function to convert a Python dictionary mapping strings to
    strings into an 'apr_array_header_t *' of svn_prop_t *
    allocated in POOL. */
-SVN_SWIG_SWIGUTIL_EXPORT
 apr_array_header_t *svn_swig_py_proparray_from_dict(PyObject *dict,
                                                     apr_pool_t *pool);
 
 /* helper function to convert a 'apr_array_header_t *' of 'svn_prop_t
    to a Python dictionary mapping strings to strings. */
-SVN_SWIG_SWIGUTIL_EXPORT
 PyObject *svn_swig_py_proparray_to_dict(const apr_array_header_t *array);
 
 /* helper function to convert a 'apr_array_header_t *' of
    'svn_prop_inherited_item_t' to a Python dictionary mapping strings
    to dictionary. */
-SVN_SWIG_SWIGUTIL_EXPORT
 PyObject *
 svn_swig_py_propinheriteditemarray_to_dict(const apr_array_header_t *array);
 
 /* helper function to convert a Python dictionary mapping strings to
    strings into an apr_hash_t mapping const char *'s to svn_string_t's,
    allocated in POOL. */
-SVN_SWIG_SWIGUTIL_EXPORT
 apr_hash_t *svn_swig_py_prophash_from_dict(PyObject *dict,
                                            apr_pool_t *pool);
 
 /* helper function to convert a Python dictionary mapping strings to
    integers into an apr_hash_t mapping const char *'s to revnums,
    allocated in POOL. */
-SVN_SWIG_SWIGUTIL_EXPORT
 apr_hash_t *svn_swig_py_path_revs_hash_from_dict(PyObject *dict,
                                                  apr_pool_t *pool);
 
 /* helper function to convert a Python dictionary mapping strings to
    SWIG wrappers described by type into an apr_hash_t mapping const char *'s to
    struct pointers, allocated in POOL. */
-SVN_SWIG_SWIGUTIL_EXPORT
 apr_hash_t *svn_swig_py_struct_ptr_hash_from_dict(PyObject *dict,
                                                   swig_type_info *type,
                                                   apr_pool_t *pool);
@@ -259,7 +218,6 @@ typedef int (*svn_swig_py_object_unwrap_t)(PyObject *source,
    In case of failure, raises a Python exception, presuming that seq was the
    function argument #argnum.
    pool is used to allocate the array. */
-SVN_SWIG_SWIGUTIL_EXPORT
 const apr_array_header_t *
 svn_swig_py_seq_to_array(PyObject *seq,
                          int element_size,
@@ -269,7 +227,6 @@ svn_swig_py_seq_to_array(PyObject *seq,
 
 /* An svn_swig_py_object_unwrap_t that extracts a char pointer from a Python
    string. */
-SVN_SWIG_SWIGUTIL_EXPORT
 int
 svn_swig_py_unwrap_string(PyObject *source,
                           void *destination,
@@ -277,7 +234,6 @@ svn_swig_py_unwrap_string(PyObject *source,
 
 /* An svn_swig_py_object_unwrap_t that extracts an svn_revnum_t from a Python
    integer. */
-SVN_SWIG_SWIGUTIL_EXPORT
 int
 svn_swig_py_unwrap_revnum(PyObject *source,
                           void *destination,
@@ -285,30 +241,31 @@ svn_swig_py_unwrap_revnum(PyObject *source,
 
 /* An svn_swig_py_object_unwrap_t that extracts a struct pointer from a SWIG
    wrapper. baton is expected to be a swig_type_info* describing the struct. */
-SVN_SWIG_SWIGUTIL_EXPORT
 int
 svn_swig_py_unwrap_struct_ptr(PyObject *source,
                           void *destination,
                           void *baton);
 
 /* make an editor that "thunks" from C callbacks up to Python */
-SVN_SWIG_SWIGUTIL_EXPORT
 void svn_swig_py_make_editor(const svn_delta_editor_t **editor,
                              void **edit_baton,
                              PyObject *py_editor,
                              apr_pool_t *pool);
 
-SVN_SWIG_SWIGUTIL_EXPORT
+/* make a parse vtable that "thunks" from C callbacks up to Python */
+void svn_swig_py_make_parse_fns3(const svn_repos_parse_fns3_t **parse_fns3,
+                                 void **parse_baton,
+                                 PyObject *py_parse_fns3,
+                                 apr_pool_t *pool);
+
 apr_file_t *svn_swig_py_make_file(PyObject *py_file,
                                   apr_pool_t *pool);
 
-SVN_SWIG_SWIGUTIL_EXPORT
 svn_stream_t *svn_swig_py_make_stream(PyObject *py_io,
                                       apr_pool_t *pool);
 
 /* Convert ops, a C array of num_ops elements, to a Python list of SWIG
    objects with descriptor op_type_info and pool set to parent_pool. */
-SVN_SWIG_SWIGUTIL_EXPORT
 PyObject *
 svn_swig_py_convert_txdelta_op_c_array(int num_ops,
                                        svn_txdelta_op_t *ops,
@@ -317,7 +274,6 @@ svn_swig_py_convert_txdelta_op_c_array(int num_ops,
 
 /* a notify function that executes a Python function that is passed in
    via the baton argument */
-SVN_SWIG_SWIGUTIL_EXPORT
 void svn_swig_py_notify_func(void *baton,
                              const char *path,
                              svn_wc_notify_action_t action,
@@ -327,21 +283,18 @@ void svn_swig_py_notify_func(void *baton,
                              svn_wc_notify_state_t prop_state,
                              svn_revnum_t revision);
 
-SVN_SWIG_SWIGUTIL_EXPORT
 void svn_swig_py_notify_func2(void *baton,
                               const svn_wc_notify_t *notify,
                               apr_pool_t *pool);
 
 /* a status function that executes a Python function that is passed in
    via the baton argument */
-SVN_SWIG_SWIGUTIL_EXPORT
 void svn_swig_py_status_func(void *baton,
                              const char *path,
                              svn_wc_status_t *status);
 
 /* a svn_delta_path_driver callback that executes a Python function
   that is passed in via the baton argument */
-SVN_SWIG_SWIGUTIL_EXPORT
 svn_error_t *svn_swig_py_delta_path_driver_cb_func(void **dir_baton,
                                                    void *parent_baton,
                                                    void *callback_baton,
@@ -350,24 +303,27 @@ svn_error_t *svn_swig_py_delta_path_driver_cb_func(void **dir_baton,
 
 /* a status function that executes a Python function that is passed in
    via the baton argument */
-SVN_SWIG_SWIGUTIL_EXPORT
 void svn_swig_py_status_func2(void *baton,
                               const char *path,
                               svn_wc_status2_t *status);
 
 /* a cancel function that executes a Python function passed in via the
    cancel_baton argument. */
-SVN_SWIG_SWIGUTIL_EXPORT
 svn_error_t *svn_swig_py_cancel_func(void *cancel_baton);
 
 /* thunked fs get_locks function */
-SVN_SWIG_SWIGUTIL_EXPORT
 svn_error_t *svn_swig_py_fs_get_locks_func(void *baton,
                                            svn_lock_t *lock,
                                            apr_pool_t *pool);
 
+svn_error_t *svn_swig_py_fs_lock_callback(
+                    void *baton,
+                    const char *path,
+                    const svn_lock_t *lock,
+                    svn_error_t *ra_err,
+                    apr_pool_t *pool);
+
 /* thunked commit log fetcher */
-SVN_SWIG_SWIGUTIL_EXPORT
 svn_error_t *svn_swig_py_get_commit_log_func(const char **log_msg,
                                              const char **tmp_file,
                                              const apr_array_header_t *
@@ -376,7 +332,6 @@ svn_error_t *svn_swig_py_get_commit_log_func(const char **log_msg,
                                              apr_pool_t *pool);
 
 /* thunked repos authz callback function */
-SVN_SWIG_SWIGUTIL_EXPORT
 svn_error_t *svn_swig_py_repos_authz_func(svn_boolean_t *allowed,
                                           svn_fs_root_t *root,
                                           const char *path,
@@ -384,14 +339,12 @@ svn_error_t *svn_swig_py_repos_authz_func(svn_boolean_t *allowed,
                                           apr_pool_t *pool);
 
 /* thunked history callback function */
-SVN_SWIG_SWIGUTIL_EXPORT
 svn_error_t *svn_swig_py_repos_history_func(void *baton,
                                             const char *path,
                                             svn_revnum_t revision,
                                             apr_pool_t *pool);
 
 /* thunked log receiver function */
-SVN_SWIG_SWIGUTIL_EXPORT
 svn_error_t *svn_swig_py_log_receiver(void *py_receiver,
                                       apr_hash_t *changed_paths,
                                       svn_revnum_t rev,
@@ -401,23 +354,19 @@ svn_error_t *svn_swig_py_log_receiver(void *py_receiver,
                                       apr_pool_t *pool);
 
 /* thunked log receiver2 function */
-SVN_SWIG_SWIGUTIL_EXPORT
 svn_error_t *svn_swig_py_log_entry_receiver(void *baton,
                                             svn_log_entry_t *log_entry,
                                             apr_pool_t *pool);
 
 /* thunked repos freeze function */
-SVN_SWIG_SWIGUTIL_EXPORT
 svn_error_t *svn_swig_py_repos_freeze_func(void *baton,
                                            apr_pool_t *pool);
 
 /* thunked fs freeze function */
-SVN_SWIG_SWIGUTIL_EXPORT
 svn_error_t *svn_swig_py_fs_freeze_func(void *baton,
                                         apr_pool_t *pool);
 
 /* thunked proplist receiver2 function */
-SVN_SWIG_SWIGUTIL_EXPORT
 svn_error_t *svn_swig_py_proplist_receiver2(void *baton,
                                             const char *path,
                                             apr_hash_t *prop_hash,
@@ -425,21 +374,18 @@ svn_error_t *svn_swig_py_proplist_receiver2(void *baton,
                                             apr_pool_t *pool);
 
 /* thunked info receiver function */
-SVN_SWIG_SWIGUTIL_EXPORT
 svn_error_t *svn_swig_py_info_receiver_func(void *py_receiver,
                                             const char *path,
                                             const svn_info_t *info,
                                             apr_pool_t *pool);
 
 /* thunked location segments receiver function */
-SVN_SWIG_SWIGUTIL_EXPORT
 svn_error_t *
 svn_swig_py_location_segment_receiver_func(svn_location_segment_t *segment,
                                            void *baton,
                                            apr_pool_t *pool);
 
 /* thunked blame receiver function */
-SVN_SWIG_SWIGUTIL_EXPORT
 svn_error_t *svn_swig_py_client_blame_receiver_func(void *baton,
                                                     apr_int64_t line_no,
                                                     svn_revnum_t revision,
@@ -449,21 +395,18 @@ svn_error_t *svn_swig_py_client_blame_receiver_func(void *baton,
                                                     apr_pool_t *pool);
 
 /* thunked changelist receiver function */
-SVN_SWIG_SWIGUTIL_EXPORT
 svn_error_t *svn_swig_py_changelist_receiver_func(void *baton,
                                                   const char *path,
                                                   const char *changelist,
                                                   apr_pool_t *pool);
 
 /* auth provider callbacks */
-SVN_SWIG_SWIGUTIL_EXPORT
 svn_error_t * svn_swig_py_auth_gnome_keyring_unlock_prompt_func(
         char **keyring_passwd,
         const char *keyring_name,
         void *baton,
         apr_pool_t *pool);
 
-SVN_SWIG_SWIGUTIL_EXPORT
 svn_error_t *svn_swig_py_auth_simple_prompt_func(
     svn_auth_cred_simple_t **cred,
     void *baton,
@@ -472,7 +415,6 @@ svn_error_t *svn_swig_py_auth_simple_prompt_func(
     svn_boolean_t may_save,
     apr_pool_t *pool);
 
-SVN_SWIG_SWIGUTIL_EXPORT
 svn_error_t *svn_swig_py_auth_username_prompt_func(
     svn_auth_cred_username_t **cred,
     void *baton,
@@ -480,7 +422,6 @@ svn_error_t *svn_swig_py_auth_username_prompt_func(
     svn_boolean_t may_save,
     apr_pool_t *pool);
 
-SVN_SWIG_SWIGUTIL_EXPORT
 svn_error_t *svn_swig_py_auth_ssl_server_trust_prompt_func(
     svn_auth_cred_ssl_server_trust_t **cred,
     void *baton,
@@ -490,7 +431,6 @@ svn_error_t *svn_swig_py_auth_ssl_server_trust_prompt_func(
     svn_boolean_t may_save,
     apr_pool_t *pool);
 
-SVN_SWIG_SWIGUTIL_EXPORT
 svn_error_t *svn_swig_py_auth_ssl_client_cert_prompt_func(
     svn_auth_cred_ssl_client_cert_t **cred,
     void *baton,
@@ -498,7 +438,6 @@ svn_error_t *svn_swig_py_auth_ssl_client_cert_prompt_func(
     svn_boolean_t may_save,
     apr_pool_t *pool);
 
-SVN_SWIG_SWIGUTIL_EXPORT
 svn_error_t *svn_swig_py_auth_ssl_client_cert_pw_prompt_func(
     svn_auth_cred_ssl_client_cert_pw_t **cred,
     void *baton,
@@ -507,7 +446,6 @@ svn_error_t *svn_swig_py_auth_ssl_client_cert_pw_prompt_func(
     apr_pool_t *pool);
 
 /* auth cleanup callback */
-SVN_SWIG_SWIGUTIL_EXPORT
 svn_error_t *svn_swig_py_config_auth_walk_func(svn_boolean_t *delete_cred,
                                                void *walk_baton,
                                                const char *cred_kind,
@@ -515,32 +453,27 @@ svn_error_t *svn_swig_py_config_auth_walk_func(svn_boolean_t *delete_cred,
                                                apr_hash_t *hash,
                                                apr_pool_t *scratch_pool);
 
-SVN_SWIG_SWIGUTIL_EXPORT
 void
 svn_swig_py_setup_ra_callbacks(svn_ra_callbacks2_t **callbacks,
                                void **baton,
                                PyObject *py_callbacks,
                                apr_pool_t *pool);
 
-SVN_SWIG_SWIGUTIL_EXPORT
 svn_wc_diff_callbacks2_t *
 svn_swig_py_setup_wc_diff_callbacks2(void **baton,
                                      PyObject *py_callbacks,
                                      apr_pool_t *pool);
 
-SVN_SWIG_SWIGUTIL_EXPORT
 svn_error_t *svn_swig_py_commit_callback2(const svn_commit_info_t *commit_info,
                                           void *baton,
                                           apr_pool_t *pool);
 
-SVN_SWIG_SWIGUTIL_EXPORT
 svn_error_t *svn_swig_py_commit_callback(svn_revnum_t new_revision,
                                          const char *date,
                                          const char *author,
                                          void *baton);
 
 
-SVN_SWIG_SWIGUTIL_EXPORT
 svn_error_t *svn_swig_py_ra_file_rev_handler_func(
                     void *baton,
                     const char *path,
@@ -551,7 +484,6 @@ svn_error_t *svn_swig_py_ra_file_rev_handler_func(
                     apr_array_header_t *prop_diffs,
                     apr_pool_t *pool);
 
-SVN_SWIG_SWIGUTIL_EXPORT
 svn_error_t *svn_swig_py_ra_lock_callback(
                     void *baton,
                     const char *path,
@@ -560,17 +492,14 @@ svn_error_t *svn_swig_py_ra_lock_callback(
                     svn_error_t *ra_err,
                     apr_pool_t *pool);
 
-SVN_SWIG_SWIGUTIL_EXPORT
-extern const svn_ra_reporter2_t swig_py_ra_reporter2;
+const svn_ra_reporter2_t *svn_swig_py_get_ra_reporter2(void);
 
-SVN_SWIG_SWIGUTIL_EXPORT
 svn_boolean_t
 svn_swig_py_config_enumerator2(const char *name,
                                const char *value,
                                void *baton,
                                apr_pool_t *pool);
 
-SVN_SWIG_SWIGUTIL_EXPORT
 svn_boolean_t
 svn_swig_py_config_section_enumerator2(const char *name,
                                        void *baton,
diff --git a/subversion/bindings/swig/python/ra.py b/subversion/bindings/swig/python/ra.py
index d43ae5e..6fa76da 100644
--- a/subversion/bindings/swig/python/ra.py
+++ b/subversion/bindings/swig/python/ra.py
@@ -1,11 +1,13 @@
 # This file was automatically generated by SWIG (http://www.swig.org).
-# Version 2.0.9
+# Version 2.0.12
 #
 # Do not make changes to this file unless you know what you are doing--modify
 # the SWIG interface file instead.
 
 
 
+
+
 from sys import version_info
 if version_info >= (2,6,0):
     def swig_import_helper():
@@ -108,7 +110,7 @@ class svn_ra_reporter3_t:
     __swig_setmethods__["abort_report"] = _ra.svn_ra_reporter3_t_abort_report_set
     __swig_getmethods__["abort_report"] = _ra.svn_ra_reporter3_t_abort_report_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_ra_reporter3_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -127,13 +129,13 @@ class svn_ra_reporter3_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -142,9 +144,9 @@ class svn_ra_reporter3_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -192,7 +194,7 @@ class svn_ra_reporter2_t:
     __swig_setmethods__["abort_report"] = _ra.svn_ra_reporter2_t_abort_report_set
     __swig_getmethods__["abort_report"] = _ra.svn_ra_reporter2_t_abort_report_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_ra_reporter2_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -211,13 +213,13 @@ class svn_ra_reporter2_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -226,9 +228,9 @@ class svn_ra_reporter2_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -276,7 +278,7 @@ class svn_ra_reporter_t:
     __swig_setmethods__["abort_report"] = _ra.svn_ra_reporter_t_abort_report_set
     __swig_getmethods__["abort_report"] = _ra.svn_ra_reporter_t_abort_report_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_ra_reporter_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -295,13 +297,13 @@ class svn_ra_reporter_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -310,9 +312,9 @@ class svn_ra_reporter_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -371,8 +373,14 @@ class svn_ra_callbacks2_t:
     __swig_getmethods__["get_client_string"] = _ra.svn_ra_callbacks2_t_get_client_string_get
     __swig_setmethods__["get_wc_contents"] = _ra.svn_ra_callbacks2_t_get_wc_contents_set
     __swig_getmethods__["get_wc_contents"] = _ra.svn_ra_callbacks2_t_get_wc_contents_get
+    __swig_setmethods__["check_tunnel_func"] = _ra.svn_ra_callbacks2_t_check_tunnel_func_set
+    __swig_getmethods__["check_tunnel_func"] = _ra.svn_ra_callbacks2_t_check_tunnel_func_get
+    __swig_setmethods__["open_tunnel_func"] = _ra.svn_ra_callbacks2_t_open_tunnel_func_set
+    __swig_getmethods__["open_tunnel_func"] = _ra.svn_ra_callbacks2_t_open_tunnel_func_get
+    __swig_setmethods__["tunnel_baton"] = _ra.svn_ra_callbacks2_t_tunnel_baton_set
+    __swig_getmethods__["tunnel_baton"] = _ra.svn_ra_callbacks2_t_tunnel_baton_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_ra_callbacks2_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -391,13 +399,13 @@ class svn_ra_callbacks2_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -406,9 +414,9 @@ class svn_ra_callbacks2_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -446,7 +454,7 @@ class svn_ra_callbacks_t:
     __swig_setmethods__["invalidate_wc_props"] = _ra.svn_ra_callbacks_t_invalidate_wc_props_set
     __swig_getmethods__["invalidate_wc_props"] = _ra.svn_ra_callbacks_t_invalidate_wc_props_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_ra_callbacks_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -465,13 +473,13 @@ class svn_ra_callbacks_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -480,9 +488,9 @@ class svn_ra_callbacks_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -915,7 +923,7 @@ class svn_ra_plugin_t:
     __swig_setmethods__["get_version"] = _ra.svn_ra_plugin_t_get_version_set
     __swig_getmethods__["get_version"] = _ra.svn_ra_plugin_t_get_version_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_ra_plugin_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -934,13 +942,13 @@ class svn_ra_plugin_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -949,9 +957,9 @@ class svn_ra_plugin_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -1044,7 +1052,7 @@ class svn_ra_session_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_ra_session_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1063,13 +1071,13 @@ class svn_ra_session_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1078,9 +1086,9 @@ class svn_ra_session_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -1380,6 +1388,22 @@ def svn_ra_invoke_replay_revfinish_callback(*args):
     """
   return _ra.svn_ra_invoke_replay_revfinish_callback(*args)
 
+def svn_ra_invoke_check_tunnel_func(*args):
+  """svn_ra_invoke_check_tunnel_func(svn_ra_check_tunnel_func_t _obj, void * tunnel_baton, char const * tunnel_name) -> svn_boolean_t"""
+  return _ra.svn_ra_invoke_check_tunnel_func(*args)
+
+def svn_ra_invoke_close_tunnel_func(*args):
+  """svn_ra_invoke_close_tunnel_func(svn_ra_close_tunnel_func_t _obj, void * close_baton, void * tunnel_baton)"""
+  return _ra.svn_ra_invoke_close_tunnel_func(*args)
+
+def svn_ra_invoke_open_tunnel_func(*args):
+  """
+    svn_ra_invoke_open_tunnel_func(svn_ra_open_tunnel_func_t _obj, void * tunnel_baton, char const * tunnel_name, char const * user, 
+        char const * hostname, int port, svn_cancel_func_t cancel_func, 
+        apr_pool_t pool) -> svn_error_t
+    """
+  return _ra.svn_ra_invoke_open_tunnel_func(*args)
+
 def svn_ra_invoke_init_func(*args):
   """svn_ra_invoke_init_func(svn_ra_init_func_t _obj, int abi_version, apr_pool_t pool, apr_hash_t hash) -> svn_error_t"""
   return _ra.svn_ra_invoke_init_func(*args)
@@ -1392,7 +1416,7 @@ class svn_ra_get_wc_prop_func_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_ra_get_wc_prop_func_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1411,13 +1435,13 @@ class svn_ra_get_wc_prop_func_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1426,9 +1450,9 @@ class svn_ra_get_wc_prop_func_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -1448,7 +1472,7 @@ class svn_ra_set_wc_prop_func_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_ra_set_wc_prop_func_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1467,13 +1491,13 @@ class svn_ra_set_wc_prop_func_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1482,9 +1506,9 @@ class svn_ra_set_wc_prop_func_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -1504,7 +1528,7 @@ class svn_ra_push_wc_prop_func_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_ra_push_wc_prop_func_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1523,13 +1547,13 @@ class svn_ra_push_wc_prop_func_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1538,9 +1562,9 @@ class svn_ra_push_wc_prop_func_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -1560,7 +1584,7 @@ class svn_ra_invalidate_wc_props_func_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_ra_invalidate_wc_props_func_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1579,13 +1603,13 @@ class svn_ra_invalidate_wc_props_func_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1594,9 +1618,9 @@ class svn_ra_invalidate_wc_props_func_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -1616,7 +1640,7 @@ class svn_ra_get_wc_contents_func_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_ra_get_wc_contents_func_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1635,13 +1659,13 @@ class svn_ra_get_wc_contents_func_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1650,9 +1674,9 @@ class svn_ra_get_wc_contents_func_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -1672,7 +1696,7 @@ class svn_ra_get_latest_revnum_func_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_ra_get_latest_revnum_func_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1691,13 +1715,13 @@ class svn_ra_get_latest_revnum_func_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1706,9 +1730,9 @@ class svn_ra_get_latest_revnum_func_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -1728,7 +1752,7 @@ class svn_ra_get_client_string_func_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_ra_get_client_string_func_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1747,13 +1771,13 @@ class svn_ra_get_client_string_func_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1762,9 +1786,9 @@ class svn_ra_get_client_string_func_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -1784,7 +1808,7 @@ class svn_ra_file_rev_handler_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_ra_file_rev_handler_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1803,13 +1827,13 @@ class svn_ra_file_rev_handler_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1818,9 +1842,9 @@ class svn_ra_file_rev_handler_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -1840,7 +1864,7 @@ class svn_ra_lock_callback_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_ra_lock_callback_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1859,13 +1883,13 @@ class svn_ra_lock_callback_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1874,9 +1898,9 @@ class svn_ra_lock_callback_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -1896,7 +1920,7 @@ class svn_ra_progress_notify_func_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_ra_progress_notify_func_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1915,13 +1939,13 @@ class svn_ra_progress_notify_func_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1930,9 +1954,9 @@ class svn_ra_progress_notify_func_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -1952,7 +1976,7 @@ class svn_ra_replay_revstart_callback_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_ra_replay_revstart_callback_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1971,13 +1995,13 @@ class svn_ra_replay_revstart_callback_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1986,9 +2010,9 @@ class svn_ra_replay_revstart_callback_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -2008,7 +2032,63 @@ class svn_ra_replay_revfinish_callback_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_ra_replay_revfinish_callback_t"""
+      """Create a new proxy object for TYPE"""
+      import libsvn.core, weakref
+      self.__dict__["_parent_pool"] = \
+        parent_pool or libsvn.core.application_pool;
+      if self.__dict__["_parent_pool"]:
+        self.__dict__["_is_valid"] = weakref.ref(
+          self.__dict__["_parent_pool"]._is_valid)
+
+    def assert_valid(self):
+      """Assert that this object is using valid pool memory"""
+      if "_is_valid" in self.__dict__:
+        assert self.__dict__["_is_valid"](), "Variable has already been deleted"
+
+    def __getattr__(self, name):
+      """Get an attribute from this object"""
+      self.assert_valid()
+
+      value = _swig_getattr(self, self.__class__, name)
+
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
+      members = self.__dict__.get("_members")
+      if members is not None:
+        _copy_metadata_deep(value, members.get(name))
+
+      # Verify that the new object is good
+      _assert_valid_deep(value)
+
+      return value
+
+    def __setattr__(self, name, value):
+      """Set an attribute on this object"""
+      self.assert_valid()
+
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
+      self.__dict__.setdefault("_members",{})[name] = value
+
+      return _swig_setattr(self, self.__class__, name, value)
+
+    def __call__(self, *args):
+      return svn_ra_invoke_replay_revfinish_callback(self, *args)
+
+svn_ra_replay_revfinish_callback_t_swigregister = _ra.svn_ra_replay_revfinish_callback_t_swigregister
+svn_ra_replay_revfinish_callback_t_swigregister(svn_ra_replay_revfinish_callback_t)
+
+class svn_ra_check_tunnel_func_t:
+    """Proxy of C svn_ra_check_tunnel_func_t struct"""
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_ra_check_tunnel_func_t, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, svn_ra_check_tunnel_func_t, name)
+    def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
+    __repr__ = _swig_repr
+    def set_parent_pool(self, parent_pool=None):
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -2027,13 +2107,69 @@ class svn_ra_replay_revfinish_callback_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
+      members = self.__dict__.get("_members")
+      if members is not None:
+        _copy_metadata_deep(value, members.get(name))
+
+      # Verify that the new object is good
+      _assert_valid_deep(value)
+
+      return value
 
+    def __setattr__(self, name, value):
+      """Set an attribute on this object"""
+      self.assert_valid()
+
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
+      self.__dict__.setdefault("_members",{})[name] = value
+
+      return _swig_setattr(self, self.__class__, name, value)
+
+    def __call__(self, *args):
+      return svn_ra_invoke_check_tunnel_func(self, *args)
 
+svn_ra_check_tunnel_func_t_swigregister = _ra.svn_ra_check_tunnel_func_t_swigregister
+svn_ra_check_tunnel_func_t_swigregister(svn_ra_check_tunnel_func_t)
+
+class svn_ra_close_tunnel_func_t:
+    """Proxy of C svn_ra_close_tunnel_func_t struct"""
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_ra_close_tunnel_func_t, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, svn_ra_close_tunnel_func_t, name)
+    def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
+    __repr__ = _swig_repr
+    def set_parent_pool(self, parent_pool=None):
+      """Create a new proxy object for TYPE"""
+      import libsvn.core, weakref
+      self.__dict__["_parent_pool"] = \
+        parent_pool or libsvn.core.application_pool;
+      if self.__dict__["_parent_pool"]:
+        self.__dict__["_is_valid"] = weakref.ref(
+          self.__dict__["_parent_pool"]._is_valid)
+
+    def assert_valid(self):
+      """Assert that this object is using valid pool memory"""
+      if "_is_valid" in self.__dict__:
+        assert self.__dict__["_is_valid"](), "Variable has already been deleted"
+
+    def __getattr__(self, name):
+      """Get an attribute from this object"""
+      self.assert_valid()
+
+      value = _swig_getattr(self, self.__class__, name)
+
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -2042,18 +2178,74 @@ class svn_ra_replay_revfinish_callback_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
+      self.__dict__.setdefault("_members",{})[name] = value
 
+      return _swig_setattr(self, self.__class__, name, value)
 
+    def __call__(self, *args):
+      return svn_ra_invoke_close_tunnel_func(self, *args)
+
+svn_ra_close_tunnel_func_t_swigregister = _ra.svn_ra_close_tunnel_func_t_swigregister
+svn_ra_close_tunnel_func_t_swigregister(svn_ra_close_tunnel_func_t)
 
+class svn_ra_open_tunnel_func_t:
+    """Proxy of C svn_ra_open_tunnel_func_t struct"""
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_ra_open_tunnel_func_t, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, svn_ra_open_tunnel_func_t, name)
+    def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
+    __repr__ = _swig_repr
+    def set_parent_pool(self, parent_pool=None):
+      """Create a new proxy object for TYPE"""
+      import libsvn.core, weakref
+      self.__dict__["_parent_pool"] = \
+        parent_pool or libsvn.core.application_pool;
+      if self.__dict__["_parent_pool"]:
+        self.__dict__["_is_valid"] = weakref.ref(
+          self.__dict__["_parent_pool"]._is_valid)
+
+    def assert_valid(self):
+      """Assert that this object is using valid pool memory"""
+      if "_is_valid" in self.__dict__:
+        assert self.__dict__["_is_valid"](), "Variable has already been deleted"
+
+    def __getattr__(self, name):
+      """Get an attribute from this object"""
+      self.assert_valid()
+
+      value = _swig_getattr(self, self.__class__, name)
+
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
+      members = self.__dict__.get("_members")
+      if members is not None:
+        _copy_metadata_deep(value, members.get(name))
+
+      # Verify that the new object is good
+      _assert_valid_deep(value)
+
+      return value
+
+    def __setattr__(self, name, value):
+      """Set an attribute on this object"""
+      self.assert_valid()
+
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
 
     def __call__(self, *args):
-      return svn_ra_invoke_replay_revfinish_callback(self, *args)
+      return svn_ra_invoke_open_tunnel_func(self, *args)
 
-svn_ra_replay_revfinish_callback_t_swigregister = _ra.svn_ra_replay_revfinish_callback_t_swigregister
-svn_ra_replay_revfinish_callback_t_swigregister(svn_ra_replay_revfinish_callback_t)
+svn_ra_open_tunnel_func_t_swigregister = _ra.svn_ra_open_tunnel_func_t_swigregister
+svn_ra_open_tunnel_func_t_swigregister(svn_ra_open_tunnel_func_t)
 
 class svn_ra_init_func_t:
     """Proxy of C svn_ra_init_func_t struct"""
@@ -2064,7 +2256,7 @@ class svn_ra_init_func_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_ra_init_func_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -2083,13 +2275,13 @@ class svn_ra_init_func_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -2098,9 +2290,9 @@ class svn_ra_init_func_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
diff --git a/subversion/bindings/swig/python/repos.py b/subversion/bindings/swig/python/repos.py
index aa9a5c5..fad1e58 100644
--- a/subversion/bindings/swig/python/repos.py
+++ b/subversion/bindings/swig/python/repos.py
@@ -1,11 +1,13 @@
 # This file was automatically generated by SWIG (http://www.swig.org).
-# Version 2.0.9
+# Version 2.0.12
 #
 # Do not make changes to this file unless you know what you are doing--modify
 # the SWIG interface file instead.
 
 
 
+
+
 from sys import version_info
 if version_info >= (2,6,0):
     def swig_import_helper():
@@ -88,6 +90,10 @@ import libsvn.core
 import libsvn.delta
 import libsvn.fs
 
+def svn_swig_py_make_parse_fns3(*args):
+  """svn_swig_py_make_parse_fns3(PyObject * py_parse_fns3, apr_pool_t pool)"""
+  return _repos.svn_swig_py_make_parse_fns3(*args)
+
 def svn_repos_version():
   """svn_repos_version() -> svn_version_t const *"""
   return _repos.svn_repos_version()
@@ -95,9 +101,6 @@ svn_node_action_change = _repos.svn_node_action_change
 svn_node_action_add = _repos.svn_node_action_add
 svn_node_action_delete = _repos.svn_node_action_delete
 svn_node_action_replace = _repos.svn_node_action_replace
-svn_repos_load_uuid_default = _repos.svn_repos_load_uuid_default
-svn_repos_load_uuid_ignore = _repos.svn_repos_load_uuid_ignore
-svn_repos_load_uuid_force = _repos.svn_repos_load_uuid_force
 svn_authz_none = _repos.svn_authz_none
 svn_authz_read = _repos.svn_authz_read
 svn_authz_write = _repos.svn_authz_write
@@ -122,9 +125,16 @@ svn_repos_notify_recover_start = _repos.svn_repos_notify_recover_start
 svn_repos_notify_upgrade_start = _repos.svn_repos_notify_upgrade_start
 svn_repos_notify_load_skipped_rev = _repos.svn_repos_notify_load_skipped_rev
 svn_repos_notify_verify_rev_structure = _repos.svn_repos_notify_verify_rev_structure
+svn_repos_notify_pack_revprops = _repos.svn_repos_notify_pack_revprops
+svn_repos_notify_cleanup_revprops = _repos.svn_repos_notify_cleanup_revprops
+svn_repos_notify_format_bumped = _repos.svn_repos_notify_format_bumped
+svn_repos_notify_hotcopy_rev_range = _repos.svn_repos_notify_hotcopy_rev_range
 svn_repos_notify_warning_found_old_reference = _repos.svn_repos_notify_warning_found_old_reference
 svn_repos_notify_warning_found_old_mergeinfo = _repos.svn_repos_notify_warning_found_old_mergeinfo
 svn_repos_notify_warning_invalid_fspath = _repos.svn_repos_notify_warning_invalid_fspath
+svn_repos_notify_warning_name_collision = _repos.svn_repos_notify_warning_name_collision
+svn_repos_notify_warning_mergeinfo_collision = _repos.svn_repos_notify_warning_mergeinfo_collision
+svn_repos_notify_warning_invalid_mergeinfo = _repos.svn_repos_notify_warning_invalid_mergeinfo
 class svn_repos_notify_t:
     """Proxy of C svn_repos_notify_t struct"""
     __swig_setmethods__ = {}
@@ -151,8 +161,12 @@ class svn_repos_notify_t:
     __swig_getmethods__["node_action"] = _repos.svn_repos_notify_t_node_action_get
     __swig_setmethods__["path"] = _repos.svn_repos_notify_t_path_set
     __swig_getmethods__["path"] = _repos.svn_repos_notify_t_path_get
+    __swig_setmethods__["start_revision"] = _repos.svn_repos_notify_t_start_revision_set
+    __swig_getmethods__["start_revision"] = _repos.svn_repos_notify_t_start_revision_get
+    __swig_setmethods__["end_revision"] = _repos.svn_repos_notify_t_end_revision_set
+    __swig_getmethods__["end_revision"] = _repos.svn_repos_notify_t_end_revision_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_repos_notify_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -171,13 +185,13 @@ class svn_repos_notify_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -186,9 +200,9 @@ class svn_repos_notify_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -205,6 +219,10 @@ def svn_repos_find_root_path(*args):
   """svn_repos_find_root_path(char const * path, apr_pool_t pool) -> char const *"""
   return _repos.svn_repos_find_root_path(*args)
 
+def svn_repos_open3(*args):
+  """svn_repos_open3(char const * path, apr_hash_t fs_config, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
+  return _repos.svn_repos_open3(*args)
+
 def svn_repos_open2(*args):
   """svn_repos_open2(char const * path, apr_hash_t fs_config, apr_pool_t pool) -> svn_error_t"""
   return _repos.svn_repos_open2(*args)
@@ -241,12 +259,32 @@ def svn_repos_delete(*args):
 def svn_repos_has_capability(*args):
   """svn_repos_has_capability(svn_repos_t * repos, char const * capability, apr_pool_t pool) -> svn_error_t"""
   return _repos.svn_repos_has_capability(*args)
+
+def svn_repos_capabilities(*args):
+  """svn_repos_capabilities(svn_repos_t * repos, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
+  return _repos.svn_repos_capabilities(*args)
 SVN_REPOS_CAPABILITY_MERGEINFO = _repos.SVN_REPOS_CAPABILITY_MERGEINFO
 
+def svn_repos_remember_client_capabilities(*args):
+  """svn_repos_remember_client_capabilities(svn_repos_t * repos, apr_array_header_t capabilities) -> svn_error_t"""
+  return _repos.svn_repos_remember_client_capabilities(*args)
+
 def svn_repos_fs(*args):
   """svn_repos_fs(svn_repos_t * repos) -> svn_fs_t *"""
   return _repos.svn_repos_fs(*args)
 
+def svn_repos_fs_type(*args):
+  """svn_repos_fs_type(svn_repos_t * repos, apr_pool_t result_pool) -> char const *"""
+  return _repos.svn_repos_fs_type(*args)
+
+def svn_repos_hotcopy3(*args):
+  """
+    svn_repos_hotcopy3(char const * src_path, char const * dst_path, svn_boolean_t clean_logs, svn_boolean_t incremental, 
+        svn_repos_notify_func_t notify_func, void * notify_baton, 
+        svn_cancel_func_t cancel_func, apr_pool_t scratch_pool) -> svn_error_t
+    """
+  return _repos.svn_repos_hotcopy3(*args)
+
 def svn_repos_hotcopy2(*args):
   """
     svn_repos_hotcopy2(char const * src_path, char const * dst_path, svn_boolean_t clean_logs, svn_boolean_t incremental, 
@@ -494,9 +532,9 @@ def svn_repos_replay(*args):
 
 def svn_repos_get_commit_editor5(*args):
   """
-    svn_repos_get_commit_editor5(svn_repos_t * repos, svn_fs_txn_t * txn, char const * repos_url, char const * base_path, 
-        apr_hash_t revprop_table, svn_commit_callback2_t commit_callback, svn_repos_authz_callback_t authz_callback, 
-        void * authz_baton, apr_pool_t pool) -> svn_error_t
+    svn_repos_get_commit_editor5(svn_repos_t * repos, svn_fs_txn_t * txn, char const * repos_url_decoded, char const * base_path, 
+        apr_hash_t revprop_table, svn_commit_callback2_t commit_callback, 
+        svn_repos_authz_callback_t authz_callback, void * authz_baton, apr_pool_t pool) -> svn_error_t
     """
   return _repos.svn_repos_get_commit_editor5(*args)
 
@@ -657,6 +695,14 @@ def svn_repos_fs_begin_txn_for_update(*args):
   """svn_repos_fs_begin_txn_for_update(svn_repos_t * repos, svn_revnum_t rev, char const * author, apr_pool_t pool) -> svn_error_t"""
   return _repos.svn_repos_fs_begin_txn_for_update(*args)
 
+def svn_repos_fs_lock_many(*args):
+  """
+    svn_repos_fs_lock_many(svn_repos_t * repos, apr_hash_t lock_targets, char const * comment, svn_boolean_t is_dav_comment, 
+        apr_time_t expiration_date, svn_boolean_t steal_lock, svn_fs_lock_callback_t lock_callback, 
+        apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t
+    """
+  return _repos.svn_repos_fs_lock_many(*args)
+
 def svn_repos_fs_lock(*args):
   """
     svn_repos_fs_lock(svn_repos_t * repos, char const * path, char const * token, char const * comment, 
@@ -665,6 +711,13 @@ def svn_repos_fs_lock(*args):
     """
   return _repos.svn_repos_fs_lock(*args)
 
+def svn_repos_fs_unlock_many(*args):
+  """
+    svn_repos_fs_unlock_many(svn_repos_t * repos, apr_hash_t unlock_targets, svn_boolean_t break_lock, svn_fs_lock_callback_t lock_callback, 
+        apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t
+    """
+  return _repos.svn_repos_fs_unlock_many(*args)
+
 def svn_repos_fs_unlock(*args):
   """
     svn_repos_fs_unlock(svn_repos_t * repos, char const * path, char const * token, svn_boolean_t break_lock, 
@@ -733,6 +786,13 @@ def svn_repos_fs_change_node_prop(*args):
     """
   return _repos.svn_repos_fs_change_node_prop(*args)
 
+def svn_repos_fs_get_inherited_props(*args):
+  """
+    svn_repos_fs_get_inherited_props(svn_fs_root_t * root, char const * path, char const * propname, svn_repos_authz_func_t authz_read_func, 
+        apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t
+    """
+  return _repos.svn_repos_fs_get_inherited_props(*args)
+
 def svn_repos_fs_change_txn_prop(*args):
   """svn_repos_fs_change_txn_prop(svn_fs_txn_t * txn, char const * name, svn_string_t const * value, apr_pool_t pool) -> svn_error_t"""
   return _repos.svn_repos_fs_change_txn_prop(*args)
@@ -769,7 +829,7 @@ class svn_repos_node_t:
     __swig_setmethods__["parent"] = _repos.svn_repos_node_t_parent_set
     __swig_getmethods__["parent"] = _repos.svn_repos_node_t_parent_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_repos_node_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -788,13 +848,13 @@ class svn_repos_node_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -803,9 +863,9 @@ class svn_repos_node_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -824,6 +884,10 @@ def svn_repos_node_editor(*args):
 def svn_repos_node_from_baton(*args):
   """svn_repos_node_from_baton(void * edit_baton) -> svn_repos_node_t"""
   return _repos.svn_repos_node_from_baton(*args)
+
+def svn_repos_info_format(*args):
+  """svn_repos_info_format(svn_repos_t * repos, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"""
+  return _repos.svn_repos_info_format(*args)
 SVN_REPOS_DUMPFILE_MAGIC_HEADER = _repos.SVN_REPOS_DUMPFILE_MAGIC_HEADER
 SVN_REPOS_DUMPFILE_FORMAT_VERSION = _repos.SVN_REPOS_DUMPFILE_FORMAT_VERSION
 SVN_REPOS_DUMPFILE_FORMAT_VERSION_DELTAS = _repos.SVN_REPOS_DUMPFILE_FORMAT_VERSION_DELTAS
@@ -848,6 +912,18 @@ SVN_REPOS_DUMPFILE_TEXT_DELTA = _repos.SVN_REPOS_DUMPFILE_TEXT_DELTA
 SVN_REPOS_DUMPFILE_TEXT_DELTA_BASE_MD5 = _repos.SVN_REPOS_DUMPFILE_TEXT_DELTA_BASE_MD5
 SVN_REPOS_DUMPFILE_TEXT_DELTA_BASE_SHA1 = _repos.SVN_REPOS_DUMPFILE_TEXT_DELTA_BASE_SHA1
 SVN_REPOS_DUMPFILE_TEXT_DELTA_BASE_CHECKSUM = _repos.SVN_REPOS_DUMPFILE_TEXT_DELTA_BASE_CHECKSUM
+svn_repos_load_uuid_default = _repos.svn_repos_load_uuid_default
+svn_repos_load_uuid_ignore = _repos.svn_repos_load_uuid_ignore
+svn_repos_load_uuid_force = _repos.svn_repos_load_uuid_force
+
+def svn_repos_verify_fs3(*args):
+  """
+    svn_repos_verify_fs3(svn_repos_t * repos, svn_revnum_t start_rev, svn_revnum_t end_rev, svn_boolean_t check_normalization, 
+        svn_boolean_t metadata_only, svn_repos_notify_func_t notify_func, 
+        void * notify_baton, svn_repos_verify_callback_t verify_callback, 
+        void * verify_baton, svn_cancel_func_t cancel, void * cancel_baton, apr_pool_t scratch_pool) -> svn_error_t
+    """
+  return _repos.svn_repos_verify_fs3(*args)
 
 def svn_repos_verify_fs2(*args):
   """
@@ -889,6 +965,16 @@ def svn_repos_dump_fs(*args):
     """
   return _repos.svn_repos_dump_fs(*args)
 
+def svn_repos_load_fs5(*args):
+  """
+    svn_repos_load_fs5(svn_repos_t * repos, svn_stream_t * dumpstream, svn_revnum_t start_rev, svn_revnum_t end_rev, 
+        enum svn_repos_load_uuid uuid_action, char const * parent_dir, 
+        svn_boolean_t use_pre_commit_hook, svn_boolean_t use_post_commit_hook, svn_boolean_t validate_props, 
+        svn_boolean_t ignore_dates, svn_repos_notify_func_t notify_func, 
+        void * notify_baton, svn_cancel_func_t cancel_func, apr_pool_t pool) -> svn_error_t
+    """
+  return _repos.svn_repos_load_fs5(*args)
+
 def svn_repos_load_fs4(*args):
   """
     svn_repos_load_fs4(svn_repos_t * repos, svn_stream_t * dumpstream, svn_revnum_t start_rev, svn_revnum_t end_rev, 
@@ -957,7 +1043,7 @@ class svn_repos_parse_fns3_t:
     __swig_setmethods__["close_revision"] = _repos.svn_repos_parse_fns3_t_close_revision_set
     __swig_getmethods__["close_revision"] = _repos.svn_repos_parse_fns3_t_close_revision_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_repos_parse_fns3_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -976,13 +1062,13 @@ class svn_repos_parse_fns3_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -991,9 +1077,9 @@ class svn_repos_parse_fns3_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -1045,6 +1131,16 @@ def svn_repos_parse_dumpstream3(*args):
     """
   return _repos.svn_repos_parse_dumpstream3(*args)
 
+def svn_repos_get_fs_build_parser5(*args):
+  """
+    svn_repos_get_fs_build_parser5(svn_repos_t * repos, svn_revnum_t start_rev, svn_revnum_t end_rev, svn_boolean_t use_history, 
+        svn_boolean_t validate_props, enum svn_repos_load_uuid uuid_action, 
+        char const * parent_dir, svn_boolean_t use_pre_commit_hook, svn_boolean_t use_post_commit_hook, 
+        svn_boolean_t ignore_dates, svn_repos_notify_func_t notify_func, 
+        void * notify_baton, apr_pool_t pool) -> svn_error_t
+    """
+  return _repos.svn_repos_get_fs_build_parser5(*args)
+
 def svn_repos_get_fs_build_parser4(*args):
   """
     svn_repos_get_fs_build_parser4(svn_repos_t * repos, svn_revnum_t start_rev, svn_revnum_t end_rev, svn_boolean_t use_history, 
@@ -1084,7 +1180,7 @@ class svn_repos_parse_fns2_t:
     __swig_setmethods__["close_revision"] = _repos.svn_repos_parse_fns2_t_close_revision_set
     __swig_getmethods__["close_revision"] = _repos.svn_repos_parse_fns2_t_close_revision_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_repos_parse_fns2_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1103,13 +1199,13 @@ class svn_repos_parse_fns2_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1118,9 +1214,9 @@ class svn_repos_parse_fns2_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -1188,7 +1284,7 @@ class svn_repos_parser_fns_t:
     __swig_setmethods__["close_revision"] = _repos.svn_repos_parser_fns_t_close_revision_set
     __swig_getmethods__["close_revision"] = _repos.svn_repos_parser_fns_t_close_revision_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_repos_parse_fns_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1207,13 +1303,13 @@ class svn_repos_parser_fns_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1222,9 +1318,9 @@ class svn_repos_parser_fns_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -1297,17 +1393,6 @@ def svn_repos_check_revision_access(*args):
         svn_repos_authz_func_t authz_read_func, apr_pool_t pool) -> svn_error_t
     """
   return _repos.svn_repos_check_revision_access(*args)
-
-def svn_repos_fs_get_inherited_props(*args):
-  """
-    svn_repos_fs_get_inherited_props(svn_fs_root_t * root, char const * path, char const * propname, svn_repos_authz_func_t authz_read_func, 
-        apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t
-    """
-  return _repos.svn_repos_fs_get_inherited_props(*args)
-
-def svn_repos_remember_client_capabilities(*args):
-  """svn_repos_remember_client_capabilities(svn_repos_t * repos, apr_array_header_t capabilities) -> svn_error_t"""
-  return _repos.svn_repos_remember_client_capabilities(*args)
 class svn_repos_t:
     """Proxy of C svn_repos_t struct"""
     __swig_setmethods__ = {}
@@ -1317,7 +1402,7 @@ class svn_repos_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_repos_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1336,13 +1421,13 @@ class svn_repos_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1351,9 +1436,9 @@ class svn_repos_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -1370,7 +1455,7 @@ class svn_authz_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_authz_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1389,13 +1474,13 @@ class svn_authz_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1404,9 +1489,9 @@ class svn_authz_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -1521,13 +1606,6 @@ def svn_repos_invoke_authz_callback(*args):
     """
   return _repos.svn_repos_invoke_authz_callback(*args)
 
-def svn_repos_invoke_file_rev_handler(*args):
-  """
-    svn_repos_invoke_file_rev_handler(svn_repos_file_rev_handler_t _obj, void * baton, char const * path, svn_revnum_t rev, 
-        apr_hash_t rev_props, apr_array_header_t prop_diffs, apr_pool_t pool) -> svn_error_t
-    """
-  return _repos.svn_repos_invoke_file_rev_handler(*args)
-
 def svn_repos_invoke_notify_func(*args):
   """svn_repos_invoke_notify_func(svn_repos_notify_func_t _obj, void * baton, svn_repos_notify_t notify, apr_pool_t scratch_pool)"""
   return _repos.svn_repos_invoke_notify_func(*args)
@@ -1542,6 +1620,20 @@ def svn_repos_invoke_history_func(*args):
         apr_pool_t pool) -> svn_error_t
     """
   return _repos.svn_repos_invoke_history_func(*args)
+
+def svn_repos_invoke_file_rev_handler(*args):
+  """
+    svn_repos_invoke_file_rev_handler(svn_repos_file_rev_handler_t _obj, void * baton, char const * path, svn_revnum_t rev, 
+        apr_hash_t rev_props, apr_array_header_t prop_diffs, apr_pool_t pool) -> svn_error_t
+    """
+  return _repos.svn_repos_invoke_file_rev_handler(*args)
+
+def svn_repos_invoke_verify_callback(*args):
+  """
+    svn_repos_invoke_verify_callback(svn_repos_verify_callback_t _obj, void * baton, svn_revnum_t revision, svn_error_t verify_err, 
+        apr_pool_t scratch_pool) -> svn_error_t
+    """
+  return _repos.svn_repos_invoke_verify_callback(*args)
 class svn_repos_authz_func_t:
     """Proxy of C svn_repos_authz_func_t struct"""
     __swig_setmethods__ = {}
@@ -1551,7 +1643,7 @@ class svn_repos_authz_func_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_repos_authz_func_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1570,13 +1662,13 @@ class svn_repos_authz_func_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1585,9 +1677,9 @@ class svn_repos_authz_func_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -1607,7 +1699,7 @@ class svn_repos_authz_callback_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_repos_authz_callback_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1626,13 +1718,13 @@ class svn_repos_authz_callback_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1641,9 +1733,9 @@ class svn_repos_authz_callback_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -1654,16 +1746,16 @@ class svn_repos_authz_callback_t:
 svn_repos_authz_callback_t_swigregister = _repos.svn_repos_authz_callback_t_swigregister
 svn_repos_authz_callback_t_swigregister(svn_repos_authz_callback_t)
 
-class svn_repos_file_rev_handler_t:
-    """Proxy of C svn_repos_file_rev_handler_t struct"""
+class svn_repos_notify_func_t:
+    """Proxy of C svn_repos_notify_func_t struct"""
     __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_repos_file_rev_handler_t, name, value)
+    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_repos_notify_func_t, name, value)
     __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_repos_file_rev_handler_t, name)
+    __getattr__ = lambda self, name: _swig_getattr(self, svn_repos_notify_func_t, name)
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_repos_file_rev_handler_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1682,13 +1774,13 @@ class svn_repos_file_rev_handler_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1697,29 +1789,29 @@ class svn_repos_file_rev_handler_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
 
     def __call__(self, *args):
-      return svn_repos_invoke_file_rev_handler(self, *args)
+      return svn_repos_invoke_notify_func(self, *args)
 
-svn_repos_file_rev_handler_t_swigregister = _repos.svn_repos_file_rev_handler_t_swigregister
-svn_repos_file_rev_handler_t_swigregister(svn_repos_file_rev_handler_t)
+svn_repos_notify_func_t_swigregister = _repos.svn_repos_notify_func_t_swigregister
+svn_repos_notify_func_t_swigregister(svn_repos_notify_func_t)
 
-class svn_repos_notify_func_t:
-    """Proxy of C svn_repos_notify_func_t struct"""
+class svn_repos_freeze_func_t:
+    """Proxy of C svn_repos_freeze_func_t struct"""
     __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_repos_notify_func_t, name, value)
+    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_repos_freeze_func_t, name, value)
     __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_repos_notify_func_t, name)
+    __getattr__ = lambda self, name: _swig_getattr(self, svn_repos_freeze_func_t, name)
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_repos_notify_func_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1738,13 +1830,13 @@ class svn_repos_notify_func_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1753,29 +1845,29 @@ class svn_repos_notify_func_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
 
     def __call__(self, *args):
-      return svn_repos_invoke_notify_func(self, *args)
+      return svn_repos_invoke_freeze_func(self, *args)
 
-svn_repos_notify_func_t_swigregister = _repos.svn_repos_notify_func_t_swigregister
-svn_repos_notify_func_t_swigregister(svn_repos_notify_func_t)
+svn_repos_freeze_func_t_swigregister = _repos.svn_repos_freeze_func_t_swigregister
+svn_repos_freeze_func_t_swigregister(svn_repos_freeze_func_t)
 
-class svn_repos_freeze_func_t:
-    """Proxy of C svn_repos_freeze_func_t struct"""
+class svn_repos_history_func_t:
+    """Proxy of C svn_repos_history_func_t struct"""
     __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_repos_freeze_func_t, name, value)
+    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_repos_history_func_t, name, value)
     __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_repos_freeze_func_t, name)
+    __getattr__ = lambda self, name: _swig_getattr(self, svn_repos_history_func_t, name)
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_repos_freeze_func_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1794,13 +1886,13 @@ class svn_repos_freeze_func_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1809,29 +1901,29 @@ class svn_repos_freeze_func_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
 
     def __call__(self, *args):
-      return svn_repos_invoke_freeze_func(self, *args)
+      return svn_repos_invoke_history_func(self, *args)
 
-svn_repos_freeze_func_t_swigregister = _repos.svn_repos_freeze_func_t_swigregister
-svn_repos_freeze_func_t_swigregister(svn_repos_freeze_func_t)
+svn_repos_history_func_t_swigregister = _repos.svn_repos_history_func_t_swigregister
+svn_repos_history_func_t_swigregister(svn_repos_history_func_t)
 
-class svn_repos_history_func_t:
-    """Proxy of C svn_repos_history_func_t struct"""
+class svn_repos_file_rev_handler_t:
+    """Proxy of C svn_repos_file_rev_handler_t struct"""
     __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_repos_history_func_t, name, value)
+    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_repos_file_rev_handler_t, name, value)
     __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_repos_history_func_t, name)
+    __getattr__ = lambda self, name: _swig_getattr(self, svn_repos_file_rev_handler_t, name)
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_repos_history_func_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1850,13 +1942,13 @@ class svn_repos_history_func_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1865,18 +1957,74 @@ class svn_repos_history_func_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
+      self.__dict__.setdefault("_members",{})[name] = value
+
+      return _swig_setattr(self, self.__class__, name, value)
 
+    def __call__(self, *args):
+      return svn_repos_invoke_file_rev_handler(self, *args)
 
+svn_repos_file_rev_handler_t_swigregister = _repos.svn_repos_file_rev_handler_t_swigregister
+svn_repos_file_rev_handler_t_swigregister(svn_repos_file_rev_handler_t)
 
+class svn_repos_verify_callback_t:
+    """Proxy of C svn_repos_verify_callback_t struct"""
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_repos_verify_callback_t, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, svn_repos_verify_callback_t, name)
+    def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
+    __repr__ = _swig_repr
+    def set_parent_pool(self, parent_pool=None):
+      """Create a new proxy object for TYPE"""
+      import libsvn.core, weakref
+      self.__dict__["_parent_pool"] = \
+        parent_pool or libsvn.core.application_pool;
+      if self.__dict__["_parent_pool"]:
+        self.__dict__["_is_valid"] = weakref.ref(
+          self.__dict__["_parent_pool"]._is_valid)
+
+    def assert_valid(self):
+      """Assert that this object is using valid pool memory"""
+      if "_is_valid" in self.__dict__:
+        assert self.__dict__["_is_valid"](), "Variable has already been deleted"
+
+    def __getattr__(self, name):
+      """Get an attribute from this object"""
+      self.assert_valid()
+
+      value = _swig_getattr(self, self.__class__, name)
+
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
+      members = self.__dict__.get("_members")
+      if members is not None:
+        _copy_metadata_deep(value, members.get(name))
+
+      # Verify that the new object is good
+      _assert_valid_deep(value)
+
+      return value
+
+    def __setattr__(self, name, value):
+      """Set an attribute on this object"""
+      self.assert_valid()
+
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
 
     def __call__(self, *args):
-      return svn_repos_invoke_history_func(self, *args)
+      return svn_repos_invoke_verify_callback(self, *args)
 
-svn_repos_history_func_t_swigregister = _repos.svn_repos_history_func_t_swigregister
-svn_repos_history_func_t_swigregister(svn_repos_history_func_t)
+svn_repos_verify_callback_t_swigregister = _repos.svn_repos_verify_callback_t_swigregister
+svn_repos_verify_callback_t_swigregister(svn_repos_verify_callback_t)
 
 # This file is compatible with both classic and new-style classes.
 
diff --git a/subversion/bindings/swig/python/svn/core.py b/subversion/bindings/swig/python/svn/core.py
index 386581c..bed78c1 100644
--- a/subversion/bindings/swig/python/svn/core.py
+++ b/subversion/bindings/swig/python/svn/core.py
@@ -27,44 +27,8 @@ from libsvn.core import *
 import libsvn.core as _libsvncore
 import atexit as _atexit
 import sys
-__all__ = [
-  # Symbols that 'import *' used to pull (in 1.7)
-  'Pool',
-  'SVNSYNC_PROP_CURRENTLY_COPYING',
-  'SVNSYNC_PROP_FROM_URL',
-  'SVNSYNC_PROP_FROM_UUID',
-  'SVNSYNC_PROP_LAST_MERGED_REV',
-  'SVNSYNC_PROP_LOCK',
-  'SVNSYNC_PROP_PREFIX',
-  'SubversionException',
-  # 'apr_array_header_t',
-  # 'apr_file_open_stderr',
-  # 'apr_file_open_stdout',
-  # 'apr_file_t',
-  # 'apr_hash_t',
-  # 'apr_initialize',
-  # 'apr_pool_clear',
-  # 'apr_pool_destroy',
-  # 'apr_pool_t',
-  # 'apr_terminate',
-  # 'apr_time_ansi_put',
-  # 'run_app',
-
-  # Symbols defined explicitly below.
-  'SVN_IGNORED_REVNUM',
-  'SVN_INVALID_REVNUM',
-  'svn_path_compare_paths',
-  'svn_mergeinfo_merge',
-  'svn_mergeinfo_sort',
-  'svn_rangelist_merge',
-  'svn_rangelist_reverse',
-  # 'Stream',
-  # 'apr_initialize',
-  # 'apr_terminate',
-  'svn_pool_create',
-  'svn_pool_destroy',
-  'svn_pool_clear',
-]
+# __all__ is defined later, since some svn_* functions are implemented below.
+
 
 class SubversionException(Exception):
 
@@ -205,6 +169,8 @@ class Stream:
     self._stream = stream
 
   def read(self, amt=None):
+    if self._stream is None:
+      raise ValueError
     if amt is None:
       # read the rest of the stream
       chunks = [ ]
@@ -219,9 +185,16 @@ class Stream:
     return svn_stream_read(self._stream, int(amt))
 
   def write(self, buf):
+    if self._stream is None:
+      raise ValueError
     ### what to do with the amount written? (the result value)
     svn_stream_write(self._stream, buf)
 
+  def close(self):
+    if self._stream is not None:
+      svn_stream_close(self._stream)
+      self._stream = None
+
 def secs_from_timestr(svn_datetime, pool=None):
   """Convert a Subversion datetime string into seconds since the Epoch."""
   aprtime = svn_time_from_cstring(svn_datetime, pool)
@@ -343,3 +316,21 @@ def run_app(func, *args, **kw):
   performed as the function exits (normally or via an exception).
   '''
   return func(application_pool, *args, **kw)
+
+# Currently, this excludes:
+# 'FALSE' 'TRUE'
+# 'apr_array_header_t' 'apr_file_t' 'apr_hash_t'
+# 'apr_file_open_stderr' 'apr_file_open_stdout'
+# 'apr_initialize' 'apr_terminate'
+# 'apr_pool_clear' 'apr_pool_destroy' 'apr_pool_t'
+# 'apr_time_ansi_put'
+# 'run_app'
+# 'svn_relpath__internal_style' 'svn_uri__is_ancestor'
+# 'svn_tristate__from_word' 'svn_tristate__to_word'
+__all__ = filter(lambda s: (s.startswith('svn_')
+                            or s.startswith('SVN_')
+                            or s.startswith('SVNSYNC_')
+                            or s in ('Pool', 'SubversionException'))
+                           and '__' not in s,
+                 locals())
+
diff --git a/subversion/bindings/swig/python/svn/repos.py b/subversion/bindings/swig/python/svn/repos.py
index f5e5944..1951aed 100644
--- a/subversion/bindings/swig/python/svn/repos.py
+++ b/subversion/bindings/swig/python/svn/repos.py
@@ -285,3 +285,56 @@ class RevisionChangeCollector(ChangeCollector):
     if idx == -1:
       return parent_path + '/' + path
     return parent_path + path[idx:]
+
+
+class ParseFns3:
+    def __init__(self):
+        pass
+
+    def __del__(self):
+        pass
+
+    def _close_dumpstream(self):
+        # Does not correspond to a C method - called before finishing the
+        # parsing of the dump stream.
+        pass
+
+    def magic_header_record(self, version, pool=None):
+        pass
+
+    def uuid_record(self, uuid, pool=None):
+        pass
+
+    def new_revision_record(self, headers, pool=None):
+        return None # Returns revision_baton
+
+    def new_node_record(self, headers, revision_baton, pool=None):
+        return None # Returns node_baton
+
+    def set_revision_property(self, revision_baton, name, value):
+        pass
+
+    def set_node_property(self, node_baton, name, value):
+        pass
+
+    def delete_node_property(self, node_baton, name):
+        pass
+
+    def remove_node_props(self, node_baton):
+        pass
+
+    def set_fulltext(self, node_baton):
+        return None # Returns a writable stream
+
+    def apply_textdelta(self, node_baton):
+        return None # Returns delta window handler
+
+    def close_node(self, node_baton):
+        pass
+
+    def close_revision(self, revision_baton):
+        pass
+
+
+def make_parse_fns3(parse_fns3, pool=None):
+    return svn_swig_py_make_parse_fns3(parse_fns3, pool)
diff --git a/subversion/bindings/swig/python/svn_client.c b/subversion/bindings/swig/python/svn_client.c
index b823730..eb959f8 100644
--- a/subversion/bindings/swig/python/svn_client.c
+++ b/subversion/bindings/swig/python/svn_client.c
@@ -1,11 +1,11 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
- * 
- * This file is not intended to be easily readable and contains a number of 
+ * Version 2.0.12
+ *
+ * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
- * changes to this file unless you know what you are doing--modify the SWIG 
- * interface file instead. 
+ * changes to this file unless you know what you are doing--modify the SWIG
+ * interface file instead.
  * ----------------------------------------------------------------------------- */
 
 #define SWIGPYTHON
@@ -43,28 +43,28 @@
 #ifndef SWIGUNUSED
 # if defined(__GNUC__)
 #   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__)) 
+#     define SWIGUNUSED __attribute__ ((__unused__))
 #   else
 #     define SWIGUNUSED
 #   endif
 # elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__)) 
+#   define SWIGUNUSED __attribute__ ((__unused__))
 # else
-#   define SWIGUNUSED 
+#   define SWIGUNUSED
 # endif
 #endif
 
 #ifndef SWIG_MSC_UNSUPPRESS_4505
 # if defined(_MSC_VER)
 #   pragma warning(disable : 4505) /* unreferenced local function has been removed */
-# endif 
+# endif
 #endif
 
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
 # else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
 # endif
 #endif
 
@@ -107,7 +107,7 @@
 #   define SWIGSTDCALL __stdcall
 # else
 #   define SWIGSTDCALL
-# endif 
+# endif
 #endif
 
 /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
@@ -122,8 +122,14 @@
 
 
 
-/* Python.h has to appear first */
-#include <Python.h>
+#if defined(_DEBUG) && defined(SWIG_PYTHON_INTERPRETER_NO_DEBUG)
+/* Use debug wrappers with the Python release dll */
+# undef _DEBUG
+# include <Python.h>
+# define _DEBUG
+#else
+# include <Python.h>
+#endif
 
 /* -----------------------------------------------------------------------------
  * swigrun.swg
@@ -149,7 +155,7 @@
   You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for
   creating a static or dynamic library from the SWIG runtime code.
   In 99.9% of the cases, SWIG just needs to declare them as 'static'.
-  
+
   But only do this if strictly necessary, ie, if you have problems
   with your compiler or suchlike.
 */
@@ -175,16 +181,16 @@
 #define SWIG_POINTER_OWN           0x1
 
 
-/* 
+/*
    Flags/methods for returning states.
-   
-   The SWIG conversion methods, as ConvertPtr, return an integer 
+
+   The SWIG conversion methods, as ConvertPtr, return an integer
    that tells if the conversion was successful or not. And if not,
    an error code can be returned (see swigerrors.swg for the codes).
-   
+
    Use the following macros/flags to set or process the returning
    states.
-   
+
    In old versions of SWIG, code such as the following was usually written:
 
      if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) {
@@ -217,23 +223,23 @@
     } else {
       // fail code
     }
-    
+
    I.e., now SWIG_ConvertPtr can return new objects and you can
    identify the case and take care of the deallocation. Of course that
    also requires SWIG_ConvertPtr to return new result values, such as
 
-      int SWIG_ConvertPtr(obj, ptr,...) {         
-        if (<obj is ok>) {			       
-          if (<need new object>) {		       
-            *ptr = <ptr to new allocated object>; 
-            return SWIG_NEWOBJ;		       
-          } else {				       
-            *ptr = <ptr to old object>;	       
-            return SWIG_OLDOBJ;		       
-          } 				       
-        } else {				       
-          return SWIG_BADOBJ;		       
-        }					       
+      int SWIG_ConvertPtr(obj, ptr,...) {
+        if (<obj is ok>) {
+          if (<need new object>) {
+            *ptr = <ptr to new allocated object>;
+            return SWIG_NEWOBJ;
+          } else {
+            *ptr = <ptr to old object>;
+            return SWIG_OLDOBJ;
+          }
+        } else {
+          return SWIG_BADOBJ;
+        }
       }
 
    Of course, returning the plain '0(success)/-1(fail)' still works, but you can be
@@ -247,17 +253,17 @@
        int fooi(int);
 
    and you call
- 
+
       food(1)   // cast rank '1'  (1 -> 1.0)
       fooi(1)   // cast rank '0'
 
    just use the SWIG_AddCast()/SWIG_CheckState()
 */
 
-#define SWIG_OK                    (0) 
+#define SWIG_OK                    (0)
 #define SWIG_ERROR                 (-1)
 #define SWIG_IsOK(r)               (r >= 0)
-#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)  
+#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)
 
 /* The CastRankLimit says how many bits are used for the cast rank */
 #define SWIG_CASTRANKLIMIT         (1 << 8)
@@ -288,14 +294,14 @@
 #  endif
 #  define SWIG_CASTRANKMASK          ((SWIG_CASTRANKLIMIT) -1)
 #  define SWIG_CastRank(r)           (r & SWIG_CASTRANKMASK)
-SWIGINTERNINLINE int SWIG_AddCast(int r) { 
+SWIGINTERNINLINE int SWIG_AddCast(int r) {
   return SWIG_IsOK(r) ? ((SWIG_CastRank(r) < SWIG_MAXCASTRANK) ? (r + 1) : SWIG_ERROR) : r;
 }
-SWIGINTERNINLINE int SWIG_CheckState(int r) { 
-  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0; 
+SWIGINTERNINLINE int SWIG_CheckState(int r) {
+  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0;
 }
 #else /* no cast-rank mode */
-#  define SWIG_AddCast
+#  define SWIG_AddCast(r) (r)
 #  define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0)
 #endif
 
@@ -339,7 +345,7 @@ typedef struct swig_module_info {
   void                    *clientdata;		/* Language specific module data */
 } swig_module_info;
 
-/* 
+/*
   Compare two type names skipping the space characters, therefore
   "char*" == "char *" and "Class<int>" == "Class<int >", etc.
 
@@ -359,18 +365,18 @@ SWIG_TypeNameComp(const char *f1, const char *l1,
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if not equal, 1 if equal
+  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
 */
 SWIGRUNTIME int
-SWIG_TypeEquiv(const char *nb, const char *tb) {
-  int equiv = 0;
+SWIG_TypeCmp(const char *nb, const char *tb) {
+  int equiv = 1;
   const char* te = tb + strlen(tb);
   const char* ne = nb;
-  while (!equiv && *ne) {
+  while (equiv != 0 && *ne) {
     for (nb = ne; *ne; ++ne) {
       if (*ne == '|') break;
     }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
+    equiv = SWIG_TypeNameComp(nb, ne, tb, te);
     if (*ne) ++ne;
   }
   return equiv;
@@ -378,24 +384,13 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
+  Return 0 if not equal, 1 if equal
 */
 SWIGRUNTIME int
-SWIG_TypeCompare(const char *nb, const char *tb) {
-  int equiv = 0;
-  const char* te = tb + strlen(tb);
-  const char* ne = nb;
-  while (!equiv && *ne) {
-    for (nb = ne; *ne; ++ne) {
-      if (*ne == '|') break;
-    }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
-    if (*ne) ++ne;
-  }
-  return equiv;
+SWIG_TypeEquiv(const char *nb, const char *tb) {
+  return SWIG_TypeCmp(nb, tb) == 0 ? 1 : 0;
 }
 
-
 /*
   Check the typename
 */
@@ -423,7 +418,7 @@ SWIG_TypeCheck(const char *c, swig_type_info *ty) {
   return 0;
 }
 
-/* 
+/*
   Identical to SWIG_TypeCheck, except strcmp is replaced with a pointer comparison
 */
 SWIGRUNTIME swig_cast_info *
@@ -458,7 +453,7 @@ SWIG_TypeCast(swig_cast_info *ty, void *ptr, int *newmemory) {
   return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr, newmemory);
 }
 
-/* 
+/*
    Dynamic pointer casting. Down an inheritance hierarchy
 */
 SWIGRUNTIME swig_type_info *
@@ -502,7 +497,7 @@ SWIG_TypePrettyName(const swig_type_info *type) {
     return type->name;
 }
 
-/* 
+/*
    Set the clientdata field for a type
 */
 SWIGRUNTIME void
@@ -510,14 +505,14 @@ SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
   swig_cast_info *cast = ti->cast;
   /* if (ti->clientdata == clientdata) return; */
   ti->clientdata = clientdata;
-  
+
   while (cast) {
     if (!cast->converter) {
       swig_type_info *tc = cast->type;
       if (!tc->clientdata) {
 	SWIG_TypeClientData(tc, clientdata);
       }
-    }    
+    }
     cast = cast->next;
   }
 }
@@ -526,18 +521,18 @@ SWIG_TypeNewClientData(swig_type_info *ti, void *clientdata) {
   SWIG_TypeClientData(ti, clientdata);
   ti->owndata = 1;
 }
-  
+
 /*
   Search for a swig_type_info structure only by mangled name
   Search is a O(log #types)
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_MangledTypeQueryModule(swig_module_info *start, 
-                            swig_module_info *end, 
+SWIG_MangledTypeQueryModule(swig_module_info *start,
+                            swig_module_info *end,
 		            const char *name) {
   swig_module_info *iter = start;
   do {
@@ -546,11 +541,11 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
       register size_t r = iter->size - 1;
       do {
 	/* since l+r >= 0, we can (>> 1) instead (/ 2) */
-	register size_t i = (l + r) >> 1; 
+	register size_t i = (l + r) >> 1;
 	const char *iname = iter->types[i]->name;
 	if (iname) {
 	  register int compare = strcmp(name, iname);
-	  if (compare == 0) {	    
+	  if (compare == 0) {
 	    return iter->types[i];
 	  } else if (compare < 0) {
 	    if (i) {
@@ -575,14 +570,14 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
   Search for a swig_type_info structure for either a mangled name or a human readable name.
   It first searches the mangled names of the types, which is a O(log #types)
   If a type is not found it then searches the human readable names, which is O(#types).
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_TypeQueryModule(swig_module_info *start, 
-                     swig_module_info *end, 
+SWIG_TypeQueryModule(swig_module_info *start,
+                     swig_module_info *end,
 		     const char *name) {
   /* STEP 1: Search the name field using binary search */
   swig_type_info *ret = SWIG_MangledTypeQueryModule(start, end, name);
@@ -601,12 +596,12 @@ SWIG_TypeQueryModule(swig_module_info *start,
       iter = iter->next;
     } while (iter != end);
   }
-  
+
   /* neither found a match */
   return 0;
 }
 
-/* 
+/*
    Pack binary data into a string
 */
 SWIGRUNTIME char *
@@ -622,7 +617,7 @@ SWIG_PackData(char *c, void *ptr, size_t sz) {
   return c;
 }
 
-/* 
+/*
    Unpack binary data from a string
 */
 SWIGRUNTIME const char *
@@ -636,21 +631,21 @@ SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
       uu = ((d - '0') << 4);
     else if ((d >= 'a') && (d <= 'f'))
       uu = ((d - ('a'-10)) << 4);
-    else 
+    else
       return (char *) 0;
     d = *(c++);
     if ((d >= '0') && (d <= '9'))
       uu |= (d - '0');
     else if ((d >= 'a') && (d <= 'f'))
       uu |= (d - ('a'-10));
-    else 
+    else
       return (char *) 0;
     *u = uu;
   }
   return c;
 }
 
-/* 
+/*
    Pack 'void *' into a string buffer.
 */
 SWIGRUNTIME char *
@@ -710,18 +705,18 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 #endif
 
 /*  Errors in SWIG */
-#define  SWIG_UnknownError    	   -1 
-#define  SWIG_IOError        	   -2 
-#define  SWIG_RuntimeError   	   -3 
-#define  SWIG_IndexError     	   -4 
-#define  SWIG_TypeError      	   -5 
-#define  SWIG_DivisionByZero 	   -6 
-#define  SWIG_OverflowError  	   -7 
-#define  SWIG_SyntaxError    	   -8 
-#define  SWIG_ValueError     	   -9 
+#define  SWIG_UnknownError    	   -1
+#define  SWIG_IOError        	   -2
+#define  SWIG_RuntimeError   	   -3
+#define  SWIG_IndexError     	   -4
+#define  SWIG_TypeError      	   -5
+#define  SWIG_DivisionByZero 	   -6
+#define  SWIG_OverflowError  	   -7
+#define  SWIG_SyntaxError    	   -8
+#define  SWIG_ValueError     	   -9
 #define  SWIG_SystemError    	   -10
 #define  SWIG_AttributeError 	   -11
-#define  SWIG_MemoryError    	   -12 
+#define  SWIG_MemoryError    	   -12
 #define  SWIG_NullReferenceError   -13
 
 
@@ -1582,34 +1577,6 @@ SwigPyObject_repr(SwigPyObject *v, PyObject *args)
 }
 
 SWIGRUNTIME int
-SwigPyObject_print(SwigPyObject *v, FILE *fp, int SWIGUNUSEDPARM(flags))
-{
-  char *str;
-#ifdef METH_NOARGS
-  PyObject *repr = SwigPyObject_repr(v);
-#else
-  PyObject *repr = SwigPyObject_repr(v, NULL);
-#endif
-  if (repr) {
-    str = SWIG_Python_str_AsChar(repr); 
-    fputs(str, fp);
-    SWIG_Python_str_DelForPy3(str);
-    Py_DECREF(repr);
-    return 0; 
-  } else {
-    return 1; 
-  }
-}
-
-SWIGRUNTIME PyObject *
-SwigPyObject_str(SwigPyObject *v)
-{
-  char result[SWIG_BUFFER_SIZE];
-  return SWIG_PackVoidPtr(result, v->ptr, v->ty->name, sizeof(result)) ?
-    SWIG_Python_str_FromChar(result) : 0;
-}
-
-SWIGRUNTIME int
 SwigPyObject_compare(SwigPyObject *v, SwigPyObject *w)
 {
   void *i = v->ptr;
@@ -1801,7 +1768,7 @@ SwigPyObject_own(PyObject *v, PyObject *args)
 static PyMethodDef
 swigobject_methods[] = {
   {(char *)"disown",  (PyCFunction)SwigPyObject_disown,  METH_NOARGS,  (char *)"releases ownership of the pointer"},
-  {(char *)"acquire", (PyCFunction)SwigPyObject_acquire, METH_NOARGS,  (char *)"aquires ownership of the pointer"},
+  {(char *)"acquire", (PyCFunction)SwigPyObject_acquire, METH_NOARGS,  (char *)"acquires ownership of the pointer"},
   {(char *)"own",     (PyCFunction)SwigPyObject_own,     METH_VARARGS, (char *)"returns/sets ownership of the pointer"},
   {(char *)"append",  (PyCFunction)SwigPyObject_append,  METH_O,       (char *)"appends another 'this' object"},
   {(char *)"next",    (PyCFunction)SwigPyObject_next,    METH_NOARGS,  (char *)"returns the next 'this' object"},
@@ -1894,7 +1861,7 @@ SwigPyObject_TypeOnce(void) {
       sizeof(SwigPyObject),                 /* tp_basicsize */
       0,                                    /* tp_itemsize */
       (destructor)SwigPyObject_dealloc,     /* tp_dealloc */
-      (printfunc)SwigPyObject_print,        /* tp_print */
+      0,				    /* tp_print */
 #if PY_VERSION_HEX < 0x02020000
       (getattrfunc)SwigPyObject_getattr,    /* tp_getattr */
 #else
@@ -1912,7 +1879,7 @@ SwigPyObject_TypeOnce(void) {
       0,                                    /* tp_as_mapping */
       (hashfunc)0,                          /* tp_hash */
       (ternaryfunc)0,                       /* tp_call */
-      (reprfunc)SwigPyObject_str,           /* tp_str */
+      0,				    /* tp_str */
       PyObject_GenericGetAttr,              /* tp_getattro */
       0,                                    /* tp_setattro */
       0,                                    /* tp_as_buffer */
@@ -2289,10 +2256,11 @@ SWIGRUNTIME int
 SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int flags, int *own) {
   int res;
   SwigPyObject *sobj;
+  int implicit_conv = (flags & SWIG_POINTER_IMPLICIT_CONV) != 0;
 
   if (!obj)
     return SWIG_ERROR;
-  if (obj == Py_None) {
+  if (obj == Py_None && !implicit_conv) {
     if (ptr)
       *ptr = 0;
     return SWIG_OK;
@@ -2341,7 +2309,7 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
     }
     res = SWIG_OK;
   } else {
-    if (flags & SWIG_POINTER_IMPLICIT_CONV) {
+    if (implicit_conv) {
       SwigPyClientData *data = ty ? (SwigPyClientData *) ty->clientdata : 0;
       if (data && !data->implicitconv) {
         PyObject *klass = data->klass;
@@ -2376,6 +2344,13 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
         }
       }
     }
+    if (!SWIG_IsOK(res) && obj == Py_None) {
+      if (ptr)
+        *ptr = 0;
+      if (PyErr_Occurred())
+        PyErr_Clear();
+      res = SWIG_OK;
+    }
   }
   return res;
 }
@@ -2875,7 +2850,7 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) {
   PyObject *descr;
   PyObject *encoded_name;
   descrsetfunc f;
-  int res;
+  int res = -1;
 
 # ifdef Py_USING_UNICODE
   if (PyString_Check(name)) {
@@ -2898,7 +2873,6 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) {
       goto done;
   }
 
-  res = -1;
   descr = _PyType_Lookup(tp, name);
   f = NULL;
   if (descr != NULL)
@@ -2957,173 +2931,177 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) {
 #define SWIGTYPE_p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[14]
 #define SWIGTYPE_p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[15]
 #define SWIGTYPE_p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[16]
-#define SWIGTYPE_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t swig_types[17]
-#define SWIGTYPE_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[18]
-#define SWIGTYPE_p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[19]
-#define SWIGTYPE_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[20]
-#define SWIGTYPE_p_f_p_void__p_svn_error_t swig_types[21]
-#define SWIGTYPE_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[22]
-#define SWIGTYPE_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[23]
-#define SWIGTYPE_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[24]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void swig_types[25]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[26]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[27]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[28]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_client_info2_t_p_apr_pool_t__p_svn_error_t swig_types[29]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t swig_types[30]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[31]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[32]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t swig_types[33]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void swig_types[34]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void swig_types[35]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t swig_types[36]
-#define SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void swig_types[37]
-#define SWIGTYPE_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[38]
-#define SWIGTYPE_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__svn_io_dirent2_t_p_apr_pool_t__p_svn_error_t swig_types[39]
-#define SWIGTYPE_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t swig_types[40]
-#define SWIGTYPE_p_f_p_void_svn_revnum_t_svn_revnum_t_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[41]
-#define SWIGTYPE_p_int swig_types[42]
-#define SWIGTYPE_p_long swig_types[43]
-#define SWIGTYPE_p_p_apr_array_header_t swig_types[44]
-#define SWIGTYPE_p_p_apr_hash_t swig_types[45]
-#define SWIGTYPE_p_p_char swig_types[46]
-#define SWIGTYPE_p_p_f_apr_off_t_apr_off_t_p_void_p_apr_pool_t__void swig_types[47]
-#define SWIGTYPE_p_p_f_p_p_q_const__char_p_p_q_const__char_p_apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[48]
-#define SWIGTYPE_p_p_f_p_p_q_const__char_p_p_q_const__char_p_q_const__apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[49]
-#define SWIGTYPE_p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t swig_types[50]
-#define SWIGTYPE_p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[51]
-#define SWIGTYPE_p_p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[52]
-#define SWIGTYPE_p_p_f_p_void__p_svn_error_t swig_types[53]
-#define SWIGTYPE_p_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[54]
-#define SWIGTYPE_p_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[55]
-#define SWIGTYPE_p_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void swig_types[56]
-#define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[57]
-#define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[58]
-#define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_client_info2_t_p_apr_pool_t__p_svn_error_t swig_types[59]
-#define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t swig_types[60]
-#define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[61]
-#define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[62]
-#define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t swig_types[63]
-#define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t swig_types[64]
-#define SWIGTYPE_p_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void swig_types[65]
-#define SWIGTYPE_p_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[66]
-#define SWIGTYPE_p_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__svn_io_dirent2_t_p_apr_pool_t__p_svn_error_t swig_types[67]
-#define SWIGTYPE_p_p_f_p_void_svn_revnum_t_svn_revnum_t_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[68]
-#define SWIGTYPE_p_p_svn_auth_provider_object_t swig_types[69]
-#define SWIGTYPE_p_p_svn_client_commit_info_t swig_types[70]
-#define SWIGTYPE_p_p_svn_client_commit_item3_t swig_types[71]
-#define SWIGTYPE_p_p_svn_client_ctx_t swig_types[72]
-#define SWIGTYPE_p_p_svn_commit_info_t swig_types[73]
-#define SWIGTYPE_p_p_svn_ra_session_t swig_types[74]
-#define SWIGTYPE_p_p_svn_string_t swig_types[75]
-#define SWIGTYPE_p_svn_auth_baton_t swig_types[76]
-#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[77]
-#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[78]
-#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[79]
-#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[80]
-#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[81]
-#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[82]
-#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[83]
-#define SWIGTYPE_p_svn_auth_provider_t swig_types[84]
-#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[85]
-#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[86]
-#define SWIGTYPE_p_svn_checksum_kind_t swig_types[87]
-#define SWIGTYPE_p_svn_checksum_t swig_types[88]
-#define SWIGTYPE_p_svn_client_commit_info_t swig_types[89]
-#define SWIGTYPE_p_svn_client_commit_item2_t swig_types[90]
-#define SWIGTYPE_p_svn_client_commit_item3_t swig_types[91]
-#define SWIGTYPE_p_svn_client_commit_item_t swig_types[92]
-#define SWIGTYPE_p_svn_client_copy_source_t swig_types[93]
-#define SWIGTYPE_p_svn_client_ctx_t swig_types[94]
-#define SWIGTYPE_p_svn_client_diff_summarize_kind_t swig_types[95]
-#define SWIGTYPE_p_svn_client_diff_summarize_t swig_types[96]
-#define SWIGTYPE_p_svn_client_info2_t swig_types[97]
-#define SWIGTYPE_p_svn_client_proplist_item_t swig_types[98]
-#define SWIGTYPE_p_svn_client_status_t swig_types[99]
-#define SWIGTYPE_p_svn_commit_info_t swig_types[100]
-#define SWIGTYPE_p_svn_config_t swig_types[101]
-#define SWIGTYPE_p_svn_delta_editor_t swig_types[102]
-#define SWIGTYPE_p_svn_depth_t swig_types[103]
-#define SWIGTYPE_p_svn_diff_file_options_t swig_types[104]
-#define SWIGTYPE_p_svn_dirent_t swig_types[105]
-#define SWIGTYPE_p_svn_errno_t swig_types[106]
-#define SWIGTYPE_p_svn_error_t swig_types[107]
-#define SWIGTYPE_p_svn_info_t swig_types[108]
-#define SWIGTYPE_p_svn_io_dirent2_t swig_types[109]
-#define SWIGTYPE_p_svn_io_dirent_t swig_types[110]
-#define SWIGTYPE_p_svn_io_file_del_t swig_types[111]
-#define SWIGTYPE_p_svn_location_segment_t swig_types[112]
-#define SWIGTYPE_p_svn_lock_t swig_types[113]
-#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[114]
-#define SWIGTYPE_p_svn_log_changed_path_t swig_types[115]
-#define SWIGTYPE_p_svn_log_entry_t swig_types[116]
-#define SWIGTYPE_p_svn_merge_range_t swig_types[117]
-#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[118]
-#define SWIGTYPE_p_svn_node_kind_t swig_types[119]
-#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[120]
-#define SWIGTYPE_p_svn_opt_revision_t swig_types[121]
-#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[122]
-#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[123]
-#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[124]
-#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[125]
-#define SWIGTYPE_p_svn_prop_kind swig_types[126]
-#define SWIGTYPE_p_svn_ra_callbacks2_t swig_types[127]
-#define SWIGTYPE_p_svn_ra_callbacks_t swig_types[128]
-#define SWIGTYPE_p_svn_ra_plugin_t swig_types[129]
-#define SWIGTYPE_p_svn_ra_reporter2_t swig_types[130]
-#define SWIGTYPE_p_svn_ra_reporter3_t swig_types[131]
-#define SWIGTYPE_p_svn_ra_reporter_t swig_types[132]
-#define SWIGTYPE_p_svn_ra_session_t swig_types[133]
-#define SWIGTYPE_p_svn_stream_mark_t swig_types[134]
-#define SWIGTYPE_p_svn_stream_t swig_types[135]
-#define SWIGTYPE_p_svn_string_t swig_types[136]
-#define SWIGTYPE_p_svn_stringbuf_t swig_types[137]
-#define SWIGTYPE_p_svn_tristate_t swig_types[138]
-#define SWIGTYPE_p_svn_txdelta_op_t swig_types[139]
-#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[140]
-#define SWIGTYPE_p_svn_txdelta_window_t swig_types[141]
-#define SWIGTYPE_p_svn_version_checklist_t swig_types[142]
-#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[143]
-#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[144]
-#define SWIGTYPE_p_svn_version_extended_t swig_types[145]
-#define SWIGTYPE_p_svn_version_t swig_types[146]
-#define SWIGTYPE_p_svn_wc_adm_access_t swig_types[147]
-#define SWIGTYPE_p_svn_wc_committed_queue_t swig_types[148]
-#define SWIGTYPE_p_svn_wc_conflict_action_t swig_types[149]
-#define SWIGTYPE_p_svn_wc_conflict_choice_t swig_types[150]
-#define SWIGTYPE_p_svn_wc_conflict_description2_t swig_types[151]
-#define SWIGTYPE_p_svn_wc_conflict_description_t swig_types[152]
-#define SWIGTYPE_p_svn_wc_conflict_kind_t swig_types[153]
-#define SWIGTYPE_p_svn_wc_conflict_reason_t swig_types[154]
-#define SWIGTYPE_p_svn_wc_conflict_result_t swig_types[155]
-#define SWIGTYPE_p_svn_wc_conflict_version_t swig_types[156]
-#define SWIGTYPE_p_svn_wc_context_t swig_types[157]
-#define SWIGTYPE_p_svn_wc_diff_callbacks2_t swig_types[158]
-#define SWIGTYPE_p_svn_wc_diff_callbacks3_t swig_types[159]
-#define SWIGTYPE_p_svn_wc_diff_callbacks4_t swig_types[160]
-#define SWIGTYPE_p_svn_wc_diff_callbacks_t swig_types[161]
-#define SWIGTYPE_p_svn_wc_entry_callbacks2_t swig_types[162]
-#define SWIGTYPE_p_svn_wc_entry_callbacks_t swig_types[163]
-#define SWIGTYPE_p_svn_wc_entry_t swig_types[164]
-#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[165]
-#define SWIGTYPE_p_svn_wc_external_item_t swig_types[166]
-#define SWIGTYPE_p_svn_wc_info_t swig_types[167]
-#define SWIGTYPE_p_svn_wc_merge_outcome_t swig_types[168]
-#define SWIGTYPE_p_svn_wc_notify_action_t swig_types[169]
-#define SWIGTYPE_p_svn_wc_notify_lock_state_t swig_types[170]
-#define SWIGTYPE_p_svn_wc_notify_state_t swig_types[171]
-#define SWIGTYPE_p_svn_wc_notify_t swig_types[172]
-#define SWIGTYPE_p_svn_wc_operation_t swig_types[173]
-#define SWIGTYPE_p_svn_wc_revision_status_t swig_types[174]
-#define SWIGTYPE_p_svn_wc_schedule_t swig_types[175]
-#define SWIGTYPE_p_svn_wc_status2_t swig_types[176]
-#define SWIGTYPE_p_svn_wc_status3_t swig_types[177]
-#define SWIGTYPE_p_svn_wc_status_t swig_types[178]
-#define SWIGTYPE_p_svn_wc_traversal_info_t swig_types[179]
-#define SWIGTYPE_p_unsigned_long swig_types[180]
-#define SWIGTYPE_p_void swig_types[181]
-static swig_type_info *swig_types[183];
-static swig_module_info swig_module = {swig_types, 182, 0, 0, 0, 0};
+#define SWIGTYPE_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[17]
+#define SWIGTYPE_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t swig_types[18]
+#define SWIGTYPE_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[19]
+#define SWIGTYPE_p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[20]
+#define SWIGTYPE_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[21]
+#define SWIGTYPE_p_f_p_void__p_svn_error_t swig_types[22]
+#define SWIGTYPE_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[23]
+#define SWIGTYPE_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[24]
+#define SWIGTYPE_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[25]
+#define SWIGTYPE_p_f_p_void_p_q_const__char__int swig_types[26]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void swig_types[27]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[28]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[29]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[30]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_client_info2_t_p_apr_pool_t__p_svn_error_t swig_types[31]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t swig_types[32]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[33]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[34]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t swig_types[35]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void swig_types[36]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void swig_types[37]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t swig_types[38]
+#define SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void swig_types[39]
+#define SWIGTYPE_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[40]
+#define SWIGTYPE_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__svn_io_dirent2_t_p_apr_pool_t__p_svn_error_t swig_types[41]
+#define SWIGTYPE_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t swig_types[42]
+#define SWIGTYPE_p_f_p_void_svn_revnum_t_svn_revnum_t_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[43]
+#define SWIGTYPE_p_int swig_types[44]
+#define SWIGTYPE_p_long swig_types[45]
+#define SWIGTYPE_p_p_apr_array_header_t swig_types[46]
+#define SWIGTYPE_p_p_apr_hash_t swig_types[47]
+#define SWIGTYPE_p_p_char swig_types[48]
+#define SWIGTYPE_p_p_f_apr_off_t_apr_off_t_p_void_p_apr_pool_t__void swig_types[49]
+#define SWIGTYPE_p_p_f_p_p_q_const__char_p_p_q_const__char_p_apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[50]
+#define SWIGTYPE_p_p_f_p_p_q_const__char_p_p_q_const__char_p_q_const__apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[51]
+#define SWIGTYPE_p_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[52]
+#define SWIGTYPE_p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t swig_types[53]
+#define SWIGTYPE_p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[54]
+#define SWIGTYPE_p_p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[55]
+#define SWIGTYPE_p_p_f_p_void__p_svn_error_t swig_types[56]
+#define SWIGTYPE_p_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[57]
+#define SWIGTYPE_p_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[58]
+#define SWIGTYPE_p_p_f_p_void_p_q_const__char__int swig_types[59]
+#define SWIGTYPE_p_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void swig_types[60]
+#define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[61]
+#define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[62]
+#define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_client_info2_t_p_apr_pool_t__p_svn_error_t swig_types[63]
+#define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t swig_types[64]
+#define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[65]
+#define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[66]
+#define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t swig_types[67]
+#define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t swig_types[68]
+#define SWIGTYPE_p_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void swig_types[69]
+#define SWIGTYPE_p_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[70]
+#define SWIGTYPE_p_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__svn_io_dirent2_t_p_apr_pool_t__p_svn_error_t swig_types[71]
+#define SWIGTYPE_p_p_f_p_void_svn_revnum_t_svn_revnum_t_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[72]
+#define SWIGTYPE_p_p_svn_auth_provider_object_t swig_types[73]
+#define SWIGTYPE_p_p_svn_client_commit_info_t swig_types[74]
+#define SWIGTYPE_p_p_svn_client_commit_item3_t swig_types[75]
+#define SWIGTYPE_p_p_svn_client_ctx_t swig_types[76]
+#define SWIGTYPE_p_p_svn_commit_info_t swig_types[77]
+#define SWIGTYPE_p_p_svn_ra_session_t swig_types[78]
+#define SWIGTYPE_p_p_svn_string_t swig_types[79]
+#define SWIGTYPE_p_svn_auth_baton_t swig_types[80]
+#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[81]
+#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[82]
+#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[83]
+#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[84]
+#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[85]
+#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[86]
+#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[87]
+#define SWIGTYPE_p_svn_auth_provider_t swig_types[88]
+#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[89]
+#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[90]
+#define SWIGTYPE_p_svn_checksum_kind_t swig_types[91]
+#define SWIGTYPE_p_svn_checksum_t swig_types[92]
+#define SWIGTYPE_p_svn_client_commit_info_t swig_types[93]
+#define SWIGTYPE_p_svn_client_commit_item2_t swig_types[94]
+#define SWIGTYPE_p_svn_client_commit_item3_t swig_types[95]
+#define SWIGTYPE_p_svn_client_commit_item_t swig_types[96]
+#define SWIGTYPE_p_svn_client_copy_source_t swig_types[97]
+#define SWIGTYPE_p_svn_client_ctx_t swig_types[98]
+#define SWIGTYPE_p_svn_client_diff_summarize_kind_t swig_types[99]
+#define SWIGTYPE_p_svn_client_diff_summarize_t swig_types[100]
+#define SWIGTYPE_p_svn_client_info2_t swig_types[101]
+#define SWIGTYPE_p_svn_client_proplist_item_t swig_types[102]
+#define SWIGTYPE_p_svn_client_status_t swig_types[103]
+#define SWIGTYPE_p_svn_commit_info_t swig_types[104]
+#define SWIGTYPE_p_svn_config_t swig_types[105]
+#define SWIGTYPE_p_svn_delta_editor_t swig_types[106]
+#define SWIGTYPE_p_svn_depth_t swig_types[107]
+#define SWIGTYPE_p_svn_diff_file_options_t swig_types[108]
+#define SWIGTYPE_p_svn_diff_hunk_t swig_types[109]
+#define SWIGTYPE_p_svn_dirent_t swig_types[110]
+#define SWIGTYPE_p_svn_errno_t swig_types[111]
+#define SWIGTYPE_p_svn_error_t swig_types[112]
+#define SWIGTYPE_p_svn_fs_lock_target_t swig_types[113]
+#define SWIGTYPE_p_svn_info_t swig_types[114]
+#define SWIGTYPE_p_svn_io_dirent2_t swig_types[115]
+#define SWIGTYPE_p_svn_io_dirent_t swig_types[116]
+#define SWIGTYPE_p_svn_io_file_del_t swig_types[117]
+#define SWIGTYPE_p_svn_location_segment_t swig_types[118]
+#define SWIGTYPE_p_svn_lock_t swig_types[119]
+#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[120]
+#define SWIGTYPE_p_svn_log_changed_path_t swig_types[121]
+#define SWIGTYPE_p_svn_log_entry_t swig_types[122]
+#define SWIGTYPE_p_svn_merge_range_t swig_types[123]
+#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[124]
+#define SWIGTYPE_p_svn_node_kind_t swig_types[125]
+#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[126]
+#define SWIGTYPE_p_svn_opt_revision_t swig_types[127]
+#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[128]
+#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[129]
+#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[130]
+#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[131]
+#define SWIGTYPE_p_svn_prop_kind swig_types[132]
+#define SWIGTYPE_p_svn_ra_callbacks2_t swig_types[133]
+#define SWIGTYPE_p_svn_ra_callbacks_t swig_types[134]
+#define SWIGTYPE_p_svn_ra_plugin_t swig_types[135]
+#define SWIGTYPE_p_svn_ra_reporter2_t swig_types[136]
+#define SWIGTYPE_p_svn_ra_reporter3_t swig_types[137]
+#define SWIGTYPE_p_svn_ra_reporter_t swig_types[138]
+#define SWIGTYPE_p_svn_ra_session_t swig_types[139]
+#define SWIGTYPE_p_svn_stream_mark_t swig_types[140]
+#define SWIGTYPE_p_svn_stream_t swig_types[141]
+#define SWIGTYPE_p_svn_string_t swig_types[142]
+#define SWIGTYPE_p_svn_stringbuf_t swig_types[143]
+#define SWIGTYPE_p_svn_tristate_t swig_types[144]
+#define SWIGTYPE_p_svn_txdelta_op_t swig_types[145]
+#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[146]
+#define SWIGTYPE_p_svn_txdelta_window_t swig_types[147]
+#define SWIGTYPE_p_svn_version_checklist_t swig_types[148]
+#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[149]
+#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[150]
+#define SWIGTYPE_p_svn_version_extended_t swig_types[151]
+#define SWIGTYPE_p_svn_version_t swig_types[152]
+#define SWIGTYPE_p_svn_wc_adm_access_t swig_types[153]
+#define SWIGTYPE_p_svn_wc_committed_queue_t swig_types[154]
+#define SWIGTYPE_p_svn_wc_conflict_action_t swig_types[155]
+#define SWIGTYPE_p_svn_wc_conflict_choice_t swig_types[156]
+#define SWIGTYPE_p_svn_wc_conflict_description_t swig_types[157]
+#define SWIGTYPE_p_svn_wc_conflict_kind_t swig_types[158]
+#define SWIGTYPE_p_svn_wc_conflict_reason_t swig_types[159]
+#define SWIGTYPE_p_svn_wc_conflict_version_t swig_types[160]
+#define SWIGTYPE_p_svn_wc_context_t swig_types[161]
+#define SWIGTYPE_p_svn_wc_diff_callbacks2_t swig_types[162]
+#define SWIGTYPE_p_svn_wc_diff_callbacks3_t swig_types[163]
+#define SWIGTYPE_p_svn_wc_diff_callbacks4_t swig_types[164]
+#define SWIGTYPE_p_svn_wc_diff_callbacks_t swig_types[165]
+#define SWIGTYPE_p_svn_wc_entry_callbacks2_t swig_types[166]
+#define SWIGTYPE_p_svn_wc_entry_callbacks_t swig_types[167]
+#define SWIGTYPE_p_svn_wc_entry_t swig_types[168]
+#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[169]
+#define SWIGTYPE_p_svn_wc_external_item_t swig_types[170]
+#define SWIGTYPE_p_svn_wc_info_t swig_types[171]
+#define SWIGTYPE_p_svn_wc_merge_outcome_t swig_types[172]
+#define SWIGTYPE_p_svn_wc_notify_action_t swig_types[173]
+#define SWIGTYPE_p_svn_wc_notify_lock_state_t swig_types[174]
+#define SWIGTYPE_p_svn_wc_notify_state_t swig_types[175]
+#define SWIGTYPE_p_svn_wc_notify_t swig_types[176]
+#define SWIGTYPE_p_svn_wc_operation_t swig_types[177]
+#define SWIGTYPE_p_svn_wc_revision_status_t swig_types[178]
+#define SWIGTYPE_p_svn_wc_schedule_t swig_types[179]
+#define SWIGTYPE_p_svn_wc_status2_t swig_types[180]
+#define SWIGTYPE_p_svn_wc_status3_t swig_types[181]
+#define SWIGTYPE_p_svn_wc_status_t swig_types[182]
+#define SWIGTYPE_p_svn_wc_traversal_info_t swig_types[183]
+#define SWIGTYPE_p_unsigned_long swig_types[184]
+#define SWIGTYPE_p_void swig_types[185]
+static swig_type_info *swig_types[187];
+static swig_module_info swig_module = {swig_types, 186, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
@@ -3147,7 +3125,7 @@ static swig_module_info swig_module = {swig_types, 182, 0, 0, 0, 0};
 #endif
 #define SWIG_name    "_client"
 
-#define SWIGVERSION 0x020009 
+#define SWIGVERSION 0x020012 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -3489,6 +3467,18 @@ SWIG_AsVal_unsigned_SS_long (PyObject *obj, unsigned long *val)
       return SWIG_OK;
     } else {
       PyErr_Clear();
+#if PY_VERSION_HEX >= 0x03000000
+      {
+        long v = PyLong_AsLong(obj);
+        if (!PyErr_Occurred()) {
+          if (v < 0) {
+            return SWIG_OverflowError;
+          }
+        } else {
+          PyErr_Clear();
+        }
+      }
+#endif
     }
   }
 #ifdef SWIG_PYTHON_CAST_MODE
@@ -3643,7 +3633,7 @@ SWIGINTERN PyObject *_wrap_svn_client_version(PyObject *SWIGUNUSEDPARM(self), Py
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_version_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_version_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -3672,7 +3662,7 @@ SWIGINTERN PyObject *_wrap_svn_client_get_simple_prompt_provider(PyObject *SWIGU
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_client_get_simple_prompt_provider",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg2 = svn_swig_py_auth_simple_prompt_func;
+    arg2 = (svn_auth_simple_prompt_func_t) svn_swig_py_auth_simple_prompt_func;
     arg3 = obj0;
   }
   {
@@ -3699,7 +3689,7 @@ SWIGINTERN PyObject *_wrap_svn_client_get_simple_prompt_provider(PyObject *SWIGU
   }
   resultobj = SWIG_Py_Void();
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_auth_provider_object_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_auth_provider_object_t,
         _global_py_pool, args))
     
     ;
@@ -3737,7 +3727,7 @@ SWIGINTERN PyObject *_wrap_svn_client_get_username_prompt_provider(PyObject *SWI
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_client_get_username_prompt_provider",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg2 = svn_swig_py_auth_username_prompt_func;
+    arg2 = (svn_auth_username_prompt_func_t) svn_swig_py_auth_username_prompt_func;
     arg3 = obj0;
   }
   {
@@ -3764,7 +3754,7 @@ SWIGINTERN PyObject *_wrap_svn_client_get_username_prompt_provider(PyObject *SWI
   }
   resultobj = SWIG_Py_Void();
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_auth_provider_object_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_auth_provider_object_t,
         _global_py_pool, args))
     
     ;
@@ -3814,7 +3804,7 @@ SWIGINTERN PyObject *_wrap_svn_client_get_simple_provider(PyObject *SWIGUNUSEDPA
   }
   resultobj = SWIG_Py_Void();
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_auth_provider_object_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_auth_provider_object_t,
         _global_py_pool, args))
     
     ;
@@ -3864,7 +3854,7 @@ SWIGINTERN PyObject *_wrap_svn_client_get_username_provider(PyObject *SWIGUNUSED
   }
   resultobj = SWIG_Py_Void();
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_auth_provider_object_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_auth_provider_object_t,
         _global_py_pool, args))
     
     ;
@@ -3914,7 +3904,7 @@ SWIGINTERN PyObject *_wrap_svn_client_get_ssl_server_trust_file_provider(PyObjec
   }
   resultobj = SWIG_Py_Void();
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_auth_provider_object_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_auth_provider_object_t,
         _global_py_pool, args))
     
     ;
@@ -3964,7 +3954,7 @@ SWIGINTERN PyObject *_wrap_svn_client_get_ssl_client_cert_file_provider(PyObject
   }
   resultobj = SWIG_Py_Void();
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_auth_provider_object_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_auth_provider_object_t,
         _global_py_pool, args))
     
     ;
@@ -4014,7 +4004,7 @@ SWIGINTERN PyObject *_wrap_svn_client_get_ssl_client_cert_pw_file_provider(PyObj
   }
   resultobj = SWIG_Py_Void();
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_auth_provider_object_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_auth_provider_object_t,
         _global_py_pool, args))
     
     ;
@@ -4050,7 +4040,7 @@ SWIGINTERN PyObject *_wrap_svn_client_get_ssl_server_trust_prompt_provider(PyObj
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_client_get_ssl_server_trust_prompt_provider",&obj0,&obj1)) SWIG_fail;
   {
-    arg2 = svn_swig_py_auth_ssl_server_trust_prompt_func;
+    arg2 = (svn_auth_ssl_server_trust_prompt_func_t) svn_swig_py_auth_ssl_server_trust_prompt_func;
     arg3 = obj0;
   }
   if (obj1) {
@@ -4071,7 +4061,7 @@ SWIGINTERN PyObject *_wrap_svn_client_get_ssl_server_trust_prompt_provider(PyObj
   }
   resultobj = SWIG_Py_Void();
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_auth_provider_object_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_auth_provider_object_t,
         _global_py_pool, args))
     
     ;
@@ -4109,7 +4099,7 @@ SWIGINTERN PyObject *_wrap_svn_client_get_ssl_client_cert_prompt_provider(PyObje
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_client_get_ssl_client_cert_prompt_provider",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg2 = svn_swig_py_auth_ssl_client_cert_prompt_func;
+    arg2 = (svn_auth_ssl_client_cert_prompt_func_t) svn_swig_py_auth_ssl_client_cert_prompt_func;
     arg3 = obj0;
   }
   {
@@ -4136,7 +4126,7 @@ SWIGINTERN PyObject *_wrap_svn_client_get_ssl_client_cert_prompt_provider(PyObje
   }
   resultobj = SWIG_Py_Void();
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_auth_provider_object_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_auth_provider_object_t,
         _global_py_pool, args))
     
     ;
@@ -4174,7 +4164,7 @@ SWIGINTERN PyObject *_wrap_svn_client_get_ssl_client_cert_pw_prompt_provider(PyO
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_client_get_ssl_client_cert_pw_prompt_provider",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg2 = svn_swig_py_auth_ssl_client_cert_pw_prompt_func;
+    arg2 = (svn_auth_ssl_client_cert_pw_prompt_func_t) svn_swig_py_auth_ssl_client_cert_pw_prompt_func;
     arg3 = obj0;
   }
   {
@@ -4201,7 +4191,7 @@ SWIGINTERN PyObject *_wrap_svn_client_get_ssl_client_cert_pw_prompt_provider(PyO
   }
   resultobj = SWIG_Py_Void();
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_auth_provider_object_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_auth_provider_object_t,
         _global_py_pool, args))
     
     ;
@@ -4234,7 +4224,7 @@ SWIGINTERN PyObject *_wrap_svn_client_proplist_item_dup(PyObject *SWIGUNUSEDPARM
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_client_proplist_item_dup",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_client_proplist_item_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_proplist_item_t, svn_argnum_obj0);
+    arg1 = (svn_client_proplist_item_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_proplist_item_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4255,7 +4245,7 @@ SWIGINTERN PyObject *_wrap_svn_client_proplist_item_dup(PyObject *SWIGUNUSEDPARM
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_client_proplist_item_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_client_proplist_item_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -4278,7 +4268,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_info_t_revision_set(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_commit_info_t_revision_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4305,7 +4295,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_info_t_revision_get(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_info_t_revision_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4326,7 +4316,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_info_t_date_set(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_client_commit_info_t_date_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4354,7 +4344,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_info_t_date_get(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_info_t_date_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4375,7 +4365,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_info_t_author_set(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_client_commit_info_t_author_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4403,7 +4393,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_info_t_author_get(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_info_t_author_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4429,7 +4419,7 @@ SWIGINTERN PyObject *_wrap_new_svn_client_commit_info_t(PyObject *SWIGUNUSEDPARM
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_client_commit_info_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_client_commit_info_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -4444,7 +4434,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_client_commit_info_t(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_client_commit_info_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4479,7 +4469,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item3_t_path_set(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_client_commit_item3_t_path_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_item3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item3_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_item3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4507,7 +4497,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item3_t_path_get(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_item3_t_path_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_item3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item3_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_item3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4529,7 +4519,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item3_t_kind_set(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_commit_item3_t_kind_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_item3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item3_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_item3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4556,7 +4546,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item3_t_kind_get(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_item3_t_kind_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_item3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item3_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_item3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4577,7 +4567,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item3_t_url_set(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_client_commit_item3_t_url_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_item3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item3_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_item3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4605,7 +4595,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item3_t_url_get(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_item3_t_url_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_item3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item3_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_item3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4627,7 +4617,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item3_t_revision_set(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_commit_item3_t_revision_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_item3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item3_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_item3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4654,7 +4644,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item3_t_revision_get(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_item3_t_revision_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_item3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item3_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_item3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4675,7 +4665,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item3_t_copyfrom_url_set(PyObject *
   
   if (!PyArg_ParseTuple(args,(char *)"Oz:svn_client_commit_item3_t_copyfrom_url_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_item3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item3_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_item3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4703,7 +4693,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item3_t_copyfrom_url_get(PyObject *
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_item3_t_copyfrom_url_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_item3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item3_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_item3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4725,7 +4715,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item3_t_copyfrom_rev_set(PyObject *
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_commit_item3_t_copyfrom_rev_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_item3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item3_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_item3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4752,7 +4742,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item3_t_copyfrom_rev_get(PyObject *
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_item3_t_copyfrom_rev_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_item3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item3_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_item3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4774,7 +4764,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item3_t_state_flags_set(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_commit_item3_t_state_flags_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_item3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item3_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_item3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4801,7 +4791,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item3_t_state_flags_get(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_item3_t_state_flags_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_item3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item3_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_item3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4823,13 +4813,13 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item3_t_incoming_prop_changes_set(P
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_commit_item3_t_incoming_prop_changes_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_item3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item3_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_item3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (apr_array_header_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj1);
+    arg2 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4850,13 +4840,13 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item3_t_incoming_prop_changes_get(P
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_item3_t_incoming_prop_changes_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_item3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item3_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_item3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (apr_array_header_t *) ((arg1)->incoming_prop_changes);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_apr_array_header_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_apr_array_header_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -4873,13 +4863,13 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item3_t_outgoing_prop_changes_set(P
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_commit_item3_t_outgoing_prop_changes_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_item3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item3_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_item3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (apr_array_header_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj1);
+    arg2 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4900,13 +4890,13 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item3_t_outgoing_prop_changes_get(P
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_item3_t_outgoing_prop_changes_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_item3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item3_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_item3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (apr_array_header_t *) ((arg1)->outgoing_prop_changes);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_apr_array_header_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_apr_array_header_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -4922,7 +4912,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item3_t_session_relpath_set(PyObjec
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_client_commit_item3_t_session_relpath_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_item3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item3_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_item3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4950,7 +4940,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item3_t_session_relpath_get(PyObjec
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_item3_t_session_relpath_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_item3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item3_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_item3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4971,7 +4961,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item3_t_moved_from_abspath_set(PyOb
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_client_commit_item3_t_moved_from_abspath_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_item3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item3_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_item3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4999,7 +4989,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item3_t_moved_from_abspath_get(PyOb
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_item3_t_moved_from_abspath_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_item3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item3_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_item3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5025,7 +5015,7 @@ SWIGINTERN PyObject *_wrap_new_svn_client_commit_item3_t(PyObject *SWIGUNUSEDPAR
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_client_commit_item3_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_client_commit_item3_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -5040,7 +5030,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_client_commit_item3_t(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_client_commit_item3_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_item3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item3_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_item3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5075,7 +5065,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item2_t_path_set(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_client_commit_item2_t_path_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_item2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item2_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_item2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5103,7 +5093,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item2_t_path_get(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_item2_t_path_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_item2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item2_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_item2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5125,7 +5115,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item2_t_kind_set(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_commit_item2_t_kind_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_item2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item2_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_item2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5152,7 +5142,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item2_t_kind_get(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_item2_t_kind_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_item2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item2_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_item2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5173,7 +5163,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item2_t_url_set(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_client_commit_item2_t_url_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_item2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item2_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_item2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5201,7 +5191,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item2_t_url_get(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_item2_t_url_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_item2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item2_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_item2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5223,7 +5213,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item2_t_revision_set(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_commit_item2_t_revision_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_item2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item2_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_item2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5250,7 +5240,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item2_t_revision_get(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_item2_t_revision_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_item2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item2_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_item2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5271,7 +5261,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item2_t_copyfrom_url_set(PyObject *
   
   if (!PyArg_ParseTuple(args,(char *)"Oz:svn_client_commit_item2_t_copyfrom_url_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_item2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item2_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_item2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5299,7 +5289,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item2_t_copyfrom_url_get(PyObject *
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_item2_t_copyfrom_url_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_item2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item2_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_item2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5321,7 +5311,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item2_t_copyfrom_rev_set(PyObject *
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_commit_item2_t_copyfrom_rev_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_item2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item2_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_item2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5348,7 +5338,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item2_t_copyfrom_rev_get(PyObject *
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_item2_t_copyfrom_rev_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_item2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item2_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_item2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5370,7 +5360,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item2_t_state_flags_set(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_commit_item2_t_state_flags_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_item2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item2_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_item2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5397,7 +5387,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item2_t_state_flags_get(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_item2_t_state_flags_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_item2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item2_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_item2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5421,7 +5411,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item2_t_wcprop_changes_set(PyObject
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_commit_item2_t_wcprop_changes_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_item2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item2_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_item2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5455,13 +5445,13 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item2_t_wcprop_changes_get(PyObject
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_item2_t_wcprop_changes_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_item2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item2_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_item2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (apr_array_header_t *) ((arg1)->wcprop_changes);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_apr_array_header_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_apr_array_header_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -5482,7 +5472,7 @@ SWIGINTERN PyObject *_wrap_new_svn_client_commit_item2_t(PyObject *SWIGUNUSEDPAR
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_client_commit_item2_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_client_commit_item2_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -5497,7 +5487,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_client_commit_item2_t(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_client_commit_item2_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_item2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item2_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_item2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5532,7 +5522,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item_t_path_set(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_client_commit_item_t_path_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_item_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_item_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5560,7 +5550,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item_t_path_get(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_item_t_path_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_item_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_item_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5582,7 +5572,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item_t_kind_set(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_commit_item_t_kind_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_item_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_item_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5609,7 +5599,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item_t_kind_get(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_item_t_kind_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_item_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_item_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5630,7 +5620,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item_t_url_set(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_client_commit_item_t_url_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_item_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_item_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5658,7 +5648,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item_t_url_get(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_item_t_url_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_item_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_item_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5680,7 +5670,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item_t_revision_set(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_commit_item_t_revision_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_item_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_item_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5707,7 +5697,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item_t_revision_get(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_item_t_revision_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_item_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_item_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5728,7 +5718,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item_t_copyfrom_url_set(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"Oz:svn_client_commit_item_t_copyfrom_url_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_item_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_item_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5756,7 +5746,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item_t_copyfrom_url_get(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_item_t_copyfrom_url_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_item_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_item_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5778,7 +5768,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item_t_state_flags_set(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_commit_item_t_state_flags_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_item_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_item_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5805,7 +5795,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item_t_state_flags_get(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_item_t_state_flags_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_item_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_item_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5829,7 +5819,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item_t_wcprop_changes_set(PyObject
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_commit_item_t_wcprop_changes_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_item_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_item_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5863,13 +5853,13 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item_t_wcprop_changes_get(PyObject
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_commit_item_t_wcprop_changes_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_item_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_item_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (apr_array_header_t *) ((arg1)->wcprop_changes);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_apr_array_header_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_apr_array_header_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -5890,7 +5880,7 @@ SWIGINTERN PyObject *_wrap_new_svn_client_commit_item_t(PyObject *SWIGUNUSEDPARM
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_client_commit_item_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_client_commit_item_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -5905,7 +5895,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_client_commit_item_t(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_client_commit_item_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_commit_item_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_commit_item_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5961,7 +5951,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item3_create(PyObject *SWIGUNUSEDPA
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_client_commit_item3_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_client_commit_item3_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -6019,7 +6009,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item_create(PyObject *SWIGUNUSEDPAR
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_client_commit_item3_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_client_commit_item3_t,
         _global_py_pool, args))
     
     ;
@@ -6052,7 +6042,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item3_dup(PyObject *SWIGUNUSEDPARM(
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_client_commit_item3_dup",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_client_commit_item3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item3_t, svn_argnum_obj0);
+    arg1 = (svn_client_commit_item3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6073,7 +6063,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item3_dup(PyObject *SWIGUNUSEDPARM(
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_client_commit_item3_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_client_commit_item3_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -6103,7 +6093,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item2_dup(PyObject *SWIGUNUSEDPARM(
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_client_commit_item2_dup",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_client_commit_item2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_commit_item2_t, svn_argnum_obj0);
+    arg1 = (svn_client_commit_item2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_commit_item2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6124,7 +6114,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit_item2_dup(PyObject *SWIGUNUSEDPARM(
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_client_commit_item2_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_client_commit_item2_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -6146,7 +6136,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_summarize_t_path_set(PyObject *SWIGUN
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_client_diff_summarize_t_path_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_client_diff_summarize_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_diff_summarize_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_diff_summarize_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_diff_summarize_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6174,7 +6164,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_summarize_t_path_get(PyObject *SWIGUN
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_diff_summarize_t_path_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_diff_summarize_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_diff_summarize_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_diff_summarize_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_diff_summarize_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6196,7 +6186,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_summarize_t_summarize_kind_set(PyObje
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_diff_summarize_t_summarize_kind_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_diff_summarize_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_diff_summarize_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_diff_summarize_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_diff_summarize_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6223,7 +6213,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_summarize_t_summarize_kind_get(PyObje
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_diff_summarize_t_summarize_kind_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_diff_summarize_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_diff_summarize_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_diff_summarize_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_diff_summarize_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6245,7 +6235,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_summarize_t_prop_changed_set(PyObject
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_diff_summarize_t_prop_changed_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_diff_summarize_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_diff_summarize_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_diff_summarize_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_diff_summarize_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6272,7 +6262,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_summarize_t_prop_changed_get(PyObject
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_diff_summarize_t_prop_changed_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_diff_summarize_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_diff_summarize_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_diff_summarize_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_diff_summarize_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6294,7 +6284,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_summarize_t_node_kind_set(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_diff_summarize_t_node_kind_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_diff_summarize_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_diff_summarize_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_diff_summarize_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_diff_summarize_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6321,7 +6311,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_summarize_t_node_kind_get(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_diff_summarize_t_node_kind_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_diff_summarize_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_diff_summarize_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_diff_summarize_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_diff_summarize_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6347,7 +6337,7 @@ SWIGINTERN PyObject *_wrap_new_svn_client_diff_summarize_t(PyObject *SWIGUNUSEDP
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_client_diff_summarize_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_client_diff_summarize_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -6362,7 +6352,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_client_diff_summarize_t(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_client_diff_summarize_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_diff_summarize_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_diff_summarize_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_diff_summarize_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_diff_summarize_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6405,7 +6395,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_summarize_dup(PyObject *SWIGUNUSEDPAR
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_client_diff_summarize_dup",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_client_diff_summarize_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_diff_summarize_t, svn_argnum_obj0);
+    arg1 = (svn_client_diff_summarize_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_diff_summarize_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6426,7 +6416,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_summarize_dup(PyObject *SWIGUNUSEDPAR
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_client_diff_summarize_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_client_diff_summarize_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -6449,13 +6439,13 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_auth_baton_set(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_ctx_t_auth_baton_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_ctx_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_auth_baton_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_auth_baton_t, svn_argnum_obj1);
+    arg2 = (svn_auth_baton_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_auth_baton_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6476,13 +6466,13 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_auth_baton_get(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_ctx_t_auth_baton_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_ctx_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (svn_auth_baton_t *) ((arg1)->auth_baton);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_auth_baton_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_auth_baton_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -6499,14 +6489,14 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_notify_func_set(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_ctx_t_notify_func_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_ctx_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
     svn_wc_notify_func_t * tmp =
-    svn_swig_MustGetPtr(obj1, SWIGTYPE_p_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void, svn_argnum_obj1);
+    svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void, svn_argnum_obj1);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6528,7 +6518,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_notify_func_get(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_ctx_t_notify_func_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_ctx_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6550,7 +6540,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_notify_func_get(PyObject *SWIGUNUSED
         SWIG_fail;
       }
       *tmp = (svn_wc_notify_func_t) result;
-      resultobj = svn_swig_NewPointerObj(tmp, SWIGTYPE_p_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void,
+      resultobj = svn_swig_py_new_pointer_obj(tmp, SWIGTYPE_p_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void,
         py_pool, args);
     }
   }
@@ -6569,7 +6559,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_notify_baton_set(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_ctx_t_notify_baton_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_ctx_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6598,7 +6588,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_notify_baton_get(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_ctx_t_notify_baton_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_ctx_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6623,7 +6613,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_notify_baton_get(PyObject *SWIGUNUSE
         /* We don't know the type of this reference, so we'll have to
                * treat it as an opaque void pointer.
                */
-        resultobj = svn_swig_NewPointerObj(result, SWIGTYPE_p_void,
+        resultobj = svn_swig_py_new_pointer_obj(result, SWIGTYPE_p_void,
           _global_py_pool, args);
       }
     }
@@ -6644,14 +6634,14 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_log_msg_func_set(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_ctx_t_log_msg_func_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_ctx_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
     svn_client_get_commit_log_t * tmp =
-    svn_swig_MustGetPtr(obj1, SWIGTYPE_p_p_f_p_p_q_const__char_p_p_q_const__char_p_apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj1);
+    svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_p_f_p_p_q_const__char_p_p_q_const__char_p_apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj1);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6673,7 +6663,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_log_msg_func_get(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_ctx_t_log_msg_func_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_ctx_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6695,7 +6685,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_log_msg_func_get(PyObject *SWIGUNUSE
         SWIG_fail;
       }
       *tmp = (svn_client_get_commit_log_t) result;
-      resultobj = svn_swig_NewPointerObj(tmp, SWIGTYPE_p_p_f_p_p_q_const__char_p_p_q_const__char_p_apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t,
+      resultobj = svn_swig_py_new_pointer_obj(tmp, SWIGTYPE_p_p_f_p_p_q_const__char_p_p_q_const__char_p_apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t,
         py_pool, args);
     }
   }
@@ -6714,7 +6704,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_log_msg_baton_set(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_ctx_t_log_msg_baton_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_ctx_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6743,7 +6733,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_log_msg_baton_get(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_ctx_t_log_msg_baton_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_ctx_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6768,7 +6758,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_log_msg_baton_get(PyObject *SWIGUNUS
         /* We don't know the type of this reference, so we'll have to
                * treat it as an opaque void pointer.
                */
-        resultobj = svn_swig_NewPointerObj(result, SWIGTYPE_p_void,
+        resultobj = svn_swig_py_new_pointer_obj(result, SWIGTYPE_p_void,
           _global_py_pool, args);
       }
     }
@@ -6791,7 +6781,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_config_set(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_ctx_t_config_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_ctx_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6825,7 +6815,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_config_get(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_ctx_t_config_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_ctx_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6866,14 +6856,14 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_cancel_func_set(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_ctx_t_cancel_func_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_ctx_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
     svn_cancel_func_t * tmp =
-    svn_swig_MustGetPtr(obj1, SWIGTYPE_p_p_f_p_void__p_svn_error_t, svn_argnum_obj1);
+    svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_p_f_p_void__p_svn_error_t, svn_argnum_obj1);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6895,7 +6885,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_cancel_func_get(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_ctx_t_cancel_func_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_ctx_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6917,7 +6907,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_cancel_func_get(PyObject *SWIGUNUSED
         SWIG_fail;
       }
       *tmp = (svn_cancel_func_t) result;
-      resultobj = svn_swig_NewPointerObj(tmp, SWIGTYPE_p_p_f_p_void__p_svn_error_t,
+      resultobj = svn_swig_py_new_pointer_obj(tmp, SWIGTYPE_p_p_f_p_void__p_svn_error_t,
         py_pool, args);
     }
   }
@@ -6936,7 +6926,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_cancel_baton_set(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_ctx_t_cancel_baton_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_ctx_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6965,7 +6955,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_cancel_baton_get(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_ctx_t_cancel_baton_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_ctx_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6990,7 +6980,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_cancel_baton_get(PyObject *SWIGUNUSE
         /* We don't know the type of this reference, so we'll have to
                * treat it as an opaque void pointer.
                */
-        resultobj = svn_swig_NewPointerObj(result, SWIGTYPE_p_void,
+        resultobj = svn_swig_py_new_pointer_obj(result, SWIGTYPE_p_void,
           _global_py_pool, args);
       }
     }
@@ -7011,14 +7001,14 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_notify_func2_set(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_ctx_t_notify_func2_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_ctx_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
     svn_wc_notify_func2_t * tmp =
-    svn_swig_MustGetPtr(obj1, SWIGTYPE_p_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void, svn_argnum_obj1);
+    svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void, svn_argnum_obj1);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7040,7 +7030,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_notify_func2_get(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_ctx_t_notify_func2_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_ctx_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7062,7 +7052,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_notify_func2_get(PyObject *SWIGUNUSE
         SWIG_fail;
       }
       *tmp = (svn_wc_notify_func2_t) result;
-      resultobj = svn_swig_NewPointerObj(tmp, SWIGTYPE_p_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void,
+      resultobj = svn_swig_py_new_pointer_obj(tmp, SWIGTYPE_p_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void,
         py_pool, args);
     }
   }
@@ -7081,7 +7071,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_notify_baton2_set(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_ctx_t_notify_baton2_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_ctx_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7110,7 +7100,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_notify_baton2_get(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_ctx_t_notify_baton2_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_ctx_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7135,7 +7125,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_notify_baton2_get(PyObject *SWIGUNUS
         /* We don't know the type of this reference, so we'll have to
                * treat it as an opaque void pointer.
                */
-        resultobj = svn_swig_NewPointerObj(result, SWIGTYPE_p_void,
+        resultobj = svn_swig_py_new_pointer_obj(result, SWIGTYPE_p_void,
           _global_py_pool, args);
       }
     }
@@ -7156,14 +7146,14 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_log_msg_func2_set(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_ctx_t_log_msg_func2_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_ctx_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
     svn_client_get_commit_log2_t * tmp =
-    svn_swig_MustGetPtr(obj1, SWIGTYPE_p_p_f_p_p_q_const__char_p_p_q_const__char_p_q_const__apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj1);
+    svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_p_f_p_p_q_const__char_p_p_q_const__char_p_q_const__apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj1);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7185,7 +7175,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_log_msg_func2_get(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_ctx_t_log_msg_func2_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_ctx_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7207,7 +7197,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_log_msg_func2_get(PyObject *SWIGUNUS
         SWIG_fail;
       }
       *tmp = (svn_client_get_commit_log2_t) result;
-      resultobj = svn_swig_NewPointerObj(tmp, SWIGTYPE_p_p_f_p_p_q_const__char_p_p_q_const__char_p_q_const__apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t,
+      resultobj = svn_swig_py_new_pointer_obj(tmp, SWIGTYPE_p_p_f_p_p_q_const__char_p_p_q_const__char_p_q_const__apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t,
         py_pool, args);
     }
   }
@@ -7226,7 +7216,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_log_msg_baton2_set(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_ctx_t_log_msg_baton2_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_ctx_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7255,7 +7245,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_log_msg_baton2_get(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_ctx_t_log_msg_baton2_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_ctx_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7280,7 +7270,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_log_msg_baton2_get(PyObject *SWIGUNU
         /* We don't know the type of this reference, so we'll have to
                * treat it as an opaque void pointer.
                */
-        resultobj = svn_swig_NewPointerObj(result, SWIGTYPE_p_void,
+        resultobj = svn_swig_py_new_pointer_obj(result, SWIGTYPE_p_void,
           _global_py_pool, args);
       }
     }
@@ -7301,14 +7291,14 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_progress_func_set(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_ctx_t_progress_func_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_ctx_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
     svn_ra_progress_notify_func_t * tmp =
-    svn_swig_MustGetPtr(obj1, SWIGTYPE_p_p_f_apr_off_t_apr_off_t_p_void_p_apr_pool_t__void, svn_argnum_obj1);
+    svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_p_f_apr_off_t_apr_off_t_p_void_p_apr_pool_t__void, svn_argnum_obj1);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7330,7 +7320,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_progress_func_get(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_ctx_t_progress_func_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_ctx_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7352,7 +7342,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_progress_func_get(PyObject *SWIGUNUS
         SWIG_fail;
       }
       *tmp = (svn_ra_progress_notify_func_t) result;
-      resultobj = svn_swig_NewPointerObj(tmp, SWIGTYPE_p_p_f_apr_off_t_apr_off_t_p_void_p_apr_pool_t__void,
+      resultobj = svn_swig_py_new_pointer_obj(tmp, SWIGTYPE_p_p_f_apr_off_t_apr_off_t_p_void_p_apr_pool_t__void,
         py_pool, args);
     }
   }
@@ -7371,7 +7361,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_progress_baton_set(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_ctx_t_progress_baton_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_ctx_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7400,7 +7390,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_progress_baton_get(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_ctx_t_progress_baton_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_ctx_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7425,7 +7415,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_progress_baton_get(PyObject *SWIGUNU
         /* We don't know the type of this reference, so we'll have to
                * treat it as an opaque void pointer.
                */
-        resultobj = svn_swig_NewPointerObj(result, SWIGTYPE_p_void,
+        resultobj = svn_swig_py_new_pointer_obj(result, SWIGTYPE_p_void,
           _global_py_pool, args);
       }
     }
@@ -7446,14 +7436,14 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_log_msg_func3_set(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_ctx_t_log_msg_func3_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_ctx_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
     svn_client_get_commit_log3_t * tmp =
-    svn_swig_MustGetPtr(obj1, SWIGTYPE_p_p_f_p_p_q_const__char_p_p_q_const__char_p_q_const__apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj1);
+    svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_p_f_p_p_q_const__char_p_p_q_const__char_p_q_const__apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj1);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7475,7 +7465,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_log_msg_func3_get(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_ctx_t_log_msg_func3_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_ctx_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7497,7 +7487,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_log_msg_func3_get(PyObject *SWIGUNUS
         SWIG_fail;
       }
       *tmp = (svn_client_get_commit_log3_t) result;
-      resultobj = svn_swig_NewPointerObj(tmp, SWIGTYPE_p_p_f_p_p_q_const__char_p_p_q_const__char_p_q_const__apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t,
+      resultobj = svn_swig_py_new_pointer_obj(tmp, SWIGTYPE_p_p_f_p_p_q_const__char_p_p_q_const__char_p_q_const__apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t,
         py_pool, args);
     }
   }
@@ -7516,7 +7506,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_log_msg_baton3_set(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_ctx_t_log_msg_baton3_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_ctx_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7545,7 +7535,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_log_msg_baton3_get(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_ctx_t_log_msg_baton3_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_ctx_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7570,7 +7560,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_log_msg_baton3_get(PyObject *SWIGUNU
         /* We don't know the type of this reference, so we'll have to
                * treat it as an opaque void pointer.
                */
-        resultobj = svn_swig_NewPointerObj(result, SWIGTYPE_p_void,
+        resultobj = svn_swig_py_new_pointer_obj(result, SWIGTYPE_p_void,
           _global_py_pool, args);
       }
     }
@@ -7591,13 +7581,13 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_mimetypes_map_set(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_ctx_t_mimetypes_map_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_ctx_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (apr_hash_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_apr_hash_t, svn_argnum_obj1);
+    arg2 = (apr_hash_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_apr_hash_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7618,13 +7608,13 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_mimetypes_map_get(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_ctx_t_mimetypes_map_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_ctx_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (apr_hash_t *) ((arg1)->mimetypes_map);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_apr_hash_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_apr_hash_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -7641,14 +7631,14 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_conflict_func_set(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_ctx_t_conflict_func_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_ctx_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
     svn_wc_conflict_resolver_func_t * tmp =
-    svn_swig_MustGetPtr(obj1, SWIGTYPE_p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj1);
+    svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj1);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7670,7 +7660,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_conflict_func_get(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_ctx_t_conflict_func_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_ctx_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7692,7 +7682,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_conflict_func_get(PyObject *SWIGUNUS
         SWIG_fail;
       }
       *tmp = (svn_wc_conflict_resolver_func_t) result;
-      resultobj = svn_swig_NewPointerObj(tmp, SWIGTYPE_p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t,
+      resultobj = svn_swig_py_new_pointer_obj(tmp, SWIGTYPE_p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t,
         py_pool, args);
     }
   }
@@ -7711,7 +7701,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_conflict_baton_set(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_ctx_t_conflict_baton_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_ctx_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7740,7 +7730,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_conflict_baton_get(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_ctx_t_conflict_baton_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_ctx_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7765,7 +7755,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_conflict_baton_get(PyObject *SWIGUNU
         /* We don't know the type of this reference, so we'll have to
                * treat it as an opaque void pointer.
                */
-        resultobj = svn_swig_NewPointerObj(result, SWIGTYPE_p_void,
+        resultobj = svn_swig_py_new_pointer_obj(result, SWIGTYPE_p_void,
           _global_py_pool, args);
       }
     }
@@ -7785,7 +7775,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_client_name_set(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_client_ctx_t_client_name_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_client_ctx_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7813,7 +7803,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_client_name_get(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_ctx_t_client_name_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_ctx_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7835,14 +7825,14 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_conflict_func2_set(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_ctx_t_conflict_func2_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_ctx_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
     svn_wc_conflict_resolver_func2_t * tmp =
-    svn_swig_MustGetPtr(obj1, SWIGTYPE_p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj1);
+    svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj1);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7864,7 +7854,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_conflict_func2_get(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_ctx_t_conflict_func2_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_ctx_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7886,7 +7876,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_conflict_func2_get(PyObject *SWIGUNU
         SWIG_fail;
       }
       *tmp = (svn_wc_conflict_resolver_func2_t) result;
-      resultobj = svn_swig_NewPointerObj(tmp, SWIGTYPE_p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t,
+      resultobj = svn_swig_py_new_pointer_obj(tmp, SWIGTYPE_p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t,
         py_pool, args);
     }
   }
@@ -7905,7 +7895,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_conflict_baton2_set(PyObject *SWIGUN
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_ctx_t_conflict_baton2_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_ctx_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7934,7 +7924,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_conflict_baton2_get(PyObject *SWIGUN
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_ctx_t_conflict_baton2_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_ctx_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7959,7 +7949,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_conflict_baton2_get(PyObject *SWIGUN
         /* We don't know the type of this reference, so we'll have to
                * treat it as an opaque void pointer.
                */
-        resultobj = svn_swig_NewPointerObj(result, SWIGTYPE_p_void,
+        resultobj = svn_swig_py_new_pointer_obj(result, SWIGTYPE_p_void,
           _global_py_pool, args);
       }
     }
@@ -7980,13 +7970,13 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_wc_ctx_set(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_ctx_t_wc_ctx_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_ctx_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj1);
+    arg2 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8007,13 +7997,13 @@ SWIGINTERN PyObject *_wrap_svn_client_ctx_t_wc_ctx_get(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_ctx_t_wc_ctx_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_ctx_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (svn_wc_context_t *) ((arg1)->wc_ctx);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_wc_context_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_wc_context_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -8021,6 +8011,221 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_client_ctx_t_check_tunnel_func_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  struct svn_client_ctx_t *arg1 = (struct svn_client_ctx_t *) 0 ;
+  svn_ra_check_tunnel_func_t arg2 = (svn_ra_check_tunnel_func_t) 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_ctx_t_check_tunnel_func_set",&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = (struct svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    svn_ra_check_tunnel_func_t * tmp =
+    svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_p_f_p_void_p_q_const__char__int, svn_argnum_obj1);
+    if (tmp == NULL || PyErr_Occurred()) {
+      SWIG_fail;
+    }
+    arg2 = *tmp;
+  }
+  if (arg1) (arg1)->check_tunnel_func = arg2;
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_svn_client_ctx_t_check_tunnel_func_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  struct svn_client_ctx_t *arg1 = (struct svn_client_ctx_t *) 0 ;
+  PyObject * obj0 = 0 ;
+  svn_ra_check_tunnel_func_t result;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_ctx_t_check_tunnel_func_get",&obj0)) SWIG_fail;
+  {
+    arg1 = (struct svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  result = (svn_ra_check_tunnel_func_t) ((arg1)->check_tunnel_func);
+  {
+    PyObject *py_pool = NULL;
+    apr_pool_t *pool = NULL;
+    
+    if (svn_swig_py_get_parent_pool(args, SWIGTYPE_p_apr_pool_t,
+        &py_pool, &pool))
+    SWIG_fail;
+    if (result == NULL) {
+      resultobj = Py_None;
+      Py_INCREF(resultobj);
+    } else {
+      svn_ra_check_tunnel_func_t * tmp = apr_palloc(pool, sizeof(svn_ra_check_tunnel_func_t));
+      if (tmp == NULL) {
+        SWIG_fail;
+      }
+      *tmp = (svn_ra_check_tunnel_func_t) result;
+      resultobj = svn_swig_py_new_pointer_obj(tmp, SWIGTYPE_p_p_f_p_void_p_q_const__char__int,
+        py_pool, args);
+    }
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_svn_client_ctx_t_open_tunnel_func_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  struct svn_client_ctx_t *arg1 = (struct svn_client_ctx_t *) 0 ;
+  svn_ra_open_tunnel_func_t arg2 = (svn_ra_open_tunnel_func_t) 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_ctx_t_open_tunnel_func_set",&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = (struct svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    svn_ra_open_tunnel_func_t * tmp =
+    svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj1);
+    if (tmp == NULL || PyErr_Occurred()) {
+      SWIG_fail;
+    }
+    arg2 = *tmp;
+  }
+  if (arg1) (arg1)->open_tunnel_func = arg2;
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_svn_client_ctx_t_open_tunnel_func_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  struct svn_client_ctx_t *arg1 = (struct svn_client_ctx_t *) 0 ;
+  PyObject * obj0 = 0 ;
+  svn_ra_open_tunnel_func_t result;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_ctx_t_open_tunnel_func_get",&obj0)) SWIG_fail;
+  {
+    arg1 = (struct svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  result = (svn_ra_open_tunnel_func_t) ((arg1)->open_tunnel_func);
+  {
+    PyObject *py_pool = NULL;
+    apr_pool_t *pool = NULL;
+    
+    if (svn_swig_py_get_parent_pool(args, SWIGTYPE_p_apr_pool_t,
+        &py_pool, &pool))
+    SWIG_fail;
+    if (result == NULL) {
+      resultobj = Py_None;
+      Py_INCREF(resultobj);
+    } else {
+      svn_ra_open_tunnel_func_t * tmp = apr_palloc(pool, sizeof(svn_ra_open_tunnel_func_t));
+      if (tmp == NULL) {
+        SWIG_fail;
+      }
+      *tmp = (svn_ra_open_tunnel_func_t) result;
+      resultobj = svn_swig_py_new_pointer_obj(tmp, SWIGTYPE_p_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t,
+        py_pool, args);
+    }
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_svn_client_ctx_t_tunnel_baton_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  struct svn_client_ctx_t *arg1 = (struct svn_client_ctx_t *) 0 ;
+  void *arg2 = (void *) 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_ctx_t_tunnel_baton_set",&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = (struct svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    if (obj1 == Py_None) {
+      arg2 = NULL;
+    } else if (SWIG_ConvertPtr(obj1, (void **) &arg2, 0, 0) == -1) {
+      arg2 = (void *) obj1;
+      PyErr_Clear();
+    }
+  }
+  if (arg1) (arg1)->tunnel_baton = arg2;
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_svn_client_ctx_t_tunnel_baton_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  struct svn_client_ctx_t *arg1 = (struct svn_client_ctx_t *) 0 ;
+  PyObject * obj0 = 0 ;
+  void *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:svn_client_ctx_t_tunnel_baton_get",&obj0)) SWIG_fail;
+  {
+    arg1 = (struct svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  result = (void *) ((arg1)->tunnel_baton);
+  {
+    PyObject *ownerObj = obj0;
+    PyObject *members = PyObject_GetAttrString(ownerObj, "_members");
+    
+    resultobj = NULL;
+    if (members != NULL) {
+      resultobj = PyDict_GetItemString(members, "tunnel_baton");
+      Py_XINCREF(resultobj);
+      Py_DECREF(members);
+    }
+    
+    if (resultobj == NULL) {
+      if (result == NULL) {
+        resultobj = Py_None;
+        Py_INCREF(resultobj);
+      } else {
+        /* We don't know the type of this reference, so we'll have to
+               * treat it as an opaque void pointer.
+               */
+        resultobj = svn_swig_py_new_pointer_obj(result, SWIGTYPE_p_void,
+          _global_py_pool, args);
+      }
+    }
+    
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_new_svn_client_ctx_t(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   struct svn_client_ctx_t *result = 0 ;
@@ -8034,7 +8239,7 @@ SWIGINTERN PyObject *_wrap_new_svn_client_ctx_t(PyObject *SWIGUNUSEDPARM(self),
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_client_ctx_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_client_ctx_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -8049,7 +8254,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_client_ctx_t(PyObject *SWIGUNUSEDPARM(self
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_client_ctx_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_ctx_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8095,7 +8300,7 @@ SWIGINTERN PyObject *_wrap_svn_client_create_context2(PyObject *SWIGUNUSEDPARM(s
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_client_create_context2",&obj0,&obj1)) SWIG_fail;
   {
-    arg2 = (apr_hash_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_apr_hash_t, svn_argnum_obj0);
+    arg2 = (apr_hash_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_hash_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8128,7 +8333,7 @@ SWIGINTERN PyObject *_wrap_svn_client_create_context2(PyObject *SWIGUNUSEDPARM(s
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_client_ctx_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_client_ctx_t,
         _global_py_pool, args))
     
     ;
@@ -8189,7 +8394,7 @@ SWIGINTERN PyObject *_wrap_svn_client_create_context(PyObject *SWIGUNUSEDPARM(se
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_client_ctx_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_client_ctx_t,
         _global_py_pool, args))
     
     ;
@@ -8231,19 +8436,19 @@ SWIGINTERN PyObject *_wrap_svn_client_args_to_target_array2(PyObject *SWIGUNUSED
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OOOO|O:svn_client_args_to_target_array2",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
-    arg2 = (apr_getopt_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_apr_getopt_t, svn_argnum_obj0);
+    arg2 = (apr_getopt_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_getopt_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (apr_array_header_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj1);
+    arg3 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj2);
+    arg4 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8319,19 +8524,19 @@ SWIGINTERN PyObject *_wrap_svn_client_args_to_target_array(PyObject *SWIGUNUSEDP
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_client_args_to_target_array",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
-    arg2 = (apr_getopt_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_apr_getopt_t, svn_argnum_obj0);
+    arg2 = (apr_getopt_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_getopt_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (apr_array_header_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj1);
+    arg3 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj2);
+    arg4 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8410,13 +8615,13 @@ SWIGINTERN PyObject *_wrap_svn_client_checkout3(PyObject *SWIGUNUSEDPARM(self),
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"ssOOOOOO|O:svn_client_checkout3",&arg2,&arg3,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   {
-    arg4 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg4 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg5 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
+    arg5 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8440,7 +8645,7 @@ SWIGINTERN PyObject *_wrap_svn_client_checkout3(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
-    arg9 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj7, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj7);
+    arg9 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj7, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj7);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8530,13 +8735,13 @@ SWIGINTERN PyObject *_wrap_svn_client_checkout2(PyObject *SWIGUNUSEDPARM(self),
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"ssOOOOO|O:svn_client_checkout2",&arg2,&arg3,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
-    arg4 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg4 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg5 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
+    arg5 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8554,7 +8759,7 @@ SWIGINTERN PyObject *_wrap_svn_client_checkout2(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
-    arg8 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj6, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj6);
+    arg8 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj6, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj6);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8640,7 +8845,7 @@ SWIGINTERN PyObject *_wrap_svn_client_checkout(PyObject *SWIGUNUSEDPARM(self), P
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"ssOOO|O:svn_client_checkout",&arg2,&arg3,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
-    arg4 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg4 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8652,7 +8857,7 @@ SWIGINTERN PyObject *_wrap_svn_client_checkout(PyObject *SWIGUNUSEDPARM(self), P
     }
   }
   {
-    arg6 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj4);
+    arg6 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8751,7 +8956,7 @@ SWIGINTERN PyObject *_wrap_svn_client_update4(PyObject *SWIGUNUSEDPARM(self), Py
     SWIG_fail;
   }
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8793,7 +8998,7 @@ SWIGINTERN PyObject *_wrap_svn_client_update4(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
-    arg10 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj8, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj8);
+    arg10 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj8, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj8);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8888,7 +9093,7 @@ SWIGINTERN PyObject *_wrap_svn_client_update3(PyObject *SWIGUNUSEDPARM(self), Py
     SWIG_fail;
   }
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8918,7 +9123,7 @@ SWIGINTERN PyObject *_wrap_svn_client_update3(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
-    arg8 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj6, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj6);
+    arg8 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj6, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj6);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9009,7 +9214,7 @@ SWIGINTERN PyObject *_wrap_svn_client_update2(PyObject *SWIGUNUSEDPARM(self), Py
     SWIG_fail;
   }
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9027,7 +9232,7 @@ SWIGINTERN PyObject *_wrap_svn_client_update2(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
-    arg6 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj4);
+    arg6 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9107,7 +9312,7 @@ SWIGINTERN PyObject *_wrap_svn_client_update(PyObject *SWIGUNUSEDPARM(self), PyO
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"sOOO|O:svn_client_update",&arg2,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9119,7 +9324,7 @@ SWIGINTERN PyObject *_wrap_svn_client_update(PyObject *SWIGUNUSEDPARM(self), PyO
     }
   }
   {
-    arg5 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj3);
+    arg5 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9210,13 +9415,13 @@ SWIGINTERN PyObject *_wrap_svn_client_switch3(PyObject *SWIGUNUSEDPARM(self), Py
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"ssOOOOOOOO|O:svn_client_switch3",&arg2,&arg3,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
   {
-    arg4 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg4 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg5 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
+    arg5 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9252,7 +9457,7 @@ SWIGINTERN PyObject *_wrap_svn_client_switch3(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
-    arg11 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj9, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj9);
+    arg11 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj9, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj9);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9346,13 +9551,13 @@ SWIGINTERN PyObject *_wrap_svn_client_switch2(PyObject *SWIGUNUSEDPARM(self), Py
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"ssOOOOOOO|O:svn_client_switch2",&arg2,&arg3,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   {
-    arg4 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg4 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg5 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
+    arg5 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9382,7 +9587,7 @@ SWIGINTERN PyObject *_wrap_svn_client_switch2(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
-    arg10 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj8, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj8);
+    arg10 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj8, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj8);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9468,7 +9673,7 @@ SWIGINTERN PyObject *_wrap_svn_client_switch(PyObject *SWIGUNUSEDPARM(self), PyO
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"ssOOO|O:svn_client_switch",&arg2,&arg3,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
-    arg4 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg4 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9480,7 +9685,7 @@ SWIGINTERN PyObject *_wrap_svn_client_switch(PyObject *SWIGUNUSEDPARM(self), PyO
     }
   }
   {
-    arg6 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj4);
+    arg6 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9592,7 +9797,7 @@ SWIGINTERN PyObject *_wrap_svn_client_add5(PyObject *SWIGUNUSEDPARM(self), PyObj
     }
   }
   {
-    arg7 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj6, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj6);
+    arg7 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj6, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj6);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9685,7 +9890,7 @@ SWIGINTERN PyObject *_wrap_svn_client_add4(PyObject *SWIGUNUSEDPARM(self), PyObj
     }
   }
   {
-    arg6 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj5, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj5);
+    arg6 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj5, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj5);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9770,7 +9975,7 @@ SWIGINTERN PyObject *_wrap_svn_client_add3(PyObject *SWIGUNUSEDPARM(self), PyObj
     }
   }
   {
-    arg5 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj4);
+    arg5 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9847,7 +10052,7 @@ SWIGINTERN PyObject *_wrap_svn_client_add2(PyObject *SWIGUNUSEDPARM(self), PyObj
     }
   }
   {
-    arg4 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj3);
+    arg4 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9916,7 +10121,7 @@ SWIGINTERN PyObject *_wrap_svn_client_add(PyObject *SWIGUNUSEDPARM(self), PyObje
     }
   }
   {
-    arg3 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj2);
+    arg3 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10017,7 +10222,7 @@ SWIGINTERN PyObject *_wrap_svn_client_mkdir4(PyObject *SWIGUNUSEDPARM(self), PyO
     arg5 = (void *)obj3;
   }
   {
-    arg6 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj4);
+    arg6 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10114,7 +10319,7 @@ SWIGINTERN PyObject *_wrap_svn_client_mkdir3(PyObject *SWIGUNUSEDPARM(self), PyO
     }
   }
   {
-    arg5 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj3);
+    arg5 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10147,7 +10352,7 @@ SWIGINTERN PyObject *_wrap_svn_client_mkdir3(PyObject *SWIGUNUSEDPARM(self), PyO
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_commit_info_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_commit_info_t,
         _global_py_pool, args))
     
     ;
@@ -10194,7 +10399,7 @@ SWIGINTERN PyObject *_wrap_svn_client_mkdir2(PyObject *SWIGUNUSEDPARM(self), PyO
     SWIG_fail;
   }
   {
-    arg3 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj1);
+    arg3 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10227,7 +10432,7 @@ SWIGINTERN PyObject *_wrap_svn_client_mkdir2(PyObject *SWIGUNUSEDPARM(self), PyO
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_commit_info_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_commit_info_t,
         _global_py_pool, args))
     
     ;
@@ -10274,7 +10479,7 @@ SWIGINTERN PyObject *_wrap_svn_client_mkdir(PyObject *SWIGUNUSEDPARM(self), PyOb
     SWIG_fail;
   }
   {
-    arg3 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj1);
+    arg3 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10307,7 +10512,7 @@ SWIGINTERN PyObject *_wrap_svn_client_mkdir(PyObject *SWIGUNUSEDPARM(self), PyOb
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_client_commit_info_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_client_commit_info_t,
         _global_py_pool, args))
     
     ;
@@ -10389,7 +10594,7 @@ SWIGINTERN PyObject *_wrap_svn_client_delete4(PyObject *SWIGUNUSEDPARM(self), Py
     arg6 = (void *)obj4;
   }
   {
-    arg7 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj5, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj5);
+    arg7 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj5, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj5);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10494,7 +10699,7 @@ SWIGINTERN PyObject *_wrap_svn_client_delete3(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
-    arg6 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj4);
+    arg6 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10527,7 +10732,7 @@ SWIGINTERN PyObject *_wrap_svn_client_delete3(PyObject *SWIGUNUSEDPARM(self), Py
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_commit_info_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_commit_info_t,
         _global_py_pool, args))
     
     ;
@@ -10582,7 +10787,7 @@ SWIGINTERN PyObject *_wrap_svn_client_delete2(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
-    arg4 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj2);
+    arg4 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10615,7 +10820,7 @@ SWIGINTERN PyObject *_wrap_svn_client_delete2(PyObject *SWIGUNUSEDPARM(self), Py
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_commit_info_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_commit_info_t,
         _global_py_pool, args))
     
     ;
@@ -10670,7 +10875,7 @@ SWIGINTERN PyObject *_wrap_svn_client_delete(PyObject *SWIGUNUSEDPARM(self), PyO
     }
   }
   {
-    arg4 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj2);
+    arg4 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10703,7 +10908,7 @@ SWIGINTERN PyObject *_wrap_svn_client_delete(PyObject *SWIGUNUSEDPARM(self), PyO
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_client_commit_info_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_client_commit_info_t,
         _global_py_pool, args))
     
     ;
@@ -10793,7 +10998,7 @@ SWIGINTERN PyObject *_wrap_svn_client_import5(PyObject *SWIGUNUSEDPARM(self), Py
   }
   {
     svn_client_import_filter_func_t * tmp =
-    svn_swig_MustGetPtr(obj7, SWIGTYPE_p_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__svn_io_dirent2_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj7);
+    svn_swig_py_must_get_ptr(obj7, SWIGTYPE_p_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__svn_io_dirent2_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj7);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10812,7 +11017,7 @@ SWIGINTERN PyObject *_wrap_svn_client_import5(PyObject *SWIGUNUSEDPARM(self), Py
     arg11 = (void *)obj9;
   }
   {
-    arg12 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj10, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj10);
+    arg12 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj10, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj10);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10920,7 +11125,7 @@ SWIGINTERN PyObject *_wrap_svn_client_import4(PyObject *SWIGUNUSEDPARM(self), Py
     arg8 = (void *)obj6;
   }
   {
-    arg9 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj7, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj7);
+    arg9 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj7, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj7);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11024,7 +11229,7 @@ SWIGINTERN PyObject *_wrap_svn_client_import3(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
-    arg8 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj6, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj6);
+    arg8 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj6, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj6);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11057,7 +11262,7 @@ SWIGINTERN PyObject *_wrap_svn_client_import3(PyObject *SWIGUNUSEDPARM(self), Py
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_commit_info_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_commit_info_t,
         _global_py_pool, args))
     
     ;
@@ -11111,7 +11316,7 @@ SWIGINTERN PyObject *_wrap_svn_client_import2(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
-    arg6 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj4);
+    arg6 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11144,7 +11349,7 @@ SWIGINTERN PyObject *_wrap_svn_client_import2(PyObject *SWIGUNUSEDPARM(self), Py
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_commit_info_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_commit_info_t,
         _global_py_pool, args))
     
     ;
@@ -11190,7 +11395,7 @@ SWIGINTERN PyObject *_wrap_svn_client_import(PyObject *SWIGUNUSEDPARM(self), PyO
     }
   }
   {
-    arg5 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj3);
+    arg5 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11223,7 +11428,7 @@ SWIGINTERN PyObject *_wrap_svn_client_import(PyObject *SWIGUNUSEDPARM(self), PyO
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_client_commit_info_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_client_commit_info_t,
         _global_py_pool, args))
     
     ;
@@ -11348,7 +11553,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit6(PyObject *SWIGUNUSEDPARM(self), Py
     arg11 = (void *)obj9;
   }
   {
-    arg12 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj10, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj10);
+    arg12 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj10, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj10);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11484,7 +11689,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit5(PyObject *SWIGUNUSEDPARM(self), Py
     arg9 = (void *)obj7;
   }
   {
-    arg10 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj8, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj8);
+    arg10 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj8, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj8);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11608,7 +11813,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit4(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
-    arg8 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj6, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj6);
+    arg8 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj6, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj6);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11641,7 +11846,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit4(PyObject *SWIGUNUSEDPARM(self), Py
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_commit_info_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_commit_info_t,
         _global_py_pool, args))
     
     ;
@@ -11704,7 +11909,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit3(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
-    arg5 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj3);
+    arg5 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11737,7 +11942,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit3(PyObject *SWIGUNUSEDPARM(self), Py
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_commit_info_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_commit_info_t,
         _global_py_pool, args))
     
     ;
@@ -11800,7 +12005,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit2(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
-    arg5 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj3);
+    arg5 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11833,7 +12038,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit2(PyObject *SWIGUNUSEDPARM(self), Py
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_client_commit_info_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_client_commit_info_t,
         _global_py_pool, args))
     
     ;
@@ -11888,7 +12093,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit(PyObject *SWIGUNUSEDPARM(self), PyO
     }
   }
   {
-    arg4 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj2);
+    arg4 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11921,7 +12126,7 @@ SWIGINTERN PyObject *_wrap_svn_client_commit(PyObject *SWIGUNUSEDPARM(self), PyO
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_client_commit_info_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_client_commit_info_t,
         _global_py_pool, args))
     
     ;
@@ -11947,7 +12152,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_kind_set(PyObject *SWIGUNUSEDPARM
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_status_t_kind_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11974,7 +12179,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_kind_get(PyObject *SWIGUNUSEDPARM
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_kind_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11995,7 +12200,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_local_abspath_set(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_client_status_t_local_abspath_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12023,7 +12228,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_local_abspath_get(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_local_abspath_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12045,7 +12250,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_filesize_set(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_status_t_filesize_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12067,7 +12272,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_filesize_get(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_filesize_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12089,7 +12294,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_versioned_set(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_status_t_versioned_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12116,7 +12321,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_versioned_get(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_versioned_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12138,7 +12343,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_conflicted_set(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_status_t_conflicted_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12165,7 +12370,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_conflicted_get(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_conflicted_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12187,7 +12392,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_node_status_set(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_status_t_node_status_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12214,7 +12419,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_node_status_get(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_node_status_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12236,7 +12441,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_text_status_set(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_status_t_text_status_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12263,7 +12468,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_text_status_get(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_text_status_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12285,7 +12490,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_prop_status_set(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_status_t_prop_status_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12312,7 +12517,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_prop_status_get(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_prop_status_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12334,7 +12539,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_wc_is_locked_set(PyObject *SWIGUN
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_status_t_wc_is_locked_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12361,7 +12566,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_wc_is_locked_get(PyObject *SWIGUN
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_wc_is_locked_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12383,7 +12588,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_copied_set(PyObject *SWIGUNUSEDPA
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_status_t_copied_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12410,7 +12615,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_copied_get(PyObject *SWIGUNUSEDPA
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_copied_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12431,7 +12636,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_repos_root_url_set(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_client_status_t_repos_root_url_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12459,7 +12664,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_repos_root_url_get(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_repos_root_url_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12480,7 +12685,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_repos_uuid_set(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_client_status_t_repos_uuid_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12508,7 +12713,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_repos_uuid_get(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_repos_uuid_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12529,7 +12734,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_repos_relpath_set(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_client_status_t_repos_relpath_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12557,7 +12762,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_repos_relpath_get(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_repos_relpath_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12579,7 +12784,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_revision_set(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_status_t_revision_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12606,7 +12811,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_revision_get(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_revision_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12628,7 +12833,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_changed_rev_set(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_status_t_changed_rev_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12655,7 +12860,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_changed_rev_get(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_changed_rev_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12677,7 +12882,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_changed_date_set(PyObject *SWIGUN
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_status_t_changed_date_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12699,7 +12904,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_changed_date_get(PyObject *SWIGUN
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_changed_date_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12720,7 +12925,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_changed_author_set(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_client_status_t_changed_author_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12748,7 +12953,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_changed_author_get(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_changed_author_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12770,7 +12975,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_switched_set(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_status_t_switched_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12797,7 +13002,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_switched_get(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_switched_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12819,7 +13024,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_file_external_set(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_status_t_file_external_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12846,7 +13051,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_file_external_get(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_file_external_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12868,13 +13073,13 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_lock_set(PyObject *SWIGUNUSEDPARM
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_status_t_lock_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_lock_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_lock_t, svn_argnum_obj1);
+    arg2 = (svn_lock_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_lock_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12895,13 +13100,13 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_lock_get(PyObject *SWIGUNUSEDPARM
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_lock_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (svn_lock_t *) ((arg1)->lock);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_lock_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_lock_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -12917,7 +13122,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_changelist_set(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_client_status_t_changelist_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12945,7 +13150,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_changelist_get(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_changelist_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12967,7 +13172,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_depth_set(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_status_t_depth_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12994,7 +13199,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_depth_get(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_depth_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13016,7 +13221,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_ood_kind_set(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_status_t_ood_kind_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13043,7 +13248,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_ood_kind_get(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_ood_kind_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13065,7 +13270,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_repos_node_status_set(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_status_t_repos_node_status_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13092,7 +13297,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_repos_node_status_get(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_repos_node_status_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13114,7 +13319,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_repos_text_status_set(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_status_t_repos_text_status_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13141,7 +13346,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_repos_text_status_get(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_repos_text_status_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13163,7 +13368,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_repos_prop_status_set(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_status_t_repos_prop_status_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13190,7 +13395,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_repos_prop_status_get(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_repos_prop_status_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13212,13 +13417,13 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_repos_lock_set(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_status_t_repos_lock_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_lock_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_lock_t, svn_argnum_obj1);
+    arg2 = (svn_lock_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_lock_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13239,13 +13444,13 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_repos_lock_get(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_repos_lock_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (svn_lock_t *) ((arg1)->repos_lock);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_lock_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_lock_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -13262,7 +13467,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_ood_changed_rev_set(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_status_t_ood_changed_rev_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13289,7 +13494,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_ood_changed_rev_get(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_ood_changed_rev_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13311,7 +13516,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_ood_changed_date_set(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_status_t_ood_changed_date_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13333,7 +13538,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_ood_changed_date_get(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_ood_changed_date_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13354,7 +13559,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_ood_changed_author_set(PyObject *
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_client_status_t_ood_changed_author_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13382,7 +13587,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_ood_changed_author_get(PyObject *
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_ood_changed_author_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13404,7 +13609,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_backwards_compatibility_baton_set
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_status_t_backwards_compatibility_baton_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13433,7 +13638,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_backwards_compatibility_baton_get
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_backwards_compatibility_baton_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13458,7 +13663,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_backwards_compatibility_baton_get
         /* We don't know the type of this reference, so we'll have to
                * treat it as an opaque void pointer.
                */
-        resultobj = svn_swig_NewPointerObj(result, SWIGTYPE_p_void,
+        resultobj = svn_swig_py_new_pointer_obj(result, SWIGTYPE_p_void,
           _global_py_pool, args);
       }
     }
@@ -13478,7 +13683,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_moved_from_abspath_set(PyObject *
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_client_status_t_moved_from_abspath_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13506,7 +13711,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_moved_from_abspath_get(PyObject *
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_moved_from_abspath_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13527,7 +13732,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_moved_to_abspath_set(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_client_status_t_moved_to_abspath_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13555,7 +13760,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_t_moved_to_abspath_get(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_status_t_moved_to_abspath_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13581,7 +13786,7 @@ SWIGINTERN PyObject *_wrap_new_svn_client_status_t(PyObject *SWIGUNUSEDPARM(self
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_client_status_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_client_status_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -13596,7 +13801,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_client_status_t(PyObject *SWIGUNUSEDPARM(s
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_client_status_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13639,7 +13844,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_dup(PyObject *SWIGUNUSEDPARM(self),
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_client_status_dup",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_client_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
+    arg1 = (svn_client_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13660,7 +13865,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status_dup(PyObject *SWIGUNUSEDPARM(self),
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_client_status_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_client_status_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -13674,6 +13879,177 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_client_status6(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  svn_revnum_t *arg1 = (svn_revnum_t *) 0 ;
+  svn_client_ctx_t *arg2 = (svn_client_ctx_t *) 0 ;
+  char *arg3 = (char *) 0 ;
+  svn_opt_revision_t *arg4 = (svn_opt_revision_t *) 0 ;
+  svn_depth_t arg5 ;
+  svn_boolean_t arg6 ;
+  svn_boolean_t arg7 ;
+  svn_boolean_t arg8 ;
+  svn_boolean_t arg9 ;
+  svn_boolean_t arg10 ;
+  svn_boolean_t arg11 ;
+  apr_array_header_t *arg12 = (apr_array_header_t *) 0 ;
+  svn_client_status_func_t arg13 = (svn_client_status_func_t) 0 ;
+  void *arg14 = (void *) 0 ;
+  apr_pool_t *arg15 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  svn_revnum_t temp1 ;
+  int res1 = SWIG_TMPOBJ ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  PyObject * obj5 = 0 ;
+  PyObject * obj6 = 0 ;
+  PyObject * obj7 = 0 ;
+  PyObject * obj8 = 0 ;
+  PyObject * obj9 = 0 ;
+  PyObject * obj10 = 0 ;
+  PyObject * obj11 = 0 ;
+  PyObject * obj12 = 0 ;
+  PyObject * obj13 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg15 = _global_pool;
+  arg1 = &temp1;
+  if (!PyArg_ParseTuple(args,(char *)"OsOOOOOOOOOOO|O:svn_client_status6",&obj0,&arg3,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13)) SWIG_fail;
+  {
+    arg2 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg4 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg5 = (svn_depth_t)SWIG_As_long (obj3);
+    if (SWIG_arg_fail(svn_argnum_obj3)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg6 = (svn_boolean_t)SWIG_As_long (obj4);
+    if (SWIG_arg_fail(svn_argnum_obj4)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg7 = (svn_boolean_t)SWIG_As_long (obj5);
+    if (SWIG_arg_fail(svn_argnum_obj5)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg8 = (svn_boolean_t)SWIG_As_long (obj6);
+    if (SWIG_arg_fail(svn_argnum_obj6)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg9 = (svn_boolean_t)SWIG_As_long (obj7);
+    if (SWIG_arg_fail(svn_argnum_obj7)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg10 = (svn_boolean_t)SWIG_As_long (obj8);
+    if (SWIG_arg_fail(svn_argnum_obj8)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg11 = (svn_boolean_t)SWIG_As_long (obj9);
+    if (SWIG_arg_fail(svn_argnum_obj9)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg12 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj10,
+      sizeof(const char *),
+      svn_swig_py_unwrap_string,
+      NULL,
+      _global_pool);
+    if (PyErr_Occurred())
+    SWIG_fail;
+  }
+  {
+    svn_client_status_func_t * tmp =
+    svn_swig_py_must_get_ptr(obj11, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj11);
+    if (tmp == NULL || PyErr_Occurred()) {
+      SWIG_fail;
+    }
+    arg13 = *tmp;
+  }
+  {
+    if (obj12 == Py_None) {
+      arg14 = NULL;
+    } else if (SWIG_ConvertPtr(obj12, (void **) &arg14, 0, 0) == -1) {
+      arg14 = (void *) obj12;
+      PyErr_Clear();
+    }
+  }
+  if (obj13) {
+    /* Verify that the user supplied a valid pool */
+    if (obj13 != Py_None && obj13 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj13);
+      SWIG_arg_fail(svn_argnum_obj13);
+      SWIG_fail;
+    }
+  }
+  {
+    if (!arg4) {
+      SWIG_exception(SWIG_ValueError,"Received a NULL pointer.");
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_client_status6(arg1,arg2,(char const *)arg3,(struct svn_opt_revision_t const *)arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11,(apr_array_header_t const *)arg12,arg13,arg14,arg15);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  if (SWIG_IsTmpObj(res1)) {
+    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_From_long((*arg1)));
+  } else {
+    int new_flags = SWIG_IsNewObj(res1) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
+    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg1), SWIGTYPE_p_long, new_flags));
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_svn_client_status5(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   svn_revnum_t *arg1 = (svn_revnum_t *) 0 ;
@@ -13715,13 +14091,13 @@ SWIGINTERN PyObject *_wrap_svn_client_status5(PyObject *SWIGUNUSEDPARM(self), Py
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OsOOOOOOOOOO|O:svn_client_status5",&obj0,&arg3,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12)) SWIG_fail;
   {
-    arg2 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
+    arg2 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg4 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13773,7 +14149,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status5(PyObject *SWIGUNUSEDPARM(self), Py
   }
   {
     svn_client_status_func_t * tmp =
-    svn_swig_MustGetPtr(obj10, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj10);
+    svn_swig_py_must_get_ptr(obj10, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj10);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13876,14 +14252,14 @@ SWIGINTERN PyObject *_wrap_svn_client_status4(PyObject *SWIGUNUSEDPARM(self), Py
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"sOOOOOOOOOO|O:svn_client_status4",&arg2,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11)) SWIG_fail;
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
     svn_wc_status_func3_t * tmp =
-    svn_swig_MustGetPtr(obj2, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj2);
+    svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj2);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13937,7 +14313,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status4(PyObject *SWIGUNUSEDPARM(self), Py
     SWIG_fail;
   }
   {
-    arg12 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj10, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj10);
+    arg12 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj10, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj10);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14030,13 +14406,13 @@ SWIGINTERN PyObject *_wrap_svn_client_status3(PyObject *SWIGUNUSEDPARM(self), Py
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"sOOOOOOOOO|O:svn_client_status3",&arg2,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = svn_swig_py_status_func2;
+    arg4 = (svn_wc_status_func2_t) svn_swig_py_status_func2;
     arg5 = obj2;
   }
   {
@@ -14079,7 +14455,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status3(PyObject *SWIGUNUSEDPARM(self), Py
     SWIG_fail;
   }
   {
-    arg12 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj9, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj9);
+    arg12 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj9, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj9);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14170,13 +14546,13 @@ SWIGINTERN PyObject *_wrap_svn_client_status2(PyObject *SWIGUNUSEDPARM(self), Py
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"sOOOOOOOO|O:svn_client_status2",&arg2,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = svn_swig_py_status_func2;
+    arg4 = (svn_wc_status_func2_t) svn_swig_py_status_func2;
     arg5 = obj2;
   }
   {
@@ -14210,7 +14586,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status2(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
-    arg11 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj8, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj8);
+    arg11 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj8, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj8);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14299,13 +14675,13 @@ SWIGINTERN PyObject *_wrap_svn_client_status(PyObject *SWIGUNUSEDPARM(self), PyO
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"sOOOOOOO|O:svn_client_status",&arg2,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = svn_swig_py_status_func;
+    arg4 = (svn_wc_status_func_t) svn_swig_py_status_func;
     arg5 = obj2;
   }
   {
@@ -14333,7 +14709,7 @@ SWIGINTERN PyObject *_wrap_svn_client_status(PyObject *SWIGUNUSEDPARM(self), PyO
     }
   }
   {
-    arg10 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj7, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj7);
+    arg10 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj7, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj7);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14427,7 +14803,7 @@ SWIGINTERN PyObject *_wrap_svn_client_log5(PyObject *SWIGUNUSEDPARM(self), PyObj
     SWIG_fail;
   }
   {
-    arg2 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg2 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14476,11 +14852,11 @@ SWIGINTERN PyObject *_wrap_svn_client_log5(PyObject *SWIGUNUSEDPARM(self), PyObj
     SWIG_fail;
   }
   {
-    arg9 = svn_swig_py_log_entry_receiver;
+    arg9 = (svn_log_entry_receiver_t) svn_swig_py_log_entry_receiver;
     arg10 = obj8;
   }
   {
-    arg11 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj9, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj9);
+    arg11 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj9, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj9);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14575,19 +14951,19 @@ SWIGINTERN PyObject *_wrap_svn_client_log4(PyObject *SWIGUNUSEDPARM(self), PyObj
     SWIG_fail;
   }
   {
-    arg2 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg2 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
+    arg4 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14626,11 +15002,11 @@ SWIGINTERN PyObject *_wrap_svn_client_log4(PyObject *SWIGUNUSEDPARM(self), PyObj
     SWIG_fail;
   }
   {
-    arg10 = svn_swig_py_log_entry_receiver;
+    arg10 = (svn_log_entry_receiver_t) svn_swig_py_log_entry_receiver;
     arg11 = obj9;
   }
   {
-    arg12 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj10, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj10);
+    arg12 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj10, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj10);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14721,19 +15097,19 @@ SWIGINTERN PyObject *_wrap_svn_client_log3(PyObject *SWIGUNUSEDPARM(self), PyObj
     SWIG_fail;
   }
   {
-    arg2 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg2 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
+    arg4 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14757,11 +15133,11 @@ SWIGINTERN PyObject *_wrap_svn_client_log3(PyObject *SWIGUNUSEDPARM(self), PyObj
     }
   }
   {
-    arg8 = svn_swig_py_log_receiver;
+    arg8 = (svn_log_message_receiver_t) svn_swig_py_log_receiver;
     arg9 = obj7;
   }
   {
-    arg10 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj8, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj8);
+    arg10 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj8, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj8);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14850,13 +15226,13 @@ SWIGINTERN PyObject *_wrap_svn_client_log2(PyObject *SWIGUNUSEDPARM(self), PyObj
     SWIG_fail;
   }
   {
-    arg2 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg2 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14880,11 +15256,11 @@ SWIGINTERN PyObject *_wrap_svn_client_log2(PyObject *SWIGUNUSEDPARM(self), PyObj
     }
   }
   {
-    arg7 = svn_swig_py_log_receiver;
+    arg7 = (svn_log_message_receiver_t) svn_swig_py_log_receiver;
     arg8 = obj6;
   }
   {
-    arg9 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj7, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj7);
+    arg9 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj7, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj7);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14966,13 +15342,13 @@ SWIGINTERN PyObject *_wrap_svn_client_log(PyObject *SWIGUNUSEDPARM(self), PyObje
     SWIG_fail;
   }
   {
-    arg2 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg2 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14990,11 +15366,11 @@ SWIGINTERN PyObject *_wrap_svn_client_log(PyObject *SWIGUNUSEDPARM(self), PyObje
     }
   }
   {
-    arg6 = svn_swig_py_log_receiver;
+    arg6 = (svn_log_message_receiver_t) svn_swig_py_log_receiver;
     arg7 = obj5;
   }
   {
-    arg8 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj6, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj6);
+    arg8 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj6, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj6);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15071,25 +15447,25 @@ SWIGINTERN PyObject *_wrap_svn_client_blame5(PyObject *SWIGUNUSEDPARM(self), PyO
   arg11 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOOOOOOOOO|O:svn_client_blame5",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
   {
-    arg2 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg2 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
+    arg4 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg5 = (svn_diff_file_options_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj4);
+    arg5 = (svn_diff_file_options_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15108,7 +15484,7 @@ SWIGINTERN PyObject *_wrap_svn_client_blame5(PyObject *SWIGUNUSEDPARM(self), PyO
   }
   {
     svn_client_blame_receiver3_t * tmp =
-    svn_swig_MustGetPtr(obj7, SWIGTYPE_p_p_f_p_void_svn_revnum_t_svn_revnum_t_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj7);
+    svn_swig_py_must_get_ptr(obj7, SWIGTYPE_p_p_f_p_void_svn_revnum_t_svn_revnum_t_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj7);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15123,7 +15499,7 @@ SWIGINTERN PyObject *_wrap_svn_client_blame5(PyObject *SWIGUNUSEDPARM(self), PyO
     }
   }
   {
-    arg10 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj9, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj9);
+    arg10 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj9, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj9);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15205,25 +15581,25 @@ SWIGINTERN PyObject *_wrap_svn_client_blame4(PyObject *SWIGUNUSEDPARM(self), PyO
   arg11 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOOOOOOOOO|O:svn_client_blame4",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
   {
-    arg2 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg2 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
+    arg4 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg5 = (svn_diff_file_options_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj4);
+    arg5 = (svn_diff_file_options_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15242,7 +15618,7 @@ SWIGINTERN PyObject *_wrap_svn_client_blame4(PyObject *SWIGUNUSEDPARM(self), PyO
   }
   {
     svn_client_blame_receiver2_t * tmp =
-    svn_swig_MustGetPtr(obj7, SWIGTYPE_p_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, svn_argnum_obj7);
+    svn_swig_py_must_get_ptr(obj7, SWIGTYPE_p_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, svn_argnum_obj7);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15257,7 +15633,7 @@ SWIGINTERN PyObject *_wrap_svn_client_blame4(PyObject *SWIGUNUSEDPARM(self), PyO
     }
   }
   {
-    arg10 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj9, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj9);
+    arg10 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj9, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj9);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15336,25 +15712,25 @@ SWIGINTERN PyObject *_wrap_svn_client_blame3(PyObject *SWIGUNUSEDPARM(self), PyO
   arg10 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOOOOOOO|O:svn_client_blame3",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   {
-    arg2 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg2 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
+    arg4 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg5 = (svn_diff_file_options_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj4);
+    arg5 = (svn_diff_file_options_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15366,11 +15742,11 @@ SWIGINTERN PyObject *_wrap_svn_client_blame3(PyObject *SWIGUNUSEDPARM(self), PyO
     }
   }
   {
-    arg7 = svn_swig_py_client_blame_receiver_func;
+    arg7 = (svn_client_blame_receiver_t) svn_swig_py_client_blame_receiver_func;
     arg8 = obj6;
   }
   {
-    arg9 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj7, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj7);
+    arg9 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj7, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj7);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15445,29 +15821,29 @@ SWIGINTERN PyObject *_wrap_svn_client_blame2(PyObject *SWIGUNUSEDPARM(self), PyO
   arg8 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOOOOO|O:svn_client_blame2",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
-    arg2 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg2 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
+    arg4 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg5 = svn_swig_py_client_blame_receiver_func;
+    arg5 = (svn_client_blame_receiver_t) svn_swig_py_client_blame_receiver_func;
     arg6 = obj4;
   }
   {
-    arg7 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj5, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj5);
+    arg7 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj5, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj5);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15540,23 +15916,23 @@ SWIGINTERN PyObject *_wrap_svn_client_blame(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg7 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOOOO|O:svn_client_blame",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
-    arg2 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg2 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = svn_swig_py_client_blame_receiver_func;
+    arg4 = (svn_client_blame_receiver_t) svn_swig_py_client_blame_receiver_func;
     arg5 = obj3;
   }
   {
-    arg6 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj4);
+    arg6 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15659,13 +16035,13 @@ SWIGINTERN PyObject *_wrap_svn_client_diff6(PyObject *SWIGUNUSEDPARM(self), PyOb
     SWIG_fail;
   }
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg5 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj4);
+    arg5 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15740,7 +16116,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff6(PyObject *SWIGUNUSEDPARM(self), PyOb
     SWIG_fail;
   }
   {
-    arg20 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj19, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj19);
+    arg20 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj19, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj19);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15837,13 +16213,13 @@ SWIGINTERN PyObject *_wrap_svn_client_diff5(PyObject *SWIGUNUSEDPARM(self), PyOb
     SWIG_fail;
   }
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg5 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj4);
+    arg5 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15902,7 +16278,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff5(PyObject *SWIGUNUSEDPARM(self), PyOb
     SWIG_fail;
   }
   {
-    arg17 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj16, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj16);
+    arg17 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj16, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj16);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15995,13 +16371,13 @@ SWIGINTERN PyObject *_wrap_svn_client_diff4(PyObject *SWIGUNUSEDPARM(self), PyOb
     SWIG_fail;
   }
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg5 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj4);
+    arg5 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16048,7 +16424,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff4(PyObject *SWIGUNUSEDPARM(self), PyOb
     SWIG_fail;
   }
   {
-    arg15 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj14, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj14);
+    arg15 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj14, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj14);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16138,13 +16514,13 @@ SWIGINTERN PyObject *_wrap_svn_client_diff3(PyObject *SWIGUNUSEDPARM(self), PyOb
     SWIG_fail;
   }
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg5 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj4);
+    arg5 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16182,7 +16558,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff3(PyObject *SWIGUNUSEDPARM(self), PyOb
     if (!arg12) SWIG_fail;
   }
   {
-    arg13 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj12, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj12);
+    arg13 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj12, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj12);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16271,13 +16647,13 @@ SWIGINTERN PyObject *_wrap_svn_client_diff2(PyObject *SWIGUNUSEDPARM(self), PyOb
     SWIG_fail;
   }
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg5 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj4);
+    arg5 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16315,7 +16691,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff2(PyObject *SWIGUNUSEDPARM(self), PyOb
     if (!arg11) SWIG_fail;
   }
   {
-    arg12 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj11, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj11);
+    arg12 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj11, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj11);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16402,13 +16778,13 @@ SWIGINTERN PyObject *_wrap_svn_client_diff(PyObject *SWIGUNUSEDPARM(self), PyObj
     SWIG_fail;
   }
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg5 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj4);
+    arg5 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16440,7 +16816,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff(PyObject *SWIGUNUSEDPARM(self), PyObj
     if (!arg10) SWIG_fail;
   }
   {
-    arg11 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj10, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj10);
+    arg11 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj10, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj10);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16544,19 +16920,19 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_peg6(PyObject *SWIGUNUSEDPARM(self),
     SWIG_fail;
   }
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
+    arg4 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg5 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj4);
+    arg5 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16631,7 +17007,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_peg6(PyObject *SWIGUNUSEDPARM(self),
     SWIG_fail;
   }
   {
-    arg20 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj19, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj19);
+    arg20 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj19, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj19);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16734,19 +17110,19 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_peg5(PyObject *SWIGUNUSEDPARM(self),
     SWIG_fail;
   }
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
+    arg4 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg5 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj4);
+    arg5 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16805,7 +17181,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_peg5(PyObject *SWIGUNUSEDPARM(self),
     SWIG_fail;
   }
   {
-    arg17 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj16, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj16);
+    arg17 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj16, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj16);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16904,19 +17280,19 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_peg4(PyObject *SWIGUNUSEDPARM(self),
     SWIG_fail;
   }
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
+    arg4 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg5 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj4);
+    arg5 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16963,7 +17339,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_peg4(PyObject *SWIGUNUSEDPARM(self),
     SWIG_fail;
   }
   {
-    arg15 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj14, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj14);
+    arg15 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj14, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj14);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17059,19 +17435,19 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_peg3(PyObject *SWIGUNUSEDPARM(self),
     SWIG_fail;
   }
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
+    arg4 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg5 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj4);
+    arg5 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17109,7 +17485,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_peg3(PyObject *SWIGUNUSEDPARM(self),
     if (!arg12) SWIG_fail;
   }
   {
-    arg13 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj12, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj12);
+    arg13 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj12, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj12);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17204,19 +17580,19 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_peg2(PyObject *SWIGUNUSEDPARM(self),
     SWIG_fail;
   }
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
+    arg4 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg5 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj4);
+    arg5 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17254,7 +17630,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_peg2(PyObject *SWIGUNUSEDPARM(self),
     if (!arg11) SWIG_fail;
   }
   {
-    arg12 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj11, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj11);
+    arg12 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj11, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj11);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17347,19 +17723,19 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_peg(PyObject *SWIGUNUSEDPARM(self), P
     SWIG_fail;
   }
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
+    arg4 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg5 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj4);
+    arg5 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17391,7 +17767,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_peg(PyObject *SWIGUNUSEDPARM(self), P
     if (!arg10) SWIG_fail;
   }
   {
-    arg11 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj10, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj10);
+    arg11 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj10, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj10);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17472,13 +17848,13 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_summarize2(PyObject *SWIGUNUSEDPARM(s
   arg11 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOsOOOOOOO|O:svn_client_diff_summarize2",&arg1,&obj1,&arg3,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
   {
-    arg2 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg2 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
+    arg4 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17506,7 +17882,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_summarize2(PyObject *SWIGUNUSEDPARM(s
   }
   {
     svn_client_diff_summarize_func_t * tmp =
-    svn_swig_MustGetPtr(obj7, SWIGTYPE_p_p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj7);
+    svn_swig_py_must_get_ptr(obj7, SWIGTYPE_p_p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj7);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17521,7 +17897,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_summarize2(PyObject *SWIGUNUSEDPARM(s
     }
   }
   {
-    arg10 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj9, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj9);
+    arg10 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj9, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj9);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17595,13 +17971,13 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_summarize(PyObject *SWIGUNUSEDPARM(se
   arg10 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOsOOOOOO|O:svn_client_diff_summarize",&arg1,&obj1,&arg3,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   {
-    arg2 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg2 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
+    arg4 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17620,7 +17996,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_summarize(PyObject *SWIGUNUSEDPARM(se
   }
   {
     svn_client_diff_summarize_func_t * tmp =
-    svn_swig_MustGetPtr(obj6, SWIGTYPE_p_p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj6);
+    svn_swig_py_must_get_ptr(obj6, SWIGTYPE_p_p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj6);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17635,7 +18011,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_summarize(PyObject *SWIGUNUSEDPARM(se
     }
   }
   {
-    arg9 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj8, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj8);
+    arg9 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj8, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj8);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17712,19 +18088,19 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_summarize_peg2(PyObject *SWIGUNUSEDPA
   arg11 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOOOOOOOOO|O:svn_client_diff_summarize_peg2",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
   {
-    arg2 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg2 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
+    arg4 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17752,7 +18128,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_summarize_peg2(PyObject *SWIGUNUSEDPA
   }
   {
     svn_client_diff_summarize_func_t * tmp =
-    svn_swig_MustGetPtr(obj7, SWIGTYPE_p_p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj7);
+    svn_swig_py_must_get_ptr(obj7, SWIGTYPE_p_p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj7);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17767,7 +18143,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_summarize_peg2(PyObject *SWIGUNUSEDPA
     }
   }
   {
-    arg10 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj9, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj9);
+    arg10 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj9, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj9);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17847,19 +18223,19 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_summarize_peg(PyObject *SWIGUNUSEDPAR
   arg10 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOOOOOOOO|O:svn_client_diff_summarize_peg",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   {
-    arg2 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg2 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
+    arg4 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17878,7 +18254,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_summarize_peg(PyObject *SWIGUNUSEDPAR
   }
   {
     svn_client_diff_summarize_func_t * tmp =
-    svn_swig_MustGetPtr(obj6, SWIGTYPE_p_p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj6);
+    svn_swig_py_must_get_ptr(obj6, SWIGTYPE_p_p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj6);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17893,7 +18269,7 @@ SWIGINTERN PyObject *_wrap_svn_client_diff_summarize_peg(PyObject *SWIGUNUSEDPAR
     }
   }
   {
-    arg9 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj8, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj8);
+    arg9 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj8, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj8);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18005,19 +18381,19 @@ SWIGINTERN PyObject *_wrap_svn_client_get_merging_summary(PyObject *SWIGUNUSEDPA
   arg10 = &temp10;
   if (!PyArg_ParseTuple(args,(char *)"sOsOO|OO:svn_client_get_merging_summary",&arg11,&obj1,&arg13,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
-    arg12 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg12 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg14 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
+    arg14 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg15 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj4);
+    arg15 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18209,13 +18585,13 @@ SWIGINTERN PyObject *_wrap_svn_client_merge5(PyObject *SWIGUNUSEDPARM(self), PyO
   arg15 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOsOsOOOOOOOOO|O:svn_client_merge5",&arg1,&obj1,&arg3,&obj3,&arg5,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13,&obj14)) SWIG_fail;
   {
-    arg2 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg2 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
+    arg4 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18263,13 +18639,13 @@ SWIGINTERN PyObject *_wrap_svn_client_merge5(PyObject *SWIGUNUSEDPARM(self), PyO
     }
   }
   {
-    arg13 = (apr_array_header_t *)svn_swig_MustGetPtr(obj12, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj12);
+    arg13 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj12, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj12);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg14 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj13, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj13);
+    arg14 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj13, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj13);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18350,13 +18726,13 @@ SWIGINTERN PyObject *_wrap_svn_client_merge4(PyObject *SWIGUNUSEDPARM(self), PyO
   arg14 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOsOsOOOOOOOO|O:svn_client_merge4",&arg1,&obj1,&arg3,&obj3,&arg5,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13)) SWIG_fail;
   {
-    arg2 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg2 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
+    arg4 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18398,13 +18774,13 @@ SWIGINTERN PyObject *_wrap_svn_client_merge4(PyObject *SWIGUNUSEDPARM(self), PyO
     }
   }
   {
-    arg12 = (apr_array_header_t *)svn_swig_MustGetPtr(obj11, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj11);
+    arg12 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj11, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj11);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg13 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj12, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj12);
+    arg13 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj12, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj12);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18483,13 +18859,13 @@ SWIGINTERN PyObject *_wrap_svn_client_merge3(PyObject *SWIGUNUSEDPARM(self), PyO
   arg13 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOsOsOOOOOOO|O:svn_client_merge3",&arg1,&obj1,&arg3,&obj3,&arg5,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12)) SWIG_fail;
   {
-    arg2 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg2 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
+    arg4 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18525,13 +18901,13 @@ SWIGINTERN PyObject *_wrap_svn_client_merge3(PyObject *SWIGUNUSEDPARM(self), PyO
     }
   }
   {
-    arg11 = (apr_array_header_t *)svn_swig_MustGetPtr(obj10, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj10);
+    arg11 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj10, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj10);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg12 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj11, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj11);
+    arg12 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj11, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj11);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18608,13 +18984,13 @@ SWIGINTERN PyObject *_wrap_svn_client_merge2(PyObject *SWIGUNUSEDPARM(self), PyO
   arg12 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOsOsOOOOOO|O:svn_client_merge2",&arg1,&obj1,&arg3,&obj3,&arg5,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11)) SWIG_fail;
   {
-    arg2 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg2 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
+    arg4 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18644,13 +19020,13 @@ SWIGINTERN PyObject *_wrap_svn_client_merge2(PyObject *SWIGUNUSEDPARM(self), PyO
     }
   }
   {
-    arg10 = (apr_array_header_t *)svn_swig_MustGetPtr(obj9, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj9);
+    arg10 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj9, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj9);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg11 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj10, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj10);
+    arg11 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj10, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj10);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18725,13 +19101,13 @@ SWIGINTERN PyObject *_wrap_svn_client_merge(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg11 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOsOsOOOOO|O:svn_client_merge",&arg1,&obj1,&arg3,&obj3,&arg5,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
   {
-    arg2 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg2 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
+    arg4 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18761,7 +19137,7 @@ SWIGINTERN PyObject *_wrap_svn_client_merge(PyObject *SWIGUNUSEDPARM(self), PyOb
     }
   }
   {
-    arg10 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj9, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj9);
+    arg10 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj9, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj9);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18829,7 +19205,7 @@ SWIGINTERN PyObject *_wrap_svn_client_merge_reintegrate(PyObject *SWIGUNUSEDPARM
   arg7 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOsOOO|O:svn_client_merge_reintegrate",&arg1,&obj1,&arg3,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
-    arg2 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg2 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18841,13 +19217,13 @@ SWIGINTERN PyObject *_wrap_svn_client_merge_reintegrate(PyObject *SWIGUNUSEDPARM
     }
   }
   {
-    arg5 = (apr_array_header_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj4);
+    arg5 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg6 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj5, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj5);
+    arg6 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj5, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj5);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18939,7 +19315,7 @@ SWIGINTERN PyObject *_wrap_svn_client_merge_peg5(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18987,13 +19363,13 @@ SWIGINTERN PyObject *_wrap_svn_client_merge_peg5(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
-    arg12 = (apr_array_header_t *)svn_swig_MustGetPtr(obj11, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj11);
+    arg12 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj11, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj11);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg13 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj12, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj12);
+    arg13 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj12, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj12);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -19083,7 +19459,7 @@ SWIGINTERN PyObject *_wrap_svn_client_merge_peg4(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -19125,13 +19501,13 @@ SWIGINTERN PyObject *_wrap_svn_client_merge_peg4(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
-    arg11 = (apr_array_header_t *)svn_swig_MustGetPtr(obj10, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj10);
+    arg11 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj10, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj10);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg12 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj11, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj11);
+    arg12 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj11, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj11);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -19219,7 +19595,7 @@ SWIGINTERN PyObject *_wrap_svn_client_merge_peg3(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -19255,13 +19631,13 @@ SWIGINTERN PyObject *_wrap_svn_client_merge_peg3(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
-    arg10 = (apr_array_header_t *)svn_swig_MustGetPtr(obj9, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj9);
+    arg10 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj9, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj9);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg11 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj10, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj10);
+    arg11 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj10, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj10);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -19344,19 +19720,19 @@ SWIGINTERN PyObject *_wrap_svn_client_merge_peg2(PyObject *SWIGUNUSEDPARM(self),
   arg12 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOOOsOOOOOO|O:svn_client_merge_peg2",&arg1,&obj1,&obj2,&obj3,&arg5,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11)) SWIG_fail;
   {
-    arg2 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg2 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
+    arg4 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -19386,13 +19762,13 @@ SWIGINTERN PyObject *_wrap_svn_client_merge_peg2(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
-    arg10 = (apr_array_header_t *)svn_swig_MustGetPtr(obj9, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj9);
+    arg10 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj9, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj9);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg11 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj10, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj10);
+    arg11 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj10, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj10);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -19473,19 +19849,19 @@ SWIGINTERN PyObject *_wrap_svn_client_merge_peg(PyObject *SWIGUNUSEDPARM(self),
   arg11 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOOOsOOOOO|O:svn_client_merge_peg",&arg1,&obj1,&obj2,&obj3,&arg5,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
   {
-    arg2 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg2 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
+    arg4 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -19515,7 +19891,7 @@ SWIGINTERN PyObject *_wrap_svn_client_merge_peg(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
-    arg10 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj9, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj9);
+    arg10 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj9, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj9);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -19586,13 +19962,13 @@ SWIGINTERN PyObject *_wrap_svn_client_suggest_merge_sources(PyObject *SWIGUNUSED
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"sOO|O:svn_client_suggest_merge_sources",&arg2,&obj1,&obj2,&obj3)) SWIG_fail;
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj2);
+    arg4 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -19666,13 +20042,13 @@ SWIGINTERN PyObject *_wrap_svn_client_mergeinfo_get_merged(PyObject *SWIGUNUSEDP
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"sOO|O:svn_client_mergeinfo_get_merged",&arg2,&obj1,&obj2,&obj3)) SWIG_fail;
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj2);
+    arg4 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -19775,31 +20151,31 @@ SWIGINTERN PyObject *_wrap_svn_client_mergeinfo_log2(PyObject *SWIGUNUSEDPARM(se
     }
   }
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg5 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj4);
+    arg5 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg6 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj5, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj5);
+    arg6 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj5, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj5);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg7 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj6, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj6);
+    arg7 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj6, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj6);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg8 = svn_swig_py_log_entry_receiver;
+    arg8 = (svn_log_entry_receiver_t) svn_swig_py_log_entry_receiver;
     arg9 = obj7;
   }
   {
@@ -19824,7 +20200,7 @@ SWIGINTERN PyObject *_wrap_svn_client_mergeinfo_log2(PyObject *SWIGUNUSEDPARM(se
     SWIG_fail;
   }
   {
-    arg13 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj11, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj11);
+    arg13 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj11, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj11);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -19907,19 +20283,19 @@ SWIGINTERN PyObject *_wrap_svn_client_mergeinfo_log(PyObject *SWIGUNUSEDPARM(sel
     }
   }
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg5 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj4);
+    arg5 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg6 = svn_swig_py_log_entry_receiver;
+    arg6 = (svn_log_entry_receiver_t) svn_swig_py_log_entry_receiver;
     arg7 = obj5;
   }
   {
@@ -19944,7 +20320,7 @@ SWIGINTERN PyObject *_wrap_svn_client_mergeinfo_log(PyObject *SWIGUNUSEDPARM(sel
     SWIG_fail;
   }
   {
-    arg11 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj9, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj9);
+    arg11 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj9, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj9);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -20017,19 +20393,19 @@ SWIGINTERN PyObject *_wrap_svn_client_mergeinfo_log_merged(PyObject *SWIGUNUSEDP
   arg10 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOsOOOOO|O:svn_client_mergeinfo_log_merged",&arg1,&obj1,&arg3,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   {
-    arg2 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg2 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
+    arg4 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg5 = svn_swig_py_log_entry_receiver;
+    arg5 = (svn_log_entry_receiver_t) svn_swig_py_log_entry_receiver;
     arg6 = obj4;
   }
   {
@@ -20048,7 +20424,7 @@ SWIGINTERN PyObject *_wrap_svn_client_mergeinfo_log_merged(PyObject *SWIGUNUSEDP
     SWIG_fail;
   }
   {
-    arg9 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj7, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj7);
+    arg9 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj7, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj7);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -20126,19 +20502,19 @@ SWIGINTERN PyObject *_wrap_svn_client_mergeinfo_log_eligible(PyObject *SWIGUNUSE
   arg10 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOsOOOOO|O:svn_client_mergeinfo_log_eligible",&arg1,&obj1,&arg3,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   {
-    arg2 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg2 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
+    arg4 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg5 = svn_swig_py_log_entry_receiver;
+    arg5 = (svn_log_entry_receiver_t) svn_swig_py_log_entry_receiver;
     arg6 = obj4;
   }
   {
@@ -20157,7 +20533,7 @@ SWIGINTERN PyObject *_wrap_svn_client_mergeinfo_log_eligible(PyObject *SWIGUNUSE
     SWIG_fail;
   }
   {
-    arg9 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj7, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj7);
+    arg9 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj7, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj7);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -20206,6 +20582,208 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_client_vacuum(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  char *arg1 = (char *) 0 ;
+  svn_boolean_t arg2 ;
+  svn_boolean_t arg3 ;
+  svn_boolean_t arg4 ;
+  svn_boolean_t arg5 ;
+  svn_boolean_t arg6 ;
+  svn_client_ctx_t *arg7 = (svn_client_ctx_t *) 0 ;
+  apr_pool_t *arg8 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  PyObject * obj5 = 0 ;
+  PyObject * obj6 = 0 ;
+  PyObject * obj7 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg8 = _global_pool;
+  if (!PyArg_ParseTuple(args,(char *)"sOOOOOO|O:svn_client_vacuum",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  {
+    arg2 = (svn_boolean_t)SWIG_As_long (obj1);
+    if (SWIG_arg_fail(svn_argnum_obj1)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg3 = (svn_boolean_t)SWIG_As_long (obj2);
+    if (SWIG_arg_fail(svn_argnum_obj2)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg4 = (svn_boolean_t)SWIG_As_long (obj3);
+    if (SWIG_arg_fail(svn_argnum_obj3)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg5 = (svn_boolean_t)SWIG_As_long (obj4);
+    if (SWIG_arg_fail(svn_argnum_obj4)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg6 = (svn_boolean_t)SWIG_As_long (obj5);
+    if (SWIG_arg_fail(svn_argnum_obj5)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg7 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj6, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj6);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  if (obj7) {
+    /* Verify that the user supplied a valid pool */
+    if (obj7 != Py_None && obj7 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj7);
+      SWIG_arg_fail(svn_argnum_obj7);
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_client_vacuum((char const *)arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_svn_client_cleanup2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  char *arg1 = (char *) 0 ;
+  svn_boolean_t arg2 ;
+  svn_boolean_t arg3 ;
+  svn_boolean_t arg4 ;
+  svn_boolean_t arg5 ;
+  svn_boolean_t arg6 ;
+  svn_client_ctx_t *arg7 = (svn_client_ctx_t *) 0 ;
+  apr_pool_t *arg8 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  PyObject * obj5 = 0 ;
+  PyObject * obj6 = 0 ;
+  PyObject * obj7 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg8 = _global_pool;
+  if (!PyArg_ParseTuple(args,(char *)"sOOOOOO|O:svn_client_cleanup2",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  {
+    arg2 = (svn_boolean_t)SWIG_As_long (obj1);
+    if (SWIG_arg_fail(svn_argnum_obj1)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg3 = (svn_boolean_t)SWIG_As_long (obj2);
+    if (SWIG_arg_fail(svn_argnum_obj2)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg4 = (svn_boolean_t)SWIG_As_long (obj3);
+    if (SWIG_arg_fail(svn_argnum_obj3)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg5 = (svn_boolean_t)SWIG_As_long (obj4);
+    if (SWIG_arg_fail(svn_argnum_obj4)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg6 = (svn_boolean_t)SWIG_As_long (obj5);
+    if (SWIG_arg_fail(svn_argnum_obj5)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg7 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj6, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj6);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  if (obj7) {
+    /* Verify that the user supplied a valid pool */
+    if (obj7 != Py_None && obj7 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj7);
+      SWIG_arg_fail(svn_argnum_obj7);
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_client_cleanup2((char const *)arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_svn_client_cleanup(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
@@ -20223,7 +20801,7 @@ SWIGINTERN PyObject *_wrap_svn_client_cleanup(PyObject *SWIGUNUSEDPARM(self), Py
   arg3 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_client_cleanup",&arg1,&obj1,&obj2)) SWIG_fail;
   {
-    arg2 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj1);
+    arg2 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -20284,7 +20862,7 @@ SWIGINTERN PyObject *_wrap_svn_client_upgrade(PyObject *SWIGUNUSEDPARM(self), Py
   arg3 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_client_upgrade",&arg1,&obj1,&obj2)) SWIG_fail;
   {
-    arg2 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj1);
+    arg2 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -20355,7 +20933,7 @@ SWIGINTERN PyObject *_wrap_svn_client_relocate2(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
-    arg5 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj4);
+    arg5 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -20426,7 +21004,7 @@ SWIGINTERN PyObject *_wrap_svn_client_relocate(PyObject *SWIGUNUSEDPARM(self), P
     }
   }
   {
-    arg5 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj4);
+    arg5 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -20470,6 +21048,112 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_client_revert3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  apr_array_header_t *arg1 = (apr_array_header_t *) 0 ;
+  svn_depth_t arg2 ;
+  apr_array_header_t *arg3 = (apr_array_header_t *) 0 ;
+  svn_boolean_t arg4 ;
+  svn_boolean_t arg5 ;
+  svn_client_ctx_t *arg6 = (svn_client_ctx_t *) 0 ;
+  apr_pool_t *arg7 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  PyObject * obj5 = 0 ;
+  PyObject * obj6 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg7 = _global_pool;
+  if (!PyArg_ParseTuple(args,(char *)"OOOOOO|O:svn_client_revert3",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  {
+    arg1 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj0,
+      sizeof(const char *),
+      svn_swig_py_unwrap_string,
+      NULL,
+      _global_pool);
+    if (PyErr_Occurred())
+    SWIG_fail;
+  }
+  {
+    arg2 = (svn_depth_t)SWIG_As_long (obj1);
+    if (SWIG_arg_fail(svn_argnum_obj1)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg3 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj2,
+      sizeof(const char *),
+      svn_swig_py_unwrap_string,
+      NULL,
+      _global_pool);
+    if (PyErr_Occurred())
+    SWIG_fail;
+  }
+  {
+    arg4 = (svn_boolean_t)SWIG_As_long (obj3);
+    if (SWIG_arg_fail(svn_argnum_obj3)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg5 = (svn_boolean_t)SWIG_As_long (obj4);
+    if (SWIG_arg_fail(svn_argnum_obj4)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg6 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj5, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj5);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  if (obj6) {
+    /* Verify that the user supplied a valid pool */
+    if (obj6 != Py_None && obj6 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj6);
+      SWIG_arg_fail(svn_argnum_obj6);
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_client_revert3((apr_array_header_t const *)arg1,arg2,(apr_array_header_t const *)arg3,arg4,arg5,arg6,arg7);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_svn_client_revert2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   apr_array_header_t *arg1 = (apr_array_header_t *) 0 ;
@@ -20516,7 +21200,7 @@ SWIGINTERN PyObject *_wrap_svn_client_revert2(PyObject *SWIGUNUSEDPARM(self), Py
     SWIG_fail;
   }
   {
-    arg4 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj3);
+    arg4 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -20595,7 +21279,7 @@ SWIGINTERN PyObject *_wrap_svn_client_revert(PyObject *SWIGUNUSEDPARM(self), PyO
     }
   }
   {
-    arg3 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj2);
+    arg3 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -20664,7 +21348,7 @@ SWIGINTERN PyObject *_wrap_svn_client_resolved(PyObject *SWIGUNUSEDPARM(self), P
     }
   }
   {
-    arg3 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj2);
+    arg3 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -20741,7 +21425,7 @@ SWIGINTERN PyObject *_wrap_svn_client_resolve(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
-    arg4 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj3);
+    arg4 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -20793,7 +21477,7 @@ SWIGINTERN PyObject *_wrap_svn_client_copy_source_t_path_set(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_client_copy_source_t_path_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_client_copy_source_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_copy_source_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_copy_source_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_copy_source_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -20821,7 +21505,7 @@ SWIGINTERN PyObject *_wrap_svn_client_copy_source_t_path_get(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_copy_source_t_path_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_copy_source_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_copy_source_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_copy_source_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_copy_source_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -20843,13 +21527,13 @@ SWIGINTERN PyObject *_wrap_svn_client_copy_source_t_revision_set(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_copy_source_t_revision_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_copy_source_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_copy_source_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_copy_source_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_copy_source_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg2 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -20875,13 +21559,13 @@ SWIGINTERN PyObject *_wrap_svn_client_copy_source_t_revision_get(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_copy_source_t_revision_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_copy_source_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_copy_source_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_copy_source_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_copy_source_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (svn_opt_revision_t *) ((arg1)->revision);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_opt_revision_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_opt_revision_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -20898,13 +21582,13 @@ SWIGINTERN PyObject *_wrap_svn_client_copy_source_t_peg_revision_set(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_copy_source_t_peg_revision_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_copy_source_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_copy_source_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_copy_source_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_copy_source_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg2 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -20930,13 +21614,13 @@ SWIGINTERN PyObject *_wrap_svn_client_copy_source_t_peg_revision_get(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_copy_source_t_peg_revision_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_copy_source_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_copy_source_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_copy_source_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_copy_source_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (svn_opt_revision_t *) ((arg1)->peg_revision);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_opt_revision_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_opt_revision_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -20957,7 +21641,7 @@ SWIGINTERN PyObject *_wrap_new_svn_client_copy_source_t(PyObject *SWIGUNUSEDPARM
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_client_copy_source_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_client_copy_source_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -20972,7 +21656,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_client_copy_source_t(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_client_copy_source_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_copy_source_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_copy_source_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_copy_source_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_copy_source_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -20999,6 +21683,145 @@ SWIGINTERN PyObject *svn_client_copy_source_t_swigregister(PyObject *SWIGUNUSEDP
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *_wrap_svn_client_copy7(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  apr_array_header_t *arg1 = (apr_array_header_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  svn_boolean_t arg3 ;
+  svn_boolean_t arg4 ;
+  svn_boolean_t arg5 ;
+  svn_boolean_t arg6 ;
+  svn_boolean_t arg7 ;
+  apr_hash_t *arg8 = (apr_hash_t *) 0 ;
+  apr_hash_t *arg9 = (apr_hash_t *) 0 ;
+  svn_commit_callback2_t arg10 = (svn_commit_callback2_t) 0 ;
+  void *arg11 = (void *) 0 ;
+  svn_client_ctx_t *arg12 = (svn_client_ctx_t *) 0 ;
+  apr_pool_t *arg13 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  PyObject * obj5 = 0 ;
+  PyObject * obj6 = 0 ;
+  PyObject * obj7 = 0 ;
+  PyObject * obj8 = 0 ;
+  PyObject * obj9 = 0 ;
+  PyObject * obj10 = 0 ;
+  PyObject * obj11 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg13 = _global_pool;
+  if (!PyArg_ParseTuple(args,(char *)"OsOOOOOOOOO|O:svn_client_copy7",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11)) SWIG_fail;
+  {
+    arg1 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg3 = (svn_boolean_t)SWIG_As_long (obj2);
+    if (SWIG_arg_fail(svn_argnum_obj2)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg4 = (svn_boolean_t)SWIG_As_long (obj3);
+    if (SWIG_arg_fail(svn_argnum_obj3)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg5 = (svn_boolean_t)SWIG_As_long (obj4);
+    if (SWIG_arg_fail(svn_argnum_obj4)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg6 = (svn_boolean_t)SWIG_As_long (obj5);
+    if (SWIG_arg_fail(svn_argnum_obj5)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg7 = (svn_boolean_t)SWIG_As_long (obj6);
+    if (SWIG_arg_fail(svn_argnum_obj6)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg8 = (apr_hash_t *)svn_swig_py_must_get_ptr(obj7, SWIGTYPE_p_apr_hash_t, svn_argnum_obj7);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    if (_global_pool == NULL)
+    {
+      if (svn_swig_py_get_parent_pool(args, SWIGTYPE_p_apr_pool_t,
+          &_global_py_pool, &_global_pool))
+      SWIG_fail;
+    }
+    
+    arg9 = svn_swig_py_prophash_from_dict(obj8, _global_pool);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg10 = svn_swig_py_commit_callback2;
+    arg11 = (void *)obj9;
+  }
+  {
+    arg12 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj10, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj10);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  if (obj11) {
+    /* Verify that the user supplied a valid pool */
+    if (obj11 != Py_None && obj11 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj11);
+      SWIG_arg_fail(svn_argnum_obj11);
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_client_copy7((apr_array_header_t const *)arg1,(char const *)arg2,arg3,arg4,arg5,arg6,arg7,(apr_hash_t const *)arg8,(apr_hash_t const *)arg9,arg10,arg11,arg12,arg13);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_svn_client_copy6(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   apr_array_header_t *arg1 = (apr_array_header_t *) 0 ;
@@ -21029,7 +21852,7 @@ SWIGINTERN PyObject *_wrap_svn_client_copy6(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg10 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OsOOOOOO|O:svn_client_copy6",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   {
-    arg1 = (apr_array_header_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj0);
+    arg1 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -21070,7 +21893,7 @@ SWIGINTERN PyObject *_wrap_svn_client_copy6(PyObject *SWIGUNUSEDPARM(self), PyOb
     arg8 = (void *)obj6;
   }
   {
-    arg9 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj7, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj7);
+    arg9 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj7, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj7);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -21144,7 +21967,7 @@ SWIGINTERN PyObject *_wrap_svn_client_copy5(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OsOOOOO|O:svn_client_copy5",&obj0,&arg3,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
-    arg2 = (apr_array_header_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj0);
+    arg2 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -21181,7 +22004,7 @@ SWIGINTERN PyObject *_wrap_svn_client_copy5(PyObject *SWIGUNUSEDPARM(self), PyOb
     }
   }
   {
-    arg8 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj6, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj6);
+    arg8 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj6, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj6);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -21214,7 +22037,7 @@ SWIGINTERN PyObject *_wrap_svn_client_copy5(PyObject *SWIGUNUSEDPARM(self), PyOb
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_commit_info_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_commit_info_t,
         _global_py_pool, args))
     
     ;
@@ -21259,7 +22082,7 @@ SWIGINTERN PyObject *_wrap_svn_client_copy4(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OsOOOO|O:svn_client_copy4",&obj0,&arg3,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
-    arg2 = (apr_array_header_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj0);
+    arg2 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -21290,7 +22113,7 @@ SWIGINTERN PyObject *_wrap_svn_client_copy4(PyObject *SWIGUNUSEDPARM(self), PyOb
     }
   }
   {
-    arg7 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj5, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj5);
+    arg7 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj5, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj5);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -21323,7 +22146,7 @@ SWIGINTERN PyObject *_wrap_svn_client_copy4(PyObject *SWIGUNUSEDPARM(self), PyOb
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_commit_info_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_commit_info_t,
         _global_py_pool, args))
     
     ;
@@ -21363,13 +22186,13 @@ SWIGINTERN PyObject *_wrap_svn_client_copy3(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"sOsO|O:svn_client_copy3",&arg2,&obj1,&arg4,&obj3,&obj4)) SWIG_fail;
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg5 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj3);
+    arg5 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -21402,7 +22225,7 @@ SWIGINTERN PyObject *_wrap_svn_client_copy3(PyObject *SWIGUNUSEDPARM(self), PyOb
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_commit_info_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_commit_info_t,
         _global_py_pool, args))
     
     ;
@@ -21442,13 +22265,13 @@ SWIGINTERN PyObject *_wrap_svn_client_copy2(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"sOsO|O:svn_client_copy2",&arg2,&obj1,&arg4,&obj3,&obj4)) SWIG_fail;
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg5 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj3);
+    arg5 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -21481,7 +22304,7 @@ SWIGINTERN PyObject *_wrap_svn_client_copy2(PyObject *SWIGUNUSEDPARM(self), PyOb
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_commit_info_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_commit_info_t,
         _global_py_pool, args))
     
     ;
@@ -21521,13 +22344,13 @@ SWIGINTERN PyObject *_wrap_svn_client_copy(PyObject *SWIGUNUSEDPARM(self), PyObj
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"sOsO|O:svn_client_copy",&arg2,&obj1,&arg4,&obj3,&obj4)) SWIG_fail;
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg5 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj3);
+    arg5 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -21560,7 +22383,7 @@ SWIGINTERN PyObject *_wrap_svn_client_copy(PyObject *SWIGUNUSEDPARM(self), PyObj
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_client_commit_info_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_client_commit_info_t,
         _global_py_pool, args))
     
     ;
@@ -21659,7 +22482,7 @@ SWIGINTERN PyObject *_wrap_svn_client_move7(PyObject *SWIGUNUSEDPARM(self), PyOb
     arg9 = (void *)obj7;
   }
   {
-    arg10 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj8, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj8);
+    arg10 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj8, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj8);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -21769,7 +22592,7 @@ SWIGINTERN PyObject *_wrap_svn_client_move6(PyObject *SWIGUNUSEDPARM(self), PyOb
     arg7 = (void *)obj5;
   }
   {
-    arg8 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj6, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj6);
+    arg8 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj6, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj6);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -21883,7 +22706,7 @@ SWIGINTERN PyObject *_wrap_svn_client_move5(PyObject *SWIGUNUSEDPARM(self), PyOb
     }
   }
   {
-    arg8 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj6, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj6);
+    arg8 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj6, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj6);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -21916,7 +22739,7 @@ SWIGINTERN PyObject *_wrap_svn_client_move5(PyObject *SWIGUNUSEDPARM(self), PyOb
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_commit_info_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_commit_info_t,
         _global_py_pool, args))
     
     ;
@@ -21962,7 +22785,7 @@ SWIGINTERN PyObject *_wrap_svn_client_move4(PyObject *SWIGUNUSEDPARM(self), PyOb
     }
   }
   {
-    arg5 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj3);
+    arg5 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -21995,7 +22818,7 @@ SWIGINTERN PyObject *_wrap_svn_client_move4(PyObject *SWIGUNUSEDPARM(self), PyOb
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_commit_info_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_commit_info_t,
         _global_py_pool, args))
     
     ;
@@ -22041,7 +22864,7 @@ SWIGINTERN PyObject *_wrap_svn_client_move3(PyObject *SWIGUNUSEDPARM(self), PyOb
     }
   }
   {
-    arg5 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj3);
+    arg5 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -22074,7 +22897,7 @@ SWIGINTERN PyObject *_wrap_svn_client_move3(PyObject *SWIGUNUSEDPARM(self), PyOb
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_commit_info_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_commit_info_t,
         _global_py_pool, args))
     
     ;
@@ -22120,7 +22943,7 @@ SWIGINTERN PyObject *_wrap_svn_client_move2(PyObject *SWIGUNUSEDPARM(self), PyOb
     }
   }
   {
-    arg5 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj3);
+    arg5 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -22153,7 +22976,7 @@ SWIGINTERN PyObject *_wrap_svn_client_move2(PyObject *SWIGUNUSEDPARM(self), PyOb
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_client_commit_info_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_client_commit_info_t,
         _global_py_pool, args))
     
     ;
@@ -22195,7 +23018,7 @@ SWIGINTERN PyObject *_wrap_svn_client_move(PyObject *SWIGUNUSEDPARM(self), PyObj
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"sOsOO|O:svn_client_move",&arg2,&obj1,&arg4,&obj3,&obj4,&obj5)) SWIG_fail;
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -22207,7 +23030,7 @@ SWIGINTERN PyObject *_wrap_svn_client_move(PyObject *SWIGUNUSEDPARM(self), PyObj
     }
   }
   {
-    arg6 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj4);
+    arg6 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -22240,7 +23063,7 @@ SWIGINTERN PyObject *_wrap_svn_client_move(PyObject *SWIGUNUSEDPARM(self), PyObj
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_client_commit_info_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_client_commit_info_t,
         _global_py_pool, args))
     
     ;
@@ -22329,7 +23152,7 @@ SWIGINTERN PyObject *_wrap_svn_client_propset_remote(PyObject *SWIGUNUSEDPARM(se
     arg8 = (void *)obj6;
   }
   {
-    arg9 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj7, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj7);
+    arg9 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj7, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj7);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -22444,7 +23267,7 @@ SWIGINTERN PyObject *_wrap_svn_client_propset_local(PyObject *SWIGUNUSEDPARM(sel
     SWIG_fail;
   }
   {
-    arg7 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj6, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj6);
+    arg7 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj6, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj6);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -22575,7 +23398,7 @@ SWIGINTERN PyObject *_wrap_svn_client_propset3(PyObject *SWIGUNUSEDPARM(self), P
     }
   }
   {
-    arg10 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj8, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj8);
+    arg10 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj8, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj8);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -22608,7 +23431,7 @@ SWIGINTERN PyObject *_wrap_svn_client_propset3(PyObject *SWIGUNUSEDPARM(self), P
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_commit_info_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_commit_info_t,
         _global_py_pool, args))
     
     ;
@@ -22675,7 +23498,7 @@ SWIGINTERN PyObject *_wrap_svn_client_propset2(PyObject *SWIGUNUSEDPARM(self), P
     }
   }
   {
-    arg6 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj5, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj5);
+    arg6 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj5, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj5);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -22855,7 +23678,7 @@ SWIGINTERN PyObject *_wrap_svn_client_revprop_set2(PyObject *SWIGUNUSEDPARM(self
     }
   }
   {
-    arg5 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj4);
+    arg5 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -22867,7 +23690,7 @@ SWIGINTERN PyObject *_wrap_svn_client_revprop_set2(PyObject *SWIGUNUSEDPARM(self
     }
   }
   {
-    arg8 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj6, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj6);
+    arg8 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj6, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj6);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -22964,7 +23787,7 @@ SWIGINTERN PyObject *_wrap_svn_client_revprop_set(PyObject *SWIGUNUSEDPARM(self)
     }
   }
   {
-    arg4 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
+    arg4 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -22976,7 +23799,7 @@ SWIGINTERN PyObject *_wrap_svn_client_revprop_set(PyObject *SWIGUNUSEDPARM(self)
     }
   }
   {
-    arg7 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj5, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj5);
+    arg7 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj5, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj5);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -23073,13 +23896,13 @@ SWIGINTERN PyObject *_wrap_svn_client_propget5(PyObject *SWIGUNUSEDPARM(self), P
   arg7 = &temp7;
   if (!PyArg_ParseTuple(args,(char *)"ssOOOOO|OO:svn_client_propget5",&arg3,&arg4,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   {
-    arg5 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg5 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg6 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
+    arg6 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -23100,7 +23923,7 @@ SWIGINTERN PyObject *_wrap_svn_client_propget5(PyObject *SWIGUNUSEDPARM(self), P
     SWIG_fail;
   }
   {
-    arg10 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj6, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj6);
+    arg10 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj6, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj6);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -23219,13 +24042,13 @@ SWIGINTERN PyObject *_wrap_svn_client_propget4(PyObject *SWIGUNUSEDPARM(self), P
   arg6 = &temp6;
   if (!PyArg_ParseTuple(args,(char *)"ssOOOOO|OO:svn_client_propget4",&arg2,&arg3,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   {
-    arg4 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg4 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg5 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
+    arg5 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -23246,7 +24069,7 @@ SWIGINTERN PyObject *_wrap_svn_client_propget4(PyObject *SWIGUNUSEDPARM(self), P
     SWIG_fail;
   }
   {
-    arg9 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj6, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj6);
+    arg9 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj6, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj6);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -23356,13 +24179,13 @@ SWIGINTERN PyObject *_wrap_svn_client_propget3(PyObject *SWIGUNUSEDPARM(self), P
   arg6 = &temp6;
   if (!PyArg_ParseTuple(args,(char *)"ssOOOOO|O:svn_client_propget3",&arg2,&arg3,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
-    arg4 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg4 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg5 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
+    arg5 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -23383,7 +24206,7 @@ SWIGINTERN PyObject *_wrap_svn_client_propget3(PyObject *SWIGUNUSEDPARM(self), P
     SWIG_fail;
   }
   {
-    arg9 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj6, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj6);
+    arg9 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj6, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj6);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -23473,13 +24296,13 @@ SWIGINTERN PyObject *_wrap_svn_client_propget2(PyObject *SWIGUNUSEDPARM(self), P
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"ssOOOO|O:svn_client_propget2",&arg2,&arg3,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
-    arg4 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg4 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg5 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
+    arg5 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -23491,7 +24314,7 @@ SWIGINTERN PyObject *_wrap_svn_client_propget2(PyObject *SWIGUNUSEDPARM(self), P
     }
   }
   {
-    arg7 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj5, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj5);
+    arg7 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj5, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj5);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -23573,7 +24396,7 @@ SWIGINTERN PyObject *_wrap_svn_client_propget(PyObject *SWIGUNUSEDPARM(self), Py
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"ssOOO|O:svn_client_propget",&arg2,&arg3,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
-    arg4 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg4 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -23585,7 +24408,7 @@ SWIGINTERN PyObject *_wrap_svn_client_propget(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
-    arg6 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj4);
+    arg6 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -23664,13 +24487,13 @@ SWIGINTERN PyObject *_wrap_svn_client_revprop_get(PyObject *SWIGUNUSEDPARM(self)
   arg5 = &temp5;
   if (!PyArg_ParseTuple(args,(char *)"ssOO|O:svn_client_revprop_get",&arg1,&arg3,&obj2,&obj3,&obj4)) SWIG_fail;
   {
-    arg4 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg4 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg6 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj3);
+    arg6 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -23768,13 +24591,13 @@ SWIGINTERN PyObject *_wrap_svn_client_proplist4(PyObject *SWIGUNUSEDPARM(self),
   arg10 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOOOOOOO|O:svn_client_proplist4",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   {
-    arg2 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg2 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -23805,7 +24628,7 @@ SWIGINTERN PyObject *_wrap_svn_client_proplist4(PyObject *SWIGUNUSEDPARM(self),
     arg8 = (void *)obj6;
   }
   {
-    arg9 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj7, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj7);
+    arg9 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj7, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj7);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -23888,13 +24711,13 @@ SWIGINTERN PyObject *_wrap_svn_client_proplist3(PyObject *SWIGUNUSEDPARM(self),
   arg9 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOOOOOOO|O:svn_client_proplist3",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   {
-    arg2 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg2 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -23916,7 +24739,7 @@ SWIGINTERN PyObject *_wrap_svn_client_proplist3(PyObject *SWIGUNUSEDPARM(self),
   }
   {
     svn_proplist_receiver_t * tmp =
-    svn_swig_MustGetPtr(obj5, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj5);
+    svn_swig_py_must_get_ptr(obj5, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj5);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -23931,7 +24754,7 @@ SWIGINTERN PyObject *_wrap_svn_client_proplist3(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
-    arg8 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj7, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj7);
+    arg8 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj7, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj7);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -24011,13 +24834,13 @@ SWIGINTERN PyObject *_wrap_svn_client_proplist2(PyObject *SWIGUNUSEDPARM(self),
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"sOOOO|O:svn_client_proplist2",&arg2,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg4 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -24029,7 +24852,7 @@ SWIGINTERN PyObject *_wrap_svn_client_proplist2(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
-    arg6 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj4);
+    arg6 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -24135,7 +24958,7 @@ SWIGINTERN PyObject *_wrap_svn_client_proplist(PyObject *SWIGUNUSEDPARM(self), P
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"sOOO|O:svn_client_proplist",&arg2,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -24147,7 +24970,7 @@ SWIGINTERN PyObject *_wrap_svn_client_proplist(PyObject *SWIGUNUSEDPARM(self), P
     }
   }
   {
-    arg5 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj3);
+    arg5 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -24250,13 +25073,13 @@ SWIGINTERN PyObject *_wrap_svn_client_revprop_list(PyObject *SWIGUNUSEDPARM(self
   arg4 = &temp4;
   if (!PyArg_ParseTuple(args,(char *)"sOO|O:svn_client_revprop_list",&arg2,&obj1,&obj2,&obj3)) SWIG_fail;
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg5 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj2);
+    arg5 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -24349,13 +25172,13 @@ SWIGINTERN PyObject *_wrap_svn_client_export5(PyObject *SWIGUNUSEDPARM(self), Py
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"ssOOOOOOzO|O:svn_client_export5",&arg2,&arg3,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&arg10,&obj9,&obj10)) SWIG_fail;
   {
-    arg4 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg4 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg5 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
+    arg5 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -24385,7 +25208,7 @@ SWIGINTERN PyObject *_wrap_svn_client_export5(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
-    arg11 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj9, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj9);
+    arg11 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj9, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj9);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -24478,13 +25301,13 @@ SWIGINTERN PyObject *_wrap_svn_client_export4(PyObject *SWIGUNUSEDPARM(self), Py
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"ssOOOOOzO|O:svn_client_export4",&arg2,&arg3,&obj2,&obj3,&obj4,&obj5,&obj6,&arg9,&obj8,&obj9)) SWIG_fail;
   {
-    arg4 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg4 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg5 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
+    arg5 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -24508,7 +25331,7 @@ SWIGINTERN PyObject *_wrap_svn_client_export4(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
-    arg10 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj8, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj8);
+    arg10 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj8, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj8);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -24601,13 +25424,13 @@ SWIGINTERN PyObject *_wrap_svn_client_export3(PyObject *SWIGUNUSEDPARM(self), Py
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"ssOOOOOzO|O:svn_client_export3",&arg2,&arg3,&obj2,&obj3,&obj4,&obj5,&obj6,&arg9,&obj8,&obj9)) SWIG_fail;
   {
-    arg4 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg4 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg5 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
+    arg5 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -24631,7 +25454,7 @@ SWIGINTERN PyObject *_wrap_svn_client_export3(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
-    arg10 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj8, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj8);
+    arg10 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj8, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj8);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -24718,7 +25541,7 @@ SWIGINTERN PyObject *_wrap_svn_client_export2(PyObject *SWIGUNUSEDPARM(self), Py
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"ssOOzO|O:svn_client_export2",&arg2,&arg3,&obj2,&obj3,&arg6,&obj5,&obj6)) SWIG_fail;
   {
-    arg4 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg4 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -24730,7 +25553,7 @@ SWIGINTERN PyObject *_wrap_svn_client_export2(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
-    arg7 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj5, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj5);
+    arg7 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj5, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj5);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -24806,7 +25629,7 @@ SWIGINTERN PyObject *_wrap_svn_client_export(PyObject *SWIGUNUSEDPARM(self), PyO
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"ssOOO|O:svn_client_export",&arg2,&arg3,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
-    arg4 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg4 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -24818,7 +25641,7 @@ SWIGINTERN PyObject *_wrap_svn_client_export(PyObject *SWIGUNUSEDPARM(self), PyO
     }
   }
   {
-    arg6 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj4);
+    arg6 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -24901,13 +25724,13 @@ SWIGINTERN PyObject *_wrap_svn_client_list3(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg11 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOOOOOOOOO|O:svn_client_list3",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
   {
-    arg2 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg2 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -24938,7 +25761,7 @@ SWIGINTERN PyObject *_wrap_svn_client_list3(PyObject *SWIGUNUSEDPARM(self), PyOb
   }
   {
     svn_client_list_func2_t * tmp =
-    svn_swig_MustGetPtr(obj7, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, svn_argnum_obj7);
+    svn_swig_py_must_get_ptr(obj7, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, svn_argnum_obj7);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -24953,7 +25776,7 @@ SWIGINTERN PyObject *_wrap_svn_client_list3(PyObject *SWIGUNUSEDPARM(self), PyOb
     }
   }
   {
-    arg10 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj9, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj9);
+    arg10 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj9, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj9);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -25038,13 +25861,13 @@ SWIGINTERN PyObject *_wrap_svn_client_list2(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg10 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOOOOOOOO|O:svn_client_list2",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   {
-    arg2 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg2 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -25069,7 +25892,7 @@ SWIGINTERN PyObject *_wrap_svn_client_list2(PyObject *SWIGUNUSEDPARM(self), PyOb
   }
   {
     svn_client_list_func_t * tmp =
-    svn_swig_MustGetPtr(obj6, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_apr_pool_t__p_svn_error_t, svn_argnum_obj6);
+    svn_swig_py_must_get_ptr(obj6, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_apr_pool_t__p_svn_error_t, svn_argnum_obj6);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -25084,7 +25907,7 @@ SWIGINTERN PyObject *_wrap_svn_client_list2(PyObject *SWIGUNUSEDPARM(self), PyOb
     }
   }
   {
-    arg9 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj8, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj8);
+    arg9 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj8, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj8);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -25169,13 +25992,13 @@ SWIGINTERN PyObject *_wrap_svn_client_list(PyObject *SWIGUNUSEDPARM(self), PyObj
   arg10 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOOOOOOOO|O:svn_client_list",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   {
-    arg2 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg2 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -25200,7 +26023,7 @@ SWIGINTERN PyObject *_wrap_svn_client_list(PyObject *SWIGUNUSEDPARM(self), PyObj
   }
   {
     svn_client_list_func_t * tmp =
-    svn_swig_MustGetPtr(obj6, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_apr_pool_t__p_svn_error_t, svn_argnum_obj6);
+    svn_swig_py_must_get_ptr(obj6, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_apr_pool_t__p_svn_error_t, svn_argnum_obj6);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -25215,7 +26038,7 @@ SWIGINTERN PyObject *_wrap_svn_client_list(PyObject *SWIGUNUSEDPARM(self), PyObj
     }
   }
   {
-    arg9 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj8, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj8);
+    arg9 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj8, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj8);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -25298,13 +26121,13 @@ SWIGINTERN PyObject *_wrap_svn_client_ls3(PyObject *SWIGUNUSEDPARM(self), PyObje
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"sOOOO|O:svn_client_ls3",&arg3,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
-    arg4 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg4 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg5 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg5 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -25316,7 +26139,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ls3(PyObject *SWIGUNUSEDPARM(self), PyObje
     }
   }
   {
-    arg7 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj4);
+    arg7 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -25414,13 +26237,13 @@ SWIGINTERN PyObject *_wrap_svn_client_ls2(PyObject *SWIGUNUSEDPARM(self), PyObje
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"sOOOO|O:svn_client_ls2",&arg2,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg4 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -25432,7 +26255,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ls2(PyObject *SWIGUNUSEDPARM(self), PyObje
     }
   }
   {
-    arg6 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj4);
+    arg6 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -25519,7 +26342,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ls(PyObject *SWIGUNUSEDPARM(self), PyObjec
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"sOOO|O:svn_client_ls",&arg2,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -25531,7 +26354,7 @@ SWIGINTERN PyObject *_wrap_svn_client_ls(PyObject *SWIGUNUSEDPARM(self), PyObjec
     }
   }
   {
-    arg5 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj3);
+    arg5 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -25584,6 +26407,132 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_client_cat3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  apr_hash_t **arg1 = (apr_hash_t **) 0 ;
+  svn_stream_t *arg2 = (svn_stream_t *) 0 ;
+  char *arg3 = (char *) 0 ;
+  svn_opt_revision_t *arg4 = (svn_opt_revision_t *) 0 ;
+  svn_opt_revision_t *arg5 = (svn_opt_revision_t *) 0 ;
+  svn_boolean_t arg6 ;
+  svn_client_ctx_t *arg7 = (svn_client_ctx_t *) 0 ;
+  apr_pool_t *arg8 = (apr_pool_t *) 0 ;
+  apr_pool_t *arg9 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  apr_hash_t *temp1 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  PyObject * obj5 = 0 ;
+  PyObject * obj6 = 0 ;
+  PyObject * obj7 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg8 = _global_pool;
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg9 = _global_pool;
+  arg1 = &temp1;
+  if (!PyArg_ParseTuple(args,(char *)"OsOOOO|OO:svn_client_cat3",&obj0,&arg3,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  {
+    arg2 = svn_swig_py_make_stream (obj0, _global_pool);
+  }
+  {
+    arg4 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg5 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg6 = (svn_boolean_t)SWIG_As_long (obj4);
+    if (SWIG_arg_fail(svn_argnum_obj4)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg7 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj5, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj5);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  if (obj6) {
+    /* Verify that the user supplied a valid pool */
+    if (obj6 != Py_None && obj6 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj6);
+      SWIG_arg_fail(svn_argnum_obj6);
+      SWIG_fail;
+    }
+  }
+  if (obj7) {
+    /* Verify that the user supplied a valid pool */
+    if (obj7 != Py_None && obj7 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj7);
+      SWIG_arg_fail(svn_argnum_obj7);
+      SWIG_fail;
+    }
+  }
+  {
+    if (!arg4) {
+      SWIG_exception(SWIG_ValueError,"Received a NULL pointer.");
+    }
+  }
+  {
+    if (!arg5) {
+      SWIG_exception(SWIG_ValueError,"Received a NULL pointer.");
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_client_cat3(arg1,arg2,(char const *)arg3,(struct svn_opt_revision_t const *)arg4,(struct svn_opt_revision_t const *)arg5,arg6,arg7,arg8,arg9);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  {
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_prophash_to_dict(*arg1));
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_svn_client_cat2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   svn_stream_t *arg1 = (svn_stream_t *) 0 ;
@@ -25610,19 +26559,19 @@ SWIGINTERN PyObject *_wrap_svn_client_cat2(PyObject *SWIGUNUSEDPARM(self), PyObj
     arg1 = svn_swig_py_make_stream (obj0, _global_pool);
   }
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
+    arg4 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg5 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj4);
+    arg5 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -25700,13 +26649,13 @@ SWIGINTERN PyObject *_wrap_svn_client_cat(PyObject *SWIGUNUSEDPARM(self), PyObje
     arg1 = svn_swig_py_make_stream (obj0, _global_pool);
   }
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj3);
+    arg4 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -25802,7 +26751,7 @@ SWIGINTERN PyObject *_wrap_svn_client_add_to_changelist(PyObject *SWIGUNUSEDPARM
     SWIG_fail;
   }
   {
-    arg5 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj4);
+    arg5 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -25892,7 +26841,7 @@ SWIGINTERN PyObject *_wrap_svn_client_remove_from_changelists(PyObject *SWIGUNUS
     SWIG_fail;
   }
   {
-    arg4 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj3);
+    arg4 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -25975,11 +26924,11 @@ SWIGINTERN PyObject *_wrap_svn_client_get_changelists(PyObject *SWIGUNUSEDPARM(s
     }
   }
   {
-    arg4 = svn_swig_py_changelist_receiver_func;
+    arg4 = (svn_changelist_receiver_t) svn_swig_py_changelist_receiver_func;
     arg5 = obj3;
   }
   {
-    arg6 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj4);
+    arg6 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -26059,7 +27008,7 @@ SWIGINTERN PyObject *_wrap_svn_client_lock(PyObject *SWIGUNUSEDPARM(self), PyObj
     }
   }
   {
-    arg4 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj3);
+    arg4 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -26138,7 +27087,7 @@ SWIGINTERN PyObject *_wrap_svn_client_unlock(PyObject *SWIGUNUSEDPARM(self), PyO
     }
   }
   {
-    arg3 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj2);
+    arg3 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -26190,7 +27139,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_URL_set(PyObject *SWIGUNUSEDPARM(self), Py
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_info_t_URL_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -26218,7 +27167,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_URL_get(PyObject *SWIGUNUSEDPARM(self), Py
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_info_t_URL_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -26240,7 +27189,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_rev_set(PyObject *SWIGUNUSEDPARM(self), Py
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_info_t_rev_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -26267,7 +27216,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_rev_get(PyObject *SWIGUNUSEDPARM(self), Py
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_info_t_rev_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -26289,7 +27238,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_kind_set(PyObject *SWIGUNUSEDPARM(self), P
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_info_t_kind_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -26316,7 +27265,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_kind_get(PyObject *SWIGUNUSEDPARM(self), P
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_info_t_kind_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -26337,7 +27286,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_repos_root_URL_set(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_info_t_repos_root_URL_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -26365,7 +27314,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_repos_root_URL_get(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_info_t_repos_root_URL_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -26386,7 +27335,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_repos_UUID_set(PyObject *SWIGUNUSEDPARM(se
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_info_t_repos_UUID_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -26414,7 +27363,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_repos_UUID_get(PyObject *SWIGUNUSEDPARM(se
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_info_t_repos_UUID_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -26436,7 +27385,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_last_changed_rev_set(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_info_t_last_changed_rev_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -26463,7 +27412,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_last_changed_rev_get(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_info_t_last_changed_rev_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -26485,7 +27434,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_last_changed_date_set(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_info_t_last_changed_date_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -26507,7 +27456,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_last_changed_date_get(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_info_t_last_changed_date_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -26528,7 +27477,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_last_changed_author_set(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_info_t_last_changed_author_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -26556,7 +27505,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_last_changed_author_get(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_info_t_last_changed_author_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -26578,13 +27527,13 @@ SWIGINTERN PyObject *_wrap_svn_info_t_lock_set(PyObject *SWIGUNUSEDPARM(self), P
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_info_t_lock_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_lock_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_lock_t, svn_argnum_obj1);
+    arg2 = (svn_lock_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_lock_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -26605,13 +27554,13 @@ SWIGINTERN PyObject *_wrap_svn_info_t_lock_get(PyObject *SWIGUNUSEDPARM(self), P
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_info_t_lock_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (svn_lock_t *) ((arg1)->lock);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_lock_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_lock_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -26628,7 +27577,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_has_wc_info_set(PyObject *SWIGUNUSEDPARM(s
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_info_t_has_wc_info_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -26655,7 +27604,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_has_wc_info_get(PyObject *SWIGUNUSEDPARM(s
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_info_t_has_wc_info_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -26677,7 +27626,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_schedule_set(PyObject *SWIGUNUSEDPARM(self
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_info_t_schedule_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -26704,7 +27653,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_schedule_get(PyObject *SWIGUNUSEDPARM(self
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_info_t_schedule_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -26725,7 +27674,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_copyfrom_url_set(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"Oz:svn_info_t_copyfrom_url_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -26753,7 +27702,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_copyfrom_url_get(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_info_t_copyfrom_url_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -26775,7 +27724,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_copyfrom_rev_set(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_info_t_copyfrom_rev_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -26802,7 +27751,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_copyfrom_rev_get(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_info_t_copyfrom_rev_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -26824,7 +27773,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_text_time_set(PyObject *SWIGUNUSEDPARM(sel
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_info_t_text_time_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -26846,7 +27795,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_text_time_get(PyObject *SWIGUNUSEDPARM(sel
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_info_t_text_time_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -26868,7 +27817,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_prop_time_set(PyObject *SWIGUNUSEDPARM(sel
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_info_t_prop_time_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -26890,7 +27839,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_prop_time_get(PyObject *SWIGUNUSEDPARM(sel
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_info_t_prop_time_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -26911,7 +27860,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_checksum_set(PyObject *SWIGUNUSEDPARM(self
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_info_t_checksum_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -26939,7 +27888,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_checksum_get(PyObject *SWIGUNUSEDPARM(self
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_info_t_checksum_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -26960,7 +27909,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_conflict_old_set(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_info_t_conflict_old_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -26988,7 +27937,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_conflict_old_get(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_info_t_conflict_old_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27009,7 +27958,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_conflict_new_set(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_info_t_conflict_new_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27037,7 +27986,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_conflict_new_get(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_info_t_conflict_new_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27058,7 +28007,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_conflict_wrk_set(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_info_t_conflict_wrk_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27086,7 +28035,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_conflict_wrk_get(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_info_t_conflict_wrk_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27107,7 +28056,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_prejfile_set(PyObject *SWIGUNUSEDPARM(self
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_info_t_prejfile_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27135,7 +28084,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_prejfile_get(PyObject *SWIGUNUSEDPARM(self
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_info_t_prejfile_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27156,7 +28105,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_changelist_set(PyObject *SWIGUNUSEDPARM(se
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_info_t_changelist_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27184,7 +28133,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_changelist_get(PyObject *SWIGUNUSEDPARM(se
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_info_t_changelist_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27206,7 +28155,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_depth_set(PyObject *SWIGUNUSEDPARM(self),
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_info_t_depth_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27233,7 +28182,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_depth_get(PyObject *SWIGUNUSEDPARM(self),
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_info_t_depth_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27255,7 +28204,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_working_size_set(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_info_t_working_size_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27282,7 +28231,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_working_size_get(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_info_t_working_size_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27304,7 +28253,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_size_set(PyObject *SWIGUNUSEDPARM(self), P
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_info_t_size_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27331,7 +28280,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_size_get(PyObject *SWIGUNUSEDPARM(self), P
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_info_t_size_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27353,7 +28302,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_size64_set(PyObject *SWIGUNUSEDPARM(self),
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_info_t_size64_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27375,7 +28324,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_size64_get(PyObject *SWIGUNUSEDPARM(self),
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_info_t_size64_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27397,7 +28346,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_working_size64_set(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_info_t_working_size64_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27419,7 +28368,7 @@ SWIGINTERN PyObject *_wrap_svn_info_t_working_size64_get(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_info_t_working_size64_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27441,13 +28390,13 @@ SWIGINTERN PyObject *_wrap_svn_info_t_tree_conflict_set(PyObject *SWIGUNUSEDPARM
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_info_t_tree_conflict_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_wc_conflict_description_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj1);
+    arg2 = (svn_wc_conflict_description_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27468,13 +28417,13 @@ SWIGINTERN PyObject *_wrap_svn_info_t_tree_conflict_get(PyObject *SWIGUNUSEDPARM
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_info_t_tree_conflict_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (svn_wc_conflict_description_t *) ((arg1)->tree_conflict);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_wc_conflict_description_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_wc_conflict_description_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -27495,7 +28444,7 @@ SWIGINTERN PyObject *_wrap_new_svn_info_t(PyObject *SWIGUNUSEDPARM(self), PyObje
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_info_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_info_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -27510,7 +28459,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_info_t(PyObject *SWIGUNUSEDPARM(self), PyO
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_info_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27553,7 +28502,7 @@ SWIGINTERN PyObject *_wrap_svn_info_dup(PyObject *SWIGUNUSEDPARM(self), PyObject
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_info_dup",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
+    arg1 = (svn_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27574,7 +28523,7 @@ SWIGINTERN PyObject *_wrap_svn_info_dup(PyObject *SWIGUNUSEDPARM(self), PyObject
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_info_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_info_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -27596,7 +28545,7 @@ SWIGINTERN PyObject *_wrap_svn_client_info2_t_URL_set(PyObject *SWIGUNUSEDPARM(s
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_client_info2_t_URL_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_client_info2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_info2_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_info2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_info2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27624,7 +28573,7 @@ SWIGINTERN PyObject *_wrap_svn_client_info2_t_URL_get(PyObject *SWIGUNUSEDPARM(s
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_info2_t_URL_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_info2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_info2_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_info2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_info2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27646,7 +28595,7 @@ SWIGINTERN PyObject *_wrap_svn_client_info2_t_rev_set(PyObject *SWIGUNUSEDPARM(s
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_info2_t_rev_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_info2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_info2_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_info2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_info2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27673,7 +28622,7 @@ SWIGINTERN PyObject *_wrap_svn_client_info2_t_rev_get(PyObject *SWIGUNUSEDPARM(s
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_info2_t_rev_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_info2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_info2_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_info2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_info2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27694,7 +28643,7 @@ SWIGINTERN PyObject *_wrap_svn_client_info2_t_repos_root_URL_set(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_client_info2_t_repos_root_URL_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_client_info2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_info2_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_info2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_info2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27722,7 +28671,7 @@ SWIGINTERN PyObject *_wrap_svn_client_info2_t_repos_root_URL_get(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_info2_t_repos_root_URL_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_info2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_info2_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_info2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_info2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27743,7 +28692,7 @@ SWIGINTERN PyObject *_wrap_svn_client_info2_t_repos_UUID_set(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_client_info2_t_repos_UUID_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_client_info2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_info2_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_info2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_info2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27771,7 +28720,7 @@ SWIGINTERN PyObject *_wrap_svn_client_info2_t_repos_UUID_get(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_info2_t_repos_UUID_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_info2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_info2_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_info2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_info2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27793,7 +28742,7 @@ SWIGINTERN PyObject *_wrap_svn_client_info2_t_kind_set(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_info2_t_kind_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_info2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_info2_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_info2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_info2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27820,7 +28769,7 @@ SWIGINTERN PyObject *_wrap_svn_client_info2_t_kind_get(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_info2_t_kind_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_info2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_info2_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_info2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_info2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27842,7 +28791,7 @@ SWIGINTERN PyObject *_wrap_svn_client_info2_t_size_set(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_info2_t_size_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_info2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_info2_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_info2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_info2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27864,7 +28813,7 @@ SWIGINTERN PyObject *_wrap_svn_client_info2_t_size_get(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_info2_t_size_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_info2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_info2_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_info2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_info2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27886,7 +28835,7 @@ SWIGINTERN PyObject *_wrap_svn_client_info2_t_last_changed_rev_set(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_info2_t_last_changed_rev_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_info2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_info2_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_info2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_info2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27913,7 +28862,7 @@ SWIGINTERN PyObject *_wrap_svn_client_info2_t_last_changed_rev_get(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_info2_t_last_changed_rev_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_info2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_info2_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_info2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_info2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27935,7 +28884,7 @@ SWIGINTERN PyObject *_wrap_svn_client_info2_t_last_changed_date_set(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_info2_t_last_changed_date_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_info2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_info2_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_info2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_info2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27957,7 +28906,7 @@ SWIGINTERN PyObject *_wrap_svn_client_info2_t_last_changed_date_get(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_info2_t_last_changed_date_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_info2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_info2_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_info2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_info2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27978,7 +28927,7 @@ SWIGINTERN PyObject *_wrap_svn_client_info2_t_last_changed_author_set(PyObject *
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_client_info2_t_last_changed_author_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_client_info2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_info2_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_info2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_info2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -28006,7 +28955,7 @@ SWIGINTERN PyObject *_wrap_svn_client_info2_t_last_changed_author_get(PyObject *
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_info2_t_last_changed_author_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_info2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_info2_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_info2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_info2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -28028,13 +28977,13 @@ SWIGINTERN PyObject *_wrap_svn_client_info2_t_lock_set(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_info2_t_lock_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_info2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_info2_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_info2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_info2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_lock_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_lock_t, svn_argnum_obj1);
+    arg2 = (svn_lock_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_lock_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -28055,13 +29004,13 @@ SWIGINTERN PyObject *_wrap_svn_client_info2_t_lock_get(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_info2_t_lock_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_info2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_info2_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_info2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_info2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (svn_lock_t *) ((arg1)->lock);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_lock_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_lock_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -28078,13 +29027,13 @@ SWIGINTERN PyObject *_wrap_svn_client_info2_t_wc_info_set(PyObject *SWIGUNUSEDPA
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_client_info2_t_wc_info_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_client_info2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_info2_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_info2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_info2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_wc_info_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_info_t, svn_argnum_obj1);
+    arg2 = (svn_wc_info_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_info_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -28105,13 +29054,13 @@ SWIGINTERN PyObject *_wrap_svn_client_info2_t_wc_info_get(PyObject *SWIGUNUSEDPA
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_client_info2_t_wc_info_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_info2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_info2_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_info2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_info2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (svn_wc_info_t *) ((arg1)->wc_info);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_wc_info_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_wc_info_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -28132,7 +29081,7 @@ SWIGINTERN PyObject *_wrap_new_svn_client_info2_t(PyObject *SWIGUNUSEDPARM(self)
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_client_info2_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_client_info2_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -28147,7 +29096,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_client_info2_t(PyObject *SWIGUNUSEDPARM(se
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_client_info2_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_client_info2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_info2_t, svn_argnum_obj0);
+    arg1 = (struct svn_client_info2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_info2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -28190,7 +29139,7 @@ SWIGINTERN PyObject *_wrap_svn_client_info2_dup(PyObject *SWIGUNUSEDPARM(self),
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_client_info2_dup",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_client_info2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_client_info2_t, svn_argnum_obj0);
+    arg1 = (svn_client_info2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_client_info2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -28211,7 +29160,7 @@ SWIGINTERN PyObject *_wrap_svn_client_info2_dup(PyObject *SWIGUNUSEDPARM(self),
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_client_info2_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_client_info2_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -28225,6 +29174,156 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_client_info4(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  char *arg1 = (char *) 0 ;
+  svn_opt_revision_t *arg2 = (svn_opt_revision_t *) 0 ;
+  svn_opt_revision_t *arg3 = (svn_opt_revision_t *) 0 ;
+  svn_depth_t arg4 ;
+  svn_boolean_t arg5 ;
+  svn_boolean_t arg6 ;
+  svn_boolean_t arg7 ;
+  apr_array_header_t *arg8 = (apr_array_header_t *) 0 ;
+  svn_client_info_receiver2_t arg9 = (svn_client_info_receiver2_t) 0 ;
+  void *arg10 = (void *) 0 ;
+  svn_client_ctx_t *arg11 = (svn_client_ctx_t *) 0 ;
+  apr_pool_t *arg12 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  PyObject * obj5 = 0 ;
+  PyObject * obj6 = 0 ;
+  PyObject * obj7 = 0 ;
+  PyObject * obj8 = 0 ;
+  PyObject * obj9 = 0 ;
+  PyObject * obj10 = 0 ;
+  PyObject * obj11 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg12 = _global_pool;
+  if (!PyArg_ParseTuple(args,(char *)"sOOOOOOOOOO|O:svn_client_info4",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11)) SWIG_fail;
+  {
+    arg2 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg4 = (svn_depth_t)SWIG_As_long (obj3);
+    if (SWIG_arg_fail(svn_argnum_obj3)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg5 = (svn_boolean_t)SWIG_As_long (obj4);
+    if (SWIG_arg_fail(svn_argnum_obj4)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg6 = (svn_boolean_t)SWIG_As_long (obj5);
+    if (SWIG_arg_fail(svn_argnum_obj5)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg7 = (svn_boolean_t)SWIG_As_long (obj6);
+    if (SWIG_arg_fail(svn_argnum_obj6)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg8 = (apr_array_header_t *) svn_swig_py_seq_to_array(obj7,
+      sizeof(const char *),
+      svn_swig_py_unwrap_string,
+      NULL,
+      _global_pool);
+    if (PyErr_Occurred())
+    SWIG_fail;
+  }
+  {
+    svn_client_info_receiver2_t * tmp =
+    svn_swig_py_must_get_ptr(obj8, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_client_info2_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj8);
+    if (tmp == NULL || PyErr_Occurred()) {
+      SWIG_fail;
+    }
+    arg9 = *tmp;
+  }
+  {
+    if (obj9 == Py_None) {
+      arg10 = NULL;
+    } else if (SWIG_ConvertPtr(obj9, (void **) &arg10, 0, 0) == -1) {
+      arg10 = (void *) obj9;
+      PyErr_Clear();
+    }
+  }
+  {
+    arg11 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj10, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj10);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  if (obj11) {
+    /* Verify that the user supplied a valid pool */
+    if (obj11 != Py_None && obj11 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj11);
+      SWIG_arg_fail(svn_argnum_obj11);
+      SWIG_fail;
+    }
+  }
+  {
+    if (!arg2) {
+      SWIG_exception(SWIG_ValueError,"Received a NULL pointer.");
+    }
+  }
+  {
+    if (!arg3) {
+      SWIG_exception(SWIG_ValueError,"Received a NULL pointer.");
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_client_info4((char const *)arg1,(struct svn_opt_revision_t const *)arg2,(struct svn_opt_revision_t const *)arg3,arg4,arg5,arg6,arg7,(apr_array_header_t const *)arg8,arg9,arg10,arg11,arg12);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_svn_client_info3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
@@ -28258,13 +29357,13 @@ SWIGINTERN PyObject *_wrap_svn_client_info3(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg11 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOOOOOOOOO|O:svn_client_info3",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
   {
-    arg2 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg2 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -28298,7 +29397,7 @@ SWIGINTERN PyObject *_wrap_svn_client_info3(PyObject *SWIGUNUSEDPARM(self), PyOb
   }
   {
     svn_client_info_receiver2_t * tmp =
-    svn_swig_MustGetPtr(obj7, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_client_info2_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj7);
+    svn_swig_py_must_get_ptr(obj7, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_client_info2_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj7);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -28313,7 +29412,7 @@ SWIGINTERN PyObject *_wrap_svn_client_info3(PyObject *SWIGUNUSEDPARM(self), PyOb
     }
   }
   {
-    arg10 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj9, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj9);
+    arg10 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj9, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj9);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -28395,19 +29494,19 @@ SWIGINTERN PyObject *_wrap_svn_client_info2(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg9 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOOOOOO|O:svn_client_info2",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
-    arg2 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg2 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = svn_swig_py_info_receiver_func;
+    arg4 = (svn_info_receiver_t) svn_swig_py_info_receiver_func;
     arg5 = obj3;
   }
   {
@@ -28426,7 +29525,7 @@ SWIGINTERN PyObject *_wrap_svn_client_info2(PyObject *SWIGUNUSEDPARM(self), PyOb
     SWIG_fail;
   }
   {
-    arg8 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj6, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj6);
+    arg8 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj6, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj6);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -28506,19 +29605,19 @@ SWIGINTERN PyObject *_wrap_svn_client_info(PyObject *SWIGUNUSEDPARM(self), PyObj
   arg8 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOOOOO|O:svn_client_info",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
-    arg2 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg2 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
+    arg3 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = svn_swig_py_info_receiver_func;
+    arg4 = (svn_info_receiver_t) svn_swig_py_info_receiver_func;
     arg5 = obj3;
   }
   {
@@ -28528,7 +29627,7 @@ SWIGINTERN PyObject *_wrap_svn_client_info(PyObject *SWIGUNUSEDPARM(self), PyObj
     }
   }
   {
-    arg7 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj5, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj5);
+    arg7 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj5, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj5);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -28608,7 +29707,7 @@ SWIGINTERN PyObject *_wrap_svn_client_get_wc_root(PyObject *SWIGUNUSEDPARM(self)
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"sO|OO:svn_client_get_wc_root",&arg2,&obj1,&obj2,&obj3)) SWIG_fail;
   {
-    arg3 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj1);
+    arg3 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -28712,7 +29811,7 @@ SWIGINTERN PyObject *_wrap_svn_client_min_max_revisions(PyObject *SWIGUNUSEDPARM
     }
   }
   {
-    arg5 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj2);
+    arg5 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -28831,7 +29930,7 @@ SWIGINTERN PyObject *_wrap_svn_client_patch(PyObject *SWIGUNUSEDPARM(self), PyOb
   }
   {
     svn_client_patch_func_t * tmp =
-    svn_swig_MustGetPtr(obj7, SWIGTYPE_p_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, svn_argnum_obj7);
+    svn_swig_py_must_get_ptr(obj7, SWIGTYPE_p_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, svn_argnum_obj7);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -28846,7 +29945,7 @@ SWIGINTERN PyObject *_wrap_svn_client_patch(PyObject *SWIGUNUSEDPARM(self), PyOb
     }
   }
   {
-    arg10 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj9, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj9);
+    arg10 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj9, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj9);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -28916,7 +30015,7 @@ SWIGINTERN PyObject *_wrap_svn_client_url_from_path2(PyObject *SWIGUNUSEDPARM(se
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"sO|OO:svn_client_url_from_path2",&arg2,&obj1,&obj2,&obj3)) SWIG_fail;
   {
-    arg3 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj1);
+    arg3 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -29085,7 +30184,7 @@ SWIGINTERN PyObject *_wrap_svn_client_get_repos_root(PyObject *SWIGUNUSEDPARM(se
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"sO|OO:svn_client_get_repos_root",&arg3,&obj1,&obj2,&obj3)) SWIG_fail;
   {
-    arg4 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj1);
+    arg4 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -29189,7 +30288,7 @@ SWIGINTERN PyObject *_wrap_svn_client_root_url_from_path(PyObject *SWIGUNUSEDPAR
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_client_root_url_from_path",&arg2,&obj1,&obj2)) SWIG_fail;
   {
-    arg3 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj1);
+    arg3 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -29266,7 +30365,7 @@ SWIGINTERN PyObject *_wrap_svn_client_uuid_from_url(PyObject *SWIGUNUSEDPARM(sel
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_client_uuid_from_url",&arg2,&obj1,&obj2)) SWIG_fail;
   {
-    arg3 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj1);
+    arg3 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -29349,7 +30448,7 @@ SWIGINTERN PyObject *_wrap_svn_client_uuid_from_path2(PyObject *SWIGUNUSEDPARM(s
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"sO|OO:svn_client_uuid_from_path2",&arg2,&obj1,&obj2,&obj3)) SWIG_fail;
   {
-    arg3 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj1);
+    arg3 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -29442,13 +30541,13 @@ SWIGINTERN PyObject *_wrap_svn_client_uuid_from_path(PyObject *SWIGUNUSEDPARM(se
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"sOO|O:svn_client_uuid_from_path",&arg2,&obj1,&obj2,&obj3)) SWIG_fail;
   {
-    arg3 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg3 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj2);
+    arg4 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -29532,7 +30631,7 @@ SWIGINTERN PyObject *_wrap_svn_client_open_ra_session2(PyObject *SWIGUNUSEDPARM(
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"ssO|OO:svn_client_open_ra_session2",&arg2,&arg3,&obj2,&obj3,&obj4)) SWIG_fail;
   {
-    arg4 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj2);
+    arg4 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -29573,7 +30672,7 @@ SWIGINTERN PyObject *_wrap_svn_client_open_ra_session2(PyObject *SWIGUNUSEDPARM(
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_ra_session_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_ra_session_t,
         _global_py_pool, args))
     
     ;
@@ -29616,7 +30715,7 @@ SWIGINTERN PyObject *_wrap_svn_client_open_ra_session(PyObject *SWIGUNUSEDPARM(s
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_client_open_ra_session",&arg2,&obj1,&obj2)) SWIG_fail;
   {
-    arg3 = (svn_client_ctx_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj1);
+    arg3 = (svn_client_ctx_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_client_ctx_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -29649,7 +30748,7 @@ SWIGINTERN PyObject *_wrap_svn_client_open_ra_session(PyObject *SWIGUNUSEDPARM(s
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_ra_session_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_ra_session_t,
         _global_py_pool, args))
     
     ;
@@ -29690,7 +30789,7 @@ SWIGINTERN PyObject *_wrap_svn_proplist_invoke_receiver2(PyObject *SWIGUNUSEDPAR
   if (!PyArg_ParseTuple(args,(char *)"OOsOO|O:svn_proplist_invoke_receiver2",&obj0,&obj1,&arg3,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     svn_proplist_receiver2_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -29705,13 +30804,13 @@ SWIGINTERN PyObject *_wrap_svn_proplist_invoke_receiver2(PyObject *SWIGUNUSEDPAR
     }
   }
   {
-    arg4 = (apr_hash_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_apr_hash_t, svn_argnum_obj3);
+    arg4 = (apr_hash_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_apr_hash_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg5 = (apr_array_header_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj4);
+    arg5 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -29777,7 +30876,7 @@ SWIGINTERN PyObject *_wrap_svn_proplist_invoke_receiver(PyObject *SWIGUNUSEDPARM
   if (!PyArg_ParseTuple(args,(char *)"OOsO|O:svn_proplist_invoke_receiver",&obj0,&obj1,&arg3,&obj3,&obj4)) SWIG_fail;
   {
     svn_proplist_receiver_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -29792,7 +30891,7 @@ SWIGINTERN PyObject *_wrap_svn_proplist_invoke_receiver(PyObject *SWIGUNUSEDPARM
     }
   }
   {
-    arg4 = (apr_hash_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_apr_hash_t, svn_argnum_obj3);
+    arg4 = (apr_hash_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_apr_hash_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -29863,14 +30962,14 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_get_commit_log3(PyObject *SWIGUNUSE
   if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_client_invoke_get_commit_log3",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     svn_client_get_commit_log3_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_p_q_const__char_p_p_q_const__char_p_q_const__apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_p_q_const__char_p_p_q_const__char_p_q_const__apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
     arg1 = *tmp;
   }
   {
-    arg4 = (apr_array_header_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj1);
+    arg4 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -29975,14 +31074,14 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_get_commit_log2(PyObject *SWIGUNUSE
   if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_client_invoke_get_commit_log2",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     svn_client_get_commit_log2_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_p_q_const__char_p_p_q_const__char_p_q_const__apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_p_q_const__char_p_p_q_const__char_p_q_const__apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
     arg1 = *tmp;
   }
   {
-    arg4 = (apr_array_header_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj1);
+    arg4 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -30087,14 +31186,14 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_get_commit_log(PyObject *SWIGUNUSED
   if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_client_invoke_get_commit_log",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     svn_client_get_commit_log_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_p_q_const__char_p_p_q_const__char_p_apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_p_q_const__char_p_p_q_const__char_p_apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
     arg1 = *tmp;
   }
   {
-    arg4 = (apr_array_header_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj1);
+    arg4 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -30209,7 +31308,7 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_blame_receiver3(PyObject *SWIGUNUSE
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOOOOssO|O:svn_client_invoke_blame_receiver3",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&arg10,&arg11,&obj11,&obj12)) SWIG_fail;
   {
     svn_client_blame_receiver3_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void_svn_revnum_t_svn_revnum_t_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_svn_revnum_t_svn_revnum_t_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -30243,7 +31342,7 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_blame_receiver3(PyObject *SWIGUNUSE
     }
   }
   {
-    arg7 = (apr_hash_t *)svn_swig_MustGetPtr(obj6, SWIGTYPE_p_apr_hash_t, svn_argnum_obj6);
+    arg7 = (apr_hash_t *)svn_swig_py_must_get_ptr(obj6, SWIGTYPE_p_apr_hash_t, svn_argnum_obj6);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -30255,7 +31354,7 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_blame_receiver3(PyObject *SWIGUNUSE
     }
   }
   {
-    arg9 = (apr_hash_t *)svn_swig_MustGetPtr(obj8, SWIGTYPE_p_apr_hash_t, svn_argnum_obj8);
+    arg9 = (apr_hash_t *)svn_swig_py_must_get_ptr(obj8, SWIGTYPE_p_apr_hash_t, svn_argnum_obj8);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -30336,7 +31435,7 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_blame_receiver2(PyObject *SWIGUNUSE
   if (!PyArg_ParseTuple(args,(char *)"OOOOssOssss|O:svn_client_invoke_blame_receiver2",&obj0,&obj1,&obj2,&obj3,&arg5,&arg6,&obj6,&arg8,&arg9,&arg10,&arg11,&obj11)) SWIG_fail;
   {
     svn_client_blame_receiver2_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -30428,7 +31527,7 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_blame_receiver(PyObject *SWIGUNUSED
   if (!PyArg_ParseTuple(args,(char *)"OOOOsss|O:svn_client_invoke_blame_receiver",&obj0,&obj1,&obj2,&obj3,&arg5,&arg6,&arg7,&obj7)) SWIG_fail;
   {
     svn_client_blame_receiver_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -30509,14 +31608,14 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_diff_summarize_func(PyObject *SWIGU
   if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_client_invoke_diff_summarize_func",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     svn_client_diff_summarize_func_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
     arg1 = *tmp;
   }
   {
-    arg2 = (svn_client_diff_summarize_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_client_diff_summarize_t, svn_argnum_obj1);
+    arg2 = (svn_client_diff_summarize_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_client_diff_summarize_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -30594,7 +31693,7 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_import_filter_func(PyObject *SWIGUN
   if (!PyArg_ParseTuple(args,(char *)"OOsO|O:svn_client_invoke_import_filter_func",&obj0,&obj1,&arg4,&obj3,&obj4)) SWIG_fail;
   {
     svn_client_import_filter_func_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__svn_io_dirent2_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__svn_io_dirent2_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -30609,7 +31708,7 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_import_filter_func(PyObject *SWIGUN
     }
   }
   {
-    arg5 = (svn_io_dirent2_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_io_dirent2_t, svn_argnum_obj3);
+    arg5 = (svn_io_dirent2_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_io_dirent2_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -30681,7 +31780,7 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_status_func(PyObject *SWIGUNUSEDPAR
   if (!PyArg_ParseTuple(args,(char *)"OOsO|O:svn_client_invoke_status_func",&obj0,&obj1,&arg3,&obj3,&obj4)) SWIG_fail;
   {
     svn_client_status_func_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -30696,7 +31795,7 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_status_func(PyObject *SWIGUNUSEDPAR
     }
   }
   {
-    arg4 = (svn_client_status_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj3);
+    arg4 = (svn_client_status_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_client_status_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -30767,7 +31866,7 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_list_func2(PyObject *SWIGUNUSEDPARM
   if (!PyArg_ParseTuple(args,(char *)"OOsOOsss|O:svn_client_invoke_list_func2",&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&arg7,&arg8,&obj8)) SWIG_fail;
   {
     svn_client_list_func2_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -30782,13 +31881,13 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_list_func2(PyObject *SWIGUNUSEDPARM
     }
   }
   {
-    arg4 = (svn_dirent_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_dirent_t, svn_argnum_obj3);
+    arg4 = (svn_dirent_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_dirent_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg5 = (svn_lock_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_lock_t, svn_argnum_obj4);
+    arg5 = (svn_lock_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_lock_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -30857,7 +31956,7 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_list_func(PyObject *SWIGUNUSEDPARM(
   if (!PyArg_ParseTuple(args,(char *)"OOsOOs|O:svn_client_invoke_list_func",&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6)) SWIG_fail;
   {
     svn_client_list_func_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -30872,13 +31971,13 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_list_func(PyObject *SWIGUNUSEDPARM(
     }
   }
   {
-    arg4 = (svn_dirent_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_dirent_t, svn_argnum_obj3);
+    arg4 = (svn_dirent_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_dirent_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg5 = (svn_lock_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_lock_t, svn_argnum_obj4);
+    arg5 = (svn_lock_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_lock_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -30944,7 +32043,7 @@ SWIGINTERN PyObject *_wrap_svn_info_invoke_receiver(PyObject *SWIGUNUSEDPARM(sel
   if (!PyArg_ParseTuple(args,(char *)"OOsO|O:svn_info_invoke_receiver",&obj0,&obj1,&arg3,&obj3,&obj4)) SWIG_fail;
   {
     svn_info_receiver_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -30959,7 +32058,7 @@ SWIGINTERN PyObject *_wrap_svn_info_invoke_receiver(PyObject *SWIGUNUSEDPARM(sel
     }
   }
   {
-    arg4 = (svn_info_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_info_t, svn_argnum_obj3);
+    arg4 = (svn_info_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_info_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -31025,7 +32124,7 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_info_receiver2(PyObject *SWIGUNUSED
   if (!PyArg_ParseTuple(args,(char *)"OOsO|O:svn_client_invoke_info_receiver2",&obj0,&obj1,&arg3,&obj3,&obj4)) SWIG_fail;
   {
     svn_client_info_receiver2_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_client_info2_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_client_info2_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -31040,7 +32139,7 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_info_receiver2(PyObject *SWIGUNUSED
     }
   }
   {
-    arg4 = (svn_client_info2_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_client_info2_t, svn_argnum_obj3);
+    arg4 = (svn_client_info2_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_client_info2_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -31110,7 +32209,7 @@ SWIGINTERN PyObject *_wrap_svn_client_invoke_patch_func(PyObject *SWIGUNUSEDPARM
   if (!PyArg_ParseTuple(args,(char *)"OOsss|O:svn_client_invoke_patch_func",&obj0,&obj1,&arg4,&arg5,&arg6,&obj5)) SWIG_fail;
   {
     svn_client_patch_func_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -31427,6 +32526,12 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"svn_client_ctx_t_conflict_baton2_get", _wrap_svn_client_ctx_t_conflict_baton2_get, METH_VARARGS, (char *)"svn_client_ctx_t_conflict_baton2_get(svn_client_ctx_t self) -> void *"},
 	 { (char *)"svn_client_ctx_t_wc_ctx_set", _wrap_svn_client_ctx_t_wc_ctx_set, METH_VARARGS, (char *)"svn_client_ctx_t_wc_ctx_set(svn_client_ctx_t self, svn_wc_context_t * wc_ctx)"},
 	 { (char *)"svn_client_ctx_t_wc_ctx_get", _wrap_svn_client_ctx_t_wc_ctx_get, METH_VARARGS, (char *)"svn_client_ctx_t_wc_ctx_get(svn_client_ctx_t self) -> svn_wc_context_t *"},
+	 { (char *)"svn_client_ctx_t_check_tunnel_func_set", _wrap_svn_client_ctx_t_check_tunnel_func_set, METH_VARARGS, (char *)"svn_client_ctx_t_check_tunnel_func_set(svn_client_ctx_t self, svn_ra_check_tunnel_func_t check_tunnel_func)"},
+	 { (char *)"svn_client_ctx_t_check_tunnel_func_get", _wrap_svn_client_ctx_t_check_tunnel_func_get, METH_VARARGS, (char *)"svn_client_ctx_t_check_tunnel_func_get(svn_client_ctx_t self) -> svn_ra_check_tunnel_func_t"},
+	 { (char *)"svn_client_ctx_t_open_tunnel_func_set", _wrap_svn_client_ctx_t_open_tunnel_func_set, METH_VARARGS, (char *)"svn_client_ctx_t_open_tunnel_func_set(svn_client_ctx_t self, svn_ra_open_tunnel_func_t open_tunnel_func)"},
+	 { (char *)"svn_client_ctx_t_open_tunnel_func_get", _wrap_svn_client_ctx_t_open_tunnel_func_get, METH_VARARGS, (char *)"svn_client_ctx_t_open_tunnel_func_get(svn_client_ctx_t self) -> svn_ra_open_tunnel_func_t"},
+	 { (char *)"svn_client_ctx_t_tunnel_baton_set", _wrap_svn_client_ctx_t_tunnel_baton_set, METH_VARARGS, (char *)"svn_client_ctx_t_tunnel_baton_set(svn_client_ctx_t self, void * tunnel_baton)"},
+	 { (char *)"svn_client_ctx_t_tunnel_baton_get", _wrap_svn_client_ctx_t_tunnel_baton_get, METH_VARARGS, (char *)"svn_client_ctx_t_tunnel_baton_get(svn_client_ctx_t self) -> void *"},
 	 { (char *)"new_svn_client_ctx_t", _wrap_new_svn_client_ctx_t, METH_VARARGS, (char *)"new_svn_client_ctx_t() -> svn_client_ctx_t"},
 	 { (char *)"delete_svn_client_ctx_t", _wrap_delete_svn_client_ctx_t, METH_VARARGS, (char *)"delete_svn_client_ctx_t(svn_client_ctx_t self)"},
 	 { (char *)"svn_client_ctx_t_swigregister", svn_client_ctx_t_swigregister, METH_VARARGS, NULL},
@@ -31647,6 +32752,13 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"delete_svn_client_status_t", _wrap_delete_svn_client_status_t, METH_VARARGS, (char *)"delete_svn_client_status_t(svn_client_status_t self)"},
 	 { (char *)"svn_client_status_t_swigregister", svn_client_status_t_swigregister, METH_VARARGS, NULL},
 	 { (char *)"svn_client_status_dup", _wrap_svn_client_status_dup, METH_VARARGS, (char *)"svn_client_status_dup(svn_client_status_t status, apr_pool_t result_pool) -> svn_client_status_t"},
+	 { (char *)"svn_client_status6", _wrap_svn_client_status6, METH_VARARGS, (char *)"\n"
+		"svn_client_status6(svn_client_ctx_t ctx, char const * path, svn_opt_revision_t revision, svn_depth_t depth, \n"
+		"    svn_boolean_t get_all, svn_boolean_t check_out_of_date, svn_boolean_t check_working_copy, \n"
+		"    svn_boolean_t no_ignore, svn_boolean_t ignore_externals, \n"
+		"    svn_boolean_t depth_as_sticky, apr_array_header_t changelists, svn_client_status_func_t status_func, \n"
+		"    void * status_baton, apr_pool_t scratch_pool) -> svn_error_t\n"
+		""},
 	 { (char *)"svn_client_status5", _wrap_svn_client_status5, METH_VARARGS, (char *)"\n"
 		"svn_client_status5(svn_client_ctx_t ctx, char const * path, svn_opt_revision_t revision, svn_depth_t depth, \n"
 		"    svn_boolean_t get_all, svn_boolean_t update, svn_boolean_t no_ignore, \n"
@@ -31965,6 +33077,16 @@ static PyMethodDef SwigMethods[] = {
 		"    svn_boolean_t discover_changed_paths, apr_array_header_t revprops, \n"
 		"    svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t\n"
 		""},
+	 { (char *)"svn_client_vacuum", _wrap_svn_client_vacuum, METH_VARARGS, (char *)"\n"
+		"svn_client_vacuum(char const * dir_abspath, svn_boolean_t remove_unversioned_items, svn_boolean_t remove_ignored_items, \n"
+		"    svn_boolean_t fix_recorded_timestamps, svn_boolean_t vacuum_pristines, \n"
+		"    svn_boolean_t include_externals, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t\n"
+		""},
+	 { (char *)"svn_client_cleanup2", _wrap_svn_client_cleanup2, METH_VARARGS, (char *)"\n"
+		"svn_client_cleanup2(char const * dir_abspath, svn_boolean_t break_locks, svn_boolean_t fix_recorded_timestamps, \n"
+		"    svn_boolean_t clear_dav_cache, svn_boolean_t vacuum_pristines, svn_boolean_t include_externals, \n"
+		"    svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t\n"
+		""},
 	 { (char *)"svn_client_cleanup", _wrap_svn_client_cleanup, METH_VARARGS, (char *)"svn_client_cleanup(char const * dir, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t"},
 	 { (char *)"svn_client_upgrade", _wrap_svn_client_upgrade, METH_VARARGS, (char *)"svn_client_upgrade(char const * wcroot_dir, svn_client_ctx_t ctx, apr_pool_t scratch_pool) -> svn_error_t"},
 	 { (char *)"svn_client_relocate2", _wrap_svn_client_relocate2, METH_VARARGS, (char *)"\n"
@@ -31975,6 +33097,11 @@ static PyMethodDef SwigMethods[] = {
 		"svn_client_relocate(char const * dir, char const * from_prefix, char const * to_prefix, svn_boolean_t recurse, \n"
 		"    svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t\n"
 		""},
+	 { (char *)"svn_client_revert3", _wrap_svn_client_revert3, METH_VARARGS, (char *)"\n"
+		"svn_client_revert3(apr_array_header_t paths, svn_depth_t depth, apr_array_header_t changelists, svn_boolean_t clear_changelists, \n"
+		"    svn_boolean_t metadata_only, svn_client_ctx_t ctx, \n"
+		"    apr_pool_t pool) -> svn_error_t\n"
+		""},
 	 { (char *)"svn_client_revert2", _wrap_svn_client_revert2, METH_VARARGS, (char *)"\n"
 		"svn_client_revert2(apr_array_header_t paths, svn_depth_t depth, apr_array_header_t changelists, svn_client_ctx_t ctx, \n"
 		"    apr_pool_t pool) -> svn_error_t\n"
@@ -31994,6 +33121,13 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"new_svn_client_copy_source_t", _wrap_new_svn_client_copy_source_t, METH_VARARGS, (char *)"new_svn_client_copy_source_t() -> svn_client_copy_source_t"},
 	 { (char *)"delete_svn_client_copy_source_t", _wrap_delete_svn_client_copy_source_t, METH_VARARGS, (char *)"delete_svn_client_copy_source_t(svn_client_copy_source_t self)"},
 	 { (char *)"svn_client_copy_source_t_swigregister", svn_client_copy_source_t_swigregister, METH_VARARGS, NULL},
+	 { (char *)"svn_client_copy7", _wrap_svn_client_copy7, METH_VARARGS, (char *)"\n"
+		"svn_client_copy7(apr_array_header_t sources, char const * dst_path, svn_boolean_t copy_as_child, svn_boolean_t make_parents, \n"
+		"    svn_boolean_t ignore_externals, svn_boolean_t metadata_only, \n"
+		"    svn_boolean_t pin_externals, apr_hash_t externals_to_pin, apr_hash_t revprop_table, \n"
+		"    svn_commit_callback2_t commit_callback, svn_client_ctx_t ctx, \n"
+		"    apr_pool_t pool) -> svn_error_t\n"
+		""},
 	 { (char *)"svn_client_copy6", _wrap_svn_client_copy6, METH_VARARGS, (char *)"\n"
 		"svn_client_copy6(apr_array_header_t sources, char const * dst_path, svn_boolean_t copy_as_child, svn_boolean_t make_parents, \n"
 		"    svn_boolean_t ignore_externals, apr_hash_t revprop_table, \n"
@@ -32189,6 +33323,11 @@ static PyMethodDef SwigMethods[] = {
 		"svn_client_ls(char const * path_or_url, svn_opt_revision_t revision, svn_boolean_t recurse, svn_client_ctx_t ctx, \n"
 		"    apr_pool_t pool) -> svn_error_t\n"
 		""},
+	 { (char *)"svn_client_cat3", _wrap_svn_client_cat3, METH_VARARGS, (char *)"\n"
+		"svn_client_cat3(svn_stream_t * out, char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, \n"
+		"    svn_boolean_t expand_keywords, svn_client_ctx_t ctx, \n"
+		"    apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t\n"
+		""},
 	 { (char *)"svn_client_cat2", _wrap_svn_client_cat2, METH_VARARGS, (char *)"\n"
 		"svn_client_cat2(svn_stream_t * out, char const * path_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, \n"
 		"    svn_client_ctx_t ctx, apr_pool_t pool) -> svn_error_t\n"
@@ -32298,6 +33437,13 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"delete_svn_client_info2_t", _wrap_delete_svn_client_info2_t, METH_VARARGS, (char *)"delete_svn_client_info2_t(svn_client_info2_t self)"},
 	 { (char *)"svn_client_info2_t_swigregister", svn_client_info2_t_swigregister, METH_VARARGS, NULL},
 	 { (char *)"svn_client_info2_dup", _wrap_svn_client_info2_dup, METH_VARARGS, (char *)"svn_client_info2_dup(svn_client_info2_t info, apr_pool_t pool) -> svn_client_info2_t"},
+	 { (char *)"svn_client_info4", _wrap_svn_client_info4, METH_VARARGS, (char *)"\n"
+		"svn_client_info4(char const * abspath_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, \n"
+		"    svn_depth_t depth, svn_boolean_t fetch_excluded, svn_boolean_t fetch_actual_only, \n"
+		"    svn_boolean_t include_externals, apr_array_header_t changelists, \n"
+		"    svn_client_info_receiver2_t receiver, void * receiver_baton, svn_client_ctx_t ctx, \n"
+		"    apr_pool_t scratch_pool) -> svn_error_t\n"
+		""},
 	 { (char *)"svn_client_info3", _wrap_svn_client_info3, METH_VARARGS, (char *)"\n"
 		"svn_client_info3(char const * abspath_or_url, svn_opt_revision_t peg_revision, svn_opt_revision_t revision, \n"
 		"    svn_depth_t depth, svn_boolean_t fetch_excluded, svn_boolean_t fetch_actual_only, \n"
@@ -32439,6 +33585,7 @@ static swig_type_info _swigt__p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_
 static swig_type_info _swigt__p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_auth_ssl_client_cert_prompt_func_t|struct svn_error_t *(*)(svn_auth_cred_ssl_client_cert_t **,void *,char const *,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_auth_cred_ssl_server_trust_t **,void *,char const *,apr_uint32_t,svn_auth_ssl_server_cert_info_t const *,svn_boolean_t,apr_pool_t *)|svn_auth_ssl_server_trust_prompt_func_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_auth_cred_username_t **,void *,char const *,svn_boolean_t,apr_pool_t *)|svn_auth_username_prompt_func_t", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_ra_open_tunnel_func_t|struct svn_error_t *(*)(svn_stream_t **,svn_stream_t **,svn_ra_close_tunnel_func_t *,void **,void *,char const *,char const *,char const *,int,svn_cancel_func_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t", "svn_wc_conflict_resolver_func2_t|struct svn_error_t *(*)(svn_wc_conflict_result_t **,svn_wc_conflict_description2_t const *,void *,apr_pool_t *,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_wc_conflict_resolver_func_t|struct svn_error_t *(*)(svn_wc_conflict_result_t **,svn_wc_conflict_description_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_client_diff_summarize_func_t|struct svn_error_t *(*)(svn_client_diff_summarize_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0};
@@ -32447,6 +33594,7 @@ static swig_type_info _swigt__p_f_p_void__p_svn_error_t = {"_p_f_p_void__p_svn_e
 static swig_type_info _swigt__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_int64_t,svn_revnum_t,char const *,char const *,char const *,apr_pool_t *)|svn_client_blame_receiver_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_client_blame_receiver2_t|struct svn_error_t *(*)(void *,apr_int64_t,svn_revnum_t,char const *,char const *,svn_revnum_t,char const *,char const *,char const *,char const *,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_hash_t *,svn_revnum_t,char const *,char const *,char const *,apr_pool_t *)|svn_log_message_receiver_t", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_f_p_void_p_q_const__char__int = {"_p_f_p_void_p_q_const__char__int", "int (*)(void *,char const *)|svn_ra_check_tunnel_func_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void = {"_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void", "void (*)(void *,char const *,enum svn_wc_notify_action_t,enum svn_node_kind_t,char const *,enum svn_wc_notify_state_t,enum svn_wc_notify_state_t,long)|svn_wc_notify_func_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,apr_hash_t *,apr_array_header_t *,apr_pool_t *)|svn_proplist_receiver2_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,apr_hash_t *,apr_pool_t *)|svn_proplist_receiver_t", 0, 0, (void*)0, 0};
@@ -32472,12 +33620,14 @@ static swig_type_info _swigt__p_p_char = {"_p_p_char", "char **", 0, 0, (void*)0
 static swig_type_info _swigt__p_p_f_apr_off_t_apr_off_t_p_void_p_apr_pool_t__void = {"_p_p_f_apr_off_t_apr_off_t_p_void_p_apr_pool_t__void", "void (**)(apr_off_t,apr_off_t,void *,apr_pool_t *)|svn_ra_progress_notify_func_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_f_p_p_q_const__char_p_p_q_const__char_p_apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_p_q_const__char_p_p_q_const__char_p_apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_client_get_commit_log_t *|struct svn_error_t *(**)(char const **,char const **,apr_array_header_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_f_p_p_q_const__char_p_p_q_const__char_p_q_const__apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_p_q_const__char_p_p_q_const__char_p_q_const__apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_client_get_commit_log3_t *|svn_client_get_commit_log2_t *|struct svn_error_t *(**)(char const **,char const **,apr_array_header_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(svn_stream_t **,svn_stream_t **,svn_ra_close_tunnel_func_t *,void **,void *,char const *,char const *,char const *,int,svn_cancel_func_t,void *,apr_pool_t *)|svn_ra_open_tunnel_func_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(svn_wc_conflict_result_t **,svn_wc_conflict_description2_t const *,void *,apr_pool_t *,apr_pool_t *)|svn_wc_conflict_resolver_func2_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(svn_wc_conflict_result_t **,svn_wc_conflict_description_t const *,void *,apr_pool_t *)|svn_wc_conflict_resolver_func_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(svn_client_diff_summarize_t const *,void *,apr_pool_t *)|svn_client_diff_summarize_func_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_f_p_void__p_svn_error_t = {"_p_p_f_p_void__p_svn_error_t", "svn_cancel_func_t *|struct svn_error_t *(**)(void *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(void *,apr_int64_t,svn_revnum_t,char const *,char const *,char const *,apr_pool_t *)|svn_client_blame_receiver_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(void *,apr_int64_t,svn_revnum_t,char const *,char const *,svn_revnum_t,char const *,char const *,char const *,char const *,apr_pool_t *)|svn_client_blame_receiver2_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_p_f_p_void_p_q_const__char__int = {"_p_p_f_p_void_p_q_const__char__int", "int (**)(void *,char const *)|svn_ra_check_tunnel_func_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void = {"_p_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void", "void (**)(void *,char const *,enum svn_wc_notify_action_t,enum svn_node_kind_t,char const *,enum svn_wc_notify_state_t,enum svn_wc_notify_state_t,long)|svn_wc_notify_func_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(void *,char const *,apr_hash_t *,apr_array_header_t *,apr_pool_t *)|svn_proplist_receiver2_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(void *,char const *,apr_hash_t *,apr_pool_t *)|svn_proplist_receiver_t *", 0, 0, (void*)0, 0};
@@ -32527,9 +33677,11 @@ static swig_type_info _swigt__p_svn_config_t = {"_p_svn_config_t", "struct svn_c
 static swig_type_info _swigt__p_svn_delta_editor_t = {"_p_svn_delta_editor_t", "struct svn_delta_editor_t *|svn_delta_editor_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_depth_t = {"_p_svn_depth_t", "enum svn_depth_t *|svn_depth_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_diff_file_options_t = {"_p_svn_diff_file_options_t", "svn_diff_file_options_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_diff_hunk_t = {"_p_svn_diff_hunk_t", "svn_diff_hunk_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_dirent_t = {"_p_svn_dirent_t", "struct svn_dirent_t *|svn_dirent_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_errno_t = {"_p_svn_errno_t", "enum svn_errno_t *|svn_errno_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "struct svn_error_t *|svn_error_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_fs_lock_target_t = {"_p_svn_fs_lock_target_t", "svn_fs_lock_target_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_info_t = {"_p_svn_info_t", "struct svn_info_t *|svn_info_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_io_dirent2_t = {"_p_svn_io_dirent2_t", "struct svn_io_dirent2_t *|svn_io_dirent2_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_io_dirent_t = {"_p_svn_io_dirent_t", "struct svn_io_dirent_t *|svn_io_dirent_t *", 0, 0, (void*)0, 0};
@@ -32573,11 +33725,9 @@ static swig_type_info _swigt__p_svn_wc_adm_access_t = {"_p_svn_wc_adm_access_t",
 static swig_type_info _swigt__p_svn_wc_committed_queue_t = {"_p_svn_wc_committed_queue_t", "struct svn_wc_committed_queue_t *|svn_wc_committed_queue_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_wc_conflict_action_t = {"_p_svn_wc_conflict_action_t", "enum svn_wc_conflict_action_t *|svn_wc_conflict_action_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_wc_conflict_choice_t = {"_p_svn_wc_conflict_choice_t", "enum svn_wc_conflict_choice_t *|svn_wc_conflict_choice_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_svn_wc_conflict_description2_t = {"_p_svn_wc_conflict_description2_t", "struct svn_wc_conflict_description2_t *|svn_wc_conflict_description2_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_wc_conflict_description_t = {"_p_svn_wc_conflict_description_t", "struct svn_wc_conflict_description_t *|svn_wc_conflict_description_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_wc_conflict_kind_t = {"_p_svn_wc_conflict_kind_t", "enum svn_wc_conflict_kind_t *|svn_wc_conflict_kind_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_wc_conflict_reason_t = {"_p_svn_wc_conflict_reason_t", "enum svn_wc_conflict_reason_t *|svn_wc_conflict_reason_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_svn_wc_conflict_result_t = {"_p_svn_wc_conflict_result_t", "struct svn_wc_conflict_result_t *|svn_wc_conflict_result_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_wc_conflict_version_t = {"_p_svn_wc_conflict_version_t", "struct svn_wc_conflict_version_t *|svn_wc_conflict_version_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_wc_context_t = {"_p_svn_wc_context_t", "struct svn_wc_context_t *|svn_wc_context_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_wc_diff_callbacks2_t = {"_p_svn_wc_diff_callbacks2_t", "struct svn_wc_diff_callbacks2_t *|svn_wc_diff_callbacks2_t *", 0, 0, (void*)0, 0};
@@ -32623,6 +33773,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t,
+  &_swigt__p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t,
@@ -32631,6 +33782,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t,
+  &_swigt__p_f_p_void_p_q_const__char__int,
   &_swigt__p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void,
   &_swigt__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t,
@@ -32656,12 +33808,14 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_p_f_apr_off_t_apr_off_t_p_void_p_apr_pool_t__void,
   &_swigt__p_p_f_p_p_q_const__char_p_p_q_const__char_p_apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_p_f_p_p_q_const__char_p_p_q_const__char_p_q_const__apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t,
+  &_swigt__p_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_p_f_p_void__p_svn_error_t,
   &_swigt__p_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t,
+  &_swigt__p_p_f_p_void_p_q_const__char__int,
   &_swigt__p_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void,
   &_swigt__p_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t,
@@ -32711,9 +33865,11 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_svn_delta_editor_t,
   &_swigt__p_svn_depth_t,
   &_swigt__p_svn_diff_file_options_t,
+  &_swigt__p_svn_diff_hunk_t,
   &_swigt__p_svn_dirent_t,
   &_swigt__p_svn_errno_t,
   &_swigt__p_svn_error_t,
+  &_swigt__p_svn_fs_lock_target_t,
   &_swigt__p_svn_info_t,
   &_swigt__p_svn_io_dirent2_t,
   &_swigt__p_svn_io_dirent_t,
@@ -32757,11 +33913,9 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_svn_wc_committed_queue_t,
   &_swigt__p_svn_wc_conflict_action_t,
   &_swigt__p_svn_wc_conflict_choice_t,
-  &_swigt__p_svn_wc_conflict_description2_t,
   &_swigt__p_svn_wc_conflict_description_t,
   &_swigt__p_svn_wc_conflict_kind_t,
   &_swigt__p_svn_wc_conflict_reason_t,
-  &_swigt__p_svn_wc_conflict_result_t,
   &_swigt__p_svn_wc_conflict_version_t,
   &_swigt__p_svn_wc_context_t,
   &_swigt__p_svn_wc_diff_callbacks2_t,
@@ -32807,6 +33961,7 @@ static swig_cast_info _swigc__p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_
 static swig_cast_info _swigc__p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -32815,6 +33970,7 @@ static swig_cast_info _swigc__p_f_p_void__p_svn_error_t[] = {  {&_swigt__p_f_p_v
 static swig_cast_info _swigc__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_f_p_void_p_q_const__char__int[] = {  {&_swigt__p_f_p_void_p_q_const__char__int, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void[] = {  {&_swigt__p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -32840,12 +33996,14 @@ static swig_cast_info _swigc__p_p_char[] = {  {&_swigt__p_p_char, 0, 0, 0},{0, 0
 static swig_cast_info _swigc__p_p_f_apr_off_t_apr_off_t_p_void_p_apr_pool_t__void[] = {  {&_swigt__p_p_f_apr_off_t_apr_off_t_p_void_p_apr_pool_t__void, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_f_p_p_q_const__char_p_p_q_const__char_p_apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_p_f_p_p_q_const__char_p_p_q_const__char_p_apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_f_p_p_q_const__char_p_p_q_const__char_p_q_const__apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_p_f_p_p_q_const__char_p_p_q_const__char_p_q_const__apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_f_p_void__p_svn_error_t[] = {  {&_swigt__p_p_f_p_void__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_p_f_p_void_p_q_const__char__int[] = {  {&_swigt__p_p_f_p_void_p_q_const__char__int, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void[] = {  {&_swigt__p_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -32895,9 +34053,11 @@ static swig_cast_info _swigc__p_svn_config_t[] = {  {&_swigt__p_svn_config_t, 0,
 static swig_cast_info _swigc__p_svn_delta_editor_t[] = {  {&_swigt__p_svn_delta_editor_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_depth_t[] = {  {&_swigt__p_svn_depth_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_diff_file_options_t[] = {  {&_swigt__p_svn_diff_file_options_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_diff_hunk_t[] = {  {&_swigt__p_svn_diff_hunk_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_dirent_t[] = {  {&_swigt__p_svn_dirent_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_errno_t[] = {  {&_swigt__p_svn_errno_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_error_t[] = {  {&_swigt__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_fs_lock_target_t[] = {  {&_swigt__p_svn_fs_lock_target_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_info_t[] = {  {&_swigt__p_svn_info_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_io_dirent2_t[] = {  {&_swigt__p_svn_io_dirent2_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_io_dirent_t[] = {  {&_swigt__p_svn_io_dirent_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -32941,11 +34101,9 @@ static swig_cast_info _swigc__p_svn_wc_adm_access_t[] = {  {&_swigt__p_svn_wc_ad
 static swig_cast_info _swigc__p_svn_wc_committed_queue_t[] = {  {&_swigt__p_svn_wc_committed_queue_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_wc_conflict_action_t[] = {  {&_swigt__p_svn_wc_conflict_action_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_wc_conflict_choice_t[] = {  {&_swigt__p_svn_wc_conflict_choice_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_svn_wc_conflict_description2_t[] = {  {&_swigt__p_svn_wc_conflict_description2_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_wc_conflict_description_t[] = {  {&_swigt__p_svn_wc_conflict_description_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_wc_conflict_kind_t[] = {  {&_swigt__p_svn_wc_conflict_kind_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_wc_conflict_reason_t[] = {  {&_swigt__p_svn_wc_conflict_reason_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_svn_wc_conflict_result_t[] = {  {&_swigt__p_svn_wc_conflict_result_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_wc_conflict_version_t[] = {  {&_swigt__p_svn_wc_conflict_version_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_wc_context_t[] = {  {&_swigt__p_svn_wc_context_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_wc_diff_callbacks2_t[] = {  {&_swigt__p_svn_wc_diff_callbacks2_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -32991,6 +34149,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t,
+  _swigc__p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t,
@@ -32999,6 +34158,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t,
+  _swigc__p_f_p_void_p_q_const__char__int,
   _swigc__p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void,
   _swigc__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t,
@@ -33024,12 +34184,14 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_p_f_apr_off_t_apr_off_t_p_void_p_apr_pool_t__void,
   _swigc__p_p_f_p_p_q_const__char_p_p_q_const__char_p_apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t,
   _swigc__p_p_f_p_p_q_const__char_p_p_q_const__char_p_q_const__apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t,
+  _swigc__p_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t,
   _swigc__p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t,
   _swigc__p_p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t,
   _swigc__p_p_f_p_void__p_svn_error_t,
   _swigc__p_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t,
   _swigc__p_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t,
+  _swigc__p_p_f_p_void_p_q_const__char__int,
   _swigc__p_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void,
   _swigc__p_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t,
@@ -33079,9 +34241,11 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_svn_delta_editor_t,
   _swigc__p_svn_depth_t,
   _swigc__p_svn_diff_file_options_t,
+  _swigc__p_svn_diff_hunk_t,
   _swigc__p_svn_dirent_t,
   _swigc__p_svn_errno_t,
   _swigc__p_svn_error_t,
+  _swigc__p_svn_fs_lock_target_t,
   _swigc__p_svn_info_t,
   _swigc__p_svn_io_dirent2_t,
   _swigc__p_svn_io_dirent_t,
@@ -33125,11 +34289,9 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_svn_wc_committed_queue_t,
   _swigc__p_svn_wc_conflict_action_t,
   _swigc__p_svn_wc_conflict_choice_t,
-  _swigc__p_svn_wc_conflict_description2_t,
   _swigc__p_svn_wc_conflict_description_t,
   _swigc__p_svn_wc_conflict_kind_t,
   _swigc__p_svn_wc_conflict_reason_t,
-  _swigc__p_svn_wc_conflict_result_t,
   _swigc__p_svn_wc_conflict_version_t,
   _swigc__p_svn_wc_context_t,
   _swigc__p_svn_wc_diff_callbacks2_t,
@@ -33173,18 +34335,18 @@ static swig_const_info swig_const_table[] = {
 #endif
 /* -----------------------------------------------------------------------------
  * Type initialization:
- * This problem is tough by the requirement that no dynamic 
- * memory is used. Also, since swig_type_info structures store pointers to 
+ * This problem is tough by the requirement that no dynamic
+ * memory is used. Also, since swig_type_info structures store pointers to
  * swig_cast_info structures and swig_cast_info structures store pointers back
- * to swig_type_info structures, we need some lookup code at initialization. 
- * The idea is that swig generates all the structures that are needed. 
- * The runtime then collects these partially filled structures. 
- * The SWIG_InitializeModule function takes these initial arrays out of 
+ * to swig_type_info structures, we need some lookup code at initialization.
+ * The idea is that swig generates all the structures that are needed.
+ * The runtime then collects these partially filled structures.
+ * The SWIG_InitializeModule function takes these initial arrays out of
  * swig_module, and does all the lookup, filling in the swig_module.types
  * array with the correct data and linking the correct swig_cast_info
  * structures together.
  *
- * The generated swig_type_info structures are assigned staticly to an initial 
+ * The generated swig_type_info structures are assigned staticly to an initial
  * array. We just loop through that array, and handle each type individually.
  * First we lookup if this type has been already loaded, and if so, use the
  * loaded structure instead of the generated one. Then we have to fill in the
@@ -33194,17 +34356,17 @@ static swig_const_info swig_const_table[] = {
  * a column is one of the swig_cast_info structures for that type.
  * The cast_initial array is actually an array of arrays, because each row has
  * a variable number of columns. So to actually build the cast linked list,
- * we find the array of casts associated with the type, and loop through it 
+ * we find the array of casts associated with the type, and loop through it
  * adding the casts to the list. The one last trick we need to do is making
  * sure the type pointer in the swig_cast_info struct is correct.
  *
- * First off, we lookup the cast->type name to see if it is already loaded. 
+ * First off, we lookup the cast->type name to see if it is already loaded.
  * There are three cases to handle:
  *  1) If the cast->type has already been loaded AND the type we are adding
  *     casting info to has not been loaded (it is in this module), THEN we
  *     replace the cast->type pointer with the type pointer that has already
  *     been loaded.
- *  2) If BOTH types (the one we are adding casting info to, and the 
+ *  2) If BOTH types (the one we are adding casting info to, and the
  *     cast->type) are loaded, THEN the cast info has already been loaded by
  *     the previous module so we just ignore it.
  *  3) Finally, if cast->type has not already been loaded, then we add that
@@ -33267,7 +34429,7 @@ SWIG_InitializeModule(void *clientdata) {
     module_head->next = &swig_module;
   }
   
-  /* When multiple interpeters are used, a module could have already been initialized in
+  /* When multiple interpreters are used, a module could have already been initialized in
        a different interpreter, but not yet have a pointer in this interpreter.
        In this case, we do not want to continue adding types... everything should be
        set up already */
@@ -33862,7 +35024,7 @@ SWIG_init(void) {
     svn_cancel_func_t * tmp = malloc(sizeof(svn_cancel_func_t));
     *tmp = (svn_cancel_func_t) svn_swig_py_cancel_func;
     
-    SWIG_Python_SetConstant(d, "svn_swig_py_cancel_func",svn_swig_NewPointerObj(tmp, SWIGTYPE_p_p_f_p_void__p_svn_error_t, NULL, NULL))
+    SWIG_Python_SetConstant(d, "svn_swig_py_cancel_func",svn_swig_py_new_pointer_obj(tmp, SWIGTYPE_p_p_f_p_void__p_svn_error_t, NULL, NULL))
     
     ;
     
@@ -33871,7 +35033,7 @@ SWIG_init(void) {
     svn_client_get_commit_log3_t * tmp = malloc(sizeof(svn_client_get_commit_log3_t));
     *tmp = (svn_client_get_commit_log3_t) svn_swig_py_get_commit_log_func;
     
-    SWIG_Python_SetConstant(d, "svn_swig_py_get_commit_log_func",svn_swig_NewPointerObj(tmp, SWIGTYPE_p_p_f_p_p_q_const__char_p_p_q_const__char_p_q_const__apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t, NULL, NULL))
+    SWIG_Python_SetConstant(d, "svn_swig_py_get_commit_log_func",svn_swig_py_new_pointer_obj(tmp, SWIGTYPE_p_p_f_p_p_q_const__char_p_p_q_const__char_p_q_const__apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t, NULL, NULL))
     
     ;
     
@@ -33880,7 +35042,7 @@ SWIG_init(void) {
     svn_wc_notify_func_t * tmp = malloc(sizeof(svn_wc_notify_func_t));
     *tmp = (svn_wc_notify_func_t) svn_swig_py_notify_func;
     
-    SWIG_Python_SetConstant(d, "svn_swig_py_notify_func",svn_swig_NewPointerObj(tmp, SWIGTYPE_p_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void, NULL, NULL))
+    SWIG_Python_SetConstant(d, "svn_swig_py_notify_func",svn_swig_py_new_pointer_obj(tmp, SWIGTYPE_p_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void, NULL, NULL))
     
     ;
     
@@ -33889,7 +35051,7 @@ SWIG_init(void) {
     svn_wc_notify_func2_t * tmp = malloc(sizeof(svn_wc_notify_func2_t));
     *tmp = (svn_wc_notify_func2_t) svn_swig_py_notify_func2;
     
-    SWIG_Python_SetConstant(d, "svn_swig_py_notify_func2",svn_swig_NewPointerObj(tmp, SWIGTYPE_p_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void, NULL, NULL))
+    SWIG_Python_SetConstant(d, "svn_swig_py_notify_func2",svn_swig_py_new_pointer_obj(tmp, SWIGTYPE_p_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void, NULL, NULL))
     
     ;
     
diff --git a/subversion/bindings/swig/python/svn_delta.c b/subversion/bindings/swig/python/svn_delta.c
index 2c66025..0ed9050 100644
--- a/subversion/bindings/swig/python/svn_delta.c
+++ b/subversion/bindings/swig/python/svn_delta.c
@@ -1,11 +1,11 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
- * 
- * This file is not intended to be easily readable and contains a number of 
+ * Version 2.0.12
+ *
+ * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
- * changes to this file unless you know what you are doing--modify the SWIG 
- * interface file instead. 
+ * changes to this file unless you know what you are doing--modify the SWIG
+ * interface file instead.
  * ----------------------------------------------------------------------------- */
 
 #define SWIGPYTHON
@@ -43,28 +43,28 @@
 #ifndef SWIGUNUSED
 # if defined(__GNUC__)
 #   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__)) 
+#     define SWIGUNUSED __attribute__ ((__unused__))
 #   else
 #     define SWIGUNUSED
 #   endif
 # elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__)) 
+#   define SWIGUNUSED __attribute__ ((__unused__))
 # else
-#   define SWIGUNUSED 
+#   define SWIGUNUSED
 # endif
 #endif
 
 #ifndef SWIG_MSC_UNSUPPRESS_4505
 # if defined(_MSC_VER)
 #   pragma warning(disable : 4505) /* unreferenced local function has been removed */
-# endif 
+# endif
 #endif
 
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
 # else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
 # endif
 #endif
 
@@ -107,7 +107,7 @@
 #   define SWIGSTDCALL __stdcall
 # else
 #   define SWIGSTDCALL
-# endif 
+# endif
 #endif
 
 /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
@@ -122,8 +122,14 @@
 
 
 
-/* Python.h has to appear first */
-#include <Python.h>
+#if defined(_DEBUG) && defined(SWIG_PYTHON_INTERPRETER_NO_DEBUG)
+/* Use debug wrappers with the Python release dll */
+# undef _DEBUG
+# include <Python.h>
+# define _DEBUG
+#else
+# include <Python.h>
+#endif
 
 /* -----------------------------------------------------------------------------
  * swigrun.swg
@@ -149,7 +155,7 @@
   You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for
   creating a static or dynamic library from the SWIG runtime code.
   In 99.9% of the cases, SWIG just needs to declare them as 'static'.
-  
+
   But only do this if strictly necessary, ie, if you have problems
   with your compiler or suchlike.
 */
@@ -175,16 +181,16 @@
 #define SWIG_POINTER_OWN           0x1
 
 
-/* 
+/*
    Flags/methods for returning states.
-   
-   The SWIG conversion methods, as ConvertPtr, return an integer 
+
+   The SWIG conversion methods, as ConvertPtr, return an integer
    that tells if the conversion was successful or not. And if not,
    an error code can be returned (see swigerrors.swg for the codes).
-   
+
    Use the following macros/flags to set or process the returning
    states.
-   
+
    In old versions of SWIG, code such as the following was usually written:
 
      if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) {
@@ -217,23 +223,23 @@
     } else {
       // fail code
     }
-    
+
    I.e., now SWIG_ConvertPtr can return new objects and you can
    identify the case and take care of the deallocation. Of course that
    also requires SWIG_ConvertPtr to return new result values, such as
 
-      int SWIG_ConvertPtr(obj, ptr,...) {         
-        if (<obj is ok>) {			       
-          if (<need new object>) {		       
-            *ptr = <ptr to new allocated object>; 
-            return SWIG_NEWOBJ;		       
-          } else {				       
-            *ptr = <ptr to old object>;	       
-            return SWIG_OLDOBJ;		       
-          } 				       
-        } else {				       
-          return SWIG_BADOBJ;		       
-        }					       
+      int SWIG_ConvertPtr(obj, ptr,...) {
+        if (<obj is ok>) {
+          if (<need new object>) {
+            *ptr = <ptr to new allocated object>;
+            return SWIG_NEWOBJ;
+          } else {
+            *ptr = <ptr to old object>;
+            return SWIG_OLDOBJ;
+          }
+        } else {
+          return SWIG_BADOBJ;
+        }
       }
 
    Of course, returning the plain '0(success)/-1(fail)' still works, but you can be
@@ -247,17 +253,17 @@
        int fooi(int);
 
    and you call
- 
+
       food(1)   // cast rank '1'  (1 -> 1.0)
       fooi(1)   // cast rank '0'
 
    just use the SWIG_AddCast()/SWIG_CheckState()
 */
 
-#define SWIG_OK                    (0) 
+#define SWIG_OK                    (0)
 #define SWIG_ERROR                 (-1)
 #define SWIG_IsOK(r)               (r >= 0)
-#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)  
+#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)
 
 /* The CastRankLimit says how many bits are used for the cast rank */
 #define SWIG_CASTRANKLIMIT         (1 << 8)
@@ -288,14 +294,14 @@
 #  endif
 #  define SWIG_CASTRANKMASK          ((SWIG_CASTRANKLIMIT) -1)
 #  define SWIG_CastRank(r)           (r & SWIG_CASTRANKMASK)
-SWIGINTERNINLINE int SWIG_AddCast(int r) { 
+SWIGINTERNINLINE int SWIG_AddCast(int r) {
   return SWIG_IsOK(r) ? ((SWIG_CastRank(r) < SWIG_MAXCASTRANK) ? (r + 1) : SWIG_ERROR) : r;
 }
-SWIGINTERNINLINE int SWIG_CheckState(int r) { 
-  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0; 
+SWIGINTERNINLINE int SWIG_CheckState(int r) {
+  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0;
 }
 #else /* no cast-rank mode */
-#  define SWIG_AddCast
+#  define SWIG_AddCast(r) (r)
 #  define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0)
 #endif
 
@@ -339,7 +345,7 @@ typedef struct swig_module_info {
   void                    *clientdata;		/* Language specific module data */
 } swig_module_info;
 
-/* 
+/*
   Compare two type names skipping the space characters, therefore
   "char*" == "char *" and "Class<int>" == "Class<int >", etc.
 
@@ -359,18 +365,18 @@ SWIG_TypeNameComp(const char *f1, const char *l1,
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if not equal, 1 if equal
+  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
 */
 SWIGRUNTIME int
-SWIG_TypeEquiv(const char *nb, const char *tb) {
-  int equiv = 0;
+SWIG_TypeCmp(const char *nb, const char *tb) {
+  int equiv = 1;
   const char* te = tb + strlen(tb);
   const char* ne = nb;
-  while (!equiv && *ne) {
+  while (equiv != 0 && *ne) {
     for (nb = ne; *ne; ++ne) {
       if (*ne == '|') break;
     }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
+    equiv = SWIG_TypeNameComp(nb, ne, tb, te);
     if (*ne) ++ne;
   }
   return equiv;
@@ -378,24 +384,13 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
+  Return 0 if not equal, 1 if equal
 */
 SWIGRUNTIME int
-SWIG_TypeCompare(const char *nb, const char *tb) {
-  int equiv = 0;
-  const char* te = tb + strlen(tb);
-  const char* ne = nb;
-  while (!equiv && *ne) {
-    for (nb = ne; *ne; ++ne) {
-      if (*ne == '|') break;
-    }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
-    if (*ne) ++ne;
-  }
-  return equiv;
+SWIG_TypeEquiv(const char *nb, const char *tb) {
+  return SWIG_TypeCmp(nb, tb) == 0 ? 1 : 0;
 }
 
-
 /*
   Check the typename
 */
@@ -423,7 +418,7 @@ SWIG_TypeCheck(const char *c, swig_type_info *ty) {
   return 0;
 }
 
-/* 
+/*
   Identical to SWIG_TypeCheck, except strcmp is replaced with a pointer comparison
 */
 SWIGRUNTIME swig_cast_info *
@@ -458,7 +453,7 @@ SWIG_TypeCast(swig_cast_info *ty, void *ptr, int *newmemory) {
   return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr, newmemory);
 }
 
-/* 
+/*
    Dynamic pointer casting. Down an inheritance hierarchy
 */
 SWIGRUNTIME swig_type_info *
@@ -502,7 +497,7 @@ SWIG_TypePrettyName(const swig_type_info *type) {
     return type->name;
 }
 
-/* 
+/*
    Set the clientdata field for a type
 */
 SWIGRUNTIME void
@@ -510,14 +505,14 @@ SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
   swig_cast_info *cast = ti->cast;
   /* if (ti->clientdata == clientdata) return; */
   ti->clientdata = clientdata;
-  
+
   while (cast) {
     if (!cast->converter) {
       swig_type_info *tc = cast->type;
       if (!tc->clientdata) {
 	SWIG_TypeClientData(tc, clientdata);
       }
-    }    
+    }
     cast = cast->next;
   }
 }
@@ -526,18 +521,18 @@ SWIG_TypeNewClientData(swig_type_info *ti, void *clientdata) {
   SWIG_TypeClientData(ti, clientdata);
   ti->owndata = 1;
 }
-  
+
 /*
   Search for a swig_type_info structure only by mangled name
   Search is a O(log #types)
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_MangledTypeQueryModule(swig_module_info *start, 
-                            swig_module_info *end, 
+SWIG_MangledTypeQueryModule(swig_module_info *start,
+                            swig_module_info *end,
 		            const char *name) {
   swig_module_info *iter = start;
   do {
@@ -546,11 +541,11 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
       register size_t r = iter->size - 1;
       do {
 	/* since l+r >= 0, we can (>> 1) instead (/ 2) */
-	register size_t i = (l + r) >> 1; 
+	register size_t i = (l + r) >> 1;
 	const char *iname = iter->types[i]->name;
 	if (iname) {
 	  register int compare = strcmp(name, iname);
-	  if (compare == 0) {	    
+	  if (compare == 0) {
 	    return iter->types[i];
 	  } else if (compare < 0) {
 	    if (i) {
@@ -575,14 +570,14 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
   Search for a swig_type_info structure for either a mangled name or a human readable name.
   It first searches the mangled names of the types, which is a O(log #types)
   If a type is not found it then searches the human readable names, which is O(#types).
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_TypeQueryModule(swig_module_info *start, 
-                     swig_module_info *end, 
+SWIG_TypeQueryModule(swig_module_info *start,
+                     swig_module_info *end,
 		     const char *name) {
   /* STEP 1: Search the name field using binary search */
   swig_type_info *ret = SWIG_MangledTypeQueryModule(start, end, name);
@@ -601,12 +596,12 @@ SWIG_TypeQueryModule(swig_module_info *start,
       iter = iter->next;
     } while (iter != end);
   }
-  
+
   /* neither found a match */
   return 0;
 }
 
-/* 
+/*
    Pack binary data into a string
 */
 SWIGRUNTIME char *
@@ -622,7 +617,7 @@ SWIG_PackData(char *c, void *ptr, size_t sz) {
   return c;
 }
 
-/* 
+/*
    Unpack binary data from a string
 */
 SWIGRUNTIME const char *
@@ -636,21 +631,21 @@ SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
       uu = ((d - '0') << 4);
     else if ((d >= 'a') && (d <= 'f'))
       uu = ((d - ('a'-10)) << 4);
-    else 
+    else
       return (char *) 0;
     d = *(c++);
     if ((d >= '0') && (d <= '9'))
       uu |= (d - '0');
     else if ((d >= 'a') && (d <= 'f'))
       uu |= (d - ('a'-10));
-    else 
+    else
       return (char *) 0;
     *u = uu;
   }
   return c;
 }
 
-/* 
+/*
    Pack 'void *' into a string buffer.
 */
 SWIGRUNTIME char *
@@ -710,18 +705,18 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 #endif
 
 /*  Errors in SWIG */
-#define  SWIG_UnknownError    	   -1 
-#define  SWIG_IOError        	   -2 
-#define  SWIG_RuntimeError   	   -3 
-#define  SWIG_IndexError     	   -4 
-#define  SWIG_TypeError      	   -5 
-#define  SWIG_DivisionByZero 	   -6 
-#define  SWIG_OverflowError  	   -7 
-#define  SWIG_SyntaxError    	   -8 
-#define  SWIG_ValueError     	   -9 
+#define  SWIG_UnknownError    	   -1
+#define  SWIG_IOError        	   -2
+#define  SWIG_RuntimeError   	   -3
+#define  SWIG_IndexError     	   -4
+#define  SWIG_TypeError      	   -5
+#define  SWIG_DivisionByZero 	   -6
+#define  SWIG_OverflowError  	   -7
+#define  SWIG_SyntaxError    	   -8
+#define  SWIG_ValueError     	   -9
 #define  SWIG_SystemError    	   -10
 #define  SWIG_AttributeError 	   -11
-#define  SWIG_MemoryError    	   -12 
+#define  SWIG_MemoryError    	   -12
 #define  SWIG_NullReferenceError   -13
 
 
@@ -1582,34 +1577,6 @@ SwigPyObject_repr(SwigPyObject *v, PyObject *args)
 }
 
 SWIGRUNTIME int
-SwigPyObject_print(SwigPyObject *v, FILE *fp, int SWIGUNUSEDPARM(flags))
-{
-  char *str;
-#ifdef METH_NOARGS
-  PyObject *repr = SwigPyObject_repr(v);
-#else
-  PyObject *repr = SwigPyObject_repr(v, NULL);
-#endif
-  if (repr) {
-    str = SWIG_Python_str_AsChar(repr); 
-    fputs(str, fp);
-    SWIG_Python_str_DelForPy3(str);
-    Py_DECREF(repr);
-    return 0; 
-  } else {
-    return 1; 
-  }
-}
-
-SWIGRUNTIME PyObject *
-SwigPyObject_str(SwigPyObject *v)
-{
-  char result[SWIG_BUFFER_SIZE];
-  return SWIG_PackVoidPtr(result, v->ptr, v->ty->name, sizeof(result)) ?
-    SWIG_Python_str_FromChar(result) : 0;
-}
-
-SWIGRUNTIME int
 SwigPyObject_compare(SwigPyObject *v, SwigPyObject *w)
 {
   void *i = v->ptr;
@@ -1801,7 +1768,7 @@ SwigPyObject_own(PyObject *v, PyObject *args)
 static PyMethodDef
 swigobject_methods[] = {
   {(char *)"disown",  (PyCFunction)SwigPyObject_disown,  METH_NOARGS,  (char *)"releases ownership of the pointer"},
-  {(char *)"acquire", (PyCFunction)SwigPyObject_acquire, METH_NOARGS,  (char *)"aquires ownership of the pointer"},
+  {(char *)"acquire", (PyCFunction)SwigPyObject_acquire, METH_NOARGS,  (char *)"acquires ownership of the pointer"},
   {(char *)"own",     (PyCFunction)SwigPyObject_own,     METH_VARARGS, (char *)"returns/sets ownership of the pointer"},
   {(char *)"append",  (PyCFunction)SwigPyObject_append,  METH_O,       (char *)"appends another 'this' object"},
   {(char *)"next",    (PyCFunction)SwigPyObject_next,    METH_NOARGS,  (char *)"returns the next 'this' object"},
@@ -1894,7 +1861,7 @@ SwigPyObject_TypeOnce(void) {
       sizeof(SwigPyObject),                 /* tp_basicsize */
       0,                                    /* tp_itemsize */
       (destructor)SwigPyObject_dealloc,     /* tp_dealloc */
-      (printfunc)SwigPyObject_print,        /* tp_print */
+      0,				    /* tp_print */
 #if PY_VERSION_HEX < 0x02020000
       (getattrfunc)SwigPyObject_getattr,    /* tp_getattr */
 #else
@@ -1912,7 +1879,7 @@ SwigPyObject_TypeOnce(void) {
       0,                                    /* tp_as_mapping */
       (hashfunc)0,                          /* tp_hash */
       (ternaryfunc)0,                       /* tp_call */
-      (reprfunc)SwigPyObject_str,           /* tp_str */
+      0,				    /* tp_str */
       PyObject_GenericGetAttr,              /* tp_getattro */
       0,                                    /* tp_setattro */
       0,                                    /* tp_as_buffer */
@@ -2289,10 +2256,11 @@ SWIGRUNTIME int
 SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int flags, int *own) {
   int res;
   SwigPyObject *sobj;
+  int implicit_conv = (flags & SWIG_POINTER_IMPLICIT_CONV) != 0;
 
   if (!obj)
     return SWIG_ERROR;
-  if (obj == Py_None) {
+  if (obj == Py_None && !implicit_conv) {
     if (ptr)
       *ptr = 0;
     return SWIG_OK;
@@ -2341,7 +2309,7 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
     }
     res = SWIG_OK;
   } else {
-    if (flags & SWIG_POINTER_IMPLICIT_CONV) {
+    if (implicit_conv) {
       SwigPyClientData *data = ty ? (SwigPyClientData *) ty->clientdata : 0;
       if (data && !data->implicitconv) {
         PyObject *klass = data->klass;
@@ -2376,6 +2344,13 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
         }
       }
     }
+    if (!SWIG_IsOK(res) && obj == Py_None) {
+      if (ptr)
+        *ptr = 0;
+      if (PyErr_Occurred())
+        PyErr_Clear();
+      res = SWIG_OK;
+    }
   }
   return res;
 }
@@ -2875,7 +2850,7 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) {
   PyObject *descr;
   PyObject *encoded_name;
   descrsetfunc f;
-  int res;
+  int res = -1;
 
 # ifdef Py_USING_UNICODE
   if (PyString_Check(name)) {
@@ -2898,7 +2873,6 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) {
       goto done;
   }
 
-  res = -1;
   descr = _PyType_Lookup(tp, name);
   f = NULL;
   if (descr != NULL)
@@ -2997,46 +2971,48 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) {
 #define SWIGTYPE_p_svn_config_t swig_types[54]
 #define SWIGTYPE_p_svn_delta_editor_t swig_types[55]
 #define SWIGTYPE_p_svn_depth_t swig_types[56]
-#define SWIGTYPE_p_svn_dirent_t swig_types[57]
-#define SWIGTYPE_p_svn_errno_t swig_types[58]
-#define SWIGTYPE_p_svn_error_t swig_types[59]
-#define SWIGTYPE_p_svn_io_dirent2_t swig_types[60]
-#define SWIGTYPE_p_svn_io_dirent_t swig_types[61]
-#define SWIGTYPE_p_svn_io_file_del_t swig_types[62]
-#define SWIGTYPE_p_svn_location_segment_t swig_types[63]
-#define SWIGTYPE_p_svn_lock_t swig_types[64]
-#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[65]
-#define SWIGTYPE_p_svn_log_changed_path_t swig_types[66]
-#define SWIGTYPE_p_svn_log_entry_t swig_types[67]
-#define SWIGTYPE_p_svn_merge_range_t swig_types[68]
-#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[69]
-#define SWIGTYPE_p_svn_node_kind_t swig_types[70]
-#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[71]
-#define SWIGTYPE_p_svn_opt_revision_t swig_types[72]
-#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[73]
-#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[74]
-#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[75]
-#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[76]
-#define SWIGTYPE_p_svn_prop_kind swig_types[77]
-#define SWIGTYPE_p_svn_stream_mark_t swig_types[78]
-#define SWIGTYPE_p_svn_stream_t swig_types[79]
-#define SWIGTYPE_p_svn_string_t swig_types[80]
-#define SWIGTYPE_p_svn_stringbuf_t swig_types[81]
-#define SWIGTYPE_p_svn_tristate_t swig_types[82]
-#define SWIGTYPE_p_svn_txdelta_op_t swig_types[83]
-#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[84]
-#define SWIGTYPE_p_svn_txdelta_window_t swig_types[85]
-#define SWIGTYPE_p_svn_version_checklist_t swig_types[86]
-#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[87]
-#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[88]
-#define SWIGTYPE_p_svn_version_extended_t swig_types[89]
-#define SWIGTYPE_p_svn_version_t swig_types[90]
-#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[91]
-#define SWIGTYPE_p_unsigned_char swig_types[92]
-#define SWIGTYPE_p_unsigned_long swig_types[93]
-#define SWIGTYPE_p_void swig_types[94]
-static swig_type_info *swig_types[96];
-static swig_module_info swig_module = {swig_types, 95, 0, 0, 0, 0};
+#define SWIGTYPE_p_svn_diff_hunk_t swig_types[57]
+#define SWIGTYPE_p_svn_dirent_t swig_types[58]
+#define SWIGTYPE_p_svn_errno_t swig_types[59]
+#define SWIGTYPE_p_svn_error_t swig_types[60]
+#define SWIGTYPE_p_svn_fs_lock_target_t swig_types[61]
+#define SWIGTYPE_p_svn_io_dirent2_t swig_types[62]
+#define SWIGTYPE_p_svn_io_dirent_t swig_types[63]
+#define SWIGTYPE_p_svn_io_file_del_t swig_types[64]
+#define SWIGTYPE_p_svn_location_segment_t swig_types[65]
+#define SWIGTYPE_p_svn_lock_t swig_types[66]
+#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[67]
+#define SWIGTYPE_p_svn_log_changed_path_t swig_types[68]
+#define SWIGTYPE_p_svn_log_entry_t swig_types[69]
+#define SWIGTYPE_p_svn_merge_range_t swig_types[70]
+#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[71]
+#define SWIGTYPE_p_svn_node_kind_t swig_types[72]
+#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[73]
+#define SWIGTYPE_p_svn_opt_revision_t swig_types[74]
+#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[75]
+#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[76]
+#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[77]
+#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[78]
+#define SWIGTYPE_p_svn_prop_kind swig_types[79]
+#define SWIGTYPE_p_svn_stream_mark_t swig_types[80]
+#define SWIGTYPE_p_svn_stream_t swig_types[81]
+#define SWIGTYPE_p_svn_string_t swig_types[82]
+#define SWIGTYPE_p_svn_stringbuf_t swig_types[83]
+#define SWIGTYPE_p_svn_tristate_t swig_types[84]
+#define SWIGTYPE_p_svn_txdelta_op_t swig_types[85]
+#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[86]
+#define SWIGTYPE_p_svn_txdelta_window_t swig_types[87]
+#define SWIGTYPE_p_svn_version_checklist_t swig_types[88]
+#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[89]
+#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[90]
+#define SWIGTYPE_p_svn_version_extended_t swig_types[91]
+#define SWIGTYPE_p_svn_version_t swig_types[92]
+#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[93]
+#define SWIGTYPE_p_unsigned_char swig_types[94]
+#define SWIGTYPE_p_unsigned_long swig_types[95]
+#define SWIGTYPE_p_void swig_types[96]
+static swig_type_info *swig_types[98];
+static swig_module_info swig_module = {swig_types, 97, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
@@ -3060,7 +3036,7 @@ static swig_module_info swig_module = {swig_types, 95, 0, 0, 0, 0};
 #endif
 #define SWIG_name    "_delta"
 
-#define SWIGVERSION 0x020009 
+#define SWIGVERSION 0x020012 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -3286,6 +3262,18 @@ SWIG_AsVal_unsigned_SS_long (PyObject *obj, unsigned long *val)
       return SWIG_OK;
     } else {
       PyErr_Clear();
+#if PY_VERSION_HEX >= 0x03000000
+      {
+        long v = PyLong_AsLong(obj);
+        if (!PyErr_Occurred()) {
+          if (v < 0) {
+            return SWIG_OverflowError;
+          }
+        } else {
+          PyErr_Clear();
+        }
+      }
+#endif
     }
   }
 #ifdef SWIG_PYTHON_CAST_MODE
@@ -3335,7 +3323,7 @@ SWIG_From_unsigned_SS_long  (unsigned long value)
     PyLong_FromUnsignedLong(value) : PyLong_FromLong((long)(value)); 
 }
 
-SWIGINTERN void svn_txdelta_window_t__ops_get(struct svn_txdelta_window_t *self,int *num_ops,svn_txdelta_op_t **ops){
+SWIGINTERN void svn_txdelta_window_t__ops_get(struct svn_txdelta_window_t *self,int *num_ops,svn_txdelta_op_t const **ops){
   *num_ops = self->num_ops;
   *ops = self->ops;
 }
@@ -3585,13 +3573,13 @@ SWIGINTERN PyObject *_wrap_svn_swig_py_make_editor(PyObject *SWIGUNUSEDPARM(self
   }
   resultobj = SWIG_Py_Void();
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_delta_editor_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_delta_editor_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -3621,7 +3609,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_version(PyObject *SWIGUNUSEDPARM(self), PyO
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_version_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_version_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -3638,7 +3626,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_op_t_action_code_set(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_txdelta_op_t_action_code_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_txdelta_op_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_txdelta_op_t, svn_argnum_obj0);
+    arg1 = (struct svn_txdelta_op_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_txdelta_op_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -3665,7 +3653,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_op_t_action_code_get(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_txdelta_op_t_action_code_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_txdelta_op_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_txdelta_op_t, svn_argnum_obj0);
+    arg1 = (struct svn_txdelta_op_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_txdelta_op_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -3687,7 +3675,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_op_t_offset_set(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_txdelta_op_t_offset_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_txdelta_op_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_txdelta_op_t, svn_argnum_obj0);
+    arg1 = (struct svn_txdelta_op_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_txdelta_op_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -3714,7 +3702,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_op_t_offset_get(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_txdelta_op_t_offset_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_txdelta_op_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_txdelta_op_t, svn_argnum_obj0);
+    arg1 = (struct svn_txdelta_op_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_txdelta_op_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -3736,7 +3724,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_op_t_length_set(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_txdelta_op_t_length_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_txdelta_op_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_txdelta_op_t, svn_argnum_obj0);
+    arg1 = (struct svn_txdelta_op_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_txdelta_op_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -3763,7 +3751,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_op_t_length_get(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_txdelta_op_t_length_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_txdelta_op_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_txdelta_op_t, svn_argnum_obj0);
+    arg1 = (struct svn_txdelta_op_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_txdelta_op_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -3789,7 +3777,7 @@ SWIGINTERN PyObject *_wrap_new_svn_txdelta_op_t(PyObject *SWIGUNUSEDPARM(self),
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_txdelta_op_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_txdelta_op_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -3804,7 +3792,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_txdelta_op_t(PyObject *SWIGUNUSEDPARM(self
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_txdelta_op_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_txdelta_op_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_txdelta_op_t, svn_argnum_obj0);
+    arg1 = (struct svn_txdelta_op_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_txdelta_op_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -3840,7 +3828,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_window_t_sview_offset_set(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_txdelta_window_t_sview_offset_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_txdelta_window_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_txdelta_window_t, svn_argnum_obj0);
+    arg1 = (struct svn_txdelta_window_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_txdelta_window_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -3862,7 +3850,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_window_t_sview_offset_get(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_txdelta_window_t_sview_offset_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_txdelta_window_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_txdelta_window_t, svn_argnum_obj0);
+    arg1 = (struct svn_txdelta_window_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_txdelta_window_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -3884,7 +3872,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_window_t_sview_len_set(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_txdelta_window_t_sview_len_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_txdelta_window_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_txdelta_window_t, svn_argnum_obj0);
+    arg1 = (struct svn_txdelta_window_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_txdelta_window_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -3911,7 +3899,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_window_t_sview_len_get(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_txdelta_window_t_sview_len_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_txdelta_window_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_txdelta_window_t, svn_argnum_obj0);
+    arg1 = (struct svn_txdelta_window_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_txdelta_window_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -3933,7 +3921,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_window_t_tview_len_set(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_txdelta_window_t_tview_len_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_txdelta_window_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_txdelta_window_t, svn_argnum_obj0);
+    arg1 = (struct svn_txdelta_window_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_txdelta_window_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -3960,7 +3948,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_window_t_tview_len_get(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_txdelta_window_t_tview_len_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_txdelta_window_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_txdelta_window_t, svn_argnum_obj0);
+    arg1 = (struct svn_txdelta_window_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_txdelta_window_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -3982,7 +3970,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_window_t_num_ops_set(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_txdelta_window_t_num_ops_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_txdelta_window_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_txdelta_window_t, svn_argnum_obj0);
+    arg1 = (struct svn_txdelta_window_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_txdelta_window_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4009,7 +3997,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_window_t_num_ops_get(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_txdelta_window_t_num_ops_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_txdelta_window_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_txdelta_window_t, svn_argnum_obj0);
+    arg1 = (struct svn_txdelta_window_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_txdelta_window_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4031,7 +4019,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_window_t_src_ops_set(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_txdelta_window_t_src_ops_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_txdelta_window_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_txdelta_window_t, svn_argnum_obj0);
+    arg1 = (struct svn_txdelta_window_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_txdelta_window_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4058,7 +4046,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_window_t_src_ops_get(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_txdelta_window_t_src_ops_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_txdelta_window_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_txdelta_window_t, svn_argnum_obj0);
+    arg1 = (struct svn_txdelta_window_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_txdelta_window_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4079,7 +4067,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_window_t_new_data_get(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_txdelta_window_t_new_data_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_txdelta_window_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_txdelta_window_t, svn_argnum_obj0);
+    arg1 = (struct svn_txdelta_window_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_txdelta_window_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4108,7 +4096,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_window_t__ops_get(PyObject *SWIGUNUSEDPAR
   arg3 = &temp3;
   if (!PyArg_ParseTuple(args,(char *)"O:svn_txdelta_window_t__ops_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_txdelta_window_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_txdelta_window_t, svn_argnum_obj0);
+    arg1 = (struct svn_txdelta_window_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_txdelta_window_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4116,7 +4104,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_window_t__ops_get(PyObject *SWIGUNUSEDPAR
   {
     svn_swig_py_release_py_lock();
     
-    svn_txdelta_window_t__ops_get(arg1,arg2,arg3);
+    svn_txdelta_window_t__ops_get(arg1,arg2,(struct svn_txdelta_op_t const **)arg3);
     
     svn_swig_py_acquire_py_lock();
     
@@ -4157,7 +4145,7 @@ SWIGINTERN PyObject *_wrap_new_svn_txdelta_window_t(PyObject *SWIGUNUSEDPARM(sel
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_txdelta_window_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_txdelta_window_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -4172,7 +4160,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_txdelta_window_t(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_txdelta_window_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_txdelta_window_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_txdelta_window_t, svn_argnum_obj0);
+    arg1 = (struct svn_txdelta_window_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_txdelta_window_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4215,7 +4203,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_window_dup(PyObject *SWIGUNUSEDPARM(self)
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_txdelta_window_dup",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_txdelta_window_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_txdelta_window_t, svn_argnum_obj0);
+    arg1 = (svn_txdelta_window_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_txdelta_window_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4236,7 +4224,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_window_dup(PyObject *SWIGUNUSEDPARM(self)
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_txdelta_window_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_txdelta_window_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -4268,13 +4256,13 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_compose_windows(PyObject *SWIGUNUSEDPARM(
   arg3 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_txdelta_compose_windows",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_txdelta_window_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_txdelta_window_t, svn_argnum_obj0);
+    arg1 = (svn_txdelta_window_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_txdelta_window_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_txdelta_window_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_txdelta_window_t, svn_argnum_obj1);
+    arg2 = (svn_txdelta_window_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_txdelta_window_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4295,7 +4283,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_compose_windows(PyObject *SWIGUNUSEDPARM(
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_txdelta_window_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_txdelta_window_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -4322,7 +4310,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_apply_instructions(PyObject *SWIGUNUSEDPA
   arg4 = &temp4;
   if (!PyArg_ParseTuple(args,(char *)"Oss:svn_txdelta_apply_instructions",&obj0,&arg2,&arg3)) SWIG_fail;
   {
-    arg1 = (svn_txdelta_window_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_txdelta_window_t, svn_argnum_obj0);
+    arg1 = (svn_txdelta_window_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_txdelta_window_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4391,7 +4379,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_run(PyObject *SWIGUNUSEDPARM(self), PyObj
   }
   {
     svn_txdelta_window_handler_t * tmp =
-    svn_swig_MustGetPtr(obj2, SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t, svn_argnum_obj2);
+    svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t, svn_argnum_obj2);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4412,8 +4400,8 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_run(PyObject *SWIGUNUSEDPARM(self), PyObj
     }
   }
   {
-    arg7 = svn_swig_py_cancel_func;
-    arg8 = obj5; /* our function is the baton. */
+    arg7 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg8 = obj5;
   }
   if (obj6) {
     /* Verify that the user supplied a valid pool */
@@ -4506,7 +4494,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_stream_create(PyObject *SWIGUNUSEDPARM(se
   }
   {
     svn_txdelta_next_window_fn_t * tmp =
-    svn_swig_MustGetPtr(obj1, SWIGTYPE_p_p_f_p_p_svn_txdelta_window_t_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj1);
+    svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_p_f_p_p_svn_txdelta_window_t_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj1);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4514,7 +4502,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_stream_create(PyObject *SWIGUNUSEDPARM(se
   }
   {
     svn_txdelta_md5_digest_fn_t * tmp =
-    svn_swig_MustGetPtr(obj2, SWIGTYPE_p_p_f_p_void__p_unsigned_char, svn_argnum_obj2);
+    svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_p_f_p_void__p_unsigned_char, svn_argnum_obj2);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4536,7 +4524,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_stream_create(PyObject *SWIGUNUSEDPARM(se
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_txdelta_stream_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_txdelta_stream_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -4569,7 +4557,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_next_window(PyObject *SWIGUNUSEDPARM(self
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_txdelta_next_window",&obj0,&obj1)) SWIG_fail;
   {
-    arg2 = (svn_txdelta_stream_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_txdelta_stream_t, svn_argnum_obj0);
+    arg2 = (svn_txdelta_stream_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_txdelta_stream_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4602,7 +4590,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_next_window(PyObject *SWIGUNUSEDPARM(self
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_txdelta_window_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_txdelta_window_t,
         _global_py_pool, args))
     
     ;
@@ -4627,7 +4615,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_md5_digest(PyObject *SWIGUNUSEDPARM(self)
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_txdelta_md5_digest",&obj0)) SWIG_fail;
   {
-    arg1 = (svn_txdelta_stream_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_txdelta_stream_t, svn_argnum_obj0);
+    arg1 = (svn_txdelta_stream_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_txdelta_stream_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4640,7 +4628,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_md5_digest(PyObject *SWIGUNUSEDPARM(self)
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_unsigned_char,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_unsigned_char,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -4699,7 +4687,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta2(PyObject *SWIGUNUSEDPARM(self), PyObject
   }
   resultobj = SWIG_Py_Void();
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_txdelta_stream_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_txdelta_stream_t,
         _global_py_pool, args))
     
     ;
@@ -4759,7 +4747,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta(PyObject *SWIGUNUSEDPARM(self), PyObject
   }
   resultobj = SWIG_Py_Void();
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_txdelta_stream_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_txdelta_stream_t,
         _global_py_pool, args))
     
     ;
@@ -4797,7 +4785,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_target_push(PyObject *SWIGUNUSEDPARM(self
   if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_txdelta_target_push",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     svn_txdelta_window_handler_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4830,7 +4818,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_target_push(PyObject *SWIGUNUSEDPARM(self
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_stream_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_stream_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -4879,7 +4867,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_send_string(PyObject *SWIGUNUSEDPARM(self
   }
   {
     svn_txdelta_window_handler_t * tmp =
-    svn_swig_MustGetPtr(obj1, SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t, svn_argnum_obj1);
+    svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t, svn_argnum_obj1);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4959,7 +4947,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_send_stream(PyObject *SWIGUNUSEDPARM(self
   }
   {
     svn_txdelta_window_handler_t * tmp =
-    svn_swig_MustGetPtr(obj1, SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t, svn_argnum_obj1);
+    svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t, svn_argnum_obj1);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5035,14 +5023,14 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_send_txstream(PyObject *SWIGUNUSEDPARM(se
   arg4 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_txdelta_send_txstream",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
-    arg1 = (svn_txdelta_stream_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_txdelta_stream_t, svn_argnum_obj0);
+    arg1 = (svn_txdelta_stream_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_txdelta_stream_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
     svn_txdelta_window_handler_t * tmp =
-    svn_swig_MustGetPtr(obj1, SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t, svn_argnum_obj1);
+    svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t, svn_argnum_obj1);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5117,7 +5105,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_send_contents(PyObject *SWIGUNUSEDPARM(se
   arg5 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOOO|O:svn_txdelta_send_contents",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
-    arg1 = (unsigned char *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_unsigned_char, svn_argnum_obj0);
+    arg1 = (unsigned char *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_unsigned_char, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5130,7 +5118,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_send_contents(PyObject *SWIGUNUSEDPARM(se
   }
   {
     svn_txdelta_window_handler_t * tmp =
-    svn_swig_MustGetPtr(obj2, SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t, svn_argnum_obj2);
+    svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t, svn_argnum_obj2);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5241,13 +5229,13 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_apply(PyObject *SWIGUNUSEDPARM(self), PyO
   }
   resultobj = SWIG_Py_Void();
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(arg6, SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(arg6, SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg7, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg7, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -5329,13 +5317,13 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_to_svndiff3(PyObject *SWIGUNUSEDPARM(self
   }
   resultobj = SWIG_Py_Void();
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(arg1, SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(arg1, SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -5409,13 +5397,13 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_to_svndiff2(PyObject *SWIGUNUSEDPARM(self
   }
   resultobj = SWIG_Py_Void();
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(arg1, SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(arg1, SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -5481,13 +5469,13 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_to_svndiff(PyObject *SWIGUNUSEDPARM(self)
   }
   resultobj = SWIG_Py_Void();
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(arg3, SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(arg3, SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg4, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg4, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -5525,7 +5513,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_parse_svndiff(PyObject *SWIGUNUSEDPARM(se
   if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_txdelta_parse_svndiff",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     svn_txdelta_window_handler_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5561,7 +5549,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_parse_svndiff(PyObject *SWIGUNUSEDPARM(se
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_stream_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_stream_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -5632,7 +5620,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_read_svndiff_window(PyObject *SWIGUNUSEDP
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_txdelta_window_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_txdelta_window_t,
         _global_py_pool, args))
     
     ;
@@ -5724,7 +5712,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_set_target_revision_set(PyObject *
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_delta_editor_t_set_target_revision_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_delta_editor_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
+    arg1 = (struct svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5751,7 +5739,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_set_target_revision_get(PyObject *
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_delta_editor_t_set_target_revision_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_delta_editor_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
+    arg1 = (struct svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5773,7 +5761,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_open_root_set(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_delta_editor_t_open_root_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_delta_editor_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
+    arg1 = (struct svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5800,7 +5788,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_open_root_get(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_delta_editor_t_open_root_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_delta_editor_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
+    arg1 = (struct svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5822,7 +5810,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_delete_entry_set(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_delta_editor_t_delete_entry_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_delta_editor_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
+    arg1 = (struct svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5849,7 +5837,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_delete_entry_get(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_delta_editor_t_delete_entry_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_delta_editor_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
+    arg1 = (struct svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5871,7 +5859,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_add_directory_set(PyObject *SWIGUN
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_delta_editor_t_add_directory_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_delta_editor_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
+    arg1 = (struct svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5898,7 +5886,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_add_directory_get(PyObject *SWIGUN
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_delta_editor_t_add_directory_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_delta_editor_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
+    arg1 = (struct svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5920,7 +5908,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_open_directory_set(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_delta_editor_t_open_directory_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_delta_editor_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
+    arg1 = (struct svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5947,7 +5935,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_open_directory_get(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_delta_editor_t_open_directory_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_delta_editor_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
+    arg1 = (struct svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5969,7 +5957,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_change_dir_prop_set(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_delta_editor_t_change_dir_prop_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_delta_editor_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
+    arg1 = (struct svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5996,7 +5984,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_change_dir_prop_get(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_delta_editor_t_change_dir_prop_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_delta_editor_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
+    arg1 = (struct svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6018,7 +6006,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_close_directory_set(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_delta_editor_t_close_directory_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_delta_editor_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
+    arg1 = (struct svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6045,7 +6033,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_close_directory_get(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_delta_editor_t_close_directory_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_delta_editor_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
+    arg1 = (struct svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6067,7 +6055,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_absent_directory_set(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_delta_editor_t_absent_directory_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_delta_editor_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
+    arg1 = (struct svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6094,7 +6082,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_absent_directory_get(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_delta_editor_t_absent_directory_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_delta_editor_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
+    arg1 = (struct svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6116,7 +6104,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_add_file_set(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_delta_editor_t_add_file_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_delta_editor_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
+    arg1 = (struct svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6143,7 +6131,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_add_file_get(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_delta_editor_t_add_file_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_delta_editor_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
+    arg1 = (struct svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6165,7 +6153,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_open_file_set(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_delta_editor_t_open_file_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_delta_editor_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
+    arg1 = (struct svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6192,7 +6180,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_open_file_get(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_delta_editor_t_open_file_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_delta_editor_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
+    arg1 = (struct svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6214,7 +6202,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_apply_textdelta_set(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_delta_editor_t_apply_textdelta_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_delta_editor_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
+    arg1 = (struct svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6241,7 +6229,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_apply_textdelta_get(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_delta_editor_t_apply_textdelta_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_delta_editor_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
+    arg1 = (struct svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6263,7 +6251,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_change_file_prop_set(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_delta_editor_t_change_file_prop_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_delta_editor_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
+    arg1 = (struct svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6290,7 +6278,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_change_file_prop_get(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_delta_editor_t_change_file_prop_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_delta_editor_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
+    arg1 = (struct svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6312,7 +6300,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_close_file_set(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_delta_editor_t_close_file_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_delta_editor_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
+    arg1 = (struct svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6339,7 +6327,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_close_file_get(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_delta_editor_t_close_file_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_delta_editor_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
+    arg1 = (struct svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6361,7 +6349,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_absent_file_set(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_delta_editor_t_absent_file_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_delta_editor_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
+    arg1 = (struct svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6388,7 +6376,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_absent_file_get(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_delta_editor_t_absent_file_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_delta_editor_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
+    arg1 = (struct svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6410,7 +6398,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_close_edit_set(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_delta_editor_t_close_edit_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_delta_editor_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
+    arg1 = (struct svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6437,7 +6425,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_close_edit_get(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_delta_editor_t_close_edit_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_delta_editor_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
+    arg1 = (struct svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6459,7 +6447,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_abort_edit_set(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_delta_editor_t_abort_edit_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_delta_editor_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
+    arg1 = (struct svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6486,7 +6474,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_t_abort_edit_get(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_delta_editor_t_abort_edit_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_delta_editor_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
+    arg1 = (struct svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6512,7 +6500,7 @@ SWIGINTERN PyObject *_wrap_new_svn_delta_editor_t(PyObject *SWIGUNUSEDPARM(self)
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_delta_editor_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_delta_editor_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -6527,7 +6515,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_delta_editor_t(PyObject *SWIGUNUSEDPARM(se
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_delta_editor_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_delta_editor_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
+    arg1 = (struct svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6583,7 +6571,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_default_editor(PyObject *SWIGUNUSEDPARM(sel
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_delta_editor_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_delta_editor_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -6607,7 +6595,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_noop_window_handler(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_delta_noop_window_handler",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_txdelta_window_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_txdelta_window_t, svn_argnum_obj0);
+    arg1 = (svn_txdelta_window_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_txdelta_window_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6672,11 +6660,11 @@ SWIGINTERN PyObject *_wrap_svn_delta_get_cancellation_editor(PyObject *SWIGUNUSE
   arg6 = &temp6;
   if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_delta_get_cancellation_editor",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
-    arg1 = svn_swig_py_cancel_func;
-    arg2 = obj0; /* our function is the baton. */
+    arg1 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg2 = obj0;
   }
   {
-    arg3 = (svn_delta_editor_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj1);
+    arg3 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6717,13 +6705,13 @@ SWIGINTERN PyObject *_wrap_svn_delta_get_cancellation_editor(PyObject *SWIGUNUSE
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg5, SWIGTYPE_p_svn_delta_editor_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg5, SWIGTYPE_p_svn_delta_editor_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg6, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg6, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -6768,7 +6756,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_depth_filter_editor(PyObject *SWIGUNUSEDPAR
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"OOOO|O:svn_delta_depth_filter_editor",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
-    arg3 = (svn_delta_editor_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
+    arg3 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6821,13 +6809,13 @@ SWIGINTERN PyObject *_wrap_svn_delta_depth_filter_editor(PyObject *SWIGUNUSEDPAR
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_delta_editor_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_delta_editor_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -6869,7 +6857,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_path_driver2(PyObject *SWIGUNUSEDPARM(self)
   arg7 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOOOO|O:svn_delta_path_driver2",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
-    arg1 = (svn_delta_editor_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
+    arg1 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6898,7 +6886,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_path_driver2(PyObject *SWIGUNUSEDPARM(self)
     }
   }
   {
-    arg5 = svn_swig_py_delta_path_driver_cb_func;
+    arg5 = (svn_delta_path_driver_cb_func_t) svn_swig_py_delta_path_driver_cb_func;
     arg6 = obj4;
   }
   if (obj5) {
@@ -6965,7 +6953,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_path_driver(PyObject *SWIGUNUSEDPARM(self),
   arg7 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOOOO|O:svn_delta_path_driver",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
-    arg1 = (svn_delta_editor_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
+    arg1 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6994,7 +6982,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_path_driver(PyObject *SWIGUNUSEDPARM(self),
     SWIG_fail;
   }
   {
-    arg5 = svn_swig_py_delta_path_driver_cb_func;
+    arg5 = (svn_delta_path_driver_cb_func_t) svn_swig_py_delta_path_driver_cb_func;
     arg6 = obj4;
   }
   if (obj5) {
@@ -7068,7 +7056,7 @@ SWIGINTERN PyObject *_wrap_svn_compat_wrap_file_rev_handler(PyObject *SWIGUNUSED
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_compat_wrap_file_rev_handler",&obj0,&obj1,&obj2)) SWIG_fail;
   {
     svn_file_rev_handler_old_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7100,7 +7088,7 @@ SWIGINTERN PyObject *_wrap_svn_compat_wrap_file_rev_handler(PyObject *SWIGUNUSED
   }
   resultobj = SWIG_Py_Void();
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(arg1, SWIGTYPE_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(arg1, SWIGTYPE_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t,
         _global_py_pool, args))
     
     ;
@@ -7153,7 +7141,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_set_target_revision(PyObject
   arg4 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_delta_editor_invoke_set_target_revision",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
-    arg1 = (svn_delta_editor_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
+    arg1 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7234,7 +7222,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_open_root(PyObject *SWIGUNUSE
   arg5 = &temp5;
   if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_delta_editor_invoke_open_root",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
-    arg1 = (svn_delta_editor_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
+    arg1 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7281,7 +7269,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_open_root(PyObject *SWIGUNUSE
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg5, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg5, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -7319,7 +7307,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_delete_entry(PyObject *SWIGUN
   arg5 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_delta_editor_invoke_delete_entry",&obj0,&arg2,&obj2,&obj3,&obj4)) SWIG_fail;
   {
-    arg1 = (svn_delta_editor_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
+    arg1 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7402,7 +7390,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_add_directory(PyObject *SWIGU
   arg7 = &temp7;
   if (!PyArg_ParseTuple(args,(char *)"OsOzO|O:svn_delta_editor_invoke_add_directory",&obj0,&arg2,&obj2,&arg4,&obj4,&obj5)) SWIG_fail;
   {
-    arg1 = (svn_delta_editor_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
+    arg1 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7449,7 +7437,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_add_directory(PyObject *SWIGU
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg7, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg7, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -7490,7 +7478,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_open_directory(PyObject *SWIG
   arg6 = &temp6;
   if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_delta_editor_invoke_open_directory",&obj0,&arg2,&obj2,&obj3,&obj4)) SWIG_fail;
   {
-    arg1 = (svn_delta_editor_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
+    arg1 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7537,7 +7525,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_open_directory(PyObject *SWIG
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg6, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg6, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -7576,7 +7564,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_change_dir_prop(PyObject *SWI
   arg5 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOsO|O:svn_delta_editor_invoke_change_dir_prop",&obj0,&obj1,&arg3,&obj3,&obj4)) SWIG_fail;
   {
-    arg1 = (svn_delta_editor_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
+    arg1 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7659,7 +7647,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_close_directory(PyObject *SWI
   arg3 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_delta_editor_invoke_close_directory",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_delta_editor_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
+    arg1 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7730,7 +7718,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_absent_directory(PyObject *SW
   arg4 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OsO|O:svn_delta_editor_invoke_absent_directory",&obj0,&arg2,&obj2,&obj3)) SWIG_fail;
   {
-    arg1 = (svn_delta_editor_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
+    arg1 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7807,7 +7795,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_add_file(PyObject *SWIGUNUSED
   arg7 = &temp7;
   if (!PyArg_ParseTuple(args,(char *)"OsOzO|O:svn_delta_editor_invoke_add_file",&obj0,&arg2,&obj2,&arg4,&obj4,&obj5)) SWIG_fail;
   {
-    arg1 = (svn_delta_editor_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
+    arg1 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7854,7 +7842,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_add_file(PyObject *SWIGUNUSED
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg7, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg7, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -7895,7 +7883,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_open_file(PyObject *SWIGUNUSE
   arg6 = &temp6;
   if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_delta_editor_invoke_open_file",&obj0,&arg2,&obj2,&obj3,&obj4)) SWIG_fail;
   {
-    arg1 = (svn_delta_editor_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
+    arg1 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7942,7 +7930,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_open_file(PyObject *SWIGUNUSE
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg6, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg6, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -7992,7 +7980,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_apply_textdelta(PyObject *SWI
   arg6 = &temp6;
   if (!PyArg_ParseTuple(args,(char *)"OOz|O:svn_delta_editor_invoke_apply_textdelta",&obj0,&obj1,&arg3,&obj3)) SWIG_fail;
   {
-    arg1 = (svn_delta_editor_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
+    arg1 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8033,13 +8021,13 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_apply_textdelta(PyObject *SWI
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(arg5, SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(arg5, SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg6, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg6, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -8078,7 +8066,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_change_file_prop(PyObject *SW
   arg5 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOsO|O:svn_delta_editor_invoke_change_file_prop",&obj0,&obj1,&arg3,&obj3,&obj4)) SWIG_fail;
   {
-    arg1 = (svn_delta_editor_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
+    arg1 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8162,7 +8150,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_close_file(PyObject *SWIGUNUS
   arg4 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOz|O:svn_delta_editor_invoke_close_file",&obj0,&obj1,&arg3,&obj3)) SWIG_fail;
   {
-    arg1 = (svn_delta_editor_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
+    arg1 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8233,7 +8221,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_absent_file(PyObject *SWIGUNU
   arg4 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OsO|O:svn_delta_editor_invoke_absent_file",&obj0,&arg2,&obj2,&obj3)) SWIG_fail;
   {
-    arg1 = (svn_delta_editor_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
+    arg1 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8303,7 +8291,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_close_edit(PyObject *SWIGUNUS
   arg3 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_delta_editor_invoke_close_edit",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_delta_editor_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
+    arg1 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8373,7 +8361,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_editor_invoke_abort_edit(PyObject *SWIGUNUS
   arg3 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_delta_editor_invoke_abort_edit",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_delta_editor_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
+    arg1 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8438,14 +8426,14 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_invoke_window_handler(PyObject *SWIGUNUSE
   if (!PyArg_ParseTuple(args,(char *)"OOO:svn_txdelta_invoke_window_handler",&obj0,&obj1,&obj2)) SWIG_fail;
   {
     svn_txdelta_window_handler_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
     arg1 = *tmp;
   }
   {
-    arg2 = (svn_txdelta_window_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_txdelta_window_t, svn_argnum_obj1);
+    arg2 = (svn_txdelta_window_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_txdelta_window_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8505,7 +8493,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_invoke_next_window_fn(PyObject *SWIGUNUSE
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_txdelta_invoke_next_window_fn",&obj0,&obj1,&obj2)) SWIG_fail;
   {
     svn_txdelta_next_window_fn_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_p_svn_txdelta_window_t_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_p_svn_txdelta_window_t_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8547,7 +8535,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_invoke_next_window_fn(PyObject *SWIGUNUSE
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_svn_txdelta_window_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_svn_txdelta_window_t,
         _global_py_pool, args))
     
     ;
@@ -8575,7 +8563,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_invoke_md5_digest_fn(PyObject *SWIGUNUSED
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_txdelta_invoke_md5_digest_fn",&obj0,&obj1)) SWIG_fail;
   {
     svn_txdelta_md5_digest_fn_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void__p_unsigned_char, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void__p_unsigned_char, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8597,7 +8585,7 @@ SWIGINTERN PyObject *_wrap_svn_txdelta_invoke_md5_digest_fn(PyObject *SWIGUNUSED
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_unsigned_char,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_unsigned_char,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -8630,7 +8618,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_invoke_path_driver_cb_func(PyObject *SWIGUN
   if (!PyArg_ParseTuple(args,(char *)"OOOs|O:svn_delta_invoke_path_driver_cb_func",&obj0,&obj1,&obj2,&arg5,&obj4)) SWIG_fail;
   {
     svn_delta_path_driver_cb_func_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_p_void_p_void_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8680,7 +8668,7 @@ SWIGINTERN PyObject *_wrap_svn_delta_invoke_path_driver_cb_func(PyObject *SWIGUN
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -8739,7 +8727,7 @@ SWIGINTERN PyObject *_wrap_svn_file_invoke_rev_handler(PyObject *SWIGUNUSEDPARM(
   if (!PyArg_ParseTuple(args,(char *)"OOsOOOO|O:svn_file_invoke_rev_handler",&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
     svn_file_rev_handler_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8760,7 +8748,7 @@ SWIGINTERN PyObject *_wrap_svn_file_invoke_rev_handler(PyObject *SWIGUNUSEDPARM(
     }
   }
   {
-    arg5 = (apr_hash_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_apr_hash_t, svn_argnum_obj4);
+    arg5 = (apr_hash_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_apr_hash_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8772,7 +8760,7 @@ SWIGINTERN PyObject *_wrap_svn_file_invoke_rev_handler(PyObject *SWIGUNUSEDPARM(
     }
   }
   {
-    arg9 = (apr_array_header_t *)svn_swig_MustGetPtr(obj6, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj6);
+    arg9 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj6, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj6);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8805,13 +8793,13 @@ SWIGINTERN PyObject *_wrap_svn_file_invoke_rev_handler(PyObject *SWIGUNUSEDPARM(
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(arg7, SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(arg7, SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg8, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg8, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -8868,7 +8856,7 @@ SWIGINTERN PyObject *_wrap_svn_file_invoke_rev_handler_old(PyObject *SWIGUNUSEDP
   if (!PyArg_ParseTuple(args,(char *)"OOsOOO|O:svn_file_invoke_rev_handler_old",&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
     svn_file_rev_handler_old_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8889,13 +8877,13 @@ SWIGINTERN PyObject *_wrap_svn_file_invoke_rev_handler_old(PyObject *SWIGUNUSEDP
     }
   }
   {
-    arg5 = (apr_hash_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_apr_hash_t, svn_argnum_obj4);
+    arg5 = (apr_hash_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_apr_hash_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg8 = (apr_array_header_t *)svn_swig_MustGetPtr(obj5, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj5);
+    arg8 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj5, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj5);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8928,13 +8916,13 @@ SWIGINTERN PyObject *_wrap_svn_file_invoke_rev_handler_old(PyObject *SWIGUNUSEDP
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(arg6, SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(arg6, SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg7, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg7, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -9244,9 +9232,11 @@ static swig_type_info _swigt__p_svn_commit_info_t = {"_p_svn_commit_info_t", "st
 static swig_type_info _swigt__p_svn_config_t = {"_p_svn_config_t", "struct svn_config_t *|svn_config_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_delta_editor_t = {"_p_svn_delta_editor_t", "struct svn_delta_editor_t *|svn_delta_editor_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_depth_t = {"_p_svn_depth_t", "enum svn_depth_t *|svn_depth_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_diff_hunk_t = {"_p_svn_diff_hunk_t", "svn_diff_hunk_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_dirent_t = {"_p_svn_dirent_t", "struct svn_dirent_t *|svn_dirent_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_errno_t = {"_p_svn_errno_t", "enum svn_errno_t *|svn_errno_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "struct svn_error_t *|svn_error_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_fs_lock_target_t = {"_p_svn_fs_lock_target_t", "svn_fs_lock_target_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_io_dirent2_t = {"_p_svn_io_dirent2_t", "struct svn_io_dirent2_t *|svn_io_dirent2_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_io_dirent_t = {"_p_svn_io_dirent_t", "struct svn_io_dirent_t *|svn_io_dirent_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_io_file_del_t = {"_p_svn_io_file_del_t", "enum svn_io_file_del_t *|svn_io_file_del_t *", 0, 0, (void*)0, 0};
@@ -9341,9 +9331,11 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_svn_config_t,
   &_swigt__p_svn_delta_editor_t,
   &_swigt__p_svn_depth_t,
+  &_swigt__p_svn_diff_hunk_t,
   &_swigt__p_svn_dirent_t,
   &_swigt__p_svn_errno_t,
   &_swigt__p_svn_error_t,
+  &_swigt__p_svn_fs_lock_target_t,
   &_swigt__p_svn_io_dirent2_t,
   &_swigt__p_svn_io_dirent_t,
   &_swigt__p_svn_io_file_del_t,
@@ -9438,9 +9430,11 @@ static swig_cast_info _swigc__p_svn_commit_info_t[] = {  {&_swigt__p_svn_commit_
 static swig_cast_info _swigc__p_svn_config_t[] = {  {&_swigt__p_svn_config_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_delta_editor_t[] = {  {&_swigt__p_svn_delta_editor_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_depth_t[] = {  {&_swigt__p_svn_depth_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_diff_hunk_t[] = {  {&_swigt__p_svn_diff_hunk_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_dirent_t[] = {  {&_swigt__p_svn_dirent_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_errno_t[] = {  {&_swigt__p_svn_errno_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_error_t[] = {  {&_swigt__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_fs_lock_target_t[] = {  {&_swigt__p_svn_fs_lock_target_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_io_dirent2_t[] = {  {&_swigt__p_svn_io_dirent2_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_io_dirent_t[] = {  {&_swigt__p_svn_io_dirent_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_io_file_del_t[] = {  {&_swigt__p_svn_io_file_del_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -9535,9 +9529,11 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_svn_config_t,
   _swigc__p_svn_delta_editor_t,
   _swigc__p_svn_depth_t,
+  _swigc__p_svn_diff_hunk_t,
   _swigc__p_svn_dirent_t,
   _swigc__p_svn_errno_t,
   _swigc__p_svn_error_t,
+  _swigc__p_svn_fs_lock_target_t,
   _swigc__p_svn_io_dirent2_t,
   _swigc__p_svn_io_dirent_t,
   _swigc__p_svn_io_file_del_t,
@@ -9586,18 +9582,18 @@ static swig_const_info swig_const_table[] = {
 #endif
 /* -----------------------------------------------------------------------------
  * Type initialization:
- * This problem is tough by the requirement that no dynamic 
- * memory is used. Also, since swig_type_info structures store pointers to 
+ * This problem is tough by the requirement that no dynamic
+ * memory is used. Also, since swig_type_info structures store pointers to
  * swig_cast_info structures and swig_cast_info structures store pointers back
- * to swig_type_info structures, we need some lookup code at initialization. 
- * The idea is that swig generates all the structures that are needed. 
- * The runtime then collects these partially filled structures. 
- * The SWIG_InitializeModule function takes these initial arrays out of 
+ * to swig_type_info structures, we need some lookup code at initialization.
+ * The idea is that swig generates all the structures that are needed.
+ * The runtime then collects these partially filled structures.
+ * The SWIG_InitializeModule function takes these initial arrays out of
  * swig_module, and does all the lookup, filling in the swig_module.types
  * array with the correct data and linking the correct swig_cast_info
  * structures together.
  *
- * The generated swig_type_info structures are assigned staticly to an initial 
+ * The generated swig_type_info structures are assigned staticly to an initial
  * array. We just loop through that array, and handle each type individually.
  * First we lookup if this type has been already loaded, and if so, use the
  * loaded structure instead of the generated one. Then we have to fill in the
@@ -9607,17 +9603,17 @@ static swig_const_info swig_const_table[] = {
  * a column is one of the swig_cast_info structures for that type.
  * The cast_initial array is actually an array of arrays, because each row has
  * a variable number of columns. So to actually build the cast linked list,
- * we find the array of casts associated with the type, and loop through it 
+ * we find the array of casts associated with the type, and loop through it
  * adding the casts to the list. The one last trick we need to do is making
  * sure the type pointer in the swig_cast_info struct is correct.
  *
- * First off, we lookup the cast->type name to see if it is already loaded. 
+ * First off, we lookup the cast->type name to see if it is already loaded.
  * There are three cases to handle:
  *  1) If the cast->type has already been loaded AND the type we are adding
  *     casting info to has not been loaded (it is in this module), THEN we
  *     replace the cast->type pointer with the type pointer that has already
  *     been loaded.
- *  2) If BOTH types (the one we are adding casting info to, and the 
+ *  2) If BOTH types (the one we are adding casting info to, and the
  *     cast->type) are loaded, THEN the cast info has already been loaded by
  *     the previous module so we just ignore it.
  *  3) Finally, if cast->type has not already been loaded, then we add that
@@ -9680,7 +9676,7 @@ SWIG_InitializeModule(void *clientdata) {
     module_head->next = &swig_module;
   }
   
-  /* When multiple interpeters are used, a module could have already been initialized in
+  /* When multiple interpreters are used, a module could have already been initialized in
        a different interpreter, but not yet have a pointer in this interpreter.
        In this case, we do not want to continue adding types... everything should be
        set up already */
diff --git a/subversion/bindings/swig/python/svn_diff.c b/subversion/bindings/swig/python/svn_diff.c
index 044eef8..b22c66b 100644
--- a/subversion/bindings/swig/python/svn_diff.c
+++ b/subversion/bindings/swig/python/svn_diff.c
@@ -1,11 +1,11 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
- * 
- * This file is not intended to be easily readable and contains a number of 
+ * Version 2.0.12
+ *
+ * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
- * changes to this file unless you know what you are doing--modify the SWIG 
- * interface file instead. 
+ * changes to this file unless you know what you are doing--modify the SWIG
+ * interface file instead.
  * ----------------------------------------------------------------------------- */
 
 #define SWIGPYTHON
@@ -43,28 +43,28 @@
 #ifndef SWIGUNUSED
 # if defined(__GNUC__)
 #   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__)) 
+#     define SWIGUNUSED __attribute__ ((__unused__))
 #   else
 #     define SWIGUNUSED
 #   endif
 # elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__)) 
+#   define SWIGUNUSED __attribute__ ((__unused__))
 # else
-#   define SWIGUNUSED 
+#   define SWIGUNUSED
 # endif
 #endif
 
 #ifndef SWIG_MSC_UNSUPPRESS_4505
 # if defined(_MSC_VER)
 #   pragma warning(disable : 4505) /* unreferenced local function has been removed */
-# endif 
+# endif
 #endif
 
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
 # else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
 # endif
 #endif
 
@@ -107,7 +107,7 @@
 #   define SWIGSTDCALL __stdcall
 # else
 #   define SWIGSTDCALL
-# endif 
+# endif
 #endif
 
 /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
@@ -122,8 +122,14 @@
 
 
 
-/* Python.h has to appear first */
-#include <Python.h>
+#if defined(_DEBUG) && defined(SWIG_PYTHON_INTERPRETER_NO_DEBUG)
+/* Use debug wrappers with the Python release dll */
+# undef _DEBUG
+# include <Python.h>
+# define _DEBUG
+#else
+# include <Python.h>
+#endif
 
 /* -----------------------------------------------------------------------------
  * swigrun.swg
@@ -149,7 +155,7 @@
   You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for
   creating a static or dynamic library from the SWIG runtime code.
   In 99.9% of the cases, SWIG just needs to declare them as 'static'.
-  
+
   But only do this if strictly necessary, ie, if you have problems
   with your compiler or suchlike.
 */
@@ -175,16 +181,16 @@
 #define SWIG_POINTER_OWN           0x1
 
 
-/* 
+/*
    Flags/methods for returning states.
-   
-   The SWIG conversion methods, as ConvertPtr, return an integer 
+
+   The SWIG conversion methods, as ConvertPtr, return an integer
    that tells if the conversion was successful or not. And if not,
    an error code can be returned (see swigerrors.swg for the codes).
-   
+
    Use the following macros/flags to set or process the returning
    states.
-   
+
    In old versions of SWIG, code such as the following was usually written:
 
      if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) {
@@ -217,23 +223,23 @@
     } else {
       // fail code
     }
-    
+
    I.e., now SWIG_ConvertPtr can return new objects and you can
    identify the case and take care of the deallocation. Of course that
    also requires SWIG_ConvertPtr to return new result values, such as
 
-      int SWIG_ConvertPtr(obj, ptr,...) {         
-        if (<obj is ok>) {			       
-          if (<need new object>) {		       
-            *ptr = <ptr to new allocated object>; 
-            return SWIG_NEWOBJ;		       
-          } else {				       
-            *ptr = <ptr to old object>;	       
-            return SWIG_OLDOBJ;		       
-          } 				       
-        } else {				       
-          return SWIG_BADOBJ;		       
-        }					       
+      int SWIG_ConvertPtr(obj, ptr,...) {
+        if (<obj is ok>) {
+          if (<need new object>) {
+            *ptr = <ptr to new allocated object>;
+            return SWIG_NEWOBJ;
+          } else {
+            *ptr = <ptr to old object>;
+            return SWIG_OLDOBJ;
+          }
+        } else {
+          return SWIG_BADOBJ;
+        }
       }
 
    Of course, returning the plain '0(success)/-1(fail)' still works, but you can be
@@ -247,17 +253,17 @@
        int fooi(int);
 
    and you call
- 
+
       food(1)   // cast rank '1'  (1 -> 1.0)
       fooi(1)   // cast rank '0'
 
    just use the SWIG_AddCast()/SWIG_CheckState()
 */
 
-#define SWIG_OK                    (0) 
+#define SWIG_OK                    (0)
 #define SWIG_ERROR                 (-1)
 #define SWIG_IsOK(r)               (r >= 0)
-#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)  
+#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)
 
 /* The CastRankLimit says how many bits are used for the cast rank */
 #define SWIG_CASTRANKLIMIT         (1 << 8)
@@ -288,14 +294,14 @@
 #  endif
 #  define SWIG_CASTRANKMASK          ((SWIG_CASTRANKLIMIT) -1)
 #  define SWIG_CastRank(r)           (r & SWIG_CASTRANKMASK)
-SWIGINTERNINLINE int SWIG_AddCast(int r) { 
+SWIGINTERNINLINE int SWIG_AddCast(int r) {
   return SWIG_IsOK(r) ? ((SWIG_CastRank(r) < SWIG_MAXCASTRANK) ? (r + 1) : SWIG_ERROR) : r;
 }
-SWIGINTERNINLINE int SWIG_CheckState(int r) { 
-  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0; 
+SWIGINTERNINLINE int SWIG_CheckState(int r) {
+  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0;
 }
 #else /* no cast-rank mode */
-#  define SWIG_AddCast
+#  define SWIG_AddCast(r) (r)
 #  define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0)
 #endif
 
@@ -339,7 +345,7 @@ typedef struct swig_module_info {
   void                    *clientdata;		/* Language specific module data */
 } swig_module_info;
 
-/* 
+/*
   Compare two type names skipping the space characters, therefore
   "char*" == "char *" and "Class<int>" == "Class<int >", etc.
 
@@ -359,18 +365,18 @@ SWIG_TypeNameComp(const char *f1, const char *l1,
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if not equal, 1 if equal
+  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
 */
 SWIGRUNTIME int
-SWIG_TypeEquiv(const char *nb, const char *tb) {
-  int equiv = 0;
+SWIG_TypeCmp(const char *nb, const char *tb) {
+  int equiv = 1;
   const char* te = tb + strlen(tb);
   const char* ne = nb;
-  while (!equiv && *ne) {
+  while (equiv != 0 && *ne) {
     for (nb = ne; *ne; ++ne) {
       if (*ne == '|') break;
     }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
+    equiv = SWIG_TypeNameComp(nb, ne, tb, te);
     if (*ne) ++ne;
   }
   return equiv;
@@ -378,24 +384,13 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
+  Return 0 if not equal, 1 if equal
 */
 SWIGRUNTIME int
-SWIG_TypeCompare(const char *nb, const char *tb) {
-  int equiv = 0;
-  const char* te = tb + strlen(tb);
-  const char* ne = nb;
-  while (!equiv && *ne) {
-    for (nb = ne; *ne; ++ne) {
-      if (*ne == '|') break;
-    }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
-    if (*ne) ++ne;
-  }
-  return equiv;
+SWIG_TypeEquiv(const char *nb, const char *tb) {
+  return SWIG_TypeCmp(nb, tb) == 0 ? 1 : 0;
 }
 
-
 /*
   Check the typename
 */
@@ -423,7 +418,7 @@ SWIG_TypeCheck(const char *c, swig_type_info *ty) {
   return 0;
 }
 
-/* 
+/*
   Identical to SWIG_TypeCheck, except strcmp is replaced with a pointer comparison
 */
 SWIGRUNTIME swig_cast_info *
@@ -458,7 +453,7 @@ SWIG_TypeCast(swig_cast_info *ty, void *ptr, int *newmemory) {
   return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr, newmemory);
 }
 
-/* 
+/*
    Dynamic pointer casting. Down an inheritance hierarchy
 */
 SWIGRUNTIME swig_type_info *
@@ -502,7 +497,7 @@ SWIG_TypePrettyName(const swig_type_info *type) {
     return type->name;
 }
 
-/* 
+/*
    Set the clientdata field for a type
 */
 SWIGRUNTIME void
@@ -510,14 +505,14 @@ SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
   swig_cast_info *cast = ti->cast;
   /* if (ti->clientdata == clientdata) return; */
   ti->clientdata = clientdata;
-  
+
   while (cast) {
     if (!cast->converter) {
       swig_type_info *tc = cast->type;
       if (!tc->clientdata) {
 	SWIG_TypeClientData(tc, clientdata);
       }
-    }    
+    }
     cast = cast->next;
   }
 }
@@ -526,18 +521,18 @@ SWIG_TypeNewClientData(swig_type_info *ti, void *clientdata) {
   SWIG_TypeClientData(ti, clientdata);
   ti->owndata = 1;
 }
-  
+
 /*
   Search for a swig_type_info structure only by mangled name
   Search is a O(log #types)
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_MangledTypeQueryModule(swig_module_info *start, 
-                            swig_module_info *end, 
+SWIG_MangledTypeQueryModule(swig_module_info *start,
+                            swig_module_info *end,
 		            const char *name) {
   swig_module_info *iter = start;
   do {
@@ -546,11 +541,11 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
       register size_t r = iter->size - 1;
       do {
 	/* since l+r >= 0, we can (>> 1) instead (/ 2) */
-	register size_t i = (l + r) >> 1; 
+	register size_t i = (l + r) >> 1;
 	const char *iname = iter->types[i]->name;
 	if (iname) {
 	  register int compare = strcmp(name, iname);
-	  if (compare == 0) {	    
+	  if (compare == 0) {
 	    return iter->types[i];
 	  } else if (compare < 0) {
 	    if (i) {
@@ -575,14 +570,14 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
   Search for a swig_type_info structure for either a mangled name or a human readable name.
   It first searches the mangled names of the types, which is a O(log #types)
   If a type is not found it then searches the human readable names, which is O(#types).
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_TypeQueryModule(swig_module_info *start, 
-                     swig_module_info *end, 
+SWIG_TypeQueryModule(swig_module_info *start,
+                     swig_module_info *end,
 		     const char *name) {
   /* STEP 1: Search the name field using binary search */
   swig_type_info *ret = SWIG_MangledTypeQueryModule(start, end, name);
@@ -601,12 +596,12 @@ SWIG_TypeQueryModule(swig_module_info *start,
       iter = iter->next;
     } while (iter != end);
   }
-  
+
   /* neither found a match */
   return 0;
 }
 
-/* 
+/*
    Pack binary data into a string
 */
 SWIGRUNTIME char *
@@ -622,7 +617,7 @@ SWIG_PackData(char *c, void *ptr, size_t sz) {
   return c;
 }
 
-/* 
+/*
    Unpack binary data from a string
 */
 SWIGRUNTIME const char *
@@ -636,21 +631,21 @@ SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
       uu = ((d - '0') << 4);
     else if ((d >= 'a') && (d <= 'f'))
       uu = ((d - ('a'-10)) << 4);
-    else 
+    else
       return (char *) 0;
     d = *(c++);
     if ((d >= '0') && (d <= '9'))
       uu |= (d - '0');
     else if ((d >= 'a') && (d <= 'f'))
       uu |= (d - ('a'-10));
-    else 
+    else
       return (char *) 0;
     *u = uu;
   }
   return c;
 }
 
-/* 
+/*
    Pack 'void *' into a string buffer.
 */
 SWIGRUNTIME char *
@@ -710,18 +705,18 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 #endif
 
 /*  Errors in SWIG */
-#define  SWIG_UnknownError    	   -1 
-#define  SWIG_IOError        	   -2 
-#define  SWIG_RuntimeError   	   -3 
-#define  SWIG_IndexError     	   -4 
-#define  SWIG_TypeError      	   -5 
-#define  SWIG_DivisionByZero 	   -6 
-#define  SWIG_OverflowError  	   -7 
-#define  SWIG_SyntaxError    	   -8 
-#define  SWIG_ValueError     	   -9 
+#define  SWIG_UnknownError    	   -1
+#define  SWIG_IOError        	   -2
+#define  SWIG_RuntimeError   	   -3
+#define  SWIG_IndexError     	   -4
+#define  SWIG_TypeError      	   -5
+#define  SWIG_DivisionByZero 	   -6
+#define  SWIG_OverflowError  	   -7
+#define  SWIG_SyntaxError    	   -8
+#define  SWIG_ValueError     	   -9
 #define  SWIG_SystemError    	   -10
 #define  SWIG_AttributeError 	   -11
-#define  SWIG_MemoryError    	   -12 
+#define  SWIG_MemoryError    	   -12
 #define  SWIG_NullReferenceError   -13
 
 
@@ -1582,34 +1577,6 @@ SwigPyObject_repr(SwigPyObject *v, PyObject *args)
 }
 
 SWIGRUNTIME int
-SwigPyObject_print(SwigPyObject *v, FILE *fp, int SWIGUNUSEDPARM(flags))
-{
-  char *str;
-#ifdef METH_NOARGS
-  PyObject *repr = SwigPyObject_repr(v);
-#else
-  PyObject *repr = SwigPyObject_repr(v, NULL);
-#endif
-  if (repr) {
-    str = SWIG_Python_str_AsChar(repr); 
-    fputs(str, fp);
-    SWIG_Python_str_DelForPy3(str);
-    Py_DECREF(repr);
-    return 0; 
-  } else {
-    return 1; 
-  }
-}
-
-SWIGRUNTIME PyObject *
-SwigPyObject_str(SwigPyObject *v)
-{
-  char result[SWIG_BUFFER_SIZE];
-  return SWIG_PackVoidPtr(result, v->ptr, v->ty->name, sizeof(result)) ?
-    SWIG_Python_str_FromChar(result) : 0;
-}
-
-SWIGRUNTIME int
 SwigPyObject_compare(SwigPyObject *v, SwigPyObject *w)
 {
   void *i = v->ptr;
@@ -1801,7 +1768,7 @@ SwigPyObject_own(PyObject *v, PyObject *args)
 static PyMethodDef
 swigobject_methods[] = {
   {(char *)"disown",  (PyCFunction)SwigPyObject_disown,  METH_NOARGS,  (char *)"releases ownership of the pointer"},
-  {(char *)"acquire", (PyCFunction)SwigPyObject_acquire, METH_NOARGS,  (char *)"aquires ownership of the pointer"},
+  {(char *)"acquire", (PyCFunction)SwigPyObject_acquire, METH_NOARGS,  (char *)"acquires ownership of the pointer"},
   {(char *)"own",     (PyCFunction)SwigPyObject_own,     METH_VARARGS, (char *)"returns/sets ownership of the pointer"},
   {(char *)"append",  (PyCFunction)SwigPyObject_append,  METH_O,       (char *)"appends another 'this' object"},
   {(char *)"next",    (PyCFunction)SwigPyObject_next,    METH_NOARGS,  (char *)"returns the next 'this' object"},
@@ -1894,7 +1861,7 @@ SwigPyObject_TypeOnce(void) {
       sizeof(SwigPyObject),                 /* tp_basicsize */
       0,                                    /* tp_itemsize */
       (destructor)SwigPyObject_dealloc,     /* tp_dealloc */
-      (printfunc)SwigPyObject_print,        /* tp_print */
+      0,				    /* tp_print */
 #if PY_VERSION_HEX < 0x02020000
       (getattrfunc)SwigPyObject_getattr,    /* tp_getattr */
 #else
@@ -1912,7 +1879,7 @@ SwigPyObject_TypeOnce(void) {
       0,                                    /* tp_as_mapping */
       (hashfunc)0,                          /* tp_hash */
       (ternaryfunc)0,                       /* tp_call */
-      (reprfunc)SwigPyObject_str,           /* tp_str */
+      0,				    /* tp_str */
       PyObject_GenericGetAttr,              /* tp_getattro */
       0,                                    /* tp_setattro */
       0,                                    /* tp_as_buffer */
@@ -2289,10 +2256,11 @@ SWIGRUNTIME int
 SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int flags, int *own) {
   int res;
   SwigPyObject *sobj;
+  int implicit_conv = (flags & SWIG_POINTER_IMPLICIT_CONV) != 0;
 
   if (!obj)
     return SWIG_ERROR;
-  if (obj == Py_None) {
+  if (obj == Py_None && !implicit_conv) {
     if (ptr)
       *ptr = 0;
     return SWIG_OK;
@@ -2341,7 +2309,7 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
     }
     res = SWIG_OK;
   } else {
-    if (flags & SWIG_POINTER_IMPLICIT_CONV) {
+    if (implicit_conv) {
       SwigPyClientData *data = ty ? (SwigPyClientData *) ty->clientdata : 0;
       if (data && !data->implicitconv) {
         PyObject *klass = data->klass;
@@ -2376,6 +2344,13 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
         }
       }
     }
+    if (!SWIG_IsOK(res) && obj == Py_None) {
+      if (ptr)
+        *ptr = 0;
+      if (PyErr_Occurred())
+        PyErr_Clear();
+      res = SWIG_OK;
+    }
   }
   return res;
 }
@@ -2875,7 +2850,7 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) {
   PyObject *descr;
   PyObject *encoded_name;
   descrsetfunc f;
-  int res;
+  int res = -1;
 
 # ifdef Py_USING_UNICODE
   if (PyString_Check(name)) {
@@ -2898,7 +2873,6 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) {
       goto done;
   }
 
-  res = -1;
   descr = _PyType_Lookup(tp, name);
   f = NULL;
   if (descr != NULL)
@@ -2950,86 +2924,88 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) {
 #define SWIGTYPE_p_char swig_types[7]
 #define SWIGTYPE_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[8]
 #define SWIGTYPE_p_f_p_apr_uint32_t_p_p_void_p_void_svn_diff_datasource_e__p_svn_error_t swig_types[9]
-#define SWIGTYPE_p_f_p_void__void swig_types[10]
-#define SWIGTYPE_p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t__p_svn_error_t swig_types[11]
-#define SWIGTYPE_p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_p_svn_diff_t__p_svn_error_t swig_types[12]
-#define SWIGTYPE_p_f_p_void_p_apr_off_t_p_apr_off_t_p_q_const__svn_diff_datasource_e_apr_size_t__p_svn_error_t swig_types[13]
-#define SWIGTYPE_p_f_p_void_p_void__void swig_types[14]
-#define SWIGTYPE_p_f_p_void_p_void_p_void_p_int__p_svn_error_t swig_types[15]
-#define SWIGTYPE_p_f_p_void_svn_diff_datasource_e__p_svn_error_t swig_types[16]
-#define SWIGTYPE_p_int swig_types[17]
-#define SWIGTYPE_p_long swig_types[18]
-#define SWIGTYPE_p_p_char swig_types[19]
-#define SWIGTYPE_p_p_svn_diff_t swig_types[20]
-#define SWIGTYPE_p_p_svn_patch_file_t swig_types[21]
-#define SWIGTYPE_p_p_svn_patch_t swig_types[22]
-#define SWIGTYPE_p_p_svn_stringbuf_t swig_types[23]
-#define SWIGTYPE_p_p_void swig_types[24]
-#define SWIGTYPE_p_svn_auth_baton_t swig_types[25]
-#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[26]
-#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[27]
-#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[28]
-#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[29]
-#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[30]
-#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[31]
-#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[32]
-#define SWIGTYPE_p_svn_auth_provider_t swig_types[33]
-#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[34]
-#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[35]
-#define SWIGTYPE_p_svn_checksum_kind_t swig_types[36]
-#define SWIGTYPE_p_svn_checksum_t swig_types[37]
-#define SWIGTYPE_p_svn_commit_info_t swig_types[38]
-#define SWIGTYPE_p_svn_config_t swig_types[39]
-#define SWIGTYPE_p_svn_depth_t swig_types[40]
-#define SWIGTYPE_p_svn_diff_conflict_display_style_t swig_types[41]
-#define SWIGTYPE_p_svn_diff_datasource_e swig_types[42]
-#define SWIGTYPE_p_svn_diff_file_ignore_space_t swig_types[43]
-#define SWIGTYPE_p_svn_diff_file_options_t swig_types[44]
-#define SWIGTYPE_p_svn_diff_fns2_t swig_types[45]
-#define SWIGTYPE_p_svn_diff_fns_t swig_types[46]
-#define SWIGTYPE_p_svn_diff_hunk_t swig_types[47]
-#define SWIGTYPE_p_svn_diff_operation_kind_e swig_types[48]
-#define SWIGTYPE_p_svn_diff_output_fns_t swig_types[49]
-#define SWIGTYPE_p_svn_diff_t swig_types[50]
-#define SWIGTYPE_p_svn_dirent_t swig_types[51]
-#define SWIGTYPE_p_svn_errno_t swig_types[52]
-#define SWIGTYPE_p_svn_error_t swig_types[53]
-#define SWIGTYPE_p_svn_io_dirent2_t swig_types[54]
-#define SWIGTYPE_p_svn_io_dirent_t swig_types[55]
-#define SWIGTYPE_p_svn_io_file_del_t swig_types[56]
-#define SWIGTYPE_p_svn_location_segment_t swig_types[57]
-#define SWIGTYPE_p_svn_lock_t swig_types[58]
-#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[59]
-#define SWIGTYPE_p_svn_log_changed_path_t swig_types[60]
-#define SWIGTYPE_p_svn_log_entry_t swig_types[61]
-#define SWIGTYPE_p_svn_merge_range_t swig_types[62]
-#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[63]
-#define SWIGTYPE_p_svn_node_kind_t swig_types[64]
-#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[65]
-#define SWIGTYPE_p_svn_opt_revision_t swig_types[66]
-#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[67]
-#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[68]
-#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[69]
-#define SWIGTYPE_p_svn_patch_file_t swig_types[70]
-#define SWIGTYPE_p_svn_patch_t swig_types[71]
-#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[72]
-#define SWIGTYPE_p_svn_prop_kind swig_types[73]
-#define SWIGTYPE_p_svn_prop_patch_t swig_types[74]
-#define SWIGTYPE_p_svn_stream_mark_t swig_types[75]
-#define SWIGTYPE_p_svn_stream_t swig_types[76]
-#define SWIGTYPE_p_svn_string_t swig_types[77]
-#define SWIGTYPE_p_svn_stringbuf_t swig_types[78]
-#define SWIGTYPE_p_svn_tristate_t swig_types[79]
-#define SWIGTYPE_p_svn_version_checklist_t swig_types[80]
-#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[81]
-#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[82]
-#define SWIGTYPE_p_svn_version_extended_t swig_types[83]
-#define SWIGTYPE_p_svn_version_t swig_types[84]
-#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[85]
-#define SWIGTYPE_p_unsigned_long swig_types[86]
-#define SWIGTYPE_p_void swig_types[87]
-static swig_type_info *swig_types[89];
-static swig_module_info swig_module = {swig_types, 88, 0, 0, 0, 0};
+#define SWIGTYPE_p_f_p_void__p_svn_error_t swig_types[10]
+#define SWIGTYPE_p_f_p_void__void swig_types[11]
+#define SWIGTYPE_p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t__p_svn_error_t swig_types[12]
+#define SWIGTYPE_p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_p_svn_diff_t__p_svn_error_t swig_types[13]
+#define SWIGTYPE_p_f_p_void_p_apr_off_t_p_apr_off_t_p_q_const__svn_diff_datasource_e_apr_size_t__p_svn_error_t swig_types[14]
+#define SWIGTYPE_p_f_p_void_p_void__void swig_types[15]
+#define SWIGTYPE_p_f_p_void_p_void_p_void_p_int__p_svn_error_t swig_types[16]
+#define SWIGTYPE_p_f_p_void_svn_diff_datasource_e__p_svn_error_t swig_types[17]
+#define SWIGTYPE_p_int swig_types[18]
+#define SWIGTYPE_p_long swig_types[19]
+#define SWIGTYPE_p_p_char swig_types[20]
+#define SWIGTYPE_p_p_svn_diff_t swig_types[21]
+#define SWIGTYPE_p_p_svn_patch_file_t swig_types[22]
+#define SWIGTYPE_p_p_svn_patch_t swig_types[23]
+#define SWIGTYPE_p_p_svn_stringbuf_t swig_types[24]
+#define SWIGTYPE_p_p_void swig_types[25]
+#define SWIGTYPE_p_svn_auth_baton_t swig_types[26]
+#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[27]
+#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[28]
+#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[29]
+#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[30]
+#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[31]
+#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[32]
+#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[33]
+#define SWIGTYPE_p_svn_auth_provider_t swig_types[34]
+#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[35]
+#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[36]
+#define SWIGTYPE_p_svn_checksum_kind_t swig_types[37]
+#define SWIGTYPE_p_svn_checksum_t swig_types[38]
+#define SWIGTYPE_p_svn_commit_info_t swig_types[39]
+#define SWIGTYPE_p_svn_config_t swig_types[40]
+#define SWIGTYPE_p_svn_depth_t swig_types[41]
+#define SWIGTYPE_p_svn_diff_conflict_display_style_t swig_types[42]
+#define SWIGTYPE_p_svn_diff_datasource_e swig_types[43]
+#define SWIGTYPE_p_svn_diff_file_ignore_space_t swig_types[44]
+#define SWIGTYPE_p_svn_diff_file_options_t swig_types[45]
+#define SWIGTYPE_p_svn_diff_fns2_t swig_types[46]
+#define SWIGTYPE_p_svn_diff_fns_t swig_types[47]
+#define SWIGTYPE_p_svn_diff_hunk_t swig_types[48]
+#define SWIGTYPE_p_svn_diff_operation_kind_e swig_types[49]
+#define SWIGTYPE_p_svn_diff_output_fns_t swig_types[50]
+#define SWIGTYPE_p_svn_diff_t swig_types[51]
+#define SWIGTYPE_p_svn_dirent_t swig_types[52]
+#define SWIGTYPE_p_svn_errno_t swig_types[53]
+#define SWIGTYPE_p_svn_error_t swig_types[54]
+#define SWIGTYPE_p_svn_fs_lock_target_t swig_types[55]
+#define SWIGTYPE_p_svn_io_dirent2_t swig_types[56]
+#define SWIGTYPE_p_svn_io_dirent_t swig_types[57]
+#define SWIGTYPE_p_svn_io_file_del_t swig_types[58]
+#define SWIGTYPE_p_svn_location_segment_t swig_types[59]
+#define SWIGTYPE_p_svn_lock_t swig_types[60]
+#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[61]
+#define SWIGTYPE_p_svn_log_changed_path_t swig_types[62]
+#define SWIGTYPE_p_svn_log_entry_t swig_types[63]
+#define SWIGTYPE_p_svn_merge_range_t swig_types[64]
+#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[65]
+#define SWIGTYPE_p_svn_node_kind_t swig_types[66]
+#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[67]
+#define SWIGTYPE_p_svn_opt_revision_t swig_types[68]
+#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[69]
+#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[70]
+#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[71]
+#define SWIGTYPE_p_svn_patch_file_t swig_types[72]
+#define SWIGTYPE_p_svn_patch_t swig_types[73]
+#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[74]
+#define SWIGTYPE_p_svn_prop_kind swig_types[75]
+#define SWIGTYPE_p_svn_prop_patch_t swig_types[76]
+#define SWIGTYPE_p_svn_stream_mark_t swig_types[77]
+#define SWIGTYPE_p_svn_stream_t swig_types[78]
+#define SWIGTYPE_p_svn_string_t swig_types[79]
+#define SWIGTYPE_p_svn_stringbuf_t swig_types[80]
+#define SWIGTYPE_p_svn_tristate_t swig_types[81]
+#define SWIGTYPE_p_svn_version_checklist_t swig_types[82]
+#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[83]
+#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[84]
+#define SWIGTYPE_p_svn_version_extended_t swig_types[85]
+#define SWIGTYPE_p_svn_version_t swig_types[86]
+#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[87]
+#define SWIGTYPE_p_unsigned_long swig_types[88]
+#define SWIGTYPE_p_void swig_types[89]
+static swig_type_info *swig_types[91];
+static swig_module_info swig_module = {swig_types, 90, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
@@ -3053,7 +3029,7 @@ static swig_module_info swig_module = {swig_types, 88, 0, 0, 0, 0};
 #endif
 #define SWIG_name    "_diff"
 
-#define SWIGVERSION 0x020009 
+#define SWIGVERSION 0x020012 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -3497,6 +3473,18 @@ SWIG_AsVal_unsigned_SS_long (PyObject *obj, unsigned long *val)
       return SWIG_OK;
     } else {
       PyErr_Clear();
+#if PY_VERSION_HEX >= 0x03000000
+      {
+        long v = PyLong_AsLong(obj);
+        if (!PyErr_Occurred()) {
+          if (v < 0) {
+            return SWIG_OverflowError;
+          }
+        } else {
+          PyErr_Clear();
+        }
+      }
+#endif
     }
   }
 #ifdef SWIG_PYTHON_CAST_MODE
@@ -3554,7 +3542,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_version(PyObject *SWIGUNUSEDPARM(self), PyOb
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_version_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_version_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -3571,7 +3559,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_t_datasources_open_set(PyObject *SWIGUN
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_fns2_t_datasources_open_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_diff_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0);
+    arg1 = (struct svn_diff_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -3598,7 +3586,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_t_datasources_open_get(PyObject *SWIGUN
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_fns2_t_datasources_open_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_diff_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0);
+    arg1 = (struct svn_diff_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -3620,7 +3608,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_t_datasource_close_set(PyObject *SWIGUN
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_fns2_t_datasource_close_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_diff_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0);
+    arg1 = (struct svn_diff_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -3647,7 +3635,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_t_datasource_close_get(PyObject *SWIGUN
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_fns2_t_datasource_close_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_diff_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0);
+    arg1 = (struct svn_diff_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -3669,7 +3657,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_t_datasource_get_next_token_set(PyObjec
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_fns2_t_datasource_get_next_token_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_diff_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0);
+    arg1 = (struct svn_diff_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -3696,7 +3684,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_t_datasource_get_next_token_get(PyObjec
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_fns2_t_datasource_get_next_token_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_diff_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0);
+    arg1 = (struct svn_diff_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -3718,7 +3706,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_t_token_compare_set(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_fns2_t_token_compare_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_diff_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0);
+    arg1 = (struct svn_diff_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -3745,7 +3733,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_t_token_compare_get(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_fns2_t_token_compare_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_diff_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0);
+    arg1 = (struct svn_diff_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -3767,7 +3755,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_t_token_discard_set(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_fns2_t_token_discard_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_diff_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0);
+    arg1 = (struct svn_diff_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -3794,7 +3782,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_t_token_discard_get(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_fns2_t_token_discard_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_diff_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0);
+    arg1 = (struct svn_diff_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -3816,7 +3804,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_t_token_discard_all_set(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_fns2_t_token_discard_all_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_diff_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0);
+    arg1 = (struct svn_diff_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -3843,7 +3831,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_t_token_discard_all_get(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_fns2_t_token_discard_all_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_diff_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0);
+    arg1 = (struct svn_diff_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -3869,7 +3857,7 @@ SWIGINTERN PyObject *_wrap_new_svn_diff_fns2_t(PyObject *SWIGUNUSEDPARM(self), P
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_diff_fns2_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_diff_fns2_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -3884,7 +3872,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_diff_fns2_t(PyObject *SWIGUNUSEDPARM(self)
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_diff_fns2_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_diff_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0);
+    arg1 = (struct svn_diff_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -3920,7 +3908,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_t_datasource_open_set(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_fns_t_datasource_open_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_diff_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0);
+    arg1 = (struct svn_diff_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -3947,7 +3935,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_t_datasource_open_get(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_fns_t_datasource_open_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_diff_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0);
+    arg1 = (struct svn_diff_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -3969,7 +3957,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_t_datasource_close_set(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_fns_t_datasource_close_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_diff_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0);
+    arg1 = (struct svn_diff_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -3996,7 +3984,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_t_datasource_close_get(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_fns_t_datasource_close_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_diff_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0);
+    arg1 = (struct svn_diff_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4018,7 +4006,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_t_datasource_get_next_token_set(PyObject
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_fns_t_datasource_get_next_token_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_diff_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0);
+    arg1 = (struct svn_diff_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4045,7 +4033,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_t_datasource_get_next_token_get(PyObject
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_fns_t_datasource_get_next_token_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_diff_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0);
+    arg1 = (struct svn_diff_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4067,7 +4055,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_t_token_compare_set(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_fns_t_token_compare_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_diff_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0);
+    arg1 = (struct svn_diff_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4094,7 +4082,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_t_token_compare_get(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_fns_t_token_compare_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_diff_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0);
+    arg1 = (struct svn_diff_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4116,7 +4104,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_t_token_discard_set(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_fns_t_token_discard_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_diff_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0);
+    arg1 = (struct svn_diff_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4143,7 +4131,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_t_token_discard_get(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_fns_t_token_discard_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_diff_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0);
+    arg1 = (struct svn_diff_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4165,7 +4153,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_t_token_discard_all_set(PyObject *SWIGUN
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_fns_t_token_discard_all_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_diff_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0);
+    arg1 = (struct svn_diff_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4192,7 +4180,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_t_token_discard_all_get(PyObject *SWIGUN
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_fns_t_token_discard_all_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_diff_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0);
+    arg1 = (struct svn_diff_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4218,7 +4206,7 @@ SWIGINTERN PyObject *_wrap_new_svn_diff_fns_t(PyObject *SWIGUNUSEDPARM(self), Py
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_diff_fns_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_diff_fns_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -4233,7 +4221,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_diff_fns_t(PyObject *SWIGUNUSEDPARM(self),
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_diff_fns_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_diff_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0);
+    arg1 = (struct svn_diff_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4289,7 +4277,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_diff_2(PyObject *SWIGUNUSEDPARM(self), PyObj
     }
   }
   {
-    arg3 = (svn_diff_fns2_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj1);
+    arg3 = (svn_diff_fns2_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4322,7 +4310,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_diff_2(PyObject *SWIGUNUSEDPARM(self), PyObj
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_diff_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_diff_t,
         _global_py_pool, args))
     
     ;
@@ -4368,7 +4356,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_diff(PyObject *SWIGUNUSEDPARM(self), PyObjec
     }
   }
   {
-    arg3 = (svn_diff_fns_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj1);
+    arg3 = (svn_diff_fns_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4401,7 +4389,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_diff(PyObject *SWIGUNUSEDPARM(self), PyObjec
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_diff_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_diff_t,
         _global_py_pool, args))
     
     ;
@@ -4447,7 +4435,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_diff3_2(PyObject *SWIGUNUSEDPARM(self), PyOb
     }
   }
   {
-    arg3 = (svn_diff_fns2_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj1);
+    arg3 = (svn_diff_fns2_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4480,7 +4468,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_diff3_2(PyObject *SWIGUNUSEDPARM(self), PyOb
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_diff_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_diff_t,
         _global_py_pool, args))
     
     ;
@@ -4526,7 +4514,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_diff3(PyObject *SWIGUNUSEDPARM(self), PyObje
     }
   }
   {
-    arg3 = (svn_diff_fns_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj1);
+    arg3 = (svn_diff_fns_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4559,7 +4547,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_diff3(PyObject *SWIGUNUSEDPARM(self), PyObje
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_diff_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_diff_t,
         _global_py_pool, args))
     
     ;
@@ -4605,7 +4593,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_diff4_2(PyObject *SWIGUNUSEDPARM(self), PyOb
     }
   }
   {
-    arg3 = (svn_diff_fns2_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj1);
+    arg3 = (svn_diff_fns2_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4638,7 +4626,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_diff4_2(PyObject *SWIGUNUSEDPARM(self), PyOb
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_diff_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_diff_t,
         _global_py_pool, args))
     
     ;
@@ -4684,7 +4672,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_diff4(PyObject *SWIGUNUSEDPARM(self), PyObje
     }
   }
   {
-    arg3 = (svn_diff_fns_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj1);
+    arg3 = (svn_diff_fns_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4717,7 +4705,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_diff4(PyObject *SWIGUNUSEDPARM(self), PyObje
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_diff_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_diff_t,
         _global_py_pool, args))
     
     ;
@@ -4742,7 +4730,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_contains_conflicts(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_contains_conflicts",&obj0)) SWIG_fail;
   {
-    arg1 = (svn_diff_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_t, svn_argnum_obj0);
+    arg1 = (svn_diff_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4770,7 +4758,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_contains_diffs(PyObject *SWIGUNUSEDPARM(self
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_contains_diffs",&obj0)) SWIG_fail;
   {
-    arg1 = (svn_diff_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_t, svn_argnum_obj0);
+    arg1 = (svn_diff_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4799,7 +4787,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_output_fns_t_output_common_set(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_output_fns_t_output_common_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_diff_output_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0);
+    arg1 = (struct svn_diff_output_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4826,7 +4814,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_output_fns_t_output_common_get(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_output_fns_t_output_common_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_diff_output_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0);
+    arg1 = (struct svn_diff_output_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4848,7 +4836,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_output_fns_t_output_diff_modified_set(PyObje
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_output_fns_t_output_diff_modified_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_diff_output_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0);
+    arg1 = (struct svn_diff_output_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4875,7 +4863,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_output_fns_t_output_diff_modified_get(PyObje
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_output_fns_t_output_diff_modified_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_diff_output_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0);
+    arg1 = (struct svn_diff_output_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4897,7 +4885,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_output_fns_t_output_diff_latest_set(PyObject
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_output_fns_t_output_diff_latest_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_diff_output_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0);
+    arg1 = (struct svn_diff_output_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4924,7 +4912,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_output_fns_t_output_diff_latest_get(PyObject
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_output_fns_t_output_diff_latest_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_diff_output_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0);
+    arg1 = (struct svn_diff_output_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4946,7 +4934,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_output_fns_t_output_diff_common_set(PyObject
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_output_fns_t_output_diff_common_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_diff_output_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0);
+    arg1 = (struct svn_diff_output_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4973,7 +4961,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_output_fns_t_output_diff_common_get(PyObject
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_output_fns_t_output_diff_common_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_diff_output_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0);
+    arg1 = (struct svn_diff_output_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4995,7 +4983,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_output_fns_t_output_conflict_set(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_output_fns_t_output_conflict_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_diff_output_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0);
+    arg1 = (struct svn_diff_output_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5022,7 +5010,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_output_fns_t_output_conflict_get(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_output_fns_t_output_conflict_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_diff_output_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0);
+    arg1 = (struct svn_diff_output_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5048,7 +5036,7 @@ SWIGINTERN PyObject *_wrap_new_svn_diff_output_fns_t(PyObject *SWIGUNUSEDPARM(se
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_diff_output_fns_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_diff_output_fns_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -5063,7 +5051,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_diff_output_fns_t(PyObject *SWIGUNUSEDPARM
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_diff_output_fns_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_diff_output_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0);
+    arg1 = (struct svn_diff_output_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5090,6 +5078,69 @@ SWIGINTERN PyObject *svn_diff_output_fns_t_swigregister(PyObject *SWIGUNUSEDPARM
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *_wrap_svn_diff_output2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  svn_diff_t *arg1 = (svn_diff_t *) 0 ;
+  void *arg2 = (void *) 0 ;
+  svn_diff_output_fns_t *arg3 = (svn_diff_output_fns_t *) 0 ;
+  svn_cancel_func_t arg4 = (svn_cancel_func_t) 0 ;
+  void *arg5 = (void *) 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOO:svn_diff_output2",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    arg1 = (svn_diff_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    if (obj1 == Py_None) {
+      arg2 = NULL;
+    } else if (SWIG_ConvertPtr(obj1, (void **) &arg2, 0, 0) == -1) {
+      arg2 = (void *) obj1;
+      PyErr_Clear();
+    }
+  }
+  {
+    arg3 = (svn_diff_output_fns_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj2);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg4 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg5 = obj3;
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_diff_output2(arg1,arg2,(struct svn_diff_output_fns_t const *)arg3,arg4,arg5);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_svn_diff_output(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   svn_diff_t *arg1 = (svn_diff_t *) 0 ;
@@ -5102,7 +5153,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_output(PyObject *SWIGUNUSEDPARM(self), PyObj
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:svn_diff_output",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_diff_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_t, svn_argnum_obj0);
+    arg1 = (svn_diff_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5116,7 +5167,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_output(PyObject *SWIGUNUSEDPARM(self), PyObj
     }
   }
   {
-    arg3 = (svn_diff_output_fns_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj2);
+    arg3 = (svn_diff_output_fns_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5155,7 +5206,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_options_t_ignore_space_set(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_file_options_t_ignore_space_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_diff_file_options_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj0);
+    arg1 = (struct svn_diff_file_options_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5182,7 +5233,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_options_t_ignore_space_get(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_file_options_t_ignore_space_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_diff_file_options_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj0);
+    arg1 = (struct svn_diff_file_options_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5204,7 +5255,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_options_t_ignore_eol_style_set(PyObject
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_file_options_t_ignore_eol_style_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_diff_file_options_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj0);
+    arg1 = (struct svn_diff_file_options_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5231,7 +5282,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_options_t_ignore_eol_style_get(PyObject
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_file_options_t_ignore_eol_style_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_diff_file_options_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj0);
+    arg1 = (struct svn_diff_file_options_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5253,7 +5304,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_options_t_show_c_function_set(PyObject
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_file_options_t_show_c_function_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_diff_file_options_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj0);
+    arg1 = (struct svn_diff_file_options_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5280,7 +5331,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_options_t_show_c_function_get(PyObject
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_file_options_t_show_c_function_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_diff_file_options_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj0);
+    arg1 = (struct svn_diff_file_options_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5293,6 +5344,55 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_diff_file_options_t_context_size_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  struct svn_diff_file_options_t *arg1 = (struct svn_diff_file_options_t *) 0 ;
+  int arg2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_file_options_t_context_size_set",&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = (struct svn_diff_file_options_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg2 = (int)SWIG_As_long (obj1);
+    if (SWIG_arg_fail(svn_argnum_obj1)) {
+      SWIG_fail;
+    }
+  }
+  if (arg1) (arg1)->context_size = arg2;
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_svn_diff_file_options_t_context_size_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  struct svn_diff_file_options_t *arg1 = (struct svn_diff_file_options_t *) 0 ;
+  PyObject * obj0 = 0 ;
+  int result;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_file_options_t_context_size_get",&obj0)) SWIG_fail;
+  {
+    arg1 = (struct svn_diff_file_options_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  result = (int) ((arg1)->context_size);
+  resultobj = SWIG_From_long((long)(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_new_svn_diff_file_options_t(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   struct svn_diff_file_options_t *result = 0 ;
@@ -5306,7 +5406,7 @@ SWIGINTERN PyObject *_wrap_new_svn_diff_file_options_t(PyObject *SWIGUNUSEDPARM(
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_diff_file_options_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_diff_file_options_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -5321,7 +5421,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_diff_file_options_t(PyObject *SWIGUNUSEDPA
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_diff_file_options_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_diff_file_options_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj0);
+    arg1 = (struct svn_diff_file_options_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5377,7 +5477,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_options_create(PyObject *SWIGUNUSEDPARM
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_diff_file_options_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_diff_file_options_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -5409,7 +5509,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_options_parse(PyObject *SWIGUNUSEDPARM(
   arg3 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_diff_file_options_parse",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_diff_file_options_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj0);
+    arg1 = (svn_diff_file_options_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5483,7 +5583,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_diff_2(PyObject *SWIGUNUSEDPARM(self),
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"ssO|O:svn_diff_file_diff_2",&arg2,&arg3,&obj2,&obj3)) SWIG_fail;
   {
-    arg4 = (svn_diff_file_options_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj2);
+    arg4 = (svn_diff_file_options_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5516,7 +5616,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_diff_2(PyObject *SWIGUNUSEDPARM(self),
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_diff_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_diff_t,
         _global_py_pool, args))
     
     ;
@@ -5579,7 +5679,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_diff(PyObject *SWIGUNUSEDPARM(self), Py
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_diff_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_diff_t,
         _global_py_pool, args))
     
     ;
@@ -5618,7 +5718,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_diff3_2(PyObject *SWIGUNUSEDPARM(self),
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"sssO|O:svn_diff_file_diff3_2",&arg2,&arg3,&arg4,&obj3,&obj4)) SWIG_fail;
   {
-    arg5 = (svn_diff_file_options_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj3);
+    arg5 = (svn_diff_file_options_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5651,7 +5751,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_diff3_2(PyObject *SWIGUNUSEDPARM(self),
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_diff_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_diff_t,
         _global_py_pool, args))
     
     ;
@@ -5715,7 +5815,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_diff3(PyObject *SWIGUNUSEDPARM(self), P
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_diff_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_diff_t,
         _global_py_pool, args))
     
     ;
@@ -5755,7 +5855,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_diff4_2(PyObject *SWIGUNUSEDPARM(self),
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"ssssO|O:svn_diff_file_diff4_2",&arg2,&arg3,&arg4,&arg5,&obj4,&obj5)) SWIG_fail;
   {
-    arg6 = (svn_diff_file_options_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj4);
+    arg6 = (svn_diff_file_options_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5788,7 +5888,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_diff4_2(PyObject *SWIGUNUSEDPARM(self),
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_diff_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_diff_t,
         _global_py_pool, args))
     
     ;
@@ -5853,7 +5953,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_diff4(PyObject *SWIGUNUSEDPARM(self), P
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_diff_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_diff_t,
         _global_py_pool, args))
     
     ;
@@ -5870,6 +5970,100 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_diff_file_output_unified4(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  svn_stream_t *arg1 = (svn_stream_t *) 0 ;
+  svn_diff_t *arg2 = (svn_diff_t *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  char *arg5 = (char *) 0 ;
+  char *arg6 = (char *) 0 ;
+  char *arg7 = (char *) 0 ;
+  char *arg8 = (char *) 0 ;
+  svn_boolean_t arg9 ;
+  int arg10 ;
+  svn_cancel_func_t arg11 = (svn_cancel_func_t) 0 ;
+  void *arg12 = (void *) 0 ;
+  apr_pool_t *arg13 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj8 = 0 ;
+  PyObject * obj9 = 0 ;
+  PyObject * obj10 = 0 ;
+  PyObject * obj11 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg13 = _global_pool;
+  if (!PyArg_ParseTuple(args,(char *)"OOsszzzzOOO|O:svn_diff_file_output_unified4",&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&arg7,&arg8,&obj8,&obj9,&obj10,&obj11)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_make_stream (obj0, _global_pool);
+  }
+  {
+    arg2 = (svn_diff_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg9 = (svn_boolean_t)SWIG_As_long (obj8);
+    if (SWIG_arg_fail(svn_argnum_obj8)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg10 = (int)SWIG_As_long (obj9);
+    if (SWIG_arg_fail(svn_argnum_obj9)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg11 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg12 = obj10;
+  }
+  if (obj11) {
+    /* Verify that the user supplied a valid pool */
+    if (obj11 != Py_None && obj11 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj11);
+      SWIG_arg_fail(svn_argnum_obj11);
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_diff_file_output_unified4(arg1,arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,arg9,arg10,arg11,arg12,arg13);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_svn_diff_file_output_unified3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   svn_stream_t *arg1 = (svn_stream_t *) 0 ;
@@ -5899,7 +6093,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_output_unified3(PyObject *SWIGUNUSEDPAR
     arg1 = svn_swig_py_make_stream (obj0, _global_pool);
   }
   {
-    arg2 = (svn_diff_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1);
+    arg2 = (svn_diff_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5975,7 +6169,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_output_unified2(PyObject *SWIGUNUSEDPAR
     arg1 = svn_swig_py_make_stream (obj0, _global_pool);
   }
   {
-    arg2 = (svn_diff_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1);
+    arg2 = (svn_diff_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6044,7 +6238,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_output_unified(PyObject *SWIGUNUSEDPARM
     arg1 = svn_swig_py_make_stream (obj0, _global_pool);
   }
   {
-    arg2 = (svn_diff_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1);
+    arg2 = (svn_diff_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6088,6 +6282,93 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_diff_file_output_merge3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  svn_stream_t *arg1 = (svn_stream_t *) 0 ;
+  svn_diff_t *arg2 = (svn_diff_t *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  char *arg5 = (char *) 0 ;
+  char *arg6 = (char *) 0 ;
+  char *arg7 = (char *) 0 ;
+  char *arg8 = (char *) 0 ;
+  char *arg9 = (char *) 0 ;
+  svn_diff_conflict_display_style_t arg10 ;
+  svn_cancel_func_t arg11 = (svn_cancel_func_t) 0 ;
+  void *arg12 = (void *) 0 ;
+  apr_pool_t *arg13 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj9 = 0 ;
+  PyObject * obj10 = 0 ;
+  PyObject * obj11 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg13 = _global_pool;
+  if (!PyArg_ParseTuple(args,(char *)"OOssszzzzOO|O:svn_diff_file_output_merge3",&obj0,&obj1,&arg3,&arg4,&arg5,&arg6,&arg7,&arg8,&arg9,&obj9,&obj10,&obj11)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_make_stream (obj0, _global_pool);
+  }
+  {
+    arg2 = (svn_diff_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg10 = (svn_diff_conflict_display_style_t)SWIG_As_long (obj9);
+    if (SWIG_arg_fail(svn_argnum_obj9)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg11 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg12 = obj10;
+  }
+  if (obj11) {
+    /* Verify that the user supplied a valid pool */
+    if (obj11 != Py_None && obj11 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj11);
+      SWIG_arg_fail(svn_argnum_obj11);
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_diff_file_output_merge3(arg1,arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,(char const *)arg9,arg10,arg11,arg12,arg13);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_svn_diff_file_output_merge2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   svn_stream_t *arg1 = (svn_stream_t *) 0 ;
@@ -6118,7 +6399,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_output_merge2(PyObject *SWIGUNUSEDPARM(
     arg1 = svn_swig_py_make_stream (obj0, _global_pool);
   }
   {
-    arg2 = (svn_diff_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1);
+    arg2 = (svn_diff_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6200,7 +6481,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_file_output_merge(PyObject *SWIGUNUSEDPARM(s
     arg1 = svn_swig_py_make_stream (obj0, _global_pool);
   }
   {
-    arg2 = (svn_diff_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1);
+    arg2 = (svn_diff_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6256,6 +6537,80 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_diff_output_binary(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  svn_stream_t *arg1 = (svn_stream_t *) 0 ;
+  svn_stream_t *arg2 = (svn_stream_t *) 0 ;
+  svn_stream_t *arg3 = (svn_stream_t *) 0 ;
+  svn_cancel_func_t arg4 = (svn_cancel_func_t) 0 ;
+  void *arg5 = (void *) 0 ;
+  apr_pool_t *arg6 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg6 = _global_pool;
+  if (!PyArg_ParseTuple(args,(char *)"OOOO|O:svn_diff_output_binary",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_make_stream (obj0, _global_pool);
+  }
+  {
+    arg2 = svn_swig_py_make_stream (obj1, _global_pool);
+  }
+  {
+    arg3 = svn_swig_py_make_stream (obj2, _global_pool);
+  }
+  {
+    arg4 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg5 = obj3;
+  }
+  if (obj4) {
+    /* Verify that the user supplied a valid pool */
+    if (obj4 != Py_None && obj4 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj4);
+      SWIG_arg_fail(svn_argnum_obj4);
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_diff_output_binary(arg1,arg2,arg3,arg4,arg5,arg6);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_svn_diff_mem_string_diff(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   svn_diff_t **arg1 = (svn_diff_t **) 0 ;
@@ -6307,7 +6662,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_diff(PyObject *SWIGUNUSEDPARM(sel
     }
   }
   {
-    arg4 = (svn_diff_file_options_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj2);
+    arg4 = (svn_diff_file_options_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6340,7 +6695,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_diff(PyObject *SWIGUNUSEDPARM(sel
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_diff_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_diff_t,
         _global_py_pool, args))
     
     ;
@@ -6424,7 +6779,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_diff3(PyObject *SWIGUNUSEDPARM(se
     }
   }
   {
-    arg5 = (svn_diff_file_options_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj3);
+    arg5 = (svn_diff_file_options_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6457,7 +6812,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_diff3(PyObject *SWIGUNUSEDPARM(se
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_diff_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_diff_t,
         _global_py_pool, args))
     
     ;
@@ -6557,7 +6912,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_diff4(PyObject *SWIGUNUSEDPARM(se
     }
   }
   {
-    arg6 = (svn_diff_file_options_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj4);
+    arg6 = (svn_diff_file_options_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_diff_file_options_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6590,7 +6945,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_diff4(PyObject *SWIGUNUSEDPARM(se
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_diff_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_diff_t,
         _global_py_pool, args))
     
     ;
@@ -6607,6 +6962,130 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_diff_mem_string_output_unified3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  svn_stream_t *arg1 = (svn_stream_t *) 0 ;
+  svn_diff_t *arg2 = (svn_diff_t *) 0 ;
+  svn_boolean_t arg3 ;
+  char *arg4 = (char *) 0 ;
+  char *arg5 = (char *) 0 ;
+  char *arg6 = (char *) 0 ;
+  char *arg7 = (char *) 0 ;
+  svn_string_t *arg8 = (svn_string_t *) 0 ;
+  svn_string_t *arg9 = (svn_string_t *) 0 ;
+  int arg10 ;
+  svn_cancel_func_t arg11 = (svn_cancel_func_t) 0 ;
+  void *arg12 = (void *) 0 ;
+  apr_pool_t *arg13 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  svn_string_t value8 ;
+  svn_string_t value9 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj7 = 0 ;
+  PyObject * obj8 = 0 ;
+  PyObject * obj9 = 0 ;
+  PyObject * obj10 = 0 ;
+  PyObject * obj11 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg13 = _global_pool;
+  if (!PyArg_ParseTuple(args,(char *)"OOOszzzOOOO|O:svn_diff_mem_string_output_unified3",&obj0,&obj1,&obj2,&arg4,&arg5,&arg6,&arg7,&obj7,&obj8,&obj9,&obj10,&obj11)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_make_stream (obj0, _global_pool);
+  }
+  {
+    arg2 = (svn_diff_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg3 = (svn_boolean_t)SWIG_As_long (obj2);
+    if (SWIG_arg_fail(svn_argnum_obj2)) {
+      SWIG_fail;
+    }
+  }
+  {
+    if (obj7 == Py_None)
+    arg8 = NULL;
+    else {
+      if (!PyString_Check(obj7)) {
+        PyErr_SetString(PyExc_TypeError, "not a string");
+        SWIG_fail;
+      }
+      value8.data = PyString_AS_STRING(obj7);
+      value8.len = PyString_GET_SIZE(obj7);
+      arg8 = &value8;
+    }
+  }
+  {
+    if (obj8 == Py_None)
+    arg9 = NULL;
+    else {
+      if (!PyString_Check(obj8)) {
+        PyErr_SetString(PyExc_TypeError, "not a string");
+        SWIG_fail;
+      }
+      value9.data = PyString_AS_STRING(obj8);
+      value9.len = PyString_GET_SIZE(obj8);
+      arg9 = &value9;
+    }
+  }
+  {
+    arg10 = (int)SWIG_As_long (obj9);
+    if (SWIG_arg_fail(svn_argnum_obj9)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg11 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg12 = obj10;
+  }
+  if (obj11) {
+    /* Verify that the user supplied a valid pool */
+    if (obj11 != Py_None && obj11 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj11);
+      SWIG_arg_fail(svn_argnum_obj11);
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_diff_mem_string_output_unified3(arg1,arg2,arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(struct svn_string_t const *)arg8,(struct svn_string_t const *)arg9,arg10,arg11,arg12,arg13);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_svn_diff_mem_string_output_unified2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   svn_stream_t *arg1 = (svn_stream_t *) 0 ;
@@ -6640,7 +7119,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_output_unified2(PyObject *SWIGUNU
     arg1 = svn_swig_py_make_stream (obj0, _global_pool);
   }
   {
-    arg2 = (svn_diff_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1);
+    arg2 = (svn_diff_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6746,7 +7225,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_output_unified(PyObject *SWIGUNUS
     arg1 = svn_swig_py_make_stream (obj0, _global_pool);
   }
   {
-    arg2 = (svn_diff_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1);
+    arg2 = (svn_diff_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6816,6 +7295,138 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_diff_mem_string_output_merge3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  svn_stream_t *arg1 = (svn_stream_t *) 0 ;
+  svn_diff_t *arg2 = (svn_diff_t *) 0 ;
+  svn_string_t *arg3 = (svn_string_t *) 0 ;
+  svn_string_t *arg4 = (svn_string_t *) 0 ;
+  svn_string_t *arg5 = (svn_string_t *) 0 ;
+  char *arg6 = (char *) 0 ;
+  char *arg7 = (char *) 0 ;
+  char *arg8 = (char *) 0 ;
+  char *arg9 = (char *) 0 ;
+  svn_diff_conflict_display_style_t arg10 ;
+  svn_cancel_func_t arg11 = (svn_cancel_func_t) 0 ;
+  void *arg12 = (void *) 0 ;
+  apr_pool_t *arg13 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  svn_string_t value3 ;
+  svn_string_t value4 ;
+  svn_string_t value5 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  PyObject * obj9 = 0 ;
+  PyObject * obj10 = 0 ;
+  PyObject * obj11 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg13 = _global_pool;
+  if (!PyArg_ParseTuple(args,(char *)"OOOOOzzzzOO|O:svn_diff_mem_string_output_merge3",&obj0,&obj1,&obj2,&obj3,&obj4,&arg6,&arg7,&arg8,&arg9,&obj9,&obj10,&obj11)) SWIG_fail;
+  {
+    arg1 = svn_swig_py_make_stream (obj0, _global_pool);
+  }
+  {
+    arg2 = (svn_diff_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    if (obj2 == Py_None)
+    arg3 = NULL;
+    else {
+      if (!PyString_Check(obj2)) {
+        PyErr_SetString(PyExc_TypeError, "not a string");
+        SWIG_fail;
+      }
+      value3.data = PyString_AS_STRING(obj2);
+      value3.len = PyString_GET_SIZE(obj2);
+      arg3 = &value3;
+    }
+  }
+  {
+    if (obj3 == Py_None)
+    arg4 = NULL;
+    else {
+      if (!PyString_Check(obj3)) {
+        PyErr_SetString(PyExc_TypeError, "not a string");
+        SWIG_fail;
+      }
+      value4.data = PyString_AS_STRING(obj3);
+      value4.len = PyString_GET_SIZE(obj3);
+      arg4 = &value4;
+    }
+  }
+  {
+    if (obj4 == Py_None)
+    arg5 = NULL;
+    else {
+      if (!PyString_Check(obj4)) {
+        PyErr_SetString(PyExc_TypeError, "not a string");
+        SWIG_fail;
+      }
+      value5.data = PyString_AS_STRING(obj4);
+      value5.len = PyString_GET_SIZE(obj4);
+      arg5 = &value5;
+    }
+  }
+  {
+    arg10 = (svn_diff_conflict_display_style_t)SWIG_As_long (obj9);
+    if (SWIG_arg_fail(svn_argnum_obj9)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg11 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg12 = obj10;
+  }
+  if (obj11) {
+    /* Verify that the user supplied a valid pool */
+    if (obj11 != Py_None && obj11 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj11);
+      SWIG_arg_fail(svn_argnum_obj11);
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_diff_mem_string_output_merge3(arg1,arg2,(struct svn_string_t const *)arg3,(struct svn_string_t const *)arg4,(struct svn_string_t const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,(char const *)arg9,arg10,arg11,arg12,arg13);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_svn_diff_mem_string_output_merge2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   svn_stream_t *arg1 = (svn_stream_t *) 0 ;
@@ -6852,7 +7463,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_output_merge2(PyObject *SWIGUNUSE
     arg1 = svn_swig_py_make_stream (obj0, _global_pool);
   }
   {
-    arg2 = (svn_diff_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1);
+    arg2 = (svn_diff_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6979,7 +7590,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_mem_string_output_merge(PyObject *SWIGUNUSED
     arg1 = svn_swig_py_make_stream (obj0, _global_pool);
   }
   {
-    arg2 = (svn_diff_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1);
+    arg2 = (svn_diff_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_diff_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7106,7 +7717,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_hunk_readline_diff_text(PyObject *SWIGUNUSED
   arg4 = &temp4;
   if (!PyArg_ParseTuple(args,(char *)"O|OO:svn_diff_hunk_readline_diff_text",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_diff_hunk_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0);
+    arg1 = (svn_diff_hunk_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7228,7 +7839,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_hunk_readline_original_text(PyObject *SWIGUN
   arg4 = &temp4;
   if (!PyArg_ParseTuple(args,(char *)"O|OO:svn_diff_hunk_readline_original_text",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_diff_hunk_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0);
+    arg1 = (svn_diff_hunk_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7350,7 +7961,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_hunk_readline_modified_text(PyObject *SWIGUN
   arg4 = &temp4;
   if (!PyArg_ParseTuple(args,(char *)"O|OO:svn_diff_hunk_readline_modified_text",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_diff_hunk_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0);
+    arg1 = (svn_diff_hunk_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7447,7 +8058,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_hunk_reset_diff_text(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_hunk_reset_diff_text",&obj0)) SWIG_fail;
   {
-    arg1 = (svn_diff_hunk_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0);
+    arg1 = (svn_diff_hunk_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7474,7 +8085,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_hunk_reset_original_text(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_hunk_reset_original_text",&obj0)) SWIG_fail;
   {
-    arg1 = (svn_diff_hunk_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0);
+    arg1 = (svn_diff_hunk_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7501,7 +8112,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_hunk_reset_modified_text(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_hunk_reset_modified_text",&obj0)) SWIG_fail;
   {
-    arg1 = (svn_diff_hunk_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0);
+    arg1 = (svn_diff_hunk_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7529,7 +8140,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_hunk_get_original_start(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_hunk_get_original_start",&obj0)) SWIG_fail;
   {
-    arg1 = (svn_diff_hunk_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0);
+    arg1 = (svn_diff_hunk_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7557,7 +8168,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_hunk_get_original_length(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_hunk_get_original_length",&obj0)) SWIG_fail;
   {
-    arg1 = (svn_diff_hunk_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0);
+    arg1 = (svn_diff_hunk_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7585,7 +8196,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_hunk_get_modified_start(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_hunk_get_modified_start",&obj0)) SWIG_fail;
   {
-    arg1 = (svn_diff_hunk_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0);
+    arg1 = (svn_diff_hunk_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7613,7 +8224,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_hunk_get_modified_length(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_hunk_get_modified_length",&obj0)) SWIG_fail;
   {
-    arg1 = (svn_diff_hunk_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0);
+    arg1 = (svn_diff_hunk_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7641,7 +8252,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_hunk_get_leading_context(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_hunk_get_leading_context",&obj0)) SWIG_fail;
   {
-    arg1 = (svn_diff_hunk_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0);
+    arg1 = (svn_diff_hunk_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7669,7 +8280,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_hunk_get_trailing_context(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_diff_hunk_get_trailing_context",&obj0)) SWIG_fail;
   {
-    arg1 = (svn_diff_hunk_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0);
+    arg1 = (svn_diff_hunk_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_hunk_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7697,7 +8308,7 @@ SWIGINTERN PyObject *_wrap_svn_prop_patch_t_name_set(PyObject *SWIGUNUSEDPARM(se
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_prop_patch_t_name_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_prop_patch_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_prop_patch_t, svn_argnum_obj0);
+    arg1 = (struct svn_prop_patch_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_prop_patch_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7725,7 +8336,7 @@ SWIGINTERN PyObject *_wrap_svn_prop_patch_t_name_get(PyObject *SWIGUNUSEDPARM(se
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_prop_patch_t_name_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_prop_patch_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_prop_patch_t, svn_argnum_obj0);
+    arg1 = (struct svn_prop_patch_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_prop_patch_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7747,7 +8358,7 @@ SWIGINTERN PyObject *_wrap_svn_prop_patch_t_operation_set(PyObject *SWIGUNUSEDPA
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_prop_patch_t_operation_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_prop_patch_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_prop_patch_t, svn_argnum_obj0);
+    arg1 = (struct svn_prop_patch_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_prop_patch_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7774,7 +8385,7 @@ SWIGINTERN PyObject *_wrap_svn_prop_patch_t_operation_get(PyObject *SWIGUNUSEDPA
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_prop_patch_t_operation_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_prop_patch_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_prop_patch_t, svn_argnum_obj0);
+    arg1 = (struct svn_prop_patch_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_prop_patch_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7796,13 +8407,13 @@ SWIGINTERN PyObject *_wrap_svn_prop_patch_t_hunks_set(PyObject *SWIGUNUSEDPARM(s
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_prop_patch_t_hunks_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_prop_patch_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_prop_patch_t, svn_argnum_obj0);
+    arg1 = (struct svn_prop_patch_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_prop_patch_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (apr_array_header_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj1);
+    arg2 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7823,14 +8434,21 @@ SWIGINTERN PyObject *_wrap_svn_prop_patch_t_hunks_get(PyObject *SWIGUNUSEDPARM(s
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_prop_patch_t_hunks_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_prop_patch_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_prop_patch_t, svn_argnum_obj0);
+    arg1 = (struct svn_prop_patch_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_prop_patch_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (apr_array_header_t *) ((arg1)->hunks);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_apr_array_header_t,
-    _global_py_pool, args);
+  {
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_pointerlist_to_list(result, SWIGTYPE_p_svn_diff_hunk_t,
+        _global_py_pool))
+    
+    ;
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
   return resultobj;
 fail:
   return NULL;
@@ -7850,7 +8468,7 @@ SWIGINTERN PyObject *_wrap_new_svn_prop_patch_t(PyObject *SWIGUNUSEDPARM(self),
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_prop_patch_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_prop_patch_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -7865,7 +8483,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_prop_patch_t(PyObject *SWIGUNUSEDPARM(self
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_prop_patch_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_prop_patch_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_prop_patch_t, svn_argnum_obj0);
+    arg1 = (struct svn_prop_patch_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_prop_patch_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7900,7 +8518,7 @@ SWIGINTERN PyObject *_wrap_svn_patch_t_old_filename_set(PyObject *SWIGUNUSEDPARM
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_patch_t_old_filename_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_patch_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0);
+    arg1 = (struct svn_patch_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7928,7 +8546,7 @@ SWIGINTERN PyObject *_wrap_svn_patch_t_old_filename_get(PyObject *SWIGUNUSEDPARM
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_patch_t_old_filename_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_patch_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0);
+    arg1 = (struct svn_patch_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7949,7 +8567,7 @@ SWIGINTERN PyObject *_wrap_svn_patch_t_new_filename_set(PyObject *SWIGUNUSEDPARM
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_patch_t_new_filename_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_patch_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0);
+    arg1 = (struct svn_patch_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7977,7 +8595,7 @@ SWIGINTERN PyObject *_wrap_svn_patch_t_new_filename_get(PyObject *SWIGUNUSEDPARM
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_patch_t_new_filename_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_patch_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0);
+    arg1 = (struct svn_patch_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7999,13 +8617,13 @@ SWIGINTERN PyObject *_wrap_svn_patch_t_hunks_set(PyObject *SWIGUNUSEDPARM(self),
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_patch_t_hunks_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_patch_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0);
+    arg1 = (struct svn_patch_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (apr_array_header_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj1);
+    arg2 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8026,14 +8644,21 @@ SWIGINTERN PyObject *_wrap_svn_patch_t_hunks_get(PyObject *SWIGUNUSEDPARM(self),
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_patch_t_hunks_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_patch_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0);
+    arg1 = (struct svn_patch_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (apr_array_header_t *) ((arg1)->hunks);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_apr_array_header_t,
-    _global_py_pool, args);
+  {
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_pointerlist_to_list(result, SWIGTYPE_p_svn_diff_hunk_t,
+        _global_py_pool))
+    
+    ;
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
   return resultobj;
 fail:
   return NULL;
@@ -8049,13 +8674,13 @@ SWIGINTERN PyObject *_wrap_svn_patch_t_prop_patches_set(PyObject *SWIGUNUSEDPARM
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_patch_t_prop_patches_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_patch_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0);
+    arg1 = (struct svn_patch_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (apr_hash_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_apr_hash_t, svn_argnum_obj1);
+    arg2 = (apr_hash_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_apr_hash_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8076,13 +8701,13 @@ SWIGINTERN PyObject *_wrap_svn_patch_t_prop_patches_get(PyObject *SWIGUNUSEDPARM
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_patch_t_prop_patches_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_patch_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0);
+    arg1 = (struct svn_patch_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (apr_hash_t *) ((arg1)->prop_patches);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_apr_hash_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_apr_hash_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -8099,7 +8724,7 @@ SWIGINTERN PyObject *_wrap_svn_patch_t_operation_set(PyObject *SWIGUNUSEDPARM(se
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_patch_t_operation_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_patch_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0);
+    arg1 = (struct svn_patch_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8126,7 +8751,7 @@ SWIGINTERN PyObject *_wrap_svn_patch_t_operation_get(PyObject *SWIGUNUSEDPARM(se
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_patch_t_operation_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_patch_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0);
+    arg1 = (struct svn_patch_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8148,7 +8773,7 @@ SWIGINTERN PyObject *_wrap_svn_patch_t_reverse_set(PyObject *SWIGUNUSEDPARM(self
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_patch_t_reverse_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_patch_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0);
+    arg1 = (struct svn_patch_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8175,7 +8800,7 @@ SWIGINTERN PyObject *_wrap_svn_patch_t_reverse_get(PyObject *SWIGUNUSEDPARM(self
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_patch_t_reverse_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_patch_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0);
+    arg1 = (struct svn_patch_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8188,6 +8813,115 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_patch_t_mergeinfo_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  struct svn_patch_t *arg1 = (struct svn_patch_t *) 0 ;
+  svn_mergeinfo_t arg2 = (svn_mergeinfo_t) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:svn_patch_t_mergeinfo_set",&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = (struct svn_patch_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    if (_global_pool == NULL)
+    {
+      if (svn_swig_py_get_parent_pool(args, SWIGTYPE_p_apr_pool_t,
+          &_global_py_pool, &_global_pool))
+      SWIG_fail;
+    }
+    
+    arg2 = svn_swig_py_mergeinfo_from_dict(obj1, _global_pool);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  if (arg1) (arg1)->mergeinfo = arg2;
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_svn_patch_t_mergeinfo_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  struct svn_patch_t *arg1 = (struct svn_patch_t *) 0 ;
+  PyObject * obj0 = 0 ;
+  svn_mergeinfo_t result;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:svn_patch_t_mergeinfo_get",&obj0)) SWIG_fail;
+  {
+    arg1 = (struct svn_patch_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  result = (svn_mergeinfo_t) ((arg1)->mergeinfo);
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_apr_hash_t,
+    _global_py_pool, args);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_svn_patch_t_reverse_mergeinfo_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  struct svn_patch_t *arg1 = (struct svn_patch_t *) 0 ;
+  svn_mergeinfo_t arg2 = (svn_mergeinfo_t) 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:svn_patch_t_reverse_mergeinfo_set",&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = (struct svn_patch_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg2 = (svn_mergeinfo_t)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_apr_hash_t, svn_argnum_obj1);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  if (arg1) (arg1)->reverse_mergeinfo = arg2;
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_svn_patch_t_reverse_mergeinfo_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  struct svn_patch_t *arg1 = (struct svn_patch_t *) 0 ;
+  PyObject * obj0 = 0 ;
+  svn_mergeinfo_t result;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:svn_patch_t_reverse_mergeinfo_get",&obj0)) SWIG_fail;
+  {
+    arg1 = (struct svn_patch_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  result = (svn_mergeinfo_t) ((arg1)->reverse_mergeinfo);
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_apr_hash_t,
+    _global_py_pool, args);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_new_svn_patch_t(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   struct svn_patch_t *result = 0 ;
@@ -8201,7 +8935,7 @@ SWIGINTERN PyObject *_wrap_new_svn_patch_t(PyObject *SWIGUNUSEDPARM(self), PyObj
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_patch_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_patch_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -8216,7 +8950,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_patch_t(PyObject *SWIGUNUSEDPARM(self), Py
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_patch_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_patch_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0);
+    arg1 = (struct svn_patch_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_patch_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8288,7 +9022,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_open_patch_file(PyObject *SWIGUNUSEDPARM(sel
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_patch_file_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_patch_file_t,
         _global_py_pool, args))
     
     ;
@@ -8334,7 +9068,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_parse_next_patch(PyObject *SWIGUNUSEDPARM(se
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OOO|OO:svn_diff_parse_next_patch",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
-    arg2 = (svn_patch_file_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_patch_file_t, svn_argnum_obj0);
+    arg2 = (svn_patch_file_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_patch_file_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8387,7 +9121,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_parse_next_patch(PyObject *SWIGUNUSEDPARM(se
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_patch_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_patch_t,
         _global_py_pool, args))
     
     ;
@@ -8426,7 +9160,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_close_patch_file(PyObject *SWIGUNUSEDPARM(se
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_diff_close_patch_file",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_patch_file_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_patch_file_t, svn_argnum_obj0);
+    arg1 = (svn_patch_file_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_patch_file_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8509,7 +9243,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_invoke_datasources_open(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOO:svn_diff_fns2_invoke_datasources_open",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
-    arg1 = (svn_diff_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0);
+    arg1 = (svn_diff_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8523,19 +9257,19 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_invoke_datasources_open(PyObject *SWIGU
     }
   }
   {
-    arg3 = (apr_off_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_apr_off_t, svn_argnum_obj2);
+    arg3 = (apr_off_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_apr_off_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (apr_off_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_apr_off_t, svn_argnum_obj3);
+    arg4 = (apr_off_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_apr_off_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg5 = (svn_diff_datasource_e *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_diff_datasource_e, svn_argnum_obj4);
+    arg5 = (svn_diff_datasource_e *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_diff_datasource_e, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8583,7 +9317,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_invoke_datasource_close(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:svn_diff_fns2_invoke_datasource_close",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_diff_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0);
+    arg1 = (svn_diff_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8646,7 +9380,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_invoke_datasource_get_next_token(PyObje
   arg3 = &temp3;
   if (!PyArg_ParseTuple(args,(char *)"OOO:svn_diff_fns2_invoke_datasource_get_next_token",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_diff_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0);
+    arg1 = (svn_diff_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8691,7 +9425,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_invoke_datasource_get_next_token(PyObje
     resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_apr_uint32_t, new_flags));
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg3, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg3, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -8720,7 +9454,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_invoke_token_compare(PyObject *SWIGUNUS
   arg5 = &temp5;
   if (!PyArg_ParseTuple(args,(char *)"OOOO:svn_diff_fns2_invoke_token_compare",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
-    arg1 = (svn_diff_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0);
+    arg1 = (svn_diff_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8734,13 +9468,13 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_invoke_token_compare(PyObject *SWIGUNUS
     }
   }
   {
-    arg3 = (void *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_void, svn_argnum_obj2);
+    arg3 = (void *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_void, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (void *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_void, svn_argnum_obj3);
+    arg4 = (void *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_void, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8787,7 +9521,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_invoke_token_discard(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:svn_diff_fns2_invoke_token_discard",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_diff_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0);
+    arg1 = (svn_diff_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8801,7 +9535,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_invoke_token_discard(PyObject *SWIGUNUS
     }
   }
   {
-    arg3 = (void *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_void, svn_argnum_obj2);
+    arg3 = (void *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_void, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8830,7 +9564,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns2_invoke_token_discard_all(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_fns2_invoke_token_discard_all",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_diff_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0);
+    arg1 = (svn_diff_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8870,7 +9604,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_invoke_datasource_open(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:svn_diff_fns_invoke_datasource_open",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_diff_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0);
+    arg1 = (svn_diff_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8926,7 +9660,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_invoke_datasource_close(PyObject *SWIGUN
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:svn_diff_fns_invoke_datasource_close",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_diff_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0);
+    arg1 = (svn_diff_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8989,7 +9723,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_invoke_datasource_get_next_token(PyObjec
   arg3 = &temp3;
   if (!PyArg_ParseTuple(args,(char *)"OOO:svn_diff_fns_invoke_datasource_get_next_token",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_diff_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0);
+    arg1 = (svn_diff_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9034,7 +9768,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_invoke_datasource_get_next_token(PyObjec
     resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_apr_uint32_t, new_flags));
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg3, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg3, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -9063,7 +9797,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_invoke_token_compare(PyObject *SWIGUNUSE
   arg5 = &temp5;
   if (!PyArg_ParseTuple(args,(char *)"OOOO:svn_diff_fns_invoke_token_compare",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
-    arg1 = (svn_diff_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0);
+    arg1 = (svn_diff_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9077,13 +9811,13 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_invoke_token_compare(PyObject *SWIGUNUSE
     }
   }
   {
-    arg3 = (void *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_void, svn_argnum_obj2);
+    arg3 = (void *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_void, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (void *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_void, svn_argnum_obj3);
+    arg4 = (void *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_void, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9130,7 +9864,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_invoke_token_discard(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:svn_diff_fns_invoke_token_discard",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_diff_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0);
+    arg1 = (svn_diff_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9144,7 +9878,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_invoke_token_discard(PyObject *SWIGUNUSE
     }
   }
   {
-    arg3 = (void *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_void, svn_argnum_obj2);
+    arg3 = (void *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_void, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9173,7 +9907,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_fns_invoke_token_discard_all(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_diff_fns_invoke_token_discard_all",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_diff_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0);
+    arg1 = (svn_diff_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9223,7 +9957,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_output_fns_invoke_output_common(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOOO:svn_diff_output_fns_invoke_output_common",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
-    arg1 = (svn_diff_output_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0);
+    arg1 = (svn_diff_output_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9289,7 +10023,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_output_fns_invoke_output_diff_modified(PyObj
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOOO:svn_diff_output_fns_invoke_output_diff_modified",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
-    arg1 = (svn_diff_output_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0);
+    arg1 = (svn_diff_output_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9355,7 +10089,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_output_fns_invoke_output_diff_latest(PyObjec
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOOO:svn_diff_output_fns_invoke_output_diff_latest",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
-    arg1 = (svn_diff_output_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0);
+    arg1 = (svn_diff_output_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9421,7 +10155,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_output_fns_invoke_output_diff_common(PyObjec
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOOO:svn_diff_output_fns_invoke_output_diff_common",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
-    arg1 = (svn_diff_output_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0);
+    arg1 = (svn_diff_output_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9489,7 +10223,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_output_fns_invoke_output_conflict(PyObject *
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOOOO:svn_diff_output_fns_invoke_output_conflict",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   {
-    arg1 = (svn_diff_output_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0);
+    arg1 = (svn_diff_output_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_diff_output_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9509,7 +10243,7 @@ SWIGINTERN PyObject *_wrap_svn_diff_output_fns_invoke_output_conflict(PyObject *
   arg7 = (apr_off_t) PyLong_AsLongLong(obj6); 
   arg8 = (apr_off_t) PyLong_AsLongLong(obj7); 
   {
-    arg9 = (svn_diff_t *)svn_swig_MustGetPtr(obj8, SWIGTYPE_p_svn_diff_t, svn_argnum_obj8);
+    arg9 = (svn_diff_t *)svn_swig_py_must_get_ptr(obj8, SWIGTYPE_p_svn_diff_t, svn_argnum_obj8);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9593,6 +10327,7 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"new_svn_diff_output_fns_t", _wrap_new_svn_diff_output_fns_t, METH_VARARGS, (char *)"new_svn_diff_output_fns_t() -> svn_diff_output_fns_t"},
 	 { (char *)"delete_svn_diff_output_fns_t", _wrap_delete_svn_diff_output_fns_t, METH_VARARGS, (char *)"delete_svn_diff_output_fns_t(svn_diff_output_fns_t self)"},
 	 { (char *)"svn_diff_output_fns_t_swigregister", svn_diff_output_fns_t_swigregister, METH_VARARGS, NULL},
+	 { (char *)"svn_diff_output2", _wrap_svn_diff_output2, METH_VARARGS, (char *)"svn_diff_output2(svn_diff_t * diff, void * output_baton, svn_diff_output_fns_t output_fns, svn_cancel_func_t cancel_func) -> svn_error_t"},
 	 { (char *)"svn_diff_output", _wrap_svn_diff_output, METH_VARARGS, (char *)"svn_diff_output(svn_diff_t * diff, void * output_baton, svn_diff_output_fns_t output_fns) -> svn_error_t"},
 	 { (char *)"svn_diff_file_options_t_ignore_space_set", _wrap_svn_diff_file_options_t_ignore_space_set, METH_VARARGS, (char *)"svn_diff_file_options_t_ignore_space_set(svn_diff_file_options_t self, svn_diff_file_ignore_space_t ignore_space)"},
 	 { (char *)"svn_diff_file_options_t_ignore_space_get", _wrap_svn_diff_file_options_t_ignore_space_get, METH_VARARGS, (char *)"svn_diff_file_options_t_ignore_space_get(svn_diff_file_options_t self) -> svn_diff_file_ignore_space_t"},
@@ -9600,6 +10335,8 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"svn_diff_file_options_t_ignore_eol_style_get", _wrap_svn_diff_file_options_t_ignore_eol_style_get, METH_VARARGS, (char *)"svn_diff_file_options_t_ignore_eol_style_get(svn_diff_file_options_t self) -> svn_boolean_t"},
 	 { (char *)"svn_diff_file_options_t_show_c_function_set", _wrap_svn_diff_file_options_t_show_c_function_set, METH_VARARGS, (char *)"svn_diff_file_options_t_show_c_function_set(svn_diff_file_options_t self, svn_boolean_t show_c_function)"},
 	 { (char *)"svn_diff_file_options_t_show_c_function_get", _wrap_svn_diff_file_options_t_show_c_function_get, METH_VARARGS, (char *)"svn_diff_file_options_t_show_c_function_get(svn_diff_file_options_t self) -> svn_boolean_t"},
+	 { (char *)"svn_diff_file_options_t_context_size_set", _wrap_svn_diff_file_options_t_context_size_set, METH_VARARGS, (char *)"svn_diff_file_options_t_context_size_set(svn_diff_file_options_t self, int context_size)"},
+	 { (char *)"svn_diff_file_options_t_context_size_get", _wrap_svn_diff_file_options_t_context_size_get, METH_VARARGS, (char *)"svn_diff_file_options_t_context_size_get(svn_diff_file_options_t self) -> int"},
 	 { (char *)"new_svn_diff_file_options_t", _wrap_new_svn_diff_file_options_t, METH_VARARGS, (char *)"new_svn_diff_file_options_t() -> svn_diff_file_options_t"},
 	 { (char *)"delete_svn_diff_file_options_t", _wrap_delete_svn_diff_file_options_t, METH_VARARGS, (char *)"delete_svn_diff_file_options_t(svn_diff_file_options_t self)"},
 	 { (char *)"svn_diff_file_options_t_swigregister", svn_diff_file_options_t_swigregister, METH_VARARGS, NULL},
@@ -9620,6 +10357,12 @@ static PyMethodDef SwigMethods[] = {
 		"svn_diff_file_diff4(char const * original, char const * modified, char const * latest, char const * ancestor, \n"
 		"    apr_pool_t pool) -> svn_error_t\n"
 		""},
+	 { (char *)"svn_diff_file_output_unified4", _wrap_svn_diff_file_output_unified4, METH_VARARGS, (char *)"\n"
+		"svn_diff_file_output_unified4(svn_stream_t * output_stream, svn_diff_t * diff, char const * original_path, char const * modified_path, \n"
+		"    char const * original_header, char const * modified_header, \n"
+		"    char const * header_encoding, char const * relative_to_dir, svn_boolean_t show_c_function, \n"
+		"    int context_size, svn_cancel_func_t cancel_func, apr_pool_t scratch_pool) -> svn_error_t\n"
+		""},
 	 { (char *)"svn_diff_file_output_unified3", _wrap_svn_diff_file_output_unified3, METH_VARARGS, (char *)"\n"
 		"svn_diff_file_output_unified3(svn_stream_t * output_stream, svn_diff_t * diff, char const * original_path, char const * modified_path, \n"
 		"    char const * original_header, char const * modified_header, \n"
@@ -9636,6 +10379,13 @@ static PyMethodDef SwigMethods[] = {
 		"    char const * original_header, char const * modified_header, \n"
 		"    apr_pool_t pool) -> svn_error_t\n"
 		""},
+	 { (char *)"svn_diff_file_output_merge3", _wrap_svn_diff_file_output_merge3, METH_VARARGS, (char *)"\n"
+		"svn_diff_file_output_merge3(svn_stream_t * output_stream, svn_diff_t * diff, char const * original_path, char const * modified_path, \n"
+		"    char const * latest_path, char const * conflict_original, \n"
+		"    char const * conflict_modified, char const * conflict_latest, char const * conflict_separator, \n"
+		"    svn_diff_conflict_display_style_t conflict_style, \n"
+		"    svn_cancel_func_t cancel_func, apr_pool_t scratch_pool) -> svn_error_t\n"
+		""},
 	 { (char *)"svn_diff_file_output_merge2", _wrap_svn_diff_file_output_merge2, METH_VARARGS, (char *)"\n"
 		"svn_diff_file_output_merge2(svn_stream_t * output_stream, svn_diff_t * diff, char const * original_path, char const * modified_path, \n"
 		"    char const * latest_path, char const * conflict_original, \n"
@@ -9650,6 +10400,10 @@ static PyMethodDef SwigMethods[] = {
 		"    svn_boolean_t display_original_in_conflict, svn_boolean_t display_resolved_conflicts, \n"
 		"    apr_pool_t pool) -> svn_error_t\n"
 		""},
+	 { (char *)"svn_diff_output_binary", _wrap_svn_diff_output_binary, METH_VARARGS, (char *)"\n"
+		"svn_diff_output_binary(svn_stream_t * output_stream, svn_stream_t * original, svn_stream_t * latest, svn_cancel_func_t cancel_func, \n"
+		"    apr_pool_t scratch_pool) -> svn_error_t\n"
+		""},
 	 { (char *)"svn_diff_mem_string_diff", _wrap_svn_diff_mem_string_diff, METH_VARARGS, (char *)"\n"
 		"svn_diff_mem_string_diff(svn_string_t const * original, svn_string_t const * modified, svn_diff_file_options_t options, \n"
 		"    apr_pool_t pool) -> svn_error_t\n"
@@ -9662,6 +10416,13 @@ static PyMethodDef SwigMethods[] = {
 		"svn_diff_mem_string_diff4(svn_string_t const * original, svn_string_t const * modified, svn_string_t const * latest, \n"
 		"    svn_string_t const * ancestor, svn_diff_file_options_t options, apr_pool_t pool) -> svn_error_t\n"
 		""},
+	 { (char *)"svn_diff_mem_string_output_unified3", _wrap_svn_diff_mem_string_output_unified3, METH_VARARGS, (char *)"\n"
+		"svn_diff_mem_string_output_unified3(svn_stream_t * output_stream, svn_diff_t * diff, svn_boolean_t with_diff_header, \n"
+		"    char const * hunk_delimiter, char const * original_header, char const * modified_header, \n"
+		"    char const * header_encoding, svn_string_t const * original, \n"
+		"    svn_string_t const * modified, int context_size, svn_cancel_func_t cancel_func, \n"
+		"    apr_pool_t scratch_pool) -> svn_error_t\n"
+		""},
 	 { (char *)"svn_diff_mem_string_output_unified2", _wrap_svn_diff_mem_string_output_unified2, METH_VARARGS, (char *)"\n"
 		"svn_diff_mem_string_output_unified2(svn_stream_t * output_stream, svn_diff_t * diff, svn_boolean_t with_diff_header, \n"
 		"    char const * hunk_delimiter, char const * original_header, char const * modified_header, \n"
@@ -9673,6 +10434,13 @@ static PyMethodDef SwigMethods[] = {
 		"    char const * header_encoding, svn_string_t const * original, \n"
 		"    svn_string_t const * modified, apr_pool_t pool) -> svn_error_t\n"
 		""},
+	 { (char *)"svn_diff_mem_string_output_merge3", _wrap_svn_diff_mem_string_output_merge3, METH_VARARGS, (char *)"\n"
+		"svn_diff_mem_string_output_merge3(svn_stream_t * output_stream, svn_diff_t * diff, svn_string_t const * original, svn_string_t const * modified, \n"
+		"    svn_string_t const * latest, char const * conflict_original, \n"
+		"    char const * conflict_modified, char const * conflict_latest, \n"
+		"    char const * conflict_separator, svn_diff_conflict_display_style_t style, \n"
+		"    svn_cancel_func_t cancel_func, apr_pool_t scratch_pool) -> svn_error_t\n"
+		""},
 	 { (char *)"svn_diff_mem_string_output_merge2", _wrap_svn_diff_mem_string_output_merge2, METH_VARARGS, (char *)"\n"
 		"svn_diff_mem_string_output_merge2(svn_stream_t * output_stream, svn_diff_t * diff, svn_string_t const * original, svn_string_t const * modified, \n"
 		"    svn_string_t const * latest, char const * conflict_original, \n"
@@ -9720,6 +10488,10 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"svn_patch_t_operation_get", _wrap_svn_patch_t_operation_get, METH_VARARGS, (char *)"svn_patch_t_operation_get(svn_patch_t self) -> svn_diff_operation_kind_t"},
 	 { (char *)"svn_patch_t_reverse_set", _wrap_svn_patch_t_reverse_set, METH_VARARGS, (char *)"svn_patch_t_reverse_set(svn_patch_t self, svn_boolean_t reverse)"},
 	 { (char *)"svn_patch_t_reverse_get", _wrap_svn_patch_t_reverse_get, METH_VARARGS, (char *)"svn_patch_t_reverse_get(svn_patch_t self) -> svn_boolean_t"},
+	 { (char *)"svn_patch_t_mergeinfo_set", _wrap_svn_patch_t_mergeinfo_set, METH_VARARGS, (char *)"svn_patch_t_mergeinfo_set(svn_patch_t self, apr_hash_t mergeinfo)"},
+	 { (char *)"svn_patch_t_mergeinfo_get", _wrap_svn_patch_t_mergeinfo_get, METH_VARARGS, (char *)"svn_patch_t_mergeinfo_get(svn_patch_t self) -> apr_hash_t"},
+	 { (char *)"svn_patch_t_reverse_mergeinfo_set", _wrap_svn_patch_t_reverse_mergeinfo_set, METH_VARARGS, (char *)"svn_patch_t_reverse_mergeinfo_set(svn_patch_t self, apr_hash_t reverse_mergeinfo)"},
+	 { (char *)"svn_patch_t_reverse_mergeinfo_get", _wrap_svn_patch_t_reverse_mergeinfo_get, METH_VARARGS, (char *)"svn_patch_t_reverse_mergeinfo_get(svn_patch_t self) -> apr_hash_t"},
 	 { (char *)"new_svn_patch_t", _wrap_new_svn_patch_t, METH_VARARGS, (char *)"new_svn_patch_t() -> svn_patch_t"},
 	 { (char *)"delete_svn_patch_t", _wrap_delete_svn_patch_t, METH_VARARGS, (char *)"delete_svn_patch_t(svn_patch_t self)"},
 	 { (char *)"svn_patch_t_swigregister", svn_patch_t_swigregister, METH_VARARGS, NULL},
@@ -9779,7 +10551,7 @@ static PyMethodDef SwigMethods[] = {
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
 
 static swig_type_info _swigt__p_apr_array_header_t = {"_p_apr_array_header_t", "apr_array_header_t *|svn_rangelist_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_apr_hash_t = {"_p_apr_hash_t", "apr_hash_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_apr_hash_t = {"_p_apr_hash_t", "svn_mergeinfo_t|apr_hash_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_apr_int32_t = {"_p_apr_int32_t", "apr_int32_t *|time_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_apr_int64_t = {"_p_apr_int64_t", "apr_int64_t *|svn_filesize_t *|apr_time_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_apr_off_t = {"_p_apr_off_t", "apr_off_t *", 0, 0, (void*)0, 0};
@@ -9788,6 +10560,7 @@ static swig_type_info _swigt__p_apr_uint32_t = {"_p_apr_uint32_t", "apr_uint32_t
 static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|struct svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_apr_uint32_t_p_p_void_p_void_svn_diff_datasource_e__p_svn_error_t = {"_p_f_p_apr_uint32_t_p_p_void_p_void_svn_diff_datasource_e__p_svn_error_t", "struct svn_error_t *(*)(apr_uint32_t *,void **,void *,svn_diff_datasource_e)|svn_error_t *(*)(apr_uint32_t *,void **,void *,svn_diff_datasource_e)", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_f_p_void__p_svn_error_t = {"_p_f_p_void__p_svn_error_t", "svn_cancel_func_t|struct svn_error_t *(*)(void *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void__void = {"_p_f_p_void__void", "void (*)(void *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t__p_svn_error_t = {"_p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t)|svn_error_t *(*)(void *,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_p_svn_diff_t__p_svn_error_t = {"_p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_p_svn_diff_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t,svn_diff_t *)|svn_error_t *(*)(void *,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t,apr_off_t,svn_diff_t *)", 0, 0, (void*)0, 0};
@@ -9832,6 +10605,7 @@ static swig_type_info _swigt__p_svn_diff_t = {"_p_svn_diff_t", "struct svn_diff_
 static swig_type_info _swigt__p_svn_dirent_t = {"_p_svn_dirent_t", "struct svn_dirent_t *|svn_dirent_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_errno_t = {"_p_svn_errno_t", "enum svn_errno_t *|svn_errno_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "struct svn_error_t *|svn_error_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_fs_lock_target_t = {"_p_svn_fs_lock_target_t", "svn_fs_lock_target_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_io_dirent2_t = {"_p_svn_io_dirent2_t", "struct svn_io_dirent2_t *|svn_io_dirent2_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_io_dirent_t = {"_p_svn_io_dirent_t", "struct svn_io_dirent_t *|svn_io_dirent_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_io_file_del_t = {"_p_svn_io_file_del_t", "enum svn_io_file_del_t *|svn_io_file_del_t *", 0, 0, (void*)0, 0};
@@ -9878,6 +10652,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_char,
   &_swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_apr_uint32_t_p_p_void_p_void_svn_diff_datasource_e__p_svn_error_t,
+  &_swigt__p_f_p_void__p_svn_error_t,
   &_swigt__p_f_p_void__void,
   &_swigt__p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t__p_svn_error_t,
   &_swigt__p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_p_svn_diff_t__p_svn_error_t,
@@ -9922,6 +10697,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_svn_dirent_t,
   &_swigt__p_svn_errno_t,
   &_swigt__p_svn_error_t,
+  &_swigt__p_svn_fs_lock_target_t,
   &_swigt__p_svn_io_dirent2_t,
   &_swigt__p_svn_io_dirent_t,
   &_swigt__p_svn_io_file_del_t,
@@ -9968,6 +10744,7 @@ static swig_cast_info _swigc__p_apr_uint32_t[] = {  {&_swigt__p_apr_uint32_t, 0,
 static swig_cast_info _swigc__p_char[] = {  {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_apr_uint32_t_p_p_void_p_void_svn_diff_datasource_e__p_svn_error_t[] = {  {&_swigt__p_f_p_apr_uint32_t_p_p_void_p_void_svn_diff_datasource_e__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_f_p_void__p_svn_error_t[] = {  {&_swigt__p_f_p_void__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void__void[] = {  {&_swigt__p_f_p_void__void, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_p_svn_diff_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_p_svn_diff_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -10012,6 +10789,7 @@ static swig_cast_info _swigc__p_svn_diff_t[] = {  {&_swigt__p_svn_diff_t, 0, 0,
 static swig_cast_info _swigc__p_svn_dirent_t[] = {  {&_swigt__p_svn_dirent_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_errno_t[] = {  {&_swigt__p_svn_errno_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_error_t[] = {  {&_swigt__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_fs_lock_target_t[] = {  {&_swigt__p_svn_fs_lock_target_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_io_dirent2_t[] = {  {&_swigt__p_svn_io_dirent2_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_io_dirent_t[] = {  {&_swigt__p_svn_io_dirent_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_io_file_del_t[] = {  {&_swigt__p_svn_io_file_del_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -10058,6 +10836,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_char,
   _swigc__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_apr_uint32_t_p_p_void_p_void_svn_diff_datasource_e__p_svn_error_t,
+  _swigc__p_f_p_void__p_svn_error_t,
   _swigc__p_f_p_void__void,
   _swigc__p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t__p_svn_error_t,
   _swigc__p_f_p_void_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_apr_off_t_p_svn_diff_t__p_svn_error_t,
@@ -10102,6 +10881,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_svn_dirent_t,
   _swigc__p_svn_errno_t,
   _swigc__p_svn_error_t,
+  _swigc__p_svn_fs_lock_target_t,
   _swigc__p_svn_io_dirent2_t,
   _swigc__p_svn_io_dirent_t,
   _swigc__p_svn_io_file_del_t,
@@ -10149,18 +10929,18 @@ static swig_const_info swig_const_table[] = {
 #endif
 /* -----------------------------------------------------------------------------
  * Type initialization:
- * This problem is tough by the requirement that no dynamic 
- * memory is used. Also, since swig_type_info structures store pointers to 
+ * This problem is tough by the requirement that no dynamic
+ * memory is used. Also, since swig_type_info structures store pointers to
  * swig_cast_info structures and swig_cast_info structures store pointers back
- * to swig_type_info structures, we need some lookup code at initialization. 
- * The idea is that swig generates all the structures that are needed. 
- * The runtime then collects these partially filled structures. 
- * The SWIG_InitializeModule function takes these initial arrays out of 
+ * to swig_type_info structures, we need some lookup code at initialization.
+ * The idea is that swig generates all the structures that are needed.
+ * The runtime then collects these partially filled structures.
+ * The SWIG_InitializeModule function takes these initial arrays out of
  * swig_module, and does all the lookup, filling in the swig_module.types
  * array with the correct data and linking the correct swig_cast_info
  * structures together.
  *
- * The generated swig_type_info structures are assigned staticly to an initial 
+ * The generated swig_type_info structures are assigned staticly to an initial
  * array. We just loop through that array, and handle each type individually.
  * First we lookup if this type has been already loaded, and if so, use the
  * loaded structure instead of the generated one. Then we have to fill in the
@@ -10170,17 +10950,17 @@ static swig_const_info swig_const_table[] = {
  * a column is one of the swig_cast_info structures for that type.
  * The cast_initial array is actually an array of arrays, because each row has
  * a variable number of columns. So to actually build the cast linked list,
- * we find the array of casts associated with the type, and loop through it 
+ * we find the array of casts associated with the type, and loop through it
  * adding the casts to the list. The one last trick we need to do is making
  * sure the type pointer in the swig_cast_info struct is correct.
  *
- * First off, we lookup the cast->type name to see if it is already loaded. 
+ * First off, we lookup the cast->type name to see if it is already loaded.
  * There are three cases to handle:
  *  1) If the cast->type has already been loaded AND the type we are adding
  *     casting info to has not been loaded (it is in this module), THEN we
  *     replace the cast->type pointer with the type pointer that has already
  *     been loaded.
- *  2) If BOTH types (the one we are adding casting info to, and the 
+ *  2) If BOTH types (the one we are adding casting info to, and the
  *     cast->type) are loaded, THEN the cast info has already been loaded by
  *     the previous module so we just ignore it.
  *  3) Finally, if cast->type has not already been loaded, then we add that
@@ -10243,7 +11023,7 @@ SWIG_InitializeModule(void *clientdata) {
     module_head->next = &swig_module;
   }
   
-  /* When multiple interpeters are used, a module could have already been initialized in
+  /* When multiple interpreters are used, a module could have already been initialized in
        a different interpreter, but not yet have a pointer in this interpreter.
        In this case, we do not want to continue adding types... everything should be
        set up already */
diff --git a/subversion/bindings/swig/python/svn_fs.c b/subversion/bindings/swig/python/svn_fs.c
index 1667fb0..3d1db1a 100644
--- a/subversion/bindings/swig/python/svn_fs.c
+++ b/subversion/bindings/swig/python/svn_fs.c
@@ -1,11 +1,11 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
- * 
- * This file is not intended to be easily readable and contains a number of 
+ * Version 2.0.12
+ *
+ * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
- * changes to this file unless you know what you are doing--modify the SWIG 
- * interface file instead. 
+ * changes to this file unless you know what you are doing--modify the SWIG
+ * interface file instead.
  * ----------------------------------------------------------------------------- */
 
 #define SWIGPYTHON
@@ -43,28 +43,28 @@
 #ifndef SWIGUNUSED
 # if defined(__GNUC__)
 #   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__)) 
+#     define SWIGUNUSED __attribute__ ((__unused__))
 #   else
 #     define SWIGUNUSED
 #   endif
 # elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__)) 
+#   define SWIGUNUSED __attribute__ ((__unused__))
 # else
-#   define SWIGUNUSED 
+#   define SWIGUNUSED
 # endif
 #endif
 
 #ifndef SWIG_MSC_UNSUPPRESS_4505
 # if defined(_MSC_VER)
 #   pragma warning(disable : 4505) /* unreferenced local function has been removed */
-# endif 
+# endif
 #endif
 
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
 # else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
 # endif
 #endif
 
@@ -107,7 +107,7 @@
 #   define SWIGSTDCALL __stdcall
 # else
 #   define SWIGSTDCALL
-# endif 
+# endif
 #endif
 
 /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
@@ -122,8 +122,14 @@
 
 
 
-/* Python.h has to appear first */
-#include <Python.h>
+#if defined(_DEBUG) && defined(SWIG_PYTHON_INTERPRETER_NO_DEBUG)
+/* Use debug wrappers with the Python release dll */
+# undef _DEBUG
+# include <Python.h>
+# define _DEBUG
+#else
+# include <Python.h>
+#endif
 
 /* -----------------------------------------------------------------------------
  * swigrun.swg
@@ -149,7 +155,7 @@
   You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for
   creating a static or dynamic library from the SWIG runtime code.
   In 99.9% of the cases, SWIG just needs to declare them as 'static'.
-  
+
   But only do this if strictly necessary, ie, if you have problems
   with your compiler or suchlike.
 */
@@ -175,16 +181,16 @@
 #define SWIG_POINTER_OWN           0x1
 
 
-/* 
+/*
    Flags/methods for returning states.
-   
-   The SWIG conversion methods, as ConvertPtr, return an integer 
+
+   The SWIG conversion methods, as ConvertPtr, return an integer
    that tells if the conversion was successful or not. And if not,
    an error code can be returned (see swigerrors.swg for the codes).
-   
+
    Use the following macros/flags to set or process the returning
    states.
-   
+
    In old versions of SWIG, code such as the following was usually written:
 
      if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) {
@@ -217,23 +223,23 @@
     } else {
       // fail code
     }
-    
+
    I.e., now SWIG_ConvertPtr can return new objects and you can
    identify the case and take care of the deallocation. Of course that
    also requires SWIG_ConvertPtr to return new result values, such as
 
-      int SWIG_ConvertPtr(obj, ptr,...) {         
-        if (<obj is ok>) {			       
-          if (<need new object>) {		       
-            *ptr = <ptr to new allocated object>; 
-            return SWIG_NEWOBJ;		       
-          } else {				       
-            *ptr = <ptr to old object>;	       
-            return SWIG_OLDOBJ;		       
-          } 				       
-        } else {				       
-          return SWIG_BADOBJ;		       
-        }					       
+      int SWIG_ConvertPtr(obj, ptr,...) {
+        if (<obj is ok>) {
+          if (<need new object>) {
+            *ptr = <ptr to new allocated object>;
+            return SWIG_NEWOBJ;
+          } else {
+            *ptr = <ptr to old object>;
+            return SWIG_OLDOBJ;
+          }
+        } else {
+          return SWIG_BADOBJ;
+        }
       }
 
    Of course, returning the plain '0(success)/-1(fail)' still works, but you can be
@@ -247,17 +253,17 @@
        int fooi(int);
 
    and you call
- 
+
       food(1)   // cast rank '1'  (1 -> 1.0)
       fooi(1)   // cast rank '0'
 
    just use the SWIG_AddCast()/SWIG_CheckState()
 */
 
-#define SWIG_OK                    (0) 
+#define SWIG_OK                    (0)
 #define SWIG_ERROR                 (-1)
 #define SWIG_IsOK(r)               (r >= 0)
-#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)  
+#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)
 
 /* The CastRankLimit says how many bits are used for the cast rank */
 #define SWIG_CASTRANKLIMIT         (1 << 8)
@@ -288,14 +294,14 @@
 #  endif
 #  define SWIG_CASTRANKMASK          ((SWIG_CASTRANKLIMIT) -1)
 #  define SWIG_CastRank(r)           (r & SWIG_CASTRANKMASK)
-SWIGINTERNINLINE int SWIG_AddCast(int r) { 
+SWIGINTERNINLINE int SWIG_AddCast(int r) {
   return SWIG_IsOK(r) ? ((SWIG_CastRank(r) < SWIG_MAXCASTRANK) ? (r + 1) : SWIG_ERROR) : r;
 }
-SWIGINTERNINLINE int SWIG_CheckState(int r) { 
-  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0; 
+SWIGINTERNINLINE int SWIG_CheckState(int r) {
+  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0;
 }
 #else /* no cast-rank mode */
-#  define SWIG_AddCast
+#  define SWIG_AddCast(r) (r)
 #  define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0)
 #endif
 
@@ -339,7 +345,7 @@ typedef struct swig_module_info {
   void                    *clientdata;		/* Language specific module data */
 } swig_module_info;
 
-/* 
+/*
   Compare two type names skipping the space characters, therefore
   "char*" == "char *" and "Class<int>" == "Class<int >", etc.
 
@@ -359,18 +365,18 @@ SWIG_TypeNameComp(const char *f1, const char *l1,
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if not equal, 1 if equal
+  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
 */
 SWIGRUNTIME int
-SWIG_TypeEquiv(const char *nb, const char *tb) {
-  int equiv = 0;
+SWIG_TypeCmp(const char *nb, const char *tb) {
+  int equiv = 1;
   const char* te = tb + strlen(tb);
   const char* ne = nb;
-  while (!equiv && *ne) {
+  while (equiv != 0 && *ne) {
     for (nb = ne; *ne; ++ne) {
       if (*ne == '|') break;
     }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
+    equiv = SWIG_TypeNameComp(nb, ne, tb, te);
     if (*ne) ++ne;
   }
   return equiv;
@@ -378,24 +384,13 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
+  Return 0 if not equal, 1 if equal
 */
 SWIGRUNTIME int
-SWIG_TypeCompare(const char *nb, const char *tb) {
-  int equiv = 0;
-  const char* te = tb + strlen(tb);
-  const char* ne = nb;
-  while (!equiv && *ne) {
-    for (nb = ne; *ne; ++ne) {
-      if (*ne == '|') break;
-    }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
-    if (*ne) ++ne;
-  }
-  return equiv;
+SWIG_TypeEquiv(const char *nb, const char *tb) {
+  return SWIG_TypeCmp(nb, tb) == 0 ? 1 : 0;
 }
 
-
 /*
   Check the typename
 */
@@ -423,7 +418,7 @@ SWIG_TypeCheck(const char *c, swig_type_info *ty) {
   return 0;
 }
 
-/* 
+/*
   Identical to SWIG_TypeCheck, except strcmp is replaced with a pointer comparison
 */
 SWIGRUNTIME swig_cast_info *
@@ -458,7 +453,7 @@ SWIG_TypeCast(swig_cast_info *ty, void *ptr, int *newmemory) {
   return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr, newmemory);
 }
 
-/* 
+/*
    Dynamic pointer casting. Down an inheritance hierarchy
 */
 SWIGRUNTIME swig_type_info *
@@ -502,7 +497,7 @@ SWIG_TypePrettyName(const swig_type_info *type) {
     return type->name;
 }
 
-/* 
+/*
    Set the clientdata field for a type
 */
 SWIGRUNTIME void
@@ -510,14 +505,14 @@ SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
   swig_cast_info *cast = ti->cast;
   /* if (ti->clientdata == clientdata) return; */
   ti->clientdata = clientdata;
-  
+
   while (cast) {
     if (!cast->converter) {
       swig_type_info *tc = cast->type;
       if (!tc->clientdata) {
 	SWIG_TypeClientData(tc, clientdata);
       }
-    }    
+    }
     cast = cast->next;
   }
 }
@@ -526,18 +521,18 @@ SWIG_TypeNewClientData(swig_type_info *ti, void *clientdata) {
   SWIG_TypeClientData(ti, clientdata);
   ti->owndata = 1;
 }
-  
+
 /*
   Search for a swig_type_info structure only by mangled name
   Search is a O(log #types)
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_MangledTypeQueryModule(swig_module_info *start, 
-                            swig_module_info *end, 
+SWIG_MangledTypeQueryModule(swig_module_info *start,
+                            swig_module_info *end,
 		            const char *name) {
   swig_module_info *iter = start;
   do {
@@ -546,11 +541,11 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
       register size_t r = iter->size - 1;
       do {
 	/* since l+r >= 0, we can (>> 1) instead (/ 2) */
-	register size_t i = (l + r) >> 1; 
+	register size_t i = (l + r) >> 1;
 	const char *iname = iter->types[i]->name;
 	if (iname) {
 	  register int compare = strcmp(name, iname);
-	  if (compare == 0) {	    
+	  if (compare == 0) {
 	    return iter->types[i];
 	  } else if (compare < 0) {
 	    if (i) {
@@ -575,14 +570,14 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
   Search for a swig_type_info structure for either a mangled name or a human readable name.
   It first searches the mangled names of the types, which is a O(log #types)
   If a type is not found it then searches the human readable names, which is O(#types).
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_TypeQueryModule(swig_module_info *start, 
-                     swig_module_info *end, 
+SWIG_TypeQueryModule(swig_module_info *start,
+                     swig_module_info *end,
 		     const char *name) {
   /* STEP 1: Search the name field using binary search */
   swig_type_info *ret = SWIG_MangledTypeQueryModule(start, end, name);
@@ -601,12 +596,12 @@ SWIG_TypeQueryModule(swig_module_info *start,
       iter = iter->next;
     } while (iter != end);
   }
-  
+
   /* neither found a match */
   return 0;
 }
 
-/* 
+/*
    Pack binary data into a string
 */
 SWIGRUNTIME char *
@@ -622,7 +617,7 @@ SWIG_PackData(char *c, void *ptr, size_t sz) {
   return c;
 }
 
-/* 
+/*
    Unpack binary data from a string
 */
 SWIGRUNTIME const char *
@@ -636,21 +631,21 @@ SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
       uu = ((d - '0') << 4);
     else if ((d >= 'a') && (d <= 'f'))
       uu = ((d - ('a'-10)) << 4);
-    else 
+    else
       return (char *) 0;
     d = *(c++);
     if ((d >= '0') && (d <= '9'))
       uu |= (d - '0');
     else if ((d >= 'a') && (d <= 'f'))
       uu |= (d - ('a'-10));
-    else 
+    else
       return (char *) 0;
     *u = uu;
   }
   return c;
 }
 
-/* 
+/*
    Pack 'void *' into a string buffer.
 */
 SWIGRUNTIME char *
@@ -710,18 +705,18 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 #endif
 
 /*  Errors in SWIG */
-#define  SWIG_UnknownError    	   -1 
-#define  SWIG_IOError        	   -2 
-#define  SWIG_RuntimeError   	   -3 
-#define  SWIG_IndexError     	   -4 
-#define  SWIG_TypeError      	   -5 
-#define  SWIG_DivisionByZero 	   -6 
-#define  SWIG_OverflowError  	   -7 
-#define  SWIG_SyntaxError    	   -8 
-#define  SWIG_ValueError     	   -9 
+#define  SWIG_UnknownError    	   -1
+#define  SWIG_IOError        	   -2
+#define  SWIG_RuntimeError   	   -3
+#define  SWIG_IndexError     	   -4
+#define  SWIG_TypeError      	   -5
+#define  SWIG_DivisionByZero 	   -6
+#define  SWIG_OverflowError  	   -7
+#define  SWIG_SyntaxError    	   -8
+#define  SWIG_ValueError     	   -9
 #define  SWIG_SystemError    	   -10
 #define  SWIG_AttributeError 	   -11
-#define  SWIG_MemoryError    	   -12 
+#define  SWIG_MemoryError    	   -12
 #define  SWIG_NullReferenceError   -13
 
 
@@ -1582,34 +1577,6 @@ SwigPyObject_repr(SwigPyObject *v, PyObject *args)
 }
 
 SWIGRUNTIME int
-SwigPyObject_print(SwigPyObject *v, FILE *fp, int SWIGUNUSEDPARM(flags))
-{
-  char *str;
-#ifdef METH_NOARGS
-  PyObject *repr = SwigPyObject_repr(v);
-#else
-  PyObject *repr = SwigPyObject_repr(v, NULL);
-#endif
-  if (repr) {
-    str = SWIG_Python_str_AsChar(repr); 
-    fputs(str, fp);
-    SWIG_Python_str_DelForPy3(str);
-    Py_DECREF(repr);
-    return 0; 
-  } else {
-    return 1; 
-  }
-}
-
-SWIGRUNTIME PyObject *
-SwigPyObject_str(SwigPyObject *v)
-{
-  char result[SWIG_BUFFER_SIZE];
-  return SWIG_PackVoidPtr(result, v->ptr, v->ty->name, sizeof(result)) ?
-    SWIG_Python_str_FromChar(result) : 0;
-}
-
-SWIGRUNTIME int
 SwigPyObject_compare(SwigPyObject *v, SwigPyObject *w)
 {
   void *i = v->ptr;
@@ -1801,7 +1768,7 @@ SwigPyObject_own(PyObject *v, PyObject *args)
 static PyMethodDef
 swigobject_methods[] = {
   {(char *)"disown",  (PyCFunction)SwigPyObject_disown,  METH_NOARGS,  (char *)"releases ownership of the pointer"},
-  {(char *)"acquire", (PyCFunction)SwigPyObject_acquire, METH_NOARGS,  (char *)"aquires ownership of the pointer"},
+  {(char *)"acquire", (PyCFunction)SwigPyObject_acquire, METH_NOARGS,  (char *)"acquires ownership of the pointer"},
   {(char *)"own",     (PyCFunction)SwigPyObject_own,     METH_VARARGS, (char *)"returns/sets ownership of the pointer"},
   {(char *)"append",  (PyCFunction)SwigPyObject_append,  METH_O,       (char *)"appends another 'this' object"},
   {(char *)"next",    (PyCFunction)SwigPyObject_next,    METH_NOARGS,  (char *)"returns the next 'this' object"},
@@ -1894,7 +1861,7 @@ SwigPyObject_TypeOnce(void) {
       sizeof(SwigPyObject),                 /* tp_basicsize */
       0,                                    /* tp_itemsize */
       (destructor)SwigPyObject_dealloc,     /* tp_dealloc */
-      (printfunc)SwigPyObject_print,        /* tp_print */
+      0,				    /* tp_print */
 #if PY_VERSION_HEX < 0x02020000
       (getattrfunc)SwigPyObject_getattr,    /* tp_getattr */
 #else
@@ -1912,7 +1879,7 @@ SwigPyObject_TypeOnce(void) {
       0,                                    /* tp_as_mapping */
       (hashfunc)0,                          /* tp_hash */
       (ternaryfunc)0,                       /* tp_call */
-      (reprfunc)SwigPyObject_str,           /* tp_str */
+      0,				    /* tp_str */
       PyObject_GenericGetAttr,              /* tp_getattro */
       0,                                    /* tp_setattro */
       0,                                    /* tp_as_buffer */
@@ -2289,10 +2256,11 @@ SWIGRUNTIME int
 SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int flags, int *own) {
   int res;
   SwigPyObject *sobj;
+  int implicit_conv = (flags & SWIG_POINTER_IMPLICIT_CONV) != 0;
 
   if (!obj)
     return SWIG_ERROR;
-  if (obj == Py_None) {
+  if (obj == Py_None && !implicit_conv) {
     if (ptr)
       *ptr = 0;
     return SWIG_OK;
@@ -2341,7 +2309,7 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
     }
     res = SWIG_OK;
   } else {
-    if (flags & SWIG_POINTER_IMPLICIT_CONV) {
+    if (implicit_conv) {
       SwigPyClientData *data = ty ? (SwigPyClientData *) ty->clientdata : 0;
       if (data && !data->implicitconv) {
         PyObject *klass = data->klass;
@@ -2376,6 +2344,13 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
         }
       }
     }
+    if (!SWIG_IsOK(res) && obj == Py_None) {
+      if (ptr)
+        *ptr = 0;
+      if (PyErr_Occurred())
+        PyErr_Clear();
+      res = SWIG_OK;
+    }
   }
   return res;
 }
@@ -2875,7 +2850,7 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) {
   PyObject *descr;
   PyObject *encoded_name;
   descrsetfunc f;
-  int res;
+  int res = -1;
 
 # ifdef Py_USING_UNICODE
   if (PyString_Check(name)) {
@@ -2898,7 +2873,6 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) {
       goto done;
   }
 
-  res = -1;
   descr = _PyType_Lookup(tp, name);
   f = NULL;
   if (descr != NULL)
@@ -2945,107 +2919,123 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) {
 #define SWIGTYPE_p_apr_int32_t swig_types[2]
 #define SWIGTYPE_p_apr_int64_t swig_types[3]
 #define SWIGTYPE_p_apr_pool_t swig_types[4]
-#define SWIGTYPE_p_char swig_types[5]
-#define SWIGTYPE_p_f_long_p_void_p_apr_pool_t__void swig_types[6]
-#define SWIGTYPE_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[7]
-#define SWIGTYPE_p_f_p_q_const__unsigned_char_apr_size_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[8]
-#define SWIGTYPE_p_f_p_void__p_svn_error_t swig_types[9]
-#define SWIGTYPE_p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t swig_types[10]
-#define SWIGTYPE_p_f_p_void_p_apr_pool_t__p_svn_error_t swig_types[11]
-#define SWIGTYPE_p_f_p_void_p_struct_svn_error_t__void swig_types[12]
-#define SWIGTYPE_p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t swig_types[13]
-#define SWIGTYPE_p_int swig_types[14]
-#define SWIGTYPE_p_long swig_types[15]
-#define SWIGTYPE_p_p_apr_array_header_t swig_types[16]
-#define SWIGTYPE_p_p_apr_hash_t swig_types[17]
-#define SWIGTYPE_p_p_char swig_types[18]
-#define SWIGTYPE_p_p_f_long_p_void_p_apr_pool_t__void swig_types[19]
-#define SWIGTYPE_p_p_f_p_q_const__unsigned_char_apr_size_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[20]
-#define SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t swig_types[21]
-#define SWIGTYPE_p_p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t swig_types[22]
-#define SWIGTYPE_p_p_f_p_void_p_apr_pool_t__p_svn_error_t swig_types[23]
-#define SWIGTYPE_p_p_f_p_void_p_struct_svn_error_t__void swig_types[24]
-#define SWIGTYPE_p_p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t swig_types[25]
-#define SWIGTYPE_p_p_svn_checksum_t swig_types[26]
-#define SWIGTYPE_p_p_svn_fs_access_t swig_types[27]
-#define SWIGTYPE_p_p_svn_fs_history_t swig_types[28]
-#define SWIGTYPE_p_p_svn_fs_id_t swig_types[29]
-#define SWIGTYPE_p_p_svn_fs_root_t swig_types[30]
-#define SWIGTYPE_p_p_svn_fs_t swig_types[31]
-#define SWIGTYPE_p_p_svn_fs_txn_t swig_types[32]
-#define SWIGTYPE_p_p_svn_lock_t swig_types[33]
-#define SWIGTYPE_p_p_svn_stream_t swig_types[34]
-#define SWIGTYPE_p_p_svn_string_t swig_types[35]
-#define SWIGTYPE_p_p_svn_txdelta_stream_t swig_types[36]
-#define SWIGTYPE_p_p_void swig_types[37]
-#define SWIGTYPE_p_svn_auth_baton_t swig_types[38]
-#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[39]
-#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[40]
-#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[41]
-#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[42]
-#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[43]
-#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[44]
-#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[45]
-#define SWIGTYPE_p_svn_auth_provider_t swig_types[46]
-#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[47]
-#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[48]
-#define SWIGTYPE_p_svn_checksum_kind_t swig_types[49]
-#define SWIGTYPE_p_svn_checksum_t swig_types[50]
-#define SWIGTYPE_p_svn_commit_info_t swig_types[51]
-#define SWIGTYPE_p_svn_config_t swig_types[52]
-#define SWIGTYPE_p_svn_delta_editor_t swig_types[53]
-#define SWIGTYPE_p_svn_depth_t swig_types[54]
-#define SWIGTYPE_p_svn_dirent_t swig_types[55]
-#define SWIGTYPE_p_svn_errno_t swig_types[56]
-#define SWIGTYPE_p_svn_error_t swig_types[57]
-#define SWIGTYPE_p_svn_fs_access_t swig_types[58]
-#define SWIGTYPE_p_svn_fs_dirent_t swig_types[59]
-#define SWIGTYPE_p_svn_fs_history_t swig_types[60]
-#define SWIGTYPE_p_svn_fs_id_t swig_types[61]
-#define SWIGTYPE_p_svn_fs_pack_notify_action_t swig_types[62]
-#define SWIGTYPE_p_svn_fs_path_change2_t swig_types[63]
-#define SWIGTYPE_p_svn_fs_path_change_kind_t swig_types[64]
-#define SWIGTYPE_p_svn_fs_path_change_t swig_types[65]
-#define SWIGTYPE_p_svn_fs_root_t swig_types[66]
-#define SWIGTYPE_p_svn_fs_t swig_types[67]
-#define SWIGTYPE_p_svn_fs_txn_t swig_types[68]
-#define SWIGTYPE_p_svn_io_dirent2_t swig_types[69]
-#define SWIGTYPE_p_svn_io_dirent_t swig_types[70]
-#define SWIGTYPE_p_svn_io_file_del_t swig_types[71]
-#define SWIGTYPE_p_svn_location_segment_t swig_types[72]
-#define SWIGTYPE_p_svn_lock_t swig_types[73]
-#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[74]
-#define SWIGTYPE_p_svn_log_changed_path_t swig_types[75]
-#define SWIGTYPE_p_svn_log_entry_t swig_types[76]
-#define SWIGTYPE_p_svn_merge_range_t swig_types[77]
-#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[78]
-#define SWIGTYPE_p_svn_node_kind_t swig_types[79]
-#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[80]
-#define SWIGTYPE_p_svn_opt_revision_t swig_types[81]
-#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[82]
-#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[83]
-#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[84]
-#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[85]
-#define SWIGTYPE_p_svn_prop_kind swig_types[86]
-#define SWIGTYPE_p_svn_stream_mark_t swig_types[87]
-#define SWIGTYPE_p_svn_stream_t swig_types[88]
-#define SWIGTYPE_p_svn_string_t swig_types[89]
-#define SWIGTYPE_p_svn_stringbuf_t swig_types[90]
-#define SWIGTYPE_p_svn_tristate_t swig_types[91]
-#define SWIGTYPE_p_svn_txdelta_op_t swig_types[92]
-#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[93]
-#define SWIGTYPE_p_svn_txdelta_window_t swig_types[94]
-#define SWIGTYPE_p_svn_version_checklist_t swig_types[95]
-#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[96]
-#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[97]
-#define SWIGTYPE_p_svn_version_extended_t swig_types[98]
-#define SWIGTYPE_p_svn_version_t swig_types[99]
-#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[100]
-#define SWIGTYPE_p_unsigned_char swig_types[101]
-#define SWIGTYPE_p_unsigned_long swig_types[102]
-#define SWIGTYPE_p_void swig_types[103]
-static swig_type_info *swig_types[105];
-static swig_module_info swig_module = {swig_types, 104, 0, 0, 0, 0};
+#define SWIGTYPE_p_apr_uint64_t swig_types[5]
+#define SWIGTYPE_p_char swig_types[6]
+#define SWIGTYPE_p_f_long_p_void_p_apr_pool_t__void swig_types[7]
+#define SWIGTYPE_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[8]
+#define SWIGTYPE_p_f_p_q_const__unsigned_char_apr_size_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[9]
+#define SWIGTYPE_p_f_p_void__p_svn_error_t swig_types[10]
+#define SWIGTYPE_p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t swig_types[11]
+#define SWIGTYPE_p_f_p_void_apr_uint64_t_svn_fs_upgrade_notify_action_t_p_apr_pool_t__p_svn_error_t swig_types[12]
+#define SWIGTYPE_p_f_p_void_long_long_p_apr_pool_t__void swig_types[13]
+#define SWIGTYPE_p_f_p_void_p_apr_pool_t__p_svn_error_t swig_types[14]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t swig_types[15]
+#define SWIGTYPE_p_f_p_void_p_struct_svn_error_t__void swig_types[16]
+#define SWIGTYPE_p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t swig_types[17]
+#define SWIGTYPE_p_int swig_types[18]
+#define SWIGTYPE_p_long swig_types[19]
+#define SWIGTYPE_p_p_apr_array_header_t swig_types[20]
+#define SWIGTYPE_p_p_apr_hash_t swig_types[21]
+#define SWIGTYPE_p_p_char swig_types[22]
+#define SWIGTYPE_p_p_f_long_p_void_p_apr_pool_t__void swig_types[23]
+#define SWIGTYPE_p_p_f_p_q_const__unsigned_char_apr_size_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[24]
+#define SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t swig_types[25]
+#define SWIGTYPE_p_p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t swig_types[26]
+#define SWIGTYPE_p_p_f_p_void_apr_uint64_t_svn_fs_upgrade_notify_action_t_p_apr_pool_t__p_svn_error_t swig_types[27]
+#define SWIGTYPE_p_p_f_p_void_long_long_p_apr_pool_t__void swig_types[28]
+#define SWIGTYPE_p_p_f_p_void_p_apr_pool_t__p_svn_error_t swig_types[29]
+#define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t swig_types[30]
+#define SWIGTYPE_p_p_f_p_void_p_struct_svn_error_t__void swig_types[31]
+#define SWIGTYPE_p_p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t swig_types[32]
+#define SWIGTYPE_p_p_svn_checksum_t swig_types[33]
+#define SWIGTYPE_p_p_svn_fs_access_t swig_types[34]
+#define SWIGTYPE_p_p_svn_fs_history_t swig_types[35]
+#define SWIGTYPE_p_p_svn_fs_id_t swig_types[36]
+#define SWIGTYPE_p_p_svn_fs_info_placeholder_t swig_types[37]
+#define SWIGTYPE_p_p_svn_fs_root_t swig_types[38]
+#define SWIGTYPE_p_p_svn_fs_t swig_types[39]
+#define SWIGTYPE_p_p_svn_fs_txn_t swig_types[40]
+#define SWIGTYPE_p_p_svn_lock_t swig_types[41]
+#define SWIGTYPE_p_p_svn_stream_t swig_types[42]
+#define SWIGTYPE_p_p_svn_string_t swig_types[43]
+#define SWIGTYPE_p_p_svn_txdelta_stream_t swig_types[44]
+#define SWIGTYPE_p_p_svn_version_t swig_types[45]
+#define SWIGTYPE_p_p_void swig_types[46]
+#define SWIGTYPE_p_svn_auth_baton_t swig_types[47]
+#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[48]
+#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[49]
+#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[50]
+#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[51]
+#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[52]
+#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[53]
+#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[54]
+#define SWIGTYPE_p_svn_auth_provider_t swig_types[55]
+#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[56]
+#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[57]
+#define SWIGTYPE_p_svn_checksum_kind_t swig_types[58]
+#define SWIGTYPE_p_svn_checksum_t swig_types[59]
+#define SWIGTYPE_p_svn_commit_info_t swig_types[60]
+#define SWIGTYPE_p_svn_config_t swig_types[61]
+#define SWIGTYPE_p_svn_delta_editor_t swig_types[62]
+#define SWIGTYPE_p_svn_depth_t swig_types[63]
+#define SWIGTYPE_p_svn_diff_hunk_t swig_types[64]
+#define SWIGTYPE_p_svn_dirent_t swig_types[65]
+#define SWIGTYPE_p_svn_errno_t swig_types[66]
+#define SWIGTYPE_p_svn_error_t swig_types[67]
+#define SWIGTYPE_p_svn_fs_access_t swig_types[68]
+#define SWIGTYPE_p_svn_fs_dirent_t swig_types[69]
+#define SWIGTYPE_p_svn_fs_fsfs_info_t swig_types[70]
+#define SWIGTYPE_p_svn_fs_fsx_info_t swig_types[71]
+#define SWIGTYPE_p_svn_fs_history_t swig_types[72]
+#define SWIGTYPE_p_svn_fs_id_t swig_types[73]
+#define SWIGTYPE_p_svn_fs_info_placeholder_t swig_types[74]
+#define SWIGTYPE_p_svn_fs_lock_target_t swig_types[75]
+#define SWIGTYPE_p_svn_fs_node_relation_t swig_types[76]
+#define SWIGTYPE_p_svn_fs_pack_notify_action_t swig_types[77]
+#define SWIGTYPE_p_svn_fs_path_change2_t swig_types[78]
+#define SWIGTYPE_p_svn_fs_path_change_kind_t swig_types[79]
+#define SWIGTYPE_p_svn_fs_path_change_t swig_types[80]
+#define SWIGTYPE_p_svn_fs_root_t swig_types[81]
+#define SWIGTYPE_p_svn_fs_t swig_types[82]
+#define SWIGTYPE_p_svn_fs_txn_t swig_types[83]
+#define SWIGTYPE_p_svn_fs_upgrade_notify_action_t swig_types[84]
+#define SWIGTYPE_p_svn_io_dirent2_t swig_types[85]
+#define SWIGTYPE_p_svn_io_dirent_t swig_types[86]
+#define SWIGTYPE_p_svn_io_file_del_t swig_types[87]
+#define SWIGTYPE_p_svn_location_segment_t swig_types[88]
+#define SWIGTYPE_p_svn_lock_t swig_types[89]
+#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[90]
+#define SWIGTYPE_p_svn_log_changed_path_t swig_types[91]
+#define SWIGTYPE_p_svn_log_entry_t swig_types[92]
+#define SWIGTYPE_p_svn_merge_range_t swig_types[93]
+#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[94]
+#define SWIGTYPE_p_svn_node_kind_t swig_types[95]
+#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[96]
+#define SWIGTYPE_p_svn_opt_revision_t swig_types[97]
+#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[98]
+#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[99]
+#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[100]
+#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[101]
+#define SWIGTYPE_p_svn_prop_kind swig_types[102]
+#define SWIGTYPE_p_svn_stream_mark_t swig_types[103]
+#define SWIGTYPE_p_svn_stream_t swig_types[104]
+#define SWIGTYPE_p_svn_string_t swig_types[105]
+#define SWIGTYPE_p_svn_stringbuf_t swig_types[106]
+#define SWIGTYPE_p_svn_tristate_t swig_types[107]
+#define SWIGTYPE_p_svn_txdelta_op_t swig_types[108]
+#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[109]
+#define SWIGTYPE_p_svn_txdelta_window_t swig_types[110]
+#define SWIGTYPE_p_svn_version_checklist_t swig_types[111]
+#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[112]
+#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[113]
+#define SWIGTYPE_p_svn_version_extended_t swig_types[114]
+#define SWIGTYPE_p_svn_version_t swig_types[115]
+#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[116]
+#define SWIGTYPE_p_unsigned_char swig_types[117]
+#define SWIGTYPE_p_unsigned_long swig_types[118]
+#define SWIGTYPE_p_void swig_types[119]
+static swig_type_info *swig_types[121];
+static swig_module_info swig_module = {swig_types, 120, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
@@ -3069,7 +3059,7 @@ static swig_module_info swig_module = {swig_types, 104, 0, 0, 0, 0};
 #endif
 #define SWIG_name    "_fs"
 
-#define SWIGVERSION 0x020009 
+#define SWIGVERSION 0x020012 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -3256,6 +3246,9 @@ SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc)
 
 
 
+  #define SWIG_From_long   PyLong_FromLong 
+
+
 SWIGINTERN int
 SWIG_AsVal_double (PyObject *obj, double *val)
 {
@@ -3391,9 +3384,6 @@ SWIG_As_long (PyObject* obj)
 }
 
 
-  #define SWIG_From_long   PyLong_FromLong 
-
-
 SWIGINTERN int
 SWIG_AsVal_unsigned_SS_long (PyObject *obj, unsigned long *val) 
 {
@@ -3415,6 +3405,18 @@ SWIG_AsVal_unsigned_SS_long (PyObject *obj, unsigned long *val)
       return SWIG_OK;
     } else {
       PyErr_Clear();
+#if PY_VERSION_HEX >= 0x03000000
+      {
+        long v = PyLong_AsLong(obj);
+        if (!PyErr_Occurred()) {
+          if (v < 0) {
+            return SWIG_OverflowError;
+          }
+        } else {
+          PyErr_Clear();
+        }
+      }
+#endif
     }
   }
 #ifdef SWIG_PYTHON_CAST_MODE
@@ -3469,11 +3471,21 @@ static void svn_fs_invoke_warning_callback(
   _obj(baton, err);
 }
 
+static svn_error_t * svn_fs_invoke_upgrade_notify(
+  svn_fs_upgrade_notify_t _obj, void *baton, apr_uint64_t number, svn_fs_upgrade_notify_action_t action, apr_pool_t *scratch_pool) {
+  return _obj(baton, number, action, scratch_pool);
+}
+
 static void svn_fs_invoke_progress_notify_func(
   svn_fs_progress_notify_func_t _obj, svn_revnum_t revision, void *baton, apr_pool_t *pool) {
   _obj(revision, baton, pool);
 }
 
+static void svn_fs_invoke_hotcopy_notify(
+  svn_fs_hotcopy_notify_t _obj, void *baton, svn_revnum_t start_revision, svn_revnum_t end_revision, apr_pool_t *scratch_pool) {
+  _obj(baton, start_revision, end_revision, scratch_pool);
+}
+
 static svn_error_t * svn_fs_invoke_freeze_func(
   svn_fs_freeze_func_t _obj, void *baton, apr_pool_t *pool) {
   return _obj(baton, pool);
@@ -3484,6 +3496,11 @@ static svn_error_t * svn_fs_invoke_process_contents_func(
   return _obj(contents, len, baton, scratch_pool);
 }
 
+static svn_error_t * svn_fs_invoke_lock_callback(
+  svn_fs_lock_callback_t _obj, void *baton, const char *path, const svn_lock_t *lock, svn_error_t *fs_err, apr_pool_t *scratch_pool) {
+  return _obj(baton, path, lock, fs_err, scratch_pool);
+}
+
 static svn_error_t * svn_fs_invoke_get_locks_callback(
   svn_fs_get_locks_callback_t _obj, void *baton, svn_lock_t *lock, apr_pool_t *pool) {
   return _obj(baton, lock, pool);
@@ -3511,7 +3528,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_version(PyObject *SWIGUNUSEDPARM(self), PyObje
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_version_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_version_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -3622,7 +3639,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_create(PyObject *SWIGUNUSEDPARM(self), PyObjec
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_fs_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_fs_t,
         _global_py_pool, args))
     
     ;
@@ -3639,6 +3656,94 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_fs_open2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  svn_fs_t **arg1 = (svn_fs_t **) 0 ;
+  char *arg2 = (char *) 0 ;
+  apr_hash_t *arg3 = (apr_hash_t *) 0 ;
+  apr_pool_t *arg4 = (apr_pool_t *) 0 ;
+  apr_pool_t *arg5 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  svn_fs_t *temp1 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg4 = _global_pool;
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg5 = _global_pool;
+  arg1 = &temp1;
+  if (!PyArg_ParseTuple(args,(char *)"sO|OO:svn_fs_open2",&arg2,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    /* PYTHON-FIXME: Handle None -> NULL. */
+    arg3 = svn_swig_py_stringhash_from_dict(obj1, _global_pool);
+  }
+  if (obj2) {
+    /* Verify that the user supplied a valid pool */
+    if (obj2 != Py_None && obj2 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj2);
+      SWIG_arg_fail(svn_argnum_obj2);
+      SWIG_fail;
+    }
+  }
+  if (obj3) {
+    /* Verify that the user supplied a valid pool */
+    if (obj3 != Py_None && obj3 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj3);
+      SWIG_arg_fail(svn_argnum_obj3);
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_fs_open2(arg1,(char const *)arg2,arg3,arg4,arg5);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  {
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_fs_t,
+        _global_py_pool, args))
+    
+    ;
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_svn_fs_open(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   svn_fs_t **arg1 = (svn_fs_t **) 0 ;
@@ -3690,7 +3795,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_open(PyObject *SWIGUNUSEDPARM(self), PyObject
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_fs_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_fs_t,
         _global_py_pool, args))
     
     ;
@@ -3707,6 +3812,86 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_fs_upgrade2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  char *arg1 = (char *) 0 ;
+  svn_fs_upgrade_notify_t arg2 = (svn_fs_upgrade_notify_t) 0 ;
+  void *arg3 = (void *) 0 ;
+  svn_cancel_func_t arg4 = (svn_cancel_func_t) 0 ;
+  void *arg5 = (void *) 0 ;
+  apr_pool_t *arg6 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg6 = _global_pool;
+  if (!PyArg_ParseTuple(args,(char *)"sOOO|O:svn_fs_upgrade2",&arg1,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  {
+    svn_fs_upgrade_notify_t * tmp =
+    svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_p_f_p_void_apr_uint64_t_svn_fs_upgrade_notify_action_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj1);
+    if (tmp == NULL || PyErr_Occurred()) {
+      SWIG_fail;
+    }
+    arg2 = *tmp;
+  }
+  {
+    if (obj2 == Py_None) {
+      arg3 = NULL;
+    } else if (SWIG_ConvertPtr(obj2, (void **) &arg3, 0, 0) == -1) {
+      arg3 = (void *) obj2;
+      PyErr_Clear();
+    }
+  }
+  {
+    arg4 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg5 = obj3;
+  }
+  if (obj4) {
+    /* Verify that the user supplied a valid pool */
+    if (obj4 != Py_None && obj4 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj4);
+      SWIG_arg_fail(svn_argnum_obj4);
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_fs_upgrade2((char const *)arg1,arg2,arg3,arg4,arg5,arg6);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_svn_fs_upgrade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
@@ -3845,7 +4030,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path(PyObject *SWIGUNUSEDPARM(self), PyObject
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_fs_path",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_fs_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
+    arg1 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -3895,7 +4080,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_config(PyObject *SWIGUNUSEDPARM(self), PyObjec
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_fs_config",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_fs_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
+    arg1 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -3916,7 +4101,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_config(PyObject *SWIGUNUSEDPARM(self), PyObjec
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_apr_hash_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_apr_hash_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -3983,6 +4168,103 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_fs_hotcopy3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  svn_boolean_t arg3 ;
+  svn_boolean_t arg4 ;
+  svn_fs_hotcopy_notify_t arg5 = (svn_fs_hotcopy_notify_t) 0 ;
+  void *arg6 = (void *) 0 ;
+  svn_cancel_func_t arg7 = (svn_cancel_func_t) 0 ;
+  void *arg8 = (void *) 0 ;
+  apr_pool_t *arg9 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  PyObject * obj5 = 0 ;
+  PyObject * obj6 = 0 ;
+  PyObject * obj7 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg9 = _global_pool;
+  if (!PyArg_ParseTuple(args,(char *)"ssOOOOO|O:svn_fs_hotcopy3",&arg1,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  {
+    arg3 = (svn_boolean_t)SWIG_As_long (obj2);
+    if (SWIG_arg_fail(svn_argnum_obj2)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg4 = (svn_boolean_t)SWIG_As_long (obj3);
+    if (SWIG_arg_fail(svn_argnum_obj3)) {
+      SWIG_fail;
+    }
+  }
+  {
+    svn_fs_hotcopy_notify_t * tmp =
+    svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_p_f_p_void_long_long_p_apr_pool_t__void, svn_argnum_obj4);
+    if (tmp == NULL || PyErr_Occurred()) {
+      SWIG_fail;
+    }
+    arg5 = *tmp;
+  }
+  {
+    if (obj5 == Py_None) {
+      arg6 = NULL;
+    } else if (SWIG_ConvertPtr(obj5, (void **) &arg6, 0, 0) == -1) {
+      arg6 = (void *) obj5;
+      PyErr_Clear();
+    }
+  }
+  {
+    arg7 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg8 = obj6;
+  }
+  if (obj7) {
+    /* Verify that the user supplied a valid pool */
+    if (obj7 != Py_None && obj7 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj7);
+      SWIG_arg_fail(svn_argnum_obj7);
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_fs_hotcopy3((char const *)arg1,(char const *)arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_svn_fs_hotcopy2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
@@ -4018,8 +4300,8 @@ SWIGINTERN PyObject *_wrap_svn_fs_hotcopy2(PyObject *SWIGUNUSEDPARM(self), PyObj
     }
   }
   {
-    arg5 = svn_swig_py_cancel_func;
-    arg6 = obj4; /* our function is the baton. */
+    arg5 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg6 = obj4;
   }
   if (obj5) {
     /* Verify that the user supplied a valid pool */
@@ -4140,8 +4422,8 @@ SWIGINTERN PyObject *_wrap_svn_fs_recover(PyObject *SWIGUNUSEDPARM(self), PyObje
   arg4 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_fs_recover",&arg1,&obj1,&obj2)) SWIG_fail;
   {
-    arg2 = svn_swig_py_cancel_func;
-    arg3 = obj1; /* our function is the baton. */
+    arg2 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg3 = obj1;
   }
   if (obj2) {
     /* Verify that the user supplied a valid pool */
@@ -4201,7 +4483,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_freeze(PyObject *SWIGUNUSEDPARM(self), PyObjec
   arg4 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_fs_freeze",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_fs_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
+    arg1 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4351,7 +4633,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_new(PyObject *SWIGUNUSEDPARM(self), PyObject *
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_fs_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_fs_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -4374,7 +4656,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_create_berkeley(PyObject *SWIGUNUSEDPARM(self)
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_fs_create_berkeley",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (svn_fs_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
+    arg1 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4413,7 +4695,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_open_berkeley(PyObject *SWIGUNUSEDPARM(self),
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_fs_open_berkeley",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (svn_fs_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
+    arg1 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4459,7 +4741,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_berkeley_path(PyObject *SWIGUNUSEDPARM(self),
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_fs_berkeley_path",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_fs_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
+    arg1 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4706,7 +4988,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_create_access(PyObject *SWIGUNUSEDPARM(self),
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_fs_access_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_fs_access_t,
         _global_py_pool, args))
     
     ;
@@ -4733,13 +5015,13 @@ SWIGINTERN PyObject *_wrap_svn_fs_set_access(PyObject *SWIGUNUSEDPARM(self), PyO
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_fs_set_access",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_fs_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
+    arg1 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_fs_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_fs_access_t, svn_argnum_obj1);
+    arg2 = (svn_fs_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_fs_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4780,7 +5062,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_get_access(PyObject *SWIGUNUSEDPARM(self), PyO
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_get_access",&obj0)) SWIG_fail;
   {
-    arg2 = (svn_fs_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
+    arg2 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4805,7 +5087,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_get_access(PyObject *SWIGUNUSEDPARM(self), PyO
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_fs_access_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_fs_access_t,
         _global_py_pool, args))
     
     ;
@@ -4827,7 +5109,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_access_get_username(PyObject *SWIGUNUSEDPARM(s
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_access_get_username",&obj0)) SWIG_fail;
   {
-    arg2 = (svn_fs_access_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_access_t, svn_argnum_obj0);
+    arg2 = (svn_fs_access_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_access_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4880,7 +5162,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_access_add_lock_token2(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"Osz:svn_fs_access_add_lock_token2",&obj0,&arg2,&arg3)) SWIG_fail;
   {
-    arg1 = (svn_fs_access_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_access_t, svn_argnum_obj0);
+    arg1 = (svn_fs_access_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_access_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4919,7 +5201,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_access_add_lock_token(PyObject *SWIGUNUSEDPARM
   
   if (!PyArg_ParseTuple(args,(char *)"Oz:svn_fs_access_add_lock_token",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (svn_fs_access_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_access_t, svn_argnum_obj0);
+    arg1 = (svn_fs_access_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_access_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4959,13 +5241,13 @@ SWIGINTERN PyObject *_wrap_svn_fs_compare_ids(PyObject *SWIGUNUSEDPARM(self), Py
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_fs_compare_ids",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_fs_id_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_id_t, svn_argnum_obj0);
+    arg1 = (svn_fs_id_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_id_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_fs_id_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_fs_id_t, svn_argnum_obj1);
+    arg2 = (svn_fs_id_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_fs_id_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4995,13 +5277,13 @@ SWIGINTERN PyObject *_wrap_svn_fs_check_related(PyObject *SWIGUNUSEDPARM(self),
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_fs_check_related",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_fs_id_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_id_t, svn_argnum_obj0);
+    arg1 = (svn_fs_id_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_id_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_fs_id_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_fs_id_t, svn_argnum_obj1);
+    arg2 = (svn_fs_id_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_fs_id_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5061,7 +5343,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_parse_id(PyObject *SWIGUNUSEDPARM(self), PyObj
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_fs_id_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_fs_id_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -5091,7 +5373,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_unparse_id(PyObject *SWIGUNUSEDPARM(self), PyO
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_fs_unparse_id",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_fs_id_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_id_t, svn_argnum_obj0);
+    arg1 = (svn_fs_id_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_id_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5150,7 +5432,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_begin_txn2(PyObject *SWIGUNUSEDPARM(self), PyO
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_fs_begin_txn2",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
-    arg2 = (svn_fs_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
+    arg2 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5195,7 +5477,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_begin_txn2(PyObject *SWIGUNUSEDPARM(self), PyO
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_fs_txn_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_fs_txn_t,
         _global_py_pool, args))
     
     ;
@@ -5233,7 +5515,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_begin_txn(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_fs_begin_txn",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg2 = (svn_fs_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
+    arg2 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5272,7 +5554,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_begin_txn(PyObject *SWIGUNUSEDPARM(self), PyOb
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_fs_txn_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_fs_txn_t,
         _global_py_pool, args))
     
     ;
@@ -5312,7 +5594,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_commit_txn(PyObject *SWIGUNUSEDPARM(self), PyO
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_fs_commit_txn",&obj0,&obj1)) SWIG_fail;
   {
-    arg3 = (svn_fs_txn_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_txn_t, svn_argnum_obj0);
+    arg3 = (svn_fs_txn_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_txn_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5378,7 +5660,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_abort_txn(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_fs_abort_txn",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_fs_txn_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_txn_t, svn_argnum_obj0);
+    arg1 = (svn_fs_txn_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_txn_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5439,7 +5721,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_purge_txn(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg3 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_fs_purge_txn",&obj0,&arg2,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_fs_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
+    arg1 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5502,7 +5784,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_txn_name(PyObject *SWIGUNUSEDPARM(self), PyObj
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_fs_txn_name",&obj0,&obj1)) SWIG_fail;
   {
-    arg2 = (svn_fs_txn_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_txn_t, svn_argnum_obj0);
+    arg2 = (svn_fs_txn_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_txn_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5567,7 +5849,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_txn_base_revision(PyObject *SWIGUNUSEDPARM(sel
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_txn_base_revision",&obj0)) SWIG_fail;
   {
-    arg1 = (svn_fs_txn_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_txn_t, svn_argnum_obj0);
+    arg1 = (svn_fs_txn_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_txn_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5607,7 +5889,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_open_txn(PyObject *SWIGUNUSEDPARM(self), PyObj
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_fs_open_txn",&obj0,&arg3,&obj2)) SWIG_fail;
   {
-    arg2 = (svn_fs_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
+    arg2 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5640,7 +5922,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_open_txn(PyObject *SWIGUNUSEDPARM(self), PyObj
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_fs_txn_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_fs_txn_t,
         _global_py_pool, args))
     
     ;
@@ -5676,7 +5958,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_list_transactions(PyObject *SWIGUNUSEDPARM(sel
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_fs_list_transactions",&obj0,&obj1)) SWIG_fail;
   {
-    arg2 = (svn_fs_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
+    arg2 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5743,7 +6025,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_txn_prop(PyObject *SWIGUNUSEDPARM(self), PyObj
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_fs_txn_prop",&obj0,&arg3,&obj2)) SWIG_fail;
   {
-    arg2 = (svn_fs_txn_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_txn_t, svn_argnum_obj0);
+    arg2 = (svn_fs_txn_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_txn_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5819,7 +6101,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_txn_proplist(PyObject *SWIGUNUSEDPARM(self), P
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_fs_txn_proplist",&obj0,&obj1)) SWIG_fail;
   {
-    arg2 = (svn_fs_txn_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_txn_t, svn_argnum_obj0);
+    arg2 = (svn_fs_txn_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_txn_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5886,7 +6168,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_change_txn_prop(PyObject *SWIGUNUSEDPARM(self)
   arg4 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OsO|O:svn_fs_change_txn_prop",&obj0,&arg2,&obj2,&obj3)) SWIG_fail;
   {
-    arg1 = (svn_fs_txn_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_txn_t, svn_argnum_obj0);
+    arg1 = (svn_fs_txn_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_txn_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5961,13 +6243,13 @@ SWIGINTERN PyObject *_wrap_svn_fs_change_txn_props(PyObject *SWIGUNUSEDPARM(self
   arg3 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_fs_change_txn_props",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_fs_txn_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_txn_t, svn_argnum_obj0);
+    arg1 = (svn_fs_txn_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_txn_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (apr_array_header_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj1);
+    arg2 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6032,7 +6314,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_revision_root(PyObject *SWIGUNUSEDPARM(self),
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_fs_revision_root",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg2 = (svn_fs_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
+    arg2 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6071,7 +6353,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_revision_root(PyObject *SWIGUNUSEDPARM(self),
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_fs_root_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_fs_root_t,
         _global_py_pool, args))
     
     ;
@@ -6107,7 +6389,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_txn_root(PyObject *SWIGUNUSEDPARM(self), PyObj
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_fs_txn_root",&obj0,&obj1)) SWIG_fail;
   {
-    arg2 = (svn_fs_txn_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_txn_t, svn_argnum_obj0);
+    arg2 = (svn_fs_txn_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_txn_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6140,7 +6422,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_txn_root(PyObject *SWIGUNUSEDPARM(self), PyObj
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_fs_root_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_fs_root_t,
         _global_py_pool, args))
     
     ;
@@ -6164,7 +6446,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_close_root(PyObject *SWIGUNUSEDPARM(self), PyO
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_close_root",&obj0)) SWIG_fail;
   {
-    arg1 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
+    arg1 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6192,7 +6474,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_root_fs(PyObject *SWIGUNUSEDPARM(self), PyObje
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_root_fs",&obj0)) SWIG_fail;
   {
-    arg1 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
+    arg1 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6205,7 +6487,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_root_fs(PyObject *SWIGUNUSEDPARM(self), PyObje
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_fs_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_fs_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -6221,7 +6503,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_is_txn_root(PyObject *SWIGUNUSEDPARM(self), Py
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_is_txn_root",&obj0)) SWIG_fail;
   {
-    arg1 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
+    arg1 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6249,7 +6531,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_is_revision_root(PyObject *SWIGUNUSEDPARM(self
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_is_revision_root",&obj0)) SWIG_fail;
   {
-    arg1 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
+    arg1 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6285,7 +6567,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_txn_root_name(PyObject *SWIGUNUSEDPARM(self),
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_fs_txn_root_name",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
+    arg1 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6327,7 +6609,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_txn_root_base_revision(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_txn_root_base_revision",&obj0)) SWIG_fail;
   {
-    arg1 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
+    arg1 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6355,7 +6637,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_revision_root_revision(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_revision_root_revision",&obj0)) SWIG_fail;
   {
-    arg1 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
+    arg1 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6384,13 +6666,13 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change2_t_node_rev_id_set(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_fs_path_change2_t_node_rev_id_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_fs_path_change2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_path_change2_t, svn_argnum_obj0);
+    arg1 = (struct svn_fs_path_change2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_path_change2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_fs_id_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_fs_id_t, svn_argnum_obj1);
+    arg2 = (svn_fs_id_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_fs_id_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6411,13 +6693,13 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change2_t_node_rev_id_get(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_path_change2_t_node_rev_id_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_fs_path_change2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_path_change2_t, svn_argnum_obj0);
+    arg1 = (struct svn_fs_path_change2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_path_change2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (svn_fs_id_t *) ((arg1)->node_rev_id);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_fs_id_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_fs_id_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -6434,7 +6716,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change2_t_change_kind_set(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_fs_path_change2_t_change_kind_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_fs_path_change2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_path_change2_t, svn_argnum_obj0);
+    arg1 = (struct svn_fs_path_change2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_path_change2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6461,7 +6743,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change2_t_change_kind_get(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_path_change2_t_change_kind_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_fs_path_change2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_path_change2_t, svn_argnum_obj0);
+    arg1 = (struct svn_fs_path_change2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_path_change2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6483,7 +6765,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change2_t_text_mod_set(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_fs_path_change2_t_text_mod_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_fs_path_change2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_path_change2_t, svn_argnum_obj0);
+    arg1 = (struct svn_fs_path_change2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_path_change2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6510,7 +6792,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change2_t_text_mod_get(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_path_change2_t_text_mod_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_fs_path_change2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_path_change2_t, svn_argnum_obj0);
+    arg1 = (struct svn_fs_path_change2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_path_change2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6532,7 +6814,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change2_t_prop_mod_set(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_fs_path_change2_t_prop_mod_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_fs_path_change2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_path_change2_t, svn_argnum_obj0);
+    arg1 = (struct svn_fs_path_change2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_path_change2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6559,7 +6841,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change2_t_prop_mod_get(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_path_change2_t_prop_mod_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_fs_path_change2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_path_change2_t, svn_argnum_obj0);
+    arg1 = (struct svn_fs_path_change2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_path_change2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6581,7 +6863,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change2_t_node_kind_set(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_fs_path_change2_t_node_kind_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_fs_path_change2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_path_change2_t, svn_argnum_obj0);
+    arg1 = (struct svn_fs_path_change2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_path_change2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6608,7 +6890,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change2_t_node_kind_get(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_path_change2_t_node_kind_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_fs_path_change2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_path_change2_t, svn_argnum_obj0);
+    arg1 = (struct svn_fs_path_change2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_path_change2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6630,7 +6912,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change2_t_copyfrom_known_set(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_fs_path_change2_t_copyfrom_known_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_fs_path_change2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_path_change2_t, svn_argnum_obj0);
+    arg1 = (struct svn_fs_path_change2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_path_change2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6657,7 +6939,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change2_t_copyfrom_known_get(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_path_change2_t_copyfrom_known_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_fs_path_change2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_path_change2_t, svn_argnum_obj0);
+    arg1 = (struct svn_fs_path_change2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_path_change2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6679,7 +6961,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change2_t_copyfrom_rev_set(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_fs_path_change2_t_copyfrom_rev_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_fs_path_change2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_path_change2_t, svn_argnum_obj0);
+    arg1 = (struct svn_fs_path_change2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_path_change2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6706,7 +6988,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change2_t_copyfrom_rev_get(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_path_change2_t_copyfrom_rev_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_fs_path_change2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_path_change2_t, svn_argnum_obj0);
+    arg1 = (struct svn_fs_path_change2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_path_change2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6727,7 +7009,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change2_t_copyfrom_path_set(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"Oz:svn_fs_path_change2_t_copyfrom_path_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_fs_path_change2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_path_change2_t, svn_argnum_obj0);
+    arg1 = (struct svn_fs_path_change2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_path_change2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6755,7 +7037,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change2_t_copyfrom_path_get(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_path_change2_t_copyfrom_path_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_fs_path_change2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_path_change2_t, svn_argnum_obj0);
+    arg1 = (struct svn_fs_path_change2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_path_change2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6768,6 +7050,55 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_fs_path_change2_t_mergeinfo_mod_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  struct svn_fs_path_change2_t *arg1 = (struct svn_fs_path_change2_t *) 0 ;
+  svn_tristate_t arg2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:svn_fs_path_change2_t_mergeinfo_mod_set",&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = (struct svn_fs_path_change2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_path_change2_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg2 = (svn_tristate_t)SWIG_As_long (obj1);
+    if (SWIG_arg_fail(svn_argnum_obj1)) {
+      SWIG_fail;
+    }
+  }
+  if (arg1) (arg1)->mergeinfo_mod = arg2;
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_svn_fs_path_change2_t_mergeinfo_mod_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  struct svn_fs_path_change2_t *arg1 = (struct svn_fs_path_change2_t *) 0 ;
+  PyObject * obj0 = 0 ;
+  svn_tristate_t result;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_path_change2_t_mergeinfo_mod_get",&obj0)) SWIG_fail;
+  {
+    arg1 = (struct svn_fs_path_change2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_path_change2_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  result = (svn_tristate_t) ((arg1)->mergeinfo_mod);
+  resultobj = SWIG_From_long((long)(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *svn_fs_path_change2_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
@@ -6784,13 +7115,13 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change_t_node_rev_id_set(PyObject *SWIGUN
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_fs_path_change_t_node_rev_id_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_fs_path_change_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_path_change_t, svn_argnum_obj0);
+    arg1 = (struct svn_fs_path_change_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_path_change_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_fs_id_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_fs_id_t, svn_argnum_obj1);
+    arg2 = (svn_fs_id_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_fs_id_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6811,13 +7142,13 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change_t_node_rev_id_get(PyObject *SWIGUN
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_path_change_t_node_rev_id_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_fs_path_change_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_path_change_t, svn_argnum_obj0);
+    arg1 = (struct svn_fs_path_change_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_path_change_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (svn_fs_id_t *) ((arg1)->node_rev_id);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_fs_id_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_fs_id_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -6834,7 +7165,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change_t_change_kind_set(PyObject *SWIGUN
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_fs_path_change_t_change_kind_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_fs_path_change_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_path_change_t, svn_argnum_obj0);
+    arg1 = (struct svn_fs_path_change_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_path_change_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6861,7 +7192,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change_t_change_kind_get(PyObject *SWIGUN
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_path_change_t_change_kind_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_fs_path_change_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_path_change_t, svn_argnum_obj0);
+    arg1 = (struct svn_fs_path_change_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_path_change_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6883,7 +7214,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change_t_text_mod_set(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_fs_path_change_t_text_mod_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_fs_path_change_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_path_change_t, svn_argnum_obj0);
+    arg1 = (struct svn_fs_path_change_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_path_change_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6910,7 +7241,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change_t_text_mod_get(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_path_change_t_text_mod_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_fs_path_change_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_path_change_t, svn_argnum_obj0);
+    arg1 = (struct svn_fs_path_change_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_path_change_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6932,7 +7263,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change_t_prop_mod_set(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_fs_path_change_t_prop_mod_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_fs_path_change_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_path_change_t, svn_argnum_obj0);
+    arg1 = (struct svn_fs_path_change_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_path_change_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6959,7 +7290,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change_t_prop_mod_get(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_path_change_t_prop_mod_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_fs_path_change_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_path_change_t, svn_argnum_obj0);
+    arg1 = (struct svn_fs_path_change_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_path_change_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6997,7 +7328,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change2_create(PyObject *SWIGUNUSEDPARM(s
   arg3 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_fs_path_change2_create",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_fs_id_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_id_t, svn_argnum_obj0);
+    arg1 = (svn_fs_id_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_id_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7024,7 +7355,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_path_change2_create(PyObject *SWIGUNUSEDPARM(s
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_fs_path_change2_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_fs_path_change2_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -7057,7 +7388,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_paths_changed2(PyObject *SWIGUNUSEDPARM(self),
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_fs_paths_changed2",&obj0,&obj1)) SWIG_fail;
   {
-    arg2 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
+    arg2 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7129,7 +7460,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_paths_changed(PyObject *SWIGUNUSEDPARM(self),
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_fs_paths_changed",&obj0,&obj1)) SWIG_fail;
   {
-    arg2 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
+    arg2 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7203,7 +7534,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_check_path(PyObject *SWIGUNUSEDPARM(self), PyO
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_fs_check_path",&obj0,&arg3,&obj2)) SWIG_fail;
   {
-    arg2 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
+    arg2 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7253,6 +7584,96 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_fs_node_history2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  svn_fs_history_t **arg1 = (svn_fs_history_t **) 0 ;
+  svn_fs_root_t *arg2 = (svn_fs_root_t *) 0 ;
+  char *arg3 = (char *) 0 ;
+  apr_pool_t *arg4 = (apr_pool_t *) 0 ;
+  apr_pool_t *arg5 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  svn_fs_history_t *temp1 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg4 = _global_pool;
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg5 = _global_pool;
+  arg1 = &temp1;
+  if (!PyArg_ParseTuple(args,(char *)"Os|OO:svn_fs_node_history2",&obj0,&arg3,&obj2,&obj3)) SWIG_fail;
+  {
+    arg2 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  if (obj2) {
+    /* Verify that the user supplied a valid pool */
+    if (obj2 != Py_None && obj2 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj2);
+      SWIG_arg_fail(svn_argnum_obj2);
+      SWIG_fail;
+    }
+  }
+  if (obj3) {
+    /* Verify that the user supplied a valid pool */
+    if (obj3 != Py_None && obj3 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj3);
+      SWIG_arg_fail(svn_argnum_obj3);
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_fs_node_history2(arg1,arg2,(char const *)arg3,arg4,arg5);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  {
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_fs_history_t,
+        _global_py_pool, args))
+    
+    ;
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_svn_fs_node_history(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   svn_fs_history_t **arg1 = (svn_fs_history_t **) 0 ;
@@ -7273,7 +7694,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_node_history(PyObject *SWIGUNUSEDPARM(self), P
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_fs_node_history",&obj0,&arg3,&obj2)) SWIG_fail;
   {
-    arg2 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
+    arg2 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7306,7 +7727,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_node_history(PyObject *SWIGUNUSEDPARM(self), P
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_fs_history_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_fs_history_t,
         _global_py_pool, args))
     
     ;
@@ -7323,6 +7744,103 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_fs_history_prev2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  svn_fs_history_t **arg1 = (svn_fs_history_t **) 0 ;
+  svn_fs_history_t *arg2 = (svn_fs_history_t *) 0 ;
+  svn_boolean_t arg3 ;
+  apr_pool_t *arg4 = (apr_pool_t *) 0 ;
+  apr_pool_t *arg5 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  svn_fs_history_t *temp1 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg4 = _global_pool;
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg5 = _global_pool;
+  arg1 = &temp1;
+  if (!PyArg_ParseTuple(args,(char *)"OO|OO:svn_fs_history_prev2",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    arg2 = (svn_fs_history_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_history_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg3 = (svn_boolean_t)SWIG_As_long (obj1);
+    if (SWIG_arg_fail(svn_argnum_obj1)) {
+      SWIG_fail;
+    }
+  }
+  if (obj2) {
+    /* Verify that the user supplied a valid pool */
+    if (obj2 != Py_None && obj2 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj2);
+      SWIG_arg_fail(svn_argnum_obj2);
+      SWIG_fail;
+    }
+  }
+  if (obj3) {
+    /* Verify that the user supplied a valid pool */
+    if (obj3 != Py_None && obj3 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj3);
+      SWIG_arg_fail(svn_argnum_obj3);
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_fs_history_prev2(arg1,arg2,arg3,arg4,arg5);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  {
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_fs_history_t,
+        _global_py_pool, args))
+    
+    ;
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_svn_fs_history_prev(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   svn_fs_history_t **arg1 = (svn_fs_history_t **) 0 ;
@@ -7344,7 +7862,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_history_prev(PyObject *SWIGUNUSEDPARM(self), P
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_fs_history_prev",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg2 = (svn_fs_history_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_history_t, svn_argnum_obj0);
+    arg2 = (svn_fs_history_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_history_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7383,7 +7901,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_history_prev(PyObject *SWIGUNUSEDPARM(self), P
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_fs_history_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_fs_history_t,
         _global_py_pool, args))
     
     ;
@@ -7423,7 +7941,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_history_location(PyObject *SWIGUNUSEDPARM(self
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_fs_history_location",&obj0,&obj1)) SWIG_fail;
   {
-    arg3 = (svn_fs_history_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_history_t, svn_argnum_obj0);
+    arg3 = (svn_fs_history_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_history_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7507,7 +8025,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_is_dir(PyObject *SWIGUNUSEDPARM(self), PyObjec
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_fs_is_dir",&obj0,&arg3,&obj2)) SWIG_fail;
   {
-    arg2 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
+    arg2 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7578,7 +8096,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_is_file(PyObject *SWIGUNUSEDPARM(self), PyObje
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_fs_is_file",&obj0,&arg3,&obj2)) SWIG_fail;
   {
-    arg2 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
+    arg2 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7648,7 +8166,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_node_id(PyObject *SWIGUNUSEDPARM(self), PyObje
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_fs_node_id",&obj0,&arg3,&obj2)) SWIG_fail;
   {
-    arg2 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
+    arg2 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7681,7 +8199,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_node_id(PyObject *SWIGUNUSEDPARM(self), PyObje
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_fs_id_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_fs_id_t,
         _global_py_pool, args))
     
     ;
@@ -7698,6 +8216,84 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_fs_node_relation(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  svn_fs_node_relation_t *arg1 = (svn_fs_node_relation_t *) 0 ;
+  svn_fs_root_t *arg2 = (svn_fs_root_t *) 0 ;
+  char *arg3 = (char *) 0 ;
+  svn_fs_root_t *arg4 = (svn_fs_root_t *) 0 ;
+  char *arg5 = (char *) 0 ;
+  apr_pool_t *arg6 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj5 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg6 = _global_pool;
+  if (!PyArg_ParseTuple(args,(char *)"OOsOs|O:svn_fs_node_relation",&obj0,&obj1,&arg3,&obj3,&arg5,&obj5)) SWIG_fail;
+  {
+    arg1 = (svn_fs_node_relation_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_node_relation_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg2 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj1);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg4 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj3);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  if (obj5) {
+    /* Verify that the user supplied a valid pool */
+    if (obj5 != Py_None && obj5 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj5);
+      SWIG_arg_fail(svn_argnum_obj5);
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_fs_node_relation(arg1,arg2,(char const *)arg3,arg4,(char const *)arg5,arg6);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_svn_fs_node_created_rev(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   svn_revnum_t *arg1 = (svn_revnum_t *) 0 ;
@@ -7719,7 +8315,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_node_created_rev(PyObject *SWIGUNUSEDPARM(self
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_fs_node_created_rev",&obj0,&arg3,&obj2)) SWIG_fail;
   {
-    arg2 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
+    arg2 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7790,7 +8386,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_node_origin_rev(PyObject *SWIGUNUSEDPARM(self)
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_fs_node_origin_rev",&obj0,&arg3,&obj2)) SWIG_fail;
   {
-    arg2 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
+    arg2 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7860,7 +8456,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_node_created_path(PyObject *SWIGUNUSEDPARM(sel
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_fs_node_created_path",&obj0,&arg3,&obj2)) SWIG_fail;
   {
-    arg2 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
+    arg2 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7938,7 +8534,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_node_prop(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"Oss|O:svn_fs_node_prop",&obj0,&arg3,&arg4,&obj3)) SWIG_fail;
   {
-    arg2 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
+    arg2 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8015,7 +8611,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_node_proplist(PyObject *SWIGUNUSEDPARM(self),
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_fs_node_proplist",&obj0,&arg3,&obj2)) SWIG_fail;
   {
-    arg2 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
+    arg2 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8062,6 +8658,77 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_fs_node_has_props(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  svn_boolean_t *arg1 = (svn_boolean_t *) 0 ;
+  svn_fs_root_t *arg2 = (svn_fs_root_t *) 0 ;
+  char *arg3 = (char *) 0 ;
+  apr_pool_t *arg4 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  svn_boolean_t temp1 ;
+  int res1 = SWIG_TMPOBJ ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj2 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg4 = _global_pool;
+  arg1 = &temp1;
+  if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_fs_node_has_props",&obj0,&arg3,&obj2)) SWIG_fail;
+  {
+    arg2 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  if (obj2) {
+    /* Verify that the user supplied a valid pool */
+    if (obj2 != Py_None && obj2 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj2);
+      SWIG_arg_fail(svn_argnum_obj2);
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_fs_node_has_props(arg1,arg2,(char const *)arg3,arg4);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  if (SWIG_IsTmpObj(res1)) {
+    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_From_int((*arg1)));
+  } else {
+    int new_flags = SWIG_IsNewObj(res1) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
+    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg1), SWIGTYPE_p_int, new_flags));
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_svn_fs_change_node_prop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   svn_fs_root_t *arg1 = (svn_fs_root_t *) 0 ;
@@ -8083,7 +8750,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_change_node_prop(PyObject *SWIGUNUSEDPARM(self
   arg5 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OssO|O:svn_fs_change_node_prop",&obj0,&arg2,&arg3,&obj3,&obj4)) SWIG_fail;
   {
-    arg1 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
+    arg1 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8140,6 +8807,86 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_fs_props_different(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  svn_boolean_t *arg1 = (svn_boolean_t *) 0 ;
+  svn_fs_root_t *arg2 = (svn_fs_root_t *) 0 ;
+  char *arg3 = (char *) 0 ;
+  svn_fs_root_t *arg4 = (svn_fs_root_t *) 0 ;
+  char *arg5 = (char *) 0 ;
+  apr_pool_t *arg6 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  svn_boolean_t temp1 ;
+  int res1 = SWIG_TMPOBJ ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj4 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg6 = _global_pool;
+  arg1 = &temp1;
+  if (!PyArg_ParseTuple(args,(char *)"OsOs|O:svn_fs_props_different",&obj0,&arg3,&obj2,&arg5,&obj4)) SWIG_fail;
+  {
+    arg2 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg4 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj2);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  if (obj4) {
+    /* Verify that the user supplied a valid pool */
+    if (obj4 != Py_None && obj4 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj4);
+      SWIG_arg_fail(svn_argnum_obj4);
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_fs_props_different(arg1,arg2,(char const *)arg3,arg4,(char const *)arg5,arg6);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  if (SWIG_IsTmpObj(res1)) {
+    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_From_int((*arg1)));
+  } else {
+    int new_flags = SWIG_IsNewObj(res1) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
+    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg1), SWIGTYPE_p_int, new_flags));
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_svn_fs_props_changed(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   svn_boolean_t *arg1 = (svn_boolean_t *) 0 ;
@@ -8164,13 +8911,13 @@ SWIGINTERN PyObject *_wrap_svn_fs_props_changed(PyObject *SWIGUNUSEDPARM(self),
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OsOs|O:svn_fs_props_changed",&obj0,&arg3,&obj2,&arg5,&obj4)) SWIG_fail;
   {
-    arg2 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
+    arg2 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj2);
+    arg4 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8244,7 +8991,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_copied_from(PyObject *SWIGUNUSEDPARM(self), Py
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_fs_copied_from",&obj0,&arg4,&obj2)) SWIG_fail;
   {
-    arg3 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
+    arg3 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8330,7 +9077,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_closest_copy(PyObject *SWIGUNUSEDPARM(self), P
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_fs_closest_copy",&obj0,&arg4,&obj2)) SWIG_fail;
   {
-    arg3 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
+    arg3 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8363,7 +9110,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_closest_copy(PyObject *SWIGUNUSEDPARM(self), P
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_fs_root_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_fs_root_t,
         _global_py_pool, args))
     
     ;
@@ -8426,7 +9173,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_get_mergeinfo2(PyObject *SWIGUNUSEDPARM(self),
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OOOOO|OO:svn_fs_get_mergeinfo2",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
-    arg2 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
+    arg2 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8548,7 +9295,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_get_mergeinfo(PyObject *SWIGUNUSEDPARM(self),
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OOOO|O:svn_fs_get_mergeinfo",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
-    arg2 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
+    arg2 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8651,19 +9398,19 @@ SWIGINTERN PyObject *_wrap_svn_fs_merge(PyObject *SWIGUNUSEDPARM(self), PyObject
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OsOsOs|O:svn_fs_merge",&obj0,&arg3,&obj2,&arg5,&obj4,&arg7,&obj6)) SWIG_fail;
   {
-    arg2 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
+    arg2 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj2);
+    arg4 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg6 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj4);
+    arg6 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8728,7 +9475,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_dirent_t_name_set(PyObject *SWIGUNUSEDPARM(sel
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_fs_dirent_t_name_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_fs_dirent_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_dirent_t, svn_argnum_obj0);
+    arg1 = (struct svn_fs_dirent_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_dirent_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8756,7 +9503,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_dirent_t_name_get(PyObject *SWIGUNUSEDPARM(sel
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_dirent_t_name_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_fs_dirent_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_dirent_t, svn_argnum_obj0);
+    arg1 = (struct svn_fs_dirent_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_dirent_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8778,13 +9525,13 @@ SWIGINTERN PyObject *_wrap_svn_fs_dirent_t_id_set(PyObject *SWIGUNUSEDPARM(self)
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_fs_dirent_t_id_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_fs_dirent_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_dirent_t, svn_argnum_obj0);
+    arg1 = (struct svn_fs_dirent_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_dirent_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_fs_id_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_fs_id_t, svn_argnum_obj1);
+    arg2 = (svn_fs_id_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_fs_id_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8805,13 +9552,13 @@ SWIGINTERN PyObject *_wrap_svn_fs_dirent_t_id_get(PyObject *SWIGUNUSEDPARM(self)
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_dirent_t_id_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_fs_dirent_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_dirent_t, svn_argnum_obj0);
+    arg1 = (struct svn_fs_dirent_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_dirent_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (svn_fs_id_t *) ((arg1)->id);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_fs_id_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_fs_id_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -8828,7 +9575,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_dirent_t_kind_set(PyObject *SWIGUNUSEDPARM(sel
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_fs_dirent_t_kind_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_fs_dirent_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_dirent_t, svn_argnum_obj0);
+    arg1 = (struct svn_fs_dirent_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_dirent_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8855,7 +9602,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_dirent_t_kind_get(PyObject *SWIGUNUSEDPARM(sel
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_dirent_t_kind_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_fs_dirent_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_dirent_t, svn_argnum_obj0);
+    arg1 = (struct svn_fs_dirent_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_dirent_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8895,7 +9642,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_dir_entries(PyObject *SWIGUNUSEDPARM(self), Py
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_fs_dir_entries",&obj0,&arg3,&obj2)) SWIG_fail;
   {
-    arg2 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
+    arg2 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8948,6 +9695,106 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_fs_dir_optimal_order(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  apr_array_header_t **arg1 = (apr_array_header_t **) 0 ;
+  svn_fs_root_t *arg2 = (svn_fs_root_t *) 0 ;
+  apr_hash_t *arg3 = (apr_hash_t *) 0 ;
+  apr_pool_t *arg4 = (apr_pool_t *) 0 ;
+  apr_pool_t *arg5 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  apr_array_header_t *temp1 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg4 = _global_pool;
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg5 = _global_pool;
+  arg1 = &temp1;
+  if (!PyArg_ParseTuple(args,(char *)"OO|OO:svn_fs_dir_optimal_order",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    arg2 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg3 = (apr_hash_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_apr_hash_t, svn_argnum_obj1);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  if (obj2) {
+    /* Verify that the user supplied a valid pool */
+    if (obj2 != Py_None && obj2 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj2);
+      SWIG_arg_fail(svn_argnum_obj2);
+      SWIG_fail;
+    }
+  }
+  if (obj3) {
+    /* Verify that the user supplied a valid pool */
+    if (obj3 != Py_None && obj3 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj3);
+      SWIG_arg_fail(svn_argnum_obj3);
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_fs_dir_optimal_order(arg1,arg2,arg3,arg4,arg5);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  {
+    /* FIXME: Missing argout typemap: svn_fs_dir_optimal_order arg 1 (apr_array_header_t **) */
+    
+    
+    
+    
+    SWIG_exception(SWIG_ValueError, "svn_fs_dir_optimal_order is not implemented yet");
+    
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_svn_fs_make_dir(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   svn_fs_root_t *arg1 = (svn_fs_root_t *) 0 ;
@@ -8965,7 +9812,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_make_dir(PyObject *SWIGUNUSEDPARM(self), PyObj
   arg3 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_fs_make_dir",&obj0,&arg2,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
+    arg1 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9026,7 +9873,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_delete(PyObject *SWIGUNUSEDPARM(self), PyObjec
   arg3 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_fs_delete",&obj0,&arg2,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
+    arg1 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9090,13 +9937,13 @@ SWIGINTERN PyObject *_wrap_svn_fs_copy(PyObject *SWIGUNUSEDPARM(self), PyObject
   arg5 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OsOs|O:svn_fs_copy",&obj0,&arg2,&obj2,&arg4,&obj4)) SWIG_fail;
   {
-    arg1 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
+    arg1 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj2);
+    arg3 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9159,13 +10006,13 @@ SWIGINTERN PyObject *_wrap_svn_fs_revision_link(PyObject *SWIGUNUSEDPARM(self),
   arg4 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOs|O:svn_fs_revision_link",&obj0,&obj1,&arg3,&obj3)) SWIG_fail;
   {
-    arg1 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
+    arg1 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj1);
+    arg2 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9229,7 +10076,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_file_length(PyObject *SWIGUNUSEDPARM(self), Py
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_fs_file_length",&obj0,&arg3,&obj2)) SWIG_fail;
   {
-    arg2 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
+    arg2 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9306,7 +10153,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_file_checksum(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
-    arg3 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj1);
+    arg3 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9385,7 +10232,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_file_md5_checksum(PyObject *SWIGUNUSEDPARM(sel
   arg1 = temp1;
   if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_fs_file_md5_checksum",&obj0,&arg3,&obj2)) SWIG_fail;
   {
-    arg2 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
+    arg2 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9452,7 +10299,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_file_contents(PyObject *SWIGUNUSEDPARM(self),
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_fs_file_contents",&obj0,&arg3,&obj2)) SWIG_fail;
   {
-    arg2 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
+    arg2 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9485,7 +10332,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_file_contents(PyObject *SWIGUNUSEDPARM(self),
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_stream_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_stream_t,
         _global_py_pool, args))
     
     ;
@@ -9527,14 +10374,14 @@ SWIGINTERN PyObject *_wrap_svn_fs_try_process_file_contents(PyObject *SWIGUNUSED
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_fs_try_process_file_contents",&obj0,&arg3,&obj2,&obj3,&obj4)) SWIG_fail;
   {
-    arg2 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
+    arg2 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
     svn_fs_process_contents_func_t * tmp =
-    svn_swig_MustGetPtr(obj2, SWIGTYPE_p_p_f_p_q_const__unsigned_char_apr_size_t_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj2);
+    svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_p_f_p_q_const__unsigned_char_apr_size_t_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj2);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9610,7 +10457,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_make_file(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg3 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_fs_make_file",&obj0,&arg2,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
+    arg1 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9687,7 +10534,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_apply_textdelta(PyObject *SWIGUNUSEDPARM(self)
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"Oszz|O:svn_fs_apply_textdelta",&obj0,&arg4,&arg5,&arg6,&obj4)) SWIG_fail;
   {
-    arg3 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
+    arg3 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9720,13 +10567,13 @@ SWIGINTERN PyObject *_wrap_svn_fs_apply_textdelta(PyObject *SWIGUNUSEDPARM(self)
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(arg1, SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(arg1, SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -9764,7 +10611,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_apply_text(PyObject *SWIGUNUSEDPARM(self), PyO
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"Osz|O:svn_fs_apply_text",&obj0,&arg3,&arg4,&obj3)) SWIG_fail;
   {
-    arg2 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
+    arg2 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9797,7 +10644,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_apply_text(PyObject *SWIGUNUSEDPARM(self), PyO
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_stream_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_stream_t,
         _global_py_pool, args))
     
     ;
@@ -9814,6 +10661,86 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_fs_contents_different(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  svn_boolean_t *arg1 = (svn_boolean_t *) 0 ;
+  svn_fs_root_t *arg2 = (svn_fs_root_t *) 0 ;
+  char *arg3 = (char *) 0 ;
+  svn_fs_root_t *arg4 = (svn_fs_root_t *) 0 ;
+  char *arg5 = (char *) 0 ;
+  apr_pool_t *arg6 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  svn_boolean_t temp1 ;
+  int res1 = SWIG_TMPOBJ ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj4 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg6 = _global_pool;
+  arg1 = &temp1;
+  if (!PyArg_ParseTuple(args,(char *)"OsOs|O:svn_fs_contents_different",&obj0,&arg3,&obj2,&arg5,&obj4)) SWIG_fail;
+  {
+    arg2 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg4 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj2);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  if (obj4) {
+    /* Verify that the user supplied a valid pool */
+    if (obj4 != Py_None && obj4 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj4);
+      SWIG_arg_fail(svn_argnum_obj4);
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_fs_contents_different(arg1,arg2,(char const *)arg3,arg4,(char const *)arg5,arg6);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  if (SWIG_IsTmpObj(res1)) {
+    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_From_int((*arg1)));
+  } else {
+    int new_flags = SWIG_IsNewObj(res1) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
+    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg1), SWIGTYPE_p_int, new_flags));
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_svn_fs_contents_changed(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   svn_boolean_t *arg1 = (svn_boolean_t *) 0 ;
@@ -9838,13 +10765,13 @@ SWIGINTERN PyObject *_wrap_svn_fs_contents_changed(PyObject *SWIGUNUSEDPARM(self
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OsOs|O:svn_fs_contents_changed",&obj0,&arg3,&obj2,&arg5,&obj4)) SWIG_fail;
   {
-    arg2 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
+    arg2 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj2);
+    arg4 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9914,7 +10841,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_youngest_rev(PyObject *SWIGUNUSEDPARM(self), P
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_fs_youngest_rev",&obj0,&obj1)) SWIG_fail;
   {
-    arg2 = (svn_fs_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
+    arg2 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9964,6 +10891,200 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_fs_info_format(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  int *arg1 = (int *) 0 ;
+  svn_version_t **arg2 = (svn_version_t **) 0 ;
+  svn_fs_t *arg3 = (svn_fs_t *) 0 ;
+  apr_pool_t *arg4 = (apr_pool_t *) 0 ;
+  apr_pool_t *arg5 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  int temp1 ;
+  int res1 = SWIG_TMPOBJ ;
+  svn_version_t *temp2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg4 = _global_pool;
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg5 = _global_pool;
+  arg1 = &temp1;
+  arg2 = &temp2;
+  if (!PyArg_ParseTuple(args,(char *)"O|OO:svn_fs_info_format",&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg3 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  if (obj1) {
+    /* Verify that the user supplied a valid pool */
+    if (obj1 != Py_None && obj1 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj1);
+      SWIG_arg_fail(svn_argnum_obj1);
+      SWIG_fail;
+    }
+  }
+  if (obj2) {
+    /* Verify that the user supplied a valid pool */
+    if (obj2 != Py_None && obj2 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj2);
+      SWIG_arg_fail(svn_argnum_obj2);
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_fs_info_format(arg1,arg2,arg3,arg4,arg5);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  if (SWIG_IsTmpObj(res1)) {
+    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_From_int((*arg1)));
+  } else {
+    int new_flags = SWIG_IsNewObj(res1) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
+    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg1), SWIGTYPE_p_int, new_flags));
+  }
+  {
+    /* FIXME: Missing argout typemap: svn_fs_info_format arg 2 (svn_version_t **) */
+    
+    
+    
+    
+    SWIG_exception(SWIG_ValueError, "svn_fs_info_format is not implemented yet");
+    
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_svn_fs_info_config_files(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  apr_array_header_t **arg1 = (apr_array_header_t **) 0 ;
+  svn_fs_t *arg2 = (svn_fs_t *) 0 ;
+  apr_pool_t *arg3 = (apr_pool_t *) 0 ;
+  apr_pool_t *arg4 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  apr_array_header_t *temp1 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg3 = _global_pool;
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg4 = _global_pool;
+  arg1 = &temp1;
+  if (!PyArg_ParseTuple(args,(char *)"O|OO:svn_fs_info_config_files",&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg2 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  if (obj1) {
+    /* Verify that the user supplied a valid pool */
+    if (obj1 != Py_None && obj1 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj1);
+      SWIG_arg_fail(svn_argnum_obj1);
+      SWIG_fail;
+    }
+  }
+  if (obj2) {
+    /* Verify that the user supplied a valid pool */
+    if (obj2 != Py_None && obj2 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj2);
+      SWIG_arg_fail(svn_argnum_obj2);
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_fs_info_config_files(arg1,arg2,arg3,arg4);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  {
+    /* FIXME: Missing argout typemap: svn_fs_info_config_files arg 1 (apr_array_header_t **) */
+    
+    
+    
+    
+    SWIG_exception(SWIG_ValueError, "svn_fs_info_config_files is not implemented yet");
+    
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_svn_fs_deltify_revision(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   svn_fs_t *arg1 = (svn_fs_t *) 0 ;
@@ -9982,7 +11103,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_deltify_revision(PyObject *SWIGUNUSEDPARM(self
   arg3 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_fs_deltify_revision",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_fs_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
+    arg1 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10054,7 +11175,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_revision_prop(PyObject *SWIGUNUSEDPARM(self),
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OOs|O:svn_fs_revision_prop",&obj0,&obj1,&arg4,&obj3)) SWIG_fail;
   {
-    arg2 = (svn_fs_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
+    arg2 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10138,7 +11259,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_revision_proplist(PyObject *SWIGUNUSEDPARM(sel
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_fs_revision_proplist",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg2 = (svn_fs_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
+    arg2 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10215,7 +11336,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_change_rev_prop2(PyObject *SWIGUNUSEDPARM(self
   arg6 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOsOO|O:svn_fs_change_rev_prop2",&obj0,&obj1,&arg3,&obj3,&obj4,&obj5)) SWIG_fail;
   {
-    arg1 = (svn_fs_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
+    arg1 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10227,7 +11348,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_change_rev_prop2(PyObject *SWIGUNUSEDPARM(self
     }
   }
   {
-    arg4 = (svn_string_t **)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_p_svn_string_t, svn_argnum_obj3);
+    arg4 = (svn_string_t **)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_p_svn_string_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10319,7 +11440,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_change_rev_prop(PyObject *SWIGUNUSEDPARM(self)
   arg5 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOsO|O:svn_fs_change_rev_prop",&obj0,&obj1,&arg3,&obj3,&obj4)) SWIG_fail;
   {
-    arg1 = (svn_fs_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
+    arg1 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10405,13 +11526,13 @@ SWIGINTERN PyObject *_wrap_svn_fs_get_file_delta_stream(PyObject *SWIGUNUSEDPARM
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OsOs|O:svn_fs_get_file_delta_stream",&obj0,&arg3,&obj2,&arg5,&obj4)) SWIG_fail;
   {
-    arg2 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
+    arg2 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj2);
+    arg4 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10444,7 +11565,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_get_file_delta_stream(PyObject *SWIGUNUSEDPARM
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_txdelta_stream_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_txdelta_stream_t,
         _global_py_pool, args))
     
     ;
@@ -10480,7 +11601,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_get_uuid(PyObject *SWIGUNUSEDPARM(self), PyObj
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_fs_get_uuid",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_fs_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
+    arg1 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10554,7 +11675,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_set_uuid(PyObject *SWIGUNUSEDPARM(self), PyObj
   arg3 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"Oz|O:svn_fs_set_uuid",&obj0,&arg2,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_fs_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
+    arg1 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10598,6 +11719,208 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_fs_lock_target_create(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  char *arg1 = (char *) 0 ;
+  svn_revnum_t arg2 ;
+  apr_pool_t *arg3 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  svn_fs_lock_target_t *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg3 = _global_pool;
+  if (!PyArg_ParseTuple(args,(char *)"zO|O:svn_fs_lock_target_create",&arg1,&obj1,&obj2)) SWIG_fail;
+  {
+    arg2 = (svn_revnum_t)SWIG_As_long (obj1);
+    if (SWIG_arg_fail(svn_argnum_obj1)) {
+      SWIG_fail;
+    }
+  }
+  if (obj2) {
+    /* Verify that the user supplied a valid pool */
+    if (obj2 != Py_None && obj2 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj2);
+      SWIG_arg_fail(svn_argnum_obj2);
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_fs_lock_target_t *)svn_fs_lock_target_create((char const *)arg1,arg2,arg3);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_fs_lock_target_t,
+    _global_py_pool, args);
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_svn_fs_lock_target_set_token(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  svn_fs_lock_target_t *arg1 = (svn_fs_lock_target_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"Oz:svn_fs_lock_target_set_token",&obj0,&arg2)) SWIG_fail;
+  {
+    arg1 = (svn_fs_lock_target_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_lock_target_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    svn_fs_lock_target_set_token(arg1,(char const *)arg2);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_svn_fs_lock_many(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  svn_fs_t *arg1 = (svn_fs_t *) 0 ;
+  apr_hash_t *arg2 = (apr_hash_t *) 0 ;
+  char *arg3 = (char *) 0 ;
+  svn_boolean_t arg4 ;
+  apr_time_t arg5 ;
+  svn_boolean_t arg6 ;
+  svn_fs_lock_callback_t arg7 = (svn_fs_lock_callback_t) 0 ;
+  void *arg8 = (void *) 0 ;
+  apr_pool_t *arg9 = (apr_pool_t *) 0 ;
+  apr_pool_t *arg10 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  PyObject * obj5 = 0 ;
+  PyObject * obj6 = 0 ;
+  PyObject * obj7 = 0 ;
+  PyObject * obj8 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg9 = _global_pool;
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg10 = _global_pool;
+  if (!PyArg_ParseTuple(args,(char *)"OOzOOOO|OO:svn_fs_lock_many",&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
+  {
+    arg1 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    if (_global_pool == NULL)
+    {
+      if (svn_swig_py_get_parent_pool(args, SWIGTYPE_p_apr_pool_t,
+          &_global_py_pool, &_global_pool))
+      SWIG_fail;
+    }
+    arg2 = svn_swig_py_struct_ptr_hash_from_dict(obj1,
+      SWIGTYPE_p_svn_fs_lock_target_t, _global_pool);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg4 = (svn_boolean_t)SWIG_As_long (obj3);
+    if (SWIG_arg_fail(svn_argnum_obj3)) {
+      SWIG_fail;
+    }
+  }
+  arg5 = (apr_time_t) PyLong_AsLongLong(obj4); 
+  {
+    arg6 = (svn_boolean_t)SWIG_As_long (obj5);
+    if (SWIG_arg_fail(svn_argnum_obj5)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg7 = (svn_fs_lock_callback_t) svn_swig_py_fs_lock_callback;
+    arg8 = obj6;
+  }
+  if (obj7) {
+    /* Verify that the user supplied a valid pool */
+    if (obj7 != Py_None && obj7 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj7);
+      SWIG_arg_fail(svn_argnum_obj7);
+      SWIG_fail;
+    }
+  }
+  if (obj8) {
+    /* Verify that the user supplied a valid pool */
+    if (obj8 != Py_None && obj8 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj8);
+      SWIG_arg_fail(svn_argnum_obj8);
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_fs_lock_many(arg1,arg2,(char const *)arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_svn_fs_lock(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   svn_lock_t **arg1 = (svn_lock_t **) 0 ;
@@ -10628,7 +11951,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_lock(PyObject *SWIGUNUSEDPARM(self), PyObject
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OszzOOOO|O:svn_fs_lock",&obj0,&arg3,&arg4,&arg5,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   {
-    arg2 = (svn_fs_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
+    arg2 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10680,7 +12003,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_lock(PyObject *SWIGUNUSEDPARM(self), PyObject
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_lock_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_lock_t,
         _global_py_pool, args))
     
     ;
@@ -10716,7 +12039,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_generate_lock_token(PyObject *SWIGUNUSEDPARM(s
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_fs_generate_lock_token",&obj0,&obj1)) SWIG_fail;
   {
-    arg2 = (svn_fs_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
+    arg2 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10773,6 +12096,106 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_fs_unlock_many(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  svn_fs_t *arg1 = (svn_fs_t *) 0 ;
+  apr_hash_t *arg2 = (apr_hash_t *) 0 ;
+  svn_boolean_t arg3 ;
+  svn_fs_lock_callback_t arg4 = (svn_fs_lock_callback_t) 0 ;
+  void *arg5 = (void *) 0 ;
+  apr_pool_t *arg6 = (apr_pool_t *) 0 ;
+  apr_pool_t *arg7 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  PyObject * obj5 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg6 = _global_pool;
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg7 = _global_pool;
+  if (!PyArg_ParseTuple(args,(char *)"OOOO|OO:svn_fs_unlock_many",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  {
+    arg1 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg2 = svn_swig_py_stringhash_from_dict(obj1, _global_pool);
+  }
+  {
+    arg3 = (svn_boolean_t)SWIG_As_long (obj2);
+    if (SWIG_arg_fail(svn_argnum_obj2)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg4 = (svn_fs_lock_callback_t) svn_swig_py_fs_lock_callback;
+    arg5 = obj3;
+  }
+  if (obj4) {
+    /* Verify that the user supplied a valid pool */
+    if (obj4 != Py_None && obj4 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj4);
+      SWIG_arg_fail(svn_argnum_obj4);
+      SWIG_fail;
+    }
+  }
+  if (obj5) {
+    /* Verify that the user supplied a valid pool */
+    if (obj5 != Py_None && obj5 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj5);
+      SWIG_arg_fail(svn_argnum_obj5);
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_fs_unlock_many(arg1,arg2,arg3,arg4,arg5,arg6,arg7);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_svn_fs_unlock(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   svn_fs_t *arg1 = (svn_fs_t *) 0 ;
@@ -10793,7 +12216,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_unlock(PyObject *SWIGUNUSEDPARM(self), PyObjec
   arg5 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OszO|O:svn_fs_unlock",&obj0,&arg2,&arg3,&obj3,&obj4)) SWIG_fail;
   {
-    arg1 = (svn_fs_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
+    arg1 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10863,7 +12286,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_get_lock(PyObject *SWIGUNUSEDPARM(self), PyObj
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_fs_get_lock",&obj0,&arg3,&obj2)) SWIG_fail;
   {
-    arg2 = (svn_fs_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
+    arg2 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10896,7 +12319,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_get_lock(PyObject *SWIGUNUSEDPARM(self), PyObj
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_lock_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_lock_t,
         _global_py_pool, args))
     
     ;
@@ -10935,7 +12358,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_get_locks2(PyObject *SWIGUNUSEDPARM(self), PyO
   arg6 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_fs_get_locks2",&obj0,&arg2,&obj2,&obj3,&obj4)) SWIG_fail;
   {
-    arg1 = (svn_fs_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
+    arg1 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10947,7 +12370,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_get_locks2(PyObject *SWIGUNUSEDPARM(self), PyO
     }
   }
   {
-    arg4 = svn_swig_py_fs_get_locks_func;
+    arg4 = (svn_fs_get_locks_callback_t) svn_swig_py_fs_get_locks_func;
     arg5 = obj3;
   }
   if (obj4) {
@@ -11009,13 +12432,13 @@ SWIGINTERN PyObject *_wrap_svn_fs_get_locks(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg5 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OsO|O:svn_fs_get_locks",&obj0,&arg2,&obj2,&obj3)) SWIG_fail;
   {
-    arg1 = (svn_fs_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
+    arg1 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = svn_swig_py_fs_get_locks_func;
+    arg3 = (svn_fs_get_locks_callback_t) svn_swig_py_fs_get_locks_func;
     arg4 = obj2;
   }
   if (obj3) {
@@ -11144,7 +12567,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_pack(PyObject *SWIGUNUSEDPARM(self), PyObject
   if (!PyArg_ParseTuple(args,(char *)"sOOO|O:svn_fs_pack",&arg1,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     svn_fs_pack_notify_t * tmp =
-    svn_swig_MustGetPtr(obj1, SWIGTYPE_p_p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj1);
+    svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj1);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11159,8 +12582,8 @@ SWIGINTERN PyObject *_wrap_svn_fs_pack(PyObject *SWIGUNUSEDPARM(self), PyObject
     }
   }
   {
-    arg4 = svn_swig_py_cancel_func;
-    arg5 = obj3; /* our function is the baton. */
+    arg4 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg5 = obj3;
   }
   if (obj4) {
     /* Verify that the user supplied a valid pool */
@@ -11246,7 +12669,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_verify(PyObject *SWIGUNUSEDPARM(self), PyObjec
   }
   {
     svn_fs_progress_notify_func_t * tmp =
-    svn_swig_MustGetPtr(obj4, SWIGTYPE_p_p_f_long_p_void_p_apr_pool_t__void, svn_argnum_obj4);
+    svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_p_f_long_p_void_p_apr_pool_t__void, svn_argnum_obj4);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11261,8 +12684,8 @@ SWIGINTERN PyObject *_wrap_svn_fs_verify(PyObject *SWIGUNUSEDPARM(self), PyObjec
     }
   }
   {
-    arg7 = svn_swig_py_cancel_func;
-    arg8 = obj6; /* our function is the baton. */
+    arg7 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg8 = obj6;
   }
   if (obj7) {
     /* Verify that the user supplied a valid pool */
@@ -11319,7 +12742,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_verify_root(PyObject *SWIGUNUSEDPARM(self), Py
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_fs_verify_root",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
+    arg1 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11363,6 +12786,582 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_fs_fsfs_info_t_fs_type_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  struct svn_fs_fsfs_info_t *arg1 = (struct svn_fs_fsfs_info_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"Os:svn_fs_fsfs_info_t_fs_type_set",&obj0,&arg2)) SWIG_fail;
+  {
+    arg1 = (struct svn_fs_fsfs_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_fsfs_info_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    apr_size_t len = strlen(arg2) + 1;
+    char *copied;
+    if (arg1->fs_type) free((char *)arg1->fs_type);
+    copied = malloc(len);
+    memcpy(copied, arg2, len);
+    arg1->fs_type = copied;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_svn_fs_fsfs_info_t_fs_type_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  struct svn_fs_fsfs_info_t *arg1 = (struct svn_fs_fsfs_info_t *) 0 ;
+  PyObject * obj0 = 0 ;
+  char *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_fsfs_info_t_fs_type_get",&obj0)) SWIG_fail;
+  {
+    arg1 = (struct svn_fs_fsfs_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_fsfs_info_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  result = (char *) ((arg1)->fs_type);
+  resultobj = SWIG_FromCharPtr((const char *)result);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_svn_fs_fsfs_info_t_shard_size_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  struct svn_fs_fsfs_info_t *arg1 = (struct svn_fs_fsfs_info_t *) 0 ;
+  int arg2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:svn_fs_fsfs_info_t_shard_size_set",&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = (struct svn_fs_fsfs_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_fsfs_info_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg2 = (int)SWIG_As_long (obj1);
+    if (SWIG_arg_fail(svn_argnum_obj1)) {
+      SWIG_fail;
+    }
+  }
+  if (arg1) (arg1)->shard_size = arg2;
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_svn_fs_fsfs_info_t_shard_size_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  struct svn_fs_fsfs_info_t *arg1 = (struct svn_fs_fsfs_info_t *) 0 ;
+  PyObject * obj0 = 0 ;
+  int result;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_fsfs_info_t_shard_size_get",&obj0)) SWIG_fail;
+  {
+    arg1 = (struct svn_fs_fsfs_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_fsfs_info_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  result = (int) ((arg1)->shard_size);
+  resultobj = SWIG_From_long((long)(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_svn_fs_fsfs_info_t_min_unpacked_rev_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  struct svn_fs_fsfs_info_t *arg1 = (struct svn_fs_fsfs_info_t *) 0 ;
+  svn_revnum_t arg2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:svn_fs_fsfs_info_t_min_unpacked_rev_set",&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = (struct svn_fs_fsfs_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_fsfs_info_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg2 = (svn_revnum_t)SWIG_As_long (obj1);
+    if (SWIG_arg_fail(svn_argnum_obj1)) {
+      SWIG_fail;
+    }
+  }
+  if (arg1) (arg1)->min_unpacked_rev = arg2;
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_svn_fs_fsfs_info_t_min_unpacked_rev_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  struct svn_fs_fsfs_info_t *arg1 = (struct svn_fs_fsfs_info_t *) 0 ;
+  PyObject * obj0 = 0 ;
+  svn_revnum_t result;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_fsfs_info_t_min_unpacked_rev_get",&obj0)) SWIG_fail;
+  {
+    arg1 = (struct svn_fs_fsfs_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_fsfs_info_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  result = (svn_revnum_t) ((arg1)->min_unpacked_rev);
+  resultobj = SWIG_From_long((long)(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_svn_fs_fsfs_info_t_log_addressing_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  struct svn_fs_fsfs_info_t *arg1 = (struct svn_fs_fsfs_info_t *) 0 ;
+  svn_boolean_t arg2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:svn_fs_fsfs_info_t_log_addressing_set",&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = (struct svn_fs_fsfs_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_fsfs_info_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg2 = (svn_boolean_t)SWIG_As_long (obj1);
+    if (SWIG_arg_fail(svn_argnum_obj1)) {
+      SWIG_fail;
+    }
+  }
+  if (arg1) (arg1)->log_addressing = arg2;
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_svn_fs_fsfs_info_t_log_addressing_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  struct svn_fs_fsfs_info_t *arg1 = (struct svn_fs_fsfs_info_t *) 0 ;
+  PyObject * obj0 = 0 ;
+  svn_boolean_t result;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_fsfs_info_t_log_addressing_get",&obj0)) SWIG_fail;
+  {
+    arg1 = (struct svn_fs_fsfs_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_fsfs_info_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  result = (svn_boolean_t) ((arg1)->log_addressing);
+  resultobj = SWIG_From_long((long)(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *svn_fs_fsfs_info_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_svn_fs_fsfs_info_t, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_svn_fs_fsx_info_t_fs_type_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  struct svn_fs_fsx_info_t *arg1 = (struct svn_fs_fsx_info_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"Os:svn_fs_fsx_info_t_fs_type_set",&obj0,&arg2)) SWIG_fail;
+  {
+    arg1 = (struct svn_fs_fsx_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_fsx_info_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    apr_size_t len = strlen(arg2) + 1;
+    char *copied;
+    if (arg1->fs_type) free((char *)arg1->fs_type);
+    copied = malloc(len);
+    memcpy(copied, arg2, len);
+    arg1->fs_type = copied;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_svn_fs_fsx_info_t_fs_type_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  struct svn_fs_fsx_info_t *arg1 = (struct svn_fs_fsx_info_t *) 0 ;
+  PyObject * obj0 = 0 ;
+  char *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_fsx_info_t_fs_type_get",&obj0)) SWIG_fail;
+  {
+    arg1 = (struct svn_fs_fsx_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_fsx_info_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  result = (char *) ((arg1)->fs_type);
+  resultobj = SWIG_FromCharPtr((const char *)result);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_svn_fs_fsx_info_t_shard_size_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  struct svn_fs_fsx_info_t *arg1 = (struct svn_fs_fsx_info_t *) 0 ;
+  int arg2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:svn_fs_fsx_info_t_shard_size_set",&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = (struct svn_fs_fsx_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_fsx_info_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg2 = (int)SWIG_As_long (obj1);
+    if (SWIG_arg_fail(svn_argnum_obj1)) {
+      SWIG_fail;
+    }
+  }
+  if (arg1) (arg1)->shard_size = arg2;
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_svn_fs_fsx_info_t_shard_size_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  struct svn_fs_fsx_info_t *arg1 = (struct svn_fs_fsx_info_t *) 0 ;
+  PyObject * obj0 = 0 ;
+  int result;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_fsx_info_t_shard_size_get",&obj0)) SWIG_fail;
+  {
+    arg1 = (struct svn_fs_fsx_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_fsx_info_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  result = (int) ((arg1)->shard_size);
+  resultobj = SWIG_From_long((long)(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_svn_fs_fsx_info_t_min_unpacked_rev_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  struct svn_fs_fsx_info_t *arg1 = (struct svn_fs_fsx_info_t *) 0 ;
+  svn_revnum_t arg2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:svn_fs_fsx_info_t_min_unpacked_rev_set",&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = (struct svn_fs_fsx_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_fsx_info_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg2 = (svn_revnum_t)SWIG_As_long (obj1);
+    if (SWIG_arg_fail(svn_argnum_obj1)) {
+      SWIG_fail;
+    }
+  }
+  if (arg1) (arg1)->min_unpacked_rev = arg2;
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_svn_fs_fsx_info_t_min_unpacked_rev_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  struct svn_fs_fsx_info_t *arg1 = (struct svn_fs_fsx_info_t *) 0 ;
+  PyObject * obj0 = 0 ;
+  svn_revnum_t result;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_fsx_info_t_min_unpacked_rev_get",&obj0)) SWIG_fail;
+  {
+    arg1 = (struct svn_fs_fsx_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_fsx_info_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  result = (svn_revnum_t) ((arg1)->min_unpacked_rev);
+  resultobj = SWIG_From_long((long)(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *svn_fs_fsx_info_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_svn_fs_fsx_info_t, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_svn_fs_info_placeholder_t_fs_type_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  struct svn_fs_info_placeholder_t *arg1 = (struct svn_fs_info_placeholder_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"Os:svn_fs_info_placeholder_t_fs_type_set",&obj0,&arg2)) SWIG_fail;
+  {
+    arg1 = (struct svn_fs_info_placeholder_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_info_placeholder_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    apr_size_t len = strlen(arg2) + 1;
+    char *copied;
+    if (arg1->fs_type) free((char *)arg1->fs_type);
+    copied = malloc(len);
+    memcpy(copied, arg2, len);
+    arg1->fs_type = copied;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_svn_fs_info_placeholder_t_fs_type_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  struct svn_fs_info_placeholder_t *arg1 = (struct svn_fs_info_placeholder_t *) 0 ;
+  PyObject * obj0 = 0 ;
+  char *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:svn_fs_info_placeholder_t_fs_type_get",&obj0)) SWIG_fail;
+  {
+    arg1 = (struct svn_fs_info_placeholder_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_info_placeholder_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  result = (char *) ((arg1)->fs_type);
+  resultobj = SWIG_FromCharPtr((const char *)result);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *svn_fs_info_placeholder_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_svn_fs_info_placeholder_t, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_svn_fs_info(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  svn_fs_info_placeholder_t **arg1 = (svn_fs_info_placeholder_t **) 0 ;
+  svn_fs_t *arg2 = (svn_fs_t *) 0 ;
+  apr_pool_t *arg3 = (apr_pool_t *) 0 ;
+  apr_pool_t *arg4 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  svn_fs_info_placeholder_t *temp1 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg3 = _global_pool;
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg4 = _global_pool;
+  arg1 = &temp1;
+  if (!PyArg_ParseTuple(args,(char *)"O|OO:svn_fs_info",&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg2 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  if (obj1) {
+    /* Verify that the user supplied a valid pool */
+    if (obj1 != Py_None && obj1 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj1);
+      SWIG_arg_fail(svn_argnum_obj1);
+      SWIG_fail;
+    }
+  }
+  if (obj2) {
+    /* Verify that the user supplied a valid pool */
+    if (obj2 != Py_None && obj2 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj2);
+      SWIG_arg_fail(svn_argnum_obj2);
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_fs_info((struct svn_fs_info_placeholder_t const **)arg1,arg2,arg3,arg4);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  {
+    /* FIXME: Missing argout typemap: svn_fs_info arg 1 (svn_fs_info_placeholder_t const **) */
+    
+    
+    
+    
+    SWIG_exception(SWIG_ValueError, "svn_fs_info is not implemented yet");
+    
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_svn_fs_info_dup(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  void *arg1 = (void *) 0 ;
+  apr_pool_t *arg2 = (apr_pool_t *) 0 ;
+  apr_pool_t *arg3 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  void *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg2 = _global_pool;
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg3 = _global_pool;
+  if (!PyArg_ParseTuple(args,(char *)"O|OO:svn_fs_info_dup",&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg1 = (void *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_void, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  if (obj1) {
+    /* Verify that the user supplied a valid pool */
+    if (obj1 != Py_None && obj1 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj1);
+      SWIG_arg_fail(svn_argnum_obj1);
+      SWIG_fail;
+    }
+  }
+  if (obj2) {
+    /* Verify that the user supplied a valid pool */
+    if (obj2 != Py_None && obj2 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj2);
+      SWIG_arg_fail(svn_argnum_obj2);
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (void *)svn_fs_info_dup((void const *)arg1,arg2,arg3);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_void,
+    _global_py_pool, args);
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *svn_fs_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
@@ -11405,6 +13404,13 @@ SWIGINTERN PyObject *svn_fs_history_t_swigregister(PyObject *SWIGUNUSEDPARM(self
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *svn_fs_lock_target_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_svn_fs_lock_target_t, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
 SWIGINTERN PyObject *_wrap_svn_fs_invoke_warning_callback(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   svn_fs_warning_callback_t arg1 = (svn_fs_warning_callback_t) 0 ;
@@ -11417,7 +13423,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_invoke_warning_callback(PyObject *SWIGUNUSEDPA
   if (!PyArg_ParseTuple(args,(char *)"OOO:svn_fs_invoke_warning_callback",&obj0,&obj1,&obj2)) SWIG_fail;
   {
     svn_fs_warning_callback_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void_p_struct_svn_error_t__void, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_struct_svn_error_t__void, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11432,7 +13438,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_invoke_warning_callback(PyObject *SWIGUNUSEDPA
     }
   }
   {
-    arg3 = (svn_error_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_error_t, svn_argnum_obj2);
+    arg3 = (svn_error_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_error_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11452,6 +13458,89 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_fs_invoke_upgrade_notify(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  svn_fs_upgrade_notify_t arg1 = (svn_fs_upgrade_notify_t) 0 ;
+  void *arg2 = (void *) 0 ;
+  apr_uint64_t arg3 ;
+  svn_fs_upgrade_notify_action_t arg4 ;
+  apr_pool_t *arg5 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg5 = _global_pool;
+  if (!PyArg_ParseTuple(args,(char *)"OOOO|O:svn_fs_invoke_upgrade_notify",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  {
+    svn_fs_upgrade_notify_t * tmp =
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_apr_uint64_t_svn_fs_upgrade_notify_action_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    if (tmp == NULL || PyErr_Occurred()) {
+      SWIG_fail;
+    }
+    arg1 = *tmp;
+  }
+  {
+    if (obj1 == Py_None) {
+      arg2 = NULL;
+    } else if (SWIG_ConvertPtr(obj1, (void **) &arg2, 0, 0) == -1) {
+      arg2 = (void *) obj1;
+      PyErr_Clear();
+    }
+  }
+  arg3 = (apr_uint64_t) PyLong_AsUnsignedLongLong(obj2); 
+  {
+    arg4 = (svn_fs_upgrade_notify_action_t)SWIG_As_long (obj3);
+    if (SWIG_arg_fail(svn_argnum_obj3)) {
+      SWIG_fail;
+    }
+  }
+  if (obj4) {
+    /* Verify that the user supplied a valid pool */
+    if (obj4 != Py_None && obj4 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj4);
+      SWIG_arg_fail(svn_argnum_obj4);
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_fs_invoke_upgrade_notify(arg1,arg2,arg3,arg4,arg5);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_svn_fs_invoke_progress_notify_func(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   svn_fs_progress_notify_func_t arg1 = (svn_fs_progress_notify_func_t) 0 ;
@@ -11472,7 +13561,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_invoke_progress_notify_func(PyObject *SWIGUNUS
   if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_fs_invoke_progress_notify_func",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     svn_fs_progress_notify_func_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_long_p_void_p_apr_pool_t__void, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_long_p_void_p_apr_pool_t__void, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11521,6 +13610,83 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_fs_invoke_hotcopy_notify(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  svn_fs_hotcopy_notify_t arg1 = (svn_fs_hotcopy_notify_t) 0 ;
+  void *arg2 = (void *) 0 ;
+  svn_revnum_t arg3 ;
+  svn_revnum_t arg4 ;
+  apr_pool_t *arg5 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg5 = _global_pool;
+  if (!PyArg_ParseTuple(args,(char *)"OOOO|O:svn_fs_invoke_hotcopy_notify",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  {
+    svn_fs_hotcopy_notify_t * tmp =
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_long_long_p_apr_pool_t__void, svn_argnum_obj0);
+    if (tmp == NULL || PyErr_Occurred()) {
+      SWIG_fail;
+    }
+    arg1 = *tmp;
+  }
+  {
+    if (obj1 == Py_None) {
+      arg2 = NULL;
+    } else if (SWIG_ConvertPtr(obj1, (void **) &arg2, 0, 0) == -1) {
+      arg2 = (void *) obj1;
+      PyErr_Clear();
+    }
+  }
+  {
+    arg3 = (svn_revnum_t)SWIG_As_long (obj2);
+    if (SWIG_arg_fail(svn_argnum_obj2)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg4 = (svn_revnum_t)SWIG_As_long (obj3);
+    if (SWIG_arg_fail(svn_argnum_obj3)) {
+      SWIG_fail;
+    }
+  }
+  if (obj4) {
+    /* Verify that the user supplied a valid pool */
+    if (obj4 != Py_None && obj4 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj4);
+      SWIG_arg_fail(svn_argnum_obj4);
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    svn_fs_invoke_hotcopy_notify(arg1,arg2,arg3,arg4,arg5);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  resultobj = SWIG_Py_Void();
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_svn_fs_invoke_freeze_func(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   svn_fs_freeze_func_t arg1 = (svn_fs_freeze_func_t) 0 ;
@@ -11540,7 +13706,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_invoke_freeze_func(PyObject *SWIGUNUSEDPARM(se
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_fs_invoke_freeze_func",&obj0,&obj1,&obj2)) SWIG_fail;
   {
     svn_fs_freeze_func_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11616,14 +13782,14 @@ SWIGINTERN PyObject *_wrap_svn_fs_invoke_process_contents_func(PyObject *SWIGUNU
   if (!PyArg_ParseTuple(args,(char *)"OOOO|O:svn_fs_invoke_process_contents_func",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     svn_fs_process_contents_func_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_q_const__unsigned_char_apr_size_t_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_q_const__unsigned_char_apr_size_t_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
     arg1 = *tmp;
   }
   {
-    arg2 = (unsigned char *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_unsigned_char, svn_argnum_obj1);
+    arg2 = (unsigned char *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_unsigned_char, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11681,6 +13847,95 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_fs_invoke_lock_callback(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  svn_fs_lock_callback_t arg1 = (svn_fs_lock_callback_t) 0 ;
+  void *arg2 = (void *) 0 ;
+  char *arg3 = (char *) 0 ;
+  svn_lock_t *arg4 = (svn_lock_t *) 0 ;
+  svn_error_t *arg5 = (svn_error_t *) 0 ;
+  apr_pool_t *arg6 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  PyObject * obj5 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg6 = _global_pool;
+  if (!PyArg_ParseTuple(args,(char *)"OOsOO|O:svn_fs_invoke_lock_callback",&obj0,&obj1,&arg3,&obj3,&obj4,&obj5)) SWIG_fail;
+  {
+    svn_fs_lock_callback_t * tmp =
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    if (tmp == NULL || PyErr_Occurred()) {
+      SWIG_fail;
+    }
+    arg1 = *tmp;
+  }
+  {
+    if (obj1 == Py_None) {
+      arg2 = NULL;
+    } else if (SWIG_ConvertPtr(obj1, (void **) &arg2, 0, 0) == -1) {
+      arg2 = (void *) obj1;
+      PyErr_Clear();
+    }
+  }
+  {
+    arg4 = (svn_lock_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_lock_t, svn_argnum_obj3);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg5 = (svn_error_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_error_t, svn_argnum_obj4);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  if (obj5) {
+    /* Verify that the user supplied a valid pool */
+    if (obj5 != Py_None && obj5 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj5);
+      SWIG_arg_fail(svn_argnum_obj5);
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_fs_invoke_lock_callback(arg1,arg2,(char const *)arg3,(struct svn_lock_t const *)arg4,arg5,arg6);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_svn_fs_invoke_get_locks_callback(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   svn_fs_get_locks_callback_t arg1 = (svn_fs_get_locks_callback_t) 0 ;
@@ -11702,7 +13957,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_invoke_get_locks_callback(PyObject *SWIGUNUSED
   if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_fs_invoke_get_locks_callback",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     svn_fs_get_locks_callback_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11717,7 +13972,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_invoke_get_locks_callback(PyObject *SWIGUNUSED
     }
   }
   {
-    arg3 = (svn_lock_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_lock_t, svn_argnum_obj2);
+    arg3 = (svn_lock_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_lock_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11784,7 +14039,7 @@ SWIGINTERN PyObject *_wrap_svn_fs_invoke_pack_notify(PyObject *SWIGUNUSEDPARM(se
   if (!PyArg_ParseTuple(args,(char *)"OOOO|O:svn_fs_invoke_pack_notify",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     svn_fs_pack_notify_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11851,6 +14106,13 @@ SWIGINTERN PyObject *svn_fs_warning_callback_t_swigregister(PyObject *SWIGUNUSED
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *svn_fs_upgrade_notify_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_void_apr_uint64_t_svn_fs_upgrade_notify_action_t_p_apr_pool_t__p_svn_error_t, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
 SWIGINTERN PyObject *svn_fs_progress_notify_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
@@ -11858,6 +14120,13 @@ SWIGINTERN PyObject *svn_fs_progress_notify_func_t_swigregister(PyObject *SWIGUN
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *svn_fs_hotcopy_notify_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_void_long_long_p_apr_pool_t__void, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
 SWIGINTERN PyObject *svn_fs_freeze_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
@@ -11872,6 +14141,13 @@ SWIGINTERN PyObject *svn_fs_process_contents_func_t_swigregister(PyObject *SWIGU
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *svn_fs_lock_callback_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
 SWIGINTERN PyObject *svn_fs_get_locks_callback_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
@@ -11891,12 +14167,22 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"svn_fs_version", _wrap_svn_fs_version, METH_VARARGS, (char *)"svn_fs_version() -> svn_version_t const *"},
 	 { (char *)"svn_fs_initialize", _wrap_svn_fs_initialize, METH_VARARGS, (char *)"svn_fs_initialize(apr_pool_t pool) -> svn_error_t"},
 	 { (char *)"svn_fs_create", _wrap_svn_fs_create, METH_VARARGS, (char *)"svn_fs_create(char const * path, apr_hash_t fs_config, apr_pool_t pool) -> svn_error_t"},
+	 { (char *)"svn_fs_open2", _wrap_svn_fs_open2, METH_VARARGS, (char *)"svn_fs_open2(char const * path, apr_hash_t fs_config, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"},
 	 { (char *)"svn_fs_open", _wrap_svn_fs_open, METH_VARARGS, (char *)"svn_fs_open(char const * path, apr_hash_t fs_config, apr_pool_t pool) -> svn_error_t"},
+	 { (char *)"svn_fs_upgrade2", _wrap_svn_fs_upgrade2, METH_VARARGS, (char *)"\n"
+		"svn_fs_upgrade2(char const * path, svn_fs_upgrade_notify_t notify_func, void * notify_baton, svn_cancel_func_t cancel_func, \n"
+		"    apr_pool_t scratch_pool) -> svn_error_t\n"
+		""},
 	 { (char *)"svn_fs_upgrade", _wrap_svn_fs_upgrade, METH_VARARGS, (char *)"svn_fs_upgrade(char const * path, apr_pool_t pool) -> svn_error_t"},
 	 { (char *)"svn_fs_type", _wrap_svn_fs_type, METH_VARARGS, (char *)"svn_fs_type(char const * path, apr_pool_t pool) -> svn_error_t"},
 	 { (char *)"svn_fs_path", _wrap_svn_fs_path, METH_VARARGS, (char *)"svn_fs_path(svn_fs_t * fs, apr_pool_t pool) -> char const *"},
 	 { (char *)"svn_fs_config", _wrap_svn_fs_config, METH_VARARGS, (char *)"svn_fs_config(svn_fs_t * fs, apr_pool_t pool) -> apr_hash_t"},
 	 { (char *)"svn_fs_delete_fs", _wrap_svn_fs_delete_fs, METH_VARARGS, (char *)"svn_fs_delete_fs(char const * path, apr_pool_t pool) -> svn_error_t"},
+	 { (char *)"svn_fs_hotcopy3", _wrap_svn_fs_hotcopy3, METH_VARARGS, (char *)"\n"
+		"svn_fs_hotcopy3(char const * src_path, char const * dest_path, svn_boolean_t clean, svn_boolean_t incremental, \n"
+		"    svn_fs_hotcopy_notify_t notify_func, void * notify_baton, svn_cancel_func_t cancel_func, \n"
+		"    apr_pool_t scratch_pool) -> svn_error_t\n"
+		""},
 	 { (char *)"svn_fs_hotcopy2", _wrap_svn_fs_hotcopy2, METH_VARARGS, (char *)"\n"
 		"svn_fs_hotcopy2(char const * src_path, char const * dest_path, svn_boolean_t clean, svn_boolean_t incremental, \n"
 		"    svn_cancel_func_t cancel_func, apr_pool_t scratch_pool) -> svn_error_t\n"
@@ -11960,6 +14246,8 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"svn_fs_path_change2_t_copyfrom_rev_get", _wrap_svn_fs_path_change2_t_copyfrom_rev_get, METH_VARARGS, (char *)"svn_fs_path_change2_t_copyfrom_rev_get(svn_fs_path_change2_t self) -> svn_revnum_t"},
 	 { (char *)"svn_fs_path_change2_t_copyfrom_path_set", _wrap_svn_fs_path_change2_t_copyfrom_path_set, METH_VARARGS, (char *)"svn_fs_path_change2_t_copyfrom_path_set(svn_fs_path_change2_t self, char const * copyfrom_path)"},
 	 { (char *)"svn_fs_path_change2_t_copyfrom_path_get", _wrap_svn_fs_path_change2_t_copyfrom_path_get, METH_VARARGS, (char *)"svn_fs_path_change2_t_copyfrom_path_get(svn_fs_path_change2_t self) -> char const *"},
+	 { (char *)"svn_fs_path_change2_t_mergeinfo_mod_set", _wrap_svn_fs_path_change2_t_mergeinfo_mod_set, METH_VARARGS, (char *)"svn_fs_path_change2_t_mergeinfo_mod_set(svn_fs_path_change2_t self, svn_tristate_t mergeinfo_mod)"},
+	 { (char *)"svn_fs_path_change2_t_mergeinfo_mod_get", _wrap_svn_fs_path_change2_t_mergeinfo_mod_get, METH_VARARGS, (char *)"svn_fs_path_change2_t_mergeinfo_mod_get(svn_fs_path_change2_t self) -> svn_tristate_t"},
 	 { (char *)"svn_fs_path_change2_t_swigregister", svn_fs_path_change2_t_swigregister, METH_VARARGS, NULL},
 	 { (char *)"svn_fs_path_change_t_node_rev_id_set", _wrap_svn_fs_path_change_t_node_rev_id_set, METH_VARARGS, (char *)"svn_fs_path_change_t_node_rev_id_set(svn_fs_path_change_t self, svn_fs_id_t const * node_rev_id)"},
 	 { (char *)"svn_fs_path_change_t_node_rev_id_get", _wrap_svn_fs_path_change_t_node_rev_id_get, METH_VARARGS, (char *)"svn_fs_path_change_t_node_rev_id_get(svn_fs_path_change_t self) -> svn_fs_id_t const *"},
@@ -11974,21 +14262,32 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"svn_fs_paths_changed2", _wrap_svn_fs_paths_changed2, METH_VARARGS, (char *)"svn_fs_paths_changed2(svn_fs_root_t * root, apr_pool_t pool) -> svn_error_t"},
 	 { (char *)"svn_fs_paths_changed", _wrap_svn_fs_paths_changed, METH_VARARGS, (char *)"svn_fs_paths_changed(svn_fs_root_t * root, apr_pool_t pool) -> svn_error_t"},
 	 { (char *)"svn_fs_check_path", _wrap_svn_fs_check_path, METH_VARARGS, (char *)"svn_fs_check_path(svn_fs_root_t * root, char const * path, apr_pool_t pool) -> svn_error_t"},
+	 { (char *)"svn_fs_node_history2", _wrap_svn_fs_node_history2, METH_VARARGS, (char *)"svn_fs_node_history2(svn_fs_root_t * root, char const * path, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"},
 	 { (char *)"svn_fs_node_history", _wrap_svn_fs_node_history, METH_VARARGS, (char *)"svn_fs_node_history(svn_fs_root_t * root, char const * path, apr_pool_t pool) -> svn_error_t"},
+	 { (char *)"svn_fs_history_prev2", _wrap_svn_fs_history_prev2, METH_VARARGS, (char *)"svn_fs_history_prev2(svn_fs_history_t * history, svn_boolean_t cross_copies, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"},
 	 { (char *)"svn_fs_history_prev", _wrap_svn_fs_history_prev, METH_VARARGS, (char *)"svn_fs_history_prev(svn_fs_history_t * history, svn_boolean_t cross_copies, apr_pool_t pool) -> svn_error_t"},
 	 { (char *)"svn_fs_history_location", _wrap_svn_fs_history_location, METH_VARARGS, (char *)"svn_fs_history_location(svn_fs_history_t * history, apr_pool_t pool) -> svn_error_t"},
 	 { (char *)"svn_fs_is_dir", _wrap_svn_fs_is_dir, METH_VARARGS, (char *)"svn_fs_is_dir(svn_fs_root_t * root, char const * path, apr_pool_t pool) -> svn_error_t"},
 	 { (char *)"svn_fs_is_file", _wrap_svn_fs_is_file, METH_VARARGS, (char *)"svn_fs_is_file(svn_fs_root_t * root, char const * path, apr_pool_t pool) -> svn_error_t"},
 	 { (char *)"svn_fs_node_id", _wrap_svn_fs_node_id, METH_VARARGS, (char *)"svn_fs_node_id(svn_fs_root_t * root, char const * path, apr_pool_t pool) -> svn_error_t"},
+	 { (char *)"svn_fs_node_relation", _wrap_svn_fs_node_relation, METH_VARARGS, (char *)"\n"
+		"svn_fs_node_relation(svn_fs_node_relation_t * relation, svn_fs_root_t * root_a, char const * path_a, svn_fs_root_t * root_b, \n"
+		"    char const * path_b, apr_pool_t scratch_pool) -> svn_error_t\n"
+		""},
 	 { (char *)"svn_fs_node_created_rev", _wrap_svn_fs_node_created_rev, METH_VARARGS, (char *)"svn_fs_node_created_rev(svn_fs_root_t * root, char const * path, apr_pool_t pool) -> svn_error_t"},
 	 { (char *)"svn_fs_node_origin_rev", _wrap_svn_fs_node_origin_rev, METH_VARARGS, (char *)"svn_fs_node_origin_rev(svn_fs_root_t * root, char const * path, apr_pool_t pool) -> svn_error_t"},
 	 { (char *)"svn_fs_node_created_path", _wrap_svn_fs_node_created_path, METH_VARARGS, (char *)"svn_fs_node_created_path(svn_fs_root_t * root, char const * path, apr_pool_t pool) -> svn_error_t"},
 	 { (char *)"svn_fs_node_prop", _wrap_svn_fs_node_prop, METH_VARARGS, (char *)"svn_fs_node_prop(svn_fs_root_t * root, char const * path, char const * propname, apr_pool_t pool) -> svn_error_t"},
 	 { (char *)"svn_fs_node_proplist", _wrap_svn_fs_node_proplist, METH_VARARGS, (char *)"svn_fs_node_proplist(svn_fs_root_t * root, char const * path, apr_pool_t pool) -> svn_error_t"},
+	 { (char *)"svn_fs_node_has_props", _wrap_svn_fs_node_has_props, METH_VARARGS, (char *)"svn_fs_node_has_props(svn_fs_root_t * root, char const * path, apr_pool_t scratch_pool) -> svn_error_t"},
 	 { (char *)"svn_fs_change_node_prop", _wrap_svn_fs_change_node_prop, METH_VARARGS, (char *)"\n"
 		"svn_fs_change_node_prop(svn_fs_root_t * root, char const * path, char const * name, svn_string_t const * value, \n"
 		"    apr_pool_t pool) -> svn_error_t\n"
 		""},
+	 { (char *)"svn_fs_props_different", _wrap_svn_fs_props_different, METH_VARARGS, (char *)"\n"
+		"svn_fs_props_different(svn_fs_root_t * root1, char const * path1, svn_fs_root_t * root2, char const * path2, \n"
+		"    apr_pool_t scratch_pool) -> svn_error_t\n"
+		""},
 	 { (char *)"svn_fs_props_changed", _wrap_svn_fs_props_changed, METH_VARARGS, (char *)"\n"
 		"svn_fs_props_changed(svn_fs_root_t * root1, char const * path1, svn_fs_root_t * root2, char const * path2, \n"
 		"    apr_pool_t pool) -> svn_error_t\n"
@@ -12017,6 +14316,7 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"svn_fs_dirent_t_kind_get", _wrap_svn_fs_dirent_t_kind_get, METH_VARARGS, (char *)"svn_fs_dirent_t_kind_get(svn_fs_dirent_t self) -> svn_node_kind_t"},
 	 { (char *)"svn_fs_dirent_t_swigregister", svn_fs_dirent_t_swigregister, METH_VARARGS, NULL},
 	 { (char *)"svn_fs_dir_entries", _wrap_svn_fs_dir_entries, METH_VARARGS, (char *)"svn_fs_dir_entries(svn_fs_root_t * root, char const * path, apr_pool_t pool) -> svn_error_t"},
+	 { (char *)"svn_fs_dir_optimal_order", _wrap_svn_fs_dir_optimal_order, METH_VARARGS, (char *)"svn_fs_dir_optimal_order(svn_fs_root_t * root, apr_hash_t entries, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"},
 	 { (char *)"svn_fs_make_dir", _wrap_svn_fs_make_dir, METH_VARARGS, (char *)"svn_fs_make_dir(svn_fs_root_t * root, char const * path, apr_pool_t pool) -> svn_error_t"},
 	 { (char *)"svn_fs_delete", _wrap_svn_fs_delete, METH_VARARGS, (char *)"svn_fs_delete(svn_fs_root_t * root, char const * path, apr_pool_t pool) -> svn_error_t"},
 	 { (char *)"svn_fs_copy", _wrap_svn_fs_copy, METH_VARARGS, (char *)"\n"
@@ -12041,11 +14341,17 @@ static PyMethodDef SwigMethods[] = {
 		"    apr_pool_t pool) -> svn_error_t\n"
 		""},
 	 { (char *)"svn_fs_apply_text", _wrap_svn_fs_apply_text, METH_VARARGS, (char *)"svn_fs_apply_text(svn_fs_root_t * root, char const * path, char const * result_checksum, apr_pool_t pool) -> svn_error_t"},
+	 { (char *)"svn_fs_contents_different", _wrap_svn_fs_contents_different, METH_VARARGS, (char *)"\n"
+		"svn_fs_contents_different(svn_fs_root_t * root1, char const * path1, svn_fs_root_t * root2, char const * path2, \n"
+		"    apr_pool_t scratch_pool) -> svn_error_t\n"
+		""},
 	 { (char *)"svn_fs_contents_changed", _wrap_svn_fs_contents_changed, METH_VARARGS, (char *)"\n"
 		"svn_fs_contents_changed(svn_fs_root_t * root1, char const * path1, svn_fs_root_t * root2, char const * path2, \n"
 		"    apr_pool_t pool) -> svn_error_t\n"
 		""},
 	 { (char *)"svn_fs_youngest_rev", _wrap_svn_fs_youngest_rev, METH_VARARGS, (char *)"svn_fs_youngest_rev(svn_fs_t * fs, apr_pool_t pool) -> svn_error_t"},
+	 { (char *)"svn_fs_info_format", _wrap_svn_fs_info_format, METH_VARARGS, (char *)"svn_fs_info_format(svn_fs_t * fs, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"},
+	 { (char *)"svn_fs_info_config_files", _wrap_svn_fs_info_config_files, METH_VARARGS, (char *)"svn_fs_info_config_files(svn_fs_t * fs, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"},
 	 { (char *)"svn_fs_deltify_revision", _wrap_svn_fs_deltify_revision, METH_VARARGS, (char *)"svn_fs_deltify_revision(svn_fs_t * fs, svn_revnum_t revision, apr_pool_t pool) -> svn_error_t"},
 	 { (char *)"svn_fs_revision_prop", _wrap_svn_fs_revision_prop, METH_VARARGS, (char *)"svn_fs_revision_prop(svn_fs_t * fs, svn_revnum_t rev, char const * propname, apr_pool_t pool) -> svn_error_t"},
 	 { (char *)"svn_fs_revision_proplist", _wrap_svn_fs_revision_proplist, METH_VARARGS, (char *)"svn_fs_revision_proplist(svn_fs_t * fs, svn_revnum_t rev, apr_pool_t pool) -> svn_error_t"},
@@ -12060,12 +14366,23 @@ static PyMethodDef SwigMethods[] = {
 		""},
 	 { (char *)"svn_fs_get_uuid", _wrap_svn_fs_get_uuid, METH_VARARGS, (char *)"svn_fs_get_uuid(svn_fs_t * fs, apr_pool_t pool) -> svn_error_t"},
 	 { (char *)"svn_fs_set_uuid", _wrap_svn_fs_set_uuid, METH_VARARGS, (char *)"svn_fs_set_uuid(svn_fs_t * fs, char const * uuid, apr_pool_t pool) -> svn_error_t"},
+	 { (char *)"svn_fs_lock_target_create", _wrap_svn_fs_lock_target_create, METH_VARARGS, (char *)"svn_fs_lock_target_create(char const * token, svn_revnum_t current_rev, apr_pool_t result_pool) -> svn_fs_lock_target_t *"},
+	 { (char *)"svn_fs_lock_target_set_token", _wrap_svn_fs_lock_target_set_token, METH_VARARGS, (char *)"svn_fs_lock_target_set_token(svn_fs_lock_target_t * target, char const * token)"},
+	 { (char *)"svn_fs_lock_many", _wrap_svn_fs_lock_many, METH_VARARGS, (char *)"\n"
+		"svn_fs_lock_many(svn_fs_t * fs, apr_hash_t lock_targets, char const * comment, svn_boolean_t is_dav_comment, \n"
+		"    apr_time_t expiration_date, svn_boolean_t steal_lock, svn_fs_lock_callback_t lock_callback, \n"
+		"    apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t\n"
+		""},
 	 { (char *)"svn_fs_lock", _wrap_svn_fs_lock, METH_VARARGS, (char *)"\n"
 		"svn_fs_lock(svn_fs_t * fs, char const * path, char const * token, char const * comment, svn_boolean_t is_dav_comment, \n"
 		"    apr_time_t expiration_date, svn_revnum_t current_rev, \n"
 		"    svn_boolean_t steal_lock, apr_pool_t pool) -> svn_error_t\n"
 		""},
 	 { (char *)"svn_fs_generate_lock_token", _wrap_svn_fs_generate_lock_token, METH_VARARGS, (char *)"svn_fs_generate_lock_token(svn_fs_t * fs, apr_pool_t pool) -> svn_error_t"},
+	 { (char *)"svn_fs_unlock_many", _wrap_svn_fs_unlock_many, METH_VARARGS, (char *)"\n"
+		"svn_fs_unlock_many(svn_fs_t * fs, apr_hash_t unlock_targets, svn_boolean_t break_lock, svn_fs_lock_callback_t lock_callback, \n"
+		"    apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t\n"
+		""},
 	 { (char *)"svn_fs_unlock", _wrap_svn_fs_unlock, METH_VARARGS, (char *)"svn_fs_unlock(svn_fs_t * fs, char const * path, char const * token, svn_boolean_t break_lock, apr_pool_t pool) -> svn_error_t"},
 	 { (char *)"svn_fs_get_lock", _wrap_svn_fs_get_lock, METH_VARARGS, (char *)"svn_fs_get_lock(svn_fs_t * fs, char const * path, apr_pool_t pool) -> svn_error_t"},
 	 { (char *)"svn_fs_get_locks2", _wrap_svn_fs_get_locks2, METH_VARARGS, (char *)"\n"
@@ -12084,28 +14401,65 @@ static PyMethodDef SwigMethods[] = {
 		"    apr_pool_t scratch_pool) -> svn_error_t\n"
 		""},
 	 { (char *)"svn_fs_verify_root", _wrap_svn_fs_verify_root, METH_VARARGS, (char *)"svn_fs_verify_root(svn_fs_root_t * root, apr_pool_t scratch_pool) -> svn_error_t"},
+	 { (char *)"svn_fs_fsfs_info_t_fs_type_set", _wrap_svn_fs_fsfs_info_t_fs_type_set, METH_VARARGS, (char *)"svn_fs_fsfs_info_t_fs_type_set(svn_fs_fsfs_info_t self, char const * fs_type)"},
+	 { (char *)"svn_fs_fsfs_info_t_fs_type_get", _wrap_svn_fs_fsfs_info_t_fs_type_get, METH_VARARGS, (char *)"svn_fs_fsfs_info_t_fs_type_get(svn_fs_fsfs_info_t self) -> char const *"},
+	 { (char *)"svn_fs_fsfs_info_t_shard_size_set", _wrap_svn_fs_fsfs_info_t_shard_size_set, METH_VARARGS, (char *)"svn_fs_fsfs_info_t_shard_size_set(svn_fs_fsfs_info_t self, int shard_size)"},
+	 { (char *)"svn_fs_fsfs_info_t_shard_size_get", _wrap_svn_fs_fsfs_info_t_shard_size_get, METH_VARARGS, (char *)"svn_fs_fsfs_info_t_shard_size_get(svn_fs_fsfs_info_t self) -> int"},
+	 { (char *)"svn_fs_fsfs_info_t_min_unpacked_rev_set", _wrap_svn_fs_fsfs_info_t_min_unpacked_rev_set, METH_VARARGS, (char *)"svn_fs_fsfs_info_t_min_unpacked_rev_set(svn_fs_fsfs_info_t self, svn_revnum_t min_unpacked_rev)"},
+	 { (char *)"svn_fs_fsfs_info_t_min_unpacked_rev_get", _wrap_svn_fs_fsfs_info_t_min_unpacked_rev_get, METH_VARARGS, (char *)"svn_fs_fsfs_info_t_min_unpacked_rev_get(svn_fs_fsfs_info_t self) -> svn_revnum_t"},
+	 { (char *)"svn_fs_fsfs_info_t_log_addressing_set", _wrap_svn_fs_fsfs_info_t_log_addressing_set, METH_VARARGS, (char *)"svn_fs_fsfs_info_t_log_addressing_set(svn_fs_fsfs_info_t self, svn_boolean_t log_addressing)"},
+	 { (char *)"svn_fs_fsfs_info_t_log_addressing_get", _wrap_svn_fs_fsfs_info_t_log_addressing_get, METH_VARARGS, (char *)"svn_fs_fsfs_info_t_log_addressing_get(svn_fs_fsfs_info_t self) -> svn_boolean_t"},
+	 { (char *)"svn_fs_fsfs_info_t_swigregister", svn_fs_fsfs_info_t_swigregister, METH_VARARGS, NULL},
+	 { (char *)"svn_fs_fsx_info_t_fs_type_set", _wrap_svn_fs_fsx_info_t_fs_type_set, METH_VARARGS, (char *)"svn_fs_fsx_info_t_fs_type_set(svn_fs_fsx_info_t self, char const * fs_type)"},
+	 { (char *)"svn_fs_fsx_info_t_fs_type_get", _wrap_svn_fs_fsx_info_t_fs_type_get, METH_VARARGS, (char *)"svn_fs_fsx_info_t_fs_type_get(svn_fs_fsx_info_t self) -> char const *"},
+	 { (char *)"svn_fs_fsx_info_t_shard_size_set", _wrap_svn_fs_fsx_info_t_shard_size_set, METH_VARARGS, (char *)"svn_fs_fsx_info_t_shard_size_set(svn_fs_fsx_info_t self, int shard_size)"},
+	 { (char *)"svn_fs_fsx_info_t_shard_size_get", _wrap_svn_fs_fsx_info_t_shard_size_get, METH_VARARGS, (char *)"svn_fs_fsx_info_t_shard_size_get(svn_fs_fsx_info_t self) -> int"},
+	 { (char *)"svn_fs_fsx_info_t_min_unpacked_rev_set", _wrap_svn_fs_fsx_info_t_min_unpacked_rev_set, METH_VARARGS, (char *)"svn_fs_fsx_info_t_min_unpacked_rev_set(svn_fs_fsx_info_t self, svn_revnum_t min_unpacked_rev)"},
+	 { (char *)"svn_fs_fsx_info_t_min_unpacked_rev_get", _wrap_svn_fs_fsx_info_t_min_unpacked_rev_get, METH_VARARGS, (char *)"svn_fs_fsx_info_t_min_unpacked_rev_get(svn_fs_fsx_info_t self) -> svn_revnum_t"},
+	 { (char *)"svn_fs_fsx_info_t_swigregister", svn_fs_fsx_info_t_swigregister, METH_VARARGS, NULL},
+	 { (char *)"svn_fs_info_placeholder_t_fs_type_set", _wrap_svn_fs_info_placeholder_t_fs_type_set, METH_VARARGS, (char *)"svn_fs_info_placeholder_t_fs_type_set(svn_fs_info_placeholder_t self, char const * fs_type)"},
+	 { (char *)"svn_fs_info_placeholder_t_fs_type_get", _wrap_svn_fs_info_placeholder_t_fs_type_get, METH_VARARGS, (char *)"svn_fs_info_placeholder_t_fs_type_get(svn_fs_info_placeholder_t self) -> char const *"},
+	 { (char *)"svn_fs_info_placeholder_t_swigregister", svn_fs_info_placeholder_t_swigregister, METH_VARARGS, NULL},
+	 { (char *)"svn_fs_info", _wrap_svn_fs_info, METH_VARARGS, (char *)"svn_fs_info(svn_fs_t * fs, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"},
+	 { (char *)"svn_fs_info_dup", _wrap_svn_fs_info_dup, METH_VARARGS, (char *)"svn_fs_info_dup(void const * info, apr_pool_t result_pool, apr_pool_t scratch_pool) -> void *"},
 	 { (char *)"svn_fs_t_swigregister", svn_fs_t_swigregister, METH_VARARGS, NULL},
 	 { (char *)"svn_fs_access_t_swigregister", svn_fs_access_t_swigregister, METH_VARARGS, NULL},
 	 { (char *)"svn_fs_id_t_swigregister", svn_fs_id_t_swigregister, METH_VARARGS, NULL},
 	 { (char *)"svn_fs_txn_t_swigregister", svn_fs_txn_t_swigregister, METH_VARARGS, NULL},
 	 { (char *)"svn_fs_root_t_swigregister", svn_fs_root_t_swigregister, METH_VARARGS, NULL},
 	 { (char *)"svn_fs_history_t_swigregister", svn_fs_history_t_swigregister, METH_VARARGS, NULL},
+	 { (char *)"svn_fs_lock_target_t_swigregister", svn_fs_lock_target_t_swigregister, METH_VARARGS, NULL},
 	 { (char *)"svn_fs_invoke_warning_callback", _wrap_svn_fs_invoke_warning_callback, METH_VARARGS, (char *)"svn_fs_invoke_warning_callback(svn_fs_warning_callback_t _obj, void * baton, svn_error_t err)"},
+	 { (char *)"svn_fs_invoke_upgrade_notify", _wrap_svn_fs_invoke_upgrade_notify, METH_VARARGS, (char *)"\n"
+		"svn_fs_invoke_upgrade_notify(svn_fs_upgrade_notify_t _obj, void * baton, apr_uint64_t number, svn_fs_upgrade_notify_action_t action, \n"
+		"    apr_pool_t scratch_pool) -> svn_error_t\n"
+		""},
 	 { (char *)"svn_fs_invoke_progress_notify_func", _wrap_svn_fs_invoke_progress_notify_func, METH_VARARGS, (char *)"svn_fs_invoke_progress_notify_func(svn_fs_progress_notify_func_t _obj, svn_revnum_t revision, void * baton, apr_pool_t pool)"},
+	 { (char *)"svn_fs_invoke_hotcopy_notify", _wrap_svn_fs_invoke_hotcopy_notify, METH_VARARGS, (char *)"\n"
+		"svn_fs_invoke_hotcopy_notify(svn_fs_hotcopy_notify_t _obj, void * baton, svn_revnum_t start_revision, svn_revnum_t end_revision, \n"
+		"    apr_pool_t scratch_pool)\n"
+		""},
 	 { (char *)"svn_fs_invoke_freeze_func", _wrap_svn_fs_invoke_freeze_func, METH_VARARGS, (char *)"svn_fs_invoke_freeze_func(svn_fs_freeze_func_t _obj, void * baton, apr_pool_t pool) -> svn_error_t"},
 	 { (char *)"svn_fs_invoke_process_contents_func", _wrap_svn_fs_invoke_process_contents_func, METH_VARARGS, (char *)"\n"
 		"svn_fs_invoke_process_contents_func(svn_fs_process_contents_func_t _obj, unsigned char const * contents, apr_size_t len, \n"
 		"    void * baton, apr_pool_t scratch_pool) -> svn_error_t\n"
 		""},
+	 { (char *)"svn_fs_invoke_lock_callback", _wrap_svn_fs_invoke_lock_callback, METH_VARARGS, (char *)"\n"
+		"svn_fs_invoke_lock_callback(svn_fs_lock_callback_t _obj, void * baton, char const * path, svn_lock_t lock, svn_error_t fs_err, \n"
+		"    apr_pool_t scratch_pool) -> svn_error_t\n"
+		""},
 	 { (char *)"svn_fs_invoke_get_locks_callback", _wrap_svn_fs_invoke_get_locks_callback, METH_VARARGS, (char *)"svn_fs_invoke_get_locks_callback(svn_fs_get_locks_callback_t _obj, void * baton, svn_lock_t lock, apr_pool_t pool) -> svn_error_t"},
 	 { (char *)"svn_fs_invoke_pack_notify", _wrap_svn_fs_invoke_pack_notify, METH_VARARGS, (char *)"\n"
 		"svn_fs_invoke_pack_notify(svn_fs_pack_notify_t _obj, void * baton, apr_int64_t shard, svn_fs_pack_notify_action_t action, \n"
 		"    apr_pool_t pool) -> svn_error_t\n"
 		""},
 	 { (char *)"svn_fs_warning_callback_t_swigregister", svn_fs_warning_callback_t_swigregister, METH_VARARGS, NULL},
+	 { (char *)"svn_fs_upgrade_notify_t_swigregister", svn_fs_upgrade_notify_t_swigregister, METH_VARARGS, NULL},
 	 { (char *)"svn_fs_progress_notify_func_t_swigregister", svn_fs_progress_notify_func_t_swigregister, METH_VARARGS, NULL},
+	 { (char *)"svn_fs_hotcopy_notify_t_swigregister", svn_fs_hotcopy_notify_t_swigregister, METH_VARARGS, NULL},
 	 { (char *)"svn_fs_freeze_func_t_swigregister", svn_fs_freeze_func_t_swigregister, METH_VARARGS, NULL},
 	 { (char *)"svn_fs_process_contents_func_t_swigregister", svn_fs_process_contents_func_t_swigregister, METH_VARARGS, NULL},
+	 { (char *)"svn_fs_lock_callback_t_swigregister", svn_fs_lock_callback_t_swigregister, METH_VARARGS, NULL},
 	 { (char *)"svn_fs_get_locks_callback_t_swigregister", svn_fs_get_locks_callback_t_swigregister, METH_VARARGS, NULL},
 	 { (char *)"svn_fs_pack_notify_t_swigregister", svn_fs_pack_notify_t_swigregister, METH_VARARGS, NULL},
 	 { NULL, NULL, 0, NULL }
@@ -12119,13 +14473,17 @@ static swig_type_info _swigt__p_apr_hash_t = {"_p_apr_hash_t", "apr_hash_t *", 0
 static swig_type_info _swigt__p_apr_int32_t = {"_p_apr_int32_t", "apr_int32_t *|time_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_apr_int64_t = {"_p_apr_int64_t", "apr_int64_t *|svn_filesize_t *|apr_time_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_apr_pool_t = {"_p_apr_pool_t", "apr_pool_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_apr_uint64_t = {"_p_apr_uint64_t", "apr_uint64_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_long_p_void_p_apr_pool_t__void = {"_p_f_long_p_void_p_apr_pool_t__void", "void (*)(long,void *,apr_pool_t *)|svn_fs_progress_notify_func_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|struct svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_q_const__unsigned_char_apr_size_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__unsigned_char_apr_size_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_fs_process_contents_func_t|struct svn_error_t *(*)(unsigned char const *,apr_size_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void__p_svn_error_t = {"_p_f_p_void__p_svn_error_t", "svn_cancel_func_t|struct svn_error_t *(*)(void *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_int64_t,svn_fs_pack_notify_action_t,apr_pool_t *)|svn_fs_pack_notify_t", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_f_p_void_apr_uint64_t_svn_fs_upgrade_notify_action_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_apr_uint64_t_svn_fs_upgrade_notify_action_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_uint64_t,svn_fs_upgrade_notify_action_t,apr_pool_t *)|svn_fs_upgrade_notify_t", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_f_p_void_long_long_p_apr_pool_t__void = {"_p_f_p_void_long_long_p_apr_pool_t__void", "void (*)(void *,long,long,apr_pool_t *)|svn_fs_hotcopy_notify_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_pool_t *)|svn_fs_freeze_func_t", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_lock_t const *,svn_error_t *,apr_pool_t *)|svn_fs_lock_callback_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_struct_svn_error_t__void = {"_p_f_p_void_p_struct_svn_error_t__void", "void (*)(void *,struct svn_error_t *)|svn_fs_warning_callback_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_lock_t *,apr_pool_t *)|svn_fs_get_locks_callback_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_int = {"_p_int", "int *|svn_boolean_t *|apr_status_t *", 0, 0, (void*)0, 0};
@@ -12137,13 +14495,17 @@ static swig_type_info _swigt__p_p_f_long_p_void_p_apr_pool_t__void = {"_p_p_f_lo
 static swig_type_info _swigt__p_p_f_p_q_const__unsigned_char_apr_size_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_q_const__unsigned_char_apr_size_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(unsigned char const *,apr_size_t,void *,apr_pool_t *)|svn_fs_process_contents_func_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t = {"_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t", "svn_txdelta_window_handler_t *|struct svn_error_t *(**)(svn_txdelta_window_t *,void *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(void *,apr_int64_t,svn_fs_pack_notify_action_t,apr_pool_t *)|svn_fs_pack_notify_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_p_f_p_void_apr_uint64_t_svn_fs_upgrade_notify_action_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_apr_uint64_t_svn_fs_upgrade_notify_action_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(void *,apr_uint64_t,svn_fs_upgrade_notify_action_t,apr_pool_t *)|svn_fs_upgrade_notify_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_p_f_p_void_long_long_p_apr_pool_t__void = {"_p_p_f_p_void_long_long_p_apr_pool_t__void", "void (**)(void *,long,long,apr_pool_t *)|svn_fs_hotcopy_notify_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_f_p_void_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(void *,apr_pool_t *)|svn_fs_freeze_func_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t", "svn_fs_lock_callback_t *|struct svn_error_t *(**)(void *,char const *,svn_lock_t const *,svn_error_t *,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_f_p_void_p_struct_svn_error_t__void = {"_p_p_f_p_void_p_struct_svn_error_t__void", "void (**)(void *,struct svn_error_t *)|svn_fs_warning_callback_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t", "svn_fs_get_locks_callback_t *|struct svn_error_t *(**)(void *,svn_lock_t *,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_svn_checksum_t = {"_p_p_svn_checksum_t", "struct svn_checksum_t **|svn_checksum_t **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_svn_fs_access_t = {"_p_p_svn_fs_access_t", "struct svn_fs_access_t **|svn_fs_access_t **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_svn_fs_history_t = {"_p_p_svn_fs_history_t", "struct svn_fs_history_t **|svn_fs_history_t **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_svn_fs_id_t = {"_p_p_svn_fs_id_t", "struct svn_fs_id_t **|svn_fs_id_t **", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_p_svn_fs_info_placeholder_t = {"_p_p_svn_fs_info_placeholder_t", "struct svn_fs_info_placeholder_t **|svn_fs_info_placeholder_t **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_svn_fs_root_t = {"_p_p_svn_fs_root_t", "struct svn_fs_root_t **|svn_fs_root_t **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_svn_fs_t = {"_p_p_svn_fs_t", "struct svn_fs_t **|svn_fs_t **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_svn_fs_txn_t = {"_p_p_svn_fs_txn_t", "struct svn_fs_txn_t **|svn_fs_txn_t **", 0, 0, (void*)0, 0};
@@ -12151,6 +14513,7 @@ static swig_type_info _swigt__p_p_svn_lock_t = {"_p_p_svn_lock_t", "struct svn_l
 static swig_type_info _swigt__p_p_svn_stream_t = {"_p_p_svn_stream_t", "struct svn_stream_t **|svn_stream_t **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_svn_string_t = {"_p_p_svn_string_t", "struct svn_string_t **|svn_string_t **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_svn_txdelta_stream_t = {"_p_p_svn_txdelta_stream_t", "struct svn_txdelta_stream_t **|svn_txdelta_stream_t **", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_p_svn_version_t = {"_p_p_svn_version_t", "struct svn_version_t **|svn_version_t **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_void = {"_p_p_void", "void **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_auth_baton_t = {"_p_svn_auth_baton_t", "struct svn_auth_baton_t *|svn_auth_baton_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_auth_cred_simple_t = {"_p_svn_auth_cred_simple_t", "struct svn_auth_cred_simple_t *|svn_auth_cred_simple_t *", 0, 0, (void*)0, 0};
@@ -12169,13 +14532,19 @@ static swig_type_info _swigt__p_svn_commit_info_t = {"_p_svn_commit_info_t", "st
 static swig_type_info _swigt__p_svn_config_t = {"_p_svn_config_t", "struct svn_config_t *|svn_config_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_delta_editor_t = {"_p_svn_delta_editor_t", "struct svn_delta_editor_t *|svn_delta_editor_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_depth_t = {"_p_svn_depth_t", "enum svn_depth_t *|svn_depth_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_diff_hunk_t = {"_p_svn_diff_hunk_t", "svn_diff_hunk_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_dirent_t = {"_p_svn_dirent_t", "struct svn_dirent_t *|svn_dirent_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_errno_t = {"_p_svn_errno_t", "enum svn_errno_t *|svn_errno_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "struct svn_error_t *|svn_error_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_fs_access_t = {"_p_svn_fs_access_t", "struct svn_fs_access_t *|svn_fs_access_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_fs_dirent_t = {"_p_svn_fs_dirent_t", "struct svn_fs_dirent_t *|svn_fs_dirent_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_fs_fsfs_info_t = {"_p_svn_fs_fsfs_info_t", "struct svn_fs_fsfs_info_t *|svn_fs_fsfs_info_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_fs_fsx_info_t = {"_p_svn_fs_fsx_info_t", "struct svn_fs_fsx_info_t *|svn_fs_fsx_info_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_fs_history_t = {"_p_svn_fs_history_t", "struct svn_fs_history_t *|svn_fs_history_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_fs_id_t = {"_p_svn_fs_id_t", "struct svn_fs_id_t *|svn_fs_id_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_fs_info_placeholder_t = {"_p_svn_fs_info_placeholder_t", "struct svn_fs_info_placeholder_t *|svn_fs_info_placeholder_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_fs_lock_target_t = {"_p_svn_fs_lock_target_t", "struct svn_fs_lock_target_t *|svn_fs_lock_target_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_fs_node_relation_t = {"_p_svn_fs_node_relation_t", "enum svn_fs_node_relation_t *|svn_fs_node_relation_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_fs_pack_notify_action_t = {"_p_svn_fs_pack_notify_action_t", "enum svn_fs_pack_notify_action_t *|svn_fs_pack_notify_action_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_fs_path_change2_t = {"_p_svn_fs_path_change2_t", "struct svn_fs_path_change2_t *|svn_fs_path_change2_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_fs_path_change_kind_t = {"_p_svn_fs_path_change_kind_t", "enum svn_fs_path_change_kind_t *|svn_fs_path_change_kind_t *", 0, 0, (void*)0, 0};
@@ -12183,6 +14552,7 @@ static swig_type_info _swigt__p_svn_fs_path_change_t = {"_p_svn_fs_path_change_t
 static swig_type_info _swigt__p_svn_fs_root_t = {"_p_svn_fs_root_t", "struct svn_fs_root_t *|svn_fs_root_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_fs_t = {"_p_svn_fs_t", "struct svn_fs_t *|svn_fs_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_fs_txn_t = {"_p_svn_fs_txn_t", "struct svn_fs_txn_t *|svn_fs_txn_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_fs_upgrade_notify_action_t = {"_p_svn_fs_upgrade_notify_action_t", "enum svn_fs_upgrade_notify_action_t *|svn_fs_upgrade_notify_action_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_io_dirent2_t = {"_p_svn_io_dirent2_t", "struct svn_io_dirent2_t *|svn_io_dirent2_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_io_dirent_t = {"_p_svn_io_dirent_t", "struct svn_io_dirent_t *|svn_io_dirent_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_io_file_del_t = {"_p_svn_io_file_del_t", "enum svn_io_file_del_t *|svn_io_file_del_t *", 0, 0, (void*)0, 0};
@@ -12225,13 +14595,17 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_apr_int32_t,
   &_swigt__p_apr_int64_t,
   &_swigt__p_apr_pool_t,
+  &_swigt__p_apr_uint64_t,
   &_swigt__p_char,
   &_swigt__p_f_long_p_void_p_apr_pool_t__void,
   &_swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_q_const__unsigned_char_apr_size_t_p_void_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void__p_svn_error_t,
   &_swigt__p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t,
+  &_swigt__p_f_p_void_apr_uint64_t_svn_fs_upgrade_notify_action_t_p_apr_pool_t__p_svn_error_t,
+  &_swigt__p_f_p_void_long_long_p_apr_pool_t__void,
   &_swigt__p_f_p_void_p_apr_pool_t__p_svn_error_t,
+  &_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_struct_svn_error_t__void,
   &_swigt__p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_int,
@@ -12243,13 +14617,17 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_p_f_p_q_const__unsigned_char_apr_size_t_p_void_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t,
   &_swigt__p_p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t,
+  &_swigt__p_p_f_p_void_apr_uint64_t_svn_fs_upgrade_notify_action_t_p_apr_pool_t__p_svn_error_t,
+  &_swigt__p_p_f_p_void_long_long_p_apr_pool_t__void,
   &_swigt__p_p_f_p_void_p_apr_pool_t__p_svn_error_t,
+  &_swigt__p_p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_p_f_p_void_p_struct_svn_error_t__void,
   &_swigt__p_p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_p_svn_checksum_t,
   &_swigt__p_p_svn_fs_access_t,
   &_swigt__p_p_svn_fs_history_t,
   &_swigt__p_p_svn_fs_id_t,
+  &_swigt__p_p_svn_fs_info_placeholder_t,
   &_swigt__p_p_svn_fs_root_t,
   &_swigt__p_p_svn_fs_t,
   &_swigt__p_p_svn_fs_txn_t,
@@ -12257,6 +14635,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_p_svn_stream_t,
   &_swigt__p_p_svn_string_t,
   &_swigt__p_p_svn_txdelta_stream_t,
+  &_swigt__p_p_svn_version_t,
   &_swigt__p_p_void,
   &_swigt__p_svn_auth_baton_t,
   &_swigt__p_svn_auth_cred_simple_t,
@@ -12275,13 +14654,19 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_svn_config_t,
   &_swigt__p_svn_delta_editor_t,
   &_swigt__p_svn_depth_t,
+  &_swigt__p_svn_diff_hunk_t,
   &_swigt__p_svn_dirent_t,
   &_swigt__p_svn_errno_t,
   &_swigt__p_svn_error_t,
   &_swigt__p_svn_fs_access_t,
   &_swigt__p_svn_fs_dirent_t,
+  &_swigt__p_svn_fs_fsfs_info_t,
+  &_swigt__p_svn_fs_fsx_info_t,
   &_swigt__p_svn_fs_history_t,
   &_swigt__p_svn_fs_id_t,
+  &_swigt__p_svn_fs_info_placeholder_t,
+  &_swigt__p_svn_fs_lock_target_t,
+  &_swigt__p_svn_fs_node_relation_t,
   &_swigt__p_svn_fs_pack_notify_action_t,
   &_swigt__p_svn_fs_path_change2_t,
   &_swigt__p_svn_fs_path_change_kind_t,
@@ -12289,6 +14674,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_svn_fs_root_t,
   &_swigt__p_svn_fs_t,
   &_swigt__p_svn_fs_txn_t,
+  &_swigt__p_svn_fs_upgrade_notify_action_t,
   &_swigt__p_svn_io_dirent2_t,
   &_swigt__p_svn_io_dirent_t,
   &_swigt__p_svn_io_file_del_t,
@@ -12331,13 +14717,17 @@ static swig_cast_info _swigc__p_apr_hash_t[] = {  {&_swigt__p_apr_hash_t, 0, 0,
 static swig_cast_info _swigc__p_apr_int32_t[] = {  {&_swigt__p_apr_int32_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_apr_int64_t[] = {  {&_swigt__p_apr_int64_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_apr_pool_t[] = {  {&_swigt__p_apr_pool_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_apr_uint64_t[] = {  {&_swigt__p_apr_uint64_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_char[] = {  {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_long_p_void_p_apr_pool_t__void[] = {  {&_swigt__p_f_long_p_void_p_apr_pool_t__void, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_q_const__unsigned_char_apr_size_t_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_q_const__unsigned_char_apr_size_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void__p_svn_error_t[] = {  {&_swigt__p_f_p_void__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_f_p_void_apr_uint64_t_svn_fs_upgrade_notify_action_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_apr_uint64_t_svn_fs_upgrade_notify_action_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_f_p_void_long_long_p_apr_pool_t__void[] = {  {&_swigt__p_f_p_void_long_long_p_apr_pool_t__void, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_struct_svn_error_t__void[] = {  {&_swigt__p_f_p_void_p_struct_svn_error_t__void, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_int[] = {  {&_swigt__p_int, 0, 0, 0},{0, 0, 0, 0}};
@@ -12349,13 +14739,17 @@ static swig_cast_info _swigc__p_p_f_long_p_void_p_apr_pool_t__void[] = {  {&_swi
 static swig_cast_info _swigc__p_p_f_p_q_const__unsigned_char_apr_size_t_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_p_f_p_q_const__unsigned_char_apr_size_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t[] = {  {&_swigt__p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_p_f_p_void_apr_uint64_t_svn_fs_upgrade_notify_action_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_p_f_p_void_apr_uint64_t_svn_fs_upgrade_notify_action_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_p_f_p_void_long_long_p_apr_pool_t__void[] = {  {&_swigt__p_p_f_p_void_long_long_p_apr_pool_t__void, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_f_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_p_f_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_f_p_void_p_struct_svn_error_t__void[] = {  {&_swigt__p_p_f_p_void_p_struct_svn_error_t__void, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_svn_checksum_t[] = {  {&_swigt__p_p_svn_checksum_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_svn_fs_access_t[] = {  {&_swigt__p_p_svn_fs_access_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_svn_fs_history_t[] = {  {&_swigt__p_p_svn_fs_history_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_svn_fs_id_t[] = {  {&_swigt__p_p_svn_fs_id_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_p_svn_fs_info_placeholder_t[] = {  {&_swigt__p_p_svn_fs_info_placeholder_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_svn_fs_root_t[] = {  {&_swigt__p_p_svn_fs_root_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_svn_fs_t[] = {  {&_swigt__p_p_svn_fs_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_svn_fs_txn_t[] = {  {&_swigt__p_p_svn_fs_txn_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -12363,6 +14757,7 @@ static swig_cast_info _swigc__p_p_svn_lock_t[] = {  {&_swigt__p_p_svn_lock_t, 0,
 static swig_cast_info _swigc__p_p_svn_stream_t[] = {  {&_swigt__p_p_svn_stream_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_svn_string_t[] = {  {&_swigt__p_p_svn_string_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_svn_txdelta_stream_t[] = {  {&_swigt__p_p_svn_txdelta_stream_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_p_svn_version_t[] = {  {&_swigt__p_p_svn_version_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_void[] = {  {&_swigt__p_p_void, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_auth_baton_t[] = {  {&_swigt__p_svn_auth_baton_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_auth_cred_simple_t[] = {  {&_swigt__p_svn_auth_cred_simple_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -12381,13 +14776,19 @@ static swig_cast_info _swigc__p_svn_commit_info_t[] = {  {&_swigt__p_svn_commit_
 static swig_cast_info _swigc__p_svn_config_t[] = {  {&_swigt__p_svn_config_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_delta_editor_t[] = {  {&_swigt__p_svn_delta_editor_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_depth_t[] = {  {&_swigt__p_svn_depth_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_diff_hunk_t[] = {  {&_swigt__p_svn_diff_hunk_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_dirent_t[] = {  {&_swigt__p_svn_dirent_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_errno_t[] = {  {&_swigt__p_svn_errno_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_error_t[] = {  {&_swigt__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_fs_access_t[] = {  {&_swigt__p_svn_fs_access_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_fs_dirent_t[] = {  {&_swigt__p_svn_fs_dirent_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_fs_fsfs_info_t[] = {  {&_swigt__p_svn_fs_fsfs_info_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_fs_fsx_info_t[] = {  {&_swigt__p_svn_fs_fsx_info_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_fs_history_t[] = {  {&_swigt__p_svn_fs_history_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_fs_id_t[] = {  {&_swigt__p_svn_fs_id_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_fs_info_placeholder_t[] = {  {&_swigt__p_svn_fs_info_placeholder_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_fs_lock_target_t[] = {  {&_swigt__p_svn_fs_lock_target_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_fs_node_relation_t[] = {  {&_swigt__p_svn_fs_node_relation_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_fs_pack_notify_action_t[] = {  {&_swigt__p_svn_fs_pack_notify_action_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_fs_path_change2_t[] = {  {&_swigt__p_svn_fs_path_change2_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_fs_path_change_kind_t[] = {  {&_swigt__p_svn_fs_path_change_kind_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -12395,6 +14796,7 @@ static swig_cast_info _swigc__p_svn_fs_path_change_t[] = {  {&_swigt__p_svn_fs_p
 static swig_cast_info _swigc__p_svn_fs_root_t[] = {  {&_swigt__p_svn_fs_root_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_fs_t[] = {  {&_swigt__p_svn_fs_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_fs_txn_t[] = {  {&_swigt__p_svn_fs_txn_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_fs_upgrade_notify_action_t[] = {  {&_swigt__p_svn_fs_upgrade_notify_action_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_io_dirent2_t[] = {  {&_swigt__p_svn_io_dirent2_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_io_dirent_t[] = {  {&_swigt__p_svn_io_dirent_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_io_file_del_t[] = {  {&_swigt__p_svn_io_file_del_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -12437,13 +14839,17 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_apr_int32_t,
   _swigc__p_apr_int64_t,
   _swigc__p_apr_pool_t,
+  _swigc__p_apr_uint64_t,
   _swigc__p_char,
   _swigc__p_f_long_p_void_p_apr_pool_t__void,
   _swigc__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_q_const__unsigned_char_apr_size_t_p_void_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void__p_svn_error_t,
   _swigc__p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t,
+  _swigc__p_f_p_void_apr_uint64_t_svn_fs_upgrade_notify_action_t_p_apr_pool_t__p_svn_error_t,
+  _swigc__p_f_p_void_long_long_p_apr_pool_t__void,
   _swigc__p_f_p_void_p_apr_pool_t__p_svn_error_t,
+  _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_p_struct_svn_error_t__void,
   _swigc__p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_int,
@@ -12455,13 +14861,17 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_p_f_p_q_const__unsigned_char_apr_size_t_p_void_p_apr_pool_t__p_svn_error_t,
   _swigc__p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t,
   _swigc__p_p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t,
+  _swigc__p_p_f_p_void_apr_uint64_t_svn_fs_upgrade_notify_action_t_p_apr_pool_t__p_svn_error_t,
+  _swigc__p_p_f_p_void_long_long_p_apr_pool_t__void,
   _swigc__p_p_f_p_void_p_apr_pool_t__p_svn_error_t,
+  _swigc__p_p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_p_f_p_void_p_struct_svn_error_t__void,
   _swigc__p_p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_p_svn_checksum_t,
   _swigc__p_p_svn_fs_access_t,
   _swigc__p_p_svn_fs_history_t,
   _swigc__p_p_svn_fs_id_t,
+  _swigc__p_p_svn_fs_info_placeholder_t,
   _swigc__p_p_svn_fs_root_t,
   _swigc__p_p_svn_fs_t,
   _swigc__p_p_svn_fs_txn_t,
@@ -12469,6 +14879,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_p_svn_stream_t,
   _swigc__p_p_svn_string_t,
   _swigc__p_p_svn_txdelta_stream_t,
+  _swigc__p_p_svn_version_t,
   _swigc__p_p_void,
   _swigc__p_svn_auth_baton_t,
   _swigc__p_svn_auth_cred_simple_t,
@@ -12487,13 +14898,19 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_svn_config_t,
   _swigc__p_svn_delta_editor_t,
   _swigc__p_svn_depth_t,
+  _swigc__p_svn_diff_hunk_t,
   _swigc__p_svn_dirent_t,
   _swigc__p_svn_errno_t,
   _swigc__p_svn_error_t,
   _swigc__p_svn_fs_access_t,
   _swigc__p_svn_fs_dirent_t,
+  _swigc__p_svn_fs_fsfs_info_t,
+  _swigc__p_svn_fs_fsx_info_t,
   _swigc__p_svn_fs_history_t,
   _swigc__p_svn_fs_id_t,
+  _swigc__p_svn_fs_info_placeholder_t,
+  _swigc__p_svn_fs_lock_target_t,
+  _swigc__p_svn_fs_node_relation_t,
   _swigc__p_svn_fs_pack_notify_action_t,
   _swigc__p_svn_fs_path_change2_t,
   _swigc__p_svn_fs_path_change_kind_t,
@@ -12501,6 +14918,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_svn_fs_root_t,
   _swigc__p_svn_fs_t,
   _swigc__p_svn_fs_txn_t,
+  _swigc__p_svn_fs_upgrade_notify_action_t,
   _swigc__p_svn_io_dirent2_t,
   _swigc__p_svn_io_dirent_t,
   _swigc__p_svn_io_file_del_t,
@@ -12549,18 +14967,18 @@ static swig_const_info swig_const_table[] = {
 #endif
 /* -----------------------------------------------------------------------------
  * Type initialization:
- * This problem is tough by the requirement that no dynamic 
- * memory is used. Also, since swig_type_info structures store pointers to 
+ * This problem is tough by the requirement that no dynamic
+ * memory is used. Also, since swig_type_info structures store pointers to
  * swig_cast_info structures and swig_cast_info structures store pointers back
- * to swig_type_info structures, we need some lookup code at initialization. 
- * The idea is that swig generates all the structures that are needed. 
- * The runtime then collects these partially filled structures. 
- * The SWIG_InitializeModule function takes these initial arrays out of 
+ * to swig_type_info structures, we need some lookup code at initialization.
+ * The idea is that swig generates all the structures that are needed.
+ * The runtime then collects these partially filled structures.
+ * The SWIG_InitializeModule function takes these initial arrays out of
  * swig_module, and does all the lookup, filling in the swig_module.types
  * array with the correct data and linking the correct swig_cast_info
  * structures together.
  *
- * The generated swig_type_info structures are assigned staticly to an initial 
+ * The generated swig_type_info structures are assigned staticly to an initial
  * array. We just loop through that array, and handle each type individually.
  * First we lookup if this type has been already loaded, and if so, use the
  * loaded structure instead of the generated one. Then we have to fill in the
@@ -12570,17 +14988,17 @@ static swig_const_info swig_const_table[] = {
  * a column is one of the swig_cast_info structures for that type.
  * The cast_initial array is actually an array of arrays, because each row has
  * a variable number of columns. So to actually build the cast linked list,
- * we find the array of casts associated with the type, and loop through it 
+ * we find the array of casts associated with the type, and loop through it
  * adding the casts to the list. The one last trick we need to do is making
  * sure the type pointer in the swig_cast_info struct is correct.
  *
- * First off, we lookup the cast->type name to see if it is already loaded. 
+ * First off, we lookup the cast->type name to see if it is already loaded.
  * There are three cases to handle:
  *  1) If the cast->type has already been loaded AND the type we are adding
  *     casting info to has not been loaded (it is in this module), THEN we
  *     replace the cast->type pointer with the type pointer that has already
  *     been loaded.
- *  2) If BOTH types (the one we are adding casting info to, and the 
+ *  2) If BOTH types (the one we are adding casting info to, and the
  *     cast->type) are loaded, THEN the cast info has already been loaded by
  *     the previous module so we just ignore it.
  *  3) Finally, if cast->type has not already been loaded, then we add that
@@ -12643,7 +15061,7 @@ SWIG_InitializeModule(void *clientdata) {
     module_head->next = &swig_module;
   }
   
-  /* When multiple interpeters are used, a module could have already been initialized in
+  /* When multiple interpreters are used, a module could have already been initialized in
        a different interpreter, but not yet have a pointer in this interpreter.
        In this case, we do not want to continue adding types... everything should be
        set up already */
@@ -13220,21 +15638,33 @@ SWIG_init(void) {
   
   SWIG_InstallConstants(d,swig_const_table);
   
+  SWIG_Python_SetConstant(d, "SVN_FS_TYPE_BDB",SWIG_FromCharPtr("bdb"));
+  SWIG_Python_SetConstant(d, "SVN_FS_TYPE_FSFS",SWIG_FromCharPtr("fsfs"));
+  SWIG_Python_SetConstant(d, "SVN_FS_TYPE_FSX",SWIG_FromCharPtr("fsx"));
   SWIG_Python_SetConstant(d, "SVN_FS_CONFIG_BDB_TXN_NOSYNC",SWIG_FromCharPtr("bdb-txn-nosync"));
   SWIG_Python_SetConstant(d, "SVN_FS_CONFIG_BDB_LOG_AUTOREMOVE",SWIG_FromCharPtr("bdb-log-autoremove"));
   SWIG_Python_SetConstant(d, "SVN_FS_CONFIG_FSFS_CACHE_DELTAS",SWIG_FromCharPtr("fsfs-cache-deltas"));
   SWIG_Python_SetConstant(d, "SVN_FS_CONFIG_FSFS_CACHE_FULLTEXTS",SWIG_FromCharPtr("fsfs-cache-fulltexts"));
   SWIG_Python_SetConstant(d, "SVN_FS_CONFIG_FSFS_CACHE_REVPROPS",SWIG_FromCharPtr("fsfs-cache-revprops"));
   SWIG_Python_SetConstant(d, "SVN_FS_CONFIG_FSFS_CACHE_NS",SWIG_FromCharPtr("fsfs-cache-namespace"));
+  SWIG_Python_SetConstant(d, "SVN_FS_CONFIG_FSFS_BLOCK_READ",SWIG_FromCharPtr("fsfs-block-read"));
+  SWIG_Python_SetConstant(d, "SVN_FS_CONFIG_FSFS_SHARD_SIZE",SWIG_FromCharPtr("fsfs-shard-size"));
+  SWIG_Python_SetConstant(d, "SVN_FS_CONFIG_FSFS_LOG_ADDRESSING",SWIG_FromCharPtr("fsfs-log-addressing"));
   SWIG_Python_SetConstant(d, "SVN_FS_CONFIG_FS_TYPE",SWIG_FromCharPtr("fs-type"));
-  SWIG_Python_SetConstant(d, "SVN_FS_TYPE_BDB",SWIG_FromCharPtr("bdb"));
-  SWIG_Python_SetConstant(d, "SVN_FS_TYPE_FSFS",SWIG_FromCharPtr("fsfs"));
   SWIG_Python_SetConstant(d, "SVN_FS_CONFIG_PRE_1_4_COMPATIBLE",SWIG_FromCharPtr("pre-1.4-compatible"));
   SWIG_Python_SetConstant(d, "SVN_FS_CONFIG_PRE_1_5_COMPATIBLE",SWIG_FromCharPtr("pre-1.5-compatible"));
   SWIG_Python_SetConstant(d, "SVN_FS_CONFIG_PRE_1_6_COMPATIBLE",SWIG_FromCharPtr("pre-1.6-compatible"));
   SWIG_Python_SetConstant(d, "SVN_FS_CONFIG_PRE_1_8_COMPATIBLE",SWIG_FromCharPtr("pre-1.8-compatible"));
+  SWIG_Python_SetConstant(d, "SVN_FS_CONFIG_COMPATIBLE_VERSION",SWIG_FromCharPtr("compatible-version"));
+  SWIG_Python_SetConstant(d, "svn_fs_upgrade_pack_revprops",SWIG_From_long((long)(svn_fs_upgrade_pack_revprops)));
+  SWIG_Python_SetConstant(d, "svn_fs_upgrade_cleanup_revprops",SWIG_From_long((long)(svn_fs_upgrade_cleanup_revprops)));
+  SWIG_Python_SetConstant(d, "svn_fs_upgrade_format_bumped",SWIG_From_long((long)(svn_fs_upgrade_format_bumped)));
+  SWIG_Python_SetConstant(d, "svn_fs_node_unrelated",SWIG_From_long((long)(svn_fs_node_unrelated)));
+  SWIG_Python_SetConstant(d, "svn_fs_node_unchanged",SWIG_From_long((long)(svn_fs_node_unchanged)));
+  SWIG_Python_SetConstant(d, "svn_fs_node_common_ancestor",SWIG_From_long((long)(svn_fs_node_common_ancestor)));
   SWIG_Python_SetConstant(d, "SVN_FS_TXN_CHECK_OOD",SWIG_From_long((long)(0x00001)));
   SWIG_Python_SetConstant(d, "SVN_FS_TXN_CHECK_LOCKS",SWIG_From_long((long)(0x00002)));
+  SWIG_Python_SetConstant(d, "SVN_FS_TXN_CLIENT_DATE",SWIG_From_long((long)(0x00004)));
   SWIG_Python_SetConstant(d, "svn_fs_path_change_modify",SWIG_From_long((long)(svn_fs_path_change_modify)));
   SWIG_Python_SetConstant(d, "svn_fs_path_change_add",SWIG_From_long((long)(svn_fs_path_change_add)));
   SWIG_Python_SetConstant(d, "svn_fs_path_change_delete",SWIG_From_long((long)(svn_fs_path_change_delete)));
diff --git a/subversion/bindings/swig/python/svn_ra.c b/subversion/bindings/swig/python/svn_ra.c
index 153741c..8b0e32e 100644
--- a/subversion/bindings/swig/python/svn_ra.c
+++ b/subversion/bindings/swig/python/svn_ra.c
@@ -1,11 +1,11 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
- * 
- * This file is not intended to be easily readable and contains a number of 
+ * Version 2.0.12
+ *
+ * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
- * changes to this file unless you know what you are doing--modify the SWIG 
- * interface file instead. 
+ * changes to this file unless you know what you are doing--modify the SWIG
+ * interface file instead.
  * ----------------------------------------------------------------------------- */
 
 #define SWIGPYTHON
@@ -43,28 +43,28 @@
 #ifndef SWIGUNUSED
 # if defined(__GNUC__)
 #   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__)) 
+#     define SWIGUNUSED __attribute__ ((__unused__))
 #   else
 #     define SWIGUNUSED
 #   endif
 # elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__)) 
+#   define SWIGUNUSED __attribute__ ((__unused__))
 # else
-#   define SWIGUNUSED 
+#   define SWIGUNUSED
 # endif
 #endif
 
 #ifndef SWIG_MSC_UNSUPPRESS_4505
 # if defined(_MSC_VER)
 #   pragma warning(disable : 4505) /* unreferenced local function has been removed */
-# endif 
+# endif
 #endif
 
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
 # else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
 # endif
 #endif
 
@@ -107,7 +107,7 @@
 #   define SWIGSTDCALL __stdcall
 # else
 #   define SWIGSTDCALL
-# endif 
+# endif
 #endif
 
 /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
@@ -122,8 +122,14 @@
 
 
 
-/* Python.h has to appear first */
-#include <Python.h>
+#if defined(_DEBUG) && defined(SWIG_PYTHON_INTERPRETER_NO_DEBUG)
+/* Use debug wrappers with the Python release dll */
+# undef _DEBUG
+# include <Python.h>
+# define _DEBUG
+#else
+# include <Python.h>
+#endif
 
 /* -----------------------------------------------------------------------------
  * swigrun.swg
@@ -149,7 +155,7 @@
   You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for
   creating a static or dynamic library from the SWIG runtime code.
   In 99.9% of the cases, SWIG just needs to declare them as 'static'.
-  
+
   But only do this if strictly necessary, ie, if you have problems
   with your compiler or suchlike.
 */
@@ -175,16 +181,16 @@
 #define SWIG_POINTER_OWN           0x1
 
 
-/* 
+/*
    Flags/methods for returning states.
-   
-   The SWIG conversion methods, as ConvertPtr, return an integer 
+
+   The SWIG conversion methods, as ConvertPtr, return an integer
    that tells if the conversion was successful or not. And if not,
    an error code can be returned (see swigerrors.swg for the codes).
-   
+
    Use the following macros/flags to set or process the returning
    states.
-   
+
    In old versions of SWIG, code such as the following was usually written:
 
      if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) {
@@ -217,23 +223,23 @@
     } else {
       // fail code
     }
-    
+
    I.e., now SWIG_ConvertPtr can return new objects and you can
    identify the case and take care of the deallocation. Of course that
    also requires SWIG_ConvertPtr to return new result values, such as
 
-      int SWIG_ConvertPtr(obj, ptr,...) {         
-        if (<obj is ok>) {			       
-          if (<need new object>) {		       
-            *ptr = <ptr to new allocated object>; 
-            return SWIG_NEWOBJ;		       
-          } else {				       
-            *ptr = <ptr to old object>;	       
-            return SWIG_OLDOBJ;		       
-          } 				       
-        } else {				       
-          return SWIG_BADOBJ;		       
-        }					       
+      int SWIG_ConvertPtr(obj, ptr,...) {
+        if (<obj is ok>) {
+          if (<need new object>) {
+            *ptr = <ptr to new allocated object>;
+            return SWIG_NEWOBJ;
+          } else {
+            *ptr = <ptr to old object>;
+            return SWIG_OLDOBJ;
+          }
+        } else {
+          return SWIG_BADOBJ;
+        }
       }
 
    Of course, returning the plain '0(success)/-1(fail)' still works, but you can be
@@ -247,17 +253,17 @@
        int fooi(int);
 
    and you call
- 
+
       food(1)   // cast rank '1'  (1 -> 1.0)
       fooi(1)   // cast rank '0'
 
    just use the SWIG_AddCast()/SWIG_CheckState()
 */
 
-#define SWIG_OK                    (0) 
+#define SWIG_OK                    (0)
 #define SWIG_ERROR                 (-1)
 #define SWIG_IsOK(r)               (r >= 0)
-#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)  
+#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)
 
 /* The CastRankLimit says how many bits are used for the cast rank */
 #define SWIG_CASTRANKLIMIT         (1 << 8)
@@ -288,14 +294,14 @@
 #  endif
 #  define SWIG_CASTRANKMASK          ((SWIG_CASTRANKLIMIT) -1)
 #  define SWIG_CastRank(r)           (r & SWIG_CASTRANKMASK)
-SWIGINTERNINLINE int SWIG_AddCast(int r) { 
+SWIGINTERNINLINE int SWIG_AddCast(int r) {
   return SWIG_IsOK(r) ? ((SWIG_CastRank(r) < SWIG_MAXCASTRANK) ? (r + 1) : SWIG_ERROR) : r;
 }
-SWIGINTERNINLINE int SWIG_CheckState(int r) { 
-  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0; 
+SWIGINTERNINLINE int SWIG_CheckState(int r) {
+  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0;
 }
 #else /* no cast-rank mode */
-#  define SWIG_AddCast
+#  define SWIG_AddCast(r) (r)
 #  define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0)
 #endif
 
@@ -339,7 +345,7 @@ typedef struct swig_module_info {
   void                    *clientdata;		/* Language specific module data */
 } swig_module_info;
 
-/* 
+/*
   Compare two type names skipping the space characters, therefore
   "char*" == "char *" and "Class<int>" == "Class<int >", etc.
 
@@ -359,18 +365,18 @@ SWIG_TypeNameComp(const char *f1, const char *l1,
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if not equal, 1 if equal
+  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
 */
 SWIGRUNTIME int
-SWIG_TypeEquiv(const char *nb, const char *tb) {
-  int equiv = 0;
+SWIG_TypeCmp(const char *nb, const char *tb) {
+  int equiv = 1;
   const char* te = tb + strlen(tb);
   const char* ne = nb;
-  while (!equiv && *ne) {
+  while (equiv != 0 && *ne) {
     for (nb = ne; *ne; ++ne) {
       if (*ne == '|') break;
     }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
+    equiv = SWIG_TypeNameComp(nb, ne, tb, te);
     if (*ne) ++ne;
   }
   return equiv;
@@ -378,24 +384,13 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
+  Return 0 if not equal, 1 if equal
 */
 SWIGRUNTIME int
-SWIG_TypeCompare(const char *nb, const char *tb) {
-  int equiv = 0;
-  const char* te = tb + strlen(tb);
-  const char* ne = nb;
-  while (!equiv && *ne) {
-    for (nb = ne; *ne; ++ne) {
-      if (*ne == '|') break;
-    }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
-    if (*ne) ++ne;
-  }
-  return equiv;
+SWIG_TypeEquiv(const char *nb, const char *tb) {
+  return SWIG_TypeCmp(nb, tb) == 0 ? 1 : 0;
 }
 
-
 /*
   Check the typename
 */
@@ -423,7 +418,7 @@ SWIG_TypeCheck(const char *c, swig_type_info *ty) {
   return 0;
 }
 
-/* 
+/*
   Identical to SWIG_TypeCheck, except strcmp is replaced with a pointer comparison
 */
 SWIGRUNTIME swig_cast_info *
@@ -458,7 +453,7 @@ SWIG_TypeCast(swig_cast_info *ty, void *ptr, int *newmemory) {
   return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr, newmemory);
 }
 
-/* 
+/*
    Dynamic pointer casting. Down an inheritance hierarchy
 */
 SWIGRUNTIME swig_type_info *
@@ -502,7 +497,7 @@ SWIG_TypePrettyName(const swig_type_info *type) {
     return type->name;
 }
 
-/* 
+/*
    Set the clientdata field for a type
 */
 SWIGRUNTIME void
@@ -510,14 +505,14 @@ SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
   swig_cast_info *cast = ti->cast;
   /* if (ti->clientdata == clientdata) return; */
   ti->clientdata = clientdata;
-  
+
   while (cast) {
     if (!cast->converter) {
       swig_type_info *tc = cast->type;
       if (!tc->clientdata) {
 	SWIG_TypeClientData(tc, clientdata);
       }
-    }    
+    }
     cast = cast->next;
   }
 }
@@ -526,18 +521,18 @@ SWIG_TypeNewClientData(swig_type_info *ti, void *clientdata) {
   SWIG_TypeClientData(ti, clientdata);
   ti->owndata = 1;
 }
-  
+
 /*
   Search for a swig_type_info structure only by mangled name
   Search is a O(log #types)
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_MangledTypeQueryModule(swig_module_info *start, 
-                            swig_module_info *end, 
+SWIG_MangledTypeQueryModule(swig_module_info *start,
+                            swig_module_info *end,
 		            const char *name) {
   swig_module_info *iter = start;
   do {
@@ -546,11 +541,11 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
       register size_t r = iter->size - 1;
       do {
 	/* since l+r >= 0, we can (>> 1) instead (/ 2) */
-	register size_t i = (l + r) >> 1; 
+	register size_t i = (l + r) >> 1;
 	const char *iname = iter->types[i]->name;
 	if (iname) {
 	  register int compare = strcmp(name, iname);
-	  if (compare == 0) {	    
+	  if (compare == 0) {
 	    return iter->types[i];
 	  } else if (compare < 0) {
 	    if (i) {
@@ -575,14 +570,14 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
   Search for a swig_type_info structure for either a mangled name or a human readable name.
   It first searches the mangled names of the types, which is a O(log #types)
   If a type is not found it then searches the human readable names, which is O(#types).
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_TypeQueryModule(swig_module_info *start, 
-                     swig_module_info *end, 
+SWIG_TypeQueryModule(swig_module_info *start,
+                     swig_module_info *end,
 		     const char *name) {
   /* STEP 1: Search the name field using binary search */
   swig_type_info *ret = SWIG_MangledTypeQueryModule(start, end, name);
@@ -601,12 +596,12 @@ SWIG_TypeQueryModule(swig_module_info *start,
       iter = iter->next;
     } while (iter != end);
   }
-  
+
   /* neither found a match */
   return 0;
 }
 
-/* 
+/*
    Pack binary data into a string
 */
 SWIGRUNTIME char *
@@ -622,7 +617,7 @@ SWIG_PackData(char *c, void *ptr, size_t sz) {
   return c;
 }
 
-/* 
+/*
    Unpack binary data from a string
 */
 SWIGRUNTIME const char *
@@ -636,21 +631,21 @@ SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
       uu = ((d - '0') << 4);
     else if ((d >= 'a') && (d <= 'f'))
       uu = ((d - ('a'-10)) << 4);
-    else 
+    else
       return (char *) 0;
     d = *(c++);
     if ((d >= '0') && (d <= '9'))
       uu |= (d - '0');
     else if ((d >= 'a') && (d <= 'f'))
       uu |= (d - ('a'-10));
-    else 
+    else
       return (char *) 0;
     *u = uu;
   }
   return c;
 }
 
-/* 
+/*
    Pack 'void *' into a string buffer.
 */
 SWIGRUNTIME char *
@@ -710,18 +705,18 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 #endif
 
 /*  Errors in SWIG */
-#define  SWIG_UnknownError    	   -1 
-#define  SWIG_IOError        	   -2 
-#define  SWIG_RuntimeError   	   -3 
-#define  SWIG_IndexError     	   -4 
-#define  SWIG_TypeError      	   -5 
-#define  SWIG_DivisionByZero 	   -6 
-#define  SWIG_OverflowError  	   -7 
-#define  SWIG_SyntaxError    	   -8 
-#define  SWIG_ValueError     	   -9 
+#define  SWIG_UnknownError    	   -1
+#define  SWIG_IOError        	   -2
+#define  SWIG_RuntimeError   	   -3
+#define  SWIG_IndexError     	   -4
+#define  SWIG_TypeError      	   -5
+#define  SWIG_DivisionByZero 	   -6
+#define  SWIG_OverflowError  	   -7
+#define  SWIG_SyntaxError    	   -8
+#define  SWIG_ValueError     	   -9
 #define  SWIG_SystemError    	   -10
 #define  SWIG_AttributeError 	   -11
-#define  SWIG_MemoryError    	   -12 
+#define  SWIG_MemoryError    	   -12
 #define  SWIG_NullReferenceError   -13
 
 
@@ -1582,34 +1577,6 @@ SwigPyObject_repr(SwigPyObject *v, PyObject *args)
 }
 
 SWIGRUNTIME int
-SwigPyObject_print(SwigPyObject *v, FILE *fp, int SWIGUNUSEDPARM(flags))
-{
-  char *str;
-#ifdef METH_NOARGS
-  PyObject *repr = SwigPyObject_repr(v);
-#else
-  PyObject *repr = SwigPyObject_repr(v, NULL);
-#endif
-  if (repr) {
-    str = SWIG_Python_str_AsChar(repr); 
-    fputs(str, fp);
-    SWIG_Python_str_DelForPy3(str);
-    Py_DECREF(repr);
-    return 0; 
-  } else {
-    return 1; 
-  }
-}
-
-SWIGRUNTIME PyObject *
-SwigPyObject_str(SwigPyObject *v)
-{
-  char result[SWIG_BUFFER_SIZE];
-  return SWIG_PackVoidPtr(result, v->ptr, v->ty->name, sizeof(result)) ?
-    SWIG_Python_str_FromChar(result) : 0;
-}
-
-SWIGRUNTIME int
 SwigPyObject_compare(SwigPyObject *v, SwigPyObject *w)
 {
   void *i = v->ptr;
@@ -1801,7 +1768,7 @@ SwigPyObject_own(PyObject *v, PyObject *args)
 static PyMethodDef
 swigobject_methods[] = {
   {(char *)"disown",  (PyCFunction)SwigPyObject_disown,  METH_NOARGS,  (char *)"releases ownership of the pointer"},
-  {(char *)"acquire", (PyCFunction)SwigPyObject_acquire, METH_NOARGS,  (char *)"aquires ownership of the pointer"},
+  {(char *)"acquire", (PyCFunction)SwigPyObject_acquire, METH_NOARGS,  (char *)"acquires ownership of the pointer"},
   {(char *)"own",     (PyCFunction)SwigPyObject_own,     METH_VARARGS, (char *)"returns/sets ownership of the pointer"},
   {(char *)"append",  (PyCFunction)SwigPyObject_append,  METH_O,       (char *)"appends another 'this' object"},
   {(char *)"next",    (PyCFunction)SwigPyObject_next,    METH_NOARGS,  (char *)"returns the next 'this' object"},
@@ -1894,7 +1861,7 @@ SwigPyObject_TypeOnce(void) {
       sizeof(SwigPyObject),                 /* tp_basicsize */
       0,                                    /* tp_itemsize */
       (destructor)SwigPyObject_dealloc,     /* tp_dealloc */
-      (printfunc)SwigPyObject_print,        /* tp_print */
+      0,				    /* tp_print */
 #if PY_VERSION_HEX < 0x02020000
       (getattrfunc)SwigPyObject_getattr,    /* tp_getattr */
 #else
@@ -1912,7 +1879,7 @@ SwigPyObject_TypeOnce(void) {
       0,                                    /* tp_as_mapping */
       (hashfunc)0,                          /* tp_hash */
       (ternaryfunc)0,                       /* tp_call */
-      (reprfunc)SwigPyObject_str,           /* tp_str */
+      0,				    /* tp_str */
       PyObject_GenericGetAttr,              /* tp_getattro */
       0,                                    /* tp_setattro */
       0,                                    /* tp_as_buffer */
@@ -2289,10 +2256,11 @@ SWIGRUNTIME int
 SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int flags, int *own) {
   int res;
   SwigPyObject *sobj;
+  int implicit_conv = (flags & SWIG_POINTER_IMPLICIT_CONV) != 0;
 
   if (!obj)
     return SWIG_ERROR;
-  if (obj == Py_None) {
+  if (obj == Py_None && !implicit_conv) {
     if (ptr)
       *ptr = 0;
     return SWIG_OK;
@@ -2341,7 +2309,7 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
     }
     res = SWIG_OK;
   } else {
-    if (flags & SWIG_POINTER_IMPLICIT_CONV) {
+    if (implicit_conv) {
       SwigPyClientData *data = ty ? (SwigPyClientData *) ty->clientdata : 0;
       if (data && !data->implicitconv) {
         PyObject *klass = data->klass;
@@ -2376,6 +2344,13 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
         }
       }
     }
+    if (!SWIG_IsOK(res) && obj == Py_None) {
+      if (ptr)
+        *ptr = 0;
+      if (PyErr_Occurred())
+        PyErr_Clear();
+      res = SWIG_OK;
+    }
   }
   return res;
 }
@@ -2875,7 +2850,7 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) {
   PyObject *descr;
   PyObject *encoded_name;
   descrsetfunc f;
-  int res;
+  int res = -1;
 
 # ifdef Py_USING_UNICODE
   if (PyString_Check(name)) {
@@ -2898,7 +2873,6 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) {
       goto done;
   }
 
-  res = -1;
   descr = _PyType_Lookup(tp, name);
   f = NULL;
   if (descr != NULL)
@@ -2952,146 +2926,154 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) {
 #define SWIGTYPE_p_f_int_p_apr_pool_t_p_apr_hash_t__p_svn_error_t swig_types[9]
 #define SWIGTYPE_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[10]
 #define SWIGTYPE_p_f_p_p_apr_file_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[11]
-#define SWIGTYPE_p_f_p_p_void_p_q_const__char_p_q_const__svn_ra_callbacks_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[12]
-#define SWIGTYPE_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[13]
-#define SWIGTYPE_p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[14]
-#define SWIGTYPE_p_f_p_void__p_svn_error_t swig_types[15]
-#define SWIGTYPE_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[16]
-#define SWIGTYPE_p_f_p_void_p_apr_pool_t__p_svn_error_t swig_types[17]
-#define SWIGTYPE_p_f_p_void_p_p_apr_hash_t_p_q_const__char_svn_revnum_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[18]
-#define SWIGTYPE_p_f_p_void_p_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[19]
-#define SWIGTYPE_p_f_p_void_p_p_q_const__svn_delta_editor_t_p_p_void_p_q_const__char_svn_commit_callback_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[20]
-#define SWIGTYPE_p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_p_q_const__char_svn_revnum_t_svn_boolean_t_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[21]
-#define SWIGTYPE_p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_p_q_const__char_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[22]
-#define SWIGTYPE_p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[23]
-#define SWIGTYPE_p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[24]
-#define SWIGTYPE_p_f_p_void_p_p_svn_stream_t_p_q_const__svn_checksum_t_p_apr_pool_t__p_svn_error_t swig_types[25]
-#define SWIGTYPE_p_f_p_void_p_q_const__apr_array_header_t_svn_revnum_t_svn_revnum_t_svn_boolean_t_svn_boolean_t_svn_log_message_receiver_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[26]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[27]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[28]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t swig_types[29]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t swig_types[30]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__char_svn_revnum_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[31]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__char_svn_revnum_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[32]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__char_svn_revnum_t_svn_depth_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[33]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_boolean_t_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t swig_types[34]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[35]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[36]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_p_apr_hash_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[37]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_node_kind_t_p_apr_pool_t__p_svn_error_t swig_types[38]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_stream_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[39]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[40]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[41]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_svn_depth_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[42]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_svn_revnum_t_svn_ra_file_rev_handler_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[43]
-#define SWIGTYPE_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t swig_types[44]
-#define SWIGTYPE_p_f_p_void_p_svn_revnum_t__p_svn_error_t swig_types[45]
-#define SWIGTYPE_p_f_p_void_p_svn_revnum_t_apr_time_t_p_apr_pool_t__p_svn_error_t swig_types[46]
-#define SWIGTYPE_p_f_p_void_p_svn_revnum_t_p_apr_pool_t__p_svn_error_t swig_types[47]
-#define SWIGTYPE_p_f_p_void_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[48]
-#define SWIGTYPE_p_f_p_void_svn_revnum_t_p_q_const__char_p_p_svn_string_t_p_apr_pool_t__p_svn_error_t swig_types[49]
-#define SWIGTYPE_p_f_p_void_svn_revnum_t_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t swig_types[50]
-#define SWIGTYPE_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t swig_types[51]
-#define SWIGTYPE_p_f_svn_revnum_t_p_void_p_p_q_const__svn_delta_editor_t_p_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[52]
-#define SWIGTYPE_p_f_svn_revnum_t_p_void_p_q_const__svn_delta_editor_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[53]
-#define SWIGTYPE_p_f_void__p_svn_version_t swig_types[54]
-#define SWIGTYPE_p_int swig_types[55]
-#define SWIGTYPE_p_long swig_types[56]
-#define SWIGTYPE_p_p_apr_array_header_t swig_types[57]
-#define SWIGTYPE_p_p_apr_file_t swig_types[58]
-#define SWIGTYPE_p_p_apr_hash_t swig_types[59]
-#define SWIGTYPE_p_p_char swig_types[60]
-#define SWIGTYPE_p_p_f_apr_off_t_apr_off_t_p_void_p_apr_pool_t__void swig_types[61]
-#define SWIGTYPE_p_p_f_int_p_apr_pool_t_p_apr_hash_t__p_svn_error_t swig_types[62]
-#define SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t swig_types[63]
-#define SWIGTYPE_p_p_f_p_void__p_svn_error_t swig_types[64]
-#define SWIGTYPE_p_p_f_p_void_p_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[65]
-#define SWIGTYPE_p_p_f_p_void_p_p_svn_stream_t_p_q_const__svn_checksum_t_p_apr_pool_t__p_svn_error_t swig_types[66]
-#define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[67]
-#define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t swig_types[68]
-#define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t swig_types[69]
-#define SWIGTYPE_p_p_f_p_void_p_q_const__char_svn_boolean_t_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t swig_types[70]
-#define SWIGTYPE_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[71]
-#define SWIGTYPE_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[72]
-#define SWIGTYPE_p_p_f_p_void_p_svn_revnum_t__p_svn_error_t swig_types[73]
-#define SWIGTYPE_p_p_f_svn_revnum_t_p_void_p_p_q_const__svn_delta_editor_t_p_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[74]
-#define SWIGTYPE_p_p_f_svn_revnum_t_p_void_p_q_const__svn_delta_editor_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[75]
-#define SWIGTYPE_p_p_svn_delta_editor_t swig_types[76]
-#define SWIGTYPE_p_p_svn_dirent_t swig_types[77]
-#define SWIGTYPE_p_p_svn_lock_t swig_types[78]
-#define SWIGTYPE_p_p_svn_ra_callbacks2_t swig_types[79]
-#define SWIGTYPE_p_p_svn_ra_plugin_t swig_types[80]
-#define SWIGTYPE_p_p_svn_ra_reporter2_t swig_types[81]
-#define SWIGTYPE_p_p_svn_ra_reporter3_t swig_types[82]
-#define SWIGTYPE_p_p_svn_ra_reporter_t swig_types[83]
-#define SWIGTYPE_p_p_svn_ra_session_t swig_types[84]
-#define SWIGTYPE_p_p_svn_stream_t swig_types[85]
-#define SWIGTYPE_p_p_svn_string_t swig_types[86]
-#define SWIGTYPE_p_p_svn_stringbuf_t swig_types[87]
-#define SWIGTYPE_p_p_void swig_types[88]
-#define SWIGTYPE_p_svn_auth_baton_t swig_types[89]
-#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[90]
-#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[91]
-#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[92]
-#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[93]
-#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[94]
-#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[95]
-#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[96]
-#define SWIGTYPE_p_svn_auth_provider_t swig_types[97]
-#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[98]
-#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[99]
-#define SWIGTYPE_p_svn_checksum_kind_t swig_types[100]
-#define SWIGTYPE_p_svn_checksum_t swig_types[101]
-#define SWIGTYPE_p_svn_commit_info_t swig_types[102]
-#define SWIGTYPE_p_svn_config_t swig_types[103]
-#define SWIGTYPE_p_svn_delta_editor_t swig_types[104]
-#define SWIGTYPE_p_svn_depth_t swig_types[105]
-#define SWIGTYPE_p_svn_dirent_t swig_types[106]
-#define SWIGTYPE_p_svn_errno_t swig_types[107]
-#define SWIGTYPE_p_svn_error_t swig_types[108]
-#define SWIGTYPE_p_svn_io_dirent2_t swig_types[109]
-#define SWIGTYPE_p_svn_io_dirent_t swig_types[110]
-#define SWIGTYPE_p_svn_io_file_del_t swig_types[111]
-#define SWIGTYPE_p_svn_location_segment_t swig_types[112]
-#define SWIGTYPE_p_svn_lock_t swig_types[113]
-#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[114]
-#define SWIGTYPE_p_svn_log_changed_path_t swig_types[115]
-#define SWIGTYPE_p_svn_log_entry_t swig_types[116]
-#define SWIGTYPE_p_svn_merge_range_t swig_types[117]
-#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[118]
-#define SWIGTYPE_p_svn_node_kind_t swig_types[119]
-#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[120]
-#define SWIGTYPE_p_svn_opt_revision_t swig_types[121]
-#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[122]
-#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[123]
-#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[124]
-#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[125]
-#define SWIGTYPE_p_svn_prop_kind swig_types[126]
-#define SWIGTYPE_p_svn_ra_callbacks2_t swig_types[127]
-#define SWIGTYPE_p_svn_ra_callbacks_t swig_types[128]
-#define SWIGTYPE_p_svn_ra_plugin_t swig_types[129]
-#define SWIGTYPE_p_svn_ra_reporter2_t swig_types[130]
-#define SWIGTYPE_p_svn_ra_reporter3_t swig_types[131]
-#define SWIGTYPE_p_svn_ra_reporter_t swig_types[132]
-#define SWIGTYPE_p_svn_ra_session_t swig_types[133]
-#define SWIGTYPE_p_svn_stream_mark_t swig_types[134]
-#define SWIGTYPE_p_svn_stream_t swig_types[135]
-#define SWIGTYPE_p_svn_string_t swig_types[136]
-#define SWIGTYPE_p_svn_stringbuf_t swig_types[137]
-#define SWIGTYPE_p_svn_tristate_t swig_types[138]
-#define SWIGTYPE_p_svn_txdelta_op_t swig_types[139]
-#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[140]
-#define SWIGTYPE_p_svn_txdelta_window_t swig_types[141]
-#define SWIGTYPE_p_svn_version_checklist_t swig_types[142]
-#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[143]
-#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[144]
-#define SWIGTYPE_p_svn_version_extended_t swig_types[145]
-#define SWIGTYPE_p_svn_version_t swig_types[146]
-#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[147]
-#define SWIGTYPE_p_unsigned_long swig_types[148]
-#define SWIGTYPE_p_void swig_types[149]
-static swig_type_info *swig_types[151];
-static swig_module_info swig_module = {swig_types, 150, 0, 0, 0, 0};
+#define SWIGTYPE_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[12]
+#define SWIGTYPE_p_f_p_p_void_p_q_const__char_p_q_const__svn_ra_callbacks_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[13]
+#define SWIGTYPE_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[14]
+#define SWIGTYPE_p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[15]
+#define SWIGTYPE_p_f_p_void__p_svn_error_t swig_types[16]
+#define SWIGTYPE_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[17]
+#define SWIGTYPE_p_f_p_void_p_apr_pool_t__p_svn_error_t swig_types[18]
+#define SWIGTYPE_p_f_p_void_p_p_apr_hash_t_p_q_const__char_svn_revnum_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[19]
+#define SWIGTYPE_p_f_p_void_p_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[20]
+#define SWIGTYPE_p_f_p_void_p_p_q_const__svn_delta_editor_t_p_p_void_p_q_const__char_svn_commit_callback_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[21]
+#define SWIGTYPE_p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_p_q_const__char_svn_revnum_t_svn_boolean_t_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[22]
+#define SWIGTYPE_p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_p_q_const__char_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[23]
+#define SWIGTYPE_p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[24]
+#define SWIGTYPE_p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[25]
+#define SWIGTYPE_p_f_p_void_p_p_svn_stream_t_p_q_const__svn_checksum_t_p_apr_pool_t__p_svn_error_t swig_types[26]
+#define SWIGTYPE_p_f_p_void_p_q_const__apr_array_header_t_svn_revnum_t_svn_revnum_t_svn_boolean_t_svn_boolean_t_svn_log_message_receiver_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[27]
+#define SWIGTYPE_p_f_p_void_p_q_const__char__int swig_types[28]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[29]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[30]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t swig_types[31]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t swig_types[32]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__char_svn_revnum_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[33]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__char_svn_revnum_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[34]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__char_svn_revnum_t_svn_depth_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[35]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_boolean_t_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t swig_types[36]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[37]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[38]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_p_apr_hash_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[39]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_node_kind_t_p_apr_pool_t__p_svn_error_t swig_types[40]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_stream_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[41]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[42]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[43]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_svn_depth_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[44]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_svn_revnum_t_svn_ra_file_rev_handler_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[45]
+#define SWIGTYPE_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t swig_types[46]
+#define SWIGTYPE_p_f_p_void_p_svn_revnum_t__p_svn_error_t swig_types[47]
+#define SWIGTYPE_p_f_p_void_p_svn_revnum_t_apr_time_t_p_apr_pool_t__p_svn_error_t swig_types[48]
+#define SWIGTYPE_p_f_p_void_p_svn_revnum_t_p_apr_pool_t__p_svn_error_t swig_types[49]
+#define SWIGTYPE_p_f_p_void_p_void__void swig_types[50]
+#define SWIGTYPE_p_f_p_void_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[51]
+#define SWIGTYPE_p_f_p_void_svn_revnum_t_p_q_const__char_p_p_svn_string_t_p_apr_pool_t__p_svn_error_t swig_types[52]
+#define SWIGTYPE_p_f_p_void_svn_revnum_t_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t swig_types[53]
+#define SWIGTYPE_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t swig_types[54]
+#define SWIGTYPE_p_f_svn_revnum_t_p_void_p_p_q_const__svn_delta_editor_t_p_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[55]
+#define SWIGTYPE_p_f_svn_revnum_t_p_void_p_q_const__svn_delta_editor_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[56]
+#define SWIGTYPE_p_f_void__p_svn_version_t swig_types[57]
+#define SWIGTYPE_p_int swig_types[58]
+#define SWIGTYPE_p_long swig_types[59]
+#define SWIGTYPE_p_p_apr_array_header_t swig_types[60]
+#define SWIGTYPE_p_p_apr_file_t swig_types[61]
+#define SWIGTYPE_p_p_apr_hash_t swig_types[62]
+#define SWIGTYPE_p_p_char swig_types[63]
+#define SWIGTYPE_p_p_f_apr_off_t_apr_off_t_p_void_p_apr_pool_t__void swig_types[64]
+#define SWIGTYPE_p_p_f_int_p_apr_pool_t_p_apr_hash_t__p_svn_error_t swig_types[65]
+#define SWIGTYPE_p_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[66]
+#define SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t swig_types[67]
+#define SWIGTYPE_p_p_f_p_void__p_svn_error_t swig_types[68]
+#define SWIGTYPE_p_p_f_p_void_p_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[69]
+#define SWIGTYPE_p_p_f_p_void_p_p_svn_stream_t_p_q_const__svn_checksum_t_p_apr_pool_t__p_svn_error_t swig_types[70]
+#define SWIGTYPE_p_p_f_p_void_p_q_const__char__int swig_types[71]
+#define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[72]
+#define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t swig_types[73]
+#define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t swig_types[74]
+#define SWIGTYPE_p_p_f_p_void_p_q_const__char_svn_boolean_t_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t swig_types[75]
+#define SWIGTYPE_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[76]
+#define SWIGTYPE_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[77]
+#define SWIGTYPE_p_p_f_p_void_p_svn_revnum_t__p_svn_error_t swig_types[78]
+#define SWIGTYPE_p_p_f_p_void_p_void__void swig_types[79]
+#define SWIGTYPE_p_p_f_svn_revnum_t_p_void_p_p_q_const__svn_delta_editor_t_p_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[80]
+#define SWIGTYPE_p_p_f_svn_revnum_t_p_void_p_q_const__svn_delta_editor_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[81]
+#define SWIGTYPE_p_p_svn_delta_editor_t swig_types[82]
+#define SWIGTYPE_p_p_svn_dirent_t swig_types[83]
+#define SWIGTYPE_p_p_svn_lock_t swig_types[84]
+#define SWIGTYPE_p_p_svn_ra_callbacks2_t swig_types[85]
+#define SWIGTYPE_p_p_svn_ra_plugin_t swig_types[86]
+#define SWIGTYPE_p_p_svn_ra_reporter2_t swig_types[87]
+#define SWIGTYPE_p_p_svn_ra_reporter3_t swig_types[88]
+#define SWIGTYPE_p_p_svn_ra_reporter_t swig_types[89]
+#define SWIGTYPE_p_p_svn_ra_session_t swig_types[90]
+#define SWIGTYPE_p_p_svn_stream_t swig_types[91]
+#define SWIGTYPE_p_p_svn_string_t swig_types[92]
+#define SWIGTYPE_p_p_svn_stringbuf_t swig_types[93]
+#define SWIGTYPE_p_p_void swig_types[94]
+#define SWIGTYPE_p_svn_auth_baton_t swig_types[95]
+#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[96]
+#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[97]
+#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[98]
+#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[99]
+#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[100]
+#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[101]
+#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[102]
+#define SWIGTYPE_p_svn_auth_provider_t swig_types[103]
+#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[104]
+#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[105]
+#define SWIGTYPE_p_svn_checksum_kind_t swig_types[106]
+#define SWIGTYPE_p_svn_checksum_t swig_types[107]
+#define SWIGTYPE_p_svn_commit_info_t swig_types[108]
+#define SWIGTYPE_p_svn_config_t swig_types[109]
+#define SWIGTYPE_p_svn_delta_editor_t swig_types[110]
+#define SWIGTYPE_p_svn_depth_t swig_types[111]
+#define SWIGTYPE_p_svn_diff_hunk_t swig_types[112]
+#define SWIGTYPE_p_svn_dirent_t swig_types[113]
+#define SWIGTYPE_p_svn_errno_t swig_types[114]
+#define SWIGTYPE_p_svn_error_t swig_types[115]
+#define SWIGTYPE_p_svn_fs_lock_target_t swig_types[116]
+#define SWIGTYPE_p_svn_io_dirent2_t swig_types[117]
+#define SWIGTYPE_p_svn_io_dirent_t swig_types[118]
+#define SWIGTYPE_p_svn_io_file_del_t swig_types[119]
+#define SWIGTYPE_p_svn_location_segment_t swig_types[120]
+#define SWIGTYPE_p_svn_lock_t swig_types[121]
+#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[122]
+#define SWIGTYPE_p_svn_log_changed_path_t swig_types[123]
+#define SWIGTYPE_p_svn_log_entry_t swig_types[124]
+#define SWIGTYPE_p_svn_merge_range_t swig_types[125]
+#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[126]
+#define SWIGTYPE_p_svn_node_kind_t swig_types[127]
+#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[128]
+#define SWIGTYPE_p_svn_opt_revision_t swig_types[129]
+#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[130]
+#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[131]
+#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[132]
+#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[133]
+#define SWIGTYPE_p_svn_prop_kind swig_types[134]
+#define SWIGTYPE_p_svn_ra_callbacks2_t swig_types[135]
+#define SWIGTYPE_p_svn_ra_callbacks_t swig_types[136]
+#define SWIGTYPE_p_svn_ra_plugin_t swig_types[137]
+#define SWIGTYPE_p_svn_ra_reporter2_t swig_types[138]
+#define SWIGTYPE_p_svn_ra_reporter3_t swig_types[139]
+#define SWIGTYPE_p_svn_ra_reporter_t swig_types[140]
+#define SWIGTYPE_p_svn_ra_session_t swig_types[141]
+#define SWIGTYPE_p_svn_stream_mark_t swig_types[142]
+#define SWIGTYPE_p_svn_stream_t swig_types[143]
+#define SWIGTYPE_p_svn_string_t swig_types[144]
+#define SWIGTYPE_p_svn_stringbuf_t swig_types[145]
+#define SWIGTYPE_p_svn_tristate_t swig_types[146]
+#define SWIGTYPE_p_svn_txdelta_op_t swig_types[147]
+#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[148]
+#define SWIGTYPE_p_svn_txdelta_window_t swig_types[149]
+#define SWIGTYPE_p_svn_version_checklist_t swig_types[150]
+#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[151]
+#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[152]
+#define SWIGTYPE_p_svn_version_extended_t swig_types[153]
+#define SWIGTYPE_p_svn_version_t swig_types[154]
+#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[155]
+#define SWIGTYPE_p_unsigned_long swig_types[156]
+#define SWIGTYPE_p_void swig_types[157]
+static swig_type_info *swig_types[159];
+static swig_module_info swig_module = {swig_types, 158, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
@@ -3115,7 +3097,7 @@ static swig_module_info swig_module = {swig_types, 150, 0, 0, 0, 0};
 #endif
 #define SWIG_name    "_ra"
 
-#define SWIGVERSION 0x020009 
+#define SWIGVERSION 0x020012 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -3429,6 +3411,18 @@ SWIG_AsVal_unsigned_SS_long (PyObject *obj, unsigned long *val)
       return SWIG_OK;
     } else {
       PyErr_Clear();
+#if PY_VERSION_HEX >= 0x03000000
+      {
+        long v = PyLong_AsLong(obj);
+        if (!PyErr_Occurred()) {
+          if (v < 0) {
+            return SWIG_OverflowError;
+          }
+        } else {
+          PyErr_Clear();
+        }
+      }
+#endif
     }
   }
 #ifdef SWIG_PYTHON_CAST_MODE
@@ -3751,6 +3745,21 @@ static svn_error_t * svn_ra_invoke_replay_revfinish_callback(
   return _obj(revision, replay_baton, editor, edit_baton, rev_props, pool);
 }
 
+static svn_boolean_t svn_ra_invoke_check_tunnel_func(
+  svn_ra_check_tunnel_func_t _obj, void *tunnel_baton, const char *tunnel_name) {
+  return _obj(tunnel_baton, tunnel_name);
+}
+
+static void svn_ra_invoke_close_tunnel_func(
+  svn_ra_close_tunnel_func_t _obj, void *close_baton, void *tunnel_baton) {
+  _obj(close_baton, tunnel_baton);
+}
+
+static svn_error_t * svn_ra_invoke_open_tunnel_func(
+  svn_ra_open_tunnel_func_t _obj, svn_stream_t **request, svn_stream_t **response, svn_ra_close_tunnel_func_t *close_func, void **close_baton, void *tunnel_baton, const char *tunnel_name, const char *user, const char *hostname, int port, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *pool) {
+  return _obj(request, response, close_func, close_baton, tunnel_baton, tunnel_name, user, hostname, port, cancel_func, cancel_baton, pool);
+}
+
 static svn_error_t * svn_ra_invoke_init_func(
   svn_ra_init_func_t _obj, int abi_version, apr_pool_t *pool, apr_hash_t *hash) {
   return _obj(abi_version, pool, hash);
@@ -3773,7 +3782,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_version(PyObject *SWIGUNUSEDPARM(self), PyObje
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_version_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_version_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -3790,7 +3799,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter3_t_set_path_set(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_reporter3_t_set_path_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_reporter3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_reporter3_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_reporter3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -3817,7 +3826,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter3_t_set_path_get(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_reporter3_t_set_path_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_reporter3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_reporter3_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_reporter3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -3839,7 +3848,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter3_t_delete_path_set(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_reporter3_t_delete_path_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_reporter3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_reporter3_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_reporter3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -3866,7 +3875,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter3_t_delete_path_get(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_reporter3_t_delete_path_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_reporter3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_reporter3_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_reporter3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -3888,7 +3897,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter3_t_link_path_set(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_reporter3_t_link_path_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_reporter3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_reporter3_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_reporter3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -3915,7 +3924,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter3_t_link_path_get(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_reporter3_t_link_path_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_reporter3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_reporter3_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_reporter3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -3937,7 +3946,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter3_t_finish_report_set(PyObject *SWIGUN
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_reporter3_t_finish_report_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_reporter3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_reporter3_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_reporter3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -3964,7 +3973,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter3_t_finish_report_get(PyObject *SWIGUN
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_reporter3_t_finish_report_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_reporter3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_reporter3_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_reporter3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -3986,7 +3995,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter3_t_abort_report_set(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_reporter3_t_abort_report_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_reporter3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_reporter3_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_reporter3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4013,7 +4022,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter3_t_abort_report_get(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_reporter3_t_abort_report_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_reporter3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_reporter3_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_reporter3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4039,7 +4048,7 @@ SWIGINTERN PyObject *_wrap_new_svn_ra_reporter3_t(PyObject *SWIGUNUSEDPARM(self)
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_ra_reporter3_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_ra_reporter3_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -4054,7 +4063,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_ra_reporter3_t(PyObject *SWIGUNUSEDPARM(se
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_ra_reporter3_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_reporter3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_reporter3_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_reporter3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4090,7 +4099,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter2_t_set_path_set(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_reporter2_t_set_path_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_reporter2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_reporter2_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_reporter2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4117,7 +4126,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter2_t_set_path_get(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_reporter2_t_set_path_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_reporter2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_reporter2_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_reporter2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4139,7 +4148,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter2_t_delete_path_set(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_reporter2_t_delete_path_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_reporter2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_reporter2_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_reporter2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4166,7 +4175,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter2_t_delete_path_get(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_reporter2_t_delete_path_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_reporter2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_reporter2_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_reporter2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4188,7 +4197,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter2_t_link_path_set(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_reporter2_t_link_path_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_reporter2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_reporter2_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_reporter2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4215,7 +4224,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter2_t_link_path_get(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_reporter2_t_link_path_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_reporter2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_reporter2_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_reporter2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4237,7 +4246,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter2_t_finish_report_set(PyObject *SWIGUN
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_reporter2_t_finish_report_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_reporter2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_reporter2_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_reporter2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4264,7 +4273,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter2_t_finish_report_get(PyObject *SWIGUN
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_reporter2_t_finish_report_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_reporter2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_reporter2_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_reporter2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4286,7 +4295,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter2_t_abort_report_set(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_reporter2_t_abort_report_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_reporter2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_reporter2_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_reporter2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4313,7 +4322,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter2_t_abort_report_get(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_reporter2_t_abort_report_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_reporter2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_reporter2_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_reporter2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4339,7 +4348,7 @@ SWIGINTERN PyObject *_wrap_new_svn_ra_reporter2_t(PyObject *SWIGUNUSEDPARM(self)
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_ra_reporter2_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_ra_reporter2_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -4354,7 +4363,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_ra_reporter2_t(PyObject *SWIGUNUSEDPARM(se
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_ra_reporter2_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_reporter2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_reporter2_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_reporter2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4390,7 +4399,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter_t_set_path_set(PyObject *SWIGUNUSEDPA
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_reporter_t_set_path_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_reporter_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_reporter_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_reporter_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4417,7 +4426,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter_t_set_path_get(PyObject *SWIGUNUSEDPA
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_reporter_t_set_path_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_reporter_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_reporter_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_reporter_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4439,7 +4448,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter_t_delete_path_set(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_reporter_t_delete_path_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_reporter_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_reporter_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_reporter_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4466,7 +4475,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter_t_delete_path_get(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_reporter_t_delete_path_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_reporter_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_reporter_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_reporter_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4488,7 +4497,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter_t_link_path_set(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_reporter_t_link_path_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_reporter_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_reporter_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_reporter_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4515,7 +4524,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter_t_link_path_get(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_reporter_t_link_path_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_reporter_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_reporter_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_reporter_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4537,7 +4546,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter_t_finish_report_set(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_reporter_t_finish_report_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_reporter_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_reporter_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_reporter_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4564,7 +4573,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter_t_finish_report_get(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_reporter_t_finish_report_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_reporter_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_reporter_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_reporter_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4586,7 +4595,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter_t_abort_report_set(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_reporter_t_abort_report_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_reporter_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_reporter_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_reporter_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4613,7 +4622,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter_t_abort_report_get(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_reporter_t_abort_report_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_reporter_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_reporter_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_reporter_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4639,7 +4648,7 @@ SWIGINTERN PyObject *_wrap_new_svn_ra_reporter_t(PyObject *SWIGUNUSEDPARM(self),
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_ra_reporter_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_ra_reporter_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -4654,7 +4663,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_ra_reporter_t(PyObject *SWIGUNUSEDPARM(sel
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_ra_reporter_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_reporter_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_reporter_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_reporter_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4690,7 +4699,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_open_tmp_file_set(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_callbacks2_t_open_tmp_file_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_callbacks2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_callbacks2_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_callbacks2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4717,7 +4726,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_open_tmp_file_get(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_callbacks2_t_open_tmp_file_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_callbacks2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_callbacks2_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_callbacks2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4739,13 +4748,13 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_auth_baton_set(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_callbacks2_t_auth_baton_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_callbacks2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_callbacks2_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_callbacks2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_auth_baton_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_auth_baton_t, svn_argnum_obj1);
+    arg2 = (svn_auth_baton_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_auth_baton_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4766,13 +4775,13 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_auth_baton_get(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_callbacks2_t_auth_baton_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_callbacks2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_callbacks2_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_callbacks2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (svn_auth_baton_t *) ((arg1)->auth_baton);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_auth_baton_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_auth_baton_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -4789,14 +4798,14 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_get_wc_prop_set(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_callbacks2_t_get_wc_prop_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_callbacks2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_callbacks2_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_callbacks2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
     svn_ra_get_wc_prop_func_t * tmp =
-    svn_swig_MustGetPtr(obj1, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj1);
+    svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj1);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4818,7 +4827,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_get_wc_prop_get(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_callbacks2_t_get_wc_prop_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_callbacks2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_callbacks2_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_callbacks2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4840,7 +4849,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_get_wc_prop_get(PyObject *SWIGUNU
         SWIG_fail;
       }
       *tmp = (svn_ra_get_wc_prop_func_t) result;
-      resultobj = svn_swig_NewPointerObj(tmp, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t,
+      resultobj = svn_swig_py_new_pointer_obj(tmp, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t,
         py_pool, args);
     }
   }
@@ -4859,14 +4868,14 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_set_wc_prop_set(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_callbacks2_t_set_wc_prop_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_callbacks2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_callbacks2_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_callbacks2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
     svn_ra_set_wc_prop_func_t * tmp =
-    svn_swig_MustGetPtr(obj1, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj1);
+    svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj1);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4888,7 +4897,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_set_wc_prop_get(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_callbacks2_t_set_wc_prop_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_callbacks2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_callbacks2_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_callbacks2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4910,7 +4919,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_set_wc_prop_get(PyObject *SWIGUNU
         SWIG_fail;
       }
       *tmp = (svn_ra_set_wc_prop_func_t) result;
-      resultobj = svn_swig_NewPointerObj(tmp, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t,
+      resultobj = svn_swig_py_new_pointer_obj(tmp, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t,
         py_pool, args);
     }
   }
@@ -4929,14 +4938,14 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_push_wc_prop_set(PyObject *SWIGUN
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_callbacks2_t_push_wc_prop_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_callbacks2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_callbacks2_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_callbacks2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
     svn_ra_push_wc_prop_func_t * tmp =
-    svn_swig_MustGetPtr(obj1, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj1);
+    svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj1);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4958,7 +4967,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_push_wc_prop_get(PyObject *SWIGUN
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_callbacks2_t_push_wc_prop_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_callbacks2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_callbacks2_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_callbacks2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4980,7 +4989,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_push_wc_prop_get(PyObject *SWIGUN
         SWIG_fail;
       }
       *tmp = (svn_ra_push_wc_prop_func_t) result;
-      resultobj = svn_swig_NewPointerObj(tmp, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t,
+      resultobj = svn_swig_py_new_pointer_obj(tmp, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t,
         py_pool, args);
     }
   }
@@ -4999,14 +5008,14 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_invalidate_wc_props_set(PyObject
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_callbacks2_t_invalidate_wc_props_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_callbacks2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_callbacks2_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_callbacks2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
     svn_ra_invalidate_wc_props_func_t * tmp =
-    svn_swig_MustGetPtr(obj1, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, svn_argnum_obj1);
+    svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, svn_argnum_obj1);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5028,7 +5037,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_invalidate_wc_props_get(PyObject
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_callbacks2_t_invalidate_wc_props_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_callbacks2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_callbacks2_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_callbacks2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5050,7 +5059,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_invalidate_wc_props_get(PyObject
         SWIG_fail;
       }
       *tmp = (svn_ra_invalidate_wc_props_func_t) result;
-      resultobj = svn_swig_NewPointerObj(tmp, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t,
+      resultobj = svn_swig_py_new_pointer_obj(tmp, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t,
         py_pool, args);
     }
   }
@@ -5069,14 +5078,14 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_progress_func_set(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_callbacks2_t_progress_func_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_callbacks2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_callbacks2_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_callbacks2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
     svn_ra_progress_notify_func_t * tmp =
-    svn_swig_MustGetPtr(obj1, SWIGTYPE_p_p_f_apr_off_t_apr_off_t_p_void_p_apr_pool_t__void, svn_argnum_obj1);
+    svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_p_f_apr_off_t_apr_off_t_p_void_p_apr_pool_t__void, svn_argnum_obj1);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5098,7 +5107,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_progress_func_get(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_callbacks2_t_progress_func_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_callbacks2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_callbacks2_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_callbacks2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5120,7 +5129,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_progress_func_get(PyObject *SWIGU
         SWIG_fail;
       }
       *tmp = (svn_ra_progress_notify_func_t) result;
-      resultobj = svn_swig_NewPointerObj(tmp, SWIGTYPE_p_p_f_apr_off_t_apr_off_t_p_void_p_apr_pool_t__void,
+      resultobj = svn_swig_py_new_pointer_obj(tmp, SWIGTYPE_p_p_f_apr_off_t_apr_off_t_p_void_p_apr_pool_t__void,
         py_pool, args);
     }
   }
@@ -5139,7 +5148,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_progress_baton_set(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_callbacks2_t_progress_baton_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_callbacks2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_callbacks2_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_callbacks2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5168,7 +5177,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_progress_baton_get(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_callbacks2_t_progress_baton_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_callbacks2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_callbacks2_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_callbacks2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5193,7 +5202,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_progress_baton_get(PyObject *SWIG
         /* We don't know the type of this reference, so we'll have to
                * treat it as an opaque void pointer.
                */
-        resultobj = svn_swig_NewPointerObj(result, SWIGTYPE_p_void,
+        resultobj = svn_swig_py_new_pointer_obj(result, SWIGTYPE_p_void,
           _global_py_pool, args);
       }
     }
@@ -5214,14 +5223,14 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_cancel_func_set(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_callbacks2_t_cancel_func_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_callbacks2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_callbacks2_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_callbacks2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
     svn_cancel_func_t * tmp =
-    svn_swig_MustGetPtr(obj1, SWIGTYPE_p_p_f_p_void__p_svn_error_t, svn_argnum_obj1);
+    svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_p_f_p_void__p_svn_error_t, svn_argnum_obj1);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5243,7 +5252,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_cancel_func_get(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_callbacks2_t_cancel_func_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_callbacks2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_callbacks2_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_callbacks2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5265,7 +5274,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_cancel_func_get(PyObject *SWIGUNU
         SWIG_fail;
       }
       *tmp = (svn_cancel_func_t) result;
-      resultobj = svn_swig_NewPointerObj(tmp, SWIGTYPE_p_p_f_p_void__p_svn_error_t,
+      resultobj = svn_swig_py_new_pointer_obj(tmp, SWIGTYPE_p_p_f_p_void__p_svn_error_t,
         py_pool, args);
     }
   }
@@ -5284,14 +5293,14 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_get_client_string_set(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_callbacks2_t_get_client_string_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_callbacks2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_callbacks2_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_callbacks2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
     svn_ra_get_client_string_func_t * tmp =
-    svn_swig_MustGetPtr(obj1, SWIGTYPE_p_p_f_p_void_p_p_q_const__char_p_apr_pool_t__p_svn_error_t, svn_argnum_obj1);
+    svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_p_f_p_void_p_p_q_const__char_p_apr_pool_t__p_svn_error_t, svn_argnum_obj1);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5313,7 +5322,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_get_client_string_get(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_callbacks2_t_get_client_string_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_callbacks2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_callbacks2_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_callbacks2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5335,7 +5344,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_get_client_string_get(PyObject *S
         SWIG_fail;
       }
       *tmp = (svn_ra_get_client_string_func_t) result;
-      resultobj = svn_swig_NewPointerObj(tmp, SWIGTYPE_p_p_f_p_void_p_p_q_const__char_p_apr_pool_t__p_svn_error_t,
+      resultobj = svn_swig_py_new_pointer_obj(tmp, SWIGTYPE_p_p_f_p_void_p_p_q_const__char_p_apr_pool_t__p_svn_error_t,
         py_pool, args);
     }
   }
@@ -5354,14 +5363,14 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_get_wc_contents_set(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_callbacks2_t_get_wc_contents_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_callbacks2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_callbacks2_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_callbacks2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
     svn_ra_get_wc_contents_func_t * tmp =
-    svn_swig_MustGetPtr(obj1, SWIGTYPE_p_p_f_p_void_p_p_svn_stream_t_p_q_const__svn_checksum_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj1);
+    svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_p_f_p_void_p_p_svn_stream_t_p_q_const__svn_checksum_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj1);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5383,7 +5392,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_get_wc_contents_get(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_callbacks2_t_get_wc_contents_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_callbacks2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_callbacks2_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_callbacks2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5405,7 +5414,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_get_wc_contents_get(PyObject *SWI
         SWIG_fail;
       }
       *tmp = (svn_ra_get_wc_contents_func_t) result;
-      resultobj = svn_swig_NewPointerObj(tmp, SWIGTYPE_p_p_f_p_void_p_p_svn_stream_t_p_q_const__svn_checksum_t_p_apr_pool_t__p_svn_error_t,
+      resultobj = svn_swig_py_new_pointer_obj(tmp, SWIGTYPE_p_p_f_p_void_p_p_svn_stream_t_p_q_const__svn_checksum_t_p_apr_pool_t__p_svn_error_t,
         py_pool, args);
     }
   }
@@ -5415,6 +5424,221 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_check_tunnel_func_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  struct svn_ra_callbacks2_t *arg1 = (struct svn_ra_callbacks2_t *) 0 ;
+  svn_ra_check_tunnel_func_t arg2 = (svn_ra_check_tunnel_func_t) 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_callbacks2_t_check_tunnel_func_set",&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = (struct svn_ra_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_callbacks2_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    svn_ra_check_tunnel_func_t * tmp =
+    svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_p_f_p_void_p_q_const__char__int, svn_argnum_obj1);
+    if (tmp == NULL || PyErr_Occurred()) {
+      SWIG_fail;
+    }
+    arg2 = *tmp;
+  }
+  if (arg1) (arg1)->check_tunnel_func = arg2;
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_check_tunnel_func_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  struct svn_ra_callbacks2_t *arg1 = (struct svn_ra_callbacks2_t *) 0 ;
+  PyObject * obj0 = 0 ;
+  svn_ra_check_tunnel_func_t result;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_callbacks2_t_check_tunnel_func_get",&obj0)) SWIG_fail;
+  {
+    arg1 = (struct svn_ra_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_callbacks2_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  result = (svn_ra_check_tunnel_func_t) ((arg1)->check_tunnel_func);
+  {
+    PyObject *py_pool = NULL;
+    apr_pool_t *pool = NULL;
+    
+    if (svn_swig_py_get_parent_pool(args, SWIGTYPE_p_apr_pool_t,
+        &py_pool, &pool))
+    SWIG_fail;
+    if (result == NULL) {
+      resultobj = Py_None;
+      Py_INCREF(resultobj);
+    } else {
+      svn_ra_check_tunnel_func_t * tmp = apr_palloc(pool, sizeof(svn_ra_check_tunnel_func_t));
+      if (tmp == NULL) {
+        SWIG_fail;
+      }
+      *tmp = (svn_ra_check_tunnel_func_t) result;
+      resultobj = svn_swig_py_new_pointer_obj(tmp, SWIGTYPE_p_p_f_p_void_p_q_const__char__int,
+        py_pool, args);
+    }
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_open_tunnel_func_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  struct svn_ra_callbacks2_t *arg1 = (struct svn_ra_callbacks2_t *) 0 ;
+  svn_ra_open_tunnel_func_t arg2 = (svn_ra_open_tunnel_func_t) 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_callbacks2_t_open_tunnel_func_set",&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = (struct svn_ra_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_callbacks2_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    svn_ra_open_tunnel_func_t * tmp =
+    svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj1);
+    if (tmp == NULL || PyErr_Occurred()) {
+      SWIG_fail;
+    }
+    arg2 = *tmp;
+  }
+  if (arg1) (arg1)->open_tunnel_func = arg2;
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_open_tunnel_func_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  struct svn_ra_callbacks2_t *arg1 = (struct svn_ra_callbacks2_t *) 0 ;
+  PyObject * obj0 = 0 ;
+  svn_ra_open_tunnel_func_t result;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_callbacks2_t_open_tunnel_func_get",&obj0)) SWIG_fail;
+  {
+    arg1 = (struct svn_ra_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_callbacks2_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  result = (svn_ra_open_tunnel_func_t) ((arg1)->open_tunnel_func);
+  {
+    PyObject *py_pool = NULL;
+    apr_pool_t *pool = NULL;
+    
+    if (svn_swig_py_get_parent_pool(args, SWIGTYPE_p_apr_pool_t,
+        &py_pool, &pool))
+    SWIG_fail;
+    if (result == NULL) {
+      resultobj = Py_None;
+      Py_INCREF(resultobj);
+    } else {
+      svn_ra_open_tunnel_func_t * tmp = apr_palloc(pool, sizeof(svn_ra_open_tunnel_func_t));
+      if (tmp == NULL) {
+        SWIG_fail;
+      }
+      *tmp = (svn_ra_open_tunnel_func_t) result;
+      resultobj = svn_swig_py_new_pointer_obj(tmp, SWIGTYPE_p_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t,
+        py_pool, args);
+    }
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_tunnel_baton_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  struct svn_ra_callbacks2_t *arg1 = (struct svn_ra_callbacks2_t *) 0 ;
+  void *arg2 = (void *) 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_callbacks2_t_tunnel_baton_set",&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = (struct svn_ra_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_callbacks2_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    if (obj1 == Py_None) {
+      arg2 = NULL;
+    } else if (SWIG_ConvertPtr(obj1, (void **) &arg2, 0, 0) == -1) {
+      arg2 = (void *) obj1;
+      PyErr_Clear();
+    }
+  }
+  if (arg1) (arg1)->tunnel_baton = arg2;
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_t_tunnel_baton_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  struct svn_ra_callbacks2_t *arg1 = (struct svn_ra_callbacks2_t *) 0 ;
+  PyObject * obj0 = 0 ;
+  void *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_callbacks2_t_tunnel_baton_get",&obj0)) SWIG_fail;
+  {
+    arg1 = (struct svn_ra_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_callbacks2_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  result = (void *) ((arg1)->tunnel_baton);
+  {
+    PyObject *ownerObj = obj0;
+    PyObject *members = PyObject_GetAttrString(ownerObj, "_members");
+    
+    resultobj = NULL;
+    if (members != NULL) {
+      resultobj = PyDict_GetItemString(members, "tunnel_baton");
+      Py_XINCREF(resultobj);
+      Py_DECREF(members);
+    }
+    
+    if (resultobj == NULL) {
+      if (result == NULL) {
+        resultobj = Py_None;
+        Py_INCREF(resultobj);
+      } else {
+        /* We don't know the type of this reference, so we'll have to
+               * treat it as an opaque void pointer.
+               */
+        resultobj = svn_swig_py_new_pointer_obj(result, SWIGTYPE_p_void,
+          _global_py_pool, args);
+      }
+    }
+    
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_new_svn_ra_callbacks2_t(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   struct svn_ra_callbacks2_t *result = 0 ;
@@ -5428,7 +5652,7 @@ SWIGINTERN PyObject *_wrap_new_svn_ra_callbacks2_t(PyObject *SWIGUNUSEDPARM(self
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_ra_callbacks2_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_ra_callbacks2_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -5443,7 +5667,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_ra_callbacks2_t(PyObject *SWIGUNUSEDPARM(s
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_ra_callbacks2_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_callbacks2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_callbacks2_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_callbacks2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5479,7 +5703,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks_t_open_tmp_file_set(PyObject *SWIGUN
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_callbacks_t_open_tmp_file_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_callbacks_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_callbacks_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_callbacks_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_callbacks_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5506,7 +5730,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks_t_open_tmp_file_get(PyObject *SWIGUN
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_callbacks_t_open_tmp_file_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_callbacks_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_callbacks_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_callbacks_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_callbacks_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5528,13 +5752,13 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks_t_auth_baton_set(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_callbacks_t_auth_baton_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_callbacks_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_callbacks_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_callbacks_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_callbacks_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_auth_baton_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_auth_baton_t, svn_argnum_obj1);
+    arg2 = (svn_auth_baton_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_auth_baton_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5555,13 +5779,13 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks_t_auth_baton_get(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_callbacks_t_auth_baton_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_callbacks_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_callbacks_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_callbacks_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_callbacks_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (svn_auth_baton_t *) ((arg1)->auth_baton);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_auth_baton_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_auth_baton_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -5578,14 +5802,14 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks_t_get_wc_prop_set(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_callbacks_t_get_wc_prop_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_callbacks_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_callbacks_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_callbacks_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_callbacks_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
     svn_ra_get_wc_prop_func_t * tmp =
-    svn_swig_MustGetPtr(obj1, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj1);
+    svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj1);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5607,7 +5831,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks_t_get_wc_prop_get(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_callbacks_t_get_wc_prop_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_callbacks_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_callbacks_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_callbacks_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_callbacks_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5629,7 +5853,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks_t_get_wc_prop_get(PyObject *SWIGUNUS
         SWIG_fail;
       }
       *tmp = (svn_ra_get_wc_prop_func_t) result;
-      resultobj = svn_swig_NewPointerObj(tmp, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t,
+      resultobj = svn_swig_py_new_pointer_obj(tmp, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t,
         py_pool, args);
     }
   }
@@ -5648,14 +5872,14 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks_t_set_wc_prop_set(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_callbacks_t_set_wc_prop_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_callbacks_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_callbacks_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_callbacks_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_callbacks_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
     svn_ra_set_wc_prop_func_t * tmp =
-    svn_swig_MustGetPtr(obj1, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj1);
+    svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj1);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5677,7 +5901,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks_t_set_wc_prop_get(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_callbacks_t_set_wc_prop_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_callbacks_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_callbacks_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_callbacks_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_callbacks_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5699,7 +5923,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks_t_set_wc_prop_get(PyObject *SWIGUNUS
         SWIG_fail;
       }
       *tmp = (svn_ra_set_wc_prop_func_t) result;
-      resultobj = svn_swig_NewPointerObj(tmp, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t,
+      resultobj = svn_swig_py_new_pointer_obj(tmp, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t,
         py_pool, args);
     }
   }
@@ -5718,14 +5942,14 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks_t_push_wc_prop_set(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_callbacks_t_push_wc_prop_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_callbacks_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_callbacks_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_callbacks_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_callbacks_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
     svn_ra_push_wc_prop_func_t * tmp =
-    svn_swig_MustGetPtr(obj1, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj1);
+    svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj1);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5747,7 +5971,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks_t_push_wc_prop_get(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_callbacks_t_push_wc_prop_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_callbacks_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_callbacks_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_callbacks_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_callbacks_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5769,7 +5993,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks_t_push_wc_prop_get(PyObject *SWIGUNU
         SWIG_fail;
       }
       *tmp = (svn_ra_push_wc_prop_func_t) result;
-      resultobj = svn_swig_NewPointerObj(tmp, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t,
+      resultobj = svn_swig_py_new_pointer_obj(tmp, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t,
         py_pool, args);
     }
   }
@@ -5788,14 +6012,14 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks_t_invalidate_wc_props_set(PyObject *
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_callbacks_t_invalidate_wc_props_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_callbacks_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_callbacks_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_callbacks_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_callbacks_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
     svn_ra_invalidate_wc_props_func_t * tmp =
-    svn_swig_MustGetPtr(obj1, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, svn_argnum_obj1);
+    svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, svn_argnum_obj1);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5817,7 +6041,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks_t_invalidate_wc_props_get(PyObject *
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_callbacks_t_invalidate_wc_props_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_callbacks_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_callbacks_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_callbacks_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_callbacks_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5839,7 +6063,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks_t_invalidate_wc_props_get(PyObject *
         SWIG_fail;
       }
       *tmp = (svn_ra_invalidate_wc_props_func_t) result;
-      resultobj = svn_swig_NewPointerObj(tmp, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t,
+      resultobj = svn_swig_py_new_pointer_obj(tmp, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t,
         py_pool, args);
     }
   }
@@ -5862,7 +6086,7 @@ SWIGINTERN PyObject *_wrap_new_svn_ra_callbacks_t(PyObject *SWIGUNUSEDPARM(self)
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_ra_callbacks_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_ra_callbacks_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -5877,7 +6101,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_ra_callbacks_t(PyObject *SWIGUNUSEDPARM(se
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_ra_callbacks_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_callbacks_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_callbacks_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_callbacks_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_callbacks_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6000,7 +6224,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_create_callbacks(PyObject *SWIGUNUSEDPARM(self
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_ra_callbacks2_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_ra_callbacks2_t,
         _global_py_pool, args))
     
     ;
@@ -6092,7 +6316,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_open4(PyObject *SWIGUNUSEDPARM(self), PyObject
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_ra_session_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_ra_session_t,
         _global_py_pool, args))
     
     ;
@@ -6194,7 +6418,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_open3(PyObject *SWIGUNUSEDPARM(self), PyObject
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_ra_session_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_ra_session_t,
         _global_py_pool, args))
     
     ;
@@ -6282,7 +6506,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_open2(PyObject *SWIGUNUSEDPARM(self), PyObject
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_ra_session_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_ra_session_t,
         _global_py_pool, args))
     
     ;
@@ -6323,7 +6547,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_open(PyObject *SWIGUNUSEDPARM(self), PyObject
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"sOOO|O:svn_ra_open",&arg2,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
-    arg3 = (svn_ra_callbacks_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_ra_callbacks_t, svn_argnum_obj1);
+    arg3 = (svn_ra_callbacks_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_ra_callbacks_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6377,7 +6601,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_open(PyObject *SWIGUNUSEDPARM(self), PyObject
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_ra_session_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_ra_session_t,
         _global_py_pool, args))
     
     ;
@@ -6411,7 +6635,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reparent(PyObject *SWIGUNUSEDPARM(self), PyObj
   arg3 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_ra_reparent",&obj0,&arg2,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_ra_session_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
+    arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6474,7 +6698,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_session_url(PyObject *SWIGUNUSEDPARM(self)
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_ra_get_session_url",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_ra_session_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
+    arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6551,7 +6775,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_path_relative_to_session(PyObject *SWIGUNU
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_ra_get_path_relative_to_session",&obj0,&arg3,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_ra_session_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
+    arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6628,7 +6852,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_path_relative_to_root(PyObject *SWIGUNUSED
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_ra_get_path_relative_to_root",&obj0,&arg3,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_ra_session_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
+    arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6705,7 +6929,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_latest_revnum(PyObject *SWIGUNUSEDPARM(sel
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_ra_get_latest_revnum",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_ra_session_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
+    arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6777,7 +7001,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_dated_revision(PyObject *SWIGUNUSEDPARM(se
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_ra_get_dated_revision",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_ra_session_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
+    arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6852,7 +7076,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_change_rev_prop2(PyObject *SWIGUNUSEDPARM(self
   arg6 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOsOO|O:svn_ra_change_rev_prop2",&obj0,&obj1,&arg3,&obj3,&obj4,&obj5)) SWIG_fail;
   {
-    arg1 = (svn_ra_session_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
+    arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6864,7 +7088,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_change_rev_prop2(PyObject *SWIGUNUSEDPARM(self
     }
   }
   {
-    arg4 = (svn_string_t **)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_p_svn_string_t, svn_argnum_obj3);
+    arg4 = (svn_string_t **)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_p_svn_string_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6956,7 +7180,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_change_rev_prop(PyObject *SWIGUNUSEDPARM(self)
   arg5 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOsO|O:svn_ra_change_rev_prop",&obj0,&obj1,&arg3,&obj3,&obj4)) SWIG_fail;
   {
-    arg1 = (svn_ra_session_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
+    arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7040,7 +7264,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_rev_proplist(PyObject *SWIGUNUSEDPARM(self), P
   arg3 = &temp3;
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_ra_rev_proplist",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_ra_session_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
+    arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7115,7 +7339,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_rev_prop(PyObject *SWIGUNUSEDPARM(self), PyObj
   arg4 = &temp4;
   if (!PyArg_ParseTuple(args,(char *)"OOs|O:svn_ra_rev_prop",&obj0,&obj1,&arg3,&obj3)) SWIG_fail;
   {
-    arg1 = (svn_ra_session_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
+    arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7209,7 +7433,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_commit_editor3(PyObject *SWIGUNUSEDPARM(se
   arg3 = &temp3;
   if (!PyArg_ParseTuple(args,(char *)"OOOOO|O:svn_ra_get_commit_editor3",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
-    arg1 = (svn_ra_session_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
+    arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7269,13 +7493,13 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_commit_editor3(PyObject *SWIGUNUSEDPARM(se
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_svn_delta_editor_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_svn_delta_editor_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg3, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg3, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -7322,7 +7546,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_commit_editor2(PyObject *SWIGUNUSEDPARM(se
   arg3 = &temp3;
   if (!PyArg_ParseTuple(args,(char *)"OsOOO|O:svn_ra_get_commit_editor2",&obj0,&arg4,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
-    arg1 = (svn_ra_session_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
+    arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7369,13 +7593,13 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_commit_editor2(PyObject *SWIGUNUSEDPARM(se
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_svn_delta_editor_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_svn_delta_editor_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg3, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg3, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -7422,7 +7646,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_commit_editor(PyObject *SWIGUNUSEDPARM(sel
   arg3 = &temp3;
   if (!PyArg_ParseTuple(args,(char *)"OsOOO|O:svn_ra_get_commit_editor",&obj0,&arg4,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
-    arg1 = (svn_ra_session_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
+    arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7469,13 +7693,13 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_commit_editor(PyObject *SWIGUNUSEDPARM(sel
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_svn_delta_editor_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_svn_delta_editor_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg3, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg3, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -7520,7 +7744,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_file(PyObject *SWIGUNUSEDPARM(self), PyObj
   arg6 = &temp6;
   if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_ra_get_file",&obj0,&arg2,&obj2,&obj3,&obj4)) SWIG_fail;
   {
-    arg1 = (svn_ra_session_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
+    arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7613,7 +7837,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_dir2(PyObject *SWIGUNUSEDPARM(self), PyObj
   arg4 = &temp4;
   if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_ra_get_dir2",&obj0,&arg5,&obj2,&obj3,&obj4)) SWIG_fail;
   {
-    arg1 = (svn_ra_session_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
+    arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7716,7 +7940,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_dir(PyObject *SWIGUNUSEDPARM(self), PyObje
   arg6 = &temp6;
   if (!PyArg_ParseTuple(args,(char *)"OsO|O:svn_ra_get_dir",&obj0,&arg2,&obj2,&obj3)) SWIG_fail;
   {
-    arg1 = (svn_ra_session_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
+    arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7811,7 +8035,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_mergeinfo(PyObject *SWIGUNUSEDPARM(self),
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"OOOOO|O:svn_ra_get_mergeinfo",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
-    arg1 = (svn_ra_session_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
+    arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7935,7 +8159,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_update3(PyObject *SWIGUNUSEDPARM(self), PyO
   arg3 = &temp3;
   if (!PyArg_ParseTuple(args,(char *)"OOsOOOOO|OO:svn_ra_do_update3",&obj0,&obj1,&arg5,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   {
-    arg1 = (svn_ra_session_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
+    arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7965,7 +8189,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_update3(PyObject *SWIGUNUSEDPARM(self), PyO
     }
   }
   {
-    arg9 = (svn_delta_editor_t *)svn_swig_MustGetPtr(obj6, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj6);
+    arg9 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj6, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj6);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8014,13 +8238,13 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_update3(PyObject *SWIGUNUSEDPARM(self), PyO
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_svn_ra_reporter3_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_svn_ra_reporter3_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg3, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg3, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -8076,7 +8300,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_update2(PyObject *SWIGUNUSEDPARM(self), PyO
   arg3 = &temp3;
   if (!PyArg_ParseTuple(args,(char *)"OOsOOOO|O:svn_ra_do_update2",&obj0,&obj1,&arg5,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
-    arg1 = (svn_ra_session_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
+    arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8100,7 +8324,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_update2(PyObject *SWIGUNUSEDPARM(self), PyO
     }
   }
   {
-    arg8 = (svn_delta_editor_t *)svn_swig_MustGetPtr(obj5, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj5);
+    arg8 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj5, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj5);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8141,13 +8365,13 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_update2(PyObject *SWIGUNUSEDPARM(self), PyO
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_svn_ra_reporter3_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_svn_ra_reporter3_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg3, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg3, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -8195,7 +8419,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_update(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg3 = &temp3;
   if (!PyArg_ParseTuple(args,(char *)"OOsOOO|O:svn_ra_do_update",&obj0,&obj1,&arg5,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
-    arg1 = (svn_ra_session_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
+    arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8213,7 +8437,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_update(PyObject *SWIGUNUSEDPARM(self), PyOb
     }
   }
   {
-    arg7 = (svn_delta_editor_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj4);
+    arg7 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8254,13 +8478,13 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_update(PyObject *SWIGUNUSEDPARM(self), PyOb
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_svn_ra_reporter2_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_svn_ra_reporter2_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg3, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg3, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -8319,7 +8543,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_switch3(PyObject *SWIGUNUSEDPARM(self), PyO
   arg3 = &temp3;
   if (!PyArg_ParseTuple(args,(char *)"OOsOsOOOO|OO:svn_ra_do_switch3",&obj0,&obj1,&arg5,&obj3,&arg7,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
   {
-    arg1 = (svn_ra_session_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
+    arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8349,7 +8573,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_switch3(PyObject *SWIGUNUSEDPARM(self), PyO
     }
   }
   {
-    arg10 = (svn_delta_editor_t *)svn_swig_MustGetPtr(obj7, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj7);
+    arg10 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj7, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj7);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8398,13 +8622,13 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_switch3(PyObject *SWIGUNUSEDPARM(self), PyO
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_svn_ra_reporter3_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_svn_ra_reporter3_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg3, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg3, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -8459,7 +8683,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_switch2(PyObject *SWIGUNUSEDPARM(self), PyO
   arg3 = &temp3;
   if (!PyArg_ParseTuple(args,(char *)"OOsOsOO|O:svn_ra_do_switch2",&obj0,&obj1,&arg5,&obj3,&arg7,&obj5,&obj6,&obj7)) SWIG_fail;
   {
-    arg1 = (svn_ra_session_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
+    arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8477,7 +8701,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_switch2(PyObject *SWIGUNUSEDPARM(self), PyO
     }
   }
   {
-    arg8 = (svn_delta_editor_t *)svn_swig_MustGetPtr(obj5, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj5);
+    arg8 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj5, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj5);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8518,13 +8742,13 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_switch2(PyObject *SWIGUNUSEDPARM(self), PyO
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_svn_ra_reporter3_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_svn_ra_reporter3_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg3, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg3, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -8573,7 +8797,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_switch(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg3 = &temp3;
   if (!PyArg_ParseTuple(args,(char *)"OOsOsOO|O:svn_ra_do_switch",&obj0,&obj1,&arg5,&obj3,&arg7,&obj5,&obj6,&obj7)) SWIG_fail;
   {
-    arg1 = (svn_ra_session_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
+    arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8591,7 +8815,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_switch(PyObject *SWIGUNUSEDPARM(self), PyOb
     }
   }
   {
-    arg8 = (svn_delta_editor_t *)svn_swig_MustGetPtr(obj5, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj5);
+    arg8 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj5, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj5);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8632,13 +8856,13 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_switch(PyObject *SWIGUNUSEDPARM(self), PyOb
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_svn_ra_reporter2_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_svn_ra_reporter2_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg3, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg3, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -8686,7 +8910,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_status2(PyObject *SWIGUNUSEDPARM(self), PyO
   arg3 = &temp3;
   if (!PyArg_ParseTuple(args,(char *)"OsOOOO|O:svn_ra_do_status2",&obj0,&arg4,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
-    arg1 = (svn_ra_session_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
+    arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8704,7 +8928,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_status2(PyObject *SWIGUNUSEDPARM(self), PyO
     }
   }
   {
-    arg7 = (svn_delta_editor_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj4);
+    arg7 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8745,13 +8969,13 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_status2(PyObject *SWIGUNUSEDPARM(self), PyO
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_svn_ra_reporter3_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_svn_ra_reporter3_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg3, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg3, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -8799,7 +9023,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_status(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg3 = &temp3;
   if (!PyArg_ParseTuple(args,(char *)"OsOOOO|O:svn_ra_do_status",&obj0,&arg4,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
-    arg1 = (svn_ra_session_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
+    arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8817,7 +9041,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_status(PyObject *SWIGUNUSEDPARM(self), PyOb
     }
   }
   {
-    arg7 = (svn_delta_editor_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj4);
+    arg7 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8858,13 +9082,13 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_status(PyObject *SWIGUNUSEDPARM(self), PyOb
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_svn_ra_reporter2_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_svn_ra_reporter2_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg3, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg3, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -8917,7 +9141,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_diff3(PyObject *SWIGUNUSEDPARM(self), PyObj
   arg3 = &temp3;
   if (!PyArg_ParseTuple(args,(char *)"OOsOOOsOO|O:svn_ra_do_diff3",&obj0,&obj1,&arg5,&obj3,&obj4,&obj5,&arg9,&obj7,&obj8,&obj9)) SWIG_fail;
   {
-    arg1 = (svn_ra_session_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
+    arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8947,7 +9171,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_diff3(PyObject *SWIGUNUSEDPARM(self), PyObj
     }
   }
   {
-    arg10 = (svn_delta_editor_t *)svn_swig_MustGetPtr(obj7, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj7);
+    arg10 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj7, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj7);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8988,13 +9212,13 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_diff3(PyObject *SWIGUNUSEDPARM(self), PyObj
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_svn_ra_reporter3_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_svn_ra_reporter3_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg3, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg3, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -9047,7 +9271,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_diff2(PyObject *SWIGUNUSEDPARM(self), PyObj
   arg3 = &temp3;
   if (!PyArg_ParseTuple(args,(char *)"OOsOOOsOO|O:svn_ra_do_diff2",&obj0,&obj1,&arg5,&obj3,&obj4,&obj5,&arg9,&obj7,&obj8,&obj9)) SWIG_fail;
   {
-    arg1 = (svn_ra_session_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
+    arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9077,7 +9301,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_diff2(PyObject *SWIGUNUSEDPARM(self), PyObj
     }
   }
   {
-    arg10 = (svn_delta_editor_t *)svn_swig_MustGetPtr(obj7, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj7);
+    arg10 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj7, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj7);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9118,13 +9342,13 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_diff2(PyObject *SWIGUNUSEDPARM(self), PyObj
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_svn_ra_reporter2_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_svn_ra_reporter2_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg3, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg3, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -9175,7 +9399,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_diff(PyObject *SWIGUNUSEDPARM(self), PyObje
   arg3 = &temp3;
   if (!PyArg_ParseTuple(args,(char *)"OOsOOsOO|O:svn_ra_do_diff",&obj0,&obj1,&arg5,&obj3,&obj4,&arg8,&obj6,&obj7,&obj8)) SWIG_fail;
   {
-    arg1 = (svn_ra_session_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
+    arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9199,7 +9423,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_diff(PyObject *SWIGUNUSEDPARM(self), PyObje
     }
   }
   {
-    arg9 = (svn_delta_editor_t *)svn_swig_MustGetPtr(obj6, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj6);
+    arg9 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj6, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj6);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9240,13 +9464,13 @@ SWIGINTERN PyObject *_wrap_svn_ra_do_diff(PyObject *SWIGUNUSEDPARM(self), PyObje
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_svn_ra_reporter2_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_svn_ra_reporter2_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg3, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg3, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -9298,7 +9522,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_log2(PyObject *SWIGUNUSEDPARM(self), PyObj
   arg12 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOOOOO|O:svn_ra_get_log2",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
   {
-    arg1 = (svn_ra_session_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
+    arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9358,7 +9582,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_log2(PyObject *SWIGUNUSEDPARM(self), PyObj
     SWIG_fail;
   }
   {
-    arg10 = svn_swig_py_log_entry_receiver;
+    arg10 = (svn_log_entry_receiver_t) svn_swig_py_log_entry_receiver;
     arg11 = obj9;
   }
   if (obj10) {
@@ -9431,7 +9655,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_log(PyObject *SWIGUNUSEDPARM(self), PyObje
   arg10 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOOO|O:svn_ra_get_log",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   {
-    arg1 = (svn_ra_session_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
+    arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9476,7 +9700,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_log(PyObject *SWIGUNUSEDPARM(self), PyObje
     }
   }
   {
-    arg8 = svn_swig_py_log_receiver;
+    arg8 = (svn_log_message_receiver_t) svn_swig_py_log_receiver;
     arg9 = obj7;
   }
   if (obj8) {
@@ -9541,7 +9765,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_check_path(PyObject *SWIGUNUSEDPARM(self), PyO
   arg4 = &temp4;
   if (!PyArg_ParseTuple(args,(char *)"OsO|O:svn_ra_check_path",&obj0,&arg2,&obj2,&obj3)) SWIG_fail;
   {
-    arg1 = (svn_ra_session_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
+    arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9619,7 +9843,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_stat(PyObject *SWIGUNUSEDPARM(self), PyObject
   arg4 = &temp4;
   if (!PyArg_ParseTuple(args,(char *)"OsO|O:svn_ra_stat",&obj0,&arg2,&obj2,&obj3)) SWIG_fail;
   {
-    arg1 = (svn_ra_session_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
+    arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9658,7 +9882,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_stat(PyObject *SWIGUNUSEDPARM(self), PyObject
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg4, SWIGTYPE_p_svn_dirent_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg4, SWIGTYPE_p_svn_dirent_t,
         _global_py_pool, args))
     
     ;
@@ -9694,7 +9918,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_uuid2(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_ra_get_uuid2",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_ra_session_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
+    arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9770,7 +9994,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_uuid(PyObject *SWIGUNUSEDPARM(self), PyObj
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_ra_get_uuid",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_ra_session_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
+    arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9846,7 +10070,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_repos_root2(PyObject *SWIGUNUSEDPARM(self)
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_ra_get_repos_root2",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_ra_session_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
+    arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9922,7 +10146,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_repos_root(PyObject *SWIGUNUSEDPARM(self),
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_ra_get_repos_root",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_ra_session_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
+    arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10003,7 +10227,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_locations(PyObject *SWIGUNUSEDPARM(self),
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_ra_get_locations",&obj0,&arg3,&obj2,&obj3,&obj4)) SWIG_fail;
   {
-    arg1 = (svn_ra_session_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
+    arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10091,7 +10315,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_location_segments(PyObject *SWIGUNUSEDPARM
   arg8 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OsOOOO|O:svn_ra_get_location_segments",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
-    arg1 = (svn_ra_session_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
+    arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10115,7 +10339,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_location_segments(PyObject *SWIGUNUSEDPARM
     }
   }
   {
-    arg6 = svn_swig_py_location_segment_receiver_func;
+    arg6 = (svn_location_segment_receiver_t) svn_swig_py_location_segment_receiver_func;
     arg7 = obj5;
   }
   if (obj6) {
@@ -10184,7 +10408,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_file_revs2(PyObject *SWIGUNUSEDPARM(self),
   arg8 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OsOOOOO|O:svn_ra_get_file_revs2",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
-    arg1 = (svn_ra_session_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
+    arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10209,7 +10433,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_file_revs2(PyObject *SWIGUNUSEDPARM(self),
   }
   {
     svn_file_rev_handler_t * tmp =
-    svn_swig_MustGetPtr(obj5, SWIGTYPE_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj5);
+    svn_swig_py_must_get_ptr(obj5, SWIGTYPE_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj5);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10286,7 +10510,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_file_revs(PyObject *SWIGUNUSEDPARM(self),
   arg7 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OsOOO|O:svn_ra_get_file_revs",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
-    arg1 = (svn_ra_session_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
+    arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10304,7 +10528,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_file_revs(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
-    arg5 = svn_swig_py_ra_file_rev_handler_func;
+    arg5 = (svn_ra_file_rev_handler_t) svn_swig_py_ra_file_rev_handler_func;
     arg6 = obj4;
   }
   if (obj5) {
@@ -10370,7 +10594,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_lock(PyObject *SWIGUNUSEDPARM(self), PyObject
   arg7 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOzOO|O:svn_ra_lock",&obj0,&obj1,&arg3,&obj3,&obj4,&obj5)) SWIG_fail;
   {
-    arg1 = (svn_ra_session_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
+    arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10385,7 +10609,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_lock(PyObject *SWIGUNUSEDPARM(self), PyObject
     }
   }
   {
-    arg5 = svn_swig_py_ra_lock_callback;
+    arg5 = (svn_ra_lock_callback_t) svn_swig_py_ra_lock_callback;
     arg6 = obj4;
   }
   if (obj5) {
@@ -10450,7 +10674,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_unlock(PyObject *SWIGUNUSEDPARM(self), PyObjec
   arg6 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOOO|O:svn_ra_unlock",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
-    arg1 = (svn_ra_session_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
+    arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10465,7 +10689,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_unlock(PyObject *SWIGUNUSEDPARM(self), PyObjec
     }
   }
   {
-    arg4 = svn_swig_py_ra_lock_callback;
+    arg4 = (svn_ra_lock_callback_t) svn_swig_py_ra_lock_callback;
     arg5 = obj3;
   }
   if (obj4) {
@@ -10527,7 +10751,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_lock(PyObject *SWIGUNUSEDPARM(self), PyObj
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_ra_get_lock",&obj0,&arg3,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_ra_session_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
+    arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10560,7 +10784,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_lock(PyObject *SWIGUNUSEDPARM(self), PyObj
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_svn_lock_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_svn_lock_t,
         _global_py_pool, args))
     
     ;
@@ -10599,7 +10823,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_locks2(PyObject *SWIGUNUSEDPARM(self), PyO
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"OsO|O:svn_ra_get_locks2",&obj0,&arg3,&obj2,&obj3)) SWIG_fail;
   {
-    arg1 = (svn_ra_session_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
+    arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10678,7 +10902,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_locks(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_ra_get_locks",&obj0,&arg3,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_ra_session_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
+    arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10761,7 +10985,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_replay_range(PyObject *SWIGUNUSEDPARM(self), P
   arg9 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOOO|O:svn_ra_replay_range",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   {
-    arg1 = (svn_ra_session_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
+    arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10792,7 +11016,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_replay_range(PyObject *SWIGUNUSEDPARM(self), P
   }
   {
     svn_ra_replay_revstart_callback_t * tmp =
-    svn_swig_MustGetPtr(obj5, SWIGTYPE_p_p_f_svn_revnum_t_p_void_p_p_q_const__svn_delta_editor_t_p_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj5);
+    svn_swig_py_must_get_ptr(obj5, SWIGTYPE_p_p_f_svn_revnum_t_p_void_p_p_q_const__svn_delta_editor_t_p_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj5);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10800,7 +11024,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_replay_range(PyObject *SWIGUNUSEDPARM(self), P
   }
   {
     svn_ra_replay_revfinish_callback_t * tmp =
-    svn_swig_MustGetPtr(obj6, SWIGTYPE_p_p_f_svn_revnum_t_p_void_p_q_const__svn_delta_editor_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj6);
+    svn_swig_py_must_get_ptr(obj6, SWIGTYPE_p_p_f_svn_revnum_t_p_void_p_q_const__svn_delta_editor_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj6);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10879,7 +11103,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_replay(PyObject *SWIGUNUSEDPARM(self), PyObjec
   arg7 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOOOOO|O:svn_ra_replay",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
-    arg1 = (svn_ra_session_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
+    arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10903,7 +11127,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_replay(PyObject *SWIGUNUSEDPARM(self), PyObjec
     }
   }
   {
-    arg5 = (svn_delta_editor_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj4);
+    arg5 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10980,7 +11204,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_deleted_rev(PyObject *SWIGUNUSEDPARM(self)
   arg5 = &temp5;
   if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_ra_get_deleted_rev",&obj0,&arg2,&obj2,&obj3,&obj4)) SWIG_fail;
   {
-    arg1 = (svn_ra_session_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
+    arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11070,7 +11294,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_inherited_props(PyObject *SWIGUNUSEDPARM(s
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"OsO|OO:svn_ra_get_inherited_props",&obj0,&arg3,&obj2,&obj3,&obj4)) SWIG_fail;
   {
-    arg1 = (svn_ra_session_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
+    arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11158,7 +11382,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_has_capability(PyObject *SWIGUNUSEDPARM(self),
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_ra_has_capability",&obj0,&arg3,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_ra_session_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
+    arg1 = (svn_ra_session_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_session_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11358,7 +11582,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_name_set(PyObject *SWIGUNUSEDPARM(sel
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_ra_plugin_t_name_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11386,7 +11610,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_name_get(PyObject *SWIGUNUSEDPARM(sel
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_plugin_t_name_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11407,7 +11631,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_description_set(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_ra_plugin_t_description_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11435,7 +11659,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_description_get(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_plugin_t_description_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11457,7 +11681,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_open_set(PyObject *SWIGUNUSEDPARM(sel
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_plugin_t_open_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11484,7 +11708,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_open_get(PyObject *SWIGUNUSEDPARM(sel
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_plugin_t_open_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11506,7 +11730,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_get_latest_revnum_set(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_plugin_t_get_latest_revnum_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11533,7 +11757,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_get_latest_revnum_get(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_plugin_t_get_latest_revnum_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11555,7 +11779,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_get_dated_revision_set(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_plugin_t_get_dated_revision_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11582,7 +11806,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_get_dated_revision_get(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_plugin_t_get_dated_revision_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11604,7 +11828,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_change_rev_prop_set(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_plugin_t_change_rev_prop_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11631,7 +11855,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_change_rev_prop_get(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_plugin_t_change_rev_prop_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11653,7 +11877,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_rev_proplist_set(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_plugin_t_rev_proplist_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11680,7 +11904,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_rev_proplist_get(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_plugin_t_rev_proplist_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11702,7 +11926,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_rev_prop_set(PyObject *SWIGUNUSEDPARM
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_plugin_t_rev_prop_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11729,7 +11953,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_rev_prop_get(PyObject *SWIGUNUSEDPARM
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_plugin_t_rev_prop_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11751,7 +11975,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_get_commit_editor_set(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_plugin_t_get_commit_editor_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11778,7 +12002,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_get_commit_editor_get(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_plugin_t_get_commit_editor_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11800,7 +12024,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_get_file_set(PyObject *SWIGUNUSEDPARM
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_plugin_t_get_file_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11827,7 +12051,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_get_file_get(PyObject *SWIGUNUSEDPARM
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_plugin_t_get_file_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11849,7 +12073,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_get_dir_set(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_plugin_t_get_dir_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11876,7 +12100,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_get_dir_get(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_plugin_t_get_dir_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11898,7 +12122,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_do_update_set(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_plugin_t_do_update_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11925,7 +12149,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_do_update_get(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_plugin_t_do_update_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11947,7 +12171,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_do_switch_set(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_plugin_t_do_switch_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11974,7 +12198,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_do_switch_get(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_plugin_t_do_switch_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11996,7 +12220,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_do_status_set(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_plugin_t_do_status_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12023,7 +12247,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_do_status_get(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_plugin_t_do_status_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12045,7 +12269,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_do_diff_set(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_plugin_t_do_diff_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12072,7 +12296,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_do_diff_get(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_plugin_t_do_diff_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12094,7 +12318,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_get_log_set(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_plugin_t_get_log_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12121,7 +12345,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_get_log_get(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_plugin_t_get_log_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12143,7 +12367,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_check_path_set(PyObject *SWIGUNUSEDPA
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_plugin_t_check_path_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12170,7 +12394,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_check_path_get(PyObject *SWIGUNUSEDPA
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_plugin_t_check_path_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12192,7 +12416,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_get_uuid_set(PyObject *SWIGUNUSEDPARM
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_plugin_t_get_uuid_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12219,7 +12443,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_get_uuid_get(PyObject *SWIGUNUSEDPARM
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_plugin_t_get_uuid_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12241,7 +12465,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_get_repos_root_set(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_plugin_t_get_repos_root_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12268,7 +12492,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_get_repos_root_get(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_plugin_t_get_repos_root_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12290,7 +12514,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_get_locations_set(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_plugin_t_get_locations_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12317,7 +12541,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_get_locations_get(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_plugin_t_get_locations_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12339,7 +12563,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_get_file_revs_set(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_plugin_t_get_file_revs_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12366,7 +12590,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_get_file_revs_get(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_plugin_t_get_file_revs_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12388,7 +12612,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_get_version_set(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_plugin_t_get_version_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12415,7 +12639,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_t_get_version_get(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_plugin_t_get_version_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12441,7 +12665,7 @@ SWIGINTERN PyObject *_wrap_new_svn_ra_plugin_t(PyObject *SWIGUNUSEDPARM(self), P
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_ra_plugin_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_ra_plugin_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -12456,7 +12680,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_ra_plugin_t(PyObject *SWIGUNUSEDPARM(self)
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_ra_plugin_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (struct svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12527,7 +12751,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_init_ra_libs(PyObject *SWIGUNUSEDPARM(self), P
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -12599,7 +12823,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_get_ra_library(PyObject *SWIGUNUSEDPARM(self),
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_ra_plugin_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_ra_plugin_t,
         _global_py_pool, args))
     
     ;
@@ -12649,7 +12873,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter3_invoke_set_path(PyObject *SWIGUNUSED
   arg8 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOsOOOz|O:svn_ra_reporter3_invoke_set_path",&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&arg7,&obj7)) SWIG_fail;
   {
-    arg1 = (svn_ra_reporter3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_reporter3_t, svn_argnum_obj0);
+    arg1 = (svn_ra_reporter3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12738,7 +12962,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter3_invoke_delete_path(PyObject *SWIGUNU
   arg4 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOs|O:svn_ra_reporter3_invoke_delete_path",&obj0,&obj1,&arg3,&obj3)) SWIG_fail;
   {
-    arg1 = (svn_ra_reporter3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_reporter3_t, svn_argnum_obj0);
+    arg1 = (svn_ra_reporter3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12817,7 +13041,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter3_invoke_link_path(PyObject *SWIGUNUSE
   arg9 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOssOOOz|O:svn_ra_reporter3_invoke_link_path",&obj0,&obj1,&arg3,&arg4,&obj4,&obj5,&obj6,&arg8,&obj8)) SWIG_fail;
   {
-    arg1 = (svn_ra_reporter3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_reporter3_t, svn_argnum_obj0);
+    arg1 = (svn_ra_reporter3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12905,7 +13129,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter3_invoke_finish_report(PyObject *SWIGU
   arg3 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_ra_reporter3_invoke_finish_report",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_ra_reporter3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_reporter3_t, svn_argnum_obj0);
+    arg1 = (svn_ra_reporter3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12975,7 +13199,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter3_invoke_abort_report(PyObject *SWIGUN
   arg3 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_ra_reporter3_invoke_abort_report",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_ra_reporter3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_reporter3_t, svn_argnum_obj0);
+    arg1 = (svn_ra_reporter3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13051,7 +13275,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter2_invoke_set_path(PyObject *SWIGUNUSED
   arg7 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOsOOz|O:svn_ra_reporter2_invoke_set_path",&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6)) SWIG_fail;
   {
-    arg1 = (svn_ra_reporter2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_reporter2_t, svn_argnum_obj0);
+    arg1 = (svn_ra_reporter2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13134,7 +13358,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter2_invoke_delete_path(PyObject *SWIGUNU
   arg4 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOs|O:svn_ra_reporter2_invoke_delete_path",&obj0,&obj1,&arg3,&obj3)) SWIG_fail;
   {
-    arg1 = (svn_ra_reporter2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_reporter2_t, svn_argnum_obj0);
+    arg1 = (svn_ra_reporter2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13211,7 +13435,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter2_invoke_link_path(PyObject *SWIGUNUSE
   arg8 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOssOOz|O:svn_ra_reporter2_invoke_link_path",&obj0,&obj1,&arg3,&arg4,&obj4,&obj5,&arg7,&obj7)) SWIG_fail;
   {
-    arg1 = (svn_ra_reporter2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_reporter2_t, svn_argnum_obj0);
+    arg1 = (svn_ra_reporter2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13293,7 +13517,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter2_invoke_finish_report(PyObject *SWIGU
   arg3 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_ra_reporter2_invoke_finish_report",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_ra_reporter2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_reporter2_t, svn_argnum_obj0);
+    arg1 = (svn_ra_reporter2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13363,7 +13587,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter2_invoke_abort_report(PyObject *SWIGUN
   arg3 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_ra_reporter2_invoke_abort_report",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_ra_reporter2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_reporter2_t, svn_argnum_obj0);
+    arg1 = (svn_ra_reporter2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13438,7 +13662,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter_invoke_set_path(PyObject *SWIGUNUSEDP
   arg6 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOsOO|O:svn_ra_reporter_invoke_set_path",&obj0,&obj1,&arg3,&obj3,&obj4,&obj5)) SWIG_fail;
   {
-    arg1 = (svn_ra_reporter_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_reporter_t, svn_argnum_obj0);
+    arg1 = (svn_ra_reporter_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13521,7 +13745,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter_invoke_delete_path(PyObject *SWIGUNUS
   arg4 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOs|O:svn_ra_reporter_invoke_delete_path",&obj0,&obj1,&arg3,&obj3)) SWIG_fail;
   {
-    arg1 = (svn_ra_reporter_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_reporter_t, svn_argnum_obj0);
+    arg1 = (svn_ra_reporter_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13597,7 +13821,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter_invoke_link_path(PyObject *SWIGUNUSED
   arg7 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOssOO|O:svn_ra_reporter_invoke_link_path",&obj0,&obj1,&arg3,&arg4,&obj4,&obj5,&obj6)) SWIG_fail;
   {
-    arg1 = (svn_ra_reporter_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_reporter_t, svn_argnum_obj0);
+    arg1 = (svn_ra_reporter_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13679,7 +13903,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter_invoke_finish_report(PyObject *SWIGUN
   arg3 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_ra_reporter_invoke_finish_report",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_ra_reporter_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_reporter_t, svn_argnum_obj0);
+    arg1 = (svn_ra_reporter_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13749,7 +13973,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_reporter_invoke_abort_report(PyObject *SWIGUNU
   arg3 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_ra_reporter_invoke_abort_report",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_ra_reporter_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_reporter_t, svn_argnum_obj0);
+    arg1 = (svn_ra_reporter_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_reporter_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13822,7 +14046,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_invoke_open_tmp_file(PyObject *SWIG
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_ra_callbacks2_invoke_open_tmp_file",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_ra_callbacks2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_callbacks2_t, svn_argnum_obj0);
+    arg1 = (svn_ra_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_callbacks2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13863,7 +14087,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks2_invoke_open_tmp_file(PyObject *SWIG
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_apr_file_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_apr_file_t,
         _global_py_pool, args))
     
     ;
@@ -13901,7 +14125,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks_invoke_open_tmp_file(PyObject *SWIGU
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_ra_callbacks_invoke_open_tmp_file",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_ra_callbacks_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_callbacks_t, svn_argnum_obj0);
+    arg1 = (svn_ra_callbacks_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_callbacks_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13942,7 +14166,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_callbacks_invoke_open_tmp_file(PyObject *SWIGU
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_apr_file_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_apr_file_t,
         _global_py_pool, args))
     
     ;
@@ -13985,13 +14209,13 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_open(PyObject *SWIGUNUSEDPARM(se
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"OsOOO|O:svn_ra_plugin_invoke_open",&obj0,&arg3,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
-    arg1 = (svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (svn_ra_callbacks_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_ra_callbacks_t, svn_argnum_obj2);
+    arg4 = (svn_ra_callbacks_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_ra_callbacks_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14045,7 +14269,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_open(PyObject *SWIGUNUSEDPARM(se
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -14084,7 +14308,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_get_latest_revnum(PyObject *SWIG
   arg3 = &temp3;
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_ra_plugin_invoke_get_latest_revnum",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14166,7 +14390,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_get_dated_revision(PyObject *SWI
   arg3 = &temp3;
   if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_ra_plugin_invoke_get_dated_revision",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
-    arg1 = (svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14249,7 +14473,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_change_rev_prop(PyObject *SWIGUN
   arg6 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOOsO|O:svn_ra_plugin_invoke_change_rev_prop",&obj0,&obj1,&obj2,&arg4,&obj4,&obj5)) SWIG_fail;
   {
-    arg1 = (svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14343,7 +14567,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_rev_proplist(PyObject *SWIGUNUSE
   arg4 = &temp4;
   if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_ra_plugin_invoke_rev_proplist",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
-    arg1 = (svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14428,7 +14652,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_rev_prop(PyObject *SWIGUNUSEDPAR
   arg5 = &temp5;
   if (!PyArg_ParseTuple(args,(char *)"OOOs|O:svn_ra_plugin_invoke_rev_prop",&obj0,&obj1,&obj2,&arg4,&obj4)) SWIG_fail;
   {
-    arg1 = (svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14527,7 +14751,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_get_commit_editor(PyObject *SWIG
   arg4 = &temp4;
   if (!PyArg_ParseTuple(args,(char *)"OOsO|O:svn_ra_plugin_invoke_get_commit_editor",&obj0,&obj1,&arg5,&obj3,&obj4)) SWIG_fail;
   {
-    arg1 = (svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14572,13 +14796,13 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_get_commit_editor(PyObject *SWIG
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg3, SWIGTYPE_p_svn_delta_editor_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg3, SWIGTYPE_p_svn_delta_editor_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg4, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg4, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -14625,7 +14849,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_get_file(PyObject *SWIGUNUSEDPAR
   arg7 = &temp7;
   if (!PyArg_ParseTuple(args,(char *)"OOsOO|O:svn_ra_plugin_invoke_get_file",&obj0,&obj1,&arg3,&obj3,&obj4,&obj5)) SWIG_fail;
   {
-    arg1 = (svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14726,7 +14950,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_get_dir(PyObject *SWIGUNUSEDPARM
   arg7 = &temp7;
   if (!PyArg_ParseTuple(args,(char *)"OOsO|O:svn_ra_plugin_invoke_get_dir",&obj0,&obj1,&arg3,&obj3,&obj4)) SWIG_fail;
   {
-    arg1 = (svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14835,7 +15059,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_do_update(PyObject *SWIGUNUSEDPA
   arg4 = &temp4;
   if (!PyArg_ParseTuple(args,(char *)"OOOsOOO|O:svn_ra_plugin_invoke_do_update",&obj0,&obj1,&obj2,&arg6,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
-    arg1 = (svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14861,7 +15085,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_do_update(PyObject *SWIGUNUSEDPA
     }
   }
   {
-    arg8 = (svn_delta_editor_t *)svn_swig_MustGetPtr(obj5, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj5);
+    arg8 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj5, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj5);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14902,13 +15126,13 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_do_update(PyObject *SWIGUNUSEDPA
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg3, SWIGTYPE_p_svn_ra_reporter_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg3, SWIGTYPE_p_svn_ra_reporter_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg4, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg4, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -14959,7 +15183,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_do_switch(PyObject *SWIGUNUSEDPA
   arg4 = &temp4;
   if (!PyArg_ParseTuple(args,(char *)"OOOsOsOO|O:svn_ra_plugin_invoke_do_switch",&obj0,&obj1,&obj2,&arg6,&obj4,&arg8,&obj6,&obj7,&obj8)) SWIG_fail;
   {
-    arg1 = (svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14985,7 +15209,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_do_switch(PyObject *SWIGUNUSEDPA
     }
   }
   {
-    arg9 = (svn_delta_editor_t *)svn_swig_MustGetPtr(obj6, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj6);
+    arg9 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj6, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj6);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15026,13 +15250,13 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_do_switch(PyObject *SWIGUNUSEDPA
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg3, SWIGTYPE_p_svn_ra_reporter_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg3, SWIGTYPE_p_svn_ra_reporter_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg4, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg4, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -15082,7 +15306,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_do_status(PyObject *SWIGUNUSEDPA
   arg4 = &temp4;
   if (!PyArg_ParseTuple(args,(char *)"OOsOOOO|O:svn_ra_plugin_invoke_do_status",&obj0,&obj1,&arg5,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
-    arg1 = (svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15108,7 +15332,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_do_status(PyObject *SWIGUNUSEDPA
     }
   }
   {
-    arg8 = (svn_delta_editor_t *)svn_swig_MustGetPtr(obj5, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj5);
+    arg8 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj5, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj5);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15149,13 +15373,13 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_do_status(PyObject *SWIGUNUSEDPA
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg3, SWIGTYPE_p_svn_ra_reporter_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg3, SWIGTYPE_p_svn_ra_reporter_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg4, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg4, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -15208,7 +15432,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_do_diff(PyObject *SWIGUNUSEDPARM
   arg4 = &temp4;
   if (!PyArg_ParseTuple(args,(char *)"OOOsOOsOO|O:svn_ra_plugin_invoke_do_diff",&obj0,&obj1,&obj2,&arg6,&obj4,&obj5,&arg9,&obj7,&obj8,&obj9)) SWIG_fail;
   {
-    arg1 = (svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15240,7 +15464,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_do_diff(PyObject *SWIGUNUSEDPARM
     }
   }
   {
-    arg10 = (svn_delta_editor_t *)svn_swig_MustGetPtr(obj7, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj7);
+    arg10 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj7, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj7);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15281,13 +15505,13 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_do_diff(PyObject *SWIGUNUSEDPARM
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg3, SWIGTYPE_p_svn_ra_reporter_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg3, SWIGTYPE_p_svn_ra_reporter_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg4, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg4, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -15335,7 +15559,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_get_log(PyObject *SWIGUNUSEDPARM
   arg10 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOOO|O:svn_ra_plugin_invoke_get_log",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   {
-    arg1 = (svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15382,7 +15606,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_get_log(PyObject *SWIGUNUSEDPARM
     }
   }
   {
-    arg8 = svn_swig_py_log_receiver;
+    arg8 = (svn_log_message_receiver_t) svn_swig_py_log_receiver;
     arg9 = obj7;
   }
   if (obj8) {
@@ -15449,7 +15673,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_check_path(PyObject *SWIGUNUSEDP
   arg5 = &temp5;
   if (!PyArg_ParseTuple(args,(char *)"OOsO|O:svn_ra_plugin_invoke_check_path",&obj0,&obj1,&arg3,&obj3,&obj4)) SWIG_fail;
   {
-    arg1 = (svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15534,7 +15758,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_get_uuid(PyObject *SWIGUNUSEDPAR
   arg3 = &temp3;
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_ra_plugin_invoke_get_uuid",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15620,7 +15844,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_get_repos_root(PyObject *SWIGUNU
   arg3 = &temp3;
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_ra_plugin_invoke_get_repos_root",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15711,7 +15935,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_get_locations(PyObject *SWIGUNUS
   arg3 = &temp3;
   if (!PyArg_ParseTuple(args,(char *)"OOsOO|O:svn_ra_plugin_invoke_get_locations",&obj0,&obj1,&arg4,&obj3,&obj4,&obj5)) SWIG_fail;
   {
-    arg1 = (svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15807,7 +16031,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_get_file_revs(PyObject *SWIGUNUS
   arg8 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOsOOO|O:svn_ra_plugin_invoke_get_file_revs",&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
-    arg1 = (svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15833,7 +16057,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_get_file_revs(PyObject *SWIGUNUS
     }
   }
   {
-    arg6 = svn_swig_py_ra_file_rev_handler_func;
+    arg6 = (svn_ra_file_rev_handler_t) svn_swig_py_ra_file_rev_handler_func;
     arg7 = obj5;
   }
   if (obj6) {
@@ -15883,7 +16107,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_get_version(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_ra_plugin_invoke_get_version",&obj0)) SWIG_fail;
   {
-    arg1 = (svn_ra_plugin_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
+    arg1 = (svn_ra_plugin_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_ra_plugin_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15896,7 +16120,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_plugin_invoke_get_version(PyObject *SWIGUNUSED
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_version_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_version_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -15928,7 +16152,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_invoke_get_wc_prop_func(PyObject *SWIGUNUSEDPA
   if (!PyArg_ParseTuple(args,(char *)"OOss|O:svn_ra_invoke_get_wc_prop_func",&obj0,&obj1,&arg3,&arg4,&obj4)) SWIG_fail;
   {
     svn_ra_get_wc_prop_func_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16018,7 +16242,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_invoke_set_wc_prop_func(PyObject *SWIGUNUSEDPA
   if (!PyArg_ParseTuple(args,(char *)"OOssO|O:svn_ra_invoke_set_wc_prop_func",&obj0,&obj1,&arg3,&arg4,&obj4,&obj5)) SWIG_fail;
   {
     svn_ra_set_wc_prop_func_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16108,7 +16332,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_invoke_push_wc_prop_func(PyObject *SWIGUNUSEDP
   if (!PyArg_ParseTuple(args,(char *)"OOssO|O:svn_ra_invoke_push_wc_prop_func",&obj0,&obj1,&arg3,&arg4,&obj4,&obj5)) SWIG_fail;
   {
     svn_ra_push_wc_prop_func_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16195,7 +16419,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_invoke_invalidate_wc_props_func(PyObject *SWIG
   if (!PyArg_ParseTuple(args,(char *)"OOss|O:svn_ra_invoke_invalidate_wc_props_func",&obj0,&obj1,&arg3,&arg4,&obj4)) SWIG_fail;
   {
     svn_ra_invalidate_wc_props_func_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16272,7 +16496,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_invoke_get_wc_contents_func(PyObject *SWIGUNUS
   if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_ra_invoke_get_wc_contents_func",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     svn_ra_get_wc_contents_func_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void_p_p_svn_stream_t_p_q_const__svn_checksum_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_p_svn_stream_t_p_q_const__svn_checksum_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16287,7 +16511,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_invoke_get_wc_contents_func(PyObject *SWIGUNUS
     }
   }
   {
-    arg4 = (svn_checksum_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_checksum_t, svn_argnum_obj2);
+    arg4 = (svn_checksum_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_checksum_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16320,7 +16544,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_invoke_get_wc_contents_func(PyObject *SWIGUNUS
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg3, SWIGTYPE_p_svn_stream_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg3, SWIGTYPE_p_svn_stream_t,
         _global_py_pool, args))
     
     ;
@@ -16352,7 +16576,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_invoke_get_latest_revnum_func(PyObject *SWIGUN
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_ra_invoke_get_latest_revnum_func",&obj0,&obj1)) SWIG_fail;
   {
     svn_ra_get_latest_revnum_func_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void_p_svn_revnum_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_svn_revnum_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16419,7 +16643,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_invoke_get_client_string_func(PyObject *SWIGUN
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_ra_invoke_get_client_string_func",&obj0,&obj1,&obj2)) SWIG_fail;
   {
     svn_ra_get_client_string_func_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void_p_p_q_const__char_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_p_q_const__char_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16525,7 +16749,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_invoke_file_rev_handler(PyObject *SWIGUNUSEDPA
   if (!PyArg_ParseTuple(args,(char *)"OOsOOO|O:svn_ra_invoke_file_rev_handler",&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
     svn_ra_file_rev_handler_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16546,13 +16770,13 @@ SWIGINTERN PyObject *_wrap_svn_ra_invoke_file_rev_handler(PyObject *SWIGUNUSEDPA
     }
   }
   {
-    arg5 = (apr_hash_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_apr_hash_t, svn_argnum_obj4);
+    arg5 = (apr_hash_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_apr_hash_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg8 = (apr_array_header_t *)svn_swig_MustGetPtr(obj5, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj5);
+    arg8 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj5, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj5);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16585,13 +16809,13 @@ SWIGINTERN PyObject *_wrap_svn_ra_invoke_file_rev_handler(PyObject *SWIGUNUSEDPA
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(arg6, SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(arg6, SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg7, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg7, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -16634,7 +16858,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_invoke_lock_callback(PyObject *SWIGUNUSEDPARM(
   if (!PyArg_ParseTuple(args,(char *)"OOsOOO|O:svn_ra_invoke_lock_callback",&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
     svn_ra_lock_callback_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_svn_boolean_t_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_svn_boolean_t_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16655,13 +16879,13 @@ SWIGINTERN PyObject *_wrap_svn_ra_invoke_lock_callback(PyObject *SWIGUNUSEDPARM(
     }
   }
   {
-    arg5 = (svn_lock_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_lock_t, svn_argnum_obj4);
+    arg5 = (svn_lock_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_lock_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg6 = (svn_error_t *)svn_swig_MustGetPtr(obj5, SWIGTYPE_p_svn_error_t, svn_argnum_obj5);
+    arg6 = (svn_error_t *)svn_swig_py_must_get_ptr(obj5, SWIGTYPE_p_svn_error_t, svn_argnum_obj5);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16727,7 +16951,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_invoke_progress_notify_func(PyObject *SWIGUNUS
   if (!PyArg_ParseTuple(args,(char *)"OOOO|O:svn_ra_invoke_progress_notify_func",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     svn_ra_progress_notify_func_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_apr_off_t_apr_off_t_p_void_p_apr_pool_t__void, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_apr_off_t_apr_off_t_p_void_p_apr_pool_t__void, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16801,7 +17025,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_invoke_replay_revstart_callback(PyObject *SWIG
   if (!PyArg_ParseTuple(args,(char *)"OOOO|O:svn_ra_invoke_replay_revstart_callback",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     svn_ra_replay_revstart_callback_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_svn_revnum_t_p_void_p_p_q_const__svn_delta_editor_t_p_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_svn_revnum_t_p_void_p_p_q_const__svn_delta_editor_t_p_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16822,7 +17046,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_invoke_replay_revstart_callback(PyObject *SWIG
     }
   }
   {
-    arg6 = (apr_hash_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_apr_hash_t, svn_argnum_obj3);
+    arg6 = (apr_hash_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_apr_hash_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16855,13 +17079,13 @@ SWIGINTERN PyObject *_wrap_svn_ra_invoke_replay_revstart_callback(PyObject *SWIG
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg4, SWIGTYPE_p_svn_delta_editor_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg4, SWIGTYPE_p_svn_delta_editor_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg5, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg5, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -16905,7 +17129,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_invoke_replay_revfinish_callback(PyObject *SWI
   if (!PyArg_ParseTuple(args,(char *)"OOOOOO|O:svn_ra_invoke_replay_revfinish_callback",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
     svn_ra_replay_revfinish_callback_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_svn_revnum_t_p_void_p_q_const__svn_delta_editor_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_svn_revnum_t_p_void_p_q_const__svn_delta_editor_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16926,7 +17150,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_invoke_replay_revfinish_callback(PyObject *SWI
     }
   }
   {
-    arg4 = (svn_delta_editor_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj3);
+    arg4 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16940,7 +17164,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_invoke_replay_revfinish_callback(PyObject *SWI
     }
   }
   {
-    arg6 = (apr_hash_t *)svn_swig_MustGetPtr(obj5, SWIGTYPE_p_apr_hash_t, svn_argnum_obj5);
+    arg6 = (apr_hash_t *)svn_swig_py_must_get_ptr(obj5, SWIGTYPE_p_apr_hash_t, svn_argnum_obj5);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16984,6 +17208,233 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_ra_invoke_check_tunnel_func(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  svn_ra_check_tunnel_func_t arg1 = (svn_ra_check_tunnel_func_t) 0 ;
+  void *arg2 = (void *) 0 ;
+  char *arg3 = (char *) 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  svn_boolean_t result;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOs:svn_ra_invoke_check_tunnel_func",&obj0,&obj1,&arg3)) SWIG_fail;
+  {
+    svn_ra_check_tunnel_func_t * tmp =
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char__int, svn_argnum_obj0);
+    if (tmp == NULL || PyErr_Occurred()) {
+      SWIG_fail;
+    }
+    arg1 = *tmp;
+  }
+  {
+    if (obj1 == Py_None) {
+      arg2 = NULL;
+    } else if (SWIG_ConvertPtr(obj1, (void **) &arg2, 0, 0) == -1) {
+      arg2 = (void *) obj1;
+      PyErr_Clear();
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_boolean_t)svn_ra_invoke_check_tunnel_func(arg1,arg2,(char const *)arg3);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  resultobj = SWIG_From_long((long)(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_svn_ra_invoke_close_tunnel_func(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  svn_ra_close_tunnel_func_t arg1 = (svn_ra_close_tunnel_func_t) 0 ;
+  void *arg2 = (void *) 0 ;
+  void *arg3 = (void *) 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:svn_ra_invoke_close_tunnel_func",&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    svn_ra_close_tunnel_func_t * tmp =
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_void__void, svn_argnum_obj0);
+    if (tmp == NULL || PyErr_Occurred()) {
+      SWIG_fail;
+    }
+    arg1 = *tmp;
+  }
+  {
+    if (obj1 == Py_None) {
+      arg2 = NULL;
+    } else if (SWIG_ConvertPtr(obj1, (void **) &arg2, 0, 0) == -1) {
+      arg2 = (void *) obj1;
+      PyErr_Clear();
+    }
+  }
+  {
+    if (obj2 == Py_None) {
+      arg3 = NULL;
+    } else if (SWIG_ConvertPtr(obj2, (void **) &arg3, 0, 0) == -1) {
+      arg3 = (void *) obj2;
+      PyErr_Clear();
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    svn_ra_invoke_close_tunnel_func(arg1,arg2,arg3);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_svn_ra_invoke_open_tunnel_func(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  svn_ra_open_tunnel_func_t arg1 = (svn_ra_open_tunnel_func_t) 0 ;
+  svn_stream_t **arg2 = (svn_stream_t **) 0 ;
+  svn_stream_t **arg3 = (svn_stream_t **) 0 ;
+  svn_ra_close_tunnel_func_t *arg4 = (svn_ra_close_tunnel_func_t *) 0 ;
+  void **arg5 = (void **) 0 ;
+  void *arg6 = (void *) 0 ;
+  char *arg7 = (char *) 0 ;
+  char *arg8 = (char *) 0 ;
+  char *arg9 = (char *) 0 ;
+  int arg10 ;
+  svn_cancel_func_t arg11 = (svn_cancel_func_t) 0 ;
+  void *arg12 = (void *) 0 ;
+  apr_pool_t *arg13 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  svn_stream_t *temp2 ;
+  svn_stream_t *temp3 ;
+  void *temp5 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj5 = 0 ;
+  PyObject * obj6 = 0 ;
+  PyObject * obj7 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg13 = _global_pool;
+  arg2 = &temp2;
+  arg3 = &temp3;
+  {
+    if (_global_pool == NULL)
+    {
+      if (svn_swig_py_get_parent_pool(args, SWIGTYPE_p_apr_pool_t,
+          &_global_py_pool, &_global_pool))
+      SWIG_fail;
+    }
+    arg4 = (svn_ra_close_tunnel_func_t *) apr_pcalloc(_global_pool, sizeof(svn_ra_close_tunnel_func_t));
+    if (arg4 == NULL) SWIG_fail;
+  }
+  arg5 = &temp5;
+  if (!PyArg_ParseTuple(args,(char *)"OOsssOO|O:svn_ra_invoke_open_tunnel_func",&obj0,&obj1,&arg7,&arg8,&arg9,&obj5,&obj6,&obj7)) SWIG_fail;
+  {
+    svn_ra_open_tunnel_func_t * tmp =
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    if (tmp == NULL || PyErr_Occurred()) {
+      SWIG_fail;
+    }
+    arg1 = *tmp;
+  }
+  {
+    if (obj1 == Py_None) {
+      arg6 = NULL;
+    } else if (SWIG_ConvertPtr(obj1, (void **) &arg6, 0, 0) == -1) {
+      arg6 = (void *) obj1;
+      PyErr_Clear();
+    }
+  }
+  {
+    arg10 = (int)SWIG_As_long (obj5);
+    if (SWIG_arg_fail(svn_argnum_obj5)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg11 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg12 = obj6;
+  }
+  if (obj7) {
+    /* Verify that the user supplied a valid pool */
+    if (obj7 != Py_None && obj7 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj7);
+      SWIG_arg_fail(svn_argnum_obj7);
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_ra_invoke_open_tunnel_func(arg1,arg2,arg3,arg4,arg5,arg6,(char const *)arg7,(char const *)arg8,(char const *)arg9,arg10,arg11,arg12,arg13);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  {
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_svn_stream_t,
+        _global_py_pool, args))
+    
+    ;
+  }
+  {
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg3, SWIGTYPE_p_svn_stream_t,
+        _global_py_pool, args))
+    
+    ;
+  }
+  {
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(arg4, SWIGTYPE_p_p_f_p_void_p_void__void,
+        _global_py_pool, args))
+    
+    ;
+  }
+  {
+    /* FIXME: Missing argout typemap: svn_ra_invoke_open_tunnel_func arg 5 (void **) */
+    
+    
+    
+    
+    SWIG_exception(SWIG_ValueError, "svn_ra_invoke_open_tunnel_func is not implemented yet");
+    
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_svn_ra_invoke_init_func(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   svn_ra_init_func_t arg1 = (svn_ra_init_func_t) 0 ;
@@ -17005,7 +17456,7 @@ SWIGINTERN PyObject *_wrap_svn_ra_invoke_init_func(PyObject *SWIGUNUSEDPARM(self
   if (!PyArg_ParseTuple(args,(char *)"OO|OO:svn_ra_invoke_init_func",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     svn_ra_init_func_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_int_p_apr_pool_t_p_apr_hash_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_int_p_apr_pool_t_p_apr_hash_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17155,6 +17606,27 @@ SWIGINTERN PyObject *svn_ra_replay_revfinish_callback_t_swigregister(PyObject *S
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *svn_ra_check_tunnel_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_void_p_q_const__char__int, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *svn_ra_close_tunnel_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_void_p_void__void, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *svn_ra_open_tunnel_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
 SWIGINTERN PyObject *svn_ra_init_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
@@ -17226,6 +17698,12 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"svn_ra_callbacks2_t_get_client_string_get", _wrap_svn_ra_callbacks2_t_get_client_string_get, METH_VARARGS, (char *)"svn_ra_callbacks2_t_get_client_string_get(svn_ra_callbacks2_t self) -> svn_ra_get_client_string_func_t"},
 	 { (char *)"svn_ra_callbacks2_t_get_wc_contents_set", _wrap_svn_ra_callbacks2_t_get_wc_contents_set, METH_VARARGS, (char *)"svn_ra_callbacks2_t_get_wc_contents_set(svn_ra_callbacks2_t self, svn_ra_get_wc_contents_func_t get_wc_contents)"},
 	 { (char *)"svn_ra_callbacks2_t_get_wc_contents_get", _wrap_svn_ra_callbacks2_t_get_wc_contents_get, METH_VARARGS, (char *)"svn_ra_callbacks2_t_get_wc_contents_get(svn_ra_callbacks2_t self) -> svn_ra_get_wc_contents_func_t"},
+	 { (char *)"svn_ra_callbacks2_t_check_tunnel_func_set", _wrap_svn_ra_callbacks2_t_check_tunnel_func_set, METH_VARARGS, (char *)"svn_ra_callbacks2_t_check_tunnel_func_set(svn_ra_callbacks2_t self, svn_ra_check_tunnel_func_t check_tunnel_func)"},
+	 { (char *)"svn_ra_callbacks2_t_check_tunnel_func_get", _wrap_svn_ra_callbacks2_t_check_tunnel_func_get, METH_VARARGS, (char *)"svn_ra_callbacks2_t_check_tunnel_func_get(svn_ra_callbacks2_t self) -> svn_ra_check_tunnel_func_t"},
+	 { (char *)"svn_ra_callbacks2_t_open_tunnel_func_set", _wrap_svn_ra_callbacks2_t_open_tunnel_func_set, METH_VARARGS, (char *)"svn_ra_callbacks2_t_open_tunnel_func_set(svn_ra_callbacks2_t self, svn_ra_open_tunnel_func_t open_tunnel_func)"},
+	 { (char *)"svn_ra_callbacks2_t_open_tunnel_func_get", _wrap_svn_ra_callbacks2_t_open_tunnel_func_get, METH_VARARGS, (char *)"svn_ra_callbacks2_t_open_tunnel_func_get(svn_ra_callbacks2_t self) -> svn_ra_open_tunnel_func_t"},
+	 { (char *)"svn_ra_callbacks2_t_tunnel_baton_set", _wrap_svn_ra_callbacks2_t_tunnel_baton_set, METH_VARARGS, (char *)"svn_ra_callbacks2_t_tunnel_baton_set(svn_ra_callbacks2_t self, void * tunnel_baton)"},
+	 { (char *)"svn_ra_callbacks2_t_tunnel_baton_get", _wrap_svn_ra_callbacks2_t_tunnel_baton_get, METH_VARARGS, (char *)"svn_ra_callbacks2_t_tunnel_baton_get(svn_ra_callbacks2_t self) -> void *"},
 	 { (char *)"new_svn_ra_callbacks2_t", _wrap_new_svn_ra_callbacks2_t, METH_VARARGS, (char *)"new_svn_ra_callbacks2_t() -> svn_ra_callbacks2_t"},
 	 { (char *)"delete_svn_ra_callbacks2_t", _wrap_delete_svn_ra_callbacks2_t, METH_VARARGS, (char *)"delete_svn_ra_callbacks2_t(svn_ra_callbacks2_t self)"},
 	 { (char *)"svn_ra_callbacks2_t_swigregister", svn_ra_callbacks2_t_swigregister, METH_VARARGS, NULL},
@@ -17618,6 +18096,13 @@ static PyMethodDef SwigMethods[] = {
 		"svn_ra_invoke_replay_revfinish_callback(svn_ra_replay_revfinish_callback_t _obj, svn_revnum_t revision, void * replay_baton, \n"
 		"    svn_delta_editor_t editor, void * edit_baton, apr_hash_t rev_props, apr_pool_t pool) -> svn_error_t\n"
 		""},
+	 { (char *)"svn_ra_invoke_check_tunnel_func", _wrap_svn_ra_invoke_check_tunnel_func, METH_VARARGS, (char *)"svn_ra_invoke_check_tunnel_func(svn_ra_check_tunnel_func_t _obj, void * tunnel_baton, char const * tunnel_name) -> svn_boolean_t"},
+	 { (char *)"svn_ra_invoke_close_tunnel_func", _wrap_svn_ra_invoke_close_tunnel_func, METH_VARARGS, (char *)"svn_ra_invoke_close_tunnel_func(svn_ra_close_tunnel_func_t _obj, void * close_baton, void * tunnel_baton)"},
+	 { (char *)"svn_ra_invoke_open_tunnel_func", _wrap_svn_ra_invoke_open_tunnel_func, METH_VARARGS, (char *)"\n"
+		"svn_ra_invoke_open_tunnel_func(svn_ra_open_tunnel_func_t _obj, void * tunnel_baton, char const * tunnel_name, char const * user, \n"
+		"    char const * hostname, int port, svn_cancel_func_t cancel_func, \n"
+		"    apr_pool_t pool) -> svn_error_t\n"
+		""},
 	 { (char *)"svn_ra_invoke_init_func", _wrap_svn_ra_invoke_init_func, METH_VARARGS, (char *)"svn_ra_invoke_init_func(svn_ra_init_func_t _obj, int abi_version, apr_pool_t pool, apr_hash_t hash) -> svn_error_t"},
 	 { (char *)"svn_ra_get_wc_prop_func_t_swigregister", svn_ra_get_wc_prop_func_t_swigregister, METH_VARARGS, NULL},
 	 { (char *)"svn_ra_set_wc_prop_func_t_swigregister", svn_ra_set_wc_prop_func_t_swigregister, METH_VARARGS, NULL},
@@ -17631,6 +18116,9 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"svn_ra_progress_notify_func_t_swigregister", svn_ra_progress_notify_func_t_swigregister, METH_VARARGS, NULL},
 	 { (char *)"svn_ra_replay_revstart_callback_t_swigregister", svn_ra_replay_revstart_callback_t_swigregister, METH_VARARGS, NULL},
 	 { (char *)"svn_ra_replay_revfinish_callback_t_swigregister", svn_ra_replay_revfinish_callback_t_swigregister, METH_VARARGS, NULL},
+	 { (char *)"svn_ra_check_tunnel_func_t_swigregister", svn_ra_check_tunnel_func_t_swigregister, METH_VARARGS, NULL},
+	 { (char *)"svn_ra_close_tunnel_func_t_swigregister", svn_ra_close_tunnel_func_t_swigregister, METH_VARARGS, NULL},
+	 { (char *)"svn_ra_open_tunnel_func_t_swigregister", svn_ra_open_tunnel_func_t_swigregister, METH_VARARGS, NULL},
 	 { (char *)"svn_ra_init_func_t_swigregister", svn_ra_init_func_t_swigregister, METH_VARARGS, NULL},
 	 { NULL, NULL, 0, NULL }
 };
@@ -17650,6 +18138,7 @@ static swig_type_info _swigt__p_f_apr_off_t_apr_off_t_p_void_p_apr_pool_t__void
 static swig_type_info _swigt__p_f_int_p_apr_pool_t_p_apr_hash_t__p_svn_error_t = {"_p_f_int_p_apr_pool_t_p_apr_hash_t__p_svn_error_t", "struct svn_error_t *(*)(int,apr_pool_t *,apr_hash_t *)|svn_ra_init_func_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|struct svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_p_apr_file_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_apr_file_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(apr_file_t **,void *,apr_pool_t *)|struct svn_error_t *(*)(apr_file_t **,void *,apr_pool_t *)", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_ra_open_tunnel_func_t|struct svn_error_t *(*)(svn_stream_t **,svn_stream_t **,svn_ra_close_tunnel_func_t *,void **,void *,char const *,char const *,char const *,int,svn_cancel_func_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_p_void_p_q_const__char_p_q_const__svn_ra_callbacks_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_void_p_q_const__char_p_q_const__svn_ra_callbacks_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void **,char const *,svn_ra_callbacks_t const *,void *,apr_hash_t *,apr_pool_t *)|svn_error_t *(*)(void **,char const *,svn_ra_callbacks_t const *,void *,apr_hash_t *,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_commit_callback2_t|struct svn_error_t *(*)(svn_commit_info_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_location_segment_t *,void *,apr_pool_t *)|svn_location_segment_receiver_t", 0, 0, (void*)0, 0};
@@ -17665,6 +18154,7 @@ static swig_type_info _swigt__p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void
 static swig_type_info _swigt__p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_ra_reporter_t const **,void **,svn_revnum_t,char const *,svn_boolean_t,svn_boolean_t,char const *,svn_delta_editor_t const *,void *,apr_pool_t *)|struct svn_error_t *(*)(void *,svn_ra_reporter_t const **,void **,svn_revnum_t,char const *,svn_boolean_t,svn_boolean_t,char const *,svn_delta_editor_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_p_svn_stream_t_p_q_const__svn_checksum_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_svn_stream_t_p_q_const__svn_checksum_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_stream_t **,svn_checksum_t const *,apr_pool_t *)|svn_ra_get_wc_contents_func_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__apr_array_header_t_svn_revnum_t_svn_revnum_t_svn_boolean_t_svn_boolean_t_svn_log_message_receiver_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__apr_array_header_t_svn_revnum_t_svn_revnum_t_svn_boolean_t_svn_boolean_t_svn_log_message_receiver_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_array_header_t const *,svn_revnum_t,svn_revnum_t,svn_boolean_t,svn_boolean_t,svn_log_message_receiver_t,void *,apr_pool_t *)|struct svn_error_t *(*)(void *,apr_array_header_t const *,svn_revnum_t,svn_revnum_t,svn_boolean_t,svn_boolean_t,svn_log_message_receiver_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_f_p_void_p_q_const__char__int = {"_p_f_p_void_p_q_const__char__int", "int (*)(void *,char const *)|svn_ra_check_tunnel_func_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,apr_pool_t *)|struct svn_error_t *(*)(void *,char const *,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,char const *,apr_pool_t *)|svn_ra_invalidate_wc_props_func_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,char const *,svn_string_t const **,apr_pool_t *)|svn_ra_get_wc_prop_func_t", 0, 0, (void*)0, 0};
@@ -17686,6 +18176,7 @@ static swig_type_info _swigt__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_e
 static swig_type_info _swigt__p_f_p_void_p_svn_revnum_t__p_svn_error_t = {"_p_f_p_void_p_svn_revnum_t__p_svn_error_t", "svn_ra_get_latest_revnum_func_t|struct svn_error_t *(*)(void *,svn_revnum_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_svn_revnum_t_apr_time_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_revnum_t_apr_time_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_revnum_t *,apr_time_t,apr_pool_t *)|struct svn_error_t *(*)(void *,svn_revnum_t *,apr_time_t,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_svn_revnum_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_revnum_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_revnum_t *,apr_pool_t *)|struct svn_error_t *(*)(void *,svn_revnum_t *,apr_pool_t *)", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_f_p_void_p_void__void = {"_p_f_p_void_p_void__void", "svn_ra_close_tunnel_func_t|void (*)(void *,void *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_revnum_t,apr_hash_t **,apr_pool_t *)|svn_error_t *(*)(void *,svn_revnum_t,apr_hash_t **,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_svn_revnum_t_p_q_const__char_p_p_svn_string_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_svn_revnum_t_p_q_const__char_p_p_svn_string_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_revnum_t,char const *,svn_string_t **,apr_pool_t *)|svn_error_t *(*)(void *,svn_revnum_t,char const *,svn_string_t **,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_svn_revnum_t_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_svn_revnum_t_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_revnum_t,char const *,svn_string_t const *,apr_pool_t *)|svn_error_t *(*)(void *,svn_revnum_t,char const *,svn_string_t const *,apr_pool_t *)", 0, 0, (void*)0, 0};
@@ -17701,10 +18192,12 @@ static swig_type_info _swigt__p_p_apr_hash_t = {"_p_p_apr_hash_t", "apr_hash_t *
 static swig_type_info _swigt__p_p_char = {"_p_p_char", "char **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_f_apr_off_t_apr_off_t_p_void_p_apr_pool_t__void = {"_p_p_f_apr_off_t_apr_off_t_p_void_p_apr_pool_t__void", "void (**)(apr_off_t,apr_off_t,void *,apr_pool_t *)|svn_ra_progress_notify_func_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_f_int_p_apr_pool_t_p_apr_hash_t__p_svn_error_t = {"_p_p_f_int_p_apr_pool_t_p_apr_hash_t__p_svn_error_t", "svn_ra_init_func_t *|struct svn_error_t *(**)(int,apr_pool_t *,apr_hash_t *)", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(svn_stream_t **,svn_stream_t **,svn_ra_close_tunnel_func_t *,void **,void *,char const *,char const *,char const *,int,svn_cancel_func_t,void *,apr_pool_t *)|svn_ra_open_tunnel_func_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t = {"_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t", "svn_txdelta_window_handler_t *|struct svn_error_t *(**)(svn_txdelta_window_t *,void *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_f_p_void__p_svn_error_t = {"_p_p_f_p_void__p_svn_error_t", "svn_cancel_func_t *|struct svn_error_t *(**)(void *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_f_p_void_p_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_ra_get_client_string_func_t *|struct svn_error_t *(**)(void *,char const **,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_f_p_void_p_p_svn_stream_t_p_q_const__svn_checksum_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_p_svn_stream_t_p_q_const__svn_checksum_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(void *,svn_stream_t **,svn_checksum_t const *,apr_pool_t *)|svn_ra_get_wc_contents_func_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_p_f_p_void_p_q_const__char__int = {"_p_p_f_p_void_p_q_const__char__int", "int (**)(void *,char const *)|svn_ra_check_tunnel_func_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(void *,char const *,char const *,apr_pool_t *)|svn_ra_invalidate_wc_props_func_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(void *,char const *,char const *,svn_string_t const **,apr_pool_t *)|svn_ra_get_wc_prop_func_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(void *,char const *,char const *,svn_string_t const *,apr_pool_t *)|svn_ra_set_wc_prop_func_t *|svn_ra_push_wc_prop_func_t *", 0, 0, (void*)0, 0};
@@ -17712,6 +18205,7 @@ static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_svn_boolean_t_p_q_con
 static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)|svn_ra_file_rev_handler_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_boolean_t,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)|svn_file_rev_handler_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_f_p_void_p_svn_revnum_t__p_svn_error_t = {"_p_p_f_p_void_p_svn_revnum_t__p_svn_error_t", "struct svn_error_t *(**)(void *,svn_revnum_t *)|svn_ra_get_latest_revnum_func_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_p_f_p_void_p_void__void = {"_p_p_f_p_void_p_void__void", "svn_ra_close_tunnel_func_t *|void (**)(void *,void *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_f_svn_revnum_t_p_void_p_p_q_const__svn_delta_editor_t_p_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_svn_revnum_t_p_void_p_p_q_const__svn_delta_editor_t_p_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "svn_ra_replay_revstart_callback_t *|struct svn_error_t *(**)(svn_revnum_t,void *,svn_delta_editor_t const **,void **,apr_hash_t *,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_f_svn_revnum_t_p_void_p_q_const__svn_delta_editor_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_svn_revnum_t_p_void_p_q_const__svn_delta_editor_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "svn_ra_replay_revfinish_callback_t *|struct svn_error_t *(**)(svn_revnum_t,void *,svn_delta_editor_t const *,void *,apr_hash_t *,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_svn_delta_editor_t = {"_p_p_svn_delta_editor_t", "struct svn_delta_editor_t **|svn_delta_editor_t **", 0, 0, (void*)0, 0};
@@ -17744,9 +18238,11 @@ static swig_type_info _swigt__p_svn_commit_info_t = {"_p_svn_commit_info_t", "st
 static swig_type_info _swigt__p_svn_config_t = {"_p_svn_config_t", "struct svn_config_t *|svn_config_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_delta_editor_t = {"_p_svn_delta_editor_t", "struct svn_delta_editor_t *|svn_delta_editor_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_depth_t = {"_p_svn_depth_t", "enum svn_depth_t *|svn_depth_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_diff_hunk_t = {"_p_svn_diff_hunk_t", "svn_diff_hunk_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_dirent_t = {"_p_svn_dirent_t", "struct svn_dirent_t *|svn_dirent_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_errno_t = {"_p_svn_errno_t", "enum svn_errno_t *|svn_errno_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "struct svn_error_t *|svn_error_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_fs_lock_target_t = {"_p_svn_fs_lock_target_t", "svn_fs_lock_target_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_io_dirent2_t = {"_p_svn_io_dirent2_t", "struct svn_io_dirent2_t *|svn_io_dirent2_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_io_dirent_t = {"_p_svn_io_dirent_t", "struct svn_io_dirent_t *|svn_io_dirent_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_io_file_del_t = {"_p_svn_io_file_del_t", "enum svn_io_file_del_t *|svn_io_file_del_t *", 0, 0, (void*)0, 0};
@@ -17802,6 +18298,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_f_int_p_apr_pool_t_p_apr_hash_t__p_svn_error_t,
   &_swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_p_apr_file_t_p_void_p_apr_pool_t__p_svn_error_t,
+  &_swigt__p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_p_void_p_q_const__char_p_q_const__svn_ra_callbacks_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t,
@@ -17817,6 +18314,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_p_svn_stream_t_p_q_const__svn_checksum_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_q_const__apr_array_header_t_svn_revnum_t_svn_revnum_t_svn_boolean_t_svn_boolean_t_svn_log_message_receiver_t_p_void_p_apr_pool_t__p_svn_error_t,
+  &_swigt__p_f_p_void_p_q_const__char__int,
   &_swigt__p_f_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t,
@@ -17838,6 +18336,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_f_p_void_p_svn_revnum_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_svn_revnum_t_apr_time_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_svn_revnum_t_p_apr_pool_t__p_svn_error_t,
+  &_swigt__p_f_p_void_p_void__void,
   &_swigt__p_f_p_void_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_svn_revnum_t_p_q_const__char_p_p_svn_string_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_svn_revnum_t_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t,
@@ -17853,10 +18352,12 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_p_char,
   &_swigt__p_p_f_apr_off_t_apr_off_t_p_void_p_apr_pool_t__void,
   &_swigt__p_p_f_int_p_apr_pool_t_p_apr_hash_t__p_svn_error_t,
+  &_swigt__p_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t,
   &_swigt__p_p_f_p_void__p_svn_error_t,
   &_swigt__p_p_f_p_void_p_p_q_const__char_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_p_f_p_void_p_p_svn_stream_t_p_q_const__svn_checksum_t_p_apr_pool_t__p_svn_error_t,
+  &_swigt__p_p_f_p_void_p_q_const__char__int,
   &_swigt__p_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t,
@@ -17864,6 +18365,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_p_f_p_void_p_svn_revnum_t__p_svn_error_t,
+  &_swigt__p_p_f_p_void_p_void__void,
   &_swigt__p_p_f_svn_revnum_t_p_void_p_p_q_const__svn_delta_editor_t_p_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_p_f_svn_revnum_t_p_void_p_q_const__svn_delta_editor_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_p_svn_delta_editor_t,
@@ -17896,9 +18398,11 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_svn_config_t,
   &_swigt__p_svn_delta_editor_t,
   &_swigt__p_svn_depth_t,
+  &_swigt__p_svn_diff_hunk_t,
   &_swigt__p_svn_dirent_t,
   &_swigt__p_svn_errno_t,
   &_swigt__p_svn_error_t,
+  &_swigt__p_svn_fs_lock_target_t,
   &_swigt__p_svn_io_dirent2_t,
   &_swigt__p_svn_io_dirent_t,
   &_swigt__p_svn_io_file_del_t,
@@ -17954,6 +18458,7 @@ static swig_cast_info _swigc__p_f_apr_off_t_apr_off_t_p_void_p_apr_pool_t__void[
 static swig_cast_info _swigc__p_f_int_p_apr_pool_t_p_apr_hash_t__p_svn_error_t[] = {  {&_swigt__p_f_int_p_apr_pool_t_p_apr_hash_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_p_apr_file_t_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_p_apr_file_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_p_void_p_q_const__char_p_q_const__svn_ra_callbacks_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_p_void_p_q_const__char_p_q_const__svn_ra_callbacks_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -17969,6 +18474,7 @@ static swig_cast_info _swigc__p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void
 static swig_cast_info _swigc__p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_p_svn_stream_t_p_q_const__svn_checksum_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_p_svn_stream_t_p_q_const__svn_checksum_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_q_const__apr_array_header_t_svn_revnum_t_svn_revnum_t_svn_boolean_t_svn_boolean_t_svn_log_message_receiver_t_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__apr_array_header_t_svn_revnum_t_svn_revnum_t_svn_boolean_t_svn_boolean_t_svn_log_message_receiver_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_f_p_void_p_q_const__char__int[] = {  {&_swigt__p_f_p_void_p_q_const__char__int, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -17990,6 +18496,7 @@ static swig_cast_info _swigc__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_e
 static swig_cast_info _swigc__p_f_p_void_p_svn_revnum_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_svn_revnum_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_svn_revnum_t_apr_time_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_svn_revnum_t_apr_time_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_svn_revnum_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_svn_revnum_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_f_p_void_p_void__void[] = {  {&_swigt__p_f_p_void_p_void__void, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_svn_revnum_t_p_q_const__char_p_p_svn_string_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_svn_revnum_t_p_q_const__char_p_p_svn_string_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_svn_revnum_t_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_svn_revnum_t_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -18005,10 +18512,12 @@ static swig_cast_info _swigc__p_p_apr_hash_t[] = {  {&_swigt__p_p_apr_hash_t, 0,
 static swig_cast_info _swigc__p_p_char[] = {  {&_swigt__p_p_char, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_f_apr_off_t_apr_off_t_p_void_p_apr_pool_t__void[] = {  {&_swigt__p_p_f_apr_off_t_apr_off_t_p_void_p_apr_pool_t__void, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_f_int_p_apr_pool_t_p_apr_hash_t__p_svn_error_t[] = {  {&_swigt__p_p_f_int_p_apr_pool_t_p_apr_hash_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t[] = {  {&_swigt__p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_f_p_void__p_svn_error_t[] = {  {&_swigt__p_p_f_p_void__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_f_p_void_p_p_q_const__char_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_p_f_p_void_p_p_q_const__char_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_f_p_void_p_p_svn_stream_t_p_q_const__svn_checksum_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_p_f_p_void_p_p_svn_stream_t_p_q_const__svn_checksum_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_p_f_p_void_p_q_const__char__int[] = {  {&_swigt__p_p_f_p_void_p_q_const__char__int, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -18016,6 +18525,7 @@ static swig_cast_info _swigc__p_p_f_p_void_p_q_const__char_svn_boolean_t_p_q_con
 static swig_cast_info _swigc__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_f_p_void_p_svn_revnum_t__p_svn_error_t[] = {  {&_swigt__p_p_f_p_void_p_svn_revnum_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_p_f_p_void_p_void__void[] = {  {&_swigt__p_p_f_p_void_p_void__void, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_f_svn_revnum_t_p_void_p_p_q_const__svn_delta_editor_t_p_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_p_f_svn_revnum_t_p_void_p_p_q_const__svn_delta_editor_t_p_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_f_svn_revnum_t_p_void_p_q_const__svn_delta_editor_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_p_f_svn_revnum_t_p_void_p_q_const__svn_delta_editor_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_svn_delta_editor_t[] = {  {&_swigt__p_p_svn_delta_editor_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -18048,9 +18558,11 @@ static swig_cast_info _swigc__p_svn_commit_info_t[] = {  {&_swigt__p_svn_commit_
 static swig_cast_info _swigc__p_svn_config_t[] = {  {&_swigt__p_svn_config_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_delta_editor_t[] = {  {&_swigt__p_svn_delta_editor_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_depth_t[] = {  {&_swigt__p_svn_depth_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_diff_hunk_t[] = {  {&_swigt__p_svn_diff_hunk_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_dirent_t[] = {  {&_swigt__p_svn_dirent_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_errno_t[] = {  {&_swigt__p_svn_errno_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_error_t[] = {  {&_swigt__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_fs_lock_target_t[] = {  {&_swigt__p_svn_fs_lock_target_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_io_dirent2_t[] = {  {&_swigt__p_svn_io_dirent2_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_io_dirent_t[] = {  {&_swigt__p_svn_io_dirent_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_io_file_del_t[] = {  {&_swigt__p_svn_io_file_del_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -18106,6 +18618,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_f_int_p_apr_pool_t_p_apr_hash_t__p_svn_error_t,
   _swigc__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_p_apr_file_t_p_void_p_apr_pool_t__p_svn_error_t,
+  _swigc__p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_p_void_p_q_const__char_p_q_const__svn_ra_callbacks_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t,
@@ -18121,6 +18634,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_p_p_svn_stream_t_p_q_const__svn_checksum_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_p_q_const__apr_array_header_t_svn_revnum_t_svn_revnum_t_svn_boolean_t_svn_boolean_t_svn_log_message_receiver_t_p_void_p_apr_pool_t__p_svn_error_t,
+  _swigc__p_f_p_void_p_q_const__char__int,
   _swigc__p_f_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t,
@@ -18142,6 +18656,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_f_p_void_p_svn_revnum_t__p_svn_error_t,
   _swigc__p_f_p_void_p_svn_revnum_t_apr_time_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_p_svn_revnum_t_p_apr_pool_t__p_svn_error_t,
+  _swigc__p_f_p_void_p_void__void,
   _swigc__p_f_p_void_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_svn_revnum_t_p_q_const__char_p_p_svn_string_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_svn_revnum_t_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t,
@@ -18157,10 +18672,12 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_p_char,
   _swigc__p_p_f_apr_off_t_apr_off_t_p_void_p_apr_pool_t__void,
   _swigc__p_p_f_int_p_apr_pool_t_p_apr_hash_t__p_svn_error_t,
+  _swigc__p_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t,
   _swigc__p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t,
   _swigc__p_p_f_p_void__p_svn_error_t,
   _swigc__p_p_f_p_void_p_p_q_const__char_p_apr_pool_t__p_svn_error_t,
   _swigc__p_p_f_p_void_p_p_svn_stream_t_p_q_const__svn_checksum_t_p_apr_pool_t__p_svn_error_t,
+  _swigc__p_p_f_p_void_p_q_const__char__int,
   _swigc__p_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t,
   _swigc__p_p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t,
@@ -18168,6 +18685,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_p_f_p_void_p_svn_revnum_t__p_svn_error_t,
+  _swigc__p_p_f_p_void_p_void__void,
   _swigc__p_p_f_svn_revnum_t_p_void_p_p_q_const__svn_delta_editor_t_p_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_p_f_svn_revnum_t_p_void_p_q_const__svn_delta_editor_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_p_svn_delta_editor_t,
@@ -18200,9 +18718,11 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_svn_config_t,
   _swigc__p_svn_delta_editor_t,
   _swigc__p_svn_depth_t,
+  _swigc__p_svn_diff_hunk_t,
   _swigc__p_svn_dirent_t,
   _swigc__p_svn_errno_t,
   _swigc__p_svn_error_t,
+  _swigc__p_svn_fs_lock_target_t,
   _swigc__p_svn_io_dirent2_t,
   _swigc__p_svn_io_dirent_t,
   _swigc__p_svn_io_file_del_t,
@@ -18257,18 +18777,18 @@ static swig_const_info swig_const_table[] = {
 #endif
 /* -----------------------------------------------------------------------------
  * Type initialization:
- * This problem is tough by the requirement that no dynamic 
- * memory is used. Also, since swig_type_info structures store pointers to 
+ * This problem is tough by the requirement that no dynamic
+ * memory is used. Also, since swig_type_info structures store pointers to
  * swig_cast_info structures and swig_cast_info structures store pointers back
- * to swig_type_info structures, we need some lookup code at initialization. 
- * The idea is that swig generates all the structures that are needed. 
- * The runtime then collects these partially filled structures. 
- * The SWIG_InitializeModule function takes these initial arrays out of 
+ * to swig_type_info structures, we need some lookup code at initialization.
+ * The idea is that swig generates all the structures that are needed.
+ * The runtime then collects these partially filled structures.
+ * The SWIG_InitializeModule function takes these initial arrays out of
  * swig_module, and does all the lookup, filling in the swig_module.types
  * array with the correct data and linking the correct swig_cast_info
  * structures together.
  *
- * The generated swig_type_info structures are assigned staticly to an initial 
+ * The generated swig_type_info structures are assigned staticly to an initial
  * array. We just loop through that array, and handle each type individually.
  * First we lookup if this type has been already loaded, and if so, use the
  * loaded structure instead of the generated one. Then we have to fill in the
@@ -18278,17 +18798,17 @@ static swig_const_info swig_const_table[] = {
  * a column is one of the swig_cast_info structures for that type.
  * The cast_initial array is actually an array of arrays, because each row has
  * a variable number of columns. So to actually build the cast linked list,
- * we find the array of casts associated with the type, and loop through it 
+ * we find the array of casts associated with the type, and loop through it
  * adding the casts to the list. The one last trick we need to do is making
  * sure the type pointer in the swig_cast_info struct is correct.
  *
- * First off, we lookup the cast->type name to see if it is already loaded. 
+ * First off, we lookup the cast->type name to see if it is already loaded.
  * There are three cases to handle:
  *  1) If the cast->type has already been loaded AND the type we are adding
  *     casting info to has not been loaded (it is in this module), THEN we
  *     replace the cast->type pointer with the type pointer that has already
  *     been loaded.
- *  2) If BOTH types (the one we are adding casting info to, and the 
+ *  2) If BOTH types (the one we are adding casting info to, and the
  *     cast->type) are loaded, THEN the cast info has already been loaded by
  *     the previous module so we just ignore it.
  *  3) Finally, if cast->type has not already been loaded, then we add that
@@ -18351,7 +18871,7 @@ SWIG_InitializeModule(void *clientdata) {
     module_head->next = &swig_module;
   }
   
-  /* When multiple interpeters are used, a module could have already been initialized in
+  /* When multiple interpreters are used, a module could have already been initialized in
        a different interpreter, but not yet have a pointer in this interpreter.
        In this case, we do not want to continue adding types... everything should be
        set up already */
diff --git a/subversion/bindings/swig/python/svn_repos.c b/subversion/bindings/swig/python/svn_repos.c
index 68d4278..9ff6c64 100644
--- a/subversion/bindings/swig/python/svn_repos.c
+++ b/subversion/bindings/swig/python/svn_repos.c
@@ -1,11 +1,11 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
- * 
- * This file is not intended to be easily readable and contains a number of 
+ * Version 2.0.12
+ *
+ * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
- * changes to this file unless you know what you are doing--modify the SWIG 
- * interface file instead. 
+ * changes to this file unless you know what you are doing--modify the SWIG
+ * interface file instead.
  * ----------------------------------------------------------------------------- */
 
 #define SWIGPYTHON
@@ -43,28 +43,28 @@
 #ifndef SWIGUNUSED
 # if defined(__GNUC__)
 #   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__)) 
+#     define SWIGUNUSED __attribute__ ((__unused__))
 #   else
 #     define SWIGUNUSED
 #   endif
 # elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__)) 
+#   define SWIGUNUSED __attribute__ ((__unused__))
 # else
-#   define SWIGUNUSED 
+#   define SWIGUNUSED
 # endif
 #endif
 
 #ifndef SWIG_MSC_UNSUPPRESS_4505
 # if defined(_MSC_VER)
 #   pragma warning(disable : 4505) /* unreferenced local function has been removed */
-# endif 
+# endif
 #endif
 
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
 # else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
 # endif
 #endif
 
@@ -107,7 +107,7 @@
 #   define SWIGSTDCALL __stdcall
 # else
 #   define SWIGSTDCALL
-# endif 
+# endif
 #endif
 
 /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
@@ -122,8 +122,14 @@
 
 
 
-/* Python.h has to appear first */
-#include <Python.h>
+#if defined(_DEBUG) && defined(SWIG_PYTHON_INTERPRETER_NO_DEBUG)
+/* Use debug wrappers with the Python release dll */
+# undef _DEBUG
+# include <Python.h>
+# define _DEBUG
+#else
+# include <Python.h>
+#endif
 
 /* -----------------------------------------------------------------------------
  * swigrun.swg
@@ -149,7 +155,7 @@
   You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for
   creating a static or dynamic library from the SWIG runtime code.
   In 99.9% of the cases, SWIG just needs to declare them as 'static'.
-  
+
   But only do this if strictly necessary, ie, if you have problems
   with your compiler or suchlike.
 */
@@ -175,16 +181,16 @@
 #define SWIG_POINTER_OWN           0x1
 
 
-/* 
+/*
    Flags/methods for returning states.
-   
-   The SWIG conversion methods, as ConvertPtr, return an integer 
+
+   The SWIG conversion methods, as ConvertPtr, return an integer
    that tells if the conversion was successful or not. And if not,
    an error code can be returned (see swigerrors.swg for the codes).
-   
+
    Use the following macros/flags to set or process the returning
    states.
-   
+
    In old versions of SWIG, code such as the following was usually written:
 
      if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) {
@@ -217,23 +223,23 @@
     } else {
       // fail code
     }
-    
+
    I.e., now SWIG_ConvertPtr can return new objects and you can
    identify the case and take care of the deallocation. Of course that
    also requires SWIG_ConvertPtr to return new result values, such as
 
-      int SWIG_ConvertPtr(obj, ptr,...) {         
-        if (<obj is ok>) {			       
-          if (<need new object>) {		       
-            *ptr = <ptr to new allocated object>; 
-            return SWIG_NEWOBJ;		       
-          } else {				       
-            *ptr = <ptr to old object>;	       
-            return SWIG_OLDOBJ;		       
-          } 				       
-        } else {				       
-          return SWIG_BADOBJ;		       
-        }					       
+      int SWIG_ConvertPtr(obj, ptr,...) {
+        if (<obj is ok>) {
+          if (<need new object>) {
+            *ptr = <ptr to new allocated object>;
+            return SWIG_NEWOBJ;
+          } else {
+            *ptr = <ptr to old object>;
+            return SWIG_OLDOBJ;
+          }
+        } else {
+          return SWIG_BADOBJ;
+        }
       }
 
    Of course, returning the plain '0(success)/-1(fail)' still works, but you can be
@@ -247,17 +253,17 @@
        int fooi(int);
 
    and you call
- 
+
       food(1)   // cast rank '1'  (1 -> 1.0)
       fooi(1)   // cast rank '0'
 
    just use the SWIG_AddCast()/SWIG_CheckState()
 */
 
-#define SWIG_OK                    (0) 
+#define SWIG_OK                    (0)
 #define SWIG_ERROR                 (-1)
 #define SWIG_IsOK(r)               (r >= 0)
-#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)  
+#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)
 
 /* The CastRankLimit says how many bits are used for the cast rank */
 #define SWIG_CASTRANKLIMIT         (1 << 8)
@@ -288,14 +294,14 @@
 #  endif
 #  define SWIG_CASTRANKMASK          ((SWIG_CASTRANKLIMIT) -1)
 #  define SWIG_CastRank(r)           (r & SWIG_CASTRANKMASK)
-SWIGINTERNINLINE int SWIG_AddCast(int r) { 
+SWIGINTERNINLINE int SWIG_AddCast(int r) {
   return SWIG_IsOK(r) ? ((SWIG_CastRank(r) < SWIG_MAXCASTRANK) ? (r + 1) : SWIG_ERROR) : r;
 }
-SWIGINTERNINLINE int SWIG_CheckState(int r) { 
-  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0; 
+SWIGINTERNINLINE int SWIG_CheckState(int r) {
+  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0;
 }
 #else /* no cast-rank mode */
-#  define SWIG_AddCast
+#  define SWIG_AddCast(r) (r)
 #  define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0)
 #endif
 
@@ -339,7 +345,7 @@ typedef struct swig_module_info {
   void                    *clientdata;		/* Language specific module data */
 } swig_module_info;
 
-/* 
+/*
   Compare two type names skipping the space characters, therefore
   "char*" == "char *" and "Class<int>" == "Class<int >", etc.
 
@@ -359,18 +365,18 @@ SWIG_TypeNameComp(const char *f1, const char *l1,
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if not equal, 1 if equal
+  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
 */
 SWIGRUNTIME int
-SWIG_TypeEquiv(const char *nb, const char *tb) {
-  int equiv = 0;
+SWIG_TypeCmp(const char *nb, const char *tb) {
+  int equiv = 1;
   const char* te = tb + strlen(tb);
   const char* ne = nb;
-  while (!equiv && *ne) {
+  while (equiv != 0 && *ne) {
     for (nb = ne; *ne; ++ne) {
       if (*ne == '|') break;
     }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
+    equiv = SWIG_TypeNameComp(nb, ne, tb, te);
     if (*ne) ++ne;
   }
   return equiv;
@@ -378,24 +384,13 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
+  Return 0 if not equal, 1 if equal
 */
 SWIGRUNTIME int
-SWIG_TypeCompare(const char *nb, const char *tb) {
-  int equiv = 0;
-  const char* te = tb + strlen(tb);
-  const char* ne = nb;
-  while (!equiv && *ne) {
-    for (nb = ne; *ne; ++ne) {
-      if (*ne == '|') break;
-    }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
-    if (*ne) ++ne;
-  }
-  return equiv;
+SWIG_TypeEquiv(const char *nb, const char *tb) {
+  return SWIG_TypeCmp(nb, tb) == 0 ? 1 : 0;
 }
 
-
 /*
   Check the typename
 */
@@ -423,7 +418,7 @@ SWIG_TypeCheck(const char *c, swig_type_info *ty) {
   return 0;
 }
 
-/* 
+/*
   Identical to SWIG_TypeCheck, except strcmp is replaced with a pointer comparison
 */
 SWIGRUNTIME swig_cast_info *
@@ -458,7 +453,7 @@ SWIG_TypeCast(swig_cast_info *ty, void *ptr, int *newmemory) {
   return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr, newmemory);
 }
 
-/* 
+/*
    Dynamic pointer casting. Down an inheritance hierarchy
 */
 SWIGRUNTIME swig_type_info *
@@ -502,7 +497,7 @@ SWIG_TypePrettyName(const swig_type_info *type) {
     return type->name;
 }
 
-/* 
+/*
    Set the clientdata field for a type
 */
 SWIGRUNTIME void
@@ -510,14 +505,14 @@ SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
   swig_cast_info *cast = ti->cast;
   /* if (ti->clientdata == clientdata) return; */
   ti->clientdata = clientdata;
-  
+
   while (cast) {
     if (!cast->converter) {
       swig_type_info *tc = cast->type;
       if (!tc->clientdata) {
 	SWIG_TypeClientData(tc, clientdata);
       }
-    }    
+    }
     cast = cast->next;
   }
 }
@@ -526,18 +521,18 @@ SWIG_TypeNewClientData(swig_type_info *ti, void *clientdata) {
   SWIG_TypeClientData(ti, clientdata);
   ti->owndata = 1;
 }
-  
+
 /*
   Search for a swig_type_info structure only by mangled name
   Search is a O(log #types)
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_MangledTypeQueryModule(swig_module_info *start, 
-                            swig_module_info *end, 
+SWIG_MangledTypeQueryModule(swig_module_info *start,
+                            swig_module_info *end,
 		            const char *name) {
   swig_module_info *iter = start;
   do {
@@ -546,11 +541,11 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
       register size_t r = iter->size - 1;
       do {
 	/* since l+r >= 0, we can (>> 1) instead (/ 2) */
-	register size_t i = (l + r) >> 1; 
+	register size_t i = (l + r) >> 1;
 	const char *iname = iter->types[i]->name;
 	if (iname) {
 	  register int compare = strcmp(name, iname);
-	  if (compare == 0) {	    
+	  if (compare == 0) {
 	    return iter->types[i];
 	  } else if (compare < 0) {
 	    if (i) {
@@ -575,14 +570,14 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
   Search for a swig_type_info structure for either a mangled name or a human readable name.
   It first searches the mangled names of the types, which is a O(log #types)
   If a type is not found it then searches the human readable names, which is O(#types).
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_TypeQueryModule(swig_module_info *start, 
-                     swig_module_info *end, 
+SWIG_TypeQueryModule(swig_module_info *start,
+                     swig_module_info *end,
 		     const char *name) {
   /* STEP 1: Search the name field using binary search */
   swig_type_info *ret = SWIG_MangledTypeQueryModule(start, end, name);
@@ -601,12 +596,12 @@ SWIG_TypeQueryModule(swig_module_info *start,
       iter = iter->next;
     } while (iter != end);
   }
-  
+
   /* neither found a match */
   return 0;
 }
 
-/* 
+/*
    Pack binary data into a string
 */
 SWIGRUNTIME char *
@@ -622,7 +617,7 @@ SWIG_PackData(char *c, void *ptr, size_t sz) {
   return c;
 }
 
-/* 
+/*
    Unpack binary data from a string
 */
 SWIGRUNTIME const char *
@@ -636,21 +631,21 @@ SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
       uu = ((d - '0') << 4);
     else if ((d >= 'a') && (d <= 'f'))
       uu = ((d - ('a'-10)) << 4);
-    else 
+    else
       return (char *) 0;
     d = *(c++);
     if ((d >= '0') && (d <= '9'))
       uu |= (d - '0');
     else if ((d >= 'a') && (d <= 'f'))
       uu |= (d - ('a'-10));
-    else 
+    else
       return (char *) 0;
     *u = uu;
   }
   return c;
 }
 
-/* 
+/*
    Pack 'void *' into a string buffer.
 */
 SWIGRUNTIME char *
@@ -710,18 +705,18 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 #endif
 
 /*  Errors in SWIG */
-#define  SWIG_UnknownError    	   -1 
-#define  SWIG_IOError        	   -2 
-#define  SWIG_RuntimeError   	   -3 
-#define  SWIG_IndexError     	   -4 
-#define  SWIG_TypeError      	   -5 
-#define  SWIG_DivisionByZero 	   -6 
-#define  SWIG_OverflowError  	   -7 
-#define  SWIG_SyntaxError    	   -8 
-#define  SWIG_ValueError     	   -9 
+#define  SWIG_UnknownError    	   -1
+#define  SWIG_IOError        	   -2
+#define  SWIG_RuntimeError   	   -3
+#define  SWIG_IndexError     	   -4
+#define  SWIG_TypeError      	   -5
+#define  SWIG_DivisionByZero 	   -6
+#define  SWIG_OverflowError  	   -7
+#define  SWIG_SyntaxError    	   -8
+#define  SWIG_ValueError     	   -9
 #define  SWIG_SystemError    	   -10
 #define  SWIG_AttributeError 	   -11
-#define  SWIG_MemoryError    	   -12 
+#define  SWIG_MemoryError    	   -12
 #define  SWIG_NullReferenceError   -13
 
 
@@ -1582,34 +1577,6 @@ SwigPyObject_repr(SwigPyObject *v, PyObject *args)
 }
 
 SWIGRUNTIME int
-SwigPyObject_print(SwigPyObject *v, FILE *fp, int SWIGUNUSEDPARM(flags))
-{
-  char *str;
-#ifdef METH_NOARGS
-  PyObject *repr = SwigPyObject_repr(v);
-#else
-  PyObject *repr = SwigPyObject_repr(v, NULL);
-#endif
-  if (repr) {
-    str = SWIG_Python_str_AsChar(repr); 
-    fputs(str, fp);
-    SWIG_Python_str_DelForPy3(str);
-    Py_DECREF(repr);
-    return 0; 
-  } else {
-    return 1; 
-  }
-}
-
-SWIGRUNTIME PyObject *
-SwigPyObject_str(SwigPyObject *v)
-{
-  char result[SWIG_BUFFER_SIZE];
-  return SWIG_PackVoidPtr(result, v->ptr, v->ty->name, sizeof(result)) ?
-    SWIG_Python_str_FromChar(result) : 0;
-}
-
-SWIGRUNTIME int
 SwigPyObject_compare(SwigPyObject *v, SwigPyObject *w)
 {
   void *i = v->ptr;
@@ -1801,7 +1768,7 @@ SwigPyObject_own(PyObject *v, PyObject *args)
 static PyMethodDef
 swigobject_methods[] = {
   {(char *)"disown",  (PyCFunction)SwigPyObject_disown,  METH_NOARGS,  (char *)"releases ownership of the pointer"},
-  {(char *)"acquire", (PyCFunction)SwigPyObject_acquire, METH_NOARGS,  (char *)"aquires ownership of the pointer"},
+  {(char *)"acquire", (PyCFunction)SwigPyObject_acquire, METH_NOARGS,  (char *)"acquires ownership of the pointer"},
   {(char *)"own",     (PyCFunction)SwigPyObject_own,     METH_VARARGS, (char *)"returns/sets ownership of the pointer"},
   {(char *)"append",  (PyCFunction)SwigPyObject_append,  METH_O,       (char *)"appends another 'this' object"},
   {(char *)"next",    (PyCFunction)SwigPyObject_next,    METH_NOARGS,  (char *)"returns the next 'this' object"},
@@ -1894,7 +1861,7 @@ SwigPyObject_TypeOnce(void) {
       sizeof(SwigPyObject),                 /* tp_basicsize */
       0,                                    /* tp_itemsize */
       (destructor)SwigPyObject_dealloc,     /* tp_dealloc */
-      (printfunc)SwigPyObject_print,        /* tp_print */
+      0,				    /* tp_print */
 #if PY_VERSION_HEX < 0x02020000
       (getattrfunc)SwigPyObject_getattr,    /* tp_getattr */
 #else
@@ -1912,7 +1879,7 @@ SwigPyObject_TypeOnce(void) {
       0,                                    /* tp_as_mapping */
       (hashfunc)0,                          /* tp_hash */
       (ternaryfunc)0,                       /* tp_call */
-      (reprfunc)SwigPyObject_str,           /* tp_str */
+      0,				    /* tp_str */
       PyObject_GenericGetAttr,              /* tp_getattro */
       0,                                    /* tp_setattro */
       0,                                    /* tp_as_buffer */
@@ -2289,10 +2256,11 @@ SWIGRUNTIME int
 SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int flags, int *own) {
   int res;
   SwigPyObject *sobj;
+  int implicit_conv = (flags & SWIG_POINTER_IMPLICIT_CONV) != 0;
 
   if (!obj)
     return SWIG_ERROR;
-  if (obj == Py_None) {
+  if (obj == Py_None && !implicit_conv) {
     if (ptr)
       *ptr = 0;
     return SWIG_OK;
@@ -2341,7 +2309,7 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
     }
     res = SWIG_OK;
   } else {
-    if (flags & SWIG_POINTER_IMPLICIT_CONV) {
+    if (implicit_conv) {
       SwigPyClientData *data = ty ? (SwigPyClientData *) ty->clientdata : 0;
       if (data && !data->implicitconv) {
         PyObject *klass = data->klass;
@@ -2376,6 +2344,13 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
         }
       }
     }
+    if (!SWIG_IsOK(res) && obj == Py_None) {
+      if (ptr)
+        *ptr = 0;
+      if (PyErr_Occurred())
+        PyErr_Clear();
+      res = SWIG_OK;
+    }
   }
   return res;
 }
@@ -2875,7 +2850,7 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) {
   PyObject *descr;
   PyObject *encoded_name;
   descrsetfunc f;
-  int res;
+  int res = -1;
 
 # ifdef Py_USING_UNICODE
   if (PyString_Check(name)) {
@@ -2898,7 +2873,6 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) {
       goto done;
   }
 
-  res = -1;
   descr = _PyType_Lookup(tp, name);
   f = NULL;
   if (descr != NULL)
@@ -2960,119 +2934,130 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) {
 #define SWIGTYPE_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[17]
 #define SWIGTYPE_p_f_p_void_p_apr_pool_t__p_svn_error_t swig_types[18]
 #define SWIGTYPE_p_f_p_void_p_q_const__char__p_svn_error_t swig_types[19]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_string_t__p_svn_error_t swig_types[20]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[21]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[22]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t swig_types[23]
-#define SWIGTYPE_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void swig_types[24]
-#define SWIGTYPE_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t swig_types[25]
-#define SWIGTYPE_p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t swig_types[26]
-#define SWIGTYPE_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t swig_types[27]
-#define SWIGTYPE_p_int swig_types[28]
-#define SWIGTYPE_p_long swig_types[29]
-#define SWIGTYPE_p_p_apr_array_header_t swig_types[30]
-#define SWIGTYPE_p_p_apr_hash_t swig_types[31]
-#define SWIGTYPE_p_p_char swig_types[32]
-#define SWIGTYPE_p_p_f_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t swig_types[33]
-#define SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t swig_types[34]
-#define SWIGTYPE_p_p_f_p_void__p_svn_error_t swig_types[35]
-#define SWIGTYPE_p_p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t swig_types[36]
-#define SWIGTYPE_p_p_f_p_void_p_apr_pool_t__p_svn_error_t swig_types[37]
-#define SWIGTYPE_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[38]
-#define SWIGTYPE_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[39]
-#define SWIGTYPE_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t swig_types[40]
-#define SWIGTYPE_p_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void swig_types[41]
-#define SWIGTYPE_p_p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t swig_types[42]
-#define SWIGTYPE_p_p_svn_authz_t swig_types[43]
-#define SWIGTYPE_p_p_svn_delta_editor_t swig_types[44]
-#define SWIGTYPE_p_p_svn_dirent_t swig_types[45]
-#define SWIGTYPE_p_p_svn_fs_txn_t swig_types[46]
-#define SWIGTYPE_p_p_svn_lock_t swig_types[47]
-#define SWIGTYPE_p_p_svn_repos_parse_fns2_t swig_types[48]
-#define SWIGTYPE_p_p_svn_repos_parse_fns3_t swig_types[49]
-#define SWIGTYPE_p_p_svn_repos_parse_fns_t swig_types[50]
-#define SWIGTYPE_p_p_svn_repos_t swig_types[51]
-#define SWIGTYPE_p_p_svn_stream_t swig_types[52]
-#define SWIGTYPE_p_p_svn_string_t swig_types[53]
-#define SWIGTYPE_p_p_void swig_types[54]
-#define SWIGTYPE_p_svn_auth_baton_t swig_types[55]
-#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[56]
-#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[57]
-#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[58]
-#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[59]
-#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[60]
-#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[61]
-#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[62]
-#define SWIGTYPE_p_svn_auth_provider_t swig_types[63]
-#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[64]
-#define SWIGTYPE_p_svn_authz_t swig_types[65]
-#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[66]
-#define SWIGTYPE_p_svn_checksum_kind_t swig_types[67]
-#define SWIGTYPE_p_svn_checksum_t swig_types[68]
-#define SWIGTYPE_p_svn_commit_info_t swig_types[69]
-#define SWIGTYPE_p_svn_config_t swig_types[70]
-#define SWIGTYPE_p_svn_delta_editor_t swig_types[71]
-#define SWIGTYPE_p_svn_depth_t swig_types[72]
-#define SWIGTYPE_p_svn_dirent_t swig_types[73]
-#define SWIGTYPE_p_svn_errno_t swig_types[74]
-#define SWIGTYPE_p_svn_error_t swig_types[75]
-#define SWIGTYPE_p_svn_fs_access_t swig_types[76]
-#define SWIGTYPE_p_svn_fs_dirent_t swig_types[77]
-#define SWIGTYPE_p_svn_fs_history_t swig_types[78]
-#define SWIGTYPE_p_svn_fs_id_t swig_types[79]
-#define SWIGTYPE_p_svn_fs_pack_notify_action_t swig_types[80]
-#define SWIGTYPE_p_svn_fs_path_change2_t swig_types[81]
-#define SWIGTYPE_p_svn_fs_path_change_kind_t swig_types[82]
-#define SWIGTYPE_p_svn_fs_path_change_t swig_types[83]
-#define SWIGTYPE_p_svn_fs_root_t swig_types[84]
-#define SWIGTYPE_p_svn_fs_t swig_types[85]
-#define SWIGTYPE_p_svn_fs_txn_t swig_types[86]
-#define SWIGTYPE_p_svn_io_dirent2_t swig_types[87]
-#define SWIGTYPE_p_svn_io_dirent_t swig_types[88]
-#define SWIGTYPE_p_svn_io_file_del_t swig_types[89]
-#define SWIGTYPE_p_svn_location_segment_t swig_types[90]
-#define SWIGTYPE_p_svn_lock_t swig_types[91]
-#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[92]
-#define SWIGTYPE_p_svn_log_changed_path_t swig_types[93]
-#define SWIGTYPE_p_svn_log_entry_t swig_types[94]
-#define SWIGTYPE_p_svn_merge_range_t swig_types[95]
-#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[96]
-#define SWIGTYPE_p_svn_node_kind_t swig_types[97]
-#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[98]
-#define SWIGTYPE_p_svn_opt_revision_t swig_types[99]
-#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[100]
-#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[101]
-#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[102]
-#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[103]
-#define SWIGTYPE_p_svn_prop_kind swig_types[104]
-#define SWIGTYPE_p_svn_repos_authz_access_t swig_types[105]
-#define SWIGTYPE_p_svn_repos_node_t swig_types[106]
-#define SWIGTYPE_p_svn_repos_notify_action_t swig_types[107]
-#define SWIGTYPE_p_svn_repos_notify_t swig_types[108]
-#define SWIGTYPE_p_svn_repos_notify_warning_t swig_types[109]
-#define SWIGTYPE_p_svn_repos_parse_fns2_t swig_types[110]
-#define SWIGTYPE_p_svn_repos_parse_fns3_t swig_types[111]
-#define SWIGTYPE_p_svn_repos_parse_fns_t swig_types[112]
-#define SWIGTYPE_p_svn_repos_revision_access_level_t swig_types[113]
-#define SWIGTYPE_p_svn_repos_t swig_types[114]
-#define SWIGTYPE_p_svn_stream_mark_t swig_types[115]
-#define SWIGTYPE_p_svn_stream_t swig_types[116]
-#define SWIGTYPE_p_svn_string_t swig_types[117]
-#define SWIGTYPE_p_svn_stringbuf_t swig_types[118]
-#define SWIGTYPE_p_svn_tristate_t swig_types[119]
-#define SWIGTYPE_p_svn_txdelta_op_t swig_types[120]
-#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[121]
-#define SWIGTYPE_p_svn_txdelta_window_t swig_types[122]
-#define SWIGTYPE_p_svn_version_checklist_t swig_types[123]
-#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[124]
-#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[125]
-#define SWIGTYPE_p_svn_version_extended_t swig_types[126]
-#define SWIGTYPE_p_svn_version_t swig_types[127]
-#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[128]
-#define SWIGTYPE_p_unsigned_long swig_types[129]
-#define SWIGTYPE_p_void swig_types[130]
-static swig_type_info *swig_types[132];
-static swig_module_info swig_module = {swig_types, 131, 0, 0, 0, 0};
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t swig_types[20]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_string_t__p_svn_error_t swig_types[21]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[22]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[23]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t swig_types[24]
+#define SWIGTYPE_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void swig_types[25]
+#define SWIGTYPE_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t swig_types[26]
+#define SWIGTYPE_p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t swig_types[27]
+#define SWIGTYPE_p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t swig_types[28]
+#define SWIGTYPE_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t swig_types[29]
+#define SWIGTYPE_p_int swig_types[30]
+#define SWIGTYPE_p_long swig_types[31]
+#define SWIGTYPE_p_p_apr_array_header_t swig_types[32]
+#define SWIGTYPE_p_p_apr_hash_t swig_types[33]
+#define SWIGTYPE_p_p_char swig_types[34]
+#define SWIGTYPE_p_p_f_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t swig_types[35]
+#define SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t swig_types[36]
+#define SWIGTYPE_p_p_f_p_void__p_svn_error_t swig_types[37]
+#define SWIGTYPE_p_p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t swig_types[38]
+#define SWIGTYPE_p_p_f_p_void_p_apr_pool_t__p_svn_error_t swig_types[39]
+#define SWIGTYPE_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[40]
+#define SWIGTYPE_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[41]
+#define SWIGTYPE_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t swig_types[42]
+#define SWIGTYPE_p_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void swig_types[43]
+#define SWIGTYPE_p_p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t swig_types[44]
+#define SWIGTYPE_p_p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t swig_types[45]
+#define SWIGTYPE_p_p_svn_authz_t swig_types[46]
+#define SWIGTYPE_p_p_svn_delta_editor_t swig_types[47]
+#define SWIGTYPE_p_p_svn_dirent_t swig_types[48]
+#define SWIGTYPE_p_p_svn_fs_txn_t swig_types[49]
+#define SWIGTYPE_p_p_svn_lock_t swig_types[50]
+#define SWIGTYPE_p_p_svn_repos_parse_fns2_t swig_types[51]
+#define SWIGTYPE_p_p_svn_repos_parse_fns3_t swig_types[52]
+#define SWIGTYPE_p_p_svn_repos_parse_fns_t swig_types[53]
+#define SWIGTYPE_p_p_svn_repos_t swig_types[54]
+#define SWIGTYPE_p_p_svn_stream_t swig_types[55]
+#define SWIGTYPE_p_p_svn_string_t swig_types[56]
+#define SWIGTYPE_p_p_svn_version_t swig_types[57]
+#define SWIGTYPE_p_p_void swig_types[58]
+#define SWIGTYPE_p_svn_auth_baton_t swig_types[59]
+#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[60]
+#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[61]
+#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[62]
+#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[63]
+#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[64]
+#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[65]
+#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[66]
+#define SWIGTYPE_p_svn_auth_provider_t swig_types[67]
+#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[68]
+#define SWIGTYPE_p_svn_authz_t swig_types[69]
+#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[70]
+#define SWIGTYPE_p_svn_checksum_kind_t swig_types[71]
+#define SWIGTYPE_p_svn_checksum_t swig_types[72]
+#define SWIGTYPE_p_svn_commit_info_t swig_types[73]
+#define SWIGTYPE_p_svn_config_t swig_types[74]
+#define SWIGTYPE_p_svn_delta_editor_t swig_types[75]
+#define SWIGTYPE_p_svn_depth_t swig_types[76]
+#define SWIGTYPE_p_svn_diff_hunk_t swig_types[77]
+#define SWIGTYPE_p_svn_dirent_t swig_types[78]
+#define SWIGTYPE_p_svn_errno_t swig_types[79]
+#define SWIGTYPE_p_svn_error_t swig_types[80]
+#define SWIGTYPE_p_svn_fs_access_t swig_types[81]
+#define SWIGTYPE_p_svn_fs_dirent_t swig_types[82]
+#define SWIGTYPE_p_svn_fs_fsfs_info_t swig_types[83]
+#define SWIGTYPE_p_svn_fs_fsx_info_t swig_types[84]
+#define SWIGTYPE_p_svn_fs_history_t swig_types[85]
+#define SWIGTYPE_p_svn_fs_id_t swig_types[86]
+#define SWIGTYPE_p_svn_fs_info_placeholder_t swig_types[87]
+#define SWIGTYPE_p_svn_fs_lock_target_t swig_types[88]
+#define SWIGTYPE_p_svn_fs_node_relation_t swig_types[89]
+#define SWIGTYPE_p_svn_fs_pack_notify_action_t swig_types[90]
+#define SWIGTYPE_p_svn_fs_path_change2_t swig_types[91]
+#define SWIGTYPE_p_svn_fs_path_change_kind_t swig_types[92]
+#define SWIGTYPE_p_svn_fs_path_change_t swig_types[93]
+#define SWIGTYPE_p_svn_fs_root_t swig_types[94]
+#define SWIGTYPE_p_svn_fs_t swig_types[95]
+#define SWIGTYPE_p_svn_fs_txn_t swig_types[96]
+#define SWIGTYPE_p_svn_fs_upgrade_notify_action_t swig_types[97]
+#define SWIGTYPE_p_svn_io_dirent2_t swig_types[98]
+#define SWIGTYPE_p_svn_io_dirent_t swig_types[99]
+#define SWIGTYPE_p_svn_io_file_del_t swig_types[100]
+#define SWIGTYPE_p_svn_location_segment_t swig_types[101]
+#define SWIGTYPE_p_svn_lock_t swig_types[102]
+#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[103]
+#define SWIGTYPE_p_svn_log_changed_path_t swig_types[104]
+#define SWIGTYPE_p_svn_log_entry_t swig_types[105]
+#define SWIGTYPE_p_svn_merge_range_t swig_types[106]
+#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[107]
+#define SWIGTYPE_p_svn_node_kind_t swig_types[108]
+#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[109]
+#define SWIGTYPE_p_svn_opt_revision_t swig_types[110]
+#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[111]
+#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[112]
+#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[113]
+#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[114]
+#define SWIGTYPE_p_svn_prop_kind swig_types[115]
+#define SWIGTYPE_p_svn_repos_authz_access_t swig_types[116]
+#define SWIGTYPE_p_svn_repos_node_t swig_types[117]
+#define SWIGTYPE_p_svn_repos_notify_action_t swig_types[118]
+#define SWIGTYPE_p_svn_repos_notify_t swig_types[119]
+#define SWIGTYPE_p_svn_repos_notify_warning_t swig_types[120]
+#define SWIGTYPE_p_svn_repos_parse_fns2_t swig_types[121]
+#define SWIGTYPE_p_svn_repos_parse_fns3_t swig_types[122]
+#define SWIGTYPE_p_svn_repos_parse_fns_t swig_types[123]
+#define SWIGTYPE_p_svn_repos_revision_access_level_t swig_types[124]
+#define SWIGTYPE_p_svn_repos_t swig_types[125]
+#define SWIGTYPE_p_svn_stream_mark_t swig_types[126]
+#define SWIGTYPE_p_svn_stream_t swig_types[127]
+#define SWIGTYPE_p_svn_string_t swig_types[128]
+#define SWIGTYPE_p_svn_stringbuf_t swig_types[129]
+#define SWIGTYPE_p_svn_tristate_t swig_types[130]
+#define SWIGTYPE_p_svn_txdelta_op_t swig_types[131]
+#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[132]
+#define SWIGTYPE_p_svn_txdelta_window_t swig_types[133]
+#define SWIGTYPE_p_svn_version_checklist_t swig_types[134]
+#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[135]
+#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[136]
+#define SWIGTYPE_p_svn_version_extended_t swig_types[137]
+#define SWIGTYPE_p_svn_version_t swig_types[138]
+#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[139]
+#define SWIGTYPE_p_unsigned_long swig_types[140]
+#define SWIGTYPE_p_void swig_types[141]
+static swig_type_info *swig_types[143];
+static swig_module_info swig_module = {swig_types, 142, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
@@ -3096,7 +3081,7 @@ static swig_module_info swig_module = {swig_types, 131, 0, 0, 0, 0};
 #endif
 #define SWIG_name    "_repos"
 
-#define SWIGVERSION 0x020009 
+#define SWIGVERSION 0x020012 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -3445,6 +3430,18 @@ SWIG_AsVal_unsigned_SS_long (PyObject *obj, unsigned long *val)
       return SWIG_OK;
     } else {
       PyErr_Clear();
+#if PY_VERSION_HEX >= 0x03000000
+      {
+        long v = PyLong_AsLong(obj);
+        if (!PyErr_Occurred()) {
+          if (v < 0) {
+            return SWIG_OverflowError;
+          }
+        } else {
+          PyErr_Clear();
+        }
+      }
+#endif
     }
   }
 #ifdef SWIG_PYTHON_CAST_MODE
@@ -3672,11 +3669,6 @@ static svn_error_t * svn_repos_invoke_authz_callback(
   return _obj(required, allowed, root, path, baton, pool);
 }
 
-static svn_error_t * svn_repos_invoke_file_rev_handler(
-  svn_repos_file_rev_handler_t _obj, void *baton, const char *path, svn_revnum_t rev, apr_hash_t *rev_props, svn_txdelta_window_handler_t *delta_handler, void **delta_baton, apr_array_header_t *prop_diffs, apr_pool_t *pool) {
-  return _obj(baton, path, rev, rev_props, delta_handler, delta_baton, prop_diffs, pool);
-}
-
 static void svn_repos_invoke_notify_func(
   svn_repos_notify_func_t _obj, void *baton, const svn_repos_notify_t *notify, apr_pool_t *scratch_pool) {
   _obj(baton, notify, scratch_pool);
@@ -3692,10 +3684,82 @@ static svn_error_t * svn_repos_invoke_history_func(
   return _obj(baton, path, revision, pool);
 }
 
+static svn_error_t * svn_repos_invoke_file_rev_handler(
+  svn_repos_file_rev_handler_t _obj, void *baton, const char *path, svn_revnum_t rev, apr_hash_t *rev_props, svn_txdelta_window_handler_t *delta_handler, void **delta_baton, apr_array_header_t *prop_diffs, apr_pool_t *pool) {
+  return _obj(baton, path, rev, rev_props, delta_handler, delta_baton, prop_diffs, pool);
+}
+
+static svn_error_t * svn_repos_invoke_verify_callback(
+  svn_repos_verify_callback_t _obj, void *baton, svn_revnum_t revision, svn_error_t *verify_err, apr_pool_t *scratch_pool) {
+  return _obj(baton, revision, verify_err, scratch_pool);
+}
+
 
 #ifdef __cplusplus
 extern "C" {
 #endif
+SWIGINTERN PyObject *_wrap_svn_swig_py_make_parse_fns3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  svn_repos_parse_fns3_t **arg1 = (svn_repos_parse_fns3_t **) 0 ;
+  void **arg2 = (void **) 0 ;
+  PyObject *arg3 = (PyObject *) 0 ;
+  apr_pool_t *arg4 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  svn_repos_parse_fns3_t *temp1 ;
+  void *temp2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg4 = _global_pool;
+  arg1 = &temp1;
+  arg2 = &temp2;
+  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_swig_py_make_parse_fns3",&obj0,&obj1)) SWIG_fail;
+  arg3 = obj0;
+  if (obj1) {
+    /* Verify that the user supplied a valid pool */
+    if (obj1 != Py_None && obj1 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj1);
+      SWIG_arg_fail(svn_argnum_obj1);
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    svn_swig_py_make_parse_fns3((struct svn_repos_parse_fns3_t const **)arg1,arg2,arg3,arg4);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  resultobj = SWIG_Py_Void();
+  {
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_repos_parse_fns3_t,
+        _global_py_pool, args))
+    
+    ;
+  }
+  {
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_void,
+        _global_py_pool, args))
+    
+    ;
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_svn_repos_version(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   svn_version_t *result = 0 ;
@@ -3709,7 +3773,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_version(PyObject *SWIGUNUSEDPARM(self), PyO
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_version_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_version_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -3726,7 +3790,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_notify_t_action_set(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_notify_t_action_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -3753,7 +3817,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_notify_t_action_get(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_notify_t_action_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -3775,7 +3839,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_notify_t_revision_set(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_notify_t_revision_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -3802,7 +3866,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_notify_t_revision_get(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_notify_t_revision_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -3823,7 +3887,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_notify_t_warning_str_set(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_repos_notify_t_warning_str_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -3851,7 +3915,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_notify_t_warning_str_get(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_notify_t_warning_str_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -3873,7 +3937,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_notify_t_warning_set(PyObject *SWIGUNUSEDPA
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_notify_t_warning_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -3900,7 +3964,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_notify_t_warning_get(PyObject *SWIGUNUSEDPA
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_notify_t_warning_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -3922,7 +3986,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_notify_t_shard_set(PyObject *SWIGUNUSEDPARM
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_notify_t_shard_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -3944,7 +4008,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_notify_t_shard_get(PyObject *SWIGUNUSEDPARM
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_notify_t_shard_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -3966,7 +4030,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_notify_t_new_revision_set(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_notify_t_new_revision_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -3993,7 +4057,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_notify_t_new_revision_get(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_notify_t_new_revision_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4015,7 +4079,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_notify_t_old_revision_set(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_notify_t_old_revision_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4042,7 +4106,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_notify_t_old_revision_get(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_notify_t_old_revision_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4064,7 +4128,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_notify_t_node_action_set(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_notify_t_node_action_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4091,7 +4155,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_notify_t_node_action_get(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_notify_t_node_action_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4112,7 +4176,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_notify_t_path_set(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_repos_notify_t_path_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4140,7 +4204,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_notify_t_path_get(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_notify_t_path_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4153,6 +4217,104 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_repos_notify_t_start_revision_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  struct svn_repos_notify_t *arg1 = (struct svn_repos_notify_t *) 0 ;
+  svn_revnum_t arg2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_notify_t_start_revision_set",&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = (struct svn_repos_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_notify_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg2 = (svn_revnum_t)SWIG_As_long (obj1);
+    if (SWIG_arg_fail(svn_argnum_obj1)) {
+      SWIG_fail;
+    }
+  }
+  if (arg1) (arg1)->start_revision = arg2;
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_svn_repos_notify_t_start_revision_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  struct svn_repos_notify_t *arg1 = (struct svn_repos_notify_t *) 0 ;
+  PyObject * obj0 = 0 ;
+  svn_revnum_t result;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_notify_t_start_revision_get",&obj0)) SWIG_fail;
+  {
+    arg1 = (struct svn_repos_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_notify_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  result = (svn_revnum_t) ((arg1)->start_revision);
+  resultobj = SWIG_From_long((long)(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_svn_repos_notify_t_end_revision_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  struct svn_repos_notify_t *arg1 = (struct svn_repos_notify_t *) 0 ;
+  svn_revnum_t arg2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_notify_t_end_revision_set",&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = (struct svn_repos_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_notify_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg2 = (svn_revnum_t)SWIG_As_long (obj1);
+    if (SWIG_arg_fail(svn_argnum_obj1)) {
+      SWIG_fail;
+    }
+  }
+  if (arg1) (arg1)->end_revision = arg2;
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_svn_repos_notify_t_end_revision_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  struct svn_repos_notify_t *arg1 = (struct svn_repos_notify_t *) 0 ;
+  PyObject * obj0 = 0 ;
+  svn_revnum_t result;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_notify_t_end_revision_get",&obj0)) SWIG_fail;
+  {
+    arg1 = (struct svn_repos_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_notify_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  result = (svn_revnum_t) ((arg1)->end_revision);
+  resultobj = SWIG_From_long((long)(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *svn_repos_notify_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
@@ -4197,7 +4359,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_notify_create(PyObject *SWIGUNUSEDPARM(self
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_repos_notify_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_repos_notify_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -4254,6 +4416,94 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_repos_open3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  svn_repos_t **arg1 = (svn_repos_t **) 0 ;
+  char *arg2 = (char *) 0 ;
+  apr_hash_t *arg3 = (apr_hash_t *) 0 ;
+  apr_pool_t *arg4 = (apr_pool_t *) 0 ;
+  apr_pool_t *arg5 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  svn_repos_t *temp1 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg4 = _global_pool;
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg5 = _global_pool;
+  arg1 = &temp1;
+  if (!PyArg_ParseTuple(args,(char *)"sO|OO:svn_repos_open3",&arg2,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    /* PYTHON-FIXME: Handle None -> NULL. */
+    arg3 = svn_swig_py_stringhash_from_dict(obj1, _global_pool);
+  }
+  if (obj2) {
+    /* Verify that the user supplied a valid pool */
+    if (obj2 != Py_None && obj2 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj2);
+      SWIG_arg_fail(svn_argnum_obj2);
+      SWIG_fail;
+    }
+  }
+  if (obj3) {
+    /* Verify that the user supplied a valid pool */
+    if (obj3 != Py_None && obj3 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj3);
+      SWIG_arg_fail(svn_argnum_obj3);
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_repos_open3(arg1,(char const *)arg2,arg3,arg4,arg5);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  {
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_repos_t,
+        _global_py_pool, args))
+    
+    ;
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_svn_repos_open2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   svn_repos_t **arg1 = (svn_repos_t **) 0 ;
@@ -4305,7 +4555,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_open2(PyObject *SWIGUNUSEDPARM(self), PyObj
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_repos_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_repos_t,
         _global_py_pool, args))
     
     ;
@@ -4367,7 +4617,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_open(PyObject *SWIGUNUSEDPARM(self), PyObje
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_repos_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_repos_t,
         _global_py_pool, args))
     
     ;
@@ -4452,7 +4702,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_create(PyObject *SWIGUNUSEDPARM(self), PyOb
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_repos_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_repos_t,
         _global_py_pool, args))
     
     ;
@@ -4497,7 +4747,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_upgrade2(PyObject *SWIGUNUSEDPARM(self), Py
   }
   {
     svn_repos_notify_func_t * tmp =
-    svn_swig_MustGetPtr(obj2, SWIGTYPE_p_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void, svn_argnum_obj2);
+    svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void, svn_argnum_obj2);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4703,7 +4953,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_has_capability(PyObject *SWIGUNUSEDPARM(sel
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_repos_has_capability",&obj0,&arg3,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4753,6 +5003,144 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_repos_capabilities(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  apr_hash_t **arg1 = (apr_hash_t **) 0 ;
+  svn_repos_t *arg2 = (svn_repos_t *) 0 ;
+  apr_pool_t *arg3 = (apr_pool_t *) 0 ;
+  apr_pool_t *arg4 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  apr_hash_t *temp1 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg3 = _global_pool;
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg4 = _global_pool;
+  arg1 = &temp1;
+  if (!PyArg_ParseTuple(args,(char *)"O|OO:svn_repos_capabilities",&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg2 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  if (obj1) {
+    /* Verify that the user supplied a valid pool */
+    if (obj1 != Py_None && obj1 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj1);
+      SWIG_arg_fail(svn_argnum_obj1);
+      SWIG_fail;
+    }
+  }
+  if (obj2) {
+    /* Verify that the user supplied a valid pool */
+    if (obj2 != Py_None && obj2 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj2);
+      SWIG_arg_fail(svn_argnum_obj2);
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_repos_capabilities(arg1,arg2,arg3,arg4);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  {
+    /* FIXME: Missing argout typemap: svn_repos_capabilities arg 1 (apr_hash_t **) */
+    
+    
+    
+    
+    SWIG_exception(SWIG_ValueError, "svn_repos_capabilities is not implemented yet");
+    
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_svn_repos_remember_client_capabilities(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  svn_repos_t *arg1 = (svn_repos_t *) 0 ;
+  apr_array_header_t *arg2 = (apr_array_header_t *) 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_remember_client_capabilities",&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg2 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj1);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_repos_remember_client_capabilities(arg1,(apr_array_header_t const *)arg2);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_svn_repos_fs(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   svn_repos_t *arg1 = (svn_repos_t *) 0 ;
@@ -4761,7 +5149,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs(PyObject *SWIGUNUSEDPARM(self), PyObject
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_fs",&obj0)) SWIG_fail;
   {
-    arg1 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4774,7 +5162,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs(PyObject *SWIGUNUSEDPARM(self), PyObject
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_fs_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_fs_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -4782,6 +5170,153 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_repos_fs_type(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  svn_repos_t *arg1 = (svn_repos_t *) 0 ;
+  apr_pool_t *arg2 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg2 = _global_pool;
+  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_repos_fs_type",&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  if (obj1) {
+    /* Verify that the user supplied a valid pool */
+    if (obj1 != Py_None && obj1 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj1);
+      SWIG_arg_fail(svn_argnum_obj1);
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (char *)svn_repos_fs_type(arg1,arg2);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  resultobj = SWIG_FromCharPtr((const char *)result);
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_svn_repos_hotcopy3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  svn_boolean_t arg3 ;
+  svn_boolean_t arg4 ;
+  svn_repos_notify_func_t arg5 = (svn_repos_notify_func_t) 0 ;
+  void *arg6 = (void *) 0 ;
+  svn_cancel_func_t arg7 = (svn_cancel_func_t) 0 ;
+  void *arg8 = (void *) 0 ;
+  apr_pool_t *arg9 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  PyObject * obj5 = 0 ;
+  PyObject * obj6 = 0 ;
+  PyObject * obj7 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg9 = _global_pool;
+  if (!PyArg_ParseTuple(args,(char *)"ssOOOOO|O:svn_repos_hotcopy3",&arg1,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  {
+    arg3 = (svn_boolean_t)SWIG_As_long (obj2);
+    if (SWIG_arg_fail(svn_argnum_obj2)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg4 = (svn_boolean_t)SWIG_As_long (obj3);
+    if (SWIG_arg_fail(svn_argnum_obj3)) {
+      SWIG_fail;
+    }
+  }
+  {
+    svn_repos_notify_func_t * tmp =
+    svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void, svn_argnum_obj4);
+    if (tmp == NULL || PyErr_Occurred()) {
+      SWIG_fail;
+    }
+    arg5 = *tmp;
+  }
+  {
+    if (obj5 == Py_None) {
+      arg6 = NULL;
+    } else if (SWIG_ConvertPtr(obj5, (void **) &arg6, 0, 0) == -1) {
+      arg6 = (void *) obj5;
+      PyErr_Clear();
+    }
+  }
+  {
+    arg7 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg8 = obj6;
+  }
+  if (obj7) {
+    /* Verify that the user supplied a valid pool */
+    if (obj7 != Py_None && obj7 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj7);
+      SWIG_arg_fail(svn_argnum_obj7);
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_repos_hotcopy3((char const *)arg1,(char const *)arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_svn_repos_hotcopy2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   char *arg1 = (char *) 0 ;
@@ -4817,8 +5352,8 @@ SWIGINTERN PyObject *_wrap_svn_repos_hotcopy2(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
-    arg5 = svn_swig_py_cancel_func;
-    arg6 = obj4; /* our function is the baton. */
+    arg5 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg6 = obj4;
   }
   if (obj5) {
     /* Verify that the user supplied a valid pool */
@@ -4944,14 +5479,14 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_pack2(PyObject *SWIGUNUSEDPARM(self), Py
   arg6 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOOO|O:svn_repos_fs_pack2",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
-    arg1 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
     svn_repos_notify_func_t * tmp =
-    svn_swig_MustGetPtr(obj1, SWIGTYPE_p_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void, svn_argnum_obj1);
+    svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void, svn_argnum_obj1);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4966,8 +5501,8 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_pack2(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
-    arg4 = svn_swig_py_cancel_func;
-    arg5 = obj3; /* our function is the baton. */
+    arg4 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg5 = obj3;
   }
   if (obj4) {
     /* Verify that the user supplied a valid pool */
@@ -5031,14 +5566,14 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_pack(PyObject *SWIGUNUSEDPARM(self), PyO
   arg6 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOOO|O:svn_repos_fs_pack",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
-    arg1 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
     svn_fs_pack_notify_t * tmp =
-    svn_swig_MustGetPtr(obj1, SWIGTYPE_p_p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj1);
+    svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj1);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5053,8 +5588,8 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_pack(PyObject *SWIGUNUSEDPARM(self), PyO
     }
   }
   {
-    arg4 = svn_swig_py_cancel_func;
-    arg5 = obj3; /* our function is the baton. */
+    arg4 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg5 = obj3;
   }
   if (obj4) {
     /* Verify that the user supplied a valid pool */
@@ -5126,7 +5661,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_recover4(PyObject *SWIGUNUSEDPARM(self), Py
   }
   {
     svn_repos_notify_func_t * tmp =
-    svn_swig_MustGetPtr(obj2, SWIGTYPE_p_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void, svn_argnum_obj2);
+    svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void, svn_argnum_obj2);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5141,8 +5676,8 @@ SWIGINTERN PyObject *_wrap_svn_repos_recover4(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
-    arg5 = svn_swig_py_cancel_func;
-    arg6 = obj4; /* our function is the baton. */
+    arg5 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg6 = obj4;
   }
   if (obj5) {
     /* Verify that the user supplied a valid pool */
@@ -5227,8 +5762,8 @@ SWIGINTERN PyObject *_wrap_svn_repos_recover3(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
-    arg5 = svn_swig_py_cancel_func;
-    arg6 = obj4; /* our function is the baton. */
+    arg5 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg6 = obj4;
   }
   if (obj5) {
     /* Verify that the user supplied a valid pool */
@@ -5554,7 +6089,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_path(PyObject *SWIGUNUSEDPARM(self), PyObje
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_repos_path",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5604,7 +6139,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_db_env(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_repos_db_env",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5654,7 +6189,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_conf_dir(PyObject *SWIGUNUSEDPARM(self), Py
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_repos_conf_dir",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5704,7 +6239,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_svnserve_conf(PyObject *SWIGUNUSEDPARM(self
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_repos_svnserve_conf",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5754,7 +6289,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_lock_dir(PyObject *SWIGUNUSEDPARM(self), Py
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_repos_lock_dir",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5804,7 +6339,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_db_lockfile(PyObject *SWIGUNUSEDPARM(self),
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_repos_db_lockfile",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5854,7 +6389,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_db_logs_lockfile(PyObject *SWIGUNUSEDPARM(s
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_repos_db_logs_lockfile",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5904,7 +6439,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_hook_dir(PyObject *SWIGUNUSEDPARM(self), Py
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_repos_hook_dir",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5954,7 +6489,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_start_commit_hook(PyObject *SWIGUNUSEDPARM(
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_repos_start_commit_hook",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6004,7 +6539,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_pre_commit_hook(PyObject *SWIGUNUSEDPARM(se
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_repos_pre_commit_hook",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6054,7 +6589,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_post_commit_hook(PyObject *SWIGUNUSEDPARM(s
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_repos_post_commit_hook",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6104,7 +6639,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_pre_revprop_change_hook(PyObject *SWIGUNUSE
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_repos_pre_revprop_change_hook",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6154,7 +6689,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_post_revprop_change_hook(PyObject *SWIGUNUS
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_repos_post_revprop_change_hook",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6204,7 +6739,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_pre_lock_hook(PyObject *SWIGUNUSEDPARM(self
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_repos_pre_lock_hook",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6254,7 +6789,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_post_lock_hook(PyObject *SWIGUNUSEDPARM(sel
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_repos_post_lock_hook",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6304,7 +6839,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_pre_unlock_hook(PyObject *SWIGUNUSEDPARM(se
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_repos_pre_unlock_hook",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6354,7 +6889,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_post_unlock_hook(PyObject *SWIGUNUSEDPARM(s
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_repos_post_unlock_hook",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6405,7 +6940,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_hooks_setenv(PyObject *SWIGUNUSEDPARM(self)
   arg3 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_repos_hooks_setenv",&obj0,&arg2,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6496,7 +7031,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_begin_report3(PyObject *SWIGUNUSEDPARM(self
     }
   }
   {
-    arg3 = (svn_repos_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_repos_t, svn_argnum_obj1);
+    arg3 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_repos_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6526,7 +7061,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_begin_report3(PyObject *SWIGUNUSEDPARM(self
     }
   }
   {
-    arg11 = (svn_delta_editor_t *)svn_swig_MustGetPtr(obj9, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj9);
+    arg11 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj9, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj9);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6541,7 +7076,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_begin_report3(PyObject *SWIGUNUSEDPARM(self
   }
   {
     /* FIXME: Handle the NULL case. */
-    arg13 = svn_swig_py_repos_authz_func;
+    arg13 = (svn_repos_authz_func_t) svn_swig_py_repos_authz_func;
     arg14 = obj11;
   }
   {
@@ -6578,7 +7113,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_begin_report3(PyObject *SWIGUNUSEDPARM(self
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -6640,7 +7175,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_begin_report2(PyObject *SWIGUNUSEDPARM(self
     }
   }
   {
-    arg3 = (svn_repos_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_repos_t, svn_argnum_obj1);
+    arg3 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_repos_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6670,7 +7205,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_begin_report2(PyObject *SWIGUNUSEDPARM(self
     }
   }
   {
-    arg11 = (svn_delta_editor_t *)svn_swig_MustGetPtr(obj9, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj9);
+    arg11 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj9, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj9);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6685,7 +7220,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_begin_report2(PyObject *SWIGUNUSEDPARM(self
   }
   {
     /* FIXME: Handle the NULL case. */
-    arg13 = svn_swig_py_repos_authz_func;
+    arg13 = (svn_repos_authz_func_t) svn_swig_py_repos_authz_func;
     arg14 = obj11;
   }
   if (obj12) {
@@ -6716,7 +7251,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_begin_report2(PyObject *SWIGUNUSEDPARM(self
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -6777,7 +7312,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_begin_report(PyObject *SWIGUNUSEDPARM(self)
     }
   }
   {
-    arg4 = (svn_repos_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_repos_t, svn_argnum_obj2);
+    arg4 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_repos_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6801,7 +7336,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_begin_report(PyObject *SWIGUNUSEDPARM(self)
     }
   }
   {
-    arg11 = (svn_delta_editor_t *)svn_swig_MustGetPtr(obj9, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj9);
+    arg11 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj9, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj9);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6816,7 +7351,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_begin_report(PyObject *SWIGUNUSEDPARM(self)
   }
   {
     /* FIXME: Handle the NULL case. */
-    arg13 = svn_swig_py_repos_authz_func;
+    arg13 = (svn_repos_authz_func_t) svn_swig_py_repos_authz_func;
     arg14 = obj11;
   }
   if (obj12) {
@@ -6847,7 +7382,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_begin_report(PyObject *SWIGUNUSEDPARM(self)
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -7584,19 +8119,19 @@ SWIGINTERN PyObject *_wrap_svn_repos_dir_delta2(PyObject *SWIGUNUSEDPARM(self),
   arg14 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OszOzOOOOOOO|O:svn_repos_dir_delta2",&obj0,&arg2,&arg3,&obj3,&arg5,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12)) SWIG_fail;
   {
-    arg1 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
+    arg1 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj3);
+    arg4 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg6 = (svn_delta_editor_t *)svn_swig_MustGetPtr(obj5, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj5);
+    arg6 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj5, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj5);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7611,7 +8146,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_dir_delta2(PyObject *SWIGUNUSEDPARM(self),
   }
   {
     /* FIXME: Handle the NULL case. */
-    arg8 = svn_swig_py_repos_authz_func;
+    arg8 = (svn_repos_authz_func_t) svn_swig_py_repos_authz_func;
     arg9 = obj7;
   }
   {
@@ -7713,19 +8248,19 @@ SWIGINTERN PyObject *_wrap_svn_repos_dir_delta(PyObject *SWIGUNUSEDPARM(self), P
   arg14 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OszOzOOOOOOO|O:svn_repos_dir_delta",&obj0,&arg2,&arg3,&obj3,&arg5,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12)) SWIG_fail;
   {
-    arg1 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
+    arg1 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj3);
+    arg4 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg6 = (svn_delta_editor_t *)svn_swig_MustGetPtr(obj5, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj5);
+    arg6 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj5, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj5);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7740,7 +8275,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_dir_delta(PyObject *SWIGUNUSEDPARM(self), P
   }
   {
     /* FIXME: Handle the NULL case. */
-    arg8 = svn_swig_py_repos_authz_func;
+    arg8 = (svn_repos_authz_func_t) svn_swig_py_repos_authz_func;
     arg9 = obj7;
   }
   {
@@ -7834,7 +8369,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_replay2(PyObject *SWIGUNUSEDPARM(self), PyO
   arg9 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OsOOOOO|O:svn_repos_replay2",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
-    arg1 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
+    arg1 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7852,7 +8387,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_replay2(PyObject *SWIGUNUSEDPARM(self), PyO
     }
   }
   {
-    arg5 = (svn_delta_editor_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj4);
+    arg5 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7867,7 +8402,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_replay2(PyObject *SWIGUNUSEDPARM(self), PyO
   }
   {
     /* FIXME: Handle the NULL case. */
-    arg7 = svn_swig_py_repos_authz_func;
+    arg7 = (svn_repos_authz_func_t) svn_swig_py_repos_authz_func;
     arg8 = obj6;
   }
   if (obj7) {
@@ -7929,13 +8464,13 @@ SWIGINTERN PyObject *_wrap_svn_repos_replay(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg4 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_repos_replay",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
-    arg1 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
+    arg1 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_delta_editor_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj1);
+    arg2 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8022,13 +8557,13 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_commit_editor5(PyObject *SWIGUNUSEDPARM
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"OOssOOOO|O:svn_repos_get_commit_editor5",&obj0,&obj1,&arg5,&arg6,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   {
-    arg3 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg3 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (svn_fs_txn_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_fs_txn_t, svn_argnum_obj1);
+    arg4 = (svn_fs_txn_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_fs_txn_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8052,7 +8587,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_commit_editor5(PyObject *SWIGUNUSEDPARM
   }
   {
     svn_repos_authz_callback_t * tmp =
-    svn_swig_MustGetPtr(obj6, SWIGTYPE_p_p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj6);
+    svn_swig_py_must_get_ptr(obj6, SWIGTYPE_p_p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj6);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8094,13 +8629,13 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_commit_editor5(PyObject *SWIGUNUSEDPARM
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_delta_editor_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_delta_editor_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -8152,13 +8687,13 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_commit_editor4(PyObject *SWIGUNUSEDPARM
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"OOsszzOOO|O:svn_repos_get_commit_editor4",&obj0,&obj1,&arg5,&arg6,&arg7,&arg8,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   {
-    arg3 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg3 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (svn_fs_txn_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_fs_txn_t, svn_argnum_obj1);
+    arg4 = (svn_fs_txn_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_fs_txn_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8169,7 +8704,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_commit_editor4(PyObject *SWIGUNUSEDPARM
   }
   {
     svn_repos_authz_callback_t * tmp =
-    svn_swig_MustGetPtr(obj7, SWIGTYPE_p_p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj7);
+    svn_swig_py_must_get_ptr(obj7, SWIGTYPE_p_p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj7);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8211,13 +8746,13 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_commit_editor4(PyObject *SWIGUNUSEDPARM
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_delta_editor_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_delta_editor_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -8269,13 +8804,13 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_commit_editor3(PyObject *SWIGUNUSEDPARM
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"OOsszzOOO|O:svn_repos_get_commit_editor3",&obj0,&obj1,&arg5,&arg6,&arg7,&arg8,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   {
-    arg3 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg3 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (svn_fs_txn_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_fs_txn_t, svn_argnum_obj1);
+    arg4 = (svn_fs_txn_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_fs_txn_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8286,7 +8821,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_commit_editor3(PyObject *SWIGUNUSEDPARM
   }
   {
     svn_repos_authz_callback_t * tmp =
-    svn_swig_MustGetPtr(obj7, SWIGTYPE_p_p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj7);
+    svn_swig_py_must_get_ptr(obj7, SWIGTYPE_p_p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj7);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8328,13 +8863,13 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_commit_editor3(PyObject *SWIGUNUSEDPARM
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_delta_editor_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_delta_editor_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -8382,13 +8917,13 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_commit_editor2(PyObject *SWIGUNUSEDPARM
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"OOsszzO|O:svn_repos_get_commit_editor2",&obj0,&obj1,&arg5,&arg6,&arg7,&arg8,&obj6,&obj7)) SWIG_fail;
   {
-    arg3 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg3 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (svn_fs_txn_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_fs_txn_t, svn_argnum_obj1);
+    arg4 = (svn_fs_txn_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_fs_txn_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8425,13 +8960,13 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_commit_editor2(PyObject *SWIGUNUSEDPARM
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_delta_editor_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_delta_editor_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -8477,7 +9012,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_commit_editor(PyObject *SWIGUNUSEDPARM(
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"OsszzO|O:svn_repos_get_commit_editor",&obj0,&arg4,&arg5,&arg6,&arg7,&obj5,&obj6)) SWIG_fail;
   {
-    arg3 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg3 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8514,13 +9049,13 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_commit_editor(PyObject *SWIGUNUSEDPARM(
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_delta_editor_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_delta_editor_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -8559,7 +9094,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_dated_revision(PyObject *SWIGUNUSEDPARM(sel
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_repos_dated_revision",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg2 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg2 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8637,7 +9172,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_committed_info(PyObject *SWIGUNUSEDPARM
   arg3 = &temp3;
   if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_repos_get_committed_info",&obj0,&arg5,&obj2)) SWIG_fail;
   {
-    arg4 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
+    arg4 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8733,7 +9268,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_stat(PyObject *SWIGUNUSEDPARM(self), PyObje
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_repos_stat",&obj0,&arg3,&obj2)) SWIG_fail;
   {
-    arg2 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
+    arg2 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8766,7 +9301,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_stat(PyObject *SWIGUNUSEDPARM(self), PyObje
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_dirent_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_dirent_t,
         _global_py_pool, args))
     
     ;
@@ -8808,7 +9343,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_deleted_rev(PyObject *SWIGUNUSEDPARM(self),
   arg5 = &temp5;
   if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_repos_deleted_rev",&obj0,&arg2,&obj2,&obj3,&obj4)) SWIG_fail;
   {
-    arg1 = (svn_fs_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
+    arg1 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8899,18 +9434,18 @@ SWIGINTERN PyObject *_wrap_svn_repos_history2(PyObject *SWIGUNUSEDPARM(self), Py
   arg10 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OsOOOOO|O:svn_repos_history2",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
-    arg1 = (svn_fs_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
+    arg1 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = svn_swig_py_repos_history_func;
+    arg3 = (svn_repos_history_func_t) svn_swig_py_repos_history_func;
     arg4 = obj2;
   }
   {
     /* FIXME: Handle the NULL case. */
-    arg5 = svn_swig_py_repos_authz_func;
+    arg5 = (svn_repos_authz_func_t) svn_swig_py_repos_authz_func;
     arg6 = obj3;
   }
   {
@@ -8996,13 +9531,13 @@ SWIGINTERN PyObject *_wrap_svn_repos_history(PyObject *SWIGUNUSEDPARM(self), PyO
   arg8 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OsOOOO|O:svn_repos_history",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
-    arg1 = (svn_fs_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
+    arg1 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = svn_swig_py_repos_history_func;
+    arg3 = (svn_repos_history_func_t) svn_swig_py_repos_history_func;
     arg4 = obj2;
   }
   {
@@ -9089,7 +9624,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_trace_node_locations(PyObject *SWIGUNUSEDPA
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"OsOOO|O:svn_repos_trace_node_locations",&obj0,&arg3,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
-    arg1 = (svn_fs_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
+    arg1 = (svn_fs_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9111,7 +9646,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_trace_node_locations(PyObject *SWIGUNUSEDPA
   }
   {
     /* FIXME: Handle the NULL case. */
-    arg6 = svn_swig_py_repos_authz_func;
+    arg6 = (svn_repos_authz_func_t) svn_swig_py_repos_authz_func;
     arg7 = obj4;
   }
   if (obj5) {
@@ -9185,7 +9720,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_node_location_segments(PyObject *SWIGUNUSED
   arg10 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OsOOOOO|O:svn_repos_node_location_segments",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
-    arg1 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9209,12 +9744,12 @@ SWIGINTERN PyObject *_wrap_svn_repos_node_location_segments(PyObject *SWIGUNUSED
     }
   }
   {
-    arg6 = svn_swig_py_location_segment_receiver_func;
+    arg6 = (svn_location_segment_receiver_t) svn_swig_py_location_segment_receiver_func;
     arg7 = obj5;
   }
   {
     /* FIXME: Handle the NULL case. */
-    arg8 = svn_swig_py_repos_authz_func;
+    arg8 = (svn_repos_authz_func_t) svn_swig_py_repos_authz_func;
     arg9 = obj6;
   }
   if (obj7) {
@@ -9294,7 +9829,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_logs4(PyObject *SWIGUNUSEDPARM(self), P
   arg14 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOOOOOO|O:svn_repos_get_logs4",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11)) SWIG_fail;
   {
-    arg1 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9355,11 +9890,11 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_logs4(PyObject *SWIGUNUSEDPARM(self), P
   }
   {
     /* FIXME: Handle the NULL case. */
-    arg10 = svn_swig_py_repos_authz_func;
+    arg10 = (svn_repos_authz_func_t) svn_swig_py_repos_authz_func;
     arg11 = obj9;
   }
   {
-    arg12 = svn_swig_py_log_entry_receiver;
+    arg12 = (svn_log_entry_receiver_t) svn_swig_py_log_entry_receiver;
     arg13 = obj10;
   }
   if (obj11) {
@@ -9435,7 +9970,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_logs3(PyObject *SWIGUNUSEDPARM(self), P
   arg12 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOOOO|O:svn_repos_get_logs3",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   {
-    arg1 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9481,11 +10016,11 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_logs3(PyObject *SWIGUNUSEDPARM(self), P
   }
   {
     /* FIXME: Handle the NULL case. */
-    arg8 = svn_swig_py_repos_authz_func;
+    arg8 = (svn_repos_authz_func_t) svn_swig_py_repos_authz_func;
     arg9 = obj7;
   }
   {
-    arg10 = svn_swig_py_log_receiver;
+    arg10 = (svn_log_message_receiver_t) svn_swig_py_log_receiver;
     arg11 = obj8;
   }
   if (obj9) {
@@ -9559,7 +10094,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_logs2(PyObject *SWIGUNUSEDPARM(self), P
   arg11 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOOO|O:svn_repos_get_logs2",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   {
-    arg1 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9599,11 +10134,11 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_logs2(PyObject *SWIGUNUSEDPARM(self), P
   }
   {
     /* FIXME: Handle the NULL case. */
-    arg7 = svn_swig_py_repos_authz_func;
+    arg7 = (svn_repos_authz_func_t) svn_swig_py_repos_authz_func;
     arg8 = obj6;
   }
   {
-    arg9 = svn_swig_py_log_receiver;
+    arg9 = (svn_log_message_receiver_t) svn_swig_py_log_receiver;
     arg10 = obj7;
   }
   if (obj8) {
@@ -9674,7 +10209,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_logs(PyObject *SWIGUNUSEDPARM(self), Py
   arg9 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOO|O:svn_repos_get_logs",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
-    arg1 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9713,7 +10248,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_logs(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
-    arg7 = svn_swig_py_log_receiver;
+    arg7 = (svn_log_message_receiver_t) svn_swig_py_log_receiver;
     arg8 = obj6;
   }
   if (obj7) {
@@ -9785,7 +10320,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_get_mergeinfo(PyObject *SWIGUNUSEDPARM(s
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OOOOOO|O:svn_repos_fs_get_mergeinfo",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
-    arg2 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg2 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9819,7 +10354,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_get_mergeinfo(PyObject *SWIGUNUSEDPARM(s
   }
   {
     /* FIXME: Handle the NULL case. */
-    arg7 = svn_swig_py_repos_authz_func;
+    arg7 = (svn_repos_authz_func_t) svn_swig_py_repos_authz_func;
     arg8 = obj5;
   }
   if (obj6) {
@@ -9903,7 +10438,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_file_revs2(PyObject *SWIGUNUSEDPARM(sel
   arg10 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OsOOOOOO|O:svn_repos_get_file_revs2",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   {
-    arg1 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9928,12 +10463,12 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_file_revs2(PyObject *SWIGUNUSEDPARM(sel
   }
   {
     /* FIXME: Handle the NULL case. */
-    arg6 = svn_swig_py_repos_authz_func;
+    arg6 = (svn_repos_authz_func_t) svn_swig_py_repos_authz_func;
     arg7 = obj5;
   }
   {
     svn_file_rev_handler_t * tmp =
-    svn_swig_MustGetPtr(obj6, SWIGTYPE_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj6);
+    svn_swig_py_must_get_ptr(obj6, SWIGTYPE_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj6);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10014,7 +10549,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_file_revs(PyObject *SWIGUNUSEDPARM(self
   arg9 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OsOOOOO|O:svn_repos_get_file_revs",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
-    arg1 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10033,12 +10568,12 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_file_revs(PyObject *SWIGUNUSEDPARM(self
   }
   {
     /* FIXME: Handle the NULL case. */
-    arg5 = svn_swig_py_repos_authz_func;
+    arg5 = (svn_repos_authz_func_t) svn_swig_py_repos_authz_func;
     arg6 = obj4;
   }
   {
     svn_repos_file_rev_handler_t * tmp =
-    svn_swig_MustGetPtr(obj5, SWIGTYPE_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj5);
+    svn_swig_py_must_get_ptr(obj5, SWIGTYPE_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj5);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10116,13 +10651,13 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_commit_txn(PyObject *SWIGUNUSEDPARM(self
   arg3 = &temp3;
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_repos_fs_commit_txn",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg2 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg2 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (svn_fs_txn_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_fs_txn_t, svn_argnum_obj1);
+    arg4 = (svn_fs_txn_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_fs_txn_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10208,7 +10743,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_begin_txn_for_commit2(PyObject *SWIGUNUS
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_repos_fs_begin_txn_for_commit2",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
-    arg2 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg2 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10260,7 +10795,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_begin_txn_for_commit2(PyObject *SWIGUNUS
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_fs_txn_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_fs_txn_t,
         _global_py_pool, args))
     
     ;
@@ -10300,7 +10835,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_begin_txn_for_commit(PyObject *SWIGUNUSE
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OOsz|O:svn_repos_fs_begin_txn_for_commit",&obj0,&obj1,&arg4,&arg5,&obj4)) SWIG_fail;
   {
-    arg2 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg2 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10339,7 +10874,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_begin_txn_for_commit(PyObject *SWIGUNUSE
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_fs_txn_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_fs_txn_t,
         _global_py_pool, args))
     
     ;
@@ -10378,7 +10913,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_begin_txn_for_update(PyObject *SWIGUNUSE
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OOs|O:svn_repos_fs_begin_txn_for_update",&obj0,&obj1,&arg4,&obj3)) SWIG_fail;
   {
-    arg2 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg2 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10417,7 +10952,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_begin_txn_for_update(PyObject *SWIGUNUSE
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_fs_txn_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_fs_txn_t,
         _global_py_pool, args))
     
     ;
@@ -10434,6 +10969,128 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_repos_fs_lock_many(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  svn_repos_t *arg1 = (svn_repos_t *) 0 ;
+  apr_hash_t *arg2 = (apr_hash_t *) 0 ;
+  char *arg3 = (char *) 0 ;
+  svn_boolean_t arg4 ;
+  apr_time_t arg5 ;
+  svn_boolean_t arg6 ;
+  svn_fs_lock_callback_t arg7 = (svn_fs_lock_callback_t) 0 ;
+  void *arg8 = (void *) 0 ;
+  apr_pool_t *arg9 = (apr_pool_t *) 0 ;
+  apr_pool_t *arg10 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  PyObject * obj5 = 0 ;
+  PyObject * obj6 = 0 ;
+  PyObject * obj7 = 0 ;
+  PyObject * obj8 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg9 = _global_pool;
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg10 = _global_pool;
+  if (!PyArg_ParseTuple(args,(char *)"OOzOOOO|OO:svn_repos_fs_lock_many",&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
+  {
+    arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    if (_global_pool == NULL)
+    {
+      if (svn_swig_py_get_parent_pool(args, SWIGTYPE_p_apr_pool_t,
+          &_global_py_pool, &_global_pool))
+      SWIG_fail;
+    }
+    arg2 = svn_swig_py_struct_ptr_hash_from_dict(obj1,
+      SWIGTYPE_p_svn_fs_lock_target_t, _global_pool);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg4 = (svn_boolean_t)SWIG_As_long (obj3);
+    if (SWIG_arg_fail(svn_argnum_obj3)) {
+      SWIG_fail;
+    }
+  }
+  arg5 = (apr_time_t) PyLong_AsLongLong(obj4); 
+  {
+    arg6 = (svn_boolean_t)SWIG_As_long (obj5);
+    if (SWIG_arg_fail(svn_argnum_obj5)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg7 = (svn_fs_lock_callback_t) svn_swig_py_fs_lock_callback;
+    arg8 = obj6;
+  }
+  if (obj7) {
+    /* Verify that the user supplied a valid pool */
+    if (obj7 != Py_None && obj7 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj7);
+      SWIG_arg_fail(svn_argnum_obj7);
+      SWIG_fail;
+    }
+  }
+  if (obj8) {
+    /* Verify that the user supplied a valid pool */
+    if (obj8 != Py_None && obj8 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj8);
+      SWIG_arg_fail(svn_argnum_obj8);
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_repos_fs_lock_many(arg1,arg2,(char const *)arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_svn_repos_fs_lock(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   svn_lock_t **arg1 = (svn_lock_t **) 0 ;
@@ -10464,7 +11121,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_lock(PyObject *SWIGUNUSEDPARM(self), PyO
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OszzOOOO|O:svn_repos_fs_lock",&obj0,&arg3,&arg4,&arg5,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   {
-    arg2 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg2 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10516,7 +11173,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_lock(PyObject *SWIGUNUSEDPARM(self), PyO
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_lock_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_lock_t,
         _global_py_pool, args))
     
     ;
@@ -10533,6 +11190,106 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_repos_fs_unlock_many(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  svn_repos_t *arg1 = (svn_repos_t *) 0 ;
+  apr_hash_t *arg2 = (apr_hash_t *) 0 ;
+  svn_boolean_t arg3 ;
+  svn_fs_lock_callback_t arg4 = (svn_fs_lock_callback_t) 0 ;
+  void *arg5 = (void *) 0 ;
+  apr_pool_t *arg6 = (apr_pool_t *) 0 ;
+  apr_pool_t *arg7 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  PyObject * obj5 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg6 = _global_pool;
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg7 = _global_pool;
+  if (!PyArg_ParseTuple(args,(char *)"OOOO|OO:svn_repos_fs_unlock_many",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  {
+    arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg2 = svn_swig_py_stringhash_from_dict(obj1, _global_pool);
+  }
+  {
+    arg3 = (svn_boolean_t)SWIG_As_long (obj2);
+    if (SWIG_arg_fail(svn_argnum_obj2)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg4 = (svn_fs_lock_callback_t) svn_swig_py_fs_lock_callback;
+    arg5 = obj3;
+  }
+  if (obj4) {
+    /* Verify that the user supplied a valid pool */
+    if (obj4 != Py_None && obj4 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj4);
+      SWIG_arg_fail(svn_argnum_obj4);
+      SWIG_fail;
+    }
+  }
+  if (obj5) {
+    /* Verify that the user supplied a valid pool */
+    if (obj5 != Py_None && obj5 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj5);
+      SWIG_arg_fail(svn_argnum_obj5);
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_repos_fs_unlock_many(arg1,arg2,arg3,arg4,arg5,arg6,arg7);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_svn_repos_fs_unlock(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   svn_repos_t *arg1 = (svn_repos_t *) 0 ;
@@ -10553,7 +11310,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_unlock(PyObject *SWIGUNUSEDPARM(self), P
   arg5 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OszO|O:svn_repos_fs_unlock",&obj0,&arg2,&arg3,&obj3,&obj4)) SWIG_fail;
   {
-    arg1 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10628,7 +11385,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_get_locks2(PyObject *SWIGUNUSEDPARM(self
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_repos_fs_get_locks2",&obj0,&arg3,&obj2,&obj3,&obj4)) SWIG_fail;
   {
-    arg2 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg2 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10641,7 +11398,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_get_locks2(PyObject *SWIGUNUSEDPARM(self
   }
   {
     /* FIXME: Handle the NULL case. */
-    arg5 = svn_swig_py_repos_authz_func;
+    arg5 = (svn_repos_authz_func_t) svn_swig_py_repos_authz_func;
     arg6 = obj3;
   }
   if (obj4) {
@@ -10715,14 +11472,14 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_get_locks(PyObject *SWIGUNUSEDPARM(self)
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OsO|O:svn_repos_fs_get_locks",&obj0,&arg3,&obj2,&obj3)) SWIG_fail;
   {
-    arg2 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg2 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
     /* FIXME: Handle the NULL case. */
-    arg4 = svn_swig_py_repos_authz_func;
+    arg4 = (svn_repos_authz_func_t) svn_swig_py_repos_authz_func;
     arg5 = obj2;
   }
   if (obj3) {
@@ -10805,7 +11562,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_change_rev_prop4(PyObject *SWIGUNUSEDPAR
   arg11 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOssOOOOO|O:svn_repos_fs_change_rev_prop4",&obj0,&obj1,&arg3,&arg4,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   {
-    arg1 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10817,7 +11574,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_change_rev_prop4(PyObject *SWIGUNUSEDPAR
     }
   }
   {
-    arg5 = (svn_string_t **)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_p_svn_string_t, svn_argnum_obj4);
+    arg5 = (svn_string_t **)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_p_svn_string_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10849,7 +11606,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_change_rev_prop4(PyObject *SWIGUNUSEDPAR
   }
   {
     /* FIXME: Handle the NULL case. */
-    arg9 = svn_swig_py_repos_authz_func;
+    arg9 = (svn_repos_authz_func_t) svn_swig_py_repos_authz_func;
     arg10 = obj8;
   }
   if (obj9) {
@@ -10934,7 +11691,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_change_rev_prop3(PyObject *SWIGUNUSEDPAR
   arg10 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOssOOOO|O:svn_repos_fs_change_rev_prop3",&obj0,&obj1,&arg3,&arg4,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   {
-    arg1 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10972,7 +11729,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_change_rev_prop3(PyObject *SWIGUNUSEDPAR
   }
   {
     /* FIXME: Handle the NULL case. */
-    arg8 = svn_swig_py_repos_authz_func;
+    arg8 = (svn_repos_authz_func_t) svn_swig_py_repos_authz_func;
     arg9 = obj7;
   }
   if (obj8) {
@@ -11040,7 +11797,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_change_rev_prop2(PyObject *SWIGUNUSEDPAR
   arg8 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOssOO|O:svn_repos_fs_change_rev_prop2",&obj0,&obj1,&arg3,&arg4,&obj4,&obj5,&obj6)) SWIG_fail;
   {
-    arg1 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11066,7 +11823,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_change_rev_prop2(PyObject *SWIGUNUSEDPAR
   }
   {
     /* FIXME: Handle the NULL case. */
-    arg6 = svn_swig_py_repos_authz_func;
+    arg6 = (svn_repos_authz_func_t) svn_swig_py_repos_authz_func;
     arg7 = obj5;
   }
   if (obj6) {
@@ -11131,7 +11888,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_change_rev_prop(PyObject *SWIGUNUSEDPARM
   arg6 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOssO|O:svn_repos_fs_change_rev_prop",&obj0,&obj1,&arg3,&arg4,&obj4,&obj5)) SWIG_fail;
   {
-    arg1 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11219,7 +11976,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_revision_prop(PyObject *SWIGUNUSEDPARM(s
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OOsO|O:svn_repos_fs_revision_prop",&obj0,&obj1,&arg4,&obj3,&obj4)) SWIG_fail;
   {
-    arg2 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg2 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11232,7 +11989,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_revision_prop(PyObject *SWIGUNUSEDPARM(s
   }
   {
     /* FIXME: Handle the NULL case. */
-    arg5 = svn_swig_py_repos_authz_func;
+    arg5 = (svn_repos_authz_func_t) svn_swig_py_repos_authz_func;
     arg6 = obj3;
   }
   if (obj4) {
@@ -11311,7 +12068,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_revision_proplist(PyObject *SWIGUNUSEDPA
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_repos_fs_revision_proplist",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
-    arg2 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg2 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11324,7 +12081,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_revision_proplist(PyObject *SWIGUNUSEDPA
   }
   {
     /* FIXME: Handle the NULL case. */
-    arg4 = svn_swig_py_repos_authz_func;
+    arg4 = (svn_repos_authz_func_t) svn_swig_py_repos_authz_func;
     arg5 = obj2;
   }
   if (obj3) {
@@ -11390,7 +12147,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_change_node_prop(PyObject *SWIGUNUSEDPAR
   arg5 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OssO|O:svn_repos_fs_change_node_prop",&obj0,&arg2,&arg3,&obj3,&obj4)) SWIG_fail;
   {
-    arg1 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
+    arg1 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11447,6 +12204,102 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_repos_fs_get_inherited_props(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  apr_array_header_t **arg1 = (apr_array_header_t **) 0 ;
+  svn_fs_root_t *arg2 = (svn_fs_root_t *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  svn_repos_authz_func_t arg5 = (svn_repos_authz_func_t) 0 ;
+  void *arg6 = (void *) 0 ;
+  apr_pool_t *arg7 = (apr_pool_t *) 0 ;
+  apr_pool_t *arg8 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  apr_array_header_t *temp1 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  PyObject * obj5 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg7 = _global_pool;
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg8 = _global_pool;
+  arg1 = &temp1;
+  if (!PyArg_ParseTuple(args,(char *)"OssO|OO:svn_repos_fs_get_inherited_props",&obj0,&arg3,&arg4,&obj3,&obj4,&obj5)) SWIG_fail;
+  {
+    arg2 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    /* FIXME: Handle the NULL case. */
+    arg5 = (svn_repos_authz_func_t) svn_swig_py_repos_authz_func;
+    arg6 = obj3;
+  }
+  if (obj4) {
+    /* Verify that the user supplied a valid pool */
+    if (obj4 != Py_None && obj4 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj4);
+      SWIG_arg_fail(svn_argnum_obj4);
+      SWIG_fail;
+    }
+  }
+  if (obj5) {
+    /* Verify that the user supplied a valid pool */
+    if (obj5 != Py_None && obj5 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj5);
+      SWIG_arg_fail(svn_argnum_obj5);
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_repos_fs_get_inherited_props(arg1,arg2,(char const *)arg3,(char const *)arg4,arg5,arg6,arg7,arg8);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  {
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_propinheriteditemarray_to_dict(*arg1));
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_svn_repos_fs_change_txn_prop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   svn_fs_txn_t *arg1 = (svn_fs_txn_t *) 0 ;
@@ -11467,7 +12320,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_change_txn_prop(PyObject *SWIGUNUSEDPARM
   arg4 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OsO|O:svn_repos_fs_change_txn_prop",&obj0,&arg2,&obj2,&obj3)) SWIG_fail;
   {
-    arg1 = (svn_fs_txn_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_txn_t, svn_argnum_obj0);
+    arg1 = (svn_fs_txn_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_txn_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11542,13 +12395,13 @@ SWIGINTERN PyObject *_wrap_svn_repos_fs_change_txn_props(PyObject *SWIGUNUSEDPAR
   arg3 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_repos_fs_change_txn_props",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_fs_txn_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_txn_t, svn_argnum_obj0);
+    arg1 = (svn_fs_txn_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_fs_txn_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (apr_array_header_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj1);
+    arg2 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11601,7 +12454,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_node_t_kind_set(PyObject *SWIGUNUSEDPARM(se
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_node_t_kind_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_node_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_node_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_node_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_node_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11628,7 +12481,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_node_t_kind_get(PyObject *SWIGUNUSEDPARM(se
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_node_t_kind_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_node_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_node_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_node_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_node_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11649,7 +12502,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_node_t_action_set(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"Oc:svn_repos_node_t_action_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_node_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_node_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_node_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_node_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11670,7 +12523,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_node_t_action_get(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_node_t_action_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_node_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_node_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_node_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_node_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11692,7 +12545,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_node_t_text_mod_set(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_node_t_text_mod_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_node_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_node_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_node_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_node_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11719,7 +12572,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_node_t_text_mod_get(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_node_t_text_mod_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_node_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_node_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_node_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_node_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11741,7 +12594,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_node_t_prop_mod_set(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_node_t_prop_mod_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_node_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_node_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_node_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_node_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11768,7 +12621,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_node_t_prop_mod_get(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_node_t_prop_mod_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_node_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_node_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_node_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_node_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11789,7 +12642,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_node_t_name_set(PyObject *SWIGUNUSEDPARM(se
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_repos_node_t_name_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_node_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_node_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_node_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_node_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11817,7 +12670,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_node_t_name_get(PyObject *SWIGUNUSEDPARM(se
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_node_t_name_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_node_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_node_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_node_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_node_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11839,7 +12692,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_node_t_copyfrom_rev_set(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_node_t_copyfrom_rev_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_node_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_node_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_node_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_node_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11866,7 +12719,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_node_t_copyfrom_rev_get(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_node_t_copyfrom_rev_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_node_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_node_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_node_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_node_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11887,7 +12740,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_node_t_copyfrom_path_set(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"Oz:svn_repos_node_t_copyfrom_path_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_node_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_node_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_node_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_node_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11915,7 +12768,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_node_t_copyfrom_path_get(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_node_t_copyfrom_path_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_node_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_node_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_node_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_node_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11937,13 +12790,13 @@ SWIGINTERN PyObject *_wrap_svn_repos_node_t_sibling_set(PyObject *SWIGUNUSEDPARM
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_node_t_sibling_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_node_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_node_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_node_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_node_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (struct svn_repos_node_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_repos_node_t, svn_argnum_obj1);
+    arg2 = (struct svn_repos_node_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_repos_node_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11964,13 +12817,13 @@ SWIGINTERN PyObject *_wrap_svn_repos_node_t_sibling_get(PyObject *SWIGUNUSEDPARM
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_node_t_sibling_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_node_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_node_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_node_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_node_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (struct svn_repos_node_t *) ((arg1)->sibling);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_repos_node_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_repos_node_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -11987,13 +12840,13 @@ SWIGINTERN PyObject *_wrap_svn_repos_node_t_child_set(PyObject *SWIGUNUSEDPARM(s
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_node_t_child_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_node_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_node_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_node_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_node_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (struct svn_repos_node_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_repos_node_t, svn_argnum_obj1);
+    arg2 = (struct svn_repos_node_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_repos_node_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12014,13 +12867,13 @@ SWIGINTERN PyObject *_wrap_svn_repos_node_t_child_get(PyObject *SWIGUNUSEDPARM(s
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_node_t_child_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_node_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_node_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_node_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_node_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (struct svn_repos_node_t *) ((arg1)->child);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_repos_node_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_repos_node_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -12037,13 +12890,13 @@ SWIGINTERN PyObject *_wrap_svn_repos_node_t_parent_set(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_node_t_parent_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_node_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_node_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_node_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_node_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (struct svn_repos_node_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_repos_node_t, svn_argnum_obj1);
+    arg2 = (struct svn_repos_node_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_repos_node_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12064,13 +12917,13 @@ SWIGINTERN PyObject *_wrap_svn_repos_node_t_parent_get(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_node_t_parent_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_node_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_node_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_node_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_node_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (struct svn_repos_node_t *) ((arg1)->parent);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_repos_node_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_repos_node_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -12117,19 +12970,19 @@ SWIGINTERN PyObject *_wrap_svn_repos_node_editor(PyObject *SWIGUNUSEDPARM(self),
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"OOO|OO:svn_repos_node_editor",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
-    arg3 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg3 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj1);
+    arg4 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg5 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj2);
+    arg5 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12170,13 +13023,13 @@ SWIGINTERN PyObject *_wrap_svn_repos_node_editor(PyObject *SWIGUNUSEDPARM(self),
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_delta_editor_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_delta_editor_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -12222,7 +13075,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_node_from_baton(PyObject *SWIGUNUSEDPARM(se
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_repos_node_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_repos_node_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -12230,6 +13083,260 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_repos_info_format(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  int *arg1 = (int *) 0 ;
+  svn_version_t **arg2 = (svn_version_t **) 0 ;
+  svn_repos_t *arg3 = (svn_repos_t *) 0 ;
+  apr_pool_t *arg4 = (apr_pool_t *) 0 ;
+  apr_pool_t *arg5 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  int temp1 ;
+  int res1 = SWIG_TMPOBJ ;
+  svn_version_t *temp2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg4 = _global_pool;
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg5 = _global_pool;
+  arg1 = &temp1;
+  arg2 = &temp2;
+  if (!PyArg_ParseTuple(args,(char *)"O|OO:svn_repos_info_format",&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    arg3 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  if (obj1) {
+    /* Verify that the user supplied a valid pool */
+    if (obj1 != Py_None && obj1 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj1);
+      SWIG_arg_fail(svn_argnum_obj1);
+      SWIG_fail;
+    }
+  }
+  if (obj2) {
+    /* Verify that the user supplied a valid pool */
+    if (obj2 != Py_None && obj2 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj2);
+      SWIG_arg_fail(svn_argnum_obj2);
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_repos_info_format(arg1,arg2,arg3,arg4,arg5);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  if (SWIG_IsTmpObj(res1)) {
+    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_From_int((*arg1)));
+  } else {
+    int new_flags = SWIG_IsNewObj(res1) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
+    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg1), SWIGTYPE_p_int, new_flags));
+  }
+  {
+    /* FIXME: Missing argout typemap: svn_repos_info_format arg 2 (svn_version_t **) */
+    
+    
+    
+    
+    SWIG_exception(SWIG_ValueError, "svn_repos_info_format is not implemented yet");
+    
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_svn_repos_verify_fs3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  svn_repos_t *arg1 = (svn_repos_t *) 0 ;
+  svn_revnum_t arg2 ;
+  svn_revnum_t arg3 ;
+  svn_boolean_t arg4 ;
+  svn_boolean_t arg5 ;
+  svn_repos_notify_func_t arg6 = (svn_repos_notify_func_t) 0 ;
+  void *arg7 = (void *) 0 ;
+  svn_repos_verify_callback_t arg8 = (svn_repos_verify_callback_t) 0 ;
+  void *arg9 = (void *) 0 ;
+  svn_cancel_func_t arg10 = (svn_cancel_func_t) 0 ;
+  void *arg11 = (void *) 0 ;
+  apr_pool_t *arg12 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  PyObject * obj5 = 0 ;
+  PyObject * obj6 = 0 ;
+  PyObject * obj7 = 0 ;
+  PyObject * obj8 = 0 ;
+  PyObject * obj9 = 0 ;
+  PyObject * obj10 = 0 ;
+  PyObject * obj11 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg12 = _global_pool;
+  if (!PyArg_ParseTuple(args,(char *)"OOOOOOOOOOO|O:svn_repos_verify_fs3",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11)) SWIG_fail;
+  {
+    arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg2 = (svn_revnum_t)SWIG_As_long (obj1);
+    if (SWIG_arg_fail(svn_argnum_obj1)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg3 = (svn_revnum_t)SWIG_As_long (obj2);
+    if (SWIG_arg_fail(svn_argnum_obj2)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg4 = (svn_boolean_t)SWIG_As_long (obj3);
+    if (SWIG_arg_fail(svn_argnum_obj3)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg5 = (svn_boolean_t)SWIG_As_long (obj4);
+    if (SWIG_arg_fail(svn_argnum_obj4)) {
+      SWIG_fail;
+    }
+  }
+  {
+    svn_repos_notify_func_t * tmp =
+    svn_swig_py_must_get_ptr(obj5, SWIGTYPE_p_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void, svn_argnum_obj5);
+    if (tmp == NULL || PyErr_Occurred()) {
+      SWIG_fail;
+    }
+    arg6 = *tmp;
+  }
+  {
+    if (obj6 == Py_None) {
+      arg7 = NULL;
+    } else if (SWIG_ConvertPtr(obj6, (void **) &arg7, 0, 0) == -1) {
+      arg7 = (void *) obj6;
+      PyErr_Clear();
+    }
+  }
+  {
+    svn_repos_verify_callback_t * tmp =
+    svn_swig_py_must_get_ptr(obj7, SWIGTYPE_p_p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj7);
+    if (tmp == NULL || PyErr_Occurred()) {
+      SWIG_fail;
+    }
+    arg8 = *tmp;
+  }
+  {
+    if (obj8 == Py_None) {
+      arg9 = NULL;
+    } else if (SWIG_ConvertPtr(obj8, (void **) &arg9, 0, 0) == -1) {
+      arg9 = (void *) obj8;
+      PyErr_Clear();
+    }
+  }
+  {
+    svn_cancel_func_t * tmp =
+    svn_swig_py_must_get_ptr(obj9, SWIGTYPE_p_p_f_p_void__p_svn_error_t, svn_argnum_obj9);
+    if (tmp == NULL || PyErr_Occurred()) {
+      SWIG_fail;
+    }
+    arg10 = *tmp;
+  }
+  {
+    if (obj10 == Py_None) {
+      arg11 = NULL;
+    } else if (SWIG_ConvertPtr(obj10, (void **) &arg11, 0, 0) == -1) {
+      arg11 = (void *) obj10;
+      PyErr_Clear();
+    }
+  }
+  if (obj11) {
+    /* Verify that the user supplied a valid pool */
+    if (obj11 != Py_None && obj11 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj11);
+      SWIG_arg_fail(svn_argnum_obj11);
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_repos_verify_fs3(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_svn_repos_verify_fs2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   svn_repos_t *arg1 = (svn_repos_t *) 0 ;
@@ -12258,7 +13365,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_verify_fs2(PyObject *SWIGUNUSEDPARM(self),
   arg8 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOO|O:svn_repos_verify_fs2",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
-    arg1 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12277,7 +13384,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_verify_fs2(PyObject *SWIGUNUSEDPARM(self),
   }
   {
     svn_repos_notify_func_t * tmp =
-    svn_swig_MustGetPtr(obj3, SWIGTYPE_p_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void, svn_argnum_obj3);
+    svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void, svn_argnum_obj3);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12293,7 +13400,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_verify_fs2(PyObject *SWIGUNUSEDPARM(self),
   }
   {
     svn_cancel_func_t * tmp =
-    svn_swig_MustGetPtr(obj5, SWIGTYPE_p_p_f_p_void__p_svn_error_t, svn_argnum_obj5);
+    svn_swig_py_must_get_ptr(obj5, SWIGTYPE_p_p_f_p_void__p_svn_error_t, svn_argnum_obj5);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12371,7 +13478,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_verify_fs(PyObject *SWIGUNUSEDPARM(self), P
   arg7 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOOOO|O:svn_repos_verify_fs",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
-    arg1 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12392,8 +13499,8 @@ SWIGINTERN PyObject *_wrap_svn_repos_verify_fs(PyObject *SWIGUNUSEDPARM(self), P
     }
   }
   {
-    arg5 = svn_swig_py_cancel_func;
-    arg6 = obj4; /* our function is the baton. */
+    arg5 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg6 = obj4;
   }
   if (obj5) {
     /* Verify that the user supplied a valid pool */
@@ -12467,7 +13574,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_dump_fs3(PyObject *SWIGUNUSEDPARM(self), Py
   arg11 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOOOO|O:svn_repos_dump_fs3",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   {
-    arg1 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12501,7 +13608,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_dump_fs3(PyObject *SWIGUNUSEDPARM(self), Py
   }
   {
     svn_repos_notify_func_t * tmp =
-    svn_swig_MustGetPtr(obj6, SWIGTYPE_p_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void, svn_argnum_obj6);
+    svn_swig_py_must_get_ptr(obj6, SWIGTYPE_p_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void, svn_argnum_obj6);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12516,8 +13623,8 @@ SWIGINTERN PyObject *_wrap_svn_repos_dump_fs3(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
-    arg9 = svn_swig_py_cancel_func;
-    arg10 = obj8; /* our function is the baton. */
+    arg9 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg10 = obj8;
   }
   if (obj9) {
     /* Verify that the user supplied a valid pool */
@@ -12589,7 +13696,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_dump_fs2(PyObject *SWIGUNUSEDPARM(self), Py
   arg10 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOOO|O:svn_repos_dump_fs2",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   {
-    arg1 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12625,8 +13732,8 @@ SWIGINTERN PyObject *_wrap_svn_repos_dump_fs2(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
-    arg8 = svn_swig_py_cancel_func;
-    arg9 = obj7; /* our function is the baton. */
+    arg8 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg9 = obj7;
   }
   if (obj8) {
     /* Verify that the user supplied a valid pool */
@@ -12696,7 +13803,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_dump_fs(PyObject *SWIGUNUSEDPARM(self), PyO
   arg9 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOO|O:svn_repos_dump_fs",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
-    arg1 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12726,8 +13833,8 @@ SWIGINTERN PyObject *_wrap_svn_repos_dump_fs(PyObject *SWIGUNUSEDPARM(self), PyO
     }
   }
   {
-    arg7 = svn_swig_py_cancel_func;
-    arg8 = obj6; /* our function is the baton. */
+    arg7 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg8 = obj6;
   }
   if (obj7) {
     /* Verify that the user supplied a valid pool */
@@ -12768,6 +13875,155 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_repos_load_fs5(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  svn_repos_t *arg1 = (svn_repos_t *) 0 ;
+  svn_stream_t *arg2 = (svn_stream_t *) 0 ;
+  svn_revnum_t arg3 ;
+  svn_revnum_t arg4 ;
+  enum svn_repos_load_uuid arg5 ;
+  char *arg6 = (char *) 0 ;
+  svn_boolean_t arg7 ;
+  svn_boolean_t arg8 ;
+  svn_boolean_t arg9 ;
+  svn_boolean_t arg10 ;
+  svn_repos_notify_func_t arg11 = (svn_repos_notify_func_t) 0 ;
+  void *arg12 = (void *) 0 ;
+  svn_cancel_func_t arg13 = (svn_cancel_func_t) 0 ;
+  void *arg14 = (void *) 0 ;
+  apr_pool_t *arg15 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  PyObject * obj6 = 0 ;
+  PyObject * obj7 = 0 ;
+  PyObject * obj8 = 0 ;
+  PyObject * obj9 = 0 ;
+  PyObject * obj10 = 0 ;
+  PyObject * obj11 = 0 ;
+  PyObject * obj12 = 0 ;
+  PyObject * obj13 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg15 = _global_pool;
+  if (!PyArg_ParseTuple(args,(char *)"OOOOOzOOOOOOO|O:svn_repos_load_fs5",&obj0,&obj1,&obj2,&obj3,&obj4,&arg6,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13)) SWIG_fail;
+  {
+    arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg2 = svn_swig_py_make_stream (obj1, _global_pool);
+  }
+  {
+    arg3 = (svn_revnum_t)SWIG_As_long (obj2);
+    if (SWIG_arg_fail(svn_argnum_obj2)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg4 = (svn_revnum_t)SWIG_As_long (obj3);
+    if (SWIG_arg_fail(svn_argnum_obj3)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg5 = (enum svn_repos_load_uuid)SWIG_As_long (obj4);
+    if (SWIG_arg_fail(svn_argnum_obj4)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg7 = (svn_boolean_t)SWIG_As_long (obj6);
+    if (SWIG_arg_fail(svn_argnum_obj6)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg8 = (svn_boolean_t)SWIG_As_long (obj7);
+    if (SWIG_arg_fail(svn_argnum_obj7)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg9 = (svn_boolean_t)SWIG_As_long (obj8);
+    if (SWIG_arg_fail(svn_argnum_obj8)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg10 = (svn_boolean_t)SWIG_As_long (obj9);
+    if (SWIG_arg_fail(svn_argnum_obj9)) {
+      SWIG_fail;
+    }
+  }
+  {
+    svn_repos_notify_func_t * tmp =
+    svn_swig_py_must_get_ptr(obj10, SWIGTYPE_p_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void, svn_argnum_obj10);
+    if (tmp == NULL || PyErr_Occurred()) {
+      SWIG_fail;
+    }
+    arg11 = *tmp;
+  }
+  {
+    if (obj11 == Py_None) {
+      arg12 = NULL;
+    } else if (SWIG_ConvertPtr(obj11, (void **) &arg12, 0, 0) == -1) {
+      arg12 = (void *) obj11;
+      PyErr_Clear();
+    }
+  }
+  {
+    arg13 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg14 = obj12;
+  }
+  if (obj13) {
+    /* Verify that the user supplied a valid pool */
+    if (obj13 != Py_None && obj13 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj13);
+      SWIG_arg_fail(svn_argnum_obj13);
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_repos_load_fs5(arg1,arg2,arg3,arg4,arg5,(char const *)arg6,arg7,arg8,arg9,arg10,arg11,arg12,arg13,arg14,arg15);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_svn_repos_load_fs4(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   svn_repos_t *arg1 = (svn_repos_t *) 0 ;
@@ -12806,7 +14062,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_load_fs4(PyObject *SWIGUNUSEDPARM(self), Py
   arg14 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOOOOzOOOOOO|O:svn_repos_load_fs4",&obj0,&obj1,&obj2,&obj3,&obj4,&arg6,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12)) SWIG_fail;
   {
-    arg1 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12852,7 +14108,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_load_fs4(PyObject *SWIGUNUSEDPARM(self), Py
   }
   {
     svn_repos_notify_func_t * tmp =
-    svn_swig_MustGetPtr(obj9, SWIGTYPE_p_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void, svn_argnum_obj9);
+    svn_swig_py_must_get_ptr(obj9, SWIGTYPE_p_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void, svn_argnum_obj9);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12867,8 +14123,8 @@ SWIGINTERN PyObject *_wrap_svn_repos_load_fs4(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
-    arg12 = svn_swig_py_cancel_func;
-    arg13 = obj11; /* our function is the baton. */
+    arg12 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg13 = obj11;
   }
   if (obj12) {
     /* Verify that the user supplied a valid pool */
@@ -12943,7 +14199,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_load_fs3(PyObject *SWIGUNUSEDPARM(self), Py
   arg12 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOOzOOOOOO|O:svn_repos_load_fs3",&obj0,&obj1,&obj2,&arg4,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
   {
-    arg1 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12977,7 +14233,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_load_fs3(PyObject *SWIGUNUSEDPARM(self), Py
   }
   {
     svn_repos_notify_func_t * tmp =
-    svn_swig_MustGetPtr(obj7, SWIGTYPE_p_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void, svn_argnum_obj7);
+    svn_swig_py_must_get_ptr(obj7, SWIGTYPE_p_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void, svn_argnum_obj7);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12992,8 +14248,8 @@ SWIGINTERN PyObject *_wrap_svn_repos_load_fs3(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
-    arg10 = svn_swig_py_cancel_func;
-    arg11 = obj9; /* our function is the baton. */
+    arg10 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg11 = obj9;
   }
   if (obj10) {
     /* Verify that the user supplied a valid pool */
@@ -13064,7 +14320,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_load_fs2(PyObject *SWIGUNUSEDPARM(self), Py
   arg10 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOOOzOOO|O:svn_repos_load_fs2",&obj0,&obj1,&obj2,&obj3,&arg5,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   {
-    arg1 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13094,8 +14350,8 @@ SWIGINTERN PyObject *_wrap_svn_repos_load_fs2(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
-    arg8 = svn_swig_py_cancel_func;
-    arg9 = obj7; /* our function is the baton. */
+    arg8 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg9 = obj7;
   }
   if (obj8) {
     /* Verify that the user supplied a valid pool */
@@ -13162,7 +14418,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_load_fs(PyObject *SWIGUNUSEDPARM(self), PyO
   arg8 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOOOzO|O:svn_repos_load_fs",&obj0,&obj1,&obj2,&obj3,&arg5,&obj5,&obj6)) SWIG_fail;
   {
-    arg1 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg1 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13180,8 +14436,8 @@ SWIGINTERN PyObject *_wrap_svn_repos_load_fs(PyObject *SWIGUNUSEDPARM(self), PyO
     }
   }
   {
-    arg6 = svn_swig_py_cancel_func;
-    arg7 = obj5; /* our function is the baton. */
+    arg6 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg7 = obj5;
   }
   if (obj6) {
     /* Verify that the user supplied a valid pool */
@@ -13231,7 +14487,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_t_magic_header_record_set(PyObje
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns3_t_magic_header_record_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13258,7 +14514,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_t_magic_header_record_get(PyObje
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parse_fns3_t_magic_header_record_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13280,7 +14536,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_t_uuid_record_set(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns3_t_uuid_record_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13307,7 +14563,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_t_uuid_record_get(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parse_fns3_t_uuid_record_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13329,7 +14585,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_t_new_revision_record_set(PyObje
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns3_t_new_revision_record_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13356,7 +14612,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_t_new_revision_record_get(PyObje
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parse_fns3_t_new_revision_record_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13378,7 +14634,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_t_new_node_record_set(PyObject *
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns3_t_new_node_record_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13405,7 +14661,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_t_new_node_record_get(PyObject *
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parse_fns3_t_new_node_record_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13427,7 +14683,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_t_set_revision_property_set(PyOb
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns3_t_set_revision_property_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13454,7 +14710,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_t_set_revision_property_get(PyOb
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parse_fns3_t_set_revision_property_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13476,7 +14732,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_t_set_node_property_set(PyObject
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns3_t_set_node_property_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13503,7 +14759,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_t_set_node_property_get(PyObject
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parse_fns3_t_set_node_property_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13525,7 +14781,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_t_delete_node_property_set(PyObj
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns3_t_delete_node_property_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13552,7 +14808,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_t_delete_node_property_get(PyObj
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parse_fns3_t_delete_node_property_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13574,7 +14830,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_t_remove_node_props_set(PyObject
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns3_t_remove_node_props_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13601,7 +14857,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_t_remove_node_props_get(PyObject
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parse_fns3_t_remove_node_props_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13623,7 +14879,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_t_set_fulltext_set(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns3_t_set_fulltext_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13650,7 +14906,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_t_set_fulltext_get(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parse_fns3_t_set_fulltext_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13672,7 +14928,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_t_apply_textdelta_set(PyObject *
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns3_t_apply_textdelta_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13699,7 +14955,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_t_apply_textdelta_get(PyObject *
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parse_fns3_t_apply_textdelta_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13721,7 +14977,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_t_close_node_set(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns3_t_close_node_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13748,7 +15004,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_t_close_node_get(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parse_fns3_t_close_node_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13770,7 +15026,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_t_close_revision_set(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns3_t_close_revision_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13797,7 +15053,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_t_close_revision_get(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parse_fns3_t_close_revision_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13845,7 +15101,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_dumpstream3(PyObject *SWIGUNUSEDPARM(
     arg1 = svn_swig_py_make_stream (obj0, _global_pool);
   }
   {
-    arg2 = (svn_repos_parse_fns3_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj1);
+    arg2 = (svn_repos_parse_fns3_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13865,8 +15121,8 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_dumpstream3(PyObject *SWIGUNUSEDPARM(
     }
   }
   {
-    arg5 = svn_swig_py_cancel_func;
-    arg6 = obj4; /* our function is the baton. */
+    arg5 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg6 = obj4;
   }
   if (obj5) {
     /* Verify that the user supplied a valid pool */
@@ -13907,6 +15163,169 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_repos_get_fs_build_parser5(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  svn_repos_parse_fns3_t **arg1 = (svn_repos_parse_fns3_t **) 0 ;
+  void **arg2 = (void **) 0 ;
+  svn_repos_t *arg3 = (svn_repos_t *) 0 ;
+  svn_revnum_t arg4 ;
+  svn_revnum_t arg5 ;
+  svn_boolean_t arg6 ;
+  svn_boolean_t arg7 ;
+  enum svn_repos_load_uuid arg8 ;
+  char *arg9 = (char *) 0 ;
+  svn_boolean_t arg10 ;
+  svn_boolean_t arg11 ;
+  svn_boolean_t arg12 ;
+  svn_repos_notify_func_t arg13 = (svn_repos_notify_func_t) 0 ;
+  void *arg14 = (void *) 0 ;
+  apr_pool_t *arg15 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  svn_repos_parse_fns3_t *temp1 ;
+  void *temp2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  PyObject * obj5 = 0 ;
+  PyObject * obj7 = 0 ;
+  PyObject * obj8 = 0 ;
+  PyObject * obj9 = 0 ;
+  PyObject * obj10 = 0 ;
+  PyObject * obj11 = 0 ;
+  PyObject * obj12 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg15 = _global_pool;
+  arg1 = &temp1;
+  arg2 = &temp2;
+  if (!PyArg_ParseTuple(args,(char *)"OOOOOOzOOOOO|O:svn_repos_get_fs_build_parser5",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&arg9,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12)) SWIG_fail;
+  {
+    arg3 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg4 = (svn_revnum_t)SWIG_As_long (obj1);
+    if (SWIG_arg_fail(svn_argnum_obj1)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg5 = (svn_revnum_t)SWIG_As_long (obj2);
+    if (SWIG_arg_fail(svn_argnum_obj2)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg6 = (svn_boolean_t)SWIG_As_long (obj3);
+    if (SWIG_arg_fail(svn_argnum_obj3)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg7 = (svn_boolean_t)SWIG_As_long (obj4);
+    if (SWIG_arg_fail(svn_argnum_obj4)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg8 = (enum svn_repos_load_uuid)SWIG_As_long (obj5);
+    if (SWIG_arg_fail(svn_argnum_obj5)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg10 = (svn_boolean_t)SWIG_As_long (obj7);
+    if (SWIG_arg_fail(svn_argnum_obj7)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg11 = (svn_boolean_t)SWIG_As_long (obj8);
+    if (SWIG_arg_fail(svn_argnum_obj8)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg12 = (svn_boolean_t)SWIG_As_long (obj9);
+    if (SWIG_arg_fail(svn_argnum_obj9)) {
+      SWIG_fail;
+    }
+  }
+  {
+    svn_repos_notify_func_t * tmp =
+    svn_swig_py_must_get_ptr(obj10, SWIGTYPE_p_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void, svn_argnum_obj10);
+    if (tmp == NULL || PyErr_Occurred()) {
+      SWIG_fail;
+    }
+    arg13 = *tmp;
+  }
+  {
+    if (obj11 == Py_None) {
+      arg14 = NULL;
+    } else if (SWIG_ConvertPtr(obj11, (void **) &arg14, 0, 0) == -1) {
+      arg14 = (void *) obj11;
+      PyErr_Clear();
+    }
+  }
+  if (obj12) {
+    /* Verify that the user supplied a valid pool */
+    if (obj12 != Py_None && obj12 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj12);
+      SWIG_arg_fail(svn_argnum_obj12);
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_repos_get_fs_build_parser5((struct svn_repos_parse_fns3_t const **)arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,(char const *)arg9,arg10,arg11,arg12,arg13,arg14,arg15);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  {
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_repos_parse_fns3_t,
+        _global_py_pool, args))
+    
+    ;
+  }
+  {
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_void,
+        _global_py_pool, args))
+    
+    ;
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_svn_repos_get_fs_build_parser4(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   svn_repos_parse_fns3_t **arg1 = (svn_repos_parse_fns3_t **) 0 ;
@@ -13944,7 +15363,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_fs_build_parser4(PyObject *SWIGUNUSEDPA
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"OOOOOOzOO|O:svn_repos_get_fs_build_parser4",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&arg9,&obj7,&obj8,&obj9)) SWIG_fail;
   {
-    arg3 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg3 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13981,7 +15400,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_fs_build_parser4(PyObject *SWIGUNUSEDPA
   }
   {
     svn_repos_notify_func_t * tmp =
-    svn_swig_MustGetPtr(obj7, SWIGTYPE_p_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void, svn_argnum_obj7);
+    svn_swig_py_must_get_ptr(obj7, SWIGTYPE_p_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void, svn_argnum_obj7);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14023,16 +15442,13 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_fs_build_parser4(PyObject *SWIGUNUSEDPA
     resultobj = Py_None;
   }
   {
-    /* FIXME: Missing argout typemap: svn_repos_get_fs_build_parser4 arg 1 (svn_repos_parse_fns3_t const **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_repos_get_fs_build_parser4 is not implemented yet");
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_repos_parse_fns3_t,
+        _global_py_pool, args))
     
+    ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -14058,7 +15474,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_t_new_revision_record_set(PyObje
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns2_t_new_revision_record_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14085,7 +15501,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_t_new_revision_record_get(PyObje
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parse_fns2_t_new_revision_record_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14107,7 +15523,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_t_uuid_record_set(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns2_t_uuid_record_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14134,7 +15550,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_t_uuid_record_get(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parse_fns2_t_uuid_record_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14156,7 +15572,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_t_new_node_record_set(PyObject *
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns2_t_new_node_record_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14183,7 +15599,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_t_new_node_record_get(PyObject *
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parse_fns2_t_new_node_record_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14205,7 +15621,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_t_set_revision_property_set(PyOb
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns2_t_set_revision_property_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14232,7 +15648,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_t_set_revision_property_get(PyOb
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parse_fns2_t_set_revision_property_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14254,7 +15670,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_t_set_node_property_set(PyObject
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns2_t_set_node_property_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14281,7 +15697,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_t_set_node_property_get(PyObject
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parse_fns2_t_set_node_property_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14303,7 +15719,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_t_delete_node_property_set(PyObj
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns2_t_delete_node_property_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14330,7 +15746,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_t_delete_node_property_get(PyObj
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parse_fns2_t_delete_node_property_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14352,7 +15768,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_t_remove_node_props_set(PyObject
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns2_t_remove_node_props_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14379,7 +15795,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_t_remove_node_props_get(PyObject
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parse_fns2_t_remove_node_props_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14401,7 +15817,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_t_set_fulltext_set(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns2_t_set_fulltext_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14428,7 +15844,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_t_set_fulltext_get(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parse_fns2_t_set_fulltext_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14450,7 +15866,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_t_apply_textdelta_set(PyObject *
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns2_t_apply_textdelta_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14477,7 +15893,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_t_apply_textdelta_get(PyObject *
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parse_fns2_t_apply_textdelta_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14499,7 +15915,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_t_close_node_set(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns2_t_close_node_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14526,7 +15942,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_t_close_node_get(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parse_fns2_t_close_node_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14548,7 +15964,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_t_close_revision_set(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns2_t_close_revision_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14575,7 +15991,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_t_close_revision_get(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parse_fns2_t_close_revision_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14604,7 +16020,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parser_fns_t_new_revision_record_set(PyObje
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parser_fns_t_new_revision_record_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14631,7 +16047,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parser_fns_t_new_revision_record_get(PyObje
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parser_fns_t_new_revision_record_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14653,7 +16069,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parser_fns_t_uuid_record_set(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parser_fns_t_uuid_record_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14680,7 +16096,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parser_fns_t_uuid_record_get(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parser_fns_t_uuid_record_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14702,7 +16118,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parser_fns_t_new_node_record_set(PyObject *
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parser_fns_t_new_node_record_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14729,7 +16145,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parser_fns_t_new_node_record_get(PyObject *
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parser_fns_t_new_node_record_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14751,7 +16167,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parser_fns_t_set_revision_property_set(PyOb
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parser_fns_t_set_revision_property_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14778,7 +16194,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parser_fns_t_set_revision_property_get(PyOb
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parser_fns_t_set_revision_property_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14800,7 +16216,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parser_fns_t_set_node_property_set(PyObject
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parser_fns_t_set_node_property_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14827,7 +16243,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parser_fns_t_set_node_property_get(PyObject
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parser_fns_t_set_node_property_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14849,7 +16265,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parser_fns_t_remove_node_props_set(PyObject
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parser_fns_t_remove_node_props_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14876,7 +16292,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parser_fns_t_remove_node_props_get(PyObject
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parser_fns_t_remove_node_props_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14898,7 +16314,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parser_fns_t_set_fulltext_set(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parser_fns_t_set_fulltext_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14925,7 +16341,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parser_fns_t_set_fulltext_get(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parser_fns_t_set_fulltext_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14947,7 +16363,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parser_fns_t_close_node_set(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parser_fns_t_close_node_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14974,7 +16390,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parser_fns_t_close_node_get(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parser_fns_t_close_node_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14996,7 +16412,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parser_fns_t_close_revision_set(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parser_fns_t_close_revision_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15023,7 +16439,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parser_fns_t_close_revision_get(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_repos_parser_fns_t_close_revision_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_repos_parse_fns_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns_t, svn_argnum_obj0);
+    arg1 = (struct svn_repos_parse_fns_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15069,7 +16485,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_dumpstream2(PyObject *SWIGUNUSEDPARM(
     arg1 = svn_swig_py_make_stream (obj0, _global_pool);
   }
   {
-    arg2 = (svn_repos_parser_fns2_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj1);
+    arg2 = (svn_repos_parser_fns2_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15083,8 +16499,8 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_dumpstream2(PyObject *SWIGUNUSEDPARM(
     }
   }
   {
-    arg4 = svn_swig_py_cancel_func;
-    arg5 = obj3; /* our function is the baton. */
+    arg4 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg5 = obj3;
   }
   if (obj4) {
     /* Verify that the user supplied a valid pool */
@@ -15151,7 +16567,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_dumpstream(PyObject *SWIGUNUSEDPARM(s
     arg1 = svn_swig_py_make_stream (obj0, _global_pool);
   }
   {
-    arg2 = (svn_repos_parser_fns_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_repos_parse_fns_t, svn_argnum_obj1);
+    arg2 = (svn_repos_parser_fns_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_repos_parse_fns_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15165,8 +16581,8 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_dumpstream(PyObject *SWIGUNUSEDPARM(s
     }
   }
   {
-    arg4 = svn_swig_py_cancel_func;
-    arg5 = obj3; /* our function is the baton. */
+    arg4 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg5 = obj3;
   }
   if (obj4) {
     /* Verify that the user supplied a valid pool */
@@ -15240,7 +16656,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_fs_build_parser3(PyObject *SWIGUNUSEDPA
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"OOOOzOO|O:svn_repos_get_fs_build_parser3",&obj0,&obj1,&obj2,&obj3,&arg7,&obj5,&obj6,&obj7)) SWIG_fail;
   {
-    arg3 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg3 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15265,7 +16681,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_fs_build_parser3(PyObject *SWIGUNUSEDPA
   }
   {
     svn_repos_notify_func_t * tmp =
-    svn_swig_MustGetPtr(obj5, SWIGTYPE_p_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void, svn_argnum_obj5);
+    svn_swig_py_must_get_ptr(obj5, SWIGTYPE_p_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void, svn_argnum_obj5);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15307,13 +16723,16 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_fs_build_parser3(PyObject *SWIGUNUSEDPA
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_repos_parse_fns2_t,
-        _global_py_pool, args))
+    /* FIXME: Missing argout typemap: svn_repos_get_fs_build_parser3 arg 1 (svn_repos_parse_fns2_t const **) */
+    
+    
+    
+    
+    SWIG_exception(SWIG_ValueError, "svn_repos_get_fs_build_parser3 is not implemented yet");
     
-    ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -15359,7 +16778,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_fs_build_parser2(PyObject *SWIGUNUSEDPA
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"OOOOz|O:svn_repos_get_fs_build_parser2",&obj0,&obj1,&obj2,&obj3,&arg7,&obj5)) SWIG_fail;
   {
-    arg3 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg3 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15407,13 +16826,16 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_fs_build_parser2(PyObject *SWIGUNUSEDPA
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_repos_parse_fns2_t,
-        _global_py_pool, args))
+    /* FIXME: Missing argout typemap: svn_repos_get_fs_build_parser2 arg 1 (svn_repos_parse_fns2_t const **) */
+    
+    
+    
+    
+    SWIG_exception(SWIG_ValueError, "svn_repos_get_fs_build_parser2 is not implemented yet");
     
-    ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -15459,7 +16881,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_fs_build_parser(PyObject *SWIGUNUSEDPAR
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"OOOOz|O:svn_repos_get_fs_build_parser",&obj0,&obj1,&obj2,&obj3,&arg7,&obj5)) SWIG_fail;
   {
-    arg3 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
+    arg3 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15507,13 +16929,13 @@ SWIGINTERN PyObject *_wrap_svn_repos_get_fs_build_parser(PyObject *SWIGUNUSEDPAR
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_repos_parse_fns_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_repos_parse_fns_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -15584,7 +17006,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_authz_read2(PyObject *SWIGUNUSEDPARM(self),
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_authz_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_authz_t,
         _global_py_pool, args))
     
     ;
@@ -15654,7 +17076,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_authz_read(PyObject *SWIGUNUSEDPARM(self),
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_authz_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_authz_t,
         _global_py_pool, args))
     
     ;
@@ -15725,7 +17147,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_authz_parse(PyObject *SWIGUNUSEDPARM(self),
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_authz_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_authz_t,
         _global_py_pool, args))
     
     ;
@@ -15767,7 +17189,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_authz_check_access(PyObject *SWIGUNUSEDPARM
   arg6 = &temp6;
   if (!PyArg_ParseTuple(args,(char *)"OsszO|O:svn_repos_authz_check_access",&obj0,&arg2,&arg3,&arg4,&obj4,&obj5)) SWIG_fail;
   {
-    arg1 = (svn_authz_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_authz_t, svn_argnum_obj0);
+    arg1 = (svn_authz_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_authz_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15846,13 +17268,13 @@ SWIGINTERN PyObject *_wrap_svn_repos_check_revision_access(PyObject *SWIGUNUSEDP
   arg6 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOOO|O:svn_repos_check_revision_access",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
-    arg1 = (svn_repos_revision_access_level_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_revision_access_level_t, svn_argnum_obj0);
+    arg1 = (svn_repos_revision_access_level_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_revision_access_level_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_repos_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_repos_t, svn_argnum_obj1);
+    arg2 = (svn_repos_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_repos_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15865,7 +17287,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_check_revision_access(PyObject *SWIGUNUSEDP
   }
   {
     /* FIXME: Handle the NULL case. */
-    arg4 = svn_swig_py_repos_authz_func;
+    arg4 = (svn_repos_authz_func_t) svn_swig_py_repos_authz_func;
     arg5 = obj3;
   }
   if (obj4) {
@@ -15907,148 +17329,6 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_svn_repos_fs_get_inherited_props(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  apr_array_header_t **arg1 = (apr_array_header_t **) 0 ;
-  svn_fs_root_t *arg2 = (svn_fs_root_t *) 0 ;
-  char *arg3 = (char *) 0 ;
-  char *arg4 = (char *) 0 ;
-  svn_repos_authz_func_t arg5 = (svn_repos_authz_func_t) 0 ;
-  void *arg6 = (void *) 0 ;
-  apr_pool_t *arg7 = (apr_pool_t *) 0 ;
-  apr_pool_t *arg8 = (apr_pool_t *) 0 ;
-  apr_pool_t *_global_pool = NULL ;
-  PyObject *_global_py_pool = NULL ;
-  apr_array_header_t *temp1 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj3 = 0 ;
-  PyObject * obj4 = 0 ;
-  PyObject * obj5 = 0 ;
-  svn_error_t *result = 0 ;
-  
-  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
-      &_global_py_pool, &_global_pool))
-  SWIG_fail;
-  arg7 = _global_pool;
-  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
-      &_global_py_pool, &_global_pool))
-  SWIG_fail;
-  arg8 = _global_pool;
-  arg1 = &temp1;
-  if (!PyArg_ParseTuple(args,(char *)"OssO|OO:svn_repos_fs_get_inherited_props",&obj0,&arg3,&arg4,&obj3,&obj4,&obj5)) SWIG_fail;
-  {
-    arg2 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  {
-    /* FIXME: Handle the NULL case. */
-    arg5 = svn_swig_py_repos_authz_func;
-    arg6 = obj3;
-  }
-  if (obj4) {
-    /* Verify that the user supplied a valid pool */
-    if (obj4 != Py_None && obj4 != _global_py_pool) {
-      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj4);
-      SWIG_arg_fail(svn_argnum_obj4);
-      SWIG_fail;
-    }
-  }
-  if (obj5) {
-    /* Verify that the user supplied a valid pool */
-    if (obj5 != Py_None && obj5 != _global_py_pool) {
-      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj5);
-      SWIG_arg_fail(svn_argnum_obj5);
-      SWIG_fail;
-    }
-  }
-  {
-    svn_swig_py_release_py_lock();
-    
-    result = (svn_error_t *)svn_repos_fs_get_inherited_props(arg1,arg2,(char const *)arg3,(char const *)arg4,arg5,arg6,arg7,arg8);
-    
-    svn_swig_py_acquire_py_lock();
-    
-  }
-  {
-    if (result != NULL) {
-      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
-      svn_swig_py_svn_exception(result);
-      else
-      svn_error_clear(result);
-      SWIG_fail;
-    }
-    Py_INCREF(Py_None);
-    resultobj = Py_None;
-  }
-  {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_propinheriteditemarray_to_dict(*arg1));
-  }
-  {
-    Py_XDECREF(_global_py_pool);
-  }
-  {
-    Py_XDECREF(_global_py_pool);
-  }
-  return resultobj;
-fail:
-  {
-    Py_XDECREF(_global_py_pool);
-  }
-  {
-    Py_XDECREF(_global_py_pool);
-  }
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_repos_remember_client_capabilities(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  svn_repos_t *arg1 = (svn_repos_t *) 0 ;
-  apr_array_header_t *arg2 = (apr_array_header_t *) 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  svn_error_t *result = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_remember_client_capabilities",&obj0,&obj1)) SWIG_fail;
-  {
-    arg1 = (svn_repos_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  {
-    arg2 = (apr_array_header_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj1);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  {
-    svn_swig_py_release_py_lock();
-    
-    result = (svn_error_t *)svn_repos_remember_client_capabilities(arg1,(apr_array_header_t const *)arg2);
-    
-    svn_swig_py_acquire_py_lock();
-    
-  }
-  {
-    if (result != NULL) {
-      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
-      svn_swig_py_svn_exception(result);
-      else
-      svn_error_clear(result);
-      SWIG_fail;
-    }
-    Py_INCREF(Py_None);
-    resultobj = Py_None;
-  }
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *svn_repos_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
@@ -16083,7 +17363,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_invoke_magic_header_record(PyObj
   arg4 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_repos_parse_fns3_invoke_magic_header_record",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
-    arg1 = (svn_repos_parse_fns3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
+    arg1 = (svn_repos_parse_fns3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16160,7 +17440,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_invoke_uuid_record(PyObject *SWI
   arg4 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OzO|O:svn_repos_parse_fns3_invoke_uuid_record",&obj0,&arg2,&obj2,&obj3)) SWIG_fail;
   {
-    arg1 = (svn_repos_parse_fns3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
+    arg1 = (svn_repos_parse_fns3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16235,13 +17515,13 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_invoke_new_revision_record(PyObj
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_repos_parse_fns3_invoke_new_revision_record",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
-    arg1 = (svn_repos_parse_fns3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
+    arg1 = (svn_repos_parse_fns3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (apr_hash_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_apr_hash_t, svn_argnum_obj1);
+    arg3 = (apr_hash_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_apr_hash_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16282,7 +17562,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_invoke_new_revision_record(PyObj
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -16322,13 +17602,13 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_invoke_new_node_record(PyObject
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_repos_parse_fns3_invoke_new_node_record",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
-    arg1 = (svn_repos_parse_fns3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
+    arg1 = (svn_repos_parse_fns3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (apr_hash_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_apr_hash_t, svn_argnum_obj1);
+    arg3 = (apr_hash_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_apr_hash_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16369,7 +17649,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_invoke_new_node_record(PyObject
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -16400,7 +17680,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_invoke_set_revision_property(PyO
   
   if (!PyArg_ParseTuple(args,(char *)"OOsO:svn_repos_parse_fns3_invoke_set_revision_property",&obj0,&obj1,&arg3,&obj3)) SWIG_fail;
   {
-    arg1 = (svn_repos_parse_fns3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
+    arg1 = (svn_repos_parse_fns3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16465,7 +17745,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_invoke_set_node_property(PyObjec
   
   if (!PyArg_ParseTuple(args,(char *)"OOsO:svn_repos_parse_fns3_invoke_set_node_property",&obj0,&obj1,&arg3,&obj3)) SWIG_fail;
   {
-    arg1 = (svn_repos_parse_fns3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
+    arg1 = (svn_repos_parse_fns3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16527,7 +17807,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_invoke_delete_node_property(PyOb
   
   if (!PyArg_ParseTuple(args,(char *)"OOs:svn_repos_parse_fns3_invoke_delete_node_property",&obj0,&obj1,&arg3)) SWIG_fail;
   {
-    arg1 = (svn_repos_parse_fns3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
+    arg1 = (svn_repos_parse_fns3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16575,7 +17855,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_invoke_remove_node_props(PyObjec
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns3_invoke_remove_node_props",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_repos_parse_fns3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
+    arg1 = (svn_repos_parse_fns3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16626,7 +17906,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_invoke_set_fulltext(PyObject *SW
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns3_invoke_set_fulltext",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_repos_parse_fns3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
+    arg1 = (svn_repos_parse_fns3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16659,7 +17939,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_invoke_set_fulltext(PyObject *SW
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_svn_stream_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_svn_stream_t,
         _global_py_pool, args))
     
     ;
@@ -16696,7 +17976,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_invoke_apply_textdelta(PyObject
   arg3 = &temp3;
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns3_invoke_apply_textdelta",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_repos_parse_fns3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
+    arg1 = (svn_repos_parse_fns3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16729,13 +18009,13 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_invoke_apply_textdelta(PyObject
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(arg2, SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(arg2, SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg3, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg3, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -16756,7 +18036,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_invoke_close_node(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns3_invoke_close_node",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_repos_parse_fns3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
+    arg1 = (svn_repos_parse_fns3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16804,7 +18084,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns3_invoke_close_revision(PyObject *
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns3_invoke_close_revision",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_repos_parse_fns3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
+    arg1 = (svn_repos_parse_fns3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16865,13 +18145,13 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_invoke_new_revision_record(PyObj
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_repos_parse_fns2_invoke_new_revision_record",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
-    arg1 = (svn_repos_parse_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
+    arg1 = (svn_repos_parse_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (apr_hash_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_apr_hash_t, svn_argnum_obj1);
+    arg3 = (apr_hash_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_apr_hash_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16912,7 +18192,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_invoke_new_revision_record(PyObj
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -16948,7 +18228,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_invoke_uuid_record(PyObject *SWI
   arg4 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OzO|O:svn_repos_parse_fns2_invoke_uuid_record",&obj0,&arg2,&obj2,&obj3)) SWIG_fail;
   {
-    arg1 = (svn_repos_parse_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
+    arg1 = (svn_repos_parse_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17023,13 +18303,13 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_invoke_new_node_record(PyObject
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_repos_parse_fns2_invoke_new_node_record",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
-    arg1 = (svn_repos_parse_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
+    arg1 = (svn_repos_parse_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (apr_hash_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_apr_hash_t, svn_argnum_obj1);
+    arg3 = (apr_hash_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_apr_hash_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17070,7 +18350,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_invoke_new_node_record(PyObject
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -17101,7 +18381,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_invoke_set_revision_property(PyO
   
   if (!PyArg_ParseTuple(args,(char *)"OOsO:svn_repos_parse_fns2_invoke_set_revision_property",&obj0,&obj1,&arg3,&obj3)) SWIG_fail;
   {
-    arg1 = (svn_repos_parse_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
+    arg1 = (svn_repos_parse_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17166,7 +18446,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_invoke_set_node_property(PyObjec
   
   if (!PyArg_ParseTuple(args,(char *)"OOsO:svn_repos_parse_fns2_invoke_set_node_property",&obj0,&obj1,&arg3,&obj3)) SWIG_fail;
   {
-    arg1 = (svn_repos_parse_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
+    arg1 = (svn_repos_parse_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17228,7 +18508,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_invoke_delete_node_property(PyOb
   
   if (!PyArg_ParseTuple(args,(char *)"OOs:svn_repos_parse_fns2_invoke_delete_node_property",&obj0,&obj1,&arg3)) SWIG_fail;
   {
-    arg1 = (svn_repos_parse_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
+    arg1 = (svn_repos_parse_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17276,7 +18556,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_invoke_remove_node_props(PyObjec
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns2_invoke_remove_node_props",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_repos_parse_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
+    arg1 = (svn_repos_parse_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17327,7 +18607,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_invoke_set_fulltext(PyObject *SW
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns2_invoke_set_fulltext",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_repos_parse_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
+    arg1 = (svn_repos_parse_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17360,7 +18640,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_invoke_set_fulltext(PyObject *SW
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_svn_stream_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_svn_stream_t,
         _global_py_pool, args))
     
     ;
@@ -17397,7 +18677,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_invoke_apply_textdelta(PyObject
   arg3 = &temp3;
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns2_invoke_apply_textdelta",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_repos_parse_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
+    arg1 = (svn_repos_parse_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17430,13 +18710,13 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_invoke_apply_textdelta(PyObject
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(arg2, SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(arg2, SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg3, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg3, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -17457,7 +18737,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_invoke_close_node(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns2_invoke_close_node",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_repos_parse_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
+    arg1 = (svn_repos_parse_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17505,7 +18785,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_parse_fns2_invoke_close_revision(PyObject *
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_repos_parse_fns2_invoke_close_revision",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_repos_parse_fns2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
+    arg1 = (svn_repos_parse_fns2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_repos_parse_fns2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17569,14 +18849,14 @@ SWIGINTERN PyObject *_wrap_svn_repos_invoke_authz_func(PyObject *SWIGUNUSEDPARM(
   if (!PyArg_ParseTuple(args,(char *)"OOsO|O:svn_repos_invoke_authz_func",&obj0,&obj1,&arg4,&obj3,&obj4)) SWIG_fail;
   {
     svn_repos_authz_func_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
     arg1 = *tmp;
   }
   {
-    arg3 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj1);
+    arg3 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17662,7 +18942,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_invoke_authz_callback(PyObject *SWIGUNUSEDP
   if (!PyArg_ParseTuple(args,(char *)"OOOsO|O:svn_repos_invoke_authz_callback",&obj0,&obj1,&obj2,&arg5,&obj4,&obj5)) SWIG_fail;
   {
     svn_repos_authz_callback_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17675,7 +18955,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_invoke_authz_callback(PyObject *SWIGUNUSEDP
     }
   }
   {
-    arg4 = (svn_fs_root_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj2);
+    arg4 = (svn_fs_root_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_fs_root_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17733,47 +19013,27 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_svn_repos_invoke_file_rev_handler(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_svn_repos_invoke_notify_func(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  svn_repos_file_rev_handler_t arg1 = (svn_repos_file_rev_handler_t) 0 ;
+  svn_repos_notify_func_t arg1 = (svn_repos_notify_func_t) 0 ;
   void *arg2 = (void *) 0 ;
-  char *arg3 = (char *) 0 ;
-  svn_revnum_t arg4 ;
-  apr_hash_t *arg5 = (apr_hash_t *) 0 ;
-  svn_txdelta_window_handler_t *arg6 = (svn_txdelta_window_handler_t *) 0 ;
-  void **arg7 = (void **) 0 ;
-  apr_array_header_t *arg8 = (apr_array_header_t *) 0 ;
-  apr_pool_t *arg9 = (apr_pool_t *) 0 ;
+  svn_repos_notify_t *arg3 = (svn_repos_notify_t *) 0 ;
+  apr_pool_t *arg4 = (apr_pool_t *) 0 ;
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
-  void *temp7 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
-  PyObject * obj4 = 0 ;
-  PyObject * obj5 = 0 ;
-  PyObject * obj6 = 0 ;
-  svn_error_t *result = 0 ;
   
   if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
       &_global_py_pool, &_global_pool))
   SWIG_fail;
-  arg9 = _global_pool;
-  {
-    if (_global_pool == NULL)
-    {
-      if (svn_swig_py_get_parent_pool(args, SWIGTYPE_p_apr_pool_t,
-          &_global_py_pool, &_global_pool))
-      SWIG_fail;
-    }
-    arg6 = (svn_txdelta_window_handler_t *) apr_pcalloc(_global_pool, sizeof(svn_txdelta_window_handler_t));
-    if (arg6 == NULL) SWIG_fail;
-  }
-  arg7 = &temp7;
-  if (!PyArg_ParseTuple(args,(char *)"OOsOOO|O:svn_repos_invoke_file_rev_handler",&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  arg4 = _global_pool;
+  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_repos_invoke_notify_func",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
-    svn_repos_file_rev_handler_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_repos_notify_func_t * tmp =
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17788,35 +19048,85 @@ SWIGINTERN PyObject *_wrap_svn_repos_invoke_file_rev_handler(PyObject *SWIGUNUSE
     }
   }
   {
-    arg4 = (svn_revnum_t)SWIG_As_long (obj3);
-    if (SWIG_arg_fail(svn_argnum_obj3)) {
+    arg3 = (svn_repos_notify_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_repos_notify_t, svn_argnum_obj2);
+    if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
-  {
-    arg5 = (apr_hash_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_apr_hash_t, svn_argnum_obj4);
-    if (PyErr_Occurred()) {
+  if (obj3) {
+    /* Verify that the user supplied a valid pool */
+    if (obj3 != Py_None && obj3 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj3);
+      SWIG_arg_fail(svn_argnum_obj3);
       SWIG_fail;
     }
   }
   {
-    arg8 = (apr_array_header_t *)svn_swig_MustGetPtr(obj5, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj5);
-    if (PyErr_Occurred()) {
+    svn_swig_py_release_py_lock();
+    
+    svn_repos_invoke_notify_func(arg1,arg2,(struct svn_repos_notify_t const *)arg3,arg4);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  resultobj = SWIG_Py_Void();
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_svn_repos_invoke_freeze_func(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  svn_repos_freeze_func_t arg1 = (svn_repos_freeze_func_t) 0 ;
+  void *arg2 = (void *) 0 ;
+  apr_pool_t *arg3 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg3 = _global_pool;
+  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_repos_invoke_freeze_func",&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    svn_repos_freeze_func_t * tmp =
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
+    arg1 = *tmp;
   }
-  if (obj6) {
+  {
+    if (obj1 == Py_None) {
+      arg2 = NULL;
+    } else if (SWIG_ConvertPtr(obj1, (void **) &arg2, 0, 0) == -1) {
+      arg2 = (void *) obj1;
+      PyErr_Clear();
+    }
+  }
+  if (obj2) {
     /* Verify that the user supplied a valid pool */
-    if (obj6 != Py_None && obj6 != _global_py_pool) {
-      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj6);
-      SWIG_arg_fail(svn_argnum_obj6);
+    if (obj2 != Py_None && obj2 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj2);
+      SWIG_arg_fail(svn_argnum_obj2);
       SWIG_fail;
     }
   }
   {
     svn_swig_py_release_py_lock();
     
-    result = (svn_error_t *)svn_repos_invoke_file_rev_handler(arg1,arg2,(char const *)arg3,arg4,arg5,arg6,arg7,arg8,arg9);
+    result = (svn_error_t *)svn_repos_invoke_freeze_func(arg1,arg2,arg3);
     
     svn_swig_py_acquire_py_lock();
     
@@ -17833,18 +19143,6 @@ SWIGINTERN PyObject *_wrap_svn_repos_invoke_file_rev_handler(PyObject *SWIGUNUSE
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(arg6, SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t,
-        _global_py_pool, args))
-    
-    ;
-  }
-  {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg7, SWIGTYPE_p_void,
-        _global_py_pool, args))
-    
-    ;
-  }
-  {
     Py_XDECREF(_global_py_pool);
   }
   return resultobj;
@@ -17856,27 +19154,29 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_svn_repos_invoke_notify_func(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_svn_repos_invoke_history_func(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  svn_repos_notify_func_t arg1 = (svn_repos_notify_func_t) 0 ;
+  svn_repos_history_func_t arg1 = (svn_repos_history_func_t) 0 ;
   void *arg2 = (void *) 0 ;
-  svn_repos_notify_t *arg3 = (svn_repos_notify_t *) 0 ;
-  apr_pool_t *arg4 = (apr_pool_t *) 0 ;
+  char *arg3 = (char *) 0 ;
+  svn_revnum_t arg4 ;
+  apr_pool_t *arg5 = (apr_pool_t *) 0 ;
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  svn_error_t *result = 0 ;
   
   if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
       &_global_py_pool, &_global_pool))
   SWIG_fail;
-  arg4 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_repos_invoke_notify_func",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  arg5 = _global_pool;
+  if (!PyArg_ParseTuple(args,(char *)"OOsO|O:svn_repos_invoke_history_func",&obj0,&obj1,&arg3,&obj3,&obj4)) SWIG_fail;
   {
-    svn_repos_notify_func_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void, svn_argnum_obj0);
+    svn_repos_history_func_t * tmp =
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17891,28 +19191,38 @@ SWIGINTERN PyObject *_wrap_svn_repos_invoke_notify_func(PyObject *SWIGUNUSEDPARM
     }
   }
   {
-    arg3 = (svn_repos_notify_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_repos_notify_t, svn_argnum_obj2);
-    if (PyErr_Occurred()) {
+    arg4 = (svn_revnum_t)SWIG_As_long (obj3);
+    if (SWIG_arg_fail(svn_argnum_obj3)) {
       SWIG_fail;
     }
   }
-  if (obj3) {
+  if (obj4) {
     /* Verify that the user supplied a valid pool */
-    if (obj3 != Py_None && obj3 != _global_py_pool) {
-      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj3);
-      SWIG_arg_fail(svn_argnum_obj3);
+    if (obj4 != Py_None && obj4 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj4);
+      SWIG_arg_fail(svn_argnum_obj4);
       SWIG_fail;
     }
   }
   {
     svn_swig_py_release_py_lock();
     
-    svn_repos_invoke_notify_func(arg1,arg2,(struct svn_repos_notify_t const *)arg3,arg4);
+    result = (svn_error_t *)svn_repos_invoke_history_func(arg1,arg2,(char const *)arg3,arg4,arg5);
     
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = SWIG_Py_Void();
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
   {
     Py_XDECREF(_global_py_pool);
   }
@@ -17925,26 +19235,47 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_svn_repos_invoke_freeze_func(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_svn_repos_invoke_file_rev_handler(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  svn_repos_freeze_func_t arg1 = (svn_repos_freeze_func_t) 0 ;
+  svn_repos_file_rev_handler_t arg1 = (svn_repos_file_rev_handler_t) 0 ;
   void *arg2 = (void *) 0 ;
-  apr_pool_t *arg3 = (apr_pool_t *) 0 ;
+  char *arg3 = (char *) 0 ;
+  svn_revnum_t arg4 ;
+  apr_hash_t *arg5 = (apr_hash_t *) 0 ;
+  svn_txdelta_window_handler_t *arg6 = (svn_txdelta_window_handler_t *) 0 ;
+  void **arg7 = (void **) 0 ;
+  apr_array_header_t *arg8 = (apr_array_header_t *) 0 ;
+  apr_pool_t *arg9 = (apr_pool_t *) 0 ;
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
+  void *temp7 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  PyObject * obj5 = 0 ;
+  PyObject * obj6 = 0 ;
   svn_error_t *result = 0 ;
   
   if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
       &_global_py_pool, &_global_pool))
   SWIG_fail;
-  arg3 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_repos_invoke_freeze_func",&obj0,&obj1,&obj2)) SWIG_fail;
+  arg9 = _global_pool;
   {
-    svn_repos_freeze_func_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    if (_global_pool == NULL)
+    {
+      if (svn_swig_py_get_parent_pool(args, SWIGTYPE_p_apr_pool_t,
+          &_global_py_pool, &_global_pool))
+      SWIG_fail;
+    }
+    arg6 = (svn_txdelta_window_handler_t *) apr_pcalloc(_global_pool, sizeof(svn_txdelta_window_handler_t));
+    if (arg6 == NULL) SWIG_fail;
+  }
+  arg7 = &temp7;
+  if (!PyArg_ParseTuple(args,(char *)"OOsOOO|O:svn_repos_invoke_file_rev_handler",&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  {
+    svn_repos_file_rev_handler_t * tmp =
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17958,18 +19289,36 @@ SWIGINTERN PyObject *_wrap_svn_repos_invoke_freeze_func(PyObject *SWIGUNUSEDPARM
       PyErr_Clear();
     }
   }
-  if (obj2) {
+  {
+    arg4 = (svn_revnum_t)SWIG_As_long (obj3);
+    if (SWIG_arg_fail(svn_argnum_obj3)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg5 = (apr_hash_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_apr_hash_t, svn_argnum_obj4);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg8 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj5, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj5);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  if (obj6) {
     /* Verify that the user supplied a valid pool */
-    if (obj2 != Py_None && obj2 != _global_py_pool) {
-      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj2);
-      SWIG_arg_fail(svn_argnum_obj2);
+    if (obj6 != Py_None && obj6 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj6);
+      SWIG_arg_fail(svn_argnum_obj6);
       SWIG_fail;
     }
   }
   {
     svn_swig_py_release_py_lock();
     
-    result = (svn_error_t *)svn_repos_invoke_freeze_func(arg1,arg2,arg3);
+    result = (svn_error_t *)svn_repos_invoke_file_rev_handler(arg1,arg2,(char const *)arg3,arg4,arg5,arg6,arg7,arg8,arg9);
     
     svn_swig_py_acquire_py_lock();
     
@@ -17986,6 +19335,18 @@ SWIGINTERN PyObject *_wrap_svn_repos_invoke_freeze_func(PyObject *SWIGUNUSEDPARM
     resultobj = Py_None;
   }
   {
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(arg6, SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t,
+        _global_py_pool, args))
+    
+    ;
+  }
+  {
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg7, SWIGTYPE_p_void,
+        _global_py_pool, args))
+    
+    ;
+  }
+  {
     Py_XDECREF(_global_py_pool);
   }
   return resultobj;
@@ -17997,17 +19358,18 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_svn_repos_invoke_history_func(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_svn_repos_invoke_verify_callback(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  svn_repos_history_func_t arg1 = (svn_repos_history_func_t) 0 ;
+  svn_repos_verify_callback_t arg1 = (svn_repos_verify_callback_t) 0 ;
   void *arg2 = (void *) 0 ;
-  char *arg3 = (char *) 0 ;
-  svn_revnum_t arg4 ;
+  svn_revnum_t arg3 ;
+  svn_error_t *arg4 = (svn_error_t *) 0 ;
   apr_pool_t *arg5 = (apr_pool_t *) 0 ;
   apr_pool_t *_global_pool = NULL ;
   PyObject *_global_py_pool = NULL ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   svn_error_t *result = 0 ;
@@ -18016,10 +19378,10 @@ SWIGINTERN PyObject *_wrap_svn_repos_invoke_history_func(PyObject *SWIGUNUSEDPAR
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg5 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"OOsO|O:svn_repos_invoke_history_func",&obj0,&obj1,&arg3,&obj3,&obj4)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OOOO|O:svn_repos_invoke_verify_callback",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
-    svn_repos_history_func_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_repos_verify_callback_t * tmp =
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18034,8 +19396,14 @@ SWIGINTERN PyObject *_wrap_svn_repos_invoke_history_func(PyObject *SWIGUNUSEDPAR
     }
   }
   {
-    arg4 = (svn_revnum_t)SWIG_As_long (obj3);
-    if (SWIG_arg_fail(svn_argnum_obj3)) {
+    arg3 = (svn_revnum_t)SWIG_As_long (obj2);
+    if (SWIG_arg_fail(svn_argnum_obj2)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg4 = (svn_error_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_error_t, svn_argnum_obj3);
+    if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
@@ -18050,7 +19418,7 @@ SWIGINTERN PyObject *_wrap_svn_repos_invoke_history_func(PyObject *SWIGUNUSEDPAR
   {
     svn_swig_py_release_py_lock();
     
-    result = (svn_error_t *)svn_repos_invoke_history_func(arg1,arg2,(char const *)arg3,arg4,arg5);
+    result = (svn_error_t *)svn_repos_invoke_verify_callback(arg1,arg2,arg3,arg4,arg5);
     
     svn_swig_py_acquire_py_lock();
     
@@ -18092,13 +19460,6 @@ SWIGINTERN PyObject *svn_repos_authz_callback_t_swigregister(PyObject *SWIGUNUSE
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *svn_repos_file_rev_handler_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
 SWIGINTERN PyObject *svn_repos_notify_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
@@ -18120,8 +19481,23 @@ SWIGINTERN PyObject *svn_repos_history_func_t_swigregister(PyObject *SWIGUNUSEDP
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *svn_repos_file_rev_handler_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *svn_repos_verify_callback_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
 static PyMethodDef SwigMethods[] = {
 	 { (char *)"SWIG_PyInstanceMethod_New", (PyCFunction)SWIG_PyInstanceMethod_New, METH_O, NULL},
+	 { (char *)"svn_swig_py_make_parse_fns3", _wrap_svn_swig_py_make_parse_fns3, METH_VARARGS, (char *)"svn_swig_py_make_parse_fns3(PyObject * py_parse_fns3, apr_pool_t pool)"},
 	 { (char *)"svn_repos_version", _wrap_svn_repos_version, METH_VARARGS, (char *)"svn_repos_version() -> svn_version_t const *"},
 	 { (char *)"svn_repos_notify_t_action_set", _wrap_svn_repos_notify_t_action_set, METH_VARARGS, (char *)"svn_repos_notify_t_action_set(svn_repos_notify_t self, svn_repos_notify_action_t action)"},
 	 { (char *)"svn_repos_notify_t_action_get", _wrap_svn_repos_notify_t_action_get, METH_VARARGS, (char *)"svn_repos_notify_t_action_get(svn_repos_notify_t self) -> svn_repos_notify_action_t"},
@@ -18141,9 +19517,14 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"svn_repos_notify_t_node_action_get", _wrap_svn_repos_notify_t_node_action_get, METH_VARARGS, (char *)"svn_repos_notify_t_node_action_get(svn_repos_notify_t self) -> enum svn_node_action"},
 	 { (char *)"svn_repos_notify_t_path_set", _wrap_svn_repos_notify_t_path_set, METH_VARARGS, (char *)"svn_repos_notify_t_path_set(svn_repos_notify_t self, char const * path)"},
 	 { (char *)"svn_repos_notify_t_path_get", _wrap_svn_repos_notify_t_path_get, METH_VARARGS, (char *)"svn_repos_notify_t_path_get(svn_repos_notify_t self) -> char const *"},
+	 { (char *)"svn_repos_notify_t_start_revision_set", _wrap_svn_repos_notify_t_start_revision_set, METH_VARARGS, (char *)"svn_repos_notify_t_start_revision_set(svn_repos_notify_t self, svn_revnum_t start_revision)"},
+	 { (char *)"svn_repos_notify_t_start_revision_get", _wrap_svn_repos_notify_t_start_revision_get, METH_VARARGS, (char *)"svn_repos_notify_t_start_revision_get(svn_repos_notify_t self) -> svn_revnum_t"},
+	 { (char *)"svn_repos_notify_t_end_revision_set", _wrap_svn_repos_notify_t_end_revision_set, METH_VARARGS, (char *)"svn_repos_notify_t_end_revision_set(svn_repos_notify_t self, svn_revnum_t end_revision)"},
+	 { (char *)"svn_repos_notify_t_end_revision_get", _wrap_svn_repos_notify_t_end_revision_get, METH_VARARGS, (char *)"svn_repos_notify_t_end_revision_get(svn_repos_notify_t self) -> svn_revnum_t"},
 	 { (char *)"svn_repos_notify_t_swigregister", svn_repos_notify_t_swigregister, METH_VARARGS, NULL},
 	 { (char *)"svn_repos_notify_create", _wrap_svn_repos_notify_create, METH_VARARGS, (char *)"svn_repos_notify_create(svn_repos_notify_action_t action, apr_pool_t result_pool) -> svn_repos_notify_t"},
 	 { (char *)"svn_repos_find_root_path", _wrap_svn_repos_find_root_path, METH_VARARGS, (char *)"svn_repos_find_root_path(char const * path, apr_pool_t pool) -> char const *"},
+	 { (char *)"svn_repos_open3", _wrap_svn_repos_open3, METH_VARARGS, (char *)"svn_repos_open3(char const * path, apr_hash_t fs_config, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"},
 	 { (char *)"svn_repos_open2", _wrap_svn_repos_open2, METH_VARARGS, (char *)"svn_repos_open2(char const * path, apr_hash_t fs_config, apr_pool_t pool) -> svn_error_t"},
 	 { (char *)"svn_repos_open", _wrap_svn_repos_open, METH_VARARGS, (char *)"svn_repos_open(char const * path, apr_pool_t pool) -> svn_error_t"},
 	 { (char *)"svn_repos_create", _wrap_svn_repos_create, METH_VARARGS, (char *)"\n"
@@ -18160,7 +19541,15 @@ static PyMethodDef SwigMethods[] = {
 		""},
 	 { (char *)"svn_repos_delete", _wrap_svn_repos_delete, METH_VARARGS, (char *)"svn_repos_delete(char const * path, apr_pool_t pool) -> svn_error_t"},
 	 { (char *)"svn_repos_has_capability", _wrap_svn_repos_has_capability, METH_VARARGS, (char *)"svn_repos_has_capability(svn_repos_t * repos, char const * capability, apr_pool_t pool) -> svn_error_t"},
+	 { (char *)"svn_repos_capabilities", _wrap_svn_repos_capabilities, METH_VARARGS, (char *)"svn_repos_capabilities(svn_repos_t * repos, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"},
+	 { (char *)"svn_repos_remember_client_capabilities", _wrap_svn_repos_remember_client_capabilities, METH_VARARGS, (char *)"svn_repos_remember_client_capabilities(svn_repos_t * repos, apr_array_header_t capabilities) -> svn_error_t"},
 	 { (char *)"svn_repos_fs", _wrap_svn_repos_fs, METH_VARARGS, (char *)"svn_repos_fs(svn_repos_t * repos) -> svn_fs_t *"},
+	 { (char *)"svn_repos_fs_type", _wrap_svn_repos_fs_type, METH_VARARGS, (char *)"svn_repos_fs_type(svn_repos_t * repos, apr_pool_t result_pool) -> char const *"},
+	 { (char *)"svn_repos_hotcopy3", _wrap_svn_repos_hotcopy3, METH_VARARGS, (char *)"\n"
+		"svn_repos_hotcopy3(char const * src_path, char const * dst_path, svn_boolean_t clean_logs, svn_boolean_t incremental, \n"
+		"    svn_repos_notify_func_t notify_func, void * notify_baton, \n"
+		"    svn_cancel_func_t cancel_func, apr_pool_t scratch_pool) -> svn_error_t\n"
+		""},
 	 { (char *)"svn_repos_hotcopy2", _wrap_svn_repos_hotcopy2, METH_VARARGS, (char *)"\n"
 		"svn_repos_hotcopy2(char const * src_path, char const * dst_path, svn_boolean_t clean_logs, svn_boolean_t incremental, \n"
 		"    svn_cancel_func_t cancel_func, apr_pool_t pool) -> svn_error_t\n"
@@ -18275,9 +19664,9 @@ static PyMethodDef SwigMethods[] = {
 		""},
 	 { (char *)"svn_repos_replay", _wrap_svn_repos_replay, METH_VARARGS, (char *)"svn_repos_replay(svn_fs_root_t * root, svn_delta_editor_t editor, void * edit_baton, apr_pool_t pool) -> svn_error_t"},
 	 { (char *)"svn_repos_get_commit_editor5", _wrap_svn_repos_get_commit_editor5, METH_VARARGS, (char *)"\n"
-		"svn_repos_get_commit_editor5(svn_repos_t * repos, svn_fs_txn_t * txn, char const * repos_url, char const * base_path, \n"
-		"    apr_hash_t revprop_table, svn_commit_callback2_t commit_callback, svn_repos_authz_callback_t authz_callback, \n"
-		"    void * authz_baton, apr_pool_t pool) -> svn_error_t\n"
+		"svn_repos_get_commit_editor5(svn_repos_t * repos, svn_fs_txn_t * txn, char const * repos_url_decoded, char const * base_path, \n"
+		"    apr_hash_t revprop_table, svn_commit_callback2_t commit_callback, \n"
+		"    svn_repos_authz_callback_t authz_callback, void * authz_baton, apr_pool_t pool) -> svn_error_t\n"
 		""},
 	 { (char *)"svn_repos_get_commit_editor4", _wrap_svn_repos_get_commit_editor4, METH_VARARGS, (char *)"\n"
 		"svn_repos_get_commit_editor4(svn_repos_t * repos, svn_fs_txn_t * txn, char const * repos_url, char const * base_path, \n"
@@ -18367,11 +19756,20 @@ static PyMethodDef SwigMethods[] = {
 		"    apr_pool_t pool) -> svn_error_t\n"
 		""},
 	 { (char *)"svn_repos_fs_begin_txn_for_update", _wrap_svn_repos_fs_begin_txn_for_update, METH_VARARGS, (char *)"svn_repos_fs_begin_txn_for_update(svn_repos_t * repos, svn_revnum_t rev, char const * author, apr_pool_t pool) -> svn_error_t"},
+	 { (char *)"svn_repos_fs_lock_many", _wrap_svn_repos_fs_lock_many, METH_VARARGS, (char *)"\n"
+		"svn_repos_fs_lock_many(svn_repos_t * repos, apr_hash_t lock_targets, char const * comment, svn_boolean_t is_dav_comment, \n"
+		"    apr_time_t expiration_date, svn_boolean_t steal_lock, svn_fs_lock_callback_t lock_callback, \n"
+		"    apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t\n"
+		""},
 	 { (char *)"svn_repos_fs_lock", _wrap_svn_repos_fs_lock, METH_VARARGS, (char *)"\n"
 		"svn_repos_fs_lock(svn_repos_t * repos, char const * path, char const * token, char const * comment, \n"
 		"    svn_boolean_t is_dav_comment, apr_time_t expiration_date, svn_revnum_t current_rev, \n"
 		"    svn_boolean_t steal_lock, apr_pool_t pool) -> svn_error_t\n"
 		""},
+	 { (char *)"svn_repos_fs_unlock_many", _wrap_svn_repos_fs_unlock_many, METH_VARARGS, (char *)"\n"
+		"svn_repos_fs_unlock_many(svn_repos_t * repos, apr_hash_t unlock_targets, svn_boolean_t break_lock, svn_fs_lock_callback_t lock_callback, \n"
+		"    apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t\n"
+		""},
 	 { (char *)"svn_repos_fs_unlock", _wrap_svn_repos_fs_unlock, METH_VARARGS, (char *)"\n"
 		"svn_repos_fs_unlock(svn_repos_t * repos, char const * path, char const * token, svn_boolean_t break_lock, \n"
 		"    apr_pool_t pool) -> svn_error_t\n"
@@ -18410,6 +19808,10 @@ static PyMethodDef SwigMethods[] = {
 		"svn_repos_fs_change_node_prop(svn_fs_root_t * root, char const * path, char const * name, svn_string_t const * value, \n"
 		"    apr_pool_t pool) -> svn_error_t\n"
 		""},
+	 { (char *)"svn_repos_fs_get_inherited_props", _wrap_svn_repos_fs_get_inherited_props, METH_VARARGS, (char *)"\n"
+		"svn_repos_fs_get_inherited_props(svn_fs_root_t * root, char const * path, char const * propname, svn_repos_authz_func_t authz_read_func, \n"
+		"    apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t\n"
+		""},
 	 { (char *)"svn_repos_fs_change_txn_prop", _wrap_svn_repos_fs_change_txn_prop, METH_VARARGS, (char *)"svn_repos_fs_change_txn_prop(svn_fs_txn_t * txn, char const * name, svn_string_t const * value, apr_pool_t pool) -> svn_error_t"},
 	 { (char *)"svn_repos_fs_change_txn_props", _wrap_svn_repos_fs_change_txn_props, METH_VARARGS, (char *)"svn_repos_fs_change_txn_props(svn_fs_txn_t * txn, apr_array_header_t props, apr_pool_t pool) -> svn_error_t"},
 	 { (char *)"svn_repos_node_t_kind_set", _wrap_svn_repos_node_t_kind_set, METH_VARARGS, (char *)"svn_repos_node_t_kind_set(svn_repos_node_t self, svn_node_kind_t kind)"},
@@ -18438,6 +19840,13 @@ static PyMethodDef SwigMethods[] = {
 		"    apr_pool_t pool) -> svn_error_t\n"
 		""},
 	 { (char *)"svn_repos_node_from_baton", _wrap_svn_repos_node_from_baton, METH_VARARGS, (char *)"svn_repos_node_from_baton(void * edit_baton) -> svn_repos_node_t"},
+	 { (char *)"svn_repos_info_format", _wrap_svn_repos_info_format, METH_VARARGS, (char *)"svn_repos_info_format(svn_repos_t * repos, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"},
+	 { (char *)"svn_repos_verify_fs3", _wrap_svn_repos_verify_fs3, METH_VARARGS, (char *)"\n"
+		"svn_repos_verify_fs3(svn_repos_t * repos, svn_revnum_t start_rev, svn_revnum_t end_rev, svn_boolean_t check_normalization, \n"
+		"    svn_boolean_t metadata_only, svn_repos_notify_func_t notify_func, \n"
+		"    void * notify_baton, svn_repos_verify_callback_t verify_callback, \n"
+		"    void * verify_baton, svn_cancel_func_t cancel, void * cancel_baton, apr_pool_t scratch_pool) -> svn_error_t\n"
+		""},
 	 { (char *)"svn_repos_verify_fs2", _wrap_svn_repos_verify_fs2, METH_VARARGS, (char *)"\n"
 		"svn_repos_verify_fs2(svn_repos_t * repos, svn_revnum_t start_rev, svn_revnum_t end_rev, svn_repos_notify_func_t notify_func, \n"
 		"    void * notify_baton, svn_cancel_func_t cancel, void * cancel_baton, \n"
@@ -18463,6 +19872,13 @@ static PyMethodDef SwigMethods[] = {
 		"    svn_revnum_t end_rev, svn_boolean_t incremental, svn_cancel_func_t cancel_func, \n"
 		"    apr_pool_t pool) -> svn_error_t\n"
 		""},
+	 { (char *)"svn_repos_load_fs5", _wrap_svn_repos_load_fs5, METH_VARARGS, (char *)"\n"
+		"svn_repos_load_fs5(svn_repos_t * repos, svn_stream_t * dumpstream, svn_revnum_t start_rev, svn_revnum_t end_rev, \n"
+		"    enum svn_repos_load_uuid uuid_action, char const * parent_dir, \n"
+		"    svn_boolean_t use_pre_commit_hook, svn_boolean_t use_post_commit_hook, svn_boolean_t validate_props, \n"
+		"    svn_boolean_t ignore_dates, svn_repos_notify_func_t notify_func, \n"
+		"    void * notify_baton, svn_cancel_func_t cancel_func, apr_pool_t pool) -> svn_error_t\n"
+		""},
 	 { (char *)"svn_repos_load_fs4", _wrap_svn_repos_load_fs4, METH_VARARGS, (char *)"\n"
 		"svn_repos_load_fs4(svn_repos_t * repos, svn_stream_t * dumpstream, svn_revnum_t start_rev, svn_revnum_t end_rev, \n"
 		"    enum svn_repos_load_uuid uuid_action, char const * parent_dir, \n"
@@ -18516,6 +19932,13 @@ static PyMethodDef SwigMethods[] = {
 		"svn_repos_parse_dumpstream3(svn_stream_t * stream, svn_repos_parse_fns3_t parse_fns, void * parse_baton, svn_boolean_t deltas_are_text, \n"
 		"    svn_cancel_func_t cancel_func, apr_pool_t pool) -> svn_error_t\n"
 		""},
+	 { (char *)"svn_repos_get_fs_build_parser5", _wrap_svn_repos_get_fs_build_parser5, METH_VARARGS, (char *)"\n"
+		"svn_repos_get_fs_build_parser5(svn_repos_t * repos, svn_revnum_t start_rev, svn_revnum_t end_rev, svn_boolean_t use_history, \n"
+		"    svn_boolean_t validate_props, enum svn_repos_load_uuid uuid_action, \n"
+		"    char const * parent_dir, svn_boolean_t use_pre_commit_hook, svn_boolean_t use_post_commit_hook, \n"
+		"    svn_boolean_t ignore_dates, svn_repos_notify_func_t notify_func, \n"
+		"    void * notify_baton, apr_pool_t pool) -> svn_error_t\n"
+		""},
 	 { (char *)"svn_repos_get_fs_build_parser4", _wrap_svn_repos_get_fs_build_parser4, METH_VARARGS, (char *)"\n"
 		"svn_repos_get_fs_build_parser4(svn_repos_t * repos, svn_revnum_t start_rev, svn_revnum_t end_rev, svn_boolean_t use_history, \n"
 		"    svn_boolean_t validate_props, enum svn_repos_load_uuid uuid_action, \n"
@@ -18596,11 +20019,6 @@ static PyMethodDef SwigMethods[] = {
 		"svn_repos_check_revision_access(svn_repos_revision_access_level_t * access_level, svn_repos_t * repos, svn_revnum_t revision, \n"
 		"    svn_repos_authz_func_t authz_read_func, apr_pool_t pool) -> svn_error_t\n"
 		""},
-	 { (char *)"svn_repos_fs_get_inherited_props", _wrap_svn_repos_fs_get_inherited_props, METH_VARARGS, (char *)"\n"
-		"svn_repos_fs_get_inherited_props(svn_fs_root_t * root, char const * path, char const * propname, svn_repos_authz_func_t authz_read_func, \n"
-		"    apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t\n"
-		""},
-	 { (char *)"svn_repos_remember_client_capabilities", _wrap_svn_repos_remember_client_capabilities, METH_VARARGS, (char *)"svn_repos_remember_client_capabilities(svn_repos_t * repos, apr_array_header_t capabilities) -> svn_error_t"},
 	 { (char *)"svn_repos_t_swigregister", svn_repos_t_swigregister, METH_VARARGS, NULL},
 	 { (char *)"svn_authz_t_swigregister", svn_authz_t_swigregister, METH_VARARGS, NULL},
 	 { (char *)"svn_repos_parse_fns3_invoke_magic_header_record", _wrap_svn_repos_parse_fns3_invoke_magic_header_record, METH_VARARGS, (char *)"svn_repos_parse_fns3_invoke_magic_header_record(svn_repos_parse_fns3_t _obj, int version, void * parse_baton, apr_pool_t pool) -> svn_error_t"},
@@ -18634,22 +20052,27 @@ static PyMethodDef SwigMethods[] = {
 		"svn_repos_invoke_authz_callback(svn_repos_authz_callback_t _obj, svn_repos_authz_access_t required, svn_fs_root_t * root, \n"
 		"    char const * path, void * baton, apr_pool_t pool) -> svn_error_t\n"
 		""},
-	 { (char *)"svn_repos_invoke_file_rev_handler", _wrap_svn_repos_invoke_file_rev_handler, METH_VARARGS, (char *)"\n"
-		"svn_repos_invoke_file_rev_handler(svn_repos_file_rev_handler_t _obj, void * baton, char const * path, svn_revnum_t rev, \n"
-		"    apr_hash_t rev_props, apr_array_header_t prop_diffs, apr_pool_t pool) -> svn_error_t\n"
-		""},
 	 { (char *)"svn_repos_invoke_notify_func", _wrap_svn_repos_invoke_notify_func, METH_VARARGS, (char *)"svn_repos_invoke_notify_func(svn_repos_notify_func_t _obj, void * baton, svn_repos_notify_t notify, apr_pool_t scratch_pool)"},
 	 { (char *)"svn_repos_invoke_freeze_func", _wrap_svn_repos_invoke_freeze_func, METH_VARARGS, (char *)"svn_repos_invoke_freeze_func(svn_repos_freeze_func_t _obj, void * baton, apr_pool_t pool) -> svn_error_t"},
 	 { (char *)"svn_repos_invoke_history_func", _wrap_svn_repos_invoke_history_func, METH_VARARGS, (char *)"\n"
 		"svn_repos_invoke_history_func(svn_repos_history_func_t _obj, void * baton, char const * path, svn_revnum_t revision, \n"
 		"    apr_pool_t pool) -> svn_error_t\n"
 		""},
+	 { (char *)"svn_repos_invoke_file_rev_handler", _wrap_svn_repos_invoke_file_rev_handler, METH_VARARGS, (char *)"\n"
+		"svn_repos_invoke_file_rev_handler(svn_repos_file_rev_handler_t _obj, void * baton, char const * path, svn_revnum_t rev, \n"
+		"    apr_hash_t rev_props, apr_array_header_t prop_diffs, apr_pool_t pool) -> svn_error_t\n"
+		""},
+	 { (char *)"svn_repos_invoke_verify_callback", _wrap_svn_repos_invoke_verify_callback, METH_VARARGS, (char *)"\n"
+		"svn_repos_invoke_verify_callback(svn_repos_verify_callback_t _obj, void * baton, svn_revnum_t revision, svn_error_t verify_err, \n"
+		"    apr_pool_t scratch_pool) -> svn_error_t\n"
+		""},
 	 { (char *)"svn_repos_authz_func_t_swigregister", svn_repos_authz_func_t_swigregister, METH_VARARGS, NULL},
 	 { (char *)"svn_repos_authz_callback_t_swigregister", svn_repos_authz_callback_t_swigregister, METH_VARARGS, NULL},
-	 { (char *)"svn_repos_file_rev_handler_t_swigregister", svn_repos_file_rev_handler_t_swigregister, METH_VARARGS, NULL},
 	 { (char *)"svn_repos_notify_func_t_swigregister", svn_repos_notify_func_t_swigregister, METH_VARARGS, NULL},
 	 { (char *)"svn_repos_freeze_func_t_swigregister", svn_repos_freeze_func_t_swigregister, METH_VARARGS, NULL},
 	 { (char *)"svn_repos_history_func_t_swigregister", svn_repos_history_func_t_swigregister, METH_VARARGS, NULL},
+	 { (char *)"svn_repos_file_rev_handler_t_swigregister", svn_repos_file_rev_handler_t_swigregister, METH_VARARGS, NULL},
+	 { (char *)"svn_repos_verify_callback_t_swigregister", svn_repos_verify_callback_t_swigregister, METH_VARARGS, NULL},
 	 { NULL, NULL, 0, NULL }
 };
 
@@ -18676,12 +20099,14 @@ static swig_type_info _swigt__p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t
 static swig_type_info _swigt__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_hash_t *,svn_revnum_t,char const *,char const *,char const *,apr_pool_t *)|svn_log_message_receiver_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_pool_t *)|svn_repos_freeze_func_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__char__p_svn_error_t = {"_p_f_p_void_p_q_const__char__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *)|svn_error_t *(*)(void *,char const *)", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_lock_t const *,svn_error_t *,apr_pool_t *)|svn_fs_lock_callback_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_string_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_string_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_string_t const *)|svn_error_t *(*)(void *,char const *,svn_string_t const *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)|svn_repos_file_rev_handler_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_boolean_t,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)|svn_file_rev_handler_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_pool_t *)|svn_repos_history_func_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void = {"_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void", "svn_repos_notify_func_t|void (*)(void *,struct svn_repos_notify_t const *,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_log_entry_t *,apr_pool_t *)|svn_log_entry_receiver_t", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t", "svn_repos_verify_callback_t|struct svn_error_t *(*)(void *,svn_revnum_t,svn_error_t *,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_repos_authz_access_t,svn_boolean_t *,svn_fs_root_t *,char const *,void *,apr_pool_t *)|svn_repos_authz_callback_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t = {"_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_revnum_t,char const *,char const *,void *)|svn_commit_callback_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_int = {"_p_int", "int *|svn_boolean_t *|apr_status_t *", 0, 0, (void*)0, 0};
@@ -18698,6 +20123,7 @@ static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_ha
 static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_boolean_t,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)|svn_file_rev_handler_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(void *,char const *,svn_revnum_t,apr_pool_t *)|svn_repos_history_func_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void = {"_p_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void", "void (**)(void *,struct svn_repos_notify_t const *,apr_pool_t *)|svn_repos_notify_func_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t", "svn_repos_verify_callback_t *|struct svn_error_t *(**)(void *,svn_revnum_t,svn_error_t *,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "svn_repos_authz_callback_t *|struct svn_error_t *(**)(svn_repos_authz_access_t,svn_boolean_t *,svn_fs_root_t *,char const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_svn_authz_t = {"_p_p_svn_authz_t", "struct svn_authz_t **|svn_authz_t **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_svn_delta_editor_t = {"_p_p_svn_delta_editor_t", "struct svn_delta_editor_t **|svn_delta_editor_t **", 0, 0, (void*)0, 0};
@@ -18710,6 +20136,7 @@ static swig_type_info _swigt__p_p_svn_repos_parse_fns_t = {"_p_p_svn_repos_parse
 static swig_type_info _swigt__p_p_svn_repos_t = {"_p_p_svn_repos_t", "struct svn_repos_t **|svn_repos_t **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_svn_stream_t = {"_p_p_svn_stream_t", "struct svn_stream_t **|svn_stream_t **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_svn_string_t = {"_p_p_svn_string_t", "struct svn_string_t **|svn_string_t **", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_p_svn_version_t = {"_p_p_svn_version_t", "struct svn_version_t **|svn_version_t **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_void = {"_p_p_void", "void **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_auth_baton_t = {"_p_svn_auth_baton_t", "struct svn_auth_baton_t *|svn_auth_baton_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_auth_cred_simple_t = {"_p_svn_auth_cred_simple_t", "struct svn_auth_cred_simple_t *|svn_auth_cred_simple_t *", 0, 0, (void*)0, 0};
@@ -18729,13 +20156,19 @@ static swig_type_info _swigt__p_svn_commit_info_t = {"_p_svn_commit_info_t", "st
 static swig_type_info _swigt__p_svn_config_t = {"_p_svn_config_t", "struct svn_config_t *|svn_config_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_delta_editor_t = {"_p_svn_delta_editor_t", "struct svn_delta_editor_t *|svn_delta_editor_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_depth_t = {"_p_svn_depth_t", "enum svn_depth_t *|svn_depth_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_diff_hunk_t = {"_p_svn_diff_hunk_t", "svn_diff_hunk_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_dirent_t = {"_p_svn_dirent_t", "struct svn_dirent_t *|svn_dirent_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_errno_t = {"_p_svn_errno_t", "enum svn_errno_t *|svn_errno_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "struct svn_error_t *|svn_error_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_fs_access_t = {"_p_svn_fs_access_t", "struct svn_fs_access_t *|svn_fs_access_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_fs_dirent_t = {"_p_svn_fs_dirent_t", "struct svn_fs_dirent_t *|svn_fs_dirent_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_fs_fsfs_info_t = {"_p_svn_fs_fsfs_info_t", "struct svn_fs_fsfs_info_t *|svn_fs_fsfs_info_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_fs_fsx_info_t = {"_p_svn_fs_fsx_info_t", "struct svn_fs_fsx_info_t *|svn_fs_fsx_info_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_fs_history_t = {"_p_svn_fs_history_t", "struct svn_fs_history_t *|svn_fs_history_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_fs_id_t = {"_p_svn_fs_id_t", "struct svn_fs_id_t *|svn_fs_id_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_fs_info_placeholder_t = {"_p_svn_fs_info_placeholder_t", "struct svn_fs_info_placeholder_t *|svn_fs_info_placeholder_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_fs_lock_target_t = {"_p_svn_fs_lock_target_t", "struct svn_fs_lock_target_t *|svn_fs_lock_target_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_fs_node_relation_t = {"_p_svn_fs_node_relation_t", "enum svn_fs_node_relation_t *|svn_fs_node_relation_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_fs_pack_notify_action_t = {"_p_svn_fs_pack_notify_action_t", "enum svn_fs_pack_notify_action_t *|svn_fs_pack_notify_action_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_fs_path_change2_t = {"_p_svn_fs_path_change2_t", "struct svn_fs_path_change2_t *|svn_fs_path_change2_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_fs_path_change_kind_t = {"_p_svn_fs_path_change_kind_t", "enum svn_fs_path_change_kind_t *|svn_fs_path_change_kind_t *", 0, 0, (void*)0, 0};
@@ -18743,6 +20176,7 @@ static swig_type_info _swigt__p_svn_fs_path_change_t = {"_p_svn_fs_path_change_t
 static swig_type_info _swigt__p_svn_fs_root_t = {"_p_svn_fs_root_t", "struct svn_fs_root_t *|svn_fs_root_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_fs_t = {"_p_svn_fs_t", "struct svn_fs_t *|svn_fs_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_fs_txn_t = {"_p_svn_fs_txn_t", "struct svn_fs_txn_t *|svn_fs_txn_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_fs_upgrade_notify_action_t = {"_p_svn_fs_upgrade_notify_action_t", "enum svn_fs_upgrade_notify_action_t *|svn_fs_upgrade_notify_action_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_io_dirent2_t = {"_p_svn_io_dirent2_t", "struct svn_io_dirent2_t *|svn_io_dirent2_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_io_dirent_t = {"_p_svn_io_dirent_t", "struct svn_io_dirent_t *|svn_io_dirent_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_io_file_del_t = {"_p_svn_io_file_del_t", "enum svn_io_file_del_t *|svn_io_file_del_t *", 0, 0, (void*)0, 0};
@@ -18809,12 +20243,14 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_q_const__char__p_svn_error_t,
+  &_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_string_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void,
   &_swigt__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t,
+  &_swigt__p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t,
   &_swigt__p_int,
@@ -18831,6 +20267,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void,
+  &_swigt__p_p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_p_svn_authz_t,
   &_swigt__p_p_svn_delta_editor_t,
@@ -18843,6 +20280,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_p_svn_repos_t,
   &_swigt__p_p_svn_stream_t,
   &_swigt__p_p_svn_string_t,
+  &_swigt__p_p_svn_version_t,
   &_swigt__p_p_void,
   &_swigt__p_svn_auth_baton_t,
   &_swigt__p_svn_auth_cred_simple_t,
@@ -18862,13 +20300,19 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_svn_config_t,
   &_swigt__p_svn_delta_editor_t,
   &_swigt__p_svn_depth_t,
+  &_swigt__p_svn_diff_hunk_t,
   &_swigt__p_svn_dirent_t,
   &_swigt__p_svn_errno_t,
   &_swigt__p_svn_error_t,
   &_swigt__p_svn_fs_access_t,
   &_swigt__p_svn_fs_dirent_t,
+  &_swigt__p_svn_fs_fsfs_info_t,
+  &_swigt__p_svn_fs_fsx_info_t,
   &_swigt__p_svn_fs_history_t,
   &_swigt__p_svn_fs_id_t,
+  &_swigt__p_svn_fs_info_placeholder_t,
+  &_swigt__p_svn_fs_lock_target_t,
+  &_swigt__p_svn_fs_node_relation_t,
   &_swigt__p_svn_fs_pack_notify_action_t,
   &_swigt__p_svn_fs_path_change2_t,
   &_swigt__p_svn_fs_path_change_kind_t,
@@ -18876,6 +20320,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_svn_fs_root_t,
   &_swigt__p_svn_fs_t,
   &_swigt__p_svn_fs_txn_t,
+  &_swigt__p_svn_fs_upgrade_notify_action_t,
   &_swigt__p_svn_io_dirent2_t,
   &_swigt__p_svn_io_dirent_t,
   &_swigt__p_svn_io_file_del_t,
@@ -18942,12 +20387,14 @@ static swig_cast_info _swigc__p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t
 static swig_cast_info _swigc__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_q_const__char__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__char__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_string_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_string_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void[] = {  {&_swigt__p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t[] = {  {&_swigt__p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_int[] = {  {&_swigt__p_int, 0, 0, 0},{0, 0, 0, 0}};
@@ -18964,6 +20411,7 @@ static swig_cast_info _swigc__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_ha
 static swig_cast_info _swigc__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void[] = {  {&_swigt__p_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_svn_authz_t[] = {  {&_swigt__p_p_svn_authz_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_svn_delta_editor_t[] = {  {&_swigt__p_p_svn_delta_editor_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -18976,6 +20424,7 @@ static swig_cast_info _swigc__p_p_svn_repos_parse_fns_t[] = {  {&_swigt__p_p_svn
 static swig_cast_info _swigc__p_p_svn_repos_t[] = {  {&_swigt__p_p_svn_repos_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_svn_stream_t[] = {  {&_swigt__p_p_svn_stream_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_svn_string_t[] = {  {&_swigt__p_p_svn_string_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_p_svn_version_t[] = {  {&_swigt__p_p_svn_version_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_void[] = {  {&_swigt__p_p_void, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_auth_baton_t[] = {  {&_swigt__p_svn_auth_baton_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_auth_cred_simple_t[] = {  {&_swigt__p_svn_auth_cred_simple_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -18995,13 +20444,19 @@ static swig_cast_info _swigc__p_svn_commit_info_t[] = {  {&_swigt__p_svn_commit_
 static swig_cast_info _swigc__p_svn_config_t[] = {  {&_swigt__p_svn_config_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_delta_editor_t[] = {  {&_swigt__p_svn_delta_editor_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_depth_t[] = {  {&_swigt__p_svn_depth_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_diff_hunk_t[] = {  {&_swigt__p_svn_diff_hunk_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_dirent_t[] = {  {&_swigt__p_svn_dirent_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_errno_t[] = {  {&_swigt__p_svn_errno_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_error_t[] = {  {&_swigt__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_fs_access_t[] = {  {&_swigt__p_svn_fs_access_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_fs_dirent_t[] = {  {&_swigt__p_svn_fs_dirent_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_fs_fsfs_info_t[] = {  {&_swigt__p_svn_fs_fsfs_info_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_fs_fsx_info_t[] = {  {&_swigt__p_svn_fs_fsx_info_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_fs_history_t[] = {  {&_swigt__p_svn_fs_history_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_fs_id_t[] = {  {&_swigt__p_svn_fs_id_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_fs_info_placeholder_t[] = {  {&_swigt__p_svn_fs_info_placeholder_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_fs_lock_target_t[] = {  {&_swigt__p_svn_fs_lock_target_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_fs_node_relation_t[] = {  {&_swigt__p_svn_fs_node_relation_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_fs_pack_notify_action_t[] = {  {&_swigt__p_svn_fs_pack_notify_action_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_fs_path_change2_t[] = {  {&_swigt__p_svn_fs_path_change2_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_fs_path_change_kind_t[] = {  {&_swigt__p_svn_fs_path_change_kind_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -19009,6 +20464,7 @@ static swig_cast_info _swigc__p_svn_fs_path_change_t[] = {  {&_swigt__p_svn_fs_p
 static swig_cast_info _swigc__p_svn_fs_root_t[] = {  {&_swigt__p_svn_fs_root_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_fs_t[] = {  {&_swigt__p_svn_fs_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_fs_txn_t[] = {  {&_swigt__p_svn_fs_txn_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_fs_upgrade_notify_action_t[] = {  {&_swigt__p_svn_fs_upgrade_notify_action_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_io_dirent2_t[] = {  {&_swigt__p_svn_io_dirent2_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_io_dirent_t[] = {  {&_swigt__p_svn_io_dirent_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_io_file_del_t[] = {  {&_swigt__p_svn_io_file_del_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -19075,12 +20531,14 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_p_q_const__char__p_svn_error_t,
+  _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_string_t__p_svn_error_t,
   _swigc__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void,
   _swigc__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t,
+  _swigc__p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t,
   _swigc__p_int,
@@ -19097,6 +20555,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void,
+  _swigc__p_p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t,
   _swigc__p_p_svn_authz_t,
   _swigc__p_p_svn_delta_editor_t,
@@ -19109,6 +20568,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_p_svn_repos_t,
   _swigc__p_p_svn_stream_t,
   _swigc__p_p_svn_string_t,
+  _swigc__p_p_svn_version_t,
   _swigc__p_p_void,
   _swigc__p_svn_auth_baton_t,
   _swigc__p_svn_auth_cred_simple_t,
@@ -19128,13 +20588,19 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_svn_config_t,
   _swigc__p_svn_delta_editor_t,
   _swigc__p_svn_depth_t,
+  _swigc__p_svn_diff_hunk_t,
   _swigc__p_svn_dirent_t,
   _swigc__p_svn_errno_t,
   _swigc__p_svn_error_t,
   _swigc__p_svn_fs_access_t,
   _swigc__p_svn_fs_dirent_t,
+  _swigc__p_svn_fs_fsfs_info_t,
+  _swigc__p_svn_fs_fsx_info_t,
   _swigc__p_svn_fs_history_t,
   _swigc__p_svn_fs_id_t,
+  _swigc__p_svn_fs_info_placeholder_t,
+  _swigc__p_svn_fs_lock_target_t,
+  _swigc__p_svn_fs_node_relation_t,
   _swigc__p_svn_fs_pack_notify_action_t,
   _swigc__p_svn_fs_path_change2_t,
   _swigc__p_svn_fs_path_change_kind_t,
@@ -19142,6 +20608,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_svn_fs_root_t,
   _swigc__p_svn_fs_t,
   _swigc__p_svn_fs_txn_t,
+  _swigc__p_svn_fs_upgrade_notify_action_t,
   _swigc__p_svn_io_dirent2_t,
   _swigc__p_svn_io_dirent_t,
   _swigc__p_svn_io_file_del_t,
@@ -19199,18 +20666,18 @@ static swig_const_info swig_const_table[] = {
 #endif
 /* -----------------------------------------------------------------------------
  * Type initialization:
- * This problem is tough by the requirement that no dynamic 
- * memory is used. Also, since swig_type_info structures store pointers to 
+ * This problem is tough by the requirement that no dynamic
+ * memory is used. Also, since swig_type_info structures store pointers to
  * swig_cast_info structures and swig_cast_info structures store pointers back
- * to swig_type_info structures, we need some lookup code at initialization. 
- * The idea is that swig generates all the structures that are needed. 
- * The runtime then collects these partially filled structures. 
- * The SWIG_InitializeModule function takes these initial arrays out of 
+ * to swig_type_info structures, we need some lookup code at initialization.
+ * The idea is that swig generates all the structures that are needed.
+ * The runtime then collects these partially filled structures.
+ * The SWIG_InitializeModule function takes these initial arrays out of
  * swig_module, and does all the lookup, filling in the swig_module.types
  * array with the correct data and linking the correct swig_cast_info
  * structures together.
  *
- * The generated swig_type_info structures are assigned staticly to an initial 
+ * The generated swig_type_info structures are assigned staticly to an initial
  * array. We just loop through that array, and handle each type individually.
  * First we lookup if this type has been already loaded, and if so, use the
  * loaded structure instead of the generated one. Then we have to fill in the
@@ -19220,17 +20687,17 @@ static swig_const_info swig_const_table[] = {
  * a column is one of the swig_cast_info structures for that type.
  * The cast_initial array is actually an array of arrays, because each row has
  * a variable number of columns. So to actually build the cast linked list,
- * we find the array of casts associated with the type, and loop through it 
+ * we find the array of casts associated with the type, and loop through it
  * adding the casts to the list. The one last trick we need to do is making
  * sure the type pointer in the swig_cast_info struct is correct.
  *
- * First off, we lookup the cast->type name to see if it is already loaded. 
+ * First off, we lookup the cast->type name to see if it is already loaded.
  * There are three cases to handle:
  *  1) If the cast->type has already been loaded AND the type we are adding
  *     casting info to has not been loaded (it is in this module), THEN we
  *     replace the cast->type pointer with the type pointer that has already
  *     been loaded.
- *  2) If BOTH types (the one we are adding casting info to, and the 
+ *  2) If BOTH types (the one we are adding casting info to, and the
  *     cast->type) are loaded, THEN the cast info has already been loaded by
  *     the previous module so we just ignore it.
  *  3) Finally, if cast->type has not already been loaded, then we add that
@@ -19293,7 +20760,7 @@ SWIG_InitializeModule(void *clientdata) {
     module_head->next = &swig_module;
   }
   
-  /* When multiple interpeters are used, a module could have already been initialized in
+  /* When multiple interpreters are used, a module could have already been initialized in
        a different interpreter, but not yet have a pointer in this interpreter.
        In this case, we do not want to continue adding types... everything should be
        set up already */
@@ -19874,9 +21341,6 @@ SWIG_init(void) {
   SWIG_Python_SetConstant(d, "svn_node_action_add",SWIG_From_long((long)(svn_node_action_add)));
   SWIG_Python_SetConstant(d, "svn_node_action_delete",SWIG_From_long((long)(svn_node_action_delete)));
   SWIG_Python_SetConstant(d, "svn_node_action_replace",SWIG_From_long((long)(svn_node_action_replace)));
-  SWIG_Python_SetConstant(d, "svn_repos_load_uuid_default",SWIG_From_long((long)(svn_repos_load_uuid_default)));
-  SWIG_Python_SetConstant(d, "svn_repos_load_uuid_ignore",SWIG_From_long((long)(svn_repos_load_uuid_ignore)));
-  SWIG_Python_SetConstant(d, "svn_repos_load_uuid_force",SWIG_From_long((long)(svn_repos_load_uuid_force)));
   SWIG_Python_SetConstant(d, "svn_authz_none",SWIG_From_long((long)(svn_authz_none)));
   SWIG_Python_SetConstant(d, "svn_authz_read",SWIG_From_long((long)(svn_authz_read)));
   SWIG_Python_SetConstant(d, "svn_authz_write",SWIG_From_long((long)(svn_authz_write)));
@@ -19901,9 +21365,16 @@ SWIG_init(void) {
   SWIG_Python_SetConstant(d, "svn_repos_notify_upgrade_start",SWIG_From_long((long)(svn_repos_notify_upgrade_start)));
   SWIG_Python_SetConstant(d, "svn_repos_notify_load_skipped_rev",SWIG_From_long((long)(svn_repos_notify_load_skipped_rev)));
   SWIG_Python_SetConstant(d, "svn_repos_notify_verify_rev_structure",SWIG_From_long((long)(svn_repos_notify_verify_rev_structure)));
+  SWIG_Python_SetConstant(d, "svn_repos_notify_pack_revprops",SWIG_From_long((long)(svn_repos_notify_pack_revprops)));
+  SWIG_Python_SetConstant(d, "svn_repos_notify_cleanup_revprops",SWIG_From_long((long)(svn_repos_notify_cleanup_revprops)));
+  SWIG_Python_SetConstant(d, "svn_repos_notify_format_bumped",SWIG_From_long((long)(svn_repos_notify_format_bumped)));
+  SWIG_Python_SetConstant(d, "svn_repos_notify_hotcopy_rev_range",SWIG_From_long((long)(svn_repos_notify_hotcopy_rev_range)));
   SWIG_Python_SetConstant(d, "svn_repos_notify_warning_found_old_reference",SWIG_From_long((long)(svn_repos_notify_warning_found_old_reference)));
   SWIG_Python_SetConstant(d, "svn_repos_notify_warning_found_old_mergeinfo",SWIG_From_long((long)(svn_repos_notify_warning_found_old_mergeinfo)));
   SWIG_Python_SetConstant(d, "svn_repos_notify_warning_invalid_fspath",SWIG_From_long((long)(svn_repos_notify_warning_invalid_fspath)));
+  SWIG_Python_SetConstant(d, "svn_repos_notify_warning_name_collision",SWIG_From_long((long)(svn_repos_notify_warning_name_collision)));
+  SWIG_Python_SetConstant(d, "svn_repos_notify_warning_mergeinfo_collision",SWIG_From_long((long)(svn_repos_notify_warning_mergeinfo_collision)));
+  SWIG_Python_SetConstant(d, "svn_repos_notify_warning_invalid_mergeinfo",SWIG_From_long((long)(svn_repos_notify_warning_invalid_mergeinfo)));
   SWIG_Python_SetConstant(d, "SVN_REPOS_CAPABILITY_MERGEINFO",SWIG_FromCharPtr("mergeinfo"));
   SWIG_Python_SetConstant(d, "SVN_REPOS_DUMPFILE_MAGIC_HEADER",SWIG_FromCharPtr("SVN-fs-dump-format-version"));
   SWIG_Python_SetConstant(d, "SVN_REPOS_DUMPFILE_FORMAT_VERSION",SWIG_From_long((long)(3)));
@@ -19929,6 +21400,9 @@ SWIG_init(void) {
   SWIG_Python_SetConstant(d, "SVN_REPOS_DUMPFILE_TEXT_DELTA_BASE_MD5",SWIG_FromCharPtr("Text-delta-base-md5"));
   SWIG_Python_SetConstant(d, "SVN_REPOS_DUMPFILE_TEXT_DELTA_BASE_SHA1",SWIG_FromCharPtr("Text-delta-base-sha1"));
   SWIG_Python_SetConstant(d, "SVN_REPOS_DUMPFILE_TEXT_DELTA_BASE_CHECKSUM",SWIG_FromCharPtr("Text-delta-base-md5"));
+  SWIG_Python_SetConstant(d, "svn_repos_load_uuid_default",SWIG_From_long((long)(svn_repos_load_uuid_default)));
+  SWIG_Python_SetConstant(d, "svn_repos_load_uuid_ignore",SWIG_From_long((long)(svn_repos_load_uuid_ignore)));
+  SWIG_Python_SetConstant(d, "svn_repos_load_uuid_force",SWIG_From_long((long)(svn_repos_load_uuid_force)));
   SWIG_Python_SetConstant(d, "svn_repos_revision_access_none",SWIG_From_long((long)(svn_repos_revision_access_none)));
   SWIG_Python_SetConstant(d, "svn_repos_revision_access_partial",SWIG_From_long((long)(svn_repos_revision_access_partial)));
   SWIG_Python_SetConstant(d, "svn_repos_revision_access_full",SWIG_From_long((long)(svn_repos_revision_access_full)));
diff --git a/subversion/bindings/swig/python/svn_wc.c b/subversion/bindings/swig/python/svn_wc.c
index 818dcf5..344d681 100644
--- a/subversion/bindings/swig/python/svn_wc.c
+++ b/subversion/bindings/swig/python/svn_wc.c
@@ -1,11 +1,11 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
- * 
- * This file is not intended to be easily readable and contains a number of 
+ * Version 2.0.12
+ *
+ * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
- * changes to this file unless you know what you are doing--modify the SWIG 
- * interface file instead. 
+ * changes to this file unless you know what you are doing--modify the SWIG
+ * interface file instead.
  * ----------------------------------------------------------------------------- */
 
 #define SWIGPYTHON
@@ -43,28 +43,28 @@
 #ifndef SWIGUNUSED
 # if defined(__GNUC__)
 #   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__)) 
+#     define SWIGUNUSED __attribute__ ((__unused__))
 #   else
 #     define SWIGUNUSED
 #   endif
 # elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__)) 
+#   define SWIGUNUSED __attribute__ ((__unused__))
 # else
-#   define SWIGUNUSED 
+#   define SWIGUNUSED
 # endif
 #endif
 
 #ifndef SWIG_MSC_UNSUPPRESS_4505
 # if defined(_MSC_VER)
 #   pragma warning(disable : 4505) /* unreferenced local function has been removed */
-# endif 
+# endif
 #endif
 
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
 # else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
 # endif
 #endif
 
@@ -107,7 +107,7 @@
 #   define SWIGSTDCALL __stdcall
 # else
 #   define SWIGSTDCALL
-# endif 
+# endif
 #endif
 
 /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
@@ -122,8 +122,14 @@
 
 
 
-/* Python.h has to appear first */
-#include <Python.h>
+#if defined(_DEBUG) && defined(SWIG_PYTHON_INTERPRETER_NO_DEBUG)
+/* Use debug wrappers with the Python release dll */
+# undef _DEBUG
+# include <Python.h>
+# define _DEBUG
+#else
+# include <Python.h>
+#endif
 
 /* -----------------------------------------------------------------------------
  * swigrun.swg
@@ -149,7 +155,7 @@
   You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for
   creating a static or dynamic library from the SWIG runtime code.
   In 99.9% of the cases, SWIG just needs to declare them as 'static'.
-  
+
   But only do this if strictly necessary, ie, if you have problems
   with your compiler or suchlike.
 */
@@ -175,16 +181,16 @@
 #define SWIG_POINTER_OWN           0x1
 
 
-/* 
+/*
    Flags/methods for returning states.
-   
-   The SWIG conversion methods, as ConvertPtr, return an integer 
+
+   The SWIG conversion methods, as ConvertPtr, return an integer
    that tells if the conversion was successful or not. And if not,
    an error code can be returned (see swigerrors.swg for the codes).
-   
+
    Use the following macros/flags to set or process the returning
    states.
-   
+
    In old versions of SWIG, code such as the following was usually written:
 
      if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) {
@@ -217,23 +223,23 @@
     } else {
       // fail code
     }
-    
+
    I.e., now SWIG_ConvertPtr can return new objects and you can
    identify the case and take care of the deallocation. Of course that
    also requires SWIG_ConvertPtr to return new result values, such as
 
-      int SWIG_ConvertPtr(obj, ptr,...) {         
-        if (<obj is ok>) {			       
-          if (<need new object>) {		       
-            *ptr = <ptr to new allocated object>; 
-            return SWIG_NEWOBJ;		       
-          } else {				       
-            *ptr = <ptr to old object>;	       
-            return SWIG_OLDOBJ;		       
-          } 				       
-        } else {				       
-          return SWIG_BADOBJ;		       
-        }					       
+      int SWIG_ConvertPtr(obj, ptr,...) {
+        if (<obj is ok>) {
+          if (<need new object>) {
+            *ptr = <ptr to new allocated object>;
+            return SWIG_NEWOBJ;
+          } else {
+            *ptr = <ptr to old object>;
+            return SWIG_OLDOBJ;
+          }
+        } else {
+          return SWIG_BADOBJ;
+        }
       }
 
    Of course, returning the plain '0(success)/-1(fail)' still works, but you can be
@@ -247,17 +253,17 @@
        int fooi(int);
 
    and you call
- 
+
       food(1)   // cast rank '1'  (1 -> 1.0)
       fooi(1)   // cast rank '0'
 
    just use the SWIG_AddCast()/SWIG_CheckState()
 */
 
-#define SWIG_OK                    (0) 
+#define SWIG_OK                    (0)
 #define SWIG_ERROR                 (-1)
 #define SWIG_IsOK(r)               (r >= 0)
-#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)  
+#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)
 
 /* The CastRankLimit says how many bits are used for the cast rank */
 #define SWIG_CASTRANKLIMIT         (1 << 8)
@@ -288,14 +294,14 @@
 #  endif
 #  define SWIG_CASTRANKMASK          ((SWIG_CASTRANKLIMIT) -1)
 #  define SWIG_CastRank(r)           (r & SWIG_CASTRANKMASK)
-SWIGINTERNINLINE int SWIG_AddCast(int r) { 
+SWIGINTERNINLINE int SWIG_AddCast(int r) {
   return SWIG_IsOK(r) ? ((SWIG_CastRank(r) < SWIG_MAXCASTRANK) ? (r + 1) : SWIG_ERROR) : r;
 }
-SWIGINTERNINLINE int SWIG_CheckState(int r) { 
-  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0; 
+SWIGINTERNINLINE int SWIG_CheckState(int r) {
+  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0;
 }
 #else /* no cast-rank mode */
-#  define SWIG_AddCast
+#  define SWIG_AddCast(r) (r)
 #  define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0)
 #endif
 
@@ -339,7 +345,7 @@ typedef struct swig_module_info {
   void                    *clientdata;		/* Language specific module data */
 } swig_module_info;
 
-/* 
+/*
   Compare two type names skipping the space characters, therefore
   "char*" == "char *" and "Class<int>" == "Class<int >", etc.
 
@@ -359,18 +365,18 @@ SWIG_TypeNameComp(const char *f1, const char *l1,
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if not equal, 1 if equal
+  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
 */
 SWIGRUNTIME int
-SWIG_TypeEquiv(const char *nb, const char *tb) {
-  int equiv = 0;
+SWIG_TypeCmp(const char *nb, const char *tb) {
+  int equiv = 1;
   const char* te = tb + strlen(tb);
   const char* ne = nb;
-  while (!equiv && *ne) {
+  while (equiv != 0 && *ne) {
     for (nb = ne; *ne; ++ne) {
       if (*ne == '|') break;
     }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
+    equiv = SWIG_TypeNameComp(nb, ne, tb, te);
     if (*ne) ++ne;
   }
   return equiv;
@@ -378,24 +384,13 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
+  Return 0 if not equal, 1 if equal
 */
 SWIGRUNTIME int
-SWIG_TypeCompare(const char *nb, const char *tb) {
-  int equiv = 0;
-  const char* te = tb + strlen(tb);
-  const char* ne = nb;
-  while (!equiv && *ne) {
-    for (nb = ne; *ne; ++ne) {
-      if (*ne == '|') break;
-    }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
-    if (*ne) ++ne;
-  }
-  return equiv;
+SWIG_TypeEquiv(const char *nb, const char *tb) {
+  return SWIG_TypeCmp(nb, tb) == 0 ? 1 : 0;
 }
 
-
 /*
   Check the typename
 */
@@ -423,7 +418,7 @@ SWIG_TypeCheck(const char *c, swig_type_info *ty) {
   return 0;
 }
 
-/* 
+/*
   Identical to SWIG_TypeCheck, except strcmp is replaced with a pointer comparison
 */
 SWIGRUNTIME swig_cast_info *
@@ -458,7 +453,7 @@ SWIG_TypeCast(swig_cast_info *ty, void *ptr, int *newmemory) {
   return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr, newmemory);
 }
 
-/* 
+/*
    Dynamic pointer casting. Down an inheritance hierarchy
 */
 SWIGRUNTIME swig_type_info *
@@ -502,7 +497,7 @@ SWIG_TypePrettyName(const swig_type_info *type) {
     return type->name;
 }
 
-/* 
+/*
    Set the clientdata field for a type
 */
 SWIGRUNTIME void
@@ -510,14 +505,14 @@ SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
   swig_cast_info *cast = ti->cast;
   /* if (ti->clientdata == clientdata) return; */
   ti->clientdata = clientdata;
-  
+
   while (cast) {
     if (!cast->converter) {
       swig_type_info *tc = cast->type;
       if (!tc->clientdata) {
 	SWIG_TypeClientData(tc, clientdata);
       }
-    }    
+    }
     cast = cast->next;
   }
 }
@@ -526,18 +521,18 @@ SWIG_TypeNewClientData(swig_type_info *ti, void *clientdata) {
   SWIG_TypeClientData(ti, clientdata);
   ti->owndata = 1;
 }
-  
+
 /*
   Search for a swig_type_info structure only by mangled name
   Search is a O(log #types)
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_MangledTypeQueryModule(swig_module_info *start, 
-                            swig_module_info *end, 
+SWIG_MangledTypeQueryModule(swig_module_info *start,
+                            swig_module_info *end,
 		            const char *name) {
   swig_module_info *iter = start;
   do {
@@ -546,11 +541,11 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
       register size_t r = iter->size - 1;
       do {
 	/* since l+r >= 0, we can (>> 1) instead (/ 2) */
-	register size_t i = (l + r) >> 1; 
+	register size_t i = (l + r) >> 1;
 	const char *iname = iter->types[i]->name;
 	if (iname) {
 	  register int compare = strcmp(name, iname);
-	  if (compare == 0) {	    
+	  if (compare == 0) {
 	    return iter->types[i];
 	  } else if (compare < 0) {
 	    if (i) {
@@ -575,14 +570,14 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
   Search for a swig_type_info structure for either a mangled name or a human readable name.
   It first searches the mangled names of the types, which is a O(log #types)
   If a type is not found it then searches the human readable names, which is O(#types).
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_TypeQueryModule(swig_module_info *start, 
-                     swig_module_info *end, 
+SWIG_TypeQueryModule(swig_module_info *start,
+                     swig_module_info *end,
 		     const char *name) {
   /* STEP 1: Search the name field using binary search */
   swig_type_info *ret = SWIG_MangledTypeQueryModule(start, end, name);
@@ -601,12 +596,12 @@ SWIG_TypeQueryModule(swig_module_info *start,
       iter = iter->next;
     } while (iter != end);
   }
-  
+
   /* neither found a match */
   return 0;
 }
 
-/* 
+/*
    Pack binary data into a string
 */
 SWIGRUNTIME char *
@@ -622,7 +617,7 @@ SWIG_PackData(char *c, void *ptr, size_t sz) {
   return c;
 }
 
-/* 
+/*
    Unpack binary data from a string
 */
 SWIGRUNTIME const char *
@@ -636,21 +631,21 @@ SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
       uu = ((d - '0') << 4);
     else if ((d >= 'a') && (d <= 'f'))
       uu = ((d - ('a'-10)) << 4);
-    else 
+    else
       return (char *) 0;
     d = *(c++);
     if ((d >= '0') && (d <= '9'))
       uu |= (d - '0');
     else if ((d >= 'a') && (d <= 'f'))
       uu |= (d - ('a'-10));
-    else 
+    else
       return (char *) 0;
     *u = uu;
   }
   return c;
 }
 
-/* 
+/*
    Pack 'void *' into a string buffer.
 */
 SWIGRUNTIME char *
@@ -710,18 +705,18 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 #endif
 
 /*  Errors in SWIG */
-#define  SWIG_UnknownError    	   -1 
-#define  SWIG_IOError        	   -2 
-#define  SWIG_RuntimeError   	   -3 
-#define  SWIG_IndexError     	   -4 
-#define  SWIG_TypeError      	   -5 
-#define  SWIG_DivisionByZero 	   -6 
-#define  SWIG_OverflowError  	   -7 
-#define  SWIG_SyntaxError    	   -8 
-#define  SWIG_ValueError     	   -9 
+#define  SWIG_UnknownError    	   -1
+#define  SWIG_IOError        	   -2
+#define  SWIG_RuntimeError   	   -3
+#define  SWIG_IndexError     	   -4
+#define  SWIG_TypeError      	   -5
+#define  SWIG_DivisionByZero 	   -6
+#define  SWIG_OverflowError  	   -7
+#define  SWIG_SyntaxError    	   -8
+#define  SWIG_ValueError     	   -9
 #define  SWIG_SystemError    	   -10
 #define  SWIG_AttributeError 	   -11
-#define  SWIG_MemoryError    	   -12 
+#define  SWIG_MemoryError    	   -12
 #define  SWIG_NullReferenceError   -13
 
 
@@ -1582,34 +1577,6 @@ SwigPyObject_repr(SwigPyObject *v, PyObject *args)
 }
 
 SWIGRUNTIME int
-SwigPyObject_print(SwigPyObject *v, FILE *fp, int SWIGUNUSEDPARM(flags))
-{
-  char *str;
-#ifdef METH_NOARGS
-  PyObject *repr = SwigPyObject_repr(v);
-#else
-  PyObject *repr = SwigPyObject_repr(v, NULL);
-#endif
-  if (repr) {
-    str = SWIG_Python_str_AsChar(repr); 
-    fputs(str, fp);
-    SWIG_Python_str_DelForPy3(str);
-    Py_DECREF(repr);
-    return 0; 
-  } else {
-    return 1; 
-  }
-}
-
-SWIGRUNTIME PyObject *
-SwigPyObject_str(SwigPyObject *v)
-{
-  char result[SWIG_BUFFER_SIZE];
-  return SWIG_PackVoidPtr(result, v->ptr, v->ty->name, sizeof(result)) ?
-    SWIG_Python_str_FromChar(result) : 0;
-}
-
-SWIGRUNTIME int
 SwigPyObject_compare(SwigPyObject *v, SwigPyObject *w)
 {
   void *i = v->ptr;
@@ -1801,7 +1768,7 @@ SwigPyObject_own(PyObject *v, PyObject *args)
 static PyMethodDef
 swigobject_methods[] = {
   {(char *)"disown",  (PyCFunction)SwigPyObject_disown,  METH_NOARGS,  (char *)"releases ownership of the pointer"},
-  {(char *)"acquire", (PyCFunction)SwigPyObject_acquire, METH_NOARGS,  (char *)"aquires ownership of the pointer"},
+  {(char *)"acquire", (PyCFunction)SwigPyObject_acquire, METH_NOARGS,  (char *)"acquires ownership of the pointer"},
   {(char *)"own",     (PyCFunction)SwigPyObject_own,     METH_VARARGS, (char *)"returns/sets ownership of the pointer"},
   {(char *)"append",  (PyCFunction)SwigPyObject_append,  METH_O,       (char *)"appends another 'this' object"},
   {(char *)"next",    (PyCFunction)SwigPyObject_next,    METH_NOARGS,  (char *)"returns the next 'this' object"},
@@ -1894,7 +1861,7 @@ SwigPyObject_TypeOnce(void) {
       sizeof(SwigPyObject),                 /* tp_basicsize */
       0,                                    /* tp_itemsize */
       (destructor)SwigPyObject_dealloc,     /* tp_dealloc */
-      (printfunc)SwigPyObject_print,        /* tp_print */
+      0,				    /* tp_print */
 #if PY_VERSION_HEX < 0x02020000
       (getattrfunc)SwigPyObject_getattr,    /* tp_getattr */
 #else
@@ -1912,7 +1879,7 @@ SwigPyObject_TypeOnce(void) {
       0,                                    /* tp_as_mapping */
       (hashfunc)0,                          /* tp_hash */
       (ternaryfunc)0,                       /* tp_call */
-      (reprfunc)SwigPyObject_str,           /* tp_str */
+      0,				    /* tp_str */
       PyObject_GenericGetAttr,              /* tp_getattro */
       0,                                    /* tp_setattro */
       0,                                    /* tp_as_buffer */
@@ -2289,10 +2256,11 @@ SWIGRUNTIME int
 SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int flags, int *own) {
   int res;
   SwigPyObject *sobj;
+  int implicit_conv = (flags & SWIG_POINTER_IMPLICIT_CONV) != 0;
 
   if (!obj)
     return SWIG_ERROR;
-  if (obj == Py_None) {
+  if (obj == Py_None && !implicit_conv) {
     if (ptr)
       *ptr = 0;
     return SWIG_OK;
@@ -2341,7 +2309,7 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
     }
     res = SWIG_OK;
   } else {
-    if (flags & SWIG_POINTER_IMPLICIT_CONV) {
+    if (implicit_conv) {
       SwigPyClientData *data = ty ? (SwigPyClientData *) ty->clientdata : 0;
       if (data && !data->implicitconv) {
         PyObject *klass = data->klass;
@@ -2376,6 +2344,13 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
         }
       }
     }
+    if (!SWIG_IsOK(res) && obj == Py_None) {
+      if (ptr)
+        *ptr = 0;
+      if (PyErr_Occurred())
+        PyErr_Clear();
+      res = SWIG_OK;
+    }
   }
   return res;
 }
@@ -2875,7 +2850,7 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) {
   PyObject *descr;
   PyObject *encoded_name;
   descrsetfunc f;
-  int res;
+  int res = -1;
 
 # ifdef Py_USING_UNICODE
   if (PyString_Check(name)) {
@@ -2898,7 +2873,6 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) {
       goto done;
   }
 
-  res = -1;
   descr = _PyType_Lookup(tp, name);
   f = NULL;
   if (descr != NULL)
@@ -3047,85 +3021,87 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) {
 #define SWIGTYPE_p_svn_config_t swig_types[104]
 #define SWIGTYPE_p_svn_delta_editor_t swig_types[105]
 #define SWIGTYPE_p_svn_depth_t swig_types[106]
-#define SWIGTYPE_p_svn_dirent_t swig_types[107]
-#define SWIGTYPE_p_svn_errno_t swig_types[108]
-#define SWIGTYPE_p_svn_error_t swig_types[109]
-#define SWIGTYPE_p_svn_io_dirent2_t swig_types[110]
-#define SWIGTYPE_p_svn_io_dirent_t swig_types[111]
-#define SWIGTYPE_p_svn_io_file_del_t swig_types[112]
-#define SWIGTYPE_p_svn_location_segment_t swig_types[113]
-#define SWIGTYPE_p_svn_lock_t swig_types[114]
-#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[115]
-#define SWIGTYPE_p_svn_log_changed_path_t swig_types[116]
-#define SWIGTYPE_p_svn_log_entry_t swig_types[117]
-#define SWIGTYPE_p_svn_merge_range_t swig_types[118]
-#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[119]
-#define SWIGTYPE_p_svn_node_kind_t swig_types[120]
-#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[121]
-#define SWIGTYPE_p_svn_opt_revision_t swig_types[122]
-#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[123]
-#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[124]
-#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[125]
-#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[126]
-#define SWIGTYPE_p_svn_prop_kind swig_types[127]
-#define SWIGTYPE_p_svn_ra_callbacks2_t swig_types[128]
-#define SWIGTYPE_p_svn_ra_callbacks_t swig_types[129]
-#define SWIGTYPE_p_svn_ra_plugin_t swig_types[130]
-#define SWIGTYPE_p_svn_ra_reporter2_t swig_types[131]
-#define SWIGTYPE_p_svn_ra_reporter3_t swig_types[132]
-#define SWIGTYPE_p_svn_ra_reporter_t swig_types[133]
-#define SWIGTYPE_p_svn_ra_session_t swig_types[134]
-#define SWIGTYPE_p_svn_stream_mark_t swig_types[135]
-#define SWIGTYPE_p_svn_stream_t swig_types[136]
-#define SWIGTYPE_p_svn_string_t swig_types[137]
-#define SWIGTYPE_p_svn_stringbuf_t swig_types[138]
-#define SWIGTYPE_p_svn_tristate_t swig_types[139]
-#define SWIGTYPE_p_svn_txdelta_op_t swig_types[140]
-#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[141]
-#define SWIGTYPE_p_svn_txdelta_window_t swig_types[142]
-#define SWIGTYPE_p_svn_version_checklist_t swig_types[143]
-#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[144]
-#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[145]
-#define SWIGTYPE_p_svn_version_extended_t swig_types[146]
-#define SWIGTYPE_p_svn_version_t swig_types[147]
-#define SWIGTYPE_p_svn_wc_adm_access_t swig_types[148]
-#define SWIGTYPE_p_svn_wc_committed_queue_t swig_types[149]
-#define SWIGTYPE_p_svn_wc_conflict_action_t swig_types[150]
-#define SWIGTYPE_p_svn_wc_conflict_choice_t swig_types[151]
-#define SWIGTYPE_p_svn_wc_conflict_description2_t swig_types[152]
-#define SWIGTYPE_p_svn_wc_conflict_description_t swig_types[153]
-#define SWIGTYPE_p_svn_wc_conflict_kind_t swig_types[154]
-#define SWIGTYPE_p_svn_wc_conflict_reason_t swig_types[155]
-#define SWIGTYPE_p_svn_wc_conflict_result_t swig_types[156]
-#define SWIGTYPE_p_svn_wc_conflict_version_t swig_types[157]
-#define SWIGTYPE_p_svn_wc_context_t swig_types[158]
-#define SWIGTYPE_p_svn_wc_diff_callbacks2_t swig_types[159]
-#define SWIGTYPE_p_svn_wc_diff_callbacks3_t swig_types[160]
-#define SWIGTYPE_p_svn_wc_diff_callbacks4_t swig_types[161]
-#define SWIGTYPE_p_svn_wc_diff_callbacks_t swig_types[162]
-#define SWIGTYPE_p_svn_wc_entry_callbacks2_t swig_types[163]
-#define SWIGTYPE_p_svn_wc_entry_callbacks_t swig_types[164]
-#define SWIGTYPE_p_svn_wc_entry_t swig_types[165]
-#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[166]
-#define SWIGTYPE_p_svn_wc_external_item_t swig_types[167]
-#define SWIGTYPE_p_svn_wc_info_t swig_types[168]
-#define SWIGTYPE_p_svn_wc_merge_outcome_t swig_types[169]
-#define SWIGTYPE_p_svn_wc_notify_action_t swig_types[170]
-#define SWIGTYPE_p_svn_wc_notify_lock_state_t swig_types[171]
-#define SWIGTYPE_p_svn_wc_notify_state_t swig_types[172]
-#define SWIGTYPE_p_svn_wc_notify_t swig_types[173]
-#define SWIGTYPE_p_svn_wc_operation_t swig_types[174]
-#define SWIGTYPE_p_svn_wc_revision_status_t swig_types[175]
-#define SWIGTYPE_p_svn_wc_schedule_t swig_types[176]
-#define SWIGTYPE_p_svn_wc_status2_t swig_types[177]
-#define SWIGTYPE_p_svn_wc_status3_t swig_types[178]
-#define SWIGTYPE_p_svn_wc_status_t swig_types[179]
-#define SWIGTYPE_p_svn_wc_traversal_info_t swig_types[180]
-#define SWIGTYPE_p_unsigned_char swig_types[181]
-#define SWIGTYPE_p_unsigned_long swig_types[182]
-#define SWIGTYPE_p_void swig_types[183]
-static swig_type_info *swig_types[185];
-static swig_module_info swig_module = {swig_types, 184, 0, 0, 0, 0};
+#define SWIGTYPE_p_svn_diff_hunk_t swig_types[107]
+#define SWIGTYPE_p_svn_dirent_t swig_types[108]
+#define SWIGTYPE_p_svn_errno_t swig_types[109]
+#define SWIGTYPE_p_svn_error_t swig_types[110]
+#define SWIGTYPE_p_svn_fs_lock_target_t swig_types[111]
+#define SWIGTYPE_p_svn_io_dirent2_t swig_types[112]
+#define SWIGTYPE_p_svn_io_dirent_t swig_types[113]
+#define SWIGTYPE_p_svn_io_file_del_t swig_types[114]
+#define SWIGTYPE_p_svn_location_segment_t swig_types[115]
+#define SWIGTYPE_p_svn_lock_t swig_types[116]
+#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[117]
+#define SWIGTYPE_p_svn_log_changed_path_t swig_types[118]
+#define SWIGTYPE_p_svn_log_entry_t swig_types[119]
+#define SWIGTYPE_p_svn_merge_range_t swig_types[120]
+#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[121]
+#define SWIGTYPE_p_svn_node_kind_t swig_types[122]
+#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[123]
+#define SWIGTYPE_p_svn_opt_revision_t swig_types[124]
+#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[125]
+#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[126]
+#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[127]
+#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[128]
+#define SWIGTYPE_p_svn_prop_kind swig_types[129]
+#define SWIGTYPE_p_svn_ra_callbacks2_t swig_types[130]
+#define SWIGTYPE_p_svn_ra_callbacks_t swig_types[131]
+#define SWIGTYPE_p_svn_ra_plugin_t swig_types[132]
+#define SWIGTYPE_p_svn_ra_reporter2_t swig_types[133]
+#define SWIGTYPE_p_svn_ra_reporter3_t swig_types[134]
+#define SWIGTYPE_p_svn_ra_reporter_t swig_types[135]
+#define SWIGTYPE_p_svn_ra_session_t swig_types[136]
+#define SWIGTYPE_p_svn_stream_mark_t swig_types[137]
+#define SWIGTYPE_p_svn_stream_t swig_types[138]
+#define SWIGTYPE_p_svn_string_t swig_types[139]
+#define SWIGTYPE_p_svn_stringbuf_t swig_types[140]
+#define SWIGTYPE_p_svn_tristate_t swig_types[141]
+#define SWIGTYPE_p_svn_txdelta_op_t swig_types[142]
+#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[143]
+#define SWIGTYPE_p_svn_txdelta_window_t swig_types[144]
+#define SWIGTYPE_p_svn_version_checklist_t swig_types[145]
+#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[146]
+#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[147]
+#define SWIGTYPE_p_svn_version_extended_t swig_types[148]
+#define SWIGTYPE_p_svn_version_t swig_types[149]
+#define SWIGTYPE_p_svn_wc_adm_access_t swig_types[150]
+#define SWIGTYPE_p_svn_wc_committed_queue_t swig_types[151]
+#define SWIGTYPE_p_svn_wc_conflict_action_t swig_types[152]
+#define SWIGTYPE_p_svn_wc_conflict_choice_t swig_types[153]
+#define SWIGTYPE_p_svn_wc_conflict_description2_t swig_types[154]
+#define SWIGTYPE_p_svn_wc_conflict_description_t swig_types[155]
+#define SWIGTYPE_p_svn_wc_conflict_kind_t swig_types[156]
+#define SWIGTYPE_p_svn_wc_conflict_reason_t swig_types[157]
+#define SWIGTYPE_p_svn_wc_conflict_result_t swig_types[158]
+#define SWIGTYPE_p_svn_wc_conflict_version_t swig_types[159]
+#define SWIGTYPE_p_svn_wc_context_t swig_types[160]
+#define SWIGTYPE_p_svn_wc_diff_callbacks2_t swig_types[161]
+#define SWIGTYPE_p_svn_wc_diff_callbacks3_t swig_types[162]
+#define SWIGTYPE_p_svn_wc_diff_callbacks4_t swig_types[163]
+#define SWIGTYPE_p_svn_wc_diff_callbacks_t swig_types[164]
+#define SWIGTYPE_p_svn_wc_entry_callbacks2_t swig_types[165]
+#define SWIGTYPE_p_svn_wc_entry_callbacks_t swig_types[166]
+#define SWIGTYPE_p_svn_wc_entry_t swig_types[167]
+#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[168]
+#define SWIGTYPE_p_svn_wc_external_item_t swig_types[169]
+#define SWIGTYPE_p_svn_wc_info_t swig_types[170]
+#define SWIGTYPE_p_svn_wc_merge_outcome_t swig_types[171]
+#define SWIGTYPE_p_svn_wc_notify_action_t swig_types[172]
+#define SWIGTYPE_p_svn_wc_notify_lock_state_t swig_types[173]
+#define SWIGTYPE_p_svn_wc_notify_state_t swig_types[174]
+#define SWIGTYPE_p_svn_wc_notify_t swig_types[175]
+#define SWIGTYPE_p_svn_wc_operation_t swig_types[176]
+#define SWIGTYPE_p_svn_wc_revision_status_t swig_types[177]
+#define SWIGTYPE_p_svn_wc_schedule_t swig_types[178]
+#define SWIGTYPE_p_svn_wc_status2_t swig_types[179]
+#define SWIGTYPE_p_svn_wc_status3_t swig_types[180]
+#define SWIGTYPE_p_svn_wc_status_t swig_types[181]
+#define SWIGTYPE_p_svn_wc_traversal_info_t swig_types[182]
+#define SWIGTYPE_p_unsigned_char swig_types[183]
+#define SWIGTYPE_p_unsigned_long swig_types[184]
+#define SWIGTYPE_p_void swig_types[185]
+static swig_type_info *swig_types[187];
+static swig_module_info swig_module = {swig_types, 186, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
@@ -3149,7 +3125,7 @@ static swig_module_info swig_module = {swig_types, 184, 0, 0, 0, 0};
 #endif
 #define SWIG_name    "_wc"
 
-#define SWIGVERSION 0x020009 
+#define SWIGVERSION 0x020012 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -3502,6 +3478,18 @@ SWIG_AsVal_unsigned_SS_long (PyObject *obj, unsigned long *val)
       return SWIG_OK;
     } else {
       PyErr_Clear();
+#if PY_VERSION_HEX >= 0x03000000
+      {
+        long v = PyLong_AsLong(obj);
+        if (!PyErr_Occurred()) {
+          if (v < 0) {
+            return SWIG_OverflowError;
+          }
+        } else {
+          PyErr_Clear();
+        }
+      }
+#endif
     }
   }
 #ifdef SWIG_PYTHON_CAST_MODE
@@ -3825,7 +3813,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_version(PyObject *SWIGUNUSEDPARM(self), PyObje
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_version_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_version_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -3858,7 +3846,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_context_create(PyObject *SWIGUNUSEDPARM(self),
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"O|OO:svn_wc_context_create",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg2 = (svn_config_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
+    arg2 = (svn_config_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_config_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -3933,7 +3921,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_context_destroy(PyObject *SWIGUNUSEDPARM(self)
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_context_destroy",&obj0)) SWIG_fail;
   {
-    arg1 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
+    arg1 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -3990,7 +3978,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_open3(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OsOOO|O:svn_wc_adm_open3",&obj0,&arg3,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4008,8 +3996,8 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_open3(PyObject *SWIGUNUSEDPARM(self), PyOb
     }
   }
   {
-    arg6 = svn_swig_py_cancel_func;
-    arg7 = obj4; /* our function is the baton. */
+    arg6 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg7 = obj4;
   }
   if (obj5) {
     /* Verify that the user supplied a valid pool */
@@ -4039,7 +4027,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_open3(PyObject *SWIGUNUSEDPARM(self), PyOb
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_wc_adm_access_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_wc_adm_access_t,
         _global_py_pool, args))
     
     ;
@@ -4080,7 +4068,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_open2(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_wc_adm_open2",&obj0,&arg3,&obj2,&obj3,&obj4)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4125,7 +4113,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_open2(PyObject *SWIGUNUSEDPARM(self), PyOb
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_wc_adm_access_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_wc_adm_access_t,
         _global_py_pool, args))
     
     ;
@@ -4166,7 +4154,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_open(PyObject *SWIGUNUSEDPARM(self), PyObj
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_wc_adm_open",&obj0,&arg3,&obj2,&obj3,&obj4)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4211,7 +4199,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_open(PyObject *SWIGUNUSEDPARM(self), PyObj
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_wc_adm_access_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_wc_adm_access_t,
         _global_py_pool, args))
     
     ;
@@ -4255,7 +4243,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_probe_open3(PyObject *SWIGUNUSEDPARM(self)
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OsOOO|O:svn_wc_adm_probe_open3",&obj0,&arg3,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4273,8 +4261,8 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_probe_open3(PyObject *SWIGUNUSEDPARM(self)
     }
   }
   {
-    arg6 = svn_swig_py_cancel_func;
-    arg7 = obj4; /* our function is the baton. */
+    arg6 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg7 = obj4;
   }
   if (obj5) {
     /* Verify that the user supplied a valid pool */
@@ -4304,7 +4292,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_probe_open3(PyObject *SWIGUNUSEDPARM(self)
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_wc_adm_access_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_wc_adm_access_t,
         _global_py_pool, args))
     
     ;
@@ -4345,7 +4333,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_probe_open2(PyObject *SWIGUNUSEDPARM(self)
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_wc_adm_probe_open2",&obj0,&arg3,&obj2,&obj3,&obj4)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4390,7 +4378,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_probe_open2(PyObject *SWIGUNUSEDPARM(self)
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_wc_adm_access_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_wc_adm_access_t,
         _global_py_pool, args))
     
     ;
@@ -4431,7 +4419,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_probe_open(PyObject *SWIGUNUSEDPARM(self),
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_wc_adm_probe_open",&obj0,&arg3,&obj2,&obj3,&obj4)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4476,7 +4464,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_probe_open(PyObject *SWIGUNUSEDPARM(self),
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_wc_adm_access_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_wc_adm_access_t,
         _global_py_pool, args))
     
     ;
@@ -4536,8 +4524,8 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_open_anchor(PyObject *SWIGUNUSEDPARM(self)
     }
   }
   {
-    arg7 = svn_swig_py_cancel_func;
-    arg8 = obj3; /* our function is the baton. */
+    arg7 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg8 = obj3;
   }
   if (obj4) {
     /* Verify that the user supplied a valid pool */
@@ -4567,13 +4555,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_open_anchor(PyObject *SWIGUNUSEDPARM(self)
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_wc_adm_access_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_wc_adm_access_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_svn_wc_adm_access_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_svn_wc_adm_access_t,
         _global_py_pool, args))
     
     ;
@@ -4623,7 +4611,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_retrieve(PyObject *SWIGUNUSEDPARM(self), P
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_wc_adm_retrieve",&obj0,&arg3,&obj2)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4656,7 +4644,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_retrieve(PyObject *SWIGUNUSEDPARM(self), P
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_wc_adm_access_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_wc_adm_access_t,
         _global_py_pool, args))
     
     ;
@@ -4693,7 +4681,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_probe_retrieve(PyObject *SWIGUNUSEDPARM(se
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_wc_adm_probe_retrieve",&obj0,&arg3,&obj2)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4726,7 +4714,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_probe_retrieve(PyObject *SWIGUNUSEDPARM(se
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_wc_adm_access_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_wc_adm_access_t,
         _global_py_pool, args))
     
     ;
@@ -4770,7 +4758,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_probe_try3(PyObject *SWIGUNUSEDPARM(self),
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OsOOO|O:svn_wc_adm_probe_try3",&obj0,&arg3,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4788,8 +4776,8 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_probe_try3(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
-    arg6 = svn_swig_py_cancel_func;
-    arg7 = obj4; /* our function is the baton. */
+    arg6 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg7 = obj4;
   }
   if (obj5) {
     /* Verify that the user supplied a valid pool */
@@ -4819,7 +4807,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_probe_try3(PyObject *SWIGUNUSEDPARM(self),
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_wc_adm_access_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_wc_adm_access_t,
         _global_py_pool, args))
     
     ;
@@ -4860,7 +4848,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_probe_try2(PyObject *SWIGUNUSEDPARM(self),
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_wc_adm_probe_try2",&obj0,&arg3,&obj2,&obj3,&obj4)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4905,7 +4893,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_probe_try2(PyObject *SWIGUNUSEDPARM(self),
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_wc_adm_access_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_wc_adm_access_t,
         _global_py_pool, args))
     
     ;
@@ -4946,7 +4934,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_probe_try(PyObject *SWIGUNUSEDPARM(self),
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_wc_adm_probe_try",&obj0,&arg3,&obj2,&obj3,&obj4)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -4991,7 +4979,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_probe_try(PyObject *SWIGUNUSEDPARM(self),
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_wc_adm_access_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_wc_adm_access_t,
         _global_py_pool, args))
     
     ;
@@ -5024,7 +5012,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_close2(PyObject *SWIGUNUSEDPARM(self), PyO
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_wc_adm_close2",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
+    arg1 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5076,7 +5064,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_close(PyObject *SWIGUNUSEDPARM(self), PyOb
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_adm_close",&obj0)) SWIG_fail;
   {
-    arg1 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
+    arg1 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5114,7 +5102,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_access_path(PyObject *SWIGUNUSEDPARM(self)
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_adm_access_path",&obj0)) SWIG_fail;
   {
-    arg1 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
+    arg1 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5142,7 +5130,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_access_pool(PyObject *SWIGUNUSEDPARM(self)
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_adm_access_pool",&obj0)) SWIG_fail;
   {
-    arg1 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
+    arg1 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5155,7 +5143,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_access_pool(PyObject *SWIGUNUSEDPARM(self)
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_apr_pool_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_apr_pool_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -5171,7 +5159,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_adm_locked(PyObject *SWIGUNUSEDPARM(self), PyO
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_adm_locked",&obj0)) SWIG_fail;
   {
-    arg1 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
+    arg1 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5216,7 +5204,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_locked2(PyObject *SWIGUNUSEDPARM(self), PyObje
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_wc_locked2",&obj0,&arg4,&obj2)) SWIG_fail;
   {
-    arg3 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
+    arg3 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5502,7 +5490,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_init_traversal_info(PyObject *SWIGUNUSEDPARM(s
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_wc_traversal_info_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_wc_traversal_info_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -5529,7 +5517,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_edited_externals(PyObject *SWIGUNUSEDPARM(self
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_edited_externals",&obj0)) SWIG_fail;
   {
-    arg3 = (svn_wc_traversal_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_traversal_info_t, svn_argnum_obj0);
+    arg3 = (svn_wc_traversal_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_traversal_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5565,7 +5553,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_traversed_depths(PyObject *SWIGUNUSEDPARM(self
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_traversed_depths",&obj0)) SWIG_fail;
   {
-    arg2 = (svn_wc_traversal_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_traversal_info_t, svn_argnum_obj0);
+    arg2 = (svn_wc_traversal_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_traversal_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5596,7 +5584,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_external_item2_t_target_dir_set(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_external_item2_t_target_dir_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_external_item2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_external_item2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_external_item2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_external_item2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5624,7 +5612,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_external_item2_t_target_dir_get(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_external_item2_t_target_dir_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_external_item2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_external_item2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_external_item2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_external_item2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5645,7 +5633,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_external_item2_t_url_set(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_external_item2_t_url_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_external_item2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_external_item2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_external_item2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_external_item2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5673,7 +5661,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_external_item2_t_url_get(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_external_item2_t_url_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_external_item2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_external_item2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_external_item2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_external_item2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5695,13 +5683,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_external_item2_t_revision_set(PyObject *SWIGUN
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_external_item2_t_revision_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_external_item2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_external_item2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_external_item2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_external_item2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg2 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5722,13 +5710,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_external_item2_t_revision_get(PyObject *SWIGUN
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_external_item2_t_revision_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_external_item2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_external_item2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_external_item2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_external_item2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (svn_opt_revision_t *)& ((arg1)->revision);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_opt_revision_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_opt_revision_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -5745,13 +5733,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_external_item2_t_peg_revision_set(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_external_item2_t_peg_revision_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_external_item2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_external_item2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_external_item2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_external_item2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg2 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5772,13 +5760,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_external_item2_t_peg_revision_get(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_external_item2_t_peg_revision_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_external_item2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_external_item2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_external_item2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_external_item2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (svn_opt_revision_t *)& ((arg1)->peg_revision);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_opt_revision_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_opt_revision_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -5799,7 +5787,7 @@ SWIGINTERN PyObject *_wrap_new_svn_wc_external_item2_t(PyObject *SWIGUNUSEDPARM(
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_wc_external_item2_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_wc_external_item2_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -5814,7 +5802,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_wc_external_item2_t(PyObject *SWIGUNUSEDPA
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_wc_external_item2_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_external_item2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_external_item2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_external_item2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_external_item2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -5885,7 +5873,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_external_item2_create(PyObject *SWIGUNUSEDPARM
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_wc_external_item2_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_wc_external_item2_t,
         _global_py_pool, args))
     
     ;
@@ -5946,7 +5934,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_external_item_create(PyObject *SWIGUNUSEDPARM(
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_wc_external_item2_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_wc_external_item2_t,
         _global_py_pool, args))
     
     ;
@@ -5979,7 +5967,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_external_item2_dup(PyObject *SWIGUNUSEDPARM(se
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_wc_external_item2_dup",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_wc_external_item2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_external_item2_t, svn_argnum_obj0);
+    arg1 = (svn_wc_external_item2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_external_item2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6000,7 +5988,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_external_item2_dup(PyObject *SWIGUNUSEDPARM(se
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_wc_external_item2_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_wc_external_item2_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -6022,7 +6010,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_external_item_t_target_dir_set(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_external_item_t_target_dir_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_external_item_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_external_item_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_external_item_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_external_item_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6050,7 +6038,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_external_item_t_target_dir_get(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_external_item_t_target_dir_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_external_item_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_external_item_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_external_item_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_external_item_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6071,7 +6059,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_external_item_t_url_set(PyObject *SWIGUNUSEDPA
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_external_item_t_url_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_external_item_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_external_item_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_external_item_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_external_item_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6099,7 +6087,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_external_item_t_url_get(PyObject *SWIGUNUSEDPA
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_external_item_t_url_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_external_item_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_external_item_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_external_item_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_external_item_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6121,13 +6109,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_external_item_t_revision_set(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_external_item_t_revision_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_external_item_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_external_item_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_external_item_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_external_item_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg2 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6148,13 +6136,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_external_item_t_revision_get(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_external_item_t_revision_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_external_item_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_external_item_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_external_item_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_external_item_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (svn_opt_revision_t *)& ((arg1)->revision);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_opt_revision_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_opt_revision_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -6175,7 +6163,7 @@ SWIGINTERN PyObject *_wrap_new_svn_wc_external_item_t(PyObject *SWIGUNUSEDPARM(s
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_wc_external_item_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_wc_external_item_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -6190,7 +6178,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_wc_external_item_t(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_wc_external_item_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_external_item_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_external_item_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_external_item_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_external_item_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6233,7 +6221,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_external_item_dup(PyObject *SWIGUNUSEDPARM(sel
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_wc_external_item_dup",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_wc_external_item_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_external_item_t, svn_argnum_obj0);
+    arg1 = (svn_wc_external_item_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_external_item_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6254,7 +6242,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_external_item_dup(PyObject *SWIGUNUSEDPARM(sel
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_wc_external_item_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_wc_external_item_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -6484,7 +6472,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_path_set(PyObject *SWIGUNUSEDPARM(sel
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_notify_t_path_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6512,7 +6500,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_path_get(PyObject *SWIGUNUSEDPARM(sel
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_notify_t_path_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6534,7 +6522,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_action_set(PyObject *SWIGUNUSEDPARM(s
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_notify_t_action_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6561,7 +6549,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_action_get(PyObject *SWIGUNUSEDPARM(s
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_notify_t_action_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6583,7 +6571,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_kind_set(PyObject *SWIGUNUSEDPARM(sel
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_notify_t_kind_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6610,7 +6598,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_kind_get(PyObject *SWIGUNUSEDPARM(sel
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_notify_t_kind_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6631,7 +6619,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_mime_type_set(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_notify_t_mime_type_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6659,7 +6647,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_mime_type_get(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_notify_t_mime_type_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6681,13 +6669,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_lock_set(PyObject *SWIGUNUSEDPARM(sel
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_notify_t_lock_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_lock_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_lock_t, svn_argnum_obj1);
+    arg2 = (svn_lock_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_lock_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6708,13 +6696,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_lock_get(PyObject *SWIGUNUSEDPARM(sel
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_notify_t_lock_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (svn_lock_t *) ((arg1)->lock);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_lock_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_lock_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -6731,13 +6719,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_err_set(PyObject *SWIGUNUSEDPARM(self
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_notify_t_err_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_error_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_error_t, svn_argnum_obj1);
+    arg2 = (svn_error_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_error_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6758,7 +6746,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_err_get(PyObject *SWIGUNUSEDPARM(self
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_notify_t_err_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6790,7 +6778,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_content_state_set(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_notify_t_content_state_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6817,7 +6805,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_content_state_get(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_notify_t_content_state_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6839,7 +6827,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_prop_state_set(PyObject *SWIGUNUSEDPA
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_notify_t_prop_state_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6866,7 +6854,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_prop_state_get(PyObject *SWIGUNUSEDPA
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_notify_t_prop_state_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6888,7 +6876,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_lock_state_set(PyObject *SWIGUNUSEDPA
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_notify_t_lock_state_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6915,7 +6903,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_lock_state_get(PyObject *SWIGUNUSEDPA
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_notify_t_lock_state_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6937,7 +6925,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_revision_set(PyObject *SWIGUNUSEDPARM
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_notify_t_revision_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6964,7 +6952,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_revision_get(PyObject *SWIGUNUSEDPARM
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_notify_t_revision_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -6985,7 +6973,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_changelist_name_set(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_notify_t_changelist_name_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7013,7 +7001,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_changelist_name_get(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_notify_t_changelist_name_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7035,13 +7023,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_merge_range_set(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_notify_t_merge_range_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_merge_range_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_merge_range_t, svn_argnum_obj1);
+    arg2 = (svn_merge_range_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_merge_range_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7062,13 +7050,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_merge_range_get(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_notify_t_merge_range_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (svn_merge_range_t *) ((arg1)->merge_range);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_merge_range_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_merge_range_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -7084,7 +7072,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_url_set(PyObject *SWIGUNUSEDPARM(self
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_notify_t_url_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7112,7 +7100,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_url_get(PyObject *SWIGUNUSEDPARM(self
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_notify_t_url_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7133,7 +7121,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_path_prefix_set(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_notify_t_path_prefix_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7161,7 +7149,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_path_prefix_get(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_notify_t_path_prefix_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7182,7 +7170,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_prop_name_set(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_notify_t_prop_name_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7210,7 +7198,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_prop_name_get(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_notify_t_prop_name_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7232,13 +7220,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_rev_props_set(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_notify_t_rev_props_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (apr_hash_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_apr_hash_t, svn_argnum_obj1);
+    arg2 = (apr_hash_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_apr_hash_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7259,13 +7247,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_rev_props_get(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_notify_t_rev_props_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (apr_hash_t *) ((arg1)->rev_props);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_apr_hash_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_apr_hash_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -7282,7 +7270,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_old_revision_set(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_notify_t_old_revision_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7309,7 +7297,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_old_revision_get(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_notify_t_old_revision_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7331,7 +7319,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_hunk_original_start_set(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_notify_t_hunk_original_start_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7358,7 +7346,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_hunk_original_start_get(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_notify_t_hunk_original_start_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7380,7 +7368,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_hunk_original_length_set(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_notify_t_hunk_original_length_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7407,7 +7395,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_hunk_original_length_get(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_notify_t_hunk_original_length_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7429,7 +7417,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_hunk_modified_start_set(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_notify_t_hunk_modified_start_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7456,7 +7444,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_hunk_modified_start_get(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_notify_t_hunk_modified_start_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7478,7 +7466,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_hunk_modified_length_set(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_notify_t_hunk_modified_length_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7505,7 +7493,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_hunk_modified_length_get(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_notify_t_hunk_modified_length_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7527,7 +7515,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_hunk_matched_line_set(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_notify_t_hunk_matched_line_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7554,7 +7542,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_hunk_matched_line_get(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_notify_t_hunk_matched_line_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7576,7 +7564,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_hunk_fuzz_set(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_notify_t_hunk_fuzz_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7603,7 +7591,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_notify_t_hunk_fuzz_get(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_notify_t_hunk_fuzz_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7629,7 +7617,7 @@ SWIGINTERN PyObject *_wrap_new_svn_wc_notify_t(PyObject *SWIGUNUSEDPARM(self), P
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_wc_notify_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_wc_notify_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -7644,7 +7632,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_wc_notify_t(PyObject *SWIGUNUSEDPARM(self)
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_wc_notify_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7709,7 +7697,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_create_notify(PyObject *SWIGUNUSEDPARM(self),
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_wc_notify_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_wc_notify_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -7761,7 +7749,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_create_notify_url(PyObject *SWIGUNUSEDPARM(sel
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_wc_notify_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_wc_notify_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -7791,7 +7779,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_dup_notify(PyObject *SWIGUNUSEDPARM(self), PyO
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_wc_dup_notify",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_wc_notify_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
+    arg1 = (svn_wc_notify_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7812,7 +7800,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_dup_notify(PyObject *SWIGUNUSEDPARM(self), PyO
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_wc_notify_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_wc_notify_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -7834,7 +7822,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_version_t_repos_url_set(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_conflict_version_t_repos_url_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_conflict_version_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_version_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_conflict_version_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_conflict_version_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7862,7 +7850,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_version_t_repos_url_get(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_version_t_repos_url_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_conflict_version_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_version_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_conflict_version_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_conflict_version_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7884,7 +7872,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_version_t_peg_rev_set(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_conflict_version_t_peg_rev_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_conflict_version_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_version_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_conflict_version_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_conflict_version_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7911,7 +7899,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_version_t_peg_rev_get(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_version_t_peg_rev_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_conflict_version_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_version_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_conflict_version_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_conflict_version_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7932,7 +7920,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_version_t_path_in_repos_set(PyObject
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_conflict_version_t_path_in_repos_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_conflict_version_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_version_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_conflict_version_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_conflict_version_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7960,7 +7948,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_version_t_path_in_repos_get(PyObject
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_version_t_path_in_repos_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_conflict_version_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_version_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_conflict_version_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_conflict_version_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -7982,7 +7970,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_version_t_node_kind_set(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_conflict_version_t_node_kind_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_conflict_version_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_version_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_conflict_version_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_conflict_version_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8009,7 +7997,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_version_t_node_kind_get(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_version_t_node_kind_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_conflict_version_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_version_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_conflict_version_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_conflict_version_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8030,7 +8018,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_version_t_repos_uuid_set(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_conflict_version_t_repos_uuid_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_conflict_version_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_version_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_conflict_version_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_conflict_version_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8058,7 +8046,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_version_t_repos_uuid_get(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_version_t_repos_uuid_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_conflict_version_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_version_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_conflict_version_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_conflict_version_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8084,7 +8072,7 @@ SWIGINTERN PyObject *_wrap_new_svn_wc_conflict_version_t(PyObject *SWIGUNUSEDPAR
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_wc_conflict_version_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_wc_conflict_version_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -8099,7 +8087,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_wc_conflict_version_t(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_wc_conflict_version_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_conflict_version_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_version_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_conflict_version_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_conflict_version_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8174,7 +8162,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_version_create2(PyObject *SWIGUNUSEDP
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_wc_conflict_version_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_wc_conflict_version_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -8235,7 +8223,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_version_create(PyObject *SWIGUNUSEDPA
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_wc_conflict_version_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_wc_conflict_version_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -8265,7 +8253,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_version_dup(PyObject *SWIGUNUSEDPARM(
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_wc_conflict_version_dup",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_wc_conflict_version_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_version_t, svn_argnum_obj0);
+    arg1 = (svn_wc_conflict_version_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_conflict_version_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -8286,7 +8274,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_version_dup(PyObject *SWIGUNUSEDPARM(
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_wc_conflict_version_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_wc_conflict_version_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -8300,798 +8288,6 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_svn_wc_conflict_description2_t_local_abspath_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_conflict_description2_t_local_abspath_set",&obj0,&arg2)) SWIG_fail;
-  {
-    arg1 = (struct svn_wc_conflict_description2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description2_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  {
-    apr_size_t len = strlen(arg2) + 1;
-    char *copied;
-    if (arg1->local_abspath) free((char *)arg1->local_abspath);
-    copied = malloc(len);
-    memcpy(copied, arg2, len);
-    arg1->local_abspath = copied;
-  }
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_wc_conflict_description2_t_local_abspath_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  PyObject * obj0 = 0 ;
-  char *result = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_description2_t_local_abspath_get",&obj0)) SWIG_fail;
-  {
-    arg1 = (struct svn_wc_conflict_description2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description2_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  result = (char *) ((arg1)->local_abspath);
-  resultobj = SWIG_FromCharPtr((const char *)result);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_wc_conflict_description2_t_node_kind_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  svn_node_kind_t arg2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_conflict_description2_t_node_kind_set",&obj0,&obj1)) SWIG_fail;
-  {
-    arg1 = (struct svn_wc_conflict_description2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description2_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  {
-    arg2 = (svn_node_kind_t)SWIG_As_long (obj1);
-    if (SWIG_arg_fail(svn_argnum_obj1)) {
-      SWIG_fail;
-    }
-  }
-  if (arg1) (arg1)->node_kind = arg2;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_wc_conflict_description2_t_node_kind_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  PyObject * obj0 = 0 ;
-  svn_node_kind_t result;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_description2_t_node_kind_get",&obj0)) SWIG_fail;
-  {
-    arg1 = (struct svn_wc_conflict_description2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description2_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  result = (svn_node_kind_t) ((arg1)->node_kind);
-  resultobj = SWIG_From_long((long)(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_wc_conflict_description2_t_kind_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  svn_wc_conflict_kind_t arg2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_conflict_description2_t_kind_set",&obj0,&obj1)) SWIG_fail;
-  {
-    arg1 = (struct svn_wc_conflict_description2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description2_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  {
-    arg2 = (svn_wc_conflict_kind_t)SWIG_As_long (obj1);
-    if (SWIG_arg_fail(svn_argnum_obj1)) {
-      SWIG_fail;
-    }
-  }
-  if (arg1) (arg1)->kind = arg2;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_wc_conflict_description2_t_kind_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  PyObject * obj0 = 0 ;
-  svn_wc_conflict_kind_t result;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_description2_t_kind_get",&obj0)) SWIG_fail;
-  {
-    arg1 = (struct svn_wc_conflict_description2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description2_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  result = (svn_wc_conflict_kind_t) ((arg1)->kind);
-  resultobj = SWIG_From_long((long)(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_wc_conflict_description2_t_property_name_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_conflict_description2_t_property_name_set",&obj0,&arg2)) SWIG_fail;
-  {
-    arg1 = (struct svn_wc_conflict_description2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description2_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  {
-    apr_size_t len = strlen(arg2) + 1;
-    char *copied;
-    if (arg1->property_name) free((char *)arg1->property_name);
-    copied = malloc(len);
-    memcpy(copied, arg2, len);
-    arg1->property_name = copied;
-  }
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_wc_conflict_description2_t_property_name_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  PyObject * obj0 = 0 ;
-  char *result = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_description2_t_property_name_get",&obj0)) SWIG_fail;
-  {
-    arg1 = (struct svn_wc_conflict_description2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description2_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  result = (char *) ((arg1)->property_name);
-  resultobj = SWIG_FromCharPtr((const char *)result);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_wc_conflict_description2_t_is_binary_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  svn_boolean_t arg2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_conflict_description2_t_is_binary_set",&obj0,&obj1)) SWIG_fail;
-  {
-    arg1 = (struct svn_wc_conflict_description2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description2_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  {
-    arg2 = (svn_boolean_t)SWIG_As_long (obj1);
-    if (SWIG_arg_fail(svn_argnum_obj1)) {
-      SWIG_fail;
-    }
-  }
-  if (arg1) (arg1)->is_binary = arg2;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_wc_conflict_description2_t_is_binary_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  PyObject * obj0 = 0 ;
-  svn_boolean_t result;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_description2_t_is_binary_get",&obj0)) SWIG_fail;
-  {
-    arg1 = (struct svn_wc_conflict_description2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description2_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  result = (svn_boolean_t) ((arg1)->is_binary);
-  resultobj = SWIG_From_long((long)(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_wc_conflict_description2_t_mime_type_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_conflict_description2_t_mime_type_set",&obj0,&arg2)) SWIG_fail;
-  {
-    arg1 = (struct svn_wc_conflict_description2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description2_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  {
-    apr_size_t len = strlen(arg2) + 1;
-    char *copied;
-    if (arg1->mime_type) free((char *)arg1->mime_type);
-    copied = malloc(len);
-    memcpy(copied, arg2, len);
-    arg1->mime_type = copied;
-  }
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_wc_conflict_description2_t_mime_type_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  PyObject * obj0 = 0 ;
-  char *result = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_description2_t_mime_type_get",&obj0)) SWIG_fail;
-  {
-    arg1 = (struct svn_wc_conflict_description2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description2_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  result = (char *) ((arg1)->mime_type);
-  resultobj = SWIG_FromCharPtr((const char *)result);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_wc_conflict_description2_t_action_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  svn_wc_conflict_action_t arg2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_conflict_description2_t_action_set",&obj0,&obj1)) SWIG_fail;
-  {
-    arg1 = (struct svn_wc_conflict_description2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description2_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  {
-    arg2 = (svn_wc_conflict_action_t)SWIG_As_long (obj1);
-    if (SWIG_arg_fail(svn_argnum_obj1)) {
-      SWIG_fail;
-    }
-  }
-  if (arg1) (arg1)->action = arg2;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_wc_conflict_description2_t_action_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  PyObject * obj0 = 0 ;
-  svn_wc_conflict_action_t result;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_description2_t_action_get",&obj0)) SWIG_fail;
-  {
-    arg1 = (struct svn_wc_conflict_description2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description2_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  result = (svn_wc_conflict_action_t) ((arg1)->action);
-  resultobj = SWIG_From_long((long)(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_wc_conflict_description2_t_reason_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  svn_wc_conflict_reason_t arg2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_conflict_description2_t_reason_set",&obj0,&obj1)) SWIG_fail;
-  {
-    arg1 = (struct svn_wc_conflict_description2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description2_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  {
-    arg2 = (svn_wc_conflict_reason_t)SWIG_As_long (obj1);
-    if (SWIG_arg_fail(svn_argnum_obj1)) {
-      SWIG_fail;
-    }
-  }
-  if (arg1) (arg1)->reason = arg2;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_wc_conflict_description2_t_reason_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  PyObject * obj0 = 0 ;
-  svn_wc_conflict_reason_t result;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_description2_t_reason_get",&obj0)) SWIG_fail;
-  {
-    arg1 = (struct svn_wc_conflict_description2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description2_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  result = (svn_wc_conflict_reason_t) ((arg1)->reason);
-  resultobj = SWIG_From_long((long)(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_wc_conflict_description2_t_base_abspath_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_conflict_description2_t_base_abspath_set",&obj0,&arg2)) SWIG_fail;
-  {
-    arg1 = (struct svn_wc_conflict_description2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description2_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  {
-    apr_size_t len = strlen(arg2) + 1;
-    char *copied;
-    if (arg1->base_abspath) free((char *)arg1->base_abspath);
-    copied = malloc(len);
-    memcpy(copied, arg2, len);
-    arg1->base_abspath = copied;
-  }
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_wc_conflict_description2_t_base_abspath_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  PyObject * obj0 = 0 ;
-  char *result = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_description2_t_base_abspath_get",&obj0)) SWIG_fail;
-  {
-    arg1 = (struct svn_wc_conflict_description2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description2_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  result = (char *) ((arg1)->base_abspath);
-  resultobj = SWIG_FromCharPtr((const char *)result);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_wc_conflict_description2_t_their_abspath_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_conflict_description2_t_their_abspath_set",&obj0,&arg2)) SWIG_fail;
-  {
-    arg1 = (struct svn_wc_conflict_description2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description2_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  {
-    apr_size_t len = strlen(arg2) + 1;
-    char *copied;
-    if (arg1->their_abspath) free((char *)arg1->their_abspath);
-    copied = malloc(len);
-    memcpy(copied, arg2, len);
-    arg1->their_abspath = copied;
-  }
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_wc_conflict_description2_t_their_abspath_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  PyObject * obj0 = 0 ;
-  char *result = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_description2_t_their_abspath_get",&obj0)) SWIG_fail;
-  {
-    arg1 = (struct svn_wc_conflict_description2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description2_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  result = (char *) ((arg1)->their_abspath);
-  resultobj = SWIG_FromCharPtr((const char *)result);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_wc_conflict_description2_t_my_abspath_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_conflict_description2_t_my_abspath_set",&obj0,&arg2)) SWIG_fail;
-  {
-    arg1 = (struct svn_wc_conflict_description2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description2_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  {
-    apr_size_t len = strlen(arg2) + 1;
-    char *copied;
-    if (arg1->my_abspath) free((char *)arg1->my_abspath);
-    copied = malloc(len);
-    memcpy(copied, arg2, len);
-    arg1->my_abspath = copied;
-  }
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_wc_conflict_description2_t_my_abspath_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  PyObject * obj0 = 0 ;
-  char *result = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_description2_t_my_abspath_get",&obj0)) SWIG_fail;
-  {
-    arg1 = (struct svn_wc_conflict_description2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description2_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  result = (char *) ((arg1)->my_abspath);
-  resultobj = SWIG_FromCharPtr((const char *)result);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_wc_conflict_description2_t_merged_file_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_conflict_description2_t_merged_file_set",&obj0,&arg2)) SWIG_fail;
-  {
-    arg1 = (struct svn_wc_conflict_description2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description2_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  {
-    apr_size_t len = strlen(arg2) + 1;
-    char *copied;
-    if (arg1->merged_file) free((char *)arg1->merged_file);
-    copied = malloc(len);
-    memcpy(copied, arg2, len);
-    arg1->merged_file = copied;
-  }
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_wc_conflict_description2_t_merged_file_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  PyObject * obj0 = 0 ;
-  char *result = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_description2_t_merged_file_get",&obj0)) SWIG_fail;
-  {
-    arg1 = (struct svn_wc_conflict_description2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description2_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  result = (char *) ((arg1)->merged_file);
-  resultobj = SWIG_FromCharPtr((const char *)result);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_wc_conflict_description2_t_operation_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  svn_wc_operation_t arg2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_conflict_description2_t_operation_set",&obj0,&obj1)) SWIG_fail;
-  {
-    arg1 = (struct svn_wc_conflict_description2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description2_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  {
-    arg2 = (svn_wc_operation_t)SWIG_As_long (obj1);
-    if (SWIG_arg_fail(svn_argnum_obj1)) {
-      SWIG_fail;
-    }
-  }
-  if (arg1) (arg1)->operation = arg2;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_wc_conflict_description2_t_operation_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  PyObject * obj0 = 0 ;
-  svn_wc_operation_t result;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_description2_t_operation_get",&obj0)) SWIG_fail;
-  {
-    arg1 = (struct svn_wc_conflict_description2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description2_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  result = (svn_wc_operation_t) ((arg1)->operation);
-  resultobj = SWIG_From_long((long)(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_wc_conflict_description2_t_src_left_version_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  svn_wc_conflict_version_t *arg2 = (svn_wc_conflict_version_t *) 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_conflict_description2_t_src_left_version_set",&obj0,&obj1)) SWIG_fail;
-  {
-    arg1 = (struct svn_wc_conflict_description2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description2_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  {
-    arg2 = (svn_wc_conflict_version_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_conflict_version_t, svn_argnum_obj1);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  if (arg1) (arg1)->src_left_version = (svn_wc_conflict_version_t const *)arg2;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_wc_conflict_description2_t_src_left_version_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  PyObject * obj0 = 0 ;
-  svn_wc_conflict_version_t *result = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_description2_t_src_left_version_get",&obj0)) SWIG_fail;
-  {
-    arg1 = (struct svn_wc_conflict_description2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description2_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  result = (svn_wc_conflict_version_t *) ((arg1)->src_left_version);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_wc_conflict_version_t,
-    _global_py_pool, args);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_wc_conflict_description2_t_src_right_version_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  svn_wc_conflict_version_t *arg2 = (svn_wc_conflict_version_t *) 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_conflict_description2_t_src_right_version_set",&obj0,&obj1)) SWIG_fail;
-  {
-    arg1 = (struct svn_wc_conflict_description2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description2_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  {
-    arg2 = (svn_wc_conflict_version_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_conflict_version_t, svn_argnum_obj1);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  if (arg1) (arg1)->src_right_version = (svn_wc_conflict_version_t const *)arg2;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_wc_conflict_description2_t_src_right_version_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  PyObject * obj0 = 0 ;
-  svn_wc_conflict_version_t *result = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_description2_t_src_right_version_get",&obj0)) SWIG_fail;
-  {
-    arg1 = (struct svn_wc_conflict_description2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description2_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  result = (svn_wc_conflict_version_t *) ((arg1)->src_right_version);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_wc_conflict_version_t,
-    _global_py_pool, args);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_new_svn_wc_conflict_description2_t(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_wc_conflict_description2_t *result = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_wc_conflict_description2_t")) SWIG_fail;
-  {
-    svn_swig_py_release_py_lock();
-    
-    result = (struct svn_wc_conflict_description2_t *)calloc(1, sizeof(struct svn_wc_conflict_description2_t));
-    
-    svn_swig_py_acquire_py_lock();
-    
-  }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_wc_conflict_description2_t,
-    _global_py_pool, args);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_delete_svn_wc_conflict_description2_t(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_wc_conflict_description2_t",&obj0)) SWIG_fail;
-  {
-    arg1 = (struct svn_wc_conflict_description2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description2_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  {
-    svn_swig_py_release_py_lock();
-    
-    free((char *) arg1);
-    
-    svn_swig_py_acquire_py_lock();
-    
-  }
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *svn_wc_conflict_description2_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_svn_wc_conflict_description2_t, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
 SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_path_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   struct svn_wc_conflict_description_t *arg1 = (struct svn_wc_conflict_description_t *) 0 ;
@@ -9100,7 +8296,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_path_set(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_conflict_description_t_path_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9128,7 +8324,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_path_get(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_description_t_path_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9150,7 +8346,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_node_kind_set(PyObject
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_conflict_description_t_node_kind_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9177,7 +8373,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_node_kind_get(PyObject
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_description_t_node_kind_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9199,7 +8395,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_kind_set(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_conflict_description_t_kind_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9226,7 +8422,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_kind_get(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_description_t_kind_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9247,7 +8443,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_property_name_set(PyObj
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_conflict_description_t_property_name_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9275,7 +8471,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_property_name_get(PyObj
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_description_t_property_name_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9297,7 +8493,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_is_binary_set(PyObject
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_conflict_description_t_is_binary_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9324,7 +8520,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_is_binary_get(PyObject
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_description_t_is_binary_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9345,7 +8541,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_mime_type_set(PyObject
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_conflict_description_t_mime_type_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9373,7 +8569,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_mime_type_get(PyObject
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_description_t_mime_type_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9395,13 +8591,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_access_set(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_conflict_description_t_access_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9422,13 +8618,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_access_get(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_description_t_access_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (svn_wc_adm_access_t *) ((arg1)->access);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_wc_adm_access_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_wc_adm_access_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -9445,7 +8641,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_action_set(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_conflict_description_t_action_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9472,7 +8668,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_action_get(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_description_t_action_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9494,7 +8690,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_reason_set(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_conflict_description_t_reason_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9521,7 +8717,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_reason_get(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_description_t_reason_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9542,7 +8738,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_base_file_set(PyObject
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_conflict_description_t_base_file_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9570,7 +8766,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_base_file_get(PyObject
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_description_t_base_file_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9591,7 +8787,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_their_file_set(PyObject
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_conflict_description_t_their_file_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9619,7 +8815,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_their_file_get(PyObject
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_description_t_their_file_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9640,7 +8836,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_my_file_set(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_conflict_description_t_my_file_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9668,7 +8864,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_my_file_get(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_description_t_my_file_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9689,7 +8885,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_merged_file_set(PyObjec
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_conflict_description_t_merged_file_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9717,7 +8913,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_merged_file_get(PyObjec
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_description_t_merged_file_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9739,7 +8935,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_operation_set(PyObject
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_conflict_description_t_operation_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9766,7 +8962,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_operation_get(PyObject
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_description_t_operation_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9788,13 +8984,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_src_left_version_set(Py
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_conflict_description_t_src_left_version_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_wc_conflict_version_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_conflict_version_t, svn_argnum_obj1);
+    arg2 = (svn_wc_conflict_version_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_conflict_version_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9815,13 +9011,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_src_left_version_get(Py
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_description_t_src_left_version_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (svn_wc_conflict_version_t *) ((arg1)->src_left_version);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_wc_conflict_version_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_wc_conflict_version_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -9838,13 +9034,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_src_right_version_set(P
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_conflict_description_t_src_right_version_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_wc_conflict_version_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_conflict_version_t, svn_argnum_obj1);
+    arg2 = (svn_wc_conflict_version_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_conflict_version_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9865,13 +9061,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_t_src_right_version_get(P
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_description_t_src_right_version_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (svn_wc_conflict_version_t *) ((arg1)->src_right_version);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_wc_conflict_version_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_wc_conflict_version_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -9892,7 +9088,7 @@ SWIGINTERN PyObject *_wrap_new_svn_wc_conflict_description_t(PyObject *SWIGUNUSE
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_wc_conflict_description_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_wc_conflict_description_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -9907,7 +9103,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_wc_conflict_description_t(PyObject *SWIGUN
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_wc_conflict_description_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_conflict_description_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -9964,7 +9160,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_create_text2(PyObject *SW
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_wc_conflict_description2_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_wc_conflict_description2_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -9995,7 +9191,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_create_text(PyObject *SWI
   arg3 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_wc_conflict_description_create_text",&arg1,&obj1,&obj2)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10016,7 +9212,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_create_text(PyObject *SWI
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_wc_conflict_description_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_wc_conflict_description_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -10069,7 +9265,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_create_prop2(PyObject *SW
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_wc_conflict_description2_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_wc_conflict_description2_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -10103,7 +9299,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_create_prop(PyObject *SWI
   arg5 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOOs|O:svn_wc_conflict_description_create_prop",&arg1,&obj1,&obj2,&arg4,&obj4)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10130,7 +9326,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_create_prop(PyObject *SWI
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_wc_conflict_description_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_wc_conflict_description_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -10179,13 +9375,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_create_tree2(PyObject *SW
     }
   }
   {
-    arg4 = (svn_wc_conflict_version_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_wc_conflict_version_t, svn_argnum_obj3);
+    arg4 = (svn_wc_conflict_version_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_wc_conflict_version_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg5 = (svn_wc_conflict_version_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_wc_conflict_version_t, svn_argnum_obj4);
+    arg5 = (svn_wc_conflict_version_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_wc_conflict_version_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10206,7 +9402,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_create_tree2(PyObject *SW
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_wc_conflict_description2_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_wc_conflict_description2_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -10245,7 +9441,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_create_tree(PyObject *SWI
   arg7 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOOOOO|O:svn_wc_conflict_description_create_tree",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10263,13 +9459,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_create_tree(PyObject *SWI
     }
   }
   {
-    arg5 = (svn_wc_conflict_version_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_wc_conflict_version_t, svn_argnum_obj4);
+    arg5 = (svn_wc_conflict_version_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_wc_conflict_version_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg6 = (svn_wc_conflict_version_t *)svn_swig_MustGetPtr(obj5, SWIGTYPE_p_svn_wc_conflict_version_t, svn_argnum_obj5);
+    arg6 = (svn_wc_conflict_version_t *)svn_swig_py_must_get_ptr(obj5, SWIGTYPE_p_svn_wc_conflict_version_t, svn_argnum_obj5);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10290,7 +9486,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflict_description_create_tree(PyObject *SWI
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_wc_conflict_description_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_wc_conflict_description_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -10304,7 +9500,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_svn_wc__conflict_description2_dup(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_svn_wc_conflict_description2_dup(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   svn_wc_conflict_description2_t *arg1 = (svn_wc_conflict_description2_t *) 0 ;
   apr_pool_t *arg2 = (apr_pool_t *) 0 ;
@@ -10318,9 +9514,9 @@ SWIGINTERN PyObject *_wrap_svn_wc__conflict_description2_dup(PyObject *SWIGUNUSE
       &_global_py_pool, &_global_pool))
   SWIG_fail;
   arg2 = _global_pool;
-  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_wc__conflict_description2_dup",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_wc_conflict_description2_dup",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_wc_conflict_description2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_description2_t, svn_argnum_obj0);
+    arg1 = (svn_wc_conflict_description2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_conflict_description2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10336,12 +9532,12 @@ SWIGINTERN PyObject *_wrap_svn_wc__conflict_description2_dup(PyObject *SWIGUNUSE
   {
     svn_swig_py_release_py_lock();
     
-    result = (svn_wc_conflict_description2_t *)svn_wc__conflict_description2_dup((struct svn_wc_conflict_description2_t const *)arg1,arg2);
+    result = (svn_wc_conflict_description2_t *)svn_wc_conflict_description2_dup((struct svn_wc_conflict_description2_t const *)arg1,arg2);
     
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_wc_conflict_description2_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_wc_conflict_description2_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -10355,208 +9551,57 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_svn_wc_conflict_result_t_choice_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_wc_conflict_result_t *arg1 = (struct svn_wc_conflict_result_t *) 0 ;
-  svn_wc_conflict_choice_t arg2 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_conflict_result_t_choice_set",&obj0,&obj1)) SWIG_fail;
-  {
-    arg1 = (struct svn_wc_conflict_result_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_result_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  {
-    arg2 = (svn_wc_conflict_choice_t)SWIG_As_long (obj1);
-    if (SWIG_arg_fail(svn_argnum_obj1)) {
-      SWIG_fail;
-    }
-  }
-  if (arg1) (arg1)->choice = arg2;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_wc_conflict_result_t_choice_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_wc_conflict_result_t *arg1 = (struct svn_wc_conflict_result_t *) 0 ;
-  PyObject * obj0 = 0 ;
-  svn_wc_conflict_choice_t result;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_result_t_choice_get",&obj0)) SWIG_fail;
-  {
-    arg1 = (struct svn_wc_conflict_result_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_result_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  result = (svn_wc_conflict_choice_t) ((arg1)->choice);
-  resultobj = SWIG_From_long((long)(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_wc_conflict_result_t_merged_file_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_wc_conflict_result_t *arg1 = (struct svn_wc_conflict_result_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_conflict_result_t_merged_file_set",&obj0,&arg2)) SWIG_fail;
-  {
-    arg1 = (struct svn_wc_conflict_result_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_result_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  {
-    apr_size_t len = strlen(arg2) + 1;
-    char *copied;
-    if (arg1->merged_file) free((char *)arg1->merged_file);
-    copied = malloc(len);
-    memcpy(copied, arg2, len);
-    arg1->merged_file = copied;
-  }
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_wc_conflict_result_t_merged_file_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_wc_conflict_result_t *arg1 = (struct svn_wc_conflict_result_t *) 0 ;
-  PyObject * obj0 = 0 ;
-  char *result = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_result_t_merged_file_get",&obj0)) SWIG_fail;
-  {
-    arg1 = (struct svn_wc_conflict_result_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_result_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  result = (char *) ((arg1)->merged_file);
-  resultobj = SWIG_FromCharPtr((const char *)result);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_wc_conflict_result_t_save_merged_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_svn_wc__conflict_description2_dup(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  struct svn_wc_conflict_result_t *arg1 = (struct svn_wc_conflict_result_t *) 0 ;
-  svn_boolean_t arg2 ;
+  svn_wc_conflict_description2_t *arg1 = (svn_wc_conflict_description2_t *) 0 ;
+  apr_pool_t *arg2 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
+  svn_wc_conflict_description2_t *result = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_conflict_result_t_save_merged_set",&obj0,&obj1)) SWIG_fail;
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg2 = _global_pool;
+  if (!PyArg_ParseTuple(args,(char *)"O|O:svn_wc__conflict_description2_dup",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_conflict_result_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_result_t, svn_argnum_obj0);
+    arg1 = (svn_wc_conflict_description2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_conflict_description2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
-  {
-    arg2 = (svn_boolean_t)SWIG_As_long (obj1);
-    if (SWIG_arg_fail(svn_argnum_obj1)) {
-      SWIG_fail;
-    }
-  }
-  if (arg1) (arg1)->save_merged = arg2;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_svn_wc_conflict_result_t_save_merged_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_wc_conflict_result_t *arg1 = (struct svn_wc_conflict_result_t *) 0 ;
-  PyObject * obj0 = 0 ;
-  svn_boolean_t result;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_conflict_result_t_save_merged_get",&obj0)) SWIG_fail;
-  {
-    arg1 = (struct svn_wc_conflict_result_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_result_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
+  if (obj1) {
+    /* Verify that the user supplied a valid pool */
+    if (obj1 != Py_None && obj1 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj1);
+      SWIG_arg_fail(svn_argnum_obj1);
       SWIG_fail;
     }
   }
-  result = (svn_boolean_t) ((arg1)->save_merged);
-  resultobj = SWIG_From_long((long)(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_new_svn_wc_conflict_result_t(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_wc_conflict_result_t *result = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)":new_svn_wc_conflict_result_t")) SWIG_fail;
   {
     svn_swig_py_release_py_lock();
     
-    result = (struct svn_wc_conflict_result_t *)calloc(1, sizeof(struct svn_wc_conflict_result_t));
+    result = (svn_wc_conflict_description2_t *)svn_wc__conflict_description2_dup((struct svn_wc_conflict_description2_t const *)arg1,arg2);
     
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_wc_conflict_result_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_wc_conflict_description2_t,
     _global_py_pool, args);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_delete_svn_wc_conflict_result_t(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  struct svn_wc_conflict_result_t *arg1 = (struct svn_wc_conflict_result_t *) 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_wc_conflict_result_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_conflict_result_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_conflict_result_t, svn_argnum_obj0);
-    if (PyErr_Occurred()) {
-      SWIG_fail;
-    }
-  }
-  {
-    svn_swig_py_release_py_lock();
-    
-    free((char *) arg1);
-    
-    svn_swig_py_acquire_py_lock();
-    
+    Py_XDECREF(_global_py_pool);
   }
-  resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
   return NULL;
 }
 
 
-SWIGINTERN PyObject *svn_wc_conflict_result_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_svn_wc_conflict_result_t, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
 SWIGINTERN PyObject *_wrap_svn_wc_create_conflict_result(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   svn_wc_conflict_choice_t arg1 ;
@@ -10595,7 +9640,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_create_conflict_result(PyObject *SWIGUNUSEDPAR
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_wc_conflict_result_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_wc_conflict_result_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -10618,7 +9663,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_t_file_opened_set(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks4_t_file_opened_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks4_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks4_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10645,7 +9690,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_t_file_opened_get(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks4_t_file_opened_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks4_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks4_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10667,7 +9712,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_t_file_changed_set(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks4_t_file_changed_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks4_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks4_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10694,7 +9739,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_t_file_changed_get(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks4_t_file_changed_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks4_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks4_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10716,7 +9761,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_t_file_added_set(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks4_t_file_added_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks4_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks4_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10743,7 +9788,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_t_file_added_get(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks4_t_file_added_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks4_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks4_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10765,7 +9810,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_t_file_deleted_set(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks4_t_file_deleted_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks4_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks4_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10792,7 +9837,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_t_file_deleted_get(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks4_t_file_deleted_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks4_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks4_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10814,7 +9859,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_t_dir_deleted_set(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks4_t_dir_deleted_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks4_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks4_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10841,7 +9886,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_t_dir_deleted_get(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks4_t_dir_deleted_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks4_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks4_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10863,7 +9908,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_t_dir_opened_set(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks4_t_dir_opened_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks4_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks4_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10890,7 +9935,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_t_dir_opened_get(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks4_t_dir_opened_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks4_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks4_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10912,7 +9957,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_t_dir_added_set(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks4_t_dir_added_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks4_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks4_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10939,7 +9984,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_t_dir_added_get(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks4_t_dir_added_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks4_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks4_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10961,7 +10006,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_t_dir_props_changed_set(PyObje
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks4_t_dir_props_changed_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks4_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks4_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -10988,7 +10033,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_t_dir_props_changed_get(PyObje
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks4_t_dir_props_changed_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks4_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks4_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11010,7 +10055,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_t_dir_closed_set(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks4_t_dir_closed_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks4_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks4_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11037,7 +10082,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_t_dir_closed_get(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks4_t_dir_closed_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks4_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks4_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11063,7 +10108,7 @@ SWIGINTERN PyObject *_wrap_new_svn_wc_diff_callbacks4_t(PyObject *SWIGUNUSEDPARM
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_wc_diff_callbacks4_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_wc_diff_callbacks4_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -11078,7 +10123,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_wc_diff_callbacks4_t(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_wc_diff_callbacks4_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks4_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks4_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11114,7 +10159,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_t_file_changed_set(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks3_t_file_changed_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11141,7 +10186,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_t_file_changed_get(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks3_t_file_changed_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11163,7 +10208,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_t_file_added_set(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks3_t_file_added_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11190,7 +10235,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_t_file_added_get(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks3_t_file_added_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11212,7 +10257,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_t_file_deleted_set(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks3_t_file_deleted_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11239,7 +10284,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_t_file_deleted_get(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks3_t_file_deleted_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11261,7 +10306,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_t_dir_added_set(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks3_t_dir_added_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11288,7 +10333,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_t_dir_added_get(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks3_t_dir_added_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11310,7 +10355,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_t_dir_deleted_set(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks3_t_dir_deleted_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11337,7 +10382,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_t_dir_deleted_get(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks3_t_dir_deleted_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11359,7 +10404,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_t_dir_props_changed_set(PyObje
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks3_t_dir_props_changed_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11386,7 +10431,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_t_dir_props_changed_get(PyObje
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks3_t_dir_props_changed_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11408,7 +10453,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_t_dir_opened_set(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks3_t_dir_opened_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11435,7 +10480,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_t_dir_opened_get(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks3_t_dir_opened_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11457,7 +10502,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_t_dir_closed_set(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks3_t_dir_closed_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11484,7 +10529,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_t_dir_closed_get(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks3_t_dir_closed_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11510,7 +10555,7 @@ SWIGINTERN PyObject *_wrap_new_svn_wc_diff_callbacks3_t(PyObject *SWIGUNUSEDPARM
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_wc_diff_callbacks3_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_wc_diff_callbacks3_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -11525,7 +10570,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_wc_diff_callbacks3_t(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_wc_diff_callbacks3_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11561,7 +10606,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks2_t_file_changed_set(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks2_t_file_changed_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11588,7 +10633,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks2_t_file_changed_get(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks2_t_file_changed_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11610,7 +10655,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks2_t_file_added_set(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks2_t_file_added_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11637,7 +10682,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks2_t_file_added_get(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks2_t_file_added_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11659,7 +10704,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks2_t_file_deleted_set(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks2_t_file_deleted_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11686,7 +10731,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks2_t_file_deleted_get(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks2_t_file_deleted_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11708,7 +10753,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks2_t_dir_added_set(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks2_t_dir_added_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11735,7 +10780,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks2_t_dir_added_get(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks2_t_dir_added_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11757,7 +10802,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks2_t_dir_deleted_set(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks2_t_dir_deleted_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11784,7 +10829,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks2_t_dir_deleted_get(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks2_t_dir_deleted_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11806,7 +10851,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks2_t_dir_props_changed_set(PyObje
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks2_t_dir_props_changed_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11833,7 +10878,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks2_t_dir_props_changed_get(PyObje
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks2_t_dir_props_changed_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11859,7 +10904,7 @@ SWIGINTERN PyObject *_wrap_new_svn_wc_diff_callbacks2_t(PyObject *SWIGUNUSEDPARM
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_wc_diff_callbacks2_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_wc_diff_callbacks2_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -11874,7 +10919,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_wc_diff_callbacks2_t(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_wc_diff_callbacks2_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11910,7 +10955,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks_t_file_changed_set(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks_t_file_changed_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11937,7 +10982,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks_t_file_changed_get(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks_t_file_changed_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11959,7 +11004,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks_t_file_added_set(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks_t_file_added_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -11986,7 +11031,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks_t_file_added_get(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks_t_file_added_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12008,7 +11053,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks_t_file_deleted_set(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks_t_file_deleted_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12035,7 +11080,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks_t_file_deleted_get(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks_t_file_deleted_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12057,7 +11102,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks_t_dir_added_set(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks_t_dir_added_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12084,7 +11129,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks_t_dir_added_get(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks_t_dir_added_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12106,7 +11151,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks_t_dir_deleted_set(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks_t_dir_deleted_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12133,7 +11178,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks_t_dir_deleted_get(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks_t_dir_deleted_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12155,7 +11200,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks_t_props_changed_set(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_diff_callbacks_t_props_changed_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12182,7 +11227,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks_t_props_changed_get(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_diff_callbacks_t_props_changed_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12208,7 +11253,7 @@ SWIGINTERN PyObject *_wrap_new_svn_wc_diff_callbacks_t(PyObject *SWIGUNUSEDPARM(
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_wc_diff_callbacks_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_wc_diff_callbacks_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -12223,7 +11268,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_wc_diff_callbacks_t(PyObject *SWIGUNUSEDPA
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_wc_diff_callbacks_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_diff_callbacks_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_diff_callbacks_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12271,7 +11316,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_check_wc2(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_wc_check_wc2",&obj0,&arg3,&obj2)) SWIG_fail;
   {
-    arg2 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
+    arg2 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12405,7 +11450,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_has_binary_prop(PyObject *SWIGUNUSEDPARM(self)
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_wc_has_binary_prop",&arg2,&obj1,&obj2)) SWIG_fail;
   {
-    arg3 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg3 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12478,7 +11523,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_text_modified_p2(PyObject *SWIGUNUSEDPARM(self
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OsO|O:svn_wc_text_modified_p2",&obj0,&arg3,&obj2,&obj3)) SWIG_fail;
   {
-    arg2 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
+    arg2 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12563,7 +11608,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_text_modified_p(PyObject *SWIGUNUSEDPARM(self)
     }
   }
   {
-    arg4 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj2);
+    arg4 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12634,7 +11679,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_props_modified_p2(PyObject *SWIGUNUSEDPARM(sel
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_wc_props_modified_p2",&obj0,&arg3,&obj2)) SWIG_fail;
   {
-    arg2 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
+    arg2 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12705,7 +11750,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_props_modified_p(PyObject *SWIGUNUSEDPARM(self
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_wc_props_modified_p",&arg2,&obj1,&obj2)) SWIG_fail;
   {
-    arg3 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg3 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12763,7 +11808,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_name_set(PyObject *SWIGUNUSEDPARM(self
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_entry_t_name_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12791,7 +11836,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_name_get(PyObject *SWIGUNUSEDPARM(self
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_name_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12813,7 +11858,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_revision_set(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_entry_t_revision_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12840,7 +11885,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_revision_get(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_revision_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12861,7 +11906,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_url_set(PyObject *SWIGUNUSEDPARM(self)
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_entry_t_url_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12889,7 +11934,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_url_get(PyObject *SWIGUNUSEDPARM(self)
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_url_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12910,7 +11955,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_repos_set(PyObject *SWIGUNUSEDPARM(sel
   
   if (!PyArg_ParseTuple(args,(char *)"Oz:svn_wc_entry_t_repos_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12938,7 +11983,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_repos_get(PyObject *SWIGUNUSEDPARM(sel
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_repos_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12959,7 +12004,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_uuid_set(PyObject *SWIGUNUSEDPARM(self
   
   if (!PyArg_ParseTuple(args,(char *)"Oz:svn_wc_entry_t_uuid_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -12987,7 +12032,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_uuid_get(PyObject *SWIGUNUSEDPARM(self
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_uuid_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13009,7 +12054,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_kind_set(PyObject *SWIGUNUSEDPARM(self
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_entry_t_kind_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13036,7 +12081,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_kind_get(PyObject *SWIGUNUSEDPARM(self
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_kind_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13058,7 +12103,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_schedule_set(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_entry_t_schedule_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13085,7 +12130,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_schedule_get(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_schedule_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13107,7 +12152,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_copied_set(PyObject *SWIGUNUSEDPARM(se
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_entry_t_copied_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13134,7 +12179,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_copied_get(PyObject *SWIGUNUSEDPARM(se
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_copied_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13156,7 +12201,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_deleted_set(PyObject *SWIGUNUSEDPARM(s
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_entry_t_deleted_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13183,7 +12228,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_deleted_get(PyObject *SWIGUNUSEDPARM(s
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_deleted_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13205,7 +12250,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_absent_set(PyObject *SWIGUNUSEDPARM(se
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_entry_t_absent_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13232,7 +12277,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_absent_get(PyObject *SWIGUNUSEDPARM(se
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_absent_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13254,7 +12299,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_incomplete_set(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_entry_t_incomplete_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13281,7 +12326,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_incomplete_get(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_incomplete_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13302,7 +12347,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_copyfrom_url_set(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"Oz:svn_wc_entry_t_copyfrom_url_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13330,7 +12375,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_copyfrom_url_get(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_copyfrom_url_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13352,7 +12397,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_copyfrom_rev_set(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_entry_t_copyfrom_rev_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13379,7 +12424,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_copyfrom_rev_get(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_copyfrom_rev_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13400,7 +12445,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_conflict_old_set(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_entry_t_conflict_old_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13428,7 +12473,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_conflict_old_get(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_conflict_old_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13449,7 +12494,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_conflict_new_set(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_entry_t_conflict_new_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13477,7 +12522,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_conflict_new_get(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_conflict_new_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13498,7 +12543,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_conflict_wrk_set(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_entry_t_conflict_wrk_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13526,7 +12571,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_conflict_wrk_get(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_conflict_wrk_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13547,7 +12592,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_prejfile_set(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_entry_t_prejfile_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13575,7 +12620,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_prejfile_get(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_prejfile_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13597,7 +12642,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_text_time_set(PyObject *SWIGUNUSEDPARM
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_entry_t_text_time_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13619,7 +12664,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_text_time_get(PyObject *SWIGUNUSEDPARM
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_text_time_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13641,7 +12686,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_prop_time_set(PyObject *SWIGUNUSEDPARM
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_entry_t_prop_time_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13663,7 +12708,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_prop_time_get(PyObject *SWIGUNUSEDPARM
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_prop_time_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13684,7 +12729,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_checksum_set(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_entry_t_checksum_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13712,7 +12757,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_checksum_get(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_checksum_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13734,7 +12779,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_cmt_rev_set(PyObject *SWIGUNUSEDPARM(s
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_entry_t_cmt_rev_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13761,7 +12806,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_cmt_rev_get(PyObject *SWIGUNUSEDPARM(s
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_cmt_rev_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13783,7 +12828,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_cmt_date_set(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_entry_t_cmt_date_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13805,7 +12850,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_cmt_date_get(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_cmt_date_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13826,7 +12871,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_cmt_author_set(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_entry_t_cmt_author_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13854,7 +12899,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_cmt_author_get(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_cmt_author_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13875,7 +12920,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_lock_token_set(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"Oz:svn_wc_entry_t_lock_token_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13903,7 +12948,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_lock_token_get(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_lock_token_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13924,7 +12969,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_lock_owner_set(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_entry_t_lock_owner_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13952,7 +12997,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_lock_owner_get(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_lock_owner_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -13973,7 +13018,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_lock_comment_set(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_entry_t_lock_comment_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14001,7 +13046,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_lock_comment_get(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_lock_comment_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14023,7 +13068,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_lock_creation_date_set(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_entry_t_lock_creation_date_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14045,7 +13090,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_lock_creation_date_get(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_lock_creation_date_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14067,7 +13112,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_has_props_set(PyObject *SWIGUNUSEDPARM
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_entry_t_has_props_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14094,7 +13139,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_has_props_get(PyObject *SWIGUNUSEDPARM
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_has_props_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14116,7 +13161,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_has_prop_mods_set(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_entry_t_has_prop_mods_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14143,7 +13188,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_has_prop_mods_get(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_has_prop_mods_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14164,7 +13209,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_cachable_props_set(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_entry_t_cachable_props_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14192,7 +13237,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_cachable_props_get(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_cachable_props_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14213,7 +13258,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_present_props_set(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_entry_t_present_props_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14241,7 +13286,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_present_props_get(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_present_props_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14262,7 +13307,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_changelist_set(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_entry_t_changelist_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14290,7 +13335,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_changelist_get(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_changelist_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14312,7 +13357,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_working_size_set(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_entry_t_working_size_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14334,7 +13379,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_working_size_get(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_working_size_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14356,7 +13401,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_keep_local_set(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_entry_t_keep_local_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14383,7 +13428,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_keep_local_get(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_keep_local_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14405,7 +13450,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_depth_set(PyObject *SWIGUNUSEDPARM(sel
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_entry_t_depth_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14432,7 +13477,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_depth_get(PyObject *SWIGUNUSEDPARM(sel
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_depth_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14453,7 +13498,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_tree_conflict_data_set(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_entry_t_tree_conflict_data_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14481,7 +13526,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_tree_conflict_data_get(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_tree_conflict_data_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14502,7 +13547,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_file_external_path_set(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_entry_t_file_external_path_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14530,7 +13575,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_file_external_path_get(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_file_external_path_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14552,13 +13597,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_file_external_peg_rev_set(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_entry_t_file_external_peg_rev_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg2 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14579,13 +13624,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_file_external_peg_rev_get(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_file_external_peg_rev_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (svn_opt_revision_t *)& ((arg1)->file_external_peg_rev);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_opt_revision_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_opt_revision_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -14602,13 +13647,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_file_external_rev_set(PyObject *SWIGUN
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_entry_t_file_external_rev_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_opt_revision_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
+    arg2 = (svn_opt_revision_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_opt_revision_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14629,13 +13674,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_t_file_external_rev_get(PyObject *SWIGUN
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_t_file_external_rev_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (svn_opt_revision_t *)& ((arg1)->file_external_rev);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_opt_revision_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_opt_revision_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -14656,7 +13701,7 @@ SWIGINTERN PyObject *_wrap_new_svn_wc_entry_t(PyObject *SWIGUNUSEDPARM(self), Py
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_wc_entry_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_wc_entry_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -14671,7 +13716,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_wc_entry_t(PyObject *SWIGUNUSEDPARM(self),
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_wc_entry_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14720,7 +13765,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry(PyObject *SWIGUNUSEDPARM(self), PyObject
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"sOO|O:svn_wc_entry",&arg2,&obj1,&obj2,&obj3)) SWIG_fail;
   {
-    arg3 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg3 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14759,7 +13804,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry(PyObject *SWIGUNUSEDPARM(self), PyObject
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_wc_entry_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_wc_entry_t,
         _global_py_pool, args))
     
     ;
@@ -14797,7 +13842,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entries_read(PyObject *SWIGUNUSEDPARM(self), P
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OO|O:svn_wc_entries_read",&obj0,&obj1,&obj2)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14872,7 +13917,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_dup(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_wc_entry_dup",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_wc_entry_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
+    arg1 = (svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14893,7 +13938,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_dup(PyObject *SWIGUNUSEDPARM(self), PyOb
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_wc_entry_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_wc_entry_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -14916,7 +13961,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_t_schedule_set(PyObject *SWIGUNUSEDPARM(s
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_info_t_schedule_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14943,7 +13988,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_t_schedule_get(PyObject *SWIGUNUSEDPARM(s
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_info_t_schedule_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14964,7 +14009,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_t_copyfrom_url_set(PyObject *SWIGUNUSEDPA
   
   if (!PyArg_ParseTuple(args,(char *)"Oz:svn_wc_info_t_copyfrom_url_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -14992,7 +14037,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_t_copyfrom_url_get(PyObject *SWIGUNUSEDPA
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_info_t_copyfrom_url_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15014,7 +14059,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_t_copyfrom_rev_set(PyObject *SWIGUNUSEDPA
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_info_t_copyfrom_rev_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15041,7 +14086,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_t_copyfrom_rev_get(PyObject *SWIGUNUSEDPA
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_info_t_copyfrom_rev_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15063,13 +14108,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_t_checksum_set(PyObject *SWIGUNUSEDPARM(s
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_info_t_checksum_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_checksum_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_checksum_t, svn_argnum_obj1);
+    arg2 = (svn_checksum_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_checksum_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15090,13 +14135,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_t_checksum_get(PyObject *SWIGUNUSEDPARM(s
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_info_t_checksum_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (svn_checksum_t *) ((arg1)->checksum);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_checksum_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_checksum_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -15112,7 +14157,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_t_changelist_set(PyObject *SWIGUNUSEDPARM
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_info_t_changelist_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15140,7 +14185,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_t_changelist_get(PyObject *SWIGUNUSEDPARM
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_info_t_changelist_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15162,7 +14207,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_t_depth_set(PyObject *SWIGUNUSEDPARM(self
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_info_t_depth_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15189,7 +14234,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_t_depth_get(PyObject *SWIGUNUSEDPARM(self
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_info_t_depth_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15211,7 +14256,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_t_recorded_size_set(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_info_t_recorded_size_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15233,7 +14278,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_t_recorded_size_get(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_info_t_recorded_size_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15255,7 +14300,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_t_recorded_time_set(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_info_t_recorded_time_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15277,7 +14322,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_t_recorded_time_get(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_info_t_recorded_time_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15299,13 +14344,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_t_conflicts_set(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_info_t_conflicts_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (apr_array_header_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj1);
+    arg2 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15326,13 +14371,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_t_conflicts_get(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_info_t_conflicts_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (apr_array_header_t *) ((arg1)->conflicts);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_apr_array_header_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_apr_array_header_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -15348,7 +14393,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_t_wcroot_abspath_set(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_info_t_wcroot_abspath_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15376,7 +14421,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_t_wcroot_abspath_get(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_info_t_wcroot_abspath_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15397,7 +14442,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_t_moved_from_abspath_set(PyObject *SWIGUN
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_info_t_moved_from_abspath_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15425,7 +14470,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_t_moved_from_abspath_get(PyObject *SWIGUN
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_info_t_moved_from_abspath_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15446,7 +14491,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_t_moved_to_abspath_set(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_info_t_moved_to_abspath_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15474,7 +14519,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_t_moved_to_abspath_get(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_info_t_moved_to_abspath_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15500,7 +14545,7 @@ SWIGINTERN PyObject *_wrap_new_svn_wc_info_t(PyObject *SWIGUNUSEDPARM(self), PyO
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_wc_info_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_wc_info_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -15515,7 +14560,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_wc_info_t(PyObject *SWIGUNUSEDPARM(self),
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_wc_info_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_info_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15558,7 +14603,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_dup(PyObject *SWIGUNUSEDPARM(self), PyObj
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_wc_info_dup",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_wc_info_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_info_t, svn_argnum_obj0);
+    arg1 = (svn_wc_info_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_info_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15579,7 +14624,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_info_dup(PyObject *SWIGUNUSEDPARM(self), PyObj
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_wc_info_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_wc_info_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -15622,7 +14667,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflicted_p3(PyObject *SWIGUNUSEDPARM(self),
   arg3 = &temp3;
   if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_wc_conflicted_p3",&obj0,&arg5,&obj2)) SWIG_fail;
   {
-    arg4 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
+    arg4 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15713,7 +14758,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflicted_p2(PyObject *SWIGUNUSEDPARM(self),
   arg3 = &temp3;
   if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_wc_conflicted_p2",&arg4,&obj1,&obj2)) SWIG_fail;
   {
-    arg5 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg5 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15800,7 +14845,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_conflicted_p(PyObject *SWIGUNUSEDPARM(self), P
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_wc_conflicted_p",&arg3,&obj1,&obj2)) SWIG_fail;
   {
-    arg4 = (svn_wc_entry_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj1);
+    arg4 = (svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15880,7 +14925,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_ancestry(PyObject *SWIGUNUSEDPARM(self), P
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_wc_get_ancestry",&arg3,&obj1,&obj2)) SWIG_fail;
   {
-    arg4 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg4 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15952,7 +14997,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_callbacks2_t_found_entry_set(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_entry_callbacks2_t_found_entry_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_callbacks2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_callbacks2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_callbacks2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -15979,7 +15024,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_callbacks2_t_found_entry_get(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_callbacks2_t_found_entry_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_callbacks2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_callbacks2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_callbacks2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16001,7 +15046,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_callbacks2_t_handle_error_set(PyObject *
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_entry_callbacks2_t_handle_error_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_callbacks2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_callbacks2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_callbacks2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16028,7 +15073,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_callbacks2_t_handle_error_get(PyObject *
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_callbacks2_t_handle_error_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_callbacks2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_callbacks2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_callbacks2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16054,7 +15099,7 @@ SWIGINTERN PyObject *_wrap_new_svn_wc_entry_callbacks2_t(PyObject *SWIGUNUSEDPAR
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_wc_entry_callbacks2_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_wc_entry_callbacks2_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -16069,7 +15114,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_wc_entry_callbacks2_t(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_wc_entry_callbacks2_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_callbacks2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_callbacks2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_callbacks2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16105,7 +15150,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_callbacks_t_found_entry_set(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_entry_callbacks_t_found_entry_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_callbacks_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_callbacks_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_callbacks_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_callbacks_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16132,7 +15177,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_callbacks_t_found_entry_get(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_entry_callbacks_t_found_entry_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_callbacks_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_callbacks_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_callbacks_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_callbacks_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16158,7 +15203,7 @@ SWIGINTERN PyObject *_wrap_new_svn_wc_entry_callbacks_t(PyObject *SWIGUNUSEDPARM
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_wc_entry_callbacks_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_wc_entry_callbacks_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -16173,7 +15218,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_wc_entry_callbacks_t(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_wc_entry_callbacks_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_entry_callbacks_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_callbacks_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_entry_callbacks_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_callbacks_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16228,13 +15273,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_walk_entries3(PyObject *SWIGUNUSEDPARM(self),
   arg9 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOOOOOO|O:svn_wc_walk_entries3",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_wc_entry_callbacks2_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_wc_entry_callbacks2_t, svn_argnum_obj2);
+    arg3 = (svn_wc_entry_callbacks2_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_wc_entry_callbacks2_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16260,8 +15305,8 @@ SWIGINTERN PyObject *_wrap_svn_wc_walk_entries3(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
-    arg7 = svn_swig_py_cancel_func;
-    arg8 = obj6; /* our function is the baton. */
+    arg7 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg8 = obj6;
   }
   if (obj7) {
     /* Verify that the user supplied a valid pool */
@@ -16328,13 +15373,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_walk_entries2(PyObject *SWIGUNUSEDPARM(self),
   arg8 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOOOOO|O:svn_wc_walk_entries2",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_wc_entry_callbacks_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_wc_entry_callbacks_t, svn_argnum_obj2);
+    arg3 = (svn_wc_entry_callbacks_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_wc_entry_callbacks_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16354,8 +15399,8 @@ SWIGINTERN PyObject *_wrap_svn_wc_walk_entries2(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
-    arg6 = svn_swig_py_cancel_func;
-    arg7 = obj5; /* our function is the baton. */
+    arg6 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg7 = obj5;
   }
   if (obj6) {
     /* Verify that the user supplied a valid pool */
@@ -16419,13 +15464,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_walk_entries(PyObject *SWIGUNUSEDPARM(self), P
   arg6 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOOOO|O:svn_wc_walk_entries",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_wc_entry_callbacks_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_wc_entry_callbacks_t, svn_argnum_obj2);
+    arg3 = (svn_wc_entry_callbacks_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_wc_entry_callbacks_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16500,7 +15545,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_mark_missing_deleted(PyObject *SWIGUNUSEDPARM(
   arg3 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_wc_mark_missing_deleted",&arg1,&obj1,&obj2)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16568,7 +15613,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_ensure_adm4(PyObject *SWIGUNUSEDPARM(self), Py
   arg8 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OssssOO|O:svn_wc_ensure_adm4",&obj0,&arg2,&arg3,&arg4,&arg5,&obj5,&obj6,&obj7)) SWIG_fail;
   {
-    arg1 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
+    arg1 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16841,7 +15886,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_maybe_set_repos_root(PyObject *SWIGUNUSEDPARM(
   arg4 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"Osz|O:svn_wc_maybe_set_repos_root",&obj0,&arg2,&arg3,&obj3)) SWIG_fail;
   {
-    arg1 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
+    arg1 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16894,7 +15939,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_kind_set(PyObject *SWIGUNUSEDPARM(se
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status3_t_kind_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16921,7 +15966,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_kind_get(PyObject *SWIGUNUSEDPARM(se
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_kind_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16943,7 +15988,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_depth_set(PyObject *SWIGUNUSEDPARM(s
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status3_t_depth_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16970,7 +16015,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_depth_get(PyObject *SWIGUNUSEDPARM(s
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_depth_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -16992,7 +16037,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_filesize_set(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status3_t_filesize_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17014,7 +16059,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_filesize_get(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_filesize_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17036,7 +16081,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_versioned_set(PyObject *SWIGUNUSEDPA
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status3_t_versioned_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17063,7 +16108,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_versioned_get(PyObject *SWIGUNUSEDPA
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_versioned_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17085,7 +16130,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_conflicted_set(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status3_t_conflicted_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17112,7 +16157,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_conflicted_get(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_conflicted_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17134,7 +16179,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_node_status_set(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status3_t_node_status_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17161,7 +16206,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_node_status_get(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_node_status_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17183,7 +16228,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_text_status_set(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status3_t_text_status_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17210,7 +16255,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_text_status_get(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_text_status_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17232,7 +16277,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_prop_status_set(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status3_t_prop_status_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17259,7 +16304,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_prop_status_get(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_prop_status_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17281,7 +16326,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_copied_set(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status3_t_copied_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17308,7 +16353,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_copied_get(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_copied_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17330,7 +16375,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_revision_set(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status3_t_revision_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17357,7 +16402,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_revision_get(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_revision_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17379,7 +16424,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_changed_rev_set(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status3_t_changed_rev_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17406,7 +16451,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_changed_rev_get(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_changed_rev_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17428,7 +16473,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_changed_date_set(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status3_t_changed_date_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17450,7 +16495,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_changed_date_get(PyObject *SWIGUNUSE
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_changed_date_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17471,7 +16516,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_changed_author_set(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_status3_t_changed_author_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17499,7 +16544,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_changed_author_get(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_changed_author_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17520,7 +16565,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_repos_root_url_set(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_status3_t_repos_root_url_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17548,7 +16593,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_repos_root_url_get(PyObject *SWIGUNU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_repos_root_url_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17569,7 +16614,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_repos_uuid_set(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_status3_t_repos_uuid_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17597,7 +16642,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_repos_uuid_get(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_repos_uuid_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17618,7 +16663,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_repos_relpath_set(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_status3_t_repos_relpath_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17646,7 +16691,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_repos_relpath_get(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_repos_relpath_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17668,7 +16713,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_switched_set(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status3_t_switched_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17695,7 +16740,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_switched_get(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_switched_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17717,7 +16762,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_locked_set(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status3_t_locked_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17744,7 +16789,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_locked_get(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_locked_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17766,13 +16811,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_lock_set(PyObject *SWIGUNUSEDPARM(se
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status3_t_lock_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_lock_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_lock_t, svn_argnum_obj1);
+    arg2 = (svn_lock_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_lock_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17793,13 +16838,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_lock_get(PyObject *SWIGUNUSEDPARM(se
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_lock_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (svn_lock_t *) ((arg1)->lock);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_lock_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_lock_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -17815,7 +16860,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_changelist_set(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_status3_t_changelist_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17843,7 +16888,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_changelist_get(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_changelist_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17865,7 +16910,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_ood_kind_set(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status3_t_ood_kind_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17892,7 +16937,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_ood_kind_get(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_ood_kind_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17914,7 +16959,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_repos_node_status_set(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status3_t_repos_node_status_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17941,7 +16986,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_repos_node_status_get(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_repos_node_status_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17963,7 +17008,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_repos_text_status_set(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status3_t_repos_text_status_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -17990,7 +17035,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_repos_text_status_get(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_repos_text_status_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18012,7 +17057,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_repos_prop_status_set(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status3_t_repos_prop_status_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18039,7 +17084,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_repos_prop_status_get(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_repos_prop_status_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18061,13 +17106,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_repos_lock_set(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status3_t_repos_lock_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_lock_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_lock_t, svn_argnum_obj1);
+    arg2 = (svn_lock_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_lock_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18088,13 +17133,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_repos_lock_get(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_repos_lock_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (svn_lock_t *) ((arg1)->repos_lock);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_lock_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_lock_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -18111,7 +17156,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_ood_changed_rev_set(PyObject *SWIGUN
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status3_t_ood_changed_rev_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18138,7 +17183,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_ood_changed_rev_get(PyObject *SWIGUN
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_ood_changed_rev_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18160,7 +17205,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_ood_changed_date_set(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status3_t_ood_changed_date_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18182,7 +17227,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_ood_changed_date_get(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_ood_changed_date_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18203,7 +17248,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_ood_changed_author_set(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_status3_t_ood_changed_author_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18231,7 +17276,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_ood_changed_author_get(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_ood_changed_author_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18252,7 +17297,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_moved_from_abspath_set(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_status3_t_moved_from_abspath_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18280,7 +17325,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_moved_from_abspath_get(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_moved_from_abspath_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18301,7 +17346,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_moved_to_abspath_set(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_status3_t_moved_to_abspath_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18329,7 +17374,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_moved_to_abspath_get(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_moved_to_abspath_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18351,7 +17396,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_file_external_set(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status3_t_file_external_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18378,7 +17423,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3_t_file_external_get(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_file_external_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18391,6 +17436,55 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_wc_status3_t_actual_kind_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  struct svn_wc_status3_t *arg1 = (struct svn_wc_status3_t *) 0 ;
+  svn_node_kind_t arg2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status3_t_actual_kind_set",&obj0,&obj1)) SWIG_fail;
+  {
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg2 = (svn_node_kind_t)SWIG_As_long (obj1);
+    if (SWIG_arg_fail(svn_argnum_obj1)) {
+      SWIG_fail;
+    }
+  }
+  if (arg1) (arg1)->actual_kind = arg2;
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_svn_wc_status3_t_actual_kind_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  struct svn_wc_status3_t *arg1 = (struct svn_wc_status3_t *) 0 ;
+  PyObject * obj0 = 0 ;
+  svn_node_kind_t result;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status3_t_actual_kind_get",&obj0)) SWIG_fail;
+  {
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  result = (svn_node_kind_t) ((arg1)->actual_kind);
+  resultobj = SWIG_From_long((long)(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_new_svn_wc_status3_t(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   struct svn_wc_status3_t *result = 0 ;
@@ -18404,7 +17498,7 @@ SWIGINTERN PyObject *_wrap_new_svn_wc_status3_t(PyObject *SWIGUNUSEDPARM(self),
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_wc_status3_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_wc_status3_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -18419,7 +17513,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_wc_status3_t(PyObject *SWIGUNUSEDPARM(self
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_wc_status3_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18455,13 +17549,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_entry_set(PyObject *SWIGUNUSEDPARM(s
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status2_t_entry_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_wc_entry_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj1);
+    arg2 = (svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18482,13 +17576,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_entry_get(PyObject *SWIGUNUSEDPARM(s
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status2_t_entry_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (svn_wc_entry_t *) ((arg1)->entry);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_wc_entry_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_wc_entry_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -18505,7 +17599,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_text_status_set(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status2_t_text_status_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18532,7 +17626,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_text_status_get(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status2_t_text_status_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18554,7 +17648,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_prop_status_set(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status2_t_prop_status_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18581,7 +17675,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_prop_status_get(PyObject *SWIGUNUSED
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status2_t_prop_status_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18603,7 +17697,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_locked_set(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status2_t_locked_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18630,7 +17724,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_locked_get(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status2_t_locked_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18652,7 +17746,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_copied_set(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status2_t_copied_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18679,7 +17773,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_copied_get(PyObject *SWIGUNUSEDPARM(
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status2_t_copied_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18701,7 +17795,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_switched_set(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status2_t_switched_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18728,7 +17822,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_switched_get(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status2_t_switched_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18750,7 +17844,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_repos_text_status_set(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status2_t_repos_text_status_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18777,7 +17871,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_repos_text_status_get(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status2_t_repos_text_status_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18799,7 +17893,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_repos_prop_status_set(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status2_t_repos_prop_status_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18826,7 +17920,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_repos_prop_status_get(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status2_t_repos_prop_status_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18848,13 +17942,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_repos_lock_set(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status2_t_repos_lock_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_lock_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_lock_t, svn_argnum_obj1);
+    arg2 = (svn_lock_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_lock_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18875,13 +17969,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_repos_lock_get(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status2_t_repos_lock_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (svn_lock_t *) ((arg1)->repos_lock);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_lock_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_lock_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -18897,7 +17991,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_url_set(PyObject *SWIGUNUSEDPARM(sel
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_status2_t_url_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18925,7 +18019,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_url_get(PyObject *SWIGUNUSEDPARM(sel
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status2_t_url_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18947,7 +18041,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_ood_last_cmt_rev_set(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status2_t_ood_last_cmt_rev_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18974,7 +18068,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_ood_last_cmt_rev_get(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status2_t_ood_last_cmt_rev_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -18996,7 +18090,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_ood_last_cmt_date_set(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status2_t_ood_last_cmt_date_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -19018,7 +18112,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_ood_last_cmt_date_get(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status2_t_ood_last_cmt_date_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -19040,7 +18134,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_ood_kind_set(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status2_t_ood_kind_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -19067,7 +18161,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_ood_kind_get(PyObject *SWIGUNUSEDPAR
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status2_t_ood_kind_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -19088,7 +18182,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_ood_last_cmt_author_set(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"Os:svn_wc_status2_t_ood_last_cmt_author_set",&obj0,&arg2)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -19116,7 +18210,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_ood_last_cmt_author_get(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status2_t_ood_last_cmt_author_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -19138,13 +18232,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_tree_conflict_set(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status2_t_tree_conflict_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_wc_conflict_description_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj1);
+    arg2 = (svn_wc_conflict_description_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -19165,13 +18259,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_tree_conflict_get(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status2_t_tree_conflict_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (svn_wc_conflict_description_t *) ((arg1)->tree_conflict);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_wc_conflict_description_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_wc_conflict_description_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -19188,7 +18282,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_file_external_set(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status2_t_file_external_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -19215,7 +18309,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_file_external_get(PyObject *SWIGUNUS
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status2_t_file_external_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -19237,7 +18331,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_pristine_text_status_set(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status2_t_pristine_text_status_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -19264,7 +18358,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_pristine_text_status_get(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status2_t_pristine_text_status_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -19286,7 +18380,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_pristine_prop_status_set(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status2_t_pristine_prop_status_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -19313,7 +18407,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2_t_pristine_prop_status_get(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status2_t_pristine_prop_status_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -19339,7 +18433,7 @@ SWIGINTERN PyObject *_wrap_new_svn_wc_status2_t(PyObject *SWIGUNUSEDPARM(self),
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_wc_status2_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_wc_status2_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -19354,7 +18448,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_wc_status2_t(PyObject *SWIGUNUSEDPARM(self
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_wc_status2_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -19390,13 +18484,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_status_t_entry_set(PyObject *SWIGUNUSEDPARM(se
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status_t_entry_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_wc_entry_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj1);
+    arg2 = (svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -19417,13 +18511,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_status_t_entry_get(PyObject *SWIGUNUSEDPARM(se
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status_t_entry_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   result = (svn_wc_entry_t *) ((arg1)->entry);
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_wc_entry_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_wc_entry_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -19440,7 +18534,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status_t_text_status_set(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status_t_text_status_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -19467,7 +18561,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status_t_text_status_get(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status_t_text_status_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -19489,7 +18583,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status_t_prop_status_set(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status_t_prop_status_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -19516,7 +18610,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status_t_prop_status_get(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status_t_prop_status_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -19538,7 +18632,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status_t_locked_set(PyObject *SWIGUNUSEDPARM(s
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status_t_locked_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -19565,7 +18659,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status_t_locked_get(PyObject *SWIGUNUSEDPARM(s
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status_t_locked_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -19587,7 +18681,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status_t_copied_set(PyObject *SWIGUNUSEDPARM(s
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status_t_copied_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -19614,7 +18708,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status_t_copied_get(PyObject *SWIGUNUSEDPARM(s
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status_t_copied_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -19636,7 +18730,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status_t_switched_set(PyObject *SWIGUNUSEDPARM
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status_t_switched_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -19663,7 +18757,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status_t_switched_get(PyObject *SWIGUNUSEDPARM
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status_t_switched_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -19685,7 +18779,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status_t_repos_text_status_set(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status_t_repos_text_status_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -19712,7 +18806,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status_t_repos_text_status_get(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status_t_repos_text_status_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -19734,7 +18828,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status_t_repos_prop_status_set(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_status_t_repos_prop_status_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -19761,7 +18855,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status_t_repos_prop_status_get(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_status_t_repos_prop_status_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -19787,7 +18881,7 @@ SWIGINTERN PyObject *_wrap_new_svn_wc_status_t(PyObject *SWIGUNUSEDPARM(self), P
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_wc_status_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_wc_status_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -19802,7 +18896,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_wc_status_t(PyObject *SWIGUNUSEDPARM(self)
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_wc_status_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -19845,7 +18939,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_dup_status3(PyObject *SWIGUNUSEDPARM(self), Py
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_wc_dup_status3",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_wc_status3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
+    arg1 = (svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -19866,7 +18960,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_dup_status3(PyObject *SWIGUNUSEDPARM(self), Py
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_wc_status3_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_wc_status3_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -19896,7 +18990,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_dup_status2(PyObject *SWIGUNUSEDPARM(self), Py
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_wc_dup_status2",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_wc_status2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
+    arg1 = (svn_wc_status2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -19917,7 +19011,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_dup_status2(PyObject *SWIGUNUSEDPARM(self), Py
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_wc_status2_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_wc_status2_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -19947,7 +19041,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_dup_status(PyObject *SWIGUNUSEDPARM(self), PyO
   arg2 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"O|O:svn_wc_dup_status",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (svn_wc_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_status_t, svn_argnum_obj0);
+    arg1 = (svn_wc_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -19968,7 +19062,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_dup_status(PyObject *SWIGUNUSEDPARM(self), PyO
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_wc_status_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_wc_status_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -20008,7 +19102,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status3(PyObject *SWIGUNUSEDPARM(self), PyObje
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"Os|OO:svn_wc_status3",&obj0,&arg3,&obj2,&obj3)) SWIG_fail;
   {
-    arg2 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
+    arg2 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -20095,7 +19189,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2(PyObject *SWIGUNUSEDPARM(self), PyObje
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_wc_status2",&arg2,&obj1,&obj2)) SWIG_fail;
   {
-    arg3 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg3 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -20128,7 +19222,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status2(PyObject *SWIGUNUSEDPARM(self), PyObje
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_wc_status2_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_wc_status2_t,
         _global_py_pool, args))
     
     ;
@@ -20165,7 +19259,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status(PyObject *SWIGUNUSEDPARM(self), PyObjec
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_wc_status",&arg2,&obj1,&obj2)) SWIG_fail;
   {
-    arg3 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg3 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -20198,7 +19292,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status(PyObject *SWIGUNUSEDPARM(self), PyObjec
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_wc_status_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_wc_status_t,
         _global_py_pool, args))
     
     ;
@@ -20249,7 +19343,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_walk_status(PyObject *SWIGUNUSEDPARM(self), Py
   arg12 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OsOOOOOOOO|O:svn_wc_walk_status",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
   {
-    arg1 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
+    arg1 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -20279,14 +19373,14 @@ SWIGINTERN PyObject *_wrap_svn_wc_walk_status(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
-    arg7 = (apr_array_header_t *)svn_swig_MustGetPtr(obj6, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj6);
+    arg7 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj6, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj6);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
     svn_wc_status_func4_t * tmp =
-    svn_swig_MustGetPtr(obj7, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj7);
+    svn_swig_py_must_get_ptr(obj7, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj7);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -20301,8 +19395,8 @@ SWIGINTERN PyObject *_wrap_svn_wc_walk_status(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
-    arg10 = svn_swig_py_cancel_func;
-    arg11 = obj9; /* our function is the baton. */
+    arg10 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg11 = obj9;
   }
   if (obj10) {
     /* Verify that the user supplied a valid pool */
@@ -20399,7 +19493,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_status_editor5(PyObject *SWIGUNUSEDPARM(se
   arg4 = &temp4;
   if (!PyArg_ParseTuple(args,(char *)"OssOOOOOOOOO|OO:svn_wc_get_status_editor5",&obj0,&arg6,&arg7,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13)) SWIG_fail;
   {
-    arg5 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
+    arg5 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -20435,14 +19529,14 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_status_editor5(PyObject *SWIGUNUSEDPARM(se
     }
   }
   {
-    arg13 = (apr_array_header_t *)svn_swig_MustGetPtr(obj8, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj8);
+    arg13 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj8, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj8);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
     svn_wc_status_func4_t * tmp =
-    svn_swig_MustGetPtr(obj9, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj9);
+    svn_swig_py_must_get_ptr(obj9, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj9);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -20457,8 +19551,8 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_status_editor5(PyObject *SWIGUNUSEDPARM(se
     }
   }
   {
-    arg16 = svn_swig_py_cancel_func;
-    arg17 = obj11; /* our function is the baton. */
+    arg16 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg17 = obj11;
   }
   if (obj12) {
     /* Verify that the user supplied a valid pool */
@@ -20496,19 +19590,19 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_status_editor5(PyObject *SWIGUNUSEDPARM(se
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_delta_editor_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_delta_editor_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg3, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg3, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -20584,7 +19678,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_status_editor4(PyObject *SWIGUNUSEDPARM(se
   arg4 = &temp4;
   if (!PyArg_ParseTuple(args,(char *)"OsOOOOOOOO|O:svn_wc_get_status_editor4",&obj0,&arg6,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
   {
-    arg5 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
+    arg5 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -20608,14 +19702,14 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_status_editor4(PyObject *SWIGUNUSEDPARM(se
     }
   }
   {
-    arg10 = (apr_array_header_t *)svn_swig_MustGetPtr(obj5, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj5);
+    arg10 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj5, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj5);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
     svn_wc_status_func3_t * tmp =
-    svn_swig_MustGetPtr(obj6, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj6);
+    svn_swig_py_must_get_ptr(obj6, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj6);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -20630,11 +19724,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_status_editor4(PyObject *SWIGUNUSEDPARM(se
     }
   }
   {
-    arg13 = svn_swig_py_cancel_func;
-    arg14 = obj8; /* our function is the baton. */
+    arg13 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg14 = obj8;
   }
   {
-    arg15 = (svn_wc_traversal_info_t *)svn_swig_MustGetPtr(obj9, SWIGTYPE_p_svn_wc_traversal_info_t, svn_argnum_obj9);
+    arg15 = (svn_wc_traversal_info_t *)svn_swig_py_must_get_ptr(obj9, SWIGTYPE_p_svn_wc_traversal_info_t, svn_argnum_obj9);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -20667,19 +19761,19 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_status_editor4(PyObject *SWIGUNUSEDPARM(se
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_delta_editor_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_delta_editor_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg3, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg3, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -20748,7 +19842,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_status_editor3(PyObject *SWIGUNUSEDPARM(se
   arg4 = &temp4;
   if (!PyArg_ParseTuple(args,(char *)"OsOOOOOOO|O:svn_wc_get_status_editor3",&obj0,&arg6,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   {
-    arg5 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
+    arg5 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -20772,21 +19866,21 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_status_editor3(PyObject *SWIGUNUSEDPARM(se
     }
   }
   {
-    arg10 = (apr_array_header_t *)svn_swig_MustGetPtr(obj5, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj5);
+    arg10 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj5, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj5);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg11 = svn_swig_py_status_func2;
+    arg11 = (svn_wc_status_func2_t) svn_swig_py_status_func2;
     arg12 = obj6;
   }
   {
-    arg13 = svn_swig_py_cancel_func;
-    arg14 = obj7; /* our function is the baton. */
+    arg13 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg14 = obj7;
   }
   {
-    arg15 = (svn_wc_traversal_info_t *)svn_swig_MustGetPtr(obj8, SWIGTYPE_p_svn_wc_traversal_info_t, svn_argnum_obj8);
+    arg15 = (svn_wc_traversal_info_t *)svn_swig_py_must_get_ptr(obj8, SWIGTYPE_p_svn_wc_traversal_info_t, svn_argnum_obj8);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -20819,19 +19913,19 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_status_editor3(PyObject *SWIGUNUSEDPARM(se
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_delta_editor_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_delta_editor_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg3, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg3, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -20900,7 +19994,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_status_editor2(PyObject *SWIGUNUSEDPARM(se
   arg4 = &temp4;
   if (!PyArg_ParseTuple(args,(char *)"OsOOOOOOO|O:svn_wc_get_status_editor2",&obj0,&arg6,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   {
-    arg5 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
+    arg5 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -20937,15 +20031,15 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_status_editor2(PyObject *SWIGUNUSEDPARM(se
     }
   }
   {
-    arg11 = svn_swig_py_status_func2;
+    arg11 = (svn_wc_status_func2_t) svn_swig_py_status_func2;
     arg12 = obj6;
   }
   {
-    arg13 = svn_swig_py_cancel_func;
-    arg14 = obj7; /* our function is the baton. */
+    arg13 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg14 = obj7;
   }
   {
-    arg15 = (svn_wc_traversal_info_t *)svn_swig_MustGetPtr(obj8, SWIGTYPE_p_svn_wc_traversal_info_t, svn_argnum_obj8);
+    arg15 = (svn_wc_traversal_info_t *)svn_swig_py_must_get_ptr(obj8, SWIGTYPE_p_svn_wc_traversal_info_t, svn_argnum_obj8);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -20978,19 +20072,19 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_status_editor2(PyObject *SWIGUNUSEDPARM(se
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_delta_editor_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_delta_editor_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg3, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg3, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -21056,7 +20150,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_status_editor(PyObject *SWIGUNUSEDPARM(sel
   arg3 = &temp3;
   if (!PyArg_ParseTuple(args,(char *)"OsOOOOOOO|O:svn_wc_get_status_editor",&obj0,&arg5,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   {
-    arg4 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
+    arg4 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -21093,15 +20187,15 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_status_editor(PyObject *SWIGUNUSEDPARM(sel
     }
   }
   {
-    arg10 = svn_swig_py_status_func;
+    arg10 = (svn_wc_status_func_t) svn_swig_py_status_func;
     arg11 = obj6;
   }
   {
-    arg12 = svn_swig_py_cancel_func;
-    arg13 = obj7; /* our function is the baton. */
+    arg12 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg13 = obj7;
   }
   {
-    arg14 = (svn_wc_traversal_info_t *)svn_swig_MustGetPtr(obj8, SWIGTYPE_p_svn_wc_traversal_info_t, svn_argnum_obj8);
+    arg14 = (svn_wc_traversal_info_t *)svn_swig_py_must_get_ptr(obj8, SWIGTYPE_p_svn_wc_traversal_info_t, svn_argnum_obj8);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -21134,13 +20228,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_status_editor(PyObject *SWIGUNUSEDPARM(sel
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_delta_editor_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_delta_editor_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -21190,7 +20284,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_status_set_repos_locks(PyObject *SWIGUNUSEDPAR
     }
   }
   {
-    arg2 = (apr_hash_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_apr_hash_t, svn_argnum_obj1);
+    arg2 = (apr_hash_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_apr_hash_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -21260,7 +20354,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_copy3(PyObject *SWIGUNUSEDPARM(self), PyObject
   arg9 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OssOOO|O:svn_wc_copy3",&obj0,&arg2,&arg3,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
-    arg1 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
+    arg1 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -21272,11 +20366,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_copy3(PyObject *SWIGUNUSEDPARM(self), PyObject
     }
   }
   {
-    arg5 = svn_swig_py_cancel_func;
-    arg6 = obj4; /* our function is the baton. */
+    arg5 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg6 = obj4;
   }
   {
-    arg7 = svn_swig_py_notify_func2;
+    arg7 = (svn_wc_notify_func2_t) svn_swig_py_notify_func2;
     arg8 = obj5;
   }
   if (obj6) {
@@ -21342,17 +20436,17 @@ SWIGINTERN PyObject *_wrap_svn_wc_copy2(PyObject *SWIGUNUSEDPARM(self), PyObject
   arg8 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOsOO|O:svn_wc_copy2",&arg1,&obj1,&arg3,&obj3,&obj4,&obj5)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = svn_swig_py_cancel_func;
-    arg5 = obj3; /* our function is the baton. */
+    arg4 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg5 = obj3;
   }
   {
-    arg6 = svn_swig_py_notify_func2;
+    arg6 = (svn_wc_notify_func2_t) svn_swig_py_notify_func2;
     arg7 = obj4;
   }
   if (obj5) {
@@ -21418,17 +20512,17 @@ SWIGINTERN PyObject *_wrap_svn_wc_copy(PyObject *SWIGUNUSEDPARM(self), PyObject
   arg8 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOsOO|O:svn_wc_copy",&arg1,&obj1,&arg3,&obj3,&obj4,&obj5)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = svn_swig_py_cancel_func;
-    arg5 = obj3; /* our function is the baton. */
+    arg4 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg5 = obj3;
   }
   {
-    arg6 = svn_swig_py_notify_func;
+    arg6 = (svn_wc_notify_func_t) svn_swig_py_notify_func;
     arg7 = obj4;
   }
   if (obj5) {
@@ -21496,7 +20590,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_move(PyObject *SWIGUNUSEDPARM(self), PyObject
   arg9 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OssOOO|O:svn_wc_move",&obj0,&arg2,&arg3,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
-    arg1 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
+    arg1 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -21508,11 +20602,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_move(PyObject *SWIGUNUSEDPARM(self), PyObject
     }
   }
   {
-    arg5 = svn_swig_py_cancel_func;
-    arg6 = obj4; /* our function is the baton. */
+    arg5 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg6 = obj4;
   }
   {
-    arg7 = svn_swig_py_notify_func2;
+    arg7 = (svn_wc_notify_func2_t) svn_swig_py_notify_func2;
     arg8 = obj5;
   }
   if (obj6) {
@@ -21581,7 +20675,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_delete4(PyObject *SWIGUNUSEDPARM(self), PyObje
   arg9 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OsOOOO|O:svn_wc_delete4",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
-    arg1 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
+    arg1 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -21599,11 +20693,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_delete4(PyObject *SWIGUNUSEDPARM(self), PyObje
     }
   }
   {
-    arg5 = svn_swig_py_cancel_func;
-    arg6 = obj4; /* our function is the baton. */
+    arg5 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg6 = obj4;
   }
   {
-    arg7 = svn_swig_py_notify_func2;
+    arg7 = (svn_wc_notify_func2_t) svn_swig_py_notify_func2;
     arg8 = obj5;
   }
   if (obj6) {
@@ -21670,17 +20764,17 @@ SWIGINTERN PyObject *_wrap_svn_wc_delete3(PyObject *SWIGUNUSEDPARM(self), PyObje
   arg8 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOOOO|O:svn_wc_delete3",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = svn_swig_py_cancel_func;
-    arg4 = obj2; /* our function is the baton. */
+    arg3 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg4 = obj2;
   }
   {
-    arg5 = svn_swig_py_notify_func2;
+    arg5 = (svn_wc_notify_func2_t) svn_swig_py_notify_func2;
     arg6 = obj3;
   }
   {
@@ -21751,17 +20845,17 @@ SWIGINTERN PyObject *_wrap_svn_wc_delete2(PyObject *SWIGUNUSEDPARM(self), PyObje
   arg7 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOOO|O:svn_wc_delete2",&arg1,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = svn_swig_py_cancel_func;
-    arg4 = obj2; /* our function is the baton. */
+    arg3 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg4 = obj2;
   }
   {
-    arg5 = svn_swig_py_notify_func2;
+    arg5 = (svn_wc_notify_func2_t) svn_swig_py_notify_func2;
     arg6 = obj3;
   }
   if (obj4) {
@@ -21826,17 +20920,17 @@ SWIGINTERN PyObject *_wrap_svn_wc_delete(PyObject *SWIGUNUSEDPARM(self), PyObjec
   arg7 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOOO|O:svn_wc_delete",&arg1,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = svn_swig_py_cancel_func;
-    arg4 = obj2; /* our function is the baton. */
+    arg3 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg4 = obj2;
   }
   {
-    arg5 = svn_swig_py_notify_func;
+    arg5 = (svn_wc_notify_func_t) svn_swig_py_notify_func;
     arg6 = obj3;
   }
   if (obj4) {
@@ -21878,6 +20972,97 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_wc_add_from_disk3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  svn_wc_context_t *arg1 = (svn_wc_context_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  apr_hash_t *arg3 = (apr_hash_t *) 0 ;
+  svn_boolean_t arg4 ;
+  svn_wc_notify_func2_t arg5 = (svn_wc_notify_func2_t) 0 ;
+  void *arg6 = (void *) 0 ;
+  apr_pool_t *arg7 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  PyObject * obj5 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg7 = _global_pool;
+  if (!PyArg_ParseTuple(args,(char *)"OsOOO|O:svn_wc_add_from_disk3",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  {
+    arg1 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    if (_global_pool == NULL)
+    {
+      if (svn_swig_py_get_parent_pool(args, SWIGTYPE_p_apr_pool_t,
+          &_global_py_pool, &_global_pool))
+      SWIG_fail;
+    }
+    
+    arg3 = svn_swig_py_prophash_from_dict(obj2, _global_pool);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg4 = (svn_boolean_t)SWIG_As_long (obj3);
+    if (SWIG_arg_fail(svn_argnum_obj3)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg5 = (svn_wc_notify_func2_t) svn_swig_py_notify_func2;
+    arg6 = obj4;
+  }
+  if (obj5) {
+    /* Verify that the user supplied a valid pool */
+    if (obj5 != Py_None && obj5 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj5);
+      SWIG_arg_fail(svn_argnum_obj5);
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_wc_add_from_disk3(arg1,(char const *)arg2,(apr_hash_t const *)arg3,arg4,arg5,arg6,arg7);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_svn_wc_add_from_disk2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   svn_wc_context_t *arg1 = (svn_wc_context_t *) 0 ;
@@ -21900,7 +21085,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_add_from_disk2(PyObject *SWIGUNUSEDPARM(self),
   arg6 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_wc_add_from_disk2",&obj0,&arg2,&obj2,&obj3,&obj4)) SWIG_fail;
   {
-    arg1 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
+    arg1 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -21919,7 +21104,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_add_from_disk2(PyObject *SWIGUNUSEDPARM(self),
     }
   }
   {
-    arg4 = svn_swig_py_notify_func2;
+    arg4 = (svn_wc_notify_func2_t) svn_swig_py_notify_func2;
     arg5 = obj3;
   }
   if (obj4) {
@@ -21981,13 +21166,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_add_from_disk(PyObject *SWIGUNUSEDPARM(self),
   arg5 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OsO|O:svn_wc_add_from_disk",&obj0,&arg2,&obj2,&obj3)) SWIG_fail;
   {
-    arg1 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
+    arg1 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = svn_swig_py_notify_func2;
+    arg3 = (svn_wc_notify_func2_t) svn_swig_py_notify_func2;
     arg4 = obj2;
   }
   if (obj3) {
@@ -22057,7 +21242,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_add4(PyObject *SWIGUNUSEDPARM(self), PyObject
   arg10 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OsOzOOO|O:svn_wc_add4",&obj0,&arg2,&obj2,&arg4,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
-    arg1 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
+    arg1 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -22075,11 +21260,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_add4(PyObject *SWIGUNUSEDPARM(self), PyObject
     }
   }
   {
-    arg6 = svn_swig_py_cancel_func;
-    arg7 = obj5; /* our function is the baton. */
+    arg6 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg7 = obj5;
   }
   {
-    arg8 = svn_swig_py_notify_func2;
+    arg8 = (svn_wc_notify_func2_t) svn_swig_py_notify_func2;
     arg9 = obj6;
   }
   if (obj7) {
@@ -22149,7 +21334,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_add3(PyObject *SWIGUNUSEDPARM(self), PyObject
   arg10 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOOzOOO|O:svn_wc_add3",&arg1,&obj1,&obj2,&arg4,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -22167,11 +21352,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_add3(PyObject *SWIGUNUSEDPARM(self), PyObject
     }
   }
   {
-    arg6 = svn_swig_py_cancel_func;
-    arg7 = obj5; /* our function is the baton. */
+    arg6 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg7 = obj5;
   }
   {
-    arg8 = svn_swig_py_notify_func2;
+    arg8 = (svn_wc_notify_func2_t) svn_swig_py_notify_func2;
     arg9 = obj6;
   }
   if (obj7) {
@@ -22239,7 +21424,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_add2(PyObject *SWIGUNUSEDPARM(self), PyObject
   arg9 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOzOOO|O:svn_wc_add2",&arg1,&obj1,&arg3,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -22251,11 +21436,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_add2(PyObject *SWIGUNUSEDPARM(self), PyObject
     }
   }
   {
-    arg5 = svn_swig_py_cancel_func;
-    arg6 = obj4; /* our function is the baton. */
+    arg5 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg6 = obj4;
   }
   {
-    arg7 = svn_swig_py_notify_func2;
+    arg7 = (svn_wc_notify_func2_t) svn_swig_py_notify_func2;
     arg8 = obj5;
   }
   if (obj6) {
@@ -22323,7 +21508,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_add(PyObject *SWIGUNUSEDPARM(self), PyObject *
   arg9 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOzOOO|O:svn_wc_add",&arg1,&obj1,&arg3,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -22335,11 +21520,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_add(PyObject *SWIGUNUSEDPARM(self), PyObject *
     }
   }
   {
-    arg5 = svn_swig_py_cancel_func;
-    arg6 = obj4; /* our function is the baton. */
+    arg5 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg6 = obj4;
   }
   {
-    arg7 = svn_swig_py_notify_func;
+    arg7 = (svn_wc_notify_func_t) svn_swig_py_notify_func;
     arg8 = obj5;
   }
   if (obj6) {
@@ -22412,7 +21597,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_add_repos_file4(PyObject *SWIGUNUSEDPARM(self)
   arg11 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OsOOOOzOO|O:svn_wc_add_repos_file4",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&arg7,&obj7,&obj8,&obj9)) SWIG_fail;
   {
-    arg1 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
+    arg1 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -22456,8 +21641,8 @@ SWIGINTERN PyObject *_wrap_svn_wc_add_repos_file4(PyObject *SWIGUNUSEDPARM(self)
     }
   }
   {
-    arg9 = svn_swig_py_cancel_func;
-    arg10 = obj8; /* our function is the baton. */
+    arg9 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg10 = obj8;
   }
   if (obj9) {
     /* Verify that the user supplied a valid pool */
@@ -22532,7 +21717,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_add_repos_file3(PyObject *SWIGUNUSEDPARM(self)
   arg13 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOOOOOzOOO|O:svn_wc_add_repos_file3",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5,&arg7,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -22576,11 +21761,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_add_repos_file3(PyObject *SWIGUNUSEDPARM(self)
     }
   }
   {
-    arg9 = svn_swig_py_cancel_func;
-    arg10 = obj8; /* our function is the baton. */
+    arg9 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg10 = obj8;
   }
   {
-    arg11 = svn_swig_py_notify_func2;
+    arg11 = (svn_wc_notify_func2_t) svn_swig_py_notify_func2;
     arg12 = obj9;
   }
   if (obj10) {
@@ -22648,7 +21833,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_add_repos_file2(PyObject *SWIGUNUSEDPARM(self)
   arg9 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOszOOzO|O:svn_wc_add_repos_file2",&arg1,&obj1,&arg3,&arg4,&obj4,&obj5,&arg7,&obj7,&obj8)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -22747,7 +21932,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_add_repos_file(PyObject *SWIGUNUSEDPARM(self),
   arg7 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOzOzO|O:svn_wc_add_repos_file",&arg1,&obj1,&arg3,&obj3,&arg5,&obj5,&obj6)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -22834,7 +22019,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_remove_from_revision_control2(PyObject *SWIGUN
   arg7 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OsOOO|O:svn_wc_remove_from_revision_control2",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
-    arg1 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
+    arg1 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -22852,8 +22037,8 @@ SWIGINTERN PyObject *_wrap_svn_wc_remove_from_revision_control2(PyObject *SWIGUN
     }
   }
   {
-    arg5 = svn_swig_py_cancel_func;
-    arg6 = obj4; /* our function is the baton. */
+    arg5 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg6 = obj4;
   }
   if (obj5) {
     /* Verify that the user supplied a valid pool */
@@ -22918,7 +22103,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_remove_from_revision_control(PyObject *SWIGUNU
   arg7 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OsOOO|O:svn_wc_remove_from_revision_control",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
-    arg1 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
+    arg1 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -22936,8 +22121,8 @@ SWIGINTERN PyObject *_wrap_svn_wc_remove_from_revision_control(PyObject *SWIGUNU
     }
   }
   {
-    arg5 = svn_swig_py_cancel_func;
-    arg6 = obj4; /* our function is the baton. */
+    arg5 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg6 = obj4;
   }
   if (obj5) {
     /* Verify that the user supplied a valid pool */
@@ -23010,7 +22195,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_resolved_conflict5(PyObject *SWIGUNUSEDPARM(se
   arg12 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OsOOsOOOO|O:svn_wc_resolved_conflict5",&obj0,&arg2,&obj2,&obj3,&arg5,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   {
-    arg1 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
+    arg1 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -23040,11 +22225,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_resolved_conflict5(PyObject *SWIGUNUSEDPARM(se
     }
   }
   {
-    arg8 = svn_swig_py_cancel_func;
-    arg9 = obj7; /* our function is the baton. */
+    arg8 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg9 = obj7;
   }
   {
-    arg10 = svn_swig_py_notify_func2;
+    arg10 = (svn_wc_notify_func2_t) svn_swig_py_notify_func2;
     arg11 = obj8;
   }
   if (obj9) {
@@ -23119,7 +22304,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_resolved_conflict4(PyObject *SWIGUNUSEDPARM(se
   arg12 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOOOOOOOO|O:svn_wc_resolved_conflict4",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -23155,12 +22340,12 @@ SWIGINTERN PyObject *_wrap_svn_wc_resolved_conflict4(PyObject *SWIGUNUSEDPARM(se
     }
   }
   {
-    arg8 = svn_swig_py_notify_func2;
+    arg8 = (svn_wc_notify_func2_t) svn_swig_py_notify_func2;
     arg9 = obj7;
   }
   {
-    arg10 = svn_swig_py_cancel_func;
-    arg11 = obj8; /* our function is the baton. */
+    arg10 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg11 = obj8;
   }
   if (obj9) {
     /* Verify that the user supplied a valid pool */
@@ -23232,7 +22417,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_resolved_conflict3(PyObject *SWIGUNUSEDPARM(se
   arg11 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOOOOOOO|O:svn_wc_resolved_conflict3",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -23262,12 +22447,12 @@ SWIGINTERN PyObject *_wrap_svn_wc_resolved_conflict3(PyObject *SWIGUNUSEDPARM(se
     }
   }
   {
-    arg7 = svn_swig_py_notify_func2;
+    arg7 = (svn_wc_notify_func2_t) svn_swig_py_notify_func2;
     arg8 = obj6;
   }
   {
-    arg9 = svn_swig_py_cancel_func;
-    arg10 = obj7; /* our function is the baton. */
+    arg9 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg10 = obj7;
   }
   if (obj8) {
     /* Verify that the user supplied a valid pool */
@@ -23337,7 +22522,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_resolved_conflict2(PyObject *SWIGUNUSEDPARM(se
   arg10 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOOOOOO|O:svn_wc_resolved_conflict2",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -23361,12 +22546,12 @@ SWIGINTERN PyObject *_wrap_svn_wc_resolved_conflict2(PyObject *SWIGUNUSEDPARM(se
     }
   }
   {
-    arg6 = svn_swig_py_notify_func2;
+    arg6 = (svn_wc_notify_func2_t) svn_swig_py_notify_func2;
     arg7 = obj5;
   }
   {
-    arg8 = svn_swig_py_cancel_func;
-    arg9 = obj6; /* our function is the baton. */
+    arg8 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg9 = obj6;
   }
   if (obj7) {
     /* Verify that the user supplied a valid pool */
@@ -23433,7 +22618,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_resolved_conflict(PyObject *SWIGUNUSEDPARM(sel
   arg8 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOOOOO|O:svn_wc_resolved_conflict",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -23457,7 +22642,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_resolved_conflict(PyObject *SWIGUNUSEDPARM(sel
     }
   }
   {
-    arg6 = svn_swig_py_notify_func;
+    arg6 = (svn_wc_notify_func_t) svn_swig_py_notify_func;
     arg7 = obj5;
   }
   if (obj6) {
@@ -23528,7 +22713,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_committed_queue_create(PyObject *SWIGUNUSEDPAR
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_wc_committed_queue_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_wc_committed_queue_t,
     _global_py_pool, args);
   {
     Py_XDECREF(_global_py_pool);
@@ -23542,6 +22727,130 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_wc_queue_committed4(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  svn_wc_committed_queue_t *arg1 = (svn_wc_committed_queue_t *) 0 ;
+  svn_wc_context_t *arg2 = (svn_wc_context_t *) 0 ;
+  char *arg3 = (char *) 0 ;
+  svn_boolean_t arg4 ;
+  svn_boolean_t arg5 ;
+  apr_array_header_t *arg6 = (apr_array_header_t *) 0 ;
+  svn_boolean_t arg7 ;
+  svn_boolean_t arg8 ;
+  svn_checksum_t *arg9 = (svn_checksum_t *) 0 ;
+  apr_pool_t *arg10 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  PyObject * obj5 = 0 ;
+  PyObject * obj6 = 0 ;
+  PyObject * obj7 = 0 ;
+  PyObject * obj8 = 0 ;
+  PyObject * obj9 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg10 = _global_pool;
+  if (!PyArg_ParseTuple(args,(char *)"OOsOOOOOO|O:svn_wc_queue_committed4",&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
+  {
+    arg1 = (svn_wc_committed_queue_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_committed_queue_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg2 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj1);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg4 = (svn_boolean_t)SWIG_As_long (obj3);
+    if (SWIG_arg_fail(svn_argnum_obj3)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg5 = (svn_boolean_t)SWIG_As_long (obj4);
+    if (SWIG_arg_fail(svn_argnum_obj4)) {
+      SWIG_fail;
+    }
+  }
+  {
+    if (_global_pool == NULL)
+    {
+      if (svn_swig_py_get_parent_pool(args, SWIGTYPE_p_apr_pool_t,
+          &_global_py_pool, &_global_pool))
+      SWIG_fail;
+    }
+    
+    arg6 = svn_swig_py_proparray_from_dict(obj5, _global_pool);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg7 = (svn_boolean_t)SWIG_As_long (obj6);
+    if (SWIG_arg_fail(svn_argnum_obj6)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg8 = (svn_boolean_t)SWIG_As_long (obj7);
+    if (SWIG_arg_fail(svn_argnum_obj7)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg9 = (svn_checksum_t *)svn_swig_py_must_get_ptr(obj8, SWIGTYPE_p_svn_checksum_t, svn_argnum_obj8);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  if (obj9) {
+    /* Verify that the user supplied a valid pool */
+    if (obj9 != Py_None && obj9 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj9);
+      SWIG_arg_fail(svn_argnum_obj9);
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_wc_queue_committed4(arg1,arg2,(char const *)arg3,arg4,arg5,(apr_array_header_t const *)arg6,arg7,arg8,(struct svn_checksum_t const *)arg9,arg10);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_svn_wc_queue_committed3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   svn_wc_committed_queue_t *arg1 = (svn_wc_committed_queue_t *) 0 ;
@@ -23571,13 +22880,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_queue_committed3(PyObject *SWIGUNUSEDPARM(self
   arg9 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOsOOOOO|O:svn_wc_queue_committed3",&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   {
-    arg1 = (svn_wc_committed_queue_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_committed_queue_t, svn_argnum_obj0);
+    arg1 = (svn_wc_committed_queue_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_committed_queue_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj1);
+    arg2 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -23614,7 +22923,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_queue_committed3(PyObject *SWIGUNUSEDPARM(self
     }
   }
   {
-    arg8 = (svn_checksum_t *)svn_swig_MustGetPtr(obj7, SWIGTYPE_p_svn_checksum_t, svn_argnum_obj7);
+    arg8 = (svn_checksum_t *)svn_swig_py_must_get_ptr(obj7, SWIGTYPE_p_svn_checksum_t, svn_argnum_obj7);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -23687,13 +22996,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_queue_committed2(PyObject *SWIGUNUSEDPARM(self
   arg9 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OsOOOOOO|O:svn_wc_queue_committed2",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   {
-    arg1 = (svn_wc_committed_queue_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_committed_queue_t, svn_argnum_obj0);
+    arg1 = (svn_wc_committed_queue_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_committed_queue_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj2);
+    arg3 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -23730,7 +23039,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_queue_committed2(PyObject *SWIGUNUSEDPARM(self
     }
   }
   {
-    arg8 = (svn_checksum_t *)svn_swig_MustGetPtr(obj7, SWIGTYPE_p_svn_checksum_t, svn_argnum_obj7);
+    arg8 = (svn_checksum_t *)svn_swig_py_must_get_ptr(obj7, SWIGTYPE_p_svn_checksum_t, svn_argnum_obj7);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -23804,7 +23113,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_queue_committed(PyObject *SWIGUNUSEDPARM(self)
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"sOOOOOO|O:svn_wc_queue_committed",&arg2,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
-    arg3 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg3 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -23876,7 +23185,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_queue_committed(PyObject *SWIGUNUSEDPARM(self)
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_wc_committed_queue_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_wc_committed_queue_t,
         _global_py_pool, args))
     
     ;
@@ -23919,13 +23228,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_process_committed_queue2(PyObject *SWIGUNUSEDP
   arg8 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOOzzO|O:svn_wc_process_committed_queue2",&obj0,&obj1,&obj2,&arg4,&arg5,&obj5,&obj6)) SWIG_fail;
   {
-    arg1 = (svn_wc_committed_queue_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_committed_queue_t, svn_argnum_obj0);
+    arg1 = (svn_wc_committed_queue_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_committed_queue_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj1);
+    arg2 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -23937,8 +23246,8 @@ SWIGINTERN PyObject *_wrap_svn_wc_process_committed_queue2(PyObject *SWIGUNUSEDP
     }
   }
   {
-    arg6 = svn_swig_py_cancel_func;
-    arg7 = obj5; /* our function is the baton. */
+    arg6 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg7 = obj5;
   }
   if (obj6) {
     /* Verify that the user supplied a valid pool */
@@ -24001,13 +23310,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_process_committed_queue(PyObject *SWIGUNUSEDPA
   arg6 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOOzz|O:svn_wc_process_committed_queue",&obj0,&obj1,&obj2,&arg4,&arg5,&obj5)) SWIG_fail;
   {
-    arg1 = (svn_wc_committed_queue_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_committed_queue_t, svn_argnum_obj0);
+    arg1 = (svn_wc_committed_queue_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_committed_queue_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -24088,7 +23397,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_process_committed4(PyObject *SWIGUNUSEDPARM(se
   arg11 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOOOzzOOOO|O:svn_wc_process_committed4",&arg1,&obj1,&obj2,&obj3,&arg5,&arg6,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -24207,7 +23516,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_process_committed3(PyObject *SWIGUNUSEDPARM(se
   arg10 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOOOzzOOO|O:svn_wc_process_committed3",&arg1,&obj1,&obj2,&obj3,&arg5,&arg6,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -24318,7 +23627,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_process_committed2(PyObject *SWIGUNUSEDPARM(se
   arg9 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOOOzzOO|O:svn_wc_process_committed2",&arg1,&obj1,&obj2,&obj3,&arg5,&arg6,&obj6,&obj7,&obj8)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -24418,7 +23727,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_process_committed(PyObject *SWIGUNUSEDPARM(sel
   arg8 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOOOzzO|O:svn_wc_process_committed",&arg1,&obj1,&obj2,&obj3,&arg5,&arg6,&obj6,&obj7)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -24524,13 +23833,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_crawl_revisions5(PyObject *SWIGUNUSEDPARM(self
   arg14 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OsOOOOOOOOO|O:svn_wc_crawl_revisions5",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11)) SWIG_fail;
   {
-    arg1 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
+    arg1 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_ra_reporter3_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_ra_reporter3_t, svn_argnum_obj2);
+    arg3 = (svn_ra_reporter3_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_ra_reporter3_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -24574,11 +23883,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_crawl_revisions5(PyObject *SWIGUNUSEDPARM(self
     }
   }
   {
-    arg10 = svn_swig_py_cancel_func;
-    arg11 = obj9; /* our function is the baton. */
+    arg10 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg11 = obj9;
   }
   {
-    arg12 = svn_swig_py_notify_func2;
+    arg12 = (svn_wc_notify_func2_t) svn_swig_py_notify_func2;
     arg13 = obj10;
   }
   if (obj11) {
@@ -24656,13 +23965,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_crawl_revisions4(PyObject *SWIGUNUSEDPARM(self
   arg13 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOOOOOOOOOO|O:svn_wc_crawl_revisions4",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_ra_reporter3_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_ra_reporter3_t, svn_argnum_obj2);
+    arg3 = (svn_ra_reporter3_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_ra_reporter3_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -24706,11 +24015,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_crawl_revisions4(PyObject *SWIGUNUSEDPARM(self
     }
   }
   {
-    arg10 = svn_swig_py_notify_func2;
+    arg10 = (svn_wc_notify_func2_t) svn_swig_py_notify_func2;
     arg11 = obj9;
   }
   {
-    arg12 = (svn_wc_traversal_info_t *)svn_swig_MustGetPtr(obj10, SWIGTYPE_p_svn_wc_traversal_info_t, svn_argnum_obj10);
+    arg12 = (svn_wc_traversal_info_t *)svn_swig_py_must_get_ptr(obj10, SWIGTYPE_p_svn_wc_traversal_info_t, svn_argnum_obj10);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -24788,13 +24097,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_crawl_revisions3(PyObject *SWIGUNUSEDPARM(self
   arg12 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOOOOOOOOO|O:svn_wc_crawl_revisions3",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_ra_reporter3_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_ra_reporter3_t, svn_argnum_obj2);
+    arg3 = (svn_ra_reporter3_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_ra_reporter3_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -24832,11 +24141,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_crawl_revisions3(PyObject *SWIGUNUSEDPARM(self
     }
   }
   {
-    arg9 = svn_swig_py_notify_func2;
+    arg9 = (svn_wc_notify_func2_t) svn_swig_py_notify_func2;
     arg10 = obj8;
   }
   {
-    arg11 = (svn_wc_traversal_info_t *)svn_swig_MustGetPtr(obj9, SWIGTYPE_p_svn_wc_traversal_info_t, svn_argnum_obj9);
+    arg11 = (svn_wc_traversal_info_t *)svn_swig_py_must_get_ptr(obj9, SWIGTYPE_p_svn_wc_traversal_info_t, svn_argnum_obj9);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -24911,13 +24220,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_crawl_revisions2(PyObject *SWIGUNUSEDPARM(self
   arg11 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOOOOOOO|O:svn_wc_crawl_revisions2",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_ra_reporter2_t *)&swig_py_ra_reporter2;
+    arg3 = (svn_ra_reporter2_t *) svn_swig_py_get_ra_reporter2();
     arg4 = obj2;
   }
   {
@@ -24939,11 +24248,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_crawl_revisions2(PyObject *SWIGUNUSEDPARM(self
     }
   }
   {
-    arg8 = svn_swig_py_notify_func2;
+    arg8 = (svn_wc_notify_func2_t) svn_swig_py_notify_func2;
     arg9 = obj6;
   }
   {
-    arg10 = (svn_wc_traversal_info_t *)svn_swig_MustGetPtr(obj7, SWIGTYPE_p_svn_wc_traversal_info_t, svn_argnum_obj7);
+    arg10 = (svn_wc_traversal_info_t *)svn_swig_py_must_get_ptr(obj7, SWIGTYPE_p_svn_wc_traversal_info_t, svn_argnum_obj7);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -25019,13 +24328,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_crawl_revisions(PyObject *SWIGUNUSEDPARM(self)
   arg11 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOOOOOOOO|O:svn_wc_crawl_revisions",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_ra_reporter_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_ra_reporter_t, svn_argnum_obj2);
+    arg3 = (svn_ra_reporter_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_ra_reporter_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -25057,11 +24366,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_crawl_revisions(PyObject *SWIGUNUSEDPARM(self)
     }
   }
   {
-    arg8 = svn_swig_py_notify_func;
+    arg8 = (svn_wc_notify_func_t) svn_swig_py_notify_func;
     arg9 = obj7;
   }
   {
-    arg10 = (svn_wc_traversal_info_t *)svn_swig_MustGetPtr(obj8, SWIGTYPE_p_svn_wc_traversal_info_t, svn_argnum_obj8);
+    arg10 = (svn_wc_traversal_info_t *)svn_swig_py_must_get_ptr(obj8, SWIGTYPE_p_svn_wc_traversal_info_t, svn_argnum_obj8);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -25134,7 +24443,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_check_root(PyObject *SWIGUNUSEDPARM(self), PyO
   arg3 = &temp3;
   if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_wc_check_root",&obj0,&arg5,&obj2)) SWIG_fail;
   {
-    arg4 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
+    arg4 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -25217,7 +24526,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_is_wc_root2(PyObject *SWIGUNUSEDPARM(self), Py
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_wc_is_wc_root2",&obj0,&arg3,&obj2)) SWIG_fail;
   {
-    arg2 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
+    arg2 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -25288,7 +24597,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_is_wc_root(PyObject *SWIGUNUSEDPARM(self), PyO
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_wc_is_wc_root",&arg2,&obj1,&obj2)) SWIG_fail;
   {
-    arg3 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg3 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -25367,7 +24676,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_actual_target2(PyObject *SWIGUNUSEDPARM(se
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"Os|OO:svn_wc_get_actual_target2",&obj0,&arg4,&obj2,&obj3)) SWIG_fail;
   {
-    arg3 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
+    arg3 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -25605,7 +24914,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_update_editor4(PyObject *SWIGUNUSEDPARM(se
   arg3 = &temp3;
   if (!PyArg_ParseTuple(args,(char *)"OssOOOOOOOzOOOOOOOOO|OO:svn_wc_get_update_editor4",&obj0,&arg5,&arg6,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&arg14,&obj11,&obj12,&obj13,&obj14,&obj15,&obj16,&obj17,&obj18,&obj19,&obj20,&obj21)) SWIG_fail;
   {
-    arg4 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
+    arg4 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -25663,7 +24972,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_update_editor4(PyObject *SWIGUNUSEDPARM(se
   }
   {
     svn_wc_dirents_func_t * tmp =
-    svn_swig_MustGetPtr(obj12, SWIGTYPE_p_p_f_p_void_p_p_apr_hash_t_p_q_const__char_p_q_const__char_p_apr_pool_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj12);
+    svn_swig_py_must_get_ptr(obj12, SWIGTYPE_p_p_f_p_void_p_p_apr_hash_t_p_q_const__char_p_q_const__char_p_apr_pool_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj12);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -25679,7 +24988,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_update_editor4(PyObject *SWIGUNUSEDPARM(se
   }
   {
     svn_wc_conflict_resolver_func2_t * tmp =
-    svn_swig_MustGetPtr(obj14, SWIGTYPE_p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj14);
+    svn_swig_py_must_get_ptr(obj14, SWIGTYPE_p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj14);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -25695,7 +25004,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_update_editor4(PyObject *SWIGUNUSEDPARM(se
   }
   {
     svn_wc_external_update_t * tmp =
-    svn_swig_MustGetPtr(obj16, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_string_t_p_q_const__svn_string_t_svn_depth_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj16);
+    svn_swig_py_must_get_ptr(obj16, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_string_t_p_q_const__svn_string_t_svn_depth_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj16);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -25710,11 +25019,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_update_editor4(PyObject *SWIGUNUSEDPARM(se
     }
   }
   {
-    arg22 = svn_swig_py_cancel_func;
-    arg23 = obj18; /* our function is the baton. */
+    arg22 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg23 = obj18;
   }
   {
-    arg24 = svn_swig_py_notify_func2;
+    arg24 = (svn_wc_notify_func2_t) svn_swig_py_notify_func2;
     arg25 = obj19;
   }
   if (obj20) {
@@ -25753,13 +25062,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_update_editor4(PyObject *SWIGUNUSEDPARM(se
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_delta_editor_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_delta_editor_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -25842,7 +25151,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_update_editor3(PyObject *SWIGUNUSEDPARM(se
   arg19 = &temp19;
   if (!PyArg_ParseTuple(args,(char *)"OsOOOOOOOOOOzOO|O:svn_wc_get_update_editor3",&obj0,&arg3,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&arg16,&obj13,&obj14,&obj15)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -25872,16 +25181,16 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_update_editor3(PyObject *SWIGUNUSEDPARM(se
     }
   }
   {
-    arg8 = svn_swig_py_notify_func2;
+    arg8 = (svn_wc_notify_func2_t) svn_swig_py_notify_func2;
     arg9 = obj6;
   }
   {
-    arg10 = svn_swig_py_cancel_func;
-    arg11 = obj7; /* our function is the baton. */
+    arg10 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg11 = obj7;
   }
   {
     svn_wc_conflict_resolver_func_t * tmp =
-    svn_swig_MustGetPtr(obj8, SWIGTYPE_p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj8);
+    svn_swig_py_must_get_ptr(obj8, SWIGTYPE_p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj8);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -25897,7 +25206,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_update_editor3(PyObject *SWIGUNUSEDPARM(se
   }
   {
     svn_wc_get_file_t * tmp =
-    svn_swig_MustGetPtr(obj10, SWIGTYPE_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_stream_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj10);
+    svn_swig_py_must_get_ptr(obj10, SWIGTYPE_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_stream_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj10);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -25921,7 +25230,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_update_editor3(PyObject *SWIGUNUSEDPARM(se
     SWIG_fail;
   }
   {
-    arg20 = (svn_wc_traversal_info_t *)svn_swig_MustGetPtr(obj14, SWIGTYPE_p_svn_wc_traversal_info_t, svn_argnum_obj14);
+    arg20 = (svn_wc_traversal_info_t *)svn_swig_py_must_get_ptr(obj14, SWIGTYPE_p_svn_wc_traversal_info_t, svn_argnum_obj14);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -25960,13 +25269,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_update_editor3(PyObject *SWIGUNUSEDPARM(se
     resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg1), SWIGTYPE_p_long, new_flags));
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg18, SWIGTYPE_p_svn_delta_editor_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg18, SWIGTYPE_p_svn_delta_editor_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg19, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg19, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -26023,7 +25332,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_update_editor2(PyObject *SWIGUNUSEDPARM(se
   arg12 = &temp12;
   if (!PyArg_ParseTuple(args,(char *)"OsOOOOzO|O:svn_wc_get_update_editor2",&obj0,&arg3,&obj2,&obj3,&obj4,&obj5,&arg10,&obj7,&obj8)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -26041,15 +25350,15 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_update_editor2(PyObject *SWIGUNUSEDPARM(se
     }
   }
   {
-    arg6 = svn_swig_py_notify_func2;
+    arg6 = (svn_wc_notify_func2_t) svn_swig_py_notify_func2;
     arg7 = obj4;
   }
   {
-    arg8 = svn_swig_py_cancel_func;
-    arg9 = obj5; /* our function is the baton. */
+    arg8 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg9 = obj5;
   }
   {
-    arg13 = (svn_wc_traversal_info_t *)svn_swig_MustGetPtr(obj7, SWIGTYPE_p_svn_wc_traversal_info_t, svn_argnum_obj7);
+    arg13 = (svn_wc_traversal_info_t *)svn_swig_py_must_get_ptr(obj7, SWIGTYPE_p_svn_wc_traversal_info_t, svn_argnum_obj7);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -26088,13 +25397,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_update_editor2(PyObject *SWIGUNUSEDPARM(se
     resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg1), SWIGTYPE_p_long, new_flags));
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg11, SWIGTYPE_p_svn_delta_editor_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg11, SWIGTYPE_p_svn_delta_editor_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg12, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg12, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -26151,7 +25460,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_update_editor(PyObject *SWIGUNUSEDPARM(sel
   arg12 = &temp12;
   if (!PyArg_ParseTuple(args,(char *)"OsOOOOzO|O:svn_wc_get_update_editor",&obj0,&arg3,&obj2,&obj3,&obj4,&obj5,&arg10,&obj7,&obj8)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -26169,15 +25478,15 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_update_editor(PyObject *SWIGUNUSEDPARM(sel
     }
   }
   {
-    arg6 = svn_swig_py_notify_func;
+    arg6 = (svn_wc_notify_func_t) svn_swig_py_notify_func;
     arg7 = obj4;
   }
   {
-    arg8 = svn_swig_py_cancel_func;
-    arg9 = obj5; /* our function is the baton. */
+    arg8 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg9 = obj5;
   }
   {
-    arg13 = (svn_wc_traversal_info_t *)svn_swig_MustGetPtr(obj7, SWIGTYPE_p_svn_wc_traversal_info_t, svn_argnum_obj7);
+    arg13 = (svn_wc_traversal_info_t *)svn_swig_py_must_get_ptr(obj7, SWIGTYPE_p_svn_wc_traversal_info_t, svn_argnum_obj7);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -26216,13 +25525,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_update_editor(PyObject *SWIGUNUSEDPARM(sel
     resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg1), SWIGTYPE_p_long, new_flags));
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg11, SWIGTYPE_p_svn_delta_editor_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg11, SWIGTYPE_p_svn_delta_editor_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg12, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg12, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -26305,7 +25614,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_switch_editor4(PyObject *SWIGUNUSEDPARM(se
   arg3 = &temp3;
   if (!PyArg_ParseTuple(args,(char *)"OsssOOOOOzOOOOOOOOO|OO:svn_wc_get_switch_editor4",&obj0,&arg5,&arg6,&arg7,&obj4,&obj5,&obj6,&obj7,&obj8,&arg13,&obj10,&obj11,&obj12,&obj13,&obj14,&obj15,&obj16,&obj17,&obj18,&obj19,&obj20)) SWIG_fail;
   {
-    arg4 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
+    arg4 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -26351,7 +25660,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_switch_editor4(PyObject *SWIGUNUSEDPARM(se
   }
   {
     svn_wc_dirents_func_t * tmp =
-    svn_swig_MustGetPtr(obj11, SWIGTYPE_p_p_f_p_void_p_p_apr_hash_t_p_q_const__char_p_q_const__char_p_apr_pool_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj11);
+    svn_swig_py_must_get_ptr(obj11, SWIGTYPE_p_p_f_p_void_p_p_apr_hash_t_p_q_const__char_p_q_const__char_p_apr_pool_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj11);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -26367,7 +25676,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_switch_editor4(PyObject *SWIGUNUSEDPARM(se
   }
   {
     svn_wc_conflict_resolver_func2_t * tmp =
-    svn_swig_MustGetPtr(obj13, SWIGTYPE_p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj13);
+    svn_swig_py_must_get_ptr(obj13, SWIGTYPE_p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj13);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -26383,7 +25692,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_switch_editor4(PyObject *SWIGUNUSEDPARM(se
   }
   {
     svn_wc_external_update_t * tmp =
-    svn_swig_MustGetPtr(obj15, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_string_t_p_q_const__svn_string_t_svn_depth_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj15);
+    svn_swig_py_must_get_ptr(obj15, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_string_t_p_q_const__svn_string_t_svn_depth_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj15);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -26398,11 +25707,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_switch_editor4(PyObject *SWIGUNUSEDPARM(se
     }
   }
   {
-    arg21 = svn_swig_py_cancel_func;
-    arg22 = obj17; /* our function is the baton. */
+    arg21 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg22 = obj17;
   }
   {
-    arg23 = svn_swig_py_notify_func2;
+    arg23 = (svn_wc_notify_func2_t) svn_swig_py_notify_func2;
     arg24 = obj18;
   }
   if (obj19) {
@@ -26441,13 +25750,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_switch_editor4(PyObject *SWIGUNUSEDPARM(se
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_delta_editor_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_delta_editor_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -26527,7 +25836,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_switch_editor3(PyObject *SWIGUNUSEDPARM(se
   arg18 = &temp18;
   if (!PyArg_ParseTuple(args,(char *)"OssOOOOOOOOzOO|O:svn_wc_get_switch_editor3",&obj0,&arg3,&arg4,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&arg15,&obj12,&obj13,&obj14)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -26557,16 +25866,16 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_switch_editor3(PyObject *SWIGUNUSEDPARM(se
     }
   }
   {
-    arg9 = svn_swig_py_notify_func2;
+    arg9 = (svn_wc_notify_func2_t) svn_swig_py_notify_func2;
     arg10 = obj7;
   }
   {
-    arg11 = svn_swig_py_cancel_func;
-    arg12 = obj8; /* our function is the baton. */
+    arg11 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg12 = obj8;
   }
   {
     svn_wc_conflict_resolver_func_t * tmp =
-    svn_swig_MustGetPtr(obj9, SWIGTYPE_p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj9);
+    svn_swig_py_must_get_ptr(obj9, SWIGTYPE_p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj9);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -26590,7 +25899,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_switch_editor3(PyObject *SWIGUNUSEDPARM(se
     SWIG_fail;
   }
   {
-    arg19 = (svn_wc_traversal_info_t *)svn_swig_MustGetPtr(obj13, SWIGTYPE_p_svn_wc_traversal_info_t, svn_argnum_obj13);
+    arg19 = (svn_wc_traversal_info_t *)svn_swig_py_must_get_ptr(obj13, SWIGTYPE_p_svn_wc_traversal_info_t, svn_argnum_obj13);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -26629,13 +25938,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_switch_editor3(PyObject *SWIGUNUSEDPARM(se
     resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg1), SWIGTYPE_p_long, new_flags));
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg17, SWIGTYPE_p_svn_delta_editor_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg17, SWIGTYPE_p_svn_delta_editor_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg18, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg18, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -26693,7 +26002,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_switch_editor2(PyObject *SWIGUNUSEDPARM(se
   arg13 = &temp13;
   if (!PyArg_ParseTuple(args,(char *)"OssOOOOzO|O:svn_wc_get_switch_editor2",&obj0,&arg3,&arg4,&obj3,&obj4,&obj5,&obj6,&arg11,&obj8,&obj9)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -26711,15 +26020,15 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_switch_editor2(PyObject *SWIGUNUSEDPARM(se
     }
   }
   {
-    arg7 = svn_swig_py_notify_func2;
+    arg7 = (svn_wc_notify_func2_t) svn_swig_py_notify_func2;
     arg8 = obj5;
   }
   {
-    arg9 = svn_swig_py_cancel_func;
-    arg10 = obj6; /* our function is the baton. */
+    arg9 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg10 = obj6;
   }
   {
-    arg14 = (svn_wc_traversal_info_t *)svn_swig_MustGetPtr(obj8, SWIGTYPE_p_svn_wc_traversal_info_t, svn_argnum_obj8);
+    arg14 = (svn_wc_traversal_info_t *)svn_swig_py_must_get_ptr(obj8, SWIGTYPE_p_svn_wc_traversal_info_t, svn_argnum_obj8);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -26758,13 +26067,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_switch_editor2(PyObject *SWIGUNUSEDPARM(se
     resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg1), SWIGTYPE_p_long, new_flags));
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg12, SWIGTYPE_p_svn_delta_editor_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg12, SWIGTYPE_p_svn_delta_editor_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg13, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg13, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -26822,7 +26131,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_switch_editor(PyObject *SWIGUNUSEDPARM(sel
   arg13 = &temp13;
   if (!PyArg_ParseTuple(args,(char *)"OssOOOOzO|O:svn_wc_get_switch_editor",&obj0,&arg3,&arg4,&obj3,&obj4,&obj5,&obj6,&arg11,&obj8,&obj9)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -26840,15 +26149,15 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_switch_editor(PyObject *SWIGUNUSEDPARM(sel
     }
   }
   {
-    arg7 = svn_swig_py_notify_func;
+    arg7 = (svn_wc_notify_func_t) svn_swig_py_notify_func;
     arg8 = obj5;
   }
   {
-    arg9 = svn_swig_py_cancel_func;
-    arg10 = obj6; /* our function is the baton. */
+    arg9 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg10 = obj6;
   }
   {
-    arg14 = (svn_wc_traversal_info_t *)svn_swig_MustGetPtr(obj8, SWIGTYPE_p_svn_wc_traversal_info_t, svn_argnum_obj8);
+    arg14 = (svn_wc_traversal_info_t *)svn_swig_py_must_get_ptr(obj8, SWIGTYPE_p_svn_wc_traversal_info_t, svn_argnum_obj8);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -26887,13 +26196,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_switch_editor(PyObject *SWIGUNUSEDPARM(sel
     resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg1), SWIGTYPE_p_long, new_flags));
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg12, SWIGTYPE_p_svn_delta_editor_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg12, SWIGTYPE_p_svn_delta_editor_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg13, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg13, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -26936,7 +26245,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_prop_list2(PyObject *SWIGUNUSEDPARM(self), PyO
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"Os|OO:svn_wc_prop_list2",&obj0,&arg3,&obj2,&obj3)) SWIG_fail;
   {
-    arg2 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
+    arg2 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27017,7 +26326,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_prop_list(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_wc_prop_list",&arg2,&obj1,&obj2)) SWIG_fail;
   {
-    arg3 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg3 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27090,7 +26399,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_pristine_props(PyObject *SWIGUNUSEDPARM(se
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"Os|OO:svn_wc_get_pristine_props",&obj0,&arg3,&obj2,&obj3)) SWIG_fail;
   {
-    arg2 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
+    arg2 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27178,7 +26487,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_prop_get2(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"Oss|OO:svn_wc_prop_get2",&obj0,&arg3,&arg4,&obj3,&obj4)) SWIG_fail;
   {
-    arg2 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
+    arg2 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27270,7 +26579,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_prop_get(PyObject *SWIGUNUSEDPARM(self), PyObj
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"ssO|O:svn_wc_prop_get",&arg2,&arg3,&obj2,&obj3)) SWIG_fail;
   {
-    arg4 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj2);
+    arg4 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27360,7 +26669,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_prop_set4(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg12 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OssOOOOOO|O:svn_wc_prop_set4",&obj0,&arg2,&arg3,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   {
-    arg1 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
+    arg1 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27391,17 +26700,17 @@ SWIGINTERN PyObject *_wrap_svn_wc_prop_set4(PyObject *SWIGUNUSEDPARM(self), PyOb
     }
   }
   {
-    arg7 = (apr_array_header_t *)svn_swig_MustGetPtr(obj6, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj6);
+    arg7 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj6, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj6);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg8 = svn_swig_py_cancel_func;
-    arg9 = obj7; /* our function is the baton. */
+    arg8 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg9 = obj7;
   }
   {
-    arg10 = svn_swig_py_notify_func2;
+    arg10 = (svn_wc_notify_func2_t) svn_swig_py_notify_func2;
     arg11 = obj8;
   }
   if (obj9) {
@@ -27482,7 +26791,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_prop_set3(PyObject *SWIGUNUSEDPARM(self), PyOb
     }
   }
   {
-    arg4 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj3);
+    arg4 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27494,7 +26803,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_prop_set3(PyObject *SWIGUNUSEDPARM(self), PyOb
     }
   }
   {
-    arg6 = svn_swig_py_notify_func2;
+    arg6 = (svn_wc_notify_func2_t) svn_swig_py_notify_func2;
     arg7 = obj5;
   }
   if (obj6) {
@@ -27572,7 +26881,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_prop_set2(PyObject *SWIGUNUSEDPARM(self), PyOb
     }
   }
   {
-    arg4 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj3);
+    arg4 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27656,7 +26965,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_prop_set(PyObject *SWIGUNUSEDPARM(self), PyObj
     }
   }
   {
-    arg4 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj3);
+    arg4 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27819,7 +27128,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_canonicalize_svn_prop(PyObject *SWIGUNUSEDPARM
   }
   {
     svn_wc_canonicalize_svn_prop_get_file_t * tmp =
-    svn_swig_MustGetPtr(obj5, SWIGTYPE_p_p_f_p_p_q_const__svn_string_t_p_svn_stream_t_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj5);
+    svn_swig_py_must_get_ptr(obj5, SWIGTYPE_p_p_f_p_p_q_const__svn_string_t_p_svn_stream_t_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj5);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27938,7 +27247,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_diff_editor6(PyObject *SWIGUNUSEDPARM(self
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"OssOOOOOOOOOOO|OO:svn_wc_get_diff_editor6",&obj0,&arg4,&arg5,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13,&obj14,&obj15)) SWIG_fail;
   {
-    arg3 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
+    arg3 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -27986,13 +27295,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_diff_editor6(PyObject *SWIGUNUSEDPARM(self
     }
   }
   {
-    arg13 = (apr_array_header_t *)svn_swig_MustGetPtr(obj10, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj10);
+    arg13 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj10, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj10);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg14 = (svn_wc_diff_callbacks4_t *)svn_swig_MustGetPtr(obj11, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj11);
+    arg14 = (svn_wc_diff_callbacks4_t *)svn_swig_py_must_get_ptr(obj11, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj11);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -28006,8 +27315,8 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_diff_editor6(PyObject *SWIGUNUSEDPARM(self
     }
   }
   {
-    arg16 = svn_swig_py_cancel_func;
-    arg17 = obj13; /* our function is the baton. */
+    arg16 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg17 = obj13;
   }
   if (obj14) {
     /* Verify that the user supplied a valid pool */
@@ -28045,13 +27354,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_diff_editor6(PyObject *SWIGUNUSEDPARM(self
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_delta_editor_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_delta_editor_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg2, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg2, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -28114,13 +27423,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_diff_editor5(PyObject *SWIGUNUSEDPARM(self
   arg13 = &temp13;
   if (!PyArg_ParseTuple(args,(char *)"OsOOOOOOOO|O:svn_wc_get_diff_editor5",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
   {
-    arg1 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
+    arg1 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_wc_diff_callbacks3_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_wc_diff_callbacks3_t, svn_argnum_obj2);
+    arg3 = (svn_wc_diff_callbacks3_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_wc_diff_callbacks3_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -28158,11 +27467,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_diff_editor5(PyObject *SWIGUNUSEDPARM(self
     }
   }
   {
-    arg9 = svn_swig_py_cancel_func;
-    arg10 = obj8; /* our function is the baton. */
+    arg9 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg10 = obj8;
   }
   {
-    arg11 = (apr_array_header_t *)svn_swig_MustGetPtr(obj9, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj9);
+    arg11 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj9, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj9);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -28195,13 +27504,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_diff_editor5(PyObject *SWIGUNUSEDPARM(self
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg12, SWIGTYPE_p_svn_delta_editor_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg12, SWIGTYPE_p_svn_delta_editor_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg13, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg13, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -28257,13 +27566,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_diff_editor4(PyObject *SWIGUNUSEDPARM(self
   arg13 = &temp13;
   if (!PyArg_ParseTuple(args,(char *)"OsOOOOOOO|O:svn_wc_get_diff_editor4",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   {
-    arg1 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
+    arg1 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = svn_swig_py_setup_wc_diff_callbacks2(&arg4, obj2,
+    arg3 = (svn_wc_diff_callbacks2_t *) svn_swig_py_setup_wc_diff_callbacks2(&arg4, obj2,
       _global_pool);
     arg4 = obj2;
   }
@@ -28292,11 +27601,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_diff_editor4(PyObject *SWIGUNUSEDPARM(self
     }
   }
   {
-    arg9 = svn_swig_py_cancel_func;
-    arg10 = obj7; /* our function is the baton. */
+    arg9 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg10 = obj7;
   }
   {
-    arg11 = (apr_array_header_t *)svn_swig_MustGetPtr(obj8, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj8);
+    arg11 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj8, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj8);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -28329,13 +27638,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_diff_editor4(PyObject *SWIGUNUSEDPARM(self
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg12, SWIGTYPE_p_svn_delta_editor_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg12, SWIGTYPE_p_svn_delta_editor_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg13, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg13, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -28389,13 +27698,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_diff_editor3(PyObject *SWIGUNUSEDPARM(self
   arg12 = &temp12;
   if (!PyArg_ParseTuple(args,(char *)"OsOOOOOO|O:svn_wc_get_diff_editor3",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   {
-    arg1 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
+    arg1 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = svn_swig_py_setup_wc_diff_callbacks2(&arg4, obj2,
+    arg3 = (svn_wc_diff_callbacks2_t *) svn_swig_py_setup_wc_diff_callbacks2(&arg4, obj2,
       _global_pool);
     arg4 = obj2;
   }
@@ -28424,8 +27733,8 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_diff_editor3(PyObject *SWIGUNUSEDPARM(self
     }
   }
   {
-    arg9 = svn_swig_py_cancel_func;
-    arg10 = obj7; /* our function is the baton. */
+    arg9 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg10 = obj7;
   }
   if (obj8) {
     /* Verify that the user supplied a valid pool */
@@ -28455,13 +27764,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_diff_editor3(PyObject *SWIGUNUSEDPARM(self
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg11, SWIGTYPE_p_svn_delta_editor_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg11, SWIGTYPE_p_svn_delta_editor_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg12, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg12, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -28516,13 +27825,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_diff_editor2(PyObject *SWIGUNUSEDPARM(self
   arg12 = &temp12;
   if (!PyArg_ParseTuple(args,(char *)"OsOOOOOOO|O:svn_wc_get_diff_editor2",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   {
-    arg1 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
+    arg1 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_wc_diff_callbacks_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_wc_diff_callbacks_t, svn_argnum_obj2);
+    arg3 = (svn_wc_diff_callbacks_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_wc_diff_callbacks_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -28560,8 +27869,8 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_diff_editor2(PyObject *SWIGUNUSEDPARM(self
     }
   }
   {
-    arg9 = svn_swig_py_cancel_func;
-    arg10 = obj8; /* our function is the baton. */
+    arg9 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg10 = obj8;
   }
   if (obj9) {
     /* Verify that the user supplied a valid pool */
@@ -28591,13 +27900,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_diff_editor2(PyObject *SWIGUNUSEDPARM(self
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg11, SWIGTYPE_p_svn_delta_editor_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg11, SWIGTYPE_p_svn_delta_editor_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg12, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg12, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -28650,13 +27959,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_diff_editor(PyObject *SWIGUNUSEDPARM(self)
   arg11 = &temp11;
   if (!PyArg_ParseTuple(args,(char *)"OsOOOOOO|O:svn_wc_get_diff_editor",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
   {
-    arg1 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
+    arg1 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_wc_diff_callbacks_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_wc_diff_callbacks_t, svn_argnum_obj2);
+    arg3 = (svn_wc_diff_callbacks_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_wc_diff_callbacks_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -28688,8 +27997,8 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_diff_editor(PyObject *SWIGUNUSEDPARM(self)
     }
   }
   {
-    arg8 = svn_swig_py_cancel_func;
-    arg9 = obj7; /* our function is the baton. */
+    arg8 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg9 = obj7;
   }
   if (obj8) {
     /* Verify that the user supplied a valid pool */
@@ -28719,13 +28028,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_diff_editor(PyObject *SWIGUNUSEDPARM(self)
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg10, SWIGTYPE_p_svn_delta_editor_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg10, SWIGTYPE_p_svn_delta_editor_t,
         _global_py_pool, args))
     
     ;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg11, SWIGTYPE_p_void,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg11, SWIGTYPE_p_void,
         _global_py_pool, args))
     
     ;
@@ -28776,13 +28085,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff6(PyObject *SWIGUNUSEDPARM(self), PyObject
   arg12 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OsOOOOOOOO|O:svn_wc_diff6",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10)) SWIG_fail;
   {
-    arg1 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
+    arg1 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_wc_diff_callbacks4_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj2);
+    arg3 = (svn_wc_diff_callbacks4_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -28820,14 +28129,14 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff6(PyObject *SWIGUNUSEDPARM(self), PyObject
     }
   }
   {
-    arg9 = (apr_array_header_t *)svn_swig_MustGetPtr(obj8, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj8);
+    arg9 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj8, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj8);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg10 = svn_swig_py_cancel_func;
-    arg11 = obj9; /* our function is the baton. */
+    arg10 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg11 = obj9;
   }
   if (obj10) {
     /* Verify that the user supplied a valid pool */
@@ -28895,13 +28204,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff5(PyObject *SWIGUNUSEDPARM(self), PyObject
   arg8 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OsOOOOO|O:svn_wc_diff5",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
-    arg1 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
+    arg1 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_wc_diff_callbacks3_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_wc_diff_callbacks3_t, svn_argnum_obj2);
+    arg3 = (svn_wc_diff_callbacks3_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_wc_diff_callbacks3_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -28927,7 +28236,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff5(PyObject *SWIGUNUSEDPARM(self), PyObject
     }
   }
   {
-    arg7 = (apr_array_header_t *)svn_swig_MustGetPtr(obj6, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj6);
+    arg7 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj6, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj6);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -28997,13 +28306,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff4(PyObject *SWIGUNUSEDPARM(self), PyObject
   arg8 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OsOOOO|O:svn_wc_diff4",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
-    arg1 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
+    arg1 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = svn_swig_py_setup_wc_diff_callbacks2(&arg4, obj2,
+    arg3 = (svn_wc_diff_callbacks2_t *) svn_swig_py_setup_wc_diff_callbacks2(&arg4, obj2,
       _global_pool);
     arg4 = obj2;
   }
@@ -29020,7 +28329,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff4(PyObject *SWIGUNUSEDPARM(self), PyObject
     }
   }
   {
-    arg7 = (apr_array_header_t *)svn_swig_MustGetPtr(obj5, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj5);
+    arg7 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj5, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj5);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -29088,13 +28397,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff3(PyObject *SWIGUNUSEDPARM(self), PyObject
   arg7 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OsOOO|O:svn_wc_diff3",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
-    arg1 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
+    arg1 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = svn_swig_py_setup_wc_diff_callbacks2(&arg4, obj2,
+    arg3 = (svn_wc_diff_callbacks2_t *) svn_swig_py_setup_wc_diff_callbacks2(&arg4, obj2,
       _global_pool);
     arg4 = obj2;
   }
@@ -29174,13 +28483,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff2(PyObject *SWIGUNUSEDPARM(self), PyObject
   arg7 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OsOOOO|O:svn_wc_diff2",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
-    arg1 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
+    arg1 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_wc_diff_callbacks_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_wc_diff_callbacks_t, svn_argnum_obj2);
+    arg3 = (svn_wc_diff_callbacks_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_wc_diff_callbacks_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -29267,13 +28576,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff(PyObject *SWIGUNUSEDPARM(self), PyObject
   arg6 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OsOOO|O:svn_wc_diff",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
-    arg1 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
+    arg1 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_wc_diff_callbacks_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_wc_diff_callbacks_t, svn_argnum_obj2);
+    arg3 = (svn_wc_diff_callbacks_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_wc_diff_callbacks_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -29360,7 +28669,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_prop_diffs2(PyObject *SWIGUNUSEDPARM(self)
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"Os|OO:svn_wc_get_prop_diffs2",&obj0,&arg4,&obj2,&obj3)) SWIG_fail;
   {
-    arg3 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
+    arg3 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -29447,7 +28756,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_prop_diffs(PyObject *SWIGUNUSEDPARM(self),
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_wc_get_prop_diffs",&arg3,&obj1,&obj2)) SWIG_fail;
   {
-    arg4 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg4 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -29545,25 +28854,25 @@ SWIGINTERN PyObject *_wrap_svn_wc_merge5(PyObject *SWIGUNUSEDPARM(self), PyObjec
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OOssssssOOOzOOOOOO|O:svn_wc_merge5",&obj0,&obj1,&arg4,&arg5,&arg6,&arg7,&arg8,&arg9,&obj8,&obj9,&obj10,&arg13,&obj12,&obj13,&obj14,&obj15,&obj16,&obj17,&obj18)) SWIG_fail;
   {
-    arg2 = (enum svn_wc_notify_state_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj0);
+    arg2 = (enum svn_wc_notify_state_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj1);
+    arg3 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg10 = (svn_wc_conflict_version_t *)svn_swig_MustGetPtr(obj8, SWIGTYPE_p_svn_wc_conflict_version_t, svn_argnum_obj8);
+    arg10 = (svn_wc_conflict_version_t *)svn_swig_py_must_get_ptr(obj8, SWIGTYPE_p_svn_wc_conflict_version_t, svn_argnum_obj8);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg11 = (svn_wc_conflict_version_t *)svn_swig_MustGetPtr(obj9, SWIGTYPE_p_svn_wc_conflict_version_t, svn_argnum_obj9);
+    arg11 = (svn_wc_conflict_version_t *)svn_swig_py_must_get_ptr(obj9, SWIGTYPE_p_svn_wc_conflict_version_t, svn_argnum_obj9);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -29575,26 +28884,26 @@ SWIGINTERN PyObject *_wrap_svn_wc_merge5(PyObject *SWIGUNUSEDPARM(self), PyObjec
     }
   }
   {
-    arg14 = (apr_array_header_t *)svn_swig_MustGetPtr(obj12, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj12);
+    arg14 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj12, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj12);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg15 = (apr_hash_t *)svn_swig_MustGetPtr(obj13, SWIGTYPE_p_apr_hash_t, svn_argnum_obj13);
+    arg15 = (apr_hash_t *)svn_swig_py_must_get_ptr(obj13, SWIGTYPE_p_apr_hash_t, svn_argnum_obj13);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg16 = (apr_array_header_t *)svn_swig_MustGetPtr(obj14, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj14);
+    arg16 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj14, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj14);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
     svn_wc_conflict_resolver_func2_t * tmp =
-    svn_swig_MustGetPtr(obj15, SWIGTYPE_p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj15);
+    svn_swig_py_must_get_ptr(obj15, SWIGTYPE_p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj15);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -29609,8 +28918,8 @@ SWIGINTERN PyObject *_wrap_svn_wc_merge5(PyObject *SWIGUNUSEDPARM(self), PyObjec
     }
   }
   {
-    arg19 = svn_swig_py_cancel_func;
-    arg20 = obj17; /* our function is the baton. */
+    arg19 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg20 = obj17;
   }
   if (obj18) {
     /* Verify that the user supplied a valid pool */
@@ -29701,19 +29010,19 @@ SWIGINTERN PyObject *_wrap_svn_wc_merge4(PyObject *SWIGUNUSEDPARM(self), PyObjec
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OssssssOOOzOOOOO|O:svn_wc_merge4",&obj0,&arg3,&arg4,&arg5,&arg6,&arg7,&arg8,&obj7,&obj8,&obj9,&arg12,&obj11,&obj12,&obj13,&obj14,&obj15,&obj16)) SWIG_fail;
   {
-    arg2 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
+    arg2 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg9 = (svn_wc_conflict_version_t *)svn_swig_MustGetPtr(obj7, SWIGTYPE_p_svn_wc_conflict_version_t, svn_argnum_obj7);
+    arg9 = (svn_wc_conflict_version_t *)svn_swig_py_must_get_ptr(obj7, SWIGTYPE_p_svn_wc_conflict_version_t, svn_argnum_obj7);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg10 = (svn_wc_conflict_version_t *)svn_swig_MustGetPtr(obj8, SWIGTYPE_p_svn_wc_conflict_version_t, svn_argnum_obj8);
+    arg10 = (svn_wc_conflict_version_t *)svn_swig_py_must_get_ptr(obj8, SWIGTYPE_p_svn_wc_conflict_version_t, svn_argnum_obj8);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -29725,20 +29034,20 @@ SWIGINTERN PyObject *_wrap_svn_wc_merge4(PyObject *SWIGUNUSEDPARM(self), PyObjec
     }
   }
   {
-    arg13 = (apr_array_header_t *)svn_swig_MustGetPtr(obj11, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj11);
+    arg13 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj11, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj11);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg14 = (apr_array_header_t *)svn_swig_MustGetPtr(obj12, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj12);
+    arg14 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj12, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj12);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
     svn_wc_conflict_resolver_func2_t * tmp =
-    svn_swig_MustGetPtr(obj13, SWIGTYPE_p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj13);
+    svn_swig_py_must_get_ptr(obj13, SWIGTYPE_p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj13);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -29753,8 +29062,8 @@ SWIGINTERN PyObject *_wrap_svn_wc_merge4(PyObject *SWIGUNUSEDPARM(self), PyObjec
     }
   }
   {
-    arg17 = svn_swig_py_cancel_func;
-    arg18 = obj15; /* our function is the baton. */
+    arg17 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg18 = obj15;
   }
   if (obj16) {
     /* Verify that the user supplied a valid pool */
@@ -29838,7 +29147,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_merge3(PyObject *SWIGUNUSEDPARM(self), PyObjec
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"sssOsssOzOOOO|O:svn_wc_merge3",&arg2,&arg3,&arg4,&obj3,&arg6,&arg7,&arg8,&obj7,&arg10,&obj9,&obj10,&obj11,&obj12,&obj13)) SWIG_fail;
   {
-    arg5 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj3);
+    arg5 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -29850,20 +29159,20 @@ SWIGINTERN PyObject *_wrap_svn_wc_merge3(PyObject *SWIGUNUSEDPARM(self), PyObjec
     }
   }
   {
-    arg11 = (apr_array_header_t *)svn_swig_MustGetPtr(obj9, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj9);
+    arg11 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj9, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj9);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg12 = (apr_array_header_t *)svn_swig_MustGetPtr(obj10, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj10);
+    arg12 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj10, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj10);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
     svn_wc_conflict_resolver_func_t * tmp =
-    svn_swig_MustGetPtr(obj11, SWIGTYPE_p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj11);
+    svn_swig_py_must_get_ptr(obj11, SWIGTYPE_p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj11);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -29953,7 +29262,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_merge2(PyObject *SWIGUNUSEDPARM(self), PyObjec
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"sssOsssOzO|O:svn_wc_merge2",&arg2,&arg3,&arg4,&obj3,&arg6,&arg7,&arg8,&obj7,&arg10,&obj9,&obj10)) SWIG_fail;
   {
-    arg5 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj3);
+    arg5 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -29965,7 +29274,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_merge2(PyObject *SWIGUNUSEDPARM(self), PyObjec
     }
   }
   {
-    arg11 = (apr_array_header_t *)svn_swig_MustGetPtr(obj9, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj9);
+    arg11 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj9, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj9);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -30044,7 +29353,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_merge(PyObject *SWIGUNUSEDPARM(self), PyObject
   arg9 = &temp9;
   if (!PyArg_ParseTuple(args,(char *)"sssOsssOz|O:svn_wc_merge",&arg1,&arg2,&arg3,&obj3,&arg5,&arg6,&arg7,&obj7,&arg10,&obj9)) SWIG_fail;
   {
-    arg4 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj3);
+    arg4 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -30136,25 +29445,25 @@ SWIGINTERN PyObject *_wrap_svn_wc_merge_props3(PyObject *SWIGUNUSEDPARM(self), P
   arg13 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OOsOOOOOOOO|O:svn_wc_merge_props3",&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11)) SWIG_fail;
   {
-    arg1 = (svn_wc_notify_state_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj0);
+    arg1 = (svn_wc_notify_state_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj1);
+    arg2 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (svn_wc_conflict_version_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_wc_conflict_version_t, svn_argnum_obj3);
+    arg4 = (svn_wc_conflict_version_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_wc_conflict_version_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg5 = (svn_wc_conflict_version_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_svn_wc_conflict_version_t, svn_argnum_obj4);
+    arg5 = (svn_wc_conflict_version_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_svn_wc_conflict_version_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -30173,7 +29482,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_merge_props3(PyObject *SWIGUNUSEDPARM(self), P
     }
   }
   {
-    arg7 = (apr_array_header_t *)svn_swig_MustGetPtr(obj6, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj6);
+    arg7 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj6, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj6);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -30186,7 +29495,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_merge_props3(PyObject *SWIGUNUSEDPARM(self), P
   }
   {
     svn_wc_conflict_resolver_func2_t * tmp =
-    svn_swig_MustGetPtr(obj8, SWIGTYPE_p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj8);
+    svn_swig_py_must_get_ptr(obj8, SWIGTYPE_p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj8);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -30201,8 +29510,8 @@ SWIGINTERN PyObject *_wrap_svn_wc_merge_props3(PyObject *SWIGUNUSEDPARM(self), P
     }
   }
   {
-    arg11 = svn_swig_py_cancel_func;
-    arg12 = obj10; /* our function is the baton. */
+    arg11 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg12 = obj10;
   }
   if (obj11) {
     /* Verify that the user supplied a valid pool */
@@ -30274,13 +29583,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_merge_props2(PyObject *SWIGUNUSEDPARM(self), P
   arg10 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OsOOOOOOO|O:svn_wc_merge_props2",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
   {
-    arg1 = (svn_wc_notify_state_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj0);
+    arg1 = (svn_wc_notify_state_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj2);
+    arg3 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -30299,7 +29608,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_merge_props2(PyObject *SWIGUNUSEDPARM(self), P
     }
   }
   {
-    arg5 = (apr_array_header_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj4);
+    arg5 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -30318,7 +29627,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_merge_props2(PyObject *SWIGUNUSEDPARM(self), P
   }
   {
     svn_wc_conflict_resolver_func_t * tmp =
-    svn_swig_MustGetPtr(obj7, SWIGTYPE_p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj7);
+    svn_swig_py_must_get_ptr(obj7, SWIGTYPE_p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj7);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -30398,13 +29707,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_merge_props(PyObject *SWIGUNUSEDPARM(self), Py
   arg8 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OsOOOOO|O:svn_wc_merge_props",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
-    arg1 = (svn_wc_notify_state_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj0);
+    arg1 = (svn_wc_notify_state_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj2);
+    arg3 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -30423,7 +29732,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_merge_props(PyObject *SWIGUNUSEDPARM(self), Py
     }
   }
   {
-    arg5 = (apr_array_header_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj4);
+    arg5 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -30504,19 +29813,19 @@ SWIGINTERN PyObject *_wrap_svn_wc_merge_prop_diffs(PyObject *SWIGUNUSEDPARM(self
   arg7 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OsOOOO|O:svn_wc_merge_prop_diffs",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
-    arg1 = (svn_wc_notify_state_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj0);
+    arg1 = (svn_wc_notify_state_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj2);
+    arg3 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (apr_array_header_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj3);
+    arg4 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -30598,7 +29907,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_pristine_contents2(PyObject *SWIGUNUSEDPAR
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"Os|OO:svn_wc_get_pristine_contents2",&obj0,&arg3,&obj2,&obj3)) SWIG_fail;
   {
-    arg2 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
+    arg2 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -30639,7 +29948,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_pristine_contents2(PyObject *SWIGUNUSEDPAR
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_stream_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_stream_t,
         _global_py_pool, args))
     
     ;
@@ -30721,7 +30030,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_pristine_contents(PyObject *SWIGUNUSEDPARM
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_stream_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_stream_t,
         _global_py_pool, args))
     
     ;
@@ -30813,6 +30122,113 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_wc_cleanup4(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  svn_wc_context_t *arg1 = (svn_wc_context_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  svn_boolean_t arg3 ;
+  svn_boolean_t arg4 ;
+  svn_boolean_t arg5 ;
+  svn_boolean_t arg6 ;
+  svn_cancel_func_t arg7 = (svn_cancel_func_t) 0 ;
+  void *arg8 = (void *) 0 ;
+  svn_wc_notify_func2_t arg9 = (svn_wc_notify_func2_t) 0 ;
+  void *arg10 = (void *) 0 ;
+  apr_pool_t *arg11 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  PyObject * obj5 = 0 ;
+  PyObject * obj6 = 0 ;
+  PyObject * obj7 = 0 ;
+  PyObject * obj8 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg11 = _global_pool;
+  if (!PyArg_ParseTuple(args,(char *)"OsOOOOOO|O:svn_wc_cleanup4",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
+  {
+    arg1 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg3 = (svn_boolean_t)SWIG_As_long (obj2);
+    if (SWIG_arg_fail(svn_argnum_obj2)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg4 = (svn_boolean_t)SWIG_As_long (obj3);
+    if (SWIG_arg_fail(svn_argnum_obj3)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg5 = (svn_boolean_t)SWIG_As_long (obj4);
+    if (SWIG_arg_fail(svn_argnum_obj4)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg6 = (svn_boolean_t)SWIG_As_long (obj5);
+    if (SWIG_arg_fail(svn_argnum_obj5)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg7 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg8 = obj6;
+  }
+  {
+    arg9 = (svn_wc_notify_func2_t) svn_swig_py_notify_func2;
+    arg10 = obj7;
+  }
+  if (obj8) {
+    /* Verify that the user supplied a valid pool */
+    if (obj8 != Py_None && obj8 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj8);
+      SWIG_arg_fail(svn_argnum_obj8);
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_wc_cleanup4(arg1,(char const *)arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_svn_wc_cleanup3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   svn_wc_context_t *arg1 = (svn_wc_context_t *) 0 ;
@@ -30833,14 +30249,14 @@ SWIGINTERN PyObject *_wrap_svn_wc_cleanup3(PyObject *SWIGUNUSEDPARM(self), PyObj
   arg5 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OsO|O:svn_wc_cleanup3",&obj0,&arg2,&obj2,&obj3)) SWIG_fail;
   {
-    arg1 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
+    arg1 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = svn_swig_py_cancel_func;
-    arg4 = obj2; /* our function is the baton. */
+    arg3 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg4 = obj2;
   }
   if (obj3) {
     /* Verify that the user supplied a valid pool */
@@ -30900,8 +30316,8 @@ SWIGINTERN PyObject *_wrap_svn_wc_cleanup2(PyObject *SWIGUNUSEDPARM(self), PyObj
   arg5 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"szO|O:svn_wc_cleanup2",&arg1,&arg2,&obj2,&obj3)) SWIG_fail;
   {
-    arg3 = svn_swig_py_cancel_func;
-    arg4 = obj2; /* our function is the baton. */
+    arg3 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg4 = obj2;
   }
   if (obj3) {
     /* Verify that the user supplied a valid pool */
@@ -30963,14 +30379,14 @@ SWIGINTERN PyObject *_wrap_svn_wc_cleanup(PyObject *SWIGUNUSEDPARM(self), PyObje
   arg6 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOzO|O:svn_wc_cleanup",&arg1,&obj1,&arg3,&obj3,&obj4)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = svn_swig_py_cancel_func;
-    arg5 = obj3; /* our function is the baton. */
+    arg4 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg5 = obj3;
   }
   if (obj4) {
     /* Verify that the user supplied a valid pool */
@@ -31038,14 +30454,14 @@ SWIGINTERN PyObject *_wrap_svn_wc_upgrade(PyObject *SWIGUNUSEDPARM(self), PyObje
   arg9 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OsOOOO|O:svn_wc_upgrade",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
-    arg1 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
+    arg1 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
     svn_wc_upgrade_get_repos_info_t * tmp =
-    svn_swig_MustGetPtr(obj2, SWIGTYPE_p_p_f_p_p_q_const__char_p_p_q_const__char_p_void_p_q_const__char_p_apr_pool_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj2);
+    svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_p_f_p_p_q_const__char_p_p_q_const__char_p_void_p_q_const__char_p_apr_pool_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj2);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -31060,11 +30476,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_upgrade(PyObject *SWIGUNUSEDPARM(self), PyObje
     }
   }
   {
-    arg5 = svn_swig_py_cancel_func;
-    arg6 = obj4; /* our function is the baton. */
+    arg5 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg6 = obj4;
   }
   {
-    arg7 = svn_swig_py_notify_func2;
+    arg7 = (svn_wc_notify_func2_t) svn_swig_py_notify_func2;
     arg8 = obj5;
   }
   if (obj6) {
@@ -31129,14 +30545,14 @@ SWIGINTERN PyObject *_wrap_svn_wc_relocate4(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg7 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OsssOO|O:svn_wc_relocate4",&obj0,&arg2,&arg3,&arg4,&obj4,&obj5,&obj6)) SWIG_fail;
   {
-    arg1 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
+    arg1 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
     svn_wc_relocation_validator3_t * tmp =
-    svn_swig_MustGetPtr(obj4, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, svn_argnum_obj4);
+    svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, svn_argnum_obj4);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -31214,7 +30630,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_relocate3(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg8 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOssOOO|O:svn_wc_relocate3",&arg1,&obj1,&arg3,&arg4,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -31227,7 +30643,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_relocate3(PyObject *SWIGUNUSEDPARM(self), PyOb
   }
   {
     svn_wc_relocation_validator3_t * tmp =
-    svn_swig_MustGetPtr(obj5, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, svn_argnum_obj5);
+    svn_swig_py_must_get_ptr(obj5, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, svn_argnum_obj5);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -31305,7 +30721,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_relocate2(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg8 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOssOOO|O:svn_wc_relocate2",&arg1,&obj1,&arg3,&arg4,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -31318,7 +30734,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_relocate2(PyObject *SWIGUNUSEDPARM(self), PyOb
   }
   {
     svn_wc_relocation_validator2_t * tmp =
-    svn_swig_MustGetPtr(obj5, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj5);
+    svn_swig_py_must_get_ptr(obj5, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj5);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -31396,7 +30812,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_relocate(PyObject *SWIGUNUSEDPARM(self), PyObj
   arg8 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOssOOO|O:svn_wc_relocate",&arg1,&obj1,&arg3,&arg4,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -31409,7 +30825,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_relocate(PyObject *SWIGUNUSEDPARM(self), PyObj
   }
   {
     svn_wc_relocation_validator_t * tmp =
-    svn_swig_MustGetPtr(obj5, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char__p_svn_error_t, svn_argnum_obj5);
+    svn_swig_py_must_get_ptr(obj5, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char__p_svn_error_t, svn_argnum_obj5);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -31462,6 +30878,121 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_svn_wc_revert5(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  svn_wc_context_t *arg1 = (svn_wc_context_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  svn_depth_t arg3 ;
+  svn_boolean_t arg4 ;
+  apr_array_header_t *arg5 = (apr_array_header_t *) 0 ;
+  svn_boolean_t arg6 ;
+  svn_boolean_t arg7 ;
+  svn_cancel_func_t arg8 = (svn_cancel_func_t) 0 ;
+  void *arg9 = (void *) 0 ;
+  svn_wc_notify_func2_t arg10 = (svn_wc_notify_func2_t) 0 ;
+  void *arg11 = (void *) 0 ;
+  apr_pool_t *arg12 = (apr_pool_t *) 0 ;
+  apr_pool_t *_global_pool = NULL ;
+  PyObject *_global_py_pool = NULL ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  PyObject * obj5 = 0 ;
+  PyObject * obj6 = 0 ;
+  PyObject * obj7 = 0 ;
+  PyObject * obj8 = 0 ;
+  PyObject * obj9 = 0 ;
+  svn_error_t *result = 0 ;
+  
+  if (svn_swig_py_get_pool_arg(args, SWIGTYPE_p_apr_pool_t,
+      &_global_py_pool, &_global_pool))
+  SWIG_fail;
+  arg12 = _global_pool;
+  if (!PyArg_ParseTuple(args,(char *)"OsOOOOOOO|O:svn_wc_revert5",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail;
+  {
+    arg1 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg3 = (svn_depth_t)SWIG_As_long (obj2);
+    if (SWIG_arg_fail(svn_argnum_obj2)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg4 = (svn_boolean_t)SWIG_As_long (obj3);
+    if (SWIG_arg_fail(svn_argnum_obj3)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg5 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj4);
+    if (PyErr_Occurred()) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg6 = (svn_boolean_t)SWIG_As_long (obj5);
+    if (SWIG_arg_fail(svn_argnum_obj5)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg7 = (svn_boolean_t)SWIG_As_long (obj6);
+    if (SWIG_arg_fail(svn_argnum_obj6)) {
+      SWIG_fail;
+    }
+  }
+  {
+    arg8 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg9 = obj7;
+  }
+  {
+    arg10 = (svn_wc_notify_func2_t) svn_swig_py_notify_func2;
+    arg11 = obj8;
+  }
+  if (obj9) {
+    /* Verify that the user supplied a valid pool */
+    if (obj9 != Py_None && obj9 != _global_py_pool) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(SWIGTYPE_p_apr_pool_t), obj9);
+      SWIG_arg_fail(svn_argnum_obj9);
+      SWIG_fail;
+    }
+  }
+  {
+    svn_swig_py_release_py_lock();
+    
+    result = (svn_error_t *)svn_wc_revert5(arg1,(char const *)arg2,arg3,arg4,(apr_array_header_t const *)arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12);
+    
+    svn_swig_py_acquire_py_lock();
+    
+  }
+  {
+    if (result != NULL) {
+      if (result->apr_err != SVN_ERR_SWIG_PY_EXCEPTION_SET)
+      svn_swig_py_svn_exception(result);
+      else
+      svn_error_clear(result);
+      SWIG_fail;
+    }
+    Py_INCREF(Py_None);
+    resultobj = Py_None;
+  }
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return resultobj;
+fail:
+  {
+    Py_XDECREF(_global_py_pool);
+  }
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_svn_wc_revert4(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   svn_wc_context_t *arg1 = (svn_wc_context_t *) 0 ;
@@ -31491,7 +31022,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_revert4(PyObject *SWIGUNUSEDPARM(self), PyObje
   arg10 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OsOOOOO|O:svn_wc_revert4",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
-    arg1 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
+    arg1 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -31509,17 +31040,17 @@ SWIGINTERN PyObject *_wrap_svn_wc_revert4(PyObject *SWIGUNUSEDPARM(self), PyObje
     }
   }
   {
-    arg5 = (apr_array_header_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj4);
+    arg5 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg6 = svn_swig_py_cancel_func;
-    arg7 = obj5; /* our function is the baton. */
+    arg6 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg7 = obj5;
   }
   {
-    arg8 = svn_swig_py_notify_func2;
+    arg8 = (svn_wc_notify_func2_t) svn_swig_py_notify_func2;
     arg9 = obj6;
   }
   if (obj7) {
@@ -31590,7 +31121,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_revert3(PyObject *SWIGUNUSEDPARM(self), PyObje
   arg10 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOOOOOO|O:svn_wc_revert3",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -31608,17 +31139,17 @@ SWIGINTERN PyObject *_wrap_svn_wc_revert3(PyObject *SWIGUNUSEDPARM(self), PyObje
     }
   }
   {
-    arg5 = (apr_array_header_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj4);
+    arg5 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg6 = svn_swig_py_cancel_func;
-    arg7 = obj5; /* our function is the baton. */
+    arg6 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg7 = obj5;
   }
   {
-    arg8 = svn_swig_py_notify_func2;
+    arg8 = (svn_wc_notify_func2_t) svn_swig_py_notify_func2;
     arg9 = obj6;
   }
   if (obj7) {
@@ -31687,7 +31218,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_revert2(PyObject *SWIGUNUSEDPARM(self), PyObje
   arg9 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOOOOO|O:svn_wc_revert2",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -31705,11 +31236,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_revert2(PyObject *SWIGUNUSEDPARM(self), PyObje
     }
   }
   {
-    arg5 = svn_swig_py_cancel_func;
-    arg6 = obj4; /* our function is the baton. */
+    arg5 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg6 = obj4;
   }
   {
-    arg7 = svn_swig_py_notify_func2;
+    arg7 = (svn_wc_notify_func2_t) svn_swig_py_notify_func2;
     arg8 = obj5;
   }
   if (obj6) {
@@ -31778,7 +31309,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_revert(PyObject *SWIGUNUSEDPARM(self), PyObjec
   arg9 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOOOOO|O:svn_wc_revert",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -31796,11 +31327,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_revert(PyObject *SWIGUNUSEDPARM(self), PyObjec
     }
   }
   {
-    arg5 = svn_swig_py_cancel_func;
-    arg6 = obj4; /* our function is the baton. */
+    arg5 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg6 = obj4;
   }
   {
-    arg7 = svn_swig_py_notify_func;
+    arg7 = (svn_wc_notify_func_t) svn_swig_py_notify_func;
     arg8 = obj5;
   }
   if (obj6) {
@@ -31861,7 +31392,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_restore(PyObject *SWIGUNUSEDPARM(self), PyObje
   arg4 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OsO|O:svn_wc_restore",&obj0,&arg2,&obj2,&obj3)) SWIG_fail;
   {
-    arg1 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
+    arg1 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -31967,7 +31498,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_create_tmp_file2(PyObject *SWIGUNUSEDPARM(self
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_apr_file_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_apr_file_t,
         _global_py_pool, args))
     
     ;
@@ -32050,7 +31581,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_create_tmp_file(PyObject *SWIGUNUSEDPARM(self)
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_apr_file_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_apr_file_t,
         _global_py_pool, args))
     
     ;
@@ -32090,7 +31621,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_translated_file2(PyObject *SWIGUNUSEDPARM(self
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"ssOO|O:svn_wc_translated_file2",&arg2,&arg3,&obj2,&obj3,&obj4)) SWIG_fail;
   {
-    arg4 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj2);
+    arg4 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -32175,7 +31706,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_translated_file(PyObject *SWIGUNUSEDPARM(self)
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"sOO|O:svn_wc_translated_file",&arg2,&obj1,&obj2,&obj3)) SWIG_fail;
   {
-    arg3 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg3 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -32261,7 +31792,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_translated_stream(PyObject *SWIGUNUSEDPARM(sel
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"ssOO|O:svn_wc_translated_stream",&arg2,&arg3,&obj2,&obj3,&obj4)) SWIG_fail;
   {
-    arg4 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj2);
+    arg4 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -32300,7 +31831,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_translated_stream(PyObject *SWIGUNUSEDPARM(sel
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_stream_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_stream_t,
         _global_py_pool, args))
     
     ;
@@ -32352,7 +31883,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_transmit_text_deltas3(PyObject *SWIGUNUSEDPARM
   arg2 = &temp2;
   if (!PyArg_ParseTuple(args,(char *)"OsOOO|OO:svn_wc_transmit_text_deltas3",&obj0,&arg4,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
-    arg3 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
+    arg3 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -32364,7 +31895,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_transmit_text_deltas3(PyObject *SWIGUNUSEDPARM
     }
   }
   {
-    arg6 = (svn_delta_editor_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj3);
+    arg6 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -32477,7 +32008,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_transmit_text_deltas2(PyObject *SWIGUNUSEDPARM
   arg2 = temp2;
   if (!PyArg_ParseTuple(args,(char *)"sOOOO|O:svn_wc_transmit_text_deltas2",&arg3,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
-    arg4 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg4 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -32489,7 +32020,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_transmit_text_deltas2(PyObject *SWIGUNUSEDPARM
     }
   }
   {
-    arg6 = (svn_delta_editor_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj3);
+    arg6 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -32583,7 +32114,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_transmit_text_deltas(PyObject *SWIGUNUSEDPARM(
   arg6 = &temp6;
   if (!PyArg_ParseTuple(args,(char *)"sOOOO|O:svn_wc_transmit_text_deltas",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -32595,7 +32126,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_transmit_text_deltas(PyObject *SWIGUNUSEDPARM(
     }
   }
   {
-    arg4 = (svn_delta_editor_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj3);
+    arg4 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -32681,13 +32212,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_transmit_prop_deltas2(PyObject *SWIGUNUSEDPARM
   arg5 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_wc_transmit_prop_deltas2",&obj0,&arg2,&obj2,&obj3,&obj4)) SWIG_fail;
   {
-    arg1 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
+    arg1 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_delta_editor_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj2);
+    arg3 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -32765,19 +32296,19 @@ SWIGINTERN PyObject *_wrap_svn_wc_transmit_prop_deltas(PyObject *SWIGUNUSEDPARM(
   arg6 = &temp6;
   if (!PyArg_ParseTuple(args,(char *)"sOOOO|O:svn_wc_transmit_prop_deltas",&arg1,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_wc_entry_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj2);
+    arg3 = (svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (svn_delta_editor_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj3);
+    arg4 = (svn_delta_editor_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_delta_editor_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -32943,7 +32474,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_ignores2(PyObject *SWIGUNUSEDPARM(self), P
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OsO|OO:svn_wc_get_ignores2",&obj0,&arg3,&obj2,&obj3,&obj4)) SWIG_fail;
   {
-    arg2 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
+    arg2 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -33051,7 +32582,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_ignores(PyObject *SWIGUNUSEDPARM(self), Py
     SWIG_fail;
   }
   {
-    arg3 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg3 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -33171,13 +32702,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_add_lock2(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg4 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OsO|O:svn_wc_add_lock2",&obj0,&arg2,&obj2,&obj3)) SWIG_fail;
   {
-    arg1 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
+    arg1 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_lock_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_lock_t, svn_argnum_obj2);
+    arg3 = (svn_lock_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_lock_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -33240,13 +32771,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_add_lock(PyObject *SWIGUNUSEDPARM(self), PyObj
   arg4 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sOO|O:svn_wc_add_lock",&arg1,&obj1,&obj2,&obj3)) SWIG_fail;
   {
-    arg2 = (svn_lock_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_lock_t, svn_argnum_obj1);
+    arg2 = (svn_lock_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_lock_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj2);
+    arg3 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -33307,7 +32838,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_remove_lock2(PyObject *SWIGUNUSEDPARM(self), P
   arg3 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"Os|O:svn_wc_remove_lock2",&obj0,&arg2,&obj2)) SWIG_fail;
   {
-    arg1 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
+    arg1 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -33368,7 +32899,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_remove_lock(PyObject *SWIGUNUSEDPARM(self), Py
   arg3 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"sO|O:svn_wc_remove_lock",&arg1,&obj1,&obj2)) SWIG_fail;
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -33421,7 +32952,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_revision_status_t_min_rev_set(PyObject *SWIGUN
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_revision_status_t_min_rev_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_revision_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_revision_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_revision_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_revision_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -33448,7 +32979,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_revision_status_t_min_rev_get(PyObject *SWIGUN
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_revision_status_t_min_rev_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_revision_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_revision_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_revision_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_revision_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -33470,7 +33001,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_revision_status_t_max_rev_set(PyObject *SWIGUN
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_revision_status_t_max_rev_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_revision_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_revision_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_revision_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_revision_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -33497,7 +33028,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_revision_status_t_max_rev_get(PyObject *SWIGUN
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_revision_status_t_max_rev_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_revision_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_revision_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_revision_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_revision_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -33519,7 +33050,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_revision_status_t_switched_set(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_revision_status_t_switched_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_revision_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_revision_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_revision_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_revision_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -33546,7 +33077,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_revision_status_t_switched_get(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_revision_status_t_switched_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_revision_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_revision_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_revision_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_revision_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -33568,7 +33099,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_revision_status_t_modified_set(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_revision_status_t_modified_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_revision_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_revision_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_revision_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_revision_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -33595,7 +33126,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_revision_status_t_modified_get(PyObject *SWIGU
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_revision_status_t_modified_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_revision_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_revision_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_revision_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_revision_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -33617,7 +33148,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_revision_status_t_sparse_checkout_set(PyObject
   
   if (!PyArg_ParseTuple(args,(char *)"OO:svn_wc_revision_status_t_sparse_checkout_set",&obj0,&obj1)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_revision_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_revision_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_revision_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_revision_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -33644,7 +33175,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_revision_status_t_sparse_checkout_get(PyObject
   
   if (!PyArg_ParseTuple(args,(char *)"O:svn_wc_revision_status_t_sparse_checkout_get",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_revision_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_revision_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_revision_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_revision_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -33670,7 +33201,7 @@ SWIGINTERN PyObject *_wrap_new_svn_wc_revision_status_t(PyObject *SWIGUNUSEDPARM
     svn_swig_py_acquire_py_lock();
     
   }
-  resultobj = svn_swig_NewPointerObj((void*)(result), SWIGTYPE_p_svn_wc_revision_status_t,
+  resultobj = svn_swig_py_new_pointer_obj((void*)(result), SWIGTYPE_p_svn_wc_revision_status_t,
     _global_py_pool, args);
   return resultobj;
 fail:
@@ -33685,7 +33216,7 @@ SWIGINTERN PyObject *_wrap_delete_svn_wc_revision_status_t(PyObject *SWIGUNUSEDP
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_svn_wc_revision_status_t",&obj0)) SWIG_fail;
   {
-    arg1 = (struct svn_wc_revision_status_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_revision_status_t, svn_argnum_obj0);
+    arg1 = (struct svn_wc_revision_status_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_revision_status_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -33744,7 +33275,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_revision_status2(PyObject *SWIGUNUSEDPARM(self
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OszOO|OO:svn_wc_revision_status2",&obj0,&arg3,&arg4,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
-    arg2 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
+    arg2 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -33756,8 +33287,8 @@ SWIGINTERN PyObject *_wrap_svn_wc_revision_status2(PyObject *SWIGUNUSEDPARM(self
     }
   }
   {
-    arg6 = svn_swig_py_cancel_func;
-    arg7 = obj4; /* our function is the baton. */
+    arg6 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg7 = obj4;
   }
   if (obj5) {
     /* Verify that the user supplied a valid pool */
@@ -33795,7 +33326,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_revision_status2(PyObject *SWIGUNUSEDPARM(self
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_wc_revision_status_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_wc_revision_status_t,
         _global_py_pool, args))
     
     ;
@@ -33848,8 +33379,8 @@ SWIGINTERN PyObject *_wrap_svn_wc_revision_status(PyObject *SWIGUNUSEDPARM(self)
     }
   }
   {
-    arg5 = svn_swig_py_cancel_func;
-    arg6 = obj3; /* our function is the baton. */
+    arg5 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg6 = obj3;
   }
   if (obj4) {
     /* Verify that the user supplied a valid pool */
@@ -33879,7 +33410,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_revision_status(PyObject *SWIGUNUSEDPARM(self)
     resultobj = Py_None;
   }
   {
-    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_NewPointerObj(*arg1, SWIGTYPE_p_svn_wc_revision_status_t,
+    resultobj = SWIG_Python_AppendOutput(resultobj, svn_swig_py_new_pointer_obj(*arg1, SWIGTYPE_p_svn_wc_revision_status_t,
         _global_py_pool, args))
     
     ;
@@ -33924,7 +33455,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_set_changelist2(PyObject *SWIGUNUSEDPARM(self)
   arg10 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OssOOOO|O:svn_wc_set_changelist2",&obj0,&arg2,&arg3,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
-    arg1 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
+    arg1 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -33936,17 +33467,17 @@ SWIGINTERN PyObject *_wrap_svn_wc_set_changelist2(PyObject *SWIGUNUSEDPARM(self)
     }
   }
   {
-    arg5 = (apr_array_header_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj4);
+    arg5 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg6 = svn_swig_py_cancel_func;
-    arg7 = obj5; /* our function is the baton. */
+    arg6 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg7 = obj5;
   }
   {
-    arg8 = svn_swig_py_notify_func2;
+    arg8 = (svn_wc_notify_func2_t) svn_swig_py_notify_func2;
     arg9 = obj6;
   }
   if (obj7) {
@@ -34012,17 +33543,17 @@ SWIGINTERN PyObject *_wrap_svn_wc_set_changelist(PyObject *SWIGUNUSEDPARM(self),
   arg8 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"ssOOO|O:svn_wc_set_changelist",&arg1,&arg2,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
-    arg3 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj2);
+    arg3 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = svn_swig_py_cancel_func;
-    arg5 = obj3; /* our function is the baton. */
+    arg4 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg5 = obj3;
   }
   {
-    arg6 = svn_swig_py_notify_func2;
+    arg6 = (svn_wc_notify_func2_t) svn_swig_py_notify_func2;
     arg7 = obj4;
   }
   if (obj5) {
@@ -34092,7 +33623,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_changelists(PyObject *SWIGUNUSEDPARM(self)
   arg9 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OsOOOOO|O:svn_wc_get_changelists",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
-    arg1 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
+    arg1 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -34104,14 +33635,14 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_changelists(PyObject *SWIGUNUSEDPARM(self)
     }
   }
   {
-    arg4 = (apr_array_header_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj3);
+    arg4 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
     svn_changelist_receiver_t * tmp =
-    svn_swig_MustGetPtr(obj4, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, svn_argnum_obj4);
+    svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, svn_argnum_obj4);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -34126,8 +33657,8 @@ SWIGINTERN PyObject *_wrap_svn_wc_get_changelists(PyObject *SWIGUNUSEDPARM(self)
     }
   }
   {
-    arg7 = svn_swig_py_cancel_func;
-    arg8 = obj6; /* our function is the baton. */
+    arg7 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg8 = obj6;
   }
   if (obj7) {
     /* Verify that the user supplied a valid pool */
@@ -34193,7 +33724,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_crop_tree2(PyObject *SWIGUNUSEDPARM(self), PyO
   arg8 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OsOOO|O:svn_wc_crop_tree2",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
-    arg1 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
+    arg1 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -34205,11 +33736,11 @@ SWIGINTERN PyObject *_wrap_svn_wc_crop_tree2(PyObject *SWIGUNUSEDPARM(self), PyO
     }
   }
   {
-    arg4 = svn_swig_py_cancel_func;
-    arg5 = obj3; /* our function is the baton. */
+    arg4 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg5 = obj3;
   }
   {
-    arg6 = svn_swig_py_notify_func2;
+    arg6 = (svn_wc_notify_func2_t) svn_swig_py_notify_func2;
     arg7 = obj4;
   }
   if (obj5) {
@@ -34276,7 +33807,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_crop_tree(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg8 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OsOOO|O:svn_wc_crop_tree",&obj0,&arg2,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
   {
-    arg1 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
+    arg1 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -34288,12 +33819,12 @@ SWIGINTERN PyObject *_wrap_svn_wc_crop_tree(PyObject *SWIGUNUSEDPARM(self), PyOb
     }
   }
   {
-    arg4 = svn_swig_py_notify_func2;
+    arg4 = (svn_wc_notify_func2_t) svn_swig_py_notify_func2;
     arg5 = obj3;
   }
   {
-    arg6 = svn_swig_py_cancel_func;
-    arg7 = obj4; /* our function is the baton. */
+    arg6 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg7 = obj4;
   }
   if (obj5) {
     /* Verify that the user supplied a valid pool */
@@ -34357,17 +33888,17 @@ SWIGINTERN PyObject *_wrap_svn_wc_exclude(PyObject *SWIGUNUSEDPARM(self), PyObje
   arg7 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_wc_exclude",&obj0,&arg2,&obj2,&obj3,&obj4)) SWIG_fail;
   {
-    arg1 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
+    arg1 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = svn_swig_py_cancel_func;
-    arg4 = obj2; /* our function is the baton. */
+    arg3 = (svn_cancel_func_t) svn_swig_py_cancel_func;
+    arg4 = obj2;
   }
   {
-    arg5 = svn_swig_py_notify_func2;
+    arg5 = (svn_wc_notify_func2_t) svn_swig_py_notify_func2;
     arg6 = obj3;
   }
   if (obj4) {
@@ -34434,7 +33965,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_read_kind2(PyObject *SWIGUNUSEDPARM(self), PyO
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_wc_read_kind2",&obj0,&arg3,&obj2,&obj3,&obj4)) SWIG_fail;
   {
-    arg2 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
+    arg2 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -34519,7 +34050,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_read_kind(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg1 = &temp1;
   if (!PyArg_ParseTuple(args,(char *)"OsO|O:svn_wc_read_kind",&obj0,&arg3,&obj2,&obj3)) SWIG_fail;
   {
-    arg2 = (svn_wc_context_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
+    arg2 = (svn_wc_context_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_context_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -34632,7 +34163,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_invoke_file_opened(PyObject *S
   arg3 = &temp3;
   if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_wc_diff_callbacks4_invoke_file_opened",&obj0,&arg4,&obj2,&obj3,&obj4)) SWIG_fail;
   {
-    arg1 = (svn_wc_diff_callbacks4_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
+    arg1 = (svn_wc_diff_callbacks4_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -34741,19 +34272,19 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_invoke_file_changed(PyObject *
   arg4 = &temp4;
   if (!PyArg_ParseTuple(args,(char *)"OOOsssOOssOOO|O:svn_wc_diff_callbacks4_invoke_file_changed",&obj0,&obj1,&obj2,&arg5,&arg6,&arg7,&obj6,&obj7,&arg10,&arg11,&obj10,&obj11,&obj12,&obj13)) SWIG_fail;
   {
-    arg1 = (svn_wc_diff_callbacks4_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
+    arg1 = (svn_wc_diff_callbacks4_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_wc_notify_state_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj1);
+    arg2 = (svn_wc_notify_state_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_wc_notify_state_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj2);
+    arg3 = (svn_wc_notify_state_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -34771,13 +34302,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_invoke_file_changed(PyObject *
     }
   }
   {
-    arg12 = (apr_array_header_t *)svn_swig_MustGetPtr(obj10, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj10);
+    arg12 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj10, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj10);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg13 = (apr_hash_t *)svn_swig_MustGetPtr(obj11, SWIGTYPE_p_apr_hash_t, svn_argnum_obj11);
+    arg13 = (apr_hash_t *)svn_swig_py_must_get_ptr(obj11, SWIGTYPE_p_apr_hash_t, svn_argnum_obj11);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -34877,19 +34408,19 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_invoke_file_added(PyObject *SW
   arg4 = &temp4;
   if (!PyArg_ParseTuple(args,(char *)"OOOsssOOsszOOOO|O:svn_wc_diff_callbacks4_invoke_file_added",&obj0,&obj1,&obj2,&arg5,&arg6,&arg7,&obj6,&obj7,&arg10,&arg11,&arg12,&obj11,&obj12,&obj13,&obj14,&obj15)) SWIG_fail;
   {
-    arg1 = (svn_wc_diff_callbacks4_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
+    arg1 = (svn_wc_diff_callbacks4_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_wc_notify_state_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj1);
+    arg2 = (svn_wc_notify_state_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_wc_notify_state_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj2);
+    arg3 = (svn_wc_notify_state_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -34913,13 +34444,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_invoke_file_added(PyObject *SW
     }
   }
   {
-    arg14 = (apr_array_header_t *)svn_swig_MustGetPtr(obj12, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj12);
+    arg14 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj12, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj12);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg15 = (apr_hash_t *)svn_swig_MustGetPtr(obj13, SWIGTYPE_p_apr_hash_t, svn_argnum_obj13);
+    arg15 = (apr_hash_t *)svn_swig_py_must_get_ptr(obj13, SWIGTYPE_p_apr_hash_t, svn_argnum_obj13);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -35008,19 +34539,19 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_invoke_file_deleted(PyObject *
   arg3 = &temp3;
   if (!PyArg_ParseTuple(args,(char *)"OOsssssOO|O:svn_wc_diff_callbacks4_invoke_file_deleted",&obj0,&obj1,&arg4,&arg5,&arg6,&arg7,&arg8,&obj7,&obj8,&obj9)) SWIG_fail;
   {
-    arg1 = (svn_wc_diff_callbacks4_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
+    arg1 = (svn_wc_diff_callbacks4_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_wc_notify_state_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj1);
+    arg2 = (svn_wc_notify_state_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg9 = (apr_hash_t *)svn_swig_MustGetPtr(obj7, SWIGTYPE_p_apr_hash_t, svn_argnum_obj7);
+    arg9 = (apr_hash_t *)svn_swig_py_must_get_ptr(obj7, SWIGTYPE_p_apr_hash_t, svn_argnum_obj7);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -35103,13 +34634,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_invoke_dir_deleted(PyObject *S
   arg3 = &temp3;
   if (!PyArg_ParseTuple(args,(char *)"OOsO|O:svn_wc_diff_callbacks4_invoke_dir_deleted",&obj0,&obj1,&arg4,&obj3,&obj4)) SWIG_fail;
   {
-    arg1 = (svn_wc_diff_callbacks4_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
+    arg1 = (svn_wc_diff_callbacks4_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_wc_notify_state_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj1);
+    arg2 = (svn_wc_notify_state_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -35200,7 +34731,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_invoke_dir_opened(PyObject *SW
   arg4 = &temp4;
   if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_wc_diff_callbacks4_invoke_dir_opened",&obj0,&arg5,&obj2,&obj3,&obj4)) SWIG_fail;
   {
-    arg1 = (svn_wc_diff_callbacks4_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
+    arg1 = (svn_wc_diff_callbacks4_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -35314,13 +34845,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_invoke_dir_added(PyObject *SWI
   arg5 = &temp5;
   if (!PyArg_ParseTuple(args,(char *)"OOsOzOO|O:svn_wc_diff_callbacks4_invoke_dir_added",&obj0,&obj1,&arg6,&obj3,&arg8,&obj5,&obj6,&obj7)) SWIG_fail;
   {
-    arg1 = (svn_wc_diff_callbacks4_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
+    arg1 = (svn_wc_diff_callbacks4_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_wc_notify_state_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj1);
+    arg2 = (svn_wc_notify_state_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -35433,13 +34964,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_invoke_dir_props_changed(PyObj
   arg3 = &temp3;
   if (!PyArg_ParseTuple(args,(char *)"OOsOOOO|O:svn_wc_diff_callbacks4_invoke_dir_props_changed",&obj0,&obj1,&arg4,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
   {
-    arg1 = (svn_wc_diff_callbacks4_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
+    arg1 = (svn_wc_diff_callbacks4_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_wc_notify_state_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj1);
+    arg2 = (svn_wc_notify_state_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -35451,13 +34982,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_invoke_dir_props_changed(PyObj
     }
   }
   {
-    arg6 = (apr_array_header_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj4);
+    arg6 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg7 = (apr_hash_t *)svn_swig_MustGetPtr(obj5, SWIGTYPE_p_apr_hash_t, svn_argnum_obj5);
+    arg7 = (apr_hash_t *)svn_swig_py_must_get_ptr(obj5, SWIGTYPE_p_apr_hash_t, svn_argnum_obj5);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -35544,19 +35075,19 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks4_invoke_dir_closed(PyObject *SW
   arg4 = &temp4;
   if (!PyArg_ParseTuple(args,(char *)"OOOsOO|O:svn_wc_diff_callbacks4_invoke_dir_closed",&obj0,&obj1,&obj2,&arg5,&obj4,&obj5,&obj6)) SWIG_fail;
   {
-    arg1 = (svn_wc_diff_callbacks4_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
+    arg1 = (svn_wc_diff_callbacks4_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks4_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_wc_notify_state_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj1);
+    arg2 = (svn_wc_notify_state_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_wc_notify_state_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj2);
+    arg3 = (svn_wc_notify_state_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -35653,25 +35184,25 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_invoke_file_changed(PyObject *
   arg5 = &temp5;
   if (!PyArg_ParseTuple(args,(char *)"OOOOsssOOssOOO:svn_wc_diff_callbacks3_invoke_file_changed",&obj0,&obj1,&obj2,&obj3,&arg6,&arg7,&arg8,&obj7,&obj8,&arg11,&arg12,&obj11,&obj12,&obj13)) SWIG_fail;
   {
-    arg1 = (svn_wc_diff_callbacks3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks3_t, svn_argnum_obj0);
+    arg1 = (svn_wc_diff_callbacks3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_wc_notify_state_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj2);
+    arg3 = (svn_wc_notify_state_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (svn_wc_notify_state_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj3);
+    arg4 = (svn_wc_notify_state_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -35689,13 +35220,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_invoke_file_changed(PyObject *
     }
   }
   {
-    arg13 = (apr_array_header_t *)svn_swig_MustGetPtr(obj11, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj11);
+    arg13 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj11, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj11);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg14 = (apr_hash_t *)svn_swig_MustGetPtr(obj12, SWIGTYPE_p_apr_hash_t, svn_argnum_obj12);
+    arg14 = (apr_hash_t *)svn_swig_py_must_get_ptr(obj12, SWIGTYPE_p_apr_hash_t, svn_argnum_obj12);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -35772,25 +35303,25 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_invoke_file_added(PyObject *SW
   arg5 = &temp5;
   if (!PyArg_ParseTuple(args,(char *)"OOOOsssOOssOOO:svn_wc_diff_callbacks3_invoke_file_added",&obj0,&obj1,&obj2,&obj3,&arg6,&arg7,&arg8,&obj7,&obj8,&arg11,&arg12,&obj11,&obj12,&obj13)) SWIG_fail;
   {
-    arg1 = (svn_wc_diff_callbacks3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks3_t, svn_argnum_obj0);
+    arg1 = (svn_wc_diff_callbacks3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_wc_notify_state_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj2);
+    arg3 = (svn_wc_notify_state_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (svn_wc_notify_state_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj3);
+    arg4 = (svn_wc_notify_state_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -35808,13 +35339,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_invoke_file_added(PyObject *SW
     }
   }
   {
-    arg13 = (apr_array_header_t *)svn_swig_MustGetPtr(obj11, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj11);
+    arg13 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj11, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj11);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg14 = (apr_hash_t *)svn_swig_MustGetPtr(obj12, SWIGTYPE_p_apr_hash_t, svn_argnum_obj12);
+    arg14 = (apr_hash_t *)svn_swig_py_must_get_ptr(obj12, SWIGTYPE_p_apr_hash_t, svn_argnum_obj12);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -35883,25 +35414,25 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_invoke_file_deleted(PyObject *
   arg4 = &temp4;
   if (!PyArg_ParseTuple(args,(char *)"OOOsssssOO:svn_wc_diff_callbacks3_invoke_file_deleted",&obj0,&obj1,&obj2,&arg5,&arg6,&arg7,&arg8,&arg9,&obj8,&obj9)) SWIG_fail;
   {
-    arg1 = (svn_wc_diff_callbacks3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks3_t, svn_argnum_obj0);
+    arg1 = (svn_wc_diff_callbacks3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_wc_notify_state_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj2);
+    arg3 = (svn_wc_notify_state_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg10 = (apr_hash_t *)svn_swig_MustGetPtr(obj8, SWIGTYPE_p_apr_hash_t, svn_argnum_obj8);
+    arg10 = (apr_hash_t *)svn_swig_py_must_get_ptr(obj8, SWIGTYPE_p_apr_hash_t, svn_argnum_obj8);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -35966,19 +35497,19 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_invoke_dir_added(PyObject *SWI
   arg4 = &temp4;
   if (!PyArg_ParseTuple(args,(char *)"OOOsOO:svn_wc_diff_callbacks3_invoke_dir_added",&obj0,&obj1,&obj2,&arg5,&obj4,&obj5)) SWIG_fail;
   {
-    arg1 = (svn_wc_diff_callbacks3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks3_t, svn_argnum_obj0);
+    arg1 = (svn_wc_diff_callbacks3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_wc_notify_state_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj2);
+    arg3 = (svn_wc_notify_state_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -36047,19 +35578,19 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_invoke_dir_deleted(PyObject *S
   arg4 = &temp4;
   if (!PyArg_ParseTuple(args,(char *)"OOOsO:svn_wc_diff_callbacks3_invoke_dir_deleted",&obj0,&obj1,&obj2,&arg5,&obj4)) SWIG_fail;
   {
-    arg1 = (svn_wc_diff_callbacks3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks3_t, svn_argnum_obj0);
+    arg1 = (svn_wc_diff_callbacks3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_wc_notify_state_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj2);
+    arg3 = (svn_wc_notify_state_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -36126,31 +35657,31 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_invoke_dir_props_changed(PyObj
   arg4 = &temp4;
   if (!PyArg_ParseTuple(args,(char *)"OOOsOOO:svn_wc_diff_callbacks3_invoke_dir_props_changed",&obj0,&obj1,&obj2,&arg5,&obj4,&obj5,&obj6)) SWIG_fail;
   {
-    arg1 = (svn_wc_diff_callbacks3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks3_t, svn_argnum_obj0);
+    arg1 = (svn_wc_diff_callbacks3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_wc_notify_state_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj2);
+    arg3 = (svn_wc_notify_state_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg6 = (apr_array_header_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj4);
+    arg6 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg7 = (apr_hash_t *)svn_swig_MustGetPtr(obj5, SWIGTYPE_p_apr_hash_t, svn_argnum_obj5);
+    arg7 = (apr_hash_t *)svn_swig_py_must_get_ptr(obj5, SWIGTYPE_p_apr_hash_t, svn_argnum_obj5);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -36213,13 +35744,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_invoke_dir_opened(PyObject *SW
   arg3 = &temp3;
   if (!PyArg_ParseTuple(args,(char *)"OOsOO:svn_wc_diff_callbacks3_invoke_dir_opened",&obj0,&obj1,&arg4,&obj3,&obj4)) SWIG_fail;
   {
-    arg1 = (svn_wc_diff_callbacks3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks3_t, svn_argnum_obj0);
+    arg1 = (svn_wc_diff_callbacks3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -36290,25 +35821,25 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks3_invoke_dir_closed(PyObject *SW
   arg5 = &temp5;
   if (!PyArg_ParseTuple(args,(char *)"OOOOsO:svn_wc_diff_callbacks3_invoke_dir_closed",&obj0,&obj1,&obj2,&obj3,&arg6,&obj5)) SWIG_fail;
   {
-    arg1 = (svn_wc_diff_callbacks3_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks3_t, svn_argnum_obj0);
+    arg1 = (svn_wc_diff_callbacks3_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks3_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_wc_notify_state_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj2);
+    arg3 = (svn_wc_notify_state_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (svn_wc_notify_state_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj3);
+    arg4 = (svn_wc_notify_state_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -36381,25 +35912,25 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks2_invoke_file_changed(PyObject *
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOsssOOssOOO:svn_wc_diff_callbacks2_invoke_file_changed",&obj0,&obj1,&obj2,&obj3,&arg5,&arg6,&arg7,&obj7,&obj8,&arg10,&arg11,&obj11,&obj12,&obj13)) SWIG_fail;
   {
-    arg1 = (svn_wc_diff_callbacks2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks2_t, svn_argnum_obj0);
+    arg1 = (svn_wc_diff_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_wc_notify_state_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj2);
+    arg3 = (svn_wc_notify_state_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (svn_wc_notify_state_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj3);
+    arg4 = (svn_wc_notify_state_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -36417,13 +35948,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks2_invoke_file_changed(PyObject *
     }
   }
   {
-    arg12 = (apr_array_header_t *)svn_swig_MustGetPtr(obj11, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj11);
+    arg12 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj11, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj11);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg13 = (apr_hash_t *)svn_swig_MustGetPtr(obj12, SWIGTYPE_p_apr_hash_t, svn_argnum_obj12);
+    arg13 = (apr_hash_t *)svn_swig_py_must_get_ptr(obj12, SWIGTYPE_p_apr_hash_t, svn_argnum_obj12);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -36490,25 +36021,25 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks2_invoke_file_added(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"OOOOsssOOssOOO:svn_wc_diff_callbacks2_invoke_file_added",&obj0,&obj1,&obj2,&obj3,&arg5,&arg6,&arg7,&obj7,&obj8,&arg10,&arg11,&obj11,&obj12,&obj13)) SWIG_fail;
   {
-    arg1 = (svn_wc_diff_callbacks2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks2_t, svn_argnum_obj0);
+    arg1 = (svn_wc_diff_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_wc_notify_state_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj2);
+    arg3 = (svn_wc_notify_state_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg4 = (svn_wc_notify_state_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj3);
+    arg4 = (svn_wc_notify_state_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -36526,13 +36057,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks2_invoke_file_added(PyObject *SW
     }
   }
   {
-    arg12 = (apr_array_header_t *)svn_swig_MustGetPtr(obj11, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj11);
+    arg12 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj11, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj11);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg13 = (apr_hash_t *)svn_swig_MustGetPtr(obj12, SWIGTYPE_p_apr_hash_t, svn_argnum_obj12);
+    arg13 = (apr_hash_t *)svn_swig_py_must_get_ptr(obj12, SWIGTYPE_p_apr_hash_t, svn_argnum_obj12);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -36591,25 +36122,25 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks2_invoke_file_deleted(PyObject *
   
   if (!PyArg_ParseTuple(args,(char *)"OOOsssssOO:svn_wc_diff_callbacks2_invoke_file_deleted",&obj0,&obj1,&obj2,&arg4,&arg5,&arg6,&arg7,&arg8,&obj8,&obj9)) SWIG_fail;
   {
-    arg1 = (svn_wc_diff_callbacks2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks2_t, svn_argnum_obj0);
+    arg1 = (svn_wc_diff_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_wc_notify_state_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj2);
+    arg3 = (svn_wc_notify_state_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg9 = (apr_hash_t *)svn_swig_MustGetPtr(obj8, SWIGTYPE_p_apr_hash_t, svn_argnum_obj8);
+    arg9 = (apr_hash_t *)svn_swig_py_must_get_ptr(obj8, SWIGTYPE_p_apr_hash_t, svn_argnum_obj8);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -36664,19 +36195,19 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks2_invoke_dir_added(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"OOOsOO:svn_wc_diff_callbacks2_invoke_dir_added",&obj0,&obj1,&obj2,&arg4,&obj4,&obj5)) SWIG_fail;
   {
-    arg1 = (svn_wc_diff_callbacks2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks2_t, svn_argnum_obj0);
+    arg1 = (svn_wc_diff_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_wc_notify_state_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj2);
+    arg3 = (svn_wc_notify_state_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -36735,19 +36266,19 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks2_invoke_dir_deleted(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"OOOsO:svn_wc_diff_callbacks2_invoke_dir_deleted",&obj0,&obj1,&obj2,&arg4,&obj4)) SWIG_fail;
   {
-    arg1 = (svn_wc_diff_callbacks2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks2_t, svn_argnum_obj0);
+    arg1 = (svn_wc_diff_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_wc_notify_state_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj2);
+    arg3 = (svn_wc_notify_state_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -36804,31 +36335,31 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks2_invoke_dir_props_changed(PyObj
   
   if (!PyArg_ParseTuple(args,(char *)"OOOsOOO:svn_wc_diff_callbacks2_invoke_dir_props_changed",&obj0,&obj1,&obj2,&arg4,&obj4,&obj5,&obj6)) SWIG_fail;
   {
-    arg1 = (svn_wc_diff_callbacks2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks2_t, svn_argnum_obj0);
+    arg1 = (svn_wc_diff_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_wc_notify_state_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj2);
+    arg3 = (svn_wc_notify_state_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg5 = (apr_array_header_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj4);
+    arg5 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg6 = (apr_hash_t *)svn_swig_MustGetPtr(obj5, SWIGTYPE_p_apr_hash_t, svn_argnum_obj5);
+    arg6 = (apr_hash_t *)svn_swig_py_must_get_ptr(obj5, SWIGTYPE_p_apr_hash_t, svn_argnum_obj5);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -36889,19 +36420,19 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks_invoke_file_changed(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"OOOsssOOssO:svn_wc_diff_callbacks_invoke_file_changed",&obj0,&obj1,&obj2,&arg4,&arg5,&arg6,&obj6,&obj7,&arg9,&arg10,&obj10)) SWIG_fail;
   {
-    arg1 = (svn_wc_diff_callbacks_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks_t, svn_argnum_obj0);
+    arg1 = (svn_wc_diff_callbacks_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_wc_notify_state_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj2);
+    arg3 = (svn_wc_notify_state_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -36974,19 +36505,19 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks_invoke_file_added(PyObject *SWI
   
   if (!PyArg_ParseTuple(args,(char *)"OOOsssOOssO:svn_wc_diff_callbacks_invoke_file_added",&obj0,&obj1,&obj2,&arg4,&arg5,&arg6,&obj6,&obj7,&arg9,&arg10,&obj10)) SWIG_fail;
   {
-    arg1 = (svn_wc_diff_callbacks_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks_t, svn_argnum_obj0);
+    arg1 = (svn_wc_diff_callbacks_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_wc_notify_state_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj2);
+    arg3 = (svn_wc_notify_state_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -37055,19 +36586,19 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks_invoke_file_deleted(PyObject *S
   
   if (!PyArg_ParseTuple(args,(char *)"OOOsssssO:svn_wc_diff_callbacks_invoke_file_deleted",&obj0,&obj1,&obj2,&arg4,&arg5,&arg6,&arg7,&arg8,&obj8)) SWIG_fail;
   {
-    arg1 = (svn_wc_diff_callbacks_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks_t, svn_argnum_obj0);
+    arg1 = (svn_wc_diff_callbacks_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_wc_notify_state_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj2);
+    arg3 = (svn_wc_notify_state_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -37122,19 +36653,19 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks_invoke_dir_added(PyObject *SWIG
   
   if (!PyArg_ParseTuple(args,(char *)"OOOsOO:svn_wc_diff_callbacks_invoke_dir_added",&obj0,&obj1,&obj2,&arg4,&obj4,&obj5)) SWIG_fail;
   {
-    arg1 = (svn_wc_diff_callbacks_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks_t, svn_argnum_obj0);
+    arg1 = (svn_wc_diff_callbacks_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_wc_notify_state_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj2);
+    arg3 = (svn_wc_notify_state_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -37193,19 +36724,19 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks_invoke_dir_deleted(PyObject *SW
   
   if (!PyArg_ParseTuple(args,(char *)"OOOsO:svn_wc_diff_callbacks_invoke_dir_deleted",&obj0,&obj1,&obj2,&arg4,&obj4)) SWIG_fail;
   {
-    arg1 = (svn_wc_diff_callbacks_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks_t, svn_argnum_obj0);
+    arg1 = (svn_wc_diff_callbacks_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_wc_notify_state_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj2);
+    arg3 = (svn_wc_notify_state_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -37262,31 +36793,31 @@ SWIGINTERN PyObject *_wrap_svn_wc_diff_callbacks_invoke_props_changed(PyObject *
   
   if (!PyArg_ParseTuple(args,(char *)"OOOsOOO:svn_wc_diff_callbacks_invoke_props_changed",&obj0,&obj1,&obj2,&arg4,&obj4,&obj5,&obj6)) SWIG_fail;
   {
-    arg1 = (svn_wc_diff_callbacks_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks_t, svn_argnum_obj0);
+    arg1 = (svn_wc_diff_callbacks_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_diff_callbacks_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg2 = (svn_wc_adm_access_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
+    arg2 = (svn_wc_adm_access_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_adm_access_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_wc_notify_state_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj2);
+    arg3 = (svn_wc_notify_state_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_wc_notify_state_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg5 = (apr_array_header_t *)svn_swig_MustGetPtr(obj4, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj4);
+    arg5 = (apr_array_header_t *)svn_swig_py_must_get_ptr(obj4, SWIGTYPE_p_apr_array_header_t, svn_argnum_obj4);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg6 = (apr_hash_t *)svn_swig_MustGetPtr(obj5, SWIGTYPE_p_apr_hash_t, svn_argnum_obj5);
+    arg6 = (apr_hash_t *)svn_swig_py_must_get_ptr(obj5, SWIGTYPE_p_apr_hash_t, svn_argnum_obj5);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -37345,13 +36876,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_callbacks2_invoke_found_entry(PyObject *
   arg5 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_wc_entry_callbacks2_invoke_found_entry",&obj0,&arg2,&obj2,&obj3,&obj4)) SWIG_fail;
   {
-    arg1 = (svn_wc_entry_callbacks2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_callbacks2_t, svn_argnum_obj0);
+    arg1 = (svn_wc_entry_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_callbacks2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_wc_entry_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj2);
+    arg3 = (svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -37424,13 +36955,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_callbacks2_invoke_handle_error(PyObject
   arg5 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_wc_entry_callbacks2_invoke_handle_error",&obj0,&arg2,&obj2,&obj3,&obj4)) SWIG_fail;
   {
-    arg1 = (svn_wc_entry_callbacks2_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_callbacks2_t, svn_argnum_obj0);
+    arg1 = (svn_wc_entry_callbacks2_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_callbacks2_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_error_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_error_t, svn_argnum_obj2);
+    arg3 = (svn_error_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_error_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -37503,13 +37034,13 @@ SWIGINTERN PyObject *_wrap_svn_wc_entry_callbacks_invoke_found_entry(PyObject *S
   arg5 = _global_pool;
   if (!PyArg_ParseTuple(args,(char *)"OsOO|O:svn_wc_entry_callbacks_invoke_found_entry",&obj0,&arg2,&obj2,&obj3,&obj4)) SWIG_fail;
   {
-    arg1 = (svn_wc_entry_callbacks_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_wc_entry_callbacks_t, svn_argnum_obj0);
+    arg1 = (svn_wc_entry_callbacks_t *)svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_svn_wc_entry_callbacks_t, svn_argnum_obj0);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
   }
   {
-    arg3 = (svn_wc_entry_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj2);
+    arg3 = (svn_wc_entry_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_wc_entry_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -37589,7 +37120,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_external_update(PyObject *SWIGUNUSEDPAR
   if (!PyArg_ParseTuple(args,(char *)"OOsOOO|O:svn_wc_invoke_external_update",&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
   {
     svn_wc_external_update_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_string_t_p_q_const__svn_string_t_svn_depth_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_string_t_p_q_const__svn_string_t_svn_depth_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -37694,7 +37225,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_notify_func2(PyObject *SWIGUNUSEDPARM(s
   if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_wc_invoke_notify_func2",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     svn_wc_notify_func2_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -37709,7 +37240,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_notify_func2(PyObject *SWIGUNUSEDPARM(s
     }
   }
   {
-    arg3 = (svn_wc_notify_t *)svn_swig_MustGetPtr(obj2, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj2);
+    arg3 = (svn_wc_notify_t *)svn_swig_py_must_get_ptr(obj2, SWIGTYPE_p_svn_wc_notify_t, svn_argnum_obj2);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -37765,7 +37296,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_notify_func(PyObject *SWIGUNUSEDPARM(se
   if (!PyArg_ParseTuple(args,(char *)"OOsOOsOOO:svn_wc_invoke_notify_func",&obj0,&obj1,&arg3,&obj3,&obj4,&arg6,&obj6,&obj7,&obj8)) SWIG_fail;
   {
     svn_wc_notify_func_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -37854,14 +37385,14 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_conflict_resolver_func2(PyObject *SWIGU
   if (!PyArg_ParseTuple(args,(char *)"OOO|OO:svn_wc_invoke_conflict_resolver_func2",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   {
     svn_wc_conflict_resolver_func2_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
     arg1 = *tmp;
   }
   {
-    arg3 = (svn_wc_conflict_description2_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_conflict_description2_t, svn_argnum_obj1);
+    arg3 = (svn_wc_conflict_description2_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_conflict_description2_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -37960,14 +37491,14 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_conflict_resolver_func(PyObject *SWIGUN
   if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_wc_invoke_conflict_resolver_func",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     svn_wc_conflict_resolver_func_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
     arg1 = *tmp;
   }
   {
-    arg3 = (svn_wc_conflict_description_t *)svn_swig_MustGetPtr(obj1, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj1);
+    arg3 = (svn_wc_conflict_description_t *)svn_swig_py_must_get_ptr(obj1, SWIGTYPE_p_svn_wc_conflict_description_t, svn_argnum_obj1);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -38050,7 +37581,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_status_func4(PyObject *SWIGUNUSEDPARM(s
   if (!PyArg_ParseTuple(args,(char *)"OOsO|O:svn_wc_invoke_status_func4",&obj0,&obj1,&arg3,&obj3,&obj4)) SWIG_fail;
   {
     svn_wc_status_func4_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__svn_wc_status3_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -38065,7 +37596,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_status_func4(PyObject *SWIGUNUSEDPARM(s
     }
   }
   {
-    arg4 = (svn_wc_status3_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj3);
+    arg4 = (svn_wc_status3_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_wc_status3_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -38131,7 +37662,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_status_func3(PyObject *SWIGUNUSEDPARM(s
   if (!PyArg_ParseTuple(args,(char *)"OOsO|O:svn_wc_invoke_status_func3",&obj0,&obj1,&arg3,&obj3,&obj4)) SWIG_fail;
   {
     svn_wc_status_func3_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -38146,7 +37677,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_status_func3(PyObject *SWIGUNUSEDPARM(s
     }
   }
   {
-    arg4 = (svn_wc_status2_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj3);
+    arg4 = (svn_wc_status2_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -38203,7 +37734,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_status_func2(PyObject *SWIGUNUSEDPARM(s
   if (!PyArg_ParseTuple(args,(char *)"OOsO:svn_wc_invoke_status_func2",&obj0,&obj1,&arg3,&obj3)) SWIG_fail;
   {
     svn_wc_status_func2_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -38218,7 +37749,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_status_func2(PyObject *SWIGUNUSEDPARM(s
     }
   }
   {
-    arg4 = (svn_wc_status2_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj3);
+    arg4 = (svn_wc_status2_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_wc_status2_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -38251,7 +37782,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_status_func(PyObject *SWIGUNUSEDPARM(se
   if (!PyArg_ParseTuple(args,(char *)"OOsO:svn_wc_invoke_status_func",&obj0,&obj1,&arg3,&obj3)) SWIG_fail;
   {
     svn_wc_status_func_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -38266,7 +37797,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_status_func(PyObject *SWIGUNUSEDPARM(se
     }
   }
   {
-    arg4 = (svn_wc_status_t *)svn_swig_MustGetPtr(obj3, SWIGTYPE_p_svn_wc_status_t, svn_argnum_obj3);
+    arg4 = (svn_wc_status_t *)svn_swig_py_must_get_ptr(obj3, SWIGTYPE_p_svn_wc_status_t, svn_argnum_obj3);
     if (PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -38317,7 +37848,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_get_file(PyObject *SWIGUNUSEDPARM(self)
   if (!PyArg_ParseTuple(args,(char *)"OOsOO|O:svn_wc_invoke_get_file",&obj0,&obj1,&arg3,&obj3,&obj4,&obj5)) SWIG_fail;
   {
     svn_wc_get_file_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_stream_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_stream_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -38418,7 +37949,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_dirents_func(PyObject *SWIGUNUSEDPARM(s
   if (!PyArg_ParseTuple(args,(char *)"OOss|OO:svn_wc_invoke_dirents_func",&obj0,&obj1,&arg4,&arg5,&obj4,&obj5)) SWIG_fail;
   {
     svn_wc_dirents_func_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void_p_p_apr_hash_t_p_q_const__char_p_q_const__char_p_apr_pool_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_p_apr_hash_t_p_q_const__char_p_q_const__char_p_apr_pool_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -38518,7 +38049,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_canonicalize_svn_prop_get_file(PyObject
   if (!PyArg_ParseTuple(args,(char *)"OOO|O:svn_wc_invoke_canonicalize_svn_prop_get_file",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
   {
     svn_wc_canonicalize_svn_prop_get_file_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_p_q_const__svn_string_t_p_svn_stream_t_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_p_q_const__svn_string_t_p_svn_stream_t_p_void_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -38619,7 +38150,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_upgrade_get_repos_info(PyObject *SWIGUN
   if (!PyArg_ParseTuple(args,(char *)"OOs|OO:svn_wc_invoke_upgrade_get_repos_info",&obj0,&obj1,&arg5,&obj3,&obj4)) SWIG_fail;
   {
     svn_wc_upgrade_get_repos_info_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_p_q_const__char_p_p_q_const__char_p_void_p_q_const__char_p_apr_pool_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_p_q_const__char_p_p_q_const__char_p_void_p_q_const__char_p_apr_pool_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -38734,7 +38265,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_relocation_validator3(PyObject *SWIGUNU
   if (!PyArg_ParseTuple(args,(char *)"OOzss|O:svn_wc_invoke_relocation_validator3",&obj0,&obj1,&arg3,&arg4,&arg5,&obj5)) SWIG_fail;
   {
     svn_wc_relocation_validator3_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -38810,7 +38341,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_relocation_validator2(PyObject *SWIGUNU
   if (!PyArg_ParseTuple(args,(char *)"OOzsO|O:svn_wc_invoke_relocation_validator2",&obj0,&obj1,&arg3,&arg4,&obj4,&obj5)) SWIG_fail;
   {
     svn_wc_relocation_validator2_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -38882,7 +38413,7 @@ SWIGINTERN PyObject *_wrap_svn_wc_invoke_relocation_validator(PyObject *SWIGUNUS
   if (!PyArg_ParseTuple(args,(char *)"OOzs:svn_wc_invoke_relocation_validator",&obj0,&obj1,&arg3,&arg4)) SWIG_fail;
   {
     svn_wc_relocation_validator_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -38942,7 +38473,7 @@ SWIGINTERN PyObject *_wrap_svn_changelist_invoke_receiver(PyObject *SWIGUNUSEDPA
   if (!PyArg_ParseTuple(args,(char *)"OOss|O:svn_changelist_invoke_receiver",&obj0,&obj1,&arg3,&arg4,&obj4)) SWIG_fail;
   {
     svn_changelist_receiver_t * tmp =
-    svn_swig_MustGetPtr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
+    svn_swig_py_must_get_ptr(obj0, SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, svn_argnum_obj0);
     if (tmp == NULL || PyErr_Occurred()) {
       SWIG_fail;
     }
@@ -39251,7 +38782,7 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"svn_wc_external_item_t_swigregister", svn_wc_external_item_t_swigregister, METH_VARARGS, NULL},
 	 { (char *)"svn_wc_external_item_dup", _wrap_svn_wc_external_item_dup, METH_VARARGS, (char *)"svn_wc_external_item_dup(svn_wc_external_item_t item, apr_pool_t pool) -> svn_wc_external_item_t"},
 	 { (char *)"svn_wc_parse_externals_description3", _wrap_svn_wc_parse_externals_description3, METH_VARARGS, (char *)"\n"
-		"svn_wc_parse_externals_description3(char const * parent_directory, char const * desc, svn_boolean_t canonicalize_url, \n"
+		"svn_wc_parse_externals_description3(char const * defining_directory, char const * desc, svn_boolean_t canonicalize_url, \n"
 		"    apr_pool_t pool) -> svn_error_t\n"
 		""},
 	 { (char *)"svn_wc_parse_externals_description2", _wrap_svn_wc_parse_externals_description2, METH_VARARGS, (char *)"svn_wc_parse_externals_description2(char const * parent_directory, char const * desc, apr_pool_t pool) -> svn_error_t"},
@@ -39330,39 +38861,6 @@ static PyMethodDef SwigMethods[] = {
 		"    apr_pool_t pool) -> svn_wc_conflict_version_t\n"
 		""},
 	 { (char *)"svn_wc_conflict_version_dup", _wrap_svn_wc_conflict_version_dup, METH_VARARGS, (char *)"svn_wc_conflict_version_dup(svn_wc_conflict_version_t version, apr_pool_t pool) -> svn_wc_conflict_version_t"},
-	 { (char *)"svn_wc_conflict_description2_t_local_abspath_set", _wrap_svn_wc_conflict_description2_t_local_abspath_set, METH_VARARGS, (char *)"svn_wc_conflict_description2_t_local_abspath_set(svn_wc_conflict_description2_t self, char const * local_abspath)"},
-	 { (char *)"svn_wc_conflict_description2_t_local_abspath_get", _wrap_svn_wc_conflict_description2_t_local_abspath_get, METH_VARARGS, (char *)"svn_wc_conflict_description2_t_local_abspath_get(svn_wc_conflict_description2_t self) -> char const *"},
-	 { (char *)"svn_wc_conflict_description2_t_node_kind_set", _wrap_svn_wc_conflict_description2_t_node_kind_set, METH_VARARGS, (char *)"svn_wc_conflict_description2_t_node_kind_set(svn_wc_conflict_description2_t self, svn_node_kind_t node_kind)"},
-	 { (char *)"svn_wc_conflict_description2_t_node_kind_get", _wrap_svn_wc_conflict_description2_t_node_kind_get, METH_VARARGS, (char *)"svn_wc_conflict_description2_t_node_kind_get(svn_wc_conflict_description2_t self) -> svn_node_kind_t"},
-	 { (char *)"svn_wc_conflict_description2_t_kind_set", _wrap_svn_wc_conflict_description2_t_kind_set, METH_VARARGS, (char *)"svn_wc_conflict_description2_t_kind_set(svn_wc_conflict_description2_t self, svn_wc_conflict_kind_t kind)"},
-	 { (char *)"svn_wc_conflict_description2_t_kind_get", _wrap_svn_wc_conflict_description2_t_kind_get, METH_VARARGS, (char *)"svn_wc_conflict_description2_t_kind_get(svn_wc_conflict_description2_t self) -> svn_wc_conflict_kind_t"},
-	 { (char *)"svn_wc_conflict_description2_t_property_name_set", _wrap_svn_wc_conflict_description2_t_property_name_set, METH_VARARGS, (char *)"svn_wc_conflict_description2_t_property_name_set(svn_wc_conflict_description2_t self, char const * property_name)"},
-	 { (char *)"svn_wc_conflict_description2_t_property_name_get", _wrap_svn_wc_conflict_description2_t_property_name_get, METH_VARARGS, (char *)"svn_wc_conflict_description2_t_property_name_get(svn_wc_conflict_description2_t self) -> char const *"},
-	 { (char *)"svn_wc_conflict_description2_t_is_binary_set", _wrap_svn_wc_conflict_description2_t_is_binary_set, METH_VARARGS, (char *)"svn_wc_conflict_description2_t_is_binary_set(svn_wc_conflict_description2_t self, svn_boolean_t is_binary)"},
-	 { (char *)"svn_wc_conflict_description2_t_is_binary_get", _wrap_svn_wc_conflict_description2_t_is_binary_get, METH_VARARGS, (char *)"svn_wc_conflict_description2_t_is_binary_get(svn_wc_conflict_description2_t self) -> svn_boolean_t"},
-	 { (char *)"svn_wc_conflict_description2_t_mime_type_set", _wrap_svn_wc_conflict_description2_t_mime_type_set, METH_VARARGS, (char *)"svn_wc_conflict_description2_t_mime_type_set(svn_wc_conflict_description2_t self, char const * mime_type)"},
-	 { (char *)"svn_wc_conflict_description2_t_mime_type_get", _wrap_svn_wc_conflict_description2_t_mime_type_get, METH_VARARGS, (char *)"svn_wc_conflict_description2_t_mime_type_get(svn_wc_conflict_description2_t self) -> char const *"},
-	 { (char *)"svn_wc_conflict_description2_t_action_set", _wrap_svn_wc_conflict_description2_t_action_set, METH_VARARGS, (char *)"svn_wc_conflict_description2_t_action_set(svn_wc_conflict_description2_t self, svn_wc_conflict_action_t action)"},
-	 { (char *)"svn_wc_conflict_description2_t_action_get", _wrap_svn_wc_conflict_description2_t_action_get, METH_VARARGS, (char *)"svn_wc_conflict_description2_t_action_get(svn_wc_conflict_description2_t self) -> svn_wc_conflict_action_t"},
-	 { (char *)"svn_wc_conflict_description2_t_reason_set", _wrap_svn_wc_conflict_description2_t_reason_set, METH_VARARGS, (char *)"svn_wc_conflict_description2_t_reason_set(svn_wc_conflict_description2_t self, svn_wc_conflict_reason_t reason)"},
-	 { (char *)"svn_wc_conflict_description2_t_reason_get", _wrap_svn_wc_conflict_description2_t_reason_get, METH_VARARGS, (char *)"svn_wc_conflict_description2_t_reason_get(svn_wc_conflict_description2_t self) -> svn_wc_conflict_reason_t"},
-	 { (char *)"svn_wc_conflict_description2_t_base_abspath_set", _wrap_svn_wc_conflict_description2_t_base_abspath_set, METH_VARARGS, (char *)"svn_wc_conflict_description2_t_base_abspath_set(svn_wc_conflict_description2_t self, char const * base_abspath)"},
-	 { (char *)"svn_wc_conflict_description2_t_base_abspath_get", _wrap_svn_wc_conflict_description2_t_base_abspath_get, METH_VARARGS, (char *)"svn_wc_conflict_description2_t_base_abspath_get(svn_wc_conflict_description2_t self) -> char const *"},
-	 { (char *)"svn_wc_conflict_description2_t_their_abspath_set", _wrap_svn_wc_conflict_description2_t_their_abspath_set, METH_VARARGS, (char *)"svn_wc_conflict_description2_t_their_abspath_set(svn_wc_conflict_description2_t self, char const * their_abspath)"},
-	 { (char *)"svn_wc_conflict_description2_t_their_abspath_get", _wrap_svn_wc_conflict_description2_t_their_abspath_get, METH_VARARGS, (char *)"svn_wc_conflict_description2_t_their_abspath_get(svn_wc_conflict_description2_t self) -> char const *"},
-	 { (char *)"svn_wc_conflict_description2_t_my_abspath_set", _wrap_svn_wc_conflict_description2_t_my_abspath_set, METH_VARARGS, (char *)"svn_wc_conflict_description2_t_my_abspath_set(svn_wc_conflict_description2_t self, char const * my_abspath)"},
-	 { (char *)"svn_wc_conflict_description2_t_my_abspath_get", _wrap_svn_wc_conflict_description2_t_my_abspath_get, METH_VARARGS, (char *)"svn_wc_conflict_description2_t_my_abspath_get(svn_wc_conflict_description2_t self) -> char const *"},
-	 { (char *)"svn_wc_conflict_description2_t_merged_file_set", _wrap_svn_wc_conflict_description2_t_merged_file_set, METH_VARARGS, (char *)"svn_wc_conflict_description2_t_merged_file_set(svn_wc_conflict_description2_t self, char const * merged_file)"},
-	 { (char *)"svn_wc_conflict_description2_t_merged_file_get", _wrap_svn_wc_conflict_description2_t_merged_file_get, METH_VARARGS, (char *)"svn_wc_conflict_description2_t_merged_file_get(svn_wc_conflict_description2_t self) -> char const *"},
-	 { (char *)"svn_wc_conflict_description2_t_operation_set", _wrap_svn_wc_conflict_description2_t_operation_set, METH_VARARGS, (char *)"svn_wc_conflict_description2_t_operation_set(svn_wc_conflict_description2_t self, svn_wc_operation_t operation)"},
-	 { (char *)"svn_wc_conflict_description2_t_operation_get", _wrap_svn_wc_conflict_description2_t_operation_get, METH_VARARGS, (char *)"svn_wc_conflict_description2_t_operation_get(svn_wc_conflict_description2_t self) -> svn_wc_operation_t"},
-	 { (char *)"svn_wc_conflict_description2_t_src_left_version_set", _wrap_svn_wc_conflict_description2_t_src_left_version_set, METH_VARARGS, (char *)"svn_wc_conflict_description2_t_src_left_version_set(svn_wc_conflict_description2_t self, svn_wc_conflict_version_t src_left_version)"},
-	 { (char *)"svn_wc_conflict_description2_t_src_left_version_get", _wrap_svn_wc_conflict_description2_t_src_left_version_get, METH_VARARGS, (char *)"svn_wc_conflict_description2_t_src_left_version_get(svn_wc_conflict_description2_t self) -> svn_wc_conflict_version_t"},
-	 { (char *)"svn_wc_conflict_description2_t_src_right_version_set", _wrap_svn_wc_conflict_description2_t_src_right_version_set, METH_VARARGS, (char *)"svn_wc_conflict_description2_t_src_right_version_set(svn_wc_conflict_description2_t self, svn_wc_conflict_version_t src_right_version)"},
-	 { (char *)"svn_wc_conflict_description2_t_src_right_version_get", _wrap_svn_wc_conflict_description2_t_src_right_version_get, METH_VARARGS, (char *)"svn_wc_conflict_description2_t_src_right_version_get(svn_wc_conflict_description2_t self) -> svn_wc_conflict_version_t"},
-	 { (char *)"new_svn_wc_conflict_description2_t", _wrap_new_svn_wc_conflict_description2_t, METH_VARARGS, (char *)"new_svn_wc_conflict_description2_t() -> svn_wc_conflict_description2_t"},
-	 { (char *)"delete_svn_wc_conflict_description2_t", _wrap_delete_svn_wc_conflict_description2_t, METH_VARARGS, (char *)"delete_svn_wc_conflict_description2_t(svn_wc_conflict_description2_t self)"},
-	 { (char *)"svn_wc_conflict_description2_t_swigregister", svn_wc_conflict_description2_t_swigregister, METH_VARARGS, NULL},
 	 { (char *)"svn_wc_conflict_description_t_path_set", _wrap_svn_wc_conflict_description_t_path_set, METH_VARARGS, (char *)"svn_wc_conflict_description_t_path_set(svn_wc_conflict_description_t self, char const * path)"},
 	 { (char *)"svn_wc_conflict_description_t_path_get", _wrap_svn_wc_conflict_description_t_path_get, METH_VARARGS, (char *)"svn_wc_conflict_description_t_path_get(svn_wc_conflict_description_t self) -> char const *"},
 	 { (char *)"svn_wc_conflict_description_t_node_kind_set", _wrap_svn_wc_conflict_description_t_node_kind_set, METH_VARARGS, (char *)"svn_wc_conflict_description_t_node_kind_set(svn_wc_conflict_description_t self, svn_node_kind_t node_kind)"},
@@ -39398,11 +38896,11 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"new_svn_wc_conflict_description_t", _wrap_new_svn_wc_conflict_description_t, METH_VARARGS, (char *)"new_svn_wc_conflict_description_t() -> svn_wc_conflict_description_t"},
 	 { (char *)"delete_svn_wc_conflict_description_t", _wrap_delete_svn_wc_conflict_description_t, METH_VARARGS, (char *)"delete_svn_wc_conflict_description_t(svn_wc_conflict_description_t self)"},
 	 { (char *)"svn_wc_conflict_description_t_swigregister", svn_wc_conflict_description_t_swigregister, METH_VARARGS, NULL},
-	 { (char *)"svn_wc_conflict_description_create_text2", _wrap_svn_wc_conflict_description_create_text2, METH_VARARGS, (char *)"svn_wc_conflict_description_create_text2(char const * local_abspath, apr_pool_t result_pool) -> svn_wc_conflict_description2_t"},
+	 { (char *)"svn_wc_conflict_description_create_text2", _wrap_svn_wc_conflict_description_create_text2, METH_VARARGS, (char *)"svn_wc_conflict_description_create_text2(char const * local_abspath, apr_pool_t result_pool) -> svn_wc_conflict_description2_t *"},
 	 { (char *)"svn_wc_conflict_description_create_text", _wrap_svn_wc_conflict_description_create_text, METH_VARARGS, (char *)"svn_wc_conflict_description_create_text(char const * path, svn_wc_adm_access_t * adm_access, apr_pool_t pool) -> svn_wc_conflict_description_t"},
 	 { (char *)"svn_wc_conflict_description_create_prop2", _wrap_svn_wc_conflict_description_create_prop2, METH_VARARGS, (char *)"\n"
 		"svn_wc_conflict_description_create_prop2(char const * local_abspath, svn_node_kind_t node_kind, char const * property_name, \n"
-		"    apr_pool_t result_pool) -> svn_wc_conflict_description2_t\n"
+		"    apr_pool_t result_pool) -> svn_wc_conflict_description2_t *\n"
 		""},
 	 { (char *)"svn_wc_conflict_description_create_prop", _wrap_svn_wc_conflict_description_create_prop, METH_VARARGS, (char *)"\n"
 		"svn_wc_conflict_description_create_prop(char const * path, svn_wc_adm_access_t * adm_access, svn_node_kind_t node_kind, char const * property_name, \n"
@@ -39411,24 +38909,16 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"svn_wc_conflict_description_create_tree2", _wrap_svn_wc_conflict_description_create_tree2, METH_VARARGS, (char *)"\n"
 		"svn_wc_conflict_description_create_tree2(char const * local_abspath, svn_node_kind_t node_kind, svn_wc_operation_t operation, \n"
 		"    svn_wc_conflict_version_t src_left_version, svn_wc_conflict_version_t src_right_version, \n"
-		"    apr_pool_t result_pool) -> svn_wc_conflict_description2_t\n"
+		"    apr_pool_t result_pool) -> svn_wc_conflict_description2_t *\n"
 		""},
 	 { (char *)"svn_wc_conflict_description_create_tree", _wrap_svn_wc_conflict_description_create_tree, METH_VARARGS, (char *)"\n"
 		"svn_wc_conflict_description_create_tree(char const * path, svn_wc_adm_access_t * adm_access, svn_node_kind_t node_kind, svn_wc_operation_t operation, \n"
 		"    svn_wc_conflict_version_t src_left_version, svn_wc_conflict_version_t src_right_version, \n"
 		"    apr_pool_t pool) -> svn_wc_conflict_description_t\n"
 		""},
-	 { (char *)"svn_wc__conflict_description2_dup", _wrap_svn_wc__conflict_description2_dup, METH_VARARGS, (char *)"svn_wc__conflict_description2_dup(svn_wc_conflict_description2_t conflict, apr_pool_t result_pool) -> svn_wc_conflict_description2_t"},
-	 { (char *)"svn_wc_conflict_result_t_choice_set", _wrap_svn_wc_conflict_result_t_choice_set, METH_VARARGS, (char *)"svn_wc_conflict_result_t_choice_set(svn_wc_conflict_result_t self, svn_wc_conflict_choice_t choice)"},
-	 { (char *)"svn_wc_conflict_result_t_choice_get", _wrap_svn_wc_conflict_result_t_choice_get, METH_VARARGS, (char *)"svn_wc_conflict_result_t_choice_get(svn_wc_conflict_result_t self) -> svn_wc_conflict_choice_t"},
-	 { (char *)"svn_wc_conflict_result_t_merged_file_set", _wrap_svn_wc_conflict_result_t_merged_file_set, METH_VARARGS, (char *)"svn_wc_conflict_result_t_merged_file_set(svn_wc_conflict_result_t self, char const * merged_file)"},
-	 { (char *)"svn_wc_conflict_result_t_merged_file_get", _wrap_svn_wc_conflict_result_t_merged_file_get, METH_VARARGS, (char *)"svn_wc_conflict_result_t_merged_file_get(svn_wc_conflict_result_t self) -> char const *"},
-	 { (char *)"svn_wc_conflict_result_t_save_merged_set", _wrap_svn_wc_conflict_result_t_save_merged_set, METH_VARARGS, (char *)"svn_wc_conflict_result_t_save_merged_set(svn_wc_conflict_result_t self, svn_boolean_t save_merged)"},
-	 { (char *)"svn_wc_conflict_result_t_save_merged_get", _wrap_svn_wc_conflict_result_t_save_merged_get, METH_VARARGS, (char *)"svn_wc_conflict_result_t_save_merged_get(svn_wc_conflict_result_t self) -> svn_boolean_t"},
-	 { (char *)"new_svn_wc_conflict_result_t", _wrap_new_svn_wc_conflict_result_t, METH_VARARGS, (char *)"new_svn_wc_conflict_result_t() -> svn_wc_conflict_result_t"},
-	 { (char *)"delete_svn_wc_conflict_result_t", _wrap_delete_svn_wc_conflict_result_t, METH_VARARGS, (char *)"delete_svn_wc_conflict_result_t(svn_wc_conflict_result_t self)"},
-	 { (char *)"svn_wc_conflict_result_t_swigregister", svn_wc_conflict_result_t_swigregister, METH_VARARGS, NULL},
-	 { (char *)"svn_wc_create_conflict_result", _wrap_svn_wc_create_conflict_result, METH_VARARGS, (char *)"svn_wc_create_conflict_result(svn_wc_conflict_choice_t choice, char const * merged_file, apr_pool_t pool) -> svn_wc_conflict_result_t"},
+	 { (char *)"svn_wc_conflict_description2_dup", _wrap_svn_wc_conflict_description2_dup, METH_VARARGS, (char *)"svn_wc_conflict_description2_dup(svn_wc_conflict_description2_t const * conflict, apr_pool_t result_pool) -> svn_wc_conflict_description2_t *"},
+	 { (char *)"svn_wc__conflict_description2_dup", _wrap_svn_wc__conflict_description2_dup, METH_VARARGS, (char *)"svn_wc__conflict_description2_dup(svn_wc_conflict_description2_t const * conflict, apr_pool_t result_pool) -> svn_wc_conflict_description2_t *"},
+	 { (char *)"svn_wc_create_conflict_result", _wrap_svn_wc_create_conflict_result, METH_VARARGS, (char *)"svn_wc_create_conflict_result(svn_wc_conflict_choice_t choice, char const * merged_file, apr_pool_t pool) -> svn_wc_conflict_result_t *"},
 	 { (char *)"svn_wc_diff_callbacks4_t_file_opened_set", _wrap_svn_wc_diff_callbacks4_t_file_opened_set, METH_VARARGS, (char *)"svn_wc_diff_callbacks4_t_file_opened_set(svn_wc_diff_callbacks4_t self, svn_error_t *(*)(svn_boolean_t *,svn_boolean_t *,char const *,svn_revnum_t,void *,apr_pool_t *) file_opened)"},
 	 { (char *)"svn_wc_diff_callbacks4_t_file_opened_get", _wrap_svn_wc_diff_callbacks4_t_file_opened_get, METH_VARARGS, (char *)"svn_wc_diff_callbacks4_t_file_opened_get(svn_wc_diff_callbacks4_t self) -> svn_error_t *(*)(svn_boolean_t *,svn_boolean_t *,char const *,svn_revnum_t,void *,apr_pool_t *)"},
 	 { (char *)"svn_wc_diff_callbacks4_t_file_changed_set", _wrap_svn_wc_diff_callbacks4_t_file_changed_set, METH_VARARGS, (char *)"svn_wc_diff_callbacks4_t_file_changed_set(svn_wc_diff_callbacks4_t self, svn_error_t *(*)(svn_wc_notify_state_t *,svn_wc_notify_state_t *,svn_boolean_t *,char const *,char const *,char const *,svn_revnum_t,svn_revnum_t,char const *,char const *,apr_array_header_t const *,apr_hash_t *,void *,apr_pool_t *) file_changed)"},
@@ -39729,6 +39219,8 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"svn_wc_status3_t_moved_to_abspath_get", _wrap_svn_wc_status3_t_moved_to_abspath_get, METH_VARARGS, (char *)"svn_wc_status3_t_moved_to_abspath_get(svn_wc_status3_t self) -> char const *"},
 	 { (char *)"svn_wc_status3_t_file_external_set", _wrap_svn_wc_status3_t_file_external_set, METH_VARARGS, (char *)"svn_wc_status3_t_file_external_set(svn_wc_status3_t self, svn_boolean_t file_external)"},
 	 { (char *)"svn_wc_status3_t_file_external_get", _wrap_svn_wc_status3_t_file_external_get, METH_VARARGS, (char *)"svn_wc_status3_t_file_external_get(svn_wc_status3_t self) -> svn_boolean_t"},
+	 { (char *)"svn_wc_status3_t_actual_kind_set", _wrap_svn_wc_status3_t_actual_kind_set, METH_VARARGS, (char *)"svn_wc_status3_t_actual_kind_set(svn_wc_status3_t self, svn_node_kind_t actual_kind)"},
+	 { (char *)"svn_wc_status3_t_actual_kind_get", _wrap_svn_wc_status3_t_actual_kind_get, METH_VARARGS, (char *)"svn_wc_status3_t_actual_kind_get(svn_wc_status3_t self) -> svn_node_kind_t"},
 	 { (char *)"new_svn_wc_status3_t", _wrap_new_svn_wc_status3_t, METH_VARARGS, (char *)"new_svn_wc_status3_t() -> svn_wc_status3_t"},
 	 { (char *)"delete_svn_wc_status3_t", _wrap_delete_svn_wc_status3_t, METH_VARARGS, (char *)"delete_svn_wc_status3_t(svn_wc_status3_t self)"},
 	 { (char *)"svn_wc_status3_t_swigregister", svn_wc_status3_t_swigregister, METH_VARARGS, NULL},
@@ -39869,6 +39361,10 @@ static PyMethodDef SwigMethods[] = {
 		"svn_wc_delete(char const * path, svn_wc_adm_access_t * adm_access, svn_cancel_func_t cancel_func, \n"
 		"    svn_wc_notify_func_t notify_func, apr_pool_t pool) -> svn_error_t\n"
 		""},
+	 { (char *)"svn_wc_add_from_disk3", _wrap_svn_wc_add_from_disk3, METH_VARARGS, (char *)"\n"
+		"svn_wc_add_from_disk3(svn_wc_context_t * wc_ctx, char const * local_abspath, apr_hash_t props, svn_boolean_t skip_checks, \n"
+		"    svn_wc_notify_func2_t notify_func, apr_pool_t scratch_pool) -> svn_error_t\n"
+		""},
 	 { (char *)"svn_wc_add_from_disk2", _wrap_svn_wc_add_from_disk2, METH_VARARGS, (char *)"\n"
 		"svn_wc_add_from_disk2(svn_wc_context_t * wc_ctx, char const * local_abspath, apr_hash_t props, svn_wc_notify_func2_t notify_func, \n"
 		"    apr_pool_t scratch_pool) -> svn_error_t\n"
@@ -39956,6 +39452,12 @@ static PyMethodDef SwigMethods[] = {
 		"    apr_pool_t pool) -> svn_error_t\n"
 		""},
 	 { (char *)"svn_wc_committed_queue_create", _wrap_svn_wc_committed_queue_create, METH_VARARGS, (char *)"svn_wc_committed_queue_create(apr_pool_t pool) -> svn_wc_committed_queue_t *"},
+	 { (char *)"svn_wc_queue_committed4", _wrap_svn_wc_queue_committed4, METH_VARARGS, (char *)"\n"
+		"svn_wc_queue_committed4(svn_wc_committed_queue_t * queue, svn_wc_context_t * wc_ctx, char const * local_abspath, \n"
+		"    svn_boolean_t recurse, svn_boolean_t is_committed, apr_array_header_t wcprop_changes, \n"
+		"    svn_boolean_t remove_lock, svn_boolean_t remove_changelist, \n"
+		"    svn_checksum_t sha1_checksum, apr_pool_t scratch_pool) -> svn_error_t\n"
+		""},
 	 { (char *)"svn_wc_queue_committed3", _wrap_svn_wc_queue_committed3, METH_VARARGS, (char *)"\n"
 		"svn_wc_queue_committed3(svn_wc_committed_queue_t * queue, svn_wc_context_t * wc_ctx, char const * local_abspath, \n"
 		"    svn_boolean_t recurse, apr_array_header_t wcprop_changes, svn_boolean_t remove_lock, \n"
@@ -40266,6 +39768,12 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"svn_wc_get_pristine_contents2", _wrap_svn_wc_get_pristine_contents2, METH_VARARGS, (char *)"svn_wc_get_pristine_contents2(svn_wc_context_t * wc_ctx, char const * local_abspath, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"},
 	 { (char *)"svn_wc_get_pristine_contents", _wrap_svn_wc_get_pristine_contents, METH_VARARGS, (char *)"svn_wc_get_pristine_contents(char const * path, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t"},
 	 { (char *)"svn_wc_get_pristine_copy_path", _wrap_svn_wc_get_pristine_copy_path, METH_VARARGS, (char *)"svn_wc_get_pristine_copy_path(char const * path, apr_pool_t pool) -> svn_error_t"},
+	 { (char *)"svn_wc_cleanup4", _wrap_svn_wc_cleanup4, METH_VARARGS, (char *)"\n"
+		"svn_wc_cleanup4(svn_wc_context_t * wc_ctx, char const * local_abspath, svn_boolean_t break_locks, \n"
+		"    svn_boolean_t fix_recorded_timestamps, svn_boolean_t clear_dav_cache, svn_boolean_t vacuum_pristines, \n"
+		"    svn_cancel_func_t cancel_func, svn_wc_notify_func2_t notify_func, \n"
+		"    apr_pool_t scratch_pool) -> svn_error_t\n"
+		""},
 	 { (char *)"svn_wc_cleanup3", _wrap_svn_wc_cleanup3, METH_VARARGS, (char *)"\n"
 		"svn_wc_cleanup3(svn_wc_context_t * wc_ctx, char const * local_abspath, svn_cancel_func_t cancel_func, \n"
 		"    apr_pool_t scratch_pool) -> svn_error_t\n"
@@ -40300,6 +39808,12 @@ static PyMethodDef SwigMethods[] = {
 		"    svn_boolean_t recurse, svn_wc_relocation_validator_t validator, void * validator_baton, \n"
 		"    apr_pool_t pool) -> svn_error_t\n"
 		""},
+	 { (char *)"svn_wc_revert5", _wrap_svn_wc_revert5, METH_VARARGS, (char *)"\n"
+		"svn_wc_revert5(svn_wc_context_t * wc_ctx, char const * local_abspath, svn_depth_t depth, svn_boolean_t use_commit_times, \n"
+		"    apr_array_header_t changelist_filter, svn_boolean_t clear_changelists, \n"
+		"    svn_boolean_t metadata_only, svn_cancel_func_t cancel_func, \n"
+		"    svn_wc_notify_func2_t notify_func, apr_pool_t scratch_pool) -> svn_error_t\n"
+		""},
 	 { (char *)"svn_wc_revert4", _wrap_svn_wc_revert4, METH_VARARGS, (char *)"\n"
 		"svn_wc_revert4(svn_wc_context_t * wc_ctx, char const * local_abspath, svn_depth_t depth, svn_boolean_t use_commit_times, \n"
 		"    apr_array_header_t changelist_filter, svn_cancel_func_t cancel_func, \n"
@@ -40601,7 +40115,7 @@ static PyMethodDef SwigMethods[] = {
 		"    svn_wc_notify_state_t prop_state, svn_revnum_t revision)\n"
 		""},
 	 { (char *)"svn_wc_invoke_conflict_resolver_func2", _wrap_svn_wc_invoke_conflict_resolver_func2, METH_VARARGS, (char *)"\n"
-		"svn_wc_invoke_conflict_resolver_func2(svn_wc_conflict_resolver_func2_t _obj, svn_wc_conflict_description2_t description, \n"
+		"svn_wc_invoke_conflict_resolver_func2(svn_wc_conflict_resolver_func2_t _obj, svn_wc_conflict_description2_t const * description, \n"
 		"    void * baton, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t\n"
 		""},
 	 { (char *)"svn_wc_invoke_conflict_resolver_func", _wrap_svn_wc_invoke_conflict_resolver_func, METH_VARARGS, (char *)"\n"
@@ -40778,9 +40292,11 @@ static swig_type_info _swigt__p_svn_commit_info_t = {"_p_svn_commit_info_t", "st
 static swig_type_info _swigt__p_svn_config_t = {"_p_svn_config_t", "struct svn_config_t *|svn_config_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_delta_editor_t = {"_p_svn_delta_editor_t", "struct svn_delta_editor_t *|svn_delta_editor_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_depth_t = {"_p_svn_depth_t", "enum svn_depth_t *|svn_depth_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_diff_hunk_t = {"_p_svn_diff_hunk_t", "svn_diff_hunk_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_dirent_t = {"_p_svn_dirent_t", "struct svn_dirent_t *|svn_dirent_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_errno_t = {"_p_svn_errno_t", "enum svn_errno_t *|svn_errno_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "struct svn_error_t *|svn_error_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_fs_lock_target_t = {"_p_svn_fs_lock_target_t", "svn_fs_lock_target_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_io_dirent2_t = {"_p_svn_io_dirent2_t", "struct svn_io_dirent2_t *|svn_io_dirent2_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_io_dirent_t = {"_p_svn_io_dirent_t", "struct svn_io_dirent_t *|svn_io_dirent_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_io_file_del_t = {"_p_svn_io_file_del_t", "enum svn_io_file_del_t *|svn_io_file_del_t *", 0, 0, (void*)0, 0};
@@ -40964,9 +40480,11 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_svn_config_t,
   &_swigt__p_svn_delta_editor_t,
   &_swigt__p_svn_depth_t,
+  &_swigt__p_svn_diff_hunk_t,
   &_swigt__p_svn_dirent_t,
   &_swigt__p_svn_errno_t,
   &_swigt__p_svn_error_t,
+  &_swigt__p_svn_fs_lock_target_t,
   &_swigt__p_svn_io_dirent2_t,
   &_swigt__p_svn_io_dirent_t,
   &_swigt__p_svn_io_file_del_t,
@@ -41150,9 +40668,11 @@ static swig_cast_info _swigc__p_svn_commit_info_t[] = {  {&_swigt__p_svn_commit_
 static swig_cast_info _swigc__p_svn_config_t[] = {  {&_swigt__p_svn_config_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_delta_editor_t[] = {  {&_swigt__p_svn_delta_editor_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_depth_t[] = {  {&_swigt__p_svn_depth_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_diff_hunk_t[] = {  {&_swigt__p_svn_diff_hunk_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_dirent_t[] = {  {&_swigt__p_svn_dirent_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_errno_t[] = {  {&_swigt__p_svn_errno_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_error_t[] = {  {&_swigt__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_fs_lock_target_t[] = {  {&_swigt__p_svn_fs_lock_target_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_io_dirent2_t[] = {  {&_swigt__p_svn_io_dirent2_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_io_dirent_t[] = {  {&_swigt__p_svn_io_dirent_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_io_file_del_t[] = {  {&_swigt__p_svn_io_file_del_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -41336,9 +40856,11 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_svn_config_t,
   _swigc__p_svn_delta_editor_t,
   _swigc__p_svn_depth_t,
+  _swigc__p_svn_diff_hunk_t,
   _swigc__p_svn_dirent_t,
   _swigc__p_svn_errno_t,
   _swigc__p_svn_error_t,
+  _swigc__p_svn_fs_lock_target_t,
   _swigc__p_svn_io_dirent2_t,
   _swigc__p_svn_io_dirent_t,
   _swigc__p_svn_io_file_del_t,
@@ -41426,18 +40948,18 @@ static swig_const_info swig_const_table[] = {
 #endif
 /* -----------------------------------------------------------------------------
  * Type initialization:
- * This problem is tough by the requirement that no dynamic 
- * memory is used. Also, since swig_type_info structures store pointers to 
+ * This problem is tough by the requirement that no dynamic
+ * memory is used. Also, since swig_type_info structures store pointers to
  * swig_cast_info structures and swig_cast_info structures store pointers back
- * to swig_type_info structures, we need some lookup code at initialization. 
- * The idea is that swig generates all the structures that are needed. 
- * The runtime then collects these partially filled structures. 
- * The SWIG_InitializeModule function takes these initial arrays out of 
+ * to swig_type_info structures, we need some lookup code at initialization.
+ * The idea is that swig generates all the structures that are needed.
+ * The runtime then collects these partially filled structures.
+ * The SWIG_InitializeModule function takes these initial arrays out of
  * swig_module, and does all the lookup, filling in the swig_module.types
  * array with the correct data and linking the correct swig_cast_info
  * structures together.
  *
- * The generated swig_type_info structures are assigned staticly to an initial 
+ * The generated swig_type_info structures are assigned staticly to an initial
  * array. We just loop through that array, and handle each type individually.
  * First we lookup if this type has been already loaded, and if so, use the
  * loaded structure instead of the generated one. Then we have to fill in the
@@ -41447,17 +40969,17 @@ static swig_const_info swig_const_table[] = {
  * a column is one of the swig_cast_info structures for that type.
  * The cast_initial array is actually an array of arrays, because each row has
  * a variable number of columns. So to actually build the cast linked list,
- * we find the array of casts associated with the type, and loop through it 
+ * we find the array of casts associated with the type, and loop through it
  * adding the casts to the list. The one last trick we need to do is making
  * sure the type pointer in the swig_cast_info struct is correct.
  *
- * First off, we lookup the cast->type name to see if it is already loaded. 
+ * First off, we lookup the cast->type name to see if it is already loaded.
  * There are three cases to handle:
  *  1) If the cast->type has already been loaded AND the type we are adding
  *     casting info to has not been loaded (it is in this module), THEN we
  *     replace the cast->type pointer with the type pointer that has already
  *     been loaded.
- *  2) If BOTH types (the one we are adding casting info to, and the 
+ *  2) If BOTH types (the one we are adding casting info to, and the
  *     cast->type) are loaded, THEN the cast info has already been loaded by
  *     the previous module so we just ignore it.
  *  3) Finally, if cast->type has not already been loaded, then we add that
@@ -41520,7 +41042,7 @@ SWIG_InitializeModule(void *clientdata) {
     module_head->next = &swig_module;
   }
   
-  /* When multiple interpeters are used, a module could have already been initialized in
+  /* When multiple interpreters are used, a module could have already been initialized in
        a different interpreter, but not yet have a pointer in this interpreter.
        In this case, we do not want to continue adding types... everything should be
        set up already */
@@ -42180,6 +41702,10 @@ SWIG_init(void) {
   SWIG_Python_SetConstant(d, "svn_wc_notify_left_local_modifications",SWIG_From_long((long)(svn_wc_notify_left_local_modifications)));
   SWIG_Python_SetConstant(d, "svn_wc_notify_foreign_copy_begin",SWIG_From_long((long)(svn_wc_notify_foreign_copy_begin)));
   SWIG_Python_SetConstant(d, "svn_wc_notify_move_broken",SWIG_From_long((long)(svn_wc_notify_move_broken)));
+  SWIG_Python_SetConstant(d, "svn_wc_notify_cleanup_external",SWIG_From_long((long)(svn_wc_notify_cleanup_external)));
+  SWIG_Python_SetConstant(d, "svn_wc_notify_failed_requires_target",SWIG_From_long((long)(svn_wc_notify_failed_requires_target)));
+  SWIG_Python_SetConstant(d, "svn_wc_notify_info_external",SWIG_From_long((long)(svn_wc_notify_info_external)));
+  SWIG_Python_SetConstant(d, "svn_wc_notify_commit_finalizing",SWIG_From_long((long)(svn_wc_notify_commit_finalizing)));
   SWIG_Python_SetConstant(d, "svn_wc_notify_state_inapplicable",SWIG_From_long((long)(svn_wc_notify_state_inapplicable)));
   SWIG_Python_SetConstant(d, "svn_wc_notify_state_unknown",SWIG_From_long((long)(svn_wc_notify_state_unknown)));
   SWIG_Python_SetConstant(d, "svn_wc_notify_state_unchanged",SWIG_From_long((long)(svn_wc_notify_state_unchanged)));
@@ -42214,6 +41740,7 @@ SWIG_init(void) {
   SWIG_Python_SetConstant(d, "svn_wc_operation_update",SWIG_From_long((long)(svn_wc_operation_update)));
   SWIG_Python_SetConstant(d, "svn_wc_operation_switch",SWIG_From_long((long)(svn_wc_operation_switch)));
   SWIG_Python_SetConstant(d, "svn_wc_operation_merge",SWIG_From_long((long)(svn_wc_operation_merge)));
+  SWIG_Python_SetConstant(d, "svn_wc_conflict_choose_undefined",SWIG_From_long((long)(svn_wc_conflict_choose_undefined)));
   SWIG_Python_SetConstant(d, "svn_wc_conflict_choose_postpone",SWIG_From_long((long)(svn_wc_conflict_choose_postpone)));
   SWIG_Python_SetConstant(d, "svn_wc_conflict_choose_base",SWIG_From_long((long)(svn_wc_conflict_choose_base)));
   SWIG_Python_SetConstant(d, "svn_wc_conflict_choose_theirs_full",SWIG_From_long((long)(svn_wc_conflict_choose_theirs_full)));
diff --git a/subversion/bindings/swig/python/tests/ra.py b/subversion/bindings/swig/python/tests/ra.py
index d38bbb8..47917ca 100644
--- a/subversion/bindings/swig/python/tests/ra.py
+++ b/subversion/bindings/swig/python/tests/ra.py
@@ -298,13 +298,53 @@ class SubversionRepositoryAccessTestCase(unittest.TestCase):
     ra.get_file_revs(self.ra_ctx, "trunk/README.txt", 0, 10, rev_handler)
 
   def test_lock(self):
-    def callback(baton, path, do_lock, lock, ra_err, pool):
-      pass
-    # This test merely makes sure that the arguments can be wrapped
-    # properly. svn.ra.lock() currently fails because it is not possible
-    # to retrieve the username from the auth_baton yet.
-    self.assertRaises(core.SubversionException,
-      lambda: ra.lock(self.ra_ctx, {"": 0}, "sleutel", False, callback))
+
+    self.calls = 0
+    self.locks = 0
+    self.errors = 0
+    def callback(path, do_lock, lock, ra_err, pool):
+      self.calls += 1
+      self.assertEqual(path, "trunk/README2.txt")
+      if lock:
+        self.assertEqual(lock.owner, "jrandom")
+        self.locks += 1
+      if ra_err:
+        self.assert_(ra_err.apr_err == core.SVN_ERR_FS_PATH_ALREADY_LOCKED
+                     or ra_err.apr_err == core.SVN_ERR_FS_NO_SUCH_LOCK)
+        self.errors += 1
+
+    providers = [core.svn_auth_get_username_provider()]
+    self.callbacks.auth_baton = core.svn_auth_open(providers)
+    core.svn_auth_set_parameter(self.callbacks.auth_baton,
+                                core.SVN_AUTH_PARAM_DEFAULT_USERNAME,
+                                "jrandom")
+    self.ra_ctx = ra.open2(self.repos_uri, self.callbacks, {})
+    rev = fs.youngest_rev(self.fs)
+    ra.lock(self.ra_ctx, {"trunk/README2.txt":rev}, "sleutel", False, callback)
+    self.assertEqual(self.calls, 1)
+    self.assertEqual(self.locks, 1)
+    self.assertEqual(self.errors, 0)
+
+    self.calls = 0
+    self.locks = 0
+    ra.lock(self.ra_ctx, {"trunk/README2.txt":rev}, "sleutel", False, callback)
+    self.assertEqual(self.calls, 1)
+    self.assertEqual(self.locks, 0)
+    self.assertEqual(self.errors, 1)
+
+    self.calls = 0
+    self.errors = 0
+    the_lock = fs.get_lock(self.fs, "/trunk/README2.txt")
+    ra.unlock(self.ra_ctx, {"trunk/README2.txt":the_lock.token}, False, callback)
+    self.assertEqual(self.calls, 1)
+    self.assertEqual(self.locks, 0)
+    self.assertEqual(self.errors, 0)
+
+    self.calls = 0
+    ra.unlock(self.ra_ctx, {"trunk/README2.txt":the_lock.token}, False, callback)
+    self.assertEqual(self.calls, 1)
+    self.assertEqual(self.locks, 0)
+    self.assertEqual(self.errors, 1)
 
   def test_get_log2(self):
     # Get an interesting commmit.
diff --git a/subversion/bindings/swig/python/tests/repository.py b/subversion/bindings/swig/python/tests/repository.py
index 68e6c91..6bfc812 100644
--- a/subversion/bindings/swig/python/tests/repository.py
+++ b/subversion/bindings/swig/python/tests/repository.py
@@ -18,7 +18,7 @@
 # under the License.
 #
 #
-import unittest, setup_path
+import unittest, setup_path, os, sys
 from sys import version_info # For Python version check
 if version_info[0] >= 3:
   # Python >=3.0
@@ -44,6 +44,42 @@ class ChangeReceiver(delta.Editor):
         self.textdeltas.append(textdelta)
     return textdelta_handler
 
+class DumpStreamParser(repos.ParseFns3):
+  def __init__(self):
+    repos.ParseFns3.__init__(self)
+    self.ops = []
+  def magic_header_record(self, version, pool=None):
+    self.ops.append(("magic-header", version))
+  def uuid_record(self, uuid, pool=None):
+    self.ops.append(("uuid", uuid))
+  def new_revision_record(self, headers, pool=None):
+    rev = int(headers[repos.DUMPFILE_REVISION_NUMBER])
+    self.ops.append(("new-revision", rev))
+    return rev
+  def close_revision(self, revision_baton):
+    self.ops.append(("close-revision", revision_baton))
+  def new_node_record(self, headers, revision_baton, pool=None):
+    node = headers[repos.DUMPFILE_NODE_PATH]
+    self.ops.append(("new-node", revision_baton, node))
+    return (revision_baton, node)
+  def close_node(self, node_baton):
+    self.ops.append(("close-node", node_baton[0], node_baton[1]))
+  def set_revision_property(self, revision_baton, name, value):
+    self.ops.append(("set-revision-prop", revision_baton, name, value))
+  def set_node_property(self, node_baton, name, value):
+    self.ops.append(("set-node-prop", node_baton[0], node_baton[1], name, value))
+  def remove_node_props(self, node_baton):
+    self.ops.append(("remove-node-props", node_baton[0], node_baton[1]))
+  def delete_node_property(self, node_baton, name):
+    self.ops.append(("delete-node-prop", node_baton[0], node_baton[1], name))
+  def apply_textdelta(self, node_baton):
+    self.ops.append(("apply-textdelta", node_baton[0], node_baton[1]))
+    return None
+  def set_fulltext(self, node_baton):
+    self.ops.append(("set-fulltext", node_baton[0], node_baton[1]))
+    return None
+
+
 def _authz_callback(root, path, pool):
   "A dummy authz callback which always returns success."
   return 1
@@ -139,6 +175,62 @@ class SubversionRepositoryTestCase(unittest.TestCase):
     #        svn_repos_t objects, so the following call segfaults
     #repos.dump_fs2(None, None, None, 0, self.rev, 0, 0, None)
 
+  def test_parse_fns3(self):
+    self.cancel_calls = 0
+    def is_cancelled():
+      self.cancel_calls += 1
+      return None
+    dump_path = os.path.join(os.path.dirname(sys.argv[0]),
+        "trac/versioncontrol/tests/svnrepos.dump")
+    stream = open(dump_path)
+    dsp = DumpStreamParser()
+    ptr, baton = repos.make_parse_fns3(dsp)
+    repos.parse_dumpstream3(stream, ptr, baton, False, is_cancelled)
+    stream.close()
+    self.assertEqual(self.cancel_calls, 76)
+    expected_list = [
+        ("magic-header", 2),
+        ('uuid', '92ea810a-adf3-0310-b540-bef912dcf5ba'),
+        ('new-revision', 0),
+        ('set-revision-prop', 0, 'svn:date', '2005-04-01T09:57:41.312767Z'),
+        ('close-revision', 0),
+        ('new-revision', 1),
+        ('set-revision-prop', 1, 'svn:log', 'Initial directory layout.'),
+        ('set-revision-prop', 1, 'svn:author', 'john'),
+        ('set-revision-prop', 1, 'svn:date', '2005-04-01T10:00:52.353248Z'),
+        ('new-node', 1, 'branches'),
+        ('remove-node-props', 1, 'branches'),
+        ('close-node', 1, 'branches'),
+        ('new-node', 1, 'tags'),
+        ('remove-node-props', 1, 'tags'),
+        ('close-node', 1, 'tags'),
+        ('new-node', 1, 'trunk'),
+        ('remove-node-props', 1, 'trunk'),
+        ('close-node', 1, 'trunk'),
+        ('close-revision', 1),
+        ('new-revision', 2),
+        ('set-revision-prop', 2, 'svn:log', 'Added README.'),
+        ('set-revision-prop', 2, 'svn:author', 'john'),
+        ('set-revision-prop', 2, 'svn:date', '2005-04-01T13:12:18.216267Z'),
+        ('new-node', 2, 'trunk/README.txt'),
+        ('remove-node-props', 2, 'trunk/README.txt'),
+        ('set-fulltext', 2, 'trunk/README.txt'),
+        ('close-node', 2, 'trunk/README.txt'),
+        ('close-revision', 2), ('new-revision', 3),
+        ('set-revision-prop', 3, 'svn:log', 'Fixed README.\n'),
+        ('set-revision-prop', 3, 'svn:author', 'kate'),
+        ('set-revision-prop', 3, 'svn:date', '2005-04-01T13:24:58.234643Z'),
+        ('new-node', 3, 'trunk/README.txt'),
+        ('remove-node-props', 3, 'trunk/README.txt'),
+        ('set-node-prop', 3, 'trunk/README.txt', 'svn:mime-type', 'text/plain'),
+        ('set-node-prop', 3, 'trunk/README.txt', 'svn:eol-style', 'native'),
+        ('set-fulltext', 3, 'trunk/README.txt'),
+        ('close-node', 3, 'trunk/README.txt'), ('close-revision', 3),
+        ]
+    # Compare only the first X nodes described in the expected list - otherwise
+    # the comparison list gets too long.
+    self.assertEqual(dsp.ops[:len(expected_list)], expected_list)
+
   def test_get_logs(self):
     """Test scope of get_logs callbacks"""
     logs = []
@@ -177,6 +269,17 @@ class SubversionRepositoryTestCase(unittest.TestCase):
                      set(["This is a test.\n", "A test.\n"]))
     self.assertEqual(len(editor.textdeltas), 2)
 
+  def test_unnamed_editor(self):
+      """Test editor object without reference from interpreter"""
+      # Check that the delta.Editor object has proper lifetime. Without
+      # increment of the refcount in make_baton, the object was destroyed
+      # immediately because the interpreter does not hold a reference to it.
+      this_root = fs.revision_root(self.fs, self.rev)
+      prev_root = fs.revision_root(self.fs, self.rev-1)
+      e_ptr, e_baton = delta.make_editor(ChangeReceiver(this_root, prev_root))
+      repos.dir_delta(prev_root, '', '', this_root, '', e_ptr, e_baton,
+              _authz_callback, 1, 1, 0, 0)
+
   def test_retrieve_and_change_rev_prop(self):
     """Test playing with revprops"""
     self.assertEqual(repos.fs_revision_prop(self.repos, self.rev, "svn:log",
@@ -208,6 +311,98 @@ class SubversionRepositoryTestCase(unittest.TestCase):
     repos.freeze([self.repos_path], self.freeze_body)
     self.assertEqual(self.freeze_invoked, 1)
 
+  def test_lock_unlock(self):
+    """Basic lock/unlock"""
+
+    access = fs.create_access('jrandom')
+    fs.set_access(self.fs, access)
+    fs.lock(self.fs, '/trunk/README.txt', None, None, 0, 0, self.rev, False)
+    try:
+      fs.lock(self.fs, '/trunk/README.txt', None, None, 0, 0, self.rev, False)
+    except core.SubversionException, exc:
+      self.assertEqual(exc.apr_err, core.SVN_ERR_FS_PATH_ALREADY_LOCKED)
+    fs.lock(self.fs, '/trunk/README.txt', None, None, 0, 0, self.rev, True)
+
+    self.calls = 0
+    self.errors = 0
+    def unlock_callback(path, lock, err, pool):
+      self.assertEqual(path, '/trunk/README.txt')
+      self.assertEqual(lock, None)
+      self.calls += 1
+      if err != None:
+        self.assertEqual(err.apr_err, core.SVN_ERR_FS_NO_SUCH_LOCK)
+        self.errors += 1
+
+    the_lock = fs.get_lock(self.fs, '/trunk/README.txt')
+    fs.unlock_many(self.fs, {'/trunk/README.txt':the_lock.token}, False,
+                   unlock_callback)
+    self.assertEqual(self.calls, 1)
+    self.assertEqual(self.errors, 0)
+
+    self.calls = 0
+    fs.unlock_many(self.fs, {'/trunk/README.txt':the_lock.token}, False,
+                   unlock_callback)
+    self.assertEqual(self.calls, 1)
+    self.assertEqual(self.errors, 1)
+
+    self.locks = 0
+    def lock_callback(path, lock, err, pool):
+      self.assertEqual(path, '/trunk/README.txt')
+      if lock != None:
+        self.assertEqual(lock.owner, 'jrandom')
+        self.locks += 1
+      self.calls += 1
+      if err != None:
+        self.assertEqual(err.apr_err, core.SVN_ERR_FS_PATH_ALREADY_LOCKED)
+        self.errors += 1
+      
+    self.calls = 0
+    self.errors = 0
+    target = fs.lock_target_create(None, self.rev)
+    fs.lock_many(self.fs, {'trunk/README.txt':target},
+                 None, False, 0, False, lock_callback)
+    self.assertEqual(self.calls, 1)
+    self.assertEqual(self.locks, 1)
+    self.assertEqual(self.errors, 0)
+
+    self.calls = 0
+    self.locks = 0
+    fs.lock_many(self.fs, {'trunk/README.txt':target},
+                 None, False, 0, False, lock_callback)
+    self.assertEqual(self.calls, 1)
+    self.assertEqual(self.locks, 0)
+    self.assertEqual(self.errors, 1)
+
+    self.calls = 0
+    self.errors = 0
+    the_lock = fs.get_lock(self.fs, '/trunk/README.txt')
+    repos.fs_unlock_many(self.repos, {'trunk/README.txt':the_lock.token},
+                         False, unlock_callback)
+    self.assertEqual(self.calls, 1)
+    self.assertEqual(self.errors, 0)
+
+    self.calls = 0
+    repos.fs_unlock_many(self.repos, {'trunk/README.txt':the_lock.token},
+                         False, unlock_callback)
+    self.assertEqual(self.calls, 1)
+    self.assertEqual(self.errors, 1)
+
+    self.calls = 0
+    self.errors = 0
+    repos.fs_lock_many(self.repos, {'trunk/README.txt':target},
+                       None, False, 0, False, lock_callback)
+    self.assertEqual(self.calls, 1)
+    self.assertEqual(self.locks, 1)
+    self.assertEqual(self.errors, 0)
+
+    self.calls = 0
+    self.locks = 0
+    repos.fs_lock_many(self.repos, {'trunk/README.txt':target},
+                       None, False, 0, False, lock_callback)
+    self.assertEqual(self.calls, 1)
+    self.assertEqual(self.locks, 0)
+    self.assertEqual(self.errors, 1)
+
 def suite():
     return unittest.defaultTestLoader.loadTestsFromTestCase(
       SubversionRepositoryTestCase)
diff --git a/subversion/bindings/swig/python/wc.py b/subversion/bindings/swig/python/wc.py
index 54dc5ad..2b94135 100644
--- a/subversion/bindings/swig/python/wc.py
+++ b/subversion/bindings/swig/python/wc.py
@@ -1,11 +1,13 @@
 # This file was automatically generated by SWIG (http://www.swig.org).
-# Version 2.0.9
+# Version 2.0.12
 #
 # Do not make changes to this file unless you know what you are doing--modify
 # the SWIG interface file instead.
 
 
 
+
+
 from sys import version_info
 if version_info >= (2,6,0):
     def swig_import_helper():
@@ -252,7 +254,7 @@ class svn_wc_external_item2_t:
     __swig_setmethods__["peg_revision"] = _wc.svn_wc_external_item2_t_peg_revision_set
     __swig_getmethods__["peg_revision"] = _wc.svn_wc_external_item2_t_peg_revision_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_wc_external_item2_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -271,13 +273,13 @@ class svn_wc_external_item2_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -286,9 +288,9 @@ class svn_wc_external_item2_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -329,7 +331,7 @@ class svn_wc_external_item_t:
     __swig_setmethods__["revision"] = _wc.svn_wc_external_item_t_revision_set
     __swig_getmethods__["revision"] = _wc.svn_wc_external_item_t_revision_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_wc_external_item_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -348,13 +350,13 @@ class svn_wc_external_item_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -363,9 +365,9 @@ class svn_wc_external_item_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -387,7 +389,7 @@ def svn_wc_external_item_dup(*args):
 
 def svn_wc_parse_externals_description3(*args):
   """
-    svn_wc_parse_externals_description3(char const * parent_directory, char const * desc, svn_boolean_t canonicalize_url, 
+    svn_wc_parse_externals_description3(char const * defining_directory, char const * desc, svn_boolean_t canonicalize_url, 
         apr_pool_t pool) -> svn_error_t
     """
   return _wc.svn_wc_parse_externals_description3(*args)
@@ -475,6 +477,10 @@ svn_wc_notify_conflict_resolver_done = _wc.svn_wc_notify_conflict_resolver_done
 svn_wc_notify_left_local_modifications = _wc.svn_wc_notify_left_local_modifications
 svn_wc_notify_foreign_copy_begin = _wc.svn_wc_notify_foreign_copy_begin
 svn_wc_notify_move_broken = _wc.svn_wc_notify_move_broken
+svn_wc_notify_cleanup_external = _wc.svn_wc_notify_cleanup_external
+svn_wc_notify_failed_requires_target = _wc.svn_wc_notify_failed_requires_target
+svn_wc_notify_info_external = _wc.svn_wc_notify_info_external
+svn_wc_notify_commit_finalizing = _wc.svn_wc_notify_commit_finalizing
 svn_wc_notify_state_inapplicable = _wc.svn_wc_notify_state_inapplicable
 svn_wc_notify_state_unknown = _wc.svn_wc_notify_state_unknown
 svn_wc_notify_state_unchanged = _wc.svn_wc_notify_state_unchanged
@@ -543,7 +549,7 @@ class svn_wc_notify_t:
     __swig_setmethods__["hunk_fuzz"] = _wc.svn_wc_notify_t_hunk_fuzz_set
     __swig_getmethods__["hunk_fuzz"] = _wc.svn_wc_notify_t_hunk_fuzz_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_wc_notify_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -562,13 +568,13 @@ class svn_wc_notify_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -577,9 +583,9 @@ class svn_wc_notify_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -644,7 +650,7 @@ class svn_wc_conflict_version_t:
     __swig_setmethods__["repos_uuid"] = _wc.svn_wc_conflict_version_t_repos_uuid_set
     __swig_getmethods__["repos_uuid"] = _wc.svn_wc_conflict_version_t_repos_uuid_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_wc_conflict_version_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -663,13 +669,13 @@ class svn_wc_conflict_version_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -678,9 +684,9 @@ class svn_wc_conflict_version_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -713,95 +719,6 @@ def svn_wc_conflict_version_create(*args):
 def svn_wc_conflict_version_dup(*args):
   """svn_wc_conflict_version_dup(svn_wc_conflict_version_t version, apr_pool_t pool) -> svn_wc_conflict_version_t"""
   return _wc.svn_wc_conflict_version_dup(*args)
-class svn_wc_conflict_description2_t:
-    """Proxy of C svn_wc_conflict_description2_t struct"""
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_wc_conflict_description2_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_wc_conflict_description2_t, name)
-    __repr__ = _swig_repr
-    __swig_setmethods__["local_abspath"] = _wc.svn_wc_conflict_description2_t_local_abspath_set
-    __swig_getmethods__["local_abspath"] = _wc.svn_wc_conflict_description2_t_local_abspath_get
-    __swig_setmethods__["node_kind"] = _wc.svn_wc_conflict_description2_t_node_kind_set
-    __swig_getmethods__["node_kind"] = _wc.svn_wc_conflict_description2_t_node_kind_get
-    __swig_setmethods__["kind"] = _wc.svn_wc_conflict_description2_t_kind_set
-    __swig_getmethods__["kind"] = _wc.svn_wc_conflict_description2_t_kind_get
-    __swig_setmethods__["property_name"] = _wc.svn_wc_conflict_description2_t_property_name_set
-    __swig_getmethods__["property_name"] = _wc.svn_wc_conflict_description2_t_property_name_get
-    __swig_setmethods__["is_binary"] = _wc.svn_wc_conflict_description2_t_is_binary_set
-    __swig_getmethods__["is_binary"] = _wc.svn_wc_conflict_description2_t_is_binary_get
-    __swig_setmethods__["mime_type"] = _wc.svn_wc_conflict_description2_t_mime_type_set
-    __swig_getmethods__["mime_type"] = _wc.svn_wc_conflict_description2_t_mime_type_get
-    __swig_setmethods__["action"] = _wc.svn_wc_conflict_description2_t_action_set
-    __swig_getmethods__["action"] = _wc.svn_wc_conflict_description2_t_action_get
-    __swig_setmethods__["reason"] = _wc.svn_wc_conflict_description2_t_reason_set
-    __swig_getmethods__["reason"] = _wc.svn_wc_conflict_description2_t_reason_get
-    __swig_setmethods__["base_abspath"] = _wc.svn_wc_conflict_description2_t_base_abspath_set
-    __swig_getmethods__["base_abspath"] = _wc.svn_wc_conflict_description2_t_base_abspath_get
-    __swig_setmethods__["their_abspath"] = _wc.svn_wc_conflict_description2_t_their_abspath_set
-    __swig_getmethods__["their_abspath"] = _wc.svn_wc_conflict_description2_t_their_abspath_get
-    __swig_setmethods__["my_abspath"] = _wc.svn_wc_conflict_description2_t_my_abspath_set
-    __swig_getmethods__["my_abspath"] = _wc.svn_wc_conflict_description2_t_my_abspath_get
-    __swig_setmethods__["merged_file"] = _wc.svn_wc_conflict_description2_t_merged_file_set
-    __swig_getmethods__["merged_file"] = _wc.svn_wc_conflict_description2_t_merged_file_get
-    __swig_setmethods__["operation"] = _wc.svn_wc_conflict_description2_t_operation_set
-    __swig_getmethods__["operation"] = _wc.svn_wc_conflict_description2_t_operation_get
-    __swig_setmethods__["src_left_version"] = _wc.svn_wc_conflict_description2_t_src_left_version_set
-    __swig_getmethods__["src_left_version"] = _wc.svn_wc_conflict_description2_t_src_left_version_get
-    __swig_setmethods__["src_right_version"] = _wc.svn_wc_conflict_description2_t_src_right_version_set
-    __swig_getmethods__["src_right_version"] = _wc.svn_wc_conflict_description2_t_src_right_version_get
-    def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_wc_conflict_description2_t"""
-      import libsvn.core, weakref
-      self.__dict__["_parent_pool"] = \
-        parent_pool or libsvn.core.application_pool;
-      if self.__dict__["_parent_pool"]:
-        self.__dict__["_is_valid"] = weakref.ref(
-          self.__dict__["_parent_pool"]._is_valid)
-
-    def assert_valid(self):
-      """Assert that this object is using valid pool memory"""
-      if "_is_valid" in self.__dict__:
-        assert self.__dict__["_is_valid"](), "Variable has already been deleted"
-
-    def __getattr__(self, name):
-      """Get an attribute from this object"""
-      self.assert_valid()
-
-      value = _swig_getattr(self, self.__class__, name)
-
-
-
-      members = self.__dict__.get("_members")
-      if members is not None:
-        _copy_metadata_deep(value, members.get(name))
-          
-
-      _assert_valid_deep(value)
-
-      return value
-
-    def __setattr__(self, name, value):
-      """Set an attribute on this object"""
-      self.assert_valid()
-
-
-
-
-      self.__dict__.setdefault("_members",{})[name] = value
-
-      return _swig_setattr(self, self.__class__, name, value)
-
-    def __init__(self): 
-        """__init__(svn_wc_conflict_description2_t self) -> svn_wc_conflict_description2_t"""
-        this = _wc.new_svn_wc_conflict_description2_t()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _wc.delete_svn_wc_conflict_description2_t
-    __del__ = lambda self : None;
-svn_wc_conflict_description2_t_swigregister = _wc.svn_wc_conflict_description2_t_swigregister
-svn_wc_conflict_description2_t_swigregister(svn_wc_conflict_description2_t)
-
 class svn_wc_conflict_description_t:
     """Proxy of C svn_wc_conflict_description_t struct"""
     __swig_setmethods__ = {}
@@ -842,7 +759,7 @@ class svn_wc_conflict_description_t:
     __swig_setmethods__["src_right_version"] = _wc.svn_wc_conflict_description_t_src_right_version_set
     __swig_getmethods__["src_right_version"] = _wc.svn_wc_conflict_description_t_src_right_version_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_wc_conflict_description_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -861,13 +778,13 @@ class svn_wc_conflict_description_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -876,9 +793,9 @@ class svn_wc_conflict_description_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -895,7 +812,7 @@ svn_wc_conflict_description_t_swigregister(svn_wc_conflict_description_t)
 
 
 def svn_wc_conflict_description_create_text2(*args):
-  """svn_wc_conflict_description_create_text2(char const * local_abspath, apr_pool_t result_pool) -> svn_wc_conflict_description2_t"""
+  """svn_wc_conflict_description_create_text2(char const * local_abspath, apr_pool_t result_pool) -> svn_wc_conflict_description2_t *"""
   return _wc.svn_wc_conflict_description_create_text2(*args)
 
 def svn_wc_conflict_description_create_text(*args):
@@ -905,7 +822,7 @@ def svn_wc_conflict_description_create_text(*args):
 def svn_wc_conflict_description_create_prop2(*args):
   """
     svn_wc_conflict_description_create_prop2(char const * local_abspath, svn_node_kind_t node_kind, char const * property_name, 
-        apr_pool_t result_pool) -> svn_wc_conflict_description2_t
+        apr_pool_t result_pool) -> svn_wc_conflict_description2_t *
     """
   return _wc.svn_wc_conflict_description_create_prop2(*args)
 
@@ -920,7 +837,7 @@ def svn_wc_conflict_description_create_tree2(*args):
   """
     svn_wc_conflict_description_create_tree2(char const * local_abspath, svn_node_kind_t node_kind, svn_wc_operation_t operation, 
         svn_wc_conflict_version_t src_left_version, svn_wc_conflict_version_t src_right_version, 
-        apr_pool_t result_pool) -> svn_wc_conflict_description2_t
+        apr_pool_t result_pool) -> svn_wc_conflict_description2_t *
     """
   return _wc.svn_wc_conflict_description_create_tree2(*args)
 
@@ -932,9 +849,14 @@ def svn_wc_conflict_description_create_tree(*args):
     """
   return _wc.svn_wc_conflict_description_create_tree(*args)
 
+def svn_wc_conflict_description2_dup(*args):
+  """svn_wc_conflict_description2_dup(svn_wc_conflict_description2_t const * conflict, apr_pool_t result_pool) -> svn_wc_conflict_description2_t *"""
+  return _wc.svn_wc_conflict_description2_dup(*args)
+
 def svn_wc__conflict_description2_dup(*args):
-  """svn_wc__conflict_description2_dup(svn_wc_conflict_description2_t conflict, apr_pool_t result_pool) -> svn_wc_conflict_description2_t"""
+  """svn_wc__conflict_description2_dup(svn_wc_conflict_description2_t const * conflict, apr_pool_t result_pool) -> svn_wc_conflict_description2_t *"""
   return _wc.svn_wc__conflict_description2_dup(*args)
+svn_wc_conflict_choose_undefined = _wc.svn_wc_conflict_choose_undefined
 svn_wc_conflict_choose_postpone = _wc.svn_wc_conflict_choose_postpone
 svn_wc_conflict_choose_base = _wc.svn_wc_conflict_choose_base
 svn_wc_conflict_choose_theirs_full = _wc.svn_wc_conflict_choose_theirs_full
@@ -943,74 +865,9 @@ svn_wc_conflict_choose_theirs_conflict = _wc.svn_wc_conflict_choose_theirs_confl
 svn_wc_conflict_choose_mine_conflict = _wc.svn_wc_conflict_choose_mine_conflict
 svn_wc_conflict_choose_merged = _wc.svn_wc_conflict_choose_merged
 svn_wc_conflict_choose_unspecified = _wc.svn_wc_conflict_choose_unspecified
-class svn_wc_conflict_result_t:
-    """Proxy of C svn_wc_conflict_result_t struct"""
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, svn_wc_conflict_result_t, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, svn_wc_conflict_result_t, name)
-    __repr__ = _swig_repr
-    __swig_setmethods__["choice"] = _wc.svn_wc_conflict_result_t_choice_set
-    __swig_getmethods__["choice"] = _wc.svn_wc_conflict_result_t_choice_get
-    __swig_setmethods__["merged_file"] = _wc.svn_wc_conflict_result_t_merged_file_set
-    __swig_getmethods__["merged_file"] = _wc.svn_wc_conflict_result_t_merged_file_get
-    __swig_setmethods__["save_merged"] = _wc.svn_wc_conflict_result_t_save_merged_set
-    __swig_getmethods__["save_merged"] = _wc.svn_wc_conflict_result_t_save_merged_get
-    def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_wc_conflict_result_t"""
-      import libsvn.core, weakref
-      self.__dict__["_parent_pool"] = \
-        parent_pool or libsvn.core.application_pool;
-      if self.__dict__["_parent_pool"]:
-        self.__dict__["_is_valid"] = weakref.ref(
-          self.__dict__["_parent_pool"]._is_valid)
-
-    def assert_valid(self):
-      """Assert that this object is using valid pool memory"""
-      if "_is_valid" in self.__dict__:
-        assert self.__dict__["_is_valid"](), "Variable has already been deleted"
-
-    def __getattr__(self, name):
-      """Get an attribute from this object"""
-      self.assert_valid()
-
-      value = _swig_getattr(self, self.__class__, name)
-
-
-
-      members = self.__dict__.get("_members")
-      if members is not None:
-        _copy_metadata_deep(value, members.get(name))
-          
-
-      _assert_valid_deep(value)
-
-      return value
-
-    def __setattr__(self, name, value):
-      """Set an attribute on this object"""
-      self.assert_valid()
-
-
-
-
-      self.__dict__.setdefault("_members",{})[name] = value
-
-      return _swig_setattr(self, self.__class__, name, value)
-
-    def __init__(self): 
-        """__init__(svn_wc_conflict_result_t self) -> svn_wc_conflict_result_t"""
-        this = _wc.new_svn_wc_conflict_result_t()
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _wc.delete_svn_wc_conflict_result_t
-    __del__ = lambda self : None;
-svn_wc_conflict_result_t_swigregister = _wc.svn_wc_conflict_result_t_swigregister
-svn_wc_conflict_result_t_swigregister(svn_wc_conflict_result_t)
-
 
 def svn_wc_create_conflict_result(*args):
-  """svn_wc_create_conflict_result(svn_wc_conflict_choice_t choice, char const * merged_file, apr_pool_t pool) -> svn_wc_conflict_result_t"""
+  """svn_wc_create_conflict_result(svn_wc_conflict_choice_t choice, char const * merged_file, apr_pool_t pool) -> svn_wc_conflict_result_t *"""
   return _wc.svn_wc_create_conflict_result(*args)
 class svn_wc_diff_callbacks4_t:
     """Proxy of C svn_wc_diff_callbacks4_t struct"""
@@ -1038,7 +895,7 @@ class svn_wc_diff_callbacks4_t:
     __swig_setmethods__["dir_closed"] = _wc.svn_wc_diff_callbacks4_t_dir_closed_set
     __swig_getmethods__["dir_closed"] = _wc.svn_wc_diff_callbacks4_t_dir_closed_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_wc_diff_callbacks4_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1057,13 +914,13 @@ class svn_wc_diff_callbacks4_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1072,9 +929,9 @@ class svn_wc_diff_callbacks4_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -1140,7 +997,7 @@ class svn_wc_diff_callbacks3_t:
     __swig_setmethods__["dir_closed"] = _wc.svn_wc_diff_callbacks3_t_dir_closed_set
     __swig_getmethods__["dir_closed"] = _wc.svn_wc_diff_callbacks3_t_dir_closed_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_wc_diff_callbacks3_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1159,13 +1016,13 @@ class svn_wc_diff_callbacks3_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1174,9 +1031,9 @@ class svn_wc_diff_callbacks3_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -1235,7 +1092,7 @@ class svn_wc_diff_callbacks2_t:
     __swig_setmethods__["dir_props_changed"] = _wc.svn_wc_diff_callbacks2_t_dir_props_changed_set
     __swig_getmethods__["dir_props_changed"] = _wc.svn_wc_diff_callbacks2_t_dir_props_changed_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_wc_diff_callbacks2_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1254,13 +1111,13 @@ class svn_wc_diff_callbacks2_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1269,9 +1126,9 @@ class svn_wc_diff_callbacks2_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -1324,7 +1181,7 @@ class svn_wc_diff_callbacks_t:
     __swig_setmethods__["props_changed"] = _wc.svn_wc_diff_callbacks_t_props_changed_set
     __swig_getmethods__["props_changed"] = _wc.svn_wc_diff_callbacks_t_props_changed_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_wc_diff_callbacks_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1343,13 +1200,13 @@ class svn_wc_diff_callbacks_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1358,9 +1215,9 @@ class svn_wc_diff_callbacks_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -1515,7 +1372,7 @@ class svn_wc_entry_t:
     __swig_setmethods__["file_external_rev"] = _wc.svn_wc_entry_t_file_external_rev_set
     __swig_getmethods__["file_external_rev"] = _wc.svn_wc_entry_t_file_external_rev_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_wc_entry_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1534,13 +1391,13 @@ class svn_wc_entry_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1549,9 +1406,9 @@ class svn_wc_entry_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -1611,7 +1468,7 @@ class svn_wc_info_t:
     __swig_setmethods__["moved_to_abspath"] = _wc.svn_wc_info_t_moved_to_abspath_set
     __swig_getmethods__["moved_to_abspath"] = _wc.svn_wc_info_t_moved_to_abspath_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_wc_info_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1630,13 +1487,13 @@ class svn_wc_info_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1645,9 +1502,9 @@ class svn_wc_info_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -1694,7 +1551,7 @@ class svn_wc_entry_callbacks2_t:
     __swig_setmethods__["handle_error"] = _wc.svn_wc_entry_callbacks2_t_handle_error_set
     __swig_getmethods__["handle_error"] = _wc.svn_wc_entry_callbacks2_t_handle_error_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_wc_entry_callbacks2_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1713,13 +1570,13 @@ class svn_wc_entry_callbacks2_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1728,9 +1585,9 @@ class svn_wc_entry_callbacks2_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -1761,7 +1618,7 @@ class svn_wc_entry_callbacks_t:
     __swig_setmethods__["found_entry"] = _wc.svn_wc_entry_callbacks_t_found_entry_set
     __swig_getmethods__["found_entry"] = _wc.svn_wc_entry_callbacks_t_found_entry_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_wc_entry_callbacks_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1780,13 +1637,13 @@ class svn_wc_entry_callbacks_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1795,9 +1652,9 @@ class svn_wc_entry_callbacks_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -1955,8 +1812,10 @@ class svn_wc_status3_t:
     __swig_getmethods__["moved_to_abspath"] = _wc.svn_wc_status3_t_moved_to_abspath_get
     __swig_setmethods__["file_external"] = _wc.svn_wc_status3_t_file_external_set
     __swig_getmethods__["file_external"] = _wc.svn_wc_status3_t_file_external_get
+    __swig_setmethods__["actual_kind"] = _wc.svn_wc_status3_t_actual_kind_set
+    __swig_getmethods__["actual_kind"] = _wc.svn_wc_status3_t_actual_kind_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_wc_status3_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -1975,13 +1834,13 @@ class svn_wc_status3_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -1990,9 +1849,9 @@ class svn_wc_status3_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -2051,7 +1910,7 @@ class svn_wc_status2_t:
     __swig_setmethods__["pristine_prop_status"] = _wc.svn_wc_status2_t_pristine_prop_status_set
     __swig_getmethods__["pristine_prop_status"] = _wc.svn_wc_status2_t_pristine_prop_status_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_wc_status2_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -2070,13 +1929,13 @@ class svn_wc_status2_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -2085,9 +1944,9 @@ class svn_wc_status2_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -2126,7 +1985,7 @@ class svn_wc_status_t:
     __swig_setmethods__["repos_prop_status"] = _wc.svn_wc_status_t_repos_prop_status_set
     __swig_getmethods__["repos_prop_status"] = _wc.svn_wc_status_t_repos_prop_status_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_wc_status_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -2145,13 +2004,13 @@ class svn_wc_status_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -2160,9 +2019,9 @@ class svn_wc_status_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -2320,6 +2179,13 @@ def svn_wc_delete(*args):
     """
   return _wc.svn_wc_delete(*args)
 
+def svn_wc_add_from_disk3(*args):
+  """
+    svn_wc_add_from_disk3(svn_wc_context_t * wc_ctx, char const * local_abspath, apr_hash_t props, svn_boolean_t skip_checks, 
+        svn_wc_notify_func2_t notify_func, apr_pool_t scratch_pool) -> svn_error_t
+    """
+  return _wc.svn_wc_add_from_disk3(*args)
+
 def svn_wc_add_from_disk2(*args):
   """
     svn_wc_add_from_disk2(svn_wc_context_t * wc_ctx, char const * local_abspath, apr_hash_t props, svn_wc_notify_func2_t notify_func, 
@@ -2461,6 +2327,15 @@ def svn_wc_committed_queue_create(*args):
   """svn_wc_committed_queue_create(apr_pool_t pool) -> svn_wc_committed_queue_t *"""
   return _wc.svn_wc_committed_queue_create(*args)
 
+def svn_wc_queue_committed4(*args):
+  """
+    svn_wc_queue_committed4(svn_wc_committed_queue_t * queue, svn_wc_context_t * wc_ctx, char const * local_abspath, 
+        svn_boolean_t recurse, svn_boolean_t is_committed, apr_array_header_t wcprop_changes, 
+        svn_boolean_t remove_lock, svn_boolean_t remove_changelist, 
+        svn_checksum_t sha1_checksum, apr_pool_t scratch_pool) -> svn_error_t
+    """
+  return _wc.svn_wc_queue_committed4(*args)
+
 def svn_wc_queue_committed3(*args):
   """
     svn_wc_queue_committed3(svn_wc_committed_queue_t * queue, svn_wc_context_t * wc_ctx, char const * local_abspath, 
@@ -2973,6 +2848,15 @@ def svn_wc_get_pristine_copy_path(*args):
   """svn_wc_get_pristine_copy_path(char const * path, apr_pool_t pool) -> svn_error_t"""
   return _wc.svn_wc_get_pristine_copy_path(*args)
 
+def svn_wc_cleanup4(*args):
+  """
+    svn_wc_cleanup4(svn_wc_context_t * wc_ctx, char const * local_abspath, svn_boolean_t break_locks, 
+        svn_boolean_t fix_recorded_timestamps, svn_boolean_t clear_dav_cache, svn_boolean_t vacuum_pristines, 
+        svn_cancel_func_t cancel_func, svn_wc_notify_func2_t notify_func, 
+        apr_pool_t scratch_pool) -> svn_error_t
+    """
+  return _wc.svn_wc_cleanup4(*args)
+
 def svn_wc_cleanup3(*args):
   """
     svn_wc_cleanup3(svn_wc_context_t * wc_ctx, char const * local_abspath, svn_cancel_func_t cancel_func, 
@@ -3031,6 +2915,15 @@ def svn_wc_relocate(*args):
     """
   return _wc.svn_wc_relocate(*args)
 
+def svn_wc_revert5(*args):
+  """
+    svn_wc_revert5(svn_wc_context_t * wc_ctx, char const * local_abspath, svn_depth_t depth, svn_boolean_t use_commit_times, 
+        apr_array_header_t changelist_filter, svn_boolean_t clear_changelists, 
+        svn_boolean_t metadata_only, svn_cancel_func_t cancel_func, 
+        svn_wc_notify_func2_t notify_func, apr_pool_t scratch_pool) -> svn_error_t
+    """
+  return _wc.svn_wc_revert5(*args)
+
 def svn_wc_revert4(*args):
   """
     svn_wc_revert4(svn_wc_context_t * wc_ctx, char const * local_abspath, svn_depth_t depth, svn_boolean_t use_commit_times, 
@@ -3186,7 +3079,7 @@ class svn_wc_revision_status_t:
     __swig_setmethods__["sparse_checkout"] = _wc.svn_wc_revision_status_t_sparse_checkout_set
     __swig_getmethods__["sparse_checkout"] = _wc.svn_wc_revision_status_t_sparse_checkout_get
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_wc_revision_status_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -3205,13 +3098,13 @@ class svn_wc_revision_status_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -3220,9 +3113,9 @@ class svn_wc_revision_status_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -3316,7 +3209,7 @@ class svn_wc_context_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_wc_context_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -3335,13 +3228,13 @@ class svn_wc_context_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -3350,9 +3243,9 @@ class svn_wc_context_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -3369,7 +3262,7 @@ class svn_wc_adm_access_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_wc_adm_access_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -3388,13 +3281,13 @@ class svn_wc_adm_access_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -3403,9 +3296,9 @@ class svn_wc_adm_access_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -3422,7 +3315,7 @@ class svn_wc_traversal_info_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_wc_traversal_info_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -3441,13 +3334,13 @@ class svn_wc_traversal_info_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -3456,9 +3349,9 @@ class svn_wc_traversal_info_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -3475,7 +3368,7 @@ class svn_wc_committed_queue_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_wc_committed_queue_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -3494,13 +3387,13 @@ class svn_wc_committed_queue_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -3509,9 +3402,9 @@ class svn_wc_committed_queue_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -3801,7 +3694,7 @@ def svn_wc_invoke_notify_func(*args):
 
 def svn_wc_invoke_conflict_resolver_func2(*args):
   """
-    svn_wc_invoke_conflict_resolver_func2(svn_wc_conflict_resolver_func2_t _obj, svn_wc_conflict_description2_t description, 
+    svn_wc_invoke_conflict_resolver_func2(svn_wc_conflict_resolver_func2_t _obj, svn_wc_conflict_description2_t const * description, 
         void * baton, apr_pool_t result_pool, apr_pool_t scratch_pool) -> svn_error_t
     """
   return _wc.svn_wc_invoke_conflict_resolver_func2(*args)
@@ -3896,7 +3789,7 @@ class svn_wc_external_update_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_wc_external_update_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -3915,13 +3808,13 @@ class svn_wc_external_update_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -3930,9 +3823,9 @@ class svn_wc_external_update_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -3952,7 +3845,7 @@ class svn_wc_notify_func2_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_wc_notify_func2_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -3971,13 +3864,13 @@ class svn_wc_notify_func2_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -3986,9 +3879,9 @@ class svn_wc_notify_func2_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -4008,7 +3901,7 @@ class svn_wc_notify_func_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_wc_notify_func_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -4027,13 +3920,13 @@ class svn_wc_notify_func_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -4042,9 +3935,9 @@ class svn_wc_notify_func_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -4064,7 +3957,7 @@ class svn_wc_conflict_resolver_func2_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_wc_conflict_resolver_func2_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -4083,13 +3976,13 @@ class svn_wc_conflict_resolver_func2_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -4098,9 +3991,9 @@ class svn_wc_conflict_resolver_func2_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -4120,7 +4013,7 @@ class svn_wc_conflict_resolver_func_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_wc_conflict_resolver_func_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -4139,13 +4032,13 @@ class svn_wc_conflict_resolver_func_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -4154,9 +4047,9 @@ class svn_wc_conflict_resolver_func_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -4176,7 +4069,7 @@ class svn_wc_status_func4_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_wc_status_func4_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -4195,13 +4088,13 @@ class svn_wc_status_func4_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -4210,9 +4103,9 @@ class svn_wc_status_func4_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -4232,7 +4125,7 @@ class svn_wc_status_func3_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_wc_status_func3_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -4251,13 +4144,13 @@ class svn_wc_status_func3_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -4266,9 +4159,9 @@ class svn_wc_status_func3_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -4288,7 +4181,7 @@ class svn_wc_status_func2_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_wc_status_func2_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -4307,13 +4200,13 @@ class svn_wc_status_func2_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -4322,9 +4215,9 @@ class svn_wc_status_func2_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -4344,7 +4237,7 @@ class svn_wc_status_func_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_wc_status_func_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -4363,13 +4256,13 @@ class svn_wc_status_func_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -4378,9 +4271,9 @@ class svn_wc_status_func_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -4400,7 +4293,7 @@ class svn_wc_get_file_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_wc_get_file_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -4419,13 +4312,13 @@ class svn_wc_get_file_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -4434,9 +4327,9 @@ class svn_wc_get_file_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -4456,7 +4349,7 @@ class svn_wc_dirents_func_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_wc_dirents_func_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -4475,13 +4368,13 @@ class svn_wc_dirents_func_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -4490,9 +4383,9 @@ class svn_wc_dirents_func_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -4512,7 +4405,7 @@ class svn_wc_canonicalize_svn_prop_get_file_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_wc_canonicalize_svn_prop_get_file_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -4531,13 +4424,13 @@ class svn_wc_canonicalize_svn_prop_get_file_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -4546,9 +4439,9 @@ class svn_wc_canonicalize_svn_prop_get_file_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -4568,7 +4461,7 @@ class svn_wc_upgrade_get_repos_info_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_wc_upgrade_get_repos_info_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -4587,13 +4480,13 @@ class svn_wc_upgrade_get_repos_info_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -4602,9 +4495,9 @@ class svn_wc_upgrade_get_repos_info_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -4624,7 +4517,7 @@ class svn_wc_relocation_validator3_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_wc_relocation_validator3_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -4643,13 +4536,13 @@ class svn_wc_relocation_validator3_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -4658,9 +4551,9 @@ class svn_wc_relocation_validator3_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -4680,7 +4573,7 @@ class svn_wc_relocation_validator2_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_wc_relocation_validator2_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -4699,13 +4592,13 @@ class svn_wc_relocation_validator2_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -4714,9 +4607,9 @@ class svn_wc_relocation_validator2_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -4736,7 +4629,7 @@ class svn_wc_relocation_validator_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_wc_relocation_validator_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -4755,13 +4648,13 @@ class svn_wc_relocation_validator_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -4770,9 +4663,9 @@ class svn_wc_relocation_validator_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
@@ -4792,7 +4685,7 @@ class svn_changelist_receiver_t:
     def __init__(self, *args, **kwargs): raise AttributeError("No constructor defined")
     __repr__ = _swig_repr
     def set_parent_pool(self, parent_pool=None):
-      """Create a new proxy object for svn_changelist_receiver_t"""
+      """Create a new proxy object for TYPE"""
       import libsvn.core, weakref
       self.__dict__["_parent_pool"] = \
         parent_pool or libsvn.core.application_pool;
@@ -4811,13 +4704,13 @@ class svn_changelist_receiver_t:
 
       value = _swig_getattr(self, self.__class__, name)
 
-
-
+      # If we got back a different object than we have, we need to copy all our
+      # metadata into it, so that it looks identical
       members = self.__dict__.get("_members")
       if members is not None:
         _copy_metadata_deep(value, members.get(name))
-          
 
+      # Verify that the new object is good
       _assert_valid_deep(value)
 
       return value
@@ -4826,9 +4719,9 @@ class svn_changelist_receiver_t:
       """Set an attribute on this object"""
       self.assert_valid()
 
-
-
-
+      # Save a copy of the object, so that the garbage
+      # collector won't kill the object while it's in
+      # SWIG-land
       self.__dict__.setdefault("_members",{})[name] = value
 
       return _swig_setattr(self, self.__class__, name, value)
diff --git a/subversion/bindings/swig/ruby/core.c b/subversion/bindings/swig/ruby/core.c
index 69fd53d..f3d293f 100644
--- a/subversion/bindings/swig/ruby/core.c
+++ b/subversion/bindings/swig/ruby/core.c
@@ -1,11 +1,11 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
- * 
- * This file is not intended to be easily readable and contains a number of 
+ * Version 2.0.12
+ *
+ * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
- * changes to this file unless you know what you are doing--modify the SWIG 
- * interface file instead. 
+ * changes to this file unless you know what you are doing--modify the SWIG
+ * interface file instead.
  * ----------------------------------------------------------------------------- */
 
 #define SWIGRUBY
@@ -41,28 +41,28 @@
 #ifndef SWIGUNUSED
 # if defined(__GNUC__)
 #   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__)) 
+#     define SWIGUNUSED __attribute__ ((__unused__))
 #   else
 #     define SWIGUNUSED
 #   endif
 # elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__)) 
+#   define SWIGUNUSED __attribute__ ((__unused__))
 # else
-#   define SWIGUNUSED 
+#   define SWIGUNUSED
 # endif
 #endif
 
 #ifndef SWIG_MSC_UNSUPPRESS_4505
 # if defined(_MSC_VER)
 #   pragma warning(disable : 4505) /* unreferenced local function has been removed */
-# endif 
+# endif
 #endif
 
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
 # else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
 # endif
 #endif
 
@@ -105,7 +105,7 @@
 #   define SWIGSTDCALL __stdcall
 # else
 #   define SWIGSTDCALL
-# endif 
+# endif
 #endif
 
 /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
@@ -150,28 +150,28 @@
 #ifndef SWIGUNUSED
 # if defined(__GNUC__)
 #   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__)) 
+#     define SWIGUNUSED __attribute__ ((__unused__))
 #   else
 #     define SWIGUNUSED
 #   endif
 # elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__)) 
+#   define SWIGUNUSED __attribute__ ((__unused__))
 # else
-#   define SWIGUNUSED 
+#   define SWIGUNUSED
 # endif
 #endif
 
 #ifndef SWIG_MSC_UNSUPPRESS_4505
 # if defined(_MSC_VER)
 #   pragma warning(disable : 4505) /* unreferenced local function has been removed */
-# endif 
+# endif
 #endif
 
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
 # else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
 # endif
 #endif
 
@@ -214,7 +214,7 @@
 #   define SWIGSTDCALL __stdcall
 # else
 #   define SWIGSTDCALL
-# endif 
+# endif
 #endif
 
 /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
@@ -252,7 +252,7 @@
   You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for
   creating a static or dynamic library from the SWIG runtime code.
   In 99.9% of the cases, SWIG just needs to declare them as 'static'.
-  
+
   But only do this if strictly necessary, ie, if you have problems
   with your compiler or suchlike.
 */
@@ -278,16 +278,16 @@
 #define SWIG_POINTER_OWN           0x1
 
 
-/* 
+/*
    Flags/methods for returning states.
-   
-   The SWIG conversion methods, as ConvertPtr, return an integer 
+
+   The SWIG conversion methods, as ConvertPtr, return an integer
    that tells if the conversion was successful or not. And if not,
    an error code can be returned (see swigerrors.swg for the codes).
-   
+
    Use the following macros/flags to set or process the returning
    states.
-   
+
    In old versions of SWIG, code such as the following was usually written:
 
      if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) {
@@ -320,23 +320,23 @@
     } else {
       // fail code
     }
-    
+
    I.e., now SWIG_ConvertPtr can return new objects and you can
    identify the case and take care of the deallocation. Of course that
    also requires SWIG_ConvertPtr to return new result values, such as
 
-      int SWIG_ConvertPtr(obj, ptr,...) {         
-        if (<obj is ok>) {			       
-          if (<need new object>) {		       
-            *ptr = <ptr to new allocated object>; 
-            return SWIG_NEWOBJ;		       
-          } else {				       
-            *ptr = <ptr to old object>;	       
-            return SWIG_OLDOBJ;		       
-          } 				       
-        } else {				       
-          return SWIG_BADOBJ;		       
-        }					       
+      int SWIG_ConvertPtr(obj, ptr,...) {
+        if (<obj is ok>) {
+          if (<need new object>) {
+            *ptr = <ptr to new allocated object>;
+            return SWIG_NEWOBJ;
+          } else {
+            *ptr = <ptr to old object>;
+            return SWIG_OLDOBJ;
+          }
+        } else {
+          return SWIG_BADOBJ;
+        }
       }
 
    Of course, returning the plain '0(success)/-1(fail)' still works, but you can be
@@ -350,17 +350,17 @@
        int fooi(int);
 
    and you call
- 
+
       food(1)   // cast rank '1'  (1 -> 1.0)
       fooi(1)   // cast rank '0'
 
    just use the SWIG_AddCast()/SWIG_CheckState()
 */
 
-#define SWIG_OK                    (0) 
+#define SWIG_OK                    (0)
 #define SWIG_ERROR                 (-1)
 #define SWIG_IsOK(r)               (r >= 0)
-#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)  
+#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)
 
 /* The CastRankLimit says how many bits are used for the cast rank */
 #define SWIG_CASTRANKLIMIT         (1 << 8)
@@ -391,14 +391,14 @@
 #  endif
 #  define SWIG_CASTRANKMASK          ((SWIG_CASTRANKLIMIT) -1)
 #  define SWIG_CastRank(r)           (r & SWIG_CASTRANKMASK)
-SWIGINTERNINLINE int SWIG_AddCast(int r) { 
+SWIGINTERNINLINE int SWIG_AddCast(int r) {
   return SWIG_IsOK(r) ? ((SWIG_CastRank(r) < SWIG_MAXCASTRANK) ? (r + 1) : SWIG_ERROR) : r;
 }
-SWIGINTERNINLINE int SWIG_CheckState(int r) { 
-  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0; 
+SWIGINTERNINLINE int SWIG_CheckState(int r) {
+  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0;
 }
 #else /* no cast-rank mode */
-#  define SWIG_AddCast
+#  define SWIG_AddCast(r) (r)
 #  define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0)
 #endif
 
@@ -442,7 +442,7 @@ typedef struct swig_module_info {
   void                    *clientdata;		/* Language specific module data */
 } swig_module_info;
 
-/* 
+/*
   Compare two type names skipping the space characters, therefore
   "char*" == "char *" and "Class<int>" == "Class<int >", etc.
 
@@ -462,18 +462,18 @@ SWIG_TypeNameComp(const char *f1, const char *l1,
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if not equal, 1 if equal
+  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
 */
 SWIGRUNTIME int
-SWIG_TypeEquiv(const char *nb, const char *tb) {
-  int equiv = 0;
+SWIG_TypeCmp(const char *nb, const char *tb) {
+  int equiv = 1;
   const char* te = tb + strlen(tb);
   const char* ne = nb;
-  while (!equiv && *ne) {
+  while (equiv != 0 && *ne) {
     for (nb = ne; *ne; ++ne) {
       if (*ne == '|') break;
     }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
+    equiv = SWIG_TypeNameComp(nb, ne, tb, te);
     if (*ne) ++ne;
   }
   return equiv;
@@ -481,24 +481,13 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
+  Return 0 if not equal, 1 if equal
 */
 SWIGRUNTIME int
-SWIG_TypeCompare(const char *nb, const char *tb) {
-  int equiv = 0;
-  const char* te = tb + strlen(tb);
-  const char* ne = nb;
-  while (!equiv && *ne) {
-    for (nb = ne; *ne; ++ne) {
-      if (*ne == '|') break;
-    }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
-    if (*ne) ++ne;
-  }
-  return equiv;
+SWIG_TypeEquiv(const char *nb, const char *tb) {
+  return SWIG_TypeCmp(nb, tb) == 0 ? 1 : 0;
 }
 
-
 /*
   Check the typename
 */
@@ -526,7 +515,7 @@ SWIG_TypeCheck(const char *c, swig_type_info *ty) {
   return 0;
 }
 
-/* 
+/*
   Identical to SWIG_TypeCheck, except strcmp is replaced with a pointer comparison
 */
 SWIGRUNTIME swig_cast_info *
@@ -561,7 +550,7 @@ SWIG_TypeCast(swig_cast_info *ty, void *ptr, int *newmemory) {
   return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr, newmemory);
 }
 
-/* 
+/*
    Dynamic pointer casting. Down an inheritance hierarchy
 */
 SWIGRUNTIME swig_type_info *
@@ -605,7 +594,7 @@ SWIG_TypePrettyName(const swig_type_info *type) {
     return type->name;
 }
 
-/* 
+/*
    Set the clientdata field for a type
 */
 SWIGRUNTIME void
@@ -613,14 +602,14 @@ SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
   swig_cast_info *cast = ti->cast;
   /* if (ti->clientdata == clientdata) return; */
   ti->clientdata = clientdata;
-  
+
   while (cast) {
     if (!cast->converter) {
       swig_type_info *tc = cast->type;
       if (!tc->clientdata) {
 	SWIG_TypeClientData(tc, clientdata);
       }
-    }    
+    }
     cast = cast->next;
   }
 }
@@ -629,18 +618,18 @@ SWIG_TypeNewClientData(swig_type_info *ti, void *clientdata) {
   SWIG_TypeClientData(ti, clientdata);
   ti->owndata = 1;
 }
-  
+
 /*
   Search for a swig_type_info structure only by mangled name
   Search is a O(log #types)
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_MangledTypeQueryModule(swig_module_info *start, 
-                            swig_module_info *end, 
+SWIG_MangledTypeQueryModule(swig_module_info *start,
+                            swig_module_info *end,
 		            const char *name) {
   swig_module_info *iter = start;
   do {
@@ -649,11 +638,11 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
       register size_t r = iter->size - 1;
       do {
 	/* since l+r >= 0, we can (>> 1) instead (/ 2) */
-	register size_t i = (l + r) >> 1; 
+	register size_t i = (l + r) >> 1;
 	const char *iname = iter->types[i]->name;
 	if (iname) {
 	  register int compare = strcmp(name, iname);
-	  if (compare == 0) {	    
+	  if (compare == 0) {
 	    return iter->types[i];
 	  } else if (compare < 0) {
 	    if (i) {
@@ -678,14 +667,14 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
   Search for a swig_type_info structure for either a mangled name or a human readable name.
   It first searches the mangled names of the types, which is a O(log #types)
   If a type is not found it then searches the human readable names, which is O(#types).
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_TypeQueryModule(swig_module_info *start, 
-                     swig_module_info *end, 
+SWIG_TypeQueryModule(swig_module_info *start,
+                     swig_module_info *end,
 		     const char *name) {
   /* STEP 1: Search the name field using binary search */
   swig_type_info *ret = SWIG_MangledTypeQueryModule(start, end, name);
@@ -704,12 +693,12 @@ SWIG_TypeQueryModule(swig_module_info *start,
       iter = iter->next;
     } while (iter != end);
   }
-  
+
   /* neither found a match */
   return 0;
 }
 
-/* 
+/*
    Pack binary data into a string
 */
 SWIGRUNTIME char *
@@ -725,7 +714,7 @@ SWIG_PackData(char *c, void *ptr, size_t sz) {
   return c;
 }
 
-/* 
+/*
    Unpack binary data from a string
 */
 SWIGRUNTIME const char *
@@ -739,21 +728,21 @@ SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
       uu = ((d - '0') << 4);
     else if ((d >= 'a') && (d <= 'f'))
       uu = ((d - ('a'-10)) << 4);
-    else 
+    else
       return (char *) 0;
     d = *(c++);
     if ((d >= '0') && (d <= '9'))
       uu |= (d - '0');
     else if ((d >= 'a') && (d <= 'f'))
       uu |= (d - ('a'-10));
-    else 
+    else
       return (char *) 0;
     *u = uu;
   }
   return c;
 }
 
-/* 
+/*
    Pack 'void *' into a string buffer.
 */
 SWIGRUNTIME char *
@@ -813,18 +802,18 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 #endif
 
 /*  Errors in SWIG */
-#define  SWIG_UnknownError    	   -1 
-#define  SWIG_IOError        	   -2 
-#define  SWIG_RuntimeError   	   -3 
-#define  SWIG_IndexError     	   -4 
-#define  SWIG_TypeError      	   -5 
-#define  SWIG_DivisionByZero 	   -6 
-#define  SWIG_OverflowError  	   -7 
-#define  SWIG_SyntaxError    	   -8 
-#define  SWIG_ValueError     	   -9 
+#define  SWIG_UnknownError    	   -1
+#define  SWIG_IOError        	   -2
+#define  SWIG_RuntimeError   	   -3
+#define  SWIG_IndexError     	   -4
+#define  SWIG_TypeError      	   -5
+#define  SWIG_DivisionByZero 	   -6
+#define  SWIG_OverflowError  	   -7
+#define  SWIG_SyntaxError    	   -8
+#define  SWIG_ValueError     	   -9
 #define  SWIG_SystemError    	   -10
 #define  SWIG_AttributeError 	   -11
-#define  SWIG_MemoryError    	   -12 
+#define  SWIG_MemoryError    	   -12
 #define  SWIG_NullReferenceError   -13
 
 
@@ -1750,7 +1739,7 @@ SWIG_Ruby_SetModule(swig_module_info *pointer)
 SWIGINTERN
 int SWIG_Ruby_isCallable( VALUE proc )
 {
-  if ( rb_respond_to( proc, swig_call_id ) == Qtrue )
+  if ( rb_respond_to( proc, swig_call_id ) )
     return 1;
   return 0;
 }
@@ -1763,7 +1752,7 @@ int SWIG_Ruby_isCallable( VALUE proc )
 SWIGINTERN
 int SWIG_Ruby_arity( VALUE proc, int minimal )
 {
-  if ( rb_respond_to( proc, swig_arity_id ) == Qtrue )
+  if ( rb_respond_to( proc, swig_arity_id ) )
     {
       VALUE num = rb_funcall( proc, swig_arity_id, 0 );
       int arity = NUM2INT(num);
@@ -1800,33 +1789,33 @@ int SWIG_Ruby_arity( VALUE proc, int minimal )
 #define SWIGTYPE_p_apr_finfo_t swig_types[5]
 #define SWIGTYPE_p_apr_getopt_option_t swig_types[6]
 #define SWIGTYPE_p_apr_getopt_t swig_types[7]
-#define SWIGTYPE_p_apr_hash_index_t swig_types[8]
-#define SWIGTYPE_p_apr_hash_t swig_types[9]
-#define SWIGTYPE_p_apr_int32_t swig_types[10]
-#define SWIGTYPE_p_apr_int64_t swig_types[11]
-#define SWIGTYPE_p_apr_off_t swig_types[12]
-#define SWIGTYPE_p_apr_pool_t swig_types[13]
-#define SWIGTYPE_p_apr_pool_wrapper_t swig_types[14]
-#define SWIGTYPE_p_apr_proc_t swig_types[15]
-#define SWIGTYPE_p_apr_size_t swig_types[16]
-#define SWIGTYPE_p_apr_uint32_t swig_types[17]
-#define SWIGTYPE_p_char swig_types[18]
-#define SWIGTYPE_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[19]
-#define SWIGTYPE_p_f_p_apr_uint32_t_p_p_void_p_void_svn_diff_datasource_e__p_svn_error_t swig_types[20]
-#define SWIGTYPE_p_f_p_p_char_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t swig_types[21]
-#define SWIGTYPE_p_f_p_p_struct_svn_auth_provider_object_t_p_apr_pool_t__void swig_types[22]
-#define SWIGTYPE_p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[23]
-#define SWIGTYPE_p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[24]
-#define SWIGTYPE_p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[25]
-#define SWIGTYPE_p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[26]
-#define SWIGTYPE_p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[27]
-#define SWIGTYPE_p_f_p_p_svn_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t swig_types[28]
-#define SWIGTYPE_p_f_p_p_void_p_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[29]
-#define SWIGTYPE_p_f_p_p_void_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[30]
-#define SWIGTYPE_p_f_p_q_const__char_p_q_const__char_p_void__int swig_types[31]
-#define SWIGTYPE_p_f_p_q_const__char_p_q_const__char_p_void_p_apr_pool_t__int swig_types[32]
-#define SWIGTYPE_p_f_p_q_const__char_p_void__int swig_types[33]
-#define SWIGTYPE_p_f_p_q_const__char_p_void_p_apr_pool_t__int swig_types[34]
+#define SWIGTYPE_p_apr_hash_t swig_types[8]
+#define SWIGTYPE_p_apr_int32_t swig_types[9]
+#define SWIGTYPE_p_apr_int64_t swig_types[10]
+#define SWIGTYPE_p_apr_off_t swig_types[11]
+#define SWIGTYPE_p_apr_pool_t swig_types[12]
+#define SWIGTYPE_p_apr_pool_wrapper_t swig_types[13]
+#define SWIGTYPE_p_apr_proc_t swig_types[14]
+#define SWIGTYPE_p_apr_size_t swig_types[15]
+#define SWIGTYPE_p_apr_uint32_t swig_types[16]
+#define SWIGTYPE_p_char swig_types[17]
+#define SWIGTYPE_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[18]
+#define SWIGTYPE_p_f_p_apr_uint32_t_p_p_void_p_void_svn_diff_datasource_e__p_svn_error_t swig_types[19]
+#define SWIGTYPE_p_f_p_p_char_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t swig_types[20]
+#define SWIGTYPE_p_f_p_p_struct_svn_auth_provider_object_t_p_apr_pool_t__void swig_types[21]
+#define SWIGTYPE_p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[22]
+#define SWIGTYPE_p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[23]
+#define SWIGTYPE_p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[24]
+#define SWIGTYPE_p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[25]
+#define SWIGTYPE_p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[26]
+#define SWIGTYPE_p_f_p_p_svn_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t swig_types[27]
+#define SWIGTYPE_p_f_p_p_void_p_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[28]
+#define SWIGTYPE_p_f_p_p_void_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[29]
+#define SWIGTYPE_p_f_p_q_const__char_p_q_const__char_p_void__int swig_types[30]
+#define SWIGTYPE_p_f_p_q_const__char_p_q_const__char_p_void_p_apr_pool_t__int swig_types[31]
+#define SWIGTYPE_p_f_p_q_const__char_p_void__int swig_types[32]
+#define SWIGTYPE_p_f_p_q_const__char_p_void_p_apr_pool_t__int swig_types[33]
+#define SWIGTYPE_p_f_p_q_const__struct_svn_version_t_p_q_const__struct_svn_version_t__int swig_types[34]
 #define SWIGTYPE_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[35]
 #define SWIGTYPE_p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t swig_types[36]
 #define SWIGTYPE_p_f_p_svn_boolean_t_p_void_p_q_const__char_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[37]
@@ -1844,104 +1833,105 @@ int SWIG_Ruby_arity( VALUE proc, int minimal )
 #define SWIGTYPE_p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t swig_types[49]
 #define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t swig_types[50]
 #define SWIGTYPE_p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t swig_types[51]
-#define SWIGTYPE_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t swig_types[52]
-#define SWIGTYPE_p_f_p_void_p_void__void swig_types[53]
-#define SWIGTYPE_p_f_p_void_p_void_p_void_p_int__p_svn_error_t swig_types[54]
-#define SWIGTYPE_p_f_p_void_svn_diff_datasource_e__p_svn_error_t swig_types[55]
-#define SWIGTYPE_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t swig_types[56]
-#define SWIGTYPE_p_f_void__p_svn_version_t swig_types[57]
-#define SWIGTYPE_p_int swig_types[58]
-#define SWIGTYPE_p_long swig_types[59]
-#define SWIGTYPE_p_p_apr_array_header_t swig_types[60]
-#define SWIGTYPE_p_p_apr_file_t swig_types[61]
-#define SWIGTYPE_p_p_apr_hash_t swig_types[62]
-#define SWIGTYPE_p_p_char swig_types[63]
-#define SWIGTYPE_p_p_svn_auth_baton_t swig_types[64]
-#define SWIGTYPE_p_p_svn_auth_cred_simple_t swig_types[65]
-#define SWIGTYPE_p_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[66]
-#define SWIGTYPE_p_p_svn_auth_cred_ssl_client_cert_t swig_types[67]
-#define SWIGTYPE_p_p_svn_auth_cred_ssl_server_trust_t swig_types[68]
-#define SWIGTYPE_p_p_svn_auth_cred_username_t swig_types[69]
-#define SWIGTYPE_p_p_svn_auth_iterstate_t swig_types[70]
-#define SWIGTYPE_p_p_svn_auth_provider_object_t swig_types[71]
-#define SWIGTYPE_p_p_svn_checksum_t swig_types[72]
-#define SWIGTYPE_p_p_svn_config_t swig_types[73]
-#define SWIGTYPE_p_p_svn_diff_t swig_types[74]
-#define SWIGTYPE_p_p_svn_io_dirent2_t swig_types[75]
-#define SWIGTYPE_p_p_svn_patch_file_t swig_types[76]
-#define SWIGTYPE_p_p_svn_patch_t swig_types[77]
-#define SWIGTYPE_p_p_svn_stream_mark_t swig_types[78]
-#define SWIGTYPE_p_p_svn_stream_t swig_types[79]
-#define SWIGTYPE_p_p_svn_string_t swig_types[80]
-#define SWIGTYPE_p_p_svn_stringbuf_t swig_types[81]
-#define SWIGTYPE_p_p_void swig_types[82]
-#define SWIGTYPE_p_svn_auth_baton_t swig_types[83]
-#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[84]
-#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[85]
-#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[86]
-#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[87]
-#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[88]
-#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[89]
-#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[90]
-#define SWIGTYPE_p_svn_auth_provider_t swig_types[91]
-#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[92]
-#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[93]
-#define SWIGTYPE_p_svn_checksum_kind_t swig_types[94]
-#define SWIGTYPE_p_svn_checksum_t swig_types[95]
-#define SWIGTYPE_p_svn_commit_info_t swig_types[96]
-#define SWIGTYPE_p_svn_config_t swig_types[97]
-#define SWIGTYPE_p_svn_depth_t swig_types[98]
-#define SWIGTYPE_p_svn_diff_conflict_display_style_t swig_types[99]
-#define SWIGTYPE_p_svn_diff_datasource_e swig_types[100]
-#define SWIGTYPE_p_svn_diff_file_ignore_space_t swig_types[101]
-#define SWIGTYPE_p_svn_diff_file_options_t swig_types[102]
-#define SWIGTYPE_p_svn_diff_fns2_t swig_types[103]
-#define SWIGTYPE_p_svn_diff_fns_t swig_types[104]
-#define SWIGTYPE_p_svn_diff_hunk_t swig_types[105]
-#define SWIGTYPE_p_svn_diff_operation_kind_e swig_types[106]
-#define SWIGTYPE_p_svn_diff_output_fns_t swig_types[107]
-#define SWIGTYPE_p_svn_diff_t swig_types[108]
-#define SWIGTYPE_p_svn_dirent_t swig_types[109]
-#define SWIGTYPE_p_svn_errno_t swig_types[110]
-#define SWIGTYPE_p_svn_error_t swig_types[111]
-#define SWIGTYPE_p_svn_io_dirent2_t swig_types[112]
-#define SWIGTYPE_p_svn_io_dirent_t swig_types[113]
-#define SWIGTYPE_p_svn_io_file_del_t swig_types[114]
-#define SWIGTYPE_p_svn_location_segment_t swig_types[115]
-#define SWIGTYPE_p_svn_lock_t swig_types[116]
-#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[117]
-#define SWIGTYPE_p_svn_log_changed_path_t swig_types[118]
-#define SWIGTYPE_p_svn_log_entry_t swig_types[119]
-#define SWIGTYPE_p_svn_merge_range_t swig_types[120]
-#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[121]
-#define SWIGTYPE_p_svn_node_kind_t swig_types[122]
-#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[123]
-#define SWIGTYPE_p_svn_opt_revision_t swig_types[124]
-#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[125]
-#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[126]
-#define SWIGTYPE_p_svn_opt_subcommand_desc2_t_desc_overrides swig_types[127]
-#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[128]
-#define SWIGTYPE_p_svn_patch_file_t swig_types[129]
-#define SWIGTYPE_p_svn_patch_t swig_types[130]
-#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[131]
-#define SWIGTYPE_p_svn_prop_kind swig_types[132]
-#define SWIGTYPE_p_svn_prop_patch_t swig_types[133]
-#define SWIGTYPE_p_svn_prop_t swig_types[134]
-#define SWIGTYPE_p_svn_stream_mark_t swig_types[135]
-#define SWIGTYPE_p_svn_stream_t swig_types[136]
-#define SWIGTYPE_p_svn_string_t swig_types[137]
-#define SWIGTYPE_p_svn_stringbuf_t swig_types[138]
-#define SWIGTYPE_p_svn_tristate_t swig_types[139]
-#define SWIGTYPE_p_svn_version_checklist_t swig_types[140]
-#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[141]
-#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[142]
-#define SWIGTYPE_p_svn_version_extended_t swig_types[143]
-#define SWIGTYPE_p_svn_version_t swig_types[144]
-#define SWIGTYPE_p_unsigned_char swig_types[145]
-#define SWIGTYPE_p_unsigned_long swig_types[146]
-#define SWIGTYPE_p_void swig_types[147]
-static swig_type_info *swig_types[149];
-static swig_module_info swig_module = {swig_types, 148, 0, 0, 0, 0};
+#define SWIGTYPE_p_f_p_void_p_svn_boolean_t__p_svn_error_t swig_types[52]
+#define SWIGTYPE_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t swig_types[53]
+#define SWIGTYPE_p_f_p_void_p_void__void swig_types[54]
+#define SWIGTYPE_p_f_p_void_p_void_p_void_p_int__p_svn_error_t swig_types[55]
+#define SWIGTYPE_p_f_p_void_svn_diff_datasource_e__p_svn_error_t swig_types[56]
+#define SWIGTYPE_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t swig_types[57]
+#define SWIGTYPE_p_f_void__p_svn_version_t swig_types[58]
+#define SWIGTYPE_p_int swig_types[59]
+#define SWIGTYPE_p_long swig_types[60]
+#define SWIGTYPE_p_p_apr_array_header_t swig_types[61]
+#define SWIGTYPE_p_p_apr_file_t swig_types[62]
+#define SWIGTYPE_p_p_apr_hash_t swig_types[63]
+#define SWIGTYPE_p_p_char swig_types[64]
+#define SWIGTYPE_p_p_svn_auth_baton_t swig_types[65]
+#define SWIGTYPE_p_p_svn_auth_cred_simple_t swig_types[66]
+#define SWIGTYPE_p_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[67]
+#define SWIGTYPE_p_p_svn_auth_cred_ssl_client_cert_t swig_types[68]
+#define SWIGTYPE_p_p_svn_auth_cred_ssl_server_trust_t swig_types[69]
+#define SWIGTYPE_p_p_svn_auth_cred_username_t swig_types[70]
+#define SWIGTYPE_p_p_svn_auth_iterstate_t swig_types[71]
+#define SWIGTYPE_p_p_svn_auth_provider_object_t swig_types[72]
+#define SWIGTYPE_p_p_svn_checksum_t swig_types[73]
+#define SWIGTYPE_p_p_svn_config_t swig_types[74]
+#define SWIGTYPE_p_p_svn_diff_t swig_types[75]
+#define SWIGTYPE_p_p_svn_io_dirent2_t swig_types[76]
+#define SWIGTYPE_p_p_svn_patch_file_t swig_types[77]
+#define SWIGTYPE_p_p_svn_patch_t swig_types[78]
+#define SWIGTYPE_p_p_svn_stream_mark_t swig_types[79]
+#define SWIGTYPE_p_p_svn_stream_t swig_types[80]
+#define SWIGTYPE_p_p_svn_string_t swig_types[81]
+#define SWIGTYPE_p_p_svn_stringbuf_t swig_types[82]
+#define SWIGTYPE_p_p_void swig_types[83]
+#define SWIGTYPE_p_svn_auth_baton_t swig_types[84]
+#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[85]
+#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[86]
+#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[87]
+#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[88]
+#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[89]
+#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[90]
+#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[91]
+#define SWIGTYPE_p_svn_auth_provider_t swig_types[92]
+#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[93]
+#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[94]
+#define SWIGTYPE_p_svn_checksum_kind_t swig_types[95]
+#define SWIGTYPE_p_svn_checksum_t swig_types[96]
+#define SWIGTYPE_p_svn_commit_info_t swig_types[97]
+#define SWIGTYPE_p_svn_config_t swig_types[98]
+#define SWIGTYPE_p_svn_depth_t swig_types[99]
+#define SWIGTYPE_p_svn_diff_conflict_display_style_t swig_types[100]
+#define SWIGTYPE_p_svn_diff_datasource_e swig_types[101]
+#define SWIGTYPE_p_svn_diff_file_ignore_space_t swig_types[102]
+#define SWIGTYPE_p_svn_diff_file_options_t swig_types[103]
+#define SWIGTYPE_p_svn_diff_fns2_t swig_types[104]
+#define SWIGTYPE_p_svn_diff_fns_t swig_types[105]
+#define SWIGTYPE_p_svn_diff_hunk_t swig_types[106]
+#define SWIGTYPE_p_svn_diff_operation_kind_e swig_types[107]
+#define SWIGTYPE_p_svn_diff_output_fns_t swig_types[108]
+#define SWIGTYPE_p_svn_diff_t swig_types[109]
+#define SWIGTYPE_p_svn_dirent_t swig_types[110]
+#define SWIGTYPE_p_svn_errno_t swig_types[111]
+#define SWIGTYPE_p_svn_error_t swig_types[112]
+#define SWIGTYPE_p_svn_io_dirent2_t swig_types[113]
+#define SWIGTYPE_p_svn_io_dirent_t swig_types[114]
+#define SWIGTYPE_p_svn_io_file_del_t swig_types[115]
+#define SWIGTYPE_p_svn_location_segment_t swig_types[116]
+#define SWIGTYPE_p_svn_lock_t swig_types[117]
+#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[118]
+#define SWIGTYPE_p_svn_log_changed_path_t swig_types[119]
+#define SWIGTYPE_p_svn_log_entry_t swig_types[120]
+#define SWIGTYPE_p_svn_merge_range_t swig_types[121]
+#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[122]
+#define SWIGTYPE_p_svn_node_kind_t swig_types[123]
+#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[124]
+#define SWIGTYPE_p_svn_opt_revision_t swig_types[125]
+#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[126]
+#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[127]
+#define SWIGTYPE_p_svn_opt_subcommand_desc2_t_desc_overrides swig_types[128]
+#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[129]
+#define SWIGTYPE_p_svn_patch_file_t swig_types[130]
+#define SWIGTYPE_p_svn_patch_t swig_types[131]
+#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[132]
+#define SWIGTYPE_p_svn_prop_kind swig_types[133]
+#define SWIGTYPE_p_svn_prop_patch_t swig_types[134]
+#define SWIGTYPE_p_svn_prop_t swig_types[135]
+#define SWIGTYPE_p_svn_stream_mark_t swig_types[136]
+#define SWIGTYPE_p_svn_stream_t swig_types[137]
+#define SWIGTYPE_p_svn_string_t swig_types[138]
+#define SWIGTYPE_p_svn_stringbuf_t swig_types[139]
+#define SWIGTYPE_p_svn_tristate_t swig_types[140]
+#define SWIGTYPE_p_svn_version_checklist_t swig_types[141]
+#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[142]
+#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[143]
+#define SWIGTYPE_p_svn_version_extended_t swig_types[144]
+#define SWIGTYPE_p_svn_version_t swig_types[145]
+#define SWIGTYPE_p_unsigned_char swig_types[146]
+#define SWIGTYPE_p_unsigned_long swig_types[147]
+#define SWIGTYPE_p_void swig_types[148]
+static swig_type_info *swig_types[150];
+static swig_module_info swig_module = {swig_types, 149, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
@@ -1956,7 +1946,7 @@ static VALUE mCore;
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x020009 
+#define SWIGVERSION 0x020012 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -2107,7 +2097,7 @@ SWIG_ruby_failed(void)
 } 
 
 
-/*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2318,7 +2308,7 @@ typedef struct {
 #include "svn_auth.h"
 
 
-/*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2440,8 +2430,8 @@ static svn_boolean_t svn_config_invoke_enumerator2(
 }
 
 static svn_error_t * svn_config_invoke_auth_walk_func(
-  svn_config_auth_walk_func_t _obj, svn_boolean_t *delete_cred, void *cleanup_baton, const char *cred_kind, const char *realmstring, apr_hash_t *hash, apr_pool_t *scratch_pool) {
-  return _obj(delete_cred, cleanup_baton, cred_kind, realmstring, hash, scratch_pool);
+  svn_config_auth_walk_func_t _obj, svn_boolean_t *delete_cred, void *walk_baton, const char *cred_kind, const char *realmstring, apr_hash_t *hash, apr_pool_t *scratch_pool) {
+  return _obj(delete_cred, walk_baton, cred_kind, realmstring, hash, scratch_pool);
 }
 
 
@@ -2504,6 +2494,11 @@ static svn_error_t * svn_stream_invoke_seek_fn(
   return _obj(baton, mark);
 }
 
+static svn_error_t * svn_stream_invoke_data_available_fn(
+  svn_stream_data_available_fn_t _obj, void *baton, svn_boolean_t *data_available) {
+  return _obj(baton, data_available);
+}
+
 static svn_error_t * svn_stream_invoke_lazyopen_func(
   svn_stream_lazyopen_func_t _obj, svn_stream_t **stream, void *baton, apr_pool_t *result_pool, apr_pool_t *scratch_pool) {
   return _obj(stream, baton, result_pool, scratch_pool);
@@ -3684,100 +3679,6 @@ free_svn_error_t(struct svn_error_t *arg1) {
 }
 
 SWIGINTERN VALUE
-_wrap_svn__apr_hash_index_key(int argc, VALUE *argv, VALUE self) {
-  apr_hash_index_t *arg1 = (apr_hash_index_t *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *result = 0 ;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_apr_hash_index_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "apr_hash_index_t const *","svn__apr_hash_index_key", 1, argv[0] )); 
-  }
-  arg1 = (apr_hash_index_t *)(argp1);
-  {
-    result = (void *)svn__apr_hash_index_key((apr_hash_index_t const *)arg1);
-    
-    
-    
-  }
-  {
-    char *value = result;
-    if (value) {
-      vresult = rb_str_new2(value);
-    } else {
-      vresult = Qnil;
-    }
-  }
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_svn__apr_hash_index_klen(int argc, VALUE *argv, VALUE self) {
-  apr_hash_index_t *arg1 = (apr_hash_index_t *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  apr_ssize_t result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_apr_hash_index_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "apr_hash_index_t const *","svn__apr_hash_index_klen", 1, argv[0] )); 
-  }
-  arg1 = (apr_hash_index_t *)(argp1);
-  {
-    result = svn__apr_hash_index_klen((apr_hash_index_t const *)arg1);
-    
-    
-    
-  }
-  vresult = SWIG_From_long((long)(result));
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_svn__apr_hash_index_val(int argc, VALUE *argv, VALUE self) {
-  apr_hash_index_t *arg1 = (apr_hash_index_t *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *result = 0 ;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_apr_hash_index_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "apr_hash_index_t const *","svn__apr_hash_index_val", 1, argv[0] )); 
-  }
-  arg1 = (apr_hash_index_t *)(argp1);
-  {
-    result = (void *)svn__apr_hash_index_val((apr_hash_index_t const *)arg1);
-    
-    
-    
-  }
-  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 |  0 );
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
 _wrap_svn_node_kind_to_word(int argc, VALUE *argv, VALUE self) {
   svn_node_kind_t arg1 ;
   int val1 ;
@@ -8581,6 +8482,57 @@ free_svn_version_checklist_t(struct svn_version_checklist_t *arg1) {
 }
 
 SWIGINTERN VALUE
+_wrap_svn_ver_check_list2(int argc, VALUE *argv, VALUE self) {
+  svn_version_t *arg1 = (svn_version_t *) 0 ;
+  svn_version_checklist_t *arg2 = (svn_version_checklist_t *) 0 ;
+  svn_boolean_t (*arg3)(svn_version_t const *,svn_version_t const *) = (svn_boolean_t (*)(svn_version_t const *,svn_version_t const *)) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 3) || (argc > 3)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_svn_version_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "svn_version_t const *","svn_ver_check_list2", 1, argv[0] )); 
+  }
+  arg1 = (svn_version_t *)(argp1);
+  res2 = SWIG_ConvertPtr(argv[1], &argp2,SWIGTYPE_p_svn_version_checklist_t, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "svn_version_checklist_t const *","svn_ver_check_list2", 2, argv[1] )); 
+  }
+  arg2 = (svn_version_checklist_t *)(argp2);
+  {
+    int res = SWIG_ConvertFunctionPtr(argv[2], (void**)(&arg3), SWIGTYPE_p_f_p_q_const__struct_svn_version_t_p_q_const__struct_svn_version_t__int);
+    if (!SWIG_IsOK(res)) {
+      SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_boolean_t (*)(svn_version_t const *,svn_version_t const *)","svn_ver_check_list2", 3, argv[2] )); 
+    }
+  }
+  {
+    result = (svn_error_t *)svn_ver_check_list2((struct svn_version_t const *)arg1,(struct svn_version_checklist_t const *)arg2,arg3);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
 _wrap_svn_ver_check_list(int argc, VALUE *argv, VALUE self) {
   svn_version_t *arg1 = (svn_version_t *) 0 ;
   svn_version_checklist_t *arg2 = (svn_version_checklist_t *) 0 ;
@@ -13493,6 +13445,120 @@ fail:
 
 
 SWIGINTERN VALUE
+_wrap_svn_cmdline_create_auth_baton2(int argc, VALUE *argv, VALUE self) {
+  svn_auth_baton_t **arg1 = (svn_auth_baton_t **) 0 ;
+  svn_boolean_t arg2 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  char *arg5 = (char *) 0 ;
+  svn_boolean_t arg6 ;
+  svn_boolean_t arg7 ;
+  svn_boolean_t arg8 ;
+  svn_boolean_t arg9 ;
+  svn_boolean_t arg10 ;
+  svn_boolean_t arg11 ;
+  svn_config_t *arg12 = (svn_config_t *) 0 ;
+  svn_cancel_func_t arg13 = (svn_cancel_func_t) 0 ;
+  void *arg14 = (void *) 0 ;
+  apr_pool_t *arg15 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  svn_auth_baton_t *temp1 ;
+  void *argp12 = 0 ;
+  int res12 = 0 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg15);
+    _global_pool = arg15;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  arg1 = &temp1;
+  if ((argc < 12) || (argc > 13)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 12)",argc); SWIG_fail;
+  }
+  arg2 = RTEST(argv[0]);
+  {
+    if (NIL_P(argv[1])) {
+      arg3 = NULL;
+    } else {
+      arg3 = StringValuePtr(argv[1]);
+    }
+  }
+  {
+    if (NIL_P(argv[2])) {
+      arg4 = NULL;
+    } else {
+      arg4 = StringValuePtr(argv[2]);
+    }
+  }
+  {
+    if (NIL_P(argv[3])) {
+      arg5 = NULL;
+    } else {
+      arg5 = StringValuePtr(argv[3]);
+    }
+  }
+  arg6 = RTEST(argv[4]);
+  arg7 = RTEST(argv[5]);
+  arg8 = RTEST(argv[6]);
+  arg9 = RTEST(argv[7]);
+  arg10 = RTEST(argv[8]);
+  arg11 = RTEST(argv[9]);
+  res12 = SWIG_ConvertPtr(argv[10], &argp12,SWIGTYPE_p_svn_config_t, 0 |  0 );
+  if (!SWIG_IsOK(res12)) {
+    SWIG_exception_fail(SWIG_ArgError(res12), Ruby_Format_TypeError( "", "svn_config_t *","svn_cmdline_create_auth_baton2", 12, argv[10] )); 
+  }
+  arg12 = (svn_config_t *)(argp12);
+  {
+    arg13 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
+    arg14 = (void *)svn_swig_rb_make_baton(argv[11], _global_svn_swig_rb_pool);
+  }
+  if (argc > 12) {
+    
+  }
+  {
+    result = (svn_error_t *)svn_cmdline_create_auth_baton2(arg1,arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12,arg13,arg14,arg15);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  {
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj(*arg1, SWIGTYPE_p_svn_auth_baton_t, 0));
+  }
+  {
+    svn_swig_rb_set_baton(vresult, (VALUE)arg14);
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
+fail:
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
 _wrap_svn_cmdline_create_auth_baton(int argc, VALUE *argv, VALUE self) {
   svn_auth_baton_t **arg1 = (svn_auth_baton_t **) 0 ;
   svn_boolean_t arg2 ;
@@ -13552,7 +13618,7 @@ _wrap_svn_cmdline_create_auth_baton(int argc, VALUE *argv, VALUE self) {
   }
   arg8 = (svn_config_t *)(argp8);
   {
-    arg9 = svn_swig_rb_cancel_func;
+    arg9 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg10 = (void *)svn_swig_rb_make_baton(argv[7], _global_svn_swig_rb_pool);
   }
   if (argc > 8) {
@@ -15795,7 +15861,7 @@ _wrap_svn_auth_get_simple_prompt_provider(int argc, VALUE *argv, VALUE self) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
   }
   {
-    arg2 = svn_swig_rb_auth_simple_prompt_func;
+    arg2 = (svn_auth_simple_prompt_func_t) svn_swig_rb_auth_simple_prompt_func;
     arg3 = (void *)svn_swig_rb_make_baton(argv[0], _global_svn_swig_rb_pool);
   }
   ecode4 = SWIG_AsVal_int(argv[1], &val4);
@@ -15859,7 +15925,7 @@ _wrap_svn_auth_get_username_prompt_provider(int argc, VALUE *argv, VALUE self) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
   }
   {
-    arg2 = svn_swig_rb_auth_username_prompt_func;
+    arg2 = (svn_auth_username_prompt_func_t) svn_swig_rb_auth_username_prompt_func;
     arg3 = (void *)svn_swig_rb_make_baton(argv[0], _global_svn_swig_rb_pool);
   }
   ecode4 = SWIG_AsVal_int(argv[1], &val4);
@@ -16444,7 +16510,7 @@ _wrap_svn_auth_get_ssl_server_trust_prompt_provider(int argc, VALUE *argv, VALUE
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
   }
   {
-    arg2 = svn_swig_rb_auth_ssl_server_trust_prompt_func;
+    arg2 = (svn_auth_ssl_server_trust_prompt_func_t) svn_swig_rb_auth_ssl_server_trust_prompt_func;
     arg3 = (void *)svn_swig_rb_make_baton(argv[0], _global_svn_swig_rb_pool);
   }
   if (argc > 1) {
@@ -16503,7 +16569,7 @@ _wrap_svn_auth_get_ssl_client_cert_prompt_provider(int argc, VALUE *argv, VALUE
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
   }
   {
-    arg2 = svn_swig_rb_auth_ssl_client_cert_prompt_func;
+    arg2 = (svn_auth_ssl_client_cert_prompt_func_t) svn_swig_rb_auth_ssl_client_cert_prompt_func;
     arg3 = (void *)svn_swig_rb_make_baton(argv[0], _global_svn_swig_rb_pool);
   }
   ecode4 = SWIG_AsVal_int(argv[1], &val4);
@@ -16567,7 +16633,7 @@ _wrap_svn_auth_get_ssl_client_cert_pw_prompt_provider(int argc, VALUE *argv, VAL
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
   }
   {
-    arg2 = svn_swig_rb_auth_ssl_client_cert_pw_prompt_func;
+    arg2 = (svn_auth_ssl_client_cert_pw_prompt_func_t) svn_swig_rb_auth_ssl_client_cert_pw_prompt_func;
     arg3 = (void *)svn_swig_rb_make_baton(argv[0], _global_svn_swig_rb_pool);
   }
   ecode4 = SWIG_AsVal_int(argv[1], &val4);
@@ -18755,7 +18821,7 @@ _wrap_svn_config_enumerate_sections2(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (svn_config_t *)(argp1);
   {
-    arg2 = svn_swig_rb_config_section_enumerator;
+    arg2 = (svn_config_section_enumerator2_t) svn_swig_rb_config_section_enumerator;
     arg3 = (void *)svn_swig_rb_make_baton(argv[1], _global_svn_swig_rb_pool);
   }
   if (argc > 2) {
@@ -18877,7 +18943,7 @@ _wrap_svn_config_enumerate2(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (char *)(buf2);
   {
-    arg3 = svn_swig_rb_config_enumerator;
+    arg3 = (svn_config_enumerator2_t) svn_swig_rb_config_enumerator;
     arg4 = (void *)svn_swig_rb_make_baton(argv[2], _global_svn_swig_rb_pool);
   }
   if (argc > 3) {
@@ -19690,14 +19756,14 @@ _wrap_svn_config_dup(int argc, VALUE *argv, VALUE self) {
   }
   res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_svn_config_t, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "svn_config_t *","svn_config_dup", 2, argv[0] )); 
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "svn_config_t const *","svn_config_dup", 2, argv[0] )); 
   }
   arg2 = (svn_config_t *)(argp2);
   if (argc > 1) {
     
   }
   {
-    result = (svn_error_t *)svn_config_dup(arg1,arg2,arg3);
+    result = (svn_error_t *)svn_config_dup(arg1,(struct svn_config_t const *)arg2,arg3);
     
     
     
@@ -22902,6 +22968,77 @@ fail:
 
 
 SWIGINTERN VALUE
+_wrap_svn_relpath_prefix(int argc, VALUE *argv, VALUE self) {
+  char *arg1 = (char *) 0 ;
+  int arg2 ;
+  apr_pool_t *arg3 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  int res1 ;
+  char *buf1 = 0 ;
+  int alloc1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  char *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg3);
+    _global_pool = arg3;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  if ((argc < 2) || (argc > 3)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  }
+  res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","svn_relpath_prefix", 1, argv[0] ));
+  }
+  arg1 = (char *)(buf1);
+  ecode2 = SWIG_AsVal_int(argv[1], &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "int","svn_relpath_prefix", 2, argv[1] ));
+  } 
+  arg2 = (int)(val2);
+  if (argc > 2) {
+    
+  }
+  {
+    result = (char *)svn_relpath_prefix((char const *)arg1,arg2,arg3);
+    
+    
+    
+  }
+  {
+    if (result) {
+      vresult = rb_str_new2(result);
+    } else {
+      vresult = Qnil;
+    }
+  }
+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
+fail:
+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
 _wrap_svn_uri_split(int argc, VALUE *argv, VALUE self) {
   char **arg1 = (char **) 0 ;
   char **arg2 = (char **) 0 ;
@@ -27555,6 +27692,148 @@ fail:
 
 
 SWIGINTERN VALUE
+_wrap_svn_io_file_create_bytes(int argc, VALUE *argv, VALUE self) {
+  char *arg1 = (char *) 0 ;
+  void *arg2 = (void *) 0 ;
+  apr_size_t arg3 ;
+  apr_pool_t *arg4 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  int res1 ;
+  char *buf1 = 0 ;
+  int alloc1 = 0 ;
+  int res2 ;
+  unsigned long val3 ;
+  int ecode3 = 0 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg4);
+    _global_pool = arg4;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  if ((argc < 3) || (argc > 4)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail;
+  }
+  res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","svn_io_file_create_bytes", 1, argv[0] ));
+  }
+  arg1 = (char *)(buf1);
+  res2 = SWIG_ConvertPtr(argv[1],SWIG_as_voidptrptr(&arg2), 0, 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "void const *","svn_io_file_create_bytes", 2, argv[1] )); 
+  }
+  ecode3 = SWIG_AsVal_unsigned_SS_long(argv[2], &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), Ruby_Format_TypeError( "", "apr_size_t","svn_io_file_create_bytes", 3, argv[2] ));
+  } 
+  arg3 = (apr_size_t)(val3);
+  if (argc > 3) {
+    
+  }
+  {
+    result = (svn_error_t *)svn_io_file_create_bytes((char const *)arg1,(void const *)arg2,arg3,arg4);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
+fail:
+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_svn_io_file_create_empty(int argc, VALUE *argv, VALUE self) {
+  char *arg1 = (char *) 0 ;
+  apr_pool_t *arg2 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  int res1 ;
+  char *buf1 = 0 ;
+  int alloc1 = 0 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg2);
+    _global_pool = arg2;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  if ((argc < 1) || (argc > 2)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","svn_io_file_create_empty", 1, argv[0] ));
+  }
+  arg1 = (char *)(buf1);
+  if (argc > 1) {
+    
+  }
+  {
+    result = (svn_error_t *)svn_io_file_create_empty((char const *)arg1,arg2);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
+fail:
+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
 _wrap_svn_io_lock_open_file(int argc, VALUE *argv, VALUE self) {
   apr_file_t *arg1 = (apr_file_t *) 0 ;
   svn_boolean_t arg2 ;
@@ -27673,6 +27952,42 @@ fail:
 
 
 SWIGINTERN VALUE
+_wrap_svn_stream_set_read2(int argc, VALUE *argv, VALUE self) {
+  svn_stream_t *arg1 = (svn_stream_t *) 0 ;
+  svn_read_fn_t arg2 = (svn_read_fn_t) 0 ;
+  svn_read_fn_t arg3 = (svn_read_fn_t) 0 ;
+  
+  if ((argc < 3) || (argc > 3)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail;
+  }
+  {
+    arg1 = svn_swig_rb_make_stream(argv[0]);
+  }
+  {
+    int res = SWIG_ConvertFunctionPtr(argv[1], (void**)(&arg2), SWIGTYPE_p_f_p_void_p_char_p_apr_size_t__p_svn_error_t);
+    if (!SWIG_IsOK(res)) {
+      SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_read_fn_t","svn_stream_set_read2", 2, argv[1] )); 
+    }
+  }
+  {
+    int res = SWIG_ConvertFunctionPtr(argv[2], (void**)(&arg3), SWIGTYPE_p_f_p_void_p_char_p_apr_size_t__p_svn_error_t);
+    if (!SWIG_IsOK(res)) {
+      SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_read_fn_t","svn_stream_set_read2", 3, argv[2] )); 
+    }
+  }
+  {
+    svn_stream_set_read2(arg1,arg2,arg3);
+    
+    
+    
+  }
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
 _wrap_svn_stream_set_skip(int argc, VALUE *argv, VALUE self) {
   svn_stream_t *arg1 = (svn_stream_t *) 0 ;
   svn_stream_skip_fn_t arg2 = (svn_stream_skip_fn_t) 0 ;
@@ -27760,6 +28075,35 @@ fail:
 
 
 SWIGINTERN VALUE
+_wrap_svn_stream_set_data_available(int argc, VALUE *argv, VALUE self) {
+  svn_stream_t *arg1 = (svn_stream_t *) 0 ;
+  svn_stream_data_available_fn_t arg2 = (svn_stream_data_available_fn_t) 0 ;
+  
+  if ((argc < 2) || (argc > 2)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  }
+  {
+    arg1 = svn_swig_rb_make_stream(argv[0]);
+  }
+  {
+    int res = SWIG_ConvertFunctionPtr(argv[1], (void**)(&arg2), SWIGTYPE_p_f_p_void_p_svn_boolean_t__p_svn_error_t);
+    if (!SWIG_IsOK(res)) {
+      SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_stream_data_available_fn_t","svn_stream_set_data_available", 2, argv[1] )); 
+    }
+  }
+  {
+    svn_stream_set_data_available(arg1,arg2);
+    
+    
+    
+  }
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
 _wrap_svn_stream_empty(int argc, VALUE *argv, VALUE self) {
   apr_pool_t *arg1 = (apr_pool_t *) 0 ;
   VALUE _global_svn_swig_rb_pool ;
@@ -28432,6 +28776,81 @@ fail:
 
 
 SWIGINTERN VALUE
+_wrap_svn_stringbuf_from_stream(int argc, VALUE *argv, VALUE self) {
+  svn_stringbuf_t **arg1 = (svn_stringbuf_t **) 0 ;
+  svn_stream_t *arg2 = (svn_stream_t *) 0 ;
+  apr_size_t arg3 ;
+  apr_pool_t *arg4 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  svn_stringbuf_t *temp1 ;
+  unsigned long val3 ;
+  int ecode3 = 0 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg4);
+    _global_pool = arg4;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  arg1 = &temp1;
+  if ((argc < 2) || (argc > 3)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  }
+  {
+    arg2 = svn_swig_rb_make_stream(argv[0]);
+  }
+  ecode3 = SWIG_AsVal_unsigned_SS_long(argv[1], &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), Ruby_Format_TypeError( "", "apr_size_t","svn_stringbuf_from_stream", 3, argv[1] ));
+  } 
+  arg3 = (apr_size_t)(val3);
+  if (argc > 2) {
+    
+  }
+  {
+    result = (svn_error_t *)svn_stringbuf_from_stream(arg1,arg2,arg3,arg4);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  {
+    if (*arg1) {
+      vresult = SWIG_Ruby_AppendOutput(vresult, rb_str_new((*arg1)->data, (*arg1)->len));
+    } else {
+      vresult = SWIG_Ruby_AppendOutput(vresult, Qnil);
+    }
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
+fail:
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
 _wrap_svn_stream_from_stringbuf(int argc, VALUE *argv, VALUE self) {
   svn_stringbuf_t *arg1 = (svn_stringbuf_t *) 0 ;
   apr_pool_t *arg2 = (apr_pool_t *) 0 ;
@@ -28725,6 +29144,119 @@ fail:
 
 
 SWIGINTERN VALUE
+_wrap_svn_stream_read_full(int argc, VALUE *argv, VALUE self) {
+  svn_stream_t *arg1 = (svn_stream_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  apr_size_t *arg3 = (apr_size_t *) 0 ;
+  apr_size_t temp2 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 2) || (argc > 2)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  }
+  {
+    arg1 = svn_swig_rb_make_stream(argv[0]);
+  }
+  {
+    temp2 = NUM2LONG(argv[1]);
+    arg2 = malloc(temp2);
+    arg3 = (apr_size_t *)&temp2;
+  }
+  {
+    result = (svn_error_t *)svn_stream_read_full(arg1,arg2,arg3);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  {
+    vresult = SWIG_Ruby_AppendOutput(vresult, *arg3 == 0 ? Qnil : rb_str_new(arg2, *arg3));
+    free(arg2);
+  }
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_svn_stream_supports_partial_read(int argc, VALUE *argv, VALUE self) {
+  svn_stream_t *arg1 = (svn_stream_t *) 0 ;
+  svn_boolean_t result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  {
+    arg1 = svn_swig_rb_make_stream(argv[0]);
+  }
+  {
+    result = (svn_boolean_t)svn_stream_supports_partial_read(arg1);
+    
+    
+    
+  }
+  vresult = result ? Qtrue : Qfalse;
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_svn_stream_read2(int argc, VALUE *argv, VALUE self) {
+  svn_stream_t *arg1 = (svn_stream_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  apr_size_t *arg3 = (apr_size_t *) 0 ;
+  apr_size_t temp2 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 2) || (argc > 2)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  }
+  {
+    arg1 = svn_swig_rb_make_stream(argv[0]);
+  }
+  {
+    temp2 = NUM2LONG(argv[1]);
+    arg2 = malloc(temp2);
+    arg3 = (apr_size_t *)&temp2;
+  }
+  {
+    result = (svn_error_t *)svn_stream_read2(arg1,arg2,arg3);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  {
+    vresult = SWIG_Ruby_AppendOutput(vresult, *arg3 == 0 ? Qnil : rb_str_new(arg2, *arg3));
+    free(arg2);
+  }
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
 _wrap_svn_stream_read(int argc, VALUE *argv, VALUE self) {
   svn_stream_t *arg1 = (svn_stream_t *) 0 ;
   char *arg2 = (char *) 0 ;
@@ -29050,6 +29582,44 @@ fail:
 
 
 SWIGINTERN VALUE
+_wrap_svn_stream_data_available(int argc, VALUE *argv, VALUE self) {
+  svn_stream_t *arg1 = (svn_stream_t *) 0 ;
+  svn_boolean_t *arg2 = (svn_boolean_t *) 0 ;
+  svn_boolean_t temp2 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  arg2 = &temp2;
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  {
+    arg1 = svn_swig_rb_make_stream(argv[0]);
+  }
+  {
+    result = (svn_error_t *)svn_stream_data_available(arg1,arg2);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  {
+    vresult = SWIG_Ruby_AppendOutput(vresult, *arg2 ? Qtrue : Qfalse);
+  }
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
 _wrap_svn_stream_tee(int argc, VALUE *argv, VALUE self) {
   svn_stream_t *arg1 = (svn_stream_t *) 0 ;
   svn_stream_t *arg2 = (svn_stream_t *) 0 ;
@@ -29257,7 +29827,7 @@ _wrap_svn_stream_copy3(int argc, VALUE *argv, VALUE self) {
     arg2 = svn_swig_rb_make_stream(argv[1]);
   }
   {
-    arg3 = svn_swig_rb_cancel_func;
+    arg3 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg4 = (void *)svn_swig_rb_make_baton(argv[2], _global_svn_swig_rb_pool);
   }
   if (argc > 3) {
@@ -29327,7 +29897,7 @@ _wrap_svn_stream_copy2(int argc, VALUE *argv, VALUE self) {
     arg2 = svn_swig_rb_make_stream(argv[1]);
   }
   {
-    arg3 = svn_swig_rb_cancel_func;
+    arg3 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg4 = (void *)svn_swig_rb_make_baton(argv[2], _global_svn_swig_rb_pool);
   }
   if (argc > 3) {
@@ -30027,7 +30597,7 @@ _wrap_svn_io_remove_dir2(int argc, VALUE *argv, VALUE self) {
   arg1 = (char *)(buf1);
   arg2 = RTEST(argv[1]);
   {
-    arg3 = svn_swig_rb_cancel_func;
+    arg3 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg4 = (void *)svn_swig_rb_make_baton(argv[2], _global_svn_swig_rb_pool);
   }
   if (argc > 3) {
@@ -31415,6 +31985,225 @@ fail:
 
 
 SWIGINTERN VALUE
+_wrap_svn_io_file_aligned_seek(int argc, VALUE *argv, VALUE self) {
+  apr_file_t *arg1 = (apr_file_t *) 0 ;
+  apr_off_t arg2 ;
+  apr_off_t *arg3 = (apr_off_t *) 0 ;
+  apr_off_t arg4 ;
+  apr_pool_t *arg5 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg5);
+    _global_pool = arg5;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  if ((argc < 4) || (argc > 5)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc); SWIG_fail;
+  }
+  {
+    arg1 = svn_swig_rb_make_file(argv[0], _global_pool);
+  }
+  {
+    arg2 = (apr_off_t)NUM2LL(argv[1]);
+  }
+  res3 = SWIG_ConvertPtr(argv[2], &argp3,SWIGTYPE_p_apr_off_t, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "apr_off_t *","svn_io_file_aligned_seek", 3, argv[2] )); 
+  }
+  arg3 = (apr_off_t *)(argp3);
+  {
+    arg4 = (apr_off_t)NUM2LL(argv[3]);
+  }
+  if (argc > 4) {
+    
+  }
+  {
+    result = (svn_error_t *)svn_io_file_aligned_seek(arg1,arg2,arg3,arg4,arg5);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
+fail:
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_svn_io_file_flush(int argc, VALUE *argv, VALUE self) {
+  apr_file_t *arg1 = (apr_file_t *) 0 ;
+  apr_pool_t *arg2 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg2);
+    _global_pool = arg2;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  if ((argc < 1) || (argc > 2)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  {
+    arg1 = svn_swig_rb_make_file(argv[0], _global_pool);
+  }
+  if (argc > 1) {
+    
+  }
+  {
+    result = (svn_error_t *)svn_io_file_flush(arg1,arg2);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
+fail:
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_svn_io_write_atomic(int argc, VALUE *argv, VALUE self) {
+  char *arg1 = (char *) 0 ;
+  void *arg2 = (void *) 0 ;
+  apr_size_t arg3 ;
+  char *arg4 = (char *) 0 ;
+  apr_pool_t *arg5 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  int res1 ;
+  char *buf1 = 0 ;
+  int alloc1 = 0 ;
+  int res2 ;
+  unsigned long val3 ;
+  int ecode3 = 0 ;
+  int res4 ;
+  char *buf4 = 0 ;
+  int alloc4 = 0 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg5);
+    _global_pool = arg5;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  if ((argc < 4) || (argc > 5)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc); SWIG_fail;
+  }
+  res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","svn_io_write_atomic", 1, argv[0] ));
+  }
+  arg1 = (char *)(buf1);
+  res2 = SWIG_ConvertPtr(argv[1],SWIG_as_voidptrptr(&arg2), 0, 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "void const *","svn_io_write_atomic", 2, argv[1] )); 
+  }
+  ecode3 = SWIG_AsVal_unsigned_SS_long(argv[2], &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), Ruby_Format_TypeError( "", "apr_size_t","svn_io_write_atomic", 3, argv[2] ));
+  } 
+  arg3 = (apr_size_t)(val3);
+  res4 = SWIG_AsCharPtrAndSize(argv[3], &buf4, NULL, &alloc4);
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), Ruby_Format_TypeError( "", "char const *","svn_io_write_atomic", 4, argv[3] ));
+  }
+  arg4 = (char *)(buf4);
+  if (argc > 4) {
+    
+  }
+  {
+    result = (svn_error_t *)svn_io_write_atomic((char const *)arg1,(void const *)arg2,arg3,(char const *)arg4,arg5);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+  if (alloc4 == SWIG_NEWOBJ) free((char*)buf4);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
+fail:
+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+  if (alloc4 == SWIG_NEWOBJ) free((char*)buf4);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
 _wrap_svn_io_write_unique(int argc, VALUE *argv, VALUE self) {
   char **arg1 = (char **) 0 ;
   char *arg2 = (char *) 0 ;
@@ -32111,6 +32900,53 @@ fail:
 
 
 SWIGINTERN VALUE
+_wrap_svn_stream_invoke_data_available_fn(int argc, VALUE *argv, VALUE self) {
+  svn_stream_data_available_fn_t arg1 = (svn_stream_data_available_fn_t) 0 ;
+  void *arg2 = (void *) 0 ;
+  svn_boolean_t *arg3 = (svn_boolean_t *) 0 ;
+  int res2 ;
+  svn_boolean_t temp3 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  arg3 = &temp3;
+  if ((argc < 2) || (argc > 2)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  }
+  {
+    int res = SWIG_ConvertFunctionPtr(argv[0], (void**)(&arg1), SWIGTYPE_p_f_p_void_p_svn_boolean_t__p_svn_error_t);
+    if (!SWIG_IsOK(res)) {
+      SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_stream_data_available_fn_t","svn_stream_invoke_data_available_fn", 1, argv[0] )); 
+    }
+  }
+  res2 = SWIG_ConvertPtr(argv[1],SWIG_as_voidptrptr(&arg2), 0, 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "void *","svn_stream_invoke_data_available_fn", 2, argv[1] )); 
+  }
+  {
+    result = (svn_error_t *)svn_stream_invoke_data_available_fn(arg1,arg2,arg3);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  {
+    vresult = SWIG_Ruby_AppendOutput(vresult, *arg3 ? Qtrue : Qfalse);
+  }
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
 _wrap_svn_stream_invoke_lazyopen_func(int argc, VALUE *argv, VALUE self) {
   svn_stream_lazyopen_func_t arg1 = (svn_stream_lazyopen_func_t) 0 ;
   svn_stream_t **arg2 = (svn_stream_t **) 0 ;
@@ -32308,16 +33144,7 @@ _wrap_svn_checksum_t_digest_set(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_checksum_t *","digest", 1, self )); 
   }
   arg1 = (struct svn_checksum_t *)(argp1);
-  {
-    if (NIL_P(argv[0])) {
-      arg2 = NULL;
-    } else if (RSTRING_LEN(argv[0]) != APR_MD5_DIGESTSIZE) {
-      rb_raise(rb_eArgError, "digest size (%d) must be %d",
-        RSTRING_LEN(argv[0]), APR_MD5_DIGESTSIZE);
-    } else {
-      arg2 = (unsigned char *)StringValuePtr(argv[0]);
-    }
-  }
+  
   if (arg1) (arg1)->digest = (unsigned char const *)arg2;
   
   return vresult;
@@ -33488,7 +34315,7 @@ _wrap_svn_auth_set_gnome_keyring_unlock_prompt_func(int argc, VALUE *argv, VALUE
   }
   arg1 = (svn_auth_baton_t *)(argp1);
   {
-    arg2 = svn_swig_rb_auth_gnome_keyring_unlock_prompt_func;
+    arg2 = (svn_auth_gnome_keyring_unlock_prompt_func_t) svn_swig_rb_auth_gnome_keyring_unlock_prompt_func;
     arg3 = (void *)svn_swig_rb_make_baton(argv[1], _global_svn_swig_rb_pool);
   }
   {
@@ -33541,7 +34368,16 @@ _wrap_svn_md5_digest_to_cstring_display(int argc, VALUE *argv, VALUE self) {
   if ((argc < 1) || (argc > 2)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
   }
-  
+  {
+    if (NIL_P(argv[0])) {
+      arg1 = NULL;
+    } else if (RSTRING_LEN(argv[0]) != APR_MD5_DIGESTSIZE) {
+      rb_raise(rb_eArgError, "digest size (%d) must be %d",
+        RSTRING_LEN(argv[0]), APR_MD5_DIGESTSIZE);
+    } else {
+      arg1 = (unsigned char *)StringValuePtr(argv[0]);
+    }
+  }
   if (argc > 1) {
     
   }
@@ -33596,7 +34432,16 @@ _wrap_svn_md5_digest_to_cstring(int argc, VALUE *argv, VALUE self) {
   if ((argc < 1) || (argc > 2)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
   }
-  
+  {
+    if (NIL_P(argv[0])) {
+      arg1 = NULL;
+    } else if (RSTRING_LEN(argv[0]) != APR_MD5_DIGESTSIZE) {
+      rb_raise(rb_eArgError, "digest size (%d) must be %d",
+        RSTRING_LEN(argv[0]), APR_MD5_DIGESTSIZE);
+    } else {
+      arg1 = (unsigned char *)StringValuePtr(argv[0]);
+    }
+  }
   if (argc > 1) {
     
   }
@@ -35490,6 +36335,65 @@ free_svn_diff_output_fns_t(struct svn_diff_output_fns_t *arg1) {
 }
 
 SWIGINTERN VALUE
+_wrap_svn_diff_output2(int argc, VALUE *argv, VALUE self) {
+  svn_diff_t *arg1 = (svn_diff_t *) 0 ;
+  void *arg2 = (void *) 0 ;
+  svn_diff_output_fns_t *arg3 = (svn_diff_output_fns_t *) 0 ;
+  svn_cancel_func_t arg4 = (svn_cancel_func_t) 0 ;
+  void *arg5 = (void *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int res2 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 4) || (argc > 4)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_svn_diff_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "svn_diff_t *","svn_diff_output2", 1, argv[0] )); 
+  }
+  arg1 = (svn_diff_t *)(argp1);
+  res2 = SWIG_ConvertPtr(argv[1],SWIG_as_voidptrptr(&arg2), 0, 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "void *","svn_diff_output2", 2, argv[1] )); 
+  }
+  res3 = SWIG_ConvertPtr(argv[2], &argp3,SWIGTYPE_p_svn_diff_output_fns_t, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "svn_diff_output_fns_t const *","svn_diff_output2", 3, argv[2] )); 
+  }
+  arg3 = (svn_diff_output_fns_t *)(argp3);
+  {
+    arg4 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
+    arg5 = (void *)svn_swig_rb_make_baton(argv[3], _global_svn_swig_rb_pool);
+  }
+  {
+    result = (svn_error_t *)svn_diff_output2(arg1,arg2,(struct svn_diff_output_fns_t const *)arg3,arg4,arg5);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  {
+    svn_swig_rb_set_baton(vresult, (VALUE)arg5);
+  }
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
 _wrap_svn_diff_output(int argc, VALUE *argv, VALUE self) {
   svn_diff_t *arg1 = (svn_diff_t *) 0 ;
   void *arg2 = (void *) 0 ;
@@ -35688,6 +36592,59 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_svn_diff_file_options_t_context_size_set(int argc, VALUE *argv, VALUE self) {
+  struct svn_diff_file_options_t *arg1 = (struct svn_diff_file_options_t *) 0 ;
+  int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_diff_file_options_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_diff_file_options_t *","context_size", 1, self )); 
+  }
+  arg1 = (struct svn_diff_file_options_t *)(argp1);
+  ecode2 = SWIG_AsVal_int(argv[0], &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "int","context_size", 2, argv[0] ));
+  } 
+  arg2 = (int)(val2);
+  if (arg1) (arg1)->context_size = arg2;
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_svn_diff_file_options_t_context_size_get(int argc, VALUE *argv, VALUE self) {
+  struct svn_diff_file_options_t *arg1 = (struct svn_diff_file_options_t *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_diff_file_options_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_diff_file_options_t *","context_size", 1, self )); 
+  }
+  arg1 = (struct svn_diff_file_options_t *)(argp1);
+  result = (int) ((arg1)->context_size);
+  vresult = SWIG_From_int((int)(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
 SWIGINTERN VALUE
 _wrap_svn_diff_file_options_t_allocate(VALUE self) {
@@ -36399,6 +37356,164 @@ fail:
 
 
 SWIGINTERN VALUE
+_wrap_svn_diff_file_output_unified4(int argc, VALUE *argv, VALUE self) {
+  svn_stream_t *arg1 = (svn_stream_t *) 0 ;
+  svn_diff_t *arg2 = (svn_diff_t *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  char *arg5 = (char *) 0 ;
+  char *arg6 = (char *) 0 ;
+  char *arg7 = (char *) 0 ;
+  char *arg8 = (char *) 0 ;
+  svn_boolean_t arg9 ;
+  int arg10 ;
+  svn_cancel_func_t arg11 = (svn_cancel_func_t) 0 ;
+  void *arg12 = (void *) 0 ;
+  apr_pool_t *arg13 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int res3 ;
+  char *buf3 = 0 ;
+  int alloc3 = 0 ;
+  int res4 ;
+  char *buf4 = 0 ;
+  int alloc4 = 0 ;
+  int res5 ;
+  char *buf5 = 0 ;
+  int alloc5 = 0 ;
+  int res6 ;
+  char *buf6 = 0 ;
+  int alloc6 = 0 ;
+  int res8 ;
+  char *buf8 = 0 ;
+  int alloc8 = 0 ;
+  int val10 ;
+  int ecode10 = 0 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg13);
+    _global_pool = arg13;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  if ((argc < 11) || (argc > 12)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 11)",argc); SWIG_fail;
+  }
+  {
+    arg1 = svn_swig_rb_make_stream(argv[0]);
+  }
+  res2 = SWIG_ConvertPtr(argv[1], &argp2,SWIGTYPE_p_svn_diff_t, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "svn_diff_t *","svn_diff_file_output_unified4", 2, argv[1] )); 
+  }
+  arg2 = (svn_diff_t *)(argp2);
+  res3 = SWIG_AsCharPtrAndSize(argv[2], &buf3, NULL, &alloc3);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "char const *","svn_diff_file_output_unified4", 3, argv[2] ));
+  }
+  arg3 = (char *)(buf3);
+  res4 = SWIG_AsCharPtrAndSize(argv[3], &buf4, NULL, &alloc4);
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), Ruby_Format_TypeError( "", "char const *","svn_diff_file_output_unified4", 4, argv[3] ));
+  }
+  arg4 = (char *)(buf4);
+  res5 = SWIG_AsCharPtrAndSize(argv[4], &buf5, NULL, &alloc5);
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), Ruby_Format_TypeError( "", "char const *","svn_diff_file_output_unified4", 5, argv[4] ));
+  }
+  arg5 = (char *)(buf5);
+  res6 = SWIG_AsCharPtrAndSize(argv[5], &buf6, NULL, &alloc6);
+  if (!SWIG_IsOK(res6)) {
+    SWIG_exception_fail(SWIG_ArgError(res6), Ruby_Format_TypeError( "", "char const *","svn_diff_file_output_unified4", 6, argv[5] ));
+  }
+  arg6 = (char *)(buf6);
+  {
+    arg7 = NULL;
+    
+    if (NIL_P(argv[6])) {
+      
+    } else if (TYPE(argv[6]) == T_FIXNUM) {
+      arg7 = (char *)NUM2INT(argv[6]);
+      if (!(arg7 == APR_LOCALE_CHARSET || arg7 == APR_DEFAULT_CHARSET)) {
+        arg7 = NULL;
+      }
+    } else {
+      arg7 = StringValuePtr(argv[6]);
+    }
+    
+    if (!arg7) {
+      arg7 = (char *)APR_LOCALE_CHARSET;
+    }
+  }
+  res8 = SWIG_AsCharPtrAndSize(argv[7], &buf8, NULL, &alloc8);
+  if (!SWIG_IsOK(res8)) {
+    SWIG_exception_fail(SWIG_ArgError(res8), Ruby_Format_TypeError( "", "char const *","svn_diff_file_output_unified4", 8, argv[7] ));
+  }
+  arg8 = (char *)(buf8);
+  arg9 = RTEST(argv[8]);
+  ecode10 = SWIG_AsVal_int(argv[9], &val10);
+  if (!SWIG_IsOK(ecode10)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode10), Ruby_Format_TypeError( "", "int","svn_diff_file_output_unified4", 10, argv[9] ));
+  } 
+  arg10 = (int)(val10);
+  {
+    arg11 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
+    arg12 = (void *)svn_swig_rb_make_baton(argv[10], _global_svn_swig_rb_pool);
+  }
+  if (argc > 11) {
+    
+  }
+  {
+    result = (svn_error_t *)svn_diff_file_output_unified4(arg1,arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,arg9,arg10,arg11,arg12,arg13);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  {
+    svn_swig_rb_set_baton(vresult, (VALUE)arg12);
+  }
+  if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+  if (alloc4 == SWIG_NEWOBJ) free((char*)buf4);
+  if (alloc5 == SWIG_NEWOBJ) free((char*)buf5);
+  if (alloc6 == SWIG_NEWOBJ) free((char*)buf6);
+  if (alloc8 == SWIG_NEWOBJ) free((char*)buf8);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
+fail:
+  if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+  if (alloc4 == SWIG_NEWOBJ) free((char*)buf4);
+  if (alloc5 == SWIG_NEWOBJ) free((char*)buf5);
+  if (alloc6 == SWIG_NEWOBJ) free((char*)buf6);
+  if (alloc8 == SWIG_NEWOBJ) free((char*)buf8);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
 _wrap_svn_diff_file_output_unified3(int argc, VALUE *argv, VALUE self) {
   svn_stream_t *arg1 = (svn_stream_t *) 0 ;
   svn_diff_t *arg2 = (svn_diff_t *) 0 ;
@@ -36777,6 +37892,153 @@ fail:
 
 
 SWIGINTERN VALUE
+_wrap_svn_diff_file_output_merge3(int argc, VALUE *argv, VALUE self) {
+  svn_stream_t *arg1 = (svn_stream_t *) 0 ;
+  svn_diff_t *arg2 = (svn_diff_t *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  char *arg5 = (char *) 0 ;
+  char *arg6 = (char *) 0 ;
+  char *arg7 = (char *) 0 ;
+  char *arg8 = (char *) 0 ;
+  char *arg9 = (char *) 0 ;
+  svn_diff_conflict_display_style_t arg10 ;
+  svn_cancel_func_t arg11 = (svn_cancel_func_t) 0 ;
+  void *arg12 = (void *) 0 ;
+  apr_pool_t *arg13 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int res3 ;
+  char *buf3 = 0 ;
+  int alloc3 = 0 ;
+  int res4 ;
+  char *buf4 = 0 ;
+  int alloc4 = 0 ;
+  int res5 ;
+  char *buf5 = 0 ;
+  int alloc5 = 0 ;
+  int val10 ;
+  int ecode10 = 0 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg13);
+    _global_pool = arg13;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  if ((argc < 11) || (argc > 12)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 11)",argc); SWIG_fail;
+  }
+  {
+    arg1 = svn_swig_rb_make_stream(argv[0]);
+  }
+  res2 = SWIG_ConvertPtr(argv[1], &argp2,SWIGTYPE_p_svn_diff_t, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "svn_diff_t *","svn_diff_file_output_merge3", 2, argv[1] )); 
+  }
+  arg2 = (svn_diff_t *)(argp2);
+  res3 = SWIG_AsCharPtrAndSize(argv[2], &buf3, NULL, &alloc3);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "char const *","svn_diff_file_output_merge3", 3, argv[2] ));
+  }
+  arg3 = (char *)(buf3);
+  res4 = SWIG_AsCharPtrAndSize(argv[3], &buf4, NULL, &alloc4);
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), Ruby_Format_TypeError( "", "char const *","svn_diff_file_output_merge3", 4, argv[3] ));
+  }
+  arg4 = (char *)(buf4);
+  res5 = SWIG_AsCharPtrAndSize(argv[4], &buf5, NULL, &alloc5);
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), Ruby_Format_TypeError( "", "char const *","svn_diff_file_output_merge3", 5, argv[4] ));
+  }
+  arg5 = (char *)(buf5);
+  {
+    if (NIL_P(argv[5])) {
+      arg6 = NULL;
+    } else {
+      arg6 = StringValuePtr(argv[5]);
+    }
+  }
+  {
+    if (NIL_P(argv[6])) {
+      arg7 = NULL;
+    } else {
+      arg7 = StringValuePtr(argv[6]);
+    }
+  }
+  {
+    if (NIL_P(argv[7])) {
+      arg8 = NULL;
+    } else {
+      arg8 = StringValuePtr(argv[7]);
+    }
+  }
+  {
+    if (NIL_P(argv[8])) {
+      arg9 = NULL;
+    } else {
+      arg9 = StringValuePtr(argv[8]);
+    }
+  }
+  ecode10 = SWIG_AsVal_int(argv[9], &val10);
+  if (!SWIG_IsOK(ecode10)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode10), Ruby_Format_TypeError( "", "svn_diff_conflict_display_style_t","svn_diff_file_output_merge3", 10, argv[9] ));
+  } 
+  arg10 = (svn_diff_conflict_display_style_t)(val10);
+  {
+    arg11 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
+    arg12 = (void *)svn_swig_rb_make_baton(argv[10], _global_svn_swig_rb_pool);
+  }
+  if (argc > 11) {
+    
+  }
+  {
+    result = (svn_error_t *)svn_diff_file_output_merge3(arg1,arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,(char const *)arg9,arg10,arg11,arg12,arg13);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  {
+    svn_swig_rb_set_baton(vresult, (VALUE)arg12);
+  }
+  if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+  if (alloc4 == SWIG_NEWOBJ) free((char*)buf4);
+  if (alloc5 == SWIG_NEWOBJ) free((char*)buf5);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
+fail:
+  if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+  if (alloc4 == SWIG_NEWOBJ) free((char*)buf4);
+  if (alloc5 == SWIG_NEWOBJ) free((char*)buf5);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
 _wrap_svn_diff_file_output_merge2(int argc, VALUE *argv, VALUE self) {
   svn_stream_t *arg1 = (svn_stream_t *) 0 ;
   svn_diff_t *arg2 = (svn_diff_t *) 0 ;
@@ -37049,6 +38311,80 @@ fail:
 
 
 SWIGINTERN VALUE
+_wrap_svn_diff_output_binary(int argc, VALUE *argv, VALUE self) {
+  svn_stream_t *arg1 = (svn_stream_t *) 0 ;
+  svn_stream_t *arg2 = (svn_stream_t *) 0 ;
+  svn_stream_t *arg3 = (svn_stream_t *) 0 ;
+  svn_cancel_func_t arg4 = (svn_cancel_func_t) 0 ;
+  void *arg5 = (void *) 0 ;
+  apr_pool_t *arg6 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg6);
+    _global_pool = arg6;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  if ((argc < 4) || (argc > 5)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc); SWIG_fail;
+  }
+  {
+    arg1 = svn_swig_rb_make_stream(argv[0]);
+  }
+  {
+    arg2 = svn_swig_rb_make_stream(argv[1]);
+  }
+  {
+    arg3 = svn_swig_rb_make_stream(argv[2]);
+  }
+  {
+    arg4 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
+    arg5 = (void *)svn_swig_rb_make_baton(argv[3], _global_svn_swig_rb_pool);
+  }
+  if (argc > 4) {
+    
+  }
+  {
+    result = (svn_error_t *)svn_diff_output_binary(arg1,arg2,arg3,arg4,arg5,arg6);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  {
+    svn_swig_rb_set_baton(vresult, (VALUE)arg5);
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
+fail:
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
 _wrap_svn_diff_mem_string_diff(int argc, VALUE *argv, VALUE self) {
   svn_diff_t **arg1 = (svn_diff_t **) 0 ;
   svn_string_t *arg2 = (svn_string_t *) 0 ;
@@ -37349,6 +38685,164 @@ fail:
 
 
 SWIGINTERN VALUE
+_wrap_svn_diff_mem_string_output_unified3(int argc, VALUE *argv, VALUE self) {
+  svn_stream_t *arg1 = (svn_stream_t *) 0 ;
+  svn_diff_t *arg2 = (svn_diff_t *) 0 ;
+  svn_boolean_t arg3 ;
+  char *arg4 = (char *) 0 ;
+  char *arg5 = (char *) 0 ;
+  char *arg6 = (char *) 0 ;
+  char *arg7 = (char *) 0 ;
+  svn_string_t *arg8 = (svn_string_t *) 0 ;
+  svn_string_t *arg9 = (svn_string_t *) 0 ;
+  int arg10 ;
+  svn_cancel_func_t arg11 = (svn_cancel_func_t) 0 ;
+  void *arg12 = (void *) 0 ;
+  apr_pool_t *arg13 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int res4 ;
+  char *buf4 = 0 ;
+  int alloc4 = 0 ;
+  int res5 ;
+  char *buf5 = 0 ;
+  int alloc5 = 0 ;
+  int res6 ;
+  char *buf6 = 0 ;
+  int alloc6 = 0 ;
+  svn_string_t value8 ;
+  svn_string_t value9 ;
+  int val10 ;
+  int ecode10 = 0 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg13);
+    _global_pool = arg13;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  if ((argc < 11) || (argc > 12)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 11)",argc); SWIG_fail;
+  }
+  {
+    arg1 = svn_swig_rb_make_stream(argv[0]);
+  }
+  res2 = SWIG_ConvertPtr(argv[1], &argp2,SWIGTYPE_p_svn_diff_t, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "svn_diff_t *","svn_diff_mem_string_output_unified3", 2, argv[1] )); 
+  }
+  arg2 = (svn_diff_t *)(argp2);
+  arg3 = RTEST(argv[2]);
+  res4 = SWIG_AsCharPtrAndSize(argv[3], &buf4, NULL, &alloc4);
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), Ruby_Format_TypeError( "", "char const *","svn_diff_mem_string_output_unified3", 4, argv[3] ));
+  }
+  arg4 = (char *)(buf4);
+  res5 = SWIG_AsCharPtrAndSize(argv[4], &buf5, NULL, &alloc5);
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), Ruby_Format_TypeError( "", "char const *","svn_diff_mem_string_output_unified3", 5, argv[4] ));
+  }
+  arg5 = (char *)(buf5);
+  res6 = SWIG_AsCharPtrAndSize(argv[5], &buf6, NULL, &alloc6);
+  if (!SWIG_IsOK(res6)) {
+    SWIG_exception_fail(SWIG_ArgError(res6), Ruby_Format_TypeError( "", "char const *","svn_diff_mem_string_output_unified3", 6, argv[5] ));
+  }
+  arg6 = (char *)(buf6);
+  {
+    arg7 = NULL;
+    
+    if (NIL_P(argv[6])) {
+      
+    } else if (TYPE(argv[6]) == T_FIXNUM) {
+      arg7 = (char *)NUM2INT(argv[6]);
+      if (!(arg7 == APR_LOCALE_CHARSET || arg7 == APR_DEFAULT_CHARSET)) {
+        arg7 = NULL;
+      }
+    } else {
+      arg7 = StringValuePtr(argv[6]);
+    }
+    
+    if (!arg7) {
+      arg7 = (char *)APR_LOCALE_CHARSET;
+    }
+  }
+  {
+    if (NIL_P(argv[7])) {
+      arg8 = NULL;
+    } else {
+      value8.data = StringValuePtr(argv[7]);
+      value8.len = RSTRING_LEN(argv[7]);
+      arg8 = &value8;
+    }
+  }
+  {
+    if (NIL_P(argv[8])) {
+      arg9 = NULL;
+    } else {
+      value9.data = StringValuePtr(argv[8]);
+      value9.len = RSTRING_LEN(argv[8]);
+      arg9 = &value9;
+    }
+  }
+  ecode10 = SWIG_AsVal_int(argv[9], &val10);
+  if (!SWIG_IsOK(ecode10)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode10), Ruby_Format_TypeError( "", "int","svn_diff_mem_string_output_unified3", 10, argv[9] ));
+  } 
+  arg10 = (int)(val10);
+  {
+    arg11 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
+    arg12 = (void *)svn_swig_rb_make_baton(argv[10], _global_svn_swig_rb_pool);
+  }
+  if (argc > 11) {
+    
+  }
+  {
+    result = (svn_error_t *)svn_diff_mem_string_output_unified3(arg1,arg2,arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(struct svn_string_t const *)arg8,(struct svn_string_t const *)arg9,arg10,arg11,arg12,arg13);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  {
+    svn_swig_rb_set_baton(vresult, (VALUE)arg12);
+  }
+  if (alloc4 == SWIG_NEWOBJ) free((char*)buf4);
+  if (alloc5 == SWIG_NEWOBJ) free((char*)buf5);
+  if (alloc6 == SWIG_NEWOBJ) free((char*)buf6);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
+fail:
+  if (alloc4 == SWIG_NEWOBJ) free((char*)buf4);
+  if (alloc5 == SWIG_NEWOBJ) free((char*)buf5);
+  if (alloc6 == SWIG_NEWOBJ) free((char*)buf6);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
 _wrap_svn_diff_mem_string_output_unified2(int argc, VALUE *argv, VALUE self) {
   svn_stream_t *arg1 = (svn_stream_t *) 0 ;
   svn_diff_t *arg2 = (svn_diff_t *) 0 ;
@@ -37618,6 +39112,153 @@ fail:
 
 
 SWIGINTERN VALUE
+_wrap_svn_diff_mem_string_output_merge3(int argc, VALUE *argv, VALUE self) {
+  svn_stream_t *arg1 = (svn_stream_t *) 0 ;
+  svn_diff_t *arg2 = (svn_diff_t *) 0 ;
+  svn_string_t *arg3 = (svn_string_t *) 0 ;
+  svn_string_t *arg4 = (svn_string_t *) 0 ;
+  svn_string_t *arg5 = (svn_string_t *) 0 ;
+  char *arg6 = (char *) 0 ;
+  char *arg7 = (char *) 0 ;
+  char *arg8 = (char *) 0 ;
+  char *arg9 = (char *) 0 ;
+  svn_diff_conflict_display_style_t arg10 ;
+  svn_cancel_func_t arg11 = (svn_cancel_func_t) 0 ;
+  void *arg12 = (void *) 0 ;
+  apr_pool_t *arg13 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  svn_string_t value3 ;
+  svn_string_t value4 ;
+  svn_string_t value5 ;
+  int val10 ;
+  int ecode10 = 0 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg13);
+    _global_pool = arg13;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  if ((argc < 11) || (argc > 12)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 11)",argc); SWIG_fail;
+  }
+  {
+    arg1 = svn_swig_rb_make_stream(argv[0]);
+  }
+  res2 = SWIG_ConvertPtr(argv[1], &argp2,SWIGTYPE_p_svn_diff_t, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "svn_diff_t *","svn_diff_mem_string_output_merge3", 2, argv[1] )); 
+  }
+  arg2 = (svn_diff_t *)(argp2);
+  {
+    if (NIL_P(argv[2])) {
+      arg3 = NULL;
+    } else {
+      value3.data = StringValuePtr(argv[2]);
+      value3.len = RSTRING_LEN(argv[2]);
+      arg3 = &value3;
+    }
+  }
+  {
+    if (NIL_P(argv[3])) {
+      arg4 = NULL;
+    } else {
+      value4.data = StringValuePtr(argv[3]);
+      value4.len = RSTRING_LEN(argv[3]);
+      arg4 = &value4;
+    }
+  }
+  {
+    if (NIL_P(argv[4])) {
+      arg5 = NULL;
+    } else {
+      value5.data = StringValuePtr(argv[4]);
+      value5.len = RSTRING_LEN(argv[4]);
+      arg5 = &value5;
+    }
+  }
+  {
+    if (NIL_P(argv[5])) {
+      arg6 = NULL;
+    } else {
+      arg6 = StringValuePtr(argv[5]);
+    }
+  }
+  {
+    if (NIL_P(argv[6])) {
+      arg7 = NULL;
+    } else {
+      arg7 = StringValuePtr(argv[6]);
+    }
+  }
+  {
+    if (NIL_P(argv[7])) {
+      arg8 = NULL;
+    } else {
+      arg8 = StringValuePtr(argv[7]);
+    }
+  }
+  {
+    if (NIL_P(argv[8])) {
+      arg9 = NULL;
+    } else {
+      arg9 = StringValuePtr(argv[8]);
+    }
+  }
+  ecode10 = SWIG_AsVal_int(argv[9], &val10);
+  if (!SWIG_IsOK(ecode10)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode10), Ruby_Format_TypeError( "", "svn_diff_conflict_display_style_t","svn_diff_mem_string_output_merge3", 10, argv[9] ));
+  } 
+  arg10 = (svn_diff_conflict_display_style_t)(val10);
+  {
+    arg11 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
+    arg12 = (void *)svn_swig_rb_make_baton(argv[10], _global_svn_swig_rb_pool);
+  }
+  if (argc > 11) {
+    
+  }
+  {
+    result = (svn_error_t *)svn_diff_mem_string_output_merge3(arg1,arg2,(struct svn_string_t const *)arg3,(struct svn_string_t const *)arg4,(struct svn_string_t const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,(char const *)arg9,arg10,arg11,arg12,arg13);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  {
+    svn_swig_rb_set_baton(vresult, (VALUE)arg12);
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
+fail:
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
 _wrap_svn_diff_mem_string_output_merge2(int argc, VALUE *argv, VALUE self) {
   svn_stream_t *arg1 = (svn_stream_t *) 0 ;
   svn_diff_t *arg2 = (svn_diff_t *) 0 ;
@@ -39036,6 +40677,108 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_svn_patch_t_mergeinfo_set(int argc, VALUE *argv, VALUE self) {
+  struct svn_patch_t *arg1 = (struct svn_patch_t *) 0 ;
+  svn_mergeinfo_t arg2 = (svn_mergeinfo_t) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_patch_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_patch_t *","mergeinfo", 1, self )); 
+  }
+  arg1 = (struct svn_patch_t *)(argp1);
+  {
+    arg2 = svn_swig_rb_hash_to_apr_hash_merge_range(argv[0], _global_pool);
+  }
+  if (arg1) (arg1)->mergeinfo = arg2;
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_svn_patch_t_mergeinfo_get(int argc, VALUE *argv, VALUE self) {
+  struct svn_patch_t *arg1 = (struct svn_patch_t *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  svn_mergeinfo_t result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_patch_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_patch_t *","mergeinfo", 1, self )); 
+  }
+  arg1 = (struct svn_patch_t *)(argp1);
+  result = (svn_mergeinfo_t) ((arg1)->mergeinfo);
+  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_apr_hash_t, 0 |  0 );
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_svn_patch_t_reverse_mergeinfo_set(int argc, VALUE *argv, VALUE self) {
+  struct svn_patch_t *arg1 = (struct svn_patch_t *) 0 ;
+  svn_mergeinfo_t arg2 = (svn_mergeinfo_t) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_patch_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_patch_t *","reverse_mergeinfo", 1, self )); 
+  }
+  arg1 = (struct svn_patch_t *)(argp1);
+  res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_apr_hash_t, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "svn_mergeinfo_t","reverse_mergeinfo", 2, argv[0] )); 
+  }
+  arg2 = (svn_mergeinfo_t)(argp2);
+  if (arg1) (arg1)->reverse_mergeinfo = arg2;
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_svn_patch_t_reverse_mergeinfo_get(int argc, VALUE *argv, VALUE self) {
+  struct svn_patch_t *arg1 = (struct svn_patch_t *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  svn_mergeinfo_t result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_patch_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_patch_t *","reverse_mergeinfo", 1, self )); 
+  }
+  arg1 = (struct svn_patch_t *)(argp1);
+  result = (svn_mergeinfo_t) ((arg1)->reverse_mergeinfo);
+  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_apr_hash_t, 0 |  0 );
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
 SWIGINTERN VALUE
 _wrap_svn_patch_t_allocate(VALUE self) {
@@ -40332,7 +42075,7 @@ _wrap_svn_swig_rb_auth_get_simple_prompt_provider(int argc, VALUE *argv, VALUE s
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
   }
   {
-    arg2 = svn_swig_rb_auth_simple_prompt_func;
+    arg2 = (svn_auth_simple_prompt_func_t) svn_swig_rb_auth_simple_prompt_func;
     arg3 = (void *)svn_swig_rb_make_baton(argv[0], _global_svn_swig_rb_pool);
   }
   ecode4 = SWIG_AsVal_int(argv[1], &val4);
@@ -40398,7 +42141,7 @@ _wrap_svn_swig_rb_auth_get_ssl_client_cert_prompt_provider(int argc, VALUE *argv
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
   }
   {
-    arg2 = svn_swig_rb_auth_ssl_client_cert_prompt_func;
+    arg2 = (svn_auth_ssl_client_cert_prompt_func_t) svn_swig_rb_auth_ssl_client_cert_prompt_func;
     arg3 = (void *)svn_swig_rb_make_baton(argv[0], _global_svn_swig_rb_pool);
   }
   ecode4 = SWIG_AsVal_int(argv[1], &val4);
@@ -40464,7 +42207,7 @@ _wrap_svn_swig_rb_auth_get_ssl_client_cert_pw_prompt_provider(int argc, VALUE *a
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
   }
   {
-    arg2 = svn_swig_rb_auth_ssl_client_cert_pw_prompt_func;
+    arg2 = (svn_auth_ssl_client_cert_pw_prompt_func_t) svn_swig_rb_auth_ssl_client_cert_pw_prompt_func;
     arg3 = (void *)svn_swig_rb_make_baton(argv[0], _global_svn_swig_rb_pool);
   }
   ecode4 = SWIG_AsVal_int(argv[1], &val4);
@@ -40527,7 +42270,7 @@ _wrap_svn_swig_rb_auth_get_ssl_server_trust_prompt_provider(int argc, VALUE *arg
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
   }
   {
-    arg2 = svn_swig_rb_auth_ssl_server_trust_prompt_func;
+    arg2 = (svn_auth_ssl_server_trust_prompt_func_t) svn_swig_rb_auth_ssl_server_trust_prompt_func;
     arg3 = (void *)svn_swig_rb_make_baton(argv[0], _global_svn_swig_rb_pool);
   }
   if (argc > 1) {
@@ -40588,7 +42331,7 @@ _wrap_svn_swig_rb_auth_get_username_prompt_provider(int argc, VALUE *argv, VALUE
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
   }
   {
-    arg2 = svn_swig_rb_auth_username_prompt_func;
+    arg2 = (svn_auth_username_prompt_func_t) svn_swig_rb_auth_username_prompt_func;
     arg3 = (void *)svn_swig_rb_make_baton(argv[0], _global_svn_swig_rb_pool);
   }
   ecode4 = SWIG_AsVal_int(argv[1], &val4);
@@ -40896,7 +42639,6 @@ static swig_type_info _swigt__p_apr_file_t = {"_p_apr_file_t", "apr_file_t *", 0
 static swig_type_info _swigt__p_apr_finfo_t = {"_p_apr_finfo_t", "apr_finfo_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_apr_getopt_option_t = {"_p_apr_getopt_option_t", "apr_getopt_option_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_apr_getopt_t = {"_p_apr_getopt_t", "apr_getopt_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_apr_hash_index_t = {"_p_apr_hash_index_t", "apr_hash_index_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_apr_hash_t = {"_p_apr_hash_t", "svn_mergeinfo_catalog_t|svn_mergeinfo_t|apr_hash_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_apr_int32_t = {"_p_apr_int32_t", "apr_int32_t *|time_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_apr_int64_t = {"_p_apr_int64_t", "apr_int64_t *|svn_filesize_t *|apr_time_t *", 0, 0, (void*)0, 0};
@@ -40923,6 +42665,7 @@ static swig_type_info _swigt__p_f_p_q_const__char_p_q_const__char_p_void__int =
 static swig_type_info _swigt__p_f_p_q_const__char_p_q_const__char_p_void_p_apr_pool_t__int = {"_p_f_p_q_const__char_p_q_const__char_p_void_p_apr_pool_t__int", "svn_config_enumerator2_t|int (*)(char const *,char const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_q_const__char_p_void__int = {"_p_f_p_q_const__char_p_void__int", "svn_config_section_enumerator_t|int (*)(char const *,void *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_q_const__char_p_void_p_apr_pool_t__int = {"_p_f_p_q_const__char_p_void_p_apr_pool_t__int", "int (*)(char const *,void *,apr_pool_t *)|svn_config_section_enumerator2_t", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_f_p_q_const__struct_svn_version_t_p_q_const__struct_svn_version_t__int = {"_p_f_p_q_const__struct_svn_version_t_p_q_const__struct_svn_version_t__int", "svn_boolean_t (*)(svn_version_t const *,svn_version_t const *)|int (*)(struct svn_version_t const *,struct svn_version_t const *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_commit_callback2_t|struct svn_error_t *(*)(svn_commit_info_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_boolean_t *,char const *,void *,apr_pool_t *)|svn_auth_plaintext_prompt_func_t|svn_auth_plaintext_passphrase_prompt_func_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_svn_boolean_t_p_void_p_q_const__char_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_boolean_t_p_void_p_q_const__char_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_boolean_t *,void *,char const *,char const *,apr_hash_t *,apr_pool_t *)|svn_config_auth_walk_func_t", 0, 0, (void*)0, 0};
@@ -40940,6 +42683,7 @@ static swig_type_info _swigt__p_f_p_void_p_p_svn_stream_mark_t_p_apr_pool_t__p_s
 static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,apr_size_t *)|svn_write_fn_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,apr_finfo_t const *,apr_pool_t *)|svn_io_walk_func_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t = {"_p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t", "svn_stream_seek_fn_t|struct svn_error_t *(*)(void *,svn_stream_mark_t const *)", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_f_p_void_p_svn_boolean_t__p_svn_error_t = {"_p_f_p_void_p_svn_boolean_t__p_svn_error_t", "svn_stream_data_available_fn_t|struct svn_error_t *(*)(void *,svn_boolean_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_log_entry_t *,apr_pool_t *)|svn_log_entry_receiver_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_void__void = {"_p_f_p_void_p_void__void", "void (*)(void *,void *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_void_p_void_p_int__p_svn_error_t = {"_p_f_p_void_p_void_p_void_p_int__p_svn_error_t", "svn_error_t *(*)(void *,void *,void *,int *)|struct svn_error_t *(*)(void *,void *,void *,int *)", 0, 0, (void*)0, 0};
@@ -41046,7 +42790,6 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_apr_finfo_t,
   &_swigt__p_apr_getopt_option_t,
   &_swigt__p_apr_getopt_t,
-  &_swigt__p_apr_hash_index_t,
   &_swigt__p_apr_hash_t,
   &_swigt__p_apr_int32_t,
   &_swigt__p_apr_int64_t,
@@ -41073,6 +42816,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_f_p_q_const__char_p_q_const__char_p_void_p_apr_pool_t__int,
   &_swigt__p_f_p_q_const__char_p_void__int,
   &_swigt__p_f_p_q_const__char_p_void_p_apr_pool_t__int,
+  &_swigt__p_f_p_q_const__struct_svn_version_t_p_q_const__struct_svn_version_t__int,
   &_swigt__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_svn_boolean_t_p_void_p_q_const__char_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t,
@@ -41090,6 +42834,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t,
+  &_swigt__p_f_p_void_p_svn_boolean_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_void__void,
   &_swigt__p_f_p_void_p_void_p_void_p_int__p_svn_error_t,
@@ -41196,7 +42941,6 @@ static swig_cast_info _swigc__p_apr_file_t[] = {  {&_swigt__p_apr_file_t, 0, 0,
 static swig_cast_info _swigc__p_apr_finfo_t[] = {  {&_swigt__p_apr_finfo_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_apr_getopt_option_t[] = {  {&_swigt__p_apr_getopt_option_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_apr_getopt_t[] = {  {&_swigt__p_apr_getopt_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_apr_hash_index_t[] = {  {&_swigt__p_apr_hash_index_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_apr_hash_t[] = {  {&_swigt__p_apr_hash_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_apr_int32_t[] = {  {&_swigt__p_apr_int32_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_apr_int64_t[] = {  {&_swigt__p_apr_int64_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -41223,6 +42967,7 @@ static swig_cast_info _swigc__p_f_p_q_const__char_p_q_const__char_p_void__int[]
 static swig_cast_info _swigc__p_f_p_q_const__char_p_q_const__char_p_void_p_apr_pool_t__int[] = {  {&_swigt__p_f_p_q_const__char_p_q_const__char_p_void_p_apr_pool_t__int, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_q_const__char_p_void__int[] = {  {&_swigt__p_f_p_q_const__char_p_void__int, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_q_const__char_p_void_p_apr_pool_t__int[] = {  {&_swigt__p_f_p_q_const__char_p_void_p_apr_pool_t__int, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_f_p_q_const__struct_svn_version_t_p_q_const__struct_svn_version_t__int[] = {  {&_swigt__p_f_p_q_const__struct_svn_version_t_p_q_const__struct_svn_version_t__int, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_svn_boolean_t_p_void_p_q_const__char_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_svn_boolean_t_p_void_p_q_const__char_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -41240,6 +42985,7 @@ static swig_cast_info _swigc__p_f_p_void_p_p_svn_stream_mark_t_p_apr_pool_t__p_s
 static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_f_p_void_p_svn_boolean_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_svn_boolean_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_void__void[] = {  {&_swigt__p_f_p_void_p_void__void, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_void_p_void_p_int__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_void_p_void_p_int__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -41346,7 +43092,6 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_apr_finfo_t,
   _swigc__p_apr_getopt_option_t,
   _swigc__p_apr_getopt_t,
-  _swigc__p_apr_hash_index_t,
   _swigc__p_apr_hash_t,
   _swigc__p_apr_int32_t,
   _swigc__p_apr_int64_t,
@@ -41373,6 +43118,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_f_p_q_const__char_p_q_const__char_p_void_p_apr_pool_t__int,
   _swigc__p_f_p_q_const__char_p_void__int,
   _swigc__p_f_p_q_const__char_p_void_p_apr_pool_t__int,
+  _swigc__p_f_p_q_const__struct_svn_version_t_p_q_const__struct_svn_version_t__int,
   _swigc__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_svn_boolean_t_p_void_p_q_const__char_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t,
@@ -41390,6 +43136,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t,
   _swigc__p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t,
+  _swigc__p_f_p_void_p_svn_boolean_t__p_svn_error_t,
   _swigc__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_p_void__void,
   _swigc__p_f_p_void_p_void_p_void_p_int__p_svn_error_t,
@@ -41493,18 +43240,18 @@ static swig_cast_info *swig_cast_initial[] = {
 
 /* -----------------------------------------------------------------------------
  * Type initialization:
- * This problem is tough by the requirement that no dynamic 
- * memory is used. Also, since swig_type_info structures store pointers to 
+ * This problem is tough by the requirement that no dynamic
+ * memory is used. Also, since swig_type_info structures store pointers to
  * swig_cast_info structures and swig_cast_info structures store pointers back
- * to swig_type_info structures, we need some lookup code at initialization. 
- * The idea is that swig generates all the structures that are needed. 
- * The runtime then collects these partially filled structures. 
- * The SWIG_InitializeModule function takes these initial arrays out of 
+ * to swig_type_info structures, we need some lookup code at initialization.
+ * The idea is that swig generates all the structures that are needed.
+ * The runtime then collects these partially filled structures.
+ * The SWIG_InitializeModule function takes these initial arrays out of
  * swig_module, and does all the lookup, filling in the swig_module.types
  * array with the correct data and linking the correct swig_cast_info
  * structures together.
  *
- * The generated swig_type_info structures are assigned staticly to an initial 
+ * The generated swig_type_info structures are assigned staticly to an initial
  * array. We just loop through that array, and handle each type individually.
  * First we lookup if this type has been already loaded, and if so, use the
  * loaded structure instead of the generated one. Then we have to fill in the
@@ -41514,17 +43261,17 @@ static swig_cast_info *swig_cast_initial[] = {
  * a column is one of the swig_cast_info structures for that type.
  * The cast_initial array is actually an array of arrays, because each row has
  * a variable number of columns. So to actually build the cast linked list,
- * we find the array of casts associated with the type, and loop through it 
+ * we find the array of casts associated with the type, and loop through it
  * adding the casts to the list. The one last trick we need to do is making
  * sure the type pointer in the swig_cast_info struct is correct.
  *
- * First off, we lookup the cast->type name to see if it is already loaded. 
+ * First off, we lookup the cast->type name to see if it is already loaded.
  * There are three cases to handle:
  *  1) If the cast->type has already been loaded AND the type we are adding
  *     casting info to has not been loaded (it is in this module), THEN we
  *     replace the cast->type pointer with the type pointer that has already
  *     been loaded.
- *  2) If BOTH types (the one we are adding casting info to, and the 
+ *  2) If BOTH types (the one we are adding casting info to, and the
  *     cast->type) are loaded, THEN the cast info has already been loaded by
  *     the previous module so we just ignore it.
  *  3) Finally, if cast->type has not already been loaded, then we add that
@@ -41587,7 +43334,7 @@ SWIG_InitializeModule(void *clientdata) {
     module_head->next = &swig_module;
   }
 
-  /* When multiple interpeters are used, a module could have already been initialized in
+  /* When multiple interpreters are used, a module could have already been initialized in
      a different interpreter, but not yet have a pointer in this interpreter.
      In this case, we do not want to continue adding types... everything should be
      set up already */
@@ -41601,7 +43348,7 @@ SWIG_InitializeModule(void *clientdata) {
     swig_type_info *type = 0;
     swig_type_info *ret;
     swig_cast_info *cast;
-  
+
 #ifdef SWIGRUNTIME_DEBUG
     printf("SWIG_InitializeModule: type %d %s\n", i, swig_module.type_initial[i]->name);
 #endif
@@ -41628,7 +43375,7 @@ SWIG_InitializeModule(void *clientdata) {
     /* Insert casting types */
     cast = swig_module.cast_initial[i];
     while (cast->type) {
-    
+
       /* Don't need to add information already in the list */
       ret = 0;
 #ifdef SWIGRUNTIME_DEBUG
@@ -41773,11 +43520,13 @@ SWIGEXPORT void Init_core(void) {
   rb_define_const(mCore, "SVN_ERR_BAD_TOKEN", SWIG_From_int((int)(SVN_ERR_BAD_TOKEN)));
   rb_define_const(mCore, "SVN_ERR_BAD_CHANGELIST_NAME", SWIG_From_int((int)(SVN_ERR_BAD_CHANGELIST_NAME)));
   rb_define_const(mCore, "SVN_ERR_BAD_ATOMIC", SWIG_From_int((int)(SVN_ERR_BAD_ATOMIC)));
+  rb_define_const(mCore, "SVN_ERR_BAD_COMPRESSION_METHOD", SWIG_From_int((int)(SVN_ERR_BAD_COMPRESSION_METHOD)));
   rb_define_const(mCore, "SVN_ERR_XML_ATTRIB_NOT_FOUND", SWIG_From_int((int)(SVN_ERR_XML_ATTRIB_NOT_FOUND)));
   rb_define_const(mCore, "SVN_ERR_XML_MISSING_ANCESTRY", SWIG_From_int((int)(SVN_ERR_XML_MISSING_ANCESTRY)));
   rb_define_const(mCore, "SVN_ERR_XML_UNKNOWN_ENCODING", SWIG_From_int((int)(SVN_ERR_XML_UNKNOWN_ENCODING)));
   rb_define_const(mCore, "SVN_ERR_XML_MALFORMED", SWIG_From_int((int)(SVN_ERR_XML_MALFORMED)));
   rb_define_const(mCore, "SVN_ERR_XML_UNESCAPABLE_DATA", SWIG_From_int((int)(SVN_ERR_XML_UNESCAPABLE_DATA)));
+  rb_define_const(mCore, "SVN_ERR_XML_UNEXPECTED_ELEMENT", SWIG_From_int((int)(SVN_ERR_XML_UNEXPECTED_ELEMENT)));
   rb_define_const(mCore, "SVN_ERR_IO_INCONSISTENT_EOL", SWIG_From_int((int)(SVN_ERR_IO_INCONSISTENT_EOL)));
   rb_define_const(mCore, "SVN_ERR_IO_UNKNOWN_EOL", SWIG_From_int((int)(SVN_ERR_IO_UNKNOWN_EOL)));
   rb_define_const(mCore, "SVN_ERR_IO_CORRUPT_EOL", SWIG_From_int((int)(SVN_ERR_IO_CORRUPT_EOL)));
@@ -41790,6 +43539,7 @@ SWIGEXPORT void Init_core(void) {
   rb_define_const(mCore, "SVN_ERR_STREAM_MALFORMED_DATA", SWIG_From_int((int)(SVN_ERR_STREAM_MALFORMED_DATA)));
   rb_define_const(mCore, "SVN_ERR_STREAM_UNRECOGNIZED_DATA", SWIG_From_int((int)(SVN_ERR_STREAM_UNRECOGNIZED_DATA)));
   rb_define_const(mCore, "SVN_ERR_STREAM_SEEK_NOT_SUPPORTED", SWIG_From_int((int)(SVN_ERR_STREAM_SEEK_NOT_SUPPORTED)));
+  rb_define_const(mCore, "SVN_ERR_STREAM_NOT_SUPPORTED", SWIG_From_int((int)(SVN_ERR_STREAM_NOT_SUPPORTED)));
   rb_define_const(mCore, "SVN_ERR_NODE_UNKNOWN_KIND", SWIG_From_int((int)(SVN_ERR_NODE_UNKNOWN_KIND)));
   rb_define_const(mCore, "SVN_ERR_NODE_UNEXPECTED_KIND", SWIG_From_int((int)(SVN_ERR_NODE_UNEXPECTED_KIND)));
   rb_define_const(mCore, "SVN_ERR_ENTRY_NOT_FOUND", SWIG_From_int((int)(SVN_ERR_ENTRY_NOT_FOUND)));
@@ -41894,6 +43644,17 @@ SWIGEXPORT void Init_core(void) {
   rb_define_const(mCore, "SVN_ERR_FS_INCORRECT_EDITOR_COMPLETION", SWIG_From_int((int)(SVN_ERR_FS_INCORRECT_EDITOR_COMPLETION)));
   rb_define_const(mCore, "SVN_ERR_FS_PACKED_REVPROP_READ_FAILURE", SWIG_From_int((int)(SVN_ERR_FS_PACKED_REVPROP_READ_FAILURE)));
   rb_define_const(mCore, "SVN_ERR_FS_REVPROP_CACHE_INIT_FAILURE", SWIG_From_int((int)(SVN_ERR_FS_REVPROP_CACHE_INIT_FAILURE)));
+  rb_define_const(mCore, "SVN_ERR_FS_MALFORMED_TXN_ID", SWIG_From_int((int)(SVN_ERR_FS_MALFORMED_TXN_ID)));
+  rb_define_const(mCore, "SVN_ERR_FS_INDEX_CORRUPTION", SWIG_From_int((int)(SVN_ERR_FS_INDEX_CORRUPTION)));
+  rb_define_const(mCore, "SVN_ERR_FS_INDEX_REVISION", SWIG_From_int((int)(SVN_ERR_FS_INDEX_REVISION)));
+  rb_define_const(mCore, "SVN_ERR_FS_INDEX_OVERFLOW", SWIG_From_int((int)(SVN_ERR_FS_INDEX_OVERFLOW)));
+  rb_define_const(mCore, "SVN_ERR_FS_CONTAINER_INDEX", SWIG_From_int((int)(SVN_ERR_FS_CONTAINER_INDEX)));
+  rb_define_const(mCore, "SVN_ERR_FS_INDEX_INCONSISTENT", SWIG_From_int((int)(SVN_ERR_FS_INDEX_INCONSISTENT)));
+  rb_define_const(mCore, "SVN_ERR_FS_LOCK_OPERATION_FAILED", SWIG_From_int((int)(SVN_ERR_FS_LOCK_OPERATION_FAILED)));
+  rb_define_const(mCore, "SVN_ERR_FS_UNSUPPORTED_TYPE", SWIG_From_int((int)(SVN_ERR_FS_UNSUPPORTED_TYPE)));
+  rb_define_const(mCore, "SVN_ERR_FS_CONTAINER_SIZE", SWIG_From_int((int)(SVN_ERR_FS_CONTAINER_SIZE)));
+  rb_define_const(mCore, "SVN_ERR_FS_MALFORMED_NODEREV_ID", SWIG_From_int((int)(SVN_ERR_FS_MALFORMED_NODEREV_ID)));
+  rb_define_const(mCore, "SVN_ERR_FS_INVALID_GENERATION", SWIG_From_int((int)(SVN_ERR_FS_INVALID_GENERATION)));
   rb_define_const(mCore, "SVN_ERR_REPOS_LOCKED", SWIG_From_int((int)(SVN_ERR_REPOS_LOCKED)));
   rb_define_const(mCore, "SVN_ERR_REPOS_HOOK_FAILURE", SWIG_From_int((int)(SVN_ERR_REPOS_HOOK_FAILURE)));
   rb_define_const(mCore, "SVN_ERR_REPOS_BAD_ARGS", SWIG_From_int((int)(SVN_ERR_REPOS_BAD_ARGS)));
@@ -41918,6 +43679,7 @@ SWIGEXPORT void Init_core(void) {
   rb_define_const(mCore, "SVN_ERR_RA_REPOS_ROOT_URL_MISMATCH", SWIG_From_int((int)(SVN_ERR_RA_REPOS_ROOT_URL_MISMATCH)));
   rb_define_const(mCore, "SVN_ERR_RA_SESSION_URL_MISMATCH", SWIG_From_int((int)(SVN_ERR_RA_SESSION_URL_MISMATCH)));
   rb_define_const(mCore, "SVN_ERR_RA_CANNOT_CREATE_TUNNEL", SWIG_From_int((int)(SVN_ERR_RA_CANNOT_CREATE_TUNNEL)));
+  rb_define_const(mCore, "SVN_ERR_RA_CANNOT_CREATE_SESSION", SWIG_From_int((int)(SVN_ERR_RA_CANNOT_CREATE_SESSION)));
   rb_define_const(mCore, "SVN_ERR_RA_DAV_SOCK_INIT", SWIG_From_int((int)(SVN_ERR_RA_DAV_SOCK_INIT)));
   rb_define_const(mCore, "SVN_ERR_RA_DAV_CREATING_REQUEST", SWIG_From_int((int)(SVN_ERR_RA_DAV_CREATING_REQUEST)));
   rb_define_const(mCore, "SVN_ERR_RA_DAV_REQUEST_FAILED", SWIG_From_int((int)(SVN_ERR_RA_DAV_REQUEST_FAILED)));
@@ -41932,6 +43694,8 @@ SWIGEXPORT void Init_core(void) {
   rb_define_const(mCore, "SVN_ERR_RA_DAV_RELOCATED", SWIG_From_int((int)(SVN_ERR_RA_DAV_RELOCATED)));
   rb_define_const(mCore, "SVN_ERR_RA_DAV_CONN_TIMEOUT", SWIG_From_int((int)(SVN_ERR_RA_DAV_CONN_TIMEOUT)));
   rb_define_const(mCore, "SVN_ERR_RA_DAV_FORBIDDEN", SWIG_From_int((int)(SVN_ERR_RA_DAV_FORBIDDEN)));
+  rb_define_const(mCore, "SVN_ERR_RA_DAV_PRECONDITION_FAILED", SWIG_From_int((int)(SVN_ERR_RA_DAV_PRECONDITION_FAILED)));
+  rb_define_const(mCore, "SVN_ERR_RA_DAV_METHOD_NOT_ALLOWED", SWIG_From_int((int)(SVN_ERR_RA_DAV_METHOD_NOT_ALLOWED)));
   rb_define_const(mCore, "SVN_ERR_RA_LOCAL_REPOS_NOT_FOUND", SWIG_From_int((int)(SVN_ERR_RA_LOCAL_REPOS_NOT_FOUND)));
   rb_define_const(mCore, "SVN_ERR_RA_LOCAL_REPOS_OPEN_FAILED", SWIG_From_int((int)(SVN_ERR_RA_LOCAL_REPOS_OPEN_FAILED)));
   rb_define_const(mCore, "SVN_ERR_SVNDIFF_INVALID_HEADER", SWIG_From_int((int)(SVN_ERR_SVNDIFF_INVALID_HEADER)));
@@ -42008,6 +43772,11 @@ SWIGEXPORT void Init_core(void) {
   rb_define_const(mCore, "SVN_ERR_TOO_MANY_MEMCACHED_SERVERS", SWIG_From_int((int)(SVN_ERR_TOO_MANY_MEMCACHED_SERVERS)));
   rb_define_const(mCore, "SVN_ERR_MALFORMED_VERSION_STRING", SWIG_From_int((int)(SVN_ERR_MALFORMED_VERSION_STRING)));
   rb_define_const(mCore, "SVN_ERR_CORRUPTED_ATOMIC_STORAGE", SWIG_From_int((int)(SVN_ERR_CORRUPTED_ATOMIC_STORAGE)));
+  rb_define_const(mCore, "SVN_ERR_UTF8PROC_ERROR", SWIG_From_int((int)(SVN_ERR_UTF8PROC_ERROR)));
+  rb_define_const(mCore, "SVN_ERR_UTF8_GLOB", SWIG_From_int((int)(SVN_ERR_UTF8_GLOB)));
+  rb_define_const(mCore, "SVN_ERR_CORRUPT_PACKED_DATA", SWIG_From_int((int)(SVN_ERR_CORRUPT_PACKED_DATA)));
+  rb_define_const(mCore, "SVN_ERR_COMPOSED_ERROR", SWIG_From_int((int)(SVN_ERR_COMPOSED_ERROR)));
+  rb_define_const(mCore, "SVN_ERR_INVALID_INPUT", SWIG_From_int((int)(SVN_ERR_INVALID_INPUT)));
   rb_define_const(mCore, "SVN_ERR_CL_ARG_PARSING_ERROR", SWIG_From_int((int)(SVN_ERR_CL_ARG_PARSING_ERROR)));
   rb_define_const(mCore, "SVN_ERR_CL_INSUFFICIENT_ARGS", SWIG_From_int((int)(SVN_ERR_CL_INSUFFICIENT_ARGS)));
   rb_define_const(mCore, "SVN_ERR_CL_MUTUALLY_EXCLUSIVE_ARGS", SWIG_From_int((int)(SVN_ERR_CL_MUTUALLY_EXCLUSIVE_ARGS)));
@@ -42020,6 +43789,7 @@ SWIGEXPORT void Init_core(void) {
   rb_define_const(mCore, "SVN_ERR_CL_UNNECESSARY_LOG_MESSAGE", SWIG_From_int((int)(SVN_ERR_CL_UNNECESSARY_LOG_MESSAGE)));
   rb_define_const(mCore, "SVN_ERR_CL_NO_EXTERNAL_MERGE_TOOL", SWIG_From_int((int)(SVN_ERR_CL_NO_EXTERNAL_MERGE_TOOL)));
   rb_define_const(mCore, "SVN_ERR_CL_ERROR_PROCESSING_EXTERNALS", SWIG_From_int((int)(SVN_ERR_CL_ERROR_PROCESSING_EXTERNALS)));
+  rb_define_const(mCore, "SVN_ERR_CL_REPOS_VERIFY_FAILED", SWIG_From_int((int)(SVN_ERR_CL_REPOS_VERIFY_FAILED)));
   rb_define_const(mCore, "SVN_ERR_RA_SVN_CMD_ERR", SWIG_From_int((int)(SVN_ERR_RA_SVN_CMD_ERR)));
   rb_define_const(mCore, "SVN_ERR_RA_SVN_UNKNOWN_CMD", SWIG_From_int((int)(SVN_ERR_RA_SVN_UNKNOWN_CMD)));
   rb_define_const(mCore, "SVN_ERR_RA_SVN_CONNECTION_CLOSED", SWIG_From_int((int)(SVN_ERR_RA_SVN_CONNECTION_CLOSED)));
@@ -42046,6 +43816,26 @@ SWIGEXPORT void Init_core(void) {
   rb_define_const(mCore, "SVN_ERR_RA_SERF_WRAPPED_ERROR", SWIG_From_int((int)(SVN_ERR_RA_SERF_WRAPPED_ERROR)));
   rb_define_const(mCore, "SVN_ERR_ASSERTION_FAIL", SWIG_From_int((int)(SVN_ERR_ASSERTION_FAIL)));
   rb_define_const(mCore, "SVN_ERR_ASSERTION_ONLY_TRACING_LINKS", SWIG_From_int((int)(SVN_ERR_ASSERTION_ONLY_TRACING_LINKS)));
+  rb_define_const(mCore, "SVN_ERR_ASN1_OUT_OF_DATA", SWIG_From_int((int)(SVN_ERR_ASN1_OUT_OF_DATA)));
+  rb_define_const(mCore, "SVN_ERR_ASN1_UNEXPECTED_TAG", SWIG_From_int((int)(SVN_ERR_ASN1_UNEXPECTED_TAG)));
+  rb_define_const(mCore, "SVN_ERR_ASN1_INVALID_LENGTH", SWIG_From_int((int)(SVN_ERR_ASN1_INVALID_LENGTH)));
+  rb_define_const(mCore, "SVN_ERR_ASN1_LENGTH_MISMATCH", SWIG_From_int((int)(SVN_ERR_ASN1_LENGTH_MISMATCH)));
+  rb_define_const(mCore, "SVN_ERR_ASN1_INVALID_DATA", SWIG_From_int((int)(SVN_ERR_ASN1_INVALID_DATA)));
+  rb_define_const(mCore, "SVN_ERR_X509_FEATURE_UNAVAILABLE", SWIG_From_int((int)(SVN_ERR_X509_FEATURE_UNAVAILABLE)));
+  rb_define_const(mCore, "SVN_ERR_X509_CERT_INVALID_PEM", SWIG_From_int((int)(SVN_ERR_X509_CERT_INVALID_PEM)));
+  rb_define_const(mCore, "SVN_ERR_X509_CERT_INVALID_FORMAT", SWIG_From_int((int)(SVN_ERR_X509_CERT_INVALID_FORMAT)));
+  rb_define_const(mCore, "SVN_ERR_X509_CERT_INVALID_VERSION", SWIG_From_int((int)(SVN_ERR_X509_CERT_INVALID_VERSION)));
+  rb_define_const(mCore, "SVN_ERR_X509_CERT_INVALID_SERIAL", SWIG_From_int((int)(SVN_ERR_X509_CERT_INVALID_SERIAL)));
+  rb_define_const(mCore, "SVN_ERR_X509_CERT_INVALID_ALG", SWIG_From_int((int)(SVN_ERR_X509_CERT_INVALID_ALG)));
+  rb_define_const(mCore, "SVN_ERR_X509_CERT_INVALID_NAME", SWIG_From_int((int)(SVN_ERR_X509_CERT_INVALID_NAME)));
+  rb_define_const(mCore, "SVN_ERR_X509_CERT_INVALID_DATE", SWIG_From_int((int)(SVN_ERR_X509_CERT_INVALID_DATE)));
+  rb_define_const(mCore, "SVN_ERR_X509_CERT_INVALID_PUBKEY", SWIG_From_int((int)(SVN_ERR_X509_CERT_INVALID_PUBKEY)));
+  rb_define_const(mCore, "SVN_ERR_X509_CERT_INVALID_SIGNATURE", SWIG_From_int((int)(SVN_ERR_X509_CERT_INVALID_SIGNATURE)));
+  rb_define_const(mCore, "SVN_ERR_X509_CERT_INVALID_EXTENSIONS", SWIG_From_int((int)(SVN_ERR_X509_CERT_INVALID_EXTENSIONS)));
+  rb_define_const(mCore, "SVN_ERR_X509_CERT_UNKNOWN_VERSION", SWIG_From_int((int)(SVN_ERR_X509_CERT_UNKNOWN_VERSION)));
+  rb_define_const(mCore, "SVN_ERR_X509_CERT_UNKNOWN_PK_ALG", SWIG_From_int((int)(SVN_ERR_X509_CERT_UNKNOWN_PK_ALG)));
+  rb_define_const(mCore, "SVN_ERR_X509_CERT_SIG_MISMATCH", SWIG_From_int((int)(SVN_ERR_X509_CERT_SIG_MISMATCH)));
+  rb_define_const(mCore, "SVN_ERR_X509_CERT_VERIFY_FAILED", SWIG_From_int((int)(SVN_ERR_X509_CERT_VERIFY_FAILED)));
   rb_define_const(mCore, "SVN_ERR_LAST", SWIG_From_int((int)(SVN_ERR_LAST)));
   rb_define_module_function(mCore, "svn_time_to_cstring", _wrap_svn_time_to_cstring, -1);
   rb_define_module_function(mCore, "svn_time_from_cstring", _wrap_svn_time_from_cstring, -1);
@@ -42073,9 +43863,6 @@ SWIGEXPORT void Init_core(void) {
   SwigClassSvn_error_t.mark = 0;
   SwigClassSvn_error_t.destroy = (void (*)(void *)) free_svn_error_t;
   SwigClassSvn_error_t.trackObjects = 0;
-  rb_define_module_function(mCore, "svn__apr_hash_index_key", _wrap_svn__apr_hash_index_key, -1);
-  rb_define_module_function(mCore, "svn__apr_hash_index_klen", _wrap_svn__apr_hash_index_klen, -1);
-  rb_define_module_function(mCore, "svn__apr_hash_index_val", _wrap_svn__apr_hash_index_val, -1);
   rb_define_const(mCore, "Svn_node_none", SWIG_From_int((int)(svn_node_none)));
   rb_define_const(mCore, "Svn_node_file", SWIG_From_int((int)(svn_node_file)));
   rb_define_const(mCore, "Svn_node_dir", SWIG_From_int((int)(svn_node_dir)));
@@ -42289,16 +44076,16 @@ SWIGEXPORT void Init_core(void) {
   rb_define_module_function(mCore, "svn_pool_create", _wrap_svn_pool_create, -1);
   rb_define_module_function(mCore, "svn_pool_create_allocator", _wrap_svn_pool_create_allocator, -1);
   rb_define_const(mCore, "SVN_VER_MAJOR", SWIG_From_int((int)(1)));
-  rb_define_const(mCore, "SVN_VER_MINOR", SWIG_From_int((int)(8)));
-  rb_define_const(mCore, "SVN_VER_PATCH", SWIG_From_int((int)(13)));
-  rb_define_const(mCore, "SVN_VER_MICRO", SWIG_From_int((int)(13)));
+  rb_define_const(mCore, "SVN_VER_MINOR", SWIG_From_int((int)(9)));
+  rb_define_const(mCore, "SVN_VER_PATCH", SWIG_From_int((int)(7)));
+  rb_define_const(mCore, "SVN_VER_MICRO", SWIG_From_int((int)(7)));
   rb_define_const(mCore, "SVN_VER_LIBRARY", SWIG_From_int((int)(1)));
-  rb_define_const(mCore, "SVN_VER_TAG", SWIG_FromCharPtr(" (r1667537)"));
+  rb_define_const(mCore, "SVN_VER_TAG", SWIG_FromCharPtr(" (r1800392)"));
   rb_define_const(mCore, "SVN_VER_NUMTAG", SWIG_FromCharPtr(""));
-  rb_define_const(mCore, "SVN_VER_REVISION", SWIG_From_int((int)(1667537)));
-  rb_define_const(mCore, "SVN_VER_NUM", SWIG_FromCharPtr("1.8.13"));
-  rb_define_const(mCore, "SVN_VER_NUMBER", SWIG_FromCharPtr("1.8.13"));
-  rb_define_const(mCore, "SVN_VERSION", SWIG_FromCharPtr("1.8.13 (r1667537)"));
+  rb_define_const(mCore, "SVN_VER_REVISION", SWIG_From_int((int)(1800392)));
+  rb_define_const(mCore, "SVN_VER_NUM", SWIG_FromCharPtr("1.9.7"));
+  rb_define_const(mCore, "SVN_VER_NUMBER", SWIG_FromCharPtr("1.9.7"));
+  rb_define_const(mCore, "SVN_VERSION", SWIG_FromCharPtr("1.9.7 (r1800392)"));
   
   SwigClassSvn_version_t.klass = rb_define_class_under(mCore, "Svn_version_t", rb_cObject);
   SWIG_TypeClientData(SWIGTYPE_p_svn_version_t, (void *) &SwigClassSvn_version_t);
@@ -42329,6 +44116,7 @@ SWIGEXPORT void Init_core(void) {
   SwigClassSvn_version_checklist_t.mark = 0;
   SwigClassSvn_version_checklist_t.destroy = (void (*)(void *)) free_svn_version_checklist_t;
   SwigClassSvn_version_checklist_t.trackObjects = 0;
+  rb_define_module_function(mCore, "svn_ver_check_list2", _wrap_svn_ver_check_list2, -1);
   rb_define_module_function(mCore, "svn_ver_check_list", _wrap_svn_ver_check_list, -1);
   rb_define_module_function(mCore, "svn_subr_version", _wrap_svn_subr_version, -1);
   rb_define_module_function(mCore, "svn_version_extended", _wrap_svn_version_extended, -1);
@@ -42564,6 +44352,7 @@ SWIGEXPORT void Init_core(void) {
   rb_define_module_function(mCore, "svn_opt_print_help2", _wrap_svn_opt_print_help2, -1);
   rb_define_module_function(mCore, "svn_opt_print_help", _wrap_svn_opt_print_help, -1);
   rb_define_module_function(mCore, "svn_cmdline_init", _wrap_svn_cmdline_init, -1);
+  rb_define_module_function(mCore, "svn_cmdline_create_auth_baton2", _wrap_svn_cmdline_create_auth_baton2, -1);
   rb_define_module_function(mCore, "svn_cmdline_create_auth_baton", _wrap_svn_cmdline_create_auth_baton, -1);
   
   SwigClassSvn_auth_provider_t.klass = rb_define_class_under(mCore, "Svn_auth_provider_t", rb_cObject);
@@ -42762,6 +44551,9 @@ SWIGEXPORT void Init_core(void) {
   rb_define_const(mCore, "SVN_CONFIG_OPTION_USERNAME", SWIG_FromCharPtr("username"));
   rb_define_const(mCore, "SVN_CONFIG_OPTION_HTTP_BULK_UPDATES", SWIG_FromCharPtr("http-bulk-updates"));
   rb_define_const(mCore, "SVN_CONFIG_OPTION_HTTP_MAX_CONNECTIONS", SWIG_FromCharPtr("http-max-connections"));
+  rb_define_const(mCore, "SVN_CONFIG_OPTION_HTTP_CHUNKED_REQUESTS", SWIG_FromCharPtr("http-chunked-requests"));
+  rb_define_const(mCore, "SVN_CONFIG_OPTION_SERF_LOG_COMPONENTS", SWIG_FromCharPtr("serf-log-components"));
+  rb_define_const(mCore, "SVN_CONFIG_OPTION_SERF_LOG_LEVEL", SWIG_FromCharPtr("serf-log-level"));
   rb_define_const(mCore, "SVN_CONFIG_CATEGORY_CONFIG", SWIG_FromCharPtr("config"));
   rb_define_const(mCore, "SVN_CONFIG_SECTION_AUTH", SWIG_FromCharPtr("auth"));
   rb_define_const(mCore, "SVN_CONFIG_OPTION_PASSWORD_STORES", SWIG_FromCharPtr("password-stores"));
@@ -42781,16 +44573,19 @@ SWIGEXPORT void Init_core(void) {
   rb_define_const(mCore, "SVN_CONFIG_OPTION_USE_COMMIT_TIMES", SWIG_FromCharPtr("use-commit-times"));
   rb_define_const(mCore, "SVN_CONFIG_OPTION_TEMPLATE_ROOT", SWIG_FromCharPtr("template-root"));
   rb_define_const(mCore, "SVN_CONFIG_OPTION_ENABLE_AUTO_PROPS", SWIG_FromCharPtr("enable-auto-props"));
+  rb_define_const(mCore, "SVN_CONFIG_OPTION_ENABLE_MAGIC_FILE", SWIG_FromCharPtr("enable-magic-file"));
   rb_define_const(mCore, "SVN_CONFIG_OPTION_NO_UNLOCK", SWIG_FromCharPtr("no-unlock"));
   rb_define_const(mCore, "SVN_CONFIG_OPTION_MIMETYPES_FILE", SWIG_FromCharPtr("mime-types-file"));
   rb_define_const(mCore, "SVN_CONFIG_OPTION_PRESERVED_CF_EXTS", SWIG_FromCharPtr("preserved-conflict-file-exts"));
   rb_define_const(mCore, "SVN_CONFIG_OPTION_INTERACTIVE_CONFLICTS", SWIG_FromCharPtr("interactive-conflicts"));
   rb_define_const(mCore, "SVN_CONFIG_OPTION_MEMORY_CACHE_SIZE", SWIG_FromCharPtr("memory-cache-size"));
+  rb_define_const(mCore, "SVN_CONFIG_OPTION_DIFF_IGNORE_CONTENT_TYPE", SWIG_FromCharPtr("diff-ignore-content-type"));
   rb_define_const(mCore, "SVN_CONFIG_SECTION_TUNNELS", SWIG_FromCharPtr("tunnels"));
   rb_define_const(mCore, "SVN_CONFIG_SECTION_AUTO_PROPS", SWIG_FromCharPtr("auto-props"));
   rb_define_const(mCore, "SVN_CONFIG_SECTION_WORKING_COPY", SWIG_FromCharPtr("working-copy"));
   rb_define_const(mCore, "SVN_CONFIG_OPTION_SQLITE_EXCLUSIVE", SWIG_FromCharPtr("exclusive-locking"));
   rb_define_const(mCore, "SVN_CONFIG_OPTION_SQLITE_EXCLUSIVE_CLIENTS", SWIG_FromCharPtr("exclusive-locking-clients"));
+  rb_define_const(mCore, "SVN_CONFIG_OPTION_SQLITE_BUSY_TIMEOUT", SWIG_FromCharPtr("busy-timeout"));
   rb_define_const(mCore, "SVN_CONFIG_SECTION_GENERAL", SWIG_FromCharPtr("general"));
   rb_define_const(mCore, "SVN_CONFIG_OPTION_ANON_ACCESS", SWIG_FromCharPtr("anon-access"));
   rb_define_const(mCore, "SVN_CONFIG_OPTION_AUTH_ACCESS", SWIG_FromCharPtr("auth-access"));
@@ -42806,8 +44601,8 @@ SWIGEXPORT void Init_core(void) {
   rb_define_const(mCore, "SVN_CONFIG_OPTION_MAX_SSF", SWIG_FromCharPtr("max-encryption"));
   rb_define_const(mCore, "SVN_CONFIG_SECTION_USERS", SWIG_FromCharPtr("users"));
   rb_define_const(mCore, "SVN_CONFIG__DEFAULT_GLOBAL_IGNORES_LINE_1", SWIG_FromCharPtr("*.o *.lo *.la *.al .libs *.so *.so.[0-9]* *.a *.pyc *.pyo __pycache__"));
-  rb_define_const(mCore, "SVN_CONFIG__DEFAULT_GLOBAL_IGNORES_LINE_2", SWIG_FromCharPtr("*.rej *~ #*# .#* .*.swp .DS_Store"));
-  rb_define_const(mCore, "SVN_CONFIG_DEFAULT_GLOBAL_IGNORES", SWIG_FromCharPtr("*.o *.lo *.la *.al .libs *.so *.so.[0-9]* *.a *.pyc *.pyo __pycache__ *.rej *~ #*# .#* .*.swp .DS_Store"));
+  rb_define_const(mCore, "SVN_CONFIG__DEFAULT_GLOBAL_IGNORES_LINE_2", SWIG_FromCharPtr("*.rej *~ #*# .#* .*.swp .DS_Store [Tt]humbs.db"));
+  rb_define_const(mCore, "SVN_CONFIG_DEFAULT_GLOBAL_IGNORES", SWIG_FromCharPtr("*.o *.lo *.la *.al .libs *.so *.so.[0-9]* *.a *.pyc *.pyo __pycache__ *.rej *~ #*# .#* .*.swp .DS_Store [Tt]humbs.db"));
   rb_define_const(mCore, "SVN_CONFIG_TRUE", SWIG_FromCharPtr("TRUE"));
   rb_define_const(mCore, "SVN_CONFIG_FALSE", SWIG_FromCharPtr("FALSE"));
   rb_define_const(mCore, "SVN_CONFIG_ASK", SWIG_FromCharPtr("ASK"));
@@ -42844,6 +44639,12 @@ SWIGEXPORT void Init_core(void) {
   rb_define_module_function(mCore, "svn_config_get_server_setting_bool", _wrap_svn_config_get_server_setting_bool, -1);
   rb_define_module_function(mCore, "svn_config_ensure", _wrap_svn_config_ensure, -1);
   rb_define_const(mCore, "SVN_CONFIG_REALMSTRING_KEY", SWIG_FromCharPtr("svn:realmstring"));
+  rb_define_const(mCore, "SVN_CONFIG_AUTHN_USERNAME_KEY", SWIG_FromCharPtr("username"));
+  rb_define_const(mCore, "SVN_CONFIG_AUTHN_PASSWORD_KEY", SWIG_FromCharPtr("password"));
+  rb_define_const(mCore, "SVN_CONFIG_AUTHN_PASSPHRASE_KEY", SWIG_FromCharPtr("passphrase"));
+  rb_define_const(mCore, "SVN_CONFIG_AUTHN_PASSTYPE_KEY", SWIG_FromCharPtr("passtype"));
+  rb_define_const(mCore, "SVN_CONFIG_AUTHN_ASCII_CERT_KEY", SWIG_FromCharPtr("ascii_cert"));
+  rb_define_const(mCore, "SVN_CONFIG_AUTHN_FAILURES_KEY", SWIG_FromCharPtr("failures"));
   rb_define_module_function(mCore, "svn_config_read_auth_data", _wrap_svn_config_read_auth_data, -1);
   rb_define_module_function(mCore, "svn_config_write_auth_data", _wrap_svn_config_write_auth_data, -1);
   rb_define_module_function(mCore, "svn_config_walk_auth_data", _wrap_svn_config_walk_auth_data, -1);
@@ -42899,6 +44700,7 @@ SWIGEXPORT void Init_core(void) {
   rb_define_module_function(mCore, "svn_relpath_split", _wrap_svn_relpath_split, -1);
   rb_define_module_function(mCore, "svn_relpath_basename", _wrap_svn_relpath_basename, -1);
   rb_define_module_function(mCore, "svn_relpath_dirname", _wrap_svn_relpath_dirname, -1);
+  rb_define_module_function(mCore, "svn_relpath_prefix", _wrap_svn_relpath_prefix, -1);
   rb_define_module_function(mCore, "svn_uri_split", _wrap_svn_uri_split, -1);
   rb_define_module_function(mCore, "svn_uri_basename", _wrap_svn_uri_basename, -1);
   rb_define_module_function(mCore, "svn_uri_dirname", _wrap_svn_uri_dirname, -1);
@@ -42994,11 +44796,15 @@ SWIGEXPORT void Init_core(void) {
   rb_define_module_function(mCore, "svn_io_file_checksum", _wrap_svn_io_file_checksum, -1);
   rb_define_module_function(mCore, "svn_io_files_contents_same_p", _wrap_svn_io_files_contents_same_p, -1);
   rb_define_module_function(mCore, "svn_io_files_contents_three_same_p", _wrap_svn_io_files_contents_three_same_p, -1);
+  rb_define_module_function(mCore, "svn_io_file_create_bytes", _wrap_svn_io_file_create_bytes, -1);
+  rb_define_module_function(mCore, "svn_io_file_create_empty", _wrap_svn_io_file_create_empty, -1);
   rb_define_module_function(mCore, "svn_io_lock_open_file", _wrap_svn_io_lock_open_file, -1);
   rb_define_module_function(mCore, "svn_io_unlock_open_file", _wrap_svn_io_unlock_open_file, -1);
+  rb_define_module_function(mCore, "svn_stream_set_read2", _wrap_svn_stream_set_read2, -1);
   rb_define_module_function(mCore, "svn_stream_set_skip", _wrap_svn_stream_set_skip, -1);
   rb_define_module_function(mCore, "svn_stream_set_mark", _wrap_svn_stream_set_mark, -1);
   rb_define_module_function(mCore, "svn_stream_set_seek", _wrap_svn_stream_set_seek, -1);
+  rb_define_module_function(mCore, "svn_stream_set_data_available", _wrap_svn_stream_set_data_available, -1);
   rb_define_module_function(mCore, "svn_stream_empty", _wrap_svn_stream_empty, -1);
   rb_define_module_function(mCore, "svn_stream_disown", _wrap_svn_stream_disown, -1);
   rb_define_module_function(mCore, "svn_stream_open_readonly", _wrap_svn_stream_open_readonly, -1);
@@ -43009,11 +44815,15 @@ SWIGEXPORT void Init_core(void) {
   rb_define_module_function(mCore, "svn_stream_for_stdin", _wrap_svn_stream_for_stdin, -1);
   rb_define_module_function(mCore, "svn_stream_for_stderr", _wrap_svn_stream_for_stderr, -1);
   rb_define_module_function(mCore, "svn_stream_for_stdout", _wrap_svn_stream_for_stdout, -1);
+  rb_define_module_function(mCore, "svn_stringbuf_from_stream", _wrap_svn_stringbuf_from_stream, -1);
   rb_define_module_function(mCore, "svn_stream_from_stringbuf", _wrap_svn_stream_from_stringbuf, -1);
   rb_define_module_function(mCore, "svn_stream_from_string", _wrap_svn_stream_from_string, -1);
   rb_define_module_function(mCore, "svn_stream_buffered", _wrap_svn_stream_buffered, -1);
   rb_define_module_function(mCore, "svn_stream_compressed", _wrap_svn_stream_compressed, -1);
   rb_define_module_function(mCore, "svn_stream_checksummed2", _wrap_svn_stream_checksummed2, -1);
+  rb_define_module_function(mCore, "svn_stream_read_full", _wrap_svn_stream_read_full, -1);
+  rb_define_module_function(mCore, "svn_stream_supports_partial_read", _wrap_svn_stream_supports_partial_read, -1);
+  rb_define_module_function(mCore, "svn_stream_read2", _wrap_svn_stream_read2, -1);
   rb_define_module_function(mCore, "svn_stream_read", _wrap_svn_stream_read, -1);
   rb_define_module_function(mCore, "svn_stream_skip", _wrap_svn_stream_skip, -1);
   rb_define_module_function(mCore, "svn_stream_write", _wrap_svn_stream_write, -1);
@@ -43022,6 +44832,7 @@ SWIGEXPORT void Init_core(void) {
   rb_define_module_function(mCore, "svn_stream_supports_mark", _wrap_svn_stream_supports_mark, -1);
   rb_define_module_function(mCore, "svn_stream_mark", _wrap_svn_stream_mark, -1);
   rb_define_module_function(mCore, "svn_stream_seek", _wrap_svn_stream_seek, -1);
+  rb_define_module_function(mCore, "svn_stream_data_available", _wrap_svn_stream_data_available, -1);
   rb_define_module_function(mCore, "svn_stream_tee", _wrap_svn_stream_tee, -1);
   rb_define_module_function(mCore, "svn_stream_puts", _wrap_svn_stream_puts, -1);
   rb_define_module_function(mCore, "svn_stream_readline", _wrap_svn_stream_readline, -1);
@@ -43051,6 +44862,9 @@ SWIGEXPORT void Init_core(void) {
   rb_define_module_function(mCore, "svn_io_is_binary_data", _wrap_svn_io_is_binary_data, -1);
   rb_define_module_function(mCore, "svn_io_file_putc", _wrap_svn_io_file_putc, -1);
   rb_define_module_function(mCore, "svn_io_file_read_full2", _wrap_svn_io_file_read_full2, -1);
+  rb_define_module_function(mCore, "svn_io_file_aligned_seek", _wrap_svn_io_file_aligned_seek, -1);
+  rb_define_module_function(mCore, "svn_io_file_flush", _wrap_svn_io_file_flush, -1);
+  rb_define_module_function(mCore, "svn_io_write_atomic", _wrap_svn_io_write_atomic, -1);
   rb_define_module_function(mCore, "svn_io_write_unique", _wrap_svn_io_write_unique, -1);
   rb_define_module_function(mCore, "svn_io_file_trunc", _wrap_svn_io_file_trunc, -1);
   rb_define_module_function(mCore, "svn_io_dir_close", _wrap_svn_io_dir_close, -1);
@@ -43062,10 +44876,13 @@ SWIGEXPORT void Init_core(void) {
   rb_define_module_function(mCore, "svn_close_invoke_fn", _wrap_svn_close_invoke_fn, -1);
   rb_define_module_function(mCore, "svn_stream_invoke_mark_fn", _wrap_svn_stream_invoke_mark_fn, -1);
   rb_define_module_function(mCore, "svn_stream_invoke_seek_fn", _wrap_svn_stream_invoke_seek_fn, -1);
+  rb_define_module_function(mCore, "svn_stream_invoke_data_available_fn", _wrap_svn_stream_invoke_data_available_fn, -1);
   rb_define_module_function(mCore, "svn_stream_invoke_lazyopen_func", _wrap_svn_stream_invoke_lazyopen_func, -1);
   rb_define_module_function(mCore, "svn_io_invoke_walk_func", _wrap_svn_io_invoke_walk_func, -1);
   rb_define_const(mCore, "Svn_checksum_md5", SWIG_From_int((int)(svn_checksum_md5)));
   rb_define_const(mCore, "Svn_checksum_sha1", SWIG_From_int((int)(svn_checksum_sha1)));
+  rb_define_const(mCore, "Svn_checksum_fnv1a_32", SWIG_From_int((int)(svn_checksum_fnv1a_32)));
+  rb_define_const(mCore, "Svn_checksum_fnv1a_32x4", SWIG_From_int((int)(svn_checksum_fnv1a_32x4)));
   
   SwigClassSvn_checksum_t.klass = rb_define_class_under(mCore, "Svn_checksum_t", rb_cObject);
   SWIG_TypeClientData(SWIGTYPE_p_svn_checksum_t, (void *) &SwigClassSvn_checksum_t);
@@ -43211,6 +45028,7 @@ SWIGEXPORT void Init_core(void) {
   rb_define_const(mCore, "Svn_diff_conflict_display_modified", SWIG_From_int((int)(svn_diff_conflict_display_modified)));
   rb_define_const(mCore, "Svn_diff_conflict_display_latest", SWIG_From_int((int)(svn_diff_conflict_display_latest)));
   rb_define_const(mCore, "Svn_diff_conflict_display_only_conflicts", SWIG_From_int((int)(svn_diff_conflict_display_only_conflicts)));
+  rb_define_module_function(mCore, "svn_diff_output2", _wrap_svn_diff_output2, -1);
   rb_define_module_function(mCore, "svn_diff_output", _wrap_svn_diff_output, -1);
   rb_define_const(mCore, "Svn_diff_file_ignore_space_none", SWIG_From_int((int)(svn_diff_file_ignore_space_none)));
   rb_define_const(mCore, "Svn_diff_file_ignore_space_change", SWIG_From_int((int)(svn_diff_file_ignore_space_change)));
@@ -43226,6 +45044,8 @@ SWIGEXPORT void Init_core(void) {
   rb_define_method(SwigClassSvn_diff_file_options_t.klass, "ignore_eol_style", _wrap_svn_diff_file_options_t_ignore_eol_style_get, -1);
   rb_define_method(SwigClassSvn_diff_file_options_t.klass, "show_c_function=", _wrap_svn_diff_file_options_t_show_c_function_set, -1);
   rb_define_method(SwigClassSvn_diff_file_options_t.klass, "show_c_function", _wrap_svn_diff_file_options_t_show_c_function_get, -1);
+  rb_define_method(SwigClassSvn_diff_file_options_t.klass, "context_size=", _wrap_svn_diff_file_options_t_context_size_set, -1);
+  rb_define_method(SwigClassSvn_diff_file_options_t.klass, "context_size", _wrap_svn_diff_file_options_t_context_size_get, -1);
   SwigClassSvn_diff_file_options_t.mark = 0;
   SwigClassSvn_diff_file_options_t.destroy = (void (*)(void *)) free_svn_diff_file_options_t;
   SwigClassSvn_diff_file_options_t.trackObjects = 0;
@@ -43236,16 +45056,21 @@ SWIGEXPORT void Init_core(void) {
   rb_define_module_function(mCore, "svn_diff_file_diff3", _wrap_svn_diff_file_diff3, -1);
   rb_define_module_function(mCore, "svn_diff_file_diff4_2", _wrap_svn_diff_file_diff4_2, -1);
   rb_define_module_function(mCore, "svn_diff_file_diff4", _wrap_svn_diff_file_diff4, -1);
+  rb_define_module_function(mCore, "svn_diff_file_output_unified4", _wrap_svn_diff_file_output_unified4, -1);
   rb_define_module_function(mCore, "svn_diff_file_output_unified3", _wrap_svn_diff_file_output_unified3, -1);
   rb_define_module_function(mCore, "svn_diff_file_output_unified2", _wrap_svn_diff_file_output_unified2, -1);
   rb_define_module_function(mCore, "svn_diff_file_output_unified", _wrap_svn_diff_file_output_unified, -1);
+  rb_define_module_function(mCore, "svn_diff_file_output_merge3", _wrap_svn_diff_file_output_merge3, -1);
   rb_define_module_function(mCore, "svn_diff_file_output_merge2", _wrap_svn_diff_file_output_merge2, -1);
   rb_define_module_function(mCore, "svn_diff_file_output_merge", _wrap_svn_diff_file_output_merge, -1);
+  rb_define_module_function(mCore, "svn_diff_output_binary", _wrap_svn_diff_output_binary, -1);
   rb_define_module_function(mCore, "svn_diff_mem_string_diff", _wrap_svn_diff_mem_string_diff, -1);
   rb_define_module_function(mCore, "svn_diff_mem_string_diff3", _wrap_svn_diff_mem_string_diff3, -1);
   rb_define_module_function(mCore, "svn_diff_mem_string_diff4", _wrap_svn_diff_mem_string_diff4, -1);
+  rb_define_module_function(mCore, "svn_diff_mem_string_output_unified3", _wrap_svn_diff_mem_string_output_unified3, -1);
   rb_define_module_function(mCore, "svn_diff_mem_string_output_unified2", _wrap_svn_diff_mem_string_output_unified2, -1);
   rb_define_module_function(mCore, "svn_diff_mem_string_output_unified", _wrap_svn_diff_mem_string_output_unified, -1);
+  rb_define_module_function(mCore, "svn_diff_mem_string_output_merge3", _wrap_svn_diff_mem_string_output_merge3, -1);
   rb_define_module_function(mCore, "svn_diff_mem_string_output_merge2", _wrap_svn_diff_mem_string_output_merge2, -1);
   rb_define_module_function(mCore, "svn_diff_mem_string_output_merge", _wrap_svn_diff_mem_string_output_merge, -1);
   rb_define_const(mCore, "Svn_diff_op_unchanged", SWIG_From_int((int)(svn_diff_op_unchanged)));
@@ -43297,6 +45122,10 @@ SWIGEXPORT void Init_core(void) {
   rb_define_method(SwigClassSvn_patch_t.klass, "operation", _wrap_svn_patch_t_operation_get, -1);
   rb_define_method(SwigClassSvn_patch_t.klass, "reverse=", _wrap_svn_patch_t_reverse_set, -1);
   rb_define_method(SwigClassSvn_patch_t.klass, "reverse", _wrap_svn_patch_t_reverse_get, -1);
+  rb_define_method(SwigClassSvn_patch_t.klass, "mergeinfo=", _wrap_svn_patch_t_mergeinfo_set, -1);
+  rb_define_method(SwigClassSvn_patch_t.klass, "mergeinfo", _wrap_svn_patch_t_mergeinfo_get, -1);
+  rb_define_method(SwigClassSvn_patch_t.klass, "reverse_mergeinfo=", _wrap_svn_patch_t_reverse_mergeinfo_set, -1);
+  rb_define_method(SwigClassSvn_patch_t.klass, "reverse_mergeinfo", _wrap_svn_patch_t_reverse_mergeinfo_get, -1);
   SwigClassSvn_patch_t.mark = 0;
   SwigClassSvn_patch_t.destroy = (void (*)(void *)) free_svn_patch_t;
   SwigClassSvn_patch_t.trackObjects = 0;
diff --git a/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c b/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
index 136d35c..a25ec5a 100644
--- a/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
+++ b/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
@@ -23,9 +23,16 @@
 /* Tell swigutil_rb.h that we're inside the implementation */
 #define SVN_SWIG_SWIGUTIL_RB_C
 
+/* Windows hack: Allow overriding some <ruby.h> defaults */
+#include "swigutil_rb__pre_ruby.h"
 #include "swig_ruby_external_runtime.swg"
 #include "swigutil_rb.h"
+
+#ifdef HAVE_RUBY_ST_H
+#include <ruby/st.h>
+#else
 #include <st.h>
+#endif
 
 #undef PACKAGE_BUGREPORT
 #undef PACKAGE_NAME
@@ -474,9 +481,9 @@ static void
 check_apr_status(apr_status_t status, VALUE exception_class, const char *format)
 {
     if (status != APR_SUCCESS) {
-	char buffer[1024];
-	apr_strerror(status, buffer, sizeof(buffer) - 1);
-	rb_raise(exception_class, format, buffer);
+        char buffer[1024];
+        apr_strerror(status, buffer, sizeof(buffer) - 1);
+        rb_raise(exception_class, format, buffer);
     }
 }
 
@@ -519,8 +526,8 @@ svn_swig_rb_destroyer_destroy(VALUE self, VALUE target)
 
     objects[0] = target;
     if (find_swig_type_object(1, objects) && DATA_PTR(target)) {
-	svn_swig_rb_destroy_internal_pool(target);
-	DATA_PTR(target) = NULL;
+        svn_swig_rb_destroy_internal_pool(target);
+        DATA_PTR(target) = NULL;
     }
 
     return Qnil;
@@ -538,9 +545,9 @@ svn_swig_rb_initialize(void)
   }
 
   check_apr_status(apr_allocator_create(&swig_rb_allocator),
-		   rb_eLoadError, "failed to create allocator: %s");
+                   rb_eLoadError, "failed to create allocator: %s");
   apr_allocator_max_free_set(swig_rb_allocator,
-			     SVN_ALLOCATOR_RECOMMENDED_MAX_FREE);
+                             SVN_ALLOCATOR_RECOMMENDED_MAX_FREE);
 
   swig_rb_pool = svn_pool_create_ex(NULL, swig_rb_allocator);
   apr_pool_tag(swig_rb_pool, "svn-ruby-pool");
@@ -549,8 +556,8 @@ svn_swig_rb_initialize(void)
     apr_thread_mutex_t *mutex;
 
     check_apr_status(apr_thread_mutex_create(&mutex, APR_THREAD_MUTEX_DEFAULT,
-					     swig_rb_pool),
-		     rb_eLoadError, "failed to create allocator: %s");
+                                             swig_rb_pool),
+                                             rb_eLoadError, "failed to create allocator: %s");
     apr_allocator_mutex_set(swig_rb_allocator, mutex);
   }
 #endif
@@ -583,7 +590,7 @@ svn_swig_rb_initialize(void)
 
   mSvnDestroyer = rb_define_module_under(rb_svn(), "Destroyer");
   rb_define_module_function(mSvnDestroyer, "destroy",
-			    svn_swig_rb_destroyer_destroy, 1);
+                            svn_swig_rb_destroyer_destroy, 1);
 }
 
 apr_pool_t *
@@ -736,7 +743,7 @@ static svn_boolean_t
 rb_set_pool_if_swig_type_object(VALUE target, VALUE pool)
 {
   VALUE targets[1];
-  
+
   targets[0] = target;
 
   if (!NIL_P(find_swig_type_object(1, targets))) {
@@ -862,7 +869,7 @@ svn_swig_rb_raise_svn_repos_already_close(void)
 
 VALUE
 svn_swig_rb_svn_error_new(VALUE code, VALUE message, VALUE file, VALUE line,
-			  VALUE child)
+                          VALUE child)
 {
   return rb_funcall(rb_svn_error_svn_error(),
                     id_new_corresponding_error,
@@ -1598,7 +1605,7 @@ typedef struct callback_handle_error_baton_t {
 } callback_handle_error_baton_t;
 
 static VALUE
-callback(VALUE baton)
+callback(VALUE baton, ...)
 {
   callback_baton_t *cbb = (callback_baton_t *)baton;
   VALUE result;
@@ -1610,7 +1617,7 @@ callback(VALUE baton)
 }
 
 static VALUE
-callback_rescue(VALUE baton)
+callback_rescue(VALUE baton, ...)
 {
   callback_rescue_baton_t *rescue_baton = (callback_rescue_baton_t*)baton;
 
@@ -1627,7 +1634,7 @@ callback_rescue(VALUE baton)
 }
 
 static VALUE
-callback_ensure(VALUE pool)
+callback_ensure(VALUE pool, ...)
 {
   svn_swig_rb_pop_pool(pool);
 
@@ -1638,17 +1645,17 @@ static VALUE
 invoke_callback(VALUE baton, VALUE pool)
 {
   callback_baton_t *cbb = (callback_baton_t *)baton;
-  VALUE sub_pool;
+  VALUE subpool;
   VALUE argv[1];
 
   argv[0] = pool;
-  svn_swig_rb_get_pool(1, argv, Qnil, &sub_pool, NULL);
-  cbb->pool = sub_pool;
-  return rb_ensure(callback, baton, callback_ensure, sub_pool);
+  svn_swig_rb_get_pool(1, argv, Qnil, &subpool, NULL);
+  cbb->pool = subpool;
+  return rb_ensure(callback, baton, callback_ensure, subpool);
 }
 
 static VALUE
-callback_handle_error(VALUE baton)
+callback_handle_error(VALUE baton, ...)
 {
   callback_handle_error_baton_t *handle_error_baton;
   handle_error_baton = (callback_handle_error_baton_t *)baton;
@@ -3231,7 +3238,8 @@ svn_swig_rb_make_stream(VALUE io)
     pool_wrapper_p = &pool_wrapper;
     r2c_swig_type2(rb_pool, "apr_pool_wrapper_t *", (void **)pool_wrapper_p);
     stream = svn_stream_create((void *)io, pool_wrapper->pool);
-    svn_stream_set_read(stream, read_handler_rbio);
+    svn_stream_set_read2(stream, NULL /* only full read support */,
+                         read_handler_rbio);
     svn_stream_set_write(stream, write_handler_rbio);
   }
 
@@ -4025,4 +4033,7 @@ static svn_ra_reporter3_t rb_ra_reporter3 = {
   svn_swig_rb_ra_reporter_abort_report
 };
 
-svn_ra_reporter3_t *svn_swig_rb_ra_reporter3 = &rb_ra_reporter3;
+svn_ra_reporter3_t *svn_swig_rb_get_ra_reporter3()
+{
+  return &rb_ra_reporter3;
+}
diff --git a/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h b/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h
index 1098c80..3dbc3ec 100644
--- a/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h
+++ b/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h
@@ -22,8 +22,14 @@
 #ifndef SVN_SWIG_SWIGUTIL_RB_H
 #define SVN_SWIG_SWIGUTIL_RB_H
 
+/* Windows hack: Allow overriding some <ruby.h> defaults */
+#include "swigutil_rb__pre_ruby.h"
 #include <ruby.h>
+#ifdef HAVE_RUBY_REGEX_H
+#include <ruby/regex.h>
+#else
 #include <regex.h>
+#endif
 
 #if SIZEOF_VOIDP == SIZEOF_LONG
 #  define PTR2NUM(x) (ULONG2NUM((unsigned long)(x)))
@@ -45,17 +51,6 @@
 #include "svn_client.h"
 #include "svn_repos.h"
 
-/* Define DLL export magic on Windows. */
-#ifdef WIN32
-#  ifdef SVN_SWIG_SWIGUTIL_RB_C
-#    define SVN_RB_SWIG_SWIGUTIL_EXPORT __declspec(dllexport)
-#  else
-#    define SVN_RB_SWIG_SWIGUTIL_EXPORT __declspec(dllimport)
-#  endif
-#else
-#  define SVN_RB_SWIG_SWIGUTIL_EXPORT
-#endif
-
 /* Ruby <=1.8.5 compatibility */
 #ifndef RARRAY_LEN
 #define RARRAY_LEN(x) RARRAY(x)->len
@@ -89,152 +84,98 @@ typedef struct apr_pool_wrapper_t
   apr_array_header_t *children;
 } apr_pool_wrapper_t;
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 void svn_swig_rb_initialize(void);
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 apr_pool_t *svn_swig_rb_pool(void);
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 apr_allocator_t *svn_swig_rb_allocator(void);
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 VALUE svn_swig_rb_svn_delta_editor(void);
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 VALUE svn_swig_rb_svn_delta_text_delta_window_handler(void);
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 void svn_swig_rb_raise_svn_fs_already_close(void);
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 void svn_swig_rb_raise_svn_repos_already_close(void);
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 VALUE svn_swig_rb_svn_error_new(VALUE code, VALUE message,
                                 VALUE file, VALUE line, VALUE child);
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 VALUE svn_swig_rb_svn_error_to_rb_error(svn_error_t *error);
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 void svn_swig_rb_handle_svn_error(svn_error_t *error);
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 void *svn_swig_rb_to_swig_type(VALUE value, const void *ctx, apr_pool_t *pool);
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 VALUE svn_swig_rb_from_swig_type(void *value, void *ctx);
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 svn_depth_t svn_swig_rb_to_depth(VALUE value);
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 svn_mergeinfo_inheritance_t svn_swig_rb_to_mergeinfo_inheritance(VALUE value);
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 VALUE svn_swig_rb_svn_date_string_to_time(const char *date);
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 VALUE svn_swig_rb_apr_hash_to_hash_string(apr_hash_t *hash);
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 VALUE svn_swig_rb_apr_hash_to_hash_svn_string(apr_hash_t *hash);
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 VALUE svn_swig_rb_apr_hash_to_hash_swig_type(apr_hash_t *hash,
                                              const char *type_name);
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 VALUE svn_swig_rb_apr_hash_to_hash_merge_range(apr_hash_t *hash);
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 VALUE svn_swig_rb_apr_hash_to_hash_merge_range_hash(apr_hash_t *hash);
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 VALUE svn_swig_rb_prop_hash_to_hash(apr_hash_t *prop_hash);
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 VALUE svn_swig_rb_apr_revnum_key_hash_to_hash_string(apr_hash_t *hash);
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 VALUE svn_swig_rb_apr_array_to_array_string(const apr_array_header_t *ary);
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 VALUE svn_swig_rb_apr_array_to_array_svn_string(const apr_array_header_t *ary);
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 VALUE svn_swig_rb_apr_array_to_array_svn_rev(const apr_array_header_t *ary);
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 VALUE svn_swig_rb_apr_array_to_array_proplist_item(const apr_array_header_t *ary);
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 VALUE svn_swig_rb_apr_array_to_array_external_item2(const apr_array_header_t *ary);
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 VALUE svn_swig_rb_apr_array_to_array_merge_range(const apr_array_header_t *ary);
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 VALUE svn_swig_rb_apr_array_to_array_auth_provider_object(const apr_array_header_t *ary);
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 VALUE svn_swig_rb_prop_apr_array_to_hash_prop(const apr_array_header_t *ary);
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 apr_hash_t *svn_swig_rb_hash_to_apr_hash_string(VALUE hash, apr_pool_t *pool);
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 apr_hash_t *svn_swig_rb_hash_to_apr_hash_svn_string(VALUE hash,
                                                     apr_pool_t *pool);
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 apr_hash_t *svn_swig_rb_hash_to_apr_hash_swig_type(VALUE hash,
                                                    const char *typename,
                                                    apr_pool_t *pool);
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 apr_hash_t *svn_swig_rb_hash_to_apr_hash_revnum(VALUE hash,
                                                 apr_pool_t *pool);
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 apr_hash_t *svn_swig_rb_hash_to_apr_hash_merge_range(VALUE hash,
                                                      apr_pool_t *pool);
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 apr_array_header_t *svn_swig_rb_strings_to_apr_array(VALUE strings,
                                                      apr_pool_t *pool);
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 apr_array_header_t *
 svn_swig_rb_array_to_auth_provider_object_apr_array(VALUE array,
                                                     apr_pool_t *pool);
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 apr_array_header_t *svn_swig_rb_array_to_apr_array_revnum(VALUE array,
                                                           apr_pool_t *pool);
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 apr_array_header_t *svn_swig_rb_array_to_apr_array_merge_range(VALUE array,
                                                                apr_pool_t *pool);
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 apr_array_header_t *svn_swig_rb_array_to_apr_array_copy_source(VALUE array,
                                                                apr_pool_t *pool);
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 apr_array_header_t *svn_swig_rb_array_to_apr_array_revision_range(VALUE array,
                                                                   apr_pool_t *pool);
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 apr_array_header_t *svn_swig_rb_to_apr_array_prop(VALUE array_or_hash,
                                                   apr_pool_t *pool);
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 apr_array_header_t *svn_swig_rb_to_apr_array_row_prop(VALUE array_or_hash,
                                                       apr_pool_t *pool);
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 void svn_swig_rb_get_pool(int argc, VALUE *argv, VALUE self, VALUE *rb_pool, apr_pool_t **pool);
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 svn_boolean_t svn_swig_rb_set_pool(VALUE target, VALUE pool);
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 void svn_swig_rb_set_pool_for_no_swig_type(VALUE target, VALUE pool);
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 void svn_swig_rb_push_pool(VALUE pool);
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 void svn_swig_rb_pop_pool(VALUE pool);
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 void svn_swig_rb_destroy_pool(VALUE pool);
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 void svn_swig_rb_destroy_internal_pool(VALUE pool);
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 void svn_swig_rb_make_delta_editor(svn_delta_editor_t **editor,
                                    void **edit_baton,
                                    VALUE rb_editor,
                                    apr_pool_t *pool);
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 VALUE svn_swig_rb_make_baton(VALUE proc, VALUE pool);
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 void svn_swig_rb_set_baton(VALUE target, VALUE baton);
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 svn_error_t *svn_swig_rb_log_receiver(void *baton,
                                       apr_hash_t *changed_paths,
                                       svn_revnum_t revision,
@@ -243,19 +184,16 @@ svn_error_t *svn_swig_rb_log_receiver(void *baton,
                                       const char *message,
                                       apr_pool_t *pool);
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 svn_error_t *svn_swig_rb_log_entry_receiver(void *baton,
                                             svn_log_entry_t *entry,
                                             apr_pool_t *pool);
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 svn_error_t *svn_swig_rb_repos_authz_func(svn_boolean_t *allowed,
                                           svn_fs_root_t *root,
                                           const char *path,
                                           void *baton,
                                           apr_pool_t *pool);
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 svn_error_t *svn_swig_rb_repos_authz_callback(svn_repos_authz_access_t required,
                                               svn_boolean_t *allowed,
                                               svn_fs_root_t *root,
@@ -264,7 +202,6 @@ svn_error_t *svn_swig_rb_repos_authz_callback(svn_repos_authz_access_t required,
                                               apr_pool_t *pool);
 
 /* Implements the svn_client_get_commit_log3_t API. */
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 svn_error_t *svn_swig_rb_get_commit_log_func(const char **log_msg,
                                              const char **tmp_file,
                                              const apr_array_header_t *
@@ -272,76 +209,60 @@ svn_error_t *svn_swig_rb_get_commit_log_func(const char **log_msg,
                                              void *baton,
                                              apr_pool_t *pool);
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 void svn_swig_rb_notify_func2(void *baton,
                               const svn_wc_notify_t *notify,
                               apr_pool_t *pool);
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 svn_error_t *svn_swig_rb_conflict_resolver_func
     (svn_wc_conflict_result_t **result,
      const svn_wc_conflict_description_t *description,
      void *baton,
      apr_pool_t *pool);
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 svn_error_t *svn_swig_rb_commit_callback(svn_revnum_t new_revision,
                                          const char *date,
                                          const char *author,
                                          void *baton);
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 svn_error_t *svn_swig_rb_commit_callback2(const svn_commit_info_t *commit_info,
                                           void *baton,
                                           apr_pool_t *pool);
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 svn_error_t *svn_swig_rb_cancel_func(void *cancel_baton);
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 svn_error_t *svn_swig_rb_info_receiver(void *baton,
                                        const char *path,
                                        const svn_info_t *info,
                                        apr_pool_t *pool);
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 svn_boolean_t svn_swig_rb_config_enumerator(const char *name,
                                             const char *value,
                                             void *baton,
                                             apr_pool_t *pool);
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 svn_boolean_t svn_swig_rb_config_section_enumerator(const char *name,
                                                     void *baton,
                                                     apr_pool_t *pool);
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 svn_error_t *svn_swig_rb_delta_path_driver_cb_func(void **dir_baton,
                                                    void *parent_baton,
                                                    void *callback_baton,
                                                    const char *path,
                                                    apr_pool_t *pool);
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 svn_error_t *svn_swig_rb_txdelta_window_handler(svn_txdelta_window_t *window,
                                                 void *baton);
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 void svn_swig_rb_fs_warning_callback(void *baton, svn_error_t *err);
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 void svn_swig_rb_fs_warning_callback_baton_register(VALUE baton,
                                                     apr_pool_t *pool);
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 svn_error_t *svn_swig_rb_fs_get_locks_callback(void *baton,
                                                svn_lock_t *lock,
                                                apr_pool_t *pool);
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 svn_error_t *svn_swig_rb_just_call(void *baton);
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 void svn_swig_rb_setup_ra_callbacks(svn_ra_callbacks2_t **callbacks,
                                     void **baton,
                                     VALUE rb_callbacks,
                                     apr_pool_t *pool);
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 svn_error_t *svn_swig_rb_ra_lock_callback(void *baton,
                                           const char *path,
                                           svn_boolean_t do_lock,
@@ -349,7 +270,6 @@ svn_error_t *svn_swig_rb_ra_lock_callback(void *baton,
                                           svn_error_t *ra_err,
                                           apr_pool_t *pool);
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 svn_error_t *svn_swig_rb_ra_file_rev_handler(void *baton,
                                              const char *path,
                                              svn_revnum_t rev,
@@ -359,13 +279,11 @@ svn_error_t *svn_swig_rb_ra_file_rev_handler(void *baton,
                                              apr_array_header_t *prop_diffs,
                                              apr_pool_t *pool);
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 svn_error_t *svn_swig_rb_repos_history_func(void *baton,
                                             const char *path,
                                             svn_revnum_t revision,
                                             apr_pool_t *pool);
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 svn_error_t *svn_swig_rb_repos_file_rev_handler(void *baton,
                                                 const char *path,
                                                 svn_revnum_t rev,
@@ -375,7 +293,6 @@ svn_error_t *svn_swig_rb_repos_file_rev_handler(void *baton,
                                                 apr_array_header_t *prop_diffs,
                                                 apr_pool_t *pool);
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 svn_error_t *svn_swig_rb_wc_relocation_validator3(void *baton,
                                                   const char *uuid,
                                                   const char *url,
@@ -384,14 +301,12 @@ svn_error_t *svn_swig_rb_wc_relocation_validator3(void *baton,
 
 
 /* auth provider callbacks */
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 svn_error_t * svn_swig_rb_auth_gnome_keyring_unlock_prompt_func(
     char **keyring_passwd,
     const char *keyring_name,
     void *baton,
     apr_pool_t *pool);
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 svn_error_t *svn_swig_rb_auth_simple_prompt_func(
     svn_auth_cred_simple_t **cred,
     void *baton,
@@ -400,7 +315,6 @@ svn_error_t *svn_swig_rb_auth_simple_prompt_func(
     svn_boolean_t may_save,
     apr_pool_t *pool);
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 svn_error_t *svn_swig_rb_auth_username_prompt_func(
     svn_auth_cred_username_t **cred,
     void *baton,
@@ -408,7 +322,6 @@ svn_error_t *svn_swig_rb_auth_username_prompt_func(
     svn_boolean_t may_save,
     apr_pool_t *pool);
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 svn_error_t *svn_swig_rb_auth_ssl_server_trust_prompt_func(
     svn_auth_cred_ssl_server_trust_t **cred,
     void *baton,
@@ -418,7 +331,6 @@ svn_error_t *svn_swig_rb_auth_ssl_server_trust_prompt_func(
     svn_boolean_t may_save,
     apr_pool_t *pool);
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 svn_error_t *svn_swig_rb_auth_ssl_client_cert_prompt_func(
     svn_auth_cred_ssl_client_cert_t **cred,
     void *baton,
@@ -426,7 +338,6 @@ svn_error_t *svn_swig_rb_auth_ssl_client_cert_prompt_func(
     svn_boolean_t may_save,
     apr_pool_t *pool);
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 svn_error_t *svn_swig_rb_auth_ssl_client_cert_pw_prompt_func(
     svn_auth_cred_ssl_client_cert_pw_t **cred,
     void *baton,
@@ -434,27 +345,20 @@ svn_error_t *svn_swig_rb_auth_ssl_client_cert_pw_prompt_func(
     svn_boolean_t may_save,
     apr_pool_t *pool);
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 apr_file_t *svn_swig_rb_make_file(VALUE file, apr_pool_t *pool);
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 svn_stream_t *svn_swig_rb_make_stream(VALUE io);
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 VALUE svn_swig_rb_filename_to_temp_file(const char *file_name);
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 void svn_swig_rb_set_revision(svn_opt_revision_t *rev, VALUE value);
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 void svn_swig_rb_adjust_arg_for_client_ctx_and_pool(int *argc, VALUE **argv);
 
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 void svn_swig_rb_wc_status_func(void *baton,
                                 const char *path,
                                 svn_wc_status2_t *status);
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 svn_error_t *svn_swig_rb_client_blame_receiver_func(void *baton,
                                                     apr_int64_t line_no,
                                                     svn_revnum_t revision,
@@ -464,39 +368,27 @@ svn_error_t *svn_swig_rb_client_blame_receiver_func(void *baton,
                                                     apr_pool_t *pool);
 
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 svn_wc_entry_callbacks2_t *svn_swig_rb_wc_entry_callbacks2(void);
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 svn_wc_diff_callbacks2_t *svn_swig_rb_wc_diff_callbacks2(void);
 
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 VALUE svn_swig_rb_make_txdelta_window_handler_wrapper(VALUE *rb_handler_pool,
                                                       apr_pool_t **handler_pool,
                                                       svn_txdelta_window_handler_t **handler,
                                                       void ***handler_baton);
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 VALUE svn_swig_rb_setup_txdelta_window_handler_wrapper(VALUE obj,
                                                        svn_txdelta_window_handler_t handler,
                                                        void *handler_baton);
-SVN_RB_SWIG_SWIGUTIL_EXPORT
-svn_error_t *svn_swig_rb_invoke_txdelta_window_handler(VALUE window_handler,
-                                                       svn_txdelta_window_t *window,
-                                                       apr_pool_t *pool);
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 svn_error_t *svn_swig_rb_invoke_txdelta_window_handler_wrapper(VALUE obj,
                                                                svn_txdelta_window_t *window,
                                                                apr_pool_t *pool);
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 VALUE svn_swig_rb_txdelta_window_t_ops_get(svn_txdelta_window_t *window);
 
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 svn_error_t *svn_swig_rb_client_diff_summarize_func(const svn_client_diff_summarize_t *diff,
                                                     void *baton,
                                                     apr_pool_t *pool);
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 svn_error_t *svn_swig_rb_client_list_func(void *baton,
                                           const char *path,
                                           const svn_dirent_t *dirent,
@@ -504,20 +396,17 @@ svn_error_t *svn_swig_rb_client_list_func(void *baton,
                                           const char *abs_path,
                                           apr_pool_t *pool);
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 svn_error_t *svn_swig_rb_proplist_receiver(void *baton,
                                            const char *path,
                                            apr_hash_t *prop_hash,
                                            apr_pool_t *pool);
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
 svn_error_t *svn_swig_rb_changelist_receiver(void *baton,
                                              const char *path,
                                              const char *changelist,
                                              apr_pool_t *pool);
 
-SVN_RB_SWIG_SWIGUTIL_EXPORT
-extern svn_ra_reporter3_t *svn_swig_rb_ra_reporter3;
+svn_ra_reporter3_t *svn_swig_rb_get_ra_reporter3();
 
 #ifdef __cplusplus
 }
diff --git a/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h b/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h
new file mode 100644
index 0000000..bc8eb6e
--- /dev/null
+++ b/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb__pre_ruby.h
@@ -0,0 +1,99 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+#ifndef SVN_SWIG_SWIGUTIL_RB__PRE_RUBY_H
+#define SVN_SWIG_SWIGUTIL_RB__PRE_RUBY_H
+
+#if defined(SVN_SWIG_RUBY__CUSTOM_RUBY_CONFIG) && defined(_MSC_VER)
+/* The standard install of Ruby on Windows 1.9 expects to be build with MINGW,
+   a gcc compatible toolchain. Since 1.8 they removed much of the compatibility
+   with Visual C++, but we can't build with MingW as that would break APR
+   binary compatibility.
+ */
+
+#include <ruby/config.h>
+
+#undef NORETURN
+#undef DEPRECATED
+#undef FUNC_STDCALL
+#undef FUNC_CDECL
+#undef FUNC_FASTCALL
+#undef RUBY_ALIAS_FUNCTION_TYPE
+#undef RUBY_ALIAS_FUNCTION_VOID
+#undef HAVE_GCC_ATOMIC_BUILTINS
+#undef RUBY_FUNC_EXPORTED
+#undef RUBY_FUNC_EXPORTED
+#undef RUBY_EXTERN
+
+#define NORETURN(x) __declspec(noreturn) x
+#define RUBY_EXTERN extern __declspec(dllimport)
+
+/* Yuck. But this makes ruby happy */
+#undef pid_t
+#undef uid_t
+#undef gid_t
+typedef  int pid_t;
+typedef  int uid_t;
+typedef  int gid_t;
+
+#if !defined(__cplusplus) && !defined(inline)
+#define inline __inline
+#endif
+typedef long ssize_t;
+
+/* Don't define iovec when including APR */
+#define APR_IOVEC_DEFINED
+
+/* Undefine headers that aren't available in Visual C++, but config.h says
+   are available. */
+#undef HAVE_UNISTD_H
+
+/* Visual C++ >= 2010 has <stdint.h> */
+#if _MSC_VER < 1600
+#undef HAVE_STDINT_H
+
+typedef signed __int8      int8_t;
+typedef signed __int16     int16_t;
+typedef signed __int32     int32_t;
+typedef signed __int64     int64_t;
+typedef unsigned __int8    uint8_t;
+typedef unsigned __int16   uint16_t;
+typedef unsigned __int32   uint32_t;
+typedef unsigned __int64   uint64_t;
+#endif
+
+/* Visual C++ >= 2013 has <inttypes.h> */
+#if _MSC_VER < 1800
+#undef HAVE_INTTYPES_H
+#endif
+
+/* Visual Studio >= 2015 has timespec defined */
+#if _MSC_VER >= 1900
+#define HAVE_STRUCT_TIMESPEC
+#endif
+
+#ifdef _MSC_VER
+#pragma warning(disable: 4702) /* warning C4702: unreachable code */
+#endif
+
+#endif /* defined(SVN_SWIG_RUBY__CUSTOM_RUBY_CONFIG) && defined(_MSC_VER) */
+
+#endif /* SVN_SWIG_SWIGUTIL_RB__PRE_RUBY_H */
diff --git a/subversion/bindings/swig/ruby/svn_client.c b/subversion/bindings/swig/ruby/svn_client.c
index f9ac920..8c7043b 100644
--- a/subversion/bindings/swig/ruby/svn_client.c
+++ b/subversion/bindings/swig/ruby/svn_client.c
@@ -1,11 +1,11 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
- * 
- * This file is not intended to be easily readable and contains a number of 
+ * Version 2.0.12
+ *
+ * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
- * changes to this file unless you know what you are doing--modify the SWIG 
- * interface file instead. 
+ * changes to this file unless you know what you are doing--modify the SWIG
+ * interface file instead.
  * ----------------------------------------------------------------------------- */
 
 #define SWIGRUBY
@@ -41,28 +41,28 @@
 #ifndef SWIGUNUSED
 # if defined(__GNUC__)
 #   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__)) 
+#     define SWIGUNUSED __attribute__ ((__unused__))
 #   else
 #     define SWIGUNUSED
 #   endif
 # elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__)) 
+#   define SWIGUNUSED __attribute__ ((__unused__))
 # else
-#   define SWIGUNUSED 
+#   define SWIGUNUSED
 # endif
 #endif
 
 #ifndef SWIG_MSC_UNSUPPRESS_4505
 # if defined(_MSC_VER)
 #   pragma warning(disable : 4505) /* unreferenced local function has been removed */
-# endif 
+# endif
 #endif
 
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
 # else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
 # endif
 #endif
 
@@ -105,7 +105,7 @@
 #   define SWIGSTDCALL __stdcall
 # else
 #   define SWIGSTDCALL
-# endif 
+# endif
 #endif
 
 /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
@@ -150,28 +150,28 @@
 #ifndef SWIGUNUSED
 # if defined(__GNUC__)
 #   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__)) 
+#     define SWIGUNUSED __attribute__ ((__unused__))
 #   else
 #     define SWIGUNUSED
 #   endif
 # elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__)) 
+#   define SWIGUNUSED __attribute__ ((__unused__))
 # else
-#   define SWIGUNUSED 
+#   define SWIGUNUSED
 # endif
 #endif
 
 #ifndef SWIG_MSC_UNSUPPRESS_4505
 # if defined(_MSC_VER)
 #   pragma warning(disable : 4505) /* unreferenced local function has been removed */
-# endif 
+# endif
 #endif
 
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
 # else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
 # endif
 #endif
 
@@ -214,7 +214,7 @@
 #   define SWIGSTDCALL __stdcall
 # else
 #   define SWIGSTDCALL
-# endif 
+# endif
 #endif
 
 /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
@@ -252,7 +252,7 @@
   You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for
   creating a static or dynamic library from the SWIG runtime code.
   In 99.9% of the cases, SWIG just needs to declare them as 'static'.
-  
+
   But only do this if strictly necessary, ie, if you have problems
   with your compiler or suchlike.
 */
@@ -278,16 +278,16 @@
 #define SWIG_POINTER_OWN           0x1
 
 
-/* 
+/*
    Flags/methods for returning states.
-   
-   The SWIG conversion methods, as ConvertPtr, return an integer 
+
+   The SWIG conversion methods, as ConvertPtr, return an integer
    that tells if the conversion was successful or not. And if not,
    an error code can be returned (see swigerrors.swg for the codes).
-   
+
    Use the following macros/flags to set or process the returning
    states.
-   
+
    In old versions of SWIG, code such as the following was usually written:
 
      if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) {
@@ -320,23 +320,23 @@
     } else {
       // fail code
     }
-    
+
    I.e., now SWIG_ConvertPtr can return new objects and you can
    identify the case and take care of the deallocation. Of course that
    also requires SWIG_ConvertPtr to return new result values, such as
 
-      int SWIG_ConvertPtr(obj, ptr,...) {         
-        if (<obj is ok>) {			       
-          if (<need new object>) {		       
-            *ptr = <ptr to new allocated object>; 
-            return SWIG_NEWOBJ;		       
-          } else {				       
-            *ptr = <ptr to old object>;	       
-            return SWIG_OLDOBJ;		       
-          } 				       
-        } else {				       
-          return SWIG_BADOBJ;		       
-        }					       
+      int SWIG_ConvertPtr(obj, ptr,...) {
+        if (<obj is ok>) {
+          if (<need new object>) {
+            *ptr = <ptr to new allocated object>;
+            return SWIG_NEWOBJ;
+          } else {
+            *ptr = <ptr to old object>;
+            return SWIG_OLDOBJ;
+          }
+        } else {
+          return SWIG_BADOBJ;
+        }
       }
 
    Of course, returning the plain '0(success)/-1(fail)' still works, but you can be
@@ -350,17 +350,17 @@
        int fooi(int);
 
    and you call
- 
+
       food(1)   // cast rank '1'  (1 -> 1.0)
       fooi(1)   // cast rank '0'
 
    just use the SWIG_AddCast()/SWIG_CheckState()
 */
 
-#define SWIG_OK                    (0) 
+#define SWIG_OK                    (0)
 #define SWIG_ERROR                 (-1)
 #define SWIG_IsOK(r)               (r >= 0)
-#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)  
+#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)
 
 /* The CastRankLimit says how many bits are used for the cast rank */
 #define SWIG_CASTRANKLIMIT         (1 << 8)
@@ -391,14 +391,14 @@
 #  endif
 #  define SWIG_CASTRANKMASK          ((SWIG_CASTRANKLIMIT) -1)
 #  define SWIG_CastRank(r)           (r & SWIG_CASTRANKMASK)
-SWIGINTERNINLINE int SWIG_AddCast(int r) { 
+SWIGINTERNINLINE int SWIG_AddCast(int r) {
   return SWIG_IsOK(r) ? ((SWIG_CastRank(r) < SWIG_MAXCASTRANK) ? (r + 1) : SWIG_ERROR) : r;
 }
-SWIGINTERNINLINE int SWIG_CheckState(int r) { 
-  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0; 
+SWIGINTERNINLINE int SWIG_CheckState(int r) {
+  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0;
 }
 #else /* no cast-rank mode */
-#  define SWIG_AddCast
+#  define SWIG_AddCast(r) (r)
 #  define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0)
 #endif
 
@@ -442,7 +442,7 @@ typedef struct swig_module_info {
   void                    *clientdata;		/* Language specific module data */
 } swig_module_info;
 
-/* 
+/*
   Compare two type names skipping the space characters, therefore
   "char*" == "char *" and "Class<int>" == "Class<int >", etc.
 
@@ -462,18 +462,18 @@ SWIG_TypeNameComp(const char *f1, const char *l1,
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if not equal, 1 if equal
+  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
 */
 SWIGRUNTIME int
-SWIG_TypeEquiv(const char *nb, const char *tb) {
-  int equiv = 0;
+SWIG_TypeCmp(const char *nb, const char *tb) {
+  int equiv = 1;
   const char* te = tb + strlen(tb);
   const char* ne = nb;
-  while (!equiv && *ne) {
+  while (equiv != 0 && *ne) {
     for (nb = ne; *ne; ++ne) {
       if (*ne == '|') break;
     }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
+    equiv = SWIG_TypeNameComp(nb, ne, tb, te);
     if (*ne) ++ne;
   }
   return equiv;
@@ -481,24 +481,13 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
+  Return 0 if not equal, 1 if equal
 */
 SWIGRUNTIME int
-SWIG_TypeCompare(const char *nb, const char *tb) {
-  int equiv = 0;
-  const char* te = tb + strlen(tb);
-  const char* ne = nb;
-  while (!equiv && *ne) {
-    for (nb = ne; *ne; ++ne) {
-      if (*ne == '|') break;
-    }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
-    if (*ne) ++ne;
-  }
-  return equiv;
+SWIG_TypeEquiv(const char *nb, const char *tb) {
+  return SWIG_TypeCmp(nb, tb) == 0 ? 1 : 0;
 }
 
-
 /*
   Check the typename
 */
@@ -526,7 +515,7 @@ SWIG_TypeCheck(const char *c, swig_type_info *ty) {
   return 0;
 }
 
-/* 
+/*
   Identical to SWIG_TypeCheck, except strcmp is replaced with a pointer comparison
 */
 SWIGRUNTIME swig_cast_info *
@@ -561,7 +550,7 @@ SWIG_TypeCast(swig_cast_info *ty, void *ptr, int *newmemory) {
   return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr, newmemory);
 }
 
-/* 
+/*
    Dynamic pointer casting. Down an inheritance hierarchy
 */
 SWIGRUNTIME swig_type_info *
@@ -605,7 +594,7 @@ SWIG_TypePrettyName(const swig_type_info *type) {
     return type->name;
 }
 
-/* 
+/*
    Set the clientdata field for a type
 */
 SWIGRUNTIME void
@@ -613,14 +602,14 @@ SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
   swig_cast_info *cast = ti->cast;
   /* if (ti->clientdata == clientdata) return; */
   ti->clientdata = clientdata;
-  
+
   while (cast) {
     if (!cast->converter) {
       swig_type_info *tc = cast->type;
       if (!tc->clientdata) {
 	SWIG_TypeClientData(tc, clientdata);
       }
-    }    
+    }
     cast = cast->next;
   }
 }
@@ -629,18 +618,18 @@ SWIG_TypeNewClientData(swig_type_info *ti, void *clientdata) {
   SWIG_TypeClientData(ti, clientdata);
   ti->owndata = 1;
 }
-  
+
 /*
   Search for a swig_type_info structure only by mangled name
   Search is a O(log #types)
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_MangledTypeQueryModule(swig_module_info *start, 
-                            swig_module_info *end, 
+SWIG_MangledTypeQueryModule(swig_module_info *start,
+                            swig_module_info *end,
 		            const char *name) {
   swig_module_info *iter = start;
   do {
@@ -649,11 +638,11 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
       register size_t r = iter->size - 1;
       do {
 	/* since l+r >= 0, we can (>> 1) instead (/ 2) */
-	register size_t i = (l + r) >> 1; 
+	register size_t i = (l + r) >> 1;
 	const char *iname = iter->types[i]->name;
 	if (iname) {
 	  register int compare = strcmp(name, iname);
-	  if (compare == 0) {	    
+	  if (compare == 0) {
 	    return iter->types[i];
 	  } else if (compare < 0) {
 	    if (i) {
@@ -678,14 +667,14 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
   Search for a swig_type_info structure for either a mangled name or a human readable name.
   It first searches the mangled names of the types, which is a O(log #types)
   If a type is not found it then searches the human readable names, which is O(#types).
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_TypeQueryModule(swig_module_info *start, 
-                     swig_module_info *end, 
+SWIG_TypeQueryModule(swig_module_info *start,
+                     swig_module_info *end,
 		     const char *name) {
   /* STEP 1: Search the name field using binary search */
   swig_type_info *ret = SWIG_MangledTypeQueryModule(start, end, name);
@@ -704,12 +693,12 @@ SWIG_TypeQueryModule(swig_module_info *start,
       iter = iter->next;
     } while (iter != end);
   }
-  
+
   /* neither found a match */
   return 0;
 }
 
-/* 
+/*
    Pack binary data into a string
 */
 SWIGRUNTIME char *
@@ -725,7 +714,7 @@ SWIG_PackData(char *c, void *ptr, size_t sz) {
   return c;
 }
 
-/* 
+/*
    Unpack binary data from a string
 */
 SWIGRUNTIME const char *
@@ -739,21 +728,21 @@ SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
       uu = ((d - '0') << 4);
     else if ((d >= 'a') && (d <= 'f'))
       uu = ((d - ('a'-10)) << 4);
-    else 
+    else
       return (char *) 0;
     d = *(c++);
     if ((d >= '0') && (d <= '9'))
       uu |= (d - '0');
     else if ((d >= 'a') && (d <= 'f'))
       uu |= (d - ('a'-10));
-    else 
+    else
       return (char *) 0;
     *u = uu;
   }
   return c;
 }
 
-/* 
+/*
    Pack 'void *' into a string buffer.
 */
 SWIGRUNTIME char *
@@ -813,18 +802,18 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 #endif
 
 /*  Errors in SWIG */
-#define  SWIG_UnknownError    	   -1 
-#define  SWIG_IOError        	   -2 
-#define  SWIG_RuntimeError   	   -3 
-#define  SWIG_IndexError     	   -4 
-#define  SWIG_TypeError      	   -5 
-#define  SWIG_DivisionByZero 	   -6 
-#define  SWIG_OverflowError  	   -7 
-#define  SWIG_SyntaxError    	   -8 
-#define  SWIG_ValueError     	   -9 
+#define  SWIG_UnknownError    	   -1
+#define  SWIG_IOError        	   -2
+#define  SWIG_RuntimeError   	   -3
+#define  SWIG_IndexError     	   -4
+#define  SWIG_TypeError      	   -5
+#define  SWIG_DivisionByZero 	   -6
+#define  SWIG_OverflowError  	   -7
+#define  SWIG_SyntaxError    	   -8
+#define  SWIG_ValueError     	   -9
 #define  SWIG_SystemError    	   -10
 #define  SWIG_AttributeError 	   -11
-#define  SWIG_MemoryError    	   -12 
+#define  SWIG_MemoryError    	   -12
 #define  SWIG_NullReferenceError   -13
 
 
@@ -1750,7 +1739,7 @@ SWIG_Ruby_SetModule(swig_module_info *pointer)
 SWIGINTERN
 int SWIG_Ruby_isCallable( VALUE proc )
 {
-  if ( rb_respond_to( proc, swig_call_id ) == Qtrue )
+  if ( rb_respond_to( proc, swig_call_id ) )
     return 1;
   return 0;
 }
@@ -1763,7 +1752,7 @@ int SWIG_Ruby_isCallable( VALUE proc )
 SWIGINTERN
 int SWIG_Ruby_arity( VALUE proc, int minimal )
 {
-  if ( rb_respond_to( proc, swig_arity_id ) == Qtrue )
+  if ( rb_respond_to( proc, swig_arity_id ) )
     {
       VALUE num = rb_funcall( proc, swig_arity_id, 0 );
       int arity = NUM2INT(num);
@@ -1809,134 +1798,134 @@ int SWIG_Ruby_arity( VALUE proc, int minimal )
 #define SWIGTYPE_p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[14]
 #define SWIGTYPE_p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[15]
 #define SWIGTYPE_p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[16]
-#define SWIGTYPE_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t swig_types[17]
-#define SWIGTYPE_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[18]
-#define SWIGTYPE_p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[19]
-#define SWIGTYPE_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[20]
-#define SWIGTYPE_p_f_p_void__p_svn_error_t swig_types[21]
-#define SWIGTYPE_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[22]
-#define SWIGTYPE_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[23]
-#define SWIGTYPE_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[24]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void swig_types[25]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[26]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[27]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[28]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_client_info2_t_p_apr_pool_t__p_svn_error_t swig_types[29]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t swig_types[30]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[31]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[32]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t swig_types[33]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void swig_types[34]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void swig_types[35]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t swig_types[36]
-#define SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void swig_types[37]
-#define SWIGTYPE_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[38]
-#define SWIGTYPE_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__svn_io_dirent2_t_p_apr_pool_t__p_svn_error_t swig_types[39]
-#define SWIGTYPE_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t swig_types[40]
-#define SWIGTYPE_p_f_p_void_svn_revnum_t_svn_revnum_t_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[41]
-#define SWIGTYPE_p_int swig_types[42]
-#define SWIGTYPE_p_long swig_types[43]
-#define SWIGTYPE_p_p_apr_array_header_t swig_types[44]
-#define SWIGTYPE_p_p_apr_hash_t swig_types[45]
-#define SWIGTYPE_p_p_char swig_types[46]
-#define SWIGTYPE_p_p_svn_auth_provider_object_t swig_types[47]
-#define SWIGTYPE_p_p_svn_client_commit_info_t swig_types[48]
-#define SWIGTYPE_p_p_svn_client_ctx_t swig_types[49]
-#define SWIGTYPE_p_p_svn_commit_info_t swig_types[50]
-#define SWIGTYPE_p_p_svn_ra_session_t swig_types[51]
-#define SWIGTYPE_p_p_svn_string_t swig_types[52]
-#define SWIGTYPE_p_svn_auth_baton_t swig_types[53]
-#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[54]
-#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[55]
-#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[56]
-#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[57]
-#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[58]
-#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[59]
-#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[60]
-#define SWIGTYPE_p_svn_auth_provider_t swig_types[61]
-#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[62]
-#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[63]
-#define SWIGTYPE_p_svn_checksum_kind_t swig_types[64]
-#define SWIGTYPE_p_svn_checksum_t swig_types[65]
-#define SWIGTYPE_p_svn_client_commit_info_t swig_types[66]
-#define SWIGTYPE_p_svn_client_commit_item2_t swig_types[67]
-#define SWIGTYPE_p_svn_client_commit_item3_t swig_types[68]
-#define SWIGTYPE_p_svn_client_commit_item_t swig_types[69]
-#define SWIGTYPE_p_svn_client_copy_source_t swig_types[70]
-#define SWIGTYPE_p_svn_client_ctx_t swig_types[71]
-#define SWIGTYPE_p_svn_client_diff_summarize_kind_t swig_types[72]
-#define SWIGTYPE_p_svn_client_diff_summarize_t swig_types[73]
-#define SWIGTYPE_p_svn_client_info2_t swig_types[74]
-#define SWIGTYPE_p_svn_client_proplist_item_t swig_types[75]
-#define SWIGTYPE_p_svn_client_status_t swig_types[76]
-#define SWIGTYPE_p_svn_commit_info_t swig_types[77]
-#define SWIGTYPE_p_svn_config_t swig_types[78]
-#define SWIGTYPE_p_svn_delta_editor_t swig_types[79]
-#define SWIGTYPE_p_svn_depth_t swig_types[80]
-#define SWIGTYPE_p_svn_diff_conflict_display_style_t swig_types[81]
-#define SWIGTYPE_p_svn_diff_datasource_e swig_types[82]
-#define SWIGTYPE_p_svn_diff_file_ignore_space_t swig_types[83]
-#define SWIGTYPE_p_svn_diff_file_options_t swig_types[84]
-#define SWIGTYPE_p_svn_diff_fns2_t swig_types[85]
-#define SWIGTYPE_p_svn_diff_fns_t swig_types[86]
-#define SWIGTYPE_p_svn_diff_hunk_t swig_types[87]
-#define SWIGTYPE_p_svn_diff_operation_kind_e swig_types[88]
-#define SWIGTYPE_p_svn_diff_output_fns_t swig_types[89]
-#define SWIGTYPE_p_svn_diff_t swig_types[90]
-#define SWIGTYPE_p_svn_dirent_t swig_types[91]
-#define SWIGTYPE_p_svn_errno_t swig_types[92]
-#define SWIGTYPE_p_svn_error_t swig_types[93]
-#define SWIGTYPE_p_svn_info_t swig_types[94]
-#define SWIGTYPE_p_svn_io_dirent2_t swig_types[95]
-#define SWIGTYPE_p_svn_io_dirent_t swig_types[96]
-#define SWIGTYPE_p_svn_io_file_del_t swig_types[97]
-#define SWIGTYPE_p_svn_location_segment_t swig_types[98]
-#define SWIGTYPE_p_svn_lock_t swig_types[99]
-#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[100]
-#define SWIGTYPE_p_svn_log_changed_path_t swig_types[101]
-#define SWIGTYPE_p_svn_log_entry_t swig_types[102]
-#define SWIGTYPE_p_svn_merge_range_t swig_types[103]
-#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[104]
-#define SWIGTYPE_p_svn_node_kind_t swig_types[105]
-#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[106]
-#define SWIGTYPE_p_svn_opt_revision_t swig_types[107]
-#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[108]
-#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[109]
-#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[110]
-#define SWIGTYPE_p_svn_patch_file_t swig_types[111]
-#define SWIGTYPE_p_svn_patch_t swig_types[112]
-#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[113]
-#define SWIGTYPE_p_svn_prop_kind swig_types[114]
-#define SWIGTYPE_p_svn_prop_patch_t swig_types[115]
-#define SWIGTYPE_p_svn_ra_callbacks2_t swig_types[116]
-#define SWIGTYPE_p_svn_ra_callbacks_t swig_types[117]
-#define SWIGTYPE_p_svn_ra_plugin_t swig_types[118]
-#define SWIGTYPE_p_svn_ra_reporter2_t swig_types[119]
-#define SWIGTYPE_p_svn_ra_reporter3_t swig_types[120]
-#define SWIGTYPE_p_svn_ra_reporter_t swig_types[121]
-#define SWIGTYPE_p_svn_ra_session_t swig_types[122]
-#define SWIGTYPE_p_svn_stream_mark_t swig_types[123]
-#define SWIGTYPE_p_svn_stream_t swig_types[124]
-#define SWIGTYPE_p_svn_string_t swig_types[125]
-#define SWIGTYPE_p_svn_stringbuf_t swig_types[126]
-#define SWIGTYPE_p_svn_tristate_t swig_types[127]
-#define SWIGTYPE_p_svn_txdelta_op_t swig_types[128]
-#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[129]
-#define SWIGTYPE_p_svn_txdelta_window_t swig_types[130]
-#define SWIGTYPE_p_svn_version_checklist_t swig_types[131]
-#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[132]
-#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[133]
-#define SWIGTYPE_p_svn_version_extended_t swig_types[134]
-#define SWIGTYPE_p_svn_version_t swig_types[135]
-#define SWIGTYPE_p_svn_wc_adm_access_t swig_types[136]
-#define SWIGTYPE_p_svn_wc_committed_queue_t swig_types[137]
-#define SWIGTYPE_p_svn_wc_conflict_action_t swig_types[138]
-#define SWIGTYPE_p_svn_wc_conflict_choice_t swig_types[139]
-#define SWIGTYPE_p_svn_wc_conflict_description2_t swig_types[140]
-#define SWIGTYPE_p_svn_wc_conflict_description_t swig_types[141]
-#define SWIGTYPE_p_svn_wc_conflict_kind_t swig_types[142]
-#define SWIGTYPE_p_svn_wc_conflict_reason_t swig_types[143]
-#define SWIGTYPE_p_svn_wc_conflict_result_t swig_types[144]
+#define SWIGTYPE_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[17]
+#define SWIGTYPE_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t swig_types[18]
+#define SWIGTYPE_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[19]
+#define SWIGTYPE_p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[20]
+#define SWIGTYPE_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[21]
+#define SWIGTYPE_p_f_p_void__p_svn_error_t swig_types[22]
+#define SWIGTYPE_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[23]
+#define SWIGTYPE_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[24]
+#define SWIGTYPE_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[25]
+#define SWIGTYPE_p_f_p_void_p_q_const__char__int swig_types[26]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void swig_types[27]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[28]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[29]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[30]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_client_info2_t_p_apr_pool_t__p_svn_error_t swig_types[31]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t swig_types[32]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[33]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_dirent_t_p_q_const__svn_lock_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[34]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_info_t_p_apr_pool_t__p_svn_error_t swig_types[35]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_struct_svn_wc_status2_t__void swig_types[36]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_struct_svn_wc_status_t__void swig_types[37]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_svn_wc_status2_t_p_apr_pool_t__p_svn_error_t swig_types[38]
+#define SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void swig_types[39]
+#define SWIGTYPE_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[40]
+#define SWIGTYPE_p_f_p_void_p_svn_boolean_t_p_q_const__char_p_q_const__svn_io_dirent2_t_p_apr_pool_t__p_svn_error_t swig_types[41]
+#define SWIGTYPE_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t swig_types[42]
+#define SWIGTYPE_p_f_p_void_svn_revnum_t_svn_revnum_t_apr_int64_t_svn_revnum_t_p_apr_hash_t_svn_revnum_t_p_apr_hash_t_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[43]
+#define SWIGTYPE_p_int swig_types[44]
+#define SWIGTYPE_p_long swig_types[45]
+#define SWIGTYPE_p_p_apr_array_header_t swig_types[46]
+#define SWIGTYPE_p_p_apr_hash_t swig_types[47]
+#define SWIGTYPE_p_p_char swig_types[48]
+#define SWIGTYPE_p_p_svn_auth_provider_object_t swig_types[49]
+#define SWIGTYPE_p_p_svn_client_commit_info_t swig_types[50]
+#define SWIGTYPE_p_p_svn_client_ctx_t swig_types[51]
+#define SWIGTYPE_p_p_svn_commit_info_t swig_types[52]
+#define SWIGTYPE_p_p_svn_ra_session_t swig_types[53]
+#define SWIGTYPE_p_p_svn_string_t swig_types[54]
+#define SWIGTYPE_p_svn_auth_baton_t swig_types[55]
+#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[56]
+#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[57]
+#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[58]
+#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[59]
+#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[60]
+#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[61]
+#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[62]
+#define SWIGTYPE_p_svn_auth_provider_t swig_types[63]
+#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[64]
+#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[65]
+#define SWIGTYPE_p_svn_checksum_kind_t swig_types[66]
+#define SWIGTYPE_p_svn_checksum_t swig_types[67]
+#define SWIGTYPE_p_svn_client_commit_info_t swig_types[68]
+#define SWIGTYPE_p_svn_client_commit_item2_t swig_types[69]
+#define SWIGTYPE_p_svn_client_commit_item3_t swig_types[70]
+#define SWIGTYPE_p_svn_client_commit_item_t swig_types[71]
+#define SWIGTYPE_p_svn_client_copy_source_t swig_types[72]
+#define SWIGTYPE_p_svn_client_ctx_t swig_types[73]
+#define SWIGTYPE_p_svn_client_diff_summarize_kind_t swig_types[74]
+#define SWIGTYPE_p_svn_client_diff_summarize_t swig_types[75]
+#define SWIGTYPE_p_svn_client_info2_t swig_types[76]
+#define SWIGTYPE_p_svn_client_proplist_item_t swig_types[77]
+#define SWIGTYPE_p_svn_client_status_t swig_types[78]
+#define SWIGTYPE_p_svn_commit_info_t swig_types[79]
+#define SWIGTYPE_p_svn_config_t swig_types[80]
+#define SWIGTYPE_p_svn_delta_editor_t swig_types[81]
+#define SWIGTYPE_p_svn_depth_t swig_types[82]
+#define SWIGTYPE_p_svn_diff_conflict_display_style_t swig_types[83]
+#define SWIGTYPE_p_svn_diff_datasource_e swig_types[84]
+#define SWIGTYPE_p_svn_diff_file_ignore_space_t swig_types[85]
+#define SWIGTYPE_p_svn_diff_file_options_t swig_types[86]
+#define SWIGTYPE_p_svn_diff_fns2_t swig_types[87]
+#define SWIGTYPE_p_svn_diff_fns_t swig_types[88]
+#define SWIGTYPE_p_svn_diff_hunk_t swig_types[89]
+#define SWIGTYPE_p_svn_diff_operation_kind_e swig_types[90]
+#define SWIGTYPE_p_svn_diff_output_fns_t swig_types[91]
+#define SWIGTYPE_p_svn_diff_t swig_types[92]
+#define SWIGTYPE_p_svn_dirent_t swig_types[93]
+#define SWIGTYPE_p_svn_errno_t swig_types[94]
+#define SWIGTYPE_p_svn_error_t swig_types[95]
+#define SWIGTYPE_p_svn_info_t swig_types[96]
+#define SWIGTYPE_p_svn_io_dirent2_t swig_types[97]
+#define SWIGTYPE_p_svn_io_dirent_t swig_types[98]
+#define SWIGTYPE_p_svn_io_file_del_t swig_types[99]
+#define SWIGTYPE_p_svn_location_segment_t swig_types[100]
+#define SWIGTYPE_p_svn_lock_t swig_types[101]
+#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[102]
+#define SWIGTYPE_p_svn_log_changed_path_t swig_types[103]
+#define SWIGTYPE_p_svn_log_entry_t swig_types[104]
+#define SWIGTYPE_p_svn_merge_range_t swig_types[105]
+#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[106]
+#define SWIGTYPE_p_svn_node_kind_t swig_types[107]
+#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[108]
+#define SWIGTYPE_p_svn_opt_revision_t swig_types[109]
+#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[110]
+#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[111]
+#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[112]
+#define SWIGTYPE_p_svn_patch_file_t swig_types[113]
+#define SWIGTYPE_p_svn_patch_t swig_types[114]
+#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[115]
+#define SWIGTYPE_p_svn_prop_kind swig_types[116]
+#define SWIGTYPE_p_svn_prop_patch_t swig_types[117]
+#define SWIGTYPE_p_svn_ra_callbacks2_t swig_types[118]
+#define SWIGTYPE_p_svn_ra_callbacks_t swig_types[119]
+#define SWIGTYPE_p_svn_ra_plugin_t swig_types[120]
+#define SWIGTYPE_p_svn_ra_reporter2_t swig_types[121]
+#define SWIGTYPE_p_svn_ra_reporter3_t swig_types[122]
+#define SWIGTYPE_p_svn_ra_reporter_t swig_types[123]
+#define SWIGTYPE_p_svn_ra_session_t swig_types[124]
+#define SWIGTYPE_p_svn_stream_mark_t swig_types[125]
+#define SWIGTYPE_p_svn_stream_t swig_types[126]
+#define SWIGTYPE_p_svn_string_t swig_types[127]
+#define SWIGTYPE_p_svn_stringbuf_t swig_types[128]
+#define SWIGTYPE_p_svn_tristate_t swig_types[129]
+#define SWIGTYPE_p_svn_txdelta_op_t swig_types[130]
+#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[131]
+#define SWIGTYPE_p_svn_txdelta_window_t swig_types[132]
+#define SWIGTYPE_p_svn_version_checklist_t swig_types[133]
+#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[134]
+#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[135]
+#define SWIGTYPE_p_svn_version_extended_t swig_types[136]
+#define SWIGTYPE_p_svn_version_t swig_types[137]
+#define SWIGTYPE_p_svn_wc_adm_access_t swig_types[138]
+#define SWIGTYPE_p_svn_wc_committed_queue_t swig_types[139]
+#define SWIGTYPE_p_svn_wc_conflict_action_t swig_types[140]
+#define SWIGTYPE_p_svn_wc_conflict_choice_t swig_types[141]
+#define SWIGTYPE_p_svn_wc_conflict_description_t swig_types[142]
+#define SWIGTYPE_p_svn_wc_conflict_kind_t swig_types[143]
+#define SWIGTYPE_p_svn_wc_conflict_reason_t swig_types[144]
 #define SWIGTYPE_p_svn_wc_conflict_version_t swig_types[145]
 #define SWIGTYPE_p_svn_wc_context_t swig_types[146]
 #define SWIGTYPE_p_svn_wc_diff_callbacks2_t swig_types[147]
@@ -1979,7 +1968,7 @@ static VALUE mClient;
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x020009 
+#define SWIGVERSION 0x020012 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -2052,7 +2041,7 @@ SWIG_ruby_failed(void)
 } 
 
 
-/*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2157,7 +2146,7 @@ SWIG_From_int  (int value)
 }
 
 
-/*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2249,13 +2238,13 @@ SWIGINTERN struct svn_client_copy_source_t *new_svn_client_copy_source_t(char co
     self = apr_palloc(pool, sizeof(*self));
     self->path = path ? apr_pstrdup(pool, path) : NULL;
 
-    revision = apr_palloc(pool, sizeof(revision));
+    revision = apr_palloc(pool, sizeof(*revision));
     revision->kind = rev->kind;
     revision->value.number = rev->value.number;
     revision->value.date = rev->value.date;
     self->revision = revision;
 
-    peg_revision = apr_palloc(pool, sizeof(peg_revision));
+    peg_revision = apr_palloc(pool, sizeof(*peg_revision));
     peg_revision->kind = peg_rev->kind;
     peg_revision->value.number = peg_rev->value.number;
     peg_revision->value.date = peg_rev->value.date;
@@ -2458,7 +2447,7 @@ _wrap_svn_client_get_simple_prompt_provider(int argc, VALUE *argv, VALUE self) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
   }
   {
-    arg2 = svn_swig_rb_auth_simple_prompt_func;
+    arg2 = (svn_auth_simple_prompt_func_t) svn_swig_rb_auth_simple_prompt_func;
     arg3 = (void *)svn_swig_rb_make_baton(argv[0], _global_svn_swig_rb_pool);
   }
   ecode4 = SWIG_AsVal_int(argv[1], &val4);
@@ -2522,7 +2511,7 @@ _wrap_svn_client_get_username_prompt_provider(int argc, VALUE *argv, VALUE self)
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
   }
   {
-    arg2 = svn_swig_rb_auth_username_prompt_func;
+    arg2 = (svn_auth_username_prompt_func_t) svn_swig_rb_auth_username_prompt_func;
     arg3 = (void *)svn_swig_rb_make_baton(argv[0], _global_svn_swig_rb_pool);
   }
   ecode4 = SWIG_AsVal_int(argv[1], &val4);
@@ -2833,7 +2822,7 @@ _wrap_svn_client_get_ssl_server_trust_prompt_provider(int argc, VALUE *argv, VAL
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
   }
   {
-    arg2 = svn_swig_rb_auth_ssl_server_trust_prompt_func;
+    arg2 = (svn_auth_ssl_server_trust_prompt_func_t) svn_swig_rb_auth_ssl_server_trust_prompt_func;
     arg3 = (void *)svn_swig_rb_make_baton(argv[0], _global_svn_swig_rb_pool);
   }
   if (argc > 1) {
@@ -2892,7 +2881,7 @@ _wrap_svn_client_get_ssl_client_cert_prompt_provider(int argc, VALUE *argv, VALU
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
   }
   {
-    arg2 = svn_swig_rb_auth_ssl_client_cert_prompt_func;
+    arg2 = (svn_auth_ssl_client_cert_prompt_func_t) svn_swig_rb_auth_ssl_client_cert_prompt_func;
     arg3 = (void *)svn_swig_rb_make_baton(argv[0], _global_svn_swig_rb_pool);
   }
   ecode4 = SWIG_AsVal_int(argv[1], &val4);
@@ -2956,7 +2945,7 @@ _wrap_svn_client_get_ssl_client_cert_pw_prompt_provider(int argc, VALUE *argv, V
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
   }
   {
-    arg2 = svn_swig_rb_auth_ssl_client_cert_pw_prompt_func;
+    arg2 = (svn_auth_ssl_client_cert_pw_prompt_func_t) svn_swig_rb_auth_ssl_client_cert_pw_prompt_func;
     arg3 = (void *)svn_swig_rb_make_baton(argv[0], _global_svn_swig_rb_pool);
   }
   ecode4 = SWIG_AsVal_int(argv[1], &val4);
@@ -6761,6 +6750,161 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_svn_client_ctx_t_check_tunnel_func_set(int argc, VALUE *argv, VALUE self) {
+  struct svn_client_ctx_t *arg1 = (struct svn_client_ctx_t *) 0 ;
+  svn_ra_check_tunnel_func_t arg2 = (svn_ra_check_tunnel_func_t) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client_ctx_t *","check_tunnel_func", 1, self )); 
+  }
+  arg1 = (struct svn_client_ctx_t *)(argp1);
+  {
+    int res = SWIG_ConvertFunctionPtr(argv[0], (void**)(&arg2), SWIGTYPE_p_f_p_void_p_q_const__char__int);
+    if (!SWIG_IsOK(res)) {
+      SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_ra_check_tunnel_func_t","check_tunnel_func", 2, argv[0] )); 
+    }
+  }
+  if (arg1) (arg1)->check_tunnel_func = arg2;
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_svn_client_ctx_t_check_tunnel_func_get(int argc, VALUE *argv, VALUE self) {
+  struct svn_client_ctx_t *arg1 = (struct svn_client_ctx_t *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  svn_ra_check_tunnel_func_t result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client_ctx_t *","check_tunnel_func", 1, self )); 
+  }
+  arg1 = (struct svn_client_ctx_t *)(argp1);
+  result = (svn_ra_check_tunnel_func_t) ((arg1)->check_tunnel_func);
+  vresult = SWIG_NewFunctionPtrObj((void *)(result), SWIGTYPE_p_f_p_void_p_q_const__char__int);
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_svn_client_ctx_t_open_tunnel_func_set(int argc, VALUE *argv, VALUE self) {
+  struct svn_client_ctx_t *arg1 = (struct svn_client_ctx_t *) 0 ;
+  svn_ra_open_tunnel_func_t arg2 = (svn_ra_open_tunnel_func_t) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client_ctx_t *","open_tunnel_func", 1, self )); 
+  }
+  arg1 = (struct svn_client_ctx_t *)(argp1);
+  {
+    int res = SWIG_ConvertFunctionPtr(argv[0], (void**)(&arg2), SWIGTYPE_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t);
+    if (!SWIG_IsOK(res)) {
+      SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_ra_open_tunnel_func_t","open_tunnel_func", 2, argv[0] )); 
+    }
+  }
+  if (arg1) (arg1)->open_tunnel_func = arg2;
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_svn_client_ctx_t_open_tunnel_func_get(int argc, VALUE *argv, VALUE self) {
+  struct svn_client_ctx_t *arg1 = (struct svn_client_ctx_t *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  svn_ra_open_tunnel_func_t result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client_ctx_t *","open_tunnel_func", 1, self )); 
+  }
+  arg1 = (struct svn_client_ctx_t *)(argp1);
+  result = (svn_ra_open_tunnel_func_t) ((arg1)->open_tunnel_func);
+  vresult = SWIG_NewFunctionPtrObj((void *)(result), SWIGTYPE_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t);
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_svn_client_ctx_t_tunnel_baton_set(int argc, VALUE *argv, VALUE self) {
+  struct svn_client_ctx_t *arg1 = (struct svn_client_ctx_t *) 0 ;
+  void *arg2 = (void *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int res2 ;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client_ctx_t *","tunnel_baton", 1, self )); 
+  }
+  arg1 = (struct svn_client_ctx_t *)(argp1);
+  res2 = SWIG_ConvertPtr(argv[0],SWIG_as_voidptrptr(&arg2), 0, SWIG_POINTER_DISOWN);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "void *","tunnel_baton", 2, argv[0] )); 
+  }
+  if (arg1) (arg1)->tunnel_baton = arg2;
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_svn_client_ctx_t_tunnel_baton_get(int argc, VALUE *argv, VALUE self) {
+  struct svn_client_ctx_t *arg1 = (struct svn_client_ctx_t *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_client_ctx_t *","tunnel_baton", 1, self )); 
+  }
+  arg1 = (struct svn_client_ctx_t *)(argp1);
+  result = (void *) ((arg1)->tunnel_baton);
+  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 |  0 );
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
 SWIGINTERN VALUE
 _wrap_svn_client_ctx_t_allocate(VALUE self) {
@@ -12497,6 +12641,133 @@ fail:
 
 
 SWIGINTERN VALUE
+_wrap_svn_client_status6(int argc, VALUE *argv, VALUE self) {
+  svn_revnum_t *arg1 = (svn_revnum_t *) 0 ;
+  svn_client_ctx_t *arg2 = (svn_client_ctx_t *) 0 ;
+  char *arg3 = (char *) 0 ;
+  svn_opt_revision_t *arg4 = (svn_opt_revision_t *) 0 ;
+  svn_depth_t arg5 ;
+  svn_boolean_t arg6 ;
+  svn_boolean_t arg7 ;
+  svn_boolean_t arg8 ;
+  svn_boolean_t arg9 ;
+  svn_boolean_t arg10 ;
+  svn_boolean_t arg11 ;
+  apr_array_header_t *arg12 = (apr_array_header_t *) 0 ;
+  svn_client_status_func_t arg13 = (svn_client_status_func_t) 0 ;
+  void *arg14 = (void *) 0 ;
+  apr_pool_t *arg15 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  svn_revnum_t temp1 ;
+  int res1 = SWIG_TMPOBJ ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int res3 ;
+  char *buf3 = 0 ;
+  int alloc3 = 0 ;
+  svn_opt_revision_t rev4 ;
+  int res14 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg15);
+    _global_pool = arg15;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  arg1 = &temp1;
+  if ((argc < 13) || (argc > 14)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 13)",argc); SWIG_fail;
+  }
+  res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "svn_client_ctx_t *","svn_client_status6", 2, argv[0] )); 
+  }
+  arg2 = (svn_client_ctx_t *)(argp2);
+  res3 = SWIG_AsCharPtrAndSize(argv[1], &buf3, NULL, &alloc3);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "char const *","svn_client_status6", 3, argv[1] ));
+  }
+  arg3 = (char *)(buf3);
+  {
+    arg4 = &rev4;
+    svn_swig_rb_set_revision(&rev4, argv[2]);
+  }
+  {
+    arg5 = svn_swig_rb_to_depth(argv[3]);
+  }
+  arg6 = RTEST(argv[4]);
+  arg7 = RTEST(argv[5]);
+  arg8 = RTEST(argv[6]);
+  arg9 = RTEST(argv[7]);
+  arg10 = RTEST(argv[8]);
+  arg11 = RTEST(argv[9]);
+  {
+    arg12 = (NIL_P(argv[10])) ? NULL :
+    svn_swig_rb_strings_to_apr_array(argv[10], _global_pool);
+  }
+  {
+    int res = SWIG_ConvertFunctionPtr(argv[11], (void**)(&arg13), SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_client_status_t_p_apr_pool_t__p_svn_error_t);
+    if (!SWIG_IsOK(res)) {
+      SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_client_status_func_t","svn_client_status6", 13, argv[11] )); 
+    }
+  }
+  res14 = SWIG_ConvertPtr(argv[12],SWIG_as_voidptrptr(&arg14), 0, 0);
+  if (!SWIG_IsOK(res14)) {
+    SWIG_exception_fail(SWIG_ArgError(res14), Ruby_Format_TypeError( "", "void *","svn_client_status6", 14, argv[12] )); 
+  }
+  if (argc > 13) {
+    
+  }
+  {
+    if (!arg4) {
+      SWIG_exception(SWIG_ValueError,"Received a NULL pointer.");
+    }
+  }
+  {
+    result = (svn_error_t *)svn_client_status6(arg1,arg2,(char const *)arg3,(struct svn_opt_revision_t const *)arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11,(apr_array_header_t const *)arg12,arg13,arg14,arg15);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  if (SWIG_IsTmpObj(res1)) {
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_From_long((*arg1)));
+  } else {
+    int new_flags = SWIG_IsNewObj(res1) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj((void*)(arg1), SWIGTYPE_p_long, new_flags));
+  }
+  if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
+fail:
+  if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
 _wrap_svn_client_status5(int argc, VALUE *argv, VALUE self) {
   svn_revnum_t *arg1 = (svn_revnum_t *) 0 ;
   svn_client_ctx_t *arg2 = (svn_client_ctx_t *) 0 ;
@@ -12805,7 +13076,7 @@ _wrap_svn_client_status3(int argc, VALUE *argv, VALUE self) {
     svn_swig_rb_set_revision(&rev3, argv[1]);
   }
   {
-    arg4 = svn_swig_rb_wc_status_func;
+    arg4 = (svn_wc_status_func2_t) svn_swig_rb_wc_status_func;
     arg5 = (void *)svn_swig_rb_make_baton(argv[2], _global_svn_swig_rb_pool);
   }
   {
@@ -12928,7 +13199,7 @@ _wrap_svn_client_status2(int argc, VALUE *argv, VALUE self) {
     svn_swig_rb_set_revision(&rev3, argv[1]);
   }
   {
-    arg4 = svn_swig_rb_wc_status_func;
+    arg4 = (svn_wc_status_func2_t) svn_swig_rb_wc_status_func;
     arg5 = (void *)svn_swig_rb_make_baton(argv[2], _global_svn_swig_rb_pool);
   }
   arg6 = RTEST(argv[3]);
@@ -13171,7 +13442,7 @@ _wrap_svn_client_log5(int argc, VALUE *argv, VALUE self) {
     svn_swig_rb_strings_to_apr_array(argv[7], _global_pool);
   }
   {
-    arg9 = svn_swig_rb_log_entry_receiver;
+    arg9 = (svn_log_entry_receiver_t) svn_swig_rb_log_entry_receiver;
     arg10 = (void *)svn_swig_rb_make_baton(argv[8], _global_svn_swig_rb_pool);
   }
   if (argc > 9) {
@@ -13292,7 +13563,7 @@ _wrap_svn_client_log4(int argc, VALUE *argv, VALUE self) {
     svn_swig_rb_strings_to_apr_array(argv[8], _global_pool);
   }
   {
-    arg10 = svn_swig_rb_log_entry_receiver;
+    arg10 = (svn_log_entry_receiver_t) svn_swig_rb_log_entry_receiver;
     arg11 = (void *)svn_swig_rb_make_baton(argv[9], _global_svn_swig_rb_pool);
   }
   if (argc > 10) {
@@ -13406,7 +13677,7 @@ _wrap_svn_client_log3(int argc, VALUE *argv, VALUE self) {
   arg6 = RTEST(argv[5]);
   arg7 = RTEST(argv[6]);
   {
-    arg8 = svn_swig_rb_log_receiver;
+    arg8 = (svn_log_message_receiver_t) svn_swig_rb_log_receiver;
     arg9 = (void *)svn_swig_rb_make_baton(argv[7], _global_svn_swig_rb_pool);
   }
   if (argc > 8) {
@@ -13514,7 +13785,7 @@ _wrap_svn_client_log2(int argc, VALUE *argv, VALUE self) {
   arg5 = RTEST(argv[4]);
   arg6 = RTEST(argv[5]);
   {
-    arg7 = svn_swig_rb_log_receiver;
+    arg7 = (svn_log_message_receiver_t) svn_swig_rb_log_receiver;
     arg8 = (void *)svn_swig_rb_make_baton(argv[6], _global_svn_swig_rb_pool);
   }
   if (argc > 7) {
@@ -13609,7 +13880,7 @@ _wrap_svn_client_log(int argc, VALUE *argv, VALUE self) {
   arg4 = RTEST(argv[3]);
   arg5 = RTEST(argv[4]);
   {
-    arg6 = svn_swig_rb_log_receiver;
+    arg6 = (svn_log_message_receiver_t) svn_swig_rb_log_receiver;
     arg7 = (void *)svn_swig_rb_make_baton(argv[5], _global_svn_swig_rb_pool);
   }
   if (argc > 6) {
@@ -13977,7 +14248,7 @@ _wrap_svn_client_blame3(int argc, VALUE *argv, VALUE self) {
   arg5 = (svn_diff_file_options_t *)(argp5);
   arg6 = RTEST(argv[5]);
   {
-    arg7 = svn_swig_rb_client_blame_receiver_func;
+    arg7 = (svn_client_blame_receiver_t) svn_swig_rb_client_blame_receiver_func;
     arg8 = (void *)svn_swig_rb_make_baton(argv[6], _global_svn_swig_rb_pool);
   }
   if (argc > 7) {
@@ -14086,7 +14357,7 @@ _wrap_svn_client_blame2(int argc, VALUE *argv, VALUE self) {
     svn_swig_rb_set_revision(&rev4, argv[3]);
   }
   {
-    arg5 = svn_swig_rb_client_blame_receiver_func;
+    arg5 = (svn_client_blame_receiver_t) svn_swig_rb_client_blame_receiver_func;
     arg6 = (void *)svn_swig_rb_make_baton(argv[4], _global_svn_swig_rb_pool);
   }
   if (argc > 5) {
@@ -14189,7 +14460,7 @@ _wrap_svn_client_blame(int argc, VALUE *argv, VALUE self) {
     svn_swig_rb_set_revision(&rev3, argv[2]);
   }
   {
-    arg4 = svn_swig_rb_client_blame_receiver_func;
+    arg4 = (svn_client_blame_receiver_t) svn_swig_rb_client_blame_receiver_func;
     arg5 = (void *)svn_swig_rb_make_baton(argv[3], _global_svn_swig_rb_pool);
   }
   if (argc > 4) {
@@ -16049,7 +16320,7 @@ _wrap_svn_client_diff_summarize2(int argc, VALUE *argv, VALUE self) {
     svn_swig_rb_strings_to_apr_array(argv[6], _global_pool);
   }
   {
-    arg8 = svn_swig_rb_client_diff_summarize_func;
+    arg8 = (svn_client_diff_summarize_func_t) svn_swig_rb_client_diff_summarize_func;
     arg9 = (void *)svn_swig_rb_make_baton(argv[7], _global_svn_swig_rb_pool);
   }
   if (argc > 8) {
@@ -16162,7 +16433,7 @@ _wrap_svn_client_diff_summarize(int argc, VALUE *argv, VALUE self) {
   arg5 = RTEST(argv[4]);
   arg6 = RTEST(argv[5]);
   {
-    arg7 = svn_swig_rb_client_diff_summarize_func;
+    arg7 = (svn_client_diff_summarize_func_t) svn_swig_rb_client_diff_summarize_func;
     arg8 = (void *)svn_swig_rb_make_baton(argv[6], _global_svn_swig_rb_pool);
   }
   if (argc > 7) {
@@ -16279,7 +16550,7 @@ _wrap_svn_client_diff_summarize_peg2(int argc, VALUE *argv, VALUE self) {
     svn_swig_rb_strings_to_apr_array(argv[6], _global_pool);
   }
   {
-    arg8 = svn_swig_rb_client_diff_summarize_func;
+    arg8 = (svn_client_diff_summarize_func_t) svn_swig_rb_client_diff_summarize_func;
     arg9 = (void *)svn_swig_rb_make_baton(argv[7], _global_svn_swig_rb_pool);
   }
   if (argc > 8) {
@@ -16392,7 +16663,7 @@ _wrap_svn_client_diff_summarize_peg(int argc, VALUE *argv, VALUE self) {
   arg5 = RTEST(argv[4]);
   arg6 = RTEST(argv[5]);
   {
-    arg7 = svn_swig_rb_client_diff_summarize_func;
+    arg7 = (svn_client_diff_summarize_func_t) svn_swig_rb_client_diff_summarize_func;
     arg8 = (void *)svn_swig_rb_make_baton(argv[6], _global_svn_swig_rb_pool);
   }
   if (argc > 7) {
@@ -18352,7 +18623,7 @@ _wrap_svn_client_mergeinfo_log2(int argc, VALUE *argv, VALUE self) {
     svn_swig_rb_set_revision(&rev7, argv[6]);
   }
   {
-    arg8 = svn_swig_rb_log_entry_receiver;
+    arg8 = (svn_log_entry_receiver_t) svn_swig_rb_log_entry_receiver;
     arg9 = (void *)svn_swig_rb_make_baton(argv[7], _global_svn_swig_rb_pool);
   }
   arg10 = RTEST(argv[8]);
@@ -18466,7 +18737,7 @@ _wrap_svn_client_mergeinfo_log(int argc, VALUE *argv, VALUE self) {
     svn_swig_rb_set_revision(&rev5, argv[4]);
   }
   {
-    arg6 = svn_swig_rb_log_entry_receiver;
+    arg6 = (svn_log_entry_receiver_t) svn_swig_rb_log_entry_receiver;
     arg7 = (void *)svn_swig_rb_make_baton(argv[5], _global_svn_swig_rb_pool);
   }
   arg8 = RTEST(argv[6]);
@@ -18583,7 +18854,7 @@ _wrap_svn_client_mergeinfo_log_merged(int argc, VALUE *argv, VALUE self) {
     svn_swig_rb_set_revision(&rev4, argv[3]);
   }
   {
-    arg5 = svn_swig_rb_log_entry_receiver;
+    arg5 = (svn_log_entry_receiver_t) svn_swig_rb_log_entry_receiver;
     arg6 = (void *)svn_swig_rb_make_baton(argv[4], _global_svn_swig_rb_pool);
   }
   arg7 = RTEST(argv[5]);
@@ -18704,7 +18975,7 @@ _wrap_svn_client_mergeinfo_log_eligible(int argc, VALUE *argv, VALUE self) {
     svn_swig_rb_set_revision(&rev4, argv[3]);
   }
   {
-    arg5 = svn_swig_rb_log_entry_receiver;
+    arg5 = (svn_log_entry_receiver_t) svn_swig_rb_log_entry_receiver;
     arg6 = (void *)svn_swig_rb_make_baton(argv[4], _global_svn_swig_rb_pool);
   }
   arg7 = RTEST(argv[5]);
@@ -18766,6 +19037,170 @@ fail:
 
 
 SWIGINTERN VALUE
+_wrap_svn_client_vacuum(int argc, VALUE *argv, VALUE self) {
+  char *arg1 = (char *) 0 ;
+  svn_boolean_t arg2 ;
+  svn_boolean_t arg3 ;
+  svn_boolean_t arg4 ;
+  svn_boolean_t arg5 ;
+  svn_boolean_t arg6 ;
+  svn_client_ctx_t *arg7 = (svn_client_ctx_t *) 0 ;
+  apr_pool_t *arg8 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  int res1 ;
+  char *buf1 = 0 ;
+  int alloc1 = 0 ;
+  void *argp7 = 0 ;
+  int res7 = 0 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg8);
+    _global_pool = arg8;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  if ((argc < 7) || (argc > 8)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 7)",argc); SWIG_fail;
+  }
+  res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","svn_client_vacuum", 1, argv[0] ));
+  }
+  arg1 = (char *)(buf1);
+  arg2 = RTEST(argv[1]);
+  arg3 = RTEST(argv[2]);
+  arg4 = RTEST(argv[3]);
+  arg5 = RTEST(argv[4]);
+  arg6 = RTEST(argv[5]);
+  res7 = SWIG_ConvertPtr(argv[6], &argp7,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
+  if (!SWIG_IsOK(res7)) {
+    SWIG_exception_fail(SWIG_ArgError(res7), Ruby_Format_TypeError( "", "svn_client_ctx_t *","svn_client_vacuum", 7, argv[6] )); 
+  }
+  arg7 = (svn_client_ctx_t *)(argp7);
+  if (argc > 7) {
+    
+  }
+  {
+    result = (svn_error_t *)svn_client_vacuum((char const *)arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
+fail:
+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_svn_client_cleanup2(int argc, VALUE *argv, VALUE self) {
+  char *arg1 = (char *) 0 ;
+  svn_boolean_t arg2 ;
+  svn_boolean_t arg3 ;
+  svn_boolean_t arg4 ;
+  svn_boolean_t arg5 ;
+  svn_boolean_t arg6 ;
+  svn_client_ctx_t *arg7 = (svn_client_ctx_t *) 0 ;
+  apr_pool_t *arg8 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  int res1 ;
+  char *buf1 = 0 ;
+  int alloc1 = 0 ;
+  void *argp7 = 0 ;
+  int res7 = 0 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg8);
+    _global_pool = arg8;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  if ((argc < 7) || (argc > 8)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 7)",argc); SWIG_fail;
+  }
+  res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","svn_client_cleanup2", 1, argv[0] ));
+  }
+  arg1 = (char *)(buf1);
+  arg2 = RTEST(argv[1]);
+  arg3 = RTEST(argv[2]);
+  arg4 = RTEST(argv[3]);
+  arg5 = RTEST(argv[4]);
+  arg6 = RTEST(argv[5]);
+  res7 = SWIG_ConvertPtr(argv[6], &argp7,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
+  if (!SWIG_IsOK(res7)) {
+    SWIG_exception_fail(SWIG_ArgError(res7), Ruby_Format_TypeError( "", "svn_client_ctx_t *","svn_client_cleanup2", 7, argv[6] )); 
+  }
+  arg7 = (svn_client_ctx_t *)(argp7);
+  if (argc > 7) {
+    
+  }
+  {
+    result = (svn_error_t *)svn_client_cleanup2((char const *)arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
+fail:
+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
 _wrap_svn_client_cleanup(int argc, VALUE *argv, VALUE self) {
   char *arg1 = (char *) 0 ;
   svn_client_ctx_t *arg2 = (svn_client_ctx_t *) 0 ;
@@ -19118,6 +19553,92 @@ fail:
 
 
 SWIGINTERN VALUE
+_wrap_svn_client_revert3(int argc, VALUE *argv, VALUE self) {
+  apr_array_header_t *arg1 = (apr_array_header_t *) 0 ;
+  svn_depth_t arg2 ;
+  apr_array_header_t *arg3 = (apr_array_header_t *) 0 ;
+  svn_boolean_t arg4 ;
+  svn_boolean_t arg5 ;
+  svn_client_ctx_t *arg6 = (svn_client_ctx_t *) 0 ;
+  apr_pool_t *arg7 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  void *argp6 = 0 ;
+  int res6 = 0 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    int adjusted_argc = argc;
+    VALUE *adjusted_argv = argv;
+    
+    svn_swig_rb_adjust_arg_for_client_ctx_and_pool(&adjusted_argc,
+      &adjusted_argv);
+    svn_swig_rb_get_pool(adjusted_argc, adjusted_argv, self,
+      &_global_svn_swig_rb_pool, &arg7);
+    _global_pool = arg7;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  if ((argc < 5) || (argc > 7)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 5)",argc); SWIG_fail;
+  }
+  {
+    arg1 = svn_swig_rb_strings_to_apr_array(argv[0], _global_pool);
+  }
+  {
+    arg2 = svn_swig_rb_to_depth(argv[1]);
+  }
+  {
+    arg3 = (NIL_P(argv[2])) ? NULL :
+    svn_swig_rb_strings_to_apr_array(argv[2], _global_pool);
+  }
+  arg4 = RTEST(argv[3]);
+  arg5 = RTEST(argv[4]);
+  if (argc > 5) {
+    res6 = SWIG_ConvertPtr(argv[5], &argp6,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
+    if (!SWIG_IsOK(res6)) {
+      SWIG_exception_fail(SWIG_ArgError(res6), Ruby_Format_TypeError( "", "svn_client_ctx_t *","svn_client_revert3", 6, argv[5] )); 
+    }
+    arg6 = (svn_client_ctx_t *)(argp6);
+  }
+  if (argc > 6) {
+    
+  }
+  {
+    result = (svn_error_t *)svn_client_revert3((apr_array_header_t const *)arg1,arg2,(apr_array_header_t const *)arg3,arg4,arg5,arg6,arg7);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
+fail:
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
 _wrap_svn_client_revert2(int argc, VALUE *argv, VALUE self) {
   apr_array_header_t *arg1 = (apr_array_header_t *) 0 ;
   svn_depth_t arg2 ;
@@ -19636,6 +20157,135 @@ fail:
 
 
 SWIGINTERN VALUE
+_wrap_svn_client_copy7(int argc, VALUE *argv, VALUE self) {
+  apr_array_header_t *arg1 = (apr_array_header_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  svn_boolean_t arg3 ;
+  svn_boolean_t arg4 ;
+  svn_boolean_t arg5 ;
+  svn_boolean_t arg6 ;
+  svn_boolean_t arg7 ;
+  apr_hash_t *arg8 = (apr_hash_t *) 0 ;
+  apr_hash_t *arg9 = (apr_hash_t *) 0 ;
+  svn_commit_callback2_t arg10 = (svn_commit_callback2_t) 0 ;
+  void *arg11 = (void *) 0 ;
+  svn_client_ctx_t *arg12 = (svn_client_ctx_t *) 0 ;
+  apr_pool_t *arg13 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
+  void *argp8 = 0 ;
+  int res8 = 0 ;
+  void *argp12 = 0 ;
+  int res12 = 0 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    int adjusted_argc = argc;
+    VALUE *adjusted_argv = argv;
+    
+    svn_swig_rb_adjust_arg_for_client_ctx_and_pool(&adjusted_argc,
+      &adjusted_argv);
+    svn_swig_rb_get_pool(adjusted_argc, adjusted_argv, self,
+      &_global_svn_swig_rb_pool, &arg13);
+    _global_pool = arg13;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  if ((argc < 10) || (argc > 12)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 10)",argc); SWIG_fail;
+  }
+  {
+    arg1 = svn_swig_rb_array_to_apr_array_copy_source(argv[0], _global_pool);
+  }
+  res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","svn_client_copy7", 2, argv[1] ));
+  }
+  arg2 = (char *)(buf2);
+  arg3 = RTEST(argv[2]);
+  arg4 = RTEST(argv[3]);
+  arg5 = RTEST(argv[4]);
+  arg6 = RTEST(argv[5]);
+  arg7 = RTEST(argv[6]);
+  res8 = SWIG_ConvertPtr(argv[7], &argp8,SWIGTYPE_p_apr_hash_t, 0 |  0 );
+  if (!SWIG_IsOK(res8)) {
+    SWIG_exception_fail(SWIG_ArgError(res8), Ruby_Format_TypeError( "", "apr_hash_t const *","svn_client_copy7", 8, argv[7] )); 
+  }
+  arg8 = (apr_hash_t *)(argp8);
+  {
+    VALUE rb_pool = Qnil;
+    if (!_global_pool) {
+      svn_swig_rb_get_pool(argc, argv, self, &rb_pool, &_global_pool);
+      svn_swig_rb_push_pool(rb_pool);
+    }
+    arg9 = svn_swig_rb_hash_to_apr_hash_svn_string(argv[8], _global_pool);
+    _global_pool = NULL;
+    if (!NIL_P(rb_pool)) {
+      if (NIL_P(arg9)) {
+        svn_swig_rb_destroy_pool(rb_pool);
+      } else {
+        svn_swig_rb_set_pool_for_no_swig_type(argv[8], rb_pool);
+      }
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+    }
+  }
+  {
+    arg10 = svn_swig_rb_commit_callback2;
+    arg11 = (void *)svn_swig_rb_make_baton(argv[9], _global_svn_swig_rb_pool);
+  }
+  if (argc > 10) {
+    res12 = SWIG_ConvertPtr(argv[10], &argp12,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
+    if (!SWIG_IsOK(res12)) {
+      SWIG_exception_fail(SWIG_ArgError(res12), Ruby_Format_TypeError( "", "svn_client_ctx_t *","svn_client_copy7", 12, argv[10] )); 
+    }
+    arg12 = (svn_client_ctx_t *)(argp12);
+  }
+  if (argc > 11) {
+    
+  }
+  {
+    result = (svn_error_t *)svn_client_copy7((apr_array_header_t const *)arg1,(char const *)arg2,arg3,arg4,arg5,arg6,arg7,(apr_hash_t const *)arg8,(apr_hash_t const *)arg9,arg10,arg11,arg12,arg13);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  {
+    svn_swig_rb_set_baton(vresult, (VALUE)arg11);
+  }
+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
+fail:
+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
 _wrap_svn_client_copy6(int argc, VALUE *argv, VALUE self) {
   apr_array_header_t *arg1 = (apr_array_header_t *) 0 ;
   char *arg2 = (char *) 0 ;
@@ -22851,7 +23501,7 @@ _wrap_svn_client_proplist3(int argc, VALUE *argv, VALUE self) {
     svn_swig_rb_strings_to_apr_array(argv[4], _global_pool);
   }
   {
-    arg6 = svn_swig_rb_proplist_receiver;
+    arg6 = (svn_proplist_receiver_t) svn_swig_rb_proplist_receiver;
     arg7 = (void *)svn_swig_rb_make_baton(argv[5], _global_svn_swig_rb_pool);
   }
   if (argc > 6) {
@@ -24063,7 +24713,7 @@ _wrap_svn_client_list2(int argc, VALUE *argv, VALUE self) {
   arg5 = (apr_uint32_t)(val5);
   arg6 = RTEST(argv[5]);
   {
-    arg7 = svn_swig_rb_client_list_func;
+    arg7 = (svn_client_list_func_t) svn_swig_rb_client_list_func;
     arg8 = (void *)svn_swig_rb_make_baton(argv[6], _global_svn_swig_rb_pool);
   }
   if (argc > 7) {
@@ -24183,7 +24833,7 @@ _wrap_svn_client_list(int argc, VALUE *argv, VALUE self) {
   arg5 = (apr_uint32_t)(val5);
   arg6 = RTEST(argv[5]);
   {
-    arg7 = svn_swig_rb_client_list_func;
+    arg7 = (svn_client_list_func_t) svn_swig_rb_client_list_func;
     arg8 = (void *)svn_swig_rb_make_baton(argv[6], _global_svn_swig_rb_pool);
   }
   if (argc > 7) {
@@ -24575,6 +25225,135 @@ fail:
 
 
 SWIGINTERN VALUE
+_wrap_svn_client_cat3(int argc, VALUE *argv, VALUE self) {
+  apr_hash_t **arg1 = (apr_hash_t **) 0 ;
+  svn_stream_t *arg2 = (svn_stream_t *) 0 ;
+  char *arg3 = (char *) 0 ;
+  svn_opt_revision_t *arg4 = (svn_opt_revision_t *) 0 ;
+  svn_opt_revision_t *arg5 = (svn_opt_revision_t *) 0 ;
+  svn_boolean_t arg6 ;
+  svn_client_ctx_t *arg7 = (svn_client_ctx_t *) 0 ;
+  apr_pool_t *arg8 = (apr_pool_t *) 0 ;
+  apr_pool_t *arg9 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  apr_hash_t *temp1 ;
+  int res3 ;
+  char *buf3 = 0 ;
+  int alloc3 = 0 ;
+  svn_opt_revision_t rev4 ;
+  svn_opt_revision_t rev5 ;
+  void *argp7 = 0 ;
+  int res7 = 0 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg8);
+    _global_pool = arg8;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg9);
+    _global_pool = arg9;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  arg1 = &temp1;
+  if ((argc < 6) || (argc > 8)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 6)",argc); SWIG_fail;
+  }
+  {
+    arg2 = svn_swig_rb_make_stream(argv[0]);
+  }
+  res3 = SWIG_AsCharPtrAndSize(argv[1], &buf3, NULL, &alloc3);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "char const *","svn_client_cat3", 3, argv[1] ));
+  }
+  arg3 = (char *)(buf3);
+  {
+    arg4 = &rev4;
+    svn_swig_rb_set_revision(&rev4, argv[2]);
+  }
+  {
+    arg5 = &rev5;
+    svn_swig_rb_set_revision(&rev5, argv[3]);
+  }
+  arg6 = RTEST(argv[4]);
+  res7 = SWIG_ConvertPtr(argv[5], &argp7,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
+  if (!SWIG_IsOK(res7)) {
+    SWIG_exception_fail(SWIG_ArgError(res7), Ruby_Format_TypeError( "", "svn_client_ctx_t *","svn_client_cat3", 7, argv[5] )); 
+  }
+  arg7 = (svn_client_ctx_t *)(argp7);
+  if (argc > 6) {
+    
+  }
+  if (argc > 7) {
+    
+  }
+  {
+    if (!arg4) {
+      SWIG_exception(SWIG_ValueError,"Received a NULL pointer.");
+    }
+  }
+  {
+    if (!arg5) {
+      SWIG_exception(SWIG_ValueError,"Received a NULL pointer.");
+    }
+  }
+  {
+    result = (svn_error_t *)svn_client_cat3(arg1,arg2,(char const *)arg3,(struct svn_opt_revision_t const *)arg4,(struct svn_opt_revision_t const *)arg5,arg6,arg7,arg8,arg9);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  {
+    vresult = SWIG_Ruby_AppendOutput(vresult, svn_swig_rb_apr_hash_to_hash_svn_string(*arg1));
+  }
+  if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
+fail:
+  if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
 _wrap_svn_client_cat2(int argc, VALUE *argv, VALUE self) {
   svn_stream_t *arg1 = (svn_stream_t *) 0 ;
   char *arg2 = (char *) 0 ;
@@ -24989,7 +25768,7 @@ _wrap_svn_client_get_changelists(int argc, VALUE *argv, VALUE self) {
     arg3 = svn_swig_rb_to_depth(argv[2]);
   }
   {
-    arg4 = svn_swig_rb_changelist_receiver;
+    arg4 = (svn_changelist_receiver_t) svn_swig_rb_changelist_receiver;
     arg5 = (void *)svn_swig_rb_make_baton(argv[3], _global_svn_swig_rb_pool);
   }
   if (argc > 4) {
@@ -27649,6 +28428,128 @@ fail:
 
 
 SWIGINTERN VALUE
+_wrap_svn_client_info4(int argc, VALUE *argv, VALUE self) {
+  char *arg1 = (char *) 0 ;
+  svn_opt_revision_t *arg2 = (svn_opt_revision_t *) 0 ;
+  svn_opt_revision_t *arg3 = (svn_opt_revision_t *) 0 ;
+  svn_depth_t arg4 ;
+  svn_boolean_t arg5 ;
+  svn_boolean_t arg6 ;
+  svn_boolean_t arg7 ;
+  apr_array_header_t *arg8 = (apr_array_header_t *) 0 ;
+  svn_client_info_receiver2_t arg9 = (svn_client_info_receiver2_t) 0 ;
+  void *arg10 = (void *) 0 ;
+  svn_client_ctx_t *arg11 = (svn_client_ctx_t *) 0 ;
+  apr_pool_t *arg12 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  int res1 ;
+  char *buf1 = 0 ;
+  int alloc1 = 0 ;
+  svn_opt_revision_t rev2 ;
+  svn_opt_revision_t rev3 ;
+  int res10 ;
+  void *argp11 = 0 ;
+  int res11 = 0 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg12);
+    _global_pool = arg12;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  if ((argc < 11) || (argc > 12)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 11)",argc); SWIG_fail;
+  }
+  res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","svn_client_info4", 1, argv[0] ));
+  }
+  arg1 = (char *)(buf1);
+  {
+    arg2 = &rev2;
+    svn_swig_rb_set_revision(&rev2, argv[1]);
+  }
+  {
+    arg3 = &rev3;
+    svn_swig_rb_set_revision(&rev3, argv[2]);
+  }
+  {
+    arg4 = svn_swig_rb_to_depth(argv[3]);
+  }
+  arg5 = RTEST(argv[4]);
+  arg6 = RTEST(argv[5]);
+  arg7 = RTEST(argv[6]);
+  {
+    arg8 = (NIL_P(argv[7])) ? NULL :
+    svn_swig_rb_strings_to_apr_array(argv[7], _global_pool);
+  }
+  {
+    int res = SWIG_ConvertFunctionPtr(argv[8], (void**)(&arg9), SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_client_info2_t_p_apr_pool_t__p_svn_error_t);
+    if (!SWIG_IsOK(res)) {
+      SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_client_info_receiver2_t","svn_client_info4", 9, argv[8] )); 
+    }
+  }
+  res10 = SWIG_ConvertPtr(argv[9],SWIG_as_voidptrptr(&arg10), 0, 0);
+  if (!SWIG_IsOK(res10)) {
+    SWIG_exception_fail(SWIG_ArgError(res10), Ruby_Format_TypeError( "", "void *","svn_client_info4", 10, argv[9] )); 
+  }
+  res11 = SWIG_ConvertPtr(argv[10], &argp11,SWIGTYPE_p_svn_client_ctx_t, 0 |  0 );
+  if (!SWIG_IsOK(res11)) {
+    SWIG_exception_fail(SWIG_ArgError(res11), Ruby_Format_TypeError( "", "svn_client_ctx_t *","svn_client_info4", 11, argv[10] )); 
+  }
+  arg11 = (svn_client_ctx_t *)(argp11);
+  if (argc > 11) {
+    
+  }
+  {
+    if (!arg2) {
+      SWIG_exception(SWIG_ValueError,"Received a NULL pointer.");
+    }
+  }
+  {
+    if (!arg3) {
+      SWIG_exception(SWIG_ValueError,"Received a NULL pointer.");
+    }
+  }
+  {
+    result = (svn_error_t *)svn_client_info4((char const *)arg1,(struct svn_opt_revision_t const *)arg2,(struct svn_opt_revision_t const *)arg3,arg4,arg5,arg6,arg7,(apr_array_header_t const *)arg8,arg9,arg10,arg11,arg12);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
+fail:
+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
 _wrap_svn_client_info3(int argc, VALUE *argv, VALUE self) {
   char *arg1 = (char *) 0 ;
   svn_opt_revision_t *arg2 = (svn_opt_revision_t *) 0 ;
@@ -30828,7 +31729,7 @@ _wrap_svn_client_set_log_msg_func3(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (svn_client_ctx_t *)(argp1);
   {
-    arg2 = svn_swig_rb_get_commit_log_func;
+    arg2 = (svn_client_get_commit_log3_t) svn_swig_rb_get_commit_log_func;
     arg3 = (void *)svn_swig_rb_make_baton(argv[1], _global_svn_swig_rb_pool);
   }
   if (argc > 2) {
@@ -30888,7 +31789,7 @@ _wrap_svn_client_set_notify_func2(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (svn_client_ctx_t *)(argp1);
   {
-    arg2 = svn_swig_rb_notify_func2;
+    arg2 = (svn_wc_notify_func2_t) svn_swig_rb_notify_func2;
     arg3 = (void *)svn_swig_rb_make_baton(argv[1], _global_svn_swig_rb_pool);
   }
   if (argc > 2) {
@@ -30948,7 +31849,7 @@ _wrap_svn_client_set_cancel_func(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (svn_client_ctx_t *)(argp1);
   {
-    arg2 = svn_swig_rb_cancel_func;
+    arg2 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg3 = (void *)svn_swig_rb_make_baton(argv[1], _global_svn_swig_rb_pool);
   }
   if (argc > 2) {
@@ -31136,6 +32037,7 @@ static swig_type_info _swigt__p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_
 static swig_type_info _swigt__p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_auth_ssl_client_cert_prompt_func_t|struct svn_error_t *(*)(svn_auth_cred_ssl_client_cert_t **,void *,char const *,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_auth_cred_ssl_server_trust_t **,void *,char const *,apr_uint32_t,svn_auth_ssl_server_cert_info_t const *,svn_boolean_t,apr_pool_t *)|svn_auth_ssl_server_trust_prompt_func_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_auth_cred_username_t **,void *,char const *,svn_boolean_t,apr_pool_t *)|svn_auth_username_prompt_func_t", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_ra_open_tunnel_func_t|struct svn_error_t *(*)(svn_stream_t **,svn_stream_t **,svn_ra_close_tunnel_func_t *,void **,void *,char const *,char const *,char const *,int,svn_cancel_func_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t", "svn_wc_conflict_resolver_func2_t|struct svn_error_t *(*)(svn_wc_conflict_result_t **,svn_wc_conflict_description2_t const *,void *,apr_pool_t *,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_wc_conflict_resolver_func_t|struct svn_error_t *(*)(svn_wc_conflict_result_t **,svn_wc_conflict_description_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_client_diff_summarize_func_t|struct svn_error_t *(*)(svn_client_diff_summarize_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0};
@@ -31144,6 +32046,7 @@ static swig_type_info _swigt__p_f_p_void__p_svn_error_t = {"_p_f_p_void__p_svn_e
 static swig_type_info _swigt__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_int64_t,svn_revnum_t,char const *,char const *,char const *,apr_pool_t *)|svn_client_blame_receiver_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_client_blame_receiver2_t|struct svn_error_t *(*)(void *,apr_int64_t,svn_revnum_t,char const *,char const *,svn_revnum_t,char const *,char const *,char const *,char const *,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_hash_t *,svn_revnum_t,char const *,char const *,char const *,apr_pool_t *)|svn_log_message_receiver_t", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_f_p_void_p_q_const__char__int = {"_p_f_p_void_p_q_const__char__int", "int (*)(void *,char const *)|svn_ra_check_tunnel_func_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void = {"_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void", "void (*)(void *,char const *,enum svn_wc_notify_action_t,enum svn_node_kind_t,char const *,enum svn_wc_notify_state_t,enum svn_wc_notify_state_t,long)|svn_wc_notify_func_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,apr_hash_t *,apr_array_header_t *,apr_pool_t *)|svn_proplist_receiver2_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,apr_hash_t *,apr_pool_t *)|svn_proplist_receiver_t", 0, 0, (void*)0, 0};
@@ -31259,11 +32162,9 @@ static swig_type_info _swigt__p_svn_wc_adm_access_t = {"_p_svn_wc_adm_access_t",
 static swig_type_info _swigt__p_svn_wc_committed_queue_t = {"_p_svn_wc_committed_queue_t", "struct svn_wc_committed_queue_t *|svn_wc_committed_queue_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_wc_conflict_action_t = {"_p_svn_wc_conflict_action_t", "enum svn_wc_conflict_action_t *|svn_wc_conflict_action_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_wc_conflict_choice_t = {"_p_svn_wc_conflict_choice_t", "enum svn_wc_conflict_choice_t *|svn_wc_conflict_choice_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_svn_wc_conflict_description2_t = {"_p_svn_wc_conflict_description2_t", "struct svn_wc_conflict_description2_t *|svn_wc_conflict_description2_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_wc_conflict_description_t = {"_p_svn_wc_conflict_description_t", "struct svn_wc_conflict_description_t *|svn_wc_conflict_description_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_wc_conflict_kind_t = {"_p_svn_wc_conflict_kind_t", "enum svn_wc_conflict_kind_t *|svn_wc_conflict_kind_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_wc_conflict_reason_t = {"_p_svn_wc_conflict_reason_t", "enum svn_wc_conflict_reason_t *|svn_wc_conflict_reason_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_svn_wc_conflict_result_t = {"_p_svn_wc_conflict_result_t", "struct svn_wc_conflict_result_t *|svn_wc_conflict_result_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_wc_conflict_version_t = {"_p_svn_wc_conflict_version_t", "struct svn_wc_conflict_version_t *|svn_wc_conflict_version_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_wc_context_t = {"_p_svn_wc_context_t", "struct svn_wc_context_t *|svn_wc_context_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_wc_diff_callbacks2_t = {"_p_svn_wc_diff_callbacks2_t", "struct svn_wc_diff_callbacks2_t *|svn_wc_diff_callbacks2_t *", 0, 0, (void*)0, 0};
@@ -31309,6 +32210,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t,
+  &_swigt__p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t,
@@ -31317,6 +32219,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t,
+  &_swigt__p_f_p_void_p_q_const__char__int,
   &_swigt__p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void,
   &_swigt__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t,
@@ -31432,11 +32335,9 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_svn_wc_committed_queue_t,
   &_swigt__p_svn_wc_conflict_action_t,
   &_swigt__p_svn_wc_conflict_choice_t,
-  &_swigt__p_svn_wc_conflict_description2_t,
   &_swigt__p_svn_wc_conflict_description_t,
   &_swigt__p_svn_wc_conflict_kind_t,
   &_swigt__p_svn_wc_conflict_reason_t,
-  &_swigt__p_svn_wc_conflict_result_t,
   &_swigt__p_svn_wc_conflict_version_t,
   &_swigt__p_svn_wc_context_t,
   &_swigt__p_svn_wc_diff_callbacks2_t,
@@ -31482,6 +32383,7 @@ static swig_cast_info _swigc__p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_
 static swig_cast_info _swigc__p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -31490,6 +32392,7 @@ static swig_cast_info _swigc__p_f_p_void__p_svn_error_t[] = {  {&_swigt__p_f_p_v
 static swig_cast_info _swigc__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_f_p_void_p_q_const__char__int[] = {  {&_swigt__p_f_p_void_p_q_const__char__int, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void[] = {  {&_swigt__p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -31605,11 +32508,9 @@ static swig_cast_info _swigc__p_svn_wc_adm_access_t[] = {  {&_swigt__p_svn_wc_ad
 static swig_cast_info _swigc__p_svn_wc_committed_queue_t[] = {  {&_swigt__p_svn_wc_committed_queue_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_wc_conflict_action_t[] = {  {&_swigt__p_svn_wc_conflict_action_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_wc_conflict_choice_t[] = {  {&_swigt__p_svn_wc_conflict_choice_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_svn_wc_conflict_description2_t[] = {  {&_swigt__p_svn_wc_conflict_description2_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_wc_conflict_description_t[] = {  {&_swigt__p_svn_wc_conflict_description_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_wc_conflict_kind_t[] = {  {&_swigt__p_svn_wc_conflict_kind_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_wc_conflict_reason_t[] = {  {&_swigt__p_svn_wc_conflict_reason_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_svn_wc_conflict_result_t[] = {  {&_swigt__p_svn_wc_conflict_result_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_wc_conflict_version_t[] = {  {&_swigt__p_svn_wc_conflict_version_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_wc_context_t[] = {  {&_swigt__p_svn_wc_context_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_wc_diff_callbacks2_t[] = {  {&_swigt__p_svn_wc_diff_callbacks2_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -31655,6 +32556,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t,
+  _swigc__p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description2_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_p_svn_wc_conflict_result_t_p_q_const__svn_wc_conflict_description_t_p_void_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_q_const__svn_client_diff_summarize_t_p_void_p_apr_pool_t__p_svn_error_t,
@@ -31663,6 +32565,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_apr_int64_t_svn_revnum_t_p_q_const__char_p_q_const__char_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t,
+  _swigc__p_f_p_void_p_q_const__char__int,
   _swigc__p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void,
   _swigc__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t,
@@ -31778,11 +32681,9 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_svn_wc_committed_queue_t,
   _swigc__p_svn_wc_conflict_action_t,
   _swigc__p_svn_wc_conflict_choice_t,
-  _swigc__p_svn_wc_conflict_description2_t,
   _swigc__p_svn_wc_conflict_description_t,
   _swigc__p_svn_wc_conflict_kind_t,
   _swigc__p_svn_wc_conflict_reason_t,
-  _swigc__p_svn_wc_conflict_result_t,
   _swigc__p_svn_wc_conflict_version_t,
   _swigc__p_svn_wc_context_t,
   _swigc__p_svn_wc_diff_callbacks2_t,
@@ -31816,18 +32717,18 @@ static swig_cast_info *swig_cast_initial[] = {
 
 /* -----------------------------------------------------------------------------
  * Type initialization:
- * This problem is tough by the requirement that no dynamic 
- * memory is used. Also, since swig_type_info structures store pointers to 
+ * This problem is tough by the requirement that no dynamic
+ * memory is used. Also, since swig_type_info structures store pointers to
  * swig_cast_info structures and swig_cast_info structures store pointers back
- * to swig_type_info structures, we need some lookup code at initialization. 
- * The idea is that swig generates all the structures that are needed. 
- * The runtime then collects these partially filled structures. 
- * The SWIG_InitializeModule function takes these initial arrays out of 
+ * to swig_type_info structures, we need some lookup code at initialization.
+ * The idea is that swig generates all the structures that are needed.
+ * The runtime then collects these partially filled structures.
+ * The SWIG_InitializeModule function takes these initial arrays out of
  * swig_module, and does all the lookup, filling in the swig_module.types
  * array with the correct data and linking the correct swig_cast_info
  * structures together.
  *
- * The generated swig_type_info structures are assigned staticly to an initial 
+ * The generated swig_type_info structures are assigned staticly to an initial
  * array. We just loop through that array, and handle each type individually.
  * First we lookup if this type has been already loaded, and if so, use the
  * loaded structure instead of the generated one. Then we have to fill in the
@@ -31837,17 +32738,17 @@ static swig_cast_info *swig_cast_initial[] = {
  * a column is one of the swig_cast_info structures for that type.
  * The cast_initial array is actually an array of arrays, because each row has
  * a variable number of columns. So to actually build the cast linked list,
- * we find the array of casts associated with the type, and loop through it 
+ * we find the array of casts associated with the type, and loop through it
  * adding the casts to the list. The one last trick we need to do is making
  * sure the type pointer in the swig_cast_info struct is correct.
  *
- * First off, we lookup the cast->type name to see if it is already loaded. 
+ * First off, we lookup the cast->type name to see if it is already loaded.
  * There are three cases to handle:
  *  1) If the cast->type has already been loaded AND the type we are adding
  *     casting info to has not been loaded (it is in this module), THEN we
  *     replace the cast->type pointer with the type pointer that has already
  *     been loaded.
- *  2) If BOTH types (the one we are adding casting info to, and the 
+ *  2) If BOTH types (the one we are adding casting info to, and the
  *     cast->type) are loaded, THEN the cast info has already been loaded by
  *     the previous module so we just ignore it.
  *  3) Finally, if cast->type has not already been loaded, then we add that
@@ -31910,7 +32811,7 @@ SWIG_InitializeModule(void *clientdata) {
     module_head->next = &swig_module;
   }
 
-  /* When multiple interpeters are used, a module could have already been initialized in
+  /* When multiple interpreters are used, a module could have already been initialized in
      a different interpreter, but not yet have a pointer in this interpreter.
      In this case, we do not want to continue adding types... everything should be
      set up already */
@@ -31924,7 +32825,7 @@ SWIG_InitializeModule(void *clientdata) {
     swig_type_info *type = 0;
     swig_type_info *ret;
     swig_cast_info *cast;
-  
+
 #ifdef SWIGRUNTIME_DEBUG
     printf("SWIG_InitializeModule: type %d %s\n", i, swig_module.type_initial[i]->name);
 #endif
@@ -31951,7 +32852,7 @@ SWIG_InitializeModule(void *clientdata) {
     /* Insert casting types */
     cast = swig_module.cast_initial[i];
     while (cast->type) {
-    
+
       /* Don't need to add information already in the list */
       ret = 0;
 #ifdef SWIGRUNTIME_DEBUG
@@ -32266,6 +33167,12 @@ SWIGEXPORT void Init_client(void) {
   rb_define_method(SwigClassSvn_client_ctx_t.klass, "conflict_baton2", _wrap_svn_client_ctx_t_conflict_baton2_get, -1);
   rb_define_method(SwigClassSvn_client_ctx_t.klass, "wc_ctx=", _wrap_svn_client_ctx_t_wc_ctx_set, -1);
   rb_define_method(SwigClassSvn_client_ctx_t.klass, "wc_ctx", _wrap_svn_client_ctx_t_wc_ctx_get, -1);
+  rb_define_method(SwigClassSvn_client_ctx_t.klass, "check_tunnel_func=", _wrap_svn_client_ctx_t_check_tunnel_func_set, -1);
+  rb_define_method(SwigClassSvn_client_ctx_t.klass, "check_tunnel_func", _wrap_svn_client_ctx_t_check_tunnel_func_get, -1);
+  rb_define_method(SwigClassSvn_client_ctx_t.klass, "open_tunnel_func=", _wrap_svn_client_ctx_t_open_tunnel_func_set, -1);
+  rb_define_method(SwigClassSvn_client_ctx_t.klass, "open_tunnel_func", _wrap_svn_client_ctx_t_open_tunnel_func_get, -1);
+  rb_define_method(SwigClassSvn_client_ctx_t.klass, "tunnel_baton=", _wrap_svn_client_ctx_t_tunnel_baton_set, -1);
+  rb_define_method(SwigClassSvn_client_ctx_t.klass, "tunnel_baton", _wrap_svn_client_ctx_t_tunnel_baton_get, -1);
   SwigClassSvn_client_ctx_t.mark = 0;
   SwigClassSvn_client_ctx_t.destroy = (void (*)(void *)) free_svn_client_ctx_t;
   SwigClassSvn_client_ctx_t.trackObjects = 0;
@@ -32383,6 +33290,7 @@ SWIGEXPORT void Init_client(void) {
   SwigClassSvn_client_status_t.destroy = (void (*)(void *)) free_svn_client_status_t;
   SwigClassSvn_client_status_t.trackObjects = 0;
   rb_define_module_function(mClient, "svn_client_status_dup", _wrap_svn_client_status_dup, -1);
+  rb_define_module_function(mClient, "svn_client_status6", _wrap_svn_client_status6, -1);
   rb_define_module_function(mClient, "svn_client_status5", _wrap_svn_client_status5, -1);
   rb_define_module_function(mClient, "svn_client_status4", _wrap_svn_client_status4, -1);
   rb_define_module_function(mClient, "svn_client_status3", _wrap_svn_client_status3, -1);
@@ -32432,10 +33340,13 @@ SWIGEXPORT void Init_client(void) {
   rb_define_module_function(mClient, "svn_client_mergeinfo_log", _wrap_svn_client_mergeinfo_log, -1);
   rb_define_module_function(mClient, "svn_client_mergeinfo_log_merged", _wrap_svn_client_mergeinfo_log_merged, -1);
   rb_define_module_function(mClient, "svn_client_mergeinfo_log_eligible", _wrap_svn_client_mergeinfo_log_eligible, -1);
+  rb_define_module_function(mClient, "svn_client_vacuum", _wrap_svn_client_vacuum, -1);
+  rb_define_module_function(mClient, "svn_client_cleanup2", _wrap_svn_client_cleanup2, -1);
   rb_define_module_function(mClient, "svn_client_cleanup", _wrap_svn_client_cleanup, -1);
   rb_define_module_function(mClient, "svn_client_upgrade", _wrap_svn_client_upgrade, -1);
   rb_define_module_function(mClient, "svn_client_relocate2", _wrap_svn_client_relocate2, -1);
   rb_define_module_function(mClient, "svn_client_relocate", _wrap_svn_client_relocate, -1);
+  rb_define_module_function(mClient, "svn_client_revert3", _wrap_svn_client_revert3, -1);
   rb_define_module_function(mClient, "svn_client_revert2", _wrap_svn_client_revert2, -1);
   rb_define_module_function(mClient, "svn_client_revert", _wrap_svn_client_revert, -1);
   rb_define_module_function(mClient, "svn_client_resolved", _wrap_svn_client_resolved, -1);
@@ -32451,6 +33362,7 @@ SWIGEXPORT void Init_client(void) {
   SwigClassSvn_client_copy_source_t.mark = 0;
   SwigClassSvn_client_copy_source_t.destroy = (void (*)(void *)) free_svn_client_copy_source_t;
   SwigClassSvn_client_copy_source_t.trackObjects = 0;
+  rb_define_module_function(mClient, "svn_client_copy7", _wrap_svn_client_copy7, -1);
   rb_define_module_function(mClient, "svn_client_copy6", _wrap_svn_client_copy6, -1);
   rb_define_module_function(mClient, "svn_client_copy5", _wrap_svn_client_copy5, -1);
   rb_define_module_function(mClient, "svn_client_copy4", _wrap_svn_client_copy4, -1);
@@ -32493,6 +33405,7 @@ SWIGEXPORT void Init_client(void) {
   rb_define_module_function(mClient, "svn_client_ls3", _wrap_svn_client_ls3, -1);
   rb_define_module_function(mClient, "svn_client_ls2", _wrap_svn_client_ls2, -1);
   rb_define_module_function(mClient, "svn_client_ls", _wrap_svn_client_ls, -1);
+  rb_define_module_function(mClient, "svn_client_cat3", _wrap_svn_client_cat3, -1);
   rb_define_module_function(mClient, "svn_client_cat2", _wrap_svn_client_cat2, -1);
   rb_define_module_function(mClient, "svn_client_cat", _wrap_svn_client_cat, -1);
   rb_define_module_function(mClient, "svn_client_add_to_changelist", _wrap_svn_client_add_to_changelist, -1);
@@ -32594,6 +33507,7 @@ SWIGEXPORT void Init_client(void) {
   SwigClassSvn_client_info2_t.destroy = (void (*)(void *)) free_svn_client_info2_t;
   SwigClassSvn_client_info2_t.trackObjects = 0;
   rb_define_module_function(mClient, "svn_client_info2_dup", _wrap_svn_client_info2_dup, -1);
+  rb_define_module_function(mClient, "svn_client_info4", _wrap_svn_client_info4, -1);
   rb_define_module_function(mClient, "svn_client_info3", _wrap_svn_client_info3, -1);
   rb_define_module_function(mClient, "svn_client_info2", _wrap_svn_client_info2, -1);
   rb_define_module_function(mClient, "svn_client_info", _wrap_svn_client_info, -1);
diff --git a/subversion/bindings/swig/ruby/svn_delta.c b/subversion/bindings/swig/ruby/svn_delta.c
index ba4a469..bf33b52 100644
--- a/subversion/bindings/swig/ruby/svn_delta.c
+++ b/subversion/bindings/swig/ruby/svn_delta.c
@@ -1,11 +1,11 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
- * 
- * This file is not intended to be easily readable and contains a number of 
+ * Version 2.0.12
+ *
+ * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
- * changes to this file unless you know what you are doing--modify the SWIG 
- * interface file instead. 
+ * changes to this file unless you know what you are doing--modify the SWIG
+ * interface file instead.
  * ----------------------------------------------------------------------------- */
 
 #define SWIGRUBY
@@ -41,28 +41,28 @@
 #ifndef SWIGUNUSED
 # if defined(__GNUC__)
 #   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__)) 
+#     define SWIGUNUSED __attribute__ ((__unused__))
 #   else
 #     define SWIGUNUSED
 #   endif
 # elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__)) 
+#   define SWIGUNUSED __attribute__ ((__unused__))
 # else
-#   define SWIGUNUSED 
+#   define SWIGUNUSED
 # endif
 #endif
 
 #ifndef SWIG_MSC_UNSUPPRESS_4505
 # if defined(_MSC_VER)
 #   pragma warning(disable : 4505) /* unreferenced local function has been removed */
-# endif 
+# endif
 #endif
 
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
 # else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
 # endif
 #endif
 
@@ -105,7 +105,7 @@
 #   define SWIGSTDCALL __stdcall
 # else
 #   define SWIGSTDCALL
-# endif 
+# endif
 #endif
 
 /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
@@ -150,28 +150,28 @@
 #ifndef SWIGUNUSED
 # if defined(__GNUC__)
 #   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__)) 
+#     define SWIGUNUSED __attribute__ ((__unused__))
 #   else
 #     define SWIGUNUSED
 #   endif
 # elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__)) 
+#   define SWIGUNUSED __attribute__ ((__unused__))
 # else
-#   define SWIGUNUSED 
+#   define SWIGUNUSED
 # endif
 #endif
 
 #ifndef SWIG_MSC_UNSUPPRESS_4505
 # if defined(_MSC_VER)
 #   pragma warning(disable : 4505) /* unreferenced local function has been removed */
-# endif 
+# endif
 #endif
 
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
 # else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
 # endif
 #endif
 
@@ -214,7 +214,7 @@
 #   define SWIGSTDCALL __stdcall
 # else
 #   define SWIGSTDCALL
-# endif 
+# endif
 #endif
 
 /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
@@ -252,7 +252,7 @@
   You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for
   creating a static or dynamic library from the SWIG runtime code.
   In 99.9% of the cases, SWIG just needs to declare them as 'static'.
-  
+
   But only do this if strictly necessary, ie, if you have problems
   with your compiler or suchlike.
 */
@@ -278,16 +278,16 @@
 #define SWIG_POINTER_OWN           0x1
 
 
-/* 
+/*
    Flags/methods for returning states.
-   
-   The SWIG conversion methods, as ConvertPtr, return an integer 
+
+   The SWIG conversion methods, as ConvertPtr, return an integer
    that tells if the conversion was successful or not. And if not,
    an error code can be returned (see swigerrors.swg for the codes).
-   
+
    Use the following macros/flags to set or process the returning
    states.
-   
+
    In old versions of SWIG, code such as the following was usually written:
 
      if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) {
@@ -320,23 +320,23 @@
     } else {
       // fail code
     }
-    
+
    I.e., now SWIG_ConvertPtr can return new objects and you can
    identify the case and take care of the deallocation. Of course that
    also requires SWIG_ConvertPtr to return new result values, such as
 
-      int SWIG_ConvertPtr(obj, ptr,...) {         
-        if (<obj is ok>) {			       
-          if (<need new object>) {		       
-            *ptr = <ptr to new allocated object>; 
-            return SWIG_NEWOBJ;		       
-          } else {				       
-            *ptr = <ptr to old object>;	       
-            return SWIG_OLDOBJ;		       
-          } 				       
-        } else {				       
-          return SWIG_BADOBJ;		       
-        }					       
+      int SWIG_ConvertPtr(obj, ptr,...) {
+        if (<obj is ok>) {
+          if (<need new object>) {
+            *ptr = <ptr to new allocated object>;
+            return SWIG_NEWOBJ;
+          } else {
+            *ptr = <ptr to old object>;
+            return SWIG_OLDOBJ;
+          }
+        } else {
+          return SWIG_BADOBJ;
+        }
       }
 
    Of course, returning the plain '0(success)/-1(fail)' still works, but you can be
@@ -350,17 +350,17 @@
        int fooi(int);
 
    and you call
- 
+
       food(1)   // cast rank '1'  (1 -> 1.0)
       fooi(1)   // cast rank '0'
 
    just use the SWIG_AddCast()/SWIG_CheckState()
 */
 
-#define SWIG_OK                    (0) 
+#define SWIG_OK                    (0)
 #define SWIG_ERROR                 (-1)
 #define SWIG_IsOK(r)               (r >= 0)
-#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)  
+#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)
 
 /* The CastRankLimit says how many bits are used for the cast rank */
 #define SWIG_CASTRANKLIMIT         (1 << 8)
@@ -391,14 +391,14 @@
 #  endif
 #  define SWIG_CASTRANKMASK          ((SWIG_CASTRANKLIMIT) -1)
 #  define SWIG_CastRank(r)           (r & SWIG_CASTRANKMASK)
-SWIGINTERNINLINE int SWIG_AddCast(int r) { 
+SWIGINTERNINLINE int SWIG_AddCast(int r) {
   return SWIG_IsOK(r) ? ((SWIG_CastRank(r) < SWIG_MAXCASTRANK) ? (r + 1) : SWIG_ERROR) : r;
 }
-SWIGINTERNINLINE int SWIG_CheckState(int r) { 
-  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0; 
+SWIGINTERNINLINE int SWIG_CheckState(int r) {
+  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0;
 }
 #else /* no cast-rank mode */
-#  define SWIG_AddCast
+#  define SWIG_AddCast(r) (r)
 #  define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0)
 #endif
 
@@ -442,7 +442,7 @@ typedef struct swig_module_info {
   void                    *clientdata;		/* Language specific module data */
 } swig_module_info;
 
-/* 
+/*
   Compare two type names skipping the space characters, therefore
   "char*" == "char *" and "Class<int>" == "Class<int >", etc.
 
@@ -462,18 +462,18 @@ SWIG_TypeNameComp(const char *f1, const char *l1,
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if not equal, 1 if equal
+  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
 */
 SWIGRUNTIME int
-SWIG_TypeEquiv(const char *nb, const char *tb) {
-  int equiv = 0;
+SWIG_TypeCmp(const char *nb, const char *tb) {
+  int equiv = 1;
   const char* te = tb + strlen(tb);
   const char* ne = nb;
-  while (!equiv && *ne) {
+  while (equiv != 0 && *ne) {
     for (nb = ne; *ne; ++ne) {
       if (*ne == '|') break;
     }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
+    equiv = SWIG_TypeNameComp(nb, ne, tb, te);
     if (*ne) ++ne;
   }
   return equiv;
@@ -481,24 +481,13 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
+  Return 0 if not equal, 1 if equal
 */
 SWIGRUNTIME int
-SWIG_TypeCompare(const char *nb, const char *tb) {
-  int equiv = 0;
-  const char* te = tb + strlen(tb);
-  const char* ne = nb;
-  while (!equiv && *ne) {
-    for (nb = ne; *ne; ++ne) {
-      if (*ne == '|') break;
-    }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
-    if (*ne) ++ne;
-  }
-  return equiv;
+SWIG_TypeEquiv(const char *nb, const char *tb) {
+  return SWIG_TypeCmp(nb, tb) == 0 ? 1 : 0;
 }
 
-
 /*
   Check the typename
 */
@@ -526,7 +515,7 @@ SWIG_TypeCheck(const char *c, swig_type_info *ty) {
   return 0;
 }
 
-/* 
+/*
   Identical to SWIG_TypeCheck, except strcmp is replaced with a pointer comparison
 */
 SWIGRUNTIME swig_cast_info *
@@ -561,7 +550,7 @@ SWIG_TypeCast(swig_cast_info *ty, void *ptr, int *newmemory) {
   return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr, newmemory);
 }
 
-/* 
+/*
    Dynamic pointer casting. Down an inheritance hierarchy
 */
 SWIGRUNTIME swig_type_info *
@@ -605,7 +594,7 @@ SWIG_TypePrettyName(const swig_type_info *type) {
     return type->name;
 }
 
-/* 
+/*
    Set the clientdata field for a type
 */
 SWIGRUNTIME void
@@ -613,14 +602,14 @@ SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
   swig_cast_info *cast = ti->cast;
   /* if (ti->clientdata == clientdata) return; */
   ti->clientdata = clientdata;
-  
+
   while (cast) {
     if (!cast->converter) {
       swig_type_info *tc = cast->type;
       if (!tc->clientdata) {
 	SWIG_TypeClientData(tc, clientdata);
       }
-    }    
+    }
     cast = cast->next;
   }
 }
@@ -629,18 +618,18 @@ SWIG_TypeNewClientData(swig_type_info *ti, void *clientdata) {
   SWIG_TypeClientData(ti, clientdata);
   ti->owndata = 1;
 }
-  
+
 /*
   Search for a swig_type_info structure only by mangled name
   Search is a O(log #types)
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_MangledTypeQueryModule(swig_module_info *start, 
-                            swig_module_info *end, 
+SWIG_MangledTypeQueryModule(swig_module_info *start,
+                            swig_module_info *end,
 		            const char *name) {
   swig_module_info *iter = start;
   do {
@@ -649,11 +638,11 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
       register size_t r = iter->size - 1;
       do {
 	/* since l+r >= 0, we can (>> 1) instead (/ 2) */
-	register size_t i = (l + r) >> 1; 
+	register size_t i = (l + r) >> 1;
 	const char *iname = iter->types[i]->name;
 	if (iname) {
 	  register int compare = strcmp(name, iname);
-	  if (compare == 0) {	    
+	  if (compare == 0) {
 	    return iter->types[i];
 	  } else if (compare < 0) {
 	    if (i) {
@@ -678,14 +667,14 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
   Search for a swig_type_info structure for either a mangled name or a human readable name.
   It first searches the mangled names of the types, which is a O(log #types)
   If a type is not found it then searches the human readable names, which is O(#types).
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_TypeQueryModule(swig_module_info *start, 
-                     swig_module_info *end, 
+SWIG_TypeQueryModule(swig_module_info *start,
+                     swig_module_info *end,
 		     const char *name) {
   /* STEP 1: Search the name field using binary search */
   swig_type_info *ret = SWIG_MangledTypeQueryModule(start, end, name);
@@ -704,12 +693,12 @@ SWIG_TypeQueryModule(swig_module_info *start,
       iter = iter->next;
     } while (iter != end);
   }
-  
+
   /* neither found a match */
   return 0;
 }
 
-/* 
+/*
    Pack binary data into a string
 */
 SWIGRUNTIME char *
@@ -725,7 +714,7 @@ SWIG_PackData(char *c, void *ptr, size_t sz) {
   return c;
 }
 
-/* 
+/*
    Unpack binary data from a string
 */
 SWIGRUNTIME const char *
@@ -739,21 +728,21 @@ SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
       uu = ((d - '0') << 4);
     else if ((d >= 'a') && (d <= 'f'))
       uu = ((d - ('a'-10)) << 4);
-    else 
+    else
       return (char *) 0;
     d = *(c++);
     if ((d >= '0') && (d <= '9'))
       uu |= (d - '0');
     else if ((d >= 'a') && (d <= 'f'))
       uu |= (d - ('a'-10));
-    else 
+    else
       return (char *) 0;
     *u = uu;
   }
   return c;
 }
 
-/* 
+/*
    Pack 'void *' into a string buffer.
 */
 SWIGRUNTIME char *
@@ -813,18 +802,18 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 #endif
 
 /*  Errors in SWIG */
-#define  SWIG_UnknownError    	   -1 
-#define  SWIG_IOError        	   -2 
-#define  SWIG_RuntimeError   	   -3 
-#define  SWIG_IndexError     	   -4 
-#define  SWIG_TypeError      	   -5 
-#define  SWIG_DivisionByZero 	   -6 
-#define  SWIG_OverflowError  	   -7 
-#define  SWIG_SyntaxError    	   -8 
-#define  SWIG_ValueError     	   -9 
+#define  SWIG_UnknownError    	   -1
+#define  SWIG_IOError        	   -2
+#define  SWIG_RuntimeError   	   -3
+#define  SWIG_IndexError     	   -4
+#define  SWIG_TypeError      	   -5
+#define  SWIG_DivisionByZero 	   -6
+#define  SWIG_OverflowError  	   -7
+#define  SWIG_SyntaxError    	   -8
+#define  SWIG_ValueError     	   -9
 #define  SWIG_SystemError    	   -10
 #define  SWIG_AttributeError 	   -11
-#define  SWIG_MemoryError    	   -12 
+#define  SWIG_MemoryError    	   -12
 #define  SWIG_NullReferenceError   -13
 
 
@@ -1750,7 +1739,7 @@ SWIG_Ruby_SetModule(swig_module_info *pointer)
 SWIGINTERN
 int SWIG_Ruby_isCallable( VALUE proc )
 {
-  if ( rb_respond_to( proc, swig_call_id ) == Qtrue )
+  if ( rb_respond_to( proc, swig_call_id ) )
     return 1;
   return 0;
 }
@@ -1763,7 +1752,7 @@ int SWIG_Ruby_isCallable( VALUE proc )
 SWIGINTERN
 int SWIG_Ruby_arity( VALUE proc, int minimal )
 {
-  if ( rb_respond_to( proc, swig_arity_id ) == Qtrue )
+  if ( rb_respond_to( proc, swig_arity_id ) )
     {
       VALUE num = rb_funcall( proc, swig_arity_id, 0 );
       int arity = NUM2INT(num);
@@ -1909,7 +1898,7 @@ static VALUE mDelta;
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x020009 
+#define SWIGVERSION 0x020012 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -1999,7 +1988,7 @@ SWIG_ruby_failed(void)
 } 
 
 
-/*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2044,7 +2033,7 @@ SWIG_AsVal_int (VALUE obj, int *val)
 }
 
 
-/*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -3230,7 +3219,7 @@ _wrap_svn_txdelta_run(int argc, VALUE *argv, VALUE self) {
   } 
   arg5 = (svn_checksum_kind_t)(val5);
   {
-    arg7 = svn_swig_rb_cancel_func;
+    arg7 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg8 = (void *)svn_swig_rb_make_baton(argv[4], _global_svn_swig_rb_pool);
   }
   if (argc > 5) {
@@ -5437,7 +5426,7 @@ _wrap_svn_delta_get_cancellation_editor(int argc, VALUE *argv, VALUE self) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail;
   }
   {
-    arg1 = svn_swig_rb_cancel_func;
+    arg1 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg2 = (void *)svn_swig_rb_make_baton(argv[0], _global_svn_swig_rb_pool);
   }
   res3 = SWIG_ConvertPtr(argv[1], &argp3,SWIGTYPE_p_svn_delta_editor_t, 0 |  0 );
@@ -5619,7 +5608,7 @@ _wrap_svn_delta_path_driver2(int argc, VALUE *argv, VALUE self) {
   }
   arg4 = RTEST(argv[2]);
   {
-    arg5 = svn_swig_rb_delta_path_driver_cb_func;
+    arg5 = (svn_delta_path_driver_cb_func_t) svn_swig_rb_delta_path_driver_cb_func;
     arg6 = (void *)svn_swig_rb_make_baton(argv[3], _global_svn_swig_rb_pool);
   }
   if (argc > 4) {
@@ -5704,7 +5693,7 @@ _wrap_svn_delta_path_driver(int argc, VALUE *argv, VALUE self) {
     arg4 = svn_swig_rb_strings_to_apr_array(argv[2], _global_pool);
   }
   {
-    arg5 = svn_swig_rb_delta_path_driver_cb_func;
+    arg5 = (svn_delta_path_driver_cb_func_t) svn_swig_rb_delta_path_driver_cb_func;
     arg6 = (void *)svn_swig_rb_make_baton(argv[3], _global_svn_swig_rb_pool);
   }
   if (argc > 4) {
@@ -8835,18 +8824,18 @@ static swig_cast_info *swig_cast_initial[] = {
 
 /* -----------------------------------------------------------------------------
  * Type initialization:
- * This problem is tough by the requirement that no dynamic 
- * memory is used. Also, since swig_type_info structures store pointers to 
+ * This problem is tough by the requirement that no dynamic
+ * memory is used. Also, since swig_type_info structures store pointers to
  * swig_cast_info structures and swig_cast_info structures store pointers back
- * to swig_type_info structures, we need some lookup code at initialization. 
- * The idea is that swig generates all the structures that are needed. 
- * The runtime then collects these partially filled structures. 
- * The SWIG_InitializeModule function takes these initial arrays out of 
+ * to swig_type_info structures, we need some lookup code at initialization.
+ * The idea is that swig generates all the structures that are needed.
+ * The runtime then collects these partially filled structures.
+ * The SWIG_InitializeModule function takes these initial arrays out of
  * swig_module, and does all the lookup, filling in the swig_module.types
  * array with the correct data and linking the correct swig_cast_info
  * structures together.
  *
- * The generated swig_type_info structures are assigned staticly to an initial 
+ * The generated swig_type_info structures are assigned staticly to an initial
  * array. We just loop through that array, and handle each type individually.
  * First we lookup if this type has been already loaded, and if so, use the
  * loaded structure instead of the generated one. Then we have to fill in the
@@ -8856,17 +8845,17 @@ static swig_cast_info *swig_cast_initial[] = {
  * a column is one of the swig_cast_info structures for that type.
  * The cast_initial array is actually an array of arrays, because each row has
  * a variable number of columns. So to actually build the cast linked list,
- * we find the array of casts associated with the type, and loop through it 
+ * we find the array of casts associated with the type, and loop through it
  * adding the casts to the list. The one last trick we need to do is making
  * sure the type pointer in the swig_cast_info struct is correct.
  *
- * First off, we lookup the cast->type name to see if it is already loaded. 
+ * First off, we lookup the cast->type name to see if it is already loaded.
  * There are three cases to handle:
  *  1) If the cast->type has already been loaded AND the type we are adding
  *     casting info to has not been loaded (it is in this module), THEN we
  *     replace the cast->type pointer with the type pointer that has already
  *     been loaded.
- *  2) If BOTH types (the one we are adding casting info to, and the 
+ *  2) If BOTH types (the one we are adding casting info to, and the
  *     cast->type) are loaded, THEN the cast info has already been loaded by
  *     the previous module so we just ignore it.
  *  3) Finally, if cast->type has not already been loaded, then we add that
@@ -8929,7 +8918,7 @@ SWIG_InitializeModule(void *clientdata) {
     module_head->next = &swig_module;
   }
 
-  /* When multiple interpeters are used, a module could have already been initialized in
+  /* When multiple interpreters are used, a module could have already been initialized in
      a different interpreter, but not yet have a pointer in this interpreter.
      In this case, we do not want to continue adding types... everything should be
      set up already */
@@ -8943,7 +8932,7 @@ SWIG_InitializeModule(void *clientdata) {
     swig_type_info *type = 0;
     swig_type_info *ret;
     swig_cast_info *cast;
-  
+
 #ifdef SWIGRUNTIME_DEBUG
     printf("SWIG_InitializeModule: type %d %s\n", i, swig_module.type_initial[i]->name);
 #endif
@@ -8970,7 +8959,7 @@ SWIG_InitializeModule(void *clientdata) {
     /* Insert casting types */
     cast = swig_module.cast_initial[i];
     while (cast->type) {
-    
+
       /* Don't need to add information already in the list */
       ret = 0;
 #ifdef SWIGRUNTIME_DEBUG
diff --git a/subversion/bindings/swig/ruby/svn_diff.c b/subversion/bindings/swig/ruby/svn_diff.c
index c1876e6..29d59ff 100644
--- a/subversion/bindings/swig/ruby/svn_diff.c
+++ b/subversion/bindings/swig/ruby/svn_diff.c
@@ -1,11 +1,11 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
- * 
- * This file is not intended to be easily readable and contains a number of 
+ * Version 2.0.12
+ *
+ * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
- * changes to this file unless you know what you are doing--modify the SWIG 
- * interface file instead. 
+ * changes to this file unless you know what you are doing--modify the SWIG
+ * interface file instead.
  * ----------------------------------------------------------------------------- */
 
 #define SWIGRUBY
@@ -41,28 +41,28 @@
 #ifndef SWIGUNUSED
 # if defined(__GNUC__)
 #   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__)) 
+#     define SWIGUNUSED __attribute__ ((__unused__))
 #   else
 #     define SWIGUNUSED
 #   endif
 # elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__)) 
+#   define SWIGUNUSED __attribute__ ((__unused__))
 # else
-#   define SWIGUNUSED 
+#   define SWIGUNUSED
 # endif
 #endif
 
 #ifndef SWIG_MSC_UNSUPPRESS_4505
 # if defined(_MSC_VER)
 #   pragma warning(disable : 4505) /* unreferenced local function has been removed */
-# endif 
+# endif
 #endif
 
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
 # else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
 # endif
 #endif
 
@@ -105,7 +105,7 @@
 #   define SWIGSTDCALL __stdcall
 # else
 #   define SWIGSTDCALL
-# endif 
+# endif
 #endif
 
 /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
@@ -150,28 +150,28 @@
 #ifndef SWIGUNUSED
 # if defined(__GNUC__)
 #   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__)) 
+#     define SWIGUNUSED __attribute__ ((__unused__))
 #   else
 #     define SWIGUNUSED
 #   endif
 # elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__)) 
+#   define SWIGUNUSED __attribute__ ((__unused__))
 # else
-#   define SWIGUNUSED 
+#   define SWIGUNUSED
 # endif
 #endif
 
 #ifndef SWIG_MSC_UNSUPPRESS_4505
 # if defined(_MSC_VER)
 #   pragma warning(disable : 4505) /* unreferenced local function has been removed */
-# endif 
+# endif
 #endif
 
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
 # else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
 # endif
 #endif
 
@@ -214,7 +214,7 @@
 #   define SWIGSTDCALL __stdcall
 # else
 #   define SWIGSTDCALL
-# endif 
+# endif
 #endif
 
 /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
@@ -252,7 +252,7 @@
   You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for
   creating a static or dynamic library from the SWIG runtime code.
   In 99.9% of the cases, SWIG just needs to declare them as 'static'.
-  
+
   But only do this if strictly necessary, ie, if you have problems
   with your compiler or suchlike.
 */
@@ -278,16 +278,16 @@
 #define SWIG_POINTER_OWN           0x1
 
 
-/* 
+/*
    Flags/methods for returning states.
-   
-   The SWIG conversion methods, as ConvertPtr, return an integer 
+
+   The SWIG conversion methods, as ConvertPtr, return an integer
    that tells if the conversion was successful or not. And if not,
    an error code can be returned (see swigerrors.swg for the codes).
-   
+
    Use the following macros/flags to set or process the returning
    states.
-   
+
    In old versions of SWIG, code such as the following was usually written:
 
      if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) {
@@ -320,23 +320,23 @@
     } else {
       // fail code
     }
-    
+
    I.e., now SWIG_ConvertPtr can return new objects and you can
    identify the case and take care of the deallocation. Of course that
    also requires SWIG_ConvertPtr to return new result values, such as
 
-      int SWIG_ConvertPtr(obj, ptr,...) {         
-        if (<obj is ok>) {			       
-          if (<need new object>) {		       
-            *ptr = <ptr to new allocated object>; 
-            return SWIG_NEWOBJ;		       
-          } else {				       
-            *ptr = <ptr to old object>;	       
-            return SWIG_OLDOBJ;		       
-          } 				       
-        } else {				       
-          return SWIG_BADOBJ;		       
-        }					       
+      int SWIG_ConvertPtr(obj, ptr,...) {
+        if (<obj is ok>) {
+          if (<need new object>) {
+            *ptr = <ptr to new allocated object>;
+            return SWIG_NEWOBJ;
+          } else {
+            *ptr = <ptr to old object>;
+            return SWIG_OLDOBJ;
+          }
+        } else {
+          return SWIG_BADOBJ;
+        }
       }
 
    Of course, returning the plain '0(success)/-1(fail)' still works, but you can be
@@ -350,17 +350,17 @@
        int fooi(int);
 
    and you call
- 
+
       food(1)   // cast rank '1'  (1 -> 1.0)
       fooi(1)   // cast rank '0'
 
    just use the SWIG_AddCast()/SWIG_CheckState()
 */
 
-#define SWIG_OK                    (0) 
+#define SWIG_OK                    (0)
 #define SWIG_ERROR                 (-1)
 #define SWIG_IsOK(r)               (r >= 0)
-#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)  
+#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)
 
 /* The CastRankLimit says how many bits are used for the cast rank */
 #define SWIG_CASTRANKLIMIT         (1 << 8)
@@ -391,14 +391,14 @@
 #  endif
 #  define SWIG_CASTRANKMASK          ((SWIG_CASTRANKLIMIT) -1)
 #  define SWIG_CastRank(r)           (r & SWIG_CASTRANKMASK)
-SWIGINTERNINLINE int SWIG_AddCast(int r) { 
+SWIGINTERNINLINE int SWIG_AddCast(int r) {
   return SWIG_IsOK(r) ? ((SWIG_CastRank(r) < SWIG_MAXCASTRANK) ? (r + 1) : SWIG_ERROR) : r;
 }
-SWIGINTERNINLINE int SWIG_CheckState(int r) { 
-  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0; 
+SWIGINTERNINLINE int SWIG_CheckState(int r) {
+  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0;
 }
 #else /* no cast-rank mode */
-#  define SWIG_AddCast
+#  define SWIG_AddCast(r) (r)
 #  define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0)
 #endif
 
@@ -442,7 +442,7 @@ typedef struct swig_module_info {
   void                    *clientdata;		/* Language specific module data */
 } swig_module_info;
 
-/* 
+/*
   Compare two type names skipping the space characters, therefore
   "char*" == "char *" and "Class<int>" == "Class<int >", etc.
 
@@ -462,18 +462,18 @@ SWIG_TypeNameComp(const char *f1, const char *l1,
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if not equal, 1 if equal
+  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
 */
 SWIGRUNTIME int
-SWIG_TypeEquiv(const char *nb, const char *tb) {
-  int equiv = 0;
+SWIG_TypeCmp(const char *nb, const char *tb) {
+  int equiv = 1;
   const char* te = tb + strlen(tb);
   const char* ne = nb;
-  while (!equiv && *ne) {
+  while (equiv != 0 && *ne) {
     for (nb = ne; *ne; ++ne) {
       if (*ne == '|') break;
     }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
+    equiv = SWIG_TypeNameComp(nb, ne, tb, te);
     if (*ne) ++ne;
   }
   return equiv;
@@ -481,24 +481,13 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
+  Return 0 if not equal, 1 if equal
 */
 SWIGRUNTIME int
-SWIG_TypeCompare(const char *nb, const char *tb) {
-  int equiv = 0;
-  const char* te = tb + strlen(tb);
-  const char* ne = nb;
-  while (!equiv && *ne) {
-    for (nb = ne; *ne; ++ne) {
-      if (*ne == '|') break;
-    }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
-    if (*ne) ++ne;
-  }
-  return equiv;
+SWIG_TypeEquiv(const char *nb, const char *tb) {
+  return SWIG_TypeCmp(nb, tb) == 0 ? 1 : 0;
 }
 
-
 /*
   Check the typename
 */
@@ -526,7 +515,7 @@ SWIG_TypeCheck(const char *c, swig_type_info *ty) {
   return 0;
 }
 
-/* 
+/*
   Identical to SWIG_TypeCheck, except strcmp is replaced with a pointer comparison
 */
 SWIGRUNTIME swig_cast_info *
@@ -561,7 +550,7 @@ SWIG_TypeCast(swig_cast_info *ty, void *ptr, int *newmemory) {
   return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr, newmemory);
 }
 
-/* 
+/*
    Dynamic pointer casting. Down an inheritance hierarchy
 */
 SWIGRUNTIME swig_type_info *
@@ -605,7 +594,7 @@ SWIG_TypePrettyName(const swig_type_info *type) {
     return type->name;
 }
 
-/* 
+/*
    Set the clientdata field for a type
 */
 SWIGRUNTIME void
@@ -613,14 +602,14 @@ SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
   swig_cast_info *cast = ti->cast;
   /* if (ti->clientdata == clientdata) return; */
   ti->clientdata = clientdata;
-  
+
   while (cast) {
     if (!cast->converter) {
       swig_type_info *tc = cast->type;
       if (!tc->clientdata) {
 	SWIG_TypeClientData(tc, clientdata);
       }
-    }    
+    }
     cast = cast->next;
   }
 }
@@ -629,18 +618,18 @@ SWIG_TypeNewClientData(swig_type_info *ti, void *clientdata) {
   SWIG_TypeClientData(ti, clientdata);
   ti->owndata = 1;
 }
-  
+
 /*
   Search for a swig_type_info structure only by mangled name
   Search is a O(log #types)
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_MangledTypeQueryModule(swig_module_info *start, 
-                            swig_module_info *end, 
+SWIG_MangledTypeQueryModule(swig_module_info *start,
+                            swig_module_info *end,
 		            const char *name) {
   swig_module_info *iter = start;
   do {
@@ -649,11 +638,11 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
       register size_t r = iter->size - 1;
       do {
 	/* since l+r >= 0, we can (>> 1) instead (/ 2) */
-	register size_t i = (l + r) >> 1; 
+	register size_t i = (l + r) >> 1;
 	const char *iname = iter->types[i]->name;
 	if (iname) {
 	  register int compare = strcmp(name, iname);
-	  if (compare == 0) {	    
+	  if (compare == 0) {
 	    return iter->types[i];
 	  } else if (compare < 0) {
 	    if (i) {
@@ -678,14 +667,14 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
   Search for a swig_type_info structure for either a mangled name or a human readable name.
   It first searches the mangled names of the types, which is a O(log #types)
   If a type is not found it then searches the human readable names, which is O(#types).
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_TypeQueryModule(swig_module_info *start, 
-                     swig_module_info *end, 
+SWIG_TypeQueryModule(swig_module_info *start,
+                     swig_module_info *end,
 		     const char *name) {
   /* STEP 1: Search the name field using binary search */
   swig_type_info *ret = SWIG_MangledTypeQueryModule(start, end, name);
@@ -704,12 +693,12 @@ SWIG_TypeQueryModule(swig_module_info *start,
       iter = iter->next;
     } while (iter != end);
   }
-  
+
   /* neither found a match */
   return 0;
 }
 
-/* 
+/*
    Pack binary data into a string
 */
 SWIGRUNTIME char *
@@ -725,7 +714,7 @@ SWIG_PackData(char *c, void *ptr, size_t sz) {
   return c;
 }
 
-/* 
+/*
    Unpack binary data from a string
 */
 SWIGRUNTIME const char *
@@ -739,21 +728,21 @@ SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
       uu = ((d - '0') << 4);
     else if ((d >= 'a') && (d <= 'f'))
       uu = ((d - ('a'-10)) << 4);
-    else 
+    else
       return (char *) 0;
     d = *(c++);
     if ((d >= '0') && (d <= '9'))
       uu |= (d - '0');
     else if ((d >= 'a') && (d <= 'f'))
       uu |= (d - ('a'-10));
-    else 
+    else
       return (char *) 0;
     *u = uu;
   }
   return c;
 }
 
-/* 
+/*
    Pack 'void *' into a string buffer.
 */
 SWIGRUNTIME char *
@@ -813,18 +802,18 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 #endif
 
 /*  Errors in SWIG */
-#define  SWIG_UnknownError    	   -1 
-#define  SWIG_IOError        	   -2 
-#define  SWIG_RuntimeError   	   -3 
-#define  SWIG_IndexError     	   -4 
-#define  SWIG_TypeError      	   -5 
-#define  SWIG_DivisionByZero 	   -6 
-#define  SWIG_OverflowError  	   -7 
-#define  SWIG_SyntaxError    	   -8 
-#define  SWIG_ValueError     	   -9 
+#define  SWIG_UnknownError    	   -1
+#define  SWIG_IOError        	   -2
+#define  SWIG_RuntimeError   	   -3
+#define  SWIG_IndexError     	   -4
+#define  SWIG_TypeError      	   -5
+#define  SWIG_DivisionByZero 	   -6
+#define  SWIG_OverflowError  	   -7
+#define  SWIG_SyntaxError    	   -8
+#define  SWIG_ValueError     	   -9
 #define  SWIG_SystemError    	   -10
 #define  SWIG_AttributeError 	   -11
-#define  SWIG_MemoryError    	   -12 
+#define  SWIG_MemoryError    	   -12
 #define  SWIG_NullReferenceError   -13
 
 
@@ -1750,7 +1739,7 @@ SWIG_Ruby_SetModule(swig_module_info *pointer)
 SWIGINTERN
 int SWIG_Ruby_isCallable( VALUE proc )
 {
-  if ( rb_respond_to( proc, swig_call_id ) == Qtrue )
+  if ( rb_respond_to( proc, swig_call_id ) )
     return 1;
   return 0;
 }
@@ -1763,7 +1752,7 @@ int SWIG_Ruby_isCallable( VALUE proc )
 SWIGINTERN
 int SWIG_Ruby_arity( VALUE proc, int minimal )
 {
-  if ( rb_respond_to( proc, swig_arity_id ) == Qtrue )
+  if ( rb_respond_to( proc, swig_arity_id ) )
     {
       VALUE num = rb_funcall( proc, swig_arity_id, 0 );
       int arity = NUM2INT(num);
@@ -1876,7 +1865,7 @@ static VALUE mDiff;
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x020009 
+#define SWIGVERSION 0x020012 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -2212,18 +2201,18 @@ static swig_cast_info *swig_cast_initial[] = {
 
 /* -----------------------------------------------------------------------------
  * Type initialization:
- * This problem is tough by the requirement that no dynamic 
- * memory is used. Also, since swig_type_info structures store pointers to 
+ * This problem is tough by the requirement that no dynamic
+ * memory is used. Also, since swig_type_info structures store pointers to
  * swig_cast_info structures and swig_cast_info structures store pointers back
- * to swig_type_info structures, we need some lookup code at initialization. 
- * The idea is that swig generates all the structures that are needed. 
- * The runtime then collects these partially filled structures. 
- * The SWIG_InitializeModule function takes these initial arrays out of 
+ * to swig_type_info structures, we need some lookup code at initialization.
+ * The idea is that swig generates all the structures that are needed.
+ * The runtime then collects these partially filled structures.
+ * The SWIG_InitializeModule function takes these initial arrays out of
  * swig_module, and does all the lookup, filling in the swig_module.types
  * array with the correct data and linking the correct swig_cast_info
  * structures together.
  *
- * The generated swig_type_info structures are assigned staticly to an initial 
+ * The generated swig_type_info structures are assigned staticly to an initial
  * array. We just loop through that array, and handle each type individually.
  * First we lookup if this type has been already loaded, and if so, use the
  * loaded structure instead of the generated one. Then we have to fill in the
@@ -2233,17 +2222,17 @@ static swig_cast_info *swig_cast_initial[] = {
  * a column is one of the swig_cast_info structures for that type.
  * The cast_initial array is actually an array of arrays, because each row has
  * a variable number of columns. So to actually build the cast linked list,
- * we find the array of casts associated with the type, and loop through it 
+ * we find the array of casts associated with the type, and loop through it
  * adding the casts to the list. The one last trick we need to do is making
  * sure the type pointer in the swig_cast_info struct is correct.
  *
- * First off, we lookup the cast->type name to see if it is already loaded. 
+ * First off, we lookup the cast->type name to see if it is already loaded.
  * There are three cases to handle:
  *  1) If the cast->type has already been loaded AND the type we are adding
  *     casting info to has not been loaded (it is in this module), THEN we
  *     replace the cast->type pointer with the type pointer that has already
  *     been loaded.
- *  2) If BOTH types (the one we are adding casting info to, and the 
+ *  2) If BOTH types (the one we are adding casting info to, and the
  *     cast->type) are loaded, THEN the cast info has already been loaded by
  *     the previous module so we just ignore it.
  *  3) Finally, if cast->type has not already been loaded, then we add that
@@ -2306,7 +2295,7 @@ SWIG_InitializeModule(void *clientdata) {
     module_head->next = &swig_module;
   }
 
-  /* When multiple interpeters are used, a module could have already been initialized in
+  /* When multiple interpreters are used, a module could have already been initialized in
      a different interpreter, but not yet have a pointer in this interpreter.
      In this case, we do not want to continue adding types... everything should be
      set up already */
@@ -2320,7 +2309,7 @@ SWIG_InitializeModule(void *clientdata) {
     swig_type_info *type = 0;
     swig_type_info *ret;
     swig_cast_info *cast;
-  
+
 #ifdef SWIGRUNTIME_DEBUG
     printf("SWIG_InitializeModule: type %d %s\n", i, swig_module.type_initial[i]->name);
 #endif
@@ -2347,7 +2336,7 @@ SWIG_InitializeModule(void *clientdata) {
     /* Insert casting types */
     cast = swig_module.cast_initial[i];
     while (cast->type) {
-    
+
       /* Don't need to add information already in the list */
       ret = 0;
 #ifdef SWIGRUNTIME_DEBUG
diff --git a/subversion/bindings/swig/ruby/svn_fs.c b/subversion/bindings/swig/ruby/svn_fs.c
index 6fd03dc..37bb6fa 100644
--- a/subversion/bindings/swig/ruby/svn_fs.c
+++ b/subversion/bindings/swig/ruby/svn_fs.c
@@ -1,11 +1,11 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
- * 
- * This file is not intended to be easily readable and contains a number of 
+ * Version 2.0.12
+ *
+ * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
- * changes to this file unless you know what you are doing--modify the SWIG 
- * interface file instead. 
+ * changes to this file unless you know what you are doing--modify the SWIG
+ * interface file instead.
  * ----------------------------------------------------------------------------- */
 
 #define SWIGRUBY
@@ -41,28 +41,28 @@
 #ifndef SWIGUNUSED
 # if defined(__GNUC__)
 #   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__)) 
+#     define SWIGUNUSED __attribute__ ((__unused__))
 #   else
 #     define SWIGUNUSED
 #   endif
 # elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__)) 
+#   define SWIGUNUSED __attribute__ ((__unused__))
 # else
-#   define SWIGUNUSED 
+#   define SWIGUNUSED
 # endif
 #endif
 
 #ifndef SWIG_MSC_UNSUPPRESS_4505
 # if defined(_MSC_VER)
 #   pragma warning(disable : 4505) /* unreferenced local function has been removed */
-# endif 
+# endif
 #endif
 
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
 # else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
 # endif
 #endif
 
@@ -105,7 +105,7 @@
 #   define SWIGSTDCALL __stdcall
 # else
 #   define SWIGSTDCALL
-# endif 
+# endif
 #endif
 
 /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
@@ -150,28 +150,28 @@
 #ifndef SWIGUNUSED
 # if defined(__GNUC__)
 #   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__)) 
+#     define SWIGUNUSED __attribute__ ((__unused__))
 #   else
 #     define SWIGUNUSED
 #   endif
 # elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__)) 
+#   define SWIGUNUSED __attribute__ ((__unused__))
 # else
-#   define SWIGUNUSED 
+#   define SWIGUNUSED
 # endif
 #endif
 
 #ifndef SWIG_MSC_UNSUPPRESS_4505
 # if defined(_MSC_VER)
 #   pragma warning(disable : 4505) /* unreferenced local function has been removed */
-# endif 
+# endif
 #endif
 
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
 # else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
 # endif
 #endif
 
@@ -214,7 +214,7 @@
 #   define SWIGSTDCALL __stdcall
 # else
 #   define SWIGSTDCALL
-# endif 
+# endif
 #endif
 
 /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
@@ -252,7 +252,7 @@
   You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for
   creating a static or dynamic library from the SWIG runtime code.
   In 99.9% of the cases, SWIG just needs to declare them as 'static'.
-  
+
   But only do this if strictly necessary, ie, if you have problems
   with your compiler or suchlike.
 */
@@ -278,16 +278,16 @@
 #define SWIG_POINTER_OWN           0x1
 
 
-/* 
+/*
    Flags/methods for returning states.
-   
-   The SWIG conversion methods, as ConvertPtr, return an integer 
+
+   The SWIG conversion methods, as ConvertPtr, return an integer
    that tells if the conversion was successful or not. And if not,
    an error code can be returned (see swigerrors.swg for the codes).
-   
+
    Use the following macros/flags to set or process the returning
    states.
-   
+
    In old versions of SWIG, code such as the following was usually written:
 
      if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) {
@@ -320,23 +320,23 @@
     } else {
       // fail code
     }
-    
+
    I.e., now SWIG_ConvertPtr can return new objects and you can
    identify the case and take care of the deallocation. Of course that
    also requires SWIG_ConvertPtr to return new result values, such as
 
-      int SWIG_ConvertPtr(obj, ptr,...) {         
-        if (<obj is ok>) {			       
-          if (<need new object>) {		       
-            *ptr = <ptr to new allocated object>; 
-            return SWIG_NEWOBJ;		       
-          } else {				       
-            *ptr = <ptr to old object>;	       
-            return SWIG_OLDOBJ;		       
-          } 				       
-        } else {				       
-          return SWIG_BADOBJ;		       
-        }					       
+      int SWIG_ConvertPtr(obj, ptr,...) {
+        if (<obj is ok>) {
+          if (<need new object>) {
+            *ptr = <ptr to new allocated object>;
+            return SWIG_NEWOBJ;
+          } else {
+            *ptr = <ptr to old object>;
+            return SWIG_OLDOBJ;
+          }
+        } else {
+          return SWIG_BADOBJ;
+        }
       }
 
    Of course, returning the plain '0(success)/-1(fail)' still works, but you can be
@@ -350,17 +350,17 @@
        int fooi(int);
 
    and you call
- 
+
       food(1)   // cast rank '1'  (1 -> 1.0)
       fooi(1)   // cast rank '0'
 
    just use the SWIG_AddCast()/SWIG_CheckState()
 */
 
-#define SWIG_OK                    (0) 
+#define SWIG_OK                    (0)
 #define SWIG_ERROR                 (-1)
 #define SWIG_IsOK(r)               (r >= 0)
-#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)  
+#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)
 
 /* The CastRankLimit says how many bits are used for the cast rank */
 #define SWIG_CASTRANKLIMIT         (1 << 8)
@@ -391,14 +391,14 @@
 #  endif
 #  define SWIG_CASTRANKMASK          ((SWIG_CASTRANKLIMIT) -1)
 #  define SWIG_CastRank(r)           (r & SWIG_CASTRANKMASK)
-SWIGINTERNINLINE int SWIG_AddCast(int r) { 
+SWIGINTERNINLINE int SWIG_AddCast(int r) {
   return SWIG_IsOK(r) ? ((SWIG_CastRank(r) < SWIG_MAXCASTRANK) ? (r + 1) : SWIG_ERROR) : r;
 }
-SWIGINTERNINLINE int SWIG_CheckState(int r) { 
-  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0; 
+SWIGINTERNINLINE int SWIG_CheckState(int r) {
+  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0;
 }
 #else /* no cast-rank mode */
-#  define SWIG_AddCast
+#  define SWIG_AddCast(r) (r)
 #  define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0)
 #endif
 
@@ -442,7 +442,7 @@ typedef struct swig_module_info {
   void                    *clientdata;		/* Language specific module data */
 } swig_module_info;
 
-/* 
+/*
   Compare two type names skipping the space characters, therefore
   "char*" == "char *" and "Class<int>" == "Class<int >", etc.
 
@@ -462,18 +462,18 @@ SWIG_TypeNameComp(const char *f1, const char *l1,
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if not equal, 1 if equal
+  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
 */
 SWIGRUNTIME int
-SWIG_TypeEquiv(const char *nb, const char *tb) {
-  int equiv = 0;
+SWIG_TypeCmp(const char *nb, const char *tb) {
+  int equiv = 1;
   const char* te = tb + strlen(tb);
   const char* ne = nb;
-  while (!equiv && *ne) {
+  while (equiv != 0 && *ne) {
     for (nb = ne; *ne; ++ne) {
       if (*ne == '|') break;
     }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
+    equiv = SWIG_TypeNameComp(nb, ne, tb, te);
     if (*ne) ++ne;
   }
   return equiv;
@@ -481,24 +481,13 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
+  Return 0 if not equal, 1 if equal
 */
 SWIGRUNTIME int
-SWIG_TypeCompare(const char *nb, const char *tb) {
-  int equiv = 0;
-  const char* te = tb + strlen(tb);
-  const char* ne = nb;
-  while (!equiv && *ne) {
-    for (nb = ne; *ne; ++ne) {
-      if (*ne == '|') break;
-    }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
-    if (*ne) ++ne;
-  }
-  return equiv;
+SWIG_TypeEquiv(const char *nb, const char *tb) {
+  return SWIG_TypeCmp(nb, tb) == 0 ? 1 : 0;
 }
 
-
 /*
   Check the typename
 */
@@ -526,7 +515,7 @@ SWIG_TypeCheck(const char *c, swig_type_info *ty) {
   return 0;
 }
 
-/* 
+/*
   Identical to SWIG_TypeCheck, except strcmp is replaced with a pointer comparison
 */
 SWIGRUNTIME swig_cast_info *
@@ -561,7 +550,7 @@ SWIG_TypeCast(swig_cast_info *ty, void *ptr, int *newmemory) {
   return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr, newmemory);
 }
 
-/* 
+/*
    Dynamic pointer casting. Down an inheritance hierarchy
 */
 SWIGRUNTIME swig_type_info *
@@ -605,7 +594,7 @@ SWIG_TypePrettyName(const swig_type_info *type) {
     return type->name;
 }
 
-/* 
+/*
    Set the clientdata field for a type
 */
 SWIGRUNTIME void
@@ -613,14 +602,14 @@ SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
   swig_cast_info *cast = ti->cast;
   /* if (ti->clientdata == clientdata) return; */
   ti->clientdata = clientdata;
-  
+
   while (cast) {
     if (!cast->converter) {
       swig_type_info *tc = cast->type;
       if (!tc->clientdata) {
 	SWIG_TypeClientData(tc, clientdata);
       }
-    }    
+    }
     cast = cast->next;
   }
 }
@@ -629,18 +618,18 @@ SWIG_TypeNewClientData(swig_type_info *ti, void *clientdata) {
   SWIG_TypeClientData(ti, clientdata);
   ti->owndata = 1;
 }
-  
+
 /*
   Search for a swig_type_info structure only by mangled name
   Search is a O(log #types)
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_MangledTypeQueryModule(swig_module_info *start, 
-                            swig_module_info *end, 
+SWIG_MangledTypeQueryModule(swig_module_info *start,
+                            swig_module_info *end,
 		            const char *name) {
   swig_module_info *iter = start;
   do {
@@ -649,11 +638,11 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
       register size_t r = iter->size - 1;
       do {
 	/* since l+r >= 0, we can (>> 1) instead (/ 2) */
-	register size_t i = (l + r) >> 1; 
+	register size_t i = (l + r) >> 1;
 	const char *iname = iter->types[i]->name;
 	if (iname) {
 	  register int compare = strcmp(name, iname);
-	  if (compare == 0) {	    
+	  if (compare == 0) {
 	    return iter->types[i];
 	  } else if (compare < 0) {
 	    if (i) {
@@ -678,14 +667,14 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
   Search for a swig_type_info structure for either a mangled name or a human readable name.
   It first searches the mangled names of the types, which is a O(log #types)
   If a type is not found it then searches the human readable names, which is O(#types).
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_TypeQueryModule(swig_module_info *start, 
-                     swig_module_info *end, 
+SWIG_TypeQueryModule(swig_module_info *start,
+                     swig_module_info *end,
 		     const char *name) {
   /* STEP 1: Search the name field using binary search */
   swig_type_info *ret = SWIG_MangledTypeQueryModule(start, end, name);
@@ -704,12 +693,12 @@ SWIG_TypeQueryModule(swig_module_info *start,
       iter = iter->next;
     } while (iter != end);
   }
-  
+
   /* neither found a match */
   return 0;
 }
 
-/* 
+/*
    Pack binary data into a string
 */
 SWIGRUNTIME char *
@@ -725,7 +714,7 @@ SWIG_PackData(char *c, void *ptr, size_t sz) {
   return c;
 }
 
-/* 
+/*
    Unpack binary data from a string
 */
 SWIGRUNTIME const char *
@@ -739,21 +728,21 @@ SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
       uu = ((d - '0') << 4);
     else if ((d >= 'a') && (d <= 'f'))
       uu = ((d - ('a'-10)) << 4);
-    else 
+    else
       return (char *) 0;
     d = *(c++);
     if ((d >= '0') && (d <= '9'))
       uu |= (d - '0');
     else if ((d >= 'a') && (d <= 'f'))
       uu |= (d - ('a'-10));
-    else 
+    else
       return (char *) 0;
     *u = uu;
   }
   return c;
 }
 
-/* 
+/*
    Pack 'void *' into a string buffer.
 */
 SWIGRUNTIME char *
@@ -813,18 +802,18 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 #endif
 
 /*  Errors in SWIG */
-#define  SWIG_UnknownError    	   -1 
-#define  SWIG_IOError        	   -2 
-#define  SWIG_RuntimeError   	   -3 
-#define  SWIG_IndexError     	   -4 
-#define  SWIG_TypeError      	   -5 
-#define  SWIG_DivisionByZero 	   -6 
-#define  SWIG_OverflowError  	   -7 
-#define  SWIG_SyntaxError    	   -8 
-#define  SWIG_ValueError     	   -9 
+#define  SWIG_UnknownError    	   -1
+#define  SWIG_IOError        	   -2
+#define  SWIG_RuntimeError   	   -3
+#define  SWIG_IndexError     	   -4
+#define  SWIG_TypeError      	   -5
+#define  SWIG_DivisionByZero 	   -6
+#define  SWIG_OverflowError  	   -7
+#define  SWIG_SyntaxError    	   -8
+#define  SWIG_ValueError     	   -9
 #define  SWIG_SystemError    	   -10
 #define  SWIG_AttributeError 	   -11
-#define  SWIG_MemoryError    	   -12 
+#define  SWIG_MemoryError    	   -12
 #define  SWIG_NullReferenceError   -13
 
 
@@ -1750,7 +1739,7 @@ SWIG_Ruby_SetModule(swig_module_info *pointer)
 SWIGINTERN
 int SWIG_Ruby_isCallable( VALUE proc )
 {
-  if ( rb_respond_to( proc, swig_call_id ) == Qtrue )
+  if ( rb_respond_to( proc, swig_call_id ) )
     return 1;
   return 0;
 }
@@ -1763,7 +1752,7 @@ int SWIG_Ruby_isCallable( VALUE proc )
 SWIGINTERN
 int SWIG_Ruby_arity( VALUE proc, int minimal )
 {
-  if ( rb_respond_to( proc, swig_arity_id ) == Qtrue )
+  if ( rb_respond_to( proc, swig_arity_id ) )
     {
       VALUE num = rb_funcall( proc, swig_arity_id, 0 );
       int arity = NUM2INT(num);
@@ -1797,114 +1786,126 @@ int SWIG_Ruby_arity( VALUE proc, int minimal )
 #define SWIGTYPE_p_apr_int32_t swig_types[2]
 #define SWIGTYPE_p_apr_int64_t swig_types[3]
 #define SWIGTYPE_p_apr_pool_t swig_types[4]
-#define SWIGTYPE_p_char swig_types[5]
-#define SWIGTYPE_p_f_long_p_void_p_apr_pool_t__void swig_types[6]
-#define SWIGTYPE_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[7]
-#define SWIGTYPE_p_f_p_q_const__unsigned_char_apr_size_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[8]
-#define SWIGTYPE_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t swig_types[9]
-#define SWIGTYPE_p_f_p_void__p_svn_error_t swig_types[10]
-#define SWIGTYPE_p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t swig_types[11]
-#define SWIGTYPE_p_f_p_void_p_apr_pool_t__p_svn_error_t swig_types[12]
-#define SWIGTYPE_p_f_p_void_p_struct_svn_error_t__void swig_types[13]
-#define SWIGTYPE_p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t swig_types[14]
-#define SWIGTYPE_p_int swig_types[15]
-#define SWIGTYPE_p_long swig_types[16]
-#define SWIGTYPE_p_p_apr_array_header_t swig_types[17]
-#define SWIGTYPE_p_p_apr_hash_t swig_types[18]
-#define SWIGTYPE_p_p_char swig_types[19]
-#define SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t swig_types[20]
-#define SWIGTYPE_p_p_svn_checksum_t swig_types[21]
-#define SWIGTYPE_p_p_svn_fs_access_t swig_types[22]
-#define SWIGTYPE_p_p_svn_fs_history_t swig_types[23]
-#define SWIGTYPE_p_p_svn_fs_id_t swig_types[24]
-#define SWIGTYPE_p_p_svn_fs_root_t swig_types[25]
-#define SWIGTYPE_p_p_svn_fs_t swig_types[26]
-#define SWIGTYPE_p_p_svn_fs_txn_t swig_types[27]
-#define SWIGTYPE_p_p_svn_lock_t swig_types[28]
-#define SWIGTYPE_p_p_svn_stream_t swig_types[29]
-#define SWIGTYPE_p_p_svn_string_t swig_types[30]
-#define SWIGTYPE_p_p_svn_txdelta_stream_t swig_types[31]
-#define SWIGTYPE_p_p_void swig_types[32]
-#define SWIGTYPE_p_svn_auth_baton_t swig_types[33]
-#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[34]
-#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[35]
-#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[36]
-#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[37]
-#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[38]
-#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[39]
-#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[40]
-#define SWIGTYPE_p_svn_auth_provider_t swig_types[41]
-#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[42]
-#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[43]
-#define SWIGTYPE_p_svn_checksum_kind_t swig_types[44]
-#define SWIGTYPE_p_svn_checksum_t swig_types[45]
-#define SWIGTYPE_p_svn_commit_info_t swig_types[46]
-#define SWIGTYPE_p_svn_config_t swig_types[47]
-#define SWIGTYPE_p_svn_delta_editor_t swig_types[48]
-#define SWIGTYPE_p_svn_depth_t swig_types[49]
-#define SWIGTYPE_p_svn_diff_conflict_display_style_t swig_types[50]
-#define SWIGTYPE_p_svn_diff_datasource_e swig_types[51]
-#define SWIGTYPE_p_svn_diff_file_ignore_space_t swig_types[52]
-#define SWIGTYPE_p_svn_diff_file_options_t swig_types[53]
-#define SWIGTYPE_p_svn_diff_fns2_t swig_types[54]
-#define SWIGTYPE_p_svn_diff_fns_t swig_types[55]
-#define SWIGTYPE_p_svn_diff_hunk_t swig_types[56]
-#define SWIGTYPE_p_svn_diff_operation_kind_e swig_types[57]
-#define SWIGTYPE_p_svn_diff_output_fns_t swig_types[58]
-#define SWIGTYPE_p_svn_diff_t swig_types[59]
-#define SWIGTYPE_p_svn_dirent_t swig_types[60]
-#define SWIGTYPE_p_svn_errno_t swig_types[61]
-#define SWIGTYPE_p_svn_error_t swig_types[62]
-#define SWIGTYPE_p_svn_fs_access_t swig_types[63]
-#define SWIGTYPE_p_svn_fs_dirent_t swig_types[64]
-#define SWIGTYPE_p_svn_fs_history_t swig_types[65]
-#define SWIGTYPE_p_svn_fs_id_t swig_types[66]
-#define SWIGTYPE_p_svn_fs_pack_notify_action_t swig_types[67]
-#define SWIGTYPE_p_svn_fs_path_change2_t swig_types[68]
-#define SWIGTYPE_p_svn_fs_path_change_kind_t swig_types[69]
-#define SWIGTYPE_p_svn_fs_path_change_t swig_types[70]
-#define SWIGTYPE_p_svn_fs_root_t swig_types[71]
-#define SWIGTYPE_p_svn_fs_t swig_types[72]
-#define SWIGTYPE_p_svn_fs_txn_t swig_types[73]
-#define SWIGTYPE_p_svn_io_dirent2_t swig_types[74]
-#define SWIGTYPE_p_svn_io_dirent_t swig_types[75]
-#define SWIGTYPE_p_svn_io_file_del_t swig_types[76]
-#define SWIGTYPE_p_svn_location_segment_t swig_types[77]
-#define SWIGTYPE_p_svn_lock_t swig_types[78]
-#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[79]
-#define SWIGTYPE_p_svn_log_changed_path_t swig_types[80]
-#define SWIGTYPE_p_svn_log_entry_t swig_types[81]
-#define SWIGTYPE_p_svn_merge_range_t swig_types[82]
-#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[83]
-#define SWIGTYPE_p_svn_node_kind_t swig_types[84]
-#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[85]
-#define SWIGTYPE_p_svn_opt_revision_t swig_types[86]
-#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[87]
-#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[88]
-#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[89]
-#define SWIGTYPE_p_svn_patch_file_t swig_types[90]
-#define SWIGTYPE_p_svn_patch_t swig_types[91]
-#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[92]
-#define SWIGTYPE_p_svn_prop_kind swig_types[93]
-#define SWIGTYPE_p_svn_prop_patch_t swig_types[94]
-#define SWIGTYPE_p_svn_stream_mark_t swig_types[95]
-#define SWIGTYPE_p_svn_stream_t swig_types[96]
-#define SWIGTYPE_p_svn_string_t swig_types[97]
-#define SWIGTYPE_p_svn_stringbuf_t swig_types[98]
-#define SWIGTYPE_p_svn_tristate_t swig_types[99]
-#define SWIGTYPE_p_svn_txdelta_op_t swig_types[100]
-#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[101]
-#define SWIGTYPE_p_svn_txdelta_window_t swig_types[102]
-#define SWIGTYPE_p_svn_version_checklist_t swig_types[103]
-#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[104]
-#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[105]
-#define SWIGTYPE_p_svn_version_extended_t swig_types[106]
-#define SWIGTYPE_p_svn_version_t swig_types[107]
-#define SWIGTYPE_p_unsigned_char swig_types[108]
-#define SWIGTYPE_p_unsigned_long swig_types[109]
-#define SWIGTYPE_p_void swig_types[110]
-static swig_type_info *swig_types[112];
-static swig_module_info swig_module = {swig_types, 111, 0, 0, 0, 0};
+#define SWIGTYPE_p_apr_uint64_t swig_types[5]
+#define SWIGTYPE_p_char swig_types[6]
+#define SWIGTYPE_p_f_long_p_void_p_apr_pool_t__void swig_types[7]
+#define SWIGTYPE_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[8]
+#define SWIGTYPE_p_f_p_q_const__unsigned_char_apr_size_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[9]
+#define SWIGTYPE_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t swig_types[10]
+#define SWIGTYPE_p_f_p_void__p_svn_error_t swig_types[11]
+#define SWIGTYPE_p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t swig_types[12]
+#define SWIGTYPE_p_f_p_void_apr_uint64_t_svn_fs_upgrade_notify_action_t_p_apr_pool_t__p_svn_error_t swig_types[13]
+#define SWIGTYPE_p_f_p_void_long_long_p_apr_pool_t__void swig_types[14]
+#define SWIGTYPE_p_f_p_void_p_apr_pool_t__p_svn_error_t swig_types[15]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t swig_types[16]
+#define SWIGTYPE_p_f_p_void_p_struct_svn_error_t__void swig_types[17]
+#define SWIGTYPE_p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t swig_types[18]
+#define SWIGTYPE_p_int swig_types[19]
+#define SWIGTYPE_p_long swig_types[20]
+#define SWIGTYPE_p_p_apr_array_header_t swig_types[21]
+#define SWIGTYPE_p_p_apr_hash_t swig_types[22]
+#define SWIGTYPE_p_p_char swig_types[23]
+#define SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t swig_types[24]
+#define SWIGTYPE_p_p_svn_checksum_t swig_types[25]
+#define SWIGTYPE_p_p_svn_fs_access_t swig_types[26]
+#define SWIGTYPE_p_p_svn_fs_history_t swig_types[27]
+#define SWIGTYPE_p_p_svn_fs_id_t swig_types[28]
+#define SWIGTYPE_p_p_svn_fs_info_placeholder_t swig_types[29]
+#define SWIGTYPE_p_p_svn_fs_root_t swig_types[30]
+#define SWIGTYPE_p_p_svn_fs_t swig_types[31]
+#define SWIGTYPE_p_p_svn_fs_txn_t swig_types[32]
+#define SWIGTYPE_p_p_svn_lock_t swig_types[33]
+#define SWIGTYPE_p_p_svn_stream_t swig_types[34]
+#define SWIGTYPE_p_p_svn_string_t swig_types[35]
+#define SWIGTYPE_p_p_svn_txdelta_stream_t swig_types[36]
+#define SWIGTYPE_p_p_svn_version_t swig_types[37]
+#define SWIGTYPE_p_p_void swig_types[38]
+#define SWIGTYPE_p_svn_auth_baton_t swig_types[39]
+#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[40]
+#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[41]
+#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[42]
+#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[43]
+#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[44]
+#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[45]
+#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[46]
+#define SWIGTYPE_p_svn_auth_provider_t swig_types[47]
+#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[48]
+#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[49]
+#define SWIGTYPE_p_svn_checksum_kind_t swig_types[50]
+#define SWIGTYPE_p_svn_checksum_t swig_types[51]
+#define SWIGTYPE_p_svn_commit_info_t swig_types[52]
+#define SWIGTYPE_p_svn_config_t swig_types[53]
+#define SWIGTYPE_p_svn_delta_editor_t swig_types[54]
+#define SWIGTYPE_p_svn_depth_t swig_types[55]
+#define SWIGTYPE_p_svn_diff_conflict_display_style_t swig_types[56]
+#define SWIGTYPE_p_svn_diff_datasource_e swig_types[57]
+#define SWIGTYPE_p_svn_diff_file_ignore_space_t swig_types[58]
+#define SWIGTYPE_p_svn_diff_file_options_t swig_types[59]
+#define SWIGTYPE_p_svn_diff_fns2_t swig_types[60]
+#define SWIGTYPE_p_svn_diff_fns_t swig_types[61]
+#define SWIGTYPE_p_svn_diff_hunk_t swig_types[62]
+#define SWIGTYPE_p_svn_diff_operation_kind_e swig_types[63]
+#define SWIGTYPE_p_svn_diff_output_fns_t swig_types[64]
+#define SWIGTYPE_p_svn_diff_t swig_types[65]
+#define SWIGTYPE_p_svn_dirent_t swig_types[66]
+#define SWIGTYPE_p_svn_errno_t swig_types[67]
+#define SWIGTYPE_p_svn_error_t swig_types[68]
+#define SWIGTYPE_p_svn_fs_access_t swig_types[69]
+#define SWIGTYPE_p_svn_fs_dirent_t swig_types[70]
+#define SWIGTYPE_p_svn_fs_fsfs_info_t swig_types[71]
+#define SWIGTYPE_p_svn_fs_fsx_info_t swig_types[72]
+#define SWIGTYPE_p_svn_fs_history_t swig_types[73]
+#define SWIGTYPE_p_svn_fs_id_t swig_types[74]
+#define SWIGTYPE_p_svn_fs_info_placeholder_t swig_types[75]
+#define SWIGTYPE_p_svn_fs_lock_target_t swig_types[76]
+#define SWIGTYPE_p_svn_fs_node_relation_t swig_types[77]
+#define SWIGTYPE_p_svn_fs_pack_notify_action_t swig_types[78]
+#define SWIGTYPE_p_svn_fs_path_change2_t swig_types[79]
+#define SWIGTYPE_p_svn_fs_path_change_kind_t swig_types[80]
+#define SWIGTYPE_p_svn_fs_path_change_t swig_types[81]
+#define SWIGTYPE_p_svn_fs_root_t swig_types[82]
+#define SWIGTYPE_p_svn_fs_t swig_types[83]
+#define SWIGTYPE_p_svn_fs_txn_t swig_types[84]
+#define SWIGTYPE_p_svn_fs_upgrade_notify_action_t swig_types[85]
+#define SWIGTYPE_p_svn_io_dirent2_t swig_types[86]
+#define SWIGTYPE_p_svn_io_dirent_t swig_types[87]
+#define SWIGTYPE_p_svn_io_file_del_t swig_types[88]
+#define SWIGTYPE_p_svn_location_segment_t swig_types[89]
+#define SWIGTYPE_p_svn_lock_t swig_types[90]
+#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[91]
+#define SWIGTYPE_p_svn_log_changed_path_t swig_types[92]
+#define SWIGTYPE_p_svn_log_entry_t swig_types[93]
+#define SWIGTYPE_p_svn_merge_range_t swig_types[94]
+#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[95]
+#define SWIGTYPE_p_svn_node_kind_t swig_types[96]
+#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[97]
+#define SWIGTYPE_p_svn_opt_revision_t swig_types[98]
+#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[99]
+#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[100]
+#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[101]
+#define SWIGTYPE_p_svn_patch_file_t swig_types[102]
+#define SWIGTYPE_p_svn_patch_t swig_types[103]
+#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[104]
+#define SWIGTYPE_p_svn_prop_kind swig_types[105]
+#define SWIGTYPE_p_svn_prop_patch_t swig_types[106]
+#define SWIGTYPE_p_svn_stream_mark_t swig_types[107]
+#define SWIGTYPE_p_svn_stream_t swig_types[108]
+#define SWIGTYPE_p_svn_string_t swig_types[109]
+#define SWIGTYPE_p_svn_stringbuf_t swig_types[110]
+#define SWIGTYPE_p_svn_tristate_t swig_types[111]
+#define SWIGTYPE_p_svn_txdelta_op_t swig_types[112]
+#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[113]
+#define SWIGTYPE_p_svn_txdelta_window_t swig_types[114]
+#define SWIGTYPE_p_svn_version_checklist_t swig_types[115]
+#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[116]
+#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[117]
+#define SWIGTYPE_p_svn_version_extended_t swig_types[118]
+#define SWIGTYPE_p_svn_version_t swig_types[119]
+#define SWIGTYPE_p_unsigned_char swig_types[120]
+#define SWIGTYPE_p_unsigned_long swig_types[121]
+#define SWIGTYPE_p_void swig_types[122]
+static swig_type_info *swig_types[124];
+static swig_module_info swig_module = {swig_types, 123, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
@@ -1919,7 +1920,7 @@ static VALUE mFs;
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x020009 
+#define SWIGVERSION 0x020012 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -2075,6 +2076,16 @@ SWIG_AsCharPtrAndSize(VALUE obj, char** cptr, size_t* psize, int *alloc)
 #endif
 
 
+  #define SWIG_From_long   LONG2NUM 
+
+
+SWIGINTERNINLINE VALUE
+SWIG_From_int  (int value)
+{    
+  return SWIG_From_long  (value);
+}
+
+
 SWIGINTERN VALUE
 SWIG_ruby_failed(void)
 {
@@ -2082,7 +2093,7 @@ SWIG_ruby_failed(void)
 } 
 
 
-/*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2127,17 +2138,7 @@ SWIG_AsVal_int (VALUE obj, int *val)
 }
 
 
-  #define SWIG_From_long   LONG2NUM 
-
-
-SWIGINTERNINLINE VALUE
-SWIG_From_int  (int value)
-{    
-  return SWIG_From_long  (value);
-}
-
-
-/*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2171,11 +2172,21 @@ static void svn_fs_invoke_warning_callback(
   _obj(baton, err);
 }
 
+static svn_error_t * svn_fs_invoke_upgrade_notify(
+  svn_fs_upgrade_notify_t _obj, void *baton, apr_uint64_t number, svn_fs_upgrade_notify_action_t action, apr_pool_t *scratch_pool) {
+  return _obj(baton, number, action, scratch_pool);
+}
+
 static void svn_fs_invoke_progress_notify_func(
   svn_fs_progress_notify_func_t _obj, svn_revnum_t revision, void *baton, apr_pool_t *pool) {
   _obj(revision, baton, pool);
 }
 
+static void svn_fs_invoke_hotcopy_notify(
+  svn_fs_hotcopy_notify_t _obj, void *baton, svn_revnum_t start_revision, svn_revnum_t end_revision, apr_pool_t *scratch_pool) {
+  _obj(baton, start_revision, end_revision, scratch_pool);
+}
+
 static svn_error_t * svn_fs_invoke_freeze_func(
   svn_fs_freeze_func_t _obj, void *baton, apr_pool_t *pool) {
   return _obj(baton, pool);
@@ -2186,6 +2197,11 @@ static svn_error_t * svn_fs_invoke_process_contents_func(
   return _obj(contents, len, baton, scratch_pool);
 }
 
+static svn_error_t * svn_fs_invoke_lock_callback(
+  svn_fs_lock_callback_t _obj, void *baton, const char *path, const svn_lock_t *lock, svn_error_t *fs_err, apr_pool_t *scratch_pool) {
+  return _obj(baton, path, lock, fs_err, scratch_pool);
+}
+
 static svn_error_t * svn_fs_invoke_get_locks_callback(
   svn_fs_get_locks_callback_t _obj, void *baton, svn_lock_t *lock, apr_pool_t *pool) {
   return _obj(baton, lock, pool);
@@ -2507,6 +2523,126 @@ fail:
 
 
 SWIGINTERN VALUE
+_wrap_svn_fs_open2(int argc, VALUE *argv, VALUE self) {
+  svn_fs_t **arg1 = (svn_fs_t **) 0 ;
+  char *arg2 = (char *) 0 ;
+  apr_hash_t *arg3 = (apr_hash_t *) 0 ;
+  apr_pool_t *arg4 = (apr_pool_t *) 0 ;
+  apr_pool_t *arg5 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  svn_fs_t *temp1 ;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg4);
+    _global_pool = arg4;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg5);
+    _global_pool = arg5;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  arg1 = &temp1;
+  if ((argc < 2) || (argc > 4)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  }
+  res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","svn_fs_open2", 2, argv[0] ));
+  }
+  arg2 = (char *)(buf2);
+  {
+    VALUE rb_pool = Qnil;
+    if (!_global_pool) {
+      svn_swig_rb_get_pool(argc, argv, self, &rb_pool, &_global_pool);
+      svn_swig_rb_push_pool(rb_pool);
+    }
+    arg3 = (NIL_P(argv[1])) ? NULL :
+    svn_swig_rb_hash_to_apr_hash_string(argv[1], _global_pool);
+    _global_pool = NULL;
+    if (!NIL_P(rb_pool)) {
+      if (NIL_P(arg3)) {
+        svn_swig_rb_destroy_pool(rb_pool);
+      } else {
+        svn_swig_rb_set_pool_for_no_swig_type(argv[1], rb_pool);
+      }
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+    }
+  }
+  if (argc > 2) {
+    
+  }
+  if (argc > 3) {
+    
+  }
+  {
+    result = (svn_error_t *)svn_fs_open2(arg1,(char const *)arg2,arg3,arg4,arg5);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  {
+    VALUE tmp;
+    tmp = SWIG_NewPointerObj(*arg1, SWIGTYPE_p_svn_fs_t, 0);
+    if (rb_block_given_p()) {
+      rb_yield(tmp);
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      DATA_PTR(tmp) = NULL;
+    } else {
+      vresult = SWIG_Ruby_AppendOutput(vresult, tmp);
+    }
+  }
+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
+fail:
+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
 _wrap_svn_fs_open(int argc, VALUE *argv, VALUE self) {
   svn_fs_t **arg1 = (svn_fs_t **) 0 ;
   char *arg2 = (char *) 0 ;
@@ -2604,6 +2740,92 @@ fail:
 
 
 SWIGINTERN VALUE
+_wrap_svn_fs_upgrade2(int argc, VALUE *argv, VALUE self) {
+  char *arg1 = (char *) 0 ;
+  svn_fs_upgrade_notify_t arg2 = (svn_fs_upgrade_notify_t) 0 ;
+  void *arg3 = (void *) 0 ;
+  svn_cancel_func_t arg4 = (svn_cancel_func_t) 0 ;
+  void *arg5 = (void *) 0 ;
+  apr_pool_t *arg6 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  int res1 ;
+  char *buf1 = 0 ;
+  int alloc1 = 0 ;
+  int res3 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg6);
+    _global_pool = arg6;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  if ((argc < 4) || (argc > 5)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc); SWIG_fail;
+  }
+  res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","svn_fs_upgrade2", 1, argv[0] ));
+  }
+  arg1 = (char *)(buf1);
+  {
+    int res = SWIG_ConvertFunctionPtr(argv[1], (void**)(&arg2), SWIGTYPE_p_f_p_void_apr_uint64_t_svn_fs_upgrade_notify_action_t_p_apr_pool_t__p_svn_error_t);
+    if (!SWIG_IsOK(res)) {
+      SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_fs_upgrade_notify_t","svn_fs_upgrade2", 2, argv[1] )); 
+    }
+  }
+  res3 = SWIG_ConvertPtr(argv[2],SWIG_as_voidptrptr(&arg3), 0, 0);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "void *","svn_fs_upgrade2", 3, argv[2] )); 
+  }
+  {
+    arg4 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
+    arg5 = (void *)svn_swig_rb_make_baton(argv[3], _global_svn_swig_rb_pool);
+  }
+  if (argc > 4) {
+    
+  }
+  {
+    result = (svn_error_t *)svn_fs_upgrade2((char const *)arg1,arg2,arg3,arg4,arg5,arg6);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  {
+    svn_swig_rb_set_baton(vresult, (VALUE)arg5);
+  }
+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
+fail:
+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
 _wrap_svn_fs_upgrade(int argc, VALUE *argv, VALUE self) {
   char *arg1 = (char *) 0 ;
   apr_pool_t *arg2 = (apr_pool_t *) 0 ;
@@ -2930,6 +3152,107 @@ fail:
 
 
 SWIGINTERN VALUE
+_wrap_svn_fs_hotcopy3(int argc, VALUE *argv, VALUE self) {
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  svn_boolean_t arg3 ;
+  svn_boolean_t arg4 ;
+  svn_fs_hotcopy_notify_t arg5 = (svn_fs_hotcopy_notify_t) 0 ;
+  void *arg6 = (void *) 0 ;
+  svn_cancel_func_t arg7 = (svn_cancel_func_t) 0 ;
+  void *arg8 = (void *) 0 ;
+  apr_pool_t *arg9 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  int res1 ;
+  char *buf1 = 0 ;
+  int alloc1 = 0 ;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
+  int res6 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg9);
+    _global_pool = arg9;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  if ((argc < 7) || (argc > 8)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 7)",argc); SWIG_fail;
+  }
+  res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","svn_fs_hotcopy3", 1, argv[0] ));
+  }
+  arg1 = (char *)(buf1);
+  res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","svn_fs_hotcopy3", 2, argv[1] ));
+  }
+  arg2 = (char *)(buf2);
+  arg3 = RTEST(argv[2]);
+  arg4 = RTEST(argv[3]);
+  {
+    int res = SWIG_ConvertFunctionPtr(argv[4], (void**)(&arg5), SWIGTYPE_p_f_p_void_long_long_p_apr_pool_t__void);
+    if (!SWIG_IsOK(res)) {
+      SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_fs_hotcopy_notify_t","svn_fs_hotcopy3", 5, argv[4] )); 
+    }
+  }
+  res6 = SWIG_ConvertPtr(argv[5],SWIG_as_voidptrptr(&arg6), 0, 0);
+  if (!SWIG_IsOK(res6)) {
+    SWIG_exception_fail(SWIG_ArgError(res6), Ruby_Format_TypeError( "", "void *","svn_fs_hotcopy3", 6, argv[5] )); 
+  }
+  {
+    arg7 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
+    arg8 = (void *)svn_swig_rb_make_baton(argv[6], _global_svn_swig_rb_pool);
+  }
+  if (argc > 7) {
+    
+  }
+  {
+    result = (svn_error_t *)svn_fs_hotcopy3((char const *)arg1,(char const *)arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  {
+    svn_swig_rb_set_baton(vresult, (VALUE)arg8);
+  }
+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
+fail:
+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
 _wrap_svn_fs_hotcopy2(int argc, VALUE *argv, VALUE self) {
   char *arg1 = (char *) 0 ;
   char *arg2 = (char *) 0 ;
@@ -2970,7 +3293,7 @@ _wrap_svn_fs_hotcopy2(int argc, VALUE *argv, VALUE self) {
   arg3 = RTEST(argv[2]);
   arg4 = RTEST(argv[3]);
   {
-    arg5 = svn_swig_rb_cancel_func;
+    arg5 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg6 = (void *)svn_swig_rb_make_baton(argv[4], _global_svn_swig_rb_pool);
   }
   if (argc > 5) {
@@ -3122,7 +3445,7 @@ _wrap_svn_fs_recover(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = (char *)(buf1);
   {
-    arg2 = svn_swig_rb_cancel_func;
+    arg2 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg3 = (void *)svn_swig_rb_make_baton(argv[1], _global_svn_swig_rb_pool);
   }
   if (argc > 2) {
@@ -5967,6 +6290,59 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_svn_fs_path_change2_t_mergeinfo_mod_set(int argc, VALUE *argv, VALUE self) {
+  struct svn_fs_path_change2_t *arg1 = (struct svn_fs_path_change2_t *) 0 ;
+  svn_tristate_t arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_fs_path_change2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_fs_path_change2_t *","mergeinfo_mod", 1, self )); 
+  }
+  arg1 = (struct svn_fs_path_change2_t *)(argp1);
+  ecode2 = SWIG_AsVal_int(argv[0], &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "svn_tristate_t","mergeinfo_mod", 2, argv[0] ));
+  } 
+  arg2 = (svn_tristate_t)(val2);
+  if (arg1) (arg1)->mergeinfo_mod = arg2;
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_svn_fs_path_change2_t_mergeinfo_mod_get(int argc, VALUE *argv, VALUE self) {
+  struct svn_fs_path_change2_t *arg1 = (struct svn_fs_path_change2_t *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  svn_tristate_t result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_fs_path_change2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_fs_path_change2_t *","mergeinfo_mod", 1, self )); 
+  }
+  arg1 = (struct svn_fs_path_change2_t *)(argp1);
+  result = (svn_tristate_t) ((arg1)->mergeinfo_mod);
+  vresult = SWIG_From_int((int)(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
 static swig_class SwigClassSvn_fs_path_change_t;
 
 SWIGINTERN VALUE
@@ -6454,6 +6830,107 @@ fail:
 
 
 SWIGINTERN VALUE
+_wrap_svn_fs_node_history2(int argc, VALUE *argv, VALUE self) {
+  svn_fs_history_t **arg1 = (svn_fs_history_t **) 0 ;
+  svn_fs_root_t *arg2 = (svn_fs_root_t *) 0 ;
+  char *arg3 = (char *) 0 ;
+  apr_pool_t *arg4 = (apr_pool_t *) 0 ;
+  apr_pool_t *arg5 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  svn_fs_history_t *temp1 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int res3 ;
+  char *buf3 = 0 ;
+  int alloc3 = 0 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg4);
+    _global_pool = arg4;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg5);
+    _global_pool = arg5;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  arg1 = &temp1;
+  if ((argc < 2) || (argc > 4)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  }
+  res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_svn_fs_root_t, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "svn_fs_root_t *","svn_fs_node_history2", 2, argv[0] )); 
+  }
+  arg2 = (svn_fs_root_t *)(argp2);
+  res3 = SWIG_AsCharPtrAndSize(argv[1], &buf3, NULL, &alloc3);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "char const *","svn_fs_node_history2", 3, argv[1] ));
+  }
+  arg3 = (char *)(buf3);
+  if (argc > 2) {
+    
+  }
+  if (argc > 3) {
+    
+  }
+  {
+    result = (svn_error_t *)svn_fs_node_history2(arg1,arg2,(char const *)arg3,arg4,arg5);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  {
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj(*arg1, SWIGTYPE_p_svn_fs_history_t, 0));
+  }
+  if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
+fail:
+  if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
 _wrap_svn_fs_node_history(int argc, VALUE *argv, VALUE self) {
   svn_fs_history_t **arg1 = (svn_fs_history_t **) 0 ;
   svn_fs_root_t *arg2 = (svn_fs_root_t *) 0 ;
@@ -6532,6 +7009,98 @@ fail:
 
 
 SWIGINTERN VALUE
+_wrap_svn_fs_history_prev2(int argc, VALUE *argv, VALUE self) {
+  svn_fs_history_t **arg1 = (svn_fs_history_t **) 0 ;
+  svn_fs_history_t *arg2 = (svn_fs_history_t *) 0 ;
+  svn_boolean_t arg3 ;
+  apr_pool_t *arg4 = (apr_pool_t *) 0 ;
+  apr_pool_t *arg5 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  svn_fs_history_t *temp1 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg4);
+    _global_pool = arg4;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg5);
+    _global_pool = arg5;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  arg1 = &temp1;
+  if ((argc < 2) || (argc > 4)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  }
+  res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_svn_fs_history_t, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "svn_fs_history_t *","svn_fs_history_prev2", 2, argv[0] )); 
+  }
+  arg2 = (svn_fs_history_t *)(argp2);
+  arg3 = RTEST(argv[1]);
+  if (argc > 2) {
+    
+  }
+  if (argc > 3) {
+    
+  }
+  {
+    result = (svn_error_t *)svn_fs_history_prev2(arg1,arg2,arg3,arg4,arg5);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  {
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj(*arg1, SWIGTYPE_p_svn_fs_history_t, 0));
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
+fail:
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
 _wrap_svn_fs_history_prev(int argc, VALUE *argv, VALUE self) {
   svn_fs_history_t **arg1 = (svn_fs_history_t **) 0 ;
   svn_fs_history_t *arg2 = (svn_fs_history_t *) 0 ;
@@ -6916,6 +7485,105 @@ fail:
 
 
 SWIGINTERN VALUE
+_wrap_svn_fs_node_relation(int argc, VALUE *argv, VALUE self) {
+  svn_fs_node_relation_t *arg1 = (svn_fs_node_relation_t *) 0 ;
+  svn_fs_root_t *arg2 = (svn_fs_root_t *) 0 ;
+  char *arg3 = (char *) 0 ;
+  svn_fs_root_t *arg4 = (svn_fs_root_t *) 0 ;
+  char *arg5 = (char *) 0 ;
+  apr_pool_t *arg6 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int res3 ;
+  char *buf3 = 0 ;
+  int alloc3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  int res5 ;
+  char *buf5 = 0 ;
+  int alloc5 = 0 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg6);
+    _global_pool = arg6;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  if ((argc < 5) || (argc > 6)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 5)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_svn_fs_node_relation_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "svn_fs_node_relation_t *","svn_fs_node_relation", 1, argv[0] )); 
+  }
+  arg1 = (svn_fs_node_relation_t *)(argp1);
+  res2 = SWIG_ConvertPtr(argv[1], &argp2,SWIGTYPE_p_svn_fs_root_t, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "svn_fs_root_t *","svn_fs_node_relation", 2, argv[1] )); 
+  }
+  arg2 = (svn_fs_root_t *)(argp2);
+  res3 = SWIG_AsCharPtrAndSize(argv[2], &buf3, NULL, &alloc3);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "char const *","svn_fs_node_relation", 3, argv[2] ));
+  }
+  arg3 = (char *)(buf3);
+  res4 = SWIG_ConvertPtr(argv[3], &argp4,SWIGTYPE_p_svn_fs_root_t, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), Ruby_Format_TypeError( "", "svn_fs_root_t *","svn_fs_node_relation", 4, argv[3] )); 
+  }
+  arg4 = (svn_fs_root_t *)(argp4);
+  res5 = SWIG_AsCharPtrAndSize(argv[4], &buf5, NULL, &alloc5);
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), Ruby_Format_TypeError( "", "char const *","svn_fs_node_relation", 5, argv[4] ));
+  }
+  arg5 = (char *)(buf5);
+  if (argc > 5) {
+    
+  }
+  {
+    result = (svn_error_t *)svn_fs_node_relation(arg1,arg2,(char const *)arg3,arg4,(char const *)arg5,arg6);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+  if (alloc5 == SWIG_NEWOBJ) free((char*)buf5);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
+fail:
+  if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+  if (alloc5 == SWIG_NEWOBJ) free((char*)buf5);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
 _wrap_svn_fs_node_created_rev(int argc, VALUE *argv, VALUE self) {
   svn_revnum_t *arg1 = (svn_revnum_t *) 0 ;
   svn_fs_root_t *arg2 = (svn_fs_root_t *) 0 ;
@@ -7333,6 +8001,84 @@ fail:
 
 
 SWIGINTERN VALUE
+_wrap_svn_fs_node_has_props(int argc, VALUE *argv, VALUE self) {
+  svn_boolean_t *arg1 = (svn_boolean_t *) 0 ;
+  svn_fs_root_t *arg2 = (svn_fs_root_t *) 0 ;
+  char *arg3 = (char *) 0 ;
+  apr_pool_t *arg4 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  svn_boolean_t temp1 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int res3 ;
+  char *buf3 = 0 ;
+  int alloc3 = 0 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg4);
+    _global_pool = arg4;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  arg1 = &temp1;
+  if ((argc < 2) || (argc > 3)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  }
+  res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_svn_fs_root_t, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "svn_fs_root_t *","svn_fs_node_has_props", 2, argv[0] )); 
+  }
+  arg2 = (svn_fs_root_t *)(argp2);
+  res3 = SWIG_AsCharPtrAndSize(argv[1], &buf3, NULL, &alloc3);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "char const *","svn_fs_node_has_props", 3, argv[1] ));
+  }
+  arg3 = (char *)(buf3);
+  if (argc > 2) {
+    
+  }
+  {
+    result = (svn_error_t *)svn_fs_node_has_props(arg1,arg2,(char const *)arg3,arg4);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  {
+    vresult = SWIG_Ruby_AppendOutput(vresult, *arg1 ? Qtrue : Qfalse);
+  }
+  if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
+fail:
+  if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
 _wrap_svn_fs_change_node_prop(int argc, VALUE *argv, VALUE self) {
   svn_fs_root_t *arg1 = (svn_fs_root_t *) 0 ;
   char *arg2 = (char *) 0 ;
@@ -7427,6 +8173,103 @@ fail:
 
 
 SWIGINTERN VALUE
+_wrap_svn_fs_props_different(int argc, VALUE *argv, VALUE self) {
+  svn_boolean_t *arg1 = (svn_boolean_t *) 0 ;
+  svn_fs_root_t *arg2 = (svn_fs_root_t *) 0 ;
+  char *arg3 = (char *) 0 ;
+  svn_fs_root_t *arg4 = (svn_fs_root_t *) 0 ;
+  char *arg5 = (char *) 0 ;
+  apr_pool_t *arg6 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  svn_boolean_t temp1 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int res3 ;
+  char *buf3 = 0 ;
+  int alloc3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  int res5 ;
+  char *buf5 = 0 ;
+  int alloc5 = 0 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg6);
+    _global_pool = arg6;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  arg1 = &temp1;
+  if ((argc < 4) || (argc > 5)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc); SWIG_fail;
+  }
+  res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_svn_fs_root_t, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "svn_fs_root_t *","svn_fs_props_different", 2, argv[0] )); 
+  }
+  arg2 = (svn_fs_root_t *)(argp2);
+  res3 = SWIG_AsCharPtrAndSize(argv[1], &buf3, NULL, &alloc3);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "char const *","svn_fs_props_different", 3, argv[1] ));
+  }
+  arg3 = (char *)(buf3);
+  res4 = SWIG_ConvertPtr(argv[2], &argp4,SWIGTYPE_p_svn_fs_root_t, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), Ruby_Format_TypeError( "", "svn_fs_root_t *","svn_fs_props_different", 4, argv[2] )); 
+  }
+  arg4 = (svn_fs_root_t *)(argp4);
+  res5 = SWIG_AsCharPtrAndSize(argv[3], &buf5, NULL, &alloc5);
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), Ruby_Format_TypeError( "", "char const *","svn_fs_props_different", 5, argv[3] ));
+  }
+  arg5 = (char *)(buf5);
+  if (argc > 4) {
+    
+  }
+  {
+    result = (svn_error_t *)svn_fs_props_different(arg1,arg2,(char const *)arg3,arg4,(char const *)arg5,arg6);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  {
+    vresult = SWIG_Ruby_AppendOutput(vresult, *arg1 ? Qtrue : Qfalse);
+  }
+  if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+  if (alloc5 == SWIG_NEWOBJ) free((char*)buf5);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
+fail:
+  if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+  if (alloc5 == SWIG_NEWOBJ) free((char*)buf5);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
 _wrap_svn_fs_props_changed(int argc, VALUE *argv, VALUE self) {
   svn_boolean_t *arg1 = (svn_boolean_t *) 0 ;
   svn_fs_root_t *arg2 = (svn_fs_root_t *) 0 ;
@@ -8261,6 +9104,110 @@ fail:
 
 
 SWIGINTERN VALUE
+_wrap_svn_fs_dir_optimal_order(int argc, VALUE *argv, VALUE self) {
+  apr_array_header_t **arg1 = (apr_array_header_t **) 0 ;
+  svn_fs_root_t *arg2 = (svn_fs_root_t *) 0 ;
+  apr_hash_t *arg3 = (apr_hash_t *) 0 ;
+  apr_pool_t *arg4 = (apr_pool_t *) 0 ;
+  apr_pool_t *arg5 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  apr_array_header_t *temp1 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg4);
+    _global_pool = arg4;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg5);
+    _global_pool = arg5;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  arg1 = &temp1;
+  if ((argc < 2) || (argc > 4)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  }
+  res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_svn_fs_root_t, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "svn_fs_root_t *","svn_fs_dir_optimal_order", 2, argv[0] )); 
+  }
+  arg2 = (svn_fs_root_t *)(argp2);
+  res3 = SWIG_ConvertPtr(argv[1], &argp3,SWIGTYPE_p_apr_hash_t, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "apr_hash_t *","svn_fs_dir_optimal_order", 3, argv[1] )); 
+  }
+  arg3 = (apr_hash_t *)(argp3);
+  if (argc > 2) {
+    
+  }
+  if (argc > 3) {
+    
+  }
+  {
+    result = (svn_error_t *)svn_fs_dir_optimal_order(arg1,arg2,arg3,arg4,arg5);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  {
+    /* FIXME: Missing argout typemap: svn_fs_dir_optimal_order arg 1 (apr_array_header_t **) */
+    
+    
+    
+    
+    SWIG_exception(SWIG_ValueError, "svn_fs_dir_optimal_order is not implemented yet");
+    
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
+fail:
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
 _wrap_svn_fs_make_dir(int argc, VALUE *argv, VALUE self) {
   svn_fs_root_t *arg1 = (svn_fs_root_t *) 0 ;
   char *arg2 = (char *) 0 ;
@@ -9255,6 +10202,103 @@ fail:
 
 
 SWIGINTERN VALUE
+_wrap_svn_fs_contents_different(int argc, VALUE *argv, VALUE self) {
+  svn_boolean_t *arg1 = (svn_boolean_t *) 0 ;
+  svn_fs_root_t *arg2 = (svn_fs_root_t *) 0 ;
+  char *arg3 = (char *) 0 ;
+  svn_fs_root_t *arg4 = (svn_fs_root_t *) 0 ;
+  char *arg5 = (char *) 0 ;
+  apr_pool_t *arg6 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  svn_boolean_t temp1 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int res3 ;
+  char *buf3 = 0 ;
+  int alloc3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  int res5 ;
+  char *buf5 = 0 ;
+  int alloc5 = 0 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg6);
+    _global_pool = arg6;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  arg1 = &temp1;
+  if ((argc < 4) || (argc > 5)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc); SWIG_fail;
+  }
+  res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_svn_fs_root_t, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "svn_fs_root_t *","svn_fs_contents_different", 2, argv[0] )); 
+  }
+  arg2 = (svn_fs_root_t *)(argp2);
+  res3 = SWIG_AsCharPtrAndSize(argv[1], &buf3, NULL, &alloc3);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "char const *","svn_fs_contents_different", 3, argv[1] ));
+  }
+  arg3 = (char *)(buf3);
+  res4 = SWIG_ConvertPtr(argv[2], &argp4,SWIGTYPE_p_svn_fs_root_t, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), Ruby_Format_TypeError( "", "svn_fs_root_t *","svn_fs_contents_different", 4, argv[2] )); 
+  }
+  arg4 = (svn_fs_root_t *)(argp4);
+  res5 = SWIG_AsCharPtrAndSize(argv[3], &buf5, NULL, &alloc5);
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), Ruby_Format_TypeError( "", "char const *","svn_fs_contents_different", 5, argv[3] ));
+  }
+  arg5 = (char *)(buf5);
+  if (argc > 4) {
+    
+  }
+  {
+    result = (svn_error_t *)svn_fs_contents_different(arg1,arg2,(char const *)arg3,arg4,(char const *)arg5,arg6);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  {
+    vresult = SWIG_Ruby_AppendOutput(vresult, *arg1 ? Qtrue : Qfalse);
+  }
+  if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+  if (alloc5 == SWIG_NEWOBJ) free((char*)buf5);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
+fail:
+  if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+  if (alloc5 == SWIG_NEWOBJ) free((char*)buf5);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
 _wrap_svn_fs_contents_changed(int argc, VALUE *argv, VALUE self) {
   svn_boolean_t *arg1 = (svn_boolean_t *) 0 ;
   svn_fs_root_t *arg2 = (svn_fs_root_t *) 0 ;
@@ -9428,6 +10472,218 @@ fail:
 
 
 SWIGINTERN VALUE
+_wrap_svn_fs_info_format(int argc, VALUE *argv, VALUE self) {
+  int *arg1 = (int *) 0 ;
+  svn_version_t **arg2 = (svn_version_t **) 0 ;
+  svn_fs_t *arg3 = (svn_fs_t *) 0 ;
+  apr_pool_t *arg4 = (apr_pool_t *) 0 ;
+  apr_pool_t *arg5 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  int temp1 ;
+  int res1 = SWIG_TMPOBJ ;
+  svn_version_t *temp2 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg4);
+    _global_pool = arg4;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg5);
+    _global_pool = arg5;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  arg1 = &temp1;
+  arg2 = &temp2;
+  if ((argc < 1) || (argc > 3)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res3 = SWIG_ConvertPtr(argv[0], &argp3,SWIGTYPE_p_svn_fs_t, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "svn_fs_t *","svn_fs_info_format", 3, argv[0] )); 
+  }
+  arg3 = (svn_fs_t *)(argp3);
+  if (argc > 1) {
+    
+  }
+  if (argc > 2) {
+    
+  }
+  {
+    if (!arg3) {
+      svn_swig_rb_raise_svn_fs_already_close();
+    }
+  }
+  {
+    result = (svn_error_t *)svn_fs_info_format(arg1,arg2,arg3,arg4,arg5);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  if (SWIG_IsTmpObj(res1)) {
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_From_int((*arg1)));
+  } else {
+    int new_flags = SWIG_IsNewObj(res1) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj((void*)(arg1), SWIGTYPE_p_int, new_flags));
+  }
+  {
+    /* FIXME: Missing argout typemap: svn_fs_info_format arg 2 (svn_version_t **) */
+    
+    
+    
+    
+    SWIG_exception(SWIG_ValueError, "svn_fs_info_format is not implemented yet");
+    
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
+fail:
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_svn_fs_info_config_files(int argc, VALUE *argv, VALUE self) {
+  apr_array_header_t **arg1 = (apr_array_header_t **) 0 ;
+  svn_fs_t *arg2 = (svn_fs_t *) 0 ;
+  apr_pool_t *arg3 = (apr_pool_t *) 0 ;
+  apr_pool_t *arg4 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  apr_array_header_t *temp1 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg3);
+    _global_pool = arg3;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg4);
+    _global_pool = arg4;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  arg1 = &temp1;
+  if ((argc < 1) || (argc > 3)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_svn_fs_t, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "svn_fs_t *","svn_fs_info_config_files", 2, argv[0] )); 
+  }
+  arg2 = (svn_fs_t *)(argp2);
+  if (argc > 1) {
+    
+  }
+  if (argc > 2) {
+    
+  }
+  {
+    if (!arg2) {
+      svn_swig_rb_raise_svn_fs_already_close();
+    }
+  }
+  {
+    result = (svn_error_t *)svn_fs_info_config_files(arg1,arg2,arg3,arg4);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  {
+    /* FIXME: Missing argout typemap: svn_fs_info_config_files arg 1 (apr_array_header_t **) */
+    
+    
+    
+    
+    SWIG_exception(SWIG_ValueError, "svn_fs_info_config_files is not implemented yet");
+    
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
+fail:
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
 _wrap_svn_fs_deltify_revision(int argc, VALUE *argv, VALUE self) {
   svn_fs_t *arg1 = (svn_fs_t *) 0 ;
   svn_revnum_t arg2 ;
@@ -10131,6 +11387,228 @@ fail:
 
 
 SWIGINTERN VALUE
+_wrap_svn_fs_lock_target_create(int argc, VALUE *argv, VALUE self) {
+  char *arg1 = (char *) 0 ;
+  svn_revnum_t arg2 ;
+  apr_pool_t *arg3 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  long val2 ;
+  int ecode2 = 0 ;
+  svn_fs_lock_target_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg3);
+    _global_pool = arg3;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  if ((argc < 2) || (argc > 3)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  }
+  {
+    if (NIL_P(argv[0])) {
+      arg1 = NULL;
+    } else {
+      arg1 = StringValuePtr(argv[0]);
+    }
+  }
+  ecode2 = SWIG_AsVal_long(argv[1], &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "svn_revnum_t","svn_fs_lock_target_create", 2, argv[1] ));
+  } 
+  arg2 = (svn_revnum_t)(val2);
+  if (argc > 2) {
+    
+  }
+  {
+    result = (svn_fs_lock_target_t *)svn_fs_lock_target_create((char const *)arg1,arg2,arg3);
+    
+    
+    
+  }
+  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_svn_fs_lock_target_t, 0 |  0 );
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
+fail:
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_svn_fs_lock_target_set_token(int argc, VALUE *argv, VALUE self) {
+  svn_fs_lock_target_t *arg1 = (svn_fs_lock_target_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  
+  if ((argc < 2) || (argc > 2)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_svn_fs_lock_target_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "svn_fs_lock_target_t *","svn_fs_lock_target_set_token", 1, argv[0] )); 
+  }
+  arg1 = (svn_fs_lock_target_t *)(argp1);
+  {
+    if (NIL_P(argv[1])) {
+      arg2 = NULL;
+    } else {
+      arg2 = StringValuePtr(argv[1]);
+    }
+  }
+  {
+    svn_fs_lock_target_set_token(arg1,(char const *)arg2);
+    
+    
+    
+  }
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_svn_fs_lock_many(int argc, VALUE *argv, VALUE self) {
+  svn_fs_t *arg1 = (svn_fs_t *) 0 ;
+  apr_hash_t *arg2 = (apr_hash_t *) 0 ;
+  char *arg3 = (char *) 0 ;
+  svn_boolean_t arg4 ;
+  apr_time_t arg5 ;
+  svn_boolean_t arg6 ;
+  svn_fs_lock_callback_t arg7 = (svn_fs_lock_callback_t) 0 ;
+  void *arg8 = (void *) 0 ;
+  apr_pool_t *arg9 = (apr_pool_t *) 0 ;
+  apr_pool_t *arg10 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int res8 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg9);
+    _global_pool = arg9;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg10);
+    _global_pool = arg10;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  if ((argc < 8) || (argc > 10)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 8)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_svn_fs_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "svn_fs_t *","svn_fs_lock_many", 1, argv[0] )); 
+  }
+  arg1 = (svn_fs_t *)(argp1);
+  res2 = SWIG_ConvertPtr(argv[1], &argp2,SWIGTYPE_p_apr_hash_t, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "apr_hash_t *","svn_fs_lock_many", 2, argv[1] )); 
+  }
+  arg2 = (apr_hash_t *)(argp2);
+  {
+    if (NIL_P(argv[2])) {
+      arg3 = NULL;
+    } else {
+      arg3 = StringValuePtr(argv[2]);
+    }
+  }
+  arg4 = RTEST(argv[3]);
+  {
+    arg5 = (apr_time_t)NUM2LL(argv[4]);
+  }
+  arg6 = RTEST(argv[5]);
+  {
+    int res = SWIG_ConvertFunctionPtr(argv[6], (void**)(&arg7), SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t);
+    if (!SWIG_IsOK(res)) {
+      SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_fs_lock_callback_t","svn_fs_lock_many", 7, argv[6] )); 
+    }
+  }
+  res8 = SWIG_ConvertPtr(argv[7],SWIG_as_voidptrptr(&arg8), 0, 0);
+  if (!SWIG_IsOK(res8)) {
+    SWIG_exception_fail(SWIG_ArgError(res8), Ruby_Format_TypeError( "", "void *","svn_fs_lock_many", 8, argv[7] )); 
+  }
+  if (argc > 8) {
+    
+  }
+  if (argc > 9) {
+    
+  }
+  {
+    if (!arg1) {
+      svn_swig_rb_raise_svn_fs_already_close();
+    }
+  }
+  {
+    result = (svn_error_t *)svn_fs_lock_many(arg1,arg2,(char const *)arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
+fail:
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
 _wrap_svn_fs_lock(int argc, VALUE *argv, VALUE self) {
   svn_lock_t **arg1 = (svn_lock_t **) 0 ;
   svn_fs_t *arg2 = (svn_fs_t *) 0 ;
@@ -10322,6 +11800,118 @@ fail:
 
 
 SWIGINTERN VALUE
+_wrap_svn_fs_unlock_many(int argc, VALUE *argv, VALUE self) {
+  svn_fs_t *arg1 = (svn_fs_t *) 0 ;
+  apr_hash_t *arg2 = (apr_hash_t *) 0 ;
+  svn_boolean_t arg3 ;
+  svn_fs_lock_callback_t arg4 = (svn_fs_lock_callback_t) 0 ;
+  void *arg5 = (void *) 0 ;
+  apr_pool_t *arg6 = (apr_pool_t *) 0 ;
+  apr_pool_t *arg7 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int res5 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg6);
+    _global_pool = arg6;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg7);
+    _global_pool = arg7;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  if ((argc < 5) || (argc > 7)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 5)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_svn_fs_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "svn_fs_t *","svn_fs_unlock_many", 1, argv[0] )); 
+  }
+  arg1 = (svn_fs_t *)(argp1);
+  res2 = SWIG_ConvertPtr(argv[1], &argp2,SWIGTYPE_p_apr_hash_t, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "apr_hash_t *","svn_fs_unlock_many", 2, argv[1] )); 
+  }
+  arg2 = (apr_hash_t *)(argp2);
+  arg3 = RTEST(argv[2]);
+  {
+    int res = SWIG_ConvertFunctionPtr(argv[3], (void**)(&arg4), SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t);
+    if (!SWIG_IsOK(res)) {
+      SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_fs_lock_callback_t","svn_fs_unlock_many", 4, argv[3] )); 
+    }
+  }
+  res5 = SWIG_ConvertPtr(argv[4],SWIG_as_voidptrptr(&arg5), 0, 0);
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), Ruby_Format_TypeError( "", "void *","svn_fs_unlock_many", 5, argv[4] )); 
+  }
+  if (argc > 5) {
+    
+  }
+  if (argc > 6) {
+    
+  }
+  {
+    if (!arg1) {
+      svn_swig_rb_raise_svn_fs_already_close();
+    }
+  }
+  {
+    result = (svn_error_t *)svn_fs_unlock_many(arg1,arg2,arg3,arg4,arg5,arg6,arg7);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
+fail:
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
 _wrap_svn_fs_unlock(int argc, VALUE *argv, VALUE self) {
   svn_fs_t *arg1 = (svn_fs_t *) 0 ;
   char *arg2 = (char *) 0 ;
@@ -10531,7 +12121,7 @@ _wrap_svn_fs_get_locks2(int argc, VALUE *argv, VALUE self) {
     arg3 = svn_swig_rb_to_depth(argv[2]);
   }
   {
-    arg4 = svn_swig_rb_fs_get_locks_callback;
+    arg4 = (svn_fs_get_locks_callback_t) svn_swig_rb_fs_get_locks_callback;
     arg5 = (void *)svn_swig_rb_make_baton(argv[3], _global_svn_swig_rb_pool);
   }
   if (argc > 4) {
@@ -10614,7 +12204,7 @@ _wrap_svn_fs_get_locks(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (char *)(buf2);
   {
-    arg3 = svn_swig_rb_fs_get_locks_callback;
+    arg3 = (svn_fs_get_locks_callback_t) svn_swig_rb_fs_get_locks_callback;
     arg4 = (void *)svn_swig_rb_make_baton(argv[2], _global_svn_swig_rb_pool);
   }
   if (argc > 3) {
@@ -10768,7 +12358,7 @@ _wrap_svn_fs_pack(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "void *","svn_fs_pack", 3, argv[2] )); 
   }
   {
-    arg4 = svn_swig_rb_cancel_func;
+    arg4 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg5 = (void *)svn_swig_rb_make_baton(argv[3], _global_svn_swig_rb_pool);
   }
   if (argc > 4) {
@@ -10889,7 +12479,7 @@ _wrap_svn_fs_verify(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res6), Ruby_Format_TypeError( "", "void *","svn_fs_verify", 6, argv[5] )); 
   }
   {
-    arg7 = svn_swig_rb_cancel_func;
+    arg7 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg8 = (void *)svn_swig_rb_make_baton(argv[6], _global_svn_swig_rb_pool);
   }
   if (argc > 7) {
@@ -10995,6 +12585,654 @@ fail:
 }
 
 
+static swig_class SwigClassSvn_fs_fsfs_info_t;
+
+SWIGINTERN VALUE
+_wrap_svn_fs_fsfs_info_t_fs_type_set(int argc, VALUE *argv, VALUE self) {
+  struct svn_fs_fsfs_info_t *arg1 = (struct svn_fs_fsfs_info_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_fs_fsfs_info_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_fs_fsfs_info_t *","fs_type", 1, self )); 
+  }
+  arg1 = (struct svn_fs_fsfs_info_t *)(argp1);
+  res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","fs_type", 2, argv[0] ));
+  }
+  arg2 = (char *)(buf2);
+  {
+    apr_size_t len = strlen(arg2) + 1;
+    char *copied;
+    if (arg1->fs_type) free((char *)arg1->fs_type);
+    copied = malloc(len);
+    memcpy(copied, arg2, len);
+    arg1->fs_type = copied;
+  }
+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+  return Qnil;
+fail:
+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_svn_fs_fsfs_info_t_fs_type_get(int argc, VALUE *argv, VALUE self) {
+  struct svn_fs_fsfs_info_t *arg1 = (struct svn_fs_fsfs_info_t *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  char *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_fs_fsfs_info_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_fs_fsfs_info_t *","fs_type", 1, self )); 
+  }
+  arg1 = (struct svn_fs_fsfs_info_t *)(argp1);
+  result = (char *) ((arg1)->fs_type);
+  {
+    if (result) {
+      vresult = rb_str_new2(result);
+    } else {
+      vresult = Qnil;
+    }
+  }
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_svn_fs_fsfs_info_t_shard_size_set(int argc, VALUE *argv, VALUE self) {
+  struct svn_fs_fsfs_info_t *arg1 = (struct svn_fs_fsfs_info_t *) 0 ;
+  int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_fs_fsfs_info_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_fs_fsfs_info_t *","shard_size", 1, self )); 
+  }
+  arg1 = (struct svn_fs_fsfs_info_t *)(argp1);
+  ecode2 = SWIG_AsVal_int(argv[0], &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "int","shard_size", 2, argv[0] ));
+  } 
+  arg2 = (int)(val2);
+  if (arg1) (arg1)->shard_size = arg2;
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_svn_fs_fsfs_info_t_shard_size_get(int argc, VALUE *argv, VALUE self) {
+  struct svn_fs_fsfs_info_t *arg1 = (struct svn_fs_fsfs_info_t *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_fs_fsfs_info_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_fs_fsfs_info_t *","shard_size", 1, self )); 
+  }
+  arg1 = (struct svn_fs_fsfs_info_t *)(argp1);
+  result = (int) ((arg1)->shard_size);
+  vresult = SWIG_From_int((int)(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_svn_fs_fsfs_info_t_min_unpacked_rev_set(int argc, VALUE *argv, VALUE self) {
+  struct svn_fs_fsfs_info_t *arg1 = (struct svn_fs_fsfs_info_t *) 0 ;
+  svn_revnum_t arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  long val2 ;
+  int ecode2 = 0 ;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_fs_fsfs_info_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_fs_fsfs_info_t *","min_unpacked_rev", 1, self )); 
+  }
+  arg1 = (struct svn_fs_fsfs_info_t *)(argp1);
+  ecode2 = SWIG_AsVal_long(argv[0], &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "svn_revnum_t","min_unpacked_rev", 2, argv[0] ));
+  } 
+  arg2 = (svn_revnum_t)(val2);
+  if (arg1) (arg1)->min_unpacked_rev = arg2;
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_svn_fs_fsfs_info_t_min_unpacked_rev_get(int argc, VALUE *argv, VALUE self) {
+  struct svn_fs_fsfs_info_t *arg1 = (struct svn_fs_fsfs_info_t *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  svn_revnum_t result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_fs_fsfs_info_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_fs_fsfs_info_t *","min_unpacked_rev", 1, self )); 
+  }
+  arg1 = (struct svn_fs_fsfs_info_t *)(argp1);
+  result = (svn_revnum_t) ((arg1)->min_unpacked_rev);
+  vresult = SWIG_From_long((long)(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_svn_fs_fsfs_info_t_log_addressing_set(int argc, VALUE *argv, VALUE self) {
+  struct svn_fs_fsfs_info_t *arg1 = (struct svn_fs_fsfs_info_t *) 0 ;
+  svn_boolean_t arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_fs_fsfs_info_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_fs_fsfs_info_t *","log_addressing", 1, self )); 
+  }
+  arg1 = (struct svn_fs_fsfs_info_t *)(argp1);
+  arg2 = RTEST(argv[0]);
+  if (arg1) (arg1)->log_addressing = arg2;
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_svn_fs_fsfs_info_t_log_addressing_get(int argc, VALUE *argv, VALUE self) {
+  struct svn_fs_fsfs_info_t *arg1 = (struct svn_fs_fsfs_info_t *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  svn_boolean_t result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_fs_fsfs_info_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_fs_fsfs_info_t *","log_addressing", 1, self )); 
+  }
+  arg1 = (struct svn_fs_fsfs_info_t *)(argp1);
+  result = (svn_boolean_t) ((arg1)->log_addressing);
+  vresult = result ? Qtrue : Qfalse;
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+static swig_class SwigClassSvn_fs_fsx_info_t;
+
+SWIGINTERN VALUE
+_wrap_svn_fs_fsx_info_t_fs_type_set(int argc, VALUE *argv, VALUE self) {
+  struct svn_fs_fsx_info_t *arg1 = (struct svn_fs_fsx_info_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_fs_fsx_info_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_fs_fsx_info_t *","fs_type", 1, self )); 
+  }
+  arg1 = (struct svn_fs_fsx_info_t *)(argp1);
+  res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","fs_type", 2, argv[0] ));
+  }
+  arg2 = (char *)(buf2);
+  {
+    apr_size_t len = strlen(arg2) + 1;
+    char *copied;
+    if (arg1->fs_type) free((char *)arg1->fs_type);
+    copied = malloc(len);
+    memcpy(copied, arg2, len);
+    arg1->fs_type = copied;
+  }
+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+  return Qnil;
+fail:
+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_svn_fs_fsx_info_t_fs_type_get(int argc, VALUE *argv, VALUE self) {
+  struct svn_fs_fsx_info_t *arg1 = (struct svn_fs_fsx_info_t *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  char *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_fs_fsx_info_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_fs_fsx_info_t *","fs_type", 1, self )); 
+  }
+  arg1 = (struct svn_fs_fsx_info_t *)(argp1);
+  result = (char *) ((arg1)->fs_type);
+  {
+    if (result) {
+      vresult = rb_str_new2(result);
+    } else {
+      vresult = Qnil;
+    }
+  }
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_svn_fs_fsx_info_t_shard_size_set(int argc, VALUE *argv, VALUE self) {
+  struct svn_fs_fsx_info_t *arg1 = (struct svn_fs_fsx_info_t *) 0 ;
+  int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_fs_fsx_info_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_fs_fsx_info_t *","shard_size", 1, self )); 
+  }
+  arg1 = (struct svn_fs_fsx_info_t *)(argp1);
+  ecode2 = SWIG_AsVal_int(argv[0], &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "int","shard_size", 2, argv[0] ));
+  } 
+  arg2 = (int)(val2);
+  if (arg1) (arg1)->shard_size = arg2;
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_svn_fs_fsx_info_t_shard_size_get(int argc, VALUE *argv, VALUE self) {
+  struct svn_fs_fsx_info_t *arg1 = (struct svn_fs_fsx_info_t *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_fs_fsx_info_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_fs_fsx_info_t *","shard_size", 1, self )); 
+  }
+  arg1 = (struct svn_fs_fsx_info_t *)(argp1);
+  result = (int) ((arg1)->shard_size);
+  vresult = SWIG_From_int((int)(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_svn_fs_fsx_info_t_min_unpacked_rev_set(int argc, VALUE *argv, VALUE self) {
+  struct svn_fs_fsx_info_t *arg1 = (struct svn_fs_fsx_info_t *) 0 ;
+  svn_revnum_t arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  long val2 ;
+  int ecode2 = 0 ;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_fs_fsx_info_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_fs_fsx_info_t *","min_unpacked_rev", 1, self )); 
+  }
+  arg1 = (struct svn_fs_fsx_info_t *)(argp1);
+  ecode2 = SWIG_AsVal_long(argv[0], &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "svn_revnum_t","min_unpacked_rev", 2, argv[0] ));
+  } 
+  arg2 = (svn_revnum_t)(val2);
+  if (arg1) (arg1)->min_unpacked_rev = arg2;
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_svn_fs_fsx_info_t_min_unpacked_rev_get(int argc, VALUE *argv, VALUE self) {
+  struct svn_fs_fsx_info_t *arg1 = (struct svn_fs_fsx_info_t *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  svn_revnum_t result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_fs_fsx_info_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_fs_fsx_info_t *","min_unpacked_rev", 1, self )); 
+  }
+  arg1 = (struct svn_fs_fsx_info_t *)(argp1);
+  result = (svn_revnum_t) ((arg1)->min_unpacked_rev);
+  vresult = SWIG_From_long((long)(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+static swig_class SwigClassSvn_fs_info_placeholder_t;
+
+SWIGINTERN VALUE
+_wrap_svn_fs_info_placeholder_t_fs_type_set(int argc, VALUE *argv, VALUE self) {
+  struct svn_fs_info_placeholder_t *arg1 = (struct svn_fs_info_placeholder_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_fs_info_placeholder_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_fs_info_placeholder_t *","fs_type", 1, self )); 
+  }
+  arg1 = (struct svn_fs_info_placeholder_t *)(argp1);
+  res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","fs_type", 2, argv[0] ));
+  }
+  arg2 = (char *)(buf2);
+  {
+    apr_size_t len = strlen(arg2) + 1;
+    char *copied;
+    if (arg1->fs_type) free((char *)arg1->fs_type);
+    copied = malloc(len);
+    memcpy(copied, arg2, len);
+    arg1->fs_type = copied;
+  }
+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+  return Qnil;
+fail:
+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_svn_fs_info_placeholder_t_fs_type_get(int argc, VALUE *argv, VALUE self) {
+  struct svn_fs_info_placeholder_t *arg1 = (struct svn_fs_info_placeholder_t *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  char *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_fs_info_placeholder_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_fs_info_placeholder_t *","fs_type", 1, self )); 
+  }
+  arg1 = (struct svn_fs_info_placeholder_t *)(argp1);
+  result = (char *) ((arg1)->fs_type);
+  {
+    if (result) {
+      vresult = rb_str_new2(result);
+    } else {
+      vresult = Qnil;
+    }
+  }
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_svn_fs_info(int argc, VALUE *argv, VALUE self) {
+  svn_fs_info_placeholder_t **arg1 = (svn_fs_info_placeholder_t **) 0 ;
+  svn_fs_t *arg2 = (svn_fs_t *) 0 ;
+  apr_pool_t *arg3 = (apr_pool_t *) 0 ;
+  apr_pool_t *arg4 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  svn_fs_info_placeholder_t *temp1 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg3);
+    _global_pool = arg3;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg4);
+    _global_pool = arg4;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  arg1 = &temp1;
+  if ((argc < 1) || (argc > 3)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_svn_fs_t, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "svn_fs_t *","svn_fs_info", 2, argv[0] )); 
+  }
+  arg2 = (svn_fs_t *)(argp2);
+  if (argc > 1) {
+    
+  }
+  if (argc > 2) {
+    
+  }
+  {
+    if (!arg2) {
+      svn_swig_rb_raise_svn_fs_already_close();
+    }
+  }
+  {
+    result = (svn_error_t *)svn_fs_info((struct svn_fs_info_placeholder_t const **)arg1,arg2,arg3,arg4);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  {
+    /* FIXME: Missing argout typemap: svn_fs_info arg 1 (svn_fs_info_placeholder_t const **) */
+    
+    
+    
+    
+    SWIG_exception(SWIG_ValueError, "svn_fs_info is not implemented yet");
+    
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
+fail:
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_svn_fs_info_dup(int argc, VALUE *argv, VALUE self) {
+  void *arg1 = (void *) 0 ;
+  apr_pool_t *arg2 = (apr_pool_t *) 0 ;
+  apr_pool_t *arg3 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  int res1 ;
+  void *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg2);
+    _global_pool = arg2;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg3);
+    _global_pool = arg3;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  if ((argc < 1) || (argc > 3)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(argv[0],SWIG_as_voidptrptr(&arg1), 0, 0);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "void const *","svn_fs_info_dup", 1, argv[0] )); 
+  }
+  if (argc > 1) {
+    
+  }
+  if (argc > 2) {
+    
+  }
+  {
+    result = (void *)svn_fs_info_dup((void const *)arg1,arg2,arg3);
+    
+    
+    
+  }
+  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 |  0 );
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
+fail:
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
 SWIGINTERN VALUE
 _wrap_svn_fs_invoke_warning_callback(int argc, VALUE *argv, VALUE self) {
   svn_fs_warning_callback_t arg1 = (svn_fs_warning_callback_t) 0 ;
@@ -11035,6 +13273,84 @@ fail:
 
 
 SWIGINTERN VALUE
+_wrap_svn_fs_invoke_upgrade_notify(int argc, VALUE *argv, VALUE self) {
+  svn_fs_upgrade_notify_t arg1 = (svn_fs_upgrade_notify_t) 0 ;
+  void *arg2 = (void *) 0 ;
+  apr_uint64_t arg3 ;
+  svn_fs_upgrade_notify_action_t arg4 ;
+  apr_pool_t *arg5 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  int res2 ;
+  int val4 ;
+  int ecode4 = 0 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg5);
+    _global_pool = arg5;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  if ((argc < 4) || (argc > 5)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc); SWIG_fail;
+  }
+  {
+    int res = SWIG_ConvertFunctionPtr(argv[0], (void**)(&arg1), SWIGTYPE_p_f_p_void_apr_uint64_t_svn_fs_upgrade_notify_action_t_p_apr_pool_t__p_svn_error_t);
+    if (!SWIG_IsOK(res)) {
+      SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_fs_upgrade_notify_t","svn_fs_invoke_upgrade_notify", 1, argv[0] )); 
+    }
+  }
+  res2 = SWIG_ConvertPtr(argv[1],SWIG_as_voidptrptr(&arg2), 0, 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "void *","svn_fs_invoke_upgrade_notify", 2, argv[1] )); 
+  }
+  {
+    arg3 = (apr_uint64_t)NUM2ULL(argv[2]);
+  }
+  ecode4 = SWIG_AsVal_int(argv[3], &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), Ruby_Format_TypeError( "", "svn_fs_upgrade_notify_action_t","svn_fs_invoke_upgrade_notify", 4, argv[3] ));
+  } 
+  arg4 = (svn_fs_upgrade_notify_action_t)(val4);
+  if (argc > 4) {
+    
+  }
+  {
+    result = (svn_error_t *)svn_fs_invoke_upgrade_notify(arg1,arg2,arg3,arg4,arg5);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
+fail:
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
 _wrap_svn_fs_invoke_progress_notify_func(int argc, VALUE *argv, VALUE self) {
   svn_fs_progress_notify_func_t arg1 = (svn_fs_progress_notify_func_t) 0 ;
   svn_revnum_t arg2 ;
@@ -11099,6 +13415,78 @@ fail:
 
 
 SWIGINTERN VALUE
+_wrap_svn_fs_invoke_hotcopy_notify(int argc, VALUE *argv, VALUE self) {
+  svn_fs_hotcopy_notify_t arg1 = (svn_fs_hotcopy_notify_t) 0 ;
+  void *arg2 = (void *) 0 ;
+  svn_revnum_t arg3 ;
+  svn_revnum_t arg4 ;
+  apr_pool_t *arg5 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  int res2 ;
+  long val3 ;
+  int ecode3 = 0 ;
+  long val4 ;
+  int ecode4 = 0 ;
+  
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg5);
+    _global_pool = arg5;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  if ((argc < 4) || (argc > 5)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc); SWIG_fail;
+  }
+  {
+    int res = SWIG_ConvertFunctionPtr(argv[0], (void**)(&arg1), SWIGTYPE_p_f_p_void_long_long_p_apr_pool_t__void);
+    if (!SWIG_IsOK(res)) {
+      SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_fs_hotcopy_notify_t","svn_fs_invoke_hotcopy_notify", 1, argv[0] )); 
+    }
+  }
+  res2 = SWIG_ConvertPtr(argv[1],SWIG_as_voidptrptr(&arg2), 0, 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "void *","svn_fs_invoke_hotcopy_notify", 2, argv[1] )); 
+  }
+  ecode3 = SWIG_AsVal_long(argv[2], &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), Ruby_Format_TypeError( "", "svn_revnum_t","svn_fs_invoke_hotcopy_notify", 3, argv[2] ));
+  } 
+  arg3 = (svn_revnum_t)(val3);
+  ecode4 = SWIG_AsVal_long(argv[3], &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), Ruby_Format_TypeError( "", "svn_revnum_t","svn_fs_invoke_hotcopy_notify", 4, argv[3] ));
+  } 
+  arg4 = (svn_revnum_t)(val4);
+  if (argc > 4) {
+    
+  }
+  {
+    svn_fs_invoke_hotcopy_notify(arg1,arg2,arg3,arg4,arg5);
+    
+    
+    
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+fail:
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
 _wrap_svn_fs_invoke_freeze_func(int argc, VALUE *argv, VALUE self) {
   svn_fs_freeze_func_t arg1 = (svn_fs_freeze_func_t) 0 ;
   void *arg2 = (void *) 0 ;
@@ -11247,6 +13635,99 @@ fail:
 
 
 SWIGINTERN VALUE
+_wrap_svn_fs_invoke_lock_callback(int argc, VALUE *argv, VALUE self) {
+  svn_fs_lock_callback_t arg1 = (svn_fs_lock_callback_t) 0 ;
+  void *arg2 = (void *) 0 ;
+  char *arg3 = (char *) 0 ;
+  svn_lock_t *arg4 = (svn_lock_t *) 0 ;
+  svn_error_t *arg5 = (svn_error_t *) 0 ;
+  apr_pool_t *arg6 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  int res2 ;
+  int res3 ;
+  char *buf3 = 0 ;
+  int alloc3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg6);
+    _global_pool = arg6;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  if ((argc < 5) || (argc > 6)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 5)",argc); SWIG_fail;
+  }
+  {
+    int res = SWIG_ConvertFunctionPtr(argv[0], (void**)(&arg1), SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t);
+    if (!SWIG_IsOK(res)) {
+      SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_fs_lock_callback_t","svn_fs_invoke_lock_callback", 1, argv[0] )); 
+    }
+  }
+  res2 = SWIG_ConvertPtr(argv[1],SWIG_as_voidptrptr(&arg2), 0, 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "void *","svn_fs_invoke_lock_callback", 2, argv[1] )); 
+  }
+  res3 = SWIG_AsCharPtrAndSize(argv[2], &buf3, NULL, &alloc3);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "char const *","svn_fs_invoke_lock_callback", 3, argv[2] ));
+  }
+  arg3 = (char *)(buf3);
+  res4 = SWIG_ConvertPtr(argv[3], &argp4,SWIGTYPE_p_svn_lock_t, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), Ruby_Format_TypeError( "", "svn_lock_t const *","svn_fs_invoke_lock_callback", 4, argv[3] )); 
+  }
+  arg4 = (svn_lock_t *)(argp4);
+  res5 = SWIG_ConvertPtr(argv[4], &argp5,SWIGTYPE_p_svn_error_t, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), Ruby_Format_TypeError( "", "svn_error_t *","svn_fs_invoke_lock_callback", 5, argv[4] )); 
+  }
+  arg5 = (svn_error_t *)(argp5);
+  if (argc > 5) {
+    
+  }
+  {
+    result = (svn_error_t *)svn_fs_invoke_lock_callback(arg1,arg2,(char const *)arg3,(struct svn_lock_t const *)arg4,arg5,arg6);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
+fail:
+  if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
 _wrap_svn_fs_invoke_get_locks_callback(int argc, VALUE *argv, VALUE self) {
   svn_fs_get_locks_callback_t arg1 = (svn_fs_get_locks_callback_t) 0 ;
   void *arg2 = (void *) 0 ;
@@ -11406,6 +13887,7 @@ static swig_type_info _swigt__p_apr_hash_t = {"_p_apr_hash_t", "apr_hash_t *", 0
 static swig_type_info _swigt__p_apr_int32_t = {"_p_apr_int32_t", "apr_int32_t *|time_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_apr_int64_t = {"_p_apr_int64_t", "apr_int64_t *|svn_filesize_t *|apr_time_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_apr_pool_t = {"_p_apr_pool_t", "apr_pool_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_apr_uint64_t = {"_p_apr_uint64_t", "apr_uint64_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_long_p_void_p_apr_pool_t__void = {"_p_f_long_p_void_p_apr_pool_t__void", "void (*)(long,void *,apr_pool_t *)|svn_fs_progress_notify_func_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|struct svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0};
@@ -11413,7 +13895,10 @@ static swig_type_info _swigt__p_f_p_q_const__unsigned_char_apr_size_t_p_void_p_a
 static swig_type_info _swigt__p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t = {"_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_txdelta_window_t *,void *)|svn_txdelta_window_handler_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void__p_svn_error_t = {"_p_f_p_void__p_svn_error_t", "svn_cancel_func_t|struct svn_error_t *(*)(void *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_int64_t,svn_fs_pack_notify_action_t,apr_pool_t *)|svn_fs_pack_notify_t", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_f_p_void_apr_uint64_t_svn_fs_upgrade_notify_action_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_apr_uint64_t_svn_fs_upgrade_notify_action_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_uint64_t,svn_fs_upgrade_notify_action_t,apr_pool_t *)|svn_fs_upgrade_notify_t", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_f_p_void_long_long_p_apr_pool_t__void = {"_p_f_p_void_long_long_p_apr_pool_t__void", "void (*)(void *,long,long,apr_pool_t *)|svn_fs_hotcopy_notify_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_pool_t *)|svn_fs_freeze_func_t", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_lock_t const *,svn_error_t *,apr_pool_t *)|svn_fs_lock_callback_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_struct_svn_error_t__void = {"_p_f_p_void_p_struct_svn_error_t__void", "void (*)(void *,struct svn_error_t *)|svn_fs_warning_callback_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_lock_t *,apr_pool_t *)|svn_fs_get_locks_callback_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_int = {"_p_int", "int *|svn_boolean_t *|apr_status_t *", 0, 0, (void*)0, 0};
@@ -11426,6 +13911,7 @@ static swig_type_info _swigt__p_p_svn_checksum_t = {"_p_p_svn_checksum_t", "stru
 static swig_type_info _swigt__p_p_svn_fs_access_t = {"_p_p_svn_fs_access_t", "struct svn_fs_access_t **|svn_fs_access_t **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_svn_fs_history_t = {"_p_p_svn_fs_history_t", "struct svn_fs_history_t **|svn_fs_history_t **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_svn_fs_id_t = {"_p_p_svn_fs_id_t", "struct svn_fs_id_t **|svn_fs_id_t **", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_p_svn_fs_info_placeholder_t = {"_p_p_svn_fs_info_placeholder_t", "struct svn_fs_info_placeholder_t **|svn_fs_info_placeholder_t **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_svn_fs_root_t = {"_p_p_svn_fs_root_t", "struct svn_fs_root_t **|svn_fs_root_t **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_svn_fs_t = {"_p_p_svn_fs_t", "struct svn_fs_t **|svn_fs_t **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_svn_fs_txn_t = {"_p_p_svn_fs_txn_t", "struct svn_fs_txn_t **|svn_fs_txn_t **", 0, 0, (void*)0, 0};
@@ -11433,6 +13919,7 @@ static swig_type_info _swigt__p_p_svn_lock_t = {"_p_p_svn_lock_t", "struct svn_l
 static swig_type_info _swigt__p_p_svn_stream_t = {"_p_p_svn_stream_t", "struct svn_stream_t **|svn_stream_t **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_svn_string_t = {"_p_p_svn_string_t", "struct svn_string_t **|svn_string_t **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_svn_txdelta_stream_t = {"_p_p_svn_txdelta_stream_t", "struct svn_txdelta_stream_t **|svn_txdelta_stream_t **", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_p_svn_version_t = {"_p_p_svn_version_t", "struct svn_version_t **|svn_version_t **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_void = {"_p_p_void", "void **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_auth_baton_t = {"_p_svn_auth_baton_t", "struct svn_auth_baton_t *|svn_auth_baton_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_auth_cred_simple_t = {"_p_svn_auth_cred_simple_t", "struct svn_auth_cred_simple_t *|svn_auth_cred_simple_t *", 0, 0, (void*)0, 0};
@@ -11466,8 +13953,13 @@ static swig_type_info _swigt__p_svn_errno_t = {"_p_svn_errno_t", "enum svn_errno
 static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "struct svn_error_t *|svn_error_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_fs_access_t = {"_p_svn_fs_access_t", "struct svn_fs_access_t *|svn_fs_access_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_fs_dirent_t = {"_p_svn_fs_dirent_t", "struct svn_fs_dirent_t *|svn_fs_dirent_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_fs_fsfs_info_t = {"_p_svn_fs_fsfs_info_t", "struct svn_fs_fsfs_info_t *|svn_fs_fsfs_info_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_fs_fsx_info_t = {"_p_svn_fs_fsx_info_t", "struct svn_fs_fsx_info_t *|svn_fs_fsx_info_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_fs_history_t = {"_p_svn_fs_history_t", "struct svn_fs_history_t *|svn_fs_history_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_fs_id_t = {"_p_svn_fs_id_t", "struct svn_fs_id_t *|svn_fs_id_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_fs_info_placeholder_t = {"_p_svn_fs_info_placeholder_t", "struct svn_fs_info_placeholder_t *|svn_fs_info_placeholder_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_fs_lock_target_t = {"_p_svn_fs_lock_target_t", "struct svn_fs_lock_target_t *|svn_fs_lock_target_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_fs_node_relation_t = {"_p_svn_fs_node_relation_t", "enum svn_fs_node_relation_t *|svn_fs_node_relation_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_fs_pack_notify_action_t = {"_p_svn_fs_pack_notify_action_t", "enum svn_fs_pack_notify_action_t *|svn_fs_pack_notify_action_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_fs_path_change2_t = {"_p_svn_fs_path_change2_t", "struct svn_fs_path_change2_t *|svn_fs_path_change2_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_fs_path_change_kind_t = {"_p_svn_fs_path_change_kind_t", "enum svn_fs_path_change_kind_t *|svn_fs_path_change_kind_t *", 0, 0, (void*)0, 0};
@@ -11475,6 +13967,7 @@ static swig_type_info _swigt__p_svn_fs_path_change_t = {"_p_svn_fs_path_change_t
 static swig_type_info _swigt__p_svn_fs_root_t = {"_p_svn_fs_root_t", "struct svn_fs_root_t *|svn_fs_root_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_fs_t = {"_p_svn_fs_t", "struct svn_fs_t *|svn_fs_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_fs_txn_t = {"_p_svn_fs_txn_t", "struct svn_fs_txn_t *|svn_fs_txn_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_fs_upgrade_notify_action_t = {"_p_svn_fs_upgrade_notify_action_t", "enum svn_fs_upgrade_notify_action_t *|svn_fs_upgrade_notify_action_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_io_dirent2_t = {"_p_svn_io_dirent2_t", "struct svn_io_dirent2_t *|svn_io_dirent2_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_io_dirent_t = {"_p_svn_io_dirent_t", "struct svn_io_dirent_t *|svn_io_dirent_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_io_file_del_t = {"_p_svn_io_file_del_t", "enum svn_io_file_del_t *|svn_io_file_del_t *", 0, 0, (void*)0, 0};
@@ -11519,6 +14012,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_apr_int32_t,
   &_swigt__p_apr_int64_t,
   &_swigt__p_apr_pool_t,
+  &_swigt__p_apr_uint64_t,
   &_swigt__p_char,
   &_swigt__p_f_long_p_void_p_apr_pool_t__void,
   &_swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t,
@@ -11526,7 +14020,10 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t,
   &_swigt__p_f_p_void__p_svn_error_t,
   &_swigt__p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t,
+  &_swigt__p_f_p_void_apr_uint64_t_svn_fs_upgrade_notify_action_t_p_apr_pool_t__p_svn_error_t,
+  &_swigt__p_f_p_void_long_long_p_apr_pool_t__void,
   &_swigt__p_f_p_void_p_apr_pool_t__p_svn_error_t,
+  &_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_struct_svn_error_t__void,
   &_swigt__p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_int,
@@ -11539,6 +14036,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_p_svn_fs_access_t,
   &_swigt__p_p_svn_fs_history_t,
   &_swigt__p_p_svn_fs_id_t,
+  &_swigt__p_p_svn_fs_info_placeholder_t,
   &_swigt__p_p_svn_fs_root_t,
   &_swigt__p_p_svn_fs_t,
   &_swigt__p_p_svn_fs_txn_t,
@@ -11546,6 +14044,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_p_svn_stream_t,
   &_swigt__p_p_svn_string_t,
   &_swigt__p_p_svn_txdelta_stream_t,
+  &_swigt__p_p_svn_version_t,
   &_swigt__p_p_void,
   &_swigt__p_svn_auth_baton_t,
   &_swigt__p_svn_auth_cred_simple_t,
@@ -11579,8 +14078,13 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_svn_error_t,
   &_swigt__p_svn_fs_access_t,
   &_swigt__p_svn_fs_dirent_t,
+  &_swigt__p_svn_fs_fsfs_info_t,
+  &_swigt__p_svn_fs_fsx_info_t,
   &_swigt__p_svn_fs_history_t,
   &_swigt__p_svn_fs_id_t,
+  &_swigt__p_svn_fs_info_placeholder_t,
+  &_swigt__p_svn_fs_lock_target_t,
+  &_swigt__p_svn_fs_node_relation_t,
   &_swigt__p_svn_fs_pack_notify_action_t,
   &_swigt__p_svn_fs_path_change2_t,
   &_swigt__p_svn_fs_path_change_kind_t,
@@ -11588,6 +14092,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_svn_fs_root_t,
   &_swigt__p_svn_fs_t,
   &_swigt__p_svn_fs_txn_t,
+  &_swigt__p_svn_fs_upgrade_notify_action_t,
   &_swigt__p_svn_io_dirent2_t,
   &_swigt__p_svn_io_dirent_t,
   &_swigt__p_svn_io_file_del_t,
@@ -11632,6 +14137,7 @@ static swig_cast_info _swigc__p_apr_hash_t[] = {  {&_swigt__p_apr_hash_t, 0, 0,
 static swig_cast_info _swigc__p_apr_int32_t[] = {  {&_swigt__p_apr_int32_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_apr_int64_t[] = {  {&_swigt__p_apr_int64_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_apr_pool_t[] = {  {&_swigt__p_apr_pool_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_apr_uint64_t[] = {  {&_swigt__p_apr_uint64_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_char[] = {  {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_long_p_void_p_apr_pool_t__void[] = {  {&_swigt__p_f_long_p_void_p_apr_pool_t__void, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -11639,7 +14145,10 @@ static swig_cast_info _swigc__p_f_p_q_const__unsigned_char_apr_size_t_p_void_p_a
 static swig_cast_info _swigc__p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t[] = {  {&_swigt__p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void__p_svn_error_t[] = {  {&_swigt__p_f_p_void__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_f_p_void_apr_uint64_t_svn_fs_upgrade_notify_action_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_apr_uint64_t_svn_fs_upgrade_notify_action_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_f_p_void_long_long_p_apr_pool_t__void[] = {  {&_swigt__p_f_p_void_long_long_p_apr_pool_t__void, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_struct_svn_error_t__void[] = {  {&_swigt__p_f_p_void_p_struct_svn_error_t__void, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_int[] = {  {&_swigt__p_int, 0, 0, 0},{0, 0, 0, 0}};
@@ -11652,6 +14161,7 @@ static swig_cast_info _swigc__p_p_svn_checksum_t[] = {  {&_swigt__p_p_svn_checks
 static swig_cast_info _swigc__p_p_svn_fs_access_t[] = {  {&_swigt__p_p_svn_fs_access_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_svn_fs_history_t[] = {  {&_swigt__p_p_svn_fs_history_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_svn_fs_id_t[] = {  {&_swigt__p_p_svn_fs_id_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_p_svn_fs_info_placeholder_t[] = {  {&_swigt__p_p_svn_fs_info_placeholder_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_svn_fs_root_t[] = {  {&_swigt__p_p_svn_fs_root_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_svn_fs_t[] = {  {&_swigt__p_p_svn_fs_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_svn_fs_txn_t[] = {  {&_swigt__p_p_svn_fs_txn_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -11659,6 +14169,7 @@ static swig_cast_info _swigc__p_p_svn_lock_t[] = {  {&_swigt__p_p_svn_lock_t, 0,
 static swig_cast_info _swigc__p_p_svn_stream_t[] = {  {&_swigt__p_p_svn_stream_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_svn_string_t[] = {  {&_swigt__p_p_svn_string_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_svn_txdelta_stream_t[] = {  {&_swigt__p_p_svn_txdelta_stream_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_p_svn_version_t[] = {  {&_swigt__p_p_svn_version_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_void[] = {  {&_swigt__p_p_void, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_auth_baton_t[] = {  {&_swigt__p_svn_auth_baton_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_auth_cred_simple_t[] = {  {&_swigt__p_svn_auth_cred_simple_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -11692,8 +14203,13 @@ static swig_cast_info _swigc__p_svn_errno_t[] = {  {&_swigt__p_svn_errno_t, 0, 0
 static swig_cast_info _swigc__p_svn_error_t[] = {  {&_swigt__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_fs_access_t[] = {  {&_swigt__p_svn_fs_access_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_fs_dirent_t[] = {  {&_swigt__p_svn_fs_dirent_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_fs_fsfs_info_t[] = {  {&_swigt__p_svn_fs_fsfs_info_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_fs_fsx_info_t[] = {  {&_swigt__p_svn_fs_fsx_info_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_fs_history_t[] = {  {&_swigt__p_svn_fs_history_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_fs_id_t[] = {  {&_swigt__p_svn_fs_id_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_fs_info_placeholder_t[] = {  {&_swigt__p_svn_fs_info_placeholder_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_fs_lock_target_t[] = {  {&_swigt__p_svn_fs_lock_target_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_fs_node_relation_t[] = {  {&_swigt__p_svn_fs_node_relation_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_fs_pack_notify_action_t[] = {  {&_swigt__p_svn_fs_pack_notify_action_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_fs_path_change2_t[] = {  {&_swigt__p_svn_fs_path_change2_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_fs_path_change_kind_t[] = {  {&_swigt__p_svn_fs_path_change_kind_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -11701,6 +14217,7 @@ static swig_cast_info _swigc__p_svn_fs_path_change_t[] = {  {&_swigt__p_svn_fs_p
 static swig_cast_info _swigc__p_svn_fs_root_t[] = {  {&_swigt__p_svn_fs_root_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_fs_t[] = {  {&_swigt__p_svn_fs_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_fs_txn_t[] = {  {&_swigt__p_svn_fs_txn_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_fs_upgrade_notify_action_t[] = {  {&_swigt__p_svn_fs_upgrade_notify_action_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_io_dirent2_t[] = {  {&_swigt__p_svn_io_dirent2_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_io_dirent_t[] = {  {&_swigt__p_svn_io_dirent_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_io_file_del_t[] = {  {&_swigt__p_svn_io_file_del_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -11745,6 +14262,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_apr_int32_t,
   _swigc__p_apr_int64_t,
   _swigc__p_apr_pool_t,
+  _swigc__p_apr_uint64_t,
   _swigc__p_char,
   _swigc__p_f_long_p_void_p_apr_pool_t__void,
   _swigc__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t,
@@ -11752,7 +14270,10 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t,
   _swigc__p_f_p_void__p_svn_error_t,
   _swigc__p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t_p_apr_pool_t__p_svn_error_t,
+  _swigc__p_f_p_void_apr_uint64_t_svn_fs_upgrade_notify_action_t_p_apr_pool_t__p_svn_error_t,
+  _swigc__p_f_p_void_long_long_p_apr_pool_t__void,
   _swigc__p_f_p_void_p_apr_pool_t__p_svn_error_t,
+  _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_p_struct_svn_error_t__void,
   _swigc__p_f_p_void_p_svn_lock_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_int,
@@ -11765,6 +14286,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_p_svn_fs_access_t,
   _swigc__p_p_svn_fs_history_t,
   _swigc__p_p_svn_fs_id_t,
+  _swigc__p_p_svn_fs_info_placeholder_t,
   _swigc__p_p_svn_fs_root_t,
   _swigc__p_p_svn_fs_t,
   _swigc__p_p_svn_fs_txn_t,
@@ -11772,6 +14294,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_p_svn_stream_t,
   _swigc__p_p_svn_string_t,
   _swigc__p_p_svn_txdelta_stream_t,
+  _swigc__p_p_svn_version_t,
   _swigc__p_p_void,
   _swigc__p_svn_auth_baton_t,
   _swigc__p_svn_auth_cred_simple_t,
@@ -11805,8 +14328,13 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_svn_error_t,
   _swigc__p_svn_fs_access_t,
   _swigc__p_svn_fs_dirent_t,
+  _swigc__p_svn_fs_fsfs_info_t,
+  _swigc__p_svn_fs_fsx_info_t,
   _swigc__p_svn_fs_history_t,
   _swigc__p_svn_fs_id_t,
+  _swigc__p_svn_fs_info_placeholder_t,
+  _swigc__p_svn_fs_lock_target_t,
+  _swigc__p_svn_fs_node_relation_t,
   _swigc__p_svn_fs_pack_notify_action_t,
   _swigc__p_svn_fs_path_change2_t,
   _swigc__p_svn_fs_path_change_kind_t,
@@ -11814,6 +14342,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_svn_fs_root_t,
   _swigc__p_svn_fs_t,
   _swigc__p_svn_fs_txn_t,
+  _swigc__p_svn_fs_upgrade_notify_action_t,
   _swigc__p_svn_io_dirent2_t,
   _swigc__p_svn_io_dirent_t,
   _swigc__p_svn_io_file_del_t,
@@ -11858,18 +14387,18 @@ static swig_cast_info *swig_cast_initial[] = {
 
 /* -----------------------------------------------------------------------------
  * Type initialization:
- * This problem is tough by the requirement that no dynamic 
- * memory is used. Also, since swig_type_info structures store pointers to 
+ * This problem is tough by the requirement that no dynamic
+ * memory is used. Also, since swig_type_info structures store pointers to
  * swig_cast_info structures and swig_cast_info structures store pointers back
- * to swig_type_info structures, we need some lookup code at initialization. 
- * The idea is that swig generates all the structures that are needed. 
- * The runtime then collects these partially filled structures. 
- * The SWIG_InitializeModule function takes these initial arrays out of 
+ * to swig_type_info structures, we need some lookup code at initialization.
+ * The idea is that swig generates all the structures that are needed.
+ * The runtime then collects these partially filled structures.
+ * The SWIG_InitializeModule function takes these initial arrays out of
  * swig_module, and does all the lookup, filling in the swig_module.types
  * array with the correct data and linking the correct swig_cast_info
  * structures together.
  *
- * The generated swig_type_info structures are assigned staticly to an initial 
+ * The generated swig_type_info structures are assigned staticly to an initial
  * array. We just loop through that array, and handle each type individually.
  * First we lookup if this type has been already loaded, and if so, use the
  * loaded structure instead of the generated one. Then we have to fill in the
@@ -11879,17 +14408,17 @@ static swig_cast_info *swig_cast_initial[] = {
  * a column is one of the swig_cast_info structures for that type.
  * The cast_initial array is actually an array of arrays, because each row has
  * a variable number of columns. So to actually build the cast linked list,
- * we find the array of casts associated with the type, and loop through it 
+ * we find the array of casts associated with the type, and loop through it
  * adding the casts to the list. The one last trick we need to do is making
  * sure the type pointer in the swig_cast_info struct is correct.
  *
- * First off, we lookup the cast->type name to see if it is already loaded. 
+ * First off, we lookup the cast->type name to see if it is already loaded.
  * There are three cases to handle:
  *  1) If the cast->type has already been loaded AND the type we are adding
  *     casting info to has not been loaded (it is in this module), THEN we
  *     replace the cast->type pointer with the type pointer that has already
  *     been loaded.
- *  2) If BOTH types (the one we are adding casting info to, and the 
+ *  2) If BOTH types (the one we are adding casting info to, and the
  *     cast->type) are loaded, THEN the cast info has already been loaded by
  *     the previous module so we just ignore it.
  *  3) Finally, if cast->type has not already been loaded, then we add that
@@ -11952,7 +14481,7 @@ SWIG_InitializeModule(void *clientdata) {
     module_head->next = &swig_module;
   }
 
-  /* When multiple interpeters are used, a module could have already been initialized in
+  /* When multiple interpreters are used, a module could have already been initialized in
      a different interpreter, but not yet have a pointer in this interpreter.
      In this case, we do not want to continue adding types... everything should be
      set up already */
@@ -11966,7 +14495,7 @@ SWIG_InitializeModule(void *clientdata) {
     swig_type_info *type = 0;
     swig_type_info *ret;
     swig_cast_info *cast;
-  
+
 #ifdef SWIGRUNTIME_DEBUG
     printf("SWIG_InitializeModule: type %d %s\n", i, swig_module.type_initial[i]->name);
 #endif
@@ -11993,7 +14522,7 @@ SWIG_InitializeModule(void *clientdata) {
     /* Insert casting types */
     cast = swig_module.cast_initial[i];
     while (cast->type) {
-    
+
       /* Don't need to add information already in the list */
       ret = 0;
 #ifdef SWIGRUNTIME_DEBUG
@@ -12116,27 +14645,38 @@ SWIGEXPORT void Init_fs(void) {
   rb_define_module_function(mFs, "svn_fs_set_warning_func_wrapper", _wrap_svn_fs_set_warning_func_wrapper, -1);
   rb_define_module_function(mFs, "svn_fs_root_fs_wrapper", _wrap_svn_fs_root_fs_wrapper, -1);
   rb_define_module_function(mFs, "svn_fs_version", _wrap_svn_fs_version, -1);
+  rb_define_const(mFs, "SVN_FS_TYPE_BDB", SWIG_FromCharPtr("bdb"));
+  rb_define_const(mFs, "SVN_FS_TYPE_FSFS", SWIG_FromCharPtr("fsfs"));
+  rb_define_const(mFs, "SVN_FS_TYPE_FSX", SWIG_FromCharPtr("fsx"));
   rb_define_const(mFs, "SVN_FS_CONFIG_BDB_TXN_NOSYNC", SWIG_FromCharPtr("bdb-txn-nosync"));
   rb_define_const(mFs, "SVN_FS_CONFIG_BDB_LOG_AUTOREMOVE", SWIG_FromCharPtr("bdb-log-autoremove"));
   rb_define_const(mFs, "SVN_FS_CONFIG_FSFS_CACHE_DELTAS", SWIG_FromCharPtr("fsfs-cache-deltas"));
   rb_define_const(mFs, "SVN_FS_CONFIG_FSFS_CACHE_FULLTEXTS", SWIG_FromCharPtr("fsfs-cache-fulltexts"));
   rb_define_const(mFs, "SVN_FS_CONFIG_FSFS_CACHE_REVPROPS", SWIG_FromCharPtr("fsfs-cache-revprops"));
   rb_define_const(mFs, "SVN_FS_CONFIG_FSFS_CACHE_NS", SWIG_FromCharPtr("fsfs-cache-namespace"));
+  rb_define_const(mFs, "SVN_FS_CONFIG_FSFS_BLOCK_READ", SWIG_FromCharPtr("fsfs-block-read"));
+  rb_define_const(mFs, "SVN_FS_CONFIG_FSFS_SHARD_SIZE", SWIG_FromCharPtr("fsfs-shard-size"));
+  rb_define_const(mFs, "SVN_FS_CONFIG_FSFS_LOG_ADDRESSING", SWIG_FromCharPtr("fsfs-log-addressing"));
   rb_define_const(mFs, "SVN_FS_CONFIG_FS_TYPE", SWIG_FromCharPtr("fs-type"));
-  rb_define_const(mFs, "SVN_FS_TYPE_BDB", SWIG_FromCharPtr("bdb"));
-  rb_define_const(mFs, "SVN_FS_TYPE_FSFS", SWIG_FromCharPtr("fsfs"));
   rb_define_const(mFs, "SVN_FS_CONFIG_PRE_1_4_COMPATIBLE", SWIG_FromCharPtr("pre-1.4-compatible"));
   rb_define_const(mFs, "SVN_FS_CONFIG_PRE_1_5_COMPATIBLE", SWIG_FromCharPtr("pre-1.5-compatible"));
   rb_define_const(mFs, "SVN_FS_CONFIG_PRE_1_6_COMPATIBLE", SWIG_FromCharPtr("pre-1.6-compatible"));
   rb_define_const(mFs, "SVN_FS_CONFIG_PRE_1_8_COMPATIBLE", SWIG_FromCharPtr("pre-1.8-compatible"));
+  rb_define_const(mFs, "SVN_FS_CONFIG_COMPATIBLE_VERSION", SWIG_FromCharPtr("compatible-version"));
   rb_define_module_function(mFs, "svn_fs_initialize", _wrap_svn_fs_initialize, -1);
   rb_define_module_function(mFs, "svn_fs_create", _wrap_svn_fs_create, -1);
+  rb_define_module_function(mFs, "svn_fs_open2", _wrap_svn_fs_open2, -1);
   rb_define_module_function(mFs, "svn_fs_open", _wrap_svn_fs_open, -1);
+  rb_define_const(mFs, "Svn_fs_upgrade_pack_revprops", SWIG_From_int((int)(svn_fs_upgrade_pack_revprops)));
+  rb_define_const(mFs, "Svn_fs_upgrade_cleanup_revprops", SWIG_From_int((int)(svn_fs_upgrade_cleanup_revprops)));
+  rb_define_const(mFs, "Svn_fs_upgrade_format_bumped", SWIG_From_int((int)(svn_fs_upgrade_format_bumped)));
+  rb_define_module_function(mFs, "svn_fs_upgrade2", _wrap_svn_fs_upgrade2, -1);
   rb_define_module_function(mFs, "svn_fs_upgrade", _wrap_svn_fs_upgrade, -1);
   rb_define_module_function(mFs, "svn_fs_type", _wrap_svn_fs_type, -1);
   rb_define_module_function(mFs, "svn_fs_path", _wrap_svn_fs_path, -1);
   rb_define_module_function(mFs, "svn_fs_config", _wrap_svn_fs_config, -1);
   rb_define_module_function(mFs, "svn_fs_delete_fs", _wrap_svn_fs_delete_fs, -1);
+  rb_define_module_function(mFs, "svn_fs_hotcopy3", _wrap_svn_fs_hotcopy3, -1);
   rb_define_module_function(mFs, "svn_fs_hotcopy2", _wrap_svn_fs_hotcopy2, -1);
   rb_define_module_function(mFs, "svn_fs_hotcopy", _wrap_svn_fs_hotcopy, -1);
   rb_define_module_function(mFs, "svn_fs_recover", _wrap_svn_fs_recover, -1);
@@ -12155,12 +14695,16 @@ SWIGEXPORT void Init_fs(void) {
   rb_define_module_function(mFs, "svn_fs_access_get_username", _wrap_svn_fs_access_get_username, -1);
   rb_define_module_function(mFs, "svn_fs_access_add_lock_token2", _wrap_svn_fs_access_add_lock_token2, -1);
   rb_define_module_function(mFs, "svn_fs_access_add_lock_token", _wrap_svn_fs_access_add_lock_token, -1);
+  rb_define_const(mFs, "Svn_fs_node_unrelated", SWIG_From_int((int)(svn_fs_node_unrelated)));
+  rb_define_const(mFs, "Svn_fs_node_unchanged", SWIG_From_int((int)(svn_fs_node_unchanged)));
+  rb_define_const(mFs, "Svn_fs_node_common_ancestor", SWIG_From_int((int)(svn_fs_node_common_ancestor)));
   rb_define_module_function(mFs, "svn_fs_compare_ids", _wrap_svn_fs_compare_ids, -1);
   rb_define_module_function(mFs, "svn_fs_check_related", _wrap_svn_fs_check_related, -1);
   rb_define_module_function(mFs, "svn_fs_parse_id", _wrap_svn_fs_parse_id, -1);
   rb_define_module_function(mFs, "svn_fs_unparse_id", _wrap_svn_fs_unparse_id, -1);
   rb_define_const(mFs, "SVN_FS_TXN_CHECK_OOD", SWIG_From_int((int)(0x00001)));
   rb_define_const(mFs, "SVN_FS_TXN_CHECK_LOCKS", SWIG_From_int((int)(0x00002)));
+  rb_define_const(mFs, "SVN_FS_TXN_CLIENT_DATE", SWIG_From_int((int)(0x00004)));
   rb_define_module_function(mFs, "svn_fs_begin_txn2", _wrap_svn_fs_begin_txn2, -1);
   rb_define_module_function(mFs, "svn_fs_begin_txn", _wrap_svn_fs_begin_txn, -1);
   rb_define_module_function(mFs, "svn_fs_commit_txn", _wrap_svn_fs_commit_txn, -1);
@@ -12207,6 +14751,8 @@ SWIGEXPORT void Init_fs(void) {
   rb_define_method(SwigClassSvn_fs_path_change2_t.klass, "copyfrom_rev", _wrap_svn_fs_path_change2_t_copyfrom_rev_get, -1);
   rb_define_method(SwigClassSvn_fs_path_change2_t.klass, "copyfrom_path=", _wrap_svn_fs_path_change2_t_copyfrom_path_set, -1);
   rb_define_method(SwigClassSvn_fs_path_change2_t.klass, "copyfrom_path", _wrap_svn_fs_path_change2_t_copyfrom_path_get, -1);
+  rb_define_method(SwigClassSvn_fs_path_change2_t.klass, "mergeinfo_mod=", _wrap_svn_fs_path_change2_t_mergeinfo_mod_set, -1);
+  rb_define_method(SwigClassSvn_fs_path_change2_t.klass, "mergeinfo_mod", _wrap_svn_fs_path_change2_t_mergeinfo_mod_get, -1);
   SwigClassSvn_fs_path_change2_t.mark = 0;
   SwigClassSvn_fs_path_change2_t.trackObjects = 0;
   
@@ -12227,18 +14773,23 @@ SWIGEXPORT void Init_fs(void) {
   rb_define_module_function(mFs, "svn_fs_paths_changed2", _wrap_svn_fs_paths_changed2, -1);
   rb_define_module_function(mFs, "svn_fs_paths_changed", _wrap_svn_fs_paths_changed, -1);
   rb_define_module_function(mFs, "svn_fs_check_path", _wrap_svn_fs_check_path, -1);
+  rb_define_module_function(mFs, "svn_fs_node_history2", _wrap_svn_fs_node_history2, -1);
   rb_define_module_function(mFs, "svn_fs_node_history", _wrap_svn_fs_node_history, -1);
+  rb_define_module_function(mFs, "svn_fs_history_prev2", _wrap_svn_fs_history_prev2, -1);
   rb_define_module_function(mFs, "svn_fs_history_prev", _wrap_svn_fs_history_prev, -1);
   rb_define_module_function(mFs, "svn_fs_history_location", _wrap_svn_fs_history_location, -1);
   rb_define_module_function(mFs, "svn_fs_is_dir", _wrap_svn_fs_is_dir, -1);
   rb_define_module_function(mFs, "svn_fs_is_file", _wrap_svn_fs_is_file, -1);
   rb_define_module_function(mFs, "svn_fs_node_id", _wrap_svn_fs_node_id, -1);
+  rb_define_module_function(mFs, "svn_fs_node_relation", _wrap_svn_fs_node_relation, -1);
   rb_define_module_function(mFs, "svn_fs_node_created_rev", _wrap_svn_fs_node_created_rev, -1);
   rb_define_module_function(mFs, "svn_fs_node_origin_rev", _wrap_svn_fs_node_origin_rev, -1);
   rb_define_module_function(mFs, "svn_fs_node_created_path", _wrap_svn_fs_node_created_path, -1);
   rb_define_module_function(mFs, "svn_fs_node_prop", _wrap_svn_fs_node_prop, -1);
   rb_define_module_function(mFs, "svn_fs_node_proplist", _wrap_svn_fs_node_proplist, -1);
+  rb_define_module_function(mFs, "svn_fs_node_has_props", _wrap_svn_fs_node_has_props, -1);
   rb_define_module_function(mFs, "svn_fs_change_node_prop", _wrap_svn_fs_change_node_prop, -1);
+  rb_define_module_function(mFs, "svn_fs_props_different", _wrap_svn_fs_props_different, -1);
   rb_define_module_function(mFs, "svn_fs_props_changed", _wrap_svn_fs_props_changed, -1);
   rb_define_module_function(mFs, "svn_fs_copied_from", _wrap_svn_fs_copied_from, -1);
   rb_define_module_function(mFs, "svn_fs_closest_copy", _wrap_svn_fs_closest_copy, -1);
@@ -12258,6 +14809,7 @@ SWIGEXPORT void Init_fs(void) {
   SwigClassSvn_fs_dirent_t.mark = 0;
   SwigClassSvn_fs_dirent_t.trackObjects = 0;
   rb_define_module_function(mFs, "svn_fs_dir_entries", _wrap_svn_fs_dir_entries, -1);
+  rb_define_module_function(mFs, "svn_fs_dir_optimal_order", _wrap_svn_fs_dir_optimal_order, -1);
   rb_define_module_function(mFs, "svn_fs_make_dir", _wrap_svn_fs_make_dir, -1);
   rb_define_module_function(mFs, "svn_fs_delete", _wrap_svn_fs_delete, -1);
   rb_define_module_function(mFs, "svn_fs_copy", _wrap_svn_fs_copy, -1);
@@ -12270,8 +14822,11 @@ SWIGEXPORT void Init_fs(void) {
   rb_define_module_function(mFs, "svn_fs_make_file", _wrap_svn_fs_make_file, -1);
   rb_define_module_function(mFs, "svn_fs_apply_textdelta", _wrap_svn_fs_apply_textdelta, -1);
   rb_define_module_function(mFs, "svn_fs_apply_text", _wrap_svn_fs_apply_text, -1);
+  rb_define_module_function(mFs, "svn_fs_contents_different", _wrap_svn_fs_contents_different, -1);
   rb_define_module_function(mFs, "svn_fs_contents_changed", _wrap_svn_fs_contents_changed, -1);
   rb_define_module_function(mFs, "svn_fs_youngest_rev", _wrap_svn_fs_youngest_rev, -1);
+  rb_define_module_function(mFs, "svn_fs_info_format", _wrap_svn_fs_info_format, -1);
+  rb_define_module_function(mFs, "svn_fs_info_config_files", _wrap_svn_fs_info_config_files, -1);
   rb_define_module_function(mFs, "svn_fs_deltify_revision", _wrap_svn_fs_deltify_revision, -1);
   rb_define_module_function(mFs, "svn_fs_revision_prop", _wrap_svn_fs_revision_prop, -1);
   rb_define_module_function(mFs, "svn_fs_revision_proplist", _wrap_svn_fs_revision_proplist, -1);
@@ -12280,8 +14835,12 @@ SWIGEXPORT void Init_fs(void) {
   rb_define_module_function(mFs, "svn_fs_get_file_delta_stream", _wrap_svn_fs_get_file_delta_stream, -1);
   rb_define_module_function(mFs, "svn_fs_get_uuid", _wrap_svn_fs_get_uuid, -1);
   rb_define_module_function(mFs, "svn_fs_set_uuid", _wrap_svn_fs_set_uuid, -1);
+  rb_define_module_function(mFs, "svn_fs_lock_target_create", _wrap_svn_fs_lock_target_create, -1);
+  rb_define_module_function(mFs, "svn_fs_lock_target_set_token", _wrap_svn_fs_lock_target_set_token, -1);
+  rb_define_module_function(mFs, "svn_fs_lock_many", _wrap_svn_fs_lock_many, -1);
   rb_define_module_function(mFs, "svn_fs_lock", _wrap_svn_fs_lock, -1);
   rb_define_module_function(mFs, "svn_fs_generate_lock_token", _wrap_svn_fs_generate_lock_token, -1);
+  rb_define_module_function(mFs, "svn_fs_unlock_many", _wrap_svn_fs_unlock_many, -1);
   rb_define_module_function(mFs, "svn_fs_unlock", _wrap_svn_fs_unlock, -1);
   rb_define_module_function(mFs, "svn_fs_get_lock", _wrap_svn_fs_get_lock, -1);
   rb_define_module_function(mFs, "svn_fs_get_locks2", _wrap_svn_fs_get_locks2, -1);
@@ -12294,10 +14853,49 @@ SWIGEXPORT void Init_fs(void) {
   rb_define_module_function(mFs, "svn_fs_pack", _wrap_svn_fs_pack, -1);
   rb_define_module_function(mFs, "svn_fs_verify", _wrap_svn_fs_verify, -1);
   rb_define_module_function(mFs, "svn_fs_verify_root", _wrap_svn_fs_verify_root, -1);
+  
+  SwigClassSvn_fs_fsfs_info_t.klass = rb_define_class_under(mFs, "Svn_fs_fsfs_info_t", rb_cObject);
+  SWIG_TypeClientData(SWIGTYPE_p_svn_fs_fsfs_info_t, (void *) &SwigClassSvn_fs_fsfs_info_t);
+  rb_undef_alloc_func(SwigClassSvn_fs_fsfs_info_t.klass);
+  rb_define_method(SwigClassSvn_fs_fsfs_info_t.klass, "fs_type=", _wrap_svn_fs_fsfs_info_t_fs_type_set, -1);
+  rb_define_method(SwigClassSvn_fs_fsfs_info_t.klass, "fs_type", _wrap_svn_fs_fsfs_info_t_fs_type_get, -1);
+  rb_define_method(SwigClassSvn_fs_fsfs_info_t.klass, "shard_size=", _wrap_svn_fs_fsfs_info_t_shard_size_set, -1);
+  rb_define_method(SwigClassSvn_fs_fsfs_info_t.klass, "shard_size", _wrap_svn_fs_fsfs_info_t_shard_size_get, -1);
+  rb_define_method(SwigClassSvn_fs_fsfs_info_t.klass, "min_unpacked_rev=", _wrap_svn_fs_fsfs_info_t_min_unpacked_rev_set, -1);
+  rb_define_method(SwigClassSvn_fs_fsfs_info_t.klass, "min_unpacked_rev", _wrap_svn_fs_fsfs_info_t_min_unpacked_rev_get, -1);
+  rb_define_method(SwigClassSvn_fs_fsfs_info_t.klass, "log_addressing=", _wrap_svn_fs_fsfs_info_t_log_addressing_set, -1);
+  rb_define_method(SwigClassSvn_fs_fsfs_info_t.klass, "log_addressing", _wrap_svn_fs_fsfs_info_t_log_addressing_get, -1);
+  SwigClassSvn_fs_fsfs_info_t.mark = 0;
+  SwigClassSvn_fs_fsfs_info_t.trackObjects = 0;
+  
+  SwigClassSvn_fs_fsx_info_t.klass = rb_define_class_under(mFs, "Svn_fs_fsx_info_t", rb_cObject);
+  SWIG_TypeClientData(SWIGTYPE_p_svn_fs_fsx_info_t, (void *) &SwigClassSvn_fs_fsx_info_t);
+  rb_undef_alloc_func(SwigClassSvn_fs_fsx_info_t.klass);
+  rb_define_method(SwigClassSvn_fs_fsx_info_t.klass, "fs_type=", _wrap_svn_fs_fsx_info_t_fs_type_set, -1);
+  rb_define_method(SwigClassSvn_fs_fsx_info_t.klass, "fs_type", _wrap_svn_fs_fsx_info_t_fs_type_get, -1);
+  rb_define_method(SwigClassSvn_fs_fsx_info_t.klass, "shard_size=", _wrap_svn_fs_fsx_info_t_shard_size_set, -1);
+  rb_define_method(SwigClassSvn_fs_fsx_info_t.klass, "shard_size", _wrap_svn_fs_fsx_info_t_shard_size_get, -1);
+  rb_define_method(SwigClassSvn_fs_fsx_info_t.klass, "min_unpacked_rev=", _wrap_svn_fs_fsx_info_t_min_unpacked_rev_set, -1);
+  rb_define_method(SwigClassSvn_fs_fsx_info_t.klass, "min_unpacked_rev", _wrap_svn_fs_fsx_info_t_min_unpacked_rev_get, -1);
+  SwigClassSvn_fs_fsx_info_t.mark = 0;
+  SwigClassSvn_fs_fsx_info_t.trackObjects = 0;
+  
+  SwigClassSvn_fs_info_placeholder_t.klass = rb_define_class_under(mFs, "Svn_fs_info_placeholder_t", rb_cObject);
+  SWIG_TypeClientData(SWIGTYPE_p_svn_fs_info_placeholder_t, (void *) &SwigClassSvn_fs_info_placeholder_t);
+  rb_undef_alloc_func(SwigClassSvn_fs_info_placeholder_t.klass);
+  rb_define_method(SwigClassSvn_fs_info_placeholder_t.klass, "fs_type=", _wrap_svn_fs_info_placeholder_t_fs_type_set, -1);
+  rb_define_method(SwigClassSvn_fs_info_placeholder_t.klass, "fs_type", _wrap_svn_fs_info_placeholder_t_fs_type_get, -1);
+  SwigClassSvn_fs_info_placeholder_t.mark = 0;
+  SwigClassSvn_fs_info_placeholder_t.trackObjects = 0;
+  rb_define_module_function(mFs, "svn_fs_info", _wrap_svn_fs_info, -1);
+  rb_define_module_function(mFs, "svn_fs_info_dup", _wrap_svn_fs_info_dup, -1);
   rb_define_module_function(mFs, "svn_fs_invoke_warning_callback", _wrap_svn_fs_invoke_warning_callback, -1);
+  rb_define_module_function(mFs, "svn_fs_invoke_upgrade_notify", _wrap_svn_fs_invoke_upgrade_notify, -1);
   rb_define_module_function(mFs, "svn_fs_invoke_progress_notify_func", _wrap_svn_fs_invoke_progress_notify_func, -1);
+  rb_define_module_function(mFs, "svn_fs_invoke_hotcopy_notify", _wrap_svn_fs_invoke_hotcopy_notify, -1);
   rb_define_module_function(mFs, "svn_fs_invoke_freeze_func", _wrap_svn_fs_invoke_freeze_func, -1);
   rb_define_module_function(mFs, "svn_fs_invoke_process_contents_func", _wrap_svn_fs_invoke_process_contents_func, -1);
+  rb_define_module_function(mFs, "svn_fs_invoke_lock_callback", _wrap_svn_fs_invoke_lock_callback, -1);
   rb_define_module_function(mFs, "svn_fs_invoke_get_locks_callback", _wrap_svn_fs_invoke_get_locks_callback, -1);
   rb_define_module_function(mFs, "svn_fs_invoke_pack_notify", _wrap_svn_fs_invoke_pack_notify, -1);
   
diff --git a/subversion/bindings/swig/ruby/svn_ra.c b/subversion/bindings/swig/ruby/svn_ra.c
index 5d953ff..90a0229 100644
--- a/subversion/bindings/swig/ruby/svn_ra.c
+++ b/subversion/bindings/swig/ruby/svn_ra.c
@@ -1,11 +1,11 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
- * 
- * This file is not intended to be easily readable and contains a number of 
+ * Version 2.0.12
+ *
+ * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
- * changes to this file unless you know what you are doing--modify the SWIG 
- * interface file instead. 
+ * changes to this file unless you know what you are doing--modify the SWIG
+ * interface file instead.
  * ----------------------------------------------------------------------------- */
 
 #define SWIGRUBY
@@ -41,28 +41,28 @@
 #ifndef SWIGUNUSED
 # if defined(__GNUC__)
 #   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__)) 
+#     define SWIGUNUSED __attribute__ ((__unused__))
 #   else
 #     define SWIGUNUSED
 #   endif
 # elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__)) 
+#   define SWIGUNUSED __attribute__ ((__unused__))
 # else
-#   define SWIGUNUSED 
+#   define SWIGUNUSED
 # endif
 #endif
 
 #ifndef SWIG_MSC_UNSUPPRESS_4505
 # if defined(_MSC_VER)
 #   pragma warning(disable : 4505) /* unreferenced local function has been removed */
-# endif 
+# endif
 #endif
 
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
 # else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
 # endif
 #endif
 
@@ -105,7 +105,7 @@
 #   define SWIGSTDCALL __stdcall
 # else
 #   define SWIGSTDCALL
-# endif 
+# endif
 #endif
 
 /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
@@ -150,28 +150,28 @@
 #ifndef SWIGUNUSED
 # if defined(__GNUC__)
 #   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__)) 
+#     define SWIGUNUSED __attribute__ ((__unused__))
 #   else
 #     define SWIGUNUSED
 #   endif
 # elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__)) 
+#   define SWIGUNUSED __attribute__ ((__unused__))
 # else
-#   define SWIGUNUSED 
+#   define SWIGUNUSED
 # endif
 #endif
 
 #ifndef SWIG_MSC_UNSUPPRESS_4505
 # if defined(_MSC_VER)
 #   pragma warning(disable : 4505) /* unreferenced local function has been removed */
-# endif 
+# endif
 #endif
 
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
 # else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
 # endif
 #endif
 
@@ -214,7 +214,7 @@
 #   define SWIGSTDCALL __stdcall
 # else
 #   define SWIGSTDCALL
-# endif 
+# endif
 #endif
 
 /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
@@ -252,7 +252,7 @@
   You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for
   creating a static or dynamic library from the SWIG runtime code.
   In 99.9% of the cases, SWIG just needs to declare them as 'static'.
-  
+
   But only do this if strictly necessary, ie, if you have problems
   with your compiler or suchlike.
 */
@@ -278,16 +278,16 @@
 #define SWIG_POINTER_OWN           0x1
 
 
-/* 
+/*
    Flags/methods for returning states.
-   
-   The SWIG conversion methods, as ConvertPtr, return an integer 
+
+   The SWIG conversion methods, as ConvertPtr, return an integer
    that tells if the conversion was successful or not. And if not,
    an error code can be returned (see swigerrors.swg for the codes).
-   
+
    Use the following macros/flags to set or process the returning
    states.
-   
+
    In old versions of SWIG, code such as the following was usually written:
 
      if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) {
@@ -320,23 +320,23 @@
     } else {
       // fail code
     }
-    
+
    I.e., now SWIG_ConvertPtr can return new objects and you can
    identify the case and take care of the deallocation. Of course that
    also requires SWIG_ConvertPtr to return new result values, such as
 
-      int SWIG_ConvertPtr(obj, ptr,...) {         
-        if (<obj is ok>) {			       
-          if (<need new object>) {		       
-            *ptr = <ptr to new allocated object>; 
-            return SWIG_NEWOBJ;		       
-          } else {				       
-            *ptr = <ptr to old object>;	       
-            return SWIG_OLDOBJ;		       
-          } 				       
-        } else {				       
-          return SWIG_BADOBJ;		       
-        }					       
+      int SWIG_ConvertPtr(obj, ptr,...) {
+        if (<obj is ok>) {
+          if (<need new object>) {
+            *ptr = <ptr to new allocated object>;
+            return SWIG_NEWOBJ;
+          } else {
+            *ptr = <ptr to old object>;
+            return SWIG_OLDOBJ;
+          }
+        } else {
+          return SWIG_BADOBJ;
+        }
       }
 
    Of course, returning the plain '0(success)/-1(fail)' still works, but you can be
@@ -350,17 +350,17 @@
        int fooi(int);
 
    and you call
- 
+
       food(1)   // cast rank '1'  (1 -> 1.0)
       fooi(1)   // cast rank '0'
 
    just use the SWIG_AddCast()/SWIG_CheckState()
 */
 
-#define SWIG_OK                    (0) 
+#define SWIG_OK                    (0)
 #define SWIG_ERROR                 (-1)
 #define SWIG_IsOK(r)               (r >= 0)
-#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)  
+#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)
 
 /* The CastRankLimit says how many bits are used for the cast rank */
 #define SWIG_CASTRANKLIMIT         (1 << 8)
@@ -391,14 +391,14 @@
 #  endif
 #  define SWIG_CASTRANKMASK          ((SWIG_CASTRANKLIMIT) -1)
 #  define SWIG_CastRank(r)           (r & SWIG_CASTRANKMASK)
-SWIGINTERNINLINE int SWIG_AddCast(int r) { 
+SWIGINTERNINLINE int SWIG_AddCast(int r) {
   return SWIG_IsOK(r) ? ((SWIG_CastRank(r) < SWIG_MAXCASTRANK) ? (r + 1) : SWIG_ERROR) : r;
 }
-SWIGINTERNINLINE int SWIG_CheckState(int r) { 
-  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0; 
+SWIGINTERNINLINE int SWIG_CheckState(int r) {
+  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0;
 }
 #else /* no cast-rank mode */
-#  define SWIG_AddCast
+#  define SWIG_AddCast(r) (r)
 #  define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0)
 #endif
 
@@ -442,7 +442,7 @@ typedef struct swig_module_info {
   void                    *clientdata;		/* Language specific module data */
 } swig_module_info;
 
-/* 
+/*
   Compare two type names skipping the space characters, therefore
   "char*" == "char *" and "Class<int>" == "Class<int >", etc.
 
@@ -462,18 +462,18 @@ SWIG_TypeNameComp(const char *f1, const char *l1,
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if not equal, 1 if equal
+  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
 */
 SWIGRUNTIME int
-SWIG_TypeEquiv(const char *nb, const char *tb) {
-  int equiv = 0;
+SWIG_TypeCmp(const char *nb, const char *tb) {
+  int equiv = 1;
   const char* te = tb + strlen(tb);
   const char* ne = nb;
-  while (!equiv && *ne) {
+  while (equiv != 0 && *ne) {
     for (nb = ne; *ne; ++ne) {
       if (*ne == '|') break;
     }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
+    equiv = SWIG_TypeNameComp(nb, ne, tb, te);
     if (*ne) ++ne;
   }
   return equiv;
@@ -481,24 +481,13 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
+  Return 0 if not equal, 1 if equal
 */
 SWIGRUNTIME int
-SWIG_TypeCompare(const char *nb, const char *tb) {
-  int equiv = 0;
-  const char* te = tb + strlen(tb);
-  const char* ne = nb;
-  while (!equiv && *ne) {
-    for (nb = ne; *ne; ++ne) {
-      if (*ne == '|') break;
-    }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
-    if (*ne) ++ne;
-  }
-  return equiv;
+SWIG_TypeEquiv(const char *nb, const char *tb) {
+  return SWIG_TypeCmp(nb, tb) == 0 ? 1 : 0;
 }
 
-
 /*
   Check the typename
 */
@@ -526,7 +515,7 @@ SWIG_TypeCheck(const char *c, swig_type_info *ty) {
   return 0;
 }
 
-/* 
+/*
   Identical to SWIG_TypeCheck, except strcmp is replaced with a pointer comparison
 */
 SWIGRUNTIME swig_cast_info *
@@ -561,7 +550,7 @@ SWIG_TypeCast(swig_cast_info *ty, void *ptr, int *newmemory) {
   return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr, newmemory);
 }
 
-/* 
+/*
    Dynamic pointer casting. Down an inheritance hierarchy
 */
 SWIGRUNTIME swig_type_info *
@@ -605,7 +594,7 @@ SWIG_TypePrettyName(const swig_type_info *type) {
     return type->name;
 }
 
-/* 
+/*
    Set the clientdata field for a type
 */
 SWIGRUNTIME void
@@ -613,14 +602,14 @@ SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
   swig_cast_info *cast = ti->cast;
   /* if (ti->clientdata == clientdata) return; */
   ti->clientdata = clientdata;
-  
+
   while (cast) {
     if (!cast->converter) {
       swig_type_info *tc = cast->type;
       if (!tc->clientdata) {
 	SWIG_TypeClientData(tc, clientdata);
       }
-    }    
+    }
     cast = cast->next;
   }
 }
@@ -629,18 +618,18 @@ SWIG_TypeNewClientData(swig_type_info *ti, void *clientdata) {
   SWIG_TypeClientData(ti, clientdata);
   ti->owndata = 1;
 }
-  
+
 /*
   Search for a swig_type_info structure only by mangled name
   Search is a O(log #types)
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_MangledTypeQueryModule(swig_module_info *start, 
-                            swig_module_info *end, 
+SWIG_MangledTypeQueryModule(swig_module_info *start,
+                            swig_module_info *end,
 		            const char *name) {
   swig_module_info *iter = start;
   do {
@@ -649,11 +638,11 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
       register size_t r = iter->size - 1;
       do {
 	/* since l+r >= 0, we can (>> 1) instead (/ 2) */
-	register size_t i = (l + r) >> 1; 
+	register size_t i = (l + r) >> 1;
 	const char *iname = iter->types[i]->name;
 	if (iname) {
 	  register int compare = strcmp(name, iname);
-	  if (compare == 0) {	    
+	  if (compare == 0) {
 	    return iter->types[i];
 	  } else if (compare < 0) {
 	    if (i) {
@@ -678,14 +667,14 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
   Search for a swig_type_info structure for either a mangled name or a human readable name.
   It first searches the mangled names of the types, which is a O(log #types)
   If a type is not found it then searches the human readable names, which is O(#types).
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_TypeQueryModule(swig_module_info *start, 
-                     swig_module_info *end, 
+SWIG_TypeQueryModule(swig_module_info *start,
+                     swig_module_info *end,
 		     const char *name) {
   /* STEP 1: Search the name field using binary search */
   swig_type_info *ret = SWIG_MangledTypeQueryModule(start, end, name);
@@ -704,12 +693,12 @@ SWIG_TypeQueryModule(swig_module_info *start,
       iter = iter->next;
     } while (iter != end);
   }
-  
+
   /* neither found a match */
   return 0;
 }
 
-/* 
+/*
    Pack binary data into a string
 */
 SWIGRUNTIME char *
@@ -725,7 +714,7 @@ SWIG_PackData(char *c, void *ptr, size_t sz) {
   return c;
 }
 
-/* 
+/*
    Unpack binary data from a string
 */
 SWIGRUNTIME const char *
@@ -739,21 +728,21 @@ SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
       uu = ((d - '0') << 4);
     else if ((d >= 'a') && (d <= 'f'))
       uu = ((d - ('a'-10)) << 4);
-    else 
+    else
       return (char *) 0;
     d = *(c++);
     if ((d >= '0') && (d <= '9'))
       uu |= (d - '0');
     else if ((d >= 'a') && (d <= 'f'))
       uu |= (d - ('a'-10));
-    else 
+    else
       return (char *) 0;
     *u = uu;
   }
   return c;
 }
 
-/* 
+/*
    Pack 'void *' into a string buffer.
 */
 SWIGRUNTIME char *
@@ -813,18 +802,18 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 #endif
 
 /*  Errors in SWIG */
-#define  SWIG_UnknownError    	   -1 
-#define  SWIG_IOError        	   -2 
-#define  SWIG_RuntimeError   	   -3 
-#define  SWIG_IndexError     	   -4 
-#define  SWIG_TypeError      	   -5 
-#define  SWIG_DivisionByZero 	   -6 
-#define  SWIG_OverflowError  	   -7 
-#define  SWIG_SyntaxError    	   -8 
-#define  SWIG_ValueError     	   -9 
+#define  SWIG_UnknownError    	   -1
+#define  SWIG_IOError        	   -2
+#define  SWIG_RuntimeError   	   -3
+#define  SWIG_IndexError     	   -4
+#define  SWIG_TypeError      	   -5
+#define  SWIG_DivisionByZero 	   -6
+#define  SWIG_OverflowError  	   -7
+#define  SWIG_SyntaxError    	   -8
+#define  SWIG_ValueError     	   -9
 #define  SWIG_SystemError    	   -10
 #define  SWIG_AttributeError 	   -11
-#define  SWIG_MemoryError    	   -12 
+#define  SWIG_MemoryError    	   -12
 #define  SWIG_NullReferenceError   -13
 
 
@@ -1750,7 +1739,7 @@ SWIG_Ruby_SetModule(swig_module_info *pointer)
 SWIGINTERN
 int SWIG_Ruby_isCallable( VALUE proc )
 {
-  if ( rb_respond_to( proc, swig_call_id ) == Qtrue )
+  if ( rb_respond_to( proc, swig_call_id ) )
     return 1;
   return 0;
 }
@@ -1763,7 +1752,7 @@ int SWIG_Ruby_isCallable( VALUE proc )
 SWIGINTERN
 int SWIG_Ruby_arity( VALUE proc, int minimal )
 {
-  if ( rb_respond_to( proc, swig_arity_id ) == Qtrue )
+  if ( rb_respond_to( proc, swig_arity_id ) )
     {
       VALUE num = rb_funcall( proc, swig_arity_id, 0 );
       int arity = NUM2INT(num);
@@ -1804,145 +1793,149 @@ int SWIG_Ruby_arity( VALUE proc, int minimal )
 #define SWIGTYPE_p_f_int_p_apr_pool_t_p_apr_hash_t__p_svn_error_t swig_types[9]
 #define SWIGTYPE_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[10]
 #define SWIGTYPE_p_f_p_p_apr_file_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[11]
-#define SWIGTYPE_p_f_p_p_void_p_q_const__char_p_q_const__svn_ra_callbacks_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[12]
-#define SWIGTYPE_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[13]
-#define SWIGTYPE_p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[14]
-#define SWIGTYPE_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t swig_types[15]
-#define SWIGTYPE_p_f_p_void__p_svn_error_t swig_types[16]
-#define SWIGTYPE_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[17]
-#define SWIGTYPE_p_f_p_void_p_apr_pool_t__p_svn_error_t swig_types[18]
-#define SWIGTYPE_p_f_p_void_p_p_apr_hash_t_p_q_const__char_svn_revnum_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[19]
-#define SWIGTYPE_p_f_p_void_p_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[20]
-#define SWIGTYPE_p_f_p_void_p_p_q_const__svn_delta_editor_t_p_p_void_p_q_const__char_svn_commit_callback_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[21]
-#define SWIGTYPE_p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_p_q_const__char_svn_revnum_t_svn_boolean_t_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[22]
-#define SWIGTYPE_p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_p_q_const__char_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[23]
-#define SWIGTYPE_p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[24]
-#define SWIGTYPE_p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[25]
-#define SWIGTYPE_p_f_p_void_p_p_svn_stream_t_p_q_const__svn_checksum_t_p_apr_pool_t__p_svn_error_t swig_types[26]
-#define SWIGTYPE_p_f_p_void_p_q_const__apr_array_header_t_svn_revnum_t_svn_revnum_t_svn_boolean_t_svn_boolean_t_svn_log_message_receiver_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[27]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[28]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[29]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t swig_types[30]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t swig_types[31]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__char_svn_revnum_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[32]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__char_svn_revnum_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[33]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__char_svn_revnum_t_svn_depth_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[34]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_boolean_t_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t swig_types[35]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[36]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[37]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_p_apr_hash_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[38]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_node_kind_t_p_apr_pool_t__p_svn_error_t swig_types[39]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_stream_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[40]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[41]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[42]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_svn_depth_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[43]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_svn_revnum_t_svn_ra_file_rev_handler_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[44]
-#define SWIGTYPE_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t swig_types[45]
-#define SWIGTYPE_p_f_p_void_p_svn_revnum_t__p_svn_error_t swig_types[46]
-#define SWIGTYPE_p_f_p_void_p_svn_revnum_t_apr_time_t_p_apr_pool_t__p_svn_error_t swig_types[47]
-#define SWIGTYPE_p_f_p_void_p_svn_revnum_t_p_apr_pool_t__p_svn_error_t swig_types[48]
-#define SWIGTYPE_p_f_p_void_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[49]
-#define SWIGTYPE_p_f_p_void_svn_revnum_t_p_q_const__char_p_p_svn_string_t_p_apr_pool_t__p_svn_error_t swig_types[50]
-#define SWIGTYPE_p_f_p_void_svn_revnum_t_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t swig_types[51]
-#define SWIGTYPE_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t swig_types[52]
-#define SWIGTYPE_p_f_svn_revnum_t_p_void_p_p_q_const__svn_delta_editor_t_p_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[53]
-#define SWIGTYPE_p_f_svn_revnum_t_p_void_p_q_const__svn_delta_editor_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[54]
-#define SWIGTYPE_p_f_void__p_svn_version_t swig_types[55]
-#define SWIGTYPE_p_int swig_types[56]
-#define SWIGTYPE_p_long swig_types[57]
-#define SWIGTYPE_p_p_apr_array_header_t swig_types[58]
-#define SWIGTYPE_p_p_apr_file_t swig_types[59]
-#define SWIGTYPE_p_p_apr_hash_t swig_types[60]
-#define SWIGTYPE_p_p_char swig_types[61]
-#define SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t swig_types[62]
-#define SWIGTYPE_p_p_svn_delta_editor_t swig_types[63]
-#define SWIGTYPE_p_p_svn_dirent_t swig_types[64]
-#define SWIGTYPE_p_p_svn_lock_t swig_types[65]
-#define SWIGTYPE_p_p_svn_ra_callbacks2_t swig_types[66]
-#define SWIGTYPE_p_p_svn_ra_plugin_t swig_types[67]
-#define SWIGTYPE_p_p_svn_ra_reporter2_t swig_types[68]
-#define SWIGTYPE_p_p_svn_ra_reporter3_t swig_types[69]
-#define SWIGTYPE_p_p_svn_ra_reporter_t swig_types[70]
-#define SWIGTYPE_p_p_svn_ra_session_t swig_types[71]
-#define SWIGTYPE_p_p_svn_stream_t swig_types[72]
-#define SWIGTYPE_p_p_svn_string_t swig_types[73]
-#define SWIGTYPE_p_p_svn_stringbuf_t swig_types[74]
-#define SWIGTYPE_p_p_void swig_types[75]
-#define SWIGTYPE_p_svn_auth_baton_t swig_types[76]
-#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[77]
-#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[78]
-#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[79]
-#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[80]
-#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[81]
-#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[82]
-#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[83]
-#define SWIGTYPE_p_svn_auth_provider_t swig_types[84]
-#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[85]
-#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[86]
-#define SWIGTYPE_p_svn_checksum_kind_t swig_types[87]
-#define SWIGTYPE_p_svn_checksum_t swig_types[88]
-#define SWIGTYPE_p_svn_commit_info_t swig_types[89]
-#define SWIGTYPE_p_svn_config_t swig_types[90]
-#define SWIGTYPE_p_svn_delta_editor_t swig_types[91]
-#define SWIGTYPE_p_svn_depth_t swig_types[92]
-#define SWIGTYPE_p_svn_diff_conflict_display_style_t swig_types[93]
-#define SWIGTYPE_p_svn_diff_datasource_e swig_types[94]
-#define SWIGTYPE_p_svn_diff_file_ignore_space_t swig_types[95]
-#define SWIGTYPE_p_svn_diff_file_options_t swig_types[96]
-#define SWIGTYPE_p_svn_diff_fns2_t swig_types[97]
-#define SWIGTYPE_p_svn_diff_fns_t swig_types[98]
-#define SWIGTYPE_p_svn_diff_hunk_t swig_types[99]
-#define SWIGTYPE_p_svn_diff_operation_kind_e swig_types[100]
-#define SWIGTYPE_p_svn_diff_output_fns_t swig_types[101]
-#define SWIGTYPE_p_svn_diff_t swig_types[102]
-#define SWIGTYPE_p_svn_dirent_t swig_types[103]
-#define SWIGTYPE_p_svn_errno_t swig_types[104]
-#define SWIGTYPE_p_svn_error_t swig_types[105]
-#define SWIGTYPE_p_svn_io_dirent2_t swig_types[106]
-#define SWIGTYPE_p_svn_io_dirent_t swig_types[107]
-#define SWIGTYPE_p_svn_io_file_del_t swig_types[108]
-#define SWIGTYPE_p_svn_location_segment_t swig_types[109]
-#define SWIGTYPE_p_svn_lock_t swig_types[110]
-#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[111]
-#define SWIGTYPE_p_svn_log_changed_path_t swig_types[112]
-#define SWIGTYPE_p_svn_log_entry_t swig_types[113]
-#define SWIGTYPE_p_svn_merge_range_t swig_types[114]
-#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[115]
-#define SWIGTYPE_p_svn_node_kind_t swig_types[116]
-#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[117]
-#define SWIGTYPE_p_svn_opt_revision_t swig_types[118]
-#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[119]
-#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[120]
-#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[121]
-#define SWIGTYPE_p_svn_patch_file_t swig_types[122]
-#define SWIGTYPE_p_svn_patch_t swig_types[123]
-#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[124]
-#define SWIGTYPE_p_svn_prop_kind swig_types[125]
-#define SWIGTYPE_p_svn_prop_patch_t swig_types[126]
-#define SWIGTYPE_p_svn_ra_callbacks2_t swig_types[127]
-#define SWIGTYPE_p_svn_ra_callbacks_t swig_types[128]
-#define SWIGTYPE_p_svn_ra_plugin_t swig_types[129]
-#define SWIGTYPE_p_svn_ra_reporter2_t swig_types[130]
-#define SWIGTYPE_p_svn_ra_reporter3_t swig_types[131]
-#define SWIGTYPE_p_svn_ra_reporter_t swig_types[132]
-#define SWIGTYPE_p_svn_ra_session_t swig_types[133]
-#define SWIGTYPE_p_svn_stream_mark_t swig_types[134]
-#define SWIGTYPE_p_svn_stream_t swig_types[135]
-#define SWIGTYPE_p_svn_string_t swig_types[136]
-#define SWIGTYPE_p_svn_stringbuf_t swig_types[137]
-#define SWIGTYPE_p_svn_tristate_t swig_types[138]
-#define SWIGTYPE_p_svn_txdelta_op_t swig_types[139]
-#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[140]
-#define SWIGTYPE_p_svn_txdelta_window_t swig_types[141]
-#define SWIGTYPE_p_svn_version_checklist_t swig_types[142]
-#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[143]
-#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[144]
-#define SWIGTYPE_p_svn_version_extended_t swig_types[145]
-#define SWIGTYPE_p_svn_version_t swig_types[146]
-#define SWIGTYPE_p_unsigned_long swig_types[147]
-#define SWIGTYPE_p_void swig_types[148]
-static swig_type_info *swig_types[150];
-static swig_module_info swig_module = {swig_types, 149, 0, 0, 0, 0};
+#define SWIGTYPE_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[12]
+#define SWIGTYPE_p_f_p_p_void_p_q_const__char_p_q_const__svn_ra_callbacks_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[13]
+#define SWIGTYPE_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[14]
+#define SWIGTYPE_p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[15]
+#define SWIGTYPE_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t swig_types[16]
+#define SWIGTYPE_p_f_p_void__p_svn_error_t swig_types[17]
+#define SWIGTYPE_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[18]
+#define SWIGTYPE_p_f_p_void_p_apr_pool_t__p_svn_error_t swig_types[19]
+#define SWIGTYPE_p_f_p_void_p_p_apr_hash_t_p_q_const__char_svn_revnum_t_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[20]
+#define SWIGTYPE_p_f_p_void_p_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[21]
+#define SWIGTYPE_p_f_p_void_p_p_q_const__svn_delta_editor_t_p_p_void_p_q_const__char_svn_commit_callback_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[22]
+#define SWIGTYPE_p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_p_q_const__char_svn_revnum_t_svn_boolean_t_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[23]
+#define SWIGTYPE_p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_p_q_const__char_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[24]
+#define SWIGTYPE_p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[25]
+#define SWIGTYPE_p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[26]
+#define SWIGTYPE_p_f_p_void_p_p_svn_stream_t_p_q_const__svn_checksum_t_p_apr_pool_t__p_svn_error_t swig_types[27]
+#define SWIGTYPE_p_f_p_void_p_q_const__apr_array_header_t_svn_revnum_t_svn_revnum_t_svn_boolean_t_svn_boolean_t_svn_log_message_receiver_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[28]
+#define SWIGTYPE_p_f_p_void_p_q_const__char__int swig_types[29]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[30]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[31]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t swig_types[32]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t swig_types[33]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__char_svn_revnum_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[34]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__char_svn_revnum_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[35]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__char_svn_revnum_t_svn_depth_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[36]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_boolean_t_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t swig_types[37]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[38]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[39]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_p_apr_hash_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[40]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_node_kind_t_p_apr_pool_t__p_svn_error_t swig_types[41]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_svn_stream_t_p_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[42]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[43]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[44]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_svn_depth_t_svn_boolean_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[45]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_svn_revnum_t_svn_ra_file_rev_handler_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[46]
+#define SWIGTYPE_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t swig_types[47]
+#define SWIGTYPE_p_f_p_void_p_svn_revnum_t__p_svn_error_t swig_types[48]
+#define SWIGTYPE_p_f_p_void_p_svn_revnum_t_apr_time_t_p_apr_pool_t__p_svn_error_t swig_types[49]
+#define SWIGTYPE_p_f_p_void_p_svn_revnum_t_p_apr_pool_t__p_svn_error_t swig_types[50]
+#define SWIGTYPE_p_f_p_void_p_void__void swig_types[51]
+#define SWIGTYPE_p_f_p_void_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[52]
+#define SWIGTYPE_p_f_p_void_svn_revnum_t_p_q_const__char_p_p_svn_string_t_p_apr_pool_t__p_svn_error_t swig_types[53]
+#define SWIGTYPE_p_f_p_void_svn_revnum_t_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t swig_types[54]
+#define SWIGTYPE_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t swig_types[55]
+#define SWIGTYPE_p_f_svn_revnum_t_p_void_p_p_q_const__svn_delta_editor_t_p_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[56]
+#define SWIGTYPE_p_f_svn_revnum_t_p_void_p_q_const__svn_delta_editor_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[57]
+#define SWIGTYPE_p_f_void__p_svn_version_t swig_types[58]
+#define SWIGTYPE_p_int swig_types[59]
+#define SWIGTYPE_p_long swig_types[60]
+#define SWIGTYPE_p_p_apr_array_header_t swig_types[61]
+#define SWIGTYPE_p_p_apr_file_t swig_types[62]
+#define SWIGTYPE_p_p_apr_hash_t swig_types[63]
+#define SWIGTYPE_p_p_char swig_types[64]
+#define SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t swig_types[65]
+#define SWIGTYPE_p_p_f_p_void_p_void__void swig_types[66]
+#define SWIGTYPE_p_p_svn_delta_editor_t swig_types[67]
+#define SWIGTYPE_p_p_svn_dirent_t swig_types[68]
+#define SWIGTYPE_p_p_svn_lock_t swig_types[69]
+#define SWIGTYPE_p_p_svn_ra_callbacks2_t swig_types[70]
+#define SWIGTYPE_p_p_svn_ra_plugin_t swig_types[71]
+#define SWIGTYPE_p_p_svn_ra_reporter2_t swig_types[72]
+#define SWIGTYPE_p_p_svn_ra_reporter3_t swig_types[73]
+#define SWIGTYPE_p_p_svn_ra_reporter_t swig_types[74]
+#define SWIGTYPE_p_p_svn_ra_session_t swig_types[75]
+#define SWIGTYPE_p_p_svn_stream_t swig_types[76]
+#define SWIGTYPE_p_p_svn_string_t swig_types[77]
+#define SWIGTYPE_p_p_svn_stringbuf_t swig_types[78]
+#define SWIGTYPE_p_p_void swig_types[79]
+#define SWIGTYPE_p_svn_auth_baton_t swig_types[80]
+#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[81]
+#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[82]
+#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[83]
+#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[84]
+#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[85]
+#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[86]
+#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[87]
+#define SWIGTYPE_p_svn_auth_provider_t swig_types[88]
+#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[89]
+#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[90]
+#define SWIGTYPE_p_svn_checksum_kind_t swig_types[91]
+#define SWIGTYPE_p_svn_checksum_t swig_types[92]
+#define SWIGTYPE_p_svn_commit_info_t swig_types[93]
+#define SWIGTYPE_p_svn_config_t swig_types[94]
+#define SWIGTYPE_p_svn_delta_editor_t swig_types[95]
+#define SWIGTYPE_p_svn_depth_t swig_types[96]
+#define SWIGTYPE_p_svn_diff_conflict_display_style_t swig_types[97]
+#define SWIGTYPE_p_svn_diff_datasource_e swig_types[98]
+#define SWIGTYPE_p_svn_diff_file_ignore_space_t swig_types[99]
+#define SWIGTYPE_p_svn_diff_file_options_t swig_types[100]
+#define SWIGTYPE_p_svn_diff_fns2_t swig_types[101]
+#define SWIGTYPE_p_svn_diff_fns_t swig_types[102]
+#define SWIGTYPE_p_svn_diff_hunk_t swig_types[103]
+#define SWIGTYPE_p_svn_diff_operation_kind_e swig_types[104]
+#define SWIGTYPE_p_svn_diff_output_fns_t swig_types[105]
+#define SWIGTYPE_p_svn_diff_t swig_types[106]
+#define SWIGTYPE_p_svn_dirent_t swig_types[107]
+#define SWIGTYPE_p_svn_errno_t swig_types[108]
+#define SWIGTYPE_p_svn_error_t swig_types[109]
+#define SWIGTYPE_p_svn_io_dirent2_t swig_types[110]
+#define SWIGTYPE_p_svn_io_dirent_t swig_types[111]
+#define SWIGTYPE_p_svn_io_file_del_t swig_types[112]
+#define SWIGTYPE_p_svn_location_segment_t swig_types[113]
+#define SWIGTYPE_p_svn_lock_t swig_types[114]
+#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[115]
+#define SWIGTYPE_p_svn_log_changed_path_t swig_types[116]
+#define SWIGTYPE_p_svn_log_entry_t swig_types[117]
+#define SWIGTYPE_p_svn_merge_range_t swig_types[118]
+#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[119]
+#define SWIGTYPE_p_svn_node_kind_t swig_types[120]
+#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[121]
+#define SWIGTYPE_p_svn_opt_revision_t swig_types[122]
+#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[123]
+#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[124]
+#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[125]
+#define SWIGTYPE_p_svn_patch_file_t swig_types[126]
+#define SWIGTYPE_p_svn_patch_t swig_types[127]
+#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[128]
+#define SWIGTYPE_p_svn_prop_kind swig_types[129]
+#define SWIGTYPE_p_svn_prop_patch_t swig_types[130]
+#define SWIGTYPE_p_svn_ra_callbacks2_t swig_types[131]
+#define SWIGTYPE_p_svn_ra_callbacks_t swig_types[132]
+#define SWIGTYPE_p_svn_ra_plugin_t swig_types[133]
+#define SWIGTYPE_p_svn_ra_reporter2_t swig_types[134]
+#define SWIGTYPE_p_svn_ra_reporter3_t swig_types[135]
+#define SWIGTYPE_p_svn_ra_reporter_t swig_types[136]
+#define SWIGTYPE_p_svn_ra_session_t swig_types[137]
+#define SWIGTYPE_p_svn_stream_mark_t swig_types[138]
+#define SWIGTYPE_p_svn_stream_t swig_types[139]
+#define SWIGTYPE_p_svn_string_t swig_types[140]
+#define SWIGTYPE_p_svn_stringbuf_t swig_types[141]
+#define SWIGTYPE_p_svn_tristate_t swig_types[142]
+#define SWIGTYPE_p_svn_txdelta_op_t swig_types[143]
+#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[144]
+#define SWIGTYPE_p_svn_txdelta_window_t swig_types[145]
+#define SWIGTYPE_p_svn_version_checklist_t swig_types[146]
+#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[147]
+#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[148]
+#define SWIGTYPE_p_svn_version_extended_t swig_types[149]
+#define SWIGTYPE_p_svn_version_t swig_types[150]
+#define SWIGTYPE_p_unsigned_long swig_types[151]
+#define SWIGTYPE_p_void swig_types[152]
+static swig_type_info *swig_types[154];
+static swig_module_info swig_module = {swig_types, 153, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
@@ -1957,7 +1950,7 @@ static VALUE mRa;
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x020009 
+#define SWIGVERSION 0x020012 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -2079,7 +2072,7 @@ SWIG_ruby_failed(void)
 } 
 
 
-/*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2124,7 +2117,7 @@ SWIG_AsVal_int (VALUE obj, int *val)
 }
 
 
-/*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2429,6 +2422,21 @@ static svn_error_t * svn_ra_invoke_replay_revfinish_callback(
   return _obj(revision, replay_baton, editor, edit_baton, rev_props, pool);
 }
 
+static svn_boolean_t svn_ra_invoke_check_tunnel_func(
+  svn_ra_check_tunnel_func_t _obj, void *tunnel_baton, const char *tunnel_name) {
+  return _obj(tunnel_baton, tunnel_name);
+}
+
+static void svn_ra_invoke_close_tunnel_func(
+  svn_ra_close_tunnel_func_t _obj, void *close_baton, void *tunnel_baton) {
+  _obj(close_baton, tunnel_baton);
+}
+
+static svn_error_t * svn_ra_invoke_open_tunnel_func(
+  svn_ra_open_tunnel_func_t _obj, svn_stream_t **request, svn_stream_t **response, svn_ra_close_tunnel_func_t *close_func, void **close_baton, void *tunnel_baton, const char *tunnel_name, const char *user, const char *hostname, int port, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *pool) {
+  return _obj(request, response, close_func, close_baton, tunnel_baton, tunnel_name, user, hostname, port, cancel_func, cancel_baton, pool);
+}
+
 static svn_error_t * svn_ra_invoke_init_func(
   svn_ra_init_func_t _obj, int abi_version, apr_pool_t *pool, apr_hash_t *hash) {
   return _obj(abi_version, pool, hash);
@@ -3942,6 +3950,161 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_svn_ra_callbacks2_t_check_tunnel_func_set(int argc, VALUE *argv, VALUE self) {
+  struct svn_ra_callbacks2_t *arg1 = (struct svn_ra_callbacks2_t *) 0 ;
+  svn_ra_check_tunnel_func_t arg2 = (svn_ra_check_tunnel_func_t) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_ra_callbacks2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_ra_callbacks2_t *","check_tunnel_func", 1, self )); 
+  }
+  arg1 = (struct svn_ra_callbacks2_t *)(argp1);
+  {
+    int res = SWIG_ConvertFunctionPtr(argv[0], (void**)(&arg2), SWIGTYPE_p_f_p_void_p_q_const__char__int);
+    if (!SWIG_IsOK(res)) {
+      SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_ra_check_tunnel_func_t","check_tunnel_func", 2, argv[0] )); 
+    }
+  }
+  if (arg1) (arg1)->check_tunnel_func = arg2;
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_svn_ra_callbacks2_t_check_tunnel_func_get(int argc, VALUE *argv, VALUE self) {
+  struct svn_ra_callbacks2_t *arg1 = (struct svn_ra_callbacks2_t *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  svn_ra_check_tunnel_func_t result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_ra_callbacks2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_ra_callbacks2_t *","check_tunnel_func", 1, self )); 
+  }
+  arg1 = (struct svn_ra_callbacks2_t *)(argp1);
+  result = (svn_ra_check_tunnel_func_t) ((arg1)->check_tunnel_func);
+  vresult = SWIG_NewFunctionPtrObj((void *)(result), SWIGTYPE_p_f_p_void_p_q_const__char__int);
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_svn_ra_callbacks2_t_open_tunnel_func_set(int argc, VALUE *argv, VALUE self) {
+  struct svn_ra_callbacks2_t *arg1 = (struct svn_ra_callbacks2_t *) 0 ;
+  svn_ra_open_tunnel_func_t arg2 = (svn_ra_open_tunnel_func_t) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_ra_callbacks2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_ra_callbacks2_t *","open_tunnel_func", 1, self )); 
+  }
+  arg1 = (struct svn_ra_callbacks2_t *)(argp1);
+  {
+    int res = SWIG_ConvertFunctionPtr(argv[0], (void**)(&arg2), SWIGTYPE_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t);
+    if (!SWIG_IsOK(res)) {
+      SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_ra_open_tunnel_func_t","open_tunnel_func", 2, argv[0] )); 
+    }
+  }
+  if (arg1) (arg1)->open_tunnel_func = arg2;
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_svn_ra_callbacks2_t_open_tunnel_func_get(int argc, VALUE *argv, VALUE self) {
+  struct svn_ra_callbacks2_t *arg1 = (struct svn_ra_callbacks2_t *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  svn_ra_open_tunnel_func_t result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_ra_callbacks2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_ra_callbacks2_t *","open_tunnel_func", 1, self )); 
+  }
+  arg1 = (struct svn_ra_callbacks2_t *)(argp1);
+  result = (svn_ra_open_tunnel_func_t) ((arg1)->open_tunnel_func);
+  vresult = SWIG_NewFunctionPtrObj((void *)(result), SWIGTYPE_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t);
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_svn_ra_callbacks2_t_tunnel_baton_set(int argc, VALUE *argv, VALUE self) {
+  struct svn_ra_callbacks2_t *arg1 = (struct svn_ra_callbacks2_t *) 0 ;
+  void *arg2 = (void *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int res2 ;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_ra_callbacks2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_ra_callbacks2_t *","tunnel_baton", 1, self )); 
+  }
+  arg1 = (struct svn_ra_callbacks2_t *)(argp1);
+  res2 = SWIG_ConvertPtr(argv[0],SWIG_as_voidptrptr(&arg2), 0, SWIG_POINTER_DISOWN);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "void *","tunnel_baton", 2, argv[0] )); 
+  }
+  if (arg1) (arg1)->tunnel_baton = arg2;
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_svn_ra_callbacks2_t_tunnel_baton_get(int argc, VALUE *argv, VALUE self) {
+  struct svn_ra_callbacks2_t *arg1 = (struct svn_ra_callbacks2_t *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_ra_callbacks2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_ra_callbacks2_t *","tunnel_baton", 1, self )); 
+  }
+  arg1 = (struct svn_ra_callbacks2_t *)(argp1);
+  result = (void *) ((arg1)->tunnel_baton);
+  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 |  0 );
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
 SWIGINTERN VALUE
 _wrap_svn_ra_callbacks2_t_allocate(VALUE self) {
@@ -7806,7 +7969,7 @@ _wrap_svn_ra_get_log2(int argc, VALUE *argv, VALUE self) {
     svn_swig_rb_strings_to_apr_array(argv[8], _global_pool);
   }
   {
-    arg10 = svn_swig_rb_log_entry_receiver;
+    arg10 = (svn_log_entry_receiver_t) svn_swig_rb_log_entry_receiver;
     arg11 = (void *)svn_swig_rb_make_baton(argv[9], _global_svn_swig_rb_pool);
   }
   if (argc > 10) {
@@ -7905,7 +8068,7 @@ _wrap_svn_ra_get_log(int argc, VALUE *argv, VALUE self) {
   arg6 = RTEST(argv[5]);
   arg7 = RTEST(argv[6]);
   {
-    arg8 = svn_swig_rb_log_receiver;
+    arg8 = (svn_log_message_receiver_t) svn_swig_rb_log_receiver;
     arg9 = (void *)svn_swig_rb_make_baton(argv[7], _global_svn_swig_rb_pool);
   }
   if (argc > 8) {
@@ -8759,7 +8922,7 @@ _wrap_svn_ra_get_file_revs(int argc, VALUE *argv, VALUE self) {
   } 
   arg4 = (svn_revnum_t)(val4);
   {
-    arg5 = svn_swig_rb_ra_file_rev_handler;
+    arg5 = (svn_ra_file_rev_handler_t) svn_swig_rb_ra_file_rev_handler;
     arg6 = (void *)svn_swig_rb_make_baton(argv[4], _global_svn_swig_rb_pool);
   }
   if (argc > 5) {
@@ -8842,7 +9005,7 @@ _wrap_svn_ra_lock(int argc, VALUE *argv, VALUE self) {
   }
   arg4 = RTEST(argv[3]);
   {
-    arg5 = svn_swig_rb_ra_lock_callback;
+    arg5 = (svn_ra_lock_callback_t) svn_swig_rb_ra_lock_callback;
     arg6 = (void *)svn_swig_rb_make_baton(argv[4], _global_svn_swig_rb_pool);
   }
   if (argc > 5) {
@@ -8915,7 +9078,7 @@ _wrap_svn_ra_unlock(int argc, VALUE *argv, VALUE self) {
   }
   arg3 = RTEST(argv[2]);
   {
-    arg4 = svn_swig_rb_ra_lock_callback;
+    arg4 = (svn_ra_lock_callback_t) svn_swig_rb_ra_lock_callback;
     arg5 = (void *)svn_swig_rb_make_baton(argv[3], _global_svn_swig_rb_pool);
   }
   if (argc > 4) {
@@ -13950,7 +14113,7 @@ _wrap_svn_ra_plugin_invoke_get_log(int argc, VALUE *argv, VALUE self) {
   arg6 = RTEST(argv[5]);
   arg7 = RTEST(argv[6]);
   {
-    arg8 = svn_swig_rb_log_receiver;
+    arg8 = (svn_log_message_receiver_t) svn_swig_rb_log_receiver;
     arg9 = (void *)svn_swig_rb_make_baton(argv[7], _global_svn_swig_rb_pool);
   }
   if (argc > 8) {
@@ -14394,7 +14557,7 @@ _wrap_svn_ra_plugin_invoke_get_file_revs(int argc, VALUE *argv, VALUE self) {
   } 
   arg5 = (svn_revnum_t)(val5);
   {
-    arg6 = svn_swig_rb_ra_file_rev_handler;
+    arg6 = (svn_ra_file_rev_handler_t) svn_swig_rb_ra_file_rev_handler;
     arg7 = (void *)svn_swig_rb_make_baton(argv[5], _global_svn_swig_rb_pool);
   }
   if (argc > 6) {
@@ -15519,6 +15682,240 @@ fail:
 
 
 SWIGINTERN VALUE
+_wrap_svn_ra_invoke_check_tunnel_func(int argc, VALUE *argv, VALUE self) {
+  svn_ra_check_tunnel_func_t arg1 = (svn_ra_check_tunnel_func_t) 0 ;
+  void *arg2 = (void *) 0 ;
+  char *arg3 = (char *) 0 ;
+  int res2 ;
+  int res3 ;
+  char *buf3 = 0 ;
+  int alloc3 = 0 ;
+  svn_boolean_t result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 3) || (argc > 3)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail;
+  }
+  {
+    int res = SWIG_ConvertFunctionPtr(argv[0], (void**)(&arg1), SWIGTYPE_p_f_p_void_p_q_const__char__int);
+    if (!SWIG_IsOK(res)) {
+      SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_ra_check_tunnel_func_t","svn_ra_invoke_check_tunnel_func", 1, argv[0] )); 
+    }
+  }
+  res2 = SWIG_ConvertPtr(argv[1],SWIG_as_voidptrptr(&arg2), 0, 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "void *","svn_ra_invoke_check_tunnel_func", 2, argv[1] )); 
+  }
+  res3 = SWIG_AsCharPtrAndSize(argv[2], &buf3, NULL, &alloc3);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "char const *","svn_ra_invoke_check_tunnel_func", 3, argv[2] ));
+  }
+  arg3 = (char *)(buf3);
+  {
+    result = (svn_boolean_t)svn_ra_invoke_check_tunnel_func(arg1,arg2,(char const *)arg3);
+    
+    
+    
+  }
+  vresult = result ? Qtrue : Qfalse;
+  if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+  return vresult;
+fail:
+  if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_svn_ra_invoke_close_tunnel_func(int argc, VALUE *argv, VALUE self) {
+  svn_ra_close_tunnel_func_t arg1 = (svn_ra_close_tunnel_func_t) 0 ;
+  void *arg2 = (void *) 0 ;
+  void *arg3 = (void *) 0 ;
+  int res2 ;
+  int res3 ;
+  
+  if ((argc < 3) || (argc > 3)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail;
+  }
+  {
+    int res = SWIG_ConvertFunctionPtr(argv[0], (void**)(&arg1), SWIGTYPE_p_f_p_void_p_void__void);
+    if (!SWIG_IsOK(res)) {
+      SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_ra_close_tunnel_func_t","svn_ra_invoke_close_tunnel_func", 1, argv[0] )); 
+    }
+  }
+  res2 = SWIG_ConvertPtr(argv[1],SWIG_as_voidptrptr(&arg2), 0, 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "void *","svn_ra_invoke_close_tunnel_func", 2, argv[1] )); 
+  }
+  res3 = SWIG_ConvertPtr(argv[2],SWIG_as_voidptrptr(&arg3), 0, 0);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "void *","svn_ra_invoke_close_tunnel_func", 3, argv[2] )); 
+  }
+  {
+    svn_ra_invoke_close_tunnel_func(arg1,arg2,arg3);
+    
+    
+    
+  }
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_svn_ra_invoke_open_tunnel_func(int argc, VALUE *argv, VALUE self) {
+  svn_ra_open_tunnel_func_t arg1 = (svn_ra_open_tunnel_func_t) 0 ;
+  svn_stream_t **arg2 = (svn_stream_t **) 0 ;
+  svn_stream_t **arg3 = (svn_stream_t **) 0 ;
+  svn_ra_close_tunnel_func_t *arg4 = (svn_ra_close_tunnel_func_t *) 0 ;
+  void **arg5 = (void **) 0 ;
+  void *arg6 = (void *) 0 ;
+  char *arg7 = (char *) 0 ;
+  char *arg8 = (char *) 0 ;
+  char *arg9 = (char *) 0 ;
+  int arg10 ;
+  svn_cancel_func_t arg11 = (svn_cancel_func_t) 0 ;
+  void *arg12 = (void *) 0 ;
+  apr_pool_t *arg13 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  svn_stream_t *temp2 ;
+  svn_stream_t *temp3 ;
+  svn_ra_close_tunnel_func_t temp4 ;
+  void *temp5 ;
+  int res6 ;
+  int res7 ;
+  char *buf7 = 0 ;
+  int alloc7 = 0 ;
+  int res8 ;
+  char *buf8 = 0 ;
+  int alloc8 = 0 ;
+  int res9 ;
+  char *buf9 = 0 ;
+  int alloc9 = 0 ;
+  int val10 ;
+  int ecode10 = 0 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg13);
+    _global_pool = arg13;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  arg2 = &temp2;
+  arg3 = &temp3;
+  arg4 = &temp4;
+  arg5 = &temp5;
+  if ((argc < 7) || (argc > 8)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 7)",argc); SWIG_fail;
+  }
+  {
+    int res = SWIG_ConvertFunctionPtr(argv[0], (void**)(&arg1), SWIGTYPE_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t);
+    if (!SWIG_IsOK(res)) {
+      SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_ra_open_tunnel_func_t","svn_ra_invoke_open_tunnel_func", 1, argv[0] )); 
+    }
+  }
+  res6 = SWIG_ConvertPtr(argv[1],SWIG_as_voidptrptr(&arg6), 0, 0);
+  if (!SWIG_IsOK(res6)) {
+    SWIG_exception_fail(SWIG_ArgError(res6), Ruby_Format_TypeError( "", "void *","svn_ra_invoke_open_tunnel_func", 6, argv[1] )); 
+  }
+  res7 = SWIG_AsCharPtrAndSize(argv[2], &buf7, NULL, &alloc7);
+  if (!SWIG_IsOK(res7)) {
+    SWIG_exception_fail(SWIG_ArgError(res7), Ruby_Format_TypeError( "", "char const *","svn_ra_invoke_open_tunnel_func", 7, argv[2] ));
+  }
+  arg7 = (char *)(buf7);
+  res8 = SWIG_AsCharPtrAndSize(argv[3], &buf8, NULL, &alloc8);
+  if (!SWIG_IsOK(res8)) {
+    SWIG_exception_fail(SWIG_ArgError(res8), Ruby_Format_TypeError( "", "char const *","svn_ra_invoke_open_tunnel_func", 8, argv[3] ));
+  }
+  arg8 = (char *)(buf8);
+  res9 = SWIG_AsCharPtrAndSize(argv[4], &buf9, NULL, &alloc9);
+  if (!SWIG_IsOK(res9)) {
+    SWIG_exception_fail(SWIG_ArgError(res9), Ruby_Format_TypeError( "", "char const *","svn_ra_invoke_open_tunnel_func", 9, argv[4] ));
+  }
+  arg9 = (char *)(buf9);
+  ecode10 = SWIG_AsVal_int(argv[5], &val10);
+  if (!SWIG_IsOK(ecode10)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode10), Ruby_Format_TypeError( "", "int","svn_ra_invoke_open_tunnel_func", 10, argv[5] ));
+  } 
+  arg10 = (int)(val10);
+  {
+    arg11 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
+    arg12 = (void *)svn_swig_rb_make_baton(argv[6], _global_svn_swig_rb_pool);
+  }
+  if (argc > 7) {
+    
+  }
+  {
+    result = (svn_error_t *)svn_ra_invoke_open_tunnel_func(arg1,arg2,arg3,arg4,arg5,arg6,(char const *)arg7,(char const *)arg8,(char const *)arg9,arg10,arg11,arg12,arg13);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  {
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj(*arg2, SWIGTYPE_p_svn_stream_t, 0));
+  }
+  {
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj(*arg3, SWIGTYPE_p_svn_stream_t, 0));
+  }
+  {
+    /* FIXME: Missing argout typemap: svn_ra_invoke_open_tunnel_func arg 4 (svn_ra_close_tunnel_func_t *) */
+    
+    
+    
+    
+    SWIG_exception(SWIG_ValueError, "svn_ra_invoke_open_tunnel_func is not implemented yet");
+    
+  }
+  {
+    /* FIXME: Missing argout typemap: svn_ra_invoke_open_tunnel_func arg 5 (void **) */
+    
+    
+    
+    
+    SWIG_exception(SWIG_ValueError, "svn_ra_invoke_open_tunnel_func is not implemented yet");
+    
+  }
+  {
+    svn_swig_rb_set_baton(vresult, (VALUE)arg12);
+  }
+  if (alloc7 == SWIG_NEWOBJ) free((char*)buf7);
+  if (alloc8 == SWIG_NEWOBJ) free((char*)buf8);
+  if (alloc9 == SWIG_NEWOBJ) free((char*)buf9);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
+fail:
+  if (alloc7 == SWIG_NEWOBJ) free((char*)buf7);
+  if (alloc8 == SWIG_NEWOBJ) free((char*)buf8);
+  if (alloc9 == SWIG_NEWOBJ) free((char*)buf9);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
 _wrap_svn_ra_invoke_init_func(int argc, VALUE *argv, VALUE self) {
   svn_ra_init_func_t arg1 = (svn_ra_init_func_t) 0 ;
   int arg2 ;
@@ -15621,6 +16018,7 @@ static swig_type_info _swigt__p_f_apr_off_t_apr_off_t_p_void_p_apr_pool_t__void
 static swig_type_info _swigt__p_f_int_p_apr_pool_t_p_apr_hash_t__p_svn_error_t = {"_p_f_int_p_apr_pool_t_p_apr_hash_t__p_svn_error_t", "struct svn_error_t *(*)(int,apr_pool_t *,apr_hash_t *)|svn_ra_init_func_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|struct svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_p_apr_file_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_apr_file_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(apr_file_t **,void *,apr_pool_t *)|struct svn_error_t *(*)(apr_file_t **,void *,apr_pool_t *)", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_ra_open_tunnel_func_t|struct svn_error_t *(*)(svn_stream_t **,svn_stream_t **,svn_ra_close_tunnel_func_t *,void **,void *,char const *,char const *,char const *,int,svn_cancel_func_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_p_void_p_q_const__char_p_q_const__svn_ra_callbacks_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_void_p_q_const__char_p_q_const__svn_ra_callbacks_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void **,char const *,svn_ra_callbacks_t const *,void *,apr_hash_t *,apr_pool_t *)|svn_error_t *(*)(void **,char const *,svn_ra_callbacks_t const *,void *,apr_hash_t *,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_commit_callback2_t|struct svn_error_t *(*)(svn_commit_info_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_location_segment_t *,void *,apr_pool_t *)|svn_location_segment_receiver_t", 0, 0, (void*)0, 0};
@@ -15637,6 +16035,7 @@ static swig_type_info _swigt__p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void
 static swig_type_info _swigt__p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_ra_reporter_t const **,void **,svn_revnum_t,char const *,svn_boolean_t,svn_boolean_t,char const *,svn_delta_editor_t const *,void *,apr_pool_t *)|struct svn_error_t *(*)(void *,svn_ra_reporter_t const **,void **,svn_revnum_t,char const *,svn_boolean_t,svn_boolean_t,char const *,svn_delta_editor_t const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_p_svn_stream_t_p_q_const__svn_checksum_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_p_svn_stream_t_p_q_const__svn_checksum_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_stream_t **,svn_checksum_t const *,apr_pool_t *)|svn_ra_get_wc_contents_func_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__apr_array_header_t_svn_revnum_t_svn_revnum_t_svn_boolean_t_svn_boolean_t_svn_log_message_receiver_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__apr_array_header_t_svn_revnum_t_svn_revnum_t_svn_boolean_t_svn_boolean_t_svn_log_message_receiver_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,apr_array_header_t const *,svn_revnum_t,svn_revnum_t,svn_boolean_t,svn_boolean_t,svn_log_message_receiver_t,void *,apr_pool_t *)|struct svn_error_t *(*)(void *,apr_array_header_t const *,svn_revnum_t,svn_revnum_t,svn_boolean_t,svn_boolean_t,svn_log_message_receiver_t,void *,apr_pool_t *)", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_f_p_void_p_q_const__char__int = {"_p_f_p_void_p_q_const__char__int", "int (*)(void *,char const *)|svn_ra_check_tunnel_func_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,char const *,apr_pool_t *)|struct svn_error_t *(*)(void *,char const *,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,char const *,apr_pool_t *)|svn_ra_invalidate_wc_props_func_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,char const *,svn_string_t const **,apr_pool_t *)|svn_ra_get_wc_prop_func_t", 0, 0, (void*)0, 0};
@@ -15658,6 +16057,7 @@ static swig_type_info _swigt__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_e
 static swig_type_info _swigt__p_f_p_void_p_svn_revnum_t__p_svn_error_t = {"_p_f_p_void_p_svn_revnum_t__p_svn_error_t", "svn_ra_get_latest_revnum_func_t|struct svn_error_t *(*)(void *,svn_revnum_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_svn_revnum_t_apr_time_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_revnum_t_apr_time_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_revnum_t *,apr_time_t,apr_pool_t *)|struct svn_error_t *(*)(void *,svn_revnum_t *,apr_time_t,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_svn_revnum_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_revnum_t_p_apr_pool_t__p_svn_error_t", "svn_error_t *(*)(void *,svn_revnum_t *,apr_pool_t *)|struct svn_error_t *(*)(void *,svn_revnum_t *,apr_pool_t *)", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_f_p_void_p_void__void = {"_p_f_p_void_p_void__void", "svn_ra_close_tunnel_func_t|void (*)(void *,void *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_revnum_t,apr_hash_t **,apr_pool_t *)|svn_error_t *(*)(void *,svn_revnum_t,apr_hash_t **,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_svn_revnum_t_p_q_const__char_p_p_svn_string_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_svn_revnum_t_p_q_const__char_p_p_svn_string_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_revnum_t,char const *,svn_string_t **,apr_pool_t *)|svn_error_t *(*)(void *,svn_revnum_t,char const *,svn_string_t **,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_svn_revnum_t_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_svn_revnum_t_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_revnum_t,char const *,svn_string_t const *,apr_pool_t *)|svn_error_t *(*)(void *,svn_revnum_t,char const *,svn_string_t const *,apr_pool_t *)", 0, 0, (void*)0, 0};
@@ -15672,6 +16072,7 @@ static swig_type_info _swigt__p_p_apr_file_t = {"_p_p_apr_file_t", "apr_file_t *
 static swig_type_info _swigt__p_p_apr_hash_t = {"_p_p_apr_hash_t", "apr_hash_t **|svn_mergeinfo_catalog_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_char = {"_p_p_char", "char **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t = {"_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t", "svn_txdelta_window_handler_t *|struct svn_error_t *(**)(svn_txdelta_window_t *,void *)", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_p_f_p_void_p_void__void = {"_p_p_f_p_void_p_void__void", "svn_ra_close_tunnel_func_t *|void (**)(void *,void *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_svn_delta_editor_t = {"_p_p_svn_delta_editor_t", "struct svn_delta_editor_t **|svn_delta_editor_t **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_svn_dirent_t = {"_p_p_svn_dirent_t", "struct svn_dirent_t **|svn_dirent_t **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_svn_lock_t = {"_p_p_svn_lock_t", "struct svn_lock_t **|svn_lock_t **", 0, 0, (void*)0, 0};
@@ -15772,6 +16173,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_f_int_p_apr_pool_t_p_apr_hash_t__p_svn_error_t,
   &_swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_p_apr_file_t_p_void_p_apr_pool_t__p_svn_error_t,
+  &_swigt__p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_p_void_p_q_const__char_p_q_const__svn_ra_callbacks_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t,
@@ -15788,6 +16190,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_p_svn_stream_t_p_q_const__svn_checksum_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_q_const__apr_array_header_t_svn_revnum_t_svn_revnum_t_svn_boolean_t_svn_boolean_t_svn_log_message_receiver_t_p_void_p_apr_pool_t__p_svn_error_t,
+  &_swigt__p_f_p_void_p_q_const__char__int,
   &_swigt__p_f_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t,
@@ -15809,6 +16212,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_f_p_void_p_svn_revnum_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_svn_revnum_t_apr_time_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_svn_revnum_t_p_apr_pool_t__p_svn_error_t,
+  &_swigt__p_f_p_void_p_void__void,
   &_swigt__p_f_p_void_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_svn_revnum_t_p_q_const__char_p_p_svn_string_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_svn_revnum_t_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t,
@@ -15823,6 +16227,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_p_apr_hash_t,
   &_swigt__p_p_char,
   &_swigt__p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t,
+  &_swigt__p_p_f_p_void_p_void__void,
   &_swigt__p_p_svn_delta_editor_t,
   &_swigt__p_p_svn_dirent_t,
   &_swigt__p_p_svn_lock_t,
@@ -15923,6 +16328,7 @@ static swig_cast_info _swigc__p_f_apr_off_t_apr_off_t_p_void_p_apr_pool_t__void[
 static swig_cast_info _swigc__p_f_int_p_apr_pool_t_p_apr_hash_t__p_svn_error_t[] = {  {&_swigt__p_f_int_p_apr_pool_t_p_apr_hash_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_p_apr_file_t_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_p_apr_file_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_p_void_p_q_const__char_p_q_const__svn_ra_callbacks_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_p_void_p_q_const__char_p_q_const__svn_ra_callbacks_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -15939,6 +16345,7 @@ static swig_cast_info _swigc__p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void
 static swig_cast_info _swigc__p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_p_svn_stream_t_p_q_const__svn_checksum_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_p_svn_stream_t_p_q_const__svn_checksum_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_q_const__apr_array_header_t_svn_revnum_t_svn_revnum_t_svn_boolean_t_svn_boolean_t_svn_log_message_receiver_t_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__apr_array_header_t_svn_revnum_t_svn_revnum_t_svn_boolean_t_svn_boolean_t_svn_log_message_receiver_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_f_p_void_p_q_const__char__int[] = {  {&_swigt__p_f_p_void_p_q_const__char__int, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -15960,6 +16367,7 @@ static swig_cast_info _swigc__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_e
 static swig_cast_info _swigc__p_f_p_void_p_svn_revnum_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_svn_revnum_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_svn_revnum_t_apr_time_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_svn_revnum_t_apr_time_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_svn_revnum_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_svn_revnum_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_f_p_void_p_void__void[] = {  {&_swigt__p_f_p_void_p_void__void, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_svn_revnum_t_p_q_const__char_p_p_svn_string_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_svn_revnum_t_p_q_const__char_p_p_svn_string_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_svn_revnum_t_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_svn_revnum_t_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -15974,6 +16382,7 @@ static swig_cast_info _swigc__p_p_apr_file_t[] = {  {&_swigt__p_p_apr_file_t, 0,
 static swig_cast_info _swigc__p_p_apr_hash_t[] = {  {&_swigt__p_p_apr_hash_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_char[] = {  {&_swigt__p_p_char, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t[] = {  {&_swigt__p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_p_f_p_void_p_void__void[] = {  {&_swigt__p_p_f_p_void_p_void__void, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_svn_delta_editor_t[] = {  {&_swigt__p_p_svn_delta_editor_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_svn_dirent_t[] = {  {&_swigt__p_p_svn_dirent_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_svn_lock_t[] = {  {&_swigt__p_p_svn_lock_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -16074,6 +16483,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_f_int_p_apr_pool_t_p_apr_hash_t__p_svn_error_t,
   _swigc__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_p_apr_file_t_p_void_p_apr_pool_t__p_svn_error_t,
+  _swigc__p_f_p_p_svn_stream_t_p_p_svn_stream_t_p_svn_ra_close_tunnel_func_t_p_p_void_p_void_p_q_const__char_p_q_const__char_p_q_const__char_int_svn_cancel_func_t_p_void_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_p_void_p_q_const__char_p_q_const__svn_ra_callbacks_t_p_void_p_apr_hash_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t,
@@ -16090,6 +16500,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_f_p_void_p_p_q_const__svn_ra_reporter_t_p_p_void_svn_revnum_t_p_q_const__char_svn_boolean_t_svn_boolean_t_p_q_const__char_p_q_const__svn_delta_editor_t_p_void_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_p_p_svn_stream_t_p_q_const__svn_checksum_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_p_q_const__apr_array_header_t_svn_revnum_t_svn_revnum_t_svn_boolean_t_svn_boolean_t_svn_log_message_receiver_t_p_void_p_apr_pool_t__p_svn_error_t,
+  _swigc__p_f_p_void_p_q_const__char__int,
   _swigc__p_f_p_void_p_q_const__char_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_p_q_const__char_p_q_const__char_p_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t,
@@ -16111,6 +16522,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_f_p_void_p_svn_revnum_t__p_svn_error_t,
   _swigc__p_f_p_void_p_svn_revnum_t_apr_time_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_p_svn_revnum_t_p_apr_pool_t__p_svn_error_t,
+  _swigc__p_f_p_void_p_void__void,
   _swigc__p_f_p_void_svn_revnum_t_p_p_apr_hash_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_svn_revnum_t_p_q_const__char_p_p_svn_string_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_svn_revnum_t_p_q_const__char_p_q_const__svn_string_t_p_apr_pool_t__p_svn_error_t,
@@ -16125,6 +16537,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_p_apr_hash_t,
   _swigc__p_p_char,
   _swigc__p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t,
+  _swigc__p_p_f_p_void_p_void__void,
   _swigc__p_p_svn_delta_editor_t,
   _swigc__p_p_svn_dirent_t,
   _swigc__p_p_svn_lock_t,
@@ -16218,18 +16631,18 @@ static swig_cast_info *swig_cast_initial[] = {
 
 /* -----------------------------------------------------------------------------
  * Type initialization:
- * This problem is tough by the requirement that no dynamic 
- * memory is used. Also, since swig_type_info structures store pointers to 
+ * This problem is tough by the requirement that no dynamic
+ * memory is used. Also, since swig_type_info structures store pointers to
  * swig_cast_info structures and swig_cast_info structures store pointers back
- * to swig_type_info structures, we need some lookup code at initialization. 
- * The idea is that swig generates all the structures that are needed. 
- * The runtime then collects these partially filled structures. 
- * The SWIG_InitializeModule function takes these initial arrays out of 
+ * to swig_type_info structures, we need some lookup code at initialization.
+ * The idea is that swig generates all the structures that are needed.
+ * The runtime then collects these partially filled structures.
+ * The SWIG_InitializeModule function takes these initial arrays out of
  * swig_module, and does all the lookup, filling in the swig_module.types
  * array with the correct data and linking the correct swig_cast_info
  * structures together.
  *
- * The generated swig_type_info structures are assigned staticly to an initial 
+ * The generated swig_type_info structures are assigned staticly to an initial
  * array. We just loop through that array, and handle each type individually.
  * First we lookup if this type has been already loaded, and if so, use the
  * loaded structure instead of the generated one. Then we have to fill in the
@@ -16239,17 +16652,17 @@ static swig_cast_info *swig_cast_initial[] = {
  * a column is one of the swig_cast_info structures for that type.
  * The cast_initial array is actually an array of arrays, because each row has
  * a variable number of columns. So to actually build the cast linked list,
- * we find the array of casts associated with the type, and loop through it 
+ * we find the array of casts associated with the type, and loop through it
  * adding the casts to the list. The one last trick we need to do is making
  * sure the type pointer in the swig_cast_info struct is correct.
  *
- * First off, we lookup the cast->type name to see if it is already loaded. 
+ * First off, we lookup the cast->type name to see if it is already loaded.
  * There are three cases to handle:
  *  1) If the cast->type has already been loaded AND the type we are adding
  *     casting info to has not been loaded (it is in this module), THEN we
  *     replace the cast->type pointer with the type pointer that has already
  *     been loaded.
- *  2) If BOTH types (the one we are adding casting info to, and the 
+ *  2) If BOTH types (the one we are adding casting info to, and the
  *     cast->type) are loaded, THEN the cast info has already been loaded by
  *     the previous module so we just ignore it.
  *  3) Finally, if cast->type has not already been loaded, then we add that
@@ -16312,7 +16725,7 @@ SWIG_InitializeModule(void *clientdata) {
     module_head->next = &swig_module;
   }
 
-  /* When multiple interpeters are used, a module could have already been initialized in
+  /* When multiple interpreters are used, a module could have already been initialized in
      a different interpreter, but not yet have a pointer in this interpreter.
      In this case, we do not want to continue adding types... everything should be
      set up already */
@@ -16326,7 +16739,7 @@ SWIG_InitializeModule(void *clientdata) {
     swig_type_info *type = 0;
     swig_type_info *ret;
     swig_cast_info *cast;
-  
+
 #ifdef SWIGRUNTIME_DEBUG
     printf("SWIG_InitializeModule: type %d %s\n", i, swig_module.type_initial[i]->name);
 #endif
@@ -16353,7 +16766,7 @@ SWIG_InitializeModule(void *clientdata) {
     /* Insert casting types */
     cast = swig_module.cast_initial[i];
     while (cast->type) {
-    
+
       /* Don't need to add information already in the list */
       ret = 0;
 #ifdef SWIGRUNTIME_DEBUG
@@ -16555,6 +16968,12 @@ SWIGEXPORT void Init_ra(void) {
   rb_define_method(SwigClassSvn_ra_callbacks2_t.klass, "get_client_string", _wrap_svn_ra_callbacks2_t_get_client_string_get, -1);
   rb_define_method(SwigClassSvn_ra_callbacks2_t.klass, "get_wc_contents=", _wrap_svn_ra_callbacks2_t_get_wc_contents_set, -1);
   rb_define_method(SwigClassSvn_ra_callbacks2_t.klass, "get_wc_contents", _wrap_svn_ra_callbacks2_t_get_wc_contents_get, -1);
+  rb_define_method(SwigClassSvn_ra_callbacks2_t.klass, "check_tunnel_func=", _wrap_svn_ra_callbacks2_t_check_tunnel_func_set, -1);
+  rb_define_method(SwigClassSvn_ra_callbacks2_t.klass, "check_tunnel_func", _wrap_svn_ra_callbacks2_t_check_tunnel_func_get, -1);
+  rb_define_method(SwigClassSvn_ra_callbacks2_t.klass, "open_tunnel_func=", _wrap_svn_ra_callbacks2_t_open_tunnel_func_set, -1);
+  rb_define_method(SwigClassSvn_ra_callbacks2_t.klass, "open_tunnel_func", _wrap_svn_ra_callbacks2_t_open_tunnel_func_get, -1);
+  rb_define_method(SwigClassSvn_ra_callbacks2_t.klass, "tunnel_baton=", _wrap_svn_ra_callbacks2_t_tunnel_baton_set, -1);
+  rb_define_method(SwigClassSvn_ra_callbacks2_t.klass, "tunnel_baton", _wrap_svn_ra_callbacks2_t_tunnel_baton_get, -1);
   SwigClassSvn_ra_callbacks2_t.mark = 0;
   SwigClassSvn_ra_callbacks2_t.destroy = (void (*)(void *)) free_svn_ra_callbacks2_t;
   SwigClassSvn_ra_callbacks2_t.trackObjects = 0;
@@ -16749,6 +17168,9 @@ SWIGEXPORT void Init_ra(void) {
   rb_define_module_function(mRa, "svn_ra_invoke_progress_notify_func", _wrap_svn_ra_invoke_progress_notify_func, -1);
   rb_define_module_function(mRa, "svn_ra_invoke_replay_revstart_callback", _wrap_svn_ra_invoke_replay_revstart_callback, -1);
   rb_define_module_function(mRa, "svn_ra_invoke_replay_revfinish_callback", _wrap_svn_ra_invoke_replay_revfinish_callback, -1);
+  rb_define_module_function(mRa, "svn_ra_invoke_check_tunnel_func", _wrap_svn_ra_invoke_check_tunnel_func, -1);
+  rb_define_module_function(mRa, "svn_ra_invoke_close_tunnel_func", _wrap_svn_ra_invoke_close_tunnel_func, -1);
+  rb_define_module_function(mRa, "svn_ra_invoke_open_tunnel_func", _wrap_svn_ra_invoke_open_tunnel_func, -1);
   rb_define_module_function(mRa, "svn_ra_invoke_init_func", _wrap_svn_ra_invoke_init_func, -1);
 }
 
diff --git a/subversion/bindings/swig/ruby/svn_repos.c b/subversion/bindings/swig/ruby/svn_repos.c
index 98c70af..d5e69a1 100644
--- a/subversion/bindings/swig/ruby/svn_repos.c
+++ b/subversion/bindings/swig/ruby/svn_repos.c
@@ -1,11 +1,11 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
- * 
- * This file is not intended to be easily readable and contains a number of 
+ * Version 2.0.12
+ *
+ * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
- * changes to this file unless you know what you are doing--modify the SWIG 
- * interface file instead. 
+ * changes to this file unless you know what you are doing--modify the SWIG
+ * interface file instead.
  * ----------------------------------------------------------------------------- */
 
 #define SWIGRUBY
@@ -41,28 +41,28 @@
 #ifndef SWIGUNUSED
 # if defined(__GNUC__)
 #   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__)) 
+#     define SWIGUNUSED __attribute__ ((__unused__))
 #   else
 #     define SWIGUNUSED
 #   endif
 # elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__)) 
+#   define SWIGUNUSED __attribute__ ((__unused__))
 # else
-#   define SWIGUNUSED 
+#   define SWIGUNUSED
 # endif
 #endif
 
 #ifndef SWIG_MSC_UNSUPPRESS_4505
 # if defined(_MSC_VER)
 #   pragma warning(disable : 4505) /* unreferenced local function has been removed */
-# endif 
+# endif
 #endif
 
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
 # else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
 # endif
 #endif
 
@@ -105,7 +105,7 @@
 #   define SWIGSTDCALL __stdcall
 # else
 #   define SWIGSTDCALL
-# endif 
+# endif
 #endif
 
 /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
@@ -150,28 +150,28 @@
 #ifndef SWIGUNUSED
 # if defined(__GNUC__)
 #   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__)) 
+#     define SWIGUNUSED __attribute__ ((__unused__))
 #   else
 #     define SWIGUNUSED
 #   endif
 # elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__)) 
+#   define SWIGUNUSED __attribute__ ((__unused__))
 # else
-#   define SWIGUNUSED 
+#   define SWIGUNUSED
 # endif
 #endif
 
 #ifndef SWIG_MSC_UNSUPPRESS_4505
 # if defined(_MSC_VER)
 #   pragma warning(disable : 4505) /* unreferenced local function has been removed */
-# endif 
+# endif
 #endif
 
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
 # else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
 # endif
 #endif
 
@@ -214,7 +214,7 @@
 #   define SWIGSTDCALL __stdcall
 # else
 #   define SWIGSTDCALL
-# endif 
+# endif
 #endif
 
 /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
@@ -252,7 +252,7 @@
   You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for
   creating a static or dynamic library from the SWIG runtime code.
   In 99.9% of the cases, SWIG just needs to declare them as 'static'.
-  
+
   But only do this if strictly necessary, ie, if you have problems
   with your compiler or suchlike.
 */
@@ -278,16 +278,16 @@
 #define SWIG_POINTER_OWN           0x1
 
 
-/* 
+/*
    Flags/methods for returning states.
-   
-   The SWIG conversion methods, as ConvertPtr, return an integer 
+
+   The SWIG conversion methods, as ConvertPtr, return an integer
    that tells if the conversion was successful or not. And if not,
    an error code can be returned (see swigerrors.swg for the codes).
-   
+
    Use the following macros/flags to set or process the returning
    states.
-   
+
    In old versions of SWIG, code such as the following was usually written:
 
      if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) {
@@ -320,23 +320,23 @@
     } else {
       // fail code
     }
-    
+
    I.e., now SWIG_ConvertPtr can return new objects and you can
    identify the case and take care of the deallocation. Of course that
    also requires SWIG_ConvertPtr to return new result values, such as
 
-      int SWIG_ConvertPtr(obj, ptr,...) {         
-        if (<obj is ok>) {			       
-          if (<need new object>) {		       
-            *ptr = <ptr to new allocated object>; 
-            return SWIG_NEWOBJ;		       
-          } else {				       
-            *ptr = <ptr to old object>;	       
-            return SWIG_OLDOBJ;		       
-          } 				       
-        } else {				       
-          return SWIG_BADOBJ;		       
-        }					       
+      int SWIG_ConvertPtr(obj, ptr,...) {
+        if (<obj is ok>) {
+          if (<need new object>) {
+            *ptr = <ptr to new allocated object>;
+            return SWIG_NEWOBJ;
+          } else {
+            *ptr = <ptr to old object>;
+            return SWIG_OLDOBJ;
+          }
+        } else {
+          return SWIG_BADOBJ;
+        }
       }
 
    Of course, returning the plain '0(success)/-1(fail)' still works, but you can be
@@ -350,17 +350,17 @@
        int fooi(int);
 
    and you call
- 
+
       food(1)   // cast rank '1'  (1 -> 1.0)
       fooi(1)   // cast rank '0'
 
    just use the SWIG_AddCast()/SWIG_CheckState()
 */
 
-#define SWIG_OK                    (0) 
+#define SWIG_OK                    (0)
 #define SWIG_ERROR                 (-1)
 #define SWIG_IsOK(r)               (r >= 0)
-#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)  
+#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)
 
 /* The CastRankLimit says how many bits are used for the cast rank */
 #define SWIG_CASTRANKLIMIT         (1 << 8)
@@ -391,14 +391,14 @@
 #  endif
 #  define SWIG_CASTRANKMASK          ((SWIG_CASTRANKLIMIT) -1)
 #  define SWIG_CastRank(r)           (r & SWIG_CASTRANKMASK)
-SWIGINTERNINLINE int SWIG_AddCast(int r) { 
+SWIGINTERNINLINE int SWIG_AddCast(int r) {
   return SWIG_IsOK(r) ? ((SWIG_CastRank(r) < SWIG_MAXCASTRANK) ? (r + 1) : SWIG_ERROR) : r;
 }
-SWIGINTERNINLINE int SWIG_CheckState(int r) { 
-  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0; 
+SWIGINTERNINLINE int SWIG_CheckState(int r) {
+  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0;
 }
 #else /* no cast-rank mode */
-#  define SWIG_AddCast
+#  define SWIG_AddCast(r) (r)
 #  define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0)
 #endif
 
@@ -442,7 +442,7 @@ typedef struct swig_module_info {
   void                    *clientdata;		/* Language specific module data */
 } swig_module_info;
 
-/* 
+/*
   Compare two type names skipping the space characters, therefore
   "char*" == "char *" and "Class<int>" == "Class<int >", etc.
 
@@ -462,18 +462,18 @@ SWIG_TypeNameComp(const char *f1, const char *l1,
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if not equal, 1 if equal
+  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
 */
 SWIGRUNTIME int
-SWIG_TypeEquiv(const char *nb, const char *tb) {
-  int equiv = 0;
+SWIG_TypeCmp(const char *nb, const char *tb) {
+  int equiv = 1;
   const char* te = tb + strlen(tb);
   const char* ne = nb;
-  while (!equiv && *ne) {
+  while (equiv != 0 && *ne) {
     for (nb = ne; *ne; ++ne) {
       if (*ne == '|') break;
     }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
+    equiv = SWIG_TypeNameComp(nb, ne, tb, te);
     if (*ne) ++ne;
   }
   return equiv;
@@ -481,24 +481,13 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
+  Return 0 if not equal, 1 if equal
 */
 SWIGRUNTIME int
-SWIG_TypeCompare(const char *nb, const char *tb) {
-  int equiv = 0;
-  const char* te = tb + strlen(tb);
-  const char* ne = nb;
-  while (!equiv && *ne) {
-    for (nb = ne; *ne; ++ne) {
-      if (*ne == '|') break;
-    }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
-    if (*ne) ++ne;
-  }
-  return equiv;
+SWIG_TypeEquiv(const char *nb, const char *tb) {
+  return SWIG_TypeCmp(nb, tb) == 0 ? 1 : 0;
 }
 
-
 /*
   Check the typename
 */
@@ -526,7 +515,7 @@ SWIG_TypeCheck(const char *c, swig_type_info *ty) {
   return 0;
 }
 
-/* 
+/*
   Identical to SWIG_TypeCheck, except strcmp is replaced with a pointer comparison
 */
 SWIGRUNTIME swig_cast_info *
@@ -561,7 +550,7 @@ SWIG_TypeCast(swig_cast_info *ty, void *ptr, int *newmemory) {
   return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr, newmemory);
 }
 
-/* 
+/*
    Dynamic pointer casting. Down an inheritance hierarchy
 */
 SWIGRUNTIME swig_type_info *
@@ -605,7 +594,7 @@ SWIG_TypePrettyName(const swig_type_info *type) {
     return type->name;
 }
 
-/* 
+/*
    Set the clientdata field for a type
 */
 SWIGRUNTIME void
@@ -613,14 +602,14 @@ SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
   swig_cast_info *cast = ti->cast;
   /* if (ti->clientdata == clientdata) return; */
   ti->clientdata = clientdata;
-  
+
   while (cast) {
     if (!cast->converter) {
       swig_type_info *tc = cast->type;
       if (!tc->clientdata) {
 	SWIG_TypeClientData(tc, clientdata);
       }
-    }    
+    }
     cast = cast->next;
   }
 }
@@ -629,18 +618,18 @@ SWIG_TypeNewClientData(swig_type_info *ti, void *clientdata) {
   SWIG_TypeClientData(ti, clientdata);
   ti->owndata = 1;
 }
-  
+
 /*
   Search for a swig_type_info structure only by mangled name
   Search is a O(log #types)
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_MangledTypeQueryModule(swig_module_info *start, 
-                            swig_module_info *end, 
+SWIG_MangledTypeQueryModule(swig_module_info *start,
+                            swig_module_info *end,
 		            const char *name) {
   swig_module_info *iter = start;
   do {
@@ -649,11 +638,11 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
       register size_t r = iter->size - 1;
       do {
 	/* since l+r >= 0, we can (>> 1) instead (/ 2) */
-	register size_t i = (l + r) >> 1; 
+	register size_t i = (l + r) >> 1;
 	const char *iname = iter->types[i]->name;
 	if (iname) {
 	  register int compare = strcmp(name, iname);
-	  if (compare == 0) {	    
+	  if (compare == 0) {
 	    return iter->types[i];
 	  } else if (compare < 0) {
 	    if (i) {
@@ -678,14 +667,14 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
   Search for a swig_type_info structure for either a mangled name or a human readable name.
   It first searches the mangled names of the types, which is a O(log #types)
   If a type is not found it then searches the human readable names, which is O(#types).
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_TypeQueryModule(swig_module_info *start, 
-                     swig_module_info *end, 
+SWIG_TypeQueryModule(swig_module_info *start,
+                     swig_module_info *end,
 		     const char *name) {
   /* STEP 1: Search the name field using binary search */
   swig_type_info *ret = SWIG_MangledTypeQueryModule(start, end, name);
@@ -704,12 +693,12 @@ SWIG_TypeQueryModule(swig_module_info *start,
       iter = iter->next;
     } while (iter != end);
   }
-  
+
   /* neither found a match */
   return 0;
 }
 
-/* 
+/*
    Pack binary data into a string
 */
 SWIGRUNTIME char *
@@ -725,7 +714,7 @@ SWIG_PackData(char *c, void *ptr, size_t sz) {
   return c;
 }
 
-/* 
+/*
    Unpack binary data from a string
 */
 SWIGRUNTIME const char *
@@ -739,21 +728,21 @@ SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
       uu = ((d - '0') << 4);
     else if ((d >= 'a') && (d <= 'f'))
       uu = ((d - ('a'-10)) << 4);
-    else 
+    else
       return (char *) 0;
     d = *(c++);
     if ((d >= '0') && (d <= '9'))
       uu |= (d - '0');
     else if ((d >= 'a') && (d <= 'f'))
       uu |= (d - ('a'-10));
-    else 
+    else
       return (char *) 0;
     *u = uu;
   }
   return c;
 }
 
-/* 
+/*
    Pack 'void *' into a string buffer.
 */
 SWIGRUNTIME char *
@@ -813,18 +802,18 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 #endif
 
 /*  Errors in SWIG */
-#define  SWIG_UnknownError    	   -1 
-#define  SWIG_IOError        	   -2 
-#define  SWIG_RuntimeError   	   -3 
-#define  SWIG_IndexError     	   -4 
-#define  SWIG_TypeError      	   -5 
-#define  SWIG_DivisionByZero 	   -6 
-#define  SWIG_OverflowError  	   -7 
-#define  SWIG_SyntaxError    	   -8 
-#define  SWIG_ValueError     	   -9 
+#define  SWIG_UnknownError    	   -1
+#define  SWIG_IOError        	   -2
+#define  SWIG_RuntimeError   	   -3
+#define  SWIG_IndexError     	   -4
+#define  SWIG_TypeError      	   -5
+#define  SWIG_DivisionByZero 	   -6
+#define  SWIG_OverflowError  	   -7
+#define  SWIG_SyntaxError    	   -8
+#define  SWIG_ValueError     	   -9
 #define  SWIG_SystemError    	   -10
 #define  SWIG_AttributeError 	   -11
-#define  SWIG_MemoryError    	   -12 
+#define  SWIG_MemoryError    	   -12
 #define  SWIG_NullReferenceError   -13
 
 
@@ -1750,7 +1739,7 @@ SWIG_Ruby_SetModule(swig_module_info *pointer)
 SWIGINTERN
 int SWIG_Ruby_isCallable( VALUE proc )
 {
-  if ( rb_respond_to( proc, swig_call_id ) == Qtrue )
+  if ( rb_respond_to( proc, swig_call_id ) )
     return 1;
   return 0;
 }
@@ -1763,7 +1752,7 @@ int SWIG_Ruby_isCallable( VALUE proc )
 SWIGINTERN
 int SWIG_Ruby_arity( VALUE proc, int minimal )
 {
-  if ( rb_respond_to( proc, swig_arity_id ) == Qtrue )
+  if ( rb_respond_to( proc, swig_arity_id ) )
     {
       VALUE num = rb_funcall( proc, swig_arity_id, 0 );
       int arity = NUM2INT(num);
@@ -1813,122 +1802,131 @@ int SWIG_Ruby_arity( VALUE proc, int minimal )
 #define SWIGTYPE_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[18]
 #define SWIGTYPE_p_f_p_void_p_apr_pool_t__p_svn_error_t swig_types[19]
 #define SWIGTYPE_p_f_p_void_p_q_const__char__p_svn_error_t swig_types[20]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_string_t__p_svn_error_t swig_types[21]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[22]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[23]
-#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t swig_types[24]
-#define SWIGTYPE_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void swig_types[25]
-#define SWIGTYPE_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t swig_types[26]
-#define SWIGTYPE_p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t swig_types[27]
-#define SWIGTYPE_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t swig_types[28]
-#define SWIGTYPE_p_int swig_types[29]
-#define SWIGTYPE_p_long swig_types[30]
-#define SWIGTYPE_p_p_apr_array_header_t swig_types[31]
-#define SWIGTYPE_p_p_apr_hash_t swig_types[32]
-#define SWIGTYPE_p_p_char swig_types[33]
-#define SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t swig_types[34]
-#define SWIGTYPE_p_p_svn_authz_t swig_types[35]
-#define SWIGTYPE_p_p_svn_delta_editor_t swig_types[36]
-#define SWIGTYPE_p_p_svn_dirent_t swig_types[37]
-#define SWIGTYPE_p_p_svn_fs_txn_t swig_types[38]
-#define SWIGTYPE_p_p_svn_lock_t swig_types[39]
-#define SWIGTYPE_p_p_svn_repos_parse_fns2_t swig_types[40]
-#define SWIGTYPE_p_p_svn_repos_parse_fns3_t swig_types[41]
-#define SWIGTYPE_p_p_svn_repos_parse_fns_t swig_types[42]
-#define SWIGTYPE_p_p_svn_repos_t swig_types[43]
-#define SWIGTYPE_p_p_svn_stream_t swig_types[44]
-#define SWIGTYPE_p_p_svn_string_t swig_types[45]
-#define SWIGTYPE_p_p_void swig_types[46]
-#define SWIGTYPE_p_svn_auth_baton_t swig_types[47]
-#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[48]
-#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[49]
-#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[50]
-#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[51]
-#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[52]
-#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[53]
-#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[54]
-#define SWIGTYPE_p_svn_auth_provider_t swig_types[55]
-#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[56]
-#define SWIGTYPE_p_svn_authz_t swig_types[57]
-#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[58]
-#define SWIGTYPE_p_svn_checksum_kind_t swig_types[59]
-#define SWIGTYPE_p_svn_checksum_t swig_types[60]
-#define SWIGTYPE_p_svn_commit_info_t swig_types[61]
-#define SWIGTYPE_p_svn_config_t swig_types[62]
-#define SWIGTYPE_p_svn_delta_editor_t swig_types[63]
-#define SWIGTYPE_p_svn_depth_t swig_types[64]
-#define SWIGTYPE_p_svn_diff_conflict_display_style_t swig_types[65]
-#define SWIGTYPE_p_svn_diff_datasource_e swig_types[66]
-#define SWIGTYPE_p_svn_diff_file_ignore_space_t swig_types[67]
-#define SWIGTYPE_p_svn_diff_file_options_t swig_types[68]
-#define SWIGTYPE_p_svn_diff_fns2_t swig_types[69]
-#define SWIGTYPE_p_svn_diff_fns_t swig_types[70]
-#define SWIGTYPE_p_svn_diff_hunk_t swig_types[71]
-#define SWIGTYPE_p_svn_diff_operation_kind_e swig_types[72]
-#define SWIGTYPE_p_svn_diff_output_fns_t swig_types[73]
-#define SWIGTYPE_p_svn_diff_t swig_types[74]
-#define SWIGTYPE_p_svn_dirent_t swig_types[75]
-#define SWIGTYPE_p_svn_errno_t swig_types[76]
-#define SWIGTYPE_p_svn_error_t swig_types[77]
-#define SWIGTYPE_p_svn_fs_access_t swig_types[78]
-#define SWIGTYPE_p_svn_fs_dirent_t swig_types[79]
-#define SWIGTYPE_p_svn_fs_history_t swig_types[80]
-#define SWIGTYPE_p_svn_fs_id_t swig_types[81]
-#define SWIGTYPE_p_svn_fs_pack_notify_action_t swig_types[82]
-#define SWIGTYPE_p_svn_fs_path_change2_t swig_types[83]
-#define SWIGTYPE_p_svn_fs_path_change_kind_t swig_types[84]
-#define SWIGTYPE_p_svn_fs_path_change_t swig_types[85]
-#define SWIGTYPE_p_svn_fs_root_t swig_types[86]
-#define SWIGTYPE_p_svn_fs_t swig_types[87]
-#define SWIGTYPE_p_svn_fs_txn_t swig_types[88]
-#define SWIGTYPE_p_svn_io_dirent2_t swig_types[89]
-#define SWIGTYPE_p_svn_io_dirent_t swig_types[90]
-#define SWIGTYPE_p_svn_io_file_del_t swig_types[91]
-#define SWIGTYPE_p_svn_location_segment_t swig_types[92]
-#define SWIGTYPE_p_svn_lock_t swig_types[93]
-#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[94]
-#define SWIGTYPE_p_svn_log_changed_path_t swig_types[95]
-#define SWIGTYPE_p_svn_log_entry_t swig_types[96]
-#define SWIGTYPE_p_svn_merge_range_t swig_types[97]
-#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[98]
-#define SWIGTYPE_p_svn_node_kind_t swig_types[99]
-#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[100]
-#define SWIGTYPE_p_svn_opt_revision_t swig_types[101]
-#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[102]
-#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[103]
-#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[104]
-#define SWIGTYPE_p_svn_patch_file_t swig_types[105]
-#define SWIGTYPE_p_svn_patch_t swig_types[106]
-#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[107]
-#define SWIGTYPE_p_svn_prop_kind swig_types[108]
-#define SWIGTYPE_p_svn_prop_patch_t swig_types[109]
-#define SWIGTYPE_p_svn_repos_authz_access_t swig_types[110]
-#define SWIGTYPE_p_svn_repos_node_t swig_types[111]
-#define SWIGTYPE_p_svn_repos_notify_action_t swig_types[112]
-#define SWIGTYPE_p_svn_repos_notify_t swig_types[113]
-#define SWIGTYPE_p_svn_repos_notify_warning_t swig_types[114]
-#define SWIGTYPE_p_svn_repos_parse_fns2_t swig_types[115]
-#define SWIGTYPE_p_svn_repos_parse_fns3_t swig_types[116]
-#define SWIGTYPE_p_svn_repos_parse_fns_t swig_types[117]
-#define SWIGTYPE_p_svn_repos_revision_access_level_t swig_types[118]
-#define SWIGTYPE_p_svn_repos_t swig_types[119]
-#define SWIGTYPE_p_svn_stream_mark_t swig_types[120]
-#define SWIGTYPE_p_svn_stream_t swig_types[121]
-#define SWIGTYPE_p_svn_string_t swig_types[122]
-#define SWIGTYPE_p_svn_stringbuf_t swig_types[123]
-#define SWIGTYPE_p_svn_tristate_t swig_types[124]
-#define SWIGTYPE_p_svn_txdelta_op_t swig_types[125]
-#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[126]
-#define SWIGTYPE_p_svn_txdelta_window_t swig_types[127]
-#define SWIGTYPE_p_svn_version_checklist_t swig_types[128]
-#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[129]
-#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[130]
-#define SWIGTYPE_p_svn_version_extended_t swig_types[131]
-#define SWIGTYPE_p_svn_version_t swig_types[132]
-#define SWIGTYPE_p_unsigned_long swig_types[133]
-#define SWIGTYPE_p_void swig_types[134]
-static swig_type_info *swig_types[136];
-static swig_module_info swig_module = {swig_types, 135, 0, 0, 0, 0};
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t swig_types[21]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_string_t__p_svn_error_t swig_types[22]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[23]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t swig_types[24]
+#define SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t swig_types[25]
+#define SWIGTYPE_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void swig_types[26]
+#define SWIGTYPE_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t swig_types[27]
+#define SWIGTYPE_p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t swig_types[28]
+#define SWIGTYPE_p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t swig_types[29]
+#define SWIGTYPE_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t swig_types[30]
+#define SWIGTYPE_p_int swig_types[31]
+#define SWIGTYPE_p_long swig_types[32]
+#define SWIGTYPE_p_p_apr_array_header_t swig_types[33]
+#define SWIGTYPE_p_p_apr_hash_t swig_types[34]
+#define SWIGTYPE_p_p_char swig_types[35]
+#define SWIGTYPE_p_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t swig_types[36]
+#define SWIGTYPE_p_p_svn_authz_t swig_types[37]
+#define SWIGTYPE_p_p_svn_delta_editor_t swig_types[38]
+#define SWIGTYPE_p_p_svn_dirent_t swig_types[39]
+#define SWIGTYPE_p_p_svn_fs_txn_t swig_types[40]
+#define SWIGTYPE_p_p_svn_lock_t swig_types[41]
+#define SWIGTYPE_p_p_svn_repos_parse_fns2_t swig_types[42]
+#define SWIGTYPE_p_p_svn_repos_parse_fns3_t swig_types[43]
+#define SWIGTYPE_p_p_svn_repos_parse_fns_t swig_types[44]
+#define SWIGTYPE_p_p_svn_repos_t swig_types[45]
+#define SWIGTYPE_p_p_svn_stream_t swig_types[46]
+#define SWIGTYPE_p_p_svn_string_t swig_types[47]
+#define SWIGTYPE_p_p_svn_version_t swig_types[48]
+#define SWIGTYPE_p_p_void swig_types[49]
+#define SWIGTYPE_p_svn_auth_baton_t swig_types[50]
+#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[51]
+#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[52]
+#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[53]
+#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[54]
+#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[55]
+#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[56]
+#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[57]
+#define SWIGTYPE_p_svn_auth_provider_t swig_types[58]
+#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[59]
+#define SWIGTYPE_p_svn_authz_t swig_types[60]
+#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[61]
+#define SWIGTYPE_p_svn_checksum_kind_t swig_types[62]
+#define SWIGTYPE_p_svn_checksum_t swig_types[63]
+#define SWIGTYPE_p_svn_commit_info_t swig_types[64]
+#define SWIGTYPE_p_svn_config_t swig_types[65]
+#define SWIGTYPE_p_svn_delta_editor_t swig_types[66]
+#define SWIGTYPE_p_svn_depth_t swig_types[67]
+#define SWIGTYPE_p_svn_diff_conflict_display_style_t swig_types[68]
+#define SWIGTYPE_p_svn_diff_datasource_e swig_types[69]
+#define SWIGTYPE_p_svn_diff_file_ignore_space_t swig_types[70]
+#define SWIGTYPE_p_svn_diff_file_options_t swig_types[71]
+#define SWIGTYPE_p_svn_diff_fns2_t swig_types[72]
+#define SWIGTYPE_p_svn_diff_fns_t swig_types[73]
+#define SWIGTYPE_p_svn_diff_hunk_t swig_types[74]
+#define SWIGTYPE_p_svn_diff_operation_kind_e swig_types[75]
+#define SWIGTYPE_p_svn_diff_output_fns_t swig_types[76]
+#define SWIGTYPE_p_svn_diff_t swig_types[77]
+#define SWIGTYPE_p_svn_dirent_t swig_types[78]
+#define SWIGTYPE_p_svn_errno_t swig_types[79]
+#define SWIGTYPE_p_svn_error_t swig_types[80]
+#define SWIGTYPE_p_svn_fs_access_t swig_types[81]
+#define SWIGTYPE_p_svn_fs_dirent_t swig_types[82]
+#define SWIGTYPE_p_svn_fs_fsfs_info_t swig_types[83]
+#define SWIGTYPE_p_svn_fs_fsx_info_t swig_types[84]
+#define SWIGTYPE_p_svn_fs_history_t swig_types[85]
+#define SWIGTYPE_p_svn_fs_id_t swig_types[86]
+#define SWIGTYPE_p_svn_fs_info_placeholder_t swig_types[87]
+#define SWIGTYPE_p_svn_fs_lock_target_t swig_types[88]
+#define SWIGTYPE_p_svn_fs_node_relation_t swig_types[89]
+#define SWIGTYPE_p_svn_fs_pack_notify_action_t swig_types[90]
+#define SWIGTYPE_p_svn_fs_path_change2_t swig_types[91]
+#define SWIGTYPE_p_svn_fs_path_change_kind_t swig_types[92]
+#define SWIGTYPE_p_svn_fs_path_change_t swig_types[93]
+#define SWIGTYPE_p_svn_fs_root_t swig_types[94]
+#define SWIGTYPE_p_svn_fs_t swig_types[95]
+#define SWIGTYPE_p_svn_fs_txn_t swig_types[96]
+#define SWIGTYPE_p_svn_fs_upgrade_notify_action_t swig_types[97]
+#define SWIGTYPE_p_svn_io_dirent2_t swig_types[98]
+#define SWIGTYPE_p_svn_io_dirent_t swig_types[99]
+#define SWIGTYPE_p_svn_io_file_del_t swig_types[100]
+#define SWIGTYPE_p_svn_location_segment_t swig_types[101]
+#define SWIGTYPE_p_svn_lock_t swig_types[102]
+#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[103]
+#define SWIGTYPE_p_svn_log_changed_path_t swig_types[104]
+#define SWIGTYPE_p_svn_log_entry_t swig_types[105]
+#define SWIGTYPE_p_svn_merge_range_t swig_types[106]
+#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[107]
+#define SWIGTYPE_p_svn_node_kind_t swig_types[108]
+#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[109]
+#define SWIGTYPE_p_svn_opt_revision_t swig_types[110]
+#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[111]
+#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[112]
+#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[113]
+#define SWIGTYPE_p_svn_patch_file_t swig_types[114]
+#define SWIGTYPE_p_svn_patch_t swig_types[115]
+#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[116]
+#define SWIGTYPE_p_svn_prop_kind swig_types[117]
+#define SWIGTYPE_p_svn_prop_patch_t swig_types[118]
+#define SWIGTYPE_p_svn_repos_authz_access_t swig_types[119]
+#define SWIGTYPE_p_svn_repos_node_t swig_types[120]
+#define SWIGTYPE_p_svn_repos_notify_action_t swig_types[121]
+#define SWIGTYPE_p_svn_repos_notify_t swig_types[122]
+#define SWIGTYPE_p_svn_repos_notify_warning_t swig_types[123]
+#define SWIGTYPE_p_svn_repos_parse_fns2_t swig_types[124]
+#define SWIGTYPE_p_svn_repos_parse_fns3_t swig_types[125]
+#define SWIGTYPE_p_svn_repos_parse_fns_t swig_types[126]
+#define SWIGTYPE_p_svn_repos_revision_access_level_t swig_types[127]
+#define SWIGTYPE_p_svn_repos_t swig_types[128]
+#define SWIGTYPE_p_svn_stream_mark_t swig_types[129]
+#define SWIGTYPE_p_svn_stream_t swig_types[130]
+#define SWIGTYPE_p_svn_string_t swig_types[131]
+#define SWIGTYPE_p_svn_stringbuf_t swig_types[132]
+#define SWIGTYPE_p_svn_tristate_t swig_types[133]
+#define SWIGTYPE_p_svn_txdelta_op_t swig_types[134]
+#define SWIGTYPE_p_svn_txdelta_stream_t swig_types[135]
+#define SWIGTYPE_p_svn_txdelta_window_t swig_types[136]
+#define SWIGTYPE_p_svn_version_checklist_t swig_types[137]
+#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[138]
+#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[139]
+#define SWIGTYPE_p_svn_version_extended_t swig_types[140]
+#define SWIGTYPE_p_svn_version_t swig_types[141]
+#define SWIGTYPE_p_unsigned_long swig_types[142]
+#define SWIGTYPE_p_void swig_types[143]
+static swig_type_info *swig_types[145];
+static swig_module_info swig_module = {swig_types, 144, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
@@ -1943,7 +1941,7 @@ static VALUE mRepos;
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x020009 
+#define SWIGVERSION 0x020012 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -2006,7 +2004,7 @@ SWIG_ruby_failed(void)
 } 
 
 
-/*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2148,7 +2146,7 @@ SWIG_FromCharPtr(const char *cptr)
 }
 
 
-/*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2352,11 +2350,6 @@ static svn_error_t * svn_repos_invoke_authz_callback(
   return _obj(required, allowed, root, path, baton, pool);
 }
 
-static svn_error_t * svn_repos_invoke_file_rev_handler(
-  svn_repos_file_rev_handler_t _obj, void *baton, const char *path, svn_revnum_t rev, apr_hash_t *rev_props, svn_txdelta_window_handler_t *delta_handler, void **delta_baton, apr_array_header_t *prop_diffs, apr_pool_t *pool) {
-  return _obj(baton, path, rev, rev_props, delta_handler, delta_baton, prop_diffs, pool);
-}
-
 static void svn_repos_invoke_notify_func(
   svn_repos_notify_func_t _obj, void *baton, const svn_repos_notify_t *notify, apr_pool_t *scratch_pool) {
   _obj(baton, notify, scratch_pool);
@@ -2372,6 +2365,16 @@ static svn_error_t * svn_repos_invoke_history_func(
   return _obj(baton, path, revision, pool);
 }
 
+static svn_error_t * svn_repos_invoke_file_rev_handler(
+  svn_repos_file_rev_handler_t _obj, void *baton, const char *path, svn_revnum_t rev, apr_hash_t *rev_props, svn_txdelta_window_handler_t *delta_handler, void **delta_baton, apr_array_header_t *prop_diffs, apr_pool_t *pool) {
+  return _obj(baton, path, rev, rev_props, delta_handler, delta_baton, prop_diffs, pool);
+}
+
+static svn_error_t * svn_repos_invoke_verify_callback(
+  svn_repos_verify_callback_t _obj, void *baton, svn_revnum_t revision, svn_error_t *verify_err, apr_pool_t *scratch_pool) {
+  return _obj(baton, revision, verify_err, scratch_pool);
+}
+
 
 
 static VALUE
@@ -2515,7 +2518,7 @@ _wrap_svn_repos_dump_fs2(int argc, VALUE *argv, VALUE self) {
   arg6 = RTEST(argv[5]);
   arg7 = RTEST(argv[6]);
   {
-    arg8 = svn_swig_rb_cancel_func;
+    arg8 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg9 = (void *)svn_swig_rb_make_baton(argv[7], _global_svn_swig_rb_pool);
   }
   if (argc > 8) {
@@ -3087,6 +3090,112 @@ fail:
 
 
 SWIGINTERN VALUE
+_wrap_svn_repos_notify_t_start_revision_set(int argc, VALUE *argv, VALUE self) {
+  struct svn_repos_notify_t *arg1 = (struct svn_repos_notify_t *) 0 ;
+  svn_revnum_t arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  long val2 ;
+  int ecode2 = 0 ;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_repos_notify_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_repos_notify_t *","start_revision", 1, self )); 
+  }
+  arg1 = (struct svn_repos_notify_t *)(argp1);
+  ecode2 = SWIG_AsVal_long(argv[0], &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "svn_revnum_t","start_revision", 2, argv[0] ));
+  } 
+  arg2 = (svn_revnum_t)(val2);
+  if (arg1) (arg1)->start_revision = arg2;
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_svn_repos_notify_t_start_revision_get(int argc, VALUE *argv, VALUE self) {
+  struct svn_repos_notify_t *arg1 = (struct svn_repos_notify_t *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  svn_revnum_t result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_repos_notify_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_repos_notify_t *","start_revision", 1, self )); 
+  }
+  arg1 = (struct svn_repos_notify_t *)(argp1);
+  result = (svn_revnum_t) ((arg1)->start_revision);
+  vresult = SWIG_From_long((long)(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_svn_repos_notify_t_end_revision_set(int argc, VALUE *argv, VALUE self) {
+  struct svn_repos_notify_t *arg1 = (struct svn_repos_notify_t *) 0 ;
+  svn_revnum_t arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  long val2 ;
+  int ecode2 = 0 ;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_repos_notify_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_repos_notify_t *","end_revision", 1, self )); 
+  }
+  arg1 = (struct svn_repos_notify_t *)(argp1);
+  ecode2 = SWIG_AsVal_long(argv[0], &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "svn_revnum_t","end_revision", 2, argv[0] ));
+  } 
+  arg2 = (svn_revnum_t)(val2);
+  if (arg1) (arg1)->end_revision = arg2;
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_svn_repos_notify_t_end_revision_get(int argc, VALUE *argv, VALUE self) {
+  struct svn_repos_notify_t *arg1 = (struct svn_repos_notify_t *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  svn_revnum_t result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_repos_notify_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_repos_notify_t *","end_revision", 1, self )); 
+  }
+  arg1 = (struct svn_repos_notify_t *)(argp1);
+  result = (svn_revnum_t) ((arg1)->end_revision);
+  vresult = SWIG_From_long((long)(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
 _wrap_svn_repos_notify_create(int argc, VALUE *argv, VALUE self) {
   svn_repos_notify_action_t arg1 ;
   apr_pool_t *arg2 = (apr_pool_t *) 0 ;
@@ -3197,6 +3306,119 @@ fail:
 
 
 SWIGINTERN VALUE
+_wrap_svn_repos_open3(int argc, VALUE *argv, VALUE self) {
+  svn_repos_t **arg1 = (svn_repos_t **) 0 ;
+  char *arg2 = (char *) 0 ;
+  apr_hash_t *arg3 = (apr_hash_t *) 0 ;
+  apr_pool_t *arg4 = (apr_pool_t *) 0 ;
+  apr_pool_t *arg5 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  svn_repos_t *temp1 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg4);
+    _global_pool = arg4;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg5);
+    _global_pool = arg5;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  arg1 = &temp1;
+  if ((argc < 2) || (argc > 4)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  }
+  {
+    arg2 = StringValueCStr(argv[0]);
+  }
+  {
+    VALUE rb_pool = Qnil;
+    if (!_global_pool) {
+      svn_swig_rb_get_pool(argc, argv, self, &rb_pool, &_global_pool);
+      svn_swig_rb_push_pool(rb_pool);
+    }
+    arg3 = (NIL_P(argv[1])) ? NULL :
+    svn_swig_rb_hash_to_apr_hash_string(argv[1], _global_pool);
+    _global_pool = NULL;
+    if (!NIL_P(rb_pool)) {
+      if (NIL_P(arg3)) {
+        svn_swig_rb_destroy_pool(rb_pool);
+      } else {
+        svn_swig_rb_set_pool_for_no_swig_type(argv[1], rb_pool);
+      }
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+    }
+  }
+  if (argc > 2) {
+    
+  }
+  if (argc > 3) {
+    
+  }
+  {
+    result = (svn_error_t *)svn_repos_open3(arg1,(char const *)arg2,arg3,arg4,arg5);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  {
+    VALUE tmp;
+    tmp = SWIG_NewPointerObj(*arg1, SWIGTYPE_p_svn_repos_t, 0);
+    if (rb_block_given_p()) {
+      rb_yield(tmp);
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      DATA_PTR(tmp) = NULL;
+    } else {
+      vresult = SWIG_Ruby_AppendOutput(vresult, tmp);
+    }
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
+fail:
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
 _wrap_svn_repos_open2(int argc, VALUE *argv, VALUE self) {
   svn_repos_t **arg1 = (svn_repos_t **) 0 ;
   char *arg2 = (char *) 0 ;
@@ -3749,6 +3971,322 @@ fail:
 
 
 SWIGINTERN VALUE
+_wrap_svn_repos_capabilities(int argc, VALUE *argv, VALUE self) {
+  apr_hash_t **arg1 = (apr_hash_t **) 0 ;
+  svn_repos_t *arg2 = (svn_repos_t *) 0 ;
+  apr_pool_t *arg3 = (apr_pool_t *) 0 ;
+  apr_pool_t *arg4 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  apr_hash_t *temp1 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg3);
+    _global_pool = arg3;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg4);
+    _global_pool = arg4;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  arg1 = &temp1;
+  if ((argc < 1) || (argc > 3)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_svn_repos_t, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "svn_repos_t *","svn_repos_capabilities", 2, argv[0] )); 
+  }
+  arg2 = (svn_repos_t *)(argp2);
+  if (argc > 1) {
+    
+  }
+  if (argc > 2) {
+    
+  }
+  {
+    if (!arg2) {
+      svn_swig_rb_raise_svn_repos_already_close();
+    }
+  }
+  {
+    result = (svn_error_t *)svn_repos_capabilities(arg1,arg2,arg3,arg4);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  {
+    /* FIXME: Missing argout typemap: svn_repos_capabilities arg 1 (apr_hash_t **) */
+    
+    
+    
+    
+    SWIG_exception(SWIG_ValueError, "svn_repos_capabilities is not implemented yet");
+    
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
+fail:
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_svn_repos_remember_client_capabilities(int argc, VALUE *argv, VALUE self) {
+  svn_repos_t *arg1 = (svn_repos_t *) 0 ;
+  apr_array_header_t *arg2 = (apr_array_header_t *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 2) || (argc > 2)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_svn_repos_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "svn_repos_t *","svn_repos_remember_client_capabilities", 1, argv[0] )); 
+  }
+  arg1 = (svn_repos_t *)(argp1);
+  res2 = SWIG_ConvertPtr(argv[1], &argp2,SWIGTYPE_p_apr_array_header_t, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "apr_array_header_t const *","svn_repos_remember_client_capabilities", 2, argv[1] )); 
+  }
+  arg2 = (apr_array_header_t *)(argp2);
+  {
+    if (!arg1) {
+      svn_swig_rb_raise_svn_repos_already_close();
+    }
+  }
+  {
+    result = (svn_error_t *)svn_repos_remember_client_capabilities(arg1,(apr_array_header_t const *)arg2);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_svn_repos_fs_type(int argc, VALUE *argv, VALUE self) {
+  svn_repos_t *arg1 = (svn_repos_t *) 0 ;
+  apr_pool_t *arg2 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  char *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg2);
+    _global_pool = arg2;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  if ((argc < 1) || (argc > 2)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_svn_repos_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "svn_repos_t *","svn_repos_fs_type", 1, argv[0] )); 
+  }
+  arg1 = (svn_repos_t *)(argp1);
+  if (argc > 1) {
+    
+  }
+  {
+    if (!arg1) {
+      svn_swig_rb_raise_svn_repos_already_close();
+    }
+  }
+  {
+    result = (char *)svn_repos_fs_type(arg1,arg2);
+    
+    
+    
+  }
+  {
+    if (result) {
+      vresult = rb_str_new2(result);
+    } else {
+      vresult = Qnil;
+    }
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
+fail:
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_svn_repos_hotcopy3(int argc, VALUE *argv, VALUE self) {
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  svn_boolean_t arg3 ;
+  svn_boolean_t arg4 ;
+  svn_repos_notify_func_t arg5 = (svn_repos_notify_func_t) 0 ;
+  void *arg6 = (void *) 0 ;
+  svn_cancel_func_t arg7 = (svn_cancel_func_t) 0 ;
+  void *arg8 = (void *) 0 ;
+  apr_pool_t *arg9 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  int res1 ;
+  char *buf1 = 0 ;
+  int alloc1 = 0 ;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
+  int res6 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg9);
+    _global_pool = arg9;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  if ((argc < 7) || (argc > 8)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 7)",argc); SWIG_fail;
+  }
+  res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","svn_repos_hotcopy3", 1, argv[0] ));
+  }
+  arg1 = (char *)(buf1);
+  res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","svn_repos_hotcopy3", 2, argv[1] ));
+  }
+  arg2 = (char *)(buf2);
+  arg3 = RTEST(argv[2]);
+  arg4 = RTEST(argv[3]);
+  {
+    int res = SWIG_ConvertFunctionPtr(argv[4], (void**)(&arg5), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void);
+    if (!SWIG_IsOK(res)) {
+      SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_repos_notify_func_t","svn_repos_hotcopy3", 5, argv[4] )); 
+    }
+  }
+  res6 = SWIG_ConvertPtr(argv[5],SWIG_as_voidptrptr(&arg6), 0, 0);
+  if (!SWIG_IsOK(res6)) {
+    SWIG_exception_fail(SWIG_ArgError(res6), Ruby_Format_TypeError( "", "void *","svn_repos_hotcopy3", 6, argv[5] )); 
+  }
+  {
+    arg7 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
+    arg8 = (void *)svn_swig_rb_make_baton(argv[6], _global_svn_swig_rb_pool);
+  }
+  if (argc > 7) {
+    
+  }
+  {
+    result = (svn_error_t *)svn_repos_hotcopy3((char const *)arg1,(char const *)arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  {
+    svn_swig_rb_set_baton(vresult, (VALUE)arg8);
+  }
+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
+fail:
+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
 _wrap_svn_repos_hotcopy2(int argc, VALUE *argv, VALUE self) {
   char *arg1 = (char *) 0 ;
   char *arg2 = (char *) 0 ;
@@ -3789,7 +4327,7 @@ _wrap_svn_repos_hotcopy2(int argc, VALUE *argv, VALUE self) {
   arg3 = RTEST(argv[2]);
   arg4 = RTEST(argv[3]);
   {
-    arg5 = svn_swig_rb_cancel_func;
+    arg5 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg6 = (void *)svn_swig_rb_make_baton(argv[4], _global_svn_swig_rb_pool);
   }
   if (argc > 5) {
@@ -3953,7 +4491,7 @@ _wrap_svn_repos_fs_pack2(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "void *","svn_repos_fs_pack2", 3, argv[2] )); 
   }
   {
-    arg4 = svn_swig_rb_cancel_func;
+    arg4 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg5 = (void *)svn_swig_rb_make_baton(argv[3], _global_svn_swig_rb_pool);
   }
   if (argc > 4) {
@@ -4041,7 +4579,7 @@ _wrap_svn_repos_fs_pack(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "void *","svn_repos_fs_pack", 3, argv[2] )); 
   }
   {
-    arg4 = svn_swig_rb_cancel_func;
+    arg4 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg5 = (void *)svn_swig_rb_make_baton(argv[3], _global_svn_swig_rb_pool);
   }
   if (argc > 4) {
@@ -4127,7 +4665,7 @@ _wrap_svn_repos_recover4(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res4), Ruby_Format_TypeError( "", "void *","svn_repos_recover4", 4, argv[3] )); 
   }
   {
-    arg5 = svn_swig_rb_cancel_func;
+    arg5 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg6 = (void *)svn_swig_rb_make_baton(argv[4], _global_svn_swig_rb_pool);
   }
   if (argc > 5) {
@@ -4201,7 +4739,7 @@ _wrap_svn_repos_recover3(int argc, VALUE *argv, VALUE self) {
     arg4 = (void *)svn_swig_rb_make_baton(argv[2], _global_svn_swig_rb_pool);
   }
   {
-    arg5 = svn_swig_rb_cancel_func;
+    arg5 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg6 = (void *)svn_swig_rb_make_baton(argv[3], _global_svn_swig_rb_pool);
   }
   if (argc > 4) {
@@ -5774,7 +6312,7 @@ _wrap_svn_repos_begin_report3(int argc, VALUE *argv, VALUE self) {
     }
   }
   {
-    arg13 = svn_swig_rb_repos_authz_func;
+    arg13 = (svn_repos_authz_func_t) svn_swig_rb_repos_authz_func;
     arg14 = (void *)svn_swig_rb_make_baton(argv[10], _global_svn_swig_rb_pool);
   }
   ecode15 = SWIG_AsVal_unsigned_SS_long(argv[11], &val15);
@@ -5919,7 +6457,7 @@ _wrap_svn_repos_begin_report2(int argc, VALUE *argv, VALUE self) {
     }
   }
   {
-    arg13 = svn_swig_rb_repos_authz_func;
+    arg13 = (svn_repos_authz_func_t) svn_swig_rb_repos_authz_func;
     arg14 = (void *)svn_swig_rb_make_baton(argv[10], _global_svn_swig_rb_pool);
   }
   if (argc > 11) {
@@ -6063,7 +6601,7 @@ _wrap_svn_repos_begin_report(int argc, VALUE *argv, VALUE self) {
     }
   }
   {
-    arg13 = svn_swig_rb_repos_authz_func;
+    arg13 = (svn_repos_authz_func_t) svn_swig_rb_repos_authz_func;
     arg14 = (void *)svn_swig_rb_make_baton(argv[10], _global_svn_swig_rb_pool);
   }
   if (argc > 11) {
@@ -6885,7 +7423,7 @@ _wrap_svn_repos_dir_delta2(int argc, VALUE *argv, VALUE self) {
     }
   }
   {
-    arg8 = svn_swig_rb_repos_authz_func;
+    arg8 = (svn_repos_authz_func_t) svn_swig_rb_repos_authz_func;
     arg9 = (void *)svn_swig_rb_make_baton(argv[6], _global_svn_swig_rb_pool);
   }
   arg10 = RTEST(argv[7]);
@@ -7011,7 +7549,7 @@ _wrap_svn_repos_dir_delta(int argc, VALUE *argv, VALUE self) {
     }
   }
   {
-    arg8 = svn_swig_rb_repos_authz_func;
+    arg8 = (svn_repos_authz_func_t) svn_swig_rb_repos_authz_func;
     arg9 = (void *)svn_swig_rb_make_baton(argv[6], _global_svn_swig_rb_pool);
   }
   arg10 = RTEST(argv[7]);
@@ -7117,7 +7655,7 @@ _wrap_svn_repos_replay2(int argc, VALUE *argv, VALUE self) {
     }
   }
   {
-    arg7 = svn_swig_rb_repos_authz_func;
+    arg7 = (svn_repos_authz_func_t) svn_swig_rb_repos_authz_func;
     arg8 = (void *)svn_swig_rb_make_baton(argv[5], _global_svn_swig_rb_pool);
   }
   if (argc > 6) {
@@ -7317,7 +7855,7 @@ _wrap_svn_repos_get_commit_editor5(int argc, VALUE *argv, VALUE self) {
     arg9 = (void *)svn_swig_rb_make_baton(argv[5], _global_svn_swig_rb_pool);
   }
   {
-    arg10 = svn_swig_rb_repos_authz_callback;
+    arg10 = (svn_repos_authz_callback_t) svn_swig_rb_repos_authz_callback;
     arg11 = (void *)svn_swig_rb_make_baton(argv[6], _global_svn_swig_rb_pool);
   }
   if (argc > 7) {
@@ -7456,7 +7994,7 @@ _wrap_svn_repos_get_commit_editor4(int argc, VALUE *argv, VALUE self) {
     arg10 = (void *)svn_swig_rb_make_baton(argv[6], _global_svn_swig_rb_pool);
   }
   {
-    arg11 = svn_swig_rb_repos_authz_callback;
+    arg11 = (svn_repos_authz_callback_t) svn_swig_rb_repos_authz_callback;
     arg12 = (void *)svn_swig_rb_make_baton(argv[7], _global_svn_swig_rb_pool);
   }
   if (argc > 8) {
@@ -7595,7 +8133,7 @@ _wrap_svn_repos_get_commit_editor3(int argc, VALUE *argv, VALUE self) {
     arg10 = (void *)svn_swig_rb_make_baton(argv[6], _global_svn_swig_rb_pool);
   }
   {
-    arg11 = svn_swig_rb_repos_authz_callback;
+    arg11 = (svn_repos_authz_callback_t) svn_swig_rb_repos_authz_callback;
     arg12 = (void *)svn_swig_rb_make_baton(argv[7], _global_svn_swig_rb_pool);
   }
   if (argc > 8) {
@@ -8289,11 +8827,11 @@ _wrap_svn_repos_history2(int argc, VALUE *argv, VALUE self) {
     arg2 = StringValueCStr(argv[1]);
   }
   {
-    arg3 = svn_swig_rb_repos_history_func;
+    arg3 = (svn_repos_history_func_t) svn_swig_rb_repos_history_func;
     arg4 = (void *)svn_swig_rb_make_baton(argv[2], _global_svn_swig_rb_pool);
   }
   {
-    arg5 = svn_swig_rb_repos_authz_func;
+    arg5 = (svn_repos_authz_func_t) svn_swig_rb_repos_authz_func;
     arg6 = (void *)svn_swig_rb_make_baton(argv[3], _global_svn_swig_rb_pool);
   }
   ecode7 = SWIG_AsVal_long(argv[4], &val7);
@@ -8387,7 +8925,7 @@ _wrap_svn_repos_history(int argc, VALUE *argv, VALUE self) {
     arg2 = StringValueCStr(argv[1]);
   }
   {
-    arg3 = svn_swig_rb_repos_history_func;
+    arg3 = (svn_repos_history_func_t) svn_swig_rb_repos_history_func;
     arg4 = (void *)svn_swig_rb_make_baton(argv[2], _global_svn_swig_rb_pool);
   }
   ecode5 = SWIG_AsVal_long(argv[3], &val5);
@@ -8494,7 +9032,7 @@ _wrap_svn_repos_trace_node_locations(int argc, VALUE *argv, VALUE self) {
     arg5 = svn_swig_rb_array_to_apr_array_revnum(argv[3], _global_pool);
   }
   {
-    arg6 = svn_swig_rb_repos_authz_func;
+    arg6 = (svn_repos_authz_func_t) svn_swig_rb_repos_authz_func;
     arg7 = (void *)svn_swig_rb_make_baton(argv[4], _global_svn_swig_rb_pool);
   }
   if (argc > 5) {
@@ -8612,7 +9150,7 @@ _wrap_svn_repos_node_location_segments(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res7), Ruby_Format_TypeError( "", "void *","svn_repos_node_location_segments", 7, argv[6] )); 
   }
   {
-    arg8 = svn_swig_rb_repos_authz_func;
+    arg8 = (svn_repos_authz_func_t) svn_swig_rb_repos_authz_func;
     arg9 = (void *)svn_swig_rb_make_baton(argv[7], _global_svn_swig_rb_pool);
   }
   if (argc > 8) {
@@ -8725,11 +9263,11 @@ _wrap_svn_repos_get_logs4(int argc, VALUE *argv, VALUE self) {
     svn_swig_rb_strings_to_apr_array(argv[8], _global_pool);
   }
   {
-    arg10 = svn_swig_rb_repos_authz_func;
+    arg10 = (svn_repos_authz_func_t) svn_swig_rb_repos_authz_func;
     arg11 = (void *)svn_swig_rb_make_baton(argv[9], _global_svn_swig_rb_pool);
   }
   {
-    arg12 = svn_swig_rb_log_entry_receiver;
+    arg12 = (svn_log_entry_receiver_t) svn_swig_rb_log_entry_receiver;
     arg13 = (void *)svn_swig_rb_make_baton(argv[10], _global_svn_swig_rb_pool);
   }
   if (argc > 11) {
@@ -8835,11 +9373,11 @@ _wrap_svn_repos_get_logs3(int argc, VALUE *argv, VALUE self) {
   arg6 = RTEST(argv[5]);
   arg7 = RTEST(argv[6]);
   {
-    arg8 = svn_swig_rb_repos_authz_func;
+    arg8 = (svn_repos_authz_func_t) svn_swig_rb_repos_authz_func;
     arg9 = (void *)svn_swig_rb_make_baton(argv[7], _global_svn_swig_rb_pool);
   }
   {
-    arg10 = svn_swig_rb_log_receiver;
+    arg10 = (svn_log_message_receiver_t) svn_swig_rb_log_receiver;
     arg11 = (void *)svn_swig_rb_make_baton(argv[8], _global_svn_swig_rb_pool);
   }
   if (argc > 9) {
@@ -8937,11 +9475,11 @@ _wrap_svn_repos_get_logs2(int argc, VALUE *argv, VALUE self) {
   arg5 = RTEST(argv[4]);
   arg6 = RTEST(argv[5]);
   {
-    arg7 = svn_swig_rb_repos_authz_func;
+    arg7 = (svn_repos_authz_func_t) svn_swig_rb_repos_authz_func;
     arg8 = (void *)svn_swig_rb_make_baton(argv[6], _global_svn_swig_rb_pool);
   }
   {
-    arg9 = svn_swig_rb_log_receiver;
+    arg9 = (svn_log_message_receiver_t) svn_swig_rb_log_receiver;
     arg10 = (void *)svn_swig_rb_make_baton(argv[7], _global_svn_swig_rb_pool);
   }
   if (argc > 8) {
@@ -9037,7 +9575,7 @@ _wrap_svn_repos_get_logs(int argc, VALUE *argv, VALUE self) {
   arg5 = RTEST(argv[4]);
   arg6 = RTEST(argv[5]);
   {
-    arg7 = svn_swig_rb_log_receiver;
+    arg7 = (svn_log_message_receiver_t) svn_swig_rb_log_receiver;
     arg8 = (void *)svn_swig_rb_make_baton(argv[6], _global_svn_swig_rb_pool);
   }
   if (argc > 7) {
@@ -9130,7 +9668,7 @@ _wrap_svn_repos_fs_get_mergeinfo(int argc, VALUE *argv, VALUE self) {
   }
   arg6 = RTEST(argv[4]);
   {
-    arg7 = svn_swig_rb_repos_authz_func;
+    arg7 = (svn_repos_authz_func_t) svn_swig_rb_repos_authz_func;
     arg8 = (void *)svn_swig_rb_make_baton(argv[5], _global_svn_swig_rb_pool);
   }
   if (argc > 6) {
@@ -9230,7 +9768,7 @@ _wrap_svn_repos_get_file_revs2(int argc, VALUE *argv, VALUE self) {
   arg4 = (svn_revnum_t)(val4);
   arg5 = RTEST(argv[4]);
   {
-    arg6 = svn_swig_rb_repos_authz_func;
+    arg6 = (svn_repos_authz_func_t) svn_swig_rb_repos_authz_func;
     arg7 = (void *)svn_swig_rb_make_baton(argv[5], _global_svn_swig_rb_pool);
   }
   {
@@ -9334,11 +9872,11 @@ _wrap_svn_repos_get_file_revs(int argc, VALUE *argv, VALUE self) {
   } 
   arg4 = (svn_revnum_t)(val4);
   {
-    arg5 = svn_swig_rb_repos_authz_func;
+    arg5 = (svn_repos_authz_func_t) svn_swig_rb_repos_authz_func;
     arg6 = (void *)svn_swig_rb_make_baton(argv[4], _global_svn_swig_rb_pool);
   }
   {
-    arg7 = svn_swig_rb_repos_file_rev_handler;
+    arg7 = (svn_repos_file_rev_handler_t) svn_swig_rb_repos_file_rev_handler;
     arg8 = (void *)svn_swig_rb_make_baton(argv[5], _global_svn_swig_rb_pool);
   }
   if (argc > 6) {
@@ -9766,6 +10304,132 @@ fail:
 
 
 SWIGINTERN VALUE
+_wrap_svn_repos_fs_lock_many(int argc, VALUE *argv, VALUE self) {
+  svn_repos_t *arg1 = (svn_repos_t *) 0 ;
+  apr_hash_t *arg2 = (apr_hash_t *) 0 ;
+  char *arg3 = (char *) 0 ;
+  svn_boolean_t arg4 ;
+  apr_time_t arg5 ;
+  svn_boolean_t arg6 ;
+  svn_fs_lock_callback_t arg7 = (svn_fs_lock_callback_t) 0 ;
+  void *arg8 = (void *) 0 ;
+  apr_pool_t *arg9 = (apr_pool_t *) 0 ;
+  apr_pool_t *arg10 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int res8 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg9);
+    _global_pool = arg9;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg10);
+    _global_pool = arg10;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  if ((argc < 8) || (argc > 10)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 8)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_svn_repos_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "svn_repos_t *","svn_repos_fs_lock_many", 1, argv[0] )); 
+  }
+  arg1 = (svn_repos_t *)(argp1);
+  res2 = SWIG_ConvertPtr(argv[1], &argp2,SWIGTYPE_p_apr_hash_t, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "apr_hash_t *","svn_repos_fs_lock_many", 2, argv[1] )); 
+  }
+  arg2 = (apr_hash_t *)(argp2);
+  {
+    if (NIL_P(argv[2])) {
+      arg3 = NULL;
+    } else {
+      arg3 = StringValuePtr(argv[2]);
+    }
+  }
+  arg4 = RTEST(argv[3]);
+  {
+    arg5 = (apr_time_t)NUM2LL(argv[4]);
+  }
+  arg6 = RTEST(argv[5]);
+  {
+    int res = SWIG_ConvertFunctionPtr(argv[6], (void**)(&arg7), SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t);
+    if (!SWIG_IsOK(res)) {
+      SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_fs_lock_callback_t","svn_repos_fs_lock_many", 7, argv[6] )); 
+    }
+  }
+  res8 = SWIG_ConvertPtr(argv[7],SWIG_as_voidptrptr(&arg8), 0, 0);
+  if (!SWIG_IsOK(res8)) {
+    SWIG_exception_fail(SWIG_ArgError(res8), Ruby_Format_TypeError( "", "void *","svn_repos_fs_lock_many", 8, argv[7] )); 
+  }
+  if (argc > 8) {
+    
+  }
+  if (argc > 9) {
+    
+  }
+  {
+    if (!arg1) {
+      svn_swig_rb_raise_svn_repos_already_close();
+    }
+  }
+  {
+    result = (svn_error_t *)svn_repos_fs_lock_many(arg1,arg2,(char const *)arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
+fail:
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
 _wrap_svn_repos_fs_lock(int argc, VALUE *argv, VALUE self) {
   svn_lock_t **arg1 = (svn_lock_t **) 0 ;
   svn_repos_t *arg2 = (svn_repos_t *) 0 ;
@@ -9874,6 +10538,118 @@ fail:
 
 
 SWIGINTERN VALUE
+_wrap_svn_repos_fs_unlock_many(int argc, VALUE *argv, VALUE self) {
+  svn_repos_t *arg1 = (svn_repos_t *) 0 ;
+  apr_hash_t *arg2 = (apr_hash_t *) 0 ;
+  svn_boolean_t arg3 ;
+  svn_fs_lock_callback_t arg4 = (svn_fs_lock_callback_t) 0 ;
+  void *arg5 = (void *) 0 ;
+  apr_pool_t *arg6 = (apr_pool_t *) 0 ;
+  apr_pool_t *arg7 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int res5 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg6);
+    _global_pool = arg6;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg7);
+    _global_pool = arg7;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  if ((argc < 5) || (argc > 7)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 5)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_svn_repos_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "svn_repos_t *","svn_repos_fs_unlock_many", 1, argv[0] )); 
+  }
+  arg1 = (svn_repos_t *)(argp1);
+  res2 = SWIG_ConvertPtr(argv[1], &argp2,SWIGTYPE_p_apr_hash_t, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "apr_hash_t *","svn_repos_fs_unlock_many", 2, argv[1] )); 
+  }
+  arg2 = (apr_hash_t *)(argp2);
+  arg3 = RTEST(argv[2]);
+  {
+    int res = SWIG_ConvertFunctionPtr(argv[3], (void**)(&arg4), SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t);
+    if (!SWIG_IsOK(res)) {
+      SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_fs_lock_callback_t","svn_repos_fs_unlock_many", 4, argv[3] )); 
+    }
+  }
+  res5 = SWIG_ConvertPtr(argv[4],SWIG_as_voidptrptr(&arg5), 0, 0);
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), Ruby_Format_TypeError( "", "void *","svn_repos_fs_unlock_many", 5, argv[4] )); 
+  }
+  if (argc > 5) {
+    
+  }
+  if (argc > 6) {
+    
+  }
+  {
+    if (!arg1) {
+      svn_swig_rb_raise_svn_repos_already_close();
+    }
+  }
+  {
+    result = (svn_error_t *)svn_repos_fs_unlock_many(arg1,arg2,arg3,arg4,arg5,arg6,arg7);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
+fail:
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
 _wrap_svn_repos_fs_unlock(int argc, VALUE *argv, VALUE self) {
   svn_repos_t *arg1 = (svn_repos_t *) 0 ;
   char *arg2 = (char *) 0 ;
@@ -9991,7 +10767,7 @@ _wrap_svn_repos_fs_get_locks2(int argc, VALUE *argv, VALUE self) {
     arg4 = svn_swig_rb_to_depth(argv[2]);
   }
   {
-    arg5 = svn_swig_rb_repos_authz_func;
+    arg5 = (svn_repos_authz_func_t) svn_swig_rb_repos_authz_func;
     arg6 = (void *)svn_swig_rb_make_baton(argv[3], _global_svn_swig_rb_pool);
   }
   if (argc > 4) {
@@ -10076,7 +10852,7 @@ _wrap_svn_repos_fs_get_locks(int argc, VALUE *argv, VALUE self) {
     arg3 = StringValueCStr(argv[1]);
   }
   {
-    arg4 = svn_swig_rb_repos_authz_func;
+    arg4 = (svn_repos_authz_func_t) svn_swig_rb_repos_authz_func;
     arg5 = (void *)svn_swig_rb_make_baton(argv[2], _global_svn_swig_rb_pool);
   }
   if (argc > 3) {
@@ -10203,7 +10979,7 @@ _wrap_svn_repos_fs_change_rev_prop4(int argc, VALUE *argv, VALUE self) {
   arg7 = RTEST(argv[6]);
   arg8 = RTEST(argv[7]);
   {
-    arg9 = svn_swig_rb_repos_authz_func;
+    arg9 = (svn_repos_authz_func_t) svn_swig_rb_repos_authz_func;
     arg10 = (void *)svn_swig_rb_make_baton(argv[8], _global_svn_swig_rb_pool);
   }
   if (argc > 9) {
@@ -10327,7 +11103,7 @@ _wrap_svn_repos_fs_change_rev_prop3(int argc, VALUE *argv, VALUE self) {
   arg6 = RTEST(argv[5]);
   arg7 = RTEST(argv[6]);
   {
-    arg8 = svn_swig_rb_repos_authz_func;
+    arg8 = (svn_repos_authz_func_t) svn_swig_rb_repos_authz_func;
     arg9 = (void *)svn_swig_rb_make_baton(argv[7], _global_svn_swig_rb_pool);
   }
   if (argc > 8) {
@@ -10440,7 +11216,7 @@ _wrap_svn_repos_fs_change_rev_prop2(int argc, VALUE *argv, VALUE self) {
     }
   }
   {
-    arg6 = svn_swig_rb_repos_authz_func;
+    arg6 = (svn_repos_authz_func_t) svn_swig_rb_repos_authz_func;
     arg7 = (void *)svn_swig_rb_make_baton(argv[5], _global_svn_swig_rb_pool);
   }
   if (argc > 6) {
@@ -10643,7 +11419,7 @@ _wrap_svn_repos_fs_revision_prop(int argc, VALUE *argv, VALUE self) {
   }
   arg4 = (char *)(buf4);
   {
-    arg5 = svn_swig_rb_repos_authz_func;
+    arg5 = (svn_repos_authz_func_t) svn_swig_rb_repos_authz_func;
     arg6 = (void *)svn_swig_rb_make_baton(argv[3], _global_svn_swig_rb_pool);
   }
   if (argc > 4) {
@@ -10735,7 +11511,7 @@ _wrap_svn_repos_fs_revision_proplist(int argc, VALUE *argv, VALUE self) {
   } 
   arg3 = (svn_revnum_t)(val3);
   {
-    arg4 = svn_swig_rb_repos_authz_func;
+    arg4 = (svn_repos_authz_func_t) svn_swig_rb_repos_authz_func;
     arg5 = (void *)svn_swig_rb_make_baton(argv[2], _global_svn_swig_rb_pool);
   }
   if (argc > 3) {
@@ -10871,6 +11647,123 @@ fail:
 
 
 SWIGINTERN VALUE
+_wrap_svn_repos_fs_get_inherited_props(int argc, VALUE *argv, VALUE self) {
+  apr_array_header_t **arg1 = (apr_array_header_t **) 0 ;
+  svn_fs_root_t *arg2 = (svn_fs_root_t *) 0 ;
+  char *arg3 = (char *) 0 ;
+  char *arg4 = (char *) 0 ;
+  svn_repos_authz_func_t arg5 = (svn_repos_authz_func_t) 0 ;
+  void *arg6 = (void *) 0 ;
+  apr_pool_t *arg7 = (apr_pool_t *) 0 ;
+  apr_pool_t *arg8 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  apr_array_header_t *temp1 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int res4 ;
+  char *buf4 = 0 ;
+  int alloc4 = 0 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg7);
+    _global_pool = arg7;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg8);
+    _global_pool = arg8;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  arg1 = &temp1;
+  if ((argc < 4) || (argc > 6)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc); SWIG_fail;
+  }
+  res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_svn_fs_root_t, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "svn_fs_root_t *","svn_repos_fs_get_inherited_props", 2, argv[0] )); 
+  }
+  arg2 = (svn_fs_root_t *)(argp2);
+  {
+    arg3 = StringValueCStr(argv[1]);
+  }
+  res4 = SWIG_AsCharPtrAndSize(argv[2], &buf4, NULL, &alloc4);
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), Ruby_Format_TypeError( "", "char const *","svn_repos_fs_get_inherited_props", 4, argv[2] ));
+  }
+  arg4 = (char *)(buf4);
+  {
+    arg5 = (svn_repos_authz_func_t) svn_swig_rb_repos_authz_func;
+    arg6 = (void *)svn_swig_rb_make_baton(argv[3], _global_svn_swig_rb_pool);
+  }
+  if (argc > 4) {
+    
+  }
+  if (argc > 5) {
+    
+  }
+  {
+    result = (svn_error_t *)svn_repos_fs_get_inherited_props(arg1,arg2,(char const *)arg3,(char const *)arg4,arg5,arg6,arg7,arg8);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  {
+    /* FIXME: Missing argout typemap: svn_repos_fs_get_inherited_props arg 1 (apr_array_header_t **) */
+    
+    
+    
+    
+    SWIG_exception(SWIG_ValueError, "svn_repos_fs_get_inherited_props is not implemented yet");
+    
+  }
+  if (alloc4 == SWIG_NEWOBJ) free((char*)buf4);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
+fail:
+  if (alloc4 == SWIG_NEWOBJ) free((char*)buf4);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
 _wrap_svn_repos_fs_change_txn_prop(int argc, VALUE *argv, VALUE self) {
   svn_fs_txn_t *arg1 = (svn_fs_txn_t *) 0 ;
   char *arg2 = (char *) 0 ;
@@ -11716,6 +12609,242 @@ fail:
 
 
 SWIGINTERN VALUE
+_wrap_svn_repos_info_format(int argc, VALUE *argv, VALUE self) {
+  int *arg1 = (int *) 0 ;
+  svn_version_t **arg2 = (svn_version_t **) 0 ;
+  svn_repos_t *arg3 = (svn_repos_t *) 0 ;
+  apr_pool_t *arg4 = (apr_pool_t *) 0 ;
+  apr_pool_t *arg5 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  int temp1 ;
+  int res1 = SWIG_TMPOBJ ;
+  svn_version_t *temp2 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg4);
+    _global_pool = arg4;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg5);
+    _global_pool = arg5;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  arg1 = &temp1;
+  arg2 = &temp2;
+  if ((argc < 1) || (argc > 3)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res3 = SWIG_ConvertPtr(argv[0], &argp3,SWIGTYPE_p_svn_repos_t, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "svn_repos_t *","svn_repos_info_format", 3, argv[0] )); 
+  }
+  arg3 = (svn_repos_t *)(argp3);
+  if (argc > 1) {
+    
+  }
+  if (argc > 2) {
+    
+  }
+  {
+    if (!arg3) {
+      svn_swig_rb_raise_svn_repos_already_close();
+    }
+  }
+  {
+    result = (svn_error_t *)svn_repos_info_format(arg1,arg2,arg3,arg4,arg5);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  if (SWIG_IsTmpObj(res1)) {
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_From_int((*arg1)));
+  } else {
+    int new_flags = SWIG_IsNewObj(res1) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj((void*)(arg1), SWIGTYPE_p_int, new_flags));
+  }
+  {
+    /* FIXME: Missing argout typemap: svn_repos_info_format arg 2 (svn_version_t **) */
+    
+    
+    
+    
+    SWIG_exception(SWIG_ValueError, "svn_repos_info_format is not implemented yet");
+    
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
+fail:
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_svn_repos_verify_fs3(int argc, VALUE *argv, VALUE self) {
+  svn_repos_t *arg1 = (svn_repos_t *) 0 ;
+  svn_revnum_t arg2 ;
+  svn_revnum_t arg3 ;
+  svn_boolean_t arg4 ;
+  svn_boolean_t arg5 ;
+  svn_repos_notify_func_t arg6 = (svn_repos_notify_func_t) 0 ;
+  void *arg7 = (void *) 0 ;
+  svn_repos_verify_callback_t arg8 = (svn_repos_verify_callback_t) 0 ;
+  void *arg9 = (void *) 0 ;
+  svn_cancel_func_t arg10 = (svn_cancel_func_t) 0 ;
+  void *arg11 = (void *) 0 ;
+  apr_pool_t *arg12 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  long val2 ;
+  int ecode2 = 0 ;
+  long val3 ;
+  int ecode3 = 0 ;
+  int res7 ;
+  int res9 ;
+  int res11 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg12);
+    _global_pool = arg12;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  if ((argc < 11) || (argc > 12)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 11)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_svn_repos_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "svn_repos_t *","svn_repos_verify_fs3", 1, argv[0] )); 
+  }
+  arg1 = (svn_repos_t *)(argp1);
+  ecode2 = SWIG_AsVal_long(argv[1], &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "svn_revnum_t","svn_repos_verify_fs3", 2, argv[1] ));
+  } 
+  arg2 = (svn_revnum_t)(val2);
+  ecode3 = SWIG_AsVal_long(argv[2], &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), Ruby_Format_TypeError( "", "svn_revnum_t","svn_repos_verify_fs3", 3, argv[2] ));
+  } 
+  arg3 = (svn_revnum_t)(val3);
+  arg4 = RTEST(argv[3]);
+  arg5 = RTEST(argv[4]);
+  {
+    int res = SWIG_ConvertFunctionPtr(argv[5], (void**)(&arg6), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void);
+    if (!SWIG_IsOK(res)) {
+      SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_repos_notify_func_t","svn_repos_verify_fs3", 6, argv[5] )); 
+    }
+  }
+  res7 = SWIG_ConvertPtr(argv[6],SWIG_as_voidptrptr(&arg7), 0, 0);
+  if (!SWIG_IsOK(res7)) {
+    SWIG_exception_fail(SWIG_ArgError(res7), Ruby_Format_TypeError( "", "void *","svn_repos_verify_fs3", 7, argv[6] )); 
+  }
+  {
+    int res = SWIG_ConvertFunctionPtr(argv[7], (void**)(&arg8), SWIGTYPE_p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t);
+    if (!SWIG_IsOK(res)) {
+      SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_repos_verify_callback_t","svn_repos_verify_fs3", 8, argv[7] )); 
+    }
+  }
+  res9 = SWIG_ConvertPtr(argv[8],SWIG_as_voidptrptr(&arg9), 0, 0);
+  if (!SWIG_IsOK(res9)) {
+    SWIG_exception_fail(SWIG_ArgError(res9), Ruby_Format_TypeError( "", "void *","svn_repos_verify_fs3", 9, argv[8] )); 
+  }
+  {
+    int res = SWIG_ConvertFunctionPtr(argv[9], (void**)(&arg10), SWIGTYPE_p_f_p_void__p_svn_error_t);
+    if (!SWIG_IsOK(res)) {
+      SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_cancel_func_t","svn_repos_verify_fs3", 10, argv[9] )); 
+    }
+  }
+  res11 = SWIG_ConvertPtr(argv[10],SWIG_as_voidptrptr(&arg11), 0, 0);
+  if (!SWIG_IsOK(res11)) {
+    SWIG_exception_fail(SWIG_ArgError(res11), Ruby_Format_TypeError( "", "void *","svn_repos_verify_fs3", 11, argv[10] )); 
+  }
+  if (argc > 11) {
+    
+  }
+  {
+    if (!arg1) {
+      svn_swig_rb_raise_svn_repos_already_close();
+    }
+  }
+  {
+    result = (svn_error_t *)svn_repos_verify_fs3(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
+fail:
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
 _wrap_svn_repos_verify_fs2(int argc, VALUE *argv, VALUE self) {
   svn_repos_t *arg1 = (svn_repos_t *) 0 ;
   svn_revnum_t arg2 ;
@@ -11874,7 +13003,7 @@ _wrap_svn_repos_verify_fs(int argc, VALUE *argv, VALUE self) {
   } 
   arg4 = (svn_revnum_t)(val4);
   {
-    arg5 = svn_swig_rb_cancel_func;
+    arg5 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg6 = (void *)svn_swig_rb_make_baton(argv[4], _global_svn_swig_rb_pool);
   }
   if (argc > 5) {
@@ -11986,7 +13115,7 @@ _wrap_svn_repos_dump_fs3(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res8), Ruby_Format_TypeError( "", "void *","svn_repos_dump_fs3", 8, argv[7] )); 
   }
   {
-    arg9 = svn_swig_rb_cancel_func;
+    arg9 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg10 = (void *)svn_swig_rb_make_baton(argv[8], _global_svn_swig_rb_pool);
   }
   if (argc > 9) {
@@ -12091,7 +13220,7 @@ _wrap_svn_repos_dump_fs(int argc, VALUE *argv, VALUE self) {
   arg5 = (svn_revnum_t)(val5);
   arg6 = RTEST(argv[5]);
   {
-    arg7 = svn_swig_rb_cancel_func;
+    arg7 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg8 = (void *)svn_swig_rb_make_baton(argv[6], _global_svn_swig_rb_pool);
   }
   if (argc > 7) {
@@ -12140,6 +13269,138 @@ fail:
 
 
 SWIGINTERN VALUE
+_wrap_svn_repos_load_fs5(int argc, VALUE *argv, VALUE self) {
+  svn_repos_t *arg1 = (svn_repos_t *) 0 ;
+  svn_stream_t *arg2 = (svn_stream_t *) 0 ;
+  svn_revnum_t arg3 ;
+  svn_revnum_t arg4 ;
+  enum svn_repos_load_uuid arg5 ;
+  char *arg6 = (char *) 0 ;
+  svn_boolean_t arg7 ;
+  svn_boolean_t arg8 ;
+  svn_boolean_t arg9 ;
+  svn_boolean_t arg10 ;
+  svn_repos_notify_func_t arg11 = (svn_repos_notify_func_t) 0 ;
+  void *arg12 = (void *) 0 ;
+  svn_cancel_func_t arg13 = (svn_cancel_func_t) 0 ;
+  void *arg14 = (void *) 0 ;
+  apr_pool_t *arg15 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  long val3 ;
+  int ecode3 = 0 ;
+  long val4 ;
+  int ecode4 = 0 ;
+  int val5 ;
+  int ecode5 = 0 ;
+  int res12 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg15);
+    _global_pool = arg15;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  if ((argc < 13) || (argc > 14)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 13)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_svn_repos_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "svn_repos_t *","svn_repos_load_fs5", 1, argv[0] )); 
+  }
+  arg1 = (svn_repos_t *)(argp1);
+  {
+    arg2 = svn_swig_rb_make_stream(argv[1]);
+  }
+  ecode3 = SWIG_AsVal_long(argv[2], &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), Ruby_Format_TypeError( "", "svn_revnum_t","svn_repos_load_fs5", 3, argv[2] ));
+  } 
+  arg3 = (svn_revnum_t)(val3);
+  ecode4 = SWIG_AsVal_long(argv[3], &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), Ruby_Format_TypeError( "", "svn_revnum_t","svn_repos_load_fs5", 4, argv[3] ));
+  } 
+  arg4 = (svn_revnum_t)(val4);
+  ecode5 = SWIG_AsVal_int(argv[4], &val5);
+  if (!SWIG_IsOK(ecode5)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode5), Ruby_Format_TypeError( "", "enum svn_repos_load_uuid","svn_repos_load_fs5", 5, argv[4] ));
+  } 
+  arg5 = (enum svn_repos_load_uuid)(val5);
+  {
+    if (NIL_P(argv[5])) {
+      arg6 = NULL;
+    } else {
+      arg6 = StringValuePtr(argv[5]);
+    }
+  }
+  arg7 = RTEST(argv[6]);
+  arg8 = RTEST(argv[7]);
+  arg9 = RTEST(argv[8]);
+  arg10 = RTEST(argv[9]);
+  {
+    int res = SWIG_ConvertFunctionPtr(argv[10], (void**)(&arg11), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void);
+    if (!SWIG_IsOK(res)) {
+      SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_repos_notify_func_t","svn_repos_load_fs5", 11, argv[10] )); 
+    }
+  }
+  res12 = SWIG_ConvertPtr(argv[11],SWIG_as_voidptrptr(&arg12), 0, 0);
+  if (!SWIG_IsOK(res12)) {
+    SWIG_exception_fail(SWIG_ArgError(res12), Ruby_Format_TypeError( "", "void *","svn_repos_load_fs5", 12, argv[11] )); 
+  }
+  {
+    arg13 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
+    arg14 = (void *)svn_swig_rb_make_baton(argv[12], _global_svn_swig_rb_pool);
+  }
+  if (argc > 13) {
+    
+  }
+  {
+    if (!arg1) {
+      svn_swig_rb_raise_svn_repos_already_close();
+    }
+  }
+  {
+    result = (svn_error_t *)svn_repos_load_fs5(arg1,arg2,arg3,arg4,arg5,(char const *)arg6,arg7,arg8,arg9,arg10,arg11,arg12,arg13,arg14,arg15);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  {
+    svn_swig_rb_set_baton(vresult, (VALUE)arg14);
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
+fail:
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
 _wrap_svn_repos_load_fs4(int argc, VALUE *argv, VALUE self) {
   svn_repos_t *arg1 = (svn_repos_t *) 0 ;
   svn_stream_t *arg2 = (svn_stream_t *) 0 ;
@@ -12221,7 +13482,7 @@ _wrap_svn_repos_load_fs4(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res11), Ruby_Format_TypeError( "", "void *","svn_repos_load_fs4", 11, argv[10] )); 
   }
   {
-    arg12 = svn_swig_rb_cancel_func;
+    arg12 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg13 = (void *)svn_swig_rb_make_baton(argv[11], _global_svn_swig_rb_pool);
   }
   if (argc > 12) {
@@ -12335,7 +13596,7 @@ _wrap_svn_repos_load_fs3(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res9), Ruby_Format_TypeError( "", "void *","svn_repos_load_fs3", 9, argv[8] )); 
   }
   {
-    arg10 = svn_swig_rb_cancel_func;
+    arg10 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg11 = (void *)svn_swig_rb_make_baton(argv[9], _global_svn_swig_rb_pool);
   }
   if (argc > 10) {
@@ -12442,7 +13703,7 @@ _wrap_svn_repos_load_fs2(int argc, VALUE *argv, VALUE self) {
   arg6 = RTEST(argv[5]);
   arg7 = RTEST(argv[6]);
   {
-    arg8 = svn_swig_rb_cancel_func;
+    arg8 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg9 = (void *)svn_swig_rb_make_baton(argv[7], _global_svn_swig_rb_pool);
   }
   if (argc > 8) {
@@ -12545,7 +13806,7 @@ _wrap_svn_repos_load_fs(int argc, VALUE *argv, VALUE self) {
     }
   }
   {
-    arg6 = svn_swig_rb_cancel_func;
+    arg6 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg7 = (void *)svn_swig_rb_make_baton(argv[5], _global_svn_swig_rb_pool);
   }
   if (argc > 6) {
@@ -13258,7 +14519,7 @@ _wrap_svn_repos_parse_dumpstream3(int argc, VALUE *argv, VALUE self) {
   }
   arg4 = RTEST(argv[3]);
   {
-    arg5 = svn_swig_rb_cancel_func;
+    arg5 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg6 = (void *)svn_swig_rb_make_baton(argv[4], _global_svn_swig_rb_pool);
   }
   if (argc > 5) {
@@ -13302,6 +14563,139 @@ fail:
 
 
 SWIGINTERN VALUE
+_wrap_svn_repos_get_fs_build_parser5(int argc, VALUE *argv, VALUE self) {
+  svn_repos_parse_fns3_t **arg1 = (svn_repos_parse_fns3_t **) 0 ;
+  void **arg2 = (void **) 0 ;
+  svn_repos_t *arg3 = (svn_repos_t *) 0 ;
+  svn_revnum_t arg4 ;
+  svn_revnum_t arg5 ;
+  svn_boolean_t arg6 ;
+  svn_boolean_t arg7 ;
+  enum svn_repos_load_uuid arg8 ;
+  char *arg9 = (char *) 0 ;
+  svn_boolean_t arg10 ;
+  svn_boolean_t arg11 ;
+  svn_boolean_t arg12 ;
+  svn_repos_notify_func_t arg13 = (svn_repos_notify_func_t) 0 ;
+  void *arg14 = (void *) 0 ;
+  apr_pool_t *arg15 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  svn_repos_parse_fns3_t *temp1 ;
+  void *temp2 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  long val4 ;
+  int ecode4 = 0 ;
+  long val5 ;
+  int ecode5 = 0 ;
+  int val8 ;
+  int ecode8 = 0 ;
+  int res14 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg15);
+    _global_pool = arg15;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  arg1 = &temp1;
+  arg2 = &temp2;
+  if ((argc < 12) || (argc > 13)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 12)",argc); SWIG_fail;
+  }
+  res3 = SWIG_ConvertPtr(argv[0], &argp3,SWIGTYPE_p_svn_repos_t, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "svn_repos_t *","svn_repos_get_fs_build_parser5", 3, argv[0] )); 
+  }
+  arg3 = (svn_repos_t *)(argp3);
+  ecode4 = SWIG_AsVal_long(argv[1], &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), Ruby_Format_TypeError( "", "svn_revnum_t","svn_repos_get_fs_build_parser5", 4, argv[1] ));
+  } 
+  arg4 = (svn_revnum_t)(val4);
+  ecode5 = SWIG_AsVal_long(argv[2], &val5);
+  if (!SWIG_IsOK(ecode5)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode5), Ruby_Format_TypeError( "", "svn_revnum_t","svn_repos_get_fs_build_parser5", 5, argv[2] ));
+  } 
+  arg5 = (svn_revnum_t)(val5);
+  arg6 = RTEST(argv[3]);
+  arg7 = RTEST(argv[4]);
+  ecode8 = SWIG_AsVal_int(argv[5], &val8);
+  if (!SWIG_IsOK(ecode8)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode8), Ruby_Format_TypeError( "", "enum svn_repos_load_uuid","svn_repos_get_fs_build_parser5", 8, argv[5] ));
+  } 
+  arg8 = (enum svn_repos_load_uuid)(val8);
+  {
+    if (NIL_P(argv[6])) {
+      arg9 = NULL;
+    } else {
+      arg9 = StringValuePtr(argv[6]);
+    }
+  }
+  arg10 = RTEST(argv[7]);
+  arg11 = RTEST(argv[8]);
+  arg12 = RTEST(argv[9]);
+  {
+    int res = SWIG_ConvertFunctionPtr(argv[10], (void**)(&arg13), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void);
+    if (!SWIG_IsOK(res)) {
+      SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_repos_notify_func_t","svn_repos_get_fs_build_parser5", 13, argv[10] )); 
+    }
+  }
+  res14 = SWIG_ConvertPtr(argv[11],SWIG_as_voidptrptr(&arg14), 0, 0);
+  if (!SWIG_IsOK(res14)) {
+    SWIG_exception_fail(SWIG_ArgError(res14), Ruby_Format_TypeError( "", "void *","svn_repos_get_fs_build_parser5", 14, argv[11] )); 
+  }
+  if (argc > 12) {
+    
+  }
+  {
+    if (!arg3) {
+      svn_swig_rb_raise_svn_repos_already_close();
+    }
+  }
+  {
+    result = (svn_error_t *)svn_repos_get_fs_build_parser5((struct svn_repos_parse_fns3_t const **)arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,(char const *)arg9,arg10,arg11,arg12,arg13,arg14,arg15);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  {
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj(*arg1, SWIGTYPE_p_svn_repos_parse_fns3_t, 0));
+  }
+  {
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj(*arg2, SWIGTYPE_p_void, 0));
+  }
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
+fail:
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
 _wrap_svn_repos_get_fs_build_parser4(int argc, VALUE *argv, VALUE self) {
   svn_repos_parse_fns3_t **arg1 = (svn_repos_parse_fns3_t **) 0 ;
   void **arg2 = (void **) 0 ;
@@ -13403,13 +14797,7 @@ _wrap_svn_repos_get_fs_build_parser4(int argc, VALUE *argv, VALUE self) {
     vresult = Qnil;
   }
   {
-    /* FIXME: Missing argout typemap: svn_repos_get_fs_build_parser4 arg 1 (svn_repos_parse_fns3_t const **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_repos_get_fs_build_parser4 is not implemented yet");
-    
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj(*arg1, SWIGTYPE_p_svn_repos_parse_fns3_t, 0));
   }
   {
     vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj(*arg2, SWIGTYPE_p_void, 0));
@@ -14515,7 +15903,7 @@ _wrap_svn_repos_parse_dumpstream2(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "void *","svn_repos_parse_dumpstream2", 3, argv[2] )); 
   }
   {
-    arg4 = svn_swig_rb_cancel_func;
+    arg4 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg5 = (void *)svn_swig_rb_make_baton(argv[3], _global_svn_swig_rb_pool);
   }
   if (argc > 4) {
@@ -14595,7 +15983,7 @@ _wrap_svn_repos_parse_dumpstream(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "void *","svn_repos_parse_dumpstream", 3, argv[2] )); 
   }
   {
-    arg4 = svn_swig_rb_cancel_func;
+    arg4 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg5 = (void *)svn_swig_rb_make_baton(argv[3], _global_svn_swig_rb_pool);
   }
   if (argc > 4) {
@@ -14724,7 +16112,13 @@ _wrap_svn_repos_get_fs_build_parser3(int argc, VALUE *argv, VALUE self) {
     vresult = Qnil;
   }
   {
-    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj(*arg1, SWIGTYPE_p_svn_repos_parse_fns2_t, 0));
+    /* FIXME: Missing argout typemap: svn_repos_get_fs_build_parser3 arg 1 (svn_repos_parse_fns2_t const **) */
+    
+    
+    
+    
+    SWIG_exception(SWIG_ValueError, "svn_repos_get_fs_build_parser3 is not implemented yet");
+    
   }
   {
     vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj(*arg2, SWIGTYPE_p_void, 0));
@@ -14824,7 +16218,13 @@ _wrap_svn_repos_get_fs_build_parser2(int argc, VALUE *argv, VALUE self) {
     vresult = Qnil;
   }
   {
-    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj(*arg1, SWIGTYPE_p_svn_repos_parse_fns2_t, 0));
+    /* FIXME: Missing argout typemap: svn_repos_get_fs_build_parser2 arg 1 (svn_repos_parse_fns2_t const **) */
+    
+    
+    
+    
+    SWIG_exception(SWIG_ValueError, "svn_repos_get_fs_build_parser2 is not implemented yet");
+    
   }
   {
     vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj(*arg2, SWIGTYPE_p_void, 0));
@@ -15305,7 +16705,7 @@ _wrap_svn_repos_check_revision_access(int argc, VALUE *argv, VALUE self) {
   } 
   arg3 = (svn_revnum_t)(val3);
   {
-    arg4 = svn_swig_rb_repos_authz_func;
+    arg4 = (svn_repos_authz_func_t) svn_swig_rb_repos_authz_func;
     arg5 = (void *)svn_swig_rb_make_baton(argv[3], _global_svn_swig_rb_pool);
   }
   if (argc > 4) {
@@ -15351,172 +16751,6 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_svn_repos_fs_get_inherited_props(int argc, VALUE *argv, VALUE self) {
-  apr_array_header_t **arg1 = (apr_array_header_t **) 0 ;
-  svn_fs_root_t *arg2 = (svn_fs_root_t *) 0 ;
-  char *arg3 = (char *) 0 ;
-  char *arg4 = (char *) 0 ;
-  svn_repos_authz_func_t arg5 = (svn_repos_authz_func_t) 0 ;
-  void *arg6 = (void *) 0 ;
-  apr_pool_t *arg7 = (apr_pool_t *) 0 ;
-  apr_pool_t *arg8 = (apr_pool_t *) 0 ;
-  VALUE _global_svn_swig_rb_pool ;
-  apr_pool_t *_global_pool ;
-  apr_array_header_t *temp1 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  int res4 ;
-  char *buf4 = 0 ;
-  int alloc4 = 0 ;
-  svn_error_t *result = 0 ;
-  VALUE vresult = Qnil;
-  
-  {
-    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg7);
-    _global_pool = arg7;
-    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
-  }
-  {
-    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg8);
-    _global_pool = arg8;
-    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
-  }
-  arg1 = &temp1;
-  if ((argc < 4) || (argc > 6)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc); SWIG_fail;
-  }
-  res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_svn_fs_root_t, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "svn_fs_root_t *","svn_repos_fs_get_inherited_props", 2, argv[0] )); 
-  }
-  arg2 = (svn_fs_root_t *)(argp2);
-  {
-    arg3 = StringValueCStr(argv[1]);
-  }
-  res4 = SWIG_AsCharPtrAndSize(argv[2], &buf4, NULL, &alloc4);
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), Ruby_Format_TypeError( "", "char const *","svn_repos_fs_get_inherited_props", 4, argv[2] ));
-  }
-  arg4 = (char *)(buf4);
-  {
-    arg5 = svn_swig_rb_repos_authz_func;
-    arg6 = (void *)svn_swig_rb_make_baton(argv[3], _global_svn_swig_rb_pool);
-  }
-  if (argc > 4) {
-    
-  }
-  if (argc > 5) {
-    
-  }
-  {
-    result = (svn_error_t *)svn_repos_fs_get_inherited_props(arg1,arg2,(char const *)arg3,(char const *)arg4,arg5,arg6,arg7,arg8);
-    
-    
-    
-  }
-  {
-    if (result) {
-      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
-      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
-      svn_swig_rb_handle_svn_error(result);
-    }
-    vresult = Qnil;
-  }
-  {
-    /* FIXME: Missing argout typemap: svn_repos_fs_get_inherited_props arg 1 (apr_array_header_t **) */
-    
-    
-    
-    
-    SWIG_exception(SWIG_ValueError, "svn_repos_fs_get_inherited_props is not implemented yet");
-    
-  }
-  if (alloc4 == SWIG_NEWOBJ) free((char*)buf4);
-  {
-    VALUE target;
-    target = _global_vresult_address == &vresult ? self : vresult;
-    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
-    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
-    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
-  }
-  {
-    VALUE target;
-    target = _global_vresult_address == &vresult ? self : vresult;
-    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
-    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
-    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
-  }
-  return vresult;
-fail:
-  if (alloc4 == SWIG_NEWOBJ) free((char*)buf4);
-  {
-    VALUE target;
-    target = _global_vresult_address == &vresult ? self : vresult;
-    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
-    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
-    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
-  }
-  {
-    VALUE target;
-    target = _global_vresult_address == &vresult ? self : vresult;
-    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
-    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
-    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
-  }
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_svn_repos_remember_client_capabilities(int argc, VALUE *argv, VALUE self) {
-  svn_repos_t *arg1 = (svn_repos_t *) 0 ;
-  apr_array_header_t *arg2 = (apr_array_header_t *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  svn_error_t *result = 0 ;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 2) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_svn_repos_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "svn_repos_t *","svn_repos_remember_client_capabilities", 1, argv[0] )); 
-  }
-  arg1 = (svn_repos_t *)(argp1);
-  res2 = SWIG_ConvertPtr(argv[1], &argp2,SWIGTYPE_p_apr_array_header_t, 0 |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "apr_array_header_t const *","svn_repos_remember_client_capabilities", 2, argv[1] )); 
-  }
-  arg2 = (apr_array_header_t *)(argp2);
-  {
-    if (!arg1) {
-      svn_swig_rb_raise_svn_repos_already_close();
-    }
-  }
-  {
-    result = (svn_error_t *)svn_repos_remember_client_capabilities(arg1,(apr_array_header_t const *)arg2);
-    
-    
-    
-  }
-  {
-    if (result) {
-      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
-      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
-      svn_swig_rb_handle_svn_error(result);
-    }
-    vresult = Qnil;
-  }
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
 _wrap_svn_repos_parse_fns3_invoke_magic_header_record(int argc, VALUE *argv, VALUE self) {
   svn_repos_parse_fns3_t *arg1 = (svn_repos_parse_fns3_t *) 0 ;
   int arg2 ;
@@ -17060,73 +18294,103 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_svn_repos_invoke_file_rev_handler(int argc, VALUE *argv, VALUE self) {
-  svn_repos_file_rev_handler_t arg1 = (svn_repos_file_rev_handler_t) 0 ;
+_wrap_svn_repos_invoke_notify_func(int argc, VALUE *argv, VALUE self) {
+  svn_repos_notify_func_t arg1 = (svn_repos_notify_func_t) 0 ;
   void *arg2 = (void *) 0 ;
-  char *arg3 = (char *) 0 ;
-  svn_revnum_t arg4 ;
-  apr_hash_t *arg5 = (apr_hash_t *) 0 ;
-  svn_txdelta_window_handler_t *arg6 = (svn_txdelta_window_handler_t *) 0 ;
-  void **arg7 = (void **) 0 ;
-  apr_array_header_t *arg8 = (apr_array_header_t *) 0 ;
-  apr_pool_t *arg9 = (apr_pool_t *) 0 ;
+  svn_repos_notify_t *arg3 = (svn_repos_notify_t *) 0 ;
+  apr_pool_t *arg4 = (apr_pool_t *) 0 ;
   VALUE _global_svn_swig_rb_pool ;
   apr_pool_t *_global_pool ;
   int res2 ;
-  long val4 ;
-  int ecode4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
-  svn_txdelta_window_handler_t temp6 ;
-  void *temp7 ;
-  void *argp8 = 0 ;
-  int res8 = 0 ;
-  svn_error_t *result = 0 ;
-  VALUE vresult = Qnil;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
   
   {
-    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg9);
-    _global_pool = arg9;
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg4);
+    _global_pool = arg4;
     svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
   }
-  arg6 = &temp6;
-  arg7 = &temp7;
-  if ((argc < 6) || (argc > 7)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 6)",argc); SWIG_fail;
+  if ((argc < 3) || (argc > 4)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail;
   }
   {
-    int res = SWIG_ConvertFunctionPtr(argv[0], (void**)(&arg1), SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t);
+    int res = SWIG_ConvertFunctionPtr(argv[0], (void**)(&arg1), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void);
     if (!SWIG_IsOK(res)) {
-      SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_repos_file_rev_handler_t","svn_repos_invoke_file_rev_handler", 1, argv[0] )); 
+      SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_repos_notify_func_t","svn_repos_invoke_notify_func", 1, argv[0] )); 
     }
   }
   res2 = SWIG_ConvertPtr(argv[1],SWIG_as_voidptrptr(&arg2), 0, 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "void *","svn_repos_invoke_file_rev_handler", 2, argv[1] )); 
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "void *","svn_repos_invoke_notify_func", 2, argv[1] )); 
+  }
+  res3 = SWIG_ConvertPtr(argv[2], &argp3,SWIGTYPE_p_svn_repos_notify_t, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "svn_repos_notify_t const *","svn_repos_invoke_notify_func", 3, argv[2] )); 
+  }
+  arg3 = (svn_repos_notify_t *)(argp3);
+  if (argc > 3) {
+    
   }
   {
-    arg3 = StringValueCStr(argv[2]);
+    svn_repos_invoke_notify_func(arg1,arg2,(struct svn_repos_notify_t const *)arg3,arg4);
+    
+    
+    
   }
-  ecode4 = SWIG_AsVal_long(argv[3], &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), Ruby_Format_TypeError( "", "svn_revnum_t","svn_repos_invoke_file_rev_handler", 4, argv[3] ));
-  } 
-  arg4 = (svn_revnum_t)(val4);
-  res5 = SWIG_ConvertPtr(argv[4], &argp5,SWIGTYPE_p_apr_hash_t, 0 |  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), Ruby_Format_TypeError( "", "apr_hash_t *","svn_repos_invoke_file_rev_handler", 5, argv[4] )); 
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
   }
-  arg5 = (apr_hash_t *)(argp5);
-  res8 = SWIG_ConvertPtr(argv[5], &argp8,SWIGTYPE_p_apr_array_header_t, 0 |  0 );
-  if (!SWIG_IsOK(res8)) {
-    SWIG_exception_fail(SWIG_ArgError(res8), Ruby_Format_TypeError( "", "apr_array_header_t *","svn_repos_invoke_file_rev_handler", 8, argv[5] )); 
+  return Qnil;
+fail:
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
   }
-  arg8 = (apr_array_header_t *)(argp8);
-  if (argc > 6) {
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_svn_repos_invoke_freeze_func(int argc, VALUE *argv, VALUE self) {
+  svn_repos_freeze_func_t arg1 = (svn_repos_freeze_func_t) 0 ;
+  void *arg2 = (void *) 0 ;
+  apr_pool_t *arg3 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  int res2 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg3);
+    _global_pool = arg3;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  if ((argc < 2) || (argc > 3)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  }
+  {
+    int res = SWIG_ConvertFunctionPtr(argv[0], (void**)(&arg1), SWIGTYPE_p_f_p_void_p_apr_pool_t__p_svn_error_t);
+    if (!SWIG_IsOK(res)) {
+      SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_repos_freeze_func_t","svn_repos_invoke_freeze_func", 1, argv[0] )); 
+    }
+  }
+  res2 = SWIG_ConvertPtr(argv[1],SWIG_as_voidptrptr(&arg2), 0, 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "void *","svn_repos_invoke_freeze_func", 2, argv[1] )); 
+  }
+  if (argc > 2) {
     
   }
   {
-    result = (svn_error_t *)svn_repos_invoke_file_rev_handler(arg1,arg2,(char const *)arg3,arg4,arg5,arg6,arg7,arg8,arg9);
+    result = (svn_error_t *)svn_repos_invoke_freeze_func(arg1,arg2,arg3);
     
     
     
@@ -17140,12 +18404,6 @@ _wrap_svn_repos_invoke_file_rev_handler(int argc, VALUE *argv, VALUE self) {
     vresult = Qnil;
   }
   {
-    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj(*arg6, SWIGTYPE_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t, 0));
-  }
-  {
-    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj(*arg7, SWIGTYPE_p_void, 0));
-  }
-  {
     VALUE target;
     target = _global_vresult_address == &vresult ? self : vresult;
     if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
@@ -17166,57 +18424,71 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_svn_repos_invoke_notify_func(int argc, VALUE *argv, VALUE self) {
-  svn_repos_notify_func_t arg1 = (svn_repos_notify_func_t) 0 ;
+_wrap_svn_repos_invoke_history_func(int argc, VALUE *argv, VALUE self) {
+  svn_repos_history_func_t arg1 = (svn_repos_history_func_t) 0 ;
   void *arg2 = (void *) 0 ;
-  svn_repos_notify_t *arg3 = (svn_repos_notify_t *) 0 ;
-  apr_pool_t *arg4 = (apr_pool_t *) 0 ;
+  char *arg3 = (char *) 0 ;
+  svn_revnum_t arg4 ;
+  apr_pool_t *arg5 = (apr_pool_t *) 0 ;
   VALUE _global_svn_swig_rb_pool ;
   apr_pool_t *_global_pool ;
   int res2 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  long val4 ;
+  int ecode4 = 0 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
   
   {
-    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg4);
-    _global_pool = arg4;
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg5);
+    _global_pool = arg5;
     svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
   }
-  if ((argc < 3) || (argc > 4)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail;
+  if ((argc < 4) || (argc > 5)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc); SWIG_fail;
   }
   {
-    int res = SWIG_ConvertFunctionPtr(argv[0], (void**)(&arg1), SWIGTYPE_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void);
+    int res = SWIG_ConvertFunctionPtr(argv[0], (void**)(&arg1), SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t);
     if (!SWIG_IsOK(res)) {
-      SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_repos_notify_func_t","svn_repos_invoke_notify_func", 1, argv[0] )); 
+      SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_repos_history_func_t","svn_repos_invoke_history_func", 1, argv[0] )); 
     }
   }
   res2 = SWIG_ConvertPtr(argv[1],SWIG_as_voidptrptr(&arg2), 0, 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "void *","svn_repos_invoke_notify_func", 2, argv[1] )); 
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "void *","svn_repos_invoke_history_func", 2, argv[1] )); 
   }
-  res3 = SWIG_ConvertPtr(argv[2], &argp3,SWIGTYPE_p_svn_repos_notify_t, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "svn_repos_notify_t const *","svn_repos_invoke_notify_func", 3, argv[2] )); 
+  {
+    arg3 = StringValueCStr(argv[2]);
   }
-  arg3 = (svn_repos_notify_t *)(argp3);
-  if (argc > 3) {
+  ecode4 = SWIG_AsVal_long(argv[3], &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), Ruby_Format_TypeError( "", "svn_revnum_t","svn_repos_invoke_history_func", 4, argv[3] ));
+  } 
+  arg4 = (svn_revnum_t)(val4);
+  if (argc > 4) {
     
   }
   {
-    svn_repos_invoke_notify_func(arg1,arg2,(struct svn_repos_notify_t const *)arg3,arg4);
+    result = (svn_error_t *)svn_repos_invoke_history_func(arg1,arg2,(char const *)arg3,arg4,arg5);
     
     
     
   }
   {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  {
     VALUE target;
     target = _global_vresult_address == &vresult ? self : vresult;
     if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
     svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
     svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
   }
-  return Qnil;
+  return vresult;
 fail:
   {
     VALUE target;
@@ -17230,39 +18502,73 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_svn_repos_invoke_freeze_func(int argc, VALUE *argv, VALUE self) {
-  svn_repos_freeze_func_t arg1 = (svn_repos_freeze_func_t) 0 ;
+_wrap_svn_repos_invoke_file_rev_handler(int argc, VALUE *argv, VALUE self) {
+  svn_repos_file_rev_handler_t arg1 = (svn_repos_file_rev_handler_t) 0 ;
   void *arg2 = (void *) 0 ;
-  apr_pool_t *arg3 = (apr_pool_t *) 0 ;
+  char *arg3 = (char *) 0 ;
+  svn_revnum_t arg4 ;
+  apr_hash_t *arg5 = (apr_hash_t *) 0 ;
+  svn_txdelta_window_handler_t *arg6 = (svn_txdelta_window_handler_t *) 0 ;
+  void **arg7 = (void **) 0 ;
+  apr_array_header_t *arg8 = (apr_array_header_t *) 0 ;
+  apr_pool_t *arg9 = (apr_pool_t *) 0 ;
   VALUE _global_svn_swig_rb_pool ;
   apr_pool_t *_global_pool ;
   int res2 ;
+  long val4 ;
+  int ecode4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  svn_txdelta_window_handler_t temp6 ;
+  void *temp7 ;
+  void *argp8 = 0 ;
+  int res8 = 0 ;
   svn_error_t *result = 0 ;
   VALUE vresult = Qnil;
   
   {
-    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg3);
-    _global_pool = arg3;
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg9);
+    _global_pool = arg9;
     svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
   }
-  if ((argc < 2) || (argc > 3)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  arg6 = &temp6;
+  arg7 = &temp7;
+  if ((argc < 6) || (argc > 7)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 6)",argc); SWIG_fail;
   }
   {
-    int res = SWIG_ConvertFunctionPtr(argv[0], (void**)(&arg1), SWIGTYPE_p_f_p_void_p_apr_pool_t__p_svn_error_t);
+    int res = SWIG_ConvertFunctionPtr(argv[0], (void**)(&arg1), SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t);
     if (!SWIG_IsOK(res)) {
-      SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_repos_freeze_func_t","svn_repos_invoke_freeze_func", 1, argv[0] )); 
+      SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_repos_file_rev_handler_t","svn_repos_invoke_file_rev_handler", 1, argv[0] )); 
     }
   }
   res2 = SWIG_ConvertPtr(argv[1],SWIG_as_voidptrptr(&arg2), 0, 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "void *","svn_repos_invoke_freeze_func", 2, argv[1] )); 
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "void *","svn_repos_invoke_file_rev_handler", 2, argv[1] )); 
   }
-  if (argc > 2) {
+  {
+    arg3 = StringValueCStr(argv[2]);
+  }
+  ecode4 = SWIG_AsVal_long(argv[3], &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), Ruby_Format_TypeError( "", "svn_revnum_t","svn_repos_invoke_file_rev_handler", 4, argv[3] ));
+  } 
+  arg4 = (svn_revnum_t)(val4);
+  res5 = SWIG_ConvertPtr(argv[4], &argp5,SWIGTYPE_p_apr_hash_t, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), Ruby_Format_TypeError( "", "apr_hash_t *","svn_repos_invoke_file_rev_handler", 5, argv[4] )); 
+  }
+  arg5 = (apr_hash_t *)(argp5);
+  res8 = SWIG_ConvertPtr(argv[5], &argp8,SWIGTYPE_p_apr_array_header_t, 0 |  0 );
+  if (!SWIG_IsOK(res8)) {
+    SWIG_exception_fail(SWIG_ArgError(res8), Ruby_Format_TypeError( "", "apr_array_header_t *","svn_repos_invoke_file_rev_handler", 8, argv[5] )); 
+  }
+  arg8 = (apr_array_header_t *)(argp8);
+  if (argc > 6) {
     
   }
   {
-    result = (svn_error_t *)svn_repos_invoke_freeze_func(arg1,arg2,arg3);
+    result = (svn_error_t *)svn_repos_invoke_file_rev_handler(arg1,arg2,(char const *)arg3,arg4,arg5,arg6,arg7,arg8,arg9);
     
     
     
@@ -17276,6 +18582,12 @@ _wrap_svn_repos_invoke_freeze_func(int argc, VALUE *argv, VALUE self) {
     vresult = Qnil;
   }
   {
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj(*arg6, SWIGTYPE_p_f_p_svn_txdelta_window_t_p_void__p_svn_error_t, 0));
+  }
+  {
+    vresult = SWIG_Ruby_AppendOutput(vresult, SWIG_NewPointerObj(*arg7, SWIGTYPE_p_void, 0));
+  }
+  {
     VALUE target;
     target = _global_vresult_address == &vresult ? self : vresult;
     if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
@@ -17296,17 +18608,19 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_svn_repos_invoke_history_func(int argc, VALUE *argv, VALUE self) {
-  svn_repos_history_func_t arg1 = (svn_repos_history_func_t) 0 ;
+_wrap_svn_repos_invoke_verify_callback(int argc, VALUE *argv, VALUE self) {
+  svn_repos_verify_callback_t arg1 = (svn_repos_verify_callback_t) 0 ;
   void *arg2 = (void *) 0 ;
-  char *arg3 = (char *) 0 ;
-  svn_revnum_t arg4 ;
+  svn_revnum_t arg3 ;
+  svn_error_t *arg4 = (svn_error_t *) 0 ;
   apr_pool_t *arg5 = (apr_pool_t *) 0 ;
   VALUE _global_svn_swig_rb_pool ;
   apr_pool_t *_global_pool ;
   int res2 ;
-  long val4 ;
-  int ecode4 = 0 ;
+  long val3 ;
+  int ecode3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
   svn_error_t *result = 0 ;
   VALUE vresult = Qnil;
   
@@ -17319,28 +18633,30 @@ _wrap_svn_repos_invoke_history_func(int argc, VALUE *argv, VALUE self) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc); SWIG_fail;
   }
   {
-    int res = SWIG_ConvertFunctionPtr(argv[0], (void**)(&arg1), SWIGTYPE_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t);
+    int res = SWIG_ConvertFunctionPtr(argv[0], (void**)(&arg1), SWIGTYPE_p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t);
     if (!SWIG_IsOK(res)) {
-      SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_repos_history_func_t","svn_repos_invoke_history_func", 1, argv[0] )); 
+      SWIG_exception_fail(SWIG_ArgError(res), Ruby_Format_TypeError( "", "svn_repos_verify_callback_t","svn_repos_invoke_verify_callback", 1, argv[0] )); 
     }
   }
   res2 = SWIG_ConvertPtr(argv[1],SWIG_as_voidptrptr(&arg2), 0, 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "void *","svn_repos_invoke_history_func", 2, argv[1] )); 
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "void *","svn_repos_invoke_verify_callback", 2, argv[1] )); 
   }
-  {
-    arg3 = StringValueCStr(argv[2]);
-  }
-  ecode4 = SWIG_AsVal_long(argv[3], &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), Ruby_Format_TypeError( "", "svn_revnum_t","svn_repos_invoke_history_func", 4, argv[3] ));
+  ecode3 = SWIG_AsVal_long(argv[2], &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), Ruby_Format_TypeError( "", "svn_revnum_t","svn_repos_invoke_verify_callback", 3, argv[2] ));
   } 
-  arg4 = (svn_revnum_t)(val4);
+  arg3 = (svn_revnum_t)(val3);
+  res4 = SWIG_ConvertPtr(argv[3], &argp4,SWIGTYPE_p_svn_error_t, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), Ruby_Format_TypeError( "", "svn_error_t *","svn_repos_invoke_verify_callback", 4, argv[3] )); 
+  }
+  arg4 = (svn_error_t *)(argp4);
   if (argc > 4) {
     
   }
   {
-    result = (svn_error_t *)svn_repos_invoke_history_func(arg1,arg2,(char const *)arg3,arg4,arg5);
+    result = (svn_error_t *)svn_repos_invoke_verify_callback(arg1,arg2,arg3,arg4,arg5);
     
     
     
@@ -17397,12 +18713,14 @@ static swig_type_info _swigt__p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t
 static swig_type_info _swigt__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_hash_t *,svn_revnum_t,char const *,char const *,char const *,apr_pool_t *)|svn_log_message_receiver_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,apr_pool_t *)|svn_repos_freeze_func_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__char__p_svn_error_t = {"_p_f_p_void_p_q_const__char__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *)|svn_error_t *(*)(void *,char const *)", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_lock_t const *,svn_error_t *,apr_pool_t *)|svn_fs_lock_callback_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__char_p_q_const__svn_string_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_p_q_const__svn_string_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_string_t const *)|svn_error_t *(*)(void *,char const *,svn_string_t const *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)|svn_repos_file_rev_handler_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_hash_t *,svn_boolean_t,svn_txdelta_window_handler_t *,void **,apr_array_header_t *,apr_pool_t *)|svn_file_rev_handler_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,char const *,svn_revnum_t,apr_pool_t *)|svn_repos_history_func_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void = {"_p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void", "svn_repos_notify_func_t|void (*)(void *,struct svn_repos_notify_t const *,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(void *,svn_log_entry_t *,apr_pool_t *)|svn_log_entry_receiver_t", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t", "svn_repos_verify_callback_t|struct svn_error_t *(*)(void *,svn_revnum_t,svn_error_t *,apr_pool_t *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(*)(svn_repos_authz_access_t,svn_boolean_t *,svn_fs_root_t *,char const *,void *,apr_pool_t *)|svn_repos_authz_callback_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t = {"_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t", "struct svn_error_t *(*)(svn_revnum_t,char const *,char const *,void *)|svn_commit_callback_t", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_int = {"_p_int", "int *|svn_boolean_t *|apr_status_t *", 0, 0, (void*)0, 0};
@@ -17422,6 +18740,7 @@ static swig_type_info _swigt__p_p_svn_repos_parse_fns_t = {"_p_p_svn_repos_parse
 static swig_type_info _swigt__p_p_svn_repos_t = {"_p_p_svn_repos_t", "struct svn_repos_t **|svn_repos_t **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_svn_stream_t = {"_p_p_svn_stream_t", "struct svn_stream_t **|svn_stream_t **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_svn_string_t = {"_p_p_svn_string_t", "struct svn_string_t **|svn_string_t **", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_p_svn_version_t = {"_p_p_svn_version_t", "struct svn_version_t **|svn_version_t **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_void = {"_p_p_void", "void **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_auth_baton_t = {"_p_svn_auth_baton_t", "struct svn_auth_baton_t *|svn_auth_baton_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_auth_cred_simple_t = {"_p_svn_auth_cred_simple_t", "struct svn_auth_cred_simple_t *|svn_auth_cred_simple_t *", 0, 0, (void*)0, 0};
@@ -17456,8 +18775,13 @@ static swig_type_info _swigt__p_svn_errno_t = {"_p_svn_errno_t", "enum svn_errno
 static swig_type_info _swigt__p_svn_error_t = {"_p_svn_error_t", "struct svn_error_t *|svn_error_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_fs_access_t = {"_p_svn_fs_access_t", "struct svn_fs_access_t *|svn_fs_access_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_fs_dirent_t = {"_p_svn_fs_dirent_t", "struct svn_fs_dirent_t *|svn_fs_dirent_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_fs_fsfs_info_t = {"_p_svn_fs_fsfs_info_t", "struct svn_fs_fsfs_info_t *|svn_fs_fsfs_info_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_fs_fsx_info_t = {"_p_svn_fs_fsx_info_t", "struct svn_fs_fsx_info_t *|svn_fs_fsx_info_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_fs_history_t = {"_p_svn_fs_history_t", "struct svn_fs_history_t *|svn_fs_history_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_fs_id_t = {"_p_svn_fs_id_t", "struct svn_fs_id_t *|svn_fs_id_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_fs_info_placeholder_t = {"_p_svn_fs_info_placeholder_t", "struct svn_fs_info_placeholder_t *|svn_fs_info_placeholder_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_fs_lock_target_t = {"_p_svn_fs_lock_target_t", "struct svn_fs_lock_target_t *|svn_fs_lock_target_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_fs_node_relation_t = {"_p_svn_fs_node_relation_t", "enum svn_fs_node_relation_t *|svn_fs_node_relation_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_fs_pack_notify_action_t = {"_p_svn_fs_pack_notify_action_t", "enum svn_fs_pack_notify_action_t *|svn_fs_pack_notify_action_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_fs_path_change2_t = {"_p_svn_fs_path_change2_t", "struct svn_fs_path_change2_t *|svn_fs_path_change2_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_fs_path_change_kind_t = {"_p_svn_fs_path_change_kind_t", "enum svn_fs_path_change_kind_t *|svn_fs_path_change_kind_t *", 0, 0, (void*)0, 0};
@@ -17465,6 +18789,7 @@ static swig_type_info _swigt__p_svn_fs_path_change_t = {"_p_svn_fs_path_change_t
 static swig_type_info _swigt__p_svn_fs_root_t = {"_p_svn_fs_root_t", "struct svn_fs_root_t *|svn_fs_root_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_fs_t = {"_p_svn_fs_t", "struct svn_fs_t *|svn_fs_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_fs_txn_t = {"_p_svn_fs_txn_t", "struct svn_fs_txn_t *|svn_fs_txn_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svn_fs_upgrade_notify_action_t = {"_p_svn_fs_upgrade_notify_action_t", "enum svn_fs_upgrade_notify_action_t *|svn_fs_upgrade_notify_action_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_io_dirent2_t = {"_p_svn_io_dirent2_t", "struct svn_io_dirent2_t *|svn_io_dirent2_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_io_dirent_t = {"_p_svn_io_dirent_t", "struct svn_io_dirent_t *|svn_io_dirent_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svn_io_file_del_t = {"_p_svn_io_file_del_t", "enum svn_io_file_del_t *|svn_io_file_del_t *", 0, 0, (void*)0, 0};
@@ -17534,12 +18859,14 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_q_const__char__p_svn_error_t,
+  &_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_string_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void,
   &_swigt__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t,
+  &_swigt__p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t,
   &_swigt__p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t,
   &_swigt__p_int,
@@ -17559,6 +18886,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_p_svn_repos_t,
   &_swigt__p_p_svn_stream_t,
   &_swigt__p_p_svn_string_t,
+  &_swigt__p_p_svn_version_t,
   &_swigt__p_p_void,
   &_swigt__p_svn_auth_baton_t,
   &_swigt__p_svn_auth_cred_simple_t,
@@ -17593,8 +18921,13 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_svn_error_t,
   &_swigt__p_svn_fs_access_t,
   &_swigt__p_svn_fs_dirent_t,
+  &_swigt__p_svn_fs_fsfs_info_t,
+  &_swigt__p_svn_fs_fsx_info_t,
   &_swigt__p_svn_fs_history_t,
   &_swigt__p_svn_fs_id_t,
+  &_swigt__p_svn_fs_info_placeholder_t,
+  &_swigt__p_svn_fs_lock_target_t,
+  &_swigt__p_svn_fs_node_relation_t,
   &_swigt__p_svn_fs_pack_notify_action_t,
   &_swigt__p_svn_fs_path_change2_t,
   &_swigt__p_svn_fs_path_change_kind_t,
@@ -17602,6 +18935,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_svn_fs_root_t,
   &_swigt__p_svn_fs_t,
   &_swigt__p_svn_fs_txn_t,
+  &_swigt__p_svn_fs_upgrade_notify_action_t,
   &_swigt__p_svn_io_dirent2_t,
   &_swigt__p_svn_io_dirent_t,
   &_swigt__p_svn_io_file_del_t,
@@ -17671,12 +19005,14 @@ static swig_cast_info _swigc__p_f_p_void_apr_int64_t_svn_fs_pack_notify_action_t
 static swig_cast_info _swigc__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_q_const__char__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__char__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_string_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__char_p_q_const__svn_string_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void[] = {  {&_swigt__p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t[] = {  {&_swigt__p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_int[] = {  {&_swigt__p_int, 0, 0, 0},{0, 0, 0, 0}};
@@ -17696,6 +19032,7 @@ static swig_cast_info _swigc__p_p_svn_repos_parse_fns_t[] = {  {&_swigt__p_p_svn
 static swig_cast_info _swigc__p_p_svn_repos_t[] = {  {&_swigt__p_p_svn_repos_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_svn_stream_t[] = {  {&_swigt__p_p_svn_stream_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_svn_string_t[] = {  {&_swigt__p_p_svn_string_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_p_svn_version_t[] = {  {&_swigt__p_p_svn_version_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_void[] = {  {&_swigt__p_p_void, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_auth_baton_t[] = {  {&_swigt__p_svn_auth_baton_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_auth_cred_simple_t[] = {  {&_swigt__p_svn_auth_cred_simple_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -17730,8 +19067,13 @@ static swig_cast_info _swigc__p_svn_errno_t[] = {  {&_swigt__p_svn_errno_t, 0, 0
 static swig_cast_info _swigc__p_svn_error_t[] = {  {&_swigt__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_fs_access_t[] = {  {&_swigt__p_svn_fs_access_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_fs_dirent_t[] = {  {&_swigt__p_svn_fs_dirent_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_fs_fsfs_info_t[] = {  {&_swigt__p_svn_fs_fsfs_info_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_fs_fsx_info_t[] = {  {&_swigt__p_svn_fs_fsx_info_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_fs_history_t[] = {  {&_swigt__p_svn_fs_history_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_fs_id_t[] = {  {&_swigt__p_svn_fs_id_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_fs_info_placeholder_t[] = {  {&_swigt__p_svn_fs_info_placeholder_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_fs_lock_target_t[] = {  {&_swigt__p_svn_fs_lock_target_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_fs_node_relation_t[] = {  {&_swigt__p_svn_fs_node_relation_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_fs_pack_notify_action_t[] = {  {&_swigt__p_svn_fs_pack_notify_action_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_fs_path_change2_t[] = {  {&_swigt__p_svn_fs_path_change2_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_fs_path_change_kind_t[] = {  {&_swigt__p_svn_fs_path_change_kind_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -17739,6 +19081,7 @@ static swig_cast_info _swigc__p_svn_fs_path_change_t[] = {  {&_swigt__p_svn_fs_p
 static swig_cast_info _swigc__p_svn_fs_root_t[] = {  {&_swigt__p_svn_fs_root_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_fs_t[] = {  {&_swigt__p_svn_fs_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_fs_txn_t[] = {  {&_swigt__p_svn_fs_txn_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svn_fs_upgrade_notify_action_t[] = {  {&_swigt__p_svn_fs_upgrade_notify_action_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_io_dirent2_t[] = {  {&_swigt__p_svn_io_dirent2_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_io_dirent_t[] = {  {&_swigt__p_svn_io_dirent_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svn_io_file_del_t[] = {  {&_swigt__p_svn_io_file_del_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -17808,12 +19151,14 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_p_q_const__char__p_svn_error_t,
+  _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_lock_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_p_q_const__char_p_q_const__svn_string_t__p_svn_error_t,
   _swigc__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_hash_t_svn_boolean_t_p_svn_txdelta_window_handler_t_p_p_void_p_apr_array_header_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_p_q_const__char_svn_revnum_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_p_void_p_q_const__struct_svn_repos_notify_t_p_apr_pool_t__void,
   _swigc__p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t,
+  _swigc__p_f_p_void_svn_revnum_t_p_svn_error_t_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_svn_repos_authz_access_t_p_svn_boolean_t_p_svn_fs_root_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t,
   _swigc__p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t,
   _swigc__p_int,
@@ -17833,6 +19178,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_p_svn_repos_t,
   _swigc__p_p_svn_stream_t,
   _swigc__p_p_svn_string_t,
+  _swigc__p_p_svn_version_t,
   _swigc__p_p_void,
   _swigc__p_svn_auth_baton_t,
   _swigc__p_svn_auth_cred_simple_t,
@@ -17867,8 +19213,13 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_svn_error_t,
   _swigc__p_svn_fs_access_t,
   _swigc__p_svn_fs_dirent_t,
+  _swigc__p_svn_fs_fsfs_info_t,
+  _swigc__p_svn_fs_fsx_info_t,
   _swigc__p_svn_fs_history_t,
   _swigc__p_svn_fs_id_t,
+  _swigc__p_svn_fs_info_placeholder_t,
+  _swigc__p_svn_fs_lock_target_t,
+  _swigc__p_svn_fs_node_relation_t,
   _swigc__p_svn_fs_pack_notify_action_t,
   _swigc__p_svn_fs_path_change2_t,
   _swigc__p_svn_fs_path_change_kind_t,
@@ -17876,6 +19227,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_svn_fs_root_t,
   _swigc__p_svn_fs_t,
   _swigc__p_svn_fs_txn_t,
+  _swigc__p_svn_fs_upgrade_notify_action_t,
   _swigc__p_svn_io_dirent2_t,
   _swigc__p_svn_io_dirent_t,
   _swigc__p_svn_io_file_del_t,
@@ -17929,18 +19281,18 @@ static swig_cast_info *swig_cast_initial[] = {
 
 /* -----------------------------------------------------------------------------
  * Type initialization:
- * This problem is tough by the requirement that no dynamic 
- * memory is used. Also, since swig_type_info structures store pointers to 
+ * This problem is tough by the requirement that no dynamic
+ * memory is used. Also, since swig_type_info structures store pointers to
  * swig_cast_info structures and swig_cast_info structures store pointers back
- * to swig_type_info structures, we need some lookup code at initialization. 
- * The idea is that swig generates all the structures that are needed. 
- * The runtime then collects these partially filled structures. 
- * The SWIG_InitializeModule function takes these initial arrays out of 
+ * to swig_type_info structures, we need some lookup code at initialization.
+ * The idea is that swig generates all the structures that are needed.
+ * The runtime then collects these partially filled structures.
+ * The SWIG_InitializeModule function takes these initial arrays out of
  * swig_module, and does all the lookup, filling in the swig_module.types
  * array with the correct data and linking the correct swig_cast_info
  * structures together.
  *
- * The generated swig_type_info structures are assigned staticly to an initial 
+ * The generated swig_type_info structures are assigned staticly to an initial
  * array. We just loop through that array, and handle each type individually.
  * First we lookup if this type has been already loaded, and if so, use the
  * loaded structure instead of the generated one. Then we have to fill in the
@@ -17950,17 +19302,17 @@ static swig_cast_info *swig_cast_initial[] = {
  * a column is one of the swig_cast_info structures for that type.
  * The cast_initial array is actually an array of arrays, because each row has
  * a variable number of columns. So to actually build the cast linked list,
- * we find the array of casts associated with the type, and loop through it 
+ * we find the array of casts associated with the type, and loop through it
  * adding the casts to the list. The one last trick we need to do is making
  * sure the type pointer in the swig_cast_info struct is correct.
  *
- * First off, we lookup the cast->type name to see if it is already loaded. 
+ * First off, we lookup the cast->type name to see if it is already loaded.
  * There are three cases to handle:
  *  1) If the cast->type has already been loaded AND the type we are adding
  *     casting info to has not been loaded (it is in this module), THEN we
  *     replace the cast->type pointer with the type pointer that has already
  *     been loaded.
- *  2) If BOTH types (the one we are adding casting info to, and the 
+ *  2) If BOTH types (the one we are adding casting info to, and the
  *     cast->type) are loaded, THEN the cast info has already been loaded by
  *     the previous module so we just ignore it.
  *  3) Finally, if cast->type has not already been loaded, then we add that
@@ -18023,7 +19375,7 @@ SWIG_InitializeModule(void *clientdata) {
     module_head->next = &swig_module;
   }
 
-  /* When multiple interpeters are used, a module could have already been initialized in
+  /* When multiple interpreters are used, a module could have already been initialized in
      a different interpreter, but not yet have a pointer in this interpreter.
      In this case, we do not want to continue adding types... everything should be
      set up already */
@@ -18037,7 +19389,7 @@ SWIG_InitializeModule(void *clientdata) {
     swig_type_info *type = 0;
     swig_type_info *ret;
     swig_cast_info *cast;
-  
+
 #ifdef SWIGRUNTIME_DEBUG
     printf("SWIG_InitializeModule: type %d %s\n", i, swig_module.type_initial[i]->name);
 #endif
@@ -18064,7 +19416,7 @@ SWIG_InitializeModule(void *clientdata) {
     /* Insert casting types */
     cast = swig_module.cast_initial[i];
     while (cast->type) {
-    
+
       /* Don't need to add information already in the list */
       ret = 0;
 #ifdef SWIGRUNTIME_DEBUG
@@ -18192,9 +19544,6 @@ SWIGEXPORT void Init_repos(void) {
   rb_define_const(mRepos, "Svn_node_action_add", SWIG_From_int((int)(svn_node_action_add)));
   rb_define_const(mRepos, "Svn_node_action_delete", SWIG_From_int((int)(svn_node_action_delete)));
   rb_define_const(mRepos, "Svn_node_action_replace", SWIG_From_int((int)(svn_node_action_replace)));
-  rb_define_const(mRepos, "Svn_repos_load_uuid_default", SWIG_From_int((int)(svn_repos_load_uuid_default)));
-  rb_define_const(mRepos, "Svn_repos_load_uuid_ignore", SWIG_From_int((int)(svn_repos_load_uuid_ignore)));
-  rb_define_const(mRepos, "Svn_repos_load_uuid_force", SWIG_From_int((int)(svn_repos_load_uuid_force)));
   rb_define_const(mRepos, "Svn_authz_none", SWIG_From_int((int)(svn_authz_none)));
   rb_define_const(mRepos, "Svn_authz_read", SWIG_From_int((int)(svn_authz_read)));
   rb_define_const(mRepos, "Svn_authz_write", SWIG_From_int((int)(svn_authz_write)));
@@ -18219,9 +19568,16 @@ SWIGEXPORT void Init_repos(void) {
   rb_define_const(mRepos, "Svn_repos_notify_upgrade_start", SWIG_From_int((int)(svn_repos_notify_upgrade_start)));
   rb_define_const(mRepos, "Svn_repos_notify_load_skipped_rev", SWIG_From_int((int)(svn_repos_notify_load_skipped_rev)));
   rb_define_const(mRepos, "Svn_repos_notify_verify_rev_structure", SWIG_From_int((int)(svn_repos_notify_verify_rev_structure)));
+  rb_define_const(mRepos, "Svn_repos_notify_pack_revprops", SWIG_From_int((int)(svn_repos_notify_pack_revprops)));
+  rb_define_const(mRepos, "Svn_repos_notify_cleanup_revprops", SWIG_From_int((int)(svn_repos_notify_cleanup_revprops)));
+  rb_define_const(mRepos, "Svn_repos_notify_format_bumped", SWIG_From_int((int)(svn_repos_notify_format_bumped)));
+  rb_define_const(mRepos, "Svn_repos_notify_hotcopy_rev_range", SWIG_From_int((int)(svn_repos_notify_hotcopy_rev_range)));
   rb_define_const(mRepos, "Svn_repos_notify_warning_found_old_reference", SWIG_From_int((int)(svn_repos_notify_warning_found_old_reference)));
   rb_define_const(mRepos, "Svn_repos_notify_warning_found_old_mergeinfo", SWIG_From_int((int)(svn_repos_notify_warning_found_old_mergeinfo)));
   rb_define_const(mRepos, "Svn_repos_notify_warning_invalid_fspath", SWIG_From_int((int)(svn_repos_notify_warning_invalid_fspath)));
+  rb_define_const(mRepos, "Svn_repos_notify_warning_name_collision", SWIG_From_int((int)(svn_repos_notify_warning_name_collision)));
+  rb_define_const(mRepos, "Svn_repos_notify_warning_mergeinfo_collision", SWIG_From_int((int)(svn_repos_notify_warning_mergeinfo_collision)));
+  rb_define_const(mRepos, "Svn_repos_notify_warning_invalid_mergeinfo", SWIG_From_int((int)(svn_repos_notify_warning_invalid_mergeinfo)));
   
   SwigClassSvn_repos_notify_t.klass = rb_define_class_under(mRepos, "Svn_repos_notify_t", rb_cObject);
   SWIG_TypeClientData(SWIGTYPE_p_svn_repos_notify_t, (void *) &SwigClassSvn_repos_notify_t);
@@ -18244,10 +19600,15 @@ SWIGEXPORT void Init_repos(void) {
   rb_define_method(SwigClassSvn_repos_notify_t.klass, "node_action", _wrap_svn_repos_notify_t_node_action_get, -1);
   rb_define_method(SwigClassSvn_repos_notify_t.klass, "path=", _wrap_svn_repos_notify_t_path_set, -1);
   rb_define_method(SwigClassSvn_repos_notify_t.klass, "path", _wrap_svn_repos_notify_t_path_get, -1);
+  rb_define_method(SwigClassSvn_repos_notify_t.klass, "start_revision=", _wrap_svn_repos_notify_t_start_revision_set, -1);
+  rb_define_method(SwigClassSvn_repos_notify_t.klass, "start_revision", _wrap_svn_repos_notify_t_start_revision_get, -1);
+  rb_define_method(SwigClassSvn_repos_notify_t.klass, "end_revision=", _wrap_svn_repos_notify_t_end_revision_set, -1);
+  rb_define_method(SwigClassSvn_repos_notify_t.klass, "end_revision", _wrap_svn_repos_notify_t_end_revision_get, -1);
   SwigClassSvn_repos_notify_t.mark = 0;
   SwigClassSvn_repos_notify_t.trackObjects = 0;
   rb_define_module_function(mRepos, "svn_repos_notify_create", _wrap_svn_repos_notify_create, -1);
   rb_define_module_function(mRepos, "svn_repos_find_root_path", _wrap_svn_repos_find_root_path, -1);
+  rb_define_module_function(mRepos, "svn_repos_open3", _wrap_svn_repos_open3, -1);
   rb_define_module_function(mRepos, "svn_repos_open2", _wrap_svn_repos_open2, -1);
   rb_define_module_function(mRepos, "svn_repos_open", _wrap_svn_repos_open, -1);
   rb_define_module_function(mRepos, "svn_repos_create", _wrap_svn_repos_create, -1);
@@ -18255,7 +19616,11 @@ SWIGEXPORT void Init_repos(void) {
   rb_define_module_function(mRepos, "svn_repos_upgrade", _wrap_svn_repos_upgrade, -1);
   rb_define_module_function(mRepos, "svn_repos_delete", _wrap_svn_repos_delete, -1);
   rb_define_module_function(mRepos, "svn_repos_has_capability", _wrap_svn_repos_has_capability, -1);
+  rb_define_module_function(mRepos, "svn_repos_capabilities", _wrap_svn_repos_capabilities, -1);
   rb_define_const(mRepos, "SVN_REPOS_CAPABILITY_MERGEINFO", SWIG_FromCharPtr("mergeinfo"));
+  rb_define_module_function(mRepos, "svn_repos_remember_client_capabilities", _wrap_svn_repos_remember_client_capabilities, -1);
+  rb_define_module_function(mRepos, "svn_repos_fs_type", _wrap_svn_repos_fs_type, -1);
+  rb_define_module_function(mRepos, "svn_repos_hotcopy3", _wrap_svn_repos_hotcopy3, -1);
   rb_define_module_function(mRepos, "svn_repos_hotcopy2", _wrap_svn_repos_hotcopy2, -1);
   rb_define_module_function(mRepos, "svn_repos_hotcopy", _wrap_svn_repos_hotcopy, -1);
   rb_define_module_function(mRepos, "svn_repos_fs_pack2", _wrap_svn_repos_fs_pack2, -1);
@@ -18324,7 +19689,9 @@ SWIGEXPORT void Init_repos(void) {
   rb_define_module_function(mRepos, "svn_repos_fs_begin_txn_for_commit2", _wrap_svn_repos_fs_begin_txn_for_commit2, -1);
   rb_define_module_function(mRepos, "svn_repos_fs_begin_txn_for_commit", _wrap_svn_repos_fs_begin_txn_for_commit, -1);
   rb_define_module_function(mRepos, "svn_repos_fs_begin_txn_for_update", _wrap_svn_repos_fs_begin_txn_for_update, -1);
+  rb_define_module_function(mRepos, "svn_repos_fs_lock_many", _wrap_svn_repos_fs_lock_many, -1);
   rb_define_module_function(mRepos, "svn_repos_fs_lock", _wrap_svn_repos_fs_lock, -1);
+  rb_define_module_function(mRepos, "svn_repos_fs_unlock_many", _wrap_svn_repos_fs_unlock_many, -1);
   rb_define_module_function(mRepos, "svn_repos_fs_unlock", _wrap_svn_repos_fs_unlock, -1);
   rb_define_module_function(mRepos, "svn_repos_fs_get_locks2", _wrap_svn_repos_fs_get_locks2, -1);
   rb_define_module_function(mRepos, "svn_repos_fs_get_locks", _wrap_svn_repos_fs_get_locks, -1);
@@ -18335,6 +19702,7 @@ SWIGEXPORT void Init_repos(void) {
   rb_define_module_function(mRepos, "svn_repos_fs_revision_prop", _wrap_svn_repos_fs_revision_prop, -1);
   rb_define_module_function(mRepos, "svn_repos_fs_revision_proplist", _wrap_svn_repos_fs_revision_proplist, -1);
   rb_define_module_function(mRepos, "svn_repos_fs_change_node_prop", _wrap_svn_repos_fs_change_node_prop, -1);
+  rb_define_module_function(mRepos, "svn_repos_fs_get_inherited_props", _wrap_svn_repos_fs_get_inherited_props, -1);
   rb_define_module_function(mRepos, "svn_repos_fs_change_txn_prop", _wrap_svn_repos_fs_change_txn_prop, -1);
   rb_define_module_function(mRepos, "svn_repos_fs_change_txn_props", _wrap_svn_repos_fs_change_txn_props, -1);
   
@@ -18365,6 +19733,7 @@ SWIGEXPORT void Init_repos(void) {
   SwigClassSvn_repos_node_t.trackObjects = 0;
   rb_define_module_function(mRepos, "svn_repos_node_editor", _wrap_svn_repos_node_editor, -1);
   rb_define_module_function(mRepos, "svn_repos_node_from_baton", _wrap_svn_repos_node_from_baton, -1);
+  rb_define_module_function(mRepos, "svn_repos_info_format", _wrap_svn_repos_info_format, -1);
   rb_define_const(mRepos, "SVN_REPOS_DUMPFILE_MAGIC_HEADER", SWIG_FromCharPtr("SVN-fs-dump-format-version"));
   rb_define_const(mRepos, "SVN_REPOS_DUMPFILE_FORMAT_VERSION", SWIG_From_int((int)(3)));
   rb_define_const(mRepos, "SVN_REPOS_DUMPFILE_FORMAT_VERSION_DELTAS", SWIG_From_int((int)(3)));
@@ -18389,10 +19758,15 @@ SWIGEXPORT void Init_repos(void) {
   rb_define_const(mRepos, "SVN_REPOS_DUMPFILE_TEXT_DELTA_BASE_MD5", SWIG_FromCharPtr("Text-delta-base-md5"));
   rb_define_const(mRepos, "SVN_REPOS_DUMPFILE_TEXT_DELTA_BASE_SHA1", SWIG_FromCharPtr("Text-delta-base-sha1"));
   rb_define_const(mRepos, "SVN_REPOS_DUMPFILE_TEXT_DELTA_BASE_CHECKSUM", SWIG_FromCharPtr("Text-delta-base-md5"));
+  rb_define_const(mRepos, "Svn_repos_load_uuid_default", SWIG_From_int((int)(svn_repos_load_uuid_default)));
+  rb_define_const(mRepos, "Svn_repos_load_uuid_ignore", SWIG_From_int((int)(svn_repos_load_uuid_ignore)));
+  rb_define_const(mRepos, "Svn_repos_load_uuid_force", SWIG_From_int((int)(svn_repos_load_uuid_force)));
+  rb_define_module_function(mRepos, "svn_repos_verify_fs3", _wrap_svn_repos_verify_fs3, -1);
   rb_define_module_function(mRepos, "svn_repos_verify_fs2", _wrap_svn_repos_verify_fs2, -1);
   rb_define_module_function(mRepos, "svn_repos_verify_fs", _wrap_svn_repos_verify_fs, -1);
   rb_define_module_function(mRepos, "svn_repos_dump_fs3", _wrap_svn_repos_dump_fs3, -1);
   rb_define_module_function(mRepos, "svn_repos_dump_fs", _wrap_svn_repos_dump_fs, -1);
+  rb_define_module_function(mRepos, "svn_repos_load_fs5", _wrap_svn_repos_load_fs5, -1);
   rb_define_module_function(mRepos, "svn_repos_load_fs4", _wrap_svn_repos_load_fs4, -1);
   rb_define_module_function(mRepos, "svn_repos_load_fs3", _wrap_svn_repos_load_fs3, -1);
   rb_define_module_function(mRepos, "svn_repos_load_fs2", _wrap_svn_repos_load_fs2, -1);
@@ -18428,6 +19802,7 @@ SWIGEXPORT void Init_repos(void) {
   SwigClassSvn_repos_parse_fns3_t.mark = 0;
   SwigClassSvn_repos_parse_fns3_t.trackObjects = 0;
   rb_define_module_function(mRepos, "svn_repos_parse_dumpstream3", _wrap_svn_repos_parse_dumpstream3, -1);
+  rb_define_module_function(mRepos, "svn_repos_get_fs_build_parser5", _wrap_svn_repos_get_fs_build_parser5, -1);
   rb_define_module_function(mRepos, "svn_repos_get_fs_build_parser4", _wrap_svn_repos_get_fs_build_parser4, -1);
   
   SwigClassSvn_repos_parse_fns2_t.klass = rb_define_class_under(mRepos, "Svn_repos_parse_fns2_t", rb_cObject);
@@ -18494,8 +19869,6 @@ SWIGEXPORT void Init_repos(void) {
   rb_define_const(mRepos, "Svn_repos_revision_access_partial", SWIG_From_int((int)(svn_repos_revision_access_partial)));
   rb_define_const(mRepos, "Svn_repos_revision_access_full", SWIG_From_int((int)(svn_repos_revision_access_full)));
   rb_define_module_function(mRepos, "svn_repos_check_revision_access", _wrap_svn_repos_check_revision_access, -1);
-  rb_define_module_function(mRepos, "svn_repos_fs_get_inherited_props", _wrap_svn_repos_fs_get_inherited_props, -1);
-  rb_define_module_function(mRepos, "svn_repos_remember_client_capabilities", _wrap_svn_repos_remember_client_capabilities, -1);
   rb_define_module_function(mRepos, "svn_repos_parse_fns3_invoke_magic_header_record", _wrap_svn_repos_parse_fns3_invoke_magic_header_record, -1);
   rb_define_module_function(mRepos, "svn_repos_parse_fns3_invoke_uuid_record", _wrap_svn_repos_parse_fns3_invoke_uuid_record, -1);
   rb_define_module_function(mRepos, "svn_repos_parse_fns3_invoke_new_revision_record", _wrap_svn_repos_parse_fns3_invoke_new_revision_record, -1);
@@ -18521,10 +19894,11 @@ SWIGEXPORT void Init_repos(void) {
   rb_define_module_function(mRepos, "svn_repos_parse_fns2_invoke_close_revision", _wrap_svn_repos_parse_fns2_invoke_close_revision, -1);
   rb_define_module_function(mRepos, "svn_repos_invoke_authz_func", _wrap_svn_repos_invoke_authz_func, -1);
   rb_define_module_function(mRepos, "svn_repos_invoke_authz_callback", _wrap_svn_repos_invoke_authz_callback, -1);
-  rb_define_module_function(mRepos, "svn_repos_invoke_file_rev_handler", _wrap_svn_repos_invoke_file_rev_handler, -1);
   rb_define_module_function(mRepos, "svn_repos_invoke_notify_func", _wrap_svn_repos_invoke_notify_func, -1);
   rb_define_module_function(mRepos, "svn_repos_invoke_freeze_func", _wrap_svn_repos_invoke_freeze_func, -1);
   rb_define_module_function(mRepos, "svn_repos_invoke_history_func", _wrap_svn_repos_invoke_history_func, -1);
+  rb_define_module_function(mRepos, "svn_repos_invoke_file_rev_handler", _wrap_svn_repos_invoke_file_rev_handler, -1);
+  rb_define_module_function(mRepos, "svn_repos_invoke_verify_callback", _wrap_svn_repos_invoke_verify_callback, -1);
   
   {
     VALUE cSvnrepos;
diff --git a/subversion/bindings/swig/ruby/svn_wc.c b/subversion/bindings/swig/ruby/svn_wc.c
index beb2ad8..1b45f52 100644
--- a/subversion/bindings/swig/ruby/svn_wc.c
+++ b/subversion/bindings/swig/ruby/svn_wc.c
@@ -1,11 +1,11 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.9
- * 
- * This file is not intended to be easily readable and contains a number of 
+ * Version 2.0.12
+ *
+ * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
- * changes to this file unless you know what you are doing--modify the SWIG 
- * interface file instead. 
+ * changes to this file unless you know what you are doing--modify the SWIG
+ * interface file instead.
  * ----------------------------------------------------------------------------- */
 
 #define SWIGRUBY
@@ -41,28 +41,28 @@
 #ifndef SWIGUNUSED
 # if defined(__GNUC__)
 #   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__)) 
+#     define SWIGUNUSED __attribute__ ((__unused__))
 #   else
 #     define SWIGUNUSED
 #   endif
 # elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__)) 
+#   define SWIGUNUSED __attribute__ ((__unused__))
 # else
-#   define SWIGUNUSED 
+#   define SWIGUNUSED
 # endif
 #endif
 
 #ifndef SWIG_MSC_UNSUPPRESS_4505
 # if defined(_MSC_VER)
 #   pragma warning(disable : 4505) /* unreferenced local function has been removed */
-# endif 
+# endif
 #endif
 
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
 # else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
 # endif
 #endif
 
@@ -105,7 +105,7 @@
 #   define SWIGSTDCALL __stdcall
 # else
 #   define SWIGSTDCALL
-# endif 
+# endif
 #endif
 
 /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
@@ -150,28 +150,28 @@
 #ifndef SWIGUNUSED
 # if defined(__GNUC__)
 #   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__)) 
+#     define SWIGUNUSED __attribute__ ((__unused__))
 #   else
 #     define SWIGUNUSED
 #   endif
 # elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__)) 
+#   define SWIGUNUSED __attribute__ ((__unused__))
 # else
-#   define SWIGUNUSED 
+#   define SWIGUNUSED
 # endif
 #endif
 
 #ifndef SWIG_MSC_UNSUPPRESS_4505
 # if defined(_MSC_VER)
 #   pragma warning(disable : 4505) /* unreferenced local function has been removed */
-# endif 
+# endif
 #endif
 
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
 # else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
 # endif
 #endif
 
@@ -214,7 +214,7 @@
 #   define SWIGSTDCALL __stdcall
 # else
 #   define SWIGSTDCALL
-# endif 
+# endif
 #endif
 
 /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
@@ -252,7 +252,7 @@
   You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for
   creating a static or dynamic library from the SWIG runtime code.
   In 99.9% of the cases, SWIG just needs to declare them as 'static'.
-  
+
   But only do this if strictly necessary, ie, if you have problems
   with your compiler or suchlike.
 */
@@ -278,16 +278,16 @@
 #define SWIG_POINTER_OWN           0x1
 
 
-/* 
+/*
    Flags/methods for returning states.
-   
-   The SWIG conversion methods, as ConvertPtr, return an integer 
+
+   The SWIG conversion methods, as ConvertPtr, return an integer
    that tells if the conversion was successful or not. And if not,
    an error code can be returned (see swigerrors.swg for the codes).
-   
+
    Use the following macros/flags to set or process the returning
    states.
-   
+
    In old versions of SWIG, code such as the following was usually written:
 
      if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) {
@@ -320,23 +320,23 @@
     } else {
       // fail code
     }
-    
+
    I.e., now SWIG_ConvertPtr can return new objects and you can
    identify the case and take care of the deallocation. Of course that
    also requires SWIG_ConvertPtr to return new result values, such as
 
-      int SWIG_ConvertPtr(obj, ptr,...) {         
-        if (<obj is ok>) {			       
-          if (<need new object>) {		       
-            *ptr = <ptr to new allocated object>; 
-            return SWIG_NEWOBJ;		       
-          } else {				       
-            *ptr = <ptr to old object>;	       
-            return SWIG_OLDOBJ;		       
-          } 				       
-        } else {				       
-          return SWIG_BADOBJ;		       
-        }					       
+      int SWIG_ConvertPtr(obj, ptr,...) {
+        if (<obj is ok>) {
+          if (<need new object>) {
+            *ptr = <ptr to new allocated object>;
+            return SWIG_NEWOBJ;
+          } else {
+            *ptr = <ptr to old object>;
+            return SWIG_OLDOBJ;
+          }
+        } else {
+          return SWIG_BADOBJ;
+        }
       }
 
    Of course, returning the plain '0(success)/-1(fail)' still works, but you can be
@@ -350,17 +350,17 @@
        int fooi(int);
 
    and you call
- 
+
       food(1)   // cast rank '1'  (1 -> 1.0)
       fooi(1)   // cast rank '0'
 
    just use the SWIG_AddCast()/SWIG_CheckState()
 */
 
-#define SWIG_OK                    (0) 
+#define SWIG_OK                    (0)
 #define SWIG_ERROR                 (-1)
 #define SWIG_IsOK(r)               (r >= 0)
-#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)  
+#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)
 
 /* The CastRankLimit says how many bits are used for the cast rank */
 #define SWIG_CASTRANKLIMIT         (1 << 8)
@@ -391,14 +391,14 @@
 #  endif
 #  define SWIG_CASTRANKMASK          ((SWIG_CASTRANKLIMIT) -1)
 #  define SWIG_CastRank(r)           (r & SWIG_CASTRANKMASK)
-SWIGINTERNINLINE int SWIG_AddCast(int r) { 
+SWIGINTERNINLINE int SWIG_AddCast(int r) {
   return SWIG_IsOK(r) ? ((SWIG_CastRank(r) < SWIG_MAXCASTRANK) ? (r + 1) : SWIG_ERROR) : r;
 }
-SWIGINTERNINLINE int SWIG_CheckState(int r) { 
-  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0; 
+SWIGINTERNINLINE int SWIG_CheckState(int r) {
+  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0;
 }
 #else /* no cast-rank mode */
-#  define SWIG_AddCast
+#  define SWIG_AddCast(r) (r)
 #  define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0)
 #endif
 
@@ -442,7 +442,7 @@ typedef struct swig_module_info {
   void                    *clientdata;		/* Language specific module data */
 } swig_module_info;
 
-/* 
+/*
   Compare two type names skipping the space characters, therefore
   "char*" == "char *" and "Class<int>" == "Class<int >", etc.
 
@@ -462,18 +462,18 @@ SWIG_TypeNameComp(const char *f1, const char *l1,
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if not equal, 1 if equal
+  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
 */
 SWIGRUNTIME int
-SWIG_TypeEquiv(const char *nb, const char *tb) {
-  int equiv = 0;
+SWIG_TypeCmp(const char *nb, const char *tb) {
+  int equiv = 1;
   const char* te = tb + strlen(tb);
   const char* ne = nb;
-  while (!equiv && *ne) {
+  while (equiv != 0 && *ne) {
     for (nb = ne; *ne; ++ne) {
       if (*ne == '|') break;
     }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
+    equiv = SWIG_TypeNameComp(nb, ne, tb, te);
     if (*ne) ++ne;
   }
   return equiv;
@@ -481,24 +481,13 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
+  Return 0 if not equal, 1 if equal
 */
 SWIGRUNTIME int
-SWIG_TypeCompare(const char *nb, const char *tb) {
-  int equiv = 0;
-  const char* te = tb + strlen(tb);
-  const char* ne = nb;
-  while (!equiv && *ne) {
-    for (nb = ne; *ne; ++ne) {
-      if (*ne == '|') break;
-    }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
-    if (*ne) ++ne;
-  }
-  return equiv;
+SWIG_TypeEquiv(const char *nb, const char *tb) {
+  return SWIG_TypeCmp(nb, tb) == 0 ? 1 : 0;
 }
 
-
 /*
   Check the typename
 */
@@ -526,7 +515,7 @@ SWIG_TypeCheck(const char *c, swig_type_info *ty) {
   return 0;
 }
 
-/* 
+/*
   Identical to SWIG_TypeCheck, except strcmp is replaced with a pointer comparison
 */
 SWIGRUNTIME swig_cast_info *
@@ -561,7 +550,7 @@ SWIG_TypeCast(swig_cast_info *ty, void *ptr, int *newmemory) {
   return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr, newmemory);
 }
 
-/* 
+/*
    Dynamic pointer casting. Down an inheritance hierarchy
 */
 SWIGRUNTIME swig_type_info *
@@ -605,7 +594,7 @@ SWIG_TypePrettyName(const swig_type_info *type) {
     return type->name;
 }
 
-/* 
+/*
    Set the clientdata field for a type
 */
 SWIGRUNTIME void
@@ -613,14 +602,14 @@ SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
   swig_cast_info *cast = ti->cast;
   /* if (ti->clientdata == clientdata) return; */
   ti->clientdata = clientdata;
-  
+
   while (cast) {
     if (!cast->converter) {
       swig_type_info *tc = cast->type;
       if (!tc->clientdata) {
 	SWIG_TypeClientData(tc, clientdata);
       }
-    }    
+    }
     cast = cast->next;
   }
 }
@@ -629,18 +618,18 @@ SWIG_TypeNewClientData(swig_type_info *ti, void *clientdata) {
   SWIG_TypeClientData(ti, clientdata);
   ti->owndata = 1;
 }
-  
+
 /*
   Search for a swig_type_info structure only by mangled name
   Search is a O(log #types)
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_MangledTypeQueryModule(swig_module_info *start, 
-                            swig_module_info *end, 
+SWIG_MangledTypeQueryModule(swig_module_info *start,
+                            swig_module_info *end,
 		            const char *name) {
   swig_module_info *iter = start;
   do {
@@ -649,11 +638,11 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
       register size_t r = iter->size - 1;
       do {
 	/* since l+r >= 0, we can (>> 1) instead (/ 2) */
-	register size_t i = (l + r) >> 1; 
+	register size_t i = (l + r) >> 1;
 	const char *iname = iter->types[i]->name;
 	if (iname) {
 	  register int compare = strcmp(name, iname);
-	  if (compare == 0) {	    
+	  if (compare == 0) {
 	    return iter->types[i];
 	  } else if (compare < 0) {
 	    if (i) {
@@ -678,14 +667,14 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
   Search for a swig_type_info structure for either a mangled name or a human readable name.
   It first searches the mangled names of the types, which is a O(log #types)
   If a type is not found it then searches the human readable names, which is O(#types).
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_TypeQueryModule(swig_module_info *start, 
-                     swig_module_info *end, 
+SWIG_TypeQueryModule(swig_module_info *start,
+                     swig_module_info *end,
 		     const char *name) {
   /* STEP 1: Search the name field using binary search */
   swig_type_info *ret = SWIG_MangledTypeQueryModule(start, end, name);
@@ -704,12 +693,12 @@ SWIG_TypeQueryModule(swig_module_info *start,
       iter = iter->next;
     } while (iter != end);
   }
-  
+
   /* neither found a match */
   return 0;
 }
 
-/* 
+/*
    Pack binary data into a string
 */
 SWIGRUNTIME char *
@@ -725,7 +714,7 @@ SWIG_PackData(char *c, void *ptr, size_t sz) {
   return c;
 }
 
-/* 
+/*
    Unpack binary data from a string
 */
 SWIGRUNTIME const char *
@@ -739,21 +728,21 @@ SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
       uu = ((d - '0') << 4);
     else if ((d >= 'a') && (d <= 'f'))
       uu = ((d - ('a'-10)) << 4);
-    else 
+    else
       return (char *) 0;
     d = *(c++);
     if ((d >= '0') && (d <= '9'))
       uu |= (d - '0');
     else if ((d >= 'a') && (d <= 'f'))
       uu |= (d - ('a'-10));
-    else 
+    else
       return (char *) 0;
     *u = uu;
   }
   return c;
 }
 
-/* 
+/*
    Pack 'void *' into a string buffer.
 */
 SWIGRUNTIME char *
@@ -813,18 +802,18 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 #endif
 
 /*  Errors in SWIG */
-#define  SWIG_UnknownError    	   -1 
-#define  SWIG_IOError        	   -2 
-#define  SWIG_RuntimeError   	   -3 
-#define  SWIG_IndexError     	   -4 
-#define  SWIG_TypeError      	   -5 
-#define  SWIG_DivisionByZero 	   -6 
-#define  SWIG_OverflowError  	   -7 
-#define  SWIG_SyntaxError    	   -8 
-#define  SWIG_ValueError     	   -9 
+#define  SWIG_UnknownError    	   -1
+#define  SWIG_IOError        	   -2
+#define  SWIG_RuntimeError   	   -3
+#define  SWIG_IndexError     	   -4
+#define  SWIG_TypeError      	   -5
+#define  SWIG_DivisionByZero 	   -6
+#define  SWIG_OverflowError  	   -7
+#define  SWIG_SyntaxError    	   -8
+#define  SWIG_ValueError     	   -9
 #define  SWIG_SystemError    	   -10
 #define  SWIG_AttributeError 	   -11
-#define  SWIG_MemoryError    	   -12 
+#define  SWIG_MemoryError    	   -12
 #define  SWIG_NullReferenceError   -13
 
 
@@ -1750,7 +1739,7 @@ SWIG_Ruby_SetModule(swig_module_info *pointer)
 SWIGINTERN
 int SWIG_Ruby_isCallable( VALUE proc )
 {
-  if ( rb_respond_to( proc, swig_call_id ) == Qtrue )
+  if ( rb_respond_to( proc, swig_call_id ) )
     return 1;
   return 0;
 }
@@ -1763,7 +1752,7 @@ int SWIG_Ruby_isCallable( VALUE proc )
 SWIGINTERN
 int SWIG_Ruby_arity( VALUE proc, int minimal )
 {
-  if ( rb_respond_to( proc, swig_arity_id ) == Qtrue )
+  if ( rb_respond_to( proc, swig_arity_id ) )
     {
       VALUE num = rb_funcall( proc, swig_arity_id, 0 );
       int arity = NUM2INT(num);
@@ -1986,7 +1975,7 @@ static VALUE mWc;
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x020009 
+#define SWIGVERSION 0x020012 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -2119,7 +2108,7 @@ SWIG_ruby_failed(void)
 } 
 
 
-/*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2199,7 +2188,7 @@ SWIGINTERN svn_wc_external_item2_t *svn_wc_external_item2_t_dup(struct svn_wc_ex
     return svn_wc_external_item2_dup(self, pool);
   }
 
-/*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.9/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/tmp/svnrm/prefix/share/swig/2.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2711,7 +2700,7 @@ _wrap_svn_wc_adm_open3(int argc, VALUE *argv, VALUE self) {
   } 
   arg5 = (int)(val5);
   {
-    arg6 = svn_swig_rb_cancel_func;
+    arg6 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg7 = (void *)svn_swig_rb_make_baton(argv[4], _global_svn_swig_rb_pool);
   }
   if (argc > 5) {
@@ -2978,7 +2967,7 @@ _wrap_svn_wc_adm_probe_open3(int argc, VALUE *argv, VALUE self) {
   } 
   arg5 = (int)(val5);
   {
-    arg6 = svn_swig_rb_cancel_func;
+    arg6 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg7 = (void *)svn_swig_rb_make_baton(argv[4], _global_svn_swig_rb_pool);
   }
   if (argc > 5) {
@@ -3243,7 +3232,7 @@ _wrap_svn_wc_adm_open_anchor(int argc, VALUE *argv, VALUE self) {
   } 
   arg6 = (int)(val6);
   {
-    arg7 = svn_swig_rb_cancel_func;
+    arg7 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg8 = (void *)svn_swig_rb_make_baton(argv[3], _global_svn_swig_rb_pool);
   }
   if (argc > 4) {
@@ -3506,7 +3495,7 @@ _wrap_svn_wc_adm_probe_try3(int argc, VALUE *argv, VALUE self) {
   } 
   arg5 = (int)(val5);
   {
-    arg6 = svn_swig_rb_cancel_func;
+    arg6 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg7 = (void *)svn_swig_rb_make_baton(argv[4], _global_svn_swig_rb_pool);
   }
   if (argc > 5) {
@@ -7350,951 +7339,6 @@ fail:
 }
 
 
-static swig_class SwigClassSvn_wc_conflict_description2_t;
-
-SWIGINTERN VALUE
-_wrap_svn_wc_conflict_description2_t_local_abspath_set(int argc, VALUE *argv, VALUE self) {
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  char *buf2 = 0 ;
-  int alloc2 = 0 ;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_wc_conflict_description2_t *","local_abspath", 1, self )); 
-  }
-  arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-  res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","local_abspath", 2, argv[0] ));
-  }
-  arg2 = (char *)(buf2);
-  {
-    apr_size_t len = strlen(arg2) + 1;
-    char *copied;
-    if (arg1->local_abspath) free((char *)arg1->local_abspath);
-    copied = malloc(len);
-    memcpy(copied, arg2, len);
-    arg1->local_abspath = copied;
-  }
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  return Qnil;
-fail:
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_svn_wc_conflict_description2_t_local_abspath_get(int argc, VALUE *argv, VALUE self) {
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  char *result = 0 ;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 0) || (argc > 0)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_wc_conflict_description2_t *","local_abspath", 1, self )); 
-  }
-  arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-  result = (char *) ((arg1)->local_abspath);
-  {
-    if (result) {
-      vresult = rb_str_new2(result);
-    } else {
-      vresult = Qnil;
-    }
-  }
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_svn_wc_conflict_description2_t_node_kind_set(int argc, VALUE *argv, VALUE self) {
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  svn_node_kind_t arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_wc_conflict_description2_t *","node_kind", 1, self )); 
-  }
-  arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-  ecode2 = SWIG_AsVal_int(argv[0], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "svn_node_kind_t","node_kind", 2, argv[0] ));
-  } 
-  arg2 = (svn_node_kind_t)(val2);
-  if (arg1) (arg1)->node_kind = arg2;
-  return Qnil;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_svn_wc_conflict_description2_t_node_kind_get(int argc, VALUE *argv, VALUE self) {
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  svn_node_kind_t result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 0) || (argc > 0)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_wc_conflict_description2_t *","node_kind", 1, self )); 
-  }
-  arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-  result = (svn_node_kind_t) ((arg1)->node_kind);
-  vresult = SWIG_From_int((int)(result));
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_svn_wc_conflict_description2_t_kind_set(int argc, VALUE *argv, VALUE self) {
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  svn_wc_conflict_kind_t arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_wc_conflict_description2_t *","kind", 1, self )); 
-  }
-  arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-  ecode2 = SWIG_AsVal_int(argv[0], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "svn_wc_conflict_kind_t","kind", 2, argv[0] ));
-  } 
-  arg2 = (svn_wc_conflict_kind_t)(val2);
-  if (arg1) (arg1)->kind = arg2;
-  return Qnil;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_svn_wc_conflict_description2_t_kind_get(int argc, VALUE *argv, VALUE self) {
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  svn_wc_conflict_kind_t result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 0) || (argc > 0)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_wc_conflict_description2_t *","kind", 1, self )); 
-  }
-  arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-  result = (svn_wc_conflict_kind_t) ((arg1)->kind);
-  vresult = SWIG_From_int((int)(result));
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_svn_wc_conflict_description2_t_property_name_set(int argc, VALUE *argv, VALUE self) {
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  char *buf2 = 0 ;
-  int alloc2 = 0 ;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_wc_conflict_description2_t *","property_name", 1, self )); 
-  }
-  arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-  res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","property_name", 2, argv[0] ));
-  }
-  arg2 = (char *)(buf2);
-  {
-    apr_size_t len = strlen(arg2) + 1;
-    char *copied;
-    if (arg1->property_name) free((char *)arg1->property_name);
-    copied = malloc(len);
-    memcpy(copied, arg2, len);
-    arg1->property_name = copied;
-  }
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  return Qnil;
-fail:
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_svn_wc_conflict_description2_t_property_name_get(int argc, VALUE *argv, VALUE self) {
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  char *result = 0 ;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 0) || (argc > 0)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_wc_conflict_description2_t *","property_name", 1, self )); 
-  }
-  arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-  result = (char *) ((arg1)->property_name);
-  {
-    if (result) {
-      vresult = rb_str_new2(result);
-    } else {
-      vresult = Qnil;
-    }
-  }
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_svn_wc_conflict_description2_t_is_binary_set(int argc, VALUE *argv, VALUE self) {
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  svn_boolean_t arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_wc_conflict_description2_t *","is_binary", 1, self )); 
-  }
-  arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-  arg2 = RTEST(argv[0]);
-  if (arg1) (arg1)->is_binary = arg2;
-  return Qnil;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_svn_wc_conflict_description2_t_is_binary_get(int argc, VALUE *argv, VALUE self) {
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  svn_boolean_t result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 0) || (argc > 0)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_wc_conflict_description2_t *","is_binary", 1, self )); 
-  }
-  arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-  result = (svn_boolean_t) ((arg1)->is_binary);
-  vresult = result ? Qtrue : Qfalse;
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_svn_wc_conflict_description2_t_mime_type_set(int argc, VALUE *argv, VALUE self) {
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  char *buf2 = 0 ;
-  int alloc2 = 0 ;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_wc_conflict_description2_t *","mime_type", 1, self )); 
-  }
-  arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-  res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","mime_type", 2, argv[0] ));
-  }
-  arg2 = (char *)(buf2);
-  {
-    apr_size_t len = strlen(arg2) + 1;
-    char *copied;
-    if (arg1->mime_type) free((char *)arg1->mime_type);
-    copied = malloc(len);
-    memcpy(copied, arg2, len);
-    arg1->mime_type = copied;
-  }
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  return Qnil;
-fail:
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_svn_wc_conflict_description2_t_mime_type_get(int argc, VALUE *argv, VALUE self) {
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  char *result = 0 ;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 0) || (argc > 0)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_wc_conflict_description2_t *","mime_type", 1, self )); 
-  }
-  arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-  result = (char *) ((arg1)->mime_type);
-  {
-    if (result) {
-      vresult = rb_str_new2(result);
-    } else {
-      vresult = Qnil;
-    }
-  }
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_svn_wc_conflict_description2_t_action_set(int argc, VALUE *argv, VALUE self) {
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  svn_wc_conflict_action_t arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_wc_conflict_description2_t *","action", 1, self )); 
-  }
-  arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-  ecode2 = SWIG_AsVal_int(argv[0], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "svn_wc_conflict_action_t","action", 2, argv[0] ));
-  } 
-  arg2 = (svn_wc_conflict_action_t)(val2);
-  if (arg1) (arg1)->action = arg2;
-  return Qnil;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_svn_wc_conflict_description2_t_action_get(int argc, VALUE *argv, VALUE self) {
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  svn_wc_conflict_action_t result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 0) || (argc > 0)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_wc_conflict_description2_t *","action", 1, self )); 
-  }
-  arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-  result = (svn_wc_conflict_action_t) ((arg1)->action);
-  vresult = SWIG_From_int((int)(result));
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_svn_wc_conflict_description2_t_reason_set(int argc, VALUE *argv, VALUE self) {
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  svn_wc_conflict_reason_t arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_wc_conflict_description2_t *","reason", 1, self )); 
-  }
-  arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-  ecode2 = SWIG_AsVal_int(argv[0], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "svn_wc_conflict_reason_t","reason", 2, argv[0] ));
-  } 
-  arg2 = (svn_wc_conflict_reason_t)(val2);
-  if (arg1) (arg1)->reason = arg2;
-  return Qnil;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_svn_wc_conflict_description2_t_reason_get(int argc, VALUE *argv, VALUE self) {
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  svn_wc_conflict_reason_t result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 0) || (argc > 0)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_wc_conflict_description2_t *","reason", 1, self )); 
-  }
-  arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-  result = (svn_wc_conflict_reason_t) ((arg1)->reason);
-  vresult = SWIG_From_int((int)(result));
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_svn_wc_conflict_description2_t_base_abspath_set(int argc, VALUE *argv, VALUE self) {
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  char *buf2 = 0 ;
-  int alloc2 = 0 ;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_wc_conflict_description2_t *","base_abspath", 1, self )); 
-  }
-  arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-  res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","base_abspath", 2, argv[0] ));
-  }
-  arg2 = (char *)(buf2);
-  {
-    apr_size_t len = strlen(arg2) + 1;
-    char *copied;
-    if (arg1->base_abspath) free((char *)arg1->base_abspath);
-    copied = malloc(len);
-    memcpy(copied, arg2, len);
-    arg1->base_abspath = copied;
-  }
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  return Qnil;
-fail:
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_svn_wc_conflict_description2_t_base_abspath_get(int argc, VALUE *argv, VALUE self) {
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  char *result = 0 ;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 0) || (argc > 0)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_wc_conflict_description2_t *","base_abspath", 1, self )); 
-  }
-  arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-  result = (char *) ((arg1)->base_abspath);
-  {
-    if (result) {
-      vresult = rb_str_new2(result);
-    } else {
-      vresult = Qnil;
-    }
-  }
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_svn_wc_conflict_description2_t_their_abspath_set(int argc, VALUE *argv, VALUE self) {
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  char *buf2 = 0 ;
-  int alloc2 = 0 ;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_wc_conflict_description2_t *","their_abspath", 1, self )); 
-  }
-  arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-  res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","their_abspath", 2, argv[0] ));
-  }
-  arg2 = (char *)(buf2);
-  {
-    apr_size_t len = strlen(arg2) + 1;
-    char *copied;
-    if (arg1->their_abspath) free((char *)arg1->their_abspath);
-    copied = malloc(len);
-    memcpy(copied, arg2, len);
-    arg1->their_abspath = copied;
-  }
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  return Qnil;
-fail:
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_svn_wc_conflict_description2_t_their_abspath_get(int argc, VALUE *argv, VALUE self) {
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  char *result = 0 ;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 0) || (argc > 0)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_wc_conflict_description2_t *","their_abspath", 1, self )); 
-  }
-  arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-  result = (char *) ((arg1)->their_abspath);
-  {
-    if (result) {
-      vresult = rb_str_new2(result);
-    } else {
-      vresult = Qnil;
-    }
-  }
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_svn_wc_conflict_description2_t_my_abspath_set(int argc, VALUE *argv, VALUE self) {
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  char *buf2 = 0 ;
-  int alloc2 = 0 ;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_wc_conflict_description2_t *","my_abspath", 1, self )); 
-  }
-  arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-  res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","my_abspath", 2, argv[0] ));
-  }
-  arg2 = (char *)(buf2);
-  {
-    apr_size_t len = strlen(arg2) + 1;
-    char *copied;
-    if (arg1->my_abspath) free((char *)arg1->my_abspath);
-    copied = malloc(len);
-    memcpy(copied, arg2, len);
-    arg1->my_abspath = copied;
-  }
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  return Qnil;
-fail:
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_svn_wc_conflict_description2_t_my_abspath_get(int argc, VALUE *argv, VALUE self) {
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  char *result = 0 ;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 0) || (argc > 0)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_wc_conflict_description2_t *","my_abspath", 1, self )); 
-  }
-  arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-  result = (char *) ((arg1)->my_abspath);
-  {
-    if (result) {
-      vresult = rb_str_new2(result);
-    } else {
-      vresult = Qnil;
-    }
-  }
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_svn_wc_conflict_description2_t_merged_file_set(int argc, VALUE *argv, VALUE self) {
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  char *buf2 = 0 ;
-  int alloc2 = 0 ;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_wc_conflict_description2_t *","merged_file", 1, self )); 
-  }
-  arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-  res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","merged_file", 2, argv[0] ));
-  }
-  arg2 = (char *)(buf2);
-  {
-    apr_size_t len = strlen(arg2) + 1;
-    char *copied;
-    if (arg1->merged_file) free((char *)arg1->merged_file);
-    copied = malloc(len);
-    memcpy(copied, arg2, len);
-    arg1->merged_file = copied;
-  }
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  return Qnil;
-fail:
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_svn_wc_conflict_description2_t_merged_file_get(int argc, VALUE *argv, VALUE self) {
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  char *result = 0 ;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 0) || (argc > 0)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_wc_conflict_description2_t *","merged_file", 1, self )); 
-  }
-  arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-  result = (char *) ((arg1)->merged_file);
-  {
-    if (result) {
-      vresult = rb_str_new2(result);
-    } else {
-      vresult = Qnil;
-    }
-  }
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_svn_wc_conflict_description2_t_operation_set(int argc, VALUE *argv, VALUE self) {
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  svn_wc_operation_t arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_wc_conflict_description2_t *","operation", 1, self )); 
-  }
-  arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-  ecode2 = SWIG_AsVal_int(argv[0], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "svn_wc_operation_t","operation", 2, argv[0] ));
-  } 
-  arg2 = (svn_wc_operation_t)(val2);
-  if (arg1) (arg1)->operation = arg2;
-  return Qnil;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_svn_wc_conflict_description2_t_operation_get(int argc, VALUE *argv, VALUE self) {
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  svn_wc_operation_t result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 0) || (argc > 0)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_wc_conflict_description2_t *","operation", 1, self )); 
-  }
-  arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-  result = (svn_wc_operation_t) ((arg1)->operation);
-  vresult = SWIG_From_int((int)(result));
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_svn_wc_conflict_description2_t_src_left_version_set(int argc, VALUE *argv, VALUE self) {
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  svn_wc_conflict_version_t *arg2 = (svn_wc_conflict_version_t *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_wc_conflict_description2_t *","src_left_version", 1, self )); 
-  }
-  arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-  res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_svn_wc_conflict_version_t, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "svn_wc_conflict_version_t const *","src_left_version", 2, argv[0] )); 
-  }
-  arg2 = (svn_wc_conflict_version_t *)(argp2);
-  if (arg1) (arg1)->src_left_version = (svn_wc_conflict_version_t const *)arg2;
-  return Qnil;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_svn_wc_conflict_description2_t_src_left_version_get(int argc, VALUE *argv, VALUE self) {
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  svn_wc_conflict_version_t *result = 0 ;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 0) || (argc > 0)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_wc_conflict_description2_t *","src_left_version", 1, self )); 
-  }
-  arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-  result = (svn_wc_conflict_version_t *) ((arg1)->src_left_version);
-  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_svn_wc_conflict_version_t, 0 |  0 );
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_svn_wc_conflict_description2_t_src_right_version_set(int argc, VALUE *argv, VALUE self) {
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  svn_wc_conflict_version_t *arg2 = (svn_wc_conflict_version_t *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_wc_conflict_description2_t *","src_right_version", 1, self )); 
-  }
-  arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-  res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_svn_wc_conflict_version_t, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "svn_wc_conflict_version_t const *","src_right_version", 2, argv[0] )); 
-  }
-  arg2 = (svn_wc_conflict_version_t *)(argp2);
-  if (arg1) (arg1)->src_right_version = (svn_wc_conflict_version_t const *)arg2;
-  return Qnil;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_svn_wc_conflict_description2_t_src_right_version_get(int argc, VALUE *argv, VALUE self) {
-  struct svn_wc_conflict_description2_t *arg1 = (struct svn_wc_conflict_description2_t *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  svn_wc_conflict_version_t *result = 0 ;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 0) || (argc > 0)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_wc_conflict_description2_t *","src_right_version", 1, self )); 
-  }
-  arg1 = (struct svn_wc_conflict_description2_t *)(argp1);
-  result = (svn_wc_conflict_version_t *) ((arg1)->src_right_version);
-  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_svn_wc_conflict_version_t, 0 |  0 );
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-#ifdef HAVE_RB_DEFINE_ALLOC_FUNC
-SWIGINTERN VALUE
-_wrap_svn_wc_conflict_description2_t_allocate(VALUE self) {
-#else
-  SWIGINTERN VALUE
-  _wrap_svn_wc_conflict_description2_t_allocate(int argc, VALUE *argv, VALUE self) {
-#endif
-    
-    
-    VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_svn_wc_conflict_description2_t);
-#ifndef HAVE_RB_DEFINE_ALLOC_FUNC
-    rb_obj_call_init(vresult, argc, argv);
-#endif
-    return vresult;
-  }
-  
-
-SWIGINTERN VALUE
-_wrap_new_svn_wc_conflict_description2_t(int argc, VALUE *argv, VALUE self) {
-  struct svn_wc_conflict_description2_t *result = 0 ;
-  
-  if ((argc < 0) || (argc > 0)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
-  }
-  {
-    result = (struct svn_wc_conflict_description2_t *)calloc(1, sizeof(struct svn_wc_conflict_description2_t));
-    DATA_PTR(self) = result;
-    
-    
-    
-  }
-  return self;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN void
-free_svn_wc_conflict_description2_t(struct svn_wc_conflict_description2_t *arg1) {
-    free((char *) arg1);
-}
-
 static swig_class SwigClassSvn_wc_conflict_description_t;
 
 SWIGINTERN VALUE
@@ -9762,7 +8806,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_svn_wc__conflict_description2_dup(int argc, VALUE *argv, VALUE self) {
+_wrap_svn_wc_conflict_description2_dup(int argc, VALUE *argv, VALUE self) {
   svn_wc_conflict_description2_t *arg1 = (svn_wc_conflict_description2_t *) 0 ;
   apr_pool_t *arg2 = (apr_pool_t *) 0 ;
   VALUE _global_svn_swig_rb_pool ;
@@ -9782,14 +8826,14 @@ _wrap_svn_wc__conflict_description2_dup(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "svn_wc_conflict_description2_t const *","svn_wc__conflict_description2_dup", 1, argv[0] )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "svn_wc_conflict_description2_t const *","svn_wc_conflict_description2_dup", 1, argv[0] )); 
   }
   arg1 = (svn_wc_conflict_description2_t *)(argp1);
   if (argc > 1) {
     
   }
   {
-    result = (svn_wc_conflict_description2_t *)svn_wc__conflict_description2_dup((struct svn_wc_conflict_description2_t const *)arg1,arg2);
+    result = (svn_wc_conflict_description2_t *)svn_wc_conflict_description2_dup((struct svn_wc_conflict_description2_t const *)arg1,arg2);
     
     
     
@@ -9815,219 +8859,60 @@ fail:
 }
 
 
-static swig_class SwigClassSvn_wc_conflict_result_t;
-
-SWIGINTERN VALUE
-_wrap_svn_wc_conflict_result_t_choice_set(int argc, VALUE *argv, VALUE self) {
-  struct svn_wc_conflict_result_t *arg1 = (struct svn_wc_conflict_result_t *) 0 ;
-  svn_wc_conflict_choice_t arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_wc_conflict_result_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_wc_conflict_result_t *","choice", 1, self )); 
-  }
-  arg1 = (struct svn_wc_conflict_result_t *)(argp1);
-  ecode2 = SWIG_AsVal_int(argv[0], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "svn_wc_conflict_choice_t","choice", 2, argv[0] ));
-  } 
-  arg2 = (svn_wc_conflict_choice_t)(val2);
-  if (arg1) (arg1)->choice = arg2;
-  return Qnil;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_svn_wc_conflict_result_t_choice_get(int argc, VALUE *argv, VALUE self) {
-  struct svn_wc_conflict_result_t *arg1 = (struct svn_wc_conflict_result_t *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  svn_wc_conflict_choice_t result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 0) || (argc > 0)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_wc_conflict_result_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_wc_conflict_result_t *","choice", 1, self )); 
-  }
-  arg1 = (struct svn_wc_conflict_result_t *)(argp1);
-  result = (svn_wc_conflict_choice_t) ((arg1)->choice);
-  vresult = SWIG_From_int((int)(result));
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_svn_wc_conflict_result_t_merged_file_set(int argc, VALUE *argv, VALUE self) {
-  struct svn_wc_conflict_result_t *arg1 = (struct svn_wc_conflict_result_t *) 0 ;
-  char *arg2 = (char *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 ;
-  char *buf2 = 0 ;
-  int alloc2 = 0 ;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_wc_conflict_result_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_wc_conflict_result_t *","merged_file", 1, self )); 
-  }
-  arg1 = (struct svn_wc_conflict_result_t *)(argp1);
-  res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2);
-  if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","merged_file", 2, argv[0] ));
-  }
-  arg2 = (char *)(buf2);
-  {
-    apr_size_t len = strlen(arg2) + 1;
-    char *copied;
-    if (arg1->merged_file) free((char *)arg1->merged_file);
-    copied = malloc(len);
-    memcpy(copied, arg2, len);
-    arg1->merged_file = copied;
-  }
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  return Qnil;
-fail:
-  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
-  return Qnil;
-}
-
-
 SWIGINTERN VALUE
-_wrap_svn_wc_conflict_result_t_merged_file_get(int argc, VALUE *argv, VALUE self) {
-  struct svn_wc_conflict_result_t *arg1 = (struct svn_wc_conflict_result_t *) 0 ;
+_wrap_svn_wc__conflict_description2_dup(int argc, VALUE *argv, VALUE self) {
+  svn_wc_conflict_description2_t *arg1 = (svn_wc_conflict_description2_t *) 0 ;
+  apr_pool_t *arg2 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  char *result = 0 ;
+  svn_wc_conflict_description2_t *result = 0 ;
   VALUE vresult = Qnil;
   
-  if ((argc < 0) || (argc > 0)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_wc_conflict_result_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_wc_conflict_result_t *","merged_file", 1, self )); 
-  }
-  arg1 = (struct svn_wc_conflict_result_t *)(argp1);
-  result = (char *) ((arg1)->merged_file);
   {
-    if (result) {
-      vresult = rb_str_new2(result);
-    } else {
-      vresult = Qnil;
-    }
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg2);
+    _global_pool = arg2;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
   }
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_svn_wc_conflict_result_t_save_merged_set(int argc, VALUE *argv, VALUE self) {
-  struct svn_wc_conflict_result_t *arg1 = (struct svn_wc_conflict_result_t *) 0 ;
-  svn_boolean_t arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  
-  if ((argc < 1) || (argc > 1)) {
+  if ((argc < 1) || (argc > 2)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_wc_conflict_result_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_wc_conflict_result_t *","save_merged", 1, self )); 
-  }
-  arg1 = (struct svn_wc_conflict_result_t *)(argp1);
-  arg2 = RTEST(argv[0]);
-  if (arg1) (arg1)->save_merged = arg2;
-  return Qnil;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_svn_wc_conflict_result_t_save_merged_get(int argc, VALUE *argv, VALUE self) {
-  struct svn_wc_conflict_result_t *arg1 = (struct svn_wc_conflict_result_t *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  svn_boolean_t result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 0) || (argc > 0)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_wc_conflict_result_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_wc_conflict_result_t *","save_merged", 1, self )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "svn_wc_conflict_description2_t const *","svn_wc__conflict_description2_dup", 1, argv[0] )); 
   }
-  arg1 = (struct svn_wc_conflict_result_t *)(argp1);
-  result = (svn_boolean_t) ((arg1)->save_merged);
-  vresult = result ? Qtrue : Qfalse;
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-#ifdef HAVE_RB_DEFINE_ALLOC_FUNC
-SWIGINTERN VALUE
-_wrap_svn_wc_conflict_result_t_allocate(VALUE self) {
-#else
-  SWIGINTERN VALUE
-  _wrap_svn_wc_conflict_result_t_allocate(int argc, VALUE *argv, VALUE self) {
-#endif
-    
+  arg1 = (svn_wc_conflict_description2_t *)(argp1);
+  if (argc > 1) {
     
-    VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_svn_wc_conflict_result_t);
-#ifndef HAVE_RB_DEFINE_ALLOC_FUNC
-    rb_obj_call_init(vresult, argc, argv);
-#endif
-    return vresult;
-  }
-  
-
-SWIGINTERN VALUE
-_wrap_new_svn_wc_conflict_result_t(int argc, VALUE *argv, VALUE self) {
-  struct svn_wc_conflict_result_t *result = 0 ;
-  
-  if ((argc < 0) || (argc > 0)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
   }
   {
-    result = (struct svn_wc_conflict_result_t *)calloc(1, sizeof(struct svn_wc_conflict_result_t));
-    DATA_PTR(self) = result;
+    result = (svn_wc_conflict_description2_t *)svn_wc__conflict_description2_dup((struct svn_wc_conflict_description2_t const *)arg1,arg2);
     
     
     
   }
-  return self;
+  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_svn_wc_conflict_description2_t, 0 |  0 );
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
 fail:
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
   return Qnil;
 }
 
 
-SWIGINTERN void
-free_svn_wc_conflict_result_t(struct svn_wc_conflict_result_t *arg1) {
-    free((char *) arg1);
-}
-
 SWIGINTERN VALUE
 _wrap_svn_wc_create_conflict_result(int argc, VALUE *argv, VALUE self) {
   svn_wc_conflict_choice_t arg1 ;
@@ -16273,7 +15158,7 @@ _wrap_svn_wc_walk_entries3(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (svn_wc_adm_access_t *)(argp2);
   {
-    arg3 = svn_swig_rb_wc_entry_callbacks2();
+    arg3 = (svn_wc_entry_callbacks2_t *) svn_swig_rb_wc_entry_callbacks2();
     arg4 = (void *)svn_swig_rb_make_baton(argv[2], _global_svn_swig_rb_pool);
   }
   {
@@ -16281,7 +15166,7 @@ _wrap_svn_wc_walk_entries3(int argc, VALUE *argv, VALUE self) {
   }
   arg6 = RTEST(argv[4]);
   {
-    arg7 = svn_swig_rb_cancel_func;
+    arg7 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg8 = (void *)svn_swig_rb_make_baton(argv[5], _global_svn_swig_rb_pool);
   }
   if (argc > 6) {
@@ -16378,7 +15263,7 @@ _wrap_svn_wc_walk_entries2(int argc, VALUE *argv, VALUE self) {
   }
   arg5 = RTEST(argv[4]);
   {
-    arg6 = svn_swig_rb_cancel_func;
+    arg6 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg7 = (void *)svn_swig_rb_make_baton(argv[5], _global_svn_swig_rb_pool);
   }
   if (argc > 6) {
@@ -18793,6 +17678,59 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_svn_wc_status3_t_actual_kind_set(int argc, VALUE *argv, VALUE self) {
+  struct svn_wc_status3_t *arg1 = (struct svn_wc_status3_t *) 0 ;
+  svn_node_kind_t arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_wc_status3_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_wc_status3_t *","actual_kind", 1, self )); 
+  }
+  arg1 = (struct svn_wc_status3_t *)(argp1);
+  ecode2 = SWIG_AsVal_int(argv[0], &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "svn_node_kind_t","actual_kind", 2, argv[0] ));
+  } 
+  arg2 = (svn_node_kind_t)(val2);
+  if (arg1) (arg1)->actual_kind = arg2;
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_svn_wc_status3_t_actual_kind_get(int argc, VALUE *argv, VALUE self) {
+  struct svn_wc_status3_t *arg1 = (struct svn_wc_status3_t *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  svn_node_kind_t result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_svn_wc_status3_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "struct svn_wc_status3_t *","actual_kind", 1, self )); 
+  }
+  arg1 = (struct svn_wc_status3_t *)(argp1);
+  result = (svn_node_kind_t) ((arg1)->actual_kind);
+  vresult = SWIG_From_int((int)(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
 SWIGINTERN VALUE
 _wrap_svn_wc_status3_t_allocate(VALUE self) {
@@ -20781,7 +19719,7 @@ _wrap_svn_wc_walk_status(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res9), Ruby_Format_TypeError( "", "void *","svn_wc_walk_status", 9, argv[8] )); 
   }
   {
-    arg10 = svn_swig_rb_cancel_func;
+    arg10 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg11 = (void *)svn_swig_rb_make_baton(argv[9], _global_svn_swig_rb_pool);
   }
   if (argc > 10) {
@@ -20923,7 +19861,7 @@ _wrap_svn_wc_get_status_editor5(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res15), Ruby_Format_TypeError( "", "void *","svn_wc_get_status_editor5", 15, argv[10] )); 
   }
   {
-    arg16 = svn_swig_rb_cancel_func;
+    arg16 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg17 = (void *)svn_swig_rb_make_baton(argv[11], _global_svn_swig_rb_pool);
   }
   if (argc > 12) {
@@ -21083,7 +20021,7 @@ _wrap_svn_wc_get_status_editor4(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res12), Ruby_Format_TypeError( "", "void *","svn_wc_get_status_editor4", 12, argv[7] )); 
   }
   {
-    arg13 = svn_swig_rb_cancel_func;
+    arg13 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg14 = (void *)svn_swig_rb_make_baton(argv[8], _global_svn_swig_rb_pool);
   }
   res15 = SWIG_ConvertPtr(argv[9], &argp15,SWIGTYPE_p_svn_wc_traversal_info_t, 0 |  0 );
@@ -21218,11 +20156,11 @@ _wrap_svn_wc_get_status_editor3(int argc, VALUE *argv, VALUE self) {
   }
   arg10 = (apr_array_header_t *)(argp10);
   {
-    arg11 = svn_swig_rb_wc_status_func;
+    arg11 = (svn_wc_status_func2_t) svn_swig_rb_wc_status_func;
     arg12 = (void *)svn_swig_rb_make_baton(argv[6], _global_svn_swig_rb_pool);
   }
   {
-    arg13 = svn_swig_rb_cancel_func;
+    arg13 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg14 = (void *)svn_swig_rb_make_baton(argv[7], _global_svn_swig_rb_pool);
   }
   res15 = SWIG_ConvertPtr(argv[8], &argp15,SWIGTYPE_p_svn_wc_traversal_info_t, 0 |  0 );
@@ -21355,11 +20293,11 @@ _wrap_svn_wc_get_status_editor2(int argc, VALUE *argv, VALUE self) {
   arg9 = RTEST(argv[4]);
   arg10 = RTEST(argv[5]);
   {
-    arg11 = svn_swig_rb_wc_status_func;
+    arg11 = (svn_wc_status_func2_t) svn_swig_rb_wc_status_func;
     arg12 = (void *)svn_swig_rb_make_baton(argv[6], _global_svn_swig_rb_pool);
   }
   {
-    arg13 = svn_swig_rb_cancel_func;
+    arg13 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg14 = (void *)svn_swig_rb_make_baton(argv[7], _global_svn_swig_rb_pool);
   }
   res15 = SWIG_ConvertPtr(argv[8], &argp15,SWIGTYPE_p_svn_wc_traversal_info_t, 0 |  0 );
@@ -21500,7 +20438,7 @@ _wrap_svn_wc_get_status_editor(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res11), Ruby_Format_TypeError( "", "void *","svn_wc_get_status_editor", 11, argv[7] )); 
   }
   {
-    arg12 = svn_swig_rb_cancel_func;
+    arg12 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg13 = (void *)svn_swig_rb_make_baton(argv[8], _global_svn_swig_rb_pool);
   }
   res14 = SWIG_ConvertPtr(argv[9], &argp14,SWIGTYPE_p_svn_wc_traversal_info_t, 0 |  0 );
@@ -21689,11 +20627,11 @@ _wrap_svn_wc_copy3(int argc, VALUE *argv, VALUE self) {
   arg3 = (char *)(buf3);
   arg4 = RTEST(argv[3]);
   {
-    arg5 = svn_swig_rb_cancel_func;
+    arg5 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg6 = (void *)svn_swig_rb_make_baton(argv[4], _global_svn_swig_rb_pool);
   }
   {
-    arg7 = svn_swig_rb_notify_func2;
+    arg7 = (svn_wc_notify_func2_t) svn_swig_rb_notify_func2;
     arg8 = (void *)svn_swig_rb_make_baton(argv[5], _global_svn_swig_rb_pool);
   }
   if (argc > 6) {
@@ -21787,11 +20725,11 @@ _wrap_svn_wc_copy2(int argc, VALUE *argv, VALUE self) {
   }
   arg3 = (char *)(buf3);
   {
-    arg4 = svn_swig_rb_cancel_func;
+    arg4 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg5 = (void *)svn_swig_rb_make_baton(argv[3], _global_svn_swig_rb_pool);
   }
   {
-    arg6 = svn_swig_rb_notify_func2;
+    arg6 = (svn_wc_notify_func2_t) svn_swig_rb_notify_func2;
     arg7 = (void *)svn_swig_rb_make_baton(argv[4], _global_svn_swig_rb_pool);
   }
   if (argc > 5) {
@@ -21886,7 +20824,7 @@ _wrap_svn_wc_copy(int argc, VALUE *argv, VALUE self) {
   }
   arg3 = (char *)(buf3);
   {
-    arg4 = svn_swig_rb_cancel_func;
+    arg4 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg5 = (void *)svn_swig_rb_make_baton(argv[3], _global_svn_swig_rb_pool);
   }
   {
@@ -21992,11 +20930,11 @@ _wrap_svn_wc_move(int argc, VALUE *argv, VALUE self) {
   arg3 = (char *)(buf3);
   arg4 = RTEST(argv[3]);
   {
-    arg5 = svn_swig_rb_cancel_func;
+    arg5 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg6 = (void *)svn_swig_rb_make_baton(argv[4], _global_svn_swig_rb_pool);
   }
   {
-    arg7 = svn_swig_rb_notify_func2;
+    arg7 = (svn_wc_notify_func2_t) svn_swig_rb_notify_func2;
     arg8 = (void *)svn_swig_rb_make_baton(argv[5], _global_svn_swig_rb_pool);
   }
   if (argc > 6) {
@@ -22085,11 +21023,11 @@ _wrap_svn_wc_delete4(int argc, VALUE *argv, VALUE self) {
   arg3 = RTEST(argv[2]);
   arg4 = RTEST(argv[3]);
   {
-    arg5 = svn_swig_rb_cancel_func;
+    arg5 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg6 = (void *)svn_swig_rb_make_baton(argv[4], _global_svn_swig_rb_pool);
   }
   {
-    arg7 = svn_swig_rb_notify_func2;
+    arg7 = (svn_wc_notify_func2_t) svn_swig_rb_notify_func2;
     arg8 = (void *)svn_swig_rb_make_baton(argv[5], _global_svn_swig_rb_pool);
   }
   if (argc > 6) {
@@ -22173,11 +21111,11 @@ _wrap_svn_wc_delete3(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (svn_wc_adm_access_t *)(argp2);
   {
-    arg3 = svn_swig_rb_cancel_func;
+    arg3 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg4 = (void *)svn_swig_rb_make_baton(argv[2], _global_svn_swig_rb_pool);
   }
   {
-    arg5 = svn_swig_rb_notify_func2;
+    arg5 = (svn_wc_notify_func2_t) svn_swig_rb_notify_func2;
     arg6 = (void *)svn_swig_rb_make_baton(argv[3], _global_svn_swig_rb_pool);
   }
   arg7 = RTEST(argv[4]);
@@ -22261,11 +21199,11 @@ _wrap_svn_wc_delete2(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (svn_wc_adm_access_t *)(argp2);
   {
-    arg3 = svn_swig_rb_cancel_func;
+    arg3 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg4 = (void *)svn_swig_rb_make_baton(argv[2], _global_svn_swig_rb_pool);
   }
   {
-    arg5 = svn_swig_rb_notify_func2;
+    arg5 = (svn_wc_notify_func2_t) svn_swig_rb_notify_func2;
     arg6 = (void *)svn_swig_rb_make_baton(argv[3], _global_svn_swig_rb_pool);
   }
   if (argc > 4) {
@@ -22349,7 +21287,7 @@ _wrap_svn_wc_delete(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (svn_wc_adm_access_t *)(argp2);
   {
-    arg3 = svn_swig_rb_cancel_func;
+    arg3 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg4 = (void *)svn_swig_rb_make_baton(argv[2], _global_svn_swig_rb_pool);
   }
   {
@@ -22405,6 +21343,104 @@ fail:
 
 
 SWIGINTERN VALUE
+_wrap_svn_wc_add_from_disk3(int argc, VALUE *argv, VALUE self) {
+  svn_wc_context_t *arg1 = (svn_wc_context_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  apr_hash_t *arg3 = (apr_hash_t *) 0 ;
+  svn_boolean_t arg4 ;
+  svn_wc_notify_func2_t arg5 = (svn_wc_notify_func2_t) 0 ;
+  void *arg6 = (void *) 0 ;
+  apr_pool_t *arg7 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg7);
+    _global_pool = arg7;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  if ((argc < 5) || (argc > 6)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 5)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_svn_wc_context_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "svn_wc_context_t *","svn_wc_add_from_disk3", 1, argv[0] )); 
+  }
+  arg1 = (svn_wc_context_t *)(argp1);
+  res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","svn_wc_add_from_disk3", 2, argv[1] ));
+  }
+  arg2 = (char *)(buf2);
+  {
+    VALUE rb_pool = Qnil;
+    if (!_global_pool) {
+      svn_swig_rb_get_pool(argc, argv, self, &rb_pool, &_global_pool);
+      svn_swig_rb_push_pool(rb_pool);
+    }
+    arg3 = svn_swig_rb_hash_to_apr_hash_svn_string(argv[2], _global_pool);
+    _global_pool = NULL;
+    if (!NIL_P(rb_pool)) {
+      if (NIL_P(arg3)) {
+        svn_swig_rb_destroy_pool(rb_pool);
+      } else {
+        svn_swig_rb_set_pool_for_no_swig_type(argv[2], rb_pool);
+      }
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+    }
+  }
+  arg4 = RTEST(argv[3]);
+  {
+    arg5 = (svn_wc_notify_func2_t) svn_swig_rb_notify_func2;
+    arg6 = (void *)svn_swig_rb_make_baton(argv[4], _global_svn_swig_rb_pool);
+  }
+  if (argc > 5) {
+    
+  }
+  {
+    result = (svn_error_t *)svn_wc_add_from_disk3(arg1,(char const *)arg2,(apr_hash_t const *)arg3,arg4,arg5,arg6,arg7);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
+fail:
+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
 _wrap_svn_wc_add_from_disk2(int argc, VALUE *argv, VALUE self) {
   svn_wc_context_t *arg1 = (svn_wc_context_t *) 0 ;
   char *arg2 = (char *) 0 ;
@@ -22458,7 +21494,7 @@ _wrap_svn_wc_add_from_disk2(int argc, VALUE *argv, VALUE self) {
     }
   }
   {
-    arg4 = svn_swig_rb_notify_func2;
+    arg4 = (svn_wc_notify_func2_t) svn_swig_rb_notify_func2;
     arg5 = (void *)svn_swig_rb_make_baton(argv[3], _global_svn_swig_rb_pool);
   }
   if (argc > 4) {
@@ -22536,7 +21572,7 @@ _wrap_svn_wc_add_from_disk(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (char *)(buf2);
   {
-    arg3 = svn_swig_rb_notify_func2;
+    arg3 = (svn_wc_notify_func2_t) svn_swig_rb_notify_func2;
     arg4 = (void *)svn_swig_rb_make_baton(argv[2], _global_svn_swig_rb_pool);
   }
   if (argc > 3) {
@@ -22636,11 +21672,11 @@ _wrap_svn_wc_add4(int argc, VALUE *argv, VALUE self) {
   } 
   arg5 = (svn_revnum_t)(val5);
   {
-    arg6 = svn_swig_rb_cancel_func;
+    arg6 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg7 = (void *)svn_swig_rb_make_baton(argv[5], _global_svn_swig_rb_pool);
   }
   {
-    arg8 = svn_swig_rb_notify_func2;
+    arg8 = (svn_wc_notify_func2_t) svn_swig_rb_notify_func2;
     arg9 = (void *)svn_swig_rb_make_baton(argv[6], _global_svn_swig_rb_pool);
   }
   if (argc > 7) {
@@ -22743,11 +21779,11 @@ _wrap_svn_wc_add3(int argc, VALUE *argv, VALUE self) {
   } 
   arg5 = (svn_revnum_t)(val5);
   {
-    arg6 = svn_swig_rb_cancel_func;
+    arg6 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg7 = (void *)svn_swig_rb_make_baton(argv[5], _global_svn_swig_rb_pool);
   }
   {
-    arg8 = svn_swig_rb_notify_func2;
+    arg8 = (svn_wc_notify_func2_t) svn_swig_rb_notify_func2;
     arg9 = (void *)svn_swig_rb_make_baton(argv[6], _global_svn_swig_rb_pool);
   }
   if (argc > 7) {
@@ -22846,11 +21882,11 @@ _wrap_svn_wc_add2(int argc, VALUE *argv, VALUE self) {
   } 
   arg4 = (svn_revnum_t)(val4);
   {
-    arg5 = svn_swig_rb_cancel_func;
+    arg5 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg6 = (void *)svn_swig_rb_make_baton(argv[4], _global_svn_swig_rb_pool);
   }
   {
-    arg7 = svn_swig_rb_notify_func2;
+    arg7 = (svn_wc_notify_func2_t) svn_swig_rb_notify_func2;
     arg8 = (void *)svn_swig_rb_make_baton(argv[5], _global_svn_swig_rb_pool);
   }
   if (argc > 6) {
@@ -22950,7 +21986,7 @@ _wrap_svn_wc_add(int argc, VALUE *argv, VALUE self) {
   } 
   arg4 = (svn_revnum_t)(val4);
   {
-    arg5 = svn_swig_rb_cancel_func;
+    arg5 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg6 = (void *)svn_swig_rb_make_baton(argv[4], _global_svn_swig_rb_pool);
   }
   {
@@ -23101,7 +22137,7 @@ _wrap_svn_wc_add_repos_file4(int argc, VALUE *argv, VALUE self) {
   } 
   arg8 = (svn_revnum_t)(val8);
   {
-    arg9 = svn_swig_rb_cancel_func;
+    arg9 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg10 = (void *)svn_swig_rb_make_baton(argv[8], _global_svn_swig_rb_pool);
   }
   if (argc > 9) {
@@ -23244,11 +22280,11 @@ _wrap_svn_wc_add_repos_file3(int argc, VALUE *argv, VALUE self) {
   } 
   arg8 = (svn_revnum_t)(val8);
   {
-    arg9 = svn_swig_rb_cancel_func;
+    arg9 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg10 = (void *)svn_swig_rb_make_baton(argv[8], _global_svn_swig_rb_pool);
   }
   {
-    arg11 = svn_swig_rb_notify_func2;
+    arg11 = (svn_wc_notify_func2_t) svn_swig_rb_notify_func2;
     arg12 = (void *)svn_swig_rb_make_baton(argv[9], _global_svn_swig_rb_pool);
   }
   if (argc > 10) {
@@ -23590,7 +22626,7 @@ _wrap_svn_wc_remove_from_revision_control2(int argc, VALUE *argv, VALUE self) {
   arg3 = RTEST(argv[2]);
   arg4 = RTEST(argv[3]);
   {
-    arg5 = svn_swig_rb_cancel_func;
+    arg5 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg6 = (void *)svn_swig_rb_make_baton(argv[4], _global_svn_swig_rb_pool);
   }
   if (argc > 5) {
@@ -23675,7 +22711,7 @@ _wrap_svn_wc_remove_from_revision_control(int argc, VALUE *argv, VALUE self) {
   arg3 = RTEST(argv[2]);
   arg4 = RTEST(argv[3]);
   {
-    arg5 = svn_swig_rb_cancel_func;
+    arg5 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg6 = (void *)svn_swig_rb_make_baton(argv[4], _global_svn_swig_rb_pool);
   }
   if (argc > 5) {
@@ -23783,11 +22819,11 @@ _wrap_svn_wc_resolved_conflict5(int argc, VALUE *argv, VALUE self) {
   } 
   arg7 = (svn_wc_conflict_choice_t)(val7);
   {
-    arg8 = svn_swig_rb_cancel_func;
+    arg8 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg9 = (void *)svn_swig_rb_make_baton(argv[7], _global_svn_swig_rb_pool);
   }
   {
-    arg10 = svn_swig_rb_notify_func2;
+    arg10 = (svn_wc_notify_func2_t) svn_swig_rb_notify_func2;
     arg11 = (void *)svn_swig_rb_make_baton(argv[8], _global_svn_swig_rb_pool);
   }
   if (argc > 9) {
@@ -23890,11 +22926,11 @@ _wrap_svn_wc_resolved_conflict4(int argc, VALUE *argv, VALUE self) {
   } 
   arg7 = (svn_wc_conflict_choice_t)(val7);
   {
-    arg8 = svn_swig_rb_notify_func2;
+    arg8 = (svn_wc_notify_func2_t) svn_swig_rb_notify_func2;
     arg9 = (void *)svn_swig_rb_make_baton(argv[7], _global_svn_swig_rb_pool);
   }
   {
-    arg10 = svn_swig_rb_cancel_func;
+    arg10 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg11 = (void *)svn_swig_rb_make_baton(argv[8], _global_svn_swig_rb_pool);
   }
   if (argc > 9) {
@@ -23993,11 +23029,11 @@ _wrap_svn_wc_resolved_conflict3(int argc, VALUE *argv, VALUE self) {
   } 
   arg6 = (svn_wc_conflict_choice_t)(val6);
   {
-    arg7 = svn_swig_rb_notify_func2;
+    arg7 = (svn_wc_notify_func2_t) svn_swig_rb_notify_func2;
     arg8 = (void *)svn_swig_rb_make_baton(argv[6], _global_svn_swig_rb_pool);
   }
   {
-    arg9 = svn_swig_rb_cancel_func;
+    arg9 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg10 = (void *)svn_swig_rb_make_baton(argv[7], _global_svn_swig_rb_pool);
   }
   if (argc > 8) {
@@ -24086,11 +23122,11 @@ _wrap_svn_wc_resolved_conflict2(int argc, VALUE *argv, VALUE self) {
   arg4 = RTEST(argv[3]);
   arg5 = RTEST(argv[4]);
   {
-    arg6 = svn_swig_rb_notify_func2;
+    arg6 = (svn_wc_notify_func2_t) svn_swig_rb_notify_func2;
     arg7 = (void *)svn_swig_rb_make_baton(argv[5], _global_svn_swig_rb_pool);
   }
   {
-    arg8 = svn_swig_rb_cancel_func;
+    arg8 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg9 = (void *)svn_swig_rb_make_baton(argv[6], _global_svn_swig_rb_pool);
   }
   if (argc > 7) {
@@ -24227,6 +23263,111 @@ fail:
 
 
 SWIGINTERN VALUE
+_wrap_svn_wc_queue_committed4(int argc, VALUE *argv, VALUE self) {
+  svn_wc_committed_queue_t *arg1 = (svn_wc_committed_queue_t *) 0 ;
+  svn_wc_context_t *arg2 = (svn_wc_context_t *) 0 ;
+  char *arg3 = (char *) 0 ;
+  svn_boolean_t arg4 ;
+  svn_boolean_t arg5 ;
+  apr_array_header_t *arg6 = (apr_array_header_t *) 0 ;
+  svn_boolean_t arg7 ;
+  svn_boolean_t arg8 ;
+  svn_checksum_t *arg9 = (svn_checksum_t *) 0 ;
+  apr_pool_t *arg10 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  int res3 ;
+  char *buf3 = 0 ;
+  int alloc3 = 0 ;
+  void *argp9 = 0 ;
+  int res9 = 0 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg10);
+    _global_pool = arg10;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  if ((argc < 9) || (argc > 10)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 9)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_svn_wc_committed_queue_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "svn_wc_committed_queue_t *","svn_wc_queue_committed4", 1, argv[0] )); 
+  }
+  arg1 = (svn_wc_committed_queue_t *)(argp1);
+  res2 = SWIG_ConvertPtr(argv[1], &argp2,SWIGTYPE_p_svn_wc_context_t, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "svn_wc_context_t *","svn_wc_queue_committed4", 2, argv[1] )); 
+  }
+  arg2 = (svn_wc_context_t *)(argp2);
+  res3 = SWIG_AsCharPtrAndSize(argv[2], &buf3, NULL, &alloc3);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "char const *","svn_wc_queue_committed4", 3, argv[2] ));
+  }
+  arg3 = (char *)(buf3);
+  arg4 = RTEST(argv[3]);
+  arg5 = RTEST(argv[4]);
+  {
+    VALUE rb_pool;
+    apr_pool_t *pool;
+    
+    svn_swig_rb_get_pool(argc, argv, self, &rb_pool, &pool);
+    
+    arg6 = svn_swig_rb_to_apr_array_prop(argv[5], pool);
+  }
+  arg7 = RTEST(argv[6]);
+  arg8 = RTEST(argv[7]);
+  res9 = SWIG_ConvertPtr(argv[8], &argp9,SWIGTYPE_p_svn_checksum_t, 0 |  0 );
+  if (!SWIG_IsOK(res9)) {
+    SWIG_exception_fail(SWIG_ArgError(res9), Ruby_Format_TypeError( "", "svn_checksum_t const *","svn_wc_queue_committed4", 9, argv[8] )); 
+  }
+  arg9 = (svn_checksum_t *)(argp9);
+  if (argc > 9) {
+    
+  }
+  {
+    result = (svn_error_t *)svn_wc_queue_committed4(arg1,arg2,(char const *)arg3,arg4,arg5,(apr_array_header_t const *)arg6,arg7,arg8,(struct svn_checksum_t const *)arg9,arg10);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
+fail:
+  if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
 _wrap_svn_wc_queue_committed3(int argc, VALUE *argv, VALUE self) {
   svn_wc_committed_queue_t *arg1 = (svn_wc_committed_queue_t *) 0 ;
   svn_wc_context_t *arg2 = (svn_wc_context_t *) 0 ;
@@ -24487,16 +23628,7 @@ _wrap_svn_wc_queue_committed(int argc, VALUE *argv, VALUE self) {
   }
   arg6 = RTEST(argv[5]);
   arg7 = RTEST(argv[6]);
-  {
-    if (NIL_P(argv[7])) {
-      arg8 = NULL;
-    } else if (RSTRING_LEN(argv[7]) != APR_MD5_DIGESTSIZE) {
-      rb_raise(rb_eArgError, "digest size (%d) must be %d",
-        RSTRING_LEN(argv[7]), APR_MD5_DIGESTSIZE);
-    } else {
-      arg8 = (unsigned char *)StringValuePtr(argv[7]);
-    }
-  }
+  
   if (argc > 8) {
     
   }
@@ -24599,7 +23731,7 @@ _wrap_svn_wc_process_committed_queue2(int argc, VALUE *argv, VALUE self) {
     }
   }
   {
-    arg6 = svn_swig_rb_cancel_func;
+    arg6 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg7 = (void *)svn_swig_rb_make_baton(argv[5], _global_svn_swig_rb_pool);
   }
   if (argc > 6) {
@@ -24808,16 +23940,7 @@ _wrap_svn_wc_process_committed4(int argc, VALUE *argv, VALUE self) {
   }
   arg8 = RTEST(argv[7]);
   arg9 = RTEST(argv[8]);
-  {
-    if (NIL_P(argv[9])) {
-      arg10 = NULL;
-    } else if (RSTRING_LEN(argv[9]) != APR_MD5_DIGESTSIZE) {
-      rb_raise(rb_eArgError, "digest size (%d) must be %d",
-        RSTRING_LEN(argv[9]), APR_MD5_DIGESTSIZE);
-    } else {
-      arg10 = (unsigned char *)StringValuePtr(argv[9]);
-    }
-  }
+  
   if (argc > 10) {
     
   }
@@ -24929,16 +24052,7 @@ _wrap_svn_wc_process_committed3(int argc, VALUE *argv, VALUE self) {
     arg7 = svn_swig_rb_to_apr_array_prop(argv[6], pool);
   }
   arg8 = RTEST(argv[7]);
-  {
-    if (NIL_P(argv[8])) {
-      arg9 = NULL;
-    } else if (RSTRING_LEN(argv[8]) != APR_MD5_DIGESTSIZE) {
-      rb_raise(rb_eArgError, "digest size (%d) must be %d",
-        RSTRING_LEN(argv[8]), APR_MD5_DIGESTSIZE);
-    } else {
-      arg9 = (unsigned char *)StringValuePtr(argv[8]);
-    }
-  }
+  
   if (argc > 9) {
     
   }
@@ -25240,7 +24354,7 @@ _wrap_svn_wc_crawl_revisions5(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (char *)(buf2);
   {
-    arg3 = svn_swig_rb_ra_reporter3;
+    arg3 = (svn_ra_reporter3_t *) svn_swig_rb_get_ra_reporter3();
     arg4 = (void *)svn_swig_rb_make_baton(argv[2], _global_svn_swig_rb_pool);
   }
   arg5 = RTEST(argv[3]);
@@ -25251,11 +24365,11 @@ _wrap_svn_wc_crawl_revisions5(int argc, VALUE *argv, VALUE self) {
   arg8 = RTEST(argv[6]);
   arg9 = RTEST(argv[7]);
   {
-    arg10 = svn_swig_rb_cancel_func;
+    arg10 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg11 = (void *)svn_swig_rb_make_baton(argv[8], _global_svn_swig_rb_pool);
   }
   {
-    arg12 = svn_swig_rb_notify_func2;
+    arg12 = (svn_wc_notify_func2_t) svn_swig_rb_notify_func2;
     arg13 = (void *)svn_swig_rb_make_baton(argv[9], _global_svn_swig_rb_pool);
   }
   if (argc > 10) {
@@ -25346,7 +24460,7 @@ _wrap_svn_wc_crawl_revisions4(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (svn_wc_adm_access_t *)(argp2);
   {
-    arg3 = svn_swig_rb_ra_reporter3;
+    arg3 = (svn_ra_reporter3_t *) svn_swig_rb_get_ra_reporter3();
     arg4 = (void *)svn_swig_rb_make_baton(argv[2], _global_svn_swig_rb_pool);
   }
   arg5 = RTEST(argv[3]);
@@ -25357,7 +24471,7 @@ _wrap_svn_wc_crawl_revisions4(int argc, VALUE *argv, VALUE self) {
   arg8 = RTEST(argv[6]);
   arg9 = RTEST(argv[7]);
   {
-    arg10 = svn_swig_rb_notify_func2;
+    arg10 = (svn_wc_notify_func2_t) svn_swig_rb_notify_func2;
     arg11 = (void *)svn_swig_rb_make_baton(argv[8], _global_svn_swig_rb_pool);
   }
   res12 = SWIG_ConvertPtr(argv[9], &argp12,SWIGTYPE_p_svn_wc_traversal_info_t, 0 |  0 );
@@ -25449,7 +24563,7 @@ _wrap_svn_wc_crawl_revisions3(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (svn_wc_adm_access_t *)(argp2);
   {
-    arg3 = svn_swig_rb_ra_reporter3;
+    arg3 = (svn_ra_reporter3_t *) svn_swig_rb_get_ra_reporter3();
     arg4 = (void *)svn_swig_rb_make_baton(argv[2], _global_svn_swig_rb_pool);
   }
   arg5 = RTEST(argv[3]);
@@ -25459,7 +24573,7 @@ _wrap_svn_wc_crawl_revisions3(int argc, VALUE *argv, VALUE self) {
   arg7 = RTEST(argv[5]);
   arg8 = RTEST(argv[6]);
   {
-    arg9 = svn_swig_rb_notify_func2;
+    arg9 = (svn_wc_notify_func2_t) svn_swig_rb_notify_func2;
     arg10 = (void *)svn_swig_rb_make_baton(argv[7], _global_svn_swig_rb_pool);
   }
   res11 = SWIG_ConvertPtr(argv[8], &argp11,SWIGTYPE_p_svn_wc_traversal_info_t, 0 |  0 );
@@ -25565,7 +24679,7 @@ _wrap_svn_wc_crawl_revisions2(int argc, VALUE *argv, VALUE self) {
   arg6 = RTEST(argv[5]);
   arg7 = RTEST(argv[6]);
   {
-    arg8 = svn_swig_rb_notify_func2;
+    arg8 = (svn_wc_notify_func2_t) svn_swig_rb_notify_func2;
     arg9 = (void *)svn_swig_rb_make_baton(argv[7], _global_svn_swig_rb_pool);
   }
   res10 = SWIG_ConvertPtr(argv[8], &argp10,SWIGTYPE_p_svn_wc_traversal_info_t, 0 |  0 );
@@ -26309,11 +25423,11 @@ _wrap_svn_wc_get_update_editor4(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res21), Ruby_Format_TypeError( "", "void *","svn_wc_get_update_editor4", 21, argv[18] )); 
   }
   {
-    arg22 = svn_swig_rb_cancel_func;
+    arg22 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg23 = (void *)svn_swig_rb_make_baton(argv[19], _global_svn_swig_rb_pool);
   }
   {
-    arg24 = svn_swig_rb_notify_func2;
+    arg24 = (svn_wc_notify_func2_t) svn_swig_rb_notify_func2;
     arg25 = (void *)svn_swig_rb_make_baton(argv[20], _global_svn_swig_rb_pool);
   }
   if (argc > 21) {
@@ -26458,11 +25572,11 @@ _wrap_svn_wc_get_update_editor3(int argc, VALUE *argv, VALUE self) {
   arg6 = RTEST(argv[5]);
   arg7 = RTEST(argv[6]);
   {
-    arg8 = svn_swig_rb_notify_func2;
+    arg8 = (svn_wc_notify_func2_t) svn_swig_rb_notify_func2;
     arg9 = (void *)svn_swig_rb_make_baton(argv[7], _global_svn_swig_rb_pool);
   }
   {
-    arg10 = svn_swig_rb_cancel_func;
+    arg10 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg11 = (void *)svn_swig_rb_make_baton(argv[8], _global_svn_swig_rb_pool);
   }
   {
@@ -26610,11 +25724,11 @@ _wrap_svn_wc_get_update_editor2(int argc, VALUE *argv, VALUE self) {
   arg4 = RTEST(argv[3]);
   arg5 = RTEST(argv[4]);
   {
-    arg6 = svn_swig_rb_notify_func2;
+    arg6 = (svn_wc_notify_func2_t) svn_swig_rb_notify_func2;
     arg7 = (void *)svn_swig_rb_make_baton(argv[5], _global_svn_swig_rb_pool);
   }
   {
-    arg8 = svn_swig_rb_cancel_func;
+    arg8 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg9 = (void *)svn_swig_rb_make_baton(argv[6], _global_svn_swig_rb_pool);
   }
   {
@@ -26752,7 +25866,7 @@ _wrap_svn_wc_get_update_editor(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res7), Ruby_Format_TypeError( "", "void *","svn_wc_get_update_editor", 7, argv[6] )); 
   }
   {
-    arg8 = svn_swig_rb_cancel_func;
+    arg8 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg9 = (void *)svn_swig_rb_make_baton(argv[7], _global_svn_swig_rb_pool);
   }
   {
@@ -26958,11 +26072,11 @@ _wrap_svn_wc_get_switch_editor4(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res20), Ruby_Format_TypeError( "", "void *","svn_wc_get_switch_editor4", 20, argv[17] )); 
   }
   {
-    arg21 = svn_swig_rb_cancel_func;
+    arg21 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg22 = (void *)svn_swig_rb_make_baton(argv[18], _global_svn_swig_rb_pool);
   }
   {
-    arg23 = svn_swig_rb_notify_func2;
+    arg23 = (svn_wc_notify_func2_t) svn_swig_rb_notify_func2;
     arg24 = (void *)svn_swig_rb_make_baton(argv[19], _global_svn_swig_rb_pool);
   }
   if (argc > 20) {
@@ -27116,11 +26230,11 @@ _wrap_svn_wc_get_switch_editor3(int argc, VALUE *argv, VALUE self) {
   arg7 = RTEST(argv[6]);
   arg8 = RTEST(argv[7]);
   {
-    arg9 = svn_swig_rb_notify_func2;
+    arg9 = (svn_wc_notify_func2_t) svn_swig_rb_notify_func2;
     arg10 = (void *)svn_swig_rb_make_baton(argv[8], _global_svn_swig_rb_pool);
   }
   {
-    arg11 = svn_swig_rb_cancel_func;
+    arg11 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg12 = (void *)svn_swig_rb_make_baton(argv[9], _global_svn_swig_rb_pool);
   }
   {
@@ -27268,11 +26382,11 @@ _wrap_svn_wc_get_switch_editor2(int argc, VALUE *argv, VALUE self) {
   arg5 = RTEST(argv[4]);
   arg6 = RTEST(argv[5]);
   {
-    arg7 = svn_swig_rb_notify_func2;
+    arg7 = (svn_wc_notify_func2_t) svn_swig_rb_notify_func2;
     arg8 = (void *)svn_swig_rb_make_baton(argv[6], _global_svn_swig_rb_pool);
   }
   {
-    arg9 = svn_swig_rb_cancel_func;
+    arg9 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg10 = (void *)svn_swig_rb_make_baton(argv[7], _global_svn_swig_rb_pool);
   }
   {
@@ -27421,7 +26535,7 @@ _wrap_svn_wc_get_switch_editor(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res8), Ruby_Format_TypeError( "", "void *","svn_wc_get_switch_editor", 8, argv[7] )); 
   }
   {
-    arg9 = svn_swig_rb_cancel_func;
+    arg9 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg10 = (void *)svn_swig_rb_make_baton(argv[8], _global_svn_swig_rb_pool);
   }
   {
@@ -28050,11 +27164,11 @@ _wrap_svn_wc_prop_set4(int argc, VALUE *argv, VALUE self) {
   }
   arg7 = (apr_array_header_t *)(argp7);
   {
-    arg8 = svn_swig_rb_cancel_func;
+    arg8 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg9 = (void *)svn_swig_rb_make_baton(argv[7], _global_svn_swig_rb_pool);
   }
   {
-    arg10 = svn_swig_rb_notify_func2;
+    arg10 = (svn_wc_notify_func2_t) svn_swig_rb_notify_func2;
     arg11 = (void *)svn_swig_rb_make_baton(argv[8], _global_svn_swig_rb_pool);
   }
   if (argc > 9) {
@@ -28159,7 +27273,7 @@ _wrap_svn_wc_prop_set3(int argc, VALUE *argv, VALUE self) {
   arg4 = (svn_wc_adm_access_t *)(argp4);
   arg5 = RTEST(argv[4]);
   {
-    arg6 = svn_swig_rb_notify_func2;
+    arg6 = (svn_wc_notify_func2_t) svn_swig_rb_notify_func2;
     arg7 = (void *)svn_swig_rb_make_baton(argv[5], _global_svn_swig_rb_pool);
   }
   if (argc > 6) {
@@ -28703,7 +27817,7 @@ _wrap_svn_wc_get_diff_editor6(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res15), Ruby_Format_TypeError( "", "void *","svn_wc_get_diff_editor6", 15, argv[12] )); 
   }
   {
-    arg16 = svn_swig_rb_cancel_func;
+    arg16 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg17 = (void *)svn_swig_rb_make_baton(argv[13], _global_svn_swig_rb_pool);
   }
   if (argc > 14) {
@@ -28842,7 +27956,7 @@ _wrap_svn_wc_get_diff_editor5(int argc, VALUE *argv, VALUE self) {
   arg7 = RTEST(argv[6]);
   arg8 = RTEST(argv[7]);
   {
-    arg9 = svn_swig_rb_cancel_func;
+    arg9 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg10 = (void *)svn_swig_rb_make_baton(argv[8], _global_svn_swig_rb_pool);
   }
   res11 = SWIG_ConvertPtr(argv[9], &argp11,SWIGTYPE_p_apr_array_header_t, 0 |  0 );
@@ -28949,7 +28063,7 @@ _wrap_svn_wc_get_diff_editor4(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (char *)(buf2);
   {
-    arg3 = svn_swig_rb_wc_diff_callbacks2();
+    arg3 = (svn_wc_diff_callbacks2_t *) svn_swig_rb_wc_diff_callbacks2();
     arg4 = (void *)svn_swig_rb_make_baton(argv[2], _global_svn_swig_rb_pool);
   }
   {
@@ -28959,7 +28073,7 @@ _wrap_svn_wc_get_diff_editor4(int argc, VALUE *argv, VALUE self) {
   arg7 = RTEST(argv[5]);
   arg8 = RTEST(argv[6]);
   {
-    arg9 = svn_swig_rb_cancel_func;
+    arg9 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg10 = (void *)svn_swig_rb_make_baton(argv[7], _global_svn_swig_rb_pool);
   }
   res11 = SWIG_ConvertPtr(argv[8], &argp11,SWIGTYPE_p_apr_array_header_t, 0 |  0 );
@@ -29063,7 +28177,7 @@ _wrap_svn_wc_get_diff_editor3(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (char *)(buf2);
   {
-    arg3 = svn_swig_rb_wc_diff_callbacks2();
+    arg3 = (svn_wc_diff_callbacks2_t *) svn_swig_rb_wc_diff_callbacks2();
     arg4 = (void *)svn_swig_rb_make_baton(argv[2], _global_svn_swig_rb_pool);
   }
   arg5 = RTEST(argv[3]);
@@ -29071,7 +28185,7 @@ _wrap_svn_wc_get_diff_editor3(int argc, VALUE *argv, VALUE self) {
   arg7 = RTEST(argv[5]);
   arg8 = RTEST(argv[6]);
   {
-    arg9 = svn_swig_rb_cancel_func;
+    arg9 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg10 = (void *)svn_swig_rb_make_baton(argv[7], _global_svn_swig_rb_pool);
   }
   if (argc > 8) {
@@ -29186,7 +28300,7 @@ _wrap_svn_wc_get_diff_editor2(int argc, VALUE *argv, VALUE self) {
   arg7 = RTEST(argv[6]);
   arg8 = RTEST(argv[7]);
   {
-    arg9 = svn_swig_rb_cancel_func;
+    arg9 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg10 = (void *)svn_swig_rb_make_baton(argv[8], _global_svn_swig_rb_pool);
   }
   if (argc > 9) {
@@ -29299,7 +28413,7 @@ _wrap_svn_wc_get_diff_editor(int argc, VALUE *argv, VALUE self) {
   arg6 = RTEST(argv[5]);
   arg7 = RTEST(argv[6]);
   {
-    arg8 = svn_swig_rb_cancel_func;
+    arg8 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg9 = (void *)svn_swig_rb_make_baton(argv[7], _global_svn_swig_rb_pool);
   }
   if (argc > 8) {
@@ -29418,7 +28532,7 @@ _wrap_svn_wc_diff6(int argc, VALUE *argv, VALUE self) {
   }
   arg9 = (apr_array_header_t *)(argp9);
   {
-    arg10 = svn_swig_rb_cancel_func;
+    arg10 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg11 = (void *)svn_swig_rb_make_baton(argv[9], _global_svn_swig_rb_pool);
   }
   if (argc > 10) {
@@ -29604,7 +28718,7 @@ _wrap_svn_wc_diff4(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (char *)(buf2);
   {
-    arg3 = svn_swig_rb_wc_diff_callbacks2();
+    arg3 = (svn_wc_diff_callbacks2_t *) svn_swig_rb_wc_diff_callbacks2();
     arg4 = (void *)svn_swig_rb_make_baton(argv[2], _global_svn_swig_rb_pool);
   }
   {
@@ -29693,7 +28807,7 @@ _wrap_svn_wc_diff3(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (char *)(buf2);
   {
-    arg3 = svn_swig_rb_wc_diff_callbacks2();
+    arg3 = (svn_wc_diff_callbacks2_t *) svn_swig_rb_wc_diff_callbacks2();
     arg4 = (void *)svn_swig_rb_make_baton(argv[2], _global_svn_swig_rb_pool);
   }
   arg5 = RTEST(argv[3]);
@@ -30266,7 +29380,7 @@ _wrap_svn_wc_merge5(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res18), Ruby_Format_TypeError( "", "void *","svn_wc_merge5", 18, argv[16] )); 
   }
   {
-    arg19 = svn_swig_rb_cancel_func;
+    arg19 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg20 = (void *)svn_swig_rb_make_baton(argv[17], _global_svn_swig_rb_pool);
   }
   if (argc > 18) {
@@ -30471,7 +29585,7 @@ _wrap_svn_wc_merge4(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res16), Ruby_Format_TypeError( "", "void *","svn_wc_merge4", 16, argv[14] )); 
   }
   {
-    arg17 = svn_swig_rb_cancel_func;
+    arg17 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg18 = (void *)svn_swig_rb_make_baton(argv[15], _global_svn_swig_rb_pool);
   }
   if (argc > 16) {
@@ -31116,7 +30230,7 @@ _wrap_svn_wc_merge_props3(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res10), Ruby_Format_TypeError( "", "void *","svn_wc_merge_props3", 10, argv[9] )); 
   }
   {
-    arg11 = svn_swig_rb_cancel_func;
+    arg11 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg12 = (void *)svn_swig_rb_make_baton(argv[10], _global_svn_swig_rb_pool);
   }
   if (argc > 11) {
@@ -31754,6 +30868,101 @@ fail:
 
 
 SWIGINTERN VALUE
+_wrap_svn_wc_cleanup4(int argc, VALUE *argv, VALUE self) {
+  svn_wc_context_t *arg1 = (svn_wc_context_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  svn_boolean_t arg3 ;
+  svn_boolean_t arg4 ;
+  svn_boolean_t arg5 ;
+  svn_boolean_t arg6 ;
+  svn_cancel_func_t arg7 = (svn_cancel_func_t) 0 ;
+  void *arg8 = (void *) 0 ;
+  svn_wc_notify_func2_t arg9 = (svn_wc_notify_func2_t) 0 ;
+  void *arg10 = (void *) 0 ;
+  apr_pool_t *arg11 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg11);
+    _global_pool = arg11;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  if ((argc < 8) || (argc > 9)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 8)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_svn_wc_context_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "svn_wc_context_t *","svn_wc_cleanup4", 1, argv[0] )); 
+  }
+  arg1 = (svn_wc_context_t *)(argp1);
+  res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","svn_wc_cleanup4", 2, argv[1] ));
+  }
+  arg2 = (char *)(buf2);
+  arg3 = RTEST(argv[2]);
+  arg4 = RTEST(argv[3]);
+  arg5 = RTEST(argv[4]);
+  arg6 = RTEST(argv[5]);
+  {
+    arg7 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
+    arg8 = (void *)svn_swig_rb_make_baton(argv[6], _global_svn_swig_rb_pool);
+  }
+  {
+    arg9 = (svn_wc_notify_func2_t) svn_swig_rb_notify_func2;
+    arg10 = (void *)svn_swig_rb_make_baton(argv[7], _global_svn_swig_rb_pool);
+  }
+  if (argc > 8) {
+    
+  }
+  {
+    result = (svn_error_t *)svn_wc_cleanup4(arg1,(char const *)arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  {
+    svn_swig_rb_set_baton(vresult, (VALUE)arg8);
+  }
+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
+fail:
+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
 _wrap_svn_wc_cleanup3(int argc, VALUE *argv, VALUE self) {
   svn_wc_context_t *arg1 = (svn_wc_context_t *) 0 ;
   char *arg2 = (char *) 0 ;
@@ -31789,7 +30998,7 @@ _wrap_svn_wc_cleanup3(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (char *)(buf2);
   {
-    arg3 = svn_swig_rb_cancel_func;
+    arg3 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg4 = (void *)svn_swig_rb_make_baton(argv[2], _global_svn_swig_rb_pool);
   }
   if (argc > 3) {
@@ -31870,7 +31079,7 @@ _wrap_svn_wc_cleanup2(int argc, VALUE *argv, VALUE self) {
     }
   }
   {
-    arg3 = svn_swig_rb_cancel_func;
+    arg3 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg4 = (void *)svn_swig_rb_make_baton(argv[2], _global_svn_swig_rb_pool);
   }
   if (argc > 3) {
@@ -31959,7 +31168,7 @@ _wrap_svn_wc_cleanup(int argc, VALUE *argv, VALUE self) {
     }
   }
   {
-    arg4 = svn_swig_rb_cancel_func;
+    arg4 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg5 = (void *)svn_swig_rb_make_baton(argv[3], _global_svn_swig_rb_pool);
   }
   if (argc > 4) {
@@ -32055,11 +31264,11 @@ _wrap_svn_wc_upgrade(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res4), Ruby_Format_TypeError( "", "void *","svn_wc_upgrade", 4, argv[3] )); 
   }
   {
-    arg5 = svn_swig_rb_cancel_func;
+    arg5 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg6 = (void *)svn_swig_rb_make_baton(argv[4], _global_svn_swig_rb_pool);
   }
   {
-    arg7 = svn_swig_rb_notify_func2;
+    arg7 = (svn_wc_notify_func2_t) svn_swig_rb_notify_func2;
     arg8 = (void *)svn_swig_rb_make_baton(argv[5], _global_svn_swig_rb_pool);
   }
   if (argc > 6) {
@@ -32158,7 +31367,7 @@ _wrap_svn_wc_relocate4(int argc, VALUE *argv, VALUE self) {
   }
   arg4 = (char *)(buf4);
   {
-    arg5 = svn_swig_rb_wc_relocation_validator3;
+    arg5 = (svn_wc_relocation_validator3_t) svn_swig_rb_wc_relocation_validator3;
     arg6 = (void *)svn_swig_rb_make_baton(argv[4], _global_svn_swig_rb_pool);
   }
   if (argc > 5) {
@@ -32260,7 +31469,7 @@ _wrap_svn_wc_relocate3(int argc, VALUE *argv, VALUE self) {
   arg4 = (char *)(buf4);
   arg5 = RTEST(argv[4]);
   {
-    arg6 = svn_swig_rb_wc_relocation_validator3;
+    arg6 = (svn_wc_relocation_validator3_t) svn_swig_rb_wc_relocation_validator3;
     arg7 = (void *)svn_swig_rb_make_baton(argv[5], _global_svn_swig_rb_pool);
   }
   if (argc > 6) {
@@ -32525,6 +31734,111 @@ fail:
 
 
 SWIGINTERN VALUE
+_wrap_svn_wc_revert5(int argc, VALUE *argv, VALUE self) {
+  svn_wc_context_t *arg1 = (svn_wc_context_t *) 0 ;
+  char *arg2 = (char *) 0 ;
+  svn_depth_t arg3 ;
+  svn_boolean_t arg4 ;
+  apr_array_header_t *arg5 = (apr_array_header_t *) 0 ;
+  svn_boolean_t arg6 ;
+  svn_boolean_t arg7 ;
+  svn_cancel_func_t arg8 = (svn_cancel_func_t) 0 ;
+  void *arg9 = (void *) 0 ;
+  svn_wc_notify_func2_t arg10 = (svn_wc_notify_func2_t) 0 ;
+  void *arg11 = (void *) 0 ;
+  apr_pool_t *arg12 = (apr_pool_t *) 0 ;
+  VALUE _global_svn_swig_rb_pool ;
+  apr_pool_t *_global_pool ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  svn_error_t *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  {
+    svn_swig_rb_get_pool(argc, argv, self, &_global_svn_swig_rb_pool, &arg12);
+    _global_pool = arg12;
+    svn_swig_rb_push_pool(_global_svn_swig_rb_pool);
+  }
+  if ((argc < 9) || (argc > 10)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 9)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_svn_wc_context_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "svn_wc_context_t *","svn_wc_revert5", 1, argv[0] )); 
+  }
+  arg1 = (svn_wc_context_t *)(argp1);
+  res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","svn_wc_revert5", 2, argv[1] ));
+  }
+  arg2 = (char *)(buf2);
+  {
+    arg3 = svn_swig_rb_to_depth(argv[2]);
+  }
+  arg4 = RTEST(argv[3]);
+  res5 = SWIG_ConvertPtr(argv[4], &argp5,SWIGTYPE_p_apr_array_header_t, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), Ruby_Format_TypeError( "", "apr_array_header_t const *","svn_wc_revert5", 5, argv[4] )); 
+  }
+  arg5 = (apr_array_header_t *)(argp5);
+  arg6 = RTEST(argv[5]);
+  arg7 = RTEST(argv[6]);
+  {
+    arg8 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
+    arg9 = (void *)svn_swig_rb_make_baton(argv[7], _global_svn_swig_rb_pool);
+  }
+  {
+    arg10 = (svn_wc_notify_func2_t) svn_swig_rb_notify_func2;
+    arg11 = (void *)svn_swig_rb_make_baton(argv[8], _global_svn_swig_rb_pool);
+  }
+  if (argc > 9) {
+    
+  }
+  {
+    result = (svn_error_t *)svn_wc_revert5(arg1,(char const *)arg2,arg3,arg4,(apr_array_header_t const *)arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12);
+    
+    
+    
+  }
+  {
+    if (result) {
+      svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+      svn_swig_rb_handle_svn_error(result);
+    }
+    vresult = Qnil;
+  }
+  {
+    svn_swig_rb_set_baton(vresult, (VALUE)arg9);
+  }
+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return vresult;
+fail:
+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+  {
+    VALUE target;
+    target = _global_vresult_address == &vresult ? self : vresult;
+    if (!svn_swig_rb_set_pool(target, _global_svn_swig_rb_pool))
+    svn_swig_rb_destroy_pool(_global_svn_swig_rb_pool);
+    svn_swig_rb_pop_pool(_global_svn_swig_rb_pool);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
 _wrap_svn_wc_revert4(int argc, VALUE *argv, VALUE self) {
   svn_wc_context_t *arg1 = (svn_wc_context_t *) 0 ;
   char *arg2 = (char *) 0 ;
@@ -32576,11 +31890,11 @@ _wrap_svn_wc_revert4(int argc, VALUE *argv, VALUE self) {
   }
   arg5 = (apr_array_header_t *)(argp5);
   {
-    arg6 = svn_swig_rb_cancel_func;
+    arg6 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg7 = (void *)svn_swig_rb_make_baton(argv[5], _global_svn_swig_rb_pool);
   }
   {
-    arg8 = svn_swig_rb_notify_func2;
+    arg8 = (svn_wc_notify_func2_t) svn_swig_rb_notify_func2;
     arg9 = (void *)svn_swig_rb_make_baton(argv[6], _global_svn_swig_rb_pool);
   }
   if (argc > 7) {
@@ -32677,11 +31991,11 @@ _wrap_svn_wc_revert3(int argc, VALUE *argv, VALUE self) {
   }
   arg5 = (apr_array_header_t *)(argp5);
   {
-    arg6 = svn_swig_rb_cancel_func;
+    arg6 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg7 = (void *)svn_swig_rb_make_baton(argv[5], _global_svn_swig_rb_pool);
   }
   {
-    arg8 = svn_swig_rb_notify_func2;
+    arg8 = (svn_wc_notify_func2_t) svn_swig_rb_notify_func2;
     arg9 = (void *)svn_swig_rb_make_baton(argv[6], _global_svn_swig_rb_pool);
   }
   if (argc > 7) {
@@ -32768,11 +32082,11 @@ _wrap_svn_wc_revert2(int argc, VALUE *argv, VALUE self) {
   arg3 = RTEST(argv[2]);
   arg4 = RTEST(argv[3]);
   {
-    arg5 = svn_swig_rb_cancel_func;
+    arg5 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg6 = (void *)svn_swig_rb_make_baton(argv[4], _global_svn_swig_rb_pool);
   }
   {
-    arg7 = svn_swig_rb_notify_func2;
+    arg7 = (svn_wc_notify_func2_t) svn_swig_rb_notify_func2;
     arg8 = (void *)svn_swig_rb_make_baton(argv[5], _global_svn_swig_rb_pool);
   }
   if (argc > 6) {
@@ -32860,7 +32174,7 @@ _wrap_svn_wc_revert(int argc, VALUE *argv, VALUE self) {
   arg3 = RTEST(argv[2]);
   arg4 = RTEST(argv[3]);
   {
-    arg5 = svn_swig_rb_cancel_func;
+    arg5 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg6 = (void *)svn_swig_rb_make_baton(argv[4], _global_svn_swig_rb_pool);
   }
   {
@@ -34874,7 +34188,7 @@ _wrap_new_svn_wc_revision_status_t(int argc, VALUE *argv, VALUE self) {
   }
   arg3 = RTEST(argv[2]);
   {
-    arg4 = svn_swig_rb_cancel_func;
+    arg4 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg5 = (void *)svn_swig_rb_make_baton(argv[3], _global_svn_swig_rb_pool);
   }
   if (argc > 4) {
@@ -34974,7 +34288,7 @@ _wrap_svn_wc_revision_status2(int argc, VALUE *argv, VALUE self) {
   }
   arg5 = RTEST(argv[3]);
   {
-    arg6 = svn_swig_rb_cancel_func;
+    arg6 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg7 = (void *)svn_swig_rb_make_baton(argv[4], _global_svn_swig_rb_pool);
   }
   if (argc > 5) {
@@ -35093,11 +34407,11 @@ _wrap_svn_wc_set_changelist2(int argc, VALUE *argv, VALUE self) {
   }
   arg5 = (apr_array_header_t *)(argp5);
   {
-    arg6 = svn_swig_rb_cancel_func;
+    arg6 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg7 = (void *)svn_swig_rb_make_baton(argv[5], _global_svn_swig_rb_pool);
   }
   {
-    arg8 = svn_swig_rb_notify_func2;
+    arg8 = (svn_wc_notify_func2_t) svn_swig_rb_notify_func2;
     arg9 = (void *)svn_swig_rb_make_baton(argv[6], _global_svn_swig_rb_pool);
   }
   if (argc > 7) {
@@ -35184,11 +34498,11 @@ _wrap_svn_wc_set_changelist(int argc, VALUE *argv, VALUE self) {
   }
   arg3 = (svn_wc_adm_access_t *)(argp3);
   {
-    arg4 = svn_swig_rb_cancel_func;
+    arg4 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg5 = (void *)svn_swig_rb_make_baton(argv[3], _global_svn_swig_rb_pool);
   }
   {
-    arg6 = svn_swig_rb_notify_func2;
+    arg6 = (svn_wc_notify_func2_t) svn_swig_rb_notify_func2;
     arg7 = (void *)svn_swig_rb_make_baton(argv[4], _global_svn_swig_rb_pool);
   }
   if (argc > 5) {
@@ -35294,7 +34608,7 @@ _wrap_svn_wc_get_changelists(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res6), Ruby_Format_TypeError( "", "void *","svn_wc_get_changelists", 6, argv[5] )); 
   }
   {
-    arg7 = svn_swig_rb_cancel_func;
+    arg7 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg8 = (void *)svn_swig_rb_make_baton(argv[6], _global_svn_swig_rb_pool);
   }
   if (argc > 7) {
@@ -35381,11 +34695,11 @@ _wrap_svn_wc_crop_tree2(int argc, VALUE *argv, VALUE self) {
     arg3 = svn_swig_rb_to_depth(argv[2]);
   }
   {
-    arg4 = svn_swig_rb_cancel_func;
+    arg4 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg5 = (void *)svn_swig_rb_make_baton(argv[3], _global_svn_swig_rb_pool);
   }
   {
-    arg6 = svn_swig_rb_notify_func2;
+    arg6 = (svn_wc_notify_func2_t) svn_swig_rb_notify_func2;
     arg7 = (void *)svn_swig_rb_make_baton(argv[4], _global_svn_swig_rb_pool);
   }
   if (argc > 5) {
@@ -35472,11 +34786,11 @@ _wrap_svn_wc_crop_tree(int argc, VALUE *argv, VALUE self) {
     arg3 = svn_swig_rb_to_depth(argv[2]);
   }
   {
-    arg4 = svn_swig_rb_notify_func2;
+    arg4 = (svn_wc_notify_func2_t) svn_swig_rb_notify_func2;
     arg5 = (void *)svn_swig_rb_make_baton(argv[3], _global_svn_swig_rb_pool);
   }
   {
-    arg6 = svn_swig_rb_cancel_func;
+    arg6 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg7 = (void *)svn_swig_rb_make_baton(argv[4], _global_svn_swig_rb_pool);
   }
   if (argc > 5) {
@@ -35559,11 +34873,11 @@ _wrap_svn_wc_exclude(int argc, VALUE *argv, VALUE self) {
   }
   arg2 = (char *)(buf2);
   {
-    arg3 = svn_swig_rb_cancel_func;
+    arg3 = (svn_cancel_func_t) svn_swig_rb_cancel_func;
     arg4 = (void *)svn_swig_rb_make_baton(argv[2], _global_svn_swig_rb_pool);
   }
   {
-    arg5 = svn_swig_rb_notify_func2;
+    arg5 = (svn_wc_notify_func2_t) svn_swig_rb_notify_func2;
     arg6 = (void *)svn_swig_rb_make_baton(argv[3], _global_svn_swig_rb_pool);
   }
   if (argc > 4) {
@@ -41701,18 +41015,18 @@ static swig_cast_info *swig_cast_initial[] = {
 
 /* -----------------------------------------------------------------------------
  * Type initialization:
- * This problem is tough by the requirement that no dynamic 
- * memory is used. Also, since swig_type_info structures store pointers to 
+ * This problem is tough by the requirement that no dynamic
+ * memory is used. Also, since swig_type_info structures store pointers to
  * swig_cast_info structures and swig_cast_info structures store pointers back
- * to swig_type_info structures, we need some lookup code at initialization. 
- * The idea is that swig generates all the structures that are needed. 
- * The runtime then collects these partially filled structures. 
- * The SWIG_InitializeModule function takes these initial arrays out of 
+ * to swig_type_info structures, we need some lookup code at initialization.
+ * The idea is that swig generates all the structures that are needed.
+ * The runtime then collects these partially filled structures.
+ * The SWIG_InitializeModule function takes these initial arrays out of
  * swig_module, and does all the lookup, filling in the swig_module.types
  * array with the correct data and linking the correct swig_cast_info
  * structures together.
  *
- * The generated swig_type_info structures are assigned staticly to an initial 
+ * The generated swig_type_info structures are assigned staticly to an initial
  * array. We just loop through that array, and handle each type individually.
  * First we lookup if this type has been already loaded, and if so, use the
  * loaded structure instead of the generated one. Then we have to fill in the
@@ -41722,17 +41036,17 @@ static swig_cast_info *swig_cast_initial[] = {
  * a column is one of the swig_cast_info structures for that type.
  * The cast_initial array is actually an array of arrays, because each row has
  * a variable number of columns. So to actually build the cast linked list,
- * we find the array of casts associated with the type, and loop through it 
+ * we find the array of casts associated with the type, and loop through it
  * adding the casts to the list. The one last trick we need to do is making
  * sure the type pointer in the swig_cast_info struct is correct.
  *
- * First off, we lookup the cast->type name to see if it is already loaded. 
+ * First off, we lookup the cast->type name to see if it is already loaded.
  * There are three cases to handle:
  *  1) If the cast->type has already been loaded AND the type we are adding
  *     casting info to has not been loaded (it is in this module), THEN we
  *     replace the cast->type pointer with the type pointer that has already
  *     been loaded.
- *  2) If BOTH types (the one we are adding casting info to, and the 
+ *  2) If BOTH types (the one we are adding casting info to, and the
  *     cast->type) are loaded, THEN the cast info has already been loaded by
  *     the previous module so we just ignore it.
  *  3) Finally, if cast->type has not already been loaded, then we add that
@@ -41795,7 +41109,7 @@ SWIG_InitializeModule(void *clientdata) {
     module_head->next = &swig_module;
   }
 
-  /* When multiple interpeters are used, a module could have already been initialized in
+  /* When multiple interpreters are used, a module could have already been initialized in
      a different interpreter, but not yet have a pointer in this interpreter.
      In this case, we do not want to continue adding types... everything should be
      set up already */
@@ -41809,7 +41123,7 @@ SWIG_InitializeModule(void *clientdata) {
     swig_type_info *type = 0;
     swig_type_info *ret;
     swig_cast_info *cast;
-  
+
 #ifdef SWIGRUNTIME_DEBUG
     printf("SWIG_InitializeModule: type %d %s\n", i, swig_module.type_initial[i]->name);
 #endif
@@ -41836,7 +41150,7 @@ SWIG_InitializeModule(void *clientdata) {
     /* Insert casting types */
     cast = swig_module.cast_initial[i];
     while (cast->type) {
-    
+
       /* Don't need to add information already in the list */
       ret = 0;
 #ifdef SWIGRUNTIME_DEBUG
@@ -42101,6 +41415,10 @@ SWIGEXPORT void Init_wc(void) {
   rb_define_const(mWc, "Svn_wc_notify_left_local_modifications", SWIG_From_int((int)(svn_wc_notify_left_local_modifications)));
   rb_define_const(mWc, "Svn_wc_notify_foreign_copy_begin", SWIG_From_int((int)(svn_wc_notify_foreign_copy_begin)));
   rb_define_const(mWc, "Svn_wc_notify_move_broken", SWIG_From_int((int)(svn_wc_notify_move_broken)));
+  rb_define_const(mWc, "Svn_wc_notify_cleanup_external", SWIG_From_int((int)(svn_wc_notify_cleanup_external)));
+  rb_define_const(mWc, "Svn_wc_notify_failed_requires_target", SWIG_From_int((int)(svn_wc_notify_failed_requires_target)));
+  rb_define_const(mWc, "Svn_wc_notify_info_external", SWIG_From_int((int)(svn_wc_notify_info_external)));
+  rb_define_const(mWc, "Svn_wc_notify_commit_finalizing", SWIG_From_int((int)(svn_wc_notify_commit_finalizing)));
   rb_define_const(mWc, "Svn_wc_notify_state_inapplicable", SWIG_From_int((int)(svn_wc_notify_state_inapplicable)));
   rb_define_const(mWc, "Svn_wc_notify_state_unknown", SWIG_From_int((int)(svn_wc_notify_state_unknown)));
   rb_define_const(mWc, "Svn_wc_notify_state_unchanged", SWIG_From_int((int)(svn_wc_notify_state_unchanged)));
@@ -42214,44 +41532,6 @@ SWIGEXPORT void Init_wc(void) {
   rb_define_module_function(mWc, "svn_wc_conflict_version_create", _wrap_svn_wc_conflict_version_create, -1);
   rb_define_module_function(mWc, "svn_wc_conflict_version_dup", _wrap_svn_wc_conflict_version_dup, -1);
   
-  SwigClassSvn_wc_conflict_description2_t.klass = rb_define_class_under(mWc, "Svn_wc_conflict_description2_t", rb_cObject);
-  SWIG_TypeClientData(SWIGTYPE_p_svn_wc_conflict_description2_t, (void *) &SwigClassSvn_wc_conflict_description2_t);
-  rb_define_alloc_func(SwigClassSvn_wc_conflict_description2_t.klass, _wrap_svn_wc_conflict_description2_t_allocate);
-  rb_define_method(SwigClassSvn_wc_conflict_description2_t.klass, "initialize", _wrap_new_svn_wc_conflict_description2_t, -1);
-  rb_define_method(SwigClassSvn_wc_conflict_description2_t.klass, "local_abspath=", _wrap_svn_wc_conflict_description2_t_local_abspath_set, -1);
-  rb_define_method(SwigClassSvn_wc_conflict_description2_t.klass, "local_abspath", _wrap_svn_wc_conflict_description2_t_local_abspath_get, -1);
-  rb_define_method(SwigClassSvn_wc_conflict_description2_t.klass, "node_kind=", _wrap_svn_wc_conflict_description2_t_node_kind_set, -1);
-  rb_define_method(SwigClassSvn_wc_conflict_description2_t.klass, "node_kind", _wrap_svn_wc_conflict_description2_t_node_kind_get, -1);
-  rb_define_method(SwigClassSvn_wc_conflict_description2_t.klass, "kind=", _wrap_svn_wc_conflict_description2_t_kind_set, -1);
-  rb_define_method(SwigClassSvn_wc_conflict_description2_t.klass, "kind", _wrap_svn_wc_conflict_description2_t_kind_get, -1);
-  rb_define_method(SwigClassSvn_wc_conflict_description2_t.klass, "property_name=", _wrap_svn_wc_conflict_description2_t_property_name_set, -1);
-  rb_define_method(SwigClassSvn_wc_conflict_description2_t.klass, "property_name", _wrap_svn_wc_conflict_description2_t_property_name_get, -1);
-  rb_define_method(SwigClassSvn_wc_conflict_description2_t.klass, "is_binary=", _wrap_svn_wc_conflict_description2_t_is_binary_set, -1);
-  rb_define_method(SwigClassSvn_wc_conflict_description2_t.klass, "is_binary", _wrap_svn_wc_conflict_description2_t_is_binary_get, -1);
-  rb_define_method(SwigClassSvn_wc_conflict_description2_t.klass, "mime_type=", _wrap_svn_wc_conflict_description2_t_mime_type_set, -1);
-  rb_define_method(SwigClassSvn_wc_conflict_description2_t.klass, "mime_type", _wrap_svn_wc_conflict_description2_t_mime_type_get, -1);
-  rb_define_method(SwigClassSvn_wc_conflict_description2_t.klass, "action=", _wrap_svn_wc_conflict_description2_t_action_set, -1);
-  rb_define_method(SwigClassSvn_wc_conflict_description2_t.klass, "action", _wrap_svn_wc_conflict_description2_t_action_get, -1);
-  rb_define_method(SwigClassSvn_wc_conflict_description2_t.klass, "reason=", _wrap_svn_wc_conflict_description2_t_reason_set, -1);
-  rb_define_method(SwigClassSvn_wc_conflict_description2_t.klass, "reason", _wrap_svn_wc_conflict_description2_t_reason_get, -1);
-  rb_define_method(SwigClassSvn_wc_conflict_description2_t.klass, "base_abspath=", _wrap_svn_wc_conflict_description2_t_base_abspath_set, -1);
-  rb_define_method(SwigClassSvn_wc_conflict_description2_t.klass, "base_abspath", _wrap_svn_wc_conflict_description2_t_base_abspath_get, -1);
-  rb_define_method(SwigClassSvn_wc_conflict_description2_t.klass, "their_abspath=", _wrap_svn_wc_conflict_description2_t_their_abspath_set, -1);
-  rb_define_method(SwigClassSvn_wc_conflict_description2_t.klass, "their_abspath", _wrap_svn_wc_conflict_description2_t_their_abspath_get, -1);
-  rb_define_method(SwigClassSvn_wc_conflict_description2_t.klass, "my_abspath=", _wrap_svn_wc_conflict_description2_t_my_abspath_set, -1);
-  rb_define_method(SwigClassSvn_wc_conflict_description2_t.klass, "my_abspath", _wrap_svn_wc_conflict_description2_t_my_abspath_get, -1);
-  rb_define_method(SwigClassSvn_wc_conflict_description2_t.klass, "merged_file=", _wrap_svn_wc_conflict_description2_t_merged_file_set, -1);
-  rb_define_method(SwigClassSvn_wc_conflict_description2_t.klass, "merged_file", _wrap_svn_wc_conflict_description2_t_merged_file_get, -1);
-  rb_define_method(SwigClassSvn_wc_conflict_description2_t.klass, "operation=", _wrap_svn_wc_conflict_description2_t_operation_set, -1);
-  rb_define_method(SwigClassSvn_wc_conflict_description2_t.klass, "operation", _wrap_svn_wc_conflict_description2_t_operation_get, -1);
-  rb_define_method(SwigClassSvn_wc_conflict_description2_t.klass, "src_left_version=", _wrap_svn_wc_conflict_description2_t_src_left_version_set, -1);
-  rb_define_method(SwigClassSvn_wc_conflict_description2_t.klass, "src_left_version", _wrap_svn_wc_conflict_description2_t_src_left_version_get, -1);
-  rb_define_method(SwigClassSvn_wc_conflict_description2_t.klass, "src_right_version=", _wrap_svn_wc_conflict_description2_t_src_right_version_set, -1);
-  rb_define_method(SwigClassSvn_wc_conflict_description2_t.klass, "src_right_version", _wrap_svn_wc_conflict_description2_t_src_right_version_get, -1);
-  SwigClassSvn_wc_conflict_description2_t.mark = 0;
-  SwigClassSvn_wc_conflict_description2_t.destroy = (void (*)(void *)) free_svn_wc_conflict_description2_t;
-  SwigClassSvn_wc_conflict_description2_t.trackObjects = 0;
-  
   SwigClassSvn_wc_conflict_description_t.klass = rb_define_class_under(mWc, "Svn_wc_conflict_description_t", rb_cObject);
   SWIG_TypeClientData(SWIGTYPE_p_svn_wc_conflict_description_t, (void *) &SwigClassSvn_wc_conflict_description_t);
   rb_define_alloc_func(SwigClassSvn_wc_conflict_description_t.klass, _wrap_svn_wc_conflict_description_t_allocate);
@@ -42297,7 +41577,9 @@ SWIGEXPORT void Init_wc(void) {
   rb_define_module_function(mWc, "svn_wc_conflict_description_create_prop", _wrap_svn_wc_conflict_description_create_prop, -1);
   rb_define_module_function(mWc, "svn_wc_conflict_description_create_tree2", _wrap_svn_wc_conflict_description_create_tree2, -1);
   rb_define_module_function(mWc, "svn_wc_conflict_description_create_tree", _wrap_svn_wc_conflict_description_create_tree, -1);
+  rb_define_module_function(mWc, "svn_wc_conflict_description2_dup", _wrap_svn_wc_conflict_description2_dup, -1);
   rb_define_module_function(mWc, "svn_wc__conflict_description2_dup", _wrap_svn_wc__conflict_description2_dup, -1);
+  rb_define_const(mWc, "Svn_wc_conflict_choose_undefined", SWIG_From_int((int)(svn_wc_conflict_choose_undefined)));
   rb_define_const(mWc, "Svn_wc_conflict_choose_postpone", SWIG_From_int((int)(svn_wc_conflict_choose_postpone)));
   rb_define_const(mWc, "Svn_wc_conflict_choose_base", SWIG_From_int((int)(svn_wc_conflict_choose_base)));
   rb_define_const(mWc, "Svn_wc_conflict_choose_theirs_full", SWIG_From_int((int)(svn_wc_conflict_choose_theirs_full)));
@@ -42306,20 +41588,6 @@ SWIGEXPORT void Init_wc(void) {
   rb_define_const(mWc, "Svn_wc_conflict_choose_mine_conflict", SWIG_From_int((int)(svn_wc_conflict_choose_mine_conflict)));
   rb_define_const(mWc, "Svn_wc_conflict_choose_merged", SWIG_From_int((int)(svn_wc_conflict_choose_merged)));
   rb_define_const(mWc, "Svn_wc_conflict_choose_unspecified", SWIG_From_int((int)(svn_wc_conflict_choose_unspecified)));
-  
-  SwigClassSvn_wc_conflict_result_t.klass = rb_define_class_under(mWc, "Svn_wc_conflict_result_t", rb_cObject);
-  SWIG_TypeClientData(SWIGTYPE_p_svn_wc_conflict_result_t, (void *) &SwigClassSvn_wc_conflict_result_t);
-  rb_define_alloc_func(SwigClassSvn_wc_conflict_result_t.klass, _wrap_svn_wc_conflict_result_t_allocate);
-  rb_define_method(SwigClassSvn_wc_conflict_result_t.klass, "initialize", _wrap_new_svn_wc_conflict_result_t, -1);
-  rb_define_method(SwigClassSvn_wc_conflict_result_t.klass, "choice=", _wrap_svn_wc_conflict_result_t_choice_set, -1);
-  rb_define_method(SwigClassSvn_wc_conflict_result_t.klass, "choice", _wrap_svn_wc_conflict_result_t_choice_get, -1);
-  rb_define_method(SwigClassSvn_wc_conflict_result_t.klass, "merged_file=", _wrap_svn_wc_conflict_result_t_merged_file_set, -1);
-  rb_define_method(SwigClassSvn_wc_conflict_result_t.klass, "merged_file", _wrap_svn_wc_conflict_result_t_merged_file_get, -1);
-  rb_define_method(SwigClassSvn_wc_conflict_result_t.klass, "save_merged=", _wrap_svn_wc_conflict_result_t_save_merged_set, -1);
-  rb_define_method(SwigClassSvn_wc_conflict_result_t.klass, "save_merged", _wrap_svn_wc_conflict_result_t_save_merged_get, -1);
-  SwigClassSvn_wc_conflict_result_t.mark = 0;
-  SwigClassSvn_wc_conflict_result_t.destroy = (void (*)(void *)) free_svn_wc_conflict_result_t;
-  SwigClassSvn_wc_conflict_result_t.trackObjects = 0;
   rb_define_module_function(mWc, "svn_wc_create_conflict_result", _wrap_svn_wc_create_conflict_result, -1);
   
   SwigClassSvn_wc_diff_callbacks4_t.klass = rb_define_class_under(mWc, "Svn_wc_diff_callbacks4_t", rb_cObject);
@@ -42661,6 +41929,8 @@ SWIGEXPORT void Init_wc(void) {
   rb_define_method(SwigClassSvn_wc_status3_t.klass, "moved_to_abspath", _wrap_svn_wc_status3_t_moved_to_abspath_get, -1);
   rb_define_method(SwigClassSvn_wc_status3_t.klass, "file_external=", _wrap_svn_wc_status3_t_file_external_set, -1);
   rb_define_method(SwigClassSvn_wc_status3_t.klass, "file_external", _wrap_svn_wc_status3_t_file_external_get, -1);
+  rb_define_method(SwigClassSvn_wc_status3_t.klass, "actual_kind=", _wrap_svn_wc_status3_t_actual_kind_set, -1);
+  rb_define_method(SwigClassSvn_wc_status3_t.klass, "actual_kind", _wrap_svn_wc_status3_t_actual_kind_get, -1);
   SwigClassSvn_wc_status3_t.mark = 0;
   SwigClassSvn_wc_status3_t.destroy = (void (*)(void *)) free_svn_wc_status3_t;
   SwigClassSvn_wc_status3_t.trackObjects = 0;
@@ -42753,6 +42023,7 @@ SWIGEXPORT void Init_wc(void) {
   rb_define_module_function(mWc, "svn_wc_delete3", _wrap_svn_wc_delete3, -1);
   rb_define_module_function(mWc, "svn_wc_delete2", _wrap_svn_wc_delete2, -1);
   rb_define_module_function(mWc, "svn_wc_delete", _wrap_svn_wc_delete, -1);
+  rb_define_module_function(mWc, "svn_wc_add_from_disk3", _wrap_svn_wc_add_from_disk3, -1);
   rb_define_module_function(mWc, "svn_wc_add_from_disk2", _wrap_svn_wc_add_from_disk2, -1);
   rb_define_module_function(mWc, "svn_wc_add_from_disk", _wrap_svn_wc_add_from_disk, -1);
   rb_define_module_function(mWc, "svn_wc_add4", _wrap_svn_wc_add4, -1);
@@ -42770,6 +42041,7 @@ SWIGEXPORT void Init_wc(void) {
   rb_define_module_function(mWc, "svn_wc_resolved_conflict3", _wrap_svn_wc_resolved_conflict3, -1);
   rb_define_module_function(mWc, "svn_wc_resolved_conflict2", _wrap_svn_wc_resolved_conflict2, -1);
   rb_define_module_function(mWc, "svn_wc_resolved_conflict", _wrap_svn_wc_resolved_conflict, -1);
+  rb_define_module_function(mWc, "svn_wc_queue_committed4", _wrap_svn_wc_queue_committed4, -1);
   rb_define_module_function(mWc, "svn_wc_queue_committed3", _wrap_svn_wc_queue_committed3, -1);
   rb_define_module_function(mWc, "svn_wc_queue_committed2", _wrap_svn_wc_queue_committed2, -1);
   rb_define_module_function(mWc, "svn_wc_queue_committed", _wrap_svn_wc_queue_committed, -1);
@@ -42840,6 +42112,7 @@ SWIGEXPORT void Init_wc(void) {
   rb_define_module_function(mWc, "svn_wc_get_pristine_contents2", _wrap_svn_wc_get_pristine_contents2, -1);
   rb_define_module_function(mWc, "svn_wc_get_pristine_contents", _wrap_svn_wc_get_pristine_contents, -1);
   rb_define_module_function(mWc, "svn_wc_get_pristine_copy_path", _wrap_svn_wc_get_pristine_copy_path, -1);
+  rb_define_module_function(mWc, "svn_wc_cleanup4", _wrap_svn_wc_cleanup4, -1);
   rb_define_module_function(mWc, "svn_wc_cleanup3", _wrap_svn_wc_cleanup3, -1);
   rb_define_module_function(mWc, "svn_wc_cleanup2", _wrap_svn_wc_cleanup2, -1);
   rb_define_module_function(mWc, "svn_wc_cleanup", _wrap_svn_wc_cleanup, -1);
@@ -42848,6 +42121,7 @@ SWIGEXPORT void Init_wc(void) {
   rb_define_module_function(mWc, "svn_wc_relocate3", _wrap_svn_wc_relocate3, -1);
   rb_define_module_function(mWc, "svn_wc_relocate2", _wrap_svn_wc_relocate2, -1);
   rb_define_module_function(mWc, "svn_wc_relocate", _wrap_svn_wc_relocate, -1);
+  rb_define_module_function(mWc, "svn_wc_revert5", _wrap_svn_wc_revert5, -1);
   rb_define_module_function(mWc, "svn_wc_revert4", _wrap_svn_wc_revert4, -1);
   rb_define_module_function(mWc, "svn_wc_revert3", _wrap_svn_wc_revert3, -1);
   rb_define_module_function(mWc, "svn_wc_revert2", _wrap_svn_wc_revert2, -1);
diff --git a/subversion/bindings/swig/ruby/test/my-assertions.rb b/subversion/bindings/swig/ruby/test/my-assertions.rb
index 77c42e7..0aa3d94 100644
--- a/subversion/bindings/swig/ruby/test/my-assertions.rb
+++ b/subversion/bindings/swig/ruby/test/my-assertions.rb
@@ -27,9 +27,7 @@ module Test
       # make an intermediary assertion block handler
       def _my_assert_block(&block)
        if RUBY_VERSION > '1.9'
-         assert_block do
-           yield
-         end
+         yield
        else
          _wrap_assertion do
            yield
diff --git a/subversion/bindings/swig/ruby/test/test_client.rb b/subversion/bindings/swig/ruby/test/test_client.rb
index 9c97567..7f3343b 100644
--- a/subversion/bindings/swig/ruby/test/test_client.rb
+++ b/subversion/bindings/swig/ruby/test/test_client.rb
@@ -179,7 +179,9 @@ class SvnClientTest < Test::Unit::TestCase
 
       infos = []
       ctx.set_notify_func do |notify|
-        infos << [notify.path, notify]
+        if notify.action != Svn::Wc::NOTIFY_COMMIT_FINALIZING
+          infos << [notify.path, notify]
+        end
       end
 
       assert_equal([false, false], dirs_path.collect {|path| path.exist?})
@@ -223,7 +225,9 @@ class SvnClientTest < Test::Unit::TestCase
 
       infos = []
       ctx.set_notify_func do |notify|
-        infos << [notify.path, notify]
+        if notify.action != Svn::Wc::NOTIFY_COMMIT_FINALIZING
+          infos << [notify.path, notify]
+        end
       end
 
       assert_equal([false, false], [dir_path.exist?, child_dir_path.exist?])
@@ -1155,7 +1159,8 @@ class SvnClientTest < Test::Unit::TestCase
       ctx.relocate(@wc_path, @repos_uri, @repos_svnserve_uri)
 
       make_context(log) do |ctx|
-        assert_raises(Svn::Error::AuthnNoProvider) do
+        # ### TODO: Verify Svn::Error::AuthnNoProvider in error chain
+        assert_raises(Svn::Error::RaCannotCreateSession) do
           ctx.cat(path)
         end
       end
@@ -1227,10 +1232,12 @@ class SvnClientTest < Test::Unit::TestCase
       end
       ctx.ci(@wc_path)
 
-      assert_equal([full_path2.to_s].sort,
+      assert_equal([full_path2.to_s, '.'].sort,
                    infos.collect{|path, notify| path}.sort)
       path2_notify = infos.assoc(full_path2.to_s)[1]
       assert(path2_notify.commit_added?)
+      finalizing_notify = infos.assoc('.')[1]
+      assert(finalizing_notify.action == Svn::Wc::NOTIFY_COMMIT_FINALIZING)
       assert_equal(File.open(path1) {|f| f.read},
                    File.open(path2) {|f| f.read})
     end
@@ -1258,12 +1265,16 @@ class SvnClientTest < Test::Unit::TestCase
       end
       ctx.ci(@wc_path)
 
-      assert_equal([path1, path2].sort.collect{|p|File.expand_path(p)},
+      assert_equal([path1, path2].collect do |p|
+                     File.expand_path(p)
+                   end.push('.').sort,
                    infos.collect{|path, notify| path}.sort)
       path1_notify = infos.assoc(File.expand_path(path1))[1]
       assert(path1_notify.commit_deleted?)
       path2_notify = infos.assoc(File.expand_path(path2))[1]
       assert(path2_notify.commit_added?)
+      finalizing_notify = infos.assoc('.')[1]
+      assert(finalizing_notify.action == Svn::Wc::NOTIFY_COMMIT_FINALIZING)
       assert_equal(src, File.open(path2) {|f| f.read})
     end
   end
@@ -1302,7 +1313,9 @@ class SvnClientTest < Test::Unit::TestCase
       paths = notifies.collect do |notify|
         notify.path
       end
-      assert_equal([path1, path2, path2].sort.collect{|p|File.expand_path(p)},
+      assert_equal([path1, path2, path2].collect do |p|
+                     File.expand_path(p)
+                   end.push('.').sort,
                    paths.sort)
 
       deleted_paths = notifies.find_all do |notify|
@@ -1329,6 +1342,13 @@ class SvnClientTest < Test::Unit::TestCase
       assert_equal([path2].sort.collect{|p|File.expand_path(p)},
                    postfix_txdelta_paths.sort)
 
+      finalizing_paths = notifies.find_all do |notify|
+        notify.action == Svn::Wc::NOTIFY_COMMIT_FINALIZING
+      end.collect do |notify|
+        notify.path
+      end
+      assert_equal(['.'], finalizing_paths)
+
       assert_equal(src2, File.open(path2) {|f| f.read})
     end
   end
@@ -2022,7 +2042,8 @@ class SvnClientTest < Test::Unit::TestCase
     end
 
     Svn::Client::Context.new do |ctx|
-      assert_raises(Svn::Error::AuthnNoProvider) do
+      # ### TODO: Verify Svn::Error::AuthnNoProvider in error chain
+      assert_raises(Svn::Error::RaCannotCreateSession) do
         ctx.cat(svnserve_uri)
       end
 
@@ -2031,7 +2052,8 @@ class SvnClientTest < Test::Unit::TestCase
         cred.password = @password
         cred.may_save = false
       end
-      assert_raises(Svn::Error::RaNotAuthorized) do
+      # ### TODO: Verify Svn::Error::RaNotAuthorized in error chain
+      assert_raises(Svn::Error::RaCannotCreateSession) do
         ctx.cat(svnserve_uri)
       end
 
@@ -2040,7 +2062,8 @@ class SvnClientTest < Test::Unit::TestCase
         cred.password = "wrong-#{@password}"
         cred.may_save = false
       end
-      assert_raises(Svn::Error::RaNotAuthorized) do
+      # ### TODO: Verify Svn::Error::RaNotAuthorized in error chain
+      assert_raises(Svn::Error::RaCannotCreateSession) do
         ctx.cat(svnserve_uri)
       end
 
@@ -2071,7 +2094,8 @@ class SvnClientTest < Test::Unit::TestCase
     ctx = Svn::Client::Context.new
     setup_auth_baton(ctx.auth_baton)
     ctx.send(method)
-    assert_raises(Svn::Error::RaNotAuthorized) do
+    # ### Verify Svn::Error::RaNotAuthorized in chain
+    assert_raises(Svn::Error::RaCannotCreateSession) do
       ctx.cat(svnserve_uri)
     end
 
@@ -2219,8 +2243,8 @@ class SvnClientTest < Test::Unit::TestCase
 
       items = nil
       ctx.cp(path, repos_uri2)
-      assert_equal([nil], items.collect {|item| item.wcprop_changes})
-      assert_equal([nil], items.collect {|item| item.incoming_prop_changes})
+      assert_equal([[]], items.collect {|item| item.wcprop_changes})
+      assert_equal([[]], items.collect {|item| item.incoming_prop_changes})
       assert_equal([nil], items.collect {|item| item.outgoing_prop_changes})
     end
   end
@@ -2493,7 +2517,7 @@ class SvnClientTest < Test::Unit::TestCase
       assert_not_nil(info)
       assert_equal(3, info.revision)
 
-      assert_equal("<<<<<<< .mine\nafter\n=======\nbefore\n>>>>>>> .r2\n",
+      assert_equal("<<<<<<< .mine\nafter\n||||||| .r1\n=======\nbefore\n>>>>>>> .r2\n",
                    File.read(path))
     end
   end
diff --git a/subversion/bindings/swig/ruby/test/test_core.rb b/subversion/bindings/swig/ruby/test/test_core.rb
index 5f05448..9d5743c 100644
--- a/subversion/bindings/swig/ruby/test/test_core.rb
+++ b/subversion/bindings/swig/ruby/test/test_core.rb
@@ -33,9 +33,9 @@ class SvnCoreTest < Test::Unit::TestCase
     setup_default_variables
     @config_file = File.join(@config_path, Svn::Core::CONFIG_CATEGORY_CONFIG)
     @servers_file = File.join(@config_path, Svn::Core::CONFIG_CATEGORY_SERVERS)
+    setup_tmp
     setup_repository(@repos_path)
     setup_config
-    setup_tmp
   end
 
   def teardown
diff --git a/subversion/bindings/swig/ruby/test/test_fs.rb b/subversion/bindings/swig/ruby/test/test_fs.rb
index 2c693a1..8808055 100644
--- a/subversion/bindings/swig/ruby/test/test_fs.rb
+++ b/subversion/bindings/swig/ruby/test/test_fs.rb
@@ -110,7 +110,8 @@ class SvnFsTest < Test::Unit::TestCase
     FileUtils.mkdir_p(fs_path)
 
     make_context(log) do |ctx|
-      assert_raises(Svn::Error::RaLocalReposOpenFailed) do
+      # ### Verify Svn::Error::RaLocalReposOpenFailed in chain
+      assert_raises(Svn::Error::RaCannotCreateSession) do
         ctx.log_message(path, rev)
       end
 
@@ -209,10 +210,14 @@ class SvnFsTest < Test::Unit::TestCase
       ctx.commit(@wc_path)
     end
 
-    assert_raises(Svn::Error::FsNoSuchTransaction) do
+    assert_raises(Svn::Error::FsMalformedTxnId) do
       @fs.open_txn("NOT-EXIST")
     end
 
+    assert_raises(Svn::Error::FsNoSuchTransaction) do
+      @fs.open_txn("9-9")
+    end
+
     start_time = Time.now
     txn1 = @fs.transaction
     assert_equal([Svn::Core::PROP_REVISION_DATE], txn1.proplist.keys)
diff --git a/subversion/bindings/swig/ruby/test/test_ra.rb b/subversion/bindings/swig/ruby/test/test_ra.rb
index 7fbbe16..1d20ca4 100644
--- a/subversion/bindings/swig/ruby/test/test_ra.rb
+++ b/subversion/bindings/swig/ruby/test/test_ra.rb
@@ -38,8 +38,7 @@ class SvnRaTest < Test::Unit::TestCase
 
   def test_uuid
     Svn::Ra::Session.open(@repos_uri) do |session|
-      assert_equal(File.read(File.join(@repos_path, "db", "uuid")).strip,
-                   session.uuid)
+      assert_equal(@repos.fs.uuid, session.uuid)
     end
   end
 
diff --git a/subversion/bindings/swig/ruby/test/test_repos.rb b/subversion/bindings/swig/ruby/test/test_repos.rb
index 89ca8c1..1c0c366 100644
--- a/subversion/bindings/swig/ruby/test/test_repos.rb
+++ b/subversion/bindings/swig/ruby/test/test_repos.rb
@@ -679,7 +679,7 @@ class SvnReposTest < Test::Unit::TestCase
       dest_path = File.join(@tmp_path, "dest")
       Svn::Repos.create(dest_path) do |repos|
         assert_raises(NoMethodError) do
-          repos.load_fs(nil)
+          repos.load_fs(Object.new)
         end
       end
 
diff --git a/subversion/bindings/swig/ruby/test/test_wc.rb b/subversion/bindings/swig/ruby/test/test_wc.rb
index 3a2aa65..763cbf6 100644
--- a/subversion/bindings/swig/ruby/test/test_wc.rb
+++ b/subversion/bindings/swig/ruby/test/test_wc.rb
@@ -1068,15 +1068,10 @@ EOE
 
   def test_context_create
     assert_nothing_raised do
-      result = Svn::Wc::Context.create do |context|
+      Svn::Wc::Context.create do |context|
         assert_not_nil context
         assert_kind_of Svn::Wc::Context, context
       end
-      if RUBY_VERSION > '1.9'
-        assert_equal(result,true)
-      else
-        assert_nil result
-      end
     end
   end
 
diff --git a/subversion/bindings/swig/ruby/test/util.rb b/subversion/bindings/swig/ruby/test/util.rb
index ee1a7ac..06ae7ba 100644
--- a/subversion/bindings/swig/ruby/test/util.rb
+++ b/subversion/bindings/swig/ruby/test/util.rb
@@ -1,4 +1,4 @@
-# ==================================================================== 
+# ====================================================================
 #    Licensed to the Apache Software Foundation (ASF) under one
 #    or more contributor license agreements.  See the NOTICE file
 #    distributed with this work for additional information
@@ -79,10 +79,11 @@ module SvnTestUtil
     @wc_path = File.join(@tmp_path, "wc")
     @import_path = File.join(@tmp_path, "import")
     @repos_path = File.join(@tmp_path, "repos")
+    @svnserve_pid_file = File.join(@tmp_path, "svnserve.pid")
     @full_repos_path = File.expand_path(@repos_path)
     @repos_uri = "file://#{@full_repos_path.sub(/^\/?/, '/')}"
 
-    @config_path = "config"
+    @config_path = File.join(@tmp_path, "config")
     @greek = Greek.new(@tmp_path, @import_path, @wc_path, @repos_uri)
   end
 
@@ -90,7 +91,7 @@ module SvnTestUtil
     @need_svnserve = need_svnserve
     setup_default_variables
     setup_tmp
-    setup_tmp(@import_path) 
+    setup_tmp(@import_path)
     setup_repository
     add_hooks
     setup_svnserve if @need_svnserve
@@ -233,6 +234,7 @@ realm = #{@realm}
       cred.username = @author
       cred.may_save = false
     end
+    ctx.config = Svn::Core::Config.config(@config_path)
     setup_auth_baton(ctx.auth_baton)
     return ctx unless block_given?
     begin
diff --git a/subversion/bindings/swig/ruby/test/windows_util.rb b/subversion/bindings/swig/ruby/test/windows_util.rb
index 793d096..726527a 100644
--- a/subversion/bindings/swig/ruby/test/windows_util.rb
+++ b/subversion/bindings/swig/ruby/test/windows_util.rb
@@ -34,149 +34,34 @@ module SvnTestUtil
         end
       end
 
-      def service_control(command, args={})
-        args = args.collect do |key, value|
-          "#{key}= #{Svnserve.escape_value(value)}"
-        end.join(" ")
-        result = `sc #{command} #{service_name} #{args}`
-        if result.match(/FAILED/)
-          raise "Failed to #{command} #{service_name}: #{args}"
-        end
-        /^\s*STATE\s*:\s\d+\s*(.*?)\s*$/ =~ result
-        $1
-      end
-
-      def grant_everyone_full_access(dir)
-        dir = dir.tr(File::SEPARATOR, File::ALT_SEPARATOR)
-        `cacls #{Svnserve.escape_value(dir)} /T /E /P Everyone:F`
-      end
-
-      def service_exists?
-        begin
-          service_control("query")
-          true
-        rescue
-          false
-        end
-      end
-
-      def service_stopped?
-        "STOPPED" == service_control("query") rescue true
-      end
-
       def setup_svnserve
         @svnserve_port = @svnserve_ports.last
         @repos_svnserve_uri = "svn://#{@svnserve_host}:#{@svnserve_port}"
-        grant_everyone_full_access(@full_repos_path)
 
         @@service_created ||= begin
           @@service_created = true
-          service_control('stop') unless service_stopped?
-          service_control('delete') if service_exists?
-
-          svnserve_dir = File.expand_path("svnserve")
-          FileUtils.mkdir_p(svnserve_dir)
-          at_exit do
-            service_control('stop') unless service_stopped?
-            service_control('delete') if service_exists?
-            FileUtils.rm_rf(svnserve_dir)
-          end
-          trap("INT") do
-            service_control('stop') unless service_stopped?
-            service_control('delete') if service_exists?
-            FileUtils.rm_rf(svnserve_dir)
-          end
 
-          config = SetupEnvironment.gen_make_opts
-          apr_version_include = Pathname.new(config["--with-apr"])  +
-              'include' + 'apr_version.h'
-          %r'^\s*#define\s+APR_MAJOR_VERSION\s+(\d+)' =~ apr_version_include.read
-          apr_major_version = $1 == '0' ? '' : "-#{$1}"
-
-          cwd = Dir.getwd
-          targets = %W(svnserve.exe libsvn_subr-1.dll libsvn_repos-1.dll
-                       libsvn_fs-1.dll libsvn_delta-1.dll
-                       libaprutil#{apr_major_version}.dll
-                       libapr#{apr_major_version}.dll
-                       libapriconv#{apr_major_version}.dll
-                       libdb??.dll libdb??d.dll)
-          ENV["PATH"].split(";").each do |path|
-
-            # Change the cwd to path, but ignore non-existent paths.
-            begin
-              Dir.chdir(path)
-            rescue Errno::ENOENT
-              next
-            end
-
-            found_targets = []
-            targets.each do |target|
-              matching_paths = Dir.glob(target)
-              matching_paths.each do |target_path|
-                target_path = File.join(path.tr('\\', '/'), target_path)
-                if File.exists?(target_path)
-                  found_targets << target
-                  retried = 0
-                  begin
-                    FileUtils.cp(target_path, svnserve_dir)
-                  rescue Errno::EACCES
-                    # On Windows the tests frequently fail spuriously with a
-                    # 'Errno::EACCES: Permission denied - svnserve.exe' error.
-                    # Sleeping for a few seconds avoids this.
-                    if retried > 5
-                      # Give up!
-                      raise
-                    else
-                      # Wait a sec...
-                      sleep(1)
-                      retried += 1
-                      retry
-                    end
-                  end
-                end
-              end
-            end
-            targets -= found_targets
-            break if targets.empty?
-          end
-          Dir.chdir(cwd)
-          # Remove optional targets instead of raising below.  If they are really
-          # needed, svnserve won't start anyway.
-          targets -= %W[libapriconv#{apr_major_version}.dll]
-          # Ditto these four, since svnserve.exe might be a static build.
-          targets -= %W[libsvn_subr-1.dll]
-          targets -= %W[libsvn_repos-1.dll]
-          targets -= %W[libsvn_fs-1.dll]
-          targets -= %W[libsvn_delta-1.dll]
-
-          unless targets.empty?
-            raise "can't find libraries to work svnserve: #{targets.join(' ')}"
-          end
-
-          grant_everyone_full_access(svnserve_dir)
-
-          svnserve_path = File.join(svnserve_dir, "svnserve.exe")
-          svnserve_path = svnserve_path.tr(File::SEPARATOR,
-                                           File::ALT_SEPARATOR)
+          top_directory = File.join(File.dirname(__FILE__), "..", "..", "..", "..", "..")
+          build_type = ENV["BUILD_TYPE"] || "Release"
+          svnserve_path = File.join(top_directory, build_type, 'subversion', 'svnserve', 'svnserve.exe')
           svnserve_path = Svnserve.escape_value(svnserve_path)
 
           root = @full_repos_path.tr(File::SEPARATOR, File::ALT_SEPARATOR)
+          FileUtils.mkdir_p(root)
 
-          args = ["--service", "--root", Svnserve.escape_value(root),
-                  "--listen-host", @svnserve_host,
-                  "--listen-port", @svnserve_port]
+          IO.popen("#{svnserve_path} -d -r #{Svnserve.escape_value(root)} --listen-host #{@svnserve_host} --listen-port #{@svnserve_port} --pid-file #{@svnserve_pid_file}")
           user = ENV["USERNAME"] || Etc.getlogin
-          service_control('create',
-                          [["binPath", "#{svnserve_path} #{args.join(' ')}"],
-                           ["DisplayName", service_name],
-                           ["type", "own"]])
+
+          # Give svnserve a bit of time to start
+          sleep 1
         end
-        service_control('start')
         true
       end
 
       def teardown_svnserve
-        service_control('stop') unless service_stopped?
+        # TODO:
+        #   Load @svnserve_pid_file
+        #   Kill process
       end
 
       def add_pre_revprop_change_hook
diff --git a/subversion/bindings/swig/svn_client.i b/subversion/bindings/swig/svn_client.i
index 432ae55..1b017c3 100644
--- a/subversion/bindings/swig/svn_client.i
+++ b/subversion/bindings/swig/svn_client.i
@@ -170,13 +170,6 @@
                   svn_swig_rb_get_commit_log_func)
 #endif
 
-#ifdef SWIGRUBY
-%callback_typemap(svn_cancel_func_t cancel_func, void *cancel_baton,
-                  ,
-                  ,
-                  svn_swig_rb_cancel_func)
-#endif
-
 %callback_typemap(svn_client_blame_receiver_t receiver, void *receiver_baton,
                   svn_swig_py_client_blame_receiver_func,
                   svn_swig_pl_blame_func,
@@ -300,8 +293,9 @@ Callback: svn_client_diff_summarize_func_t
  */
 #ifdef SWIGPERL
 %typemap(in) apr_hash_t *config {
-  $1 = svn_swig_pl_objs_to_hash_by_name ($input, "svn_config_t *",
-                                         svn_swig_pl_make_pool ((SV *)NULL));
+  apr_pool_t *pool = svn_swig_pl_make_pool ((SV *)NULL);
+  SPAGAIN;
+  $1 = svn_swig_pl_objs_to_hash_by_name ($input, "svn_config_t *", pool);
 }
 
 %typemap(out) apr_hash_t *config {
@@ -448,13 +442,13 @@ Callback: svn_client_diff_summarize_func_t
     self = apr_palloc(pool, sizeof(*self));
     self->path = path ? apr_pstrdup(pool, path) : NULL;
 
-    revision = apr_palloc(pool, sizeof(revision));
+    revision = apr_palloc(pool, sizeof(*revision));
     revision->kind = rev->kind;
     revision->value.number = rev->value.number;
     revision->value.date = rev->value.date;
     self->revision = revision;
 
-    peg_revision = apr_palloc(pool, sizeof(peg_revision));
+    peg_revision = apr_palloc(pool, sizeof(*peg_revision));
     peg_revision->kind = peg_rev->kind;
     peg_revision->value.number = peg_rev->value.number;
     peg_revision->value.date = peg_rev->value.date;
diff --git a/subversion/bindings/swig/svn_delta.i b/subversion/bindings/swig/svn_delta.i
index ddcd714..f69b76e 100644
--- a/subversion/bindings/swig/svn_delta.i
+++ b/subversion/bindings/swig/svn_delta.i
@@ -63,6 +63,9 @@
 */
 
 #ifdef SWIGPYTHON
+/* Make swig wrap this function for us, to allow making an editor in python
+   ### There must be a cleaner way to implement this? 
+   ### Maybe follow Ruby by wrapping it where passing an editor? */
 void svn_swig_py_make_editor(const svn_delta_editor_t **editor,
                              void **edit_baton,
                              PyObject *py_editor,
@@ -71,14 +74,8 @@ void svn_swig_py_make_editor(const svn_delta_editor_t **editor,
 
 #ifdef SWIGPERL
 %typemap(in) (const svn_delta_editor_t *EDITOR, void *BATON) {
-    svn_delta_make_editor(&$1, &$2, $input, _global_pool);
+    svn_swig_pl_make_editor(&$1, &$2, $input, _global_pool);
 }
-
-void svn_delta_wrap_window_handler(svn_txdelta_window_handler_t *handler,
-                                   void **handler_baton,
-                                   SV *callback,
-                                   apr_pool_t *pool);
-
 #endif
 
 #ifdef SWIGRUBY
@@ -176,7 +173,7 @@ svn_txdelta_window_t_ops_get(svn_txdelta_window_t *window)
 %ignore svn_txdelta_window_t::ops;
 %extend svn_txdelta_window_t {
 
-void _ops_get(int *num_ops, svn_txdelta_op_t **ops)
+void _ops_get(int *num_ops, const svn_txdelta_op_t **ops)
 {
   *num_ops = self->num_ops;
   *ops = self->ops;
@@ -208,11 +205,11 @@ void _ops_get(int *num_ops, svn_txdelta_op_t **ops)
 %include svn_delta_h.swg
 
 #ifdef SWIGPYTHON
-%pythoncode {
+%pythoncode %{
 # This function is for backwards compatibility only.
 # Use svn_txdelta_window_t.ops instead.
 svn_txdelta_window_t_ops_get = svn_txdelta_window_t._ops_get
-}
+%}
 #endif
 
 #ifdef SWIGRUBY
diff --git a/subversion/bindings/swig/svn_fs.i b/subversion/bindings/swig/svn_fs.i
index 26ca84b..ae1d847 100644
--- a/subversion/bindings/swig/svn_fs.i
+++ b/subversion/bindings/swig/svn_fs.i
@@ -71,6 +71,14 @@
                   ,
                   svn_swig_rb_fs_get_locks_callback)
 #endif
+
+#ifdef SWIGPYTHON
+%callback_typemap(svn_fs_lock_callback_t lock_callback, void *lock_baton,
+                  svn_swig_py_fs_lock_callback,
+                  ,
+                  )
+#endif
+
 /* -----------------------------------------------------------------------
    svn_fs_get_merge_info
 */
diff --git a/subversion/bindings/swig/svn_ra.i b/subversion/bindings/swig/svn_ra.i
index ebf5297..e1925f8 100644
--- a/subversion/bindings/swig/svn_ra.i
+++ b/subversion/bindings/swig/svn_ra.i
@@ -65,7 +65,7 @@
 #ifdef SWIGPERL
 /* FIXME: svn_ra_callbacks2_t ? */
 %typemap(in) (const svn_ra_callbacks_t *callbacks, void *callback_baton) {
-  svn_ra_make_callbacks(&$1, &$2, $input, _global_pool);
+  svn_swig_pl_make_callbacks(&$1, &$2, $input, _global_pool);
 }
 #endif
 #ifdef SWIGRUBY
@@ -77,7 +77,7 @@
 
 #ifdef SWIGPYTHON
 %callback_typemap(const svn_ra_reporter2_t *reporter, void *report_baton,
-                  (svn_ra_reporter2_t *)&swig_py_ra_reporter2,
+                  svn_swig_py_get_ra_reporter2(),
                   ,
                   )
 %callback_typemap(svn_location_segment_receiver_t receiver, void *receiver_baton,
@@ -90,7 +90,7 @@
 %callback_typemap(const svn_ra_reporter3_t *reporter, void *report_baton,
                   ,
                   ,
-                  svn_swig_rb_ra_reporter3)
+                  svn_swig_rb_get_ra_reporter3())
 #endif
 
 #ifndef SWIGPERL
diff --git a/subversion/bindings/swig/svn_repos.i b/subversion/bindings/swig/svn_repos.i
index 2b12313..bab95c8 100644
--- a/subversion/bindings/swig/svn_repos.i
+++ b/subversion/bindings/swig/svn_repos.i
@@ -147,8 +147,18 @@ svn_error_t *svn_repos_dump_fs2(svn_repos_t *repos,
 %ignore svn_repos_dump_fs2;
 #endif
 
+/* ----------------------------------------------------------------------- */
+#ifdef SWIGPYTHON
+/* Make swig wrap this function for us, to allow making a vtable in python */
+void svn_swig_py_make_parse_fns3(const svn_repos_parse_fns3_t **parse_fns3,
+                                 void **parse_baton,
+                                 PyObject *py_parse_fns3,
+                                 apr_pool_t *pool);
+#endif
+
 %include svn_repos_h.swg
 
 #ifdef SWIGRUBY
 %define_close_related_methods(repos)
 #endif
+
diff --git a/subversion/bindings/swig/svn_wc.i b/subversion/bindings/swig/svn_wc.i
index 6137b99..2efe847 100644
--- a/subversion/bindings/swig/svn_wc.i
+++ b/subversion/bindings/swig/svn_wc.i
@@ -40,8 +40,10 @@
 */
 %ignore svn_wc_set_auth_file;
 
-/* ### ignore this structure because the accessors will need a pool */
+/* ### ignore these structures because the accessors will need a pool */
 %ignore svn_wc_keywords_t;
+%ignore svn_wc_conflict_description2_t;
+%ignore svn_wc_conflict_result_t;
 
 #ifdef SWIGRUBY
 %ignore svn_wc_external_item_create;